diff options
5559 files changed, 214911 insertions, 332314 deletions
diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000000..05ff204541 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,134 @@ +--- +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: "24-%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 + - ps: Start-FileDownload 'https://github.com/microsoft/vcpkg-tool/releases/download/2023-08-09/vcpkg.exe' -FileName 'C:\Tools\vcpkg\vcpkg.exe' + - 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 MSPECOPT=-fs # 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 @@ -18,7 +18,7 @@ gc.rb io.rb kernel.rb marshal.rb -rjit.rb +mjit.rb numeric.rb nilclass.rb pack.rb @@ -48,4 +48,7 @@ COPYING.ja LEGAL +# win32/README.win32 linked from README.md +win32 + doc @@ -67,7 +67,7 @@ define rp printf "%sT_OBJECT%s: ", $color_type, $color_end print ((struct RObject *)($arg0))->basic if ($flags & ROBJECT_EMBED) - print/x *((VALUE*)((struct RObject*)($arg0))->as.ary) @ (rb_shape_get_shape($arg0)->capacity) + print/x *((VALUE*)((struct RObject*)($arg0))->as.ary) @ (ROBJECT_EMBED_LEN_MAX+0) else print (((struct RObject *)($arg0))->as.heap) if (((struct RObject*)($arg0))->as.heap.numiv) > 0 @@ -104,8 +104,8 @@ define rp (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2) 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.heap.ptr : \ + ((struct RString*)$regsrc)->as.ary) @ $len set print address on printf " len:%ld ", $len if $flags & RUBY_FL_USER6 @@ -126,26 +126,26 @@ define rp printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len printf "(embed) " if ($len == 0) - printf "{(empty)} " + printf "{(empty)} " else - print/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len - printf " " + print/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len + printf " " end else set $len = ((struct RArray*)($arg0))->as.heap.len printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len if ($flags & RUBY_FL_USER2) - printf "(shared) shared=" - output/x ((struct RArray*)($arg0))->as.heap.aux.shared_root - printf " " + printf "(shared) shared=" + output/x ((struct RArray*)($arg0))->as.heap.aux.shared_root + printf " " else - printf "(ownership) capa=%ld ", ((struct RArray*)($arg0))->as.heap.aux.capa + printf "(ownership) capa=%ld ", ((struct RArray*)($arg0))->as.heap.aux.capa end if ($len == 0) - printf "{(empty)} " + printf "{(empty)} " else - print/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len - printf " " + print/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len + printf " " end end print (struct RArray *)($arg0) @@ -445,8 +445,8 @@ define output_string (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2) 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.heap.ptr : \ + ((struct RString*)($arg0))->as.ary) @ $len else output "" end @@ -459,8 +459,8 @@ define print_string (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2) 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.heap.ptr : \ + ((struct RString*)($arg0))->as.ary) @ $len end end @@ -689,6 +689,11 @@ define nd_stts end +define nd_entry + printf "%su3.entry%s: ", $color_highlite, $color_end + p ($arg0).u3.entry +end + define nd_vid printf "%su1.id%s: ", $color_highlite, $color_end p ($arg0).u1.id @@ -863,22 +868,22 @@ define rb_numtable_entry set $rb_numtable_p = $rb_numtable_tbl->as.packed.bins while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->as.packed.bins+$rb_numtable_tbl->num_entries if $rb_numtable_p.k == $rb_numtable_id - set $rb_numtable_key = $rb_numtable_p.k - set $rb_numtable_rec = $rb_numtable_p.v - set $rb_numtable_p = 0 + set $rb_numtable_key = $rb_numtable_p.k + set $rb_numtable_rec = $rb_numtable_p.v + set $rb_numtable_p = 0 else - set $rb_numtable_p = $rb_numtable_p + 1 + set $rb_numtable_p = $rb_numtable_p + 1 end end else set $rb_numtable_p = $rb_numtable_tbl->as.big.bins[st_numhash($rb_numtable_id) % $rb_numtable_tbl->num_bins] while $rb_numtable_p if $rb_numtable_p->key == $rb_numtable_id - set $rb_numtable_key = $rb_numtable_p->key - set $rb_numtable_rec = $rb_numtable_p->record - set $rb_numtable_p = 0 + set $rb_numtable_key = $rb_numtable_p->key + set $rb_numtable_rec = $rb_numtable_p->record + set $rb_numtable_p = 0 else - set $rb_numtable_p = $rb_numtable_p->next + set $rb_numtable_p = $rb_numtable_p->next end end end @@ -956,7 +961,7 @@ define iseq set $operand_size = ((INSN*)($arg0))->operand_size set $operands = ((INSN*)($arg0))->operands while $i < $operand_size - rp $operands[$i++] + rp $operands[$i++] end end end @@ -1274,9 +1279,9 @@ document rb_count_objects Counts all objects grouped by type. end -# Details: https://github.com/ruby/ruby/wiki/Machine-Instructions-Trace-with-GDB +# Details: https://bugs.ruby-lang.org/projects/ruby-master/wiki/MachineInstructionsTraceWithGDB define trace_machine_instructions - set logging enabled + set logging on set height 0 set width 0 display/i $pc @@ -1343,5 +1348,3 @@ define print_flags printf "RUBY_FL_USER17 : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER17 ? "1" : "0" printf "RUBY_FL_USER18 : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER18 ? "1" : "0" end - -source misc/gdb.py diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 1bf7db40ad..6c5eac5a0f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,7 +5,6 @@ # Expand tabs 5b21e94bebed90180d8ff63dad03b8b948361089 -c5e9af9c9d890578182a21e7b71b50334cd5579e # Enable Style/StringLiterals cop for RubyGems/Bundler d7ffd3fea402239b16833cc434404a7af82d44f3 @@ -22,7 +21,3 @@ f28287d34c03f472ffe90ea262bdde9affd4b965 # Make benchmark indentation consistent fc4acf8cae82e5196186d3278d831f2438479d91 - -# Make prism_compile.c indentation consistent -40b2c8e5e7e6e5f83cee9276dc9c1922a69292d6 -d2c5867357ed88eccc28c2b3bd4a46e206e7ff85 diff --git a/.github/actions/setup/directories/action.yml b/.github/actions/setup/directories/action.yml deleted file mode 100644 index 359e5c0d37..0000000000 --- a/.github/actions/setup/directories/action.yml +++ /dev/null @@ -1,137 +0,0 @@ -name: Setup directories etc. -description: >- - Set up the source code and build directories (plus some - environmental tweaks) - -inputs: - srcdir: - required: false - default: ${{ github.workspace }} - description: >- - Directory to (re-)checkout source codes. This will be created - if absent. If there is no `configure` file that is also - generated inside. - - builddir: - required: false - default: ${{ github.workspace }} - description: >- - Where binaries and other generated contents go. This will be - created if absent. - - makeup: - required: false - type: boolean - # Note that `default: false` evaluates to a string constant - # `'false'`, which is a truthy value :sigh: - # https://github.com/actions/runner/issues/2238 - default: '' - 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. - -outputs: {} # nothing? - -runs: - using: composite - - steps: - # Note that `shell: bash` works on both Windows and Linux, but not - # `shell: sh`. This is because GitHub hosted Windows runners have - # their bash manually installed. - - shell: bash - run: | - mkdir -p ${{ inputs.srcdir }} - mkdir -p ${{ inputs.builddir }} - - # Did you know that actions/checkout works without git(1)? We are - # checking that here. - - id: which - shell: bash - run: | - echo "git=`command -v git`" >> "$GITHUB_OUTPUT" - echo "sudo=`command -v sudo`" >> "$GITHUB_OUTPUT" - echo "autoreconf=`command -v autoreconf`" >> "$GITHUB_OUTPUT" - - - if: steps.which.outputs.git - shell: bash - run: | - git config --global core.autocrlf false - git config --global core.eol lf - git config --global advice.detachedHead 0 - git config --global init.defaultBranch garbage - - - if: inputs.checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - path: ${{ inputs.srcdir }} - - - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ inputs.srcdir }}/.downloaded-cache - key: downloaded-cache - - - if: steps.which.outputs.autoreconf - shell: bash - working-directory: ${{ inputs.srcdir }} - run: ./autogen.sh - - # This is for MinGW. - - if: runner.os == 'Windows' - shell: bash - run: echo "GNUMAKEFLAGS=-j$((2 * NUMBER_OF_PROCESSORS))" >> $GITHUB_ENV - - - if: runner.os == 'Linux' - shell: bash - run: echo "GNUMAKEFLAGS=-sj$((1 + $(nproc --all)))" >> "$GITHUB_ENV" - - # macOS' GNU make is so old that they doesn't understand `GNUMAKEFLAGS`. - - if: runner.os == 'macOS' - shell: bash - run: echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> "$GITHUB_ENV" - - - if: inputs.makeup - 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 - 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 - - - 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' || : - - - if: inputs.dummy-files == 'true' - shell: bash - working-directory: ${{ inputs.builddir }} - run: | - : Create dummy files in build dir - for basename in {a..z} {A..Z} {0..9} foo bar test zzz; do - echo > ${basename}.rb "raise %(do not load ${basename}.rb)" - done diff --git a/.github/actions/setup/macos/action.yml b/.github/actions/setup/macos/action.yml deleted file mode 100644 index 3649a64876..0000000000 --- a/.github/actions/setup/macos/action.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Setup macOS environment -description: >- - Installs necessary packages via Homebrew. - -inputs: {} # nothing? - -outputs: {} # nothing? - -runs: - using: composite - - steps: - - name: brew - shell: bash - run: | - brew install --quiet gmp libffi openssl@1.1 zlib autoconf automake libtool readline - - - 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 diff --git a/.github/actions/setup/ubuntu/action.yml b/.github/actions/setup/ubuntu/action.yml deleted file mode 100644 index a9e5b41951..0000000000 --- a/.github/actions/setup/ubuntu/action.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Setup ubuntu environment -description: >- - At the beginning there was no way but to copy & paste `apt-get` - everywhere. But now that we have composite actions, it seems better - merge them into one. - -inputs: - arch: - required: false - default: '' - description: >- - Architecture. Because we run this on a GitHub-hosted runner - acceptable value for this input is very limited. - -outputs: - arch: - value: ${{ steps.uname.outputs.uname }} - description: >- - Actual architecture. This could be different from the one - passed to the `inputs.arch`. For instance giving `i386` to this - action yields `i686`. - -runs: - using: composite - - steps: - - name: set SETARCH - shell: bash - run: echo "SETARCH=${setarch}" >> "$GITHUB_ENV" - env: - setarch: ${{ inputs.arch && format('setarch {0} --', inputs.arch) }} - - - id: uname - name: uname - shell: bash - run: | - echo uname=`${SETARCH} uname -m` >> "$GITHUB_OUTPUT" - echo dpkg=`${SETARCH} uname -m | sed s/686/386/` >> "$GITHUB_OUTPUT" - - - name: apt-get - shell: bash - env: - arch: ${{ inputs.arch && format(':{0}', steps.uname.outputs.dpkg) || '' }} - run: | - set -x - ${arch:+sudo dpkg --add-architecture ${arch#:}} - sudo apt-get update -qq || : - sudo apt-get install --no-install-recommends -qq -y -o=Dpkg::Use-Pty=0 \ - ${arch:+cross}build-essential${arch/:/-} \ - libssl-dev${arch} libyaml-dev${arch} libreadline6-dev${arch} \ - zlib1g-dev${arch} libncurses5-dev${arch} libffi-dev${arch} \ - autoconf ruby - sudo apt-get install -qq -y pkg-config${arch} || : diff --git a/.github/actions/slack/action.yml b/.github/actions/slack/action.yml deleted file mode 100644 index c98be085a8..0000000000 --- a/.github/actions/slack/action.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Post a message to slack -description: >- - We have our ruby/action-slack webhook. However its arguments are - bit verbose to be listed in every workflow files. Better merge them - into one. - -inputs: - SLACK_WEBHOOK_URL: - 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 - look into one. - - label: - required: false - description: >- - Human-readable description of the run, something like "DEBUG=1". - This need not be unique among runs. - -outputs: {} # Nothing? - -runs: - using: composite - - steps: - - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 - with: - payload: | - { - "ci": "GitHub Actions", - "env": "${{ github.workflow }}${{ inputs.label && format(' / {0}', inputs.label) }}", - "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", - "commit": "${{ github.sha }}", - "branch": "${{ github.ref_name }}" - } - 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 deleted file mode 100644 index 8726df577d..0000000000 --- a/.github/auto_request_review.yml +++ /dev/null @@ -1,13 +0,0 @@ -files: - 'yjit*': [team:yjit] - 'yjit/**/*': [team:yjit] - 'yjit/src/cruby_bindings.inc.rs': [] - 'doc/yjit/*': [team:yjit] - 'bootstraptest/test_yjit*': [team:yjit] - 'test/ruby/test_yjit*': [team:yjit] -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. - #last_files_match_only: true diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml new file mode 100644 index 0000000000..91f82b842b --- /dev/null +++ b/.github/codeql/codeql-config.yml @@ -0,0 +1,3 @@ +name: "CodeQL config for the Ruby language" + +languages: cpp diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 70a73430d7..bc63aca35b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,6 @@ version: 2 updates: - package-ecosystem: 'github-actions' - directory: '/.github' + directory: '/' schedule: - interval: 'daily' + interval: 'monthly' diff --git a/.github/workflows/annocheck.yml b/.github/workflows/annocheck.yml deleted file mode 100644 index 25454f6abe..0000000000 --- a/.github/workflows/annocheck.yml +++ /dev/null @@ -1,127 +0,0 @@ -name: Annocheck - -on: - push: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - pull_request: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - merge_group: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - -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: - compile: - name: gcc-11 annocheck - - runs-on: ubuntu-latest - - container: - image: ghcr.io/ruby/ruby-ci-image:gcc-11 - options: --user root - - 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]') - )}} - - env: - CONFIGURE_TTY: never - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} - RUBY_DEBUG: ci rgengc - RUBY_TESTOPTS: >- - -q - --color=always - --tty=no - # FIXME: Drop skipping options - # https://bugs.ruby-lang.org/issues/18061 - # https://sourceware.org/annobin/annobin.html/Test-pie.html - TEST_ANNOCHECK_OPTS: '--skip-pie --skip-gaps' - - steps: - - run: id - working-directory: - - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - sparse-checkout-cone-mode: false - sparse-checkout: /.github - - - uses: ./.github/actions/setup/directories - with: - srcdir: src - builddir: build - makeup: true - - # Minimal flags to pass the check. - # -g0 disables backtraces when SEGV. Do not set that. - - name: Run configure - run: > - ../src/configure -C - --enable-debug-env - --disable-install-doc - --with-ext=-test-/cxxanyargs,+ - --without-valgrind - --without-jemalloc - --without-gmp - --with-gcc="gcc-11 -fcf-protection -Wa,--generate-missing-build-notes=yes" - --enable-shared - debugflags=-ggdb3 - optflags=-O2 - LDFLAGS=-Wl,-z,now - - - run: make showflags - - - 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 - continue-on-error: true # toomanyrequests: You have reached your pull rate limit. - - - uses: ./.github/actions/slack - with: - 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/auto_request_review.yml b/.github/workflows/auto_request_review.yml deleted file mode 100644 index 998a6ea58a..0000000000 --- a/.github/workflows/auto_request_review.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Auto Request Review -on: - pull_request_target: - types: [opened, ready_for_review, reopened] - -permissions: - contents: read - -jobs: - auto-request-review: - name: Auto Request Review - runs-on: ubuntu-latest - 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 - with: - # scope: public_repo - token: ${{ secrets.MATZBOT_GITHUB_TOKEN }} diff --git a/.github/workflows/baseruby.yml b/.github/workflows/baseruby.yml index 860d74aa1a..ebaafe3bf0 100644 --- a/.github/workflows/baseruby.yml +++ b/.github/workflows/baseruby.yml @@ -8,7 +8,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' pull_request: paths-ignore: - 'doc/**' @@ -16,7 +15,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' merge_group: paths-ignore: - 'doc/**' @@ -24,7 +22,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -36,49 +33,48 @@ permissions: jobs: baseruby: name: BASERUBY - - 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]') - )}} - + runs-on: ubuntu-22.04 + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} strategy: matrix: ruby: - - ruby-2.5 + - ruby-2.2 +# - ruby-2.3 +# - ruby-2.4 +# - ruby-2.5 # - ruby-2.6 # - ruby-2.7 - ruby-3.0 - ruby-3.1 - - ruby-3.2 steps: - - uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: .downloaded-cache + key: downloaded-cache + - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0 with: ruby-version: ${{ matrix.ruby }} bundler: none - - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - uses: ./.github/actions/setup/ubuntu - - - uses: ./.github/actions/setup/directories - with: - makeup: true - + - run: echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV + - run: sudo apt-get install build-essential autoconf bison libyaml-dev + - run: ./autogen.sh - run: ./configure --disable-install-doc - + - run: make common-srcs + - run: make incs - run: make all - - run: make test - - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.ruby }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / BASERUBY @ ${{ matrix.ruby }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: ${{ failure() }} + if: ${{ failure() && github.event_name == 'push' }} diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml index 943140e9ef..070c0fa1dd 100644 --- a/.github/workflows/bundled_gems.yml +++ b/.github/workflows/bundled_gems.yml @@ -2,17 +2,17 @@ name: bundled_gems on: push: - branches: ['master'] + branches: [ "master" ] paths: - '.github/workflows/bundled_gems.yml' - 'gems/bundled_gems' pull_request: - branches: ['master'] + branches: [ "master" ] paths: - '.github/workflows/bundled_gems.yml' - 'gems/bundled_gems' merge_group: - branches: ['master'] + branches: [ "master" ] paths: - '.github/workflows/bundled_gems.yml' - 'gems/bundled_gems' @@ -20,34 +20,36 @@ on: - cron: '45 6 * * *' workflow_dispatch: -permissions: # added using https://github.com/step-security/secure-workflows +permissions: # added using https://github.com/step-security/secure-workflows contents: read jobs: update: permissions: - contents: write # for Git to git push - + contents: write # for Git to git push if: ${{ github.event_name != 'schedule' || github.repository == 'ruby/ruby' }} - name: update ${{ github.workflow }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} - - - uses: ./.github/actions/setup/directories - with: - # Skip overwriting MATZBOT_GITHUB_TOKEN - checkout: '' # false (ref: https://github.com/actions/runner/issues/2238) + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage - name: Set ENV run: | + echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV echo "TODAY=$(date +%F)" >> $GITHUB_ENV + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: .downloaded-cache + key: downloaded-cache-${{ github.sha }} + restore-keys: | + downloaded-cache + - name: Download previous gems list run: | data=bundled_gems.json @@ -56,76 +58,109 @@ jobs: curl -O -R -z ./$data https://stdgems.org/$data - name: Update bundled gems list - id: bundled_gems run: | - ruby -i~ tool/update-bundled_gems.rb gems/bundled_gems >> $GITHUB_OUTPUT + ruby -i~ tool/update-bundled_gems.rb gems/bundled_gems - name: Maintain updated gems list in NEWS run: | - ruby tool/update-NEWS-gemlist.rb bundled + #!ruby + require 'json' + news = File.read("NEWS.md") + prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1] + prevs = [prev, prev.sub(/\.\d+\z/, '')] + %W[bundled].each do |type| + last = 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 + changed = File.foreach("gems/#{type}_gems").filter_map do |l| + next if l.start_with?("#") + g, v = l.split(" ", 3) + [g, v] unless last[g] == v + end + changed, added = changed.partition {|g, _| last[g]} + news.sub!(/^\*( +)The following #{type} gems? are updated\.\n+\K(?: \1\*( +).*\n)*/) do + mark = "#{$1} *#{$2}" + changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("") + end or next + news.sub!(/^\*( +)The following default gems are now bundled gems\.\n+\K(?: \1\*( +).*\n)*/) do + mark = "#{$1} *#{$2}" + added.map {|g, v|"#{mark}#{g} #{v}\n"}.join("") + end or next unless added.empty? + File.write("NEWS.md", news) + end + shell: ruby {0} - name: Check diffs id: diff run: | - 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 - echo news=$news >> $GITHUB_OUTPUT - echo gems=$gems >> $GITHUB_OUTPUT - echo update=${news:-$gems} >> $GITHUB_OUTPUT + git add -- NEWS.md + git diff --no-ext-diff --ignore-submodules --quiet -- gems/bundled_gems + continue-on-error: true - name: Install libraries - uses: ./.github/actions/setup/ubuntu - if: ${{ steps.diff.outputs.gems }} + run: | + set -x + sudo apt-get update -q || : + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby + if: ${{ steps.diff.outcome == 'failure' }} - name: Build run: | ./autogen.sh ./configure -C --disable-install-doc make - if: ${{ steps.diff.outputs.gems }} + if: ${{ steps.diff.outcome == 'failure' }} - name: Prepare bundled gems run: | make -s prepare-gems - if: ${{ steps.diff.outputs.gems }} + if: ${{ steps.diff.outcome == 'failure' }} - 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.outputs.gems }} + 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 - name: Commit run: | git pull --ff-only origin ${GITHUB_REF#refs/heads/} - message="Update bundled gems list" - if [ -z "${gems}" ]; then - git commit --message="${message} at ${GITHUB_SHA:0:30} [ci skip]" + message="Update bundled gems list at " + if [ ${{ steps.diff.outcome }} = success ]; then + git commit --message="${message}${GITHUB_SHA:0:30} [ci skip]" else - git commit --message="${message} as of ${TODAY}" + git commit --message="${message}${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 - gems: ${{ steps.diff.outputs.gems }} - if: >- - ${{ - github.repository == 'ruby/ruby' && - !startsWith(github.event_name, 'pull') && - steps.diff.outputs.update - }} - - - uses: ./.github/actions/slack + if: ${{ github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull') && steps.show.outcome == 'failure' }} + + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / update", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: ${{ failure() }} + if: ${{ failure() && github.event_name == 'push' }} diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml index 10c202c3c1..79b2916feb 100644 --- a/.github/workflows/check_dependencies.yml +++ b/.github/workflows/check_dependencies.yml @@ -7,7 +7,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' pull_request: paths-ignore: - 'doc/**' @@ -15,7 +14,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' merge_group: paths-ignore: - 'doc/**' @@ -23,7 +21,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -36,41 +33,46 @@ jobs: update-deps: strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-22.04] 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]') - )}} - + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - uses: ./.github/actions/setup/ubuntu + - name: Install libraries + run: | + set -x + sudo apt-get update -q || : + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby if: ${{ contains(matrix.os, 'ubuntu') }} - - - uses: ./.github/actions/setup/macos + - name: Install libraries + run: | + brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline if: ${{ contains(matrix.os, 'macos') }} - - - uses: ./.github/actions/setup/directories - + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: .downloaded-cache + key: downloaded-cache + - run: ./autogen.sh - 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: ruby tool/update-deps --fix - - run: git diff --no-ext-diff --ignore-submodules --exit-code - - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.os }} / Dependencies need to update + payload: | + { + "ci": "GitHub Actions", + "env": "${{ matrix.os }} / Dependencies need to update", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: ${{ failure() }} + if: ${{ failure() && github.event_name == 'push' }} diff --git a/.github/workflows/check_misc.yml b/.github/workflows/check_misc.yml deleted file mode 100644 index ce4397b35a..0000000000 --- a/.github/workflows/check_misc.yml +++ /dev/null @@ -1,117 +0,0 @@ -name: Misc -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: - checks: - name: Miscellaneous checks - - permissions: - contents: write # for Git to git push - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} - - - uses: ./.github/actions/setup/directories - with: - makeup: true - # Skip overwriting MATZBOT_GITHUB_TOKEN - checkout: '' # false (ref: https://github.com/actions/runner/issues/2238) - - - name: Check if C-sources are US-ASCII - run: | - grep -r -n --include='*.[chyS]' --include='*.asm' $'[^\t-~]' -- . && exit 1 || : - - - name: Check for trailing spaces - run: | - git grep -I -n $'[\t ]$' -- '*.rb' '*.[chy]' '*.rs' '*.yml' && exit 1 || : - git grep -n $'^[\t ][\t ]*$' -- '*.md' && exit 1 || : - - - name: Check for bash specific substitution in configure.ac - run: | - git grep -n '\${[A-Za-z_0-9]*/' -- configure.ac && exit 1 || : - - - name: Check for header macros - run: | - fail= - for header in ruby/*.h; do - git grep -l -F -e $header -e HAVE_`echo $header | tr a-z./ A-Z__` -- . > /dev/null && continue - fail=1 - echo $header - done - 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 - 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/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 47104672fe..8dba76fbe2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,23 +1,20 @@ -name: 'CodeQL' +name: "Code scanning - action" on: - push: - branches: ['master'] - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - pull_request: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' + # push: + # paths-ignore: + # - 'doc/**' + # - '**/man' + # - '**.md' + # - '**.rdoc' + # - '**/.document' + # pull_request: + # paths-ignore: + # - 'doc/**' + # - '**/man' + # - '**.md' + # - '**.rdoc' + # - '**/.document' schedule: - cron: '0 12 * * *' workflow_dispatch: @@ -26,90 +23,53 @@ concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }} -permissions: # added using https://github.com/step-security/secure-workflows +permissions: # added using https://github.com/step-security/secure-workflows contents: read jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest + CodeQL-Build: + + # CodeQL runs on ubuntu-latest and windows-latest permissions: - actions: read # for github/codeql-action/init to get workflow details - contents: read # for actions/checkout to fetch code - security-events: write # for github/codeql-action/autobuild to send a status report + actions: read # for github/codeql-action/init to get workflow details + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/autobuild to send a status report + runs-on: ubuntu-latest # CodeQL fails to run pull requests from dependabot due to missing write access to upload results. - 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]') - )}} + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') && github.event.head_commit.pusher.name != 'dependabot[bot]' }} env: enable_install_doc: no - strategy: - fail-fast: false - matrix: - language: ['cpp', 'ruby'] - steps: - - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Install libraries - uses: ./.github/actions/setup/ubuntu + - name: Install libraries + run: | + set -x + sudo apt-get update -q || : + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby - - uses: ./.github/actions/setup/directories + - name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Remove an obsolete rubygems vendored file - run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: .downloaded-cache + key: downloaded-cache - - name: Initialize CodeQL - uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 - with: - languages: ${{ matrix.language }} + - name: Remove an obsolete rubygems vendored file + run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb - - name: Autobuild - uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 + - name: Initialize CodeQL + uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37 + with: + config-file: ./.github/codeql/codeql-config.yml + trap-caching: false - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 - with: - category: '/language:${{ matrix.language }}' - upload: False - output: sarif-results - ram: 8192 - # CodeQL randomly hits `OutOfMemoryError "Java heap space"`. - # GitHub recommends running a larger runner to fix it, but we don't pay for it. - continue-on-error: true + - name: Set ENV + run: echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV - - name: filter-sarif - uses: advanced-security/filter-sarif@f3b8118a9349d88f7b1c0c488476411145b6270d # v1.0 - with: - patterns: | - +**/*.rb - -lib/uri/mailto.rb:rb/overly-large-range - -lib/uri/rfc3986_parser.rb:rb/overly-large-range - -lib/bundler/vendor/uri/lib/uri/mailto.rb:rb/overly-large-range - -lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb:rb/overly-large-range - -test/ruby/test_io.rb:rb/non-constant-kernel-open - -test/open-uri/test_open-uri.rb:rb/non-constant-kernel-open - -test/open-uri/test_ssl.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/binread_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/readlines_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/foreach_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/write_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/read_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/kernel/open_spec.rb:rb/non-constant-kernel-open - input: sarif-results/${{ matrix.language }}.sarif - output: sarif-results/${{ matrix.language }}.sarif - if: ${{ matrix.language == 'ruby' }} - continue-on-error: true + - name: Autobuild + uses: github/codeql-action/autobuild@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37 - - name: Upload SARIF - uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 - with: - sarif_file: sarif-results/${{ matrix.language }}.sarif - continue-on-error: true + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37 diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index fbe6d5da88..caf12cc0f4 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -1,4 +1,3 @@ -# Some tests depending on this name 'Compilations' via $GITHUB_WORKFLOW. Make sure to update such tests when renaming this workflow. name: Compilations on: @@ -9,23 +8,18 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' pull_request: paths-ignore: - 'doc/**' - '**/man' - - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' merge_group: paths-ignore: - 'doc/**' - '**/man' - - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -35,7 +29,7 @@ concurrency: # environment variables (plus the "echo $GITHUB_ENV" hack) is to reroute that # restriction. env: - default_cc: clang-17 + default_cc: clang-15 append_cc: '' # -O1 is faster than -O3 in our tests... Majority of time are consumed trying @@ -56,8 +50,13 @@ env: --without-jemalloc --without-gmp + UPDATE_UNICODE: >- + UNICODE_FILES=. + UNICODE_PROPERTY_FILES=. + UNICODE_AUXILIARY_FILES=. + UNICODE_EMOJI_FILES=. CONFIGURE_TTY: never - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} + GITPULLOPTIONS: --no-tags origin ${{github.ref}} RUBY_DEBUG: ci rgengc RUBY_TESTOPTS: >- -q @@ -75,7 +74,6 @@ jobs: 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 } } @@ -89,8 +87,6 @@ jobs: 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 } } @@ -111,8 +107,6 @@ jobs: 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 } @@ -128,27 +122,25 @@ jobs: # 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: c99, env: { append_cc: '-std=c99 -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } } +# - { name: c11, env: { append_cc: '-std=c11 -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } } +# - { name: c17, env: { append_cc: '-std=c17 -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } } + - { name: c2x, env: { append_cc: '-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: c++2a, env: { CXXFLAGS: '-std=c++2a -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' }, 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, env: { append_configure: '--disable-yjit --disable-rjit' } } + - { 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' } } @@ -172,27 +164,31 @@ jobs: # - { name: SYMBOL_DEBUG, env: { cppflags: '-DSYMBOL_DEBUG' } } # - { name: RGENGC_CHECK_MODE, env: { cppflags: '-DRGENGC_CHECK_MODE' } } +# - { name: TRANSIENT_HEAP_CHECK_MODE, env: { cppflags: '-DTRANSIENT_HEAP_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 + - { 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_LAZY_LOAD, env: { cppflags: '-DUSE_LAZY_LOAD' } } +# - { name: USE_RINCGC=0, env: { cppflags: '-DUSE_RINCGC=0' } } # - { 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_TRANSIENT_HEAP=0, env: { cppflags: '-DUSE_TRANSIENT_HEAP=0' } } +# - { name: USE_RUBY_DEBUG_LOG=1, env: { cppflags: '-DUSE_RUBY_DEBUG_LOG=1' } } + - { name: USE_RVARGC=0, env: { cppflags: '-DUSE_RVARGC=0' } } +# - { name: USE_RVARGC=1, env: { cppflags: '-DUSE_RVARGC=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: 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_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' } } @@ -205,50 +201,39 @@ jobs: # - { 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_OLD_NEWOBJ_CHECK, env: { cppflags: '-DRGENGC_OLD_NEWOBJ_CHECK' } } # - { 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: MJIT_FORCE_ENABLE, env: { cppflags: '-DMJIT_FORCE_ENABLE' } } - { 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 }} - runs-on: ubuntu-latest - container: - image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-17' }} + image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-15' }} options: --user root - - 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]') - )}} - + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} env: ${{ matrix.entry.env || matrix.env }} - steps: - run: id working-directory: - - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - run: mkdir build + working-directory: + - name: setenv + run: | + echo "GNUMAKEFLAGS=-sj$((1 + $(nproc --all)))" >> $GITHUB_ENV + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - sparse-checkout-cone-mode: false - sparse-checkout: /.github - - - uses: ./.github/actions/setup/directories + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: - srcdir: src - builddir: build - makeup: true - + path: src/.downloaded-cache + key: downloaded-cache + - run: ./autogen.sh + working-directory: src - name: Run configure run: > ../src/configure -C ${default_configure} ${append_configure} @@ -258,39 +243,38 @@ jobs: 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 extract-extlibs + - run: make incs - run: make showflags - - run: make - + - run: make leaked-globals - 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') }} - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.entry.name }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / ${{ matrix.entry.name }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: ${{ failure() }} + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml deleted file mode 100644 index 6259199b11..0000000000 --- a/.github/workflows/dependabot_automerge.yml +++ /dev/null @@ -1,30 +0,0 @@ -# from https://github.com/gofiber/swagger/blob/main/.github/workflows/dependabot_automerge.yml -name: Dependabot auto-merge -on: - pull_request_target: - -jobs: - automerge: - runs-on: ubuntu-latest - - if: ${{ github.actor == 'dependabot[bot]' }} - - steps: - - name: Dependabot metadata - uses: dependabot/fetch-metadata@c9c4182bf1b97f5224aee3906fd373f6b61b4526 # v1.6.0 - id: metadata - - - name: Wait for status checks - uses: lewagon/wait-on-check-action@e106e5c43e8ca1edea6383a39a01c5ca495fd812 # v1.3.1 - with: - repo-token: ${{ secrets.MATZBOT_GITHUB_TOKEN }} - ref: ${{ github.event.pull_request.head.sha || github.sha }} - check-regexp: 'make \(check, .*\)' - wait-interval: 30 - - - name: Auto-merge for Dependabot PRs - if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch' }} - run: gh pr merge --auto --rebase "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GITHUB_TOKEN: ${{ secrets.MATZBOT_GITHUB_TOKEN }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6411a02d2b..d8dc58b119 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -7,10 +7,13 @@ on: - '**.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 + paths-ignore: + - 'doc/**' + - '**/man' + - '**.md' + - '**.rdoc' + - '**/.document' merge_group: paths-ignore: - 'doc/**' @@ -18,7 +21,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -31,86 +33,80 @@ jobs: make: strategy: matrix: - test_task: ['check'] - configure: [''] - os: ${{ fromJSON(format('["macos-11","macos-12"{0}]', (github.repository == 'ruby/ruby' && ',"macos-arm-oss"' || ''))) }} - include: - - test_task: test-all TESTS=--repeat-count=2 - os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-12' }} + test_task: ["check"] # "test-bundler-parallel", "test-bundled-gems" + os: + - macos-13 + - macos-14 + - macos-15 fail-fast: false - env: - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} - + GITPULLOPTIONS: --no-tags origin ${{github.ref}} 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]') - )}} - + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - run: mkdir build + working-directory: + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - 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 + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: - srcdir: src - builddir: build - makeup: true - dummy-files: ${{ matrix.test_task == 'check' }} - + path: src/.downloaded-cache + key: downloaded-cache + - name: Install libraries + run: | + brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline bison + working-directory: src + - name: Set ENV + run: | + echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV + echo "PATH="/usr/local/opt/bison/bin:/opt/homebrew/opt/bison/bin:$PATH"" >> $GITHUB_ENV + - run: ./autogen.sh + working-directory: src - name: Run configure - run: ../src/configure -C --disable-install-doc ${{ matrix.configure }} - + run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline) + - run: make incs - run: make prepare-gems if: ${{ matrix.test_task == 'test-bundled-gems' }} - - run: make - + - run: make leaked-globals + if: ${{ matrix.test_task == 'check' }} - name: make ${{ matrix.test_task }} run: | make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`} - timeout-minutes: 60 + timeout-minutes: 40 env: - RUBY_TESTOPTS: '-q --tty=no' + RUBY_TESTOPTS: "-q --tty=no" TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }} - TEST_BUNDLED_GEMS_ALLOW_FAILURES: '' - PRECHECK_BUNDLED_GEMS: 'no' - + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" + PRECHECK_BUNDLED_GEMS: "no" - name: make skipped tests run: | make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'` env: - GNUMAKEFLAGS: '' - RUBY_TESTOPTS: '-v --tty=no' + GNUMAKEFLAGS: "" + RUBY_TESTOPTS: "-v --tty=no" TESTS: ${{ matrix.skipped_tests }} - PRECHECK_BUNDLED_GEMS: '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 + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.os }} / ${{ matrix.test_task }} ${{ matrix.configure }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: 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-latest - needs: [make] - steps: - - run: exit 1 - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index df879f56b6..0df917d3d8 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -7,8 +7,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' - - '.*.yml' pull_request: paths-ignore: - 'doc/**' @@ -16,8 +14,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' - - '.*.yml' merge_group: paths-ignore: - 'doc/**' @@ -25,8 +21,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -41,42 +35,50 @@ permissions: jobs: make: runs-on: windows-2022 - name: ${{ github.workflow }} (${{ matrix.msystem }}) - env: MSYSTEM: ${{ matrix.msystem }} MSYS2_ARCH: x86_64 - CHOST: 'x86_64-w64-mingw32' - CFLAGS: '-march=x86-64 -mtune=generic -O3 -pipe' - CXXFLAGS: '-march=x86-64 -mtune=generic -O3 -pipe' - CPPFLAGS: '-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048' - LDFLAGS: '-pipe' - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} - + CHOST: "x86_64-w64-mingw32" + CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe" + CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe" + CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048" + LDFLAGS: "-pipe" + UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." + GITPULLOPTIONS: --no-tags origin ${{github.ref}} strategy: matrix: include: # To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses. - - msystem: 'UCRT64' + - msystem: "UCRT64" base_ruby: head - test_task: 'check' - test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/' + test_task: "check" + test-all-opts: "--name=!/TestObjSpace#test_reachable_objects_during_iteration/" fail-fast: false - - 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]') - )}} - + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: + - run: mkdir build + working-directory: + - name: git config + run: | + git config --global core.autocrlf false + git config --global core.eol lf + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: src/.downloaded-cache + key: downloaded-cache - name: Set up Ruby & MSYS2 - uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0 + uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0 with: ruby-version: ${{ matrix.base_ruby }} + - name: set env + run: | + echo "GNUMAKEFLAGS=-j$((2 * NUMBER_OF_PROCESSORS))" >> $GITHUB_ENV - name: where check run: | @@ -84,83 +86,92 @@ jobs: 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 - echo ::group::$'\033[93m'$e$'\033[m' + for e in gcc.exe ragel.exe make.exe bison.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do + echo '##['group']'$'\033[93m'$e$'\033[m' where $e || result=false - echo ::endgroup:: + echo '##['endgroup']' done $result - working-directory: - name: version check run: | # show version result=true - for e in gcc ragel make "openssl version"; do + for e in gcc ragel make bison "openssl version"; do case "$e" in *" "*) ;; *) e="$e --version";; esac - echo ::group::$'\033[93m'$e$'\033[m' + echo '##['group']'$'\033[93m'$e$'\033[m' $e || result=false - echo ::endgroup:: + echo '##['endgroup']' done $result - working-directory: - - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - sparse-checkout-cone-mode: false - sparse-checkout: /.github - - uses: ./.github/actions/setup/directories - with: - srcdir: src - builddir: build - makeup: true + - name: autogen + run: | + ./autogen.sh + working-directory: src - name: configure run: > ../src/configure --disable-install-doc --prefix=/. --build=$CHOST --host=$CHOST --target=$CHOST + - name: update + run: | + make incs + + - name: download gems + run: | + make update-gems + - name: make all timeout-minutes: 30 - run: make + run: | + make + + - run: make leaked-globals - name: make install - run: make DESTDIR=../install install-nodoc + run: | + make DESTDIR=../install install-nodoc - name: test - timeout-minutes: 30 - run: make test - shell: cmd - env: - GNUMAKEFLAGS: '' - RUBY_TESTOPTS: '-v --tty=no' - if: ${{ matrix.test_task == 'check' || matrix.test_task == 'test' }} + timeout-minutes: 5 + run: | + make test + if: ${{matrix.test_task == 'check' || matrix.test_task == 'test'}} - 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 ${{ matrix.test-all-opts }} BUNDLER_VERSION: - if: ${{ matrix.test_task == 'check' || matrix.test_task == 'test-all' || StartsWith(matrix.test_task, 'test/') }} + if: ${{matrix.test_task == 'check' || matrix.test_task == 'test-all' || StartsWith(matrix.test_task, 'test/')}} - name: test-spec 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/') }} + if: ${{matrix.test_task == 'check' || matrix.test_task == 'test-spec' || StartsWith(matrix.test_task, 'spec/')}} - - uses: ./src/.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.msystem }} / ${{ matrix.test_task }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} ${{ matrix.msystem }} / ${{ matrix.test_task }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: ${{ failure() }} + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/mjit-bindgen.yml b/.github/workflows/mjit-bindgen.yml new file mode 100644 index 0000000000..26f8a1b2aa --- /dev/null +++ b/.github/workflows/mjit-bindgen.yml @@ -0,0 +1,104 @@ +name: MJIT 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: mjit-bindgen + fail-fast: false + runs-on: ubuntu-22.04 + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} + steps: + - run: mkdir build + working-directory: + - name: Set ENV + run: | + echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV + - name: Install libraries + run: | + set -x + sudo apt-get update -q || : + sudo apt-get install --no-install-recommends -q -y \ + build-essential \ + libssl-dev libyaml-dev libreadline6-dev \ + zlib1g-dev libncurses5-dev libffi-dev \ + libclang1-14 \ + bison autoconf + sudo apt-get install -q -y pkg-config || : + - name: Set up Ruby + uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0 + with: + ruby-version: '3.1' + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: src/.downloaded-cache + key: downloaded-cache + - name: Fixed world writable dirs + run: | + chmod -v go-w $HOME $HOME/.config + sudo chmod -R go-w /usr/share + sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || : + - run: ./autogen.sh + working-directory: src + - name: Run configure + run: ../src/configure -C --disable-install-doc --prefix=$(pwd)/install --enable-yjit=dev_nodebug + - run: make incs + - run: make + - run: make install + - run: make ${{ matrix.task }} + - run: git diff --exit-code + working-directory: src + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 + with: + payload: | + { + "ci": "GitHub Actions", + "env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: + 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/mjit.yml b/.github/workflows/mjit.yml new file mode 100644 index 0000000000..6f7181489a --- /dev/null +++ b/.github/workflows/mjit.yml @@ -0,0 +1,113 @@ +name: MJIT +on: + push: + paths-ignore: + - 'doc/**' + - '**/man' + - '**.md' + - '**.rdoc' + - '**/.document' + pull_request: + paths-ignore: + - 'doc/**' + - '**/man' + - '**.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: + test_task: [check] # to make job names consistent + mjit_opts: [--mjit-wait] + fail-fast: false + runs-on: ubuntu-latest + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} + env: + TESTOPTS: '-q --tty=no' + RUN_OPTS: '--disable-gems ${{ matrix.mjit_opts }} --mjit-debug=-ggdb3' + GITPULLOPTIONS: --no-tags origin ${{github.ref}} + steps: + - run: mkdir build + working-directory: + - name: Install libraries + run: | + set -x + sudo apt-get update -q || : + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: src/.downloaded-cache + key: downloaded-cache + - name: Fixed world writable dirs + run: | + chmod -v go-w $HOME $HOME/.config + sudo chmod -R go-w /usr/share + sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || : + - name: Set ENV + run: | + echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV + - run: ./autogen.sh + working-directory: src + - name: Run configure + run: ../src/configure -C --disable-install-doc cppflags=-DVM_CHECK_MODE + - run: make incs + - run: make + - run: sudo make -s install + - name: Run test + run: | + unset GNUMAKEFLAGS + make -s test RUN_OPTS="$RUN_OPTS" + timeout-minutes: 60 + # - name: Run test-all + # run: | + # ulimit -c unlimited + # make -s test-all RUN_OPTS="$RUN_OPTS" + # timeout-minutes: 60 + - name: Run test-spec + run: | + unset GNUMAKEFLAGS + make -s test-spec RUN_OPTS="$RUN_OPTS" + timeout-minutes: 60 + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 + with: + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.mjit_opts }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: + 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/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000000..5d4474d978 --- /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/rjit-bindgen.yml b/.github/workflows/rjit-bindgen.yml deleted file mode 100644 index bf3c752e7b..0000000000 --- a/.github/workflows/rjit-bindgen.yml +++ /dev/null @@ -1,91 +0,0 @@ -name: RJIT bindgen -on: - push: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - pull_request: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - merge_group: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - -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@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0 - with: - ruby-version: '3.1' - - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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() }} - -defaults: - run: - working-directory: build diff --git a/.github/workflows/rjit.yml b/.github/workflows/rjit.yml deleted file mode 100644 index bf9122f581..0000000000 --- a/.github/workflows/rjit.yml +++ /dev/null @@ -1,120 +0,0 @@ -name: RJIT -on: - push: - paths-ignore: - - 'doc/**' - - '**.md' - - '**.rdoc' - - '**/.document' - - '**.[1-8]' - - '**.ronn' - - '.*.yml' - pull_request: - paths-ignore: - - 'doc/**' - - '**.md' - - '**.rdoc' - - '**/.document' - - '**.[1-8]' - - '**.ronn' - - '.*.yml' - merge_group: - paths-ignore: - - 'doc/**' - - '**.md' - - '**.rdoc' - - '**/.document' - - '**.[1-8]' - - '**.ronn' - - '.*.yml' - -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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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() }} - -defaults: - run: - working-directory: build diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 51ce54a518..c12a95362d 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -11,8 +11,8 @@ on: # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained schedule: - cron: '22 4 * * 2' - # push: - # branches: [ "master" ] + push: + branches: [ "master" ] # Declare default permissions as read only. permissions: read-all @@ -31,13 +31,13 @@ jobs: # actions: read steps: - - name: 'Checkout code' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - name: "Checkout code" + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - - name: 'Run analysis' - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + - name: "Run analysis" + uses: ossf/scorecard-action@ea651e62978af7915d09fe2e282747c798bf2dab # v2.4.1 with: results_file: results.sarif results_format: sarif @@ -58,15 +58,15 @@ jobs: # 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 + - name: "Upload to code-scanning" + uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.27 with: sarif_file: results.sarif diff --git a/.github/workflows/spec_guards.yml b/.github/workflows/spec_guards.yml index e14e7818a6..4521195a2b 100644 --- a/.github/workflows/spec_guards.yml +++ b/.github/workflows/spec_guards.yml @@ -6,13 +6,10 @@ on: - 'spec/**' - '!spec/*.md' pull_request: - paths-ignore: + paths: - '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,13 +22,15 @@ 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.labels.*.name, 'Documentation') + || contains(github.event.pull_request.title, 'Document') + || contains(github.event.pull_request.labels.*.name, 'Document') || (github.event_name == 'push' && github.actor == 'dependabot[bot]') )}} @@ -40,14 +39,13 @@ 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 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0 + - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0 with: ruby-version: ${{ matrix.ruby }} bundler: none @@ -58,9 +56,16 @@ jobs: working-directory: spec/ruby env: CHECK_LEAKS: true - - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.ruby }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / rubyspec @ ${{ matrix.ruby }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot if: ${{ failure() }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 93ced0d1d2..4fbca1170e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -7,10 +7,13 @@ on: - '**.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 + paths-ignore: + - 'doc/**' + - '**/man' + - '**.md' + - '**.rdoc' + - '**/.document' merge_group: paths-ignore: - 'doc/**' @@ -18,7 +21,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -31,101 +33,113 @@ jobs: make: strategy: matrix: + # main variables included in the job name test_task: [check] + configure: [cppflags=-DRUBY_DEBUG] # default to use more assertions arch: [''] - configure: ['cppflags=-DVM_CHECK_MODE'] - # specifying other jobs with `include` to avoid redundant tests + # specify all jobs with `include` to avoid testing duplicated things include: - test_task: check - arch: i686 - test_task: check - configure: '--disable-yjit' + arch: i686 + configure: '' # test without -DRUBY_DEBUG as well - test_task: check - configure: '--enable-shared --enable-load-relative' + configure: "--enable-shared --enable-load-relative" + - test_task: test-all TESTS=--repeat-count=2 - test_task: test-bundler-parallel - test_task: test-bundled-gems fail-fast: false - env: - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} + GITPULLOPTIONS: --no-tags origin ${{github.ref}} RUBY_DEBUG: ci - - 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]') - )}} - + SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }} + runs-on: ubuntu-22.04 + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - sparse-checkout-cone-mode: false - sparse-checkout: /.github - - - uses: ./.github/actions/setup/ubuntu + - run: mkdir build + working-directory: + - name: Set ENV + run: | + echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV + - name: Install libraries + env: + arch: ${{matrix.arch}} + run: | + set -x + arch=${arch:+:${arch/i[3-6]86/i386}} + ${arch:+sudo dpkg --add-architecture ${arch#:}} + sudo apt-get update -q || : + sudo apt-get install --no-install-recommends -q -y \ + ${arch:+cross}build-essential${arch/:/-} \ + libssl-dev${arch} libyaml-dev${arch} libreadline6-dev${arch} \ + zlib1g-dev${arch} libncurses5-dev${arch} libffi-dev${arch} \ + bison autoconf ruby + sudo apt-get install -q -y pkg-config${arch} || : + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - arch: ${{ matrix.arch }} - - - uses: ./.github/actions/setup/directories + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: - srcdir: src - builddir: build - makeup: true - dummy-files: ${{ matrix.test_task == 'check' }} - + path: src/.downloaded-cache + key: downloaded-cache + - name: Fixed world writable dirs + run: | + chmod -v go-w $HOME $HOME/.config + sudo chmod -R go-w /usr/share + sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || : + - run: ./autogen.sh + working-directory: src - name: Run configure env: - arch: ${{ matrix.arch }} - configure: ${{ matrix.configure }} + arch: ${{matrix.arch}} run: >- - $SETARCH ../src/configure -C --disable-install-doc ${configure:-cppflags=-DRUBY_DEBUG} + $SETARCH ../src/configure -C --disable-install-doc ${{ matrix.configure }} ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE} - + - run: $SETARCH make incs - run: $SETARCH make prepare-gems if: ${{ matrix.test_task == 'test-bundled-gems' }} - - run: $SETARCH make - + - run: $SETARCH make leaked-globals + if: ${{ matrix.test_task == 'check' }} + - name: Create dummy files in build dir + 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' }} - 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' || '' }} + run: | + $SETARCH make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`} timeout-minutes: 40 env: - RUBY_TESTOPTS: '-q --tty=no' + RUBY_TESTOPTS: "-q --tty=no" TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }} - TEST_BUNDLED_GEMS_ALLOW_FAILURES: '' - PRECHECK_BUNDLED_GEMS: 'no' - + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" + PRECHECK_BUNDLED_GEMS: "no" - name: make skipped tests run: | $SETARCH make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'` env: - GNUMAKEFLAGS: '' - RUBY_TESTOPTS: '-v --tty=no' + GNUMAKEFLAGS: "" + RUBY_TESTOPTS: "-v --tty=no" TESTS: ${{ matrix.skipped_tests }} if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }} continue-on-error: ${{ matrix.continue-on-skipped_tests || false }} - - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.test_task }} ${{ matrix.configure }}${{ matrix.arch }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}${{ matrix.arch }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: 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: ubuntu-latest - needs: [make] - steps: - - run: exit 1 - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index f69df0f58d..27920b5821 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -7,7 +7,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' pull_request: paths-ignore: - 'doc/**' @@ -15,7 +14,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' merge_group: paths-ignore: - 'doc/**' @@ -23,13 +21,12 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }} -permissions: # added using https://github.com/step-security/secure-workflows +permissions: # added using https://github.com/step-security/secure-workflows contents: read jobs: @@ -38,50 +35,38 @@ jobs: matrix: entry: # # wasmtime can't compile non-optimized Asyncified binary due to locals explosion -# - { name: O0-debuginfo, optflags: '-O0', debugflags: '-g', wasmoptflags: '-O1' } -# - { name: O1, optflags: '-O1', debugflags: '' , wasmoptflags: '-O1' } - - { name: O2, optflags: '-O2', debugflags: '', wasmoptflags: '-O2' } -# - { name: O3, optflags: '-O3', debugflags: '' , wasmoptflags: '-O3' } +# - { name: O0-debuginfo, optflags: "-O0", debugflags: "-g", wasmoptflags: "-O1" } +# - { name: O1, optflags: "-O1", debugflags: "" , wasmoptflags: "-O1" } + - { name: O2, optflags: "-O2", debugflags: "" , wasmoptflags: "-O2" } +# - { name: O3, optflags: "-O3", debugflags: "" , wasmoptflags: "-O3" } # # -O4 is equivalent to -O3 in clang, but it's different in wasm-opt -# - { name: O4, optflags: '-O3', debugflags: '' , wasmoptflags: '-O4' } -# - { name: Oz, optflags: '-Oz', debugflags: '' , wasmoptflags: '-Oz' } +# - { name: O4, optflags: "-O3", debugflags: "" , wasmoptflags: "-O4" } +# - { name: Oz, optflags: "-Oz", debugflags: "" , wasmoptflags: "-Oz" } fail-fast: false - env: RUBY_TESTOPTS: '-q --tty=no' - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} - WASI_SDK_VERSION_MAJOR: 20 + GITPULLOPTIONS: --no-tags origin ${{github.ref}} + WASI_SDK_VERSION_MAJOR: 14 WASI_SDK_VERSION_MINOR: 0 - BINARYEN_VERSION: 113 - WASMTIME_VERSION: v15.0.0 - - 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]') - )}} - + BINARYEN_VERSION: 109 + WASMTIME_VERSION: v0.33.0 + runs-on: ubuntu-22.04 + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - sparse-checkout-cone-mode: false - sparse-checkout: /.github - - - uses: ./.github/actions/setup/directories + - run: mkdir build + working-directory: + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - srcdir: src - builddir: build - makeup: true - + path: src - name: Install libraries run: | set -ex sudo apt-get update -q || : - sudo apt-get install --no-install-recommends -q -y ruby make autoconf git wget + sudo apt-get install --no-install-recommends -q -y ruby bison make autoconf git wget wasi_sdk_deb="wasi-sdk_${WASI_SDK_VERSION_MAJOR}.${WASI_SDK_VERSION_MINOR}_amd64.deb" wget "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION_MAJOR}/${wasi_sdk_deb}" @@ -100,27 +85,29 @@ jobs: wget -O - "$binaryen_url" | tar xfz - sudo ln -fs "$PWD/binaryen-version_${BINARYEN_VERSION}/bin/wasm-opt" /usr/local/bin/wasm-opt working-directory: src - - name: Set ENV run: | + echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV echo "WASI_SDK_PATH=/opt/wasi-sdk" >> $GITHUB_ENV + - run: ./autogen.sh + working-directory: src - - name: Build baseruby + - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0 + with: + ruby-version: '3.0' + bundler: none + + - name: Download config.guess with wasi version run: | - set -ex - mkdir ../baseruby - pushd ../baseruby - ../src/configure --prefix=$PWD/install - make - make install + 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=bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor \ LDFLAGS=" \ -Xlinker --stack-first \ -Xlinker -z -Xlinker stack-size=16777216 \ @@ -131,31 +118,28 @@ 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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 - with: - name: ruby-wasm-install - path: ${{ github.workspace }}/install.tar.gz - - name: Run basictest run: wasmtime run ./../build/miniruby --mapdir /::./ -- basictest/test.rb working-directory: src - - name: Run bootstraptest (no thread) run: | NO_THREAD_TESTS="$(grep -L Thread -R ./bootstraptest | awk -F/ '{ print $NF }' | uniq | sed -n 's/test_\(.*\).rb/\1/p' | paste -s -d, -)" ruby ./bootstraptest/runner.rb --ruby="$(which wasmtime) run $PWD/../build/ruby --mapdir /::./ -- " --verbose "--sets=$NO_THREAD_TESTS" working-directory: src - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.entry.name }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / ${{ matrix.name }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: ${{ failure() }} + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8b34f962fe..c2bd4881c2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -7,7 +7,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' pull_request: paths-ignore: - 'doc/**' @@ -15,7 +14,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' merge_group: paths-ignore: - 'doc/**' @@ -23,7 +21,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -37,163 +34,114 @@ jobs: strategy: matrix: include: - - vs: 2019 - vs: 2022 + vcvers: -vcvars_ver=14.2 fail-fast: false - - runs-on: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }} - - 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]') - )}} - + runs-on: windows-${{ matrix.vs }} + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} name: VisualStudio ${{ matrix.vs }} - 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 - + GITPULLOPTIONS: --no-tags origin ${{github.ref}} + PATCH: C:\msys64\usr\bin\patch.exe + OS_VER: windows-${{ matrix.vs }} steps: - run: md build working-directory: - - - name: find tools - id: find-tools - run: | - ::- find needed tools - set NEEDS= - for %%I in (%NEEDED_TOOLS%) do if "%%~$PATH:I" == "" ( - call set NEEDS=%%NEEDS%% %%~nI - ) else ( - echo %%I: %%~$PATH:I - ) - echo.needs=%NEEDS%>>%GITHUB_OUTPUT% - if "%NEEDS%" == "" ( - echo [debug] All needed tools found - ) else ( - echo [warning^]Needs%NEEDS% - ) - env: - NEEDED_TOOLS: >- - patch.exe - - - uses: msys2/setup-msys2@d40200dc2db4c351366b048a9565ad82919e1c24 # v2 + - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # v2.27.0 id: setup-msys2 with: update: true - install: >- - ${{ steps.find-tools.outputs.needs }} - if: ${{ steps.find-tools.outputs.needs != '' }} - - - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.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- - - - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 + install: bison patch + - name: patch path + shell: msys2 {0} + run: echo PATCH=$(cygpath -wa $(command -v patch)) >> $GITHUB_ENV + if: ${{ steps.setup-msys2.outcome == 'success' }} + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: path: C:\vcpkg\installed - key: ${{ runner.os }}-vcpkg-installed-${{ env.OS_VER }}-${{ github.sha }} + key: ${{ runner.os }}-vcpkg-installed-windows-${{ matrix.vs }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-vcpkg-installed-${{ env.OS_VER }}- - ${{ runner.os }}-vcpkg-installed- - + ${{ runner.os }}-vcpkg-installed-windows-${{ matrix.vs }}- + ${{ runner.os }}-vcpkg-installed-windows- - name: Install libraries with vcpkg run: | - vcpkg --triplet x64-windows install libffi libyaml openssl readline zlib - - - name: Install libraries with scoop - run: | iex "& {$(irm get.scoop.sh)} -RunAsAdmin" Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH - shell: pwsh - - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + scoop install cmake@3.31.6 + vcpkg --triplet x64-windows install libffi libyaml openssl readline zlib + shell: + pwsh + - name: git config + run: | + git config --global core.autocrlf false + git config --global core.eol lf + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - sparse-checkout-cone-mode: false - sparse-checkout: /.github - - - uses: ./.github/actions/setup/directories + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: - srcdir: src - builddir: build - + path: src/.downloaded-cache + key: downloaded-cache - name: setup env # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent. # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302 + # msys2/setup-msys2 installs MSYS2 to D:/a/_temp/msys64/usr/bin run: | - set VS=${{ matrix.vs }} - set VCVARS=${{ matrix.vcvars || '' }} + set Path=D:/a/_temp/msys64/usr/bin;%Path% 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" + set VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + if not exist %VCVARS% set VCVARS="C:\Program Files\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" :vcset set | C:\msys64\usr\bin\sort > old.env - call %VCVARS% - nmake -f nul + call %VCVARS% ${{ matrix.vcvers || ''}} 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% del *.env - - 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 ) - # We use OpenSSL instealled by vcpkg instead - - name: disable system OpenSSL - run: | for %%I in (libcrypto-1_1-x64 libssl-1_1-x64) do ( ren c:\Windows\System32\%%I.dll %%I.dll_ ) - # windows-2019 image doesn't have OpenSSL as of 2023/9/14 - if: ${{ matrix.vs != 2019 }} - - name: Configure run: >- ../src/win32/configure.bat --disable-install-doc --with-opt-dir=C:/vcpkg/installed/x64-windows - - run: nmake incs - - run: nmake extract-extlibs - - run: nmake - + env: + YACC: bison.exe - run: nmake test timeout-minutes: 5 - - run: nmake test-spec timeout-minutes: 10 - - run: nmake test-all env: - RUBY_TESTOPTS: -j${{ env.TEST_JOBS || 4 }} --job-status=normal + RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --job-status=normal timeout-minutes: 60 - - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: VS${{ matrix.vs }} / ${{ matrix.test_task || 'check' }} + payload: | + { + "ci": "GitHub Actions", + "env": "VS${{ matrix.vs }} / ${{ matrix.test_task || 'check' }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: ${{ failure() }} + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/yjit-macos.yml b/.github/workflows/yjit-macos.yml deleted file mode 100644 index 11e200a619..0000000000 --- a/.github/workflows/yjit-macos.yml +++ /dev/null @@ -1,151 +0,0 @@ -name: YJIT macOS Arm64 -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: - paths-ignore: - - 'doc/**' - - '**/man' - - '**.md' - - '**.rdoc' - - '**/.document' - - '.*.yml' - -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-arm-oss - - if: >- - ${{github.repository == 'ruby/ruby' && - !(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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - 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' - fail-fast: false - - env: - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} - RUN_OPTS: ${{ matrix.yjit_opts }} - - runs-on: macos-arm-oss - - if: >- - ${{github.repository == 'ruby/ruby' && - !(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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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' }} - - - 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: Enable YJIT through ENV - run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV - - - name: make ${{ matrix.test_task }} - run: | - make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`} - 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' - - - name: make skipped tests - run: | - make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'` - env: - GNUMAKEFLAGS: '' - RUBY_TESTOPTS: '-v --tty=no' - TESTS: ${{ matrix.skipped_tests }} - 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() && github.repository == 'ruby/ruby' }} - name: ${{ github.workflow }} result - runs-on: macos-arm-oss - needs: [make] - steps: - - run: exit 1 - 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 ec8483b7d1..0b7b9046e9 100644 --- a/.github/workflows/yjit-ubuntu.yml +++ b/.github/workflows/yjit-ubuntu.yml @@ -7,10 +7,13 @@ on: - '**.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 + paths-ignore: + - 'doc/**' + - '**/man' + - '**.md' + - '**.rdoc' + - '**/.document' merge_group: paths-ignore: - 'doc/**' @@ -18,7 +21,6 @@ on: - '**.md' - '**.rdoc' - '**/.document' - - '.*.yml' concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} @@ -29,58 +31,22 @@ permissions: jobs: cargo: - name: cargo test - + name: Rust cargo test # GitHub Action's image seems to already contain a Rust 1.58.0. - 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]') - )}} - + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - + - 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 #- run: cargo test --offline - - 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 - - lint: - name: cargo clippy - - # GitHub Action's image seems to already contain a Rust 1.58.0. - 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: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - # Check that we don't have linting errors in release mode, too - - run: cargo clippy --all-targets --all-features - working-directory: yjit - make: strategy: fail-fast: false @@ -88,114 +54,116 @@ 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' + - test_task: "check" # YJIT should be automatically built in release mode on x86-64 Linux with rustc present #configure: "--enable-yjit RUSTC='rustc +1.58.0'" configure: "RUSTC='rustc +1.58.0'" - rust_version: '1.58.0' + rust_version: "1.58.0" - - test_task: 'check' - configure: '--enable-yjit=dev' + - test_task: "check" + configure: "--enable-yjit=dev" - - test_task: 'check' - configure: '--enable-yjit=dev' - yjit_opts: '--yjit-call-threshold=1 --yjit-verify-ctx --yjit-code-gc' + - test_task: "check" + configure: "--enable-yjit=dev" + yjit_opts: "--yjit-call-threshold=1 --yjit-verify-ctx" - - test_task: 'test-bundled-gems' - configure: '--enable-yjit=dev' + - test_task: "test-all TESTS=--repeat-count=2" + configure: "--enable-yjit=dev" - - test_task: 'yjit-bench' - configure: '--enable-yjit=dev' - yjit_bench_opts: '--yjit-stats' + - test_task: "test-bundled-gems" + configure: "--enable-yjit=dev" + - test_task: "yjit-bench" + configure: "--enable-yjit=dev" + yjit_bench_opts: "--yjit-stats" env: - GITPULLOPTIONS: --no-tags origin ${{ github.ref }} + GITPULLOPTIONS: --no-tags origin ${{github.ref}} RUN_OPTS: ${{ matrix.yjit_opts }} YJIT_BENCH_OPTS: ${{ matrix.yjit_bench_opts }} RUBY_DEBUG: ci BUNDLE_JOBS: 8 # for yjit-bench - RUST_BACKTRACE: 1 - - 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]') - )}} - + runs-on: ubuntu-22.04 + if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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 - dummy-files: ${{ matrix.test_task == 'check' }} - + - run: mkdir build + working-directory: + - name: Install libraries + run: | + set -x + sudo apt-get update -q || : + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby - name: Install Rust if: ${{ matrix.rust_version }} run: rustup install ${{ matrix.rust_version }} --profile minimal - + - name: git config + run: | + git config --global advice.detachedHead 0 + git config --global init.defaultBranch garbage + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: src + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + with: + path: src/.downloaded-cache + key: downloaded-cache + - name: Fixed world writable dirs + run: | + chmod -v go-w $HOME $HOME/.config + sudo chmod -R go-w /usr/share + sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || : + - name: Set ENV + run: | + echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV + - run: ./autogen.sh + working-directory: src - 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 - + - run: make -j + - run: make leaked-globals + if: ${{ matrix.test_task == 'check' }} + - name: Create dummy files in build dir + 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' }} - name: Enable YJIT through ENV run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV - # Check that the binary was built with YJIT - name: Check YJIT enabled run: ./miniruby --yjit -v | grep "+YJIT" - - name: make ${{ matrix.test_task }} - run: make -s -j ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" MSPECOPT=--debug YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" YJIT_BINDGEN_DIFF_OPTS="$YJIT_BINDGEN_DIFF_OPTS" + run: make -s -j ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" timeout-minutes: 60 env: - RUBY_TESTOPTS: '-q --tty=no' - TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'rbs' - PRECHECK_BUNDLED_GEMS: 'no' - SYNTAX_SUGGEST_TIMEOUT: '5' - YJIT_BINDGEN_DIFF_OPTS: '--exit-code' + RUBY_TESTOPTS: "-q --tty=no" + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" + PRECHECK_BUNDLED_GEMS: "no" + LIBCLANG_PATH: ${{ matrix.libclang_path }} continue-on-error: ${{ matrix.test_task == 'yjit-bench' }} - - name: Show ${{ github.event.pull_request.base.ref }} GitHub URL for yjit-bench comparison run: echo "https://github.com/${BASE_REPO}/commit/${BASE_SHA}" env: BASE_REPO: ${{ github.event.pull_request.base.repo.full_name }} BASE_SHA: ${{ github.event.pull_request.base.sha }} if: ${{ matrix.test_task == 'yjit-bench' && startsWith(github.event_name, 'pull') }} - - - uses: ./.github/actions/slack + - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1 with: - label: ${{ matrix.test_task }} ${{ matrix.configure }} + payload: | + { + "ci": "GitHub Actions", + "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}", + "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", + "commit": "${{ github.sha }}", + "branch": "${{ github.ref_name }}" + } + env: 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: ubuntu-latest - needs: [make] - steps: - - run: exit 1 - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.gitignore b/.gitignore index b6beba3b3e..99d32a1825 100644 --- a/.gitignore +++ b/.gitignore @@ -50,7 +50,6 @@ y.tab.c *.gcno *.gcov *.vscode -!misc/.vscode lcov*.info # / @@ -124,7 +123,6 @@ lcov*.info /repack /revision.h /revision.tmp -/ripper.tmp.y /riscos /rubicon /ruby @@ -138,7 +136,6 @@ lcov*.info /test.rb /test-coverage.dat /tmp -/vcpkg_installed /transdb.h /uncommon.mk /verconf.h @@ -167,7 +164,6 @@ lcov*.info # /coroutine/ !/coroutine/**/*.s -!/coroutine/**/*.S # /enc/trans/ /enc/trans/*.c @@ -207,10 +203,8 @@ lcov*.info # /ext/ripper/ /ext/ripper/eventids1.c -/ext/ripper/eventids1.h /ext/ripper/.eventids2-check /ext/ripper/eventids2table.c -/ext/ripper/ripper_init.c /ext/ripper/ripper.* /ext/ripper/ids1 /ext/ripper/ids2 @@ -232,9 +226,8 @@ lcov*.info # /misc/ /misc/**/__pycache__ -# for `make test-bundler` +# /spec/bundler /.rspec_status -/tool/bundler/*.lock # /tool/ /tool/config.guess @@ -243,12 +236,11 @@ 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* +# MJIT +/include/ruby-*/*/rb_mjit_min_header-*.h +/lib/ruby_vm/mjit/instruction.rb +/mjit_config.h +/rb_mjit_header.h # YJIT /yjit-bench @@ -256,28 +248,3 @@ lcov*.info # /wasm/ /wasm/tests/*.wasm - -# 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/.travis.yml b/.travis.yml deleted file mode 100644 index 741c0a32ef..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,152 +0,0 @@ -# -*- YAML -*- -# Copyright (C) 2011 Urabe, Shyouhei. All rights reserved. -# -# This file is a part of the programming language Ruby. Permission is hereby -# granted, to either redistribute or modify this file, provided that the -# conditions mentioned in the file COPYING are met. Consult the file for -# details. - -# 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. -if: >- - (repo != ruby/ruby OR branch = master OR branch =~ /^ruby_\d_\d$/) - AND (commit_message !~ /\[DOC\]/) - -language: c - -os: linux - -dist: jammy - -git: - quiet: true - -env: - global: - - NPROC="$(nproc)" - - JOBS="-j${NPROC}" - # SETARCH are overridden when necessary. See below. - - SETARCH= - # 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" - # -g0 disables backtraces when SEGV. Do not set that. - - debugflags=-ggdb3 - - RUBY_TESTOPTS="$JOBS -q --tty=no" - -.org.ruby-lang.ci.matrix-definitions: - - &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 - gcc-11 - g++-11 - libffi-dev - libncurses-dev - libncursesw5-dev - libreadline-dev - libssl-dev - libyaml-dev - openssl - zlib1g-dev - - gcc-11 --version - - &arm64-linux - name: arm64-linux - arch: arm64 - <<: *gcc-11 - - &ppc64le-linux - name: ppc64le-linux - arch: ppc64le - <<: *gcc-11 - - &s390x-linux - name: s390x-linux - arch: s390x - <<: *gcc-11 - env: - # Avoid possible test failures with the zlib applying the following patch - # on s390x CPU architecture. - # https://github.com/madler/zlib/pull/410 - - DFLTCC=0 - - &arm32-linux - name: arm32-linux - arch: arm64 - # https://packages.ubuntu.com/jammy/crossbuild-essential-armhf - compiler: arm-linux-gnueabihf-gcc - env: - - SETARCH='setarch linux32 --verbose --32bit' - # Still keep the -O1 for only arm32, while we want to test with the - # default optflags -O3. - # Because bootstraptest/test_ractor.rb fails with segfualt with the - # default -O3. - # https://bugs.ruby-lang.org/issues/19981 - - optflags=-O1 - 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 - 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 - -matrix: - include: - - <<: *arm64-linux - - <<: *ppc64le-linux - - <<: *s390x-linux - # FIXME: lib/rubygems/util.rb:104 glob_files_in_dir - - # <internal:dir>:411:in glob: File name too long - (Errno::ENAMETOOLONG) - # https://github.com/rubygems/rubygems/issues/7132 - - <<: *arm32-linux - allow_failures: - # Allow failures for the unstable jobs. - # - name: arm64-linux - # - name: ppc64le-linux - # - name: s390x-linux - # The 2nd arm64 pipeline may be unstable. - # - name: arm32-linux - fast_finish: true - -before_script: - - ./autogen.sh - - mkdir build - - cd build - - $SETARCH ../configure -C --disable-install-doc --prefix=$(pwd)/install - - $SETARCH make -s $JOBS - - make -s $JOBS install - # Useful info to report issues to the Ruby. - - $SETARCH $(pwd)/install/bin/ruby -v - # Useful info To report issues to the RubyGems. - - $SETARCH $(pwd)/install/bin/gem env - -script: - - $SETARCH make -s test - - ../tool/travis_wait.sh $SETARCH make -s test-all RUBYOPT="-w" - - $SETARCH make -s test-spec - -# We want to be notified when something happens. -notifications: - webhooks: - urls: - # ruby-lang slack: ruby/simpler-alerts-bot (travis) - - secure: mRsoS/UbqDkKkW5p3AEqM27d4SZnV6Gsylo3bm8T/deltQzTsGzZwrm7OIBXZv0UFZdE68XmPlyHfZFLSP2V9QZ7apXMf9/vw0GtcSe1gchtnjpAPF6lYBn7nMCbVPPx9cS0dwL927fjdRM1vj7IKZ2bk4F0lAJ25R25S6teqdk= - on_success: never - on_failure: always - email: - recipients: - - jaruga@ruby-lang.org - on_success: never - on_failure: always @@ -748,7 +748,8 @@ mentioned below. [ext/psych] [test/psych] - The files under these directories are under the following license. + The files under these directories are under the following license, except for + ext/psych/yaml. >>> Copyright 2009:: Aaron Patterson, et al. @@ -771,6 +772,31 @@ mentioned below. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +[ext/psych/yaml] + + The files under this directory are under the following license. + + >>> + Copyright (c) 2006:: Kirill Simonov + + 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. + [ext/pty/pty.c] >>> @@ -1,529 +1,820 @@ -# NEWS for Ruby 3.3.0 +# NEWS for Ruby 3.2.0 This document is a list of user-visible feature changes -since the **3.2.0** release, except for bug fixes. +since the **3.1.0** release, except for bug fixes. Note that each entry is kept to a minimum, see links for details. -## Command line options +## Language changes -* 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]] +* Anonymous rest and keyword rest arguments can now be passed as + arguments, instead of just used in method parameters. + [[Feature #18351]] -* 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]] + ```ruby + def foo(*) + bar(*) + end + def baz(**) + quux(**) + end + ``` -## Core classes updates +* A proc that accepts a single positional argument and keywords will + no longer autosplat. [[Bug #18633]] -Note: We're only listing outstanding class updates. + ```ruby + proc{|a, **k| a}.call([1, 2]) + # Ruby 3.1 and before + # => 1 + # Ruby 3.2 and after + # => [1, 2] + ``` + +* Constant assignment evaluation order for constants set on explicit + objects has been made consistent with single attribute assignment + evaluation order. With this code: + + ```ruby + foo::BAR = baz + ``` + + `foo` is now called before `baz`. Similarly, for multiple assignments + to constants, left-to-right evaluation order is used. With this + code: + + ```ruby + foo1::BAR1, foo2::BAR2 = baz1, baz2 + ``` -* Array + The following evaluation order is now used: - * Array#pack now raises ArgumentError for unknown directives. [[Bug #19150]] + 1. `foo1` + 2. `foo2` + 3. `baz1` + 4. `baz2` -* Dir + [[Bug #15928]] - * 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]] +* "Find pattern" is no longer experimental. + [[Feature #18585]] -* Encoding +* Methods taking a rest parameter (like `*args`) and wishing to delegate keyword + arguments through `foo(*args)` must now be marked with `ruby2_keywords` + (if not already the case). In other words, all methods wishing to delegate + keyword arguments through `*args` must now be marked with `ruby2_keywords`, + with no exception. This will make it easier to transition to other ways of + delegation once a library can require Ruby 3+. Previously, the `ruby2_keywords` + flag was kept if the receiving method took `*args`, but this was a bug and an + inconsistency. A good technique to find the potentially-missing `ruby2_keywords` + is to run the test suite, for where it fails find the last method which must + receive keyword arguments, use `puts nil, caller, nil` there, and check each + method/block on the call chain which must delegate keywords is correctly marked + as `ruby2_keywords`. [[Bug #18625]] [[Bug #16466]] + + ```ruby + def target(**kw) + end + + # Accidentally worked without ruby2_keywords in Ruby 2.7-3.1, ruby2_keywords + # needed in 3.2+. Just like (*args, **kwargs) or (...) would be needed on + # both #foo and #bar when migrating away from ruby2_keywords. + ruby2_keywords def bar(*args) + target(*args) + end + + ruby2_keywords def foo(*args) + bar(*args) + end + + foo(k: 1) + ``` + +## Core classes updates - * `Encoding#replicate` has been removed, it was already deprecated. [[Feature #18949]] +Note: We're only listing outstanding class updates. * Fiber - * Introduce Fiber#kill. [[Bug #595]] + * Introduce Fiber.[] and Fiber.[]= for inheritable fiber storage. + Introduce Fiber#storage and Fiber#storage= (experimental) for + getting and resetting the current storage. Introduce + `Fiber.new(storage:)` for setting the storage when creating a + fiber. [[Feature #19078]] + + Existing Thread and Fiber local variables can be tricky to use. + Thread-local variables are shared between all fibers, making it + hard to isolate, while Fiber-local variables can be hard to + share. It is often desirable to define unit of execution + ("execution context") such that some state is shared between all + fibers and threads created in that context. This is what Fiber + storage provides. ```ruby - fiber = Fiber.new do - while true - puts "Yielding..." - Fiber.yield + def log(message) + puts "#{Fiber[:request_id]}: #{message}" + end + + def handle_requests + while request = read_request + Fiber.schedule do + Fiber[:request_id] = SecureRandom.uuid + + request.messages.each do |message| + Fiber.schedule do + log("Handling #{message}") # Log includes inherited request_id. + end + end + end end - ensure - puts "Exiting..." end + ``` + + You should generally consider Fiber storage for any state which + you want to be shared implicitly between all fibers and threads + created in a given context, e.g. a connection pool, a request + id, a logger level, environment variables, configuration, etc. + +* Fiber::Scheduler + + * Introduce `Fiber::Scheduler#io_select` for non-blocking IO.select. + [[Feature #19060]] + +* IO - fiber.resume - # Yielding... - fiber.kill - # Exiting... + * Introduce IO#timeout= and IO#timeout which can cause + IO::TimeoutError to be raised if a blocking operation exceeds the + specified timeout. [[Feature #18630]] + + ```ruby + STDIN.timeout = 1 + STDIN.read # => Blocking operation timed out! (IO::TimeoutError) ``` -* MatchData + * Introduce `IO.new(..., path:)` and promote `File#path` to `IO#path`. + [[Feature #19036]] - * MatchData#named_captures now accepts optional `symbolize_names` - keyword. [[Feature #19591]] +* Class -* Module + * Class#attached_object, which returns the object for which + the receiver is the singleton class. Raises TypeError if the + receiver is not a singleton class. + [[Feature #12084]] + + ```ruby + class Foo; end + + Foo.singleton_class.attached_object #=> Foo + Foo.new.singleton_class.attached_object #=> #<Foo:0x000000010491a370> + Foo.attached_object #=> TypeError: `Foo' is not a singleton class + nil.singleton_class.attached_object #=> TypeError: `NilClass' is not a singleton class + ``` + +* Data + + * New core class to represent simple immutable value object. The class is + similar to Struct and partially shares an implementation, but has more + lean and strict API. [[Feature #16122]] + + ```ruby + Measure = Data.define(:amount, :unit) + distance = Measure.new(100, 'km') #=> #<data Measure amount=100, unit="km"> + weight = Measure.new(amount: 50, unit: 'kg') #=> #<data Measure amount=50, unit="kg"> + weight.with(amount: 40) #=> #<data Measure amount=40, unit="kg"> + weight.amount #=> 50 + weight.amount = 40 #=> NoMethodError: undefined method `amount=' + ``` + +* Encoding + + * Encoding#replicate has been deprecated and will be removed in 3.3. [[Feature #18949]] + * The dummy `Encoding::UTF_16` and `Encoding::UTF_32` encodings no longer + try to dynamically guess the endian based on a byte order mark. + Use `Encoding::UTF_16BE`/`UTF_16LE` and `Encoding::UTF_32BE`/`UTF_32LE` instead. + This change speeds up getting the encoding of a String. [[Feature #18949]] + * Limit maximum encoding set size by 256. + If exceeding maximum size, `EncodingError` will be raised. [[Feature #18949]] - * Module#set_temporary_name added for setting a temporary name for a - module. [[Feature #19521]] +* Enumerator -* ObjectSpace::WeakKeyMap + * Enumerator.product has been added. Enumerator::Product is the implementation. [[Feature #18685]] - * 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]] +* Exception -* ObjectSpace::WeakMap + * Exception#detailed_message has been added. + The default error printer calls this method on the Exception object + instead of #message. [[Feature #18564]] - * ObjectSpace::WeakMap#delete was added to eagerly clear weak map - entries. [[Feature #19561]] +* Hash + + * Hash#shift now always returns nil if the hash is + empty, instead of returning the default value or + calling the default proc. [[Bug #16908]] + +* Integer + + * Integer#ceildiv has been added. [[Feature #18809]] + +* Kernel + + * Kernel#binding raises RuntimeError if called from a non-Ruby frame + (such as a method defined in C). [[Bug #18487]] + +* MatchData + + * MatchData#byteoffset has been added. [[Feature #13110]] + * MatchData#deconstruct has been added. [[Feature #18821]] + * MatchData#deconstruct_keys has been added. [[Feature #18821]] + +* Module + + * Module.used_refinements has been added. [[Feature #14332]] + * Module#refinements has been added. [[Feature #12737]] + * Module#const_added has been added. [[Feature #17881]] + * Module#undefined_instance_methods has been added. [[Feature #12655]] * Proc - * Now Proc#dup and Proc#clone call `#initialize_dup` and `#initialize_clone` - hooks respectively. [[Feature #19362]] + + * Proc#dup returns an instance of subclass. [[Bug #17545]] + * Proc#parameters now accepts lambda keyword. [[Feature #15357]] * Process + * Added `RLIMIT_NPTS` constant to FreeBSD platform - * 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]] +* Regexp -* Process::Status + * The cache-based optimization is introduced. + Many (but not all) Regexp matching is now in linear time, which + will prevent regular expression denial of service (ReDoS) + vulnerability. [[Feature #19104]] - * Process::Status#& and Process::Status#>> are deprecated. [[Bug #19868]] + * Regexp.linear_time? is introduced. [[Feature #19194]] -* Range + * Regexp.new now supports passing the regexp flags not only as an Integer, + but also as a String. Unknown flags raise ArgumentError. + Otherwise, anything other than `true`, `false`, `nil` or Integer will be warned. + [[Feature #18788]] - * 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]] + * Regexp.timeout= has been added. Also, Regexp.new new supports timeout keyword. + See [[Feature #17837]] * 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]] + * Refinement#refined_class has been added. [[Feature #12737]] -* Regexp +* RubyVM::AbstractSyntaxTree + + * Add `error_tolerant` option for `parse`, `parse_file` and `of`. [[Feature #19013]] + With this option + + 1. SyntaxError is suppressed + 2. AST is returned for invalid input + 3. `end` is complemented when a parser reaches to the end of input but `end` is insufficient + 4. `end` is treated as keyword based on indent - * 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]] + ```ruby + # Without error_tolerant option + root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY) + def m + a = 10 + if + end + RUBY + # => <internal:ast>:33:in `parse': syntax error, unexpected `end' (SyntaxError) + + # With error_tolerant option + root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY, error_tolerant: true) + def m + a = 10 + if + end + RUBY + p root # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-4:3> + + # `end` is treated as keyword based on indent + root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY, error_tolerant: true) + module Z + class Foo + foo. + end + + def bar + end + end + RUBY + p root.children[-1].children[-1].children[-1].children[-2..-1] + # => [#<RubyVM::AbstractSyntaxTree::Node:CLASS@2:2-4:5>, #<RubyVM::AbstractSyntaxTree::Node:DEFN@6:2-7:5>] + ``` + + * Add `keep_tokens` option for `parse`, `parse_file` and `of`. Add `#tokens` and `#all_tokens` + for RubyVM::AbstractSyntaxTree::Node [[Feature #19070]] + + ```ruby + root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2", keep_tokens: true) + root.tokens # => [[0, :tIDENTIFIER, "x", [1, 0, 1, 1]], [1, :tSP, " ", [1, 1, 1, 2]], ...] + root.tokens.map{_1[2]}.join # => "x = 1 + 2" + ``` + +* Set + + * Set is now available as a built-in class without the need for `require "set"`. [[Feature #16989]] + It is currently autoloaded via the Set constant or a call to Enumerable#to_set. * 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]] + * String#byteindex and String#byterindex have been added. [[Feature #13110]] + * Update Unicode to Version 15.0.0 and Emoji Version 15.0. [[Feature #18639]] + (also applies to Regexp) + * String#bytesplice has been added. [[Feature #18598]] + * String#dedup has been added as an alias to String#-@. [[Feature #18595]] + +* Struct + + * A Struct class can also be initialized with keyword arguments + without `keyword_init: true` on Struct.new [[Feature #16806]] + + ```ruby + Post = Struct.new(:id, :name) + Post.new(1, "hello") #=> #<struct Post id=1, name="hello"> + # From Ruby 3.2, the following code also works without keyword_init: true. + Post.new(id: 1, name: "hello") #=> #<struct Post id=1, name="hello"> + ``` + +* Thread + + * Thread.each_caller_location is added. [[Feature #16663]] * Thread::Queue - * Thread::Queue#freeze now raises TypeError. [[Bug #17146]] + * Thread::Queue#pop(timeout: sec) is added. [[Feature #18774]] * Thread::SizedQueue - * Thread::SizedQueue#freeze now raises TypeError. [[Bug #17146]] + * Thread::SizedQueue#pop(timeout: sec) is added. [[Feature #18774]] + * Thread::SizedQueue#push(timeout: sec) is added. [[Feature #18944]] * Time - * Time.new with a string argument became stricter. [[Bug #19293]] + * Time#deconstruct_keys is added, allowing to use Time instances + in pattern-matching expressions [[Feature #19071]] - ```ruby - Time.new('2023-12-20') - # no time information (ArgumentError) - ``` + * Time.new now can parse a string like generated by Time#inspect + and return a Time instance based on the given argument. + [[Feature #18033]] + +* SyntaxError + * SyntaxError#path has been added. [[Feature #19138]] * 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]] + * TracePoint#binding now returns `nil` for `c_call`/`c_return` TracePoints. + [[Bug #18487]] + * TracePoint#enable `target_thread` keyword argument now defaults to the + current thread if a block is given and `target` and `target_line` keyword + arguments are not passed. [[Bug #16889]] + +* UnboundMethod + + * `UnboundMethod#==` returns `true` if the actual method is same. For example, + `String.instance_method(:object_id) == Array.instance_method(:object_id)` + returns `true`. [[Feature #18798]] + + * `UnboundMethod#inspect` does not show the receiver of `instance_method`. + For example `String.instance_method(:object_id).inspect` returns + `"#<UnboundMethod: Kernel#object_id()>"` + (was `"#<UnboundMethod: String(Kernel)#object_id()>"`). + +* GC + + * Expose `need_major_gc` via `GC.latest_gc_info`. [GH-6791] + +* ObjectSpace + + * `ObjectSpace.dump_all` dump shapes as well. [GH-6868] ## 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. +* Bundler + + * Bundler now uses [PubGrub] resolver instead of [Molinillo] for performance improvement. + * Add --ext=rust support to bundle gem for creating simple gems with Rust extensions. + [[GH-rubygems-6149]] + * Make cloning git repos faster [[GH-rubygems-4475]] + +* RubyGems + + * Add mswin support for cargo builder. [[GH-rubygems-6167]] + +* CGI + + * `CGI.escapeURIComponent` and `CGI.unescapeURIComponent` are added. + [[Feature #18822]] + +* Coverage + + * `Coverage.setup` now accepts `eval: true`. By this, `eval` and related methods are + able to generate code coverage. [[Feature #19008]] + + * `Coverage.supported?(mode)` enables detection of what coverage modes are + supported. [[Feature #19026]] + +* Date + + * Added `Date#deconstruct_keys` and `DateTime#deconstruct_keys` same as [[Feature #19071]] + +* ERB + + * `ERB::Util.html_escape` is made faster than `CGI.escapeHTML`. + * It no longer allocates a String object when no character needs to be escaped. + * It skips calling `#to_s` method when an argument is already a String. + * `ERB::Escape.html_escape` is added as an alias to `ERB::Util.html_escape`, + which has not been monkey-patched by Rails. + * `ERB::Util.url_encode` is made faster using `CGI.escapeURIComponent`. + * `-S` option is removed from `erb` command. + +* FileUtils + + * Add FileUtils.ln_sr method and `relative:` option to FileUtils.ln_s. + [[Feature #18925]] + +* IRB + + * debug.gem integration commands have been added: `debug`, `break`, `catch`, + `next`, `delete`, `step`, `continue`, `finish`, `backtrace`, `info` + * They work even if you don't have `gem "debug"` in your Gemfile. + * See also: [What's new in Ruby 3.2's IRB?](https://st0012.dev/whats-new-in-ruby-3-2-irb) + * More Pry-like commands and features have been added. + * `edit` and `show_cmds` (like Pry's `help`) are added. + * `ls` takes `-g` or `-G` option to filter out outputs. + * `show_source` is aliased from `$` and accepts unquoted inputs. + * `whereami` is aliased from `@`. + +* Net::Protocol + + * Improve `Net::BufferedIO` performance. [[GH-net-protocol-14]] + +* Pathname + + * Added `Pathname#lutime`. [[GH-pathname-20]] + +* Socket + + * Added the following constants for supported platforms. + * `SO_INCOMING_CPU` + * `SO_INCOMING_NAPI_ID` + * `SO_RTABLE` + * `SO_SETFIB` + * `SO_USER_COOKIE` + * `TCP_KEEPALIVE` + * `TCP_CONNECTION_INFO` + +* SyntaxSuggest + + * The feature of `syntax_suggest` formerly `dead_end` is integrated in Ruby. + [[Feature #18159]] + +* UNIXSocket + + * Add support for UNIXSocket on Windows. Emulate anonymous sockets. Add + support for File.socket? and File::Stat#socket? where possible. + [[Feature #19135]] + +* The following default gems are updated. + + * RubyGems 3.4.1 + * abbrev 0.1.1 + * benchmark 0.2.1 + * bigdecimal 3.1.3 + * bundler 2.4.1 + * cgi 0.3.6 + * csv 3.2.6 + * date 3.3.3 + * delegate 0.3.0 + * did_you_mean 1.6.3 + * digest 3.1.1 + * drb 2.1.1 + * english 0.7.2 + * erb 4.0.2 + * error_highlight 0.5.1 + * etc 1.4.2 + * fcntl 1.0.2 + * fiddle 1.1.1 + * fileutils 1.7.0 + * forwardable 1.3.3 + * getoptlong 0.2.0 + * io-console 0.6.0 + * io-nonblock 0.2.0 + * io-wait 0.3.0 + * ipaddr 1.2.5 + * irb 1.6.2 + * json 2.6.3 + * logger 1.5.3 + * mutex_m 0.1.2 + * net-http 0.4.0 + * net-protocol 0.2.1 + * nkf 0.1.2 + * open-uri 0.3.0 + * open3 0.1.2 + * openssl 3.1.0 + * optparse 0.3.1 + * ostruct 0.5.5 + * pathname 0.2.1 + * pp 0.4.0 + * pstore 0.1.2 + * psych 5.0.1 + * racc 1.6.2 + * rdoc 6.5.0 + * readline-ext 0.1.5 + * reline 0.3.2 + * resolv 0.2.2 + * resolv-replace 0.1.1 + * securerandom 0.2.2 + * set 1.0.3 + * stringio 3.0.4 + * strscan 3.0.5 + * syntax_suggest 1.0.2 + * syslog 0.1.1 + * tempfile 0.1.3 + * time 0.2.1 + * timeout 0.3.1 + * tmpdir 0.1.3 + * tsort 0.1.1 + * un 0.2.1 + * uri 0.12.0 + * weakref 0.1.2 + * win32ole 1.8.9 + * yaml 0.2.1 + * zlib 3.0.0 + +* The following bundled gems are updated. + + * minitest 5.16.3 + * power_assert 2.0.3 + * test-unit 3.5.7 + * net-ftp 0.2.0 + * net-imap 0.3.4 + * net-pop 0.1.2 + * net-smtp 0.3.3 + * rbs 2.8.2 + * typeprof 0.21.3 + * debug 1.7.1 + +See GitHub releases like [GitHub Releases of Logger](https://github.com/ruby/logger/releases) or changelog for details of the default gems or bundled gems. + +## Supported platforms + +* WebAssembly/WASI is added. See [wasm/README.md] and [ruby.wasm] for more details. [[Feature #18462]] ## 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 +* `String#to_c` currently treat a sequence of underscores as an end of Complex + string. [[Bug #19087]] -* 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]] +* Now `ENV.clone` raises `TypeError` as well as `ENV.dup` [[Bug #17767]] -* 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]] +### Removed constants -* `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]] +The following deprecated constants are removed. -* Error message for NoMethodError have changed to not use the target object's `#inspect` - for efficiency, and says "instance of ClassName" instead. [[Feature #18285]] +* `Fixnum` and `Bignum` [[Feature #12005]] +* `Random::DEFAULT` [[Feature #17351]] +* `Struct::Group` +* `Struct::Passwd` - ```ruby - ([1] * 100).nonexisting - # undefined method `nonexisting' for an instance of Array (NoMethodError) - ``` +### Removed methods -* Now anonymous parameters forwarding is disallowed inside a block - that uses anonymous parameters. [[Feature #19370]] +The following deprecated methods are removed. + +* `Dir.exists?` [[Feature #17391]] +* `File.exists?` [[Feature #17391]] +* `Kernel#=~` [[Feature #15231]] +* `Kernel#taint`, `Kernel#untaint`, `Kernel#tainted?` + [[Feature #16131]] +* `Kernel#trust`, `Kernel#untrust`, `Kernel#untrusted?` + [[Feature #16131]] +* `Method#public?`, `Method#private?`, `Method#protected?`, + `UnboundMethod#public?`, `UnboundMethod#private?`, `UnboundMethod#protected?` + [[Bug #18729]] [[Bug #18751]] [[Bug #18435]] + +### Source code incompatibility of extension libraries + +* Extension libraries provide PRNG, subclasses of Random, need updates. + See [PRNG update] below for more information. [[Bug #19100]] + +### Error printer + +* Ruby no longer escapes control characters and backslashes in an + error message. [[Feature #18367]] + +### Constant lookup when defining a class/module + +* When defining a class/module directly under the Object class by class/module + statement, if there is already a class/module defined by `Module#include` + with the same name, the statement was handled as "open class" in Ruby 3.1 or before. + Since Ruby 3.2, a new class is defined instead. [[Feature #18832]] ## 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`. +* Psych no longer bundles libyaml sources. + And also Fiddle no longer bundles libffi sources. + Users need to install the libyaml/libffi library themselves via the package + manager like apt, yum, brew, etc. + + 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 + $ ./configure --with-libyaml-source-dir=/path/to/libyaml-0.2.5 + ``` + + And you can build fiddle with libffi-3.4.4 like this. + + ```bash + $ ./configure --with-libffi-source-dir=/path/to/libffi-3.4.4 + ``` + + [[Feature #18571]] + +* Check cookie name/path/domain characters in `CGI::Cookie`. [[CVE-2021-33621]] + +* `URI.parse` return empty string in host instead of nil. [[sec-156615]] ## 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. +### Updated C APIs + +The following APIs are updated. + +* PRNG update + + `rb_random_interface_t` in ruby/random.h updated and versioned. + Extension libraries which use this interface and built for older + versions need to rebuild with adding `init_int32` function. + +### Added C APIs + +* `VALUE rb_hash_new_capa(long capa)` was added to created hashes with the desired capacity. +* `rb_internal_thread_add_event_hook` and `rb_internal_thread_add_event_hook` were added to instrument threads scheduling. + The following events are available: + * `RUBY_INTERNAL_THREAD_EVENT_STARTED` + * `RUBY_INTERNAL_THREAD_EVENT_READY` + * `RUBY_INTERNAL_THREAD_EVENT_RESUMED` + * `RUBY_INTERNAL_THREAD_EVENT_SUSPENDED` + * `RUBY_INTERNAL_THREAD_EVENT_EXITED` +* `rb_debug_inspector_current_depth` and `rb_debug_inspector_frame_depth` are added for debuggers. + +### Removed C APIs + +The following deprecated APIs are removed. + +* `rb_cData` variable. +* "taintedness" and "trustedness" functions. [[Feature #16131]] ## 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. +* Fixed several race conditions in Kernel#autoload. [[Bug #18782]] +* Cache invalidation for expressions referencing constants is now + more fine-grained. `RubyVM.stat(:global_constant_state)` was + removed because it was closely tied to the previous caching scheme + where setting any constant invalidates all caches in the system. + New keys, `:constant_cache_invalidations` and `:constant_cache_misses`, + were introduced to help with use cases for `:global_constant_state`. + [[Feature #18589]] +* The cache-based optimization for Regexp matching is introduced. + [[Feature #19104]] +* [Variable Width Allocation](https://shopify.engineering/ruby-variable-width-allocation) + is now enabled by default. [[Feature #18239]] +* Added a new instance variable caching mechanism, called object shapes, which + improves inline cache hits for most objects and allows us to generate very + efficient JIT code. Objects whose instance variables are defined in a + consistent order will see the most performance benefits. + [[Feature #18776]] +* Speed up marking instruction sequences by using a bitmap to find "markable" + objects. This change results in faster major collections. + [[Feature #18875]] + +## JIT ### 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. +* YJIT is no longer experimental + * Has been tested on production workloads for over a year and proven to be quite stable. +* YJIT now supports both x86-64 and arm64/aarch64 CPUs on Linux, MacOS, BSD and other UNIX platforms. + * This release brings support for Mac M1/M2, AWS Graviton and Raspberry Pi 4. +* Building YJIT now requires Rust 1.58.0+. [[Feature #18481]] + * In order to ensure that CRuby is built with YJIT, please install `rustc` >= 1.58.0 + before running `./configure` + * Please reach out to the YJIT team should you run into any issues. +* Physical memory for JIT code is lazily allocated. Unlike Ruby 3.1, + the RSS of a Ruby process is minimized because virtual memory pages + allocated by `--yjit-exec-mem-size` will not be mapped to physical + memory pages until actually utilized by JIT code. +* Introduce Code GC that frees all code pages when the memory consumption + by JIT code reaches `--yjit-exec-mem-size`. + * `RubyVM::YJIT.runtime_stats` returns Code GC metrics in addition to + existing `inline_code_size` and `outlined_code_size` keys: + `code_gc_count`, `live_page_count`, `freed_page_count`, and `freed_code_size`. +* Most of the statistics produced by `RubyVM::YJIT.runtime_stats` are now available in release builds. + * Simply run ruby with `--yjit-stats` to compute and dump stats (incurs some run-time overhead). +* YJIT is now optimized to take advantage of object shapes. [[Feature #18776]] +* Take advantage of finer-grained constant invalidation to invalidate less code when defining new constants. [[Feature #18589]] +* The default `--yjit-exec-mem-size` is changed to 64 (MiB). +* The default `--yjit-call-threshold` is changed to 30. ### 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 +* The MJIT compiler is re-implemented in Ruby as `ruby_vm/mjit/compiler`. +* MJIT compiler is executed under a forked Ruby process instead of + doing it in a native thread called MJIT worker. [[Feature #18968]] + * As a result, Microsoft Visual Studio (MSWIN) is no longer supported. +* MinGW is no longer supported. [[Feature #18824]] +* Rename `--mjit-min-calls` to `--mjit-call-threshold`. +* Change default `--mjit-max-cache` back from 10000 to 100. + +[Feature #12005]: https://bugs.ruby-lang.org/issues/12005 +[Feature #12084]: https://bugs.ruby-lang.org/issues/12084 +[Feature #12655]: https://bugs.ruby-lang.org/issues/12655 +[Feature #12737]: https://bugs.ruby-lang.org/issues/12737 +[Feature #13110]: https://bugs.ruby-lang.org/issues/13110 +[Feature #14332]: https://bugs.ruby-lang.org/issues/14332 +[Feature #15231]: https://bugs.ruby-lang.org/issues/15231 +[Feature #15357]: https://bugs.ruby-lang.org/issues/15357 +[Bug #15928]: https://bugs.ruby-lang.org/issues/15928 +[Feature #16122]: https://bugs.ruby-lang.org/issues/16122 +[Feature #16131]: https://bugs.ruby-lang.org/issues/16131 +[Bug #16466]: https://bugs.ruby-lang.org/issues/16466 +[Feature #16663]: https://bugs.ruby-lang.org/issues/16663 +[Feature #16806]: https://bugs.ruby-lang.org/issues/16806 +[Bug #16889]: https://bugs.ruby-lang.org/issues/16889 +[Bug #16908]: https://bugs.ruby-lang.org/issues/16908 +[Feature #16989]: https://bugs.ruby-lang.org/issues/16989 +[Feature #17351]: https://bugs.ruby-lang.org/issues/17351 +[Feature #17391]: https://bugs.ruby-lang.org/issues/17391 +[Bug #17545]: https://bugs.ruby-lang.org/issues/17545 +[Bug #17767]: https://bugs.ruby-lang.org/issues/17767 +[Feature #17837]: https://bugs.ruby-lang.org/issues/17837 +[Feature #17881]: https://bugs.ruby-lang.org/issues/17881 +[Feature #18033]: https://bugs.ruby-lang.org/issues/18033 +[Feature #18159]: https://bugs.ruby-lang.org/issues/18159 +[Feature #18239]: https://bugs.ruby-lang.org/issues/18239#note-17 +[Feature #18351]: https://bugs.ruby-lang.org/issues/18351 +[Feature #18367]: https://bugs.ruby-lang.org/issues/18367 +[Bug #18435]: https://bugs.ruby-lang.org/issues/18435 +[Feature #18462]: https://bugs.ruby-lang.org/issues/18462 +[Feature #18481]: https://bugs.ruby-lang.org/issues/18481 +[Bug #18487]: https://bugs.ruby-lang.org/issues/18487 +[Feature #18564]: https://bugs.ruby-lang.org/issues/18564 +[Feature #18571]: https://bugs.ruby-lang.org/issues/18571 +[Feature #18585]: https://bugs.ruby-lang.org/issues/18585 +[Feature #18589]: https://bugs.ruby-lang.org/issues/18589 +[Feature #18595]: https://bugs.ruby-lang.org/issues/18595 +[Feature #18598]: https://bugs.ruby-lang.org/issues/18598 +[Bug #18625]: https://bugs.ruby-lang.org/issues/18625 +[Feature #18630]: https://bugs.ruby-lang.org/issues/18630 +[Bug #18633]: https://bugs.ruby-lang.org/issues/18633 +[Feature #18639]: https://bugs.ruby-lang.org/issues/18639 +[Feature #18685]: https://bugs.ruby-lang.org/issues/18685 +[Bug #18729]: https://bugs.ruby-lang.org/issues/18729 +[Bug #18751]: https://bugs.ruby-lang.org/issues/18751 +[Feature #18774]: https://bugs.ruby-lang.org/issues/18774 +[Feature #18776]: https://bugs.ruby-lang.org/issues/18776 +[Bug #18782]: https://bugs.ruby-lang.org/issues/18782 +[Feature #18788]: https://bugs.ruby-lang.org/issues/18788 +[Feature #18798]: https://bugs.ruby-lang.org/issues/18798 +[Feature #18809]: https://bugs.ruby-lang.org/issues/18809 +[Feature #18821]: https://bugs.ruby-lang.org/issues/18821 +[Feature #18822]: https://bugs.ruby-lang.org/issues/18822 +[Feature #18824]: https://bugs.ruby-lang.org/issues/18824 +[Feature #18832]: https://bugs.ruby-lang.org/issues/18832 +[Feature #18875]: https://bugs.ruby-lang.org/issues/18875 +[Feature #18925]: https://bugs.ruby-lang.org/issues/18925 +[Feature #18944]: https://bugs.ruby-lang.org/issues/18944 +[Feature #18949]: https://bugs.ruby-lang.org/issues/18949 +[Feature #18968]: https://bugs.ruby-lang.org/issues/18968 +[Feature #19008]: https://bugs.ruby-lang.org/issues/19008 +[Feature #19013]: https://bugs.ruby-lang.org/issues/19013 +[Feature #19026]: https://bugs.ruby-lang.org/issues/19026 +[Feature #19036]: https://bugs.ruby-lang.org/issues/19036 +[Feature #19060]: https://bugs.ruby-lang.org/issues/19060 +[Feature #19070]: https://bugs.ruby-lang.org/issues/19070 +[Feature #19071]: https://bugs.ruby-lang.org/issues/19071 +[Feature #19078]: https://bugs.ruby-lang.org/issues/19078 +[Bug #19087]: https://bugs.ruby-lang.org/issues/19087 +[Bug #19100]: https://bugs.ruby-lang.org/issues/19100 +[Feature #19104]: https://bugs.ruby-lang.org/issues/19104 +[Feature #19135]: https://bugs.ruby-lang.org/issues/19135 +[Feature #19138]: https://bugs.ruby-lang.org/issues/19138 +[Feature #19194]: https://bugs.ruby-lang.org/issues/19194 +[Molinillo]: https://github.com/CocoaPods/Molinillo +[PubGrub]: https://github.com/jhawthorn/pub_grub +[GH-net-protocol-14]: https://github.com/ruby/net-protocol/pull/14 +[GH-pathname-20]: https://github.com/ruby/pathname/pull/20 +[GH-6791]: https://github.com/ruby/ruby/pull/6791 +[GH-6868]: https://github.com/ruby/ruby/pull/6868 +[GH-rubygems-4475]: https://github.com/rubygems/rubygems/pull/4475 +[GH-rubygems-6149]: https://github.com/rubygems/rubygems/pull/6149 +[GH-rubygems-6167]: https://github.com/rubygems/rubygems/pull/6167 +[sec-156615]: https://hackerone.com/reports/156615 +[CVE-2021-33621]: https://www.ruby-lang.org/en/news/2022/11/22/http-response-splitting-in-cgi-cve-2021-33621/ +[wasm/README.md]: https://github.com/ruby/ruby/blob/master/wasm/README.md +[ruby.wasm]: https://github.com/ruby/ruby.wasm diff --git a/README.ja.md b/README.ja.md index 0d2d309fb8..93c0131690 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,10 +1,9 @@ [](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW") -[](https://github.com/ruby/ruby/actions?query=workflow%3A"RJIT") +[](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT") [](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu") [](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows") [](https://ci.appveyor.com/project/ruby/ruby/branch/master) [](https://app.travis-ci.com/ruby/ruby) -[](https://cirrus-ci.com/github/ruby/ruby/master) # Rubyとは @@ -26,7 +25,7 @@ Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい * ダイナミックローディング (アーキテクチャによる) * 移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， macOS， Haikuなどの上でも動く cf. - https://docs.ruby-lang.org/en/master/maintainers_md.html#label-Platform+Maintainers + https://github.com/ruby/ruby/blob/master/doc/contributing.rdoc#platform-maintainers ## 入手法 @@ -50,6 +49,17 @@ https://www.ruby-lang.org/ja/downloads/ Rubyリポジトリの本来のmasterは https://git.ruby-lang.org/ruby.git にあります． コミッタはこちらを使います． +### Subversion + +古いRubyのバージョンのソースコードは次のコマンドでも取得できます． + + $ svn co https://svn.ruby-lang.org/repos/ruby/branches/ruby_2_6/ ruby + +他のブランチの一覧は次のコマンドで見られます． + + $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/ + + ## ホームページ RubyのホームページのURLは @@ -60,20 +70,20 @@ https://www.ruby-lang.org/ ## メーリングリスト -Rubyのメーリングリストがあります．参加希望の方は [ruby-list-request@ml.ruby-lang.org] まで件名に +Rubyのメーリングリストがあります．参加希望の方は [ruby-list-request@ruby-lang.org] まで本文に - join + subscribe と書いて送って下さい． Ruby開発者向けメーリングリストもあります．こちらではrubyのバグ，将来の仕様拡張など実装上の問題について議論されています． -参加希望の方は [ruby-dev-request@ml.ruby-lang.org] までruby-listと同様の方法でメールしてください． +参加希望の方は [ruby-dev-request@ruby-lang.org] までruby-listと同様の方法でメールしてください． Ruby拡張モジュールについて話し合うruby-extメーリングリストと数学関係の話題について話し合うruby-mathメーリングリストと 英語でrubyについて話し合うruby-talkメーリングリストもあります．参加方法はどれも同じです． -[ruby-list-request@ml.ruby-lang.org]: mailto:ruby-list-request@ml.ruby-lang.org?subject=join -[ruby-dev-request@ml.ruby-lang.org]: mailto:ruby-dev-request@ml.ruby-lang.org?subject=join +[ruby-list-request@ruby-lang.org]: mailto:ruby-list-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe +[ruby-dev-request@ruby-lang.org]: mailto:ruby-dev-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe ## コンパイル・インストール @@ -152,7 +162,7 @@ UNIXであれば `configure` がほとんどの差異を吸収してくれるは ## 配布条件 -[COPYING.ja](https://docs.ruby-lang.org/en/master/COPYING_ja.html) ファイルを参照してください． +[COPYING.ja](COPYING.ja) ファイルを参照してください． ## フィードバック @@ -1,5 +1,5 @@ [](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW") -[](https://github.com/ruby/ruby/actions?query=workflow%3A"RJIT") +[](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT") [](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu") [](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows") [](https://ci.appveyor.com/project/ruby/ruby/branch/master) @@ -24,20 +24,15 @@ It is simple, straightforward, and extensible. * Dynamic Loading of Object Files (on some architectures) * Highly Portable (works on many Unix-like/POSIX compatible platforms as well as Windows, macOS, etc.) cf. - https://docs.ruby-lang.org/en/master/maintainers_md.html#label-Platform+Maintainers + https://github.com/ruby/ruby/blob/master/doc/maintainers.rdoc#label-Platform+Maintainers -## How to get Ruby +## How to get Ruby with Git For a complete list of ways to install Ruby, including using third-party tools like rvm, see: https://www.ruby-lang.org/en/downloads/ -You can download release packages and the snapshot of the repository. If you want to -download whole versions of Ruby, please visit https://www.ruby-lang.org/en/downloads/releases/. - -### Download with Git - The mirror of the Ruby source tree can be checked out with the following command: $ git clone https://github.com/ruby/ruby.git @@ -52,7 +47,7 @@ if you are a committer. ## How to build -See [Building Ruby](https://docs.ruby-lang.org/en/master/contributing/building_ruby_md.html) +see [Building Ruby](doc/contributing/building_ruby.md) ## Ruby home page @@ -68,11 +63,11 @@ https://www.ruby-lang.org/ There is a mailing list to discuss Ruby. To subscribe to this list, please send the following phrase: - join + subscribe -in the mail subject (not body) to the address [ruby-talk-request@ml.ruby-lang.org]. +in the mail body (not subject) to the address [ruby-talk-request@ruby-lang.org]. -[ruby-talk-request@ml.ruby-lang.org]: mailto:ruby-talk-request@ml.ruby-lang.org?subject=join +[ruby-talk-request@ruby-lang.org]: mailto:ruby-talk-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe ## Copying diff --git a/addr2line.c b/addr2line.c index 2a69dd0966..e5f25293e2 100644 --- a/addr2line.c +++ b/addr2line.c @@ -8,14 +8,10 @@ **********************************************************************/ -#if defined(__clang__) && defined(__has_warning) -#if __has_warning("-Wgnu-empty-initializer") +#if defined(__clang__) #pragma clang diagnostic ignored "-Wgnu-empty-initializer" -#endif -#if __has_warning("-Wgcc-compat") #pragma clang diagnostic ignored "-Wgcc-compat" #endif -#endif #include "ruby/internal/config.h" #include "ruby/defines.h" @@ -61,21 +57,8 @@ void *alloca(); # endif # endif /* AIX */ # endif /* HAVE_ALLOCA_H */ -# ifndef UNREACHABLE -# define UNREACHABLE __builtin_unreachable() -# endif -# ifndef UNREACHABLE_RETURN -# define UNREACHABLE_RETURN(_) __builtin_unreachable() -# endif #endif /* __GNUC__ */ -#ifndef UNREACHABLE -# define UNREACHABLE abort() -#endif -#ifndef UNREACHABLE_RETURN -# define UNREACHABLE_RETURN(_) return (abort(), (_)) -#endif - #ifdef HAVE_DLADDR # include <dlfcn.h> #endif @@ -144,7 +127,7 @@ void *alloca(); #define DW_LNE_define_file 0x03 #define DW_LNE_set_discriminator 0x04 /* DWARF4 */ -#define kprintf(...) fprintf(errout, "" __VA_ARGS__) +PRINTF_ARGS(static int kprintf(const char *fmt, ...), 1, 2); typedef struct line_info { const char *dirname; @@ -201,7 +184,7 @@ obj_dwarf_section_at(obj_info_t *obj, int n) &obj->debug_line_str }; if (n < 0 || DWARF_SECTION_COUNT <= n) { - UNREACHABLE_RETURN(0); + abort(); } return ary[n]; } @@ -254,7 +237,7 @@ sleb128(const char **p) } static const char * -get_nth_dirname(unsigned long dir, const char *p, FILE *errout) +get_nth_dirname(unsigned long dir, const char *p) { if (!dir--) { return ""; @@ -271,14 +254,10 @@ get_nth_dirname(unsigned long dir, const char *p, FILE *errout) 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, FILE *errout); +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 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, FILE *errout) +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) { int i; const char *p = filenames; @@ -287,9 +266,9 @@ 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, errout); + parse_ver5_debug_line_header(filenames, file, format, obj, &path, &directory_index); line->filename = path; - parse_ver5_debug_line_header(include_directories, (int)directory_index, format, obj, &path, NULL, errout); + parse_ver5_debug_line_header(include_directories, (int)directory_index, format, obj, &path, NULL); line->dirname = path; } else { @@ -311,7 +290,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, errout); + line->dirname = get_nth_dirname(dir, include_directories); } } } @@ -320,7 +299,7 @@ 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, FILE *errout) + obj_info_t *obj, line_info_t *lines, int offset) { int i; addr += obj->base_addr - obj->vmaddr; @@ -329,7 +308,7 @@ fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line, /* 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, errout); + fill_filename(file, format, version, include_directories, filenames, &lines[i], obj); lines[i].line = line; } } @@ -354,7 +333,7 @@ struct LineNumberProgramHeader { }; static int -parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgramHeader *header, FILE *errout) +parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgramHeader *header) { const char *p = *pp; header->unit_length = *(uint32_t *)p; @@ -400,7 +379,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, errout); + p = parse_ver5_debug_line_header(p, -1, header->format, obj, NULL, NULL); header->filenames = p; } else { @@ -427,7 +406,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, FILE *errout) + obj_info_t *obj, line_info_t *lines, int offset) { const char *p = (const char *)*debug_line; struct LineNumberProgramHeader header; @@ -444,7 +423,7 @@ 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, errout)) + if (parse_debug_line_header(obj, &p, &header)) return -1; is_stmt = header.default_is_stmt; @@ -455,7 +434,7 @@ parse_debug_line_cu(int num_traces, void **traces, const char **debug_line, header.version, \ header.include_directories, \ header.filenames, \ - obj, lines, offset, errout); \ + obj, lines, offset); \ /*basic_block = prologue_end = epilogue_begin = 0;*/ \ } while (0) @@ -555,11 +534,11 @@ 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, FILE *errout) + obj_info_t *obj, line_info_t *lines, int offset) { 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, errout)) + if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset)) return -1; } if (debug_line != debug_line_end) { @@ -572,7 +551,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, FILE *errout); + obj_info_t **objp, line_info_t *lines, int offset); static void append_obj(obj_info_t **objp) @@ -600,7 +579,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, FILE *errout) + obj_info_t **objp, line_info_t *lines, int offset) { static const char global_debug_dir[] = "/usr/lib/debug"; const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1; @@ -626,13 +605,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, errout); + fill_lines(num_traces, traces, 0, objp, lines, offset); } // 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, FILE *errout) + obj_info_t **objp, line_info_t *lines, int offset) { static const char global_debug_dir[] = "/usr/lib/debug/.build-id/"; const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1; @@ -657,7 +636,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, errout); + fill_lines(num_traces, traces, 0, objp, lines, offset); } #endif @@ -861,11 +840,7 @@ enum DW_FORM_addrx1 = 0x29, DW_FORM_addrx2 = 0x2a, DW_FORM_addrx3 = 0x2b, - DW_FORM_addrx4 = 0x2c, - - /* GNU extensions for referring to .gnu_debugaltlink dwz-compressed info */ - DW_FORM_GNU_ref_alt = 0x1f20, - DW_FORM_GNU_strp_alt = 0x1f21 + DW_FORM_addrx4 = 0x2c }; /* Range list entry encodings */ @@ -1083,13 +1058,13 @@ di_read_debug_abbrev_cu(DebugInfoReader *reader) } static int -di_read_debug_line_cu(DebugInfoReader *reader, FILE *errout) +di_read_debug_line_cu(DebugInfoReader *reader) { const char *p; struct LineNumberProgramHeader header; p = (const char *)reader->debug_line_cu_end; - if (parse_debug_line_header(reader->obj, &p, &header, errout)) + if (parse_debug_line_header(reader->obj, &p, &header)) return -1; reader->debug_line_cu_end = (char *)header.cu_end; @@ -1169,32 +1144,25 @@ resolve_strx(DebugInfoReader *reader, uint64_t idx) return reader->obj->debug_str.ptr + off; } -static bool -debug_info_reader_read_addr_value_member(DebugInfoReader *reader, DebugInfoValue *v, int size) +static void +debug_info_reader_read_addr_value(DebugInfoReader *reader, DebugInfoValue *v) { - if (size == 4) { + if (reader->address_size == 4) { set_uint_value(v, read_uint32(&reader->p)); - } else if (size == 8) { + } else if (reader->address_size == 8) { set_uint_value(v, read_uint64(&reader->p)); } else { - return false; + fprintf(stderr,"unknown address_size:%d", reader->address_size); + abort(); } - return true; } -#define debug_info_reader_read_addr_value(reader, v, mem) \ - if (!debug_info_reader_read_addr_value_member((reader), (v), (reader)->mem)) { \ - kprintf("unknown " #mem ":%d", (reader)->mem); \ - return false; \ - } - - -static bool -debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v, FILE *errout) +static void +debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v) { switch (form) { case DW_FORM_addr: - debug_info_reader_read_addr_value(reader, v, address_size); + debug_info_reader_read_addr_value(reader, v); break; case DW_FORM_block2: v->size = read_uint16(&reader->p); @@ -1249,9 +1217,16 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa if (reader->current_version <= 2) { // DWARF Version 2 specifies that references have // the same size as an address on the target system - debug_info_reader_read_addr_value(reader, v, address_size); + debug_info_reader_read_addr_value(reader, v); } else { - debug_info_reader_read_addr_value(reader, v, format); + if (reader->format == 4) { + set_uint_value(v, read_uint32(&reader->p)); + } else if (reader->format == 8) { + set_uint_value(v, read_uint64(&reader->p)); + } else { + fprintf(stderr,"unknown format:%d", reader->format); + abort(); + } } break; case DW_FORM_ref1: @@ -1352,28 +1327,20 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa case DW_FORM_addrx4: set_addr_idx_value(v, read_uint32(&reader->p)); break; - /* we have no support for actually reading the real values of these refs out - * of the .gnu_debugaltlink dwz-compressed debuginfo at the moment, but "read" - * them anyway so that we advance the reader by the right amount. */ - case DW_FORM_GNU_ref_alt: - case DW_FORM_GNU_strp_alt: - read_uint(reader); - set_uint_value(v, 0); - break; case 0: goto fail; break; } - return true; + return; fail: - kprintf("%d: unsupported form: %#"PRIx64"\n", __LINE__, form); - return false; + fprintf(stderr, "%d: unsupported form: %#"PRIx64"\n", __LINE__, form); + exit(1); } /* find abbrev in current compilation unit */ static const char * -di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number, FILE *errout) +di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number) { const char *p; if (abbrev_number < ABBREV_TABLE_SIZE) { @@ -1386,8 +1353,8 @@ di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number, FILE *errout) di_skip_die_attributes(&p); for (uint64_t n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) { if (n == 0) { - kprintf("%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number); - return NULL; + fprintf(stderr,"%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number); + exit(1); } uleb128(&p); /* tag */ p++; /* has_children */ @@ -1398,52 +1365,52 @@ di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number, FILE *errout) #if 0 static void -hexdump0(const unsigned char *p, size_t n, FILE *errout) +hexdump0(const unsigned char *p, size_t n) { size_t i; - kprintf(" 0 1 2 3 4 5 6 7 8 9 A B C D E F\n"); + fprintf(stderr, " 0 1 2 3 4 5 6 7 8 9 A B C D E F\n"); for (i=0; i < n; i++){ switch (i & 15) { case 0: - kprintf("%02" PRIdSIZE ": %02X ", i/16, p[i]); + fprintf(stderr, "%02" PRIdSIZE ": %02X ", i/16, p[i]); break; case 15: - kprintf("%02X\n", p[i]); + fprintf(stderr, "%02X\n", p[i]); break; default: - kprintf("%02X ", p[i]); + fprintf(stderr, "%02X ", p[i]); break; } } if ((i & 15) != 15) { - kprintf("\n"); + fprintf(stderr, "\n"); } } -#define hexdump(p,n,e) hexdump0((const unsigned char *)p, n, e) +#define hexdump(p,n) hexdump0((const unsigned char *)p, n) static void -div_inspect(DebugInfoValue *v, FILE *errout) +div_inspect(DebugInfoValue *v) { switch (v->type) { case VAL_uint: - kprintf("%d: type:%d size:%" PRIxSIZE " v:%"PRIx64"\n",__LINE__,v->type,v->size,v->as.uint64); + fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:%"PRIx64"\n",__LINE__,v->type,v->size,v->as.uint64); break; case VAL_int: - kprintf("%d: type:%d size:%" PRIxSIZE " v:%"PRId64"\n",__LINE__,v->type,v->size,(int64_t)v->as.uint64); + fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:%"PRId64"\n",__LINE__,v->type,v->size,(int64_t)v->as.uint64); break; case VAL_cstr: - kprintf("%d: type:%d size:%" PRIxSIZE " v:'%s'\n",__LINE__,v->type,v->size,v->as.ptr); + fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:'%s'\n",__LINE__,v->type,v->size,v->as.ptr); break; case VAL_data: - kprintf("%d: type:%d size:%" PRIxSIZE " v:\n",__LINE__,v->type,v->size); - hexdump(v->as.ptr, 16, errout); + fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:\n",__LINE__,v->type,v->size); + hexdump(v->as.ptr, 16); break; } } #endif static DIE * -di_read_die(DebugInfoReader *reader, DIE *die, FILE *errout) +di_read_die(DebugInfoReader *reader, DIE *die) { uint64_t abbrev_number = uleb128(&reader->p); if (abbrev_number == 0) { @@ -1451,7 +1418,7 @@ di_read_die(DebugInfoReader *reader, DIE *die, FILE *errout) return NULL; } - if (!(reader->q = di_find_abbrev(reader, abbrev_number, errout))) return NULL; + reader->q = di_find_abbrev(reader, abbrev_number); die->pos = reader->p - reader->obj->debug_info.ptr - 1; die->tag = (int)uleb128(&reader->q); /* tag */ @@ -1463,26 +1430,26 @@ di_read_die(DebugInfoReader *reader, DIE *die, FILE *errout) } static DebugInfoValue * -di_read_record(DebugInfoReader *reader, DebugInfoValue *vp, FILE *errout) +di_read_record(DebugInfoReader *reader, DebugInfoValue *vp) { 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, errout)) return NULL; + debug_info_reader_read_value(reader, form, vp); return vp; } -static bool -di_skip_records(DebugInfoReader *reader, FILE *errout) +static void +di_skip_records(DebugInfoReader *reader) { for (;;) { - DebugInfoValue v = {{0}}; + DebugInfoValue v = {{}}; 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, errout)) return false; + if (!at || !form) return; + debug_info_reader_read_value(reader, form, &v); } } @@ -1494,14 +1461,13 @@ typedef struct addr_header { /* uint8_t segment_selector_size; */ } addr_header_t; -static bool -addr_header_init(obj_info_t *obj, addr_header_t *header, FILE *errout) -{ +static void +addr_header_init(obj_info_t *obj, addr_header_t *header) { const char *p = obj->debug_addr.ptr; header->ptr = p; - if (!p) return true; + if (!p) return; header->unit_length = *(uint32_t *)p; p += sizeof(uint32_t); @@ -1515,12 +1481,7 @@ addr_header_init(obj_info_t *obj, addr_header_t *header, FILE *errout) p += 2; /* version */ header->address_size = *p++; - if (header->address_size != 4 && header->address_size != 8) { - kprintf("unknown address_size:%d", header->address_size); - return false; - } p++; /* segment_selector_size */ - return true; } static uint64_t @@ -1540,12 +1501,11 @@ typedef struct rnglists_header { uint32_t offset_entry_count; } rnglists_header_t; -static bool -rnglists_header_init(obj_info_t *obj, rnglists_header_t *header, FILE *errout) -{ +static void +rnglists_header_init(obj_info_t *obj, rnglists_header_t *header) { const char *p = obj->debug_rnglists.ptr; - if (!p) return true; + if (!p) return; header->unit_length = *(uint32_t *)p; p += sizeof(uint32_t); @@ -1559,13 +1519,8 @@ rnglists_header_init(obj_info_t *obj, rnglists_header_t *header, FILE *errout) p += 2; /* version */ header->address_size = *p++; - if (header->address_size != 4 && header->address_size != 8) { - kprintf("unknown address_size:%d", header->address_size); - return false; - } p++; /* segment_selector_size */ header->offset_entry_count = *(uint32_t *)p; - return true; } typedef struct { @@ -1609,23 +1564,26 @@ 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, FILE *errout) +read_dw_form_addr(DebugInfoReader *reader, const char **ptr) { const char *p = *ptr; *ptr = p + reader->address_size; if (reader->address_size == 4) { return read_uint32(&p); - } else { + } else if (reader->address_size == 8) { return read_uint64(&p); + } else { + fprintf(stderr,"unknown address_size:%d", reader->address_size); + abort(); } } static uintptr_t -ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_header_t *rnglists_header, FILE *errout) +ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_header_t *rnglists_header) { if (ptr->high_pc_set) { if (ptr->ranges_set || !ptr->low_pc_set) { - return UINTPTR_MAX; + exit(1); } if (ptr->low_pc <= addr && addr <= ptr->high_pc) { return (uintptr_t)ptr->low_pc; @@ -1674,15 +1632,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, errout); + base = read_dw_form_addr(reader, &p); base_valid = true; break; case DW_RLE_start_end: - from = (uintptr_t)read_dw_form_addr(reader, &p, errout); - to = (uintptr_t)read_dw_form_addr(reader, &p, errout); + from = (uintptr_t)read_dw_form_addr(reader, &p); + to = (uintptr_t)read_dw_form_addr(reader, &p); break; case DW_RLE_start_length: - from = (uintptr_t)read_dw_form_addr(reader, &p, errout); + from = (uintptr_t)read_dw_form_addr(reader, &p); to = from + uleb128(&p); break; } @@ -1690,7 +1648,7 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_h return from; } } - return 0; + return false; } p = reader->obj->debug_ranges.ptr + ptr->ranges; for (;;) { @@ -1711,42 +1669,42 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_h return (uintptr_t)ptr->low_pc; } } - return 0; + return false; } #if 0 static void -ranges_inspect(DebugInfoReader *reader, ranges_t *ptr, FILE *errout) +ranges_inspect(DebugInfoReader *reader, ranges_t *ptr) { if (ptr->high_pc_set) { if (ptr->ranges_set || !ptr->low_pc_set) { - kprintf("low_pc_set:%d high_pc_set:%d ranges_set:%d\n",ptr->low_pc_set,ptr->high_pc_set,ptr->ranges_set); - return; + fprintf(stderr,"low_pc_set:%d high_pc_set:%d ranges_set:%d\n",ptr->low_pc_set,ptr->high_pc_set,ptr->ranges_set); + exit(1); } - kprintf("low_pc:%"PRIx64" high_pc:%"PRIx64"\n",ptr->low_pc,ptr->high_pc); + fprintf(stderr,"low_pc:%"PRIx64" high_pc:%"PRIx64"\n",ptr->low_pc,ptr->high_pc); } else if (ptr->ranges_set) { char *p = reader->obj->debug_ranges.ptr + ptr->ranges; - kprintf("low_pc:%"PRIx64" ranges:%"PRIx64" %lx ",ptr->low_pc,ptr->ranges, p-reader->obj->mapped); + fprintf(stderr,"low_pc:%"PRIx64" ranges:%"PRIx64" %lx ",ptr->low_pc,ptr->ranges, p-reader->obj->mapped); for (;;) { uintptr_t from = read_uintptr(&p); uintptr_t to = read_uintptr(&p); if (!from && !to) break; - kprintf("%"PRIx64"-%"PRIx64" ",ptr->low_pc+from,ptr->low_pc+to); + fprintf(stderr,"%"PRIx64"-%"PRIx64" ",ptr->low_pc+from,ptr->low_pc+to); } - kprintf("\n"); + fprintf(stderr,"\n"); } else if (ptr->low_pc_set) { - kprintf("low_pc:%"PRIx64"\n",ptr->low_pc); + fprintf(stderr,"low_pc:%"PRIx64"\n",ptr->low_pc); } else { - kprintf("empty\n"); + fprintf(stderr,"empty\n"); } } #endif static int -di_read_cu(DebugInfoReader *reader, FILE *errout) +di_read_cu(DebugInfoReader *reader) { uint64_t unit_length; uint16_t version; @@ -1773,23 +1731,23 @@ di_read_cu(DebugInfoReader *reader, FILE *errout) debug_abbrev_offset = read_uint(reader); reader->address_size = read_uint8(&reader->p); } - if (reader->address_size != 4 && reader->address_size != 8) { - kprintf("unknown address_size:%d", reader->address_size); - return -1; - } reader->q0 = reader->obj->debug_abbrev.ptr + debug_abbrev_offset; reader->level = 0; di_read_debug_abbrev_cu(reader); - if (di_read_debug_line_cu(reader, errout)) return -1; + if (di_read_debug_line_cu(reader)) return -1; +#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER_BUILD_DATE) + /* Though DWARF specifies "the applicable base address defaults to the base + address of the compilation unit", but GCC seems to use zero as default */ +#else do { DIE die; - if (!di_read_die(reader, &die, errout)) continue; + if (!di_read_die(reader, &die)) continue; if (die.tag != DW_TAG_compile_unit) { - if (!di_skip_records(reader, errout)) return -1; + di_skip_records(reader); break; } @@ -1797,11 +1755,11 @@ di_read_cu(DebugInfoReader *reader, FILE *errout) reader->current_addr_base = 0; reader->current_rnglists_base = 0; - DebugInfoValue low_pc = {{0}}; + DebugInfoValue low_pc = {{}}; /* enumerate abbrev */ for (;;) { - DebugInfoValue v = {{0}}; - if (!di_read_record(reader, &v, errout)) break; + DebugInfoValue v = {{}}; + if (!di_read_record(reader, &v)) break; switch (v.at) { case DW_AT_low_pc: // clang may output DW_AT_addr_base after DW_AT_low_pc. @@ -1826,19 +1784,19 @@ di_read_cu(DebugInfoReader *reader, FILE *errout) break; case VAL_addr: { - addr_header_t header = {0}; - if (!addr_header_init(reader->obj, &header, errout)) return -1; + addr_header_t header; + addr_header_init(reader->obj, &header); reader->current_low_pc = read_addr(&header, reader->current_addr_base, low_pc.as.addr_idx); } break; } } while (0); - +#endif return 0; } static void -read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_origin, line_info_t *line, FILE *errout) +read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_origin, line_info_t *line) { const char *p = reader->p; const char *q = reader->q; @@ -1863,12 +1821,12 @@ read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_o default: goto finish; } - if (!di_read_die(reader, &die, errout)) goto finish; + if (!di_read_die(reader, &die)) goto finish; /* enumerate abbrev */ for (;;) { - DebugInfoValue v = {{0}}; - if (!di_read_record(reader, &v, errout)) break; + DebugInfoValue v = {{}}; + if (!di_read_record(reader, &v)) break; switch (v.at) { case DW_AT_name: line->sname = get_cstr_value(&v); @@ -1882,44 +1840,43 @@ read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_o reader->level = level; } -static bool +static void debug_info_read(DebugInfoReader *reader, int num_traces, void **traces, - line_info_t *lines, int offset, FILE *errout) -{ + line_info_t *lines, int offset) { - addr_header_t addr_header = {0}; - if (!addr_header_init(reader->obj, &addr_header, errout)) return false; + addr_header_t addr_header = {}; + addr_header_init(reader->obj, &addr_header); - rnglists_header_t rnglists_header = {0}; - if (!rnglists_header_init(reader->obj, &rnglists_header, errout)) return false; + rnglists_header_t rnglists_header = {}; + rnglists_header_init(reader->obj, &rnglists_header); while (reader->p < reader->cu_end) { DIE die; - ranges_t ranges = {0}; - line_info_t line = {0}; + ranges_t ranges = {}; + line_info_t line = {}; - if (!di_read_die(reader, &die, errout)) continue; - /* kprintf("%d:%tx: <%d>\n",__LINE__,die.pos,reader->level,die.tag); */ + if (!di_read_die(reader, &die)) continue; + /* fprintf(stderr,"%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, errout)) return false; + di_skip_records(reader); continue; } /* enumerate abbrev */ for (;;) { - DebugInfoValue v = {{0}}; + DebugInfoValue v = {{}}; /* ptrdiff_t pos = reader->p - reader->p0; */ - 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, errout); */ + if (!di_read_record(reader, &v)) break; + /* fprintf(stderr,"\n%d:%tx: AT:%lx FORM:%lx\n",__LINE__,pos,v.at,v.form); */ + /* div_inspect(&v); */ 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, errout); + 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); break; case DW_AT_call_line: line.line = (int)v.as.uint64; @@ -1935,19 +1892,18 @@ 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, errout); + read_abstract_origin(reader, v.form, v.as.uint64, &line); break; /* goto skip_die; */ } } - /* ranges_inspect(reader, &ranges, errout); */ - /* kprintf("%d:%tx: %x ",__LINE__,diepos,die.tag); */ + /* ranges_inspect(reader, &ranges); */ + /* fprintf(stderr,"%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, errout); - if (saddr == UINTPTR_MAX) return false; + uintptr_t saddr = ranges_include(reader, &ranges, offset, &rnglists_header); 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); */ + /* fprintf(stdout, "%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); */ if (lines[i].sname) { line_info_t *lp = malloc(sizeof(line_info_t)); memcpy(lp, &lines[i], sizeof(line_info_t)); @@ -1964,7 +1920,6 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces, } } } - return true; } // This function parses the following attributes of Line Number Program Header in DWARF 5: @@ -1983,10 +1938,7 @@ 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, FILE *errout) -{ +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) { int i, j; int entry_format_count = *(uint8_t *)p++; const char *entry_format = p; @@ -1996,17 +1948,17 @@ parse_ver5_debug_line_header(const char *p, int idx, uint8_t format, int entry_count = (int)uleb128(&p); - DebugInfoReader reader = {0}; + DebugInfoReader reader; debug_info_reader_init(&reader, obj); reader.format = format; reader.p = p; for (j = 0; j < entry_count; j++) { const char *format = entry_format; for (i = 0; i < entry_format_count; i++) { - DebugInfoValue v = {{0}}; + DebugInfoValue v = {{}}; unsigned long dw_lnct = uleb128(&format); unsigned long dw_form = uleb128(&format); - if (!debug_info_reader_read_value(&reader, dw_form, &v, errout)) return 0; + debug_info_reader_read_value(&reader, dw_form, &v); 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) @@ -2051,7 +2003,7 @@ fail: /* 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, FILE *errout) + obj_info_t **objp, line_info_t *lines, int offset) { int i, j; char *shstr; @@ -2211,10 +2163,9 @@ fill_lines(int num_traces, void **traces, int check_debuglink, debug_info_reader_init(&reader, obj); 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, errout)) goto use_symtab; - if (!debug_info_read(&reader, num_traces, traces, lines, offset, errout)) - goto use_symtab; + /* fprintf(stderr, "%d:%tx: CU[%d]\n", __LINE__, reader.p - reader.obj->debug_info.ptr, i++); */ + if (di_read_cu(&reader)) goto use_symtab; + debug_info_read(&reader, num_traces, traces, lines, offset); } } else { @@ -2254,14 +2205,14 @@ use_symtab: if (gnu_debuglink_shdr && check_debuglink) { follow_debuglink(file + gnu_debuglink_shdr->sh_offset, num_traces, traces, - objp, lines, offset, errout); + objp, lines, offset); } 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, errout); + objp, lines, offset); } goto finish; } @@ -2269,7 +2220,7 @@ use_symtab: if (parse_debug_line(num_traces, traces, obj->debug_line.ptr, obj->debug_line.size, - obj, lines, offset, errout) == -1) + obj, lines, offset) == -1) goto fail; finish: @@ -2281,7 +2232,7 @@ fail: /* 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, FILE *errout) + obj_info_t **objp, line_info_t *lines, int offset) { # ifdef __LP64__ # define LP(x) x##_64 @@ -2360,13 +2311,13 @@ fill_lines(int num_traces, void **traces, int check_debuglink, struct fat_header *fat = (struct fat_header *)file; char *q = file + sizeof(*fat); uint32_t nfat_arch = __builtin_bswap32(fat->nfat_arch); - /* kprintf("%d: fat:%s %d\n",__LINE__, binary_filename,nfat_arch); */ + /* fprintf(stderr,"%d: fat:%s %d\n",__LINE__, binary_filename,nfat_arch); */ for (uint32_t i = 0; i < nfat_arch; i++) { struct fat_arch *arch = (struct fat_arch *)q; cpu_type_t cputype = __builtin_bswap32(arch->cputype); cpu_subtype_t cpusubtype = __builtin_bswap32(arch->cpusubtype); uint32_t offset = __builtin_bswap32(arch->offset); - /* kprintf("%d: fat %d %x/%x %x/%x\n",__LINE__, i, mhp->cputype,mhp->cpusubtype, cputype,cpusubtype); */ + /* fprintf(stderr,"%d: fat %d %x/%x %x/%x\n",__LINE__, i, mhp->cputype,mhp->cpusubtype, cputype,cpusubtype); */ if (mhp->cputype == cputype && (cpu_subtype_t)(mhp->cpusubtype & ~CPU_SUBTYPE_MASK) == cpusubtype) { p = file + offset; @@ -2482,16 +2433,15 @@ found_mach_header: DebugInfoReader reader; debug_info_reader_init(&reader, obj); while (reader.p < reader.pend) { - if (di_read_cu(&reader, errout)) goto fail; - if (!debug_info_read(&reader, num_traces, traces, lines, offset, errout)) - goto fail; + if (di_read_cu(&reader)) goto fail; + debug_info_read(&reader, num_traces, traces, lines, offset); } } if (parse_debug_line(num_traces, traces, obj->debug_line.ptr, obj->debug_line.size, - obj, lines, offset, errout) == -1) + obj, lines, offset) == -1) goto fail; return dladdr_fbase; @@ -2504,7 +2454,7 @@ fail: #if defined(__FreeBSD__) || defined(__DragonFly__) # include <sys/sysctl.h> #endif -/* ssize_t main_exe_path(FILE *errout) +/* ssize_t main_exe_path(void) * * store the path of the main executable to `binary_filename`, * and returns strlen(binary_filename). @@ -2512,7 +2462,7 @@ fail: */ #if defined(__linux__) || defined(__NetBSD__) static ssize_t -main_exe_path(FILE *errout) +main_exe_path(void) { # if defined(__linux__) # define PROC_SELF_EXE "/proc/self/exe" @@ -2526,7 +2476,7 @@ main_exe_path(FILE *errout) } #elif defined(__FreeBSD__) || defined(__DragonFly__) static ssize_t -main_exe_path(FILE *errout) +main_exe_path(void) { int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1}; size_t len = PATH_MAX; @@ -2540,7 +2490,7 @@ main_exe_path(FILE *errout) } #elif defined(HAVE_LIBPROC_H) static ssize_t -main_exe_path(FILE *errout) +main_exe_path(void) { int len = proc_pidpath(getpid(), binary_filename, PATH_MAX); if (len == 0) return 0; @@ -2552,7 +2502,7 @@ main_exe_path(FILE *errout) #endif static void -print_line0(line_info_t *line, void *address, FILE *errout) +print_line0(line_info_t *line, void *address) { uintptr_t addr = (uintptr_t)address; uintptr_t d = addr - line->saddr; @@ -2593,16 +2543,16 @@ print_line0(line_info_t *line, void *address, FILE *errout) } static void -print_line(line_info_t *line, void *address, FILE *errout) +print_line(line_info_t *line, void *address) { - print_line0(line, address, errout); + print_line0(line, address); if (line->next) { - print_line(line->next, NULL, errout); + print_line(line->next, NULL); } } void -rb_dump_backtrace_with_lines(int num_traces, void **traces, FILE *errout) +rb_dump_backtrace_with_lines(int num_traces, void **traces) { int i; /* async-signal unsafe */ @@ -2614,14 +2564,14 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces, FILE *errout) #ifdef HAVE_MAIN_EXE_PATH char *main_path = NULL; /* used on printing backtrace */ ssize_t len; - if ((len = main_exe_path(errout)) > 0) { + 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, errout); + addr = fill_lines(num_traces, traces, 1, &obj, lines, -1); if (addr != (uintptr_t)-1) { dladdr_fbases[0] = (void *)addr; } @@ -2658,7 +2608,7 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces, FILE *errout) lines[i].saddr = (uintptr_t)info.dli_saddr; } strlcpy(binary_filename, path, PATH_MAX); - if (fill_lines(num_traces, traces, 1, &obj, lines, i, errout) == (uintptr_t)-1) + if (fill_lines(num_traces, traces, 1, &obj, lines, i) == (uintptr_t)-1) break; } next_line: @@ -2667,7 +2617,7 @@ next_line: /* output */ for (i = 0; i < num_traces; i++) { - print_line(&lines[i], traces[i], errout); + print_line(&lines[i], traces[i]); /* FreeBSD's backtrace may show _start and so on */ if (lines[i].sname && strcmp("main", lines[i].sname) == 0) @@ -2701,8 +2651,435 @@ next_line: free(dladdr_fbases); } -#undef kprintf +/* From FreeBSD's lib/libstand/printf.c */ +/*- + * Copyright (c) 1986, 1988, 1991, 1993 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. + * + * 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. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + * + * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 + */ + +#include <stdarg.h> +#define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1) +static inline int toupper(int c) { return ('A' <= c && c <= 'Z') ? (c&0x5f) : c; } +#define hex2ascii(hex) (hex2ascii_data[hex]) +static const char hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz"; +static inline int imax(int a, int b) { return (a > b ? a : b); } +static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap); + +static void putce(int c) +{ + char s[1]; + ssize_t ret; + + s[0] = (char)c; + ret = write(2, s, 1); + (void)ret; +} + +static int +kprintf(const char *fmt, ...) +{ + va_list ap; + int retval; + va_start(ap, fmt); + retval = kvprintf(fmt, putce, NULL, 10, ap); + va_end(ap); + return retval; +} + +/* + * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse + * order; return an optional length and a pointer to the last character + * written in the buffer (i.e., the first character of the string). + * The buffer pointed to by `nbuf' must have length >= MAXNBUF. + */ +static char * +ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) +{ + char *p, c; + + p = nbuf; + *p = '\0'; + do { + c = hex2ascii(num % base); + *++p = upper ? toupper(c) : c; + } while (num /= base); + if (lenp) + *lenp = (int)(p - nbuf); + return (p); +} + +/* + * Scaled down version of printf(3). + * + * Two additional formats: + * + * The format %b is supported to decode error registers. + * Its usage is: + * + * printf("reg=%b\n", regval, "<base><arg>*"); + * + * where <base> is the output base expressed as a control character, e.g. + * \10 gives octal; \20 gives hex. Each arg is a sequence of characters, + * the first of which gives the bit number to be inspected (origin 1), and + * the next characters (up to a control character, i.e. a character <= 32), + * give the name of the register. Thus: + * + * kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n"); + * + * would produce output: + * + * reg=3<BITTWO,BITONE> + * + * XXX: %D -- Hexdump, takes pointer and separator string: + * ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX + * ("%*D", len, ptr, " " -> XX XX XX XX ... + */ +static int +kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap) +{ +#define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; } + char nbuf[MAXNBUF]; + char *d; + const char *p, *percent, *q; + unsigned char *up; + int ch, n; + uintmax_t num; + int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot; + int cflag, hflag, jflag, tflag, zflag; + int dwidth, upper; + char padc; + int stop = 0, retval = 0; + + num = 0; + if (!func) + d = (char *) arg; + else + d = NULL; + + if (fmt == NULL) + fmt = "(fmt null)\n"; + + if (radix < 2 || radix > 36) + radix = 10; + + for (;;) { + padc = ' '; + width = 0; + while ((ch = (unsigned char)*fmt++) != '%' || stop) { + if (ch == '\0') + return (retval); + PCHAR(ch); + } + percent = fmt - 1; + qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0; + sign = 0; dot = 0; dwidth = 0; upper = 0; + cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0; +reswitch: switch (ch = (unsigned char)*fmt++) { + case '.': + dot = 1; + goto reswitch; + case '#': + sharpflag = 1; + goto reswitch; + case '+': + sign = 1; + goto reswitch; + case '-': + ladjust = 1; + goto reswitch; + case '%': + PCHAR(ch); + break; + case '*': + if (!dot) { + width = va_arg(ap, int); + if (width < 0) { + ladjust = !ladjust; + width = -width; + } + } else { + dwidth = va_arg(ap, int); + } + goto reswitch; + case '0': + if (!dot) { + padc = '0'; + goto reswitch; + } + case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + for (n = 0;; ++fmt) { + n = n * 10 + ch - '0'; + ch = *fmt; + if (ch < '0' || ch > '9') + break; + } + if (dot) + dwidth = n; + else + width = n; + goto reswitch; + case 'b': + num = (unsigned int)va_arg(ap, int); + p = va_arg(ap, char *); + for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;) + PCHAR(*q--); + + if (num == 0) + break; + + for (tmp = 0; *p;) { + n = *p++; + if (num & (1 << (n - 1))) { + PCHAR(tmp ? ',' : '<'); + for (; (n = *p) > ' '; ++p) + PCHAR(n); + tmp = 1; + } else + for (; *p > ' '; ++p) + continue; + } + if (tmp) + PCHAR('>'); + break; + case 'c': + PCHAR(va_arg(ap, int)); + break; + case 'D': + up = va_arg(ap, unsigned char *); + p = va_arg(ap, char *); + if (!width) + width = 16; + while(width--) { + PCHAR(hex2ascii(*up >> 4)); + PCHAR(hex2ascii(*up & 0x0f)); + up++; + if (width) + for (q=p;*q;q++) + PCHAR(*q); + } + break; + case 'd': + case 'i': + base = 10; + sign = 1; + goto handle_sign; + case 'h': + if (hflag) { + hflag = 0; + cflag = 1; + } else + hflag = 1; + goto reswitch; + case 'j': + jflag = 1; + goto reswitch; + case 'l': + if (lflag) { + lflag = 0; + qflag = 1; + } else + lflag = 1; + goto reswitch; + case 'n': + if (jflag) + *(va_arg(ap, intmax_t *)) = retval; + else if (qflag) + *(va_arg(ap, int64_t *)) = retval; + else if (lflag) + *(va_arg(ap, long *)) = retval; + else if (zflag) + *(va_arg(ap, size_t *)) = retval; + else if (hflag) + *(va_arg(ap, short *)) = retval; + else if (cflag) + *(va_arg(ap, char *)) = retval; + else + *(va_arg(ap, int *)) = retval; + break; + case 'o': + base = 8; + goto handle_nosign; + case 'p': + base = 16; + sharpflag = (width == 0); + sign = 0; + num = (uintptr_t)va_arg(ap, void *); + goto number; + case 'q': + qflag = 1; + goto reswitch; + case 'r': + base = radix; + if (sign) + goto handle_sign; + goto handle_nosign; + case 's': + p = va_arg(ap, char *); + if (p == NULL) + p = "(null)"; + if (!dot) + n = (int)strlen (p); + else + for (n = 0; n < dwidth && p[n]; n++) + continue; + + width -= n; + + if (!ladjust && width > 0) + while (width--) + PCHAR(padc); + while (n--) + PCHAR(*p++); + if (ladjust && width > 0) + while (width--) + PCHAR(padc); + break; + case 't': + tflag = 1; + goto reswitch; + case 'u': + base = 10; + goto handle_nosign; + case 'X': + upper = 1; + case 'x': + base = 16; + goto handle_nosign; + case 'y': + base = 16; + sign = 1; + goto handle_sign; + case 'z': + zflag = 1; + goto reswitch; +handle_nosign: + sign = 0; + if (jflag) + num = va_arg(ap, uintmax_t); + else if (qflag) + num = va_arg(ap, uint64_t); + else if (tflag) + num = va_arg(ap, ptrdiff_t); + else if (lflag) + num = va_arg(ap, unsigned long); + else if (zflag) + num = va_arg(ap, size_t); + else if (hflag) + num = (unsigned short)va_arg(ap, int); + else if (cflag) + num = (unsigned char)va_arg(ap, int); + else + num = va_arg(ap, unsigned int); + goto number; +handle_sign: + if (jflag) + num = va_arg(ap, intmax_t); + else if (qflag) + num = va_arg(ap, int64_t); + else if (tflag) + num = va_arg(ap, ptrdiff_t); + else if (lflag) + num = va_arg(ap, long); + else if (zflag) + num = va_arg(ap, ssize_t); + else if (hflag) + num = (short)va_arg(ap, int); + else if (cflag) + num = (char)va_arg(ap, int); + else + num = va_arg(ap, int); +number: + if (sign && (intmax_t)num < 0) { + neg = 1; + num = -(intmax_t)num; + } + p = ksprintn(nbuf, num, base, &n, upper); + tmp = 0; + if (sharpflag && num != 0) { + if (base == 8) + tmp++; + else if (base == 16) + tmp += 2; + } + if (neg) + tmp++; + + if (!ladjust && padc == '0') + dwidth = width - tmp; + width -= tmp + imax(dwidth, n); + dwidth -= n; + if (!ladjust) + while (width-- > 0) + PCHAR(' '); + if (neg) + PCHAR('-'); + if (sharpflag && num != 0) { + if (base == 8) { + PCHAR('0'); + } else if (base == 16) { + PCHAR('0'); + PCHAR('x'); + } + } + while (dwidth-- > 0) + PCHAR('0'); + + while (*p) + PCHAR(*p--); + + if (ladjust) + while (width-- > 0) + PCHAR(' '); + + break; + default: + while (percent < fmt) + PCHAR(*percent++); + /* + * Since we ignore an formatting argument it is no + * longer safe to obey the remaining formatting + * arguments as the arguments will no longer match + * the format specs. + */ + stop = 1; + break; + } + } +#undef PCHAR +} #else /* defined(USE_ELF) */ #error not supported #endif diff --git a/addr2line.h b/addr2line.h index ff8e476b92..f09b665800 100644 --- a/addr2line.h +++ b/addr2line.h @@ -12,10 +12,8 @@ #if (defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H)) -#include <stdio.h> - void -rb_dump_backtrace_with_lines(int num_traces, void **traces, FILE *errout); +rb_dump_backtrace_with_lines(int num_traces, void **traces); #endif /* USE_ELF */ @@ -28,6 +28,7 @@ #include "ruby/encoding.h" #include "ruby/st.h" #include "ruby/util.h" +#include "transient_heap.h" #include "builtin.h" #if !ARRAY_DEBUG @@ -46,8 +47,13 @@ VALUE rb_cArray; * 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). + * if USE_RVARGC * 3-9: RARRAY_EMBED_LEN * The length of the array when RARRAY_EMBED_FLAG is set. + * else + * 3-4: RARRAY_EMBED_LEN + * The length of the array when RARRAY_EMBED_FLAG is set. + * endif * 12: RARRAY_SHARED_ROOT_FLAG * The array is a shared root that does reference counting. The buffer * this array points to is owned by this array but may be pointed to @@ -57,6 +63,8 @@ VALUE rb_cArray; * they cannot be modified. Not updating the reference count * improves copy-on-write performance. Their reference count is * assumed to be infinity. + * 13: RARRAY_TRANSIENT_FLAG + * The buffer of the array is allocated on the transient heap. * 14: RARRAY_PTR_IN_USE_FLAG * The buffer of the array is in use. This is only used during * debugging. @@ -94,6 +102,7 @@ should_be_T_ARRAY(VALUE ary) #define FL_SET_EMBED(a) do { \ assert(!ARY_SHARED_P(a)); \ FL_SET((a), RARRAY_EMBED_FLAG); \ + RARY_TRANSIENT_UNSET(a); \ ary_verify(a); \ } while (0) @@ -152,6 +161,16 @@ should_be_T_ARRAY(VALUE ary) RARRAY(ary)->as.heap.aux.capa = (n); \ } while (0) +#define ARY_SET_SHARED(ary, value) do { \ + const VALUE _ary_ = (ary); \ + const VALUE _value_ = (value); \ + assert(!ARY_EMBED_P(_ary_)); \ + assert(ARY_SHARED_P(_ary_)); \ + assert(!OBJ_FROZEN(_ary_)); \ + assert(ARY_SHARED_ROOT_P(_value_) || OBJ_FROZEN(_value_)); \ + RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared_root, _value_); \ +} 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)); \ @@ -162,6 +181,7 @@ should_be_T_ARRAY(VALUE ary) #define FL_SET_SHARED_ROOT(ary) do { \ assert(!OBJ_FROZEN(ary)); \ assert(!ARY_EMBED_P(ary)); \ + assert(!RARRAY_TRANSIENT_P(ary)); \ FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \ } while (0) @@ -178,9 +198,13 @@ ARY_SET(VALUE a, long i, VALUE v) static long ary_embed_capa(VALUE ary) { +#if USE_RVARGC size_t size = rb_gc_obj_slot_size(ary) - offsetof(struct RArray, as.ary); assert(size % sizeof(VALUE) == 0); return size / sizeof(VALUE); +#else + return RARRAY_EMBED_LEN_MAX; +#endif } static size_t @@ -192,7 +216,11 @@ ary_embed_size(long capa) static bool ary_embeddable_p(long capa) { +#if USE_RVARGC return rb_gc_size_allocatable_p(ary_embed_size(capa)); +#else + return capa <= RARRAY_EMBED_LEN_MAX; +#endif } bool @@ -238,18 +266,20 @@ ary_verify_(VALUE ary, const char *file, int line) 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); + const VALUE *root_ptr = RARRAY_CONST_PTR_TRANSIENT(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); ary_verify(root); } else if (ARY_EMBED_P(ary)) { + assert(!RARRAY_TRANSIENT_P(ary)); assert(!ARY_SHARED_P(ary)); assert(RARRAY_LEN(ary) <= ary_embed_capa(ary)); } else { - const VALUE *ptr = RARRAY_CONST_PTR(ary); +#if 1 + const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(ary); long i, len = RARRAY_LEN(ary); volatile VALUE v; if (len > 1) len = 1; /* check only HEAD */ @@ -257,7 +287,16 @@ ary_verify_(VALUE ary, const char *file, int line) v = ptr[i]; /* access check */ } v = v; +#endif + } + +#if USE_TRANSIENT_HEAP + if (RARRAY_TRANSIENT_P(ary)) { + assert(rb_transient_heap_managed_ptr_p(RARRAY_CONST_PTR_TRANSIENT(ary))); } +#endif + + rb_transient_heap_verify(); return ary; } @@ -277,7 +316,7 @@ rb_ary_ptr_use_start(VALUE ary) #if ARRAY_DEBUG FL_SET_RAW(ary, RARRAY_PTR_IN_USE_FLAG); #endif - return (VALUE *)RARRAY_CONST_PTR(ary); + return (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary); } void @@ -299,7 +338,7 @@ rb_mem_clear(VALUE *mem, long size) static void ary_mem_clear(VALUE ary, long beg, long size) { - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { rb_mem_clear(ptr + beg, size); }); } @@ -315,7 +354,7 @@ memfill(register VALUE *mem, register long size, register VALUE val) static void ary_memfill(VALUE ary, long beg, long size, VALUE val) { - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { memfill(ptr + beg, size, val); RB_OBJ_WRITTEN(ary, Qundef, val); }); @@ -328,13 +367,13 @@ ary_memcpy0(VALUE ary, long beg, long argc, const VALUE *argv, VALUE buff_owner_ if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) { rb_gc_writebarrier_remember(buff_owner_ary); - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { MEMCPY(ptr+beg, argv, VALUE, argc); }); } else { int i; - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { for (i=0; i<argc; i++) { RB_OBJ_WRITE(buff_owner_ary, &ptr[i+beg], argv[i]); } @@ -349,46 +388,143 @@ ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv) } static VALUE * -ary_heap_alloc(size_t capa) +ary_heap_alloc(VALUE ary, size_t capa) { - return ALLOC_N(VALUE, capa); + VALUE *ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * capa); + + if (ptr != NULL) { + RARY_TRANSIENT_SET(ary); + } + else { + RARY_TRANSIENT_UNSET(ary); + ptr = ALLOC_N(VALUE, capa); + } + + return ptr; } static void ary_heap_free_ptr(VALUE ary, const VALUE *ptr, long size) { - ruby_sized_xfree((void *)ptr, size); + if (RARRAY_TRANSIENT_P(ary)) { + /* ignore it */ + } + else { + ruby_sized_xfree((void *)ptr, size); + } } static void ary_heap_free(VALUE ary) { - ary_heap_free_ptr(ary, ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary)); + if (RARRAY_TRANSIENT_P(ary)) { + RARY_TRANSIENT_UNSET(ary); + } + else { + ary_heap_free_ptr(ary, ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary)); + } } static size_t ary_heap_realloc(VALUE ary, size_t new_capa) { - SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, ARY_HEAP_CAPA(ary)); + size_t alloc_capa = new_capa; + size_t old_capa = ARY_HEAP_CAPA(ary); + + if (RARRAY_TRANSIENT_P(ary)) { + if (new_capa <= old_capa) { + /* do nothing */ + alloc_capa = old_capa; + } + else { + VALUE *new_ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * new_capa); + + if (new_ptr == NULL) { + new_ptr = ALLOC_N(VALUE, new_capa); + RARY_TRANSIENT_UNSET(ary); + } + + MEMCPY(new_ptr, ARY_HEAP_PTR(ary), VALUE, old_capa); + ARY_SET_PTR(ary, new_ptr); + } + } + else { + SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, old_capa); + } + ary_verify(ary); + + return alloc_capa; +} + +#if USE_TRANSIENT_HEAP +static inline void +rb_ary_transient_heap_evacuate_(VALUE ary, int transient, int promote) +{ + if (transient) { + assert(!ARY_SHARED_ROOT_P(ary)); + + VALUE *new_ptr; + const VALUE *old_ptr = ARY_HEAP_PTR(ary); + long capa = ARY_HEAP_CAPA(ary); + + assert(ARY_OWNS_HEAP_P(ary)); + assert(RARRAY_TRANSIENT_P(ary)); + assert(!ARY_PTR_USING_P(ary)); + + if (promote) { + new_ptr = ALLOC_N(VALUE, capa); + RARY_TRANSIENT_UNSET(ary); + } + else { + new_ptr = ary_heap_alloc(ary, capa); + } + + MEMCPY(new_ptr, old_ptr, VALUE, capa); + /* do not use ARY_SET_PTR() because they assert !frozen */ + RARRAY(ary)->as.heap.ptr = new_ptr; + } + ary_verify(ary); +} - return new_capa; +void +rb_ary_transient_heap_evacuate(VALUE ary, int promote) +{ + rb_ary_transient_heap_evacuate_(ary, RARRAY_TRANSIENT_P(ary), promote); } void +rb_ary_detransient(VALUE ary) +{ + assert(RARRAY_TRANSIENT_P(ary)); + rb_ary_transient_heap_evacuate_(ary, TRUE, TRUE); +} +#else +void +rb_ary_detransient(VALUE ary) +{ + /* do nothing */ +} +#endif + +void rb_ary_make_embedded(VALUE ary) { assert(rb_ary_embeddable_p(ary)); if (!ARY_EMBED_P(ary)) { const VALUE *buf = ARY_HEAP_PTR(ary); long len = ARY_HEAP_LEN(ary); + bool was_transient = RARRAY_TRANSIENT_P(ary); + // FL_SET_EMBED also unsets the transient flag FL_SET_EMBED(ary); ARY_SET_EMBED_LEN(ary, len); MEMCPY((void *)ARY_EMBED_PTR(ary), (void *)buf, VALUE, len); - ary_heap_free_ptr(ary, buf, len * sizeof(VALUE)); + if (!was_transient) { + ary_heap_free_ptr(ary, buf, len * sizeof(VALUE)); + } } } @@ -403,7 +539,7 @@ ary_resize_capa(VALUE ary, long capacity) 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(ary, capacity); MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len); FL_UNSET_EMBED(ary); @@ -507,15 +643,10 @@ 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)); - rb_ary_increment_share(shared_root); FL_SET_SHARED(ary); - RB_OBJ_WRITE(ary, &RARRAY(ary)->as.heap.aux.shared_root, shared_root); - RB_DEBUG_COUNTER_INC(obj_ary_shared_create); + ARY_SET_SHARED(ary, shared_root); } static inline void @@ -543,18 +674,18 @@ rb_ary_cancel_sharing(VALUE ary) ARY_SET_EMBED_LEN(ary, len); } else if (ARY_SHARED_ROOT_OCCUPIED(shared_root) && len > ((shared_len = RARRAY_LEN(shared_root))>>1)) { - long shift = RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared_root); + long shift = RARRAY_CONST_PTR_TRANSIENT(ary) - RARRAY_CONST_PTR_TRANSIENT(shared_root); FL_UNSET_SHARED(ary); - ARY_SET_PTR(ary, RARRAY_CONST_PTR(shared_root)); + ARY_SET_PTR(ary, RARRAY_CONST_PTR_TRANSIENT(shared_root)); ARY_SET_CAPA(ary, shared_len); - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { MEMMOVE(ptr, ptr+shift, VALUE, len); }); FL_SET_EMBED(shared_root); rb_ary_decrement_share(shared_root); } else { - VALUE *ptr = ary_heap_alloc(len); + VALUE *ptr = ary_heap_alloc(ary, len); MEMCPY(ptr, ARY_HEAP_PTR(ary), VALUE, len); rb_ary_unshare(ary); ARY_SET_CAPA(ary, len); @@ -587,7 +718,7 @@ ary_ensure_room_for_push(VALUE ary, long add_len) if (new_len > ary_embed_capa(ary)) { VALUE shared_root = ARY_SHARED_ROOT(ary); if (ARY_SHARED_ROOT_OCCUPIED(shared_root)) { - if (ARY_HEAP_PTR(ary) - RARRAY_CONST_PTR(shared_root) + new_len <= RARRAY_LEN(shared_root)) { + if (ARY_HEAP_PTR(ary) - RARRAY_CONST_PTR_TRANSIENT(shared_root) + new_len <= RARRAY_LEN(shared_root)) { rb_ary_modify_check(ary); ary_verify(ary); @@ -665,9 +796,12 @@ ary_alloc_embed(VALUE klass, long capa) { size_t size = ary_embed_size(capa); assert(rb_gc_size_allocatable_p(size)); - NEWOBJ_OF(ary, struct RArray, klass, +#if !USE_RVARGC + assert(size <= sizeof(struct RArray)); +#endif + RVARGC_NEWOBJ_OF(ary, struct RArray, klass, T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0), - size, 0); + size); /* Created array is: * FL_SET_EMBED((VALUE)ary); * ARY_SET_EMBED_LEN((VALUE)ary, 0); @@ -678,9 +812,9 @@ ary_alloc_embed(VALUE klass, long capa) static VALUE ary_alloc_heap(VALUE klass) { - NEWOBJ_OF(ary, struct RArray, klass, + RVARGC_NEWOBJ_OF(ary, struct RArray, klass, T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0), - sizeof(struct RArray), 0); + sizeof(struct RArray)); return (VALUE)ary; } @@ -694,7 +828,7 @@ empty_ary_alloc(VALUE klass) static VALUE ary_new(VALUE klass, long capa) { - VALUE ary; + VALUE ary,*ptr; if (capa < 0) { rb_raise(rb_eArgError, "negative array size (or size too big)"); @@ -713,7 +847,8 @@ ary_new(VALUE klass, long capa) ARY_SET_CAPA(ary, capa); assert(!ARY_EMBED_P(ary)); - ARY_SET_PTR(ary, ary_heap_alloc(capa)); + ptr = ary_heap_alloc(ary, capa); + ARY_SET_PTR(ary, ptr); ARY_SET_HEAP_LEN(ary, 0); } @@ -751,7 +886,7 @@ VALUE return ary; } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts) { VALUE ary; @@ -776,9 +911,12 @@ 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)); - NEWOBJ_OF(ary, struct RArray, klass, - T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0), - size, ec); +#if !USE_RVARGC + assert(size <= sizeof(struct RArray)); +#endif + RB_RVARGC_EC_NEWOBJ_OF(ec, ary, struct RArray, klass, + T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0), + size); /* Created array is: * FL_SET_EMBED((VALUE)ary); * ARY_SET_EMBED_LEN((VALUE)ary, 0); @@ -789,16 +927,16 @@ ec_ary_alloc_embed(rb_execution_context_t *ec, VALUE klass, long capa) static VALUE ec_ary_alloc_heap(rb_execution_context_t *ec, VALUE klass) { - NEWOBJ_OF(ary, struct RArray, klass, - T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0), - sizeof(struct RArray), ec); + RB_RVARGC_EC_NEWOBJ_OF(ec, ary, struct RArray, klass, + T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0), + sizeof(struct RArray)); return (VALUE)ary; } static VALUE ec_ary_new(rb_execution_context_t *ec, VALUE klass, long capa) { - VALUE ary; + VALUE ary,*ptr; if (capa < 0) { rb_raise(rb_eArgError, "negative array size (or size too big)"); @@ -817,7 +955,8 @@ ec_ary_new(rb_execution_context_t *ec, VALUE klass, long capa) ARY_SET_CAPA(ary, capa); assert(!ARY_EMBED_P(ary)); - ARY_SET_PTR(ary, ary_heap_alloc(capa)); + ptr = ary_heap_alloc(ary, capa); + ARY_SET_PTR(ary, ptr); ARY_SET_HEAP_LEN(ary, 0); } @@ -842,6 +981,7 @@ VALUE rb_ary_hidden_new(long capa) { VALUE ary = ary_new(0, capa); + rb_ary_transient_heap_evacuate(ary, TRUE); return ary; } @@ -864,8 +1004,13 @@ rb_ary_free(VALUE ary) RB_DEBUG_COUNTER_INC(obj_ary_extracapa); } - RB_DEBUG_COUNTER_INC(obj_ary_ptr); - ary_heap_free(ary); + if (RARRAY_TRANSIENT_P(ary)) { + RB_DEBUG_COUNTER_INC(obj_ary_transient); + } + else { + RB_DEBUG_COUNTER_INC(obj_ary_ptr); + ary_heap_free(ary); + } } else { RB_DEBUG_COUNTER_INC(obj_ary_embed); @@ -893,6 +1038,7 @@ rb_ary_memsize(VALUE ary) static VALUE ary_make_shared(VALUE ary) { + assert(USE_RVARGC || !ARY_EMBED_P(ary)); ary_verify(ary); if (ARY_SHARED_P(ary)) { @@ -903,11 +1049,14 @@ ary_make_shared(VALUE ary) } else if (OBJ_FROZEN(ary)) { if (!ARY_EMBED_P(ary)) { + rb_ary_transient_heap_evacuate(ary, TRUE); ary_shrink_capa(ary); } return ary; } else { + rb_ary_transient_heap_evacuate(ary, TRUE); + long capa = ARY_CAPA(ary); long len = RARRAY_LEN(ary); @@ -917,21 +1066,26 @@ ary_make_shared(VALUE ary) FL_SET_SHARED_ROOT(shared); if (ARY_EMBED_P(ary)) { - VALUE *ptr = ary_heap_alloc(capa); + /* Cannot use ary_heap_alloc because we don't want to allocate + * on the transient heap. */ + VALUE *ptr = ALLOC_N(VALUE, capa); ARY_SET_PTR(shared, ptr); - ary_memcpy(shared, 0, len, RARRAY_CONST_PTR(ary)); + ary_memcpy(shared, 0, len, RARRAY_PTR(ary)); FL_UNSET_EMBED(ary); ARY_SET_HEAP_LEN(ary, len); ARY_SET_PTR(ary, ptr); } else { - ARY_SET_PTR(shared, RARRAY_CONST_PTR(ary)); + ARY_SET_PTR(shared, RARRAY_PTR(ary)); } ARY_SET_LEN(shared, capa); ary_mem_clear(shared, len, capa - len); - rb_ary_set_shared(ary, shared); + ARY_SET_SHARED_ROOT_REFCNT(shared, 1); + FL_SET_SHARED(ary); + RB_DEBUG_COUNTER_INC(obj_ary_shared_create); + ARY_SET_SHARED(ary, shared); ary_verify(shared); ary_verify(ary); @@ -949,7 +1103,7 @@ ary_make_substitution(VALUE ary) VALUE subst = rb_ary_new_capa(len); assert(ARY_EMBED_P(subst)); - ary_memcpy(subst, 0, len, RARRAY_CONST_PTR(ary)); + ary_memcpy(subst, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary)); ARY_SET_EMBED_LEN(subst, len); return subst; } @@ -977,7 +1131,7 @@ rb_check_array_type(VALUE ary) return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary); } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_check_to_array(VALUE ary) { return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_a); @@ -1052,7 +1206,7 @@ rb_ary_s_new(int argc, VALUE *argv, VALUE klass) * a.class # => Array * a # => [:foo, "bar", 2] * - * With no block and a single Integer argument +size+, + * With no block and a single \Integer argument +size+, * returns a new \Array of the given size * whose elements are all +nil+: * @@ -1192,22 +1346,21 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len) assert(len >= 0); assert(offset+len <= RARRAY_LEN(ary)); - VALUE result = ary_alloc_heap(klass); - size_t embed_capa = ary_embed_capa(result); - if ((size_t)len <= embed_capa) { - FL_SET_EMBED(result); - ary_memcpy(result, 0, len, RARRAY_CONST_PTR(ary) + offset); + const size_t rarray_embed_capa_max = (sizeof(struct RArray) - offsetof(struct RArray, as.ary)) / sizeof(VALUE); + + if ((size_t)len <= rarray_embed_capa_max && ary_embeddable_p(len)) { + VALUE result = ary_alloc_embed(klass, len); + ary_memcpy(result, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary) + offset); ARY_SET_EMBED_LEN(result, len); + return result; } else { VALUE shared = ary_make_shared(ary); - /* 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); + VALUE result = ary_alloc_heap(klass); + assert(!ARY_EMBED_P(result)); - ARY_SET_PTR(result, RARRAY_CONST_PTR(ary)); + ARY_SET_PTR(result, RARRAY_CONST_PTR_TRANSIENT(ary)); ARY_SET_LEN(result, RARRAY_LEN(ary)); rb_ary_set_shared(result, shared); @@ -1215,10 +1368,9 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len) ARY_SET_LEN(result, len); ary_verify(shared); + ary_verify(result); + return result; } - - ary_verify(result); - return result; } static VALUE @@ -1229,13 +1381,12 @@ ary_make_partial_step(VALUE ary, VALUE klass, long offset, long len, long step) assert(offset+len <= RARRAY_LEN(ary)); assert(step != 0); + const VALUE *values = RARRAY_CONST_PTR_TRANSIENT(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; @@ -1253,8 +1404,6 @@ 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; @@ -1262,9 +1411,7 @@ 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, { + RARRAY_PTR_USE_TRANSIENT(result, ptr, { for (i = 0; i < len; ++i) { RB_OBJ_WRITE(result, ptr+i, values[j]); j += step; @@ -1289,11 +1436,20 @@ enum ary_take_pos_flags }; static VALUE -ary_take_first_or_last_n(VALUE ary, long n, enum ary_take_pos_flags last) +ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos_flags last) { - long len = RARRAY_LEN(ary); + long n; + long len; long offset = 0; + argc = rb_check_arity(argc, 0, 1); + /* the case optional argument is omitted should be handled in + * callers of this function. if another arity case is added, + * this arity check needs to rewrite. */ + RUBY_ASSERT_ALWAYS(argc == 1); + + n = NUM2LONG(argv[0]); + len = RARRAY_LEN(ary); if (n > len) { n = len; } @@ -1306,17 +1462,6 @@ ary_take_first_or_last_n(VALUE ary, long n, enum ary_take_pos_flags last) return ary_make_partial(ary, rb_cArray, offset, n); } -static VALUE -ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos_flags last) -{ - argc = rb_check_arity(argc, 0, 1); - /* the case optional argument is omitted should be handled in - * callers of this function. if another arity case is added, - * this arity check needs to rewrite. */ - RUBY_ASSERT_ALWAYS(argc == 1); - return ary_take_first_or_last_n(ary, NUM2LONG(argv[0]), last); -} - /* * call-seq: * array << object -> self @@ -1339,7 +1484,7 @@ rb_ary_push(VALUE ary, VALUE item) { long idx = RARRAY_LEN((ary_verify(ary), ary)); VALUE target_ary = ary_ensure_room_for_push(ary, 1); - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { RB_OBJ_WRITE(target_ary, &ptr[idx], item); }); ARY_SET_LEN(ary, idx + 1); @@ -1374,6 +1519,8 @@ rb_ary_cat(VALUE ary, const VALUE *argv, long len) * a1 = a.push([:baz, :bat], [:bam, :bad]) * a1 # => [:foo, "bar", 2, [:baz, :bat], [:bam, :bad]] * + * Array#append is an alias for Array#push. + * * Related: #pop, #shift, #unshift. */ @@ -1418,7 +1565,7 @@ rb_ary_pop(VALUE ary) * * Returns +nil+ if the array is empty. * - * When a non-negative Integer argument +n+ is given and is in range, + * 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] @@ -1482,7 +1629,7 @@ rb_ary_shift(VALUE ary) * * Returns +nil+ if +self+ is empty. * - * When positive Integer argument +n+ is given, removes the first +n+ elements; + * When positive \Integer argument +n+ is given, removes the first +n+ elements; * returns those elements in a new \Array: * * a = [:foo, 'bar', 2] @@ -1518,7 +1665,7 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary) return result; } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_ary_behead(VALUE ary, long n) { if (n <= 0) { @@ -1529,7 +1676,7 @@ rb_ary_behead(VALUE ary, long n) if (!ARY_SHARED_P(ary)) { if (ARY_EMBED_P(ary) || RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) { - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { MEMMOVE(ptr, ptr + n, VALUE, RARRAY_LEN(ary) - n); }); /* WB: no new reference */ ARY_INCREASE_LEN(ary, -n); @@ -1590,12 +1737,12 @@ ary_modify_for_unshift(VALUE ary, int argc) capa = ARY_CAPA(ary); ary_make_shared(ary); - head = sharedp = RARRAY_CONST_PTR(ary); + head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary); return make_room_for_unshift(ary, head, (void *)sharedp, argc, capa, len); } else { /* sliding items */ - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { MEMMOVE(ptr + argc, ptr, VALUE, len); }); @@ -1627,8 +1774,8 @@ ary_ensure_room_for_unshift(VALUE ary, int argc) return ary_modify_for_unshift(ary, argc); } else { - const VALUE * head = RARRAY_CONST_PTR(ary); - void *sharedp = (void *)RARRAY_CONST_PTR(shared_root); + const VALUE * head = RARRAY_CONST_PTR_TRANSIENT(ary); + void *sharedp = (void *)RARRAY_CONST_PTR_TRANSIENT(shared_root); rb_ary_modify_check(ary); return make_room_for_unshift(ary, head, sharedp, argc, capa, len); @@ -1645,10 +1792,12 @@ ary_ensure_room_for_unshift(VALUE ary, int argc) * a = [:foo, 'bar', 2] * a.unshift(:bam, :bat) # => [:bam, :bat, :foo, "bar", 2] * + * Array#prepend is an alias for Array#unshift. + * * Related: #push, #pop, #shift. */ -VALUE +static VALUE rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary) { long len = RARRAY_LEN(ary); @@ -1668,7 +1817,7 @@ rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary) VALUE rb_ary_unshift(VALUE ary, VALUE item) { - return rb_ary_unshift_m(1, &item, ary); + return rb_ary_unshift_m(1,&item,ary); } /* faster version - use this if you don't need to treat negative offset */ @@ -1732,7 +1881,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e); * * Returns elements from +self+; does not modify +self+. * - * When a single Integer argument +index+ is given, returns the element at offset +index+: + * When a single \Integer argument +index+ is given, returns the element at offset +index+: * * a = [:foo, 'bar', 2] * a[0] # => :foo @@ -1747,7 +1896,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, + * When two \Integer arguments +start+ and +length+ are given, * returns a new \Array of size +length+ containing successive elements beginning at offset +start+: * * a = [:foo, 'bar', 2] @@ -1767,7 +1916,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e); * * If +length+ is negative, returns +nil+. * - * When a single Range argument +range+ is given, + * When a single \Range argument +range+ is given, * treats <tt>range.min</tt> as +start+ above * and <tt>range.size</tt> as +length+ above: * @@ -1821,6 +1970,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e); * # Raises TypeError (no implicit conversion of Symbol into Integer): * a[:foo] * + * Array#slice is an alias for Array#[]. */ VALUE @@ -1844,7 +1994,7 @@ rb_ary_aref2(VALUE ary, VALUE b, VALUE e) return rb_ary_subseq(ary, beg, len); } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_ary_aref1(VALUE ary, VALUE arg) { long beg, len, step; @@ -1870,7 +2020,7 @@ rb_ary_aref1(VALUE ary, VALUE arg) * call-seq: * array.at(index) -> object * - * Returns the element at Integer offset +index+; does not modify +self+. + * Returns the element at \Integer offset +index+; does not modify +self+. * a = [:foo, 'bar', 2] * a.at(0) # => :foo * a.at(2) # => 2 @@ -1883,7 +2033,39 @@ rb_ary_at(VALUE ary, VALUE pos) return rb_ary_entry(ary, NUM2LONG(pos)); } -#if 0 +/* + * call-seq: + * array.first -> object or nil + * array.first(n) -> new_array + * + * Returns elements from +self+; does not modify +self+. + * + * When no argument is given, returns the first element: + * + * a = [:foo, 'bar', 2] + * a.first # => :foo + * a # => [:foo, "bar", 2] + * + * 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"] + * + * If <tt>n >= array.size</tt>, returns all elements: + * + * a = [:foo, 'bar', 2] + * 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. + */ static VALUE rb_ary_first(int argc, VALUE *argv, VALUE ary) { @@ -1895,26 +2077,48 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary) return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST); } } -#endif - -static VALUE -ary_first(VALUE self) -{ - return (RARRAY_LEN(self) == 0) ? Qnil : RARRAY_AREF(self, 0); -} -static VALUE -ary_last(VALUE self) -{ - long len = RARRAY_LEN(self); - return (len == 0) ? Qnil : RARRAY_AREF(self, len-1); -} +/* + * call-seq: + * array.last -> object or nil + * array.last(n) -> new_array + * + * Returns elements from +self+; +self+ is not modified. + * + * When no argument is given, returns the last element: + * + * a = [:foo, 'bar', 2] + * a.last # => 2 + * a # => [:foo, "bar", 2] + * + * 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: + * + * a = [:foo, 'bar', 2] + * a.last(50) # => [:foo, "bar", 2] + * + * If <tt>n == 0</tt>, returns an new empty \Array: + * + * a = [:foo, 'bar', 2] + * a.last(0) # [] + * + * Related: #first. + */ VALUE -rb_ary_last(int argc, const VALUE *argv, VALUE ary) // used by parse.y +rb_ary_last(int argc, const VALUE *argv, VALUE ary) { if (argc == 0) { - return ary_last(ary); + long len = RARRAY_LEN(ary); + if (len == 0) return Qnil; + return RARRAY_AREF(ary, len-1); } else { return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST); @@ -1929,7 +2133,7 @@ rb_ary_last(int argc, const VALUE *argv, VALUE ary) // used by parse.y * * Returns the element at offset +index+. * - * With the single Integer argument +index+, + * With the single \Integer argument +index+, * returns the element at offset +index+: * * a = [:foo, 'bar', 2] @@ -2019,6 +2223,8 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary) * e # => #<Enumerator: [:foo, "bar", 2]:index> * e.each {|element| element == 'bar' } # => 1 * + * Array#find_index is an alias for Array#index. + * * Related: #rindex. */ @@ -2073,7 +2279,7 @@ 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: + * When neither an argument nor a block is given, returns a new \Enumerator: * * a = [:foo, 'bar', 2, 'bar'] * e = a.rindex @@ -2145,7 +2351,7 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen) } { - const VALUE *optr = RARRAY_CONST_PTR(ary); + const VALUE *optr = RARRAY_CONST_PTR_TRANSIENT(ary); rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1; } @@ -2158,7 +2364,7 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen) len = beg + rlen; ary_mem_clear(ary, olen, beg - olen); if (rlen > 0) { - if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs; + if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs; ary_memcpy0(ary, beg, rlen, rptr, target_ary); } ARY_SET_LEN(ary, len); @@ -2176,25 +2382,20 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen) } if (len != rlen) { - RARRAY_PTR_USE(ary, ptr, + RARRAY_PTR_USE_TRANSIENT(ary, ptr, MEMMOVE(ptr + beg + rlen, ptr + beg + len, VALUE, olen - (beg + len))); ARY_SET_LEN(ary, alen); } if (rlen > 0) { - if (rofs == -1) { - rb_gc_writebarrier_remember(ary); - } - else { - /* In this case, we're copying from a region in this array, so - * we don't need to fire the write barrier. */ - rptr = RARRAY_CONST_PTR(ary) + rofs; - } + if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs; + /* give up wb-protected ary */ + RB_OBJ_WB_UNPROTECT_FOR(ARRAY, ary); /* do not use RARRAY_PTR() because it can causes GC. * ary can contain T_NONE object because it is not cleared. */ - RARRAY_PTR_USE(ary, ptr, + RARRAY_PTR_USE_TRANSIENT(ary, ptr, MEMMOVE(ptr + beg, rptr, VALUE, rlen)); } } @@ -2239,8 +2440,9 @@ rb_ary_resize(VALUE ary, long len) else if (len <= ary_embed_capa(ary)) { const VALUE *ptr = ARY_HEAP_PTR(ary); long ptr_capa = ARY_HEAP_SIZE(ary); - bool is_malloc_ptr = !ARY_SHARED_P(ary); + bool is_malloc_ptr = !ARY_SHARED_P(ary) && !RARRAY_TRANSIENT_P(ary); + FL_UNSET(ary, RARRAY_TRANSIENT_FLAG); FL_SET_EMBED(ary); MEMCPY((VALUE *)ARY_EMBED_PTR(ary), ptr, VALUE, len); /* WB: no new reference */ @@ -2270,7 +2472,7 @@ static VALUE ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val) { VALUE rpl = rb_ary_to_ary(val); - rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR(rpl), RARRAY_LEN(rpl)); + rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR_TRANSIENT(rpl), RARRAY_LEN(rpl)); RB_GC_GUARD(rpl); return val; } @@ -2283,7 +2485,7 @@ ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val) * * Assigns elements in +self+; returns the given +object+. * - * When Integer argument +index+ is given, assigns +object+ to an element in +self+. + * When \Integer argument +index+ is given, assigns +object+ to an element in +self+. * * If +index+ is non-negative, assigns +object+ the element at offset +index+: * @@ -2303,7 +2505,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+: * @@ -2338,7 +2540,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 an \Array, * removes <tt>length - 1</tt> elements beginning at offset +start+, * and assigns +object+ at offset +start+: * @@ -2418,7 +2620,7 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary) * call-seq: * array.insert(index, *objects) -> self * - * Inserts given +objects+ before or after the element at Integer index +offset+; + * Inserts given +objects+ before or after the element at \Integer index +offset+; * returns +self+. * * When +index+ is non-negative, inserts all given +objects+ @@ -2512,7 +2714,7 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj) * foo * bar * - * When no block given, returns a new Enumerator: + * When no block given, returns a new \Enumerator: * a = [:foo, 'bar', 2] * * e = a.each @@ -2569,7 +2771,7 @@ rb_ary_each(VALUE ary) * 0 * 1 * - * When no block given, returns a new Enumerator: + * When no block given, returns a new \Enumerator: * * a = [:foo, 'bar', 2] * e = a.each_index @@ -2626,7 +2828,7 @@ rb_ary_each_index(VALUE ary) * 2 * bar * - * When no block given, returns a new Enumerator: + * When no block given, returns a new \Enumerator: * * a = [:foo, 'bar', 2] * e = a.reverse_each @@ -2693,7 +2895,7 @@ rb_ary_dup(VALUE ary) { long len = RARRAY_LEN(ary); VALUE dup = rb_ary_new2(len); - ary_memcpy(dup, 0, len, RARRAY_CONST_PTR(ary)); + ary_memcpy(dup, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary)); ARY_SET_LEN(dup, len); ary_verify(ary); @@ -2846,7 +3048,7 @@ rb_ary_join(VALUE ary, VALUE sep) * array.join ->new_string * array.join(separator = $,) -> new_string * - * Returns the new String formed by joining the array elements after conversion. + * Returns the new \String formed by joining the array elements after conversion. * For each element +element+: * * - Uses <tt>element.to_s</tt> if +element+ is not a <tt>kind_of?(Array)</tt>. @@ -2906,12 +3108,13 @@ inspect_ary(VALUE ary, VALUE dummy, int recur) * call-seq: * array.inspect -> 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]" * + * Array#to_s is an alias for Array#inspect. */ static VALUE @@ -2964,18 +3167,18 @@ rb_ary_to_a(VALUE ary) * array.to_h -> new_hash * array.to_h {|item| ... } -> 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: + * form a key-value pair in the returned \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}} * * 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: + * each sub-array is formed into a key-value pair in the new \Hash: * * [].to_h # => {} * a = [['foo', 'zero'], ['bar', 'one'], ['baz', 'two']] @@ -3039,7 +3242,7 @@ rb_ary_reverse(VALUE ary) rb_ary_modify(ary); if (len > 1) { - RARRAY_PTR_USE(ary, p1, { + RARRAY_PTR_USE_TRANSIENT(ary, p1, { p2 = p1 + len - 1; /* points last item */ ary_reverse(p1, p2); }); /* WB: no new reference */ @@ -3083,8 +3286,8 @@ rb_ary_reverse_m(VALUE ary) VALUE dup = rb_ary_new2(len); if (len > 0) { - const VALUE *p1 = RARRAY_CONST_PTR(ary); - VALUE *p2 = (VALUE *)RARRAY_CONST_PTR(dup) + len - 1; + const VALUE *p1 = RARRAY_CONST_PTR_TRANSIENT(ary); + VALUE *p2 = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(dup) + len - 1; do *p2-- = *p1++; while (--len > 0); } ARY_SET_LEN(dup, RARRAY_LEN(ary)); @@ -3126,7 +3329,7 @@ rb_ary_rotate(VALUE ary, long cnt) if (cnt != 0) { long len = RARRAY_LEN(ary); if (len > 1 && (cnt = rotate_count(cnt, len)) > 0) { - RARRAY_PTR_USE(ary, ptr, ary_rotate_ptr(ptr, len, cnt)); + RARRAY_PTR_USE_TRANSIENT(ary, ptr, ary_rotate_ptr(ptr, len, cnt)); return ary; } } @@ -3145,7 +3348,7 @@ rb_ary_rotate(VALUE ary, long cnt) * a = [:foo, 'bar', 2, 'bar'] * a.rotate! # => ["bar", 2, "bar", :foo] * - * When given a non-negative Integer +count+, + * When given a non-negative \Integer +count+, * rotates +count+ elements from the beginning to the end: * * a = [:foo, 'bar', 2] @@ -3202,7 +3405,7 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary) * a1 = a.rotate * a1 # => ["bar", 2, "bar", :foo] * - * When given a non-negative Integer +count+, + * When given a non-negative \Integer +count+, * returns a new \Array with +count+ elements rotated from the beginning to the end: * * a = [:foo, 'bar', 2] @@ -3221,7 +3424,7 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary) * a1 = a.rotate(0) * a1 # => [:foo, "bar", 2] * - * When given a negative Integer +count+, rotates in the opposite direction, + * When given a negative \Integer +count+, rotates in the opposite direction, * from end to beginning: * * a = [:foo, 'bar', 2] @@ -3248,7 +3451,7 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary) rotated = rb_ary_new2(len); if (len > 0) { cnt = rotate_count(cnt, len); - ptr = RARRAY_CONST_PTR(ary); + ptr = RARRAY_CONST_PTR_TRANSIENT(ary); len -= cnt; ary_memcpy(rotated, 0, len, ptr + cnt); ary_memcpy(rotated, len, cnt, ptr); @@ -3387,9 +3590,6 @@ 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)); } @@ -3582,7 +3782,7 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy)) * a.sort_by! {|element| element.size } * a # => ["d", "cc", "bbb", "aaaa"] * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = ['aaaa', 'bbb', 'cc', 'd'] * a.sort_by! # => #<Enumerator: ["aaaa", "bbb", "cc", "d"]:sort_by!> @@ -3614,11 +3814,12 @@ rb_ary_sort_by_bang(VALUE ary) * a1 = a.map {|element| element.class } * a1 # => [Symbol, String, Integer] * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * a = [:foo, 'bar', 2] * a1 = a.map * a1 # => #<Enumerator: [:foo, "bar", 2]:map> * + * Array#collect is an alias for Array#map. */ static VALUE @@ -3647,12 +3848,13 @@ rb_ary_collect(VALUE ary) * a = [:foo, 'bar', 2] * a.map! { |element| element.class } # => [Symbol, String, Integer] * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [:foo, 'bar', 2] * a1 = a.map! * a1 # => #<Enumerator: [:foo, "bar", 2]:map!> * + * Array#collect! is an alias for Array#map!. */ static VALUE @@ -3704,7 +3906,7 @@ append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx) /* check if idx is Range */ else if (rb_range_beg_len(idx, &beg, &len, olen, 1)) { if (len > 0) { - const VALUE *const src = RARRAY_CONST_PTR(ary); + const VALUE *const src = RARRAY_CONST_PTR_TRANSIENT(ary); const long end = beg + len; const long prevlen = RARRAY_LEN(result); if (beg < olen) { @@ -3727,7 +3929,7 @@ append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx) * array.values_at(*indexes) -> new_array * * Returns a new \Array whose elements are the elements - * of +self+ at the given Integer or Range +indexes+. + * of +self+ at the given \Integer or \Range +indexes+. * * For each positive +index+, returns the element at offset +index+: * @@ -3791,11 +3993,12 @@ rb_ary_values_at(int argc, VALUE *argv, VALUE ary) * a1 = a.select {|element| element.to_s.start_with?('b') } * a1 # => ["bar", :bam] * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [:foo, 'bar', 2, :bam] * a.select # => #<Enumerator: [:foo, "bar", 2, :bam]:select> * + * Array#filter is an alias for Array#select. */ static VALUE @@ -3850,7 +4053,7 @@ select_bang_ensure(VALUE a) rb_ary_modify(ary); if (i1 < len) { tail = len - i1; - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { MEMMOVE(ptr + i2, ptr + i1, VALUE, tail); }); } @@ -3874,11 +4077,12 @@ select_bang_ensure(VALUE a) * * Returns +nil+ if no elements were removed. * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [:foo, 'bar', 2, :bam] * a.select! # => #<Enumerator: [:foo, "bar", 2, :bam]:select!> * + * Array#filter! is an alias for Array#select!. */ static VALUE @@ -3905,7 +4109,7 @@ rb_ary_select_bang(VALUE ary) * 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: + * Returns a new \Enumerator if no block given: * * a = [:foo, 'bar', 2, :bam] * a.keep_if # => #<Enumerator: [:foo, "bar", 2, :bam]:keep_if> @@ -4037,7 +4241,7 @@ rb_ary_delete_at(VALUE ary, long pos) rb_ary_modify(ary); del = RARRAY_AREF(ary, pos); - RARRAY_PTR_USE(ary, ptr, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1); }); ARY_INCREASE_LEN(ary, -1); @@ -4049,7 +4253,7 @@ rb_ary_delete_at(VALUE ary, long pos) * call-seq: * array.delete_at(index) -> deleted_object or nil * - * Deletes an element from +self+, per the given Integer +index+. + * Deletes an element from +self+, per the given \Integer +index+. * * When +index+ is non-negative, deletes the element at offset +index+: * @@ -4098,7 +4302,7 @@ ary_slice_bang_by_rb_ary_splice(VALUE ary, long pos, long len) return rb_ary_new2(0); } else { - VALUE arg2 = rb_ary_new4(len, RARRAY_CONST_PTR(ary)+pos); + VALUE arg2 = rb_ary_new4(len, RARRAY_CONST_PTR_TRANSIENT(ary)+pos); rb_ary_splice(ary, pos, len, 0, 0); return arg2; } @@ -4112,7 +4316,7 @@ ary_slice_bang_by_rb_ary_splice(VALUE ary, long pos, long len) * * Removes and returns elements from +self+. * - * When the only argument is an Integer +n+, + * When the only argument is an \Integer +n+, * removes and returns the _nth_ element in +self+: * * a = [:foo, 'bar', 2] @@ -4147,7 +4351,7 @@ ary_slice_bang_by_rb_ary_splice(VALUE ary, long pos, long len) * * If +length+ is negative, returns +nil+. * - * When the only argument is a Range object +range+, + * 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: * * a = [:foo, 'bar', 2] @@ -4263,7 +4467,7 @@ ary_reject_bang(VALUE ary) * * Returns +nil+ if no elements removed. * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [:foo, 'bar', 2] * a.reject! # => #<Enumerator: [:foo, "bar", 2]:reject!> @@ -4290,7 +4494,7 @@ rb_ary_reject_bang(VALUE ary) * a1 = a.reject {|element| element.to_s.start_with?('b') } * a1 # => [:foo, 2] * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [:foo, 'bar', 2] * a.reject # => #<Enumerator: [:foo, "bar", 2]:reject> @@ -4319,12 +4523,12 @@ rb_ary_reject(VALUE ary) * 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: + * Returns a new \Enumerator if no block given: * * a = [:foo, 'bar', 2] * a.delete_if # => #<Enumerator: [:foo, "bar", 2]:delete_if> * - */ +3 */ static VALUE rb_ary_delete_if(VALUE ary) @@ -4539,14 +4743,15 @@ 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)); - ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR(orig)); + ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig)); ARY_SET_EMBED_LEN(copy, RARRAY_LEN(orig)); } +#if USE_RVARGC /* orig is embedded but copy does not have enough space to embed the * 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(copy, len); FL_UNSET_EMBED(copy); ARY_SET_PTR(copy, ptr); @@ -4555,8 +4760,9 @@ rb_ary_replace(VALUE copy, VALUE orig) // No allocation and exception expected that could leave `copy` in a // bad state from the edits above. - ary_memcpy(copy, 0, len, RARRAY_CONST_PTR(orig)); + ary_memcpy(copy, 0, len, RARRAY_CONST_PTR_TRANSIENT(orig)); } +#endif /* Otherwise, orig is on heap and copy does not have enough space to embed * the contents of orig. */ else { @@ -4621,7 +4827,7 @@ rb_ary_clear(VALUE ary) * a # => ["a", "b", "c", "d"] * a.fill(:X) # => [:X, :X, :X, :X] * - * With arguments +obj+ and Integer +start+, and no block given, + * 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>), @@ -4649,7 +4855,7 @@ rb_ary_clear(VALUE ary) * a = ['a', 'b', 'c', 'd'] * a.fill(:X, -50) # => [:X, :X, :X, :X] * - * With arguments +obj+, Integer +start+, and Integer +length+, and no block given, + * With arguments +obj+, \Integer +start+, and \Integer +length+, and no block given, * replaces elements based on the given +start+ and +length+. * * If +start+ is in range, replaces +length+ elements beginning at offset +start+: @@ -4675,7 +4881,7 @@ rb_ary_clear(VALUE ary) * a.fill(:X, 1, 0) # => ["a", "b", "c", "d"] * a.fill(:X, 1, -1) # => ["a", "b", "c", "d"] * - * With arguments +obj+ and Range +range+, and no block given, + * With arguments +obj+ and \Range +range+, and no block given, * replaces elements based on the given range. * * If the range is positive and ascending (<tt>0 < range.begin <= range.end</tt>), @@ -4887,8 +5093,8 @@ rb_ary_plus(VALUE x, VALUE y) len = xlen + ylen; z = rb_ary_new2(len); - ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR(x)); - ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR(y)); + ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR_TRANSIENT(x)); + ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR_TRANSIENT(y)); ARY_SET_LEN(z, len); return z; } @@ -4898,7 +5104,7 @@ ary_append(VALUE x, VALUE y) { long n = RARRAY_LEN(y); if (n > 0) { - rb_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR(y), n); + rb_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR_TRANSIENT(y), n); } RB_GC_GUARD(y); return x; @@ -4946,13 +5152,13 @@ rb_ary_concat(VALUE x, VALUE y) * array * n -> new_array * array * string_separator -> new_string * - * When non-negative argument Integer +n+ is given, + * When non-negative argument \Integer +n+ is given, * returns a new \Array built by concatenating the +n+ copies of +self+: * * a = ['x', 'y'] * a * 3 # => ["x", "y", "x", "y", "x", "y"] * - * When String argument +string_separator+ is given, + * When \String argument +string_separator+ is given, * equivalent to <tt>array.join(string_separator)</tt>: * * [0, [0, 1], {foo: 0}] * ', ' # => "0, 0, 1, {:foo=>0}" @@ -4987,16 +5193,16 @@ rb_ary_times(VALUE ary, VALUE times) ary2 = ary_new(rb_cArray, len); ARY_SET_LEN(ary2, len); - ptr = RARRAY_CONST_PTR(ary); + ptr = RARRAY_CONST_PTR_TRANSIENT(ary); t = RARRAY_LEN(ary); if (0 < t) { ary_memcpy(ary2, 0, t, ptr); while (t <= len/2) { - ary_memcpy(ary2, t, t, RARRAY_CONST_PTR(ary2)); + ary_memcpy(ary2, t, t, RARRAY_CONST_PTR_TRANSIENT(ary2)); t *= 2; } if (t < len) { - ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR(ary2)); + ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR_TRANSIENT(ary2)); } } out: @@ -5055,7 +5261,7 @@ rb_ary_rassoc(VALUE ary, VALUE value) VALUE v; for (i = 0; i < RARRAY_LEN(ary); ++i) { - v = rb_check_array_type(RARRAY_AREF(ary, i)); + v = RARRAY_AREF(ary, i); if (RB_TYPE_P(v, T_ARRAY) && RARRAY_LEN(v) > 1 && rb_equal(RARRAY_AREF(v, 1), value)) @@ -5127,7 +5333,7 @@ rb_ary_equal(VALUE ary1, VALUE ary2) return rb_equal(ary2, ary1); } if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; - if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue; + if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue; return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2); } @@ -5167,27 +5373,10 @@ rb_ary_eql(VALUE ary1, VALUE ary2) if (ary1 == ary2) return Qtrue; if (!RB_TYPE_P(ary2, T_ARRAY)) return Qfalse; if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; - if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue; + if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue; return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2); } -VALUE -rb_ary_hash_values(long len, const VALUE *elements) -{ - long i; - st_index_t h; - VALUE n; - - h = rb_hash_start(len); - h = rb_hash_uint(h, (st_index_t)rb_ary_hash_values); - for (i=0; i<len; i++) { - n = rb_hash(elements[i]); - h = rb_hash_uint(h, NUM2LONG(n)); - } - h = rb_hash_end(h); - return ST2FIX(h); -} - /* * call-seq: * array.hash -> integer @@ -5204,7 +5393,18 @@ rb_ary_hash_values(long len, const VALUE *elements) static VALUE rb_ary_hash(VALUE ary) { - return rb_ary_hash_values(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary)); + long i; + st_index_t h; + VALUE n; + + h = rb_hash_start(RARRAY_LEN(ary)); + h = rb_hash_uint(h, (st_index_t)rb_ary_hash); + for (i=0; i<RARRAY_LEN(ary); i++) { + n = rb_hash(RARRAY_AREF(ary, i)); + h = rb_hash_uint(h, NUM2LONG(n)); + } + h = rb_hash_end(h); + return ST2FIX(h); } /* @@ -5364,6 +5564,17 @@ ary_make_hash_by(VALUE ary) return ary_add_hash_by(hash, ary); } +static inline void +ary_recycle_hash(VALUE hash) +{ + assert(RBASIC_CLASS(hash) == 0); + if (RHASH_ST_TABLE_P(hash)) { + st_table *tbl = RHASH_ST_TABLE(hash); + st_free_table(tbl); + RHASH_ST_CLEAR(hash); + } +} + /* * call-seq: * array - other_array -> new_array @@ -5405,7 +5616,7 @@ rb_ary_diff(VALUE ary1, VALUE ary2) if (rb_hash_stlike_lookup(hash, RARRAY_AREF(ary1, i), NULL)) continue; rb_ary_push(ary3, rb_ary_elt(ary1, i)); } - + ary_recycle_hash(hash); return ary3; } @@ -5468,8 +5679,7 @@ rb_ary_difference_multi(int argc, VALUE *argv, VALUE ary) * array & 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): + * duplicates are omitted; items are compared using <tt>eql?</tt>: * * [0, 1, 2, 3] & [1, 2] # => [1, 2] * [0, 1, 0, 1] & [0, 1] # => [0, 1] @@ -5512,6 +5722,7 @@ rb_ary_and(VALUE ary1, VALUE ary2) rb_ary_push(ary3, v); } } + ary_recycle_hash(hash); return ary3; } @@ -5522,8 +5733,7 @@ rb_ary_and(VALUE ary1, VALUE ary2) * * 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): + * duplicates are omitted; items are compared using <tt>eql?</tt>: * * [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] @@ -5599,11 +5809,11 @@ rb_ary_union_hash(VALUE hash, VALUE ary2) static VALUE rb_ary_or(VALUE ary1, VALUE ary2) { - VALUE hash; + VALUE hash, ary3; ary2 = to_ary(ary2); if (RARRAY_LEN(ary1) + RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) { - VALUE ary3 = rb_ary_new(); + ary3 = rb_ary_new(); rb_ary_union(ary3, ary1); rb_ary_union(ary3, ary2); return ary3; @@ -5612,7 +5822,9 @@ rb_ary_or(VALUE ary1, VALUE ary2) hash = ary_make_hash(ary1); rb_ary_union_hash(hash, ary2); - return rb_hash_values(hash); + ary3 = rb_hash_values(hash); + ary_recycle_hash(hash); + return ary3; } /* @@ -5636,7 +5848,7 @@ rb_ary_union_multi(int argc, VALUE *argv, VALUE ary) { int i; long sum; - VALUE hash; + VALUE hash, ary_union; sum = RARRAY_LEN(ary); for (i = 0; i < argc; i++) { @@ -5645,7 +5857,7 @@ rb_ary_union_multi(int argc, VALUE *argv, VALUE ary) } if (sum <= SMALL_ARRAY_LEN) { - VALUE ary_union = rb_ary_new(); + ary_union = rb_ary_new(); rb_ary_union(ary_union, ary); for (i = 0; i < argc; i++) rb_ary_union(ary_union, argv[i]); @@ -5656,7 +5868,9 @@ rb_ary_union_multi(int argc, VALUE *argv, VALUE ary) hash = ary_make_hash(ary); for (i = 0; i < argc; i++) rb_ary_union_hash(hash, argv[i]); - return rb_hash_values(hash); + ary_union = rb_hash_values(hash); + ary_recycle_hash(hash); + return ary_union; } /* @@ -5672,8 +5886,6 @@ rb_ary_union_multi(int argc, VALUE *argv, VALUE ary) * a.intersect?(b) #=> true * a.intersect?(c) #=> false * - * Array elements are compared using <tt>eql?</tt> - * (items must also implement +hash+ correctly). */ static VALUE @@ -5712,6 +5924,7 @@ rb_ary_intersect_p(VALUE ary1, VALUE ary2) break; } } + ary_recycle_hash(hash); return result; } @@ -5818,20 +6031,20 @@ ary_max_opt_string(VALUE ary, long i, VALUE vmax) * - A new \Array of maximum-valued elements selected from +self+. * * When no block is given, each element in +self+ must respond to method <tt><=></tt> - * with an Integer. + * with an \Integer. * * With no argument and no block, returns the element in +self+ * having the maximum value per method <tt><=></tt>: * * [0, 1, 2].max # => 2 * - * With an argument Integer +n+ and no block, returns a new \Array with at most +n+ elements, + * With an argument \Integer +n+ and no block, returns a new \Array with at most +n+ 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] * - * When a block is given, the block must return an Integer. + * When a block is given, the block must return an \Integer. * * 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: @@ -5986,14 +6199,14 @@ ary_min_opt_string(VALUE ary, long i, VALUE vmin) * - A new \Array of minimum-valued elements selected from +self+. * * When no block is given, each element in +self+ must respond to method <tt><=></tt> - * with an Integer. + * with an \Integer. * * With no argument and no block, returns the element in +self+ * having the minimum value per method <tt><=></tt>: * * [0, 1, 2].min # => 0 * - * With Integer argument +n+ and no block, returns a new \Array with at most +n+ elements, + * With \Integer argument +n+ and no block, returns a new \Array with at most +n+ elements, * in ascending order per method <tt><=></tt>: * * [0, 1, 2, 3].min(3) # => [0, 1, 2] @@ -6061,13 +6274,13 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary) * from +self+, either per method <tt><=></tt> or per a given block:. * * When no block is given, each element in +self+ must respond to method <tt><=></tt> - * with an Integer; + * with an \Integer; * returns a new 2-element \Array containing the minimum and maximum values * from +self+, per method <tt><=></tt>: * * [0, 1, 2].minmax # => [0, 2] * - * When a block is given, the block must return an Integer; + * 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: @@ -6146,6 +6359,7 @@ rb_ary_uniq_bang(VALUE ary) } ary_resize_capa(ary, hash_size); rb_hash_foreach(hash, push_value, ary); + ary_recycle_hash(hash); return ary; } @@ -6190,6 +6404,9 @@ rb_ary_uniq(VALUE ary) hash = ary_make_hash(ary); uniq = rb_hash_values(hash); } + if (hash) { + ary_recycle_hash(hash); + } return uniq; } @@ -6210,14 +6427,14 @@ rb_ary_compact_bang(VALUE ary) long n; rb_ary_modify(ary); - p = t = (VALUE *)RARRAY_CONST_PTR(ary); /* WB: no new reference */ + p = t = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary); /* WB: no new reference */ end = p + RARRAY_LEN(ary); while (t < end) { if (NIL_P(*t)) t++; else *p++ = *t++; } - n = p - RARRAY_CONST_PTR(ary); + n = p - RARRAY_CONST_PTR_TRANSIENT(ary); if (RARRAY_LEN(ary) == n) { return Qnil; } @@ -6305,8 +6522,9 @@ static VALUE flatten(VALUE ary, int level) { long i; - VALUE stack, result, tmp = 0, elt; - VALUE memo = Qfalse; + VALUE stack, result, tmp = 0, elt, vmemo; + st_table *memo = 0; + st_data_t id; for (i = 0; i < RARRAY_LEN(ary); i++) { elt = RARRAY_AREF(ary, i); @@ -6320,7 +6538,7 @@ flatten(VALUE ary, int level) } result = ary_new(0, RARRAY_LEN(ary)); - ary_memcpy(result, 0, i, RARRAY_CONST_PTR(ary)); + ary_memcpy(result, 0, i, RARRAY_CONST_PTR_TRANSIENT(ary)); ARY_SET_LEN(result, i); stack = ary_new(0, ARY_DEFAULT_SIZE); @@ -6328,9 +6546,12 @@ flatten(VALUE ary, int level) rb_ary_push(stack, LONG2NUM(i + 1)); if (level < 0) { - memo = rb_obj_hide(rb_ident_hash_new()); - rb_hash_aset(memo, ary, Qtrue); - rb_hash_aset(memo, tmp, Qtrue); + vmemo = rb_hash_new(); + RBASIC_CLEAR_CLASS(vmemo); + memo = st_init_numtable(); + rb_hash_st_table_set(vmemo, memo); + st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue); + st_insert(memo, (st_data_t)tmp, (st_data_t)Qtrue); } ary = tmp; @@ -6345,8 +6566,9 @@ flatten(VALUE ary, int level) } tmp = rb_check_array_type(elt); if (RBASIC(result)->klass) { - if (RTEST(memo)) { - rb_hash_clear(memo); + if (memo) { + RB_GC_GUARD(vmemo); + st_clear(memo); } rb_raise(rb_eRuntimeError, "flatten reentered"); } @@ -6355,11 +6577,12 @@ flatten(VALUE ary, int level) } else { if (memo) { - if (rb_hash_aref(memo, tmp) == Qtrue) { - rb_hash_clear(memo); + id = (st_data_t)tmp; + if (st_is_member(memo, id)) { + st_clear(memo); rb_raise(rb_eArgError, "tried to flatten recursive array"); } - rb_hash_aset(memo, tmp, Qtrue); + st_insert(memo, id, (st_data_t)Qtrue); } rb_ary_push(stack, ary); rb_ary_push(stack, LONG2NUM(i)); @@ -6371,7 +6594,8 @@ flatten(VALUE ary, int level) break; } if (memo) { - rb_hash_delete(memo, ary); + id = (st_data_t)ary; + st_delete(memo, &id, 0); } tmp = rb_ary_pop(stack); i = NUM2LONG(tmp); @@ -6379,7 +6603,7 @@ flatten(VALUE ary, int level) } if (memo) { - rb_hash_clear(memo); + st_clear(memo); } RBASIC_SET_CLASS(result, rb_cArray); @@ -6394,7 +6618,7 @@ flatten(VALUE ary, int level) * Replaces each nested \Array in +self+ with the elements from that \Array; * returns +self+ if any changes, +nil+ otherwise. * - * With non-negative Integer argument +level+, flattens recursively through +level+ levels: + * With non-negative \Integer argument +level+, flattens recursively through +level+ levels: * * a = [ 0, [ 1, [2, 3], 4 ], 5 ] * a.flatten!(1) # => [0, 1, [2, 3], 4, 5] @@ -6448,7 +6672,7 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary) * - 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: + * 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] @@ -6504,7 +6728,7 @@ rb_ary_shuffle_bang(rb_execution_context_t *ec, VALUE ary, VALUE randgen) while (i) { long j = RAND_UPTO(i); VALUE tmp; - if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR(ary)) { + if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR_TRANSIENT(ary)) { rb_raise(rb_eRuntimeError, "modified during shuffle"); } tmp = ptr[--i]; @@ -6596,7 +6820,7 @@ ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE sorted[j] = idx[i] = k; } result = rb_ary_new_capa(n); - RARRAY_PTR_USE(result, ptr_result, { + RARRAY_PTR_USE_TRANSIENT(result, ptr_result, { for (i=0; i<n; i++) { ptr_result[i] = RARRAY_AREF(ary, idx[i]); } @@ -6619,7 +6843,7 @@ ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE len = RARRAY_LEN(ary); if (len <= max_idx) n = 0; else if (n > len) n = len; - RARRAY_PTR_USE(ary, ptr_ary, { + RARRAY_PTR_USE_TRANSIENT(ary, ptr_ary, { for (i=0; i<n; i++) { long j2 = j = ptr_result[i]; long i2 = i; @@ -6682,7 +6906,7 @@ rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj) * array.cycle -> new_enumerator * array.cycle(count) -> new_enumerator * - * When called with positive Integer argument +count+ and a block, + * When called with positive \Integer argument +count+ and a block, * calls the block with each element, then does so again, * until it has done so +count+ times; returns +nil+: * @@ -6701,7 +6925,7 @@ rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj) * [0, 1].cycle {|element| puts element } * [0, 1].cycle(nil) {|element| puts element } * - * When no block is given, returns a new Enumerator: + * 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> @@ -6858,7 +7082,7 @@ rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj) * When invoked with a block, yield all permutations of elements of +self+; returns +self+. * The order of permutations is indeterminate. * - * When a block and an in-range positive Integer argument +n+ (<tt>0 < n <= self.size</tt>) + * 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: @@ -6920,7 +7144,7 @@ rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj) * [2, 0, 1] * [2, 1, 0] * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [0, 1, 2] * a.permutation # => #<Enumerator: [0, 1, 2]:permutation> @@ -7004,7 +7228,7 @@ rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj) * Calls the block, if given, with combinations of elements of +self+; * returns +self+. The order of combinations is indeterminate. * - * When a block and an in-range positive Integer argument +n+ (<tt>0 < n <= self.size</tt>) + * 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: @@ -7043,7 +7267,7 @@ rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj) * a.combination(-1) {|combination| fail 'Cannot happen' } * a.combination(4) {|combination| fail 'Cannot happen' } * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [0, 1, 2] * a.combination(2) # => #<Enumerator: [0, 1, 2]:combination(2)> @@ -7141,7 +7365,7 @@ rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj) * 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 + * 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>. * @@ -7178,7 +7402,7 @@ rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj) * * a.repeated_permutation(-1) {|permutation| fail 'Cannot happen' } * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [0, 1, 2] * a.repeated_permutation(2) # => #<Enumerator: [0, 1, 2]:permutation(2)> @@ -7273,7 +7497,7 @@ rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj) * 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 + * 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>. * @@ -7307,7 +7531,7 @@ rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj) * * a.repeated_combination(-1) {|combination| fail 'Cannot happen' } * - * Returns a new Enumerator if no block given: + * Returns a new \Enumerator if no block given: * * a = [0, 1, 2] * a.repeated_combination(2) # => #<Enumerator: [0, 1, 2]:combination(2)> @@ -7515,7 +7739,7 @@ done: * array.take(n) -> new_array * * Returns a new \Array containing the first +n+ element of +self+, - * where +n+ is a non-negative Integer; + * where +n+ is a non-negative \Integer; * does not modify +self+. * * Examples: @@ -7555,7 +7779,7 @@ rb_ary_take(VALUE obj, VALUE n) * a.take_while {|element| true } # => [0, 1, 2, 3, 4, 5] * a # => [0, 1, 2, 3, 4, 5] * - * 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> * @@ -7578,7 +7802,7 @@ rb_ary_take_while(VALUE ary) * array.drop(n) -> new_array * * Returns a new \Array containing all but the first +n+ element of +self+, - * where +n+ is a non-negative Integer; + * where +n+ is a non-negative \Integer; * does not modify +self+. * * Examples: @@ -7619,7 +7843,7 @@ rb_ary_drop(VALUE ary, VALUE n) * a = [0, 1, 2, 3, 4, 5] * a.drop_while {|element| element < 3 } # => [3, 4, 5] * - * With no block given, returns a new Enumerator: + * With no block given, returns a new \Enumerator: * * [0, 1].drop_while # => # => #<Enumerator: [0, 1]:drop_while> * @@ -7645,9 +7869,6 @@ rb_ary_drop_while(VALUE ary) * * Returns +true+ if any element of +self+ meets a given criterion. * - * If +self+ has no element, returns +false+ and argument or block - * are not used. - * * With no block given and no argument, returns +true+ if +self+ has any truthy element, * +false+ otherwise: * @@ -7709,9 +7930,6 @@ rb_ary_any_p(int argc, VALUE *argv, VALUE ary) * * Returns +true+ if all elements of +self+ meet a given criterion. * - * If +self+ has no element, returns +true+ and argument or block - * are not used. - * * With no block given and no argument, returns +true+ if +self+ contains only truthy elements, * +false+ otherwise: * @@ -7997,12 +8215,6 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary) n = 0; r = Qundef; - - if (!FIXNUM_P(v) && !RB_BIGNUM_TYPE_P(v) && !RB_TYPE_P(v, T_RATIONAL)) { - i = 0; - goto init_is_a_value; - } - for (i = 0; i < RARRAY_LEN(ary); i++) { e = RARRAY_AREF(ary, i); if (block_given) @@ -8087,7 +8299,6 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary) } goto has_some_value; - init_is_a_value: for (; i < RARRAY_LEN(ary); i++) { e = RARRAY_AREF(ary, i); if (block_given) @@ -8098,7 +8309,6 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary) return v; } -/* :nodoc: */ static VALUE rb_ary_deconstruct(VALUE ary) { @@ -8626,6 +8836,8 @@ Init_Array(void) rb_define_method(rb_cArray, "[]=", rb_ary_aset, -1); rb_define_method(rb_cArray, "at", rb_ary_at, 1); rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1); + rb_define_method(rb_cArray, "first", rb_ary_first, -1); + rb_define_method(rb_cArray, "last", rb_ary_last, -1); rb_define_method(rb_cArray, "concat", rb_ary_concat_multi, -1); rb_define_method(rb_cArray, "union", rb_ary_union_multi, -1); rb_define_method(rb_cArray, "difference", rb_ary_difference_multi, -1); @@ -66,92 +66,4 @@ class Array Primitive.ary_sample(random, n, ary) end end - - # call-seq: - # array.first -> object or nil - # array.first(n) -> new_array - # - # Returns elements from +self+; does not modify +self+. - # - # When no argument is given, returns the first element: - # - # a = [:foo, 'bar', 2] - # a.first # => :foo - # a # => [:foo, "bar", 2] - # - # 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"] - # - # If <tt>n >= array.size</tt>, returns all elements: - # - # a = [:foo, 'bar', 2] - # 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. - def first n = unspecified = true - if Primitive.mandatory_only? - Primitive.attr! :leaf - Primitive.cexpr! %q{ ary_first(self) } - else - if unspecified - Primitive.cexpr! %q{ ary_first(self) } - else - Primitive.cexpr! %q{ ary_take_first_or_last_n(self, NUM2LONG(n), ARY_TAKE_FIRST) } - end - end - end - - # call-seq: - # array.last -> object or nil - # array.last(n) -> new_array - # - # Returns elements from +self+; +self+ is not modified. - # - # When no argument is given, returns the last element: - # - # a = [:foo, 'bar', 2] - # a.last # => 2 - # a # => [:foo, "bar", 2] - # - # 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: - # - # a = [:foo, 'bar', 2] - # a.last(50) # => [:foo, "bar", 2] - # - # If <tt>n == 0</tt>, returns an new empty \Array: - # - # a = [:foo, 'bar', 2] - # a.last(0) # [] - # - # Related: #first. - def last n = unspecified = true - if Primitive.mandatory_only? - Primitive.attr! :leaf - Primitive.cexpr! %q{ ary_last(self) } - else - if unspecified - Primitive.cexpr! %q{ ary_last(self) } - else - Primitive.cexpr! %q{ ary_take_first_or_last_n(self, NUM2LONG(n), ARY_TAKE_LAST) } - end - end - end end @@ -1,6 +1,6 @@ /* indent-tabs-mode: nil */ #include "internal.h" -#include "internal/ruby_parser.h" +#include "internal/parse.h" #include "internal/symbol.h" #include "internal/warnings.h" #include "iseq.h" @@ -97,7 +97,7 @@ rb_ast_parse_str(VALUE str, VALUE keep_script_lines, VALUE error_tolerant, VALUE StringValue(str); VALUE vparser = ast_parse_new(); - if (RTEST(keep_script_lines)) rb_parser_set_script_lines(vparser, Qtrue); + if (RTEST(keep_script_lines)) rb_parser_keep_script_lines(vparser); 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); @@ -117,10 +117,11 @@ rb_ast_parse_file(VALUE path, VALUE keep_script_lines, VALUE error_tolerant, VAL rb_ast_t *ast = 0; 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(keep_script_lines)) rb_parser_keep_script_lines(vparser); 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); @@ -148,7 +149,7 @@ rb_ast_parse_array(VALUE array, VALUE keep_script_lines, VALUE error_tolerant, V 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(keep_script_lines)) rb_parser_keep_script_lines(vparser); 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); @@ -183,8 +184,8 @@ node_find(VALUE self, const int node_id) extern VALUE rb_e_script; -VALUE -rb_script_lines_for(VALUE path, bool add) +static VALUE +script_lines(VALUE path) { VALUE hash, lines; ID script_lines; @@ -192,19 +193,10 @@ rb_script_lines_for(VALUE path, bool add) 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; - } + lines = rb_hash_lookup(hash, path); + if (!RB_TYPE_P(lines, 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) @@ -330,14 +322,14 @@ rb_ary_new_from_node_args(rb_ast_t *ast, long n, ...) } static VALUE -dump_block(rb_ast_t *ast, const struct RNode_BLOCK *node) +dump_block(rb_ast_t *ast, const NODE *node) { VALUE ary = rb_ary_new(); do { rb_ary_push(ary, NEW_CHILD(ast, node->nd_head)); } while (node->nd_next && nd_type_p(node->nd_next, NODE_BLOCK) && - (node = RNODE_BLOCK(node->nd_next), 1)); + (node = node->nd_next, 1)); if (node->nd_next) { rb_ary_push(ary, NEW_CHILD(ast, node->nd_next)); } @@ -346,13 +338,13 @@ dump_block(rb_ast_t *ast, const struct RNode_BLOCK *node) } static VALUE -dump_array(rb_ast_t *ast, const struct RNode_LIST *node) +dump_array(rb_ast_t *ast, const NODE *node) { VALUE ary = rb_ary_new(); rb_ary_push(ary, NEW_CHILD(ast, node->nd_head)); while (node->nd_next && nd_type_p(node->nd_next, NODE_LIST)) { - node = RNODE_LIST(node->nd_next); + node = node->nd_next; rb_ary_push(ary, NEW_CHILD(ast, node->nd_head)); } rb_ary_push(ary, NEW_CHILD(ast, node->nd_next)); @@ -385,229 +377,211 @@ rest_arg(rb_ast_t *ast, const NODE *rest_arg) static VALUE node_children(rb_ast_t *ast, const NODE *node) { - char name[sizeof("$") + DECIMAL_SIZE_OF(long)]; + char name[DECIMAL_SIZE_OF_BITS(sizeof(long) * CHAR_BIT) + 2]; /* including '$' */ enum node_type type = nd_type(node); switch (type) { case NODE_BLOCK: - return dump_block(ast, RNODE_BLOCK(node)); + return dump_block(ast, node); case NODE_IF: - return rb_ary_new_from_node_args(ast, 3, RNODE_IF(node)->nd_cond, RNODE_IF(node)->nd_body, RNODE_IF(node)->nd_else); + return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else); case NODE_UNLESS: - return rb_ary_new_from_node_args(ast, 3, RNODE_UNLESS(node)->nd_cond, RNODE_UNLESS(node)->nd_body, RNODE_UNLESS(node)->nd_else); + return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else); case NODE_CASE: - return rb_ary_new_from_node_args(ast, 2, RNODE_CASE(node)->nd_head, RNODE_CASE(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body); case NODE_CASE2: - return rb_ary_new_from_node_args(ast, 2, RNODE_CASE2(node)->nd_head, RNODE_CASE2(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body); case NODE_CASE3: - return rb_ary_new_from_node_args(ast, 2, RNODE_CASE3(node)->nd_head, RNODE_CASE3(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body); case NODE_WHEN: - return rb_ary_new_from_node_args(ast, 3, RNODE_WHEN(node)->nd_head, RNODE_WHEN(node)->nd_body, RNODE_WHEN(node)->nd_next); + return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next); case NODE_IN: - return rb_ary_new_from_node_args(ast, 3, RNODE_IN(node)->nd_head, RNODE_IN(node)->nd_body, RNODE_IN(node)->nd_next); + return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next); case NODE_WHILE: case NODE_UNTIL: - return rb_ary_push(rb_ary_new_from_node_args(ast, 2, RNODE_WHILE(node)->nd_cond, RNODE_WHILE(node)->nd_body), - RBOOL(RNODE_WHILE(node)->nd_state)); + return rb_ary_push(rb_ary_new_from_node_args(ast, 2, node->nd_cond, node->nd_body), + RBOOL(node->nd_state)); case NODE_ITER: case NODE_FOR: - return rb_ary_new_from_node_args(ast, 2, RNODE_ITER(node)->nd_iter, RNODE_ITER(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_iter, node->nd_body); case NODE_FOR_MASGN: - return rb_ary_new_from_node_args(ast, 1, RNODE_FOR_MASGN(node)->nd_var); + return rb_ary_new_from_node_args(ast, 1, node->nd_var); case NODE_BREAK: - return rb_ary_new_from_node_args(ast, 1, RNODE_BREAK(node)->nd_stts); case NODE_NEXT: - return rb_ary_new_from_node_args(ast, 1, RNODE_NEXT(node)->nd_stts); case NODE_RETURN: - return rb_ary_new_from_node_args(ast, 1, RNODE_RETURN(node)->nd_stts); + return rb_ary_new_from_node_args(ast, 1, node->nd_stts); case NODE_REDO: return rb_ary_new_from_node_args(ast, 0); case NODE_RETRY: return rb_ary_new_from_node_args(ast, 0); case NODE_BEGIN: - return rb_ary_new_from_node_args(ast, 1, RNODE_BEGIN(node)->nd_body); + return rb_ary_new_from_node_args(ast, 1, node->nd_body); case NODE_RESCUE: - return rb_ary_new_from_node_args(ast, 3, RNODE_RESCUE(node)->nd_head, RNODE_RESCUE(node)->nd_resq, RNODE_RESCUE(node)->nd_else); + return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_resq, node->nd_else); case NODE_RESBODY: - return rb_ary_new_from_node_args(ast, 3, RNODE_RESBODY(node)->nd_args, RNODE_RESBODY(node)->nd_body, RNODE_RESBODY(node)->nd_head); + return rb_ary_new_from_node_args(ast, 3, node->nd_args, node->nd_body, node->nd_head); case NODE_ENSURE: - return rb_ary_new_from_node_args(ast, 2, RNODE_ENSURE(node)->nd_head, RNODE_ENSURE(node)->nd_ensr); + return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_ensr); case NODE_AND: case NODE_OR: { VALUE ary = rb_ary_new(); while (1) { - rb_ary_push(ary, NEW_CHILD(ast, RNODE_AND(node)->nd_1st)); - if (!RNODE_AND(node)->nd_2nd || !nd_type_p(RNODE_AND(node)->nd_2nd, type)) + rb_ary_push(ary, NEW_CHILD(ast, node->nd_1st)); + if (!node->nd_2nd || !nd_type_p(node->nd_2nd, type)) break; - node = RNODE_AND(node)->nd_2nd; + node = node->nd_2nd; } - rb_ary_push(ary, NEW_CHILD(ast, RNODE_AND(node)->nd_2nd)); + rb_ary_push(ary, NEW_CHILD(ast, node->nd_2nd)); return ary; } case NODE_MASGN: - if (NODE_NAMED_REST_P(RNODE_MASGN(node)->nd_args)) { - return rb_ary_new_from_node_args(ast, 3, RNODE_MASGN(node)->nd_value, RNODE_MASGN(node)->nd_head, RNODE_MASGN(node)->nd_args); + 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); } else { - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_MASGN(node)->nd_value), - NEW_CHILD(ast, RNODE_MASGN(node)->nd_head), + return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_value), + NEW_CHILD(ast, 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, 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, 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, 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, RNODE_CVASGN(node)->nd_value)); case NODE_GASGN: - return rb_ary_new_from_args(2, var_name(RNODE_GASGN(node)->nd_vid), NEW_CHILD(ast, RNODE_GASGN(node)->nd_value)); + 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)); case NODE_CDECL: - if (RNODE_CDECL(node)->nd_vid) { - return rb_ary_new_from_args(2, ID2SYM(RNODE_CDECL(node)->nd_vid), NEW_CHILD(ast, RNODE_CDECL(node)->nd_value)); + if (node->nd_vid) { + return rb_ary_new_from_args(2, ID2SYM(node->nd_vid), NEW_CHILD(ast, node->nd_value)); } - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_CDECL(node)->nd_else), ID2SYM(RNODE_COLON2(RNODE_CDECL(node)->nd_else)->nd_mid), NEW_CHILD(ast, 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)); case NODE_OP_ASGN1: - return rb_ary_new_from_args(4, NEW_CHILD(ast, RNODE_OP_ASGN1(node)->nd_recv), - ID2SYM(RNODE_OP_ASGN1(node)->nd_mid), - NEW_CHILD(ast, RNODE_OP_ASGN1(node)->nd_index), - NEW_CHILD(ast, RNODE_OP_ASGN1(node)->nd_rvalue)); + 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)); case NODE_OP_ASGN2: - return rb_ary_new_from_args(5, NEW_CHILD(ast, 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, RNODE_OP_ASGN2(node)->nd_value)); + 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)); case NODE_OP_ASGN_AND: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_OP_ASGN_AND(node)->nd_head), ID2SYM(idANDOP), - NEW_CHILD(ast, RNODE_OP_ASGN_AND(node)->nd_value)); + return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idANDOP), + NEW_CHILD(ast, node->nd_value)); case NODE_OP_ASGN_OR: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_OP_ASGN_OR(node)->nd_head), ID2SYM(idOROP), - NEW_CHILD(ast, RNODE_OP_ASGN_OR(node)->nd_value)); + return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idOROP), + NEW_CHILD(ast, node->nd_value)); case NODE_OP_CDECL: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_OP_CDECL(node)->nd_head), - ID2SYM(RNODE_OP_CDECL(node)->nd_aid), - NEW_CHILD(ast, RNODE_OP_CDECL(node)->nd_value)); + return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), + ID2SYM(node->nd_aid), + NEW_CHILD(ast, node->nd_value)); case NODE_CALL: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_CALL(node)->nd_recv), - ID2SYM(RNODE_CALL(node)->nd_mid), - NEW_CHILD(ast, RNODE_CALL(node)->nd_args)); case NODE_OPCALL: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_OPCALL(node)->nd_recv), - ID2SYM(RNODE_OPCALL(node)->nd_mid), - NEW_CHILD(ast, RNODE_OPCALL(node)->nd_args)); case NODE_QCALL: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_QCALL(node)->nd_recv), - ID2SYM(RNODE_QCALL(node)->nd_mid), - NEW_CHILD(ast, RNODE_QCALL(node)->nd_args)); + return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), + ID2SYM(node->nd_mid), + NEW_CHILD(ast, node->nd_args)); case NODE_FCALL: - return rb_ary_new_from_args(2, ID2SYM(RNODE_FCALL(node)->nd_mid), - NEW_CHILD(ast, RNODE_FCALL(node)->nd_args)); + return rb_ary_new_from_args(2, ID2SYM(node->nd_mid), + NEW_CHILD(ast, node->nd_args)); case NODE_VCALL: - return rb_ary_new_from_args(1, ID2SYM(RNODE_VCALL(node)->nd_mid)); + return rb_ary_new_from_args(1, ID2SYM(node->nd_mid)); case NODE_SUPER: - return rb_ary_new_from_node_args(ast, 1, RNODE_SUPER(node)->nd_args); + return rb_ary_new_from_node_args(ast, 1, node->nd_args); case NODE_ZSUPER: return rb_ary_new_from_node_args(ast, 0); case NODE_LIST: - return dump_array(ast, RNODE_LIST(node)); + case NODE_VALUES: + return dump_array(ast, node); case NODE_ZLIST: return rb_ary_new_from_node_args(ast, 0); case NODE_HASH: - return rb_ary_new_from_node_args(ast, 1, RNODE_HASH(node)->nd_head); + return rb_ary_new_from_node_args(ast, 1, node->nd_head); case NODE_YIELD: - return rb_ary_new_from_node_args(ast, 1, RNODE_YIELD(node)->nd_head); + return rb_ary_new_from_node_args(ast, 1, 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(RNODE_DVAR(node)->nd_vid)); + return rb_ary_new_from_args(1, var_name(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(RNODE_GVAR(node)->nd_vid)); + return rb_ary_new_from_args(1, ID2SYM(node->nd_vid)); case NODE_NTH_REF: - snprintf(name, sizeof(name), "$%ld", RNODE_NTH_REF(node)->nd_nth); + snprintf(name, sizeof(name), "$%ld", node->nd_nth); return rb_ary_new_from_args(1, ID2SYM(rb_intern(name))); case NODE_BACK_REF: name[0] = '$'; - name[1] = (char)RNODE_BACK_REF(node)->nd_nth; + name[1] = (char)node->nd_nth; name[2] = '\0'; return rb_ary_new_from_args(1, ID2SYM(rb_intern(name))); case NODE_MATCH2: - if (RNODE_MATCH2(node)->nd_args) { - return rb_ary_new_from_node_args(ast, 3, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value, RNODE_MATCH2(node)->nd_args); + if (node->nd_args) { + return rb_ary_new_from_node_args(ast, 3, node->nd_recv, node->nd_value, node->nd_args); } - return rb_ary_new_from_node_args(ast, 2, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value); + return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value); case NODE_MATCH3: - return rb_ary_new_from_node_args(ast, 2, RNODE_MATCH3(node)->nd_recv, RNODE_MATCH3(node)->nd_value); + return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value); case NODE_MATCH: case NODE_LIT: case NODE_STR: case NODE_XSTR: - return rb_ary_new_from_args(1, RNODE_LIT(node)->nd_lit); + return rb_ary_new_from_args(1, node->nd_lit); case NODE_ONCE: - return rb_ary_new_from_node_args(ast, 1, RNODE_ONCE(node)->nd_body); + return rb_ary_new_from_node_args(ast, 1, node->nd_body); case NODE_DSTR: case NODE_DXSTR: case NODE_DREGX: case NODE_DSYM: { - struct RNode_LIST *n = RNODE_DSTR(node)->nd_next; + NODE *n = node->nd_next; VALUE head = Qnil, next = Qnil; if (n) { head = NEW_CHILD(ast, n->nd_head); next = NEW_CHILD(ast, n->nd_next); } - return rb_ary_new_from_args(3, RNODE_DSTR(node)->nd_lit, head, next); + return rb_ary_new_from_args(3, node->nd_lit, head, next); } case NODE_EVSTR: - return rb_ary_new_from_node_args(ast, 1, RNODE_EVSTR(node)->nd_body); + return rb_ary_new_from_node_args(ast, 1, node->nd_body); case NODE_ARGSCAT: - return rb_ary_new_from_node_args(ast, 2, RNODE_ARGSCAT(node)->nd_head, RNODE_ARGSCAT(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body); case NODE_ARGSPUSH: - return rb_ary_new_from_node_args(ast, 2, RNODE_ARGSPUSH(node)->nd_head, RNODE_ARGSPUSH(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body); case NODE_SPLAT: - return rb_ary_new_from_node_args(ast, 1, RNODE_SPLAT(node)->nd_head); + return rb_ary_new_from_node_args(ast, 1, node->nd_head); case NODE_BLOCK_PASS: - return rb_ary_new_from_node_args(ast, 2, RNODE_BLOCK_PASS(node)->nd_head, RNODE_BLOCK_PASS(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body); case NODE_DEFN: - return rb_ary_new_from_args(2, ID2SYM(RNODE_DEFN(node)->nd_mid), NEW_CHILD(ast, RNODE_DEFN(node)->nd_defn)); + return rb_ary_new_from_args(2, ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn)); case NODE_DEFS: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_DEFS(node)->nd_recv), ID2SYM(RNODE_DEFS(node)->nd_mid), NEW_CHILD(ast, RNODE_DEFS(node)->nd_defn)); + return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn)); case NODE_ALIAS: - return rb_ary_new_from_node_args(ast, 2, RNODE_ALIAS(node)->nd_1st, RNODE_ALIAS(node)->nd_2nd); + return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd); case NODE_VALIAS: - return rb_ary_new_from_args(2, ID2SYM(RNODE_VALIAS(node)->nd_alias), ID2SYM(RNODE_VALIAS(node)->nd_orig)); + return rb_ary_new_from_args(2, ID2SYM(node->nd_alias), ID2SYM(node->nd_orig)); case NODE_UNDEF: - return rb_ary_new_from_node_args(ast, 1, RNODE_UNDEF(node)->nd_undef); + return rb_ary_new_from_node_args(ast, 1, node->nd_undef); case NODE_CLASS: - return rb_ary_new_from_node_args(ast, 3, RNODE_CLASS(node)->nd_cpath, RNODE_CLASS(node)->nd_super, RNODE_CLASS(node)->nd_body); + return rb_ary_new_from_node_args(ast, 3, node->nd_cpath, node->nd_super, node->nd_body); case NODE_MODULE: - return rb_ary_new_from_node_args(ast, 2, RNODE_MODULE(node)->nd_cpath, RNODE_MODULE(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_cpath, node->nd_body); case NODE_SCLASS: - return rb_ary_new_from_node_args(ast, 2, RNODE_SCLASS(node)->nd_recv, RNODE_SCLASS(node)->nd_body); + return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_body); case NODE_COLON2: - return rb_ary_new_from_args(2, NEW_CHILD(ast, RNODE_COLON2(node)->nd_head), ID2SYM(RNODE_COLON2(node)->nd_mid)); + return rb_ary_new_from_args(2, NEW_CHILD(ast, node->nd_head), ID2SYM(node->nd_mid)); case NODE_COLON3: - return rb_ary_new_from_args(1, ID2SYM(RNODE_COLON3(node)->nd_mid)); + return rb_ary_new_from_args(1, ID2SYM(node->nd_mid)); case NODE_DOT2: case NODE_DOT3: case NODE_FLIP2: case NODE_FLIP3: - return rb_ary_new_from_node_args(ast, 2, RNODE_DOT2(node)->nd_beg, RNODE_DOT2(node)->nd_end); + return rb_ary_new_from_node_args(ast, 2, node->nd_beg, node->nd_end); case NODE_SELF: return rb_ary_new_from_node_args(ast, 0); case NODE_NIL: @@ -619,84 +593,84 @@ node_children(rb_ast_t *ast, const NODE *node) case NODE_ERRINFO: return rb_ary_new_from_node_args(ast, 0); case NODE_DEFINED: - return rb_ary_new_from_node_args(ast, 1, RNODE_DEFINED(node)->nd_head); + return rb_ary_new_from_node_args(ast, 1, node->nd_head); case NODE_POSTEXE: - return rb_ary_new_from_node_args(ast, 1, RNODE_POSTEXE(node)->nd_body); + return rb_ary_new_from_node_args(ast, 1, node->nd_body); case NODE_ATTRASGN: - return rb_ary_new_from_args(3, NEW_CHILD(ast, RNODE_ATTRASGN(node)->nd_recv), ID2SYM(RNODE_ATTRASGN(node)->nd_mid), NEW_CHILD(ast, RNODE_ATTRASGN(node)->nd_args)); + return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_args)); case NODE_LAMBDA: - return rb_ary_new_from_node_args(ast, 1, RNODE_LAMBDA(node)->nd_body); + return rb_ary_new_from_node_args(ast, 1, node->nd_body); case NODE_OPT_ARG: - return rb_ary_new_from_node_args(ast, 2, RNODE_OPT_ARG(node)->nd_body, RNODE_OPT_ARG(node)->nd_next); + return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next); case NODE_KW_ARG: - return rb_ary_new_from_node_args(ast, 2, RNODE_KW_ARG(node)->nd_body, RNODE_KW_ARG(node)->nd_next); + return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next); case NODE_POSTARG: - if (NODE_NAMED_REST_P(RNODE_POSTARG(node)->nd_1st)) { - return rb_ary_new_from_node_args(ast, 2, RNODE_POSTARG(node)->nd_1st, RNODE_POSTARG(node)->nd_2nd); + if (NODE_NAMED_REST_P(node->nd_1st)) { + return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd); } return rb_ary_new_from_args(2, no_name_rest(), - NEW_CHILD(ast, RNODE_POSTARG(node)->nd_2nd)); + NEW_CHILD(ast, node->nd_2nd)); case NODE_ARGS: { - struct rb_args_info *ainfo = &RNODE_ARGS(node)->nd_ainfo; + struct rb_args_info *ainfo = node->nd_ainfo; return rb_ary_new_from_args(10, INT2NUM(ainfo->pre_args_num), NEW_CHILD(ast, ainfo->pre_init), - NEW_CHILD(ast, (NODE *)ainfo->opt_args), + NEW_CHILD(ast, ainfo->opt_args), var_name(ainfo->first_post_arg), INT2NUM(ainfo->post_args_num), NEW_CHILD(ast, 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, (NODE *)ainfo->kw_args)), + (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_args)), (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_rest_arg)), var_name(ainfo->block_arg)); } case NODE_SCOPE: { - rb_ast_id_table_t *tbl = RNODE_SCOPE(node)->nd_tbl; + rb_ast_id_table_t *tbl = 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 *)RNODE_SCOPE(node)->nd_args), NEW_CHILD(ast, RNODE_SCOPE(node)->nd_body)); + return rb_ary_new_from_args(3, locals, NEW_CHILD(ast, node->nd_args), NEW_CHILD(ast, node->nd_body)); } case NODE_ARYPTN: { - VALUE rest = rest_arg(ast, RNODE_ARYPTN(node)->rest_arg); + struct rb_ary_pattern_info *apinfo = node->nd_apinfo; + VALUE rest = rest_arg(ast, apinfo->rest_arg); return rb_ary_new_from_args(4, - NEW_CHILD(ast, RNODE_ARYPTN(node)->nd_pconst), - NEW_CHILD(ast, RNODE_ARYPTN(node)->pre_args), + NEW_CHILD(ast, node->nd_pconst), + NEW_CHILD(ast, apinfo->pre_args), rest, - NEW_CHILD(ast, RNODE_ARYPTN(node)->post_args)); + NEW_CHILD(ast, apinfo->post_args)); } case NODE_FNDPTN: { - VALUE pre_rest = rest_arg(ast, RNODE_FNDPTN(node)->pre_rest_arg); - VALUE post_rest = rest_arg(ast, RNODE_FNDPTN(node)->post_rest_arg); + 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); return rb_ary_new_from_args(4, - NEW_CHILD(ast, RNODE_FNDPTN(node)->nd_pconst), + NEW_CHILD(ast, node->nd_pconst), pre_rest, - NEW_CHILD(ast, RNODE_FNDPTN(node)->args), + NEW_CHILD(ast, fpinfo->args), post_rest); } case NODE_HSHPTN: { - VALUE kwrest = RNODE_HSHPTN(node)->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD ? ID2SYM(rb_intern("NODE_SPECIAL_NO_REST_KEYWORD")) : - NEW_CHILD(ast, RNODE_HSHPTN(node)->nd_pkwrestarg); + VALUE kwrest = node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD ? ID2SYM(rb_intern("NODE_SPECIAL_NO_REST_KEYWORD")) : + NEW_CHILD(ast, node->nd_pkwrestarg); return rb_ary_new_from_args(3, - NEW_CHILD(ast, RNODE_HSHPTN(node)->nd_pconst), - NEW_CHILD(ast, RNODE_HSHPTN(node)->nd_pkwargs), + NEW_CHILD(ast, node->nd_pconst), + NEW_CHILD(ast, node->nd_pkwargs), kwrest); } case NODE_ERROR: return rb_ary_new_from_node_args(ast, 0); case NODE_ARGS_AUX: - case NODE_RIPPER: - case NODE_RIPPER_VALUES: case NODE_LAST: break; } @@ -20,7 +20,7 @@ module RubyVM::AbstractSyntaxTree # call-seq: - # RubyVM::AbstractSyntaxTree.parse(string, keep_script_lines: RubyVM.keep_script_lines, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node + # RubyVM::AbstractSyntaxTree.parse(string, keep_script_lines: false, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node # # Parses the given _string_ into an abstract syntax tree, # returning the root node of that tree. @@ -53,14 +53,14 @@ module RubyVM::AbstractSyntaxTree # # (ERROR@1:7-1:11), # # (LASGN@1:12-1:15 :y (LIT@1:14-1:15 2))] # - # Note that parsing continues even after the errored expression. + # Note that parsing continues even after the errored expresion. # - def self.parse string, keep_script_lines: RubyVM.keep_script_lines, error_tolerant: false, keep_tokens: false + def self.parse string, keep_script_lines: false, error_tolerant: false, keep_tokens: false Primitive.ast_s_parse string, keep_script_lines, error_tolerant, keep_tokens end # call-seq: - # RubyVM::AbstractSyntaxTree.parse_file(pathname, keep_script_lines: RubyVM.keep_script_lines, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node + # RubyVM::AbstractSyntaxTree.parse_file(pathname, keep_script_lines: false, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node # # Reads the file from _pathname_, then parses it like ::parse, # returning the root node of the abstract syntax tree. @@ -72,13 +72,13 @@ module RubyVM::AbstractSyntaxTree # # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-31:3> # # See ::parse for explanation of keyword argument meaning and usage. - def self.parse_file pathname, keep_script_lines: RubyVM.keep_script_lines, error_tolerant: false, keep_tokens: false + def self.parse_file pathname, keep_script_lines: false, error_tolerant: false, keep_tokens: false Primitive.ast_s_parse_file pathname, keep_script_lines, error_tolerant, keep_tokens end # call-seq: - # RubyVM::AbstractSyntaxTree.of(proc, keep_script_lines: RubyVM.keep_script_lines, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node - # RubyVM::AbstractSyntaxTree.of(method, keep_script_lines: RubyVM.keep_script_lines, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node + # RubyVM::AbstractSyntaxTree.of(proc, keep_script_lines: false, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node + # RubyVM::AbstractSyntaxTree.of(method, keep_script_lines: false, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node # # Returns AST nodes of the given _proc_ or _method_. # @@ -93,7 +93,7 @@ module RubyVM::AbstractSyntaxTree # # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-3:3> # # See ::parse for explanation of keyword argument meaning and usage. - def self.of body, keep_script_lines: RubyVM.keep_script_lines, error_tolerant: false, keep_tokens: false + def self.of body, keep_script_lines: false, error_tolerant: false, keep_tokens: false Primitive.ast_s_of body, keep_script_lines, error_tolerant, keep_tokens end @@ -265,8 +265,8 @@ module RubyVM::AbstractSyntaxTree lines = script_lines if lines lines = lines[first_lineno - 1 .. last_lineno - 1] - lines[-1] = lines[-1].byteslice(0...last_column) - lines[0] = lines[0].byteslice(first_column..-1) + lines[-1] = lines[-1][0...last_column] + lines[0] = lines[0][first_column..-1] lines.join else nil diff --git a/benchmark/enum_sort_by.yml b/benchmark/enum_sort_by.yml deleted file mode 100644 index d386353888..0000000000 --- a/benchmark/enum_sort_by.yml +++ /dev/null @@ -1,53 +0,0 @@ -prelude: | - array_length = 2 - fixnum_array2 = array_length.times.to_a.map {rand(10000)} - float_array2 = array_length.times.to_a.map {rand(10000.0).to_f} - string_array2 = array_length.times.to_a.map {"r" * rand(1..10000)} - mix_array2 = array_length.times.to_a.map {if rand(1..100) <= 50 then rand(1..10000).to_f else rand(1..10000) end} - all_zero_array2 =array_length.times.to_a.map {0} - - array_length = 10 - fixnum_array10 = array_length.times.to_a.map {rand(10000)} - float_array10 = array_length.times.to_a.map {rand(10000.0).to_f} - string_array10 = array_length.times.to_a.map {"r" * rand(1..10000)} - mix_array10 = array_length.times.to_a.map {if rand(1..100) <= 50 then rand(1..10000).to_f else rand(1..10000) end} - all_zero_array10 =array_length.times.to_a.map {0} - - array_length = 1000 - fixnum_array1000 = array_length.times.to_a.map {rand(10000)} - float_array1000 = array_length.times.to_a.map {rand(10000.0).to_f} - string_array1000 = array_length.times.to_a.map {"r" * rand(1..10000)} - mix_array1000 = array_length.times.to_a.map {if rand(1..100) <= 50 then rand(1..10000).to_f else rand(1..10000) end} - all_zero_array1000 =array_length.times.to_a.map {0} - - array_length = 100000 - fixnum_array100000 = array_length.times.to_a.map {rand(10000)} - float_array100000 = array_length.times.to_a.map {rand(10000.0).to_f} - string_array100000 = array_length.times.to_a.map {"r" * rand(1..10000)} - mix_array100000 = array_length.times.to_a.map {if rand(1..100) <= 50 then rand(1..10000).to_f else rand(1..10000) end} - all_zero_array100000 =array_length.times.to_a.map {0} - -benchmark: - fixnum_array2.sort_by: fixnum_array2.sort_by {|a| a} - float_array2.sort_by: float_array2.sort_by {|a| a} - string_length2.sort_by: string_array2.sort_by {|a| a.length} - mix_array2.sort_by: mix_array2.sort_by {|a| a} - all_zero2.sort_by: all_zero_array2.sort_by{|a| a} - - fixnum_array10.sort_by: fixnum_array10.sort_by {|a| a} - float_array10.sort_by: float_array10.sort_by {|a| a} - string_length10.sort_by: string_array10.sort_by {|a| a.length} - mix_array10.sort_by: mix_array10.sort_by {|a| a} - all_zero10.sort_by: all_zero_array10.sort_by{|a| a} - - fixnum_array1000.sort_by: fixnum_array1000.sort_by {|a| a} - float_array1000.sort_by: float_array1000.sort_by {|a| a} - string_length1000.sort_by: string_array1000.sort_by {|a| a.length} - mix_array1000.sort_by: mix_array1000.sort_by {|a| a} - all_zero1000.sort_by: all_zero_array1000.sort_by{|a| a} - - fixnum_array100000.sort_by: fixnum_array100000.sort_by {|a| a} - float_array100000.sort_by: float_array100000.sort_by {|a| a} - string_length100000.sort_by: string_array100000.sort_by {|a| a.length} - mix_array100000.sort_by: mix_array100000.sort_by {|a| a} - all_zero100000.sort_by: all_zero_array100000.sort_by{|a| a} diff --git a/benchmark/lib/benchmark_driver/runner/mjit.rb b/benchmark/lib/benchmark_driver/runner/mjit.rb new file mode 100644 index 0000000000..3a58a620de --- /dev/null +++ b/benchmark/lib/benchmark_driver/runner/mjit.rb @@ -0,0 +1,34 @@ +require 'benchmark_driver/struct' +require 'benchmark_driver/metric' +require 'erb' + +# A runner to measure after-JIT performance easily +class BenchmarkDriver::Runner::Mjit < BenchmarkDriver::Runner::Ips + # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job" + Job = Class.new(BenchmarkDriver::DefaultJob) + + # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse` + JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC]).extend(Module.new{ + def parse(**) + jobs = super + jobs.map do |job| + job = job.dup + job.prelude = "#{job.prelude}\n#{<<~EOS}" + if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? + __bmdv_ruby_i = 0 + while __bmdv_ruby_i < 10000 # MJIT call threshold + #{job.script} + __bmdv_ruby_i += 1 + end + RubyVM::MJIT.pause # compile + #{job.script} + RubyVM::MJIT.resume; RubyVM::MJIT.pause # recompile + #{job.script} + RubyVM::MJIT.resume; RubyVM::MJIT.pause # recompile 2 + end + EOS + job + end + end + }) +end diff --git a/benchmark/loop_generator.rb b/benchmark/loop_generator.rb index 6a3194b670..d3375c744c 100644 --- a/benchmark/loop_generator.rb +++ b/benchmark/loop_generator.rb @@ -1,4 +1,4 @@ -max = 6000000 +max = 600000 if defined? Fiber gen = (1..max).each diff --git a/benchmark/mjit_exivar.yml b/benchmark/mjit_exivar.yml new file mode 100644 index 0000000000..2584fa6410 --- /dev/null +++ b/benchmark/mjit_exivar.yml @@ -0,0 +1,18 @@ +type: lib/benchmark_driver/runner/mjit +prelude: | + class Bench < Hash + def initialize + @exivar = nil + end + + def exivar + @exivar + end + end + + bench = Bench.new + +benchmark: + mjit_exivar: bench.exivar + +loop_count: 200000000 diff --git a/benchmark/mjit_integer.yml b/benchmark/mjit_integer.yml new file mode 100644 index 0000000000..a6b5c9ee16 --- /dev/null +++ b/benchmark/mjit_integer.yml @@ -0,0 +1,32 @@ +type: lib/benchmark_driver/runner/mjit +prelude: | + def mjit_abs(int) int.abs end + def mjit_bit_length(int) int.bit_length end + def mjit_comp(int) ~int end + def mjit_even?(int) int.even? end + def mjit_integer?(int) int.integer? end + def mjit_magnitude(int) int.magnitude end + def mjit_odd?(int) int.odd? end + def mjit_ord(int) int.ord end + def mjit_size(int) int.size end + def mjit_to_i(int) int.to_i end + def mjit_to_int(int) int.to_int end + def mjit_uminus(int) -int end + def mjit_zero?(int) int.zero? end + +benchmark: + - mjit_abs(-1) + - mjit_bit_length(100) + - mjit_comp(1) + - mjit_even?(2) + - mjit_integer?(0) + - mjit_magnitude(-1) + - mjit_odd?(1) + - mjit_ord(1) + - mjit_size(1) + - mjit_to_i(1) + - mjit_to_int(1) + - mjit_uminus(1) + - mjit_zero?(0) + +loop_count: 40000000 diff --git a/benchmark/mjit_kernel.yml b/benchmark/mjit_kernel.yml new file mode 100644 index 0000000000..7720e65c2c --- /dev/null +++ b/benchmark/mjit_kernel.yml @@ -0,0 +1,20 @@ +type: lib/benchmark_driver/runner/mjit +prelude: | + def mjit_class(obj) + obj.class + end + + def mjit_frozen?(obj) + obj.frozen? + end + + str = "" + fstr = "".freeze + +benchmark: + - mjit_class(self) + - mjit_class(1) + - mjit_frozen?(str) + - mjit_frozen?(fstr) + +loop_count: 40000000 diff --git a/benchmark/mjit_leave.yml b/benchmark/mjit_leave.yml new file mode 100644 index 0000000000..9ac68b164b --- /dev/null +++ b/benchmark/mjit_leave.yml @@ -0,0 +1,8 @@ +type: lib/benchmark_driver/runner/mjit +prelude: | + def leave + nil + end +benchmark: + mjit_leave: leave +loop_count: 200000000 diff --git a/benchmark/mjit_opt_cc_insns.yml b/benchmark/mjit_opt_cc_insns.yml new file mode 100644 index 0000000000..fed6d34bd5 --- /dev/null +++ b/benchmark/mjit_opt_cc_insns.yml @@ -0,0 +1,27 @@ +# opt_* insns using vm_method_cfunc_is with send-compatible operands: +# * opt_nil_p +# * opt_not +# * opt_eq +type: lib/benchmark_driver/runner/mjit +prelude: | + def mjit_nil?(obj) + obj.nil? + end + + def mjit_not(obj) + !obj + end + + def mjit_eq(a, b) + a == b + end + +benchmark: + - script: mjit_nil?(1) + loop_count: 40000000 + - script: mjit_not(1) + loop_count: 40000000 + - script: mjit_eq(1, nil) + loop_count: 8000000 + - script: mjit_eq(nil, 1) + loop_count: 8000000 diff --git a/benchmark/mjit_struct_aref.yml b/benchmark/mjit_struct_aref.yml new file mode 100644 index 0000000000..bfba1323f2 --- /dev/null +++ b/benchmark/mjit_struct_aref.yml @@ -0,0 +1,10 @@ +type: lib/benchmark_driver/runner/mjit +prelude: | + def mjit_struct_aref(struct) + struct.aa + end + struct = Struct.new(:a0, :a1, :a2, :a3, :a4, :a5, :a6, :a7, :a8, :a9, :aa).new + +benchmark: mjit_struct_aref(struct) + +loop_count: 40000000 diff --git a/benchmark/range_bsearch_bignum.yml b/benchmark/range_bsearch_bignum.yml deleted file mode 100644 index 5730c93fcf..0000000000 --- a/benchmark/range_bsearch_bignum.yml +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 8d7bedb662..0000000000 --- a/benchmark/range_bsearch_endpointless.yml +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 59416531b9..0000000000 --- a/benchmark/range_bsearch_fixnum.yml +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 58f53a0236..0000000000 --- a/benchmark/range_count.yml +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 700a00053c..0000000000 --- a/benchmark/range_overlap.yml +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index a32efeccc6..0000000000 --- a/benchmark/range_reverse_each.yml +++ /dev/null @@ -1,16 +0,0 @@ -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/regexp_dup.yml b/benchmark/regexp_dup.yml deleted file mode 100644 index 52f89991cd..0000000000 --- a/benchmark/regexp_dup.yml +++ /dev/null @@ -1,6 +0,0 @@ -prelude: | - str = "a" * 1000 - re = Regexp.new(str) - -benchmark: - dup: re.dup diff --git a/benchmark/regexp_new.yml b/benchmark/regexp_new.yml deleted file mode 100644 index bc9ab3ca21..0000000000 --- a/benchmark/regexp_new.yml +++ /dev/null @@ -1,7 +0,0 @@ -prelude: | - str = "a" * 1000 - re = Regexp.new(str) - -benchmark: - string: Regexp.new(str) - regexp: Regexp.new(re) diff --git a/benchmark/so_count_words.yml b/benchmark/so_count_words.yml index f7322a8541..99683505f9 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,9 +38,8 @@ prelude: | 13.times{ data << data } - File.write(wcinput, data) + open(wcinput, 'w'){|f| f.write data} end - at_exit {File.unlink(wcinput) rescue nil} end prepare_wc_input(wc_input_base) @@ -50,16 +49,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 - 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 + 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 end # STDERR.puts "#{nl} #{nw} #{nc}" diff --git a/benchmark/so_meteor_contest.rb b/benchmark/so_meteor_contest.rb index d8c8e3ab9c..8c136baa6c 100644 --- a/benchmark/so_meteor_contest.rb +++ b/benchmark/so_meteor_contest.rb @@ -447,7 +447,7 @@ end # as an inverse. The inverse will ALWAYS be 3 one of the piece configurations that is exactly 3 rotations away # (an odd number). Checking even vs odd then produces a higher probability of finding more pieces earlier # in the cycle. We still need to keep checking all the permutations, but our probability of finding one will -# diminish over time. Since we are TOLD how many to search for this lets us exit before checking all pieces +# diminsh over time. Since we are TOLD how many to search for this lets us exit before checking all pieces # this bennifit is very great when seeking small numbers of solutions and is 0 when looking for more than the # maximum number def find_top( rotation_skip) diff --git a/benchmark/string_concat.yml b/benchmark/string_concat.yml index da14692f5e..e65c00cca9 100644 --- a/benchmark/string_concat.yml +++ b/benchmark/string_concat.yml @@ -1,8 +1,6 @@ prelude: | CHUNK = "a" * 64 UCHUNK = "é" * 32 - SHORT = "a" * (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] / 2) - LONG = "a" * (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] * 2) GC.disable # GC causes a lot of variance benchmark: binary_concat_7bit: | @@ -45,7 +43,3 @@ 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: | - buffer = "#{SHORT}#{SHORT}" - interpolation_switching_size_pools: | - buffer = "#{SHORT}#{LONG}" diff --git a/benchmark/string_dup.yml b/benchmark/string_dup.yml deleted file mode 100644 index 90793f9f2a..0000000000 --- a/benchmark/string_dup.yml +++ /dev/null @@ -1,7 +0,0 @@ -prelude: | - # frozen_string_literal: true -benchmark: - uplus: | - +"A" - dup: | - "A".dup diff --git a/benchmark/string_rpartition.yml b/benchmark/string_rpartition.yml deleted file mode 100644 index 37e9d1b071..0000000000 --- a/benchmark/string_rpartition.yml +++ /dev/null @@ -1,18 +0,0 @@ -prelude: | - str1 = [*"a".."z",*"0".."9"].join("") - str10 = str1 * 10 + ":" - str100 = str1 * 100 + ":" - str1000 = str1 * 1000 + ":" - nonascii1 = [*"\u{e0}".."\u{ff}"].join("") - nonascii10 = nonascii1 * 10 + ":" - nonascii100 = nonascii1 * 100 + ":" - nonascii1000 = nonascii1 * 1000 + ":" -benchmark: - rpartition-1: str1.rpartition(":") - rpartition-10: str10.rpartition(":") - rpartition-100: str100.rpartition(":") - rpartition-1000: str1000.rpartition(":") - rpartition-nonascii1: nonascii1.rpartition(":") - rpartition-nonascii10: nonascii10.rpartition(":") - rpartition-nonascii100: nonascii100.rpartition(":") - rpartition-nonascii1000: nonascii1000.rpartition(":") diff --git a/benchmark/struct_accessor.yml b/benchmark/struct_accessor.yml deleted file mode 100644 index 61176cfdd4..0000000000 --- a/benchmark/struct_accessor.yml +++ /dev/null @@ -1,25 +0,0 @@ -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/vm_call_bmethod.yml b/benchmark/vm_call_bmethod.yml deleted file mode 100644 index 40136e5aa4..0000000000 --- a/benchmark/vm_call_bmethod.yml +++ /dev/null @@ -1,37 +0,0 @@ -prelude: | - define_method(:a0){} - define_method(:a1){|a| a} - define_method(:s){|*a| a} - define_method(:b){|kw: 1| kw} - - t0 = 0.times.to_a - t1 = 1.times.to_a - t10 = 10.times.to_a - t100 = 100.times.to_a - kw = {kw: 2} -benchmark: - bmethod_simple_0: | - a0 - bmethod_simple_1: | - a1(1) - bmethod_simple_0_splat: | - a0(*t0) - bmethod_simple_1_splat: | - a1(*t1) - bmethod_no_splat: | - s - bmethod_0_splat: | - s(*t0) - bmethod_1_splat: | - s(*t1) - bmethod_10_splat: | - s(*t10) - bmethod_100_splat: | - s(*t100) - bmethod_kw: | - b(kw: 1) - bmethod_no_kw: | - b - bmethod_kw_splat: | - b(**kw) -loop_count: 6000000 diff --git a/benchmark/vm_call_method_missing.yml b/benchmark/vm_call_method_missing.yml deleted file mode 100644 index f890796f11..0000000000 --- a/benchmark/vm_call_method_missing.yml +++ /dev/null @@ -1,62 +0,0 @@ -prelude: | - class A0 - def method_missing(m); m end - end - class A1 - def method_missing(m, a) a; end - end - class S - def method_missing(m, *a) a; end - end - class B - def method_missing(m, kw: 1) kw end - end - class SB - def method_missing(m, *a, kw: 1) kw end - end - - t0 = 0.times.to_a - t1 = 1.times.to_a - t10 = 10.times.to_a - t200 = 200.times.to_a - kw = {kw: 2} - - a0 = A0.new - a1 = A1.new - s = S.new - b = B.new - sb = SB.new -benchmark: - method_missing_simple_0: | - a0.() - method_missing_simple_1: | - a1.x(1) - method_missing_simple_0_splat: | - a0.(*t0) - method_missing_simple_1_splat: | - a1.(*t1) - method_missing_no_splat: | - s.() - method_missing_0_splat: | - s.(*t0) - method_missing_1_splat: | - s.(*t1) - method_missing_10_splat: | - s.(*t10) - method_missing_200_splat: | - s.(*t200) - method_missing_kw: | - b.(kw: 1) - method_missing_no_kw: | - b.() - method_missing_kw_splat: | - b.(**kw) - method_missing_0_splat_kw: | - sb.(*t0, **kw) - method_missing_1_splat_kw: | - sb.(*t1, **kw) - method_missing_10_splat_kw: | - sb.(*t10, **kw) - method_missing_200_splat_kw: | - sb.(*t200, **kw) -loop_count: 1000000 diff --git a/benchmark/vm_call_send_iseq.yml b/benchmark/vm_call_send_iseq.yml deleted file mode 100644 index 60ff23c475..0000000000 --- a/benchmark/vm_call_send_iseq.yml +++ /dev/null @@ -1,77 +0,0 @@ -prelude: | - def a0; end - def a1(a) a; end - def s(*a) a; end - def b(kw: 1) kw end - def sb(*a, kw: 1) kw end - - t0 = 0.times.to_a - t1 = 1.times.to_a - t10 = 10.times.to_a - t200 = 200.times.to_a - - a0_t0 = [:a0, *t0] - a1_t1 = [:a1, *t1] - s_t0 = [:s, *t0] - s_t1 = [:s, *t1] - s_t10 = [:s, *t10] - s_t200 = [:s, *t200] - sb_t0 = [:sb, *t0] - sb_t1 = [:sb, *t1] - sb_t10 = [:sb, *t10] - sb_t200 = [:sb, *t200] - kw = {kw: 2} -benchmark: - send_simple_0: | - send(:a0) - send_simple_1: | - send(:a1, 1) - send_simple_0_splat: | - send(:a0, *t0) - send_simple_1_splat: | - send(:a1, *t1) - send_simple_0_splat_comb: | - send(*a0_t0) - send_simple_1_splat_comb: | - send(*a1_t1) - send_no_splat: | - send(:s) - send_0_splat: | - send(:s, *t0) - send_1_splat: | - send(:s, *t1) - send_10_splat: | - send(:s, *t10) - send_200_splat: | - send(:s, *t200) - send_0_splat_comb: | - send(*s_t0) - send_1_splat_comb: | - send(*s_t1) - send_10_splat_comb: | - send(*s_t10) - send_200_splat_comb: | - send(*s_t200) - send_kw: | - send(:b, kw: 1) - send_no_kw: | - send(:b) - send_kw_splat: | - send(:b, **kw) - send_0_splat_kw: | - send(:sb, *t0, **kw) - send_1_splat_kw: | - send(:sb, *t1, **kw) - send_10_splat_kw: | - send(:sb, *t10, **kw) - send_200_splat_kw: | - send(:sb, *t200, **kw) - send_0_splat_comb_kw: | - send(*sb_t0, **kw) - send_1_splat_comb_kw: | - send(*sb_t1, **kw) - send_10_splat_comb_kw: | - send(*sb_t10, **kw) - send_200_splat_comb_kw: | - send(*sb_t200, **kw) -loop_count: 3000000 diff --git a/benchmark/vm_call_symproc.yml b/benchmark/vm_call_symproc.yml deleted file mode 100644 index 16e0ac579e..0000000000 --- a/benchmark/vm_call_symproc.yml +++ /dev/null @@ -1,83 +0,0 @@ -prelude: | - def self.a0; end - def self.a1(a) a; end - def self.s(*a) a; end - def self.b(kw: 1) kw end - def self.sb(*a, kw: 1) kw end - - t0 = 0.times.to_a - t1 = 1.times.to_a - t10 = 10.times.to_a - t200 = 200.times.to_a - - a0_t0 = [self, *t0] - a1_t1 = [self, *t1] - s_t0 = [self, *t0] - s_t1 = [self, *t1] - s_t10 = [self, *t10] - s_t200 = [self, *t200] - sb_t0 = [self, *t0] - sb_t1 = [self, *t1] - sb_t10 = [self, *t10] - sb_t200 = [self, *t200] - kw = {kw: 2} - - a0 = :a0.to_proc - a1 = :a1.to_proc - s = :s.to_proc - b = :b.to_proc - sb = :sb.to_proc -benchmark: - symproc_simple_0: | - a0.(self) - symproc_simple_1: | - a1.(self, 1) - symproc_simple_0_splat: | - a0.(self, *t0) - symproc_simple_1_splat: | - a1.(self, *t1) - symproc_simple_0_splat_comb: | - a0.(*a0_t0) - symproc_simple_1_splat_comb: | - a1.(*a1_t1) - symproc_no_splat: | - s.(self) - symproc_0_splat: | - s.(self, *t0) - symproc_1_splat: | - s.(self, *t1) - symproc_10_splat: | - s.(self, *t10) - symproc_200_splat: | - s.(self, *t200) - symproc_0_splat_comb: | - s.(*s_t0) - symproc_1_splat_comb: | - s.(*s_t1) - symproc_10_splat_comb: | - s.(*s_t10) - symproc_200_splat_comb: | - s.(*s_t200) - symproc_kw: | - b.(self, kw: 1) - symproc_no_kw: | - b.(self) - symproc_kw_splat: | - b.(self, **kw) - symproc_0_splat_kw: | - sb.(self, *t0, **kw) - symproc_1_splat_kw: | - sb.(self, *t1, **kw) - symproc_10_splat_kw: | - sb.(self, *t10, **kw) - symproc_200_splat_kw: | - sb.(self, *t200, **kw) - symproc_0_splat_comb_kw: | - sb.(*sb_t0, **kw) - symproc_1_splat_comb_kw: | - sb.(*sb_t1, **kw) - symproc_10_splat_comb_kw: | - sb.(*sb_t10, **kw) - symproc_200_splat_comb_kw: | - sb.(*sb_t200, **kw) -loop_count: 1000000 diff --git a/benchmark/vm_ivar_ic_miss.yml b/benchmark/vm_ivar_ic_miss.yml deleted file mode 100644 index 944fb1a9e6..0000000000 --- a/benchmark/vm_ivar_ic_miss.yml +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 90f6b07f05..0000000000 --- a/benchmark/vm_ivar_memoize.yml +++ /dev/null @@ -1,85 +0,0 @@ -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 deleted file mode 100644 index f2f366e99c..0000000000 --- a/benchmark/vm_method_splat_calls.yml +++ /dev/null @@ -1,13 +0,0 @@ -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_send_cfunc.yml b/benchmark/vm_send_cfunc.yml index 6f12b65176..b114ac317d 100644 --- a/benchmark/vm_send_cfunc.yml +++ b/benchmark/vm_send_cfunc.yml @@ -1,14 +1,3 @@ -prelude: | - ary = [] - kw = {a: 1} - empty_kw = {} - kw_ary = [Hash.ruby2_keywords_hash(a: 1)] - empty_kw_ary = [Hash.ruby2_keywords_hash({})] benchmark: - vm_send_cfunc: itself - vm_send_cfunc_splat: itself(*ary) - vm_send_cfunc_splat_kw_hash: equal?(*kw_ary) - vm_send_cfunc_splat_empty_kw_hash: itself(*empty_kw_ary) - vm_send_cfunc_splat_kw: equal?(*ary, **kw) - vm_send_cfunc_splat_empty_kw: itself(*ary, **empty_kw) -loop_count: 20000000 + vm_send_cfunc: self.class +loop_count: 100000000 @@ -48,14 +48,6 @@ #include "ruby/util.h" #include "ruby_assert.h" -static const bool debug_integer_pack = ( -#ifdef DEBUG_INTEGER_PACK - DEBUG_INTEGER_PACK+0 -#else - RUBY_DEBUG -#endif - ) != 0; - const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz"; #ifndef SIZEOF_BDIGIT_DBL @@ -1057,13 +1049,15 @@ integer_unpack_num_bdigits(size_t numwords, size_t wordsize, size_t nails, int * if (numwords <= (SIZE_MAX - (BITSPERDIG-1)) / CHAR_BIT / wordsize) { num_bdigits = integer_unpack_num_bdigits_small(numwords, wordsize, nails, nlp_bits_ret); - if (debug_integer_pack) { +#ifdef 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); (void)num_bdigits1; } +#endif } else { num_bdigits = integer_unpack_num_bdigits_generic(numwords, wordsize, nails, nlp_bits_ret); @@ -3029,8 +3023,7 @@ rb_big_resize(VALUE big, size_t len) static VALUE bignew_1(VALUE klass, size_t len, int sign) { - NEWOBJ_OF(big, struct RBignum, klass, - T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0), sizeof(struct RBignum), 0); + NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0)); VALUE bigv = (VALUE)big; BIGNUM_SET_SIGN(bigv, sign); if (len <= BIGNUM_EMBED_LEN_MAX) { @@ -3429,13 +3422,15 @@ rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret) if (numbytes <= SIZE_MAX / CHAR_BIT) { numwords = absint_numwords_small(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits); - if (debug_integer_pack) { +#ifdef 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); (void)numwords0; } +#endif } else { numwords = absint_numwords_generic(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits); @@ -4546,7 +4541,7 @@ rb_uint128t2big(uint128_t n) return big; } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_int128t2big(int128_t n) { int neg = 0; @@ -1,6 +1,4 @@ #!/usr/bin/env ruby -# frozen_string_literal: true - #-- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. # All rights reserved. diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index a34527d2fa..f9b3e919b8 100755 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -118,7 +118,7 @@ BT = Class.new(bt) do r = IO.for_fd($1.to_i(10), "rb", autoclose: false) w = IO.for_fd($2.to_i(10), "wb", autoclose: false) end - rescue + rescue => e r.close if r else r.close_on_exec = true @@ -552,13 +552,8 @@ class Assertion < Struct.new(:src, :path, :lineno, :proc) filename = "bootstraptest.#{self.path}_#{self.lineno}_#{self.id}.rb" File.open(filename, 'w') {|f| f.puts "#frozen_string_literal:true" if frozen_string_literal - 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)" + f.puts "GC.stress = true" if $stress + f.puts "print(begin; #{self.src}; end)" } filename end @@ -674,7 +669,7 @@ end def assert_finish(timeout_seconds, testsrc, message = '') add_assertion testsrc, -> as do - if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # for --jit-wait + if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait timeout_seconds *= 3 end @@ -789,9 +784,4 @@ def check_coredump end end -def rjit_enabled? - # Don't check `RubyVM::RJIT.enabled?`. On btest-bruby, target Ruby != runner Ruby. - ENV.fetch('RUN_OPTS', '').include?('rjit') -end - exit main diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb index 47e2924846..a9f389c673 100644 --- a/bootstraptest/test_eval.rb +++ b/bootstraptest/test_eval.rb @@ -227,16 +227,6 @@ assert_equal %q{[10, main]}, %q{ }, '[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 diff --git a/bootstraptest/test_gc.rb b/bootstraptest/test_gc.rb index 17bc497822..eb68c9845e 100644 --- a/bootstraptest/test_gc.rb +++ b/bootstraptest/test_gc.rb @@ -14,7 +14,7 @@ ms = "a".."k" o.send(meth) end end -}, '[ruby-dev:39453]' unless rjit_enabled? # 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 d2e799f855..91fba9b011 100644 --- a/bootstraptest/test_insns.rb +++ b/bootstraptest/test_insns.rb @@ -214,11 +214,9 @@ tests = [ 'true'.freeze }, - [ 'opt_newarray_send', %q{ ![ ].hash.nil? }, ], - - [ 'opt_newarray_send', %q{ [ ].max.nil? }, ], - [ 'opt_newarray_send', %q{ [1, x = 2, 3].max == 3 }, ], - [ 'opt_newarray_send', <<-'},', ], # { + [ 'opt_newarray_max', %q{ [ ].max.nil? }, ], + [ 'opt_newarray_max', %q{ [1, x = 2, 3].max == 3 }, ], + [ 'opt_newarray_max', <<-'},', ], # { class Array def max true @@ -226,9 +224,9 @@ tests = [ end [1, x = 2, 3].max }, - [ 'opt_newarray_send', %q{ [ ].min.nil? }, ], - [ 'opt_newarray_send', %q{ [3, x = 2, 1].min == 1 }, ], - [ 'opt_newarray_send', <<-'},', ], # { + [ 'opt_newarray_min', %q{ [ ].min.nil? }, ], + [ 'opt_newarray_min', %q{ [3, x = 2, 1].min == 1 }, ], + [ 'opt_newarray_min', <<-'},', ], # { class Array def min true diff --git a/bootstraptest/test_load.rb b/bootstraptest/test_load.rb index 3253582a32..e63c93a8f4 100644 --- a/bootstraptest/test_load.rb +++ b/bootstraptest/test_load.rb @@ -12,7 +12,7 @@ assert_equal 'ok', %q{ } }.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)} diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb index 964bf39d98..04c9eb2d11 100644 --- a/bootstraptest/test_method.rb +++ b/bootstraptest/test_method.rb @@ -1190,12 +1190,3 @@ assert_equal 'DC', %q{ test2 o1, [], block $result.join } - -assert_equal 'ok', %q{ - def foo - binding - ["ok"].first - end - foo - foo -}, '[Bug #20178]' diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb index ea7c2c197d..67e66b03ee 100644 --- a/bootstraptest/test_ractor.rb +++ b/bootstraptest/test_ractor.rb @@ -283,7 +283,9 @@ assert_equal 30.times.map { 'ok' }.to_s, %q{ 30.times.map{|i| test i } -} unless (ENV.key?('TRAVIS') && ENV['TRAVIS_CPU_ARCH'] == 'arm64') # https://bugs.ruby-lang.org/issues/17878 +} unless ENV['RUN_OPTS'] =~ /--mjit-call-threshold=5/ || # This always fails with --mjit-wait --mjit-call-threshold=5 + (ENV.key?('TRAVIS') && ENV['TRAVIS_CPU_ARCH'] == 'arm64') || # https://bugs.ruby-lang.org/issues/17878 + true # too flaky everywhere http://ci.rvm.jp/results/trunk@ruby-sp1/4321096 # Exception for empty select assert_match /specify at least one ractor/, %q{ @@ -514,9 +516,9 @@ assert_equal '[true, true, true]', %q{ end } received = [] - taken = [] + take = [] yielded = [] - until received.size == RN && taken.size == RN && yielded.size == RN + until rs.empty? r, v = Ractor.select(CR, *rs, yield_value: 'yield') case r when :receive @@ -524,17 +526,11 @@ assert_equal '[true, true, true]', %q{ when :yield yielded << v else - taken << v + take << v rs.delete r end end - r = [received == ['sendyield'] * RN, - yielded == [nil] * RN, - taken == ['take'] * RN, - ] - - STDERR.puts [received, yielded, taken].inspect - r + [received.all?('sendyield'), yielded.all?(nil), take.all?('take')] } # multiple Ractors can send to one Ractor @@ -1401,7 +1397,7 @@ assert_equal '[false, false, true, true]', %q{ } # TracePoint with normal Proc should be Ractor local -assert_equal '[6, 10]', %q{ +assert_equal '[4, 8]', %q{ rs = [] TracePoint.new(:line){|tp| rs << tp.lineno if tp.path == __FILE__}.enable do Ractor.new{ # line 4 @@ -1476,6 +1472,21 @@ assert_equal "#{N}#{N}", %Q{ }.map{|r| r.take}.join } +# enc_table +assert_equal "100", %Q{ + Ractor.new do + loop do + Encoding.find("test-enc-#{rand(5_000)}").inspect + rescue ArgumentError => e + end + end + + src = Encoding.find("UTF-8") + 100.times{|i| + src.replicate("test-enc-\#{i}") + } +} + # Generic ivtbl n = N/2 assert_equal "#{n}#{n}", %Q{ @@ -1494,9 +1505,8 @@ assert_equal "#{n}#{n}", %Q{ # NameError assert_equal "ok", %q{ - obj = "".freeze # NameError refers the receiver indirectly begin - obj.bar + bar rescue => err end begin @@ -1532,7 +1542,7 @@ assert_equal "ok", %q{ 1_000.times { idle_worker, tmp_reporter = Ractor.select(*workers) } "ok" -} unless ENV['RUN_OPTS'] =~ /rjit/ || ENV.key?('CI') # flaky +} assert_equal "ok", %q{ def foo(*); ->{ super }; end @@ -1570,7 +1580,6 @@ assert_equal "ok", %q{ end } -# check method cache invalidation assert_equal "ok", %q{ module M def foo @@ -1610,166 +1619,10 @@ assert_equal "ok", %q{ "ok" } -# check method cache invalidation -assert_equal 'true', %q{ - class C1; def self.foo = 1; end - class C2; def self.foo = 2; end - class C3; def self.foo = 3; end - class C4; def self.foo = 5; end - class C5; def self.foo = 7; end - class C6; def self.foo = 11; end - class C7; def self.foo = 13; end - class C8; def self.foo = 17; end - - LN = 10_000 - RN = 10 - CS = [C1, C2, C3, C4, C5, C6, C7, C8] - rs = RN.times.map{|i| - Ractor.new(CS.shuffle){|cs| - LN.times.sum{ - cs.inject(1){|r, c| r * c.foo} # c.foo invalidates method cache entry - } - } - } - - n = CS.inject(1){|r, c| r * c.foo} * LN - rs.map{|r| r.take} == 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) } -# 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.take -} - -## 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? -} - -# 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} - s.clear - s.empty? -} - -# 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} - r, v = s.wait - vs = [] - vs << v - 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 } - } - s = Ractor::Selector.new(*rs) - - results = [] - until s.empty? - results << s.wait - - # Note that s.wait can raise an exception because other Ractors/Threads - # can take from the same ractors in the waiting set. - # In this case there is no other takers so `s.wait` doesn't raise an error. - 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 - rs = RN.times.map{ - Ractor.new{ - Ractor.main << Ractor.new{ Ractor.yield :v3; :v4 } - Ractor.main << Ractor.new{ Ractor.yield :v5; :v6 } - Ractor.yield :v1 - :v2 - } - } - - rs.each{|r| s.add(r)} - h = {v1: 0, v2: 0, v3: 0, v4: 0, v5: 0, v6: 0} - - loop do - case s.wait receive: true - in :receive, r - s.add r - in r, v - h[v] += 1 - break if h.all?{|k, v| v == RN} - end - end - - h.sum{|k, v| v} -} 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 } - } - s = Ractor::Selector.new(*rs) - :ok -} - end # if !ENV['GITHUB_WORKFLOW'] diff --git a/bootstraptest/test_rjit.rb b/bootstraptest/test_rjit.rb deleted file mode 100644 index e123f35160..0000000000 --- a/bootstraptest/test_rjit.rb +++ /dev/null @@ -1,58 +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 -} - -# Updating local type in Context -assert_normal_exit %q{ - def foo(flag, object) - klass = if flag - object - end - klass ||= object - return klass.new - end - - foo(false, Object) - foo(true, Object) -} diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index 59fdae651f..948e2d7809 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -535,8 +535,8 @@ assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev 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 "`$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_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_equal %q{0}, %q{[*0];0}, '[ruby-dev:31102]' assert_syntax_error "syntax error, unexpected ')'", %q{v0,(*,v1,) = 0}, '[ruby-dev:31104]' assert_equal %q{1}, %q{ diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb index a4d46e2f10..5361828403 100644 --- a/bootstraptest/test_thread.rb +++ b/bootstraptest/test_thread.rb @@ -242,20 +242,6 @@ assert_equal 'true', %{ 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 @@ -303,7 +289,7 @@ assert_normal_exit %q{ }.each {|t| t.join } -} unless rjit_enabled? # flaky +} assert_equal 'ok', %q{ def m @@ -497,7 +483,7 @@ assert_equal 'foo', %q{ [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 7266587707..5c655b8f25 100644 --- a/bootstraptest/test_yjit.rb +++ b/bootstraptest/test_yjit.rb @@ -1,267 +1,3 @@ -# 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 "2210150001501015", %q{ - def splat_kw(ary) = yield *ary, a: 1 - - def splat(ary) = yield *ary - - def kw = yield 1, 2, a: 0 - - def simple = yield 0, 1 - - 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 { |a| a }, - simple { 5.itself }, - simple { |a| a }, - simple { |opt = raise| opt }, - simple { |*rest| rest }, - simple { |opt_kw: 5| opt_kw }, - # 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 -} unless rjit_enabled? # Not yet working on RJIT - -# 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([])] -} unless rjit_enabled? # Not yet working on RJIT - -# 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{ - 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{ - return :ok unless defined?(GC.compact) - def foo = yield - 10.times do |i| - ret = eval("foo { #{i} }") - raise "failed at #{i}" unless ret == i - GC.compact - end - :ok -} unless rjit_enabled? # Not yet working on RJIT - -# regression test for overly generous guard elision -assert_equal '[0, :sum, 0, :sum]', %q{ - # In faulty versions, the following happens: - # 1. YJIT puts object on the temp stack with type knowledge - # (CArray or CString) about RBASIC_CLASS(object). - # 2. In iter=0, due to the type knowledge, YJIT generates - # a call to sum() without any guard on RBASIC_CLASS(object). - # 3. In iter=1, a singleton class is added to the object, - # changing RBASIC_CLASS(object), falsifying the type knowledge. - # 4. Because the code from (1) has no class guard, it is incorrectly - # reused and the wrong method is invoked. - # Putting a literal is important for gaining type knowledge. - def carray(iter) - array = [] - array.sum(iter.times { def array.sum(_) = :sum }) - end - - def cstring(iter) - string = "" - string.sum(iter.times { def string.sum(_) = :sum }) - end - - [carray(0), carray(1), cstring(0), cstring(1)] -} - -# regression test for return type of Integer#/ -# It can return a T_BIGNUM when inputs are T_FIXNUM. -assert_equal 0x3fffffffffffffff.to_s, %q{ - def call(fixnum_min) - (fixnum_min / -1) - 1 - end - - call(-(2**62)) -} - -# regression test for return type of String#<< -assert_equal 'Sub', %q{ - def call(sub) = (sub << sub).itself - - class Sub < String; end - - call(Sub.new('o')).class -} - -# test splat filling required and feeding rest -assert_equal '[0, 1, 2, [3, 4]]', %q{ - public def lead_rest(a, b, *rest) - [self, a, b, rest] - end - - def call(args) = 0.lead_rest(*args) - - call([1, 2, 3, 4]) -} - -# test missing opts are nil initialized -assert_equal '[[0, 1, nil, 3], [0, 1, nil, 3], [0, 1, nil, 3, []], [0, 1, nil, 3, []]]', %q{ - public def lead_opts(a, b=binding.local_variable_get(:c), c=3) - [self, a, b, c] - end - - public def opts_rest(a=raise, b=binding.local_variable_get(:c), c=3, *rest) - [self, a, b, c, rest] - end - - def call(args) - [ - 0.lead_opts(1), - 0.lead_opts(*args), - - 0.opts_rest(1), - 0.opts_rest(*args), - ] - end - - call([1]) -} - -# test filled optionals with unspecified keyword param -assert_equal 'ok', %q{ - def opt_rest_opt_kw(_=1, *, k: :ok) = k - - def call = opt_rest_opt_kw(0) - - call -} - -# test splat empty array with rest param -assert_equal '[0, 1, 2, []]', %q{ - public def foo(a=1, b=2, *rest) - [self, a, b, rest] - end - - def call(args) = 0.foo(*args) - - call([]) -} - # Regression test for yielding with autosplat to block with # optional parameters. https://github.com/Shopify/yjit/issues/313 assert_equal '[:a, :b, :a, :b]', %q{ @@ -290,7 +26,7 @@ assert_equal '[:ok]', %q{ # Used to crash due to GC run in rb_ensure_iv_list_size() # not marking the newly allocated [:ok]. RegressionTest.new.extender.itself -} unless rjit_enabled? # Skip on RJIT since this uncovers a crash +} assert_equal 'true', %q{ # regression test for tracking type of locals for too long @@ -340,7 +76,7 @@ assert_normal_exit %q{ } assert_normal_exit %q{ - # Test to ensure send on overridden c functions + # Test to ensure send on overriden c functions # doesn't corrupt the stack class Bar def bar(x) @@ -373,80 +109,6 @@ assert_equal '[nil, nil, nil, nil, nil, nil]', %q{ end } -assert_equal '[nil, nil, nil, nil, nil, nil]', %q{ - # Tests defined? on non-heap objects - [NilClass, TrueClass, FalseClass, Integer, Float, Symbol].each do |klass| - klass.class_eval("def foo = defined?(@foo)") - end - - [nil, true, false, 0xFABCAFE, 0.42, :cake].map do |instance| - instance.foo - instance.foo - end -} - -assert_equal '[nil, "instance-variable", nil, "instance-variable"]', %q{ - # defined? on object that changes shape between calls - class Foo - def foo - defined?(@foo) - end - - def add - @foo = 1 - end - - def remove - self.remove_instance_variable(:@foo) - end - end - - obj = Foo.new - [obj.foo, (obj.add; obj.foo), (obj.remove; obj.foo), (obj.add; obj.foo)] -} - -assert_equal '["instance-variable", 5]', %q{ - # defined? on object too complex for shape information - class Foo - def initialize - 100.times { |i| instance_variable_set("@foo#{i}", i) } - end - - def foo - [defined?(@foo5), @foo5] - end - end - - 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 @@ -589,6 +251,8 @@ assert_equal 'string', %q{ # Check that exceptions work when getting global variable assert_equal 'rescued', %q{ + Warning[:deprecated] = true + module Warning def warn(message) raise @@ -742,45 +406,6 @@ assert_equal 'false', %q{ less_than 2 } -# BOP redefinition works on Integer#<= -assert_equal 'false', %q{ - def le(x, y) = x <= y - - le(2, 2) - - class Integer - def <=(_) = false - end - - le(2, 2) -} - -# BOP redefinition works on Integer#> -assert_equal 'false', %q{ - def gt(x, y) = x > y - - gt(3, 2) - - class Integer - def >(_) = false - end - - gt(3, 2) -} - -# BOP redefinition works on Integer#>= -assert_equal 'false', %q{ - def ge(x, y) = x >= y - - ge(2, 2) - - class Integer - def >=(_) = false - end - - ge(2, 2) -} - # Putobject, less-than operator, fixnums assert_equal '2', %q{ def check_index(index) @@ -1391,18 +1016,6 @@ assert_equal '[42, :default]', %q{ ] } -# Test default value block for Hash with opt_aref_with -assert_equal "false", %q{ - def index_with_string(h) - h["foo"] - end - - h = Hash.new { |h, k| k.frozen? } - - index_with_string(h) - index_with_string(h) -} - # A regression test for making sure cfp->sp is proper when # hitting stubs. See :stub-sp-flush: assert_equal 'ok', %q{ @@ -2025,24 +1638,6 @@ assert_equal 'true', %q{ 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")] -} unless rjit_enabled? # Not yet working on RJIT - # Test << operator on string subclass assert_equal 'abab', %q{ class MyString < String; end @@ -2409,38 +2004,6 @@ assert_equal '[:A, :Btwo]', %q{ ins.foo } -# invokesuper with a block -assert_equal 'true', %q{ - class A - def foo = block_given? - end - - class B < A - def foo = super() - end - - B.new.foo { } - B.new.foo { } -} - -# invokesuper in a block -assert_equal '[0, 2]', %q{ - class A - def foo(x) = x * 2 - end - - class B < A - def foo - 2.times.map do |x| - super(x) - end - end - end - - B.new.foo - B.new.foo -} - # Call to fixnum assert_equal '[true, false]', %q{ def is_odd(obj) @@ -2521,18 +2084,6 @@ assert_equal '[1, 2, 3, 4, 5]', %q{ 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, 1, 2, 1, 2, 3]', %q{ def expandarray arr = [1, 2, 3] @@ -2597,17 +2148,6 @@ assert_equal '[1, 2, nil]', %q{ expandarray_rhs_too_small } -assert_equal '[nil, 2, nil]', %q{ - def foo(arr) - a, b, c = arr - end - - a, b, c1 = foo([0, 1]) - a, b, c2 = foo([0, 1, 2]) - a, b, c3 = foo([0, 1]) - [c1, c2, c3] -} - assert_equal '[1, [2]]', %q{ def expandarray_splat a, *b = [1, 2] @@ -2697,7 +2237,7 @@ assert_equal '[[:c_return, :String, :string_alias, "events_to_str"]]', %q{ events.compiled(events) events -} unless rjit_enabled? # RJIT calls extra Ruby methods +} unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # MJIT calls extra Ruby methods # test enabling a TracePoint that targets a particular line in a C method call assert_equal '[true]', %q{ @@ -2779,7 +2319,7 @@ assert_equal '[[:c_call, :itself]]', %q{ tp.enable { shouldnt_compile } events -} unless rjit_enabled? # RJIT calls extra Ruby methods +} unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # MJIT calls extra Ruby methods # test enabling c_return tracing before compiling assert_equal '[[:c_return, :itself, main]]', %q{ @@ -2794,7 +2334,7 @@ assert_equal '[[:c_return, :itself, main]]', %q{ tp.enable { shouldnt_compile } events -} unless rjit_enabled? # RJIT calls extra Ruby methods +} unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # MJIT calls extra Ruby methods # test c_call invalidation assert_equal '[[:c_call, :itself]]', %q{ @@ -3981,530 +3521,10 @@ assert_equal 'ok', %q{ cw(4) } -assert_equal 'threw', %q{ - def foo(args) - wrap(*args) - rescue ArgumentError - 'threw' - end - - def wrap(a) - [a] - end - - foo([Hash.ruby2_keywords_hash({})]) -} - -assert_equal 'threw', %q{ - # C call - def bar(args) - Array(*args) - rescue ArgumentError - 'threw' - end - - bar([Hash.ruby2_keywords_hash({})]) -} - -# Test instance_of? and is_a? -assert_equal 'true', %q{ - 1.instance_of?(Integer) && 1.is_a?(Integer) -} - -# Test instance_of? and is_a? for singleton classes -assert_equal 'true', %q{ - a = [] - def a.test = :test - a.instance_of?(Array) && a.is_a?(Array) -} - -# Test instance_of? for singleton_class -# Yes this does really return false -assert_equal 'false', %q{ - a = [] - def a.test = :test - a.instance_of?(a.singleton_class) -} - -# Test is_a? for singleton_class -assert_equal 'true', %q{ - a = [] - def a.test = :test - a.is_a?(a.singleton_class) -} - -# Test send with splat to a cfunc -assert_equal 'true', %q{ - 1.send(:==, 1, *[]) -} - -# Test empty splat with cfunc -assert_equal '2', %q{ - def foo - Integer.sqrt(4, *[]) - end - # call twice to deal with constant exiting - foo - foo -} - -# Test non-empty splat with cfunc -assert_equal 'Hello World', %q{ - def bar - args = ["Hello "] - greeting = "World" - greeting.insert(0, *args) - greeting - end - bar -} - -# Regression: this creates a temp stack with > 127 elements -assert_normal_exit %q{ - def foo(a) - [ - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, a, a, - a, a, a, a, a, a, a, a, - ] - end - - def entry - foo(1) - end - - entry -} - -# Test that splat and rest combined -# properly dupe the array -assert_equal "[]", %q{ - def foo(*rest) - rest << 1 - end - - def test(splat) - foo(*splat) - end - - EMPTY = [] - custom = Object.new - def custom.to_a - EMPTY - end - - test(custom) - test(custom) - EMPTY -} - -# Rest with send -assert_equal '[1, 2, 3]', %q{ - def bar(x, *rest) - rest.insert(0, x) - end - send(:bar, 1, 2, 3) -} - -# Fix splat block arg bad compilation -assert_equal "foo", %q{ - def literal(*args, &block) - s = ''.dup - literal_append(s, *args, &block) - s - end - - def literal_append(sql, v) - sql << v - end - - literal("foo") -} - -# regression test for accidentally having a parameter truncated -# due to Rust/C signature mismatch. Used to crash with -# > [BUG] rb_vm_insn_addr2insn: invalid insn address ... -# or -# > ... `Err` value: TryFromIntError(())' -assert_normal_exit %q{ - n = 16384 - eval( - "def foo(arg); " + "_=arg;" * n + '_=1;' + "Object; end" - ) - foo 1 -} - -# Regression test for CantCompile not using starting_ctx -assert_normal_exit %q{ - class Integer - def ===(other) - false - end - end - - def my_func(x) - case x - when 1 - 1 - when 2 - 2 - else - 3 - end - end - - my_func(1) -} - -# Regression test for CantCompile not using starting_ctx -assert_equal "ArgumentError", %q{ - def literal(*args, &block) - s = ''.dup - args = [1, 2, 3] - literal_append(s, *args, &block) - s - end - - def literal_append(sql, v) - [sql.inspect, v.inspect] - end - - begin - literal("foo") - rescue ArgumentError - "ArgumentError" - end -} - -# Rest with block -# Simplified code from railsbench -assert_equal '[{"/a"=>"b", :as=>:c, :via=>:post}, [], nil]', %q{ - def match(path, *rest, &block) - [path, rest, block] - end - - def map_method(method, args, &block) - options = args.last - args.pop - options[:via] = method - match(*args, options, &block) - end - - def post(*args, &block) - map_method(:post, args, &block) - end - - post "/a" => "b", as: :c -} - -# Test rest and kw_args -assert_equal '[true, true, true, true]', %q{ - def my_func(*args, base: nil, sort: true) - [args, base, sort] - end - - def calling_my_func - results = [] - results << (my_func("test") == [["test"], nil, true]) - results << (my_func("test", base: :base) == [["test"], :base, true]) - results << (my_func("test", sort: false) == [["test"], nil, false]) - results << (my_func("test", "other", base: :base) == [["test", "other"], :base, true]) - results - end - calling_my_func -} - -# Test Integer#[] with 2 args -assert_equal '0', %q{ - 3[0, 0] -} - -# unspecified_bits + checkkeyword -assert_equal '2', %q{ - def callee = 1 - - # checkkeyword should see unspecified_bits=0 (use bar), not Integer 1 (set bar = foo). - def foo(foo, bar: foo) = bar - - def entry(&block) - # write 1 at stack[3]. Calling #callee spills stack[3]. - 1 + (1 + (1 + (1 + callee))) - # &block is written to a register instead of stack[3]. When &block is popped and - # unspecified_bits is pushed, it must be written to stack[3], not to a register. - foo(1, bar: 2, &block) - end - - entry # call branch_stub_hit (spill temps) - entry # doesn't call branch_stub_hit (not spill temps) -} - -# Test rest and optional_params -assert_equal '[true, true, true, true]', %q{ - def my_func(stuff, base=nil, sort=true, *args) - [stuff, base, sort, args] - end - - def calling_my_func - results = [] - results << (my_func("test") == ["test", nil, true, []]) - results << (my_func("test", :base) == ["test", :base, true, []]) - results << (my_func("test", :base, false) == ["test", :base, false, []]) - results << (my_func("test", :base, false, "other", "other") == ["test", :base, false, ["other", "other"]]) - results - end - calling_my_func -} - -# Test rest and optional_params and splat -assert_equal '[true, true, true, true, true]', %q{ - def my_func(stuff, base=nil, sort=true, *args) - [stuff, base, sort, args] - end - - def calling_my_func - results = [] - splat = ["test"] - results << (my_func(*splat) == ["test", nil, true, []]) - splat = [:base] - results << (my_func("test", *splat) == ["test", :base, true, []]) - splat = [:base, false] - results << (my_func("test", *splat) == ["test", :base, false, []]) - splat = [:base, false, "other", "other"] - results << (my_func("test", *splat) == ["test", :base, false, ["other", "other"]]) - splat = ["test", :base, false, "other", "other"] - results << (my_func(*splat) == ["test", :base, false, ["other", "other"]]) - results - end - calling_my_func -} +assert_normal_exit %{ + class Bug20997 + def foo(&) = self.class.name(&) -# Regression test: rest and optional and splat -assert_equal 'true', %q{ - def my_func(base=nil, *args) - [base, args] - end - - def calling_my_func - array = [] - my_func(:base, :rest1, *array) == [:base, [:rest1]] - end - - calling_my_func -} - -# Fix failed case for large splat -assert_equal 'true', %q{ - def d(a, b=:b) - end - - def calling_func - ary = 1380888.times; - d(*ary) - end - begin - calling_func - rescue ArgumentError - true - end -} unless rjit_enabled? # Not yet working on RJIT - -# Regression test: register allocator on expandarray -assert_equal '[]', %q{ - func = proc { [] } - proc do - _x, _y = func.call - end.call -} - -# Catch TAG_BREAK in a non-FINISH frame with JIT code -assert_equal '1', %q{ - def entry - catch_break - end - - def catch_break - while_true do - break - end - 1 - end - - def while_true - while true - yield - end - end - - entry -} - -assert_equal '6', %q{ - class Base - def number = 1 + yield - end - - class Sub < Base - def number = super + 2 - end - - Sub.new.number { 3 } -} - -# Integer multiplication and overflow -assert_equal '[6, -6, 9671406556917033397649408, -9671406556917033397649408, 21267647932558653966460912964485513216]', %q{ - def foo(a, b) - a * b - end - - r1 = foo(2, 3) - r2 = foo(2, -3) - r3 = foo(2 << 40, 2 << 41) - r4 = foo(2 << 40, -2 << 41) - r5 = foo(1 << 62, 1 << 62) - - [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_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 right shift -assert_equal '[0, 1, -4]', %q{ - [0 >> 1, 2 >> 1, -7 >> 1] -} - -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 -} - -# 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) + new.foo 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 @@ -3,15 +3,15 @@ #include "iseq.h" #include "builtin.h" -#include "builtin_binary.inc" - -#ifndef BUILTIN_BINARY_SIZE +#ifdef CROSS_COMPILING #define INCLUDED_BY_BUILTIN_C 1 #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) { @@ -39,7 +39,7 @@ rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin size_t size; const unsigned char *bin = builtin_lookup(feature_name, &size); if (! bin) { - rb_bug("builtin_lookup: can not find %s", feature_name); + rb_bug("builtin_lookup: can not find %s\n", feature_name); } // load binary @@ -48,7 +48,6 @@ rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin 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; // exec @@ -58,12 +57,6 @@ rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin #endif void -rb_free_loaded_builtin_table(void) -{ - // do nothing -} - -void Init_builtin(void) { // nothing @@ -11,13 +11,17 @@ struct rb_builtin_function { // for load const int index; const char * const name; + + // for jit + void (*compiler)(VALUE, long, unsigned, bool); }; -#define RB_BUILTIN_FUNCTION(_i, _name, _fname, _arity) {\ +#define RB_BUILTIN_FUNCTION(_i, _name, _fname, _arity, _compiler) {\ .name = _i < 0 ? NULL : #_name, \ .func_ptr = (void *)_fname, \ .argc = _arity, \ .index = _i, \ + .compiler = _compiler, \ } void rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table); diff --git a/ccan/list/list.h b/ccan/list/list.h index bf692a6937..30b2af04e9 100644 --- a/ccan/list/list.h +++ b/ccan/list/list.h @@ -635,16 +635,14 @@ 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 = 0, \ - i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \ + for (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 = 0, \ - i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \ + for (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)); \ @@ -30,41 +30,7 @@ #include "ruby/st.h" #include "vm_core.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 - */ - -/* 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 - */ - -/* 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 - * Module is used for refinements. - * if !SHAPE_IN_BASIC_FLAGS - * 4-19: SHAPE_FLAG_MASK - * Shape ID for the module. - * endif - */ +#define id_attached id__attached__ #define METACLASS_OF(k) RBASIC(k)->klass #define SET_METACLASS_OF(k, cls) RBASIC_SET_CLASS(k, cls) @@ -229,13 +195,22 @@ rb_class_detach_module_subclasses(VALUE klass) static VALUE class_alloc(VALUE flags, VALUE klass) { - size_t alloc_size = sizeof(struct RClass) + sizeof(rb_classext_t); + size_t alloc_size = sizeof(struct RClass); + +#if RCLASS_EXT_EMBEDDED + alloc_size += sizeof(rb_classext_t); +#endif flags &= T_MASK; + flags |= FL_PROMOTED1 /* start from age == 2 */; if (RGENGC_WB_PROTECTED_CLASS) flags |= FL_WB_PROTECTED; - NEWOBJ_OF(obj, struct RClass, klass, flags, alloc_size, 0); + RVARGC_NEWOBJ_OF(obj, struct RClass, klass, flags, alloc_size); +#if RCLASS_EXT_EMBEDDED memset(RCLASS_EXT(obj), 0, sizeof(rb_classext_t)); +#else + obj->ptr = ZALLOC(rb_classext_t); +#endif /* ZALLOC RCLASS_CONST_TBL(obj) = 0; @@ -248,7 +223,7 @@ class_alloc(VALUE flags, VALUE klass) */ RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj); RB_OBJ_WRITE(obj, &RCLASS_REFINED_CLASS(obj), Qnil); - RCLASS_SET_ALLOCATOR((VALUE)obj, 0); + RCLASS_ALLOCATOR(obj) = 0; return (VALUE)obj; } @@ -435,8 +410,7 @@ struct cvc_table_copy_ctx { }; static enum rb_id_table_iterator_result -cvc_table_copy(ID id, VALUE val, void *data) -{ +cvc_table_copy(ID id, VALUE val, void *data) { struct cvc_table_copy_ctx *ctx = (struct cvc_table_copy_ctx *)data; struct rb_cvar_class_tbl_entry * orig_entry; orig_entry = (struct rb_cvar_class_tbl_entry *)val; @@ -496,7 +470,7 @@ 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}; +enum {RMODULE_ALLOCATED_BUT_NOT_INITIALIZED = RUBY_FL_USER5}; static inline bool RMODULE_UNINITIALIZED(VALUE module) @@ -539,14 +513,14 @@ rb_mod_init_copy(VALUE clone, VALUE orig) /* 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; + FL_SET(clone, RCLASS_CLONED); + FL_SET(orig , RCLASS_CLONED); if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) { 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)); + RCLASS_ALLOCATOR(clone) = RCLASS_ALLOCATOR(orig); copy_tables(clone, orig); if (RCLASS_M_TBL(orig)) { struct clone_method_arg arg; @@ -578,14 +552,11 @@ rb_mod_init_copy(VALUE clone, VALUE orig) rb_bug("non iclass between module/class and origin"); } clone_p = class_alloc(RBASIC(p)->flags, 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)); RCLASS_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_ALLOCATOR(clone_p) = RCLASS_ALLOCATOR(p); if (RB_TYPE_P(clone, T_CLASS)) { RCLASS_SET_INCLUDER(clone_p, clone); } @@ -648,7 +619,7 @@ 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 (!(FL_TEST(klass, FL_SINGLETON) && rb_attr_get(klass, id_attached) == obj)) { // nothing to clone return klass; } @@ -670,6 +641,7 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach) } RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass)); + RCLASS_ALLOCATOR(clone) = RCLASS_ALLOCATOR(klass); rb_iv_tbl_copy(clone, klass); if (RCLASS_CONST_TBL(klass)) { struct clone_const_arg arg; @@ -700,7 +672,7 @@ void rb_singleton_class_attached(VALUE klass, VALUE obj) { if (FL_TEST(klass, FL_SINGLETON)) { - RCLASS_SET_ATTACHED_OBJECT(klass, obj); + rb_class_ivar_set(klass, id_attached, obj); } } @@ -714,13 +686,13 @@ rb_singleton_class_attached(VALUE klass, VALUE obj) static int rb_singleton_class_has_metaclass_p(VALUE sklass) { - return RCLASS_ATTACHED_OBJECT(METACLASS_OF(sklass)) == sklass; + return rb_attr_get(METACLASS_OF(sklass), id_attached) == sklass; } int rb_singleton_class_internal_p(VALUE sklass) { - return (RB_TYPE_P(RCLASS_ATTACHED_OBJECT(sklass), T_CLASS) && + return (RB_TYPE_P(rb_attr_get(sklass, id_attached), T_CLASS) && !rb_singleton_class_has_metaclass_p(sklass)); } @@ -866,27 +838,6 @@ refinement_import_methods(int argc, VALUE *argv, VALUE refinement) } # endif -/*! - *-- - * \private - * Initializes the world of objects and classes. - * - * At first, the function bootstraps the class hierarchy. - * It initializes the most fundamental classes and their metaclasses. - * - \c BasicObject - * - \c Object - * - \c Module - * - \c Class - * After the bootstrap step, the class hierarchy becomes as the following - * diagram. - * - * \image html boottime-classes.png - * - * Then, the function defines classes, modules and methods as usual. - * \ingroup class - *++ - */ - void Init_class_hierarchy(void) { @@ -959,7 +910,7 @@ rb_define_class_id(ID id, VALUE super) * \return the value \c Class#inherited's returns * \pre Each of \a super and \a klass must be a \c Class object. */ -VALUE +MJIT_FUNC_EXPORTED VALUE rb_class_inherited(VALUE super, VALUE klass) { ID inherited; @@ -1142,7 +1093,7 @@ rb_include_class_new(VALUE module, VALUE super) { VALUE klass = class_alloc(T_ICLASS, rb_cClass); - RCLASS_SET_M_TBL(klass, RCLASS_M_TBL(module)); + RCLASS_M_TBL(klass) = RCLASS_M_TBL(module); RCLASS_SET_ORIGIN(klass, klass); if (BUILTIN_TYPE(module) == T_ICLASS) { @@ -1194,8 +1145,8 @@ rb_include_module(VALUE klass, VALUE module) iclass = iclass->next; } - int do_include = 1; 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. */ @@ -1262,7 +1213,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; @@ -1326,7 +1277,6 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super iclass = rb_include_class_new(module, super_class); c = RCLASS_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)}; @@ -1337,14 +1287,11 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super RCLASS_SET_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), iclass); RICLASS_SET_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 = @@ -1418,10 +1365,10 @@ ensure_origin(VALUE klass) VALUE origin = RCLASS_ORIGIN(klass); if (origin == klass) { origin = class_alloc(T_ICLASS, klass); - RCLASS_SET_M_TBL(origin, RCLASS_M_TBL(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); 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); @@ -1714,7 +1661,7 @@ rb_class_attached_object(VALUE klass) rb_raise(rb_eTypeError, "`%"PRIsVALUE"' is not a singleton class", klass); } - return RCLASS_ATTACHED_OBJECT(klass); + return rb_attr_get(klass, id_attached); } static void @@ -2243,7 +2190,7 @@ singleton_class_of(VALUE obj) klass = METACLASS_OF(obj); if (!(FL_TEST(klass, FL_SINGLETON) && - RCLASS_ATTACHED_OBJECT(klass) == obj)) { + rb_attr_get(klass, id_attached) == obj)) { klass = rb_make_metaclass(obj, klass); } @@ -2282,7 +2229,7 @@ rb_singleton_class_get(VALUE obj) } klass = METACLASS_OF(obj); if (!FL_TEST(klass, FL_SINGLETON)) return Qnil; - if (RCLASS_ATTACHED_OBJECT(klass) != obj) return Qnil; + if (rb_attr_get(klass, id_attached) != obj) return Qnil; return klass; } @@ -2346,7 +2293,7 @@ rb_define_attr(VALUE klass, const char *name, int read, int write) rb_attr(klass, rb_intern(name), read, write, FALSE); } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_keyword_error_new(const char *error, VALUE keys) { long i = 0, len = RARRAY_LEN(keys); @@ -1,6 +1,4 @@ # -*- mode: makefile-gmake; indent-tabs-mode: t -*- -# This fragment can be used with nmake.exe and with bsdmake. -# Avoid features specific to GNU Make. bin: $(PROGRAM) $(WPROGRAM) lib: $(LIBRUBY) @@ -45,15 +43,20 @@ RUN_OPTS = --disable-gems # GITPULLOPTIONS = --no-tags -PRISM_SRCDIR = $(srcdir)/prism -INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(PRISM_SRCDIR) -I$(UNICODE_HDR_DIR) $(incflags) +INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR) $(incflags) GEM_HOME = GEM_PATH = GEM_VENDOR = BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver -BENCHMARK_DRIVER_GIT_REF = v0.16.3 +BENCHMARK_DRIVER_GIT_REF = v0.16.0 +SIMPLECOV_GIT_URL = https://github.com/colszowka/simplecov.git +SIMPLECOV_GIT_REF = v0.17.0 +SIMPLECOV_HTML_GIT_URL = https://github.com/colszowka/simplecov-html.git +SIMPLECOV_HTML_GIT_REF = v0.10.2 +DOCLIE_GIT_URL = https://github.com/ms-ati/docile.git +DOCLIE_GIT_REF = v1.3.2 STATIC_RUBY = static-ruby @@ -83,34 +86,6 @@ ENC_MK = enc.mk MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \ RUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BOOTSTRAPRUBY)" $(mflags) -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/token_type.$(OBJEXT) \ - prism/util/pm_buffer.$(OBJEXT) \ - prism/util/pm_char.$(OBJEXT) \ - prism/util/pm_constant_pool.$(OBJEXT) \ - prism/util/pm_list.$(OBJEXT) \ - prism/util/pm_memchr.$(OBJEXT) \ - prism/util/pm_newline_list.$(OBJEXT) \ - prism/util/pm_state_stack.$(OBJEXT) \ - prism/util/pm_string.$(OBJEXT) \ - prism/util/pm_string_list.$(OBJEXT) \ - prism/util/pm_strncasecmp.$(OBJEXT) \ - prism/util/pm_strpbrk.$(OBJEXT) \ - prism/prism.$(OBJEXT) \ - prism_init.$(OBJEXT) - COMMONOBJS = array.$(OBJEXT) \ ast.$(OBJEXT) \ bignum.$(OBJEXT) \ @@ -139,15 +114,13 @@ COMMONOBJS = array.$(OBJEXT) \ marshal.$(OBJEXT) \ math.$(OBJEXT) \ memory_view.$(OBJEXT) \ - rjit.$(OBJEXT) \ - rjit_c.$(OBJEXT) \ + mjit.$(OBJEXT) \ + mjit_c.$(OBJEXT) \ node.$(OBJEXT) \ - node_dump.$(OBJEXT) \ numeric.$(OBJEXT) \ object.$(OBJEXT) \ pack.$(OBJEXT) \ parse.$(OBJEXT) \ - parser_st.$(OBJEXT) \ proc.$(OBJEXT) \ process.$(OBJEXT) \ ractor.$(OBJEXT) \ @@ -162,7 +135,6 @@ COMMONOBJS = array.$(OBJEXT) \ regparse.$(OBJEXT) \ regsyntax.$(OBJEXT) \ ruby.$(OBJEXT) \ - ruby_parser.$(OBJEXT) \ scheduler.$(OBJEXT) \ shape.$(OBJEXT) \ signal.$(OBJEXT) \ @@ -175,6 +147,7 @@ COMMONOBJS = array.$(OBJEXT) \ thread.$(OBJEXT) \ time.$(OBJEXT) \ transcode.$(OBJEXT) \ + transient_heap.$(OBJEXT) \ util.$(OBJEXT) \ variable.$(OBJEXT) \ version.$(OBJEXT) \ @@ -183,81 +156,13 @@ COMMONOBJS = array.$(OBJEXT) \ vm_dump.$(OBJEXT) \ vm_sync.$(OBJEXT) \ vm_trace.$(OBJEXT) \ - weakmap.$(OBJEXT) \ - $(PRISM_FILES) \ $(YJIT_OBJ) \ - $(YJIT_LIBOBJ) \ $(COROUTINE_OBJ) \ $(DTRACE_OBJ) \ $(BUILTIN_ENCOBJS) \ $(BUILTIN_TRANSOBJS) \ $(MISSING) -$(PRISM_FILES): $(PRISM_BUILD_DIR)/.time $(PRISM_BUILD_DIR)/util/.time - -$(PRISM_BUILD_DIR)/.time $(PRISM_BUILD_DIR)/util/.time: - $(Q) $(MAKEDIRS) $(@D) - @$(NULLCMD) > $@ - -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/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/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/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) \ loadpath.$(OBJEXT) \ @@ -296,7 +201,7 @@ INSTALL_DATA_MODE = 0644 BOOTSTRAPRUBY_COMMAND = $(BOOTSTRAPRUBY) $(BOOTSTRAPRUBY_OPT) TESTSDIR = $(srcdir)/test TOOL_TESTSDIR = $(tooldir)/test -TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/.excludes --name=!/memory_leak/ +TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/ TESTWORKDIR = testwork TESTOPTS = $(RUBY_TESTOPTS) @@ -320,7 +225,6 @@ YJIT_RUSTC_ARGS = --crate-name=yjit \ --crate-type=staticlib \ --edition=2021 \ -g \ - -C lto=thin \ -C opt-level=3 \ -C overflow-checks=on \ '--out-dir=$(CARGO_TARGET_DIR)/release/' \ @@ -331,15 +235,45 @@ all: $(SHOWFLAGS) main docs 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 +main: $(srcdir)/lib/ruby_vm/mjit/instruction.rb +srcs: $(srcdir)/lib/ruby_vm/mjit/instruction.rb +$(srcdir)/lib/ruby_vm/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/ruby_vm/mjit/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) +mjit-headers: $(MJIT_SUPPORT)-mjit-headers +no-mjit-headers: PHONY +yes-mjit-headers: mjit_config.h PHONY + +mjit.$(OBJEXT): mjit_config.h +mjit_config.h: Makefile + +.PHONY: mjit-bindgen +mjit-bindgen: + $(Q) $(BASERUBY) -rrubygems -C $(srcdir)/tool/mjit bindgen.rb $(CURDIR) + +# These rules using MJIT_HEADER_SUFFIX must be in common.mk, not +# Makefile.in, in order to override the macro in defs/universal.mk. + +# Other `-Dxxx`s preceding `-DMJIT_HEADER` will be removed in transform_mjit_header.rb. +# So `-DMJIT_HEADER` should be passed first when rb_mjit_header.h is generated. +$(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJEXT) \ + $(TIMESTAMPDIR)/$(arch)/.time $(tooldir)/mjit_tabs.rb $(PREP) $(RBCONFIG) + $(ECHO) building $(@F:.time=.h) + $(Q)$(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \ + $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new + $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new + +$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time + +$(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: \ + $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time \ + $(tooldir)/transform_mjit_header.rb $(PREP) \ + $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h + $(ECHO) building $@ + $(Q)$(MINIRUBY) $(tooldir)/transform_mjit_header.rb "$(CC) $(CFLAGS) -w" $(MJIT_HEADER:.h=)$(MJIT_HEADER_ARCH).h $@ + $(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR) + $(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F) .PHONY: showflags exts enc trans: $(SHOWFLAGS) @@ -395,8 +329,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) + EXTENCS="$(ENCOBJS)" MINIRUBY="$(MINIRUBY)" UPDATE_LIBRARIES=no $(EXTSTATIC) $(Q)$(MAKE) $(EXTS_NOTE) exts-note: $(EXTS_MK) @@ -439,8 +372,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) $(DOT_WAIT) $(PROGRAM) -wprogram: $(SHOWFLAGS) $(DOT_WAIT) $(WPROGRAM) +program: $(SHOWFLAGS) $(PROGRAM) +wprogram: $(SHOWFLAGS) $(WPROGRAM) mini: PHONY miniruby$(EXEEXT) $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) @@ -461,12 +394,12 @@ ruby.imp: $(COMMONOBJS) $(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) \ + exec sed -n '/^MJIT_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 $@ install: install-$(INSTALLDOC) -docs: srcs-doc $(DOCTARGETS) +docs: $(DOCTARGETS) pkgconfig-data: $(ruby_pc) $(ruby_pc): $(srcdir)/template/ruby.pc.in config.status @@ -660,24 +593,18 @@ do-install-dbg: $(PROGRAM) pre-install-dbg post-install-dbg:: @$(NULLCMD) -rdoc: PHONY main srcs-doc +rdoc: PHONY main @echo Generating RDoc documentation $(Q) $(RDOC) --ri --op "$(RDOCOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)" -html: PHONY main srcs-doc +html: PHONY main @echo Generating RDoc HTML files $(Q) $(RDOC) --op "$(HTMLOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)" -rdoc-coverage: PHONY main srcs-doc +rdoc-coverage: PHONY main @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' - RDOCBENCHOUT=/tmp/rdocbench GCBENCH_ITEM=null @@ -712,11 +639,8 @@ clean-local:: clean-runnable $(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)$(RM) $(PRISM_BUILD_DIR)/.time $(PRISM_BUILD_DIR)/*/.time -$(Q)$(RMALL) yjit/target - -$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine yjit \ - $(PRISM_BUILD_DIR)/*/ $(PRISM_BUILD_DIR) tmp \ - 2> $(NULL) || $(NULLCMD) + -$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine yjit 2> $(NULL) || $(NULLCMD) bin/clean-runnable:: PHONY $(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || $(NULLCMD) @@ -764,6 +688,8 @@ clean-srcs-local:: $(Q)$(RM) parse.c parse.h lex.c enc/trans/newline.c revision.h $(Q)$(RM) id.c id.h probes.dmyh probes.h $(Q)$(RM) encdb.h transdb.h verconf.h ruby-runner.h + $(Q)$(RM) mjit_config.h rb_mjit_header.h + $(Q)$(RM) $(MJIT_MIN_HEADER) $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h realclean-srcs-local:: clean-srcs-local $(Q)$(CHDIR) $(srcdir) && $(RM) \ @@ -858,7 +784,7 @@ $(HAVE_BASERUBY:no=)$(arch)-fake.rb: miniruby$(EXEEXT) # actually depending on other headers more. $(arch:noarch=ignore)-fake.rb: $(top_srcdir)/revision.h $(top_srcdir)/version.h $(srcdir)/version.c -$(arch:noarch=ignore)-fake.rb: {$(VPATH)}id.h {$(VPATH)}vm_opts.h $(REVISION_H) +$(arch:noarch=ignore)-fake.rb: {$(VPATH)}id.h {$(VPATH)}vm_opts.h $(arch:noarch=ignore)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb $(ECHO) generating $@ @@ -870,7 +796,6 @@ $(arch:noarch=ignore)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_ noarch-fake.rb: # prerequisite of yes-fake $(Q) exit > $@ -# runner: BASERUBY, target: miniruby btest: $(TEST_RUNNABLE)-btest no-btest: PHONY yes-btest: yes-fake miniruby$(EXEEXT) PHONY @@ -878,7 +803,6 @@ yes-btest: yes-fake miniruby$(EXEEXT) PHONY $(Q)$(gnumake_recursive)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) $(ACTIONS_ENDGROUP) -# runner: ruby, target: ruby btest-ruby: $(TEST_RUNNABLE)-btest-ruby no-btest-ruby: PHONY yes-btest-ruby: prog PHONY @@ -886,12 +810,6 @@ yes-btest-ruby: prog PHONY $(Q)$(gnumake_recursive)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) $(ACTIONS_ENDGROUP) -# runner: BASERUBY, target: ruby -btest-bruby: prog PHONY - $(ACTIONS_GROUP) - $(Q)$(gnumake_recursive)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) - $(ACTIONS_ENDGROUP) - rtest: yes-fake miniruby$(EXEEXT) PHONY $(ACTIONS_GROUP) $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" --sets=ractor -v @@ -930,17 +848,10 @@ test-sample: test-basic # backward compatibility for mswin-build test-short: btest-ruby $(DOT_WAIT) test-knownbug $(DOT_WAIT) test-basic test: test-short -# Separate to skip updating encs and exts by `make -o test-precheck` -# for GNU make. -test-precheck: 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: $(PRECHECK_TEST_ALL) +yes-test-all: programs PHONY $(ACTIONS_GROUP) $(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS) $(ACTIONS_ENDGROUP) @@ -982,14 +893,13 @@ $(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h $(srcdir)/ test-rubyspec: test-spec yes-test-rubyspec: yes-test-spec -yes-test-spec-precheck: yes-test-all-precheck yes-fake +test-spec-precheck: programs yes-fake test-spec: $(TEST_RUNNABLE)-test-spec -yes-test-spec: yes-test-spec-precheck +yes-test-spec: test-spec-precheck $(ACTIONS_GROUP) $(gnumake_recursive)$(Q) \ - $(RUNRUBY) -r./$(arch)-fake -r$(tooldir)/rubyspec_temp \ - $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) $(SPECOPTS) + $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) $(SPECOPTS) $(ACTIONS_ENDGROUP) no-test-spec: @@ -1033,19 +943,23 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc PHONY: -{$(VPATH)}parse.c: {$(VPATH)}parse.y {$(VPATH)}id.h +{$(VPATH)}parse.c: {$(VPATH)}parse.y $(tooldir)/ytab.sed {$(VPATH)}id.h {$(VPATH)}parse.h: {$(VPATH)}parse.c {$(srcdir)}.y.c: $(ECHO) generating $@ - $(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) | \ - $(YACC) $(YFLAGS) -o$@ -H$*.h - parse.y + $(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) > parse.tmp.y + $(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y + $(Q)$(RM) parse.tmp.y + $(Q)sed -f $(tooldir)/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new + $(Q)$(MV) $@.new $@ + $(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h) + $(Q)$(RM) y.tab.c y.tab.h $(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) @@ -1058,8 +972,6 @@ 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,7 +1039,7 @@ parse.$(OBJEXT): {$(VPATH)}parse.c miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c # dependencies for optional sources. -compile.$(OBJEXT): {$(VPATH)}optunifs.inc +compile.$(OBJEXT): {$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}win32/file.h \ {$(VPATH)}dln.h {$(VPATH)}dln_find.c {$(VPATH)}encindex.h \ @@ -1154,6 +1066,7 @@ INSNS2VMOPT = --srcdir="$(srcdir)" srcs_vpath = {$(VPATH)} inc_common_headers = $(tooldir)/ruby_vm/views/_copyright.erb $(tooldir)/ruby_vm/views/_notice.erb +$(srcs_vpath)opt_sc.inc: $(tooldir)/ruby_vm/views/opt_sc.inc.erb $(inc_common_headers) $(srcs_vpath)optinsn.inc: $(tooldir)/ruby_vm/views/optinsn.inc.erb $(inc_common_headers) $(srcs_vpath)optunifs.inc: $(tooldir)/ruby_vm/views/optunifs.inc.erb $(inc_common_headers) $(srcs_vpath)insns.inc: $(tooldir)/ruby_vm/views/insns.inc.erb $(inc_common_headers) @@ -1165,6 +1078,7 @@ $(srcs_vpath)insns_info.inc: $(tooldir)/ruby_vm/views/insns_info.inc.erb $(inc_c $(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 +$(srcs_vpath)mjit_sp_inc.inc: $(tooldir)/ruby_vm/views/mjit_sp_inc.inc.erb BUILTIN_RB_SRCS = \ $(srcdir)/ast.rb \ @@ -1173,8 +1087,8 @@ BUILTIN_RB_SRCS = \ $(srcdir)/numeric.rb \ $(srcdir)/io.rb \ $(srcdir)/marshal.rb \ - $(srcdir)/rjit.rb \ - $(srcdir)/rjit_c.rb \ + $(srcdir)/mjit.rb \ + $(srcdir)/mjit_c.rb \ $(srcdir)/pack.rb \ $(srcdir)/trace_point.rb \ $(srcdir)/warning.rb \ @@ -1197,16 +1111,9 @@ common-srcs: $(srcs_vpath)parse.c $(srcs_vpath)lex.c $(srcs_vpath)enc/trans/newl missing-srcs: $(srcdir)/missing/des_tables.c -srcs: common-srcs missing-srcs srcs-enc srcs-doc +srcs: common-srcs missing-srcs srcs-enc -RIPPER_SRCS = $(srcdir)/ext/ripper/ripper.c \ - $(srcdir)/ext/ripper/ripper_init.c \ - $(srcdir)/ext/ripper/eventids1.h \ - $(srcdir)/ext/ripper/eventids1.c \ - $(srcdir)/ext/ripper/eventids2table.c \ - # RIPPER_SRCS - -EXT_SRCS = ripper_srcs \ +EXT_SRCS = $(srcdir)/ext/ripper/ripper.c \ $(srcdir)/ext/rbconfig/sizeof/sizes.c \ $(srcdir)/ext/rbconfig/sizeof/limits.c \ $(srcdir)/ext/socket/constdefs.c \ @@ -1252,9 +1159,9 @@ id.c: $(tooldir)/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.d $(Q) $(BASERUBY) $(tooldir)/generic_erb.rb --output=$@ \ $(srcdir)/template/id.c.tmpl -node_name.inc: $(tooldir)/node_name.rb $(srcdir)/rubyparser.h +node_name.inc: $(tooldir)/node_name.rb $(srcdir)/node.h $(ECHO) generating $@ - $(Q) $(BASERUBY) -n $(tooldir)/node_name.rb < $(srcdir)/rubyparser.h > $@ + $(Q) $(BASERUBY) -n $(tooldir)/node_name.rb < $(srcdir)/node.h > $@ encdb.h: $(RBCONFIG) $(tooldir)/generic_erb.rb $(srcdir)/template/encdb.h.tmpl $(ECHO) generating $@ @@ -1306,13 +1213,9 @@ preludes: {$(srcdir)}golf_prelude.c $(ECHO) making $@ $(Q) $(BASERUBY) $(tooldir)/mk_builtin_loader.rb $< -$(BUILTIN_BINARY:yes=built)in_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.inc.tmpl +builtin_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 - -$(Q) sha256sum $@ 2> $(NULL) || $(NULLCMD) - -$(BUILTIN_BINARY:no=builtin)_binary.inc: - $(Q) echo> $@ // empty $(@F) + $(srcdir)/template/builtin_binary.inc.tmpl -- --cross=$(CROSS_COMPILING) $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb @@ -1323,20 +1226,13 @@ $(REVISION_H)$(no_baseruby:no=~disabled~): $(REVISION_H)$(yes_baseruby:yes=~disabled~): $(Q) exit > $@ -# uncommon.mk: $(REVISION_H) -# $(MKFILES): $(REVISION_H) - -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 -$(RIPPER_SRCS): $(srcdir)/ext/ripper/ripper_init.c.tmpl $(srcdir)/ext/ripper/eventids2.c +$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y $(srcdir)/defs/id.def $(srcdir)/ext/ripper/depend $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ $(CAT_DEPEND) depend | \ $(exec) $(MAKE) -f - $(mflags) \ - Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" top_srcdir=../.. srcdir=. VPATH=../.. \ - RUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C + Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" BISON="$(YACC)" top_srcdir=../.. srcdir=. VPATH=../.. \ + RUBY="$(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 $@ @@ -1364,7 +1260,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/mkconstants.rb +$(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend $(Q) $(CHDIR) $(@D) && \ $(CAT_DEPEND) depend | \ $(exec) $(MAKE) -f - $(mflags) \ @@ -1426,10 +1322,9 @@ run.gdb: echo ' quit' >> run.gdb echo end >> run.gdb -GDB = gdb gdb: miniruby$(EXEEXT) run.gdb PHONY - $(GDB) -x run.gdb --quiet --args $(MINIRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT) + gdb -x run.gdb --quiet --args $(MINIRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT) gdb-ruby: $(PROGRAM) run.gdb PHONY $(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT) @@ -1452,7 +1347,7 @@ dist: up:: update-remote -up$(DOT_WAIT):: +up:: -$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY ALWAYS_UPDATE_UNICODE= after-update yes:: @@ -1479,10 +1374,6 @@ update-config_files: PHONY $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \ config.guess config.sub -update-coverage: main PHONY - $(XRUBY) -C "$(srcdir)" bin/gem install --no-document \ - --install-dir .bundle --conservative "simplecov" - 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) @@ -1509,28 +1400,14 @@ extract-gems$(gnumake:yes=-sequential): PHONY -e 'gem, ver, _, rev = *$$F' \ -e 'next if !ver or /^#/=~gem' \ -e 'g = "#{gem}-#{ver}"' \ - -e 'unless File.directory?("#{d}/#{g}")' \ - -e 'if rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \ - -e 'BundledGem.build(gs, ver, "gems")' \ - -e 'end' \ + -e 'if File.directory?("#{d}/#{g}")' \ + -e 'elsif rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \ + -e 'BundledGem.copy(gs, ".bundle")' \ + -e 'else' \ -e 'BundledGem.unpack("gems/#{g}.gem", ".bundle")' \ -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 - outdate-bundled-gems: PHONY $(Q) $(BASERUBY) $(tooldir)/$@.rb --make="$(MAKE)" --mflags="$(MFLAGS)" "$(srcdir)" @@ -1560,7 +1437,7 @@ no-test-bundled-gems-prepare: no-test-bundled-gems-precheck yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck $(ACTIONS_GROUP) $(XRUBY) -C "$(srcdir)" bin/gem install --no-document \ - --install-dir .bundle --conservative "hoe" "json-schema" "test-unit-rr" + --install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "rexml" "json-schema:5.1.0" "test-unit-rr" $(ACTIONS_ENDGROUP) PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare @@ -1584,30 +1461,24 @@ 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" + --install-dir .bundle --conservative "bundler" "rake" "rspec:~> 3" #"ruby-prof" $(ACTIONS_ENDGROUP) RSPECOPTS = SYNTAX_SUGGEST_SPECS = -PREPARE_SYNTAX_SUGGEST = $(TEST_RUNNABLE)-test-syntax-suggest-prepare +PREPARE_SYNTAX_SUGGEST = 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) +yes-test-syntax-suggest: yes-$(PREPARE_SYNTAX_SUGGEST) + $(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \ + --require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS) no-test-syntax-suggest: -check: $(DOT_WAIT) $(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest +check: $(DOT_WAIT) $(TEST_RUNNABLE)-$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck no-test-bundler-precheck: yes-test-bundler-precheck: main $(arch)-fake.rb -yes-test-bundler-parallel-precheck: yes-test-bundler-precheck -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) @@ -1616,24 +1487,23 @@ yes-test-bundler-prepare: yes-test-bundler-precheck -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 + -e 'load "spec/bundler/support/bundle.rb"' -- install --gemfile=tool/bundler/dev_gems.rb $(ACTIONS_ENDGROUP) RSPECOPTS = BUNDLER_SPECS = -PREPARE_BUNDLER = $(TEST_RUNNABLE)-test-bundler-prepare test-bundler: $(TEST_RUNNABLE)-test-bundler -yes-test-bundler: $(PREPARE_BUNDLER) +yes-test-bundler: yes-test-bundler-prepare $(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) + $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \ + --require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) no-test-bundler: PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel -yes-test-bundler-parallel: $(PREPARE_BUNDLER) +yes-test-bundler-parallel: yes-test-bundler-prepare $(gnumake_recursive)$(XRUBY) \ -r./$(arch)-fake \ -e "ARGV[-1] = File.expand_path(ARGV[-1])" \ @@ -1641,9 +1511,9 @@ yes-test-bundler-parallel: $(PREPARE_BUNDLER) $(XRUBY) -I$(srcdir)/spec/bundler \ -e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \ -e "load ARGV.shift" \ - "$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \ + "$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec" \ $(srcdir)/.bundle/bin/parallel_rspec \ - -o "--require spec_helper --require formatter_overrides" \ + -o "--require spec_helper" \ $(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS) no-test-bundler-parallel: @@ -1793,16 +1663,6 @@ $(UNICODE_HDR_DIR)/name2ctype.h: $(UNICODE_SRC_DATA_DIR) $(UNICODE_SRC_EMOJI_DATA_DIR) > $@.new $(MV) $@.new $@ -srcs-doc: $(srcdir)/doc/regexp/unicode_properties.rdoc -$(srcdir)/doc/regexp/$(ALWAYS_UPDATE_UNICODE:yes=unicode_properties.rdoc): \ - $(UNICODE_HDR_DIR)/name2ctype.h $(UNICODE_PROPERTY_FILES) - -$(srcdir)/doc/regexp/unicode_properties.rdoc: - $(Q) $(BOOTSTRAPRUBY) $(tooldir)/generic_erb.rb -c -o $@ \ - $(srcdir)/template/unicode_properties.rdoc.tmpl \ - $(UNICODE_SRC_DATA_DIR) $(UNICODE_HDR_DIR)/name2ctype.h || \ - $(TOUCH) $@ - # the next non-comment line was: # $(UNICODE_HDR_DIR)/casefold.h: $(tooldir)/enc-case-folding.rb \ # but was changed to make sure CI works on systems that don't have gperf @@ -1845,8 +1705,6 @@ info-arch: PHONY @echo arch=$(arch) exam: check -exam: $(DOT_WAIT) test-bundler-parallel -exam: $(DOT_WAIT) test-bundled-gems love: sudo-precheck up all test exam install @echo love is all you need @@ -1868,7 +1726,7 @@ update-man-date: PHONY ChangeLog: $(ECHO) Generating $@ -$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs \ - -e 'VCS.detect(ARGV[0]).export_changelog(path: ARGV[1])' \ + -e 'VCS.detect(ARGV[0]).export_changelog("@", nil, nil, ARGV[1])' \ "$(srcdir)" $@ HELP_EXTRA_TASKS = "" @@ -1889,16 +1747,13 @@ help: PHONY " runruby: runs test.rb by ruby you just built" \ " gdb: runs test.rb by miniruby under gdb" \ " gdb-ruby: runs test.rb by ruby under gdb" \ - " runirb: starts irb on built ruby (not installed ruby)" \ - " exam: equals make check test-bundler-parallel test-bundled-gems" \ - " check: equals make test test-tool test-all test-spec test-syntax-suggest" \ + " check: equals make test test-tool test-all test-spec" \ " test: ruby core tests [BTESTS=<bootstraptest files>]" \ " test-all: all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \ " test-spec: run the Ruby spec suite [SPECOPTS=<specs, opts>]" \ " test-bundler: run the Bundler spec" \ " test-bundler-parallel: run the Bundler spec with parallel" \ - " test-syntax-suggest: run the SyntaxSuggest spec" \ - " test-bundled-gems: run the test suite of bundled gems [BUNDLED_GEMS=<gems>]" \ + " test-bundled-gems: run the test suite of bundled gems" \ " test-tool: tests under the tool/test" \ " update-gems: download files of the bundled gems" \ " update-bundled_gems: update the latest version of bundled gems" \ @@ -1909,12 +1764,12 @@ help: PHONY " install: install all ruby distributions" \ " install-nodoc: install without rdoc" \ " install-cross: install cross compiling stuff" \ - " clean: clean up to the state before build" \ - " distclean: clean up to the state before configure" \ + " clean: clean for tarball" \ + " distclean: clean for repository" \ " golf: build goruby for golfers" \ $(HELP_EXTRA_TASKS) \ "see DeveloperHowto for more detail: " \ - " https://github.com/ruby/ruby/wiki/Developer-How-To" \ + " https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \ $(MESSAGE_END) $(CROSS_COMPILING:yes=)builtin.$(OBJEXT): {$(VPATH)}mini_builtin.c @@ -1946,7 +1801,6 @@ addr2line.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h addr2line.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h addr2line.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h addr2line.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -addr2line.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h addr2line.$(OBJEXT): {$(VPATH)}internal/attr/pure.h addr2line.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h addr2line.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -1976,10 +1830,6 @@ addr2line.$(OBJEXT): {$(VPATH)}internal/stdbool.h addr2line.$(OBJEXT): {$(VPATH)}internal/warning_push.h addr2line.$(OBJEXT): {$(VPATH)}internal/xmalloc.h addr2line.$(OBJEXT): {$(VPATH)}missing.h -array.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -array.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -array.$(OBJEXT): $(CCAN_DIR)/list/list.h -array.$(OBJEXT): $(CCAN_DIR)/str/str.h array.$(OBJEXT): $(hdrdir)/ruby/ruby.h array.$(OBJEXT): $(top_srcdir)/internal/array.h array.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h @@ -1992,7 +1842,6 @@ array.$(OBJEXT): $(top_srcdir)/internal/enum.h array.$(OBJEXT): $(top_srcdir)/internal/fixnum.h array.$(OBJEXT): $(top_srcdir)/internal/gc.h array.$(OBJEXT): $(top_srcdir)/internal/hash.h -array.$(OBJEXT): $(top_srcdir)/internal/imemo.h array.$(OBJEXT): $(top_srcdir)/internal/numeric.h array.$(OBJEXT): $(top_srcdir)/internal/object.h array.$(OBJEXT): $(top_srcdir)/internal/proc.h @@ -2005,7 +1854,6 @@ array.$(OBJEXT): $(top_srcdir)/internal/warnings.h array.$(OBJEXT): {$(VPATH)}array.c array.$(OBJEXT): {$(VPATH)}array.rbinc array.$(OBJEXT): {$(VPATH)}assert.h -array.$(OBJEXT): {$(VPATH)}atomic.h array.$(OBJEXT): {$(VPATH)}backward/2/assume.h array.$(OBJEXT): {$(VPATH)}backward/2/attributes.h array.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -2063,7 +1911,6 @@ array.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h array.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h array.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h array.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -array.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h array.$(OBJEXT): {$(VPATH)}internal/attr/pure.h array.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h array.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -2132,6 +1979,7 @@ array.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h array.$(OBJEXT): {$(VPATH)}internal/intern/error.h array.$(OBJEXT): {$(VPATH)}internal/intern/eval.h array.$(OBJEXT): {$(VPATH)}internal/intern/file.h +array.$(OBJEXT): {$(VPATH)}internal/intern/gc.h array.$(OBJEXT): {$(VPATH)}internal/intern/hash.h array.$(OBJEXT): {$(VPATH)}internal/intern/io.h array.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -2162,6 +2010,7 @@ array.$(OBJEXT): {$(VPATH)}internal/memory.h array.$(OBJEXT): {$(VPATH)}internal/method.h array.$(OBJEXT): {$(VPATH)}internal/module.h array.$(OBJEXT): {$(VPATH)}internal/newobj.h +array.$(OBJEXT): {$(VPATH)}internal/rgengc.h array.$(OBJEXT): {$(VPATH)}internal/scan_args.h array.$(OBJEXT): {$(VPATH)}internal/special_consts.h array.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -2173,24 +2022,17 @@ array.$(OBJEXT): {$(VPATH)}internal/value_type.h array.$(OBJEXT): {$(VPATH)}internal/variable.h array.$(OBJEXT): {$(VPATH)}internal/warning_push.h array.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -array.$(OBJEXT): {$(VPATH)}method.h array.$(OBJEXT): {$(VPATH)}missing.h -array.$(OBJEXT): {$(VPATH)}node.h array.$(OBJEXT): {$(VPATH)}onigmo.h array.$(OBJEXT): {$(VPATH)}oniguruma.h array.$(OBJEXT): {$(VPATH)}probes.dmyh array.$(OBJEXT): {$(VPATH)}probes.h array.$(OBJEXT): {$(VPATH)}ruby_assert.h -array.$(OBJEXT): {$(VPATH)}ruby_atomic.h -array.$(OBJEXT): {$(VPATH)}rubyparser.h array.$(OBJEXT): {$(VPATH)}shape.h array.$(OBJEXT): {$(VPATH)}st.h array.$(OBJEXT): {$(VPATH)}subst.h -array.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -array.$(OBJEXT): {$(VPATH)}thread_native.h +array.$(OBJEXT): {$(VPATH)}transient_heap.h array.$(OBJEXT): {$(VPATH)}util.h -array.$(OBJEXT): {$(VPATH)}vm_core.h -array.$(OBJEXT): {$(VPATH)}vm_opts.h ast.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h ast.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h ast.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -2203,34 +2045,12 @@ ast.$(OBJEXT): $(top_srcdir)/internal/compilers.h ast.$(OBJEXT): $(top_srcdir)/internal/gc.h ast.$(OBJEXT): $(top_srcdir)/internal/imemo.h ast.$(OBJEXT): $(top_srcdir)/internal/parse.h -ast.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h ast.$(OBJEXT): $(top_srcdir)/internal/serial.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/diagnostic.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/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_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_state_stack.h -ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -2291,7 +2111,6 @@ ast.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h ast.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h ast.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h ast.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -ast.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h ast.$(OBJEXT): {$(VPATH)}internal/attr/pure.h ast.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h ast.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -2360,6 +2179,7 @@ ast.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h ast.$(OBJEXT): {$(VPATH)}internal/intern/error.h ast.$(OBJEXT): {$(VPATH)}internal/intern/eval.h ast.$(OBJEXT): {$(VPATH)}internal/intern/file.h +ast.$(OBJEXT): {$(VPATH)}internal/intern/gc.h ast.$(OBJEXT): {$(VPATH)}internal/intern/hash.h ast.$(OBJEXT): {$(VPATH)}internal/intern/io.h ast.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -2390,6 +2210,7 @@ ast.$(OBJEXT): {$(VPATH)}internal/memory.h ast.$(OBJEXT): {$(VPATH)}internal/method.h ast.$(OBJEXT): {$(VPATH)}internal/module.h ast.$(OBJEXT): {$(VPATH)}internal/newobj.h +ast.$(OBJEXT): {$(VPATH)}internal/rgengc.h ast.$(OBJEXT): {$(VPATH)}internal/scan_args.h ast.$(OBJEXT): {$(VPATH)}internal/special_consts.h ast.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -2407,12 +2228,8 @@ 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/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 ast.$(OBJEXT): {$(VPATH)}shape.h ast.$(OBJEXT): {$(VPATH)}st.h ast.$(OBJEXT): {$(VPATH)}subst.h @@ -2421,13 +2238,7 @@ ast.$(OBJEXT): {$(VPATH)}thread_native.h ast.$(OBJEXT): {$(VPATH)}util.h ast.$(OBJEXT): {$(VPATH)}vm_core.h ast.$(OBJEXT): {$(VPATH)}vm_opts.h -bignum.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -bignum.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -bignum.$(OBJEXT): $(CCAN_DIR)/list/list.h -bignum.$(OBJEXT): $(CCAN_DIR)/str/str.h bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h -bignum.$(OBJEXT): $(top_srcdir)/internal/array.h -bignum.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h bignum.$(OBJEXT): $(top_srcdir)/internal/bignum.h bignum.$(OBJEXT): $(top_srcdir)/internal/bits.h bignum.$(OBJEXT): $(top_srcdir)/internal/class.h @@ -2435,7 +2246,6 @@ bignum.$(OBJEXT): $(top_srcdir)/internal/compilers.h bignum.$(OBJEXT): $(top_srcdir)/internal/complex.h bignum.$(OBJEXT): $(top_srcdir)/internal/fixnum.h bignum.$(OBJEXT): $(top_srcdir)/internal/gc.h -bignum.$(OBJEXT): $(top_srcdir)/internal/imemo.h bignum.$(OBJEXT): $(top_srcdir)/internal/numeric.h bignum.$(OBJEXT): $(top_srcdir)/internal/object.h bignum.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h @@ -2445,7 +2255,6 @@ bignum.$(OBJEXT): $(top_srcdir)/internal/variable.h bignum.$(OBJEXT): $(top_srcdir)/internal/vm.h bignum.$(OBJEXT): $(top_srcdir)/internal/warnings.h bignum.$(OBJEXT): {$(VPATH)}assert.h -bignum.$(OBJEXT): {$(VPATH)}atomic.h bignum.$(OBJEXT): {$(VPATH)}backward/2/assume.h bignum.$(OBJEXT): {$(VPATH)}backward/2/attributes.h bignum.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -2459,7 +2268,6 @@ bignum.$(OBJEXT): {$(VPATH)}bignum.c bignum.$(OBJEXT): {$(VPATH)}config.h bignum.$(OBJEXT): {$(VPATH)}constant.h bignum.$(OBJEXT): {$(VPATH)}defines.h -bignum.$(OBJEXT): {$(VPATH)}encoding.h bignum.$(OBJEXT): {$(VPATH)}id.h bignum.$(OBJEXT): {$(VPATH)}id_table.h bignum.$(OBJEXT): {$(VPATH)}intern.h @@ -2502,7 +2310,6 @@ bignum.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h bignum.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h bignum.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h bignum.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -bignum.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h bignum.$(OBJEXT): {$(VPATH)}internal/attr/pure.h bignum.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h bignum.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -2535,15 +2342,6 @@ bignum.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h bignum.$(OBJEXT): {$(VPATH)}internal/ctype.h bignum.$(OBJEXT): {$(VPATH)}internal/dllexport.h bignum.$(OBJEXT): {$(VPATH)}internal/dosish.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -bignum.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h bignum.$(OBJEXT): {$(VPATH)}internal/error.h bignum.$(OBJEXT): {$(VPATH)}internal/eval.h bignum.$(OBJEXT): {$(VPATH)}internal/event.h @@ -2571,6 +2369,7 @@ bignum.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h bignum.$(OBJEXT): {$(VPATH)}internal/intern/error.h bignum.$(OBJEXT): {$(VPATH)}internal/intern/eval.h bignum.$(OBJEXT): {$(VPATH)}internal/intern/file.h +bignum.$(OBJEXT): {$(VPATH)}internal/intern/gc.h bignum.$(OBJEXT): {$(VPATH)}internal/intern/hash.h bignum.$(OBJEXT): {$(VPATH)}internal/intern/io.h bignum.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -2601,6 +2400,7 @@ bignum.$(OBJEXT): {$(VPATH)}internal/memory.h bignum.$(OBJEXT): {$(VPATH)}internal/method.h bignum.$(OBJEXT): {$(VPATH)}internal/module.h bignum.$(OBJEXT): {$(VPATH)}internal/newobj.h +bignum.$(OBJEXT): {$(VPATH)}internal/rgengc.h bignum.$(OBJEXT): {$(VPATH)}internal/scan_args.h bignum.$(OBJEXT): {$(VPATH)}internal/special_consts.h bignum.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -2612,23 +2412,13 @@ bignum.$(OBJEXT): {$(VPATH)}internal/value_type.h bignum.$(OBJEXT): {$(VPATH)}internal/variable.h bignum.$(OBJEXT): {$(VPATH)}internal/warning_push.h bignum.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -bignum.$(OBJEXT): {$(VPATH)}method.h bignum.$(OBJEXT): {$(VPATH)}missing.h -bignum.$(OBJEXT): {$(VPATH)}node.h -bignum.$(OBJEXT): {$(VPATH)}onigmo.h -bignum.$(OBJEXT): {$(VPATH)}oniguruma.h bignum.$(OBJEXT): {$(VPATH)}ruby_assert.h -bignum.$(OBJEXT): {$(VPATH)}ruby_atomic.h -bignum.$(OBJEXT): {$(VPATH)}rubyparser.h bignum.$(OBJEXT): {$(VPATH)}shape.h bignum.$(OBJEXT): {$(VPATH)}st.h bignum.$(OBJEXT): {$(VPATH)}subst.h bignum.$(OBJEXT): {$(VPATH)}thread.h -bignum.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -bignum.$(OBJEXT): {$(VPATH)}thread_native.h bignum.$(OBJEXT): {$(VPATH)}util.h -bignum.$(OBJEXT): {$(VPATH)}vm_core.h -bignum.$(OBJEXT): {$(VPATH)}vm_opts.h builtin.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h builtin.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h builtin.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -2644,27 +2434,6 @@ 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/diagnostic.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/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_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_state_stack.h -builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -2682,7 +2451,6 @@ builtin.$(OBJEXT): {$(VPATH)}builtin_binary.inc builtin.$(OBJEXT): {$(VPATH)}config.h builtin.$(OBJEXT): {$(VPATH)}constant.h builtin.$(OBJEXT): {$(VPATH)}defines.h -builtin.$(OBJEXT): {$(VPATH)}encoding.h builtin.$(OBJEXT): {$(VPATH)}id.h builtin.$(OBJEXT): {$(VPATH)}id_table.h builtin.$(OBJEXT): {$(VPATH)}intern.h @@ -2725,7 +2493,6 @@ builtin.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h builtin.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h builtin.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h builtin.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -builtin.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h builtin.$(OBJEXT): {$(VPATH)}internal/attr/pure.h builtin.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h builtin.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -2758,15 +2525,6 @@ builtin.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h builtin.$(OBJEXT): {$(VPATH)}internal/ctype.h builtin.$(OBJEXT): {$(VPATH)}internal/dllexport.h builtin.$(OBJEXT): {$(VPATH)}internal/dosish.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -builtin.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h builtin.$(OBJEXT): {$(VPATH)}internal/error.h builtin.$(OBJEXT): {$(VPATH)}internal/eval.h builtin.$(OBJEXT): {$(VPATH)}internal/event.h @@ -2794,6 +2552,7 @@ builtin.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h builtin.$(OBJEXT): {$(VPATH)}internal/intern/error.h builtin.$(OBJEXT): {$(VPATH)}internal/intern/eval.h builtin.$(OBJEXT): {$(VPATH)}internal/intern/file.h +builtin.$(OBJEXT): {$(VPATH)}internal/intern/gc.h builtin.$(OBJEXT): {$(VPATH)}internal/intern/hash.h builtin.$(OBJEXT): {$(VPATH)}internal/intern/io.h builtin.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -2824,6 +2583,7 @@ builtin.$(OBJEXT): {$(VPATH)}internal/memory.h builtin.$(OBJEXT): {$(VPATH)}internal/method.h builtin.$(OBJEXT): {$(VPATH)}internal/module.h builtin.$(OBJEXT): {$(VPATH)}internal/newobj.h +builtin.$(OBJEXT): {$(VPATH)}internal/rgengc.h builtin.$(OBJEXT): {$(VPATH)}internal/scan_args.h builtin.$(OBJEXT): {$(VPATH)}internal/special_consts.h builtin.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -2839,14 +2599,8 @@ builtin.$(OBJEXT): {$(VPATH)}iseq.h builtin.$(OBJEXT): {$(VPATH)}method.h 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/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 builtin.$(OBJEXT): {$(VPATH)}shape.h builtin.$(OBJEXT): {$(VPATH)}st.h builtin.$(OBJEXT): {$(VPATH)}subst.h @@ -2933,7 +2687,6 @@ class.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h class.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h class.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h class.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -class.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h class.$(OBJEXT): {$(VPATH)}internal/attr/pure.h class.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h class.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -3002,6 +2755,7 @@ class.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h class.$(OBJEXT): {$(VPATH)}internal/intern/error.h class.$(OBJEXT): {$(VPATH)}internal/intern/eval.h class.$(OBJEXT): {$(VPATH)}internal/intern/file.h +class.$(OBJEXT): {$(VPATH)}internal/intern/gc.h class.$(OBJEXT): {$(VPATH)}internal/intern/hash.h class.$(OBJEXT): {$(VPATH)}internal/intern/io.h class.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -3032,6 +2786,7 @@ class.$(OBJEXT): {$(VPATH)}internal/memory.h class.$(OBJEXT): {$(VPATH)}internal/method.h class.$(OBJEXT): {$(VPATH)}internal/module.h class.$(OBJEXT): {$(VPATH)}internal/newobj.h +class.$(OBJEXT): {$(VPATH)}internal/rgengc.h class.$(OBJEXT): {$(VPATH)}internal/scan_args.h class.$(OBJEXT): {$(VPATH)}internal/special_consts.h class.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -3050,18 +2805,14 @@ class.$(OBJEXT): {$(VPATH)}onigmo.h class.$(OBJEXT): {$(VPATH)}oniguruma.h class.$(OBJEXT): {$(VPATH)}ruby_assert.h class.$(OBJEXT): {$(VPATH)}ruby_atomic.h -class.$(OBJEXT): {$(VPATH)}rubyparser.h class.$(OBJEXT): {$(VPATH)}shape.h class.$(OBJEXT): {$(VPATH)}st.h 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 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 @@ -3125,7 +2876,6 @@ compar.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h compar.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h compar.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h compar.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -compar.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h compar.$(OBJEXT): {$(VPATH)}internal/attr/pure.h compar.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h compar.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -3194,6 +2944,7 @@ compar.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h compar.$(OBJEXT): {$(VPATH)}internal/intern/error.h compar.$(OBJEXT): {$(VPATH)}internal/intern/eval.h compar.$(OBJEXT): {$(VPATH)}internal/intern/file.h +compar.$(OBJEXT): {$(VPATH)}internal/intern/gc.h compar.$(OBJEXT): {$(VPATH)}internal/intern/hash.h compar.$(OBJEXT): {$(VPATH)}internal/intern/io.h compar.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -3224,6 +2975,7 @@ compar.$(OBJEXT): {$(VPATH)}internal/memory.h compar.$(OBJEXT): {$(VPATH)}internal/method.h compar.$(OBJEXT): {$(VPATH)}internal/module.h compar.$(OBJEXT): {$(VPATH)}internal/newobj.h +compar.$(OBJEXT): {$(VPATH)}internal/rgengc.h compar.$(OBJEXT): {$(VPATH)}internal/scan_args.h compar.$(OBJEXT): {$(VPATH)}internal/special_consts.h compar.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -3245,7 +2997,6 @@ 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 @@ -3272,28 +3023,6 @@ 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)/prism/defines.h -compile.$(OBJEXT): $(top_srcdir)/prism/diagnostic.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/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_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_state_stack.h -compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -3313,6 +3042,7 @@ compile.$(OBJEXT): {$(VPATH)}debug_counter.h compile.$(OBJEXT): {$(VPATH)}defines.h compile.$(OBJEXT): {$(VPATH)}encindex.h compile.$(OBJEXT): {$(VPATH)}encoding.h +compile.$(OBJEXT): {$(VPATH)}gc.h compile.$(OBJEXT): {$(VPATH)}id.h compile.$(OBJEXT): {$(VPATH)}id_table.h compile.$(OBJEXT): {$(VPATH)}insns.def @@ -3358,7 +3088,6 @@ compile.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h compile.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h compile.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h compile.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -compile.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h compile.$(OBJEXT): {$(VPATH)}internal/attr/pure.h compile.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h compile.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -3428,6 +3157,7 @@ compile.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h compile.$(OBJEXT): {$(VPATH)}internal/intern/error.h compile.$(OBJEXT): {$(VPATH)}internal/intern/eval.h compile.$(OBJEXT): {$(VPATH)}internal/intern/file.h +compile.$(OBJEXT): {$(VPATH)}internal/intern/gc.h compile.$(OBJEXT): {$(VPATH)}internal/intern/hash.h compile.$(OBJEXT): {$(VPATH)}internal/intern/io.h compile.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -3458,6 +3188,7 @@ compile.$(OBJEXT): {$(VPATH)}internal/memory.h compile.$(OBJEXT): {$(VPATH)}internal/method.h compile.$(OBJEXT): {$(VPATH)}internal/module.h compile.$(OBJEXT): {$(VPATH)}internal/newobj.h +compile.$(OBJEXT): {$(VPATH)}internal/rgengc.h compile.$(OBJEXT): {$(VPATH)}internal/scan_args.h compile.$(OBJEXT): {$(VPATH)}internal/special_consts.h compile.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -3476,16 +3207,10 @@ 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/prism.h -compile.$(OBJEXT): {$(VPATH)}prism/version.h -compile.$(OBJEXT): {$(VPATH)}prism_compile.c -compile.$(OBJEXT): {$(VPATH)}prism_compile.h compile.$(OBJEXT): {$(VPATH)}re.h compile.$(OBJEXT): {$(VPATH)}regex.h compile.$(OBJEXT): {$(VPATH)}ruby_assert.h compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h -compile.$(OBJEXT): {$(VPATH)}rubyparser.h compile.$(OBJEXT): {$(VPATH)}shape.h compile.$(OBJEXT): {$(VPATH)}st.h compile.$(OBJEXT): {$(VPATH)}subst.h @@ -3496,8 +3221,6 @@ 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)}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 @@ -3519,7 +3242,6 @@ complex.$(OBJEXT): $(top_srcdir)/internal/object.h complex.$(OBJEXT): $(top_srcdir)/internal/rational.h complex.$(OBJEXT): $(top_srcdir)/internal/serial.h complex.$(OBJEXT): $(top_srcdir)/internal/static_assert.h -complex.$(OBJEXT): $(top_srcdir)/internal/string.h complex.$(OBJEXT): $(top_srcdir)/internal/variable.h complex.$(OBJEXT): $(top_srcdir)/internal/vm.h complex.$(OBJEXT): $(top_srcdir)/internal/warnings.h @@ -3537,9 +3259,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 complex.$(OBJEXT): {$(VPATH)}id_table.h complex.$(OBJEXT): {$(VPATH)}intern.h @@ -3582,7 +3302,6 @@ complex.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h complex.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h complex.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h complex.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -complex.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h complex.$(OBJEXT): {$(VPATH)}internal/attr/pure.h complex.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h complex.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -3615,15 +3334,6 @@ complex.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h complex.$(OBJEXT): {$(VPATH)}internal/ctype.h complex.$(OBJEXT): {$(VPATH)}internal/dllexport.h complex.$(OBJEXT): {$(VPATH)}internal/dosish.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -complex.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h complex.$(OBJEXT): {$(VPATH)}internal/error.h complex.$(OBJEXT): {$(VPATH)}internal/eval.h complex.$(OBJEXT): {$(VPATH)}internal/event.h @@ -3651,6 +3361,7 @@ complex.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h complex.$(OBJEXT): {$(VPATH)}internal/intern/error.h complex.$(OBJEXT): {$(VPATH)}internal/intern/eval.h complex.$(OBJEXT): {$(VPATH)}internal/intern/file.h +complex.$(OBJEXT): {$(VPATH)}internal/intern/gc.h complex.$(OBJEXT): {$(VPATH)}internal/intern/hash.h complex.$(OBJEXT): {$(VPATH)}internal/intern/io.h complex.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -3681,6 +3392,7 @@ complex.$(OBJEXT): {$(VPATH)}internal/memory.h complex.$(OBJEXT): {$(VPATH)}internal/method.h complex.$(OBJEXT): {$(VPATH)}internal/module.h complex.$(OBJEXT): {$(VPATH)}internal/newobj.h +complex.$(OBJEXT): {$(VPATH)}internal/rgengc.h complex.$(OBJEXT): {$(VPATH)}internal/scan_args.h complex.$(OBJEXT): {$(VPATH)}internal/special_consts.h complex.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -3695,27 +3407,21 @@ complex.$(OBJEXT): {$(VPATH)}internal/xmalloc.h complex.$(OBJEXT): {$(VPATH)}method.h complex.$(OBJEXT): {$(VPATH)}missing.h complex.$(OBJEXT): {$(VPATH)}node.h -complex.$(OBJEXT): {$(VPATH)}onigmo.h -complex.$(OBJEXT): {$(VPATH)}oniguruma.h complex.$(OBJEXT): {$(VPATH)}ruby_assert.h complex.$(OBJEXT): {$(VPATH)}ruby_atomic.h -complex.$(OBJEXT): {$(VPATH)}rubyparser.h complex.$(OBJEXT): {$(VPATH)}shape.h complex.$(OBJEXT): {$(VPATH)}st.h 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 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 @@ -3728,31 +3434,9 @@ cont.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h cont.$(OBJEXT): $(top_srcdir)/internal/serial.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/diagnostic.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/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_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_state_stack.h -cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -3773,6 +3457,7 @@ cont.$(OBJEXT): {$(VPATH)}defines.h cont.$(OBJEXT): {$(VPATH)}encoding.h cont.$(OBJEXT): {$(VPATH)}eval_intern.h cont.$(OBJEXT): {$(VPATH)}fiber/scheduler.h +cont.$(OBJEXT): {$(VPATH)}gc.h cont.$(OBJEXT): {$(VPATH)}id.h cont.$(OBJEXT): {$(VPATH)}id_table.h cont.$(OBJEXT): {$(VPATH)}intern.h @@ -3815,7 +3500,6 @@ cont.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h cont.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h cont.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h cont.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -cont.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h cont.$(OBJEXT): {$(VPATH)}internal/attr/pure.h cont.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h cont.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -3884,6 +3568,7 @@ cont.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h cont.$(OBJEXT): {$(VPATH)}internal/intern/error.h cont.$(OBJEXT): {$(VPATH)}internal/intern/eval.h cont.$(OBJEXT): {$(VPATH)}internal/intern/file.h +cont.$(OBJEXT): {$(VPATH)}internal/intern/gc.h cont.$(OBJEXT): {$(VPATH)}internal/intern/hash.h cont.$(OBJEXT): {$(VPATH)}internal/intern/io.h cont.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -3914,6 +3599,7 @@ cont.$(OBJEXT): {$(VPATH)}internal/memory.h cont.$(OBJEXT): {$(VPATH)}internal/method.h cont.$(OBJEXT): {$(VPATH)}internal/module.h cont.$(OBJEXT): {$(VPATH)}internal/newobj.h +cont.$(OBJEXT): {$(VPATH)}internal/rgengc.h cont.$(OBJEXT): {$(VPATH)}internal/scan_args.h cont.$(OBJEXT): {$(VPATH)}internal/special_consts.h cont.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -3928,18 +3614,14 @@ cont.$(OBJEXT): {$(VPATH)}internal/xmalloc.h cont.$(OBJEXT): {$(VPATH)}iseq.h cont.$(OBJEXT): {$(VPATH)}method.h cont.$(OBJEXT): {$(VPATH)}missing.h +cont.$(OBJEXT): {$(VPATH)}mjit.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/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 cont.$(OBJEXT): {$(VPATH)}shape.h cont.$(OBJEXT): {$(VPATH)}st.h cont.$(OBJEXT): {$(VPATH)}subst.h @@ -3986,6 +3668,7 @@ debug.$(OBJEXT): {$(VPATH)}defines.h debug.$(OBJEXT): {$(VPATH)}encindex.h debug.$(OBJEXT): {$(VPATH)}encoding.h debug.$(OBJEXT): {$(VPATH)}eval_intern.h +debug.$(OBJEXT): {$(VPATH)}gc.h debug.$(OBJEXT): {$(VPATH)}id.h debug.$(OBJEXT): {$(VPATH)}id_table.h debug.$(OBJEXT): {$(VPATH)}intern.h @@ -4028,7 +3711,6 @@ debug.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h debug.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h debug.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h debug.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -debug.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h debug.$(OBJEXT): {$(VPATH)}internal/attr/pure.h debug.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h debug.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -4097,6 +3779,7 @@ debug.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h debug.$(OBJEXT): {$(VPATH)}internal/intern/error.h debug.$(OBJEXT): {$(VPATH)}internal/intern/eval.h debug.$(OBJEXT): {$(VPATH)}internal/intern/file.h +debug.$(OBJEXT): {$(VPATH)}internal/intern/gc.h debug.$(OBJEXT): {$(VPATH)}internal/intern/hash.h debug.$(OBJEXT): {$(VPATH)}internal/intern/io.h debug.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -4127,6 +3810,7 @@ debug.$(OBJEXT): {$(VPATH)}internal/memory.h debug.$(OBJEXT): {$(VPATH)}internal/method.h debug.$(OBJEXT): {$(VPATH)}internal/module.h debug.$(OBJEXT): {$(VPATH)}internal/newobj.h +debug.$(OBJEXT): {$(VPATH)}internal/rgengc.h debug.$(OBJEXT): {$(VPATH)}internal/scan_args.h debug.$(OBJEXT): {$(VPATH)}internal/special_consts.h debug.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -4148,7 +3832,6 @@ debug.$(OBJEXT): {$(VPATH)}ractor.h debug.$(OBJEXT): {$(VPATH)}ractor_core.h debug.$(OBJEXT): {$(VPATH)}ruby_assert.h debug.$(OBJEXT): {$(VPATH)}ruby_atomic.h -debug.$(OBJEXT): {$(VPATH)}rubyparser.h debug.$(OBJEXT): {$(VPATH)}shape.h debug.$(OBJEXT): {$(VPATH)}st.h debug.$(OBJEXT): {$(VPATH)}subst.h @@ -4160,7 +3843,6 @@ 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 @@ -4215,7 +3897,6 @@ debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/pure.h debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -4275,6 +3956,7 @@ debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/error.h debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/eval.h debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/file.h +debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/gc.h debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/hash.h debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/io.h debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -4305,6 +3987,7 @@ debug_counter.$(OBJEXT): {$(VPATH)}internal/memory.h debug_counter.$(OBJEXT): {$(VPATH)}internal/method.h debug_counter.$(OBJEXT): {$(VPATH)}internal/module.h debug_counter.$(OBJEXT): {$(VPATH)}internal/newobj.h +debug_counter.$(OBJEXT): {$(VPATH)}internal/rgengc.h debug_counter.$(OBJEXT): {$(VPATH)}internal/scan_args.h debug_counter.$(OBJEXT): {$(VPATH)}internal/special_consts.h debug_counter.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -4320,14 +4003,8 @@ debug_counter.$(OBJEXT): {$(VPATH)}missing.h debug_counter.$(OBJEXT): {$(VPATH)}st.h debug_counter.$(OBJEXT): {$(VPATH)}subst.h debug_counter.$(OBJEXT): {$(VPATH)}thread_native.h -dir.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -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 dir.$(OBJEXT): $(top_srcdir)/internal/compilers.h dir.$(OBJEXT): $(top_srcdir)/internal/dir.h @@ -4335,7 +4012,6 @@ dir.$(OBJEXT): $(top_srcdir)/internal/encoding.h dir.$(OBJEXT): $(top_srcdir)/internal/error.h dir.$(OBJEXT): $(top_srcdir)/internal/file.h dir.$(OBJEXT): $(top_srcdir)/internal/gc.h -dir.$(OBJEXT): $(top_srcdir)/internal/imemo.h dir.$(OBJEXT): $(top_srcdir)/internal/io.h dir.$(OBJEXT): $(top_srcdir)/internal/object.h dir.$(OBJEXT): $(top_srcdir)/internal/serial.h @@ -4345,7 +4021,6 @@ dir.$(OBJEXT): $(top_srcdir)/internal/variable.h dir.$(OBJEXT): $(top_srcdir)/internal/vm.h dir.$(OBJEXT): $(top_srcdir)/internal/warnings.h dir.$(OBJEXT): {$(VPATH)}assert.h -dir.$(OBJEXT): {$(VPATH)}atomic.h dir.$(OBJEXT): {$(VPATH)}backward/2/assume.h dir.$(OBJEXT): {$(VPATH)}backward/2/attributes.h dir.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -4405,7 +4080,6 @@ dir.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h dir.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h dir.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h dir.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -dir.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h dir.$(OBJEXT): {$(VPATH)}internal/attr/pure.h dir.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h dir.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -4474,6 +4148,7 @@ dir.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h dir.$(OBJEXT): {$(VPATH)}internal/intern/error.h dir.$(OBJEXT): {$(VPATH)}internal/intern/eval.h dir.$(OBJEXT): {$(VPATH)}internal/intern/file.h +dir.$(OBJEXT): {$(VPATH)}internal/intern/gc.h dir.$(OBJEXT): {$(VPATH)}internal/intern/hash.h dir.$(OBJEXT): {$(VPATH)}internal/intern/io.h dir.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -4504,6 +4179,7 @@ dir.$(OBJEXT): {$(VPATH)}internal/memory.h dir.$(OBJEXT): {$(VPATH)}internal/method.h dir.$(OBJEXT): {$(VPATH)}internal/module.h dir.$(OBJEXT): {$(VPATH)}internal/newobj.h +dir.$(OBJEXT): {$(VPATH)}internal/rgengc.h dir.$(OBJEXT): {$(VPATH)}internal/scan_args.h dir.$(OBJEXT): {$(VPATH)}internal/special_consts.h dir.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -4516,23 +4192,14 @@ dir.$(OBJEXT): {$(VPATH)}internal/variable.h dir.$(OBJEXT): {$(VPATH)}internal/warning_push.h dir.$(OBJEXT): {$(VPATH)}internal/xmalloc.h dir.$(OBJEXT): {$(VPATH)}io.h -dir.$(OBJEXT): {$(VPATH)}method.h dir.$(OBJEXT): {$(VPATH)}missing.h -dir.$(OBJEXT): {$(VPATH)}node.h dir.$(OBJEXT): {$(VPATH)}onigmo.h dir.$(OBJEXT): {$(VPATH)}oniguruma.h -dir.$(OBJEXT): {$(VPATH)}ruby_assert.h -dir.$(OBJEXT): {$(VPATH)}ruby_atomic.h -dir.$(OBJEXT): {$(VPATH)}rubyparser.h dir.$(OBJEXT): {$(VPATH)}shape.h dir.$(OBJEXT): {$(VPATH)}st.h dir.$(OBJEXT): {$(VPATH)}subst.h dir.$(OBJEXT): {$(VPATH)}thread.h -dir.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -dir.$(OBJEXT): {$(VPATH)}thread_native.h dir.$(OBJEXT): {$(VPATH)}util.h -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/warnings.h @@ -4590,7 +4257,6 @@ dln.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h dln.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h dln.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h dln.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -dln.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h dln.$(OBJEXT): {$(VPATH)}internal/attr/pure.h dln.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h dln.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -4650,6 +4316,7 @@ dln.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h dln.$(OBJEXT): {$(VPATH)}internal/intern/error.h dln.$(OBJEXT): {$(VPATH)}internal/intern/eval.h dln.$(OBJEXT): {$(VPATH)}internal/intern/file.h +dln.$(OBJEXT): {$(VPATH)}internal/intern/gc.h dln.$(OBJEXT): {$(VPATH)}internal/intern/hash.h dln.$(OBJEXT): {$(VPATH)}internal/intern/io.h dln.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -4680,6 +4347,7 @@ dln.$(OBJEXT): {$(VPATH)}internal/memory.h dln.$(OBJEXT): {$(VPATH)}internal/method.h dln.$(OBJEXT): {$(VPATH)}internal/module.h dln.$(OBJEXT): {$(VPATH)}internal/newobj.h +dln.$(OBJEXT): {$(VPATH)}internal/rgengc.h dln.$(OBJEXT): {$(VPATH)}internal/scan_args.h dln.$(OBJEXT): {$(VPATH)}internal/special_consts.h dln.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -4747,7 +4415,6 @@ dln_find.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h dln_find.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h dln_find.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h dln_find.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -dln_find.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h dln_find.$(OBJEXT): {$(VPATH)}internal/attr/pure.h dln_find.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h dln_find.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -4807,6 +4474,7 @@ dln_find.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h dln_find.$(OBJEXT): {$(VPATH)}internal/intern/error.h dln_find.$(OBJEXT): {$(VPATH)}internal/intern/eval.h dln_find.$(OBJEXT): {$(VPATH)}internal/intern/file.h +dln_find.$(OBJEXT): {$(VPATH)}internal/intern/gc.h dln_find.$(OBJEXT): {$(VPATH)}internal/intern/hash.h dln_find.$(OBJEXT): {$(VPATH)}internal/intern/io.h dln_find.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -4837,6 +4505,7 @@ dln_find.$(OBJEXT): {$(VPATH)}internal/memory.h dln_find.$(OBJEXT): {$(VPATH)}internal/method.h dln_find.$(OBJEXT): {$(VPATH)}internal/module.h dln_find.$(OBJEXT): {$(VPATH)}internal/newobj.h +dln_find.$(OBJEXT): {$(VPATH)}internal/rgengc.h dln_find.$(OBJEXT): {$(VPATH)}internal/scan_args.h dln_find.$(OBJEXT): {$(VPATH)}internal/special_consts.h dln_find.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -4903,7 +4572,6 @@ dmydln.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h dmydln.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h dmydln.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h dmydln.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -dmydln.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h dmydln.$(OBJEXT): {$(VPATH)}internal/attr/pure.h dmydln.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h dmydln.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -4963,6 +4631,7 @@ dmydln.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h dmydln.$(OBJEXT): {$(VPATH)}internal/intern/error.h dmydln.$(OBJEXT): {$(VPATH)}internal/intern/eval.h dmydln.$(OBJEXT): {$(VPATH)}internal/intern/file.h +dmydln.$(OBJEXT): {$(VPATH)}internal/intern/gc.h dmydln.$(OBJEXT): {$(VPATH)}internal/intern/hash.h dmydln.$(OBJEXT): {$(VPATH)}internal/intern/io.h dmydln.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -4993,6 +4662,7 @@ dmydln.$(OBJEXT): {$(VPATH)}internal/memory.h dmydln.$(OBJEXT): {$(VPATH)}internal/method.h dmydln.$(OBJEXT): {$(VPATH)}internal/module.h dmydln.$(OBJEXT): {$(VPATH)}internal/newobj.h +dmydln.$(OBJEXT): {$(VPATH)}internal/rgengc.h dmydln.$(OBJEXT): {$(VPATH)}internal/scan_args.h dmydln.$(OBJEXT): {$(VPATH)}internal/special_consts.h dmydln.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -5130,6 +4800,7 @@ enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/error.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/eval.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/file.h +enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/gc.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/hash.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/io.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -5160,6 +4831,7 @@ enc/ascii.$(OBJEXT): {$(VPATH)}internal/memory.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/method.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/module.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/newobj.h +enc/ascii.$(OBJEXT): {$(VPATH)}internal/rgengc.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/scan_args.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/special_consts.h enc/ascii.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -5287,6 +4959,7 @@ enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/error.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/eval.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/file.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/gc.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/hash.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/io.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -5317,6 +4990,7 @@ enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/memory.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/method.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/module.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/newobj.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/rgengc.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/scan_args.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/special_consts.h enc/trans/newline.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -5444,6 +5118,7 @@ enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/error.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/eval.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/file.h +enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/gc.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/hash.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/io.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -5474,6 +5149,7 @@ enc/unicode.$(OBJEXT): {$(VPATH)}internal/memory.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/method.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/module.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/newobj.h +enc/unicode.$(OBJEXT): {$(VPATH)}internal/rgengc.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/scan_args.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/special_consts.h enc/unicode.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -5612,6 +5288,7 @@ enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/error.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/eval.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/file.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/gc.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/hash.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/io.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -5642,6 +5319,7 @@ enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/memory.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/method.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/module.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/newobj.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/rgengc.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/scan_args.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/special_consts.h enc/us_ascii.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -5780,6 +5458,7 @@ enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/error.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/eval.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/file.h +enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/gc.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/hash.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/io.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -5810,6 +5489,7 @@ enc/utf_8.$(OBJEXT): {$(VPATH)}internal/memory.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/method.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/module.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/newobj.h +enc/utf_8.$(OBJEXT): {$(VPATH)}internal/rgengc.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/scan_args.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/special_consts.h enc/utf_8.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -5827,22 +5507,14 @@ 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 @@ -5853,7 +5525,6 @@ 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 @@ -5870,7 +5541,6 @@ 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 @@ -5912,7 +5582,6 @@ encoding.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h encoding.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h encoding.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h encoding.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -encoding.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h encoding.$(OBJEXT): {$(VPATH)}internal/attr/pure.h encoding.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h encoding.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -5981,6 +5650,7 @@ encoding.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h encoding.$(OBJEXT): {$(VPATH)}internal/intern/error.h encoding.$(OBJEXT): {$(VPATH)}internal/intern/eval.h encoding.$(OBJEXT): {$(VPATH)}internal/intern/file.h +encoding.$(OBJEXT): {$(VPATH)}internal/intern/gc.h encoding.$(OBJEXT): {$(VPATH)}internal/intern/hash.h encoding.$(OBJEXT): {$(VPATH)}internal/intern/io.h encoding.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -6011,6 +5681,7 @@ encoding.$(OBJEXT): {$(VPATH)}internal/memory.h encoding.$(OBJEXT): {$(VPATH)}internal/method.h encoding.$(OBJEXT): {$(VPATH)}internal/module.h encoding.$(OBJEXT): {$(VPATH)}internal/newobj.h +encoding.$(OBJEXT): {$(VPATH)}internal/rgengc.h encoding.$(OBJEXT): {$(VPATH)}internal/scan_args.h encoding.$(OBJEXT): {$(VPATH)}internal/special_consts.h encoding.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -6022,24 +5693,16 @@ 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 @@ -6121,7 +5784,6 @@ enum.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h enum.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h enum.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h enum.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -enum.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h enum.$(OBJEXT): {$(VPATH)}internal/attr/pure.h enum.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h enum.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -6190,6 +5852,7 @@ enum.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h enum.$(OBJEXT): {$(VPATH)}internal/intern/error.h enum.$(OBJEXT): {$(VPATH)}internal/intern/eval.h enum.$(OBJEXT): {$(VPATH)}internal/intern/file.h +enum.$(OBJEXT): {$(VPATH)}internal/intern/gc.h enum.$(OBJEXT): {$(VPATH)}internal/intern/hash.h enum.$(OBJEXT): {$(VPATH)}internal/intern/io.h enum.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -6220,6 +5883,7 @@ enum.$(OBJEXT): {$(VPATH)}internal/memory.h enum.$(OBJEXT): {$(VPATH)}internal/method.h enum.$(OBJEXT): {$(VPATH)}internal/module.h enum.$(OBJEXT): {$(VPATH)}internal/newobj.h +enum.$(OBJEXT): {$(VPATH)}internal/rgengc.h enum.$(OBJEXT): {$(VPATH)}internal/scan_args.h enum.$(OBJEXT): {$(VPATH)}internal/special_consts.h enum.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -6245,7 +5909,6 @@ 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 @@ -6265,7 +5928,6 @@ enumerator.$(OBJEXT): $(top_srcdir)/internal/serial.h enumerator.$(OBJEXT): $(top_srcdir)/internal/static_assert.h enumerator.$(OBJEXT): $(top_srcdir)/internal/string.h enumerator.$(OBJEXT): $(top_srcdir)/internal/struct.h -enumerator.$(OBJEXT): $(top_srcdir)/internal/variable.h enumerator.$(OBJEXT): $(top_srcdir)/internal/vm.h enumerator.$(OBJEXT): $(top_srcdir)/internal/warnings.h enumerator.$(OBJEXT): {$(VPATH)}assert.h @@ -6280,8 +5942,6 @@ enumerator.$(OBJEXT): {$(VPATH)}backward/2/long_long.h 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 @@ -6327,7 +5987,6 @@ enumerator.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h enumerator.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h enumerator.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h enumerator.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -enumerator.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h enumerator.$(OBJEXT): {$(VPATH)}internal/attr/pure.h enumerator.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h enumerator.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -6396,6 +6055,7 @@ enumerator.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h enumerator.$(OBJEXT): {$(VPATH)}internal/intern/error.h enumerator.$(OBJEXT): {$(VPATH)}internal/intern/eval.h enumerator.$(OBJEXT): {$(VPATH)}internal/intern/file.h +enumerator.$(OBJEXT): {$(VPATH)}internal/intern/gc.h enumerator.$(OBJEXT): {$(VPATH)}internal/intern/hash.h enumerator.$(OBJEXT): {$(VPATH)}internal/intern/io.h enumerator.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -6426,6 +6086,7 @@ enumerator.$(OBJEXT): {$(VPATH)}internal/memory.h enumerator.$(OBJEXT): {$(VPATH)}internal/method.h enumerator.$(OBJEXT): {$(VPATH)}internal/module.h enumerator.$(OBJEXT): {$(VPATH)}internal/newobj.h +enumerator.$(OBJEXT): {$(VPATH)}internal/rgengc.h enumerator.$(OBJEXT): {$(VPATH)}internal/scan_args.h enumerator.$(OBJEXT): {$(VPATH)}internal/special_consts.h enumerator.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -6444,22 +6105,18 @@ enumerator.$(OBJEXT): {$(VPATH)}onigmo.h enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h enumerator.$(OBJEXT): {$(VPATH)}ruby_assert.h enumerator.$(OBJEXT): {$(VPATH)}ruby_atomic.h -enumerator.$(OBJEXT): {$(VPATH)}rubyparser.h enumerator.$(OBJEXT): {$(VPATH)}shape.h enumerator.$(OBJEXT): {$(VPATH)}st.h 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 @@ -6472,7 +6129,6 @@ error.$(OBJEXT): $(top_srcdir)/internal/imemo.h error.$(OBJEXT): $(top_srcdir)/internal/io.h error.$(OBJEXT): $(top_srcdir)/internal/load.h error.$(OBJEXT): $(top_srcdir)/internal/object.h -error.$(OBJEXT): $(top_srcdir)/internal/process.h error.$(OBJEXT): $(top_srcdir)/internal/serial.h error.$(OBJEXT): $(top_srcdir)/internal/static_assert.h error.$(OBJEXT): $(top_srcdir)/internal/string.h @@ -6540,7 +6196,6 @@ error.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h error.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h error.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h error.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -error.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h error.$(OBJEXT): {$(VPATH)}internal/attr/pure.h error.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h error.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -6609,6 +6264,7 @@ error.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h error.$(OBJEXT): {$(VPATH)}internal/intern/error.h error.$(OBJEXT): {$(VPATH)}internal/intern/eval.h error.$(OBJEXT): {$(VPATH)}internal/intern/file.h +error.$(OBJEXT): {$(VPATH)}internal/intern/gc.h error.$(OBJEXT): {$(VPATH)}internal/intern/hash.h error.$(OBJEXT): {$(VPATH)}internal/intern/io.h error.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -6639,6 +6295,7 @@ error.$(OBJEXT): {$(VPATH)}internal/memory.h error.$(OBJEXT): {$(VPATH)}internal/method.h error.$(OBJEXT): {$(VPATH)}internal/module.h error.$(OBJEXT): {$(VPATH)}internal/newobj.h +error.$(OBJEXT): {$(VPATH)}internal/rgengc.h error.$(OBJEXT): {$(VPATH)}internal/scan_args.h error.$(OBJEXT): {$(VPATH)}internal/special_consts.h error.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -6659,13 +6316,11 @@ error.$(OBJEXT): {$(VPATH)}onigmo.h error.$(OBJEXT): {$(VPATH)}oniguruma.h error.$(OBJEXT): {$(VPATH)}ruby_assert.h error.$(OBJEXT): {$(VPATH)}ruby_atomic.h -error.$(OBJEXT): {$(VPATH)}rubyparser.h error.$(OBJEXT): {$(VPATH)}shape.h 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_opts.h error.$(OBJEXT): {$(VPATH)}warning.rbinc @@ -6675,7 +6330,6 @@ 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 @@ -6696,27 +6350,6 @@ 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/diagnostic.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/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_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_state_stack.h -eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -6738,6 +6371,7 @@ eval.$(OBJEXT): {$(VPATH)}eval_error.c eval.$(OBJEXT): {$(VPATH)}eval_intern.h eval.$(OBJEXT): {$(VPATH)}eval_jump.c eval.$(OBJEXT): {$(VPATH)}fiber/scheduler.h +eval.$(OBJEXT): {$(VPATH)}gc.h eval.$(OBJEXT): {$(VPATH)}id.h eval.$(OBJEXT): {$(VPATH)}id_table.h eval.$(OBJEXT): {$(VPATH)}intern.h @@ -6780,7 +6414,6 @@ eval.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h eval.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h eval.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h eval.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -eval.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h eval.$(OBJEXT): {$(VPATH)}internal/attr/pure.h eval.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h eval.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -6849,6 +6482,7 @@ eval.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h eval.$(OBJEXT): {$(VPATH)}internal/intern/error.h eval.$(OBJEXT): {$(VPATH)}internal/intern/eval.h eval.$(OBJEXT): {$(VPATH)}internal/intern/file.h +eval.$(OBJEXT): {$(VPATH)}internal/intern/gc.h eval.$(OBJEXT): {$(VPATH)}internal/intern/hash.h eval.$(OBJEXT): {$(VPATH)}internal/intern/io.h eval.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -6879,6 +6513,7 @@ eval.$(OBJEXT): {$(VPATH)}internal/memory.h eval.$(OBJEXT): {$(VPATH)}internal/method.h eval.$(OBJEXT): {$(VPATH)}internal/module.h eval.$(OBJEXT): {$(VPATH)}internal/newobj.h +eval.$(OBJEXT): {$(VPATH)}internal/rgengc.h eval.$(OBJEXT): {$(VPATH)}internal/scan_args.h eval.$(OBJEXT): {$(VPATH)}internal/special_consts.h eval.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -6894,21 +6529,17 @@ eval.$(OBJEXT): {$(VPATH)}io.h eval.$(OBJEXT): {$(VPATH)}iseq.h eval.$(OBJEXT): {$(VPATH)}method.h eval.$(OBJEXT): {$(VPATH)}missing.h +eval.$(OBJEXT): {$(VPATH)}mjit.h eval.$(OBJEXT): {$(VPATH)}node.h eval.$(OBJEXT): {$(VPATH)}onigmo.h eval.$(OBJEXT): {$(VPATH)}oniguruma.h -eval.$(OBJEXT): {$(VPATH)}prism/ast.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 eval.$(OBJEXT): {$(VPATH)}shape.h eval.$(OBJEXT): {$(VPATH)}st.h eval.$(OBJEXT): {$(VPATH)}subst.h @@ -6918,7 +6549,6 @@ 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 @@ -6934,12 +6564,7 @@ explicit_bzero.$(OBJEXT): {$(VPATH)}internal/config.h explicit_bzero.$(OBJEXT): {$(VPATH)}internal/dllexport.h explicit_bzero.$(OBJEXT): {$(VPATH)}internal/has/attribute.h explicit_bzero.$(OBJEXT): {$(VPATH)}missing.h -file.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -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 @@ -7018,7 +6643,6 @@ file.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h file.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h file.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h file.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -file.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h file.$(OBJEXT): {$(VPATH)}internal/attr/pure.h file.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h file.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -7087,6 +6711,7 @@ file.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h file.$(OBJEXT): {$(VPATH)}internal/intern/error.h file.$(OBJEXT): {$(VPATH)}internal/intern/eval.h file.$(OBJEXT): {$(VPATH)}internal/intern/file.h +file.$(OBJEXT): {$(VPATH)}internal/intern/gc.h file.$(OBJEXT): {$(VPATH)}internal/intern/hash.h file.$(OBJEXT): {$(VPATH)}internal/intern/io.h file.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -7117,6 +6742,7 @@ file.$(OBJEXT): {$(VPATH)}internal/memory.h file.$(OBJEXT): {$(VPATH)}internal/method.h file.$(OBJEXT): {$(VPATH)}internal/module.h file.$(OBJEXT): {$(VPATH)}internal/newobj.h +file.$(OBJEXT): {$(VPATH)}internal/rgengc.h file.$(OBJEXT): {$(VPATH)}internal/scan_args.h file.$(OBJEXT): {$(VPATH)}internal/special_consts.h file.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -7136,7 +6762,6 @@ file.$(OBJEXT): {$(VPATH)}shape.h file.$(OBJEXT): {$(VPATH)}st.h file.$(OBJEXT): {$(VPATH)}subst.h file.$(OBJEXT): {$(VPATH)}thread.h -file.$(OBJEXT): {$(VPATH)}thread_native.h file.$(OBJEXT): {$(VPATH)}util.h gc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h gc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h @@ -7144,13 +6769,11 @@ 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)/internal/array.h gc.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h gc.$(OBJEXT): $(top_srcdir)/internal/bignum.h gc.$(OBJEXT): $(top_srcdir)/internal/bits.h gc.$(OBJEXT): $(top_srcdir)/internal/class.h -gc.$(OBJEXT): $(top_srcdir)/internal/compile.h gc.$(OBJEXT): $(top_srcdir)/internal/compilers.h gc.$(OBJEXT): $(top_srcdir)/internal/complex.h gc.$(OBJEXT): $(top_srcdir)/internal/cont.h @@ -7175,27 +6798,6 @@ 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/diagnostic.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/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_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_state_stack.h -gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -7210,13 +6812,13 @@ gc.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h gc.$(OBJEXT): {$(VPATH)}builtin.h gc.$(OBJEXT): {$(VPATH)}config.h gc.$(OBJEXT): {$(VPATH)}constant.h -gc.$(OBJEXT): {$(VPATH)}darray.h gc.$(OBJEXT): {$(VPATH)}debug.h gc.$(OBJEXT): {$(VPATH)}debug_counter.h gc.$(OBJEXT): {$(VPATH)}defines.h gc.$(OBJEXT): {$(VPATH)}encoding.h gc.$(OBJEXT): {$(VPATH)}eval_intern.h gc.$(OBJEXT): {$(VPATH)}gc.c +gc.$(OBJEXT): {$(VPATH)}gc.h gc.$(OBJEXT): {$(VPATH)}gc.rbinc gc.$(OBJEXT): {$(VPATH)}id.h gc.$(OBJEXT): {$(VPATH)}id_table.h @@ -7260,7 +6862,6 @@ gc.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h gc.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h gc.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h gc.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -gc.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h gc.$(OBJEXT): {$(VPATH)}internal/attr/pure.h gc.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h gc.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -7330,6 +6931,7 @@ gc.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h gc.$(OBJEXT): {$(VPATH)}internal/intern/error.h gc.$(OBJEXT): {$(VPATH)}internal/intern/eval.h gc.$(OBJEXT): {$(VPATH)}internal/intern/file.h +gc.$(OBJEXT): {$(VPATH)}internal/intern/gc.h gc.$(OBJEXT): {$(VPATH)}internal/intern/hash.h gc.$(OBJEXT): {$(VPATH)}internal/intern/io.h gc.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -7360,6 +6962,7 @@ gc.$(OBJEXT): {$(VPATH)}internal/memory.h gc.$(OBJEXT): {$(VPATH)}internal/method.h gc.$(OBJEXT): {$(VPATH)}internal/module.h gc.$(OBJEXT): {$(VPATH)}internal/newobj.h +gc.$(OBJEXT): {$(VPATH)}internal/rgengc.h gc.$(OBJEXT): {$(VPATH)}internal/scan_args.h gc.$(OBJEXT): {$(VPATH)}internal/special_consts.h gc.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -7375,12 +6978,10 @@ gc.$(OBJEXT): {$(VPATH)}io.h gc.$(OBJEXT): {$(VPATH)}iseq.h gc.$(OBJEXT): {$(VPATH)}method.h gc.$(OBJEXT): {$(VPATH)}missing.h +gc.$(OBJEXT): {$(VPATH)}mjit.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/version.h -gc.$(OBJEXT): {$(VPATH)}prism_compile.h gc.$(OBJEXT): {$(VPATH)}probes.dmyh gc.$(OBJEXT): {$(VPATH)}probes.h gc.$(OBJEXT): {$(VPATH)}ractor.h @@ -7389,10 +6990,8 @@ 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 gc.$(OBJEXT): {$(VPATH)}shape.h gc.$(OBJEXT): {$(VPATH)}st.h gc.$(OBJEXT): {$(VPATH)}subst.h @@ -7400,6 +6999,7 @@ gc.$(OBJEXT): {$(VPATH)}symbol.h gc.$(OBJEXT): {$(VPATH)}thread.h gc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h gc.$(OBJEXT): {$(VPATH)}thread_native.h +gc.$(OBJEXT): {$(VPATH)}transient_heap.h gc.$(OBJEXT): {$(VPATH)}util.h gc.$(OBJEXT): {$(VPATH)}vm_callinfo.h gc.$(OBJEXT): {$(VPATH)}vm_core.h @@ -7417,33 +7017,11 @@ goruby.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h goruby.$(OBJEXT): $(top_srcdir)/internal/compilers.h goruby.$(OBJEXT): $(top_srcdir)/internal/gc.h goruby.$(OBJEXT): $(top_srcdir)/internal/imemo.h -goruby.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h goruby.$(OBJEXT): $(top_srcdir)/internal/serial.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/diagnostic.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/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_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_state_stack.h -goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -7459,7 +7037,6 @@ goruby.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h 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)}goruby.c goruby.$(OBJEXT): {$(VPATH)}id.h @@ -7503,8 +7080,8 @@ goruby.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h goruby.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h goruby.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h goruby.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h +goruby.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h goruby.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -goruby.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h goruby.$(OBJEXT): {$(VPATH)}internal/attr/pure.h goruby.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h goruby.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -7537,15 +7114,6 @@ goruby.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h goruby.$(OBJEXT): {$(VPATH)}internal/ctype.h goruby.$(OBJEXT): {$(VPATH)}internal/dllexport.h goruby.$(OBJEXT): {$(VPATH)}internal/dosish.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -goruby.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h goruby.$(OBJEXT): {$(VPATH)}internal/error.h goruby.$(OBJEXT): {$(VPATH)}internal/eval.h goruby.$(OBJEXT): {$(VPATH)}internal/event.h @@ -7573,6 +7141,7 @@ goruby.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h goruby.$(OBJEXT): {$(VPATH)}internal/intern/error.h goruby.$(OBJEXT): {$(VPATH)}internal/intern/eval.h goruby.$(OBJEXT): {$(VPATH)}internal/intern/file.h +goruby.$(OBJEXT): {$(VPATH)}internal/intern/gc.h goruby.$(OBJEXT): {$(VPATH)}internal/intern/hash.h goruby.$(OBJEXT): {$(VPATH)}internal/intern/io.h goruby.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -7603,6 +7172,7 @@ goruby.$(OBJEXT): {$(VPATH)}internal/memory.h goruby.$(OBJEXT): {$(VPATH)}internal/method.h goruby.$(OBJEXT): {$(VPATH)}internal/module.h goruby.$(OBJEXT): {$(VPATH)}internal/newobj.h +goruby.$(OBJEXT): {$(VPATH)}internal/rgengc.h goruby.$(OBJEXT): {$(VPATH)}internal/scan_args.h goruby.$(OBJEXT): {$(VPATH)}internal/special_consts.h goruby.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -7619,14 +7189,8 @@ goruby.$(OBJEXT): {$(VPATH)}main.c goruby.$(OBJEXT): {$(VPATH)}method.h 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/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 goruby.$(OBJEXT): {$(VPATH)}shape.h goruby.$(OBJEXT): {$(VPATH)}st.h goruby.$(OBJEXT): {$(VPATH)}subst.h @@ -7640,7 +7204,6 @@ 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 @@ -7663,27 +7226,6 @@ 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/diagnostic.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/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_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_state_stack.h -hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -7743,7 +7285,6 @@ hash.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h hash.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h hash.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h hash.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -hash.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h hash.$(OBJEXT): {$(VPATH)}internal/attr/pure.h hash.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h hash.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -7812,6 +7353,7 @@ hash.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h hash.$(OBJEXT): {$(VPATH)}internal/intern/error.h hash.$(OBJEXT): {$(VPATH)}internal/intern/eval.h hash.$(OBJEXT): {$(VPATH)}internal/intern/file.h +hash.$(OBJEXT): {$(VPATH)}internal/intern/gc.h hash.$(OBJEXT): {$(VPATH)}internal/intern/hash.h hash.$(OBJEXT): {$(VPATH)}internal/intern/io.h hash.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -7842,6 +7384,7 @@ hash.$(OBJEXT): {$(VPATH)}internal/memory.h hash.$(OBJEXT): {$(VPATH)}internal/method.h hash.$(OBJEXT): {$(VPATH)}internal/module.h hash.$(OBJEXT): {$(VPATH)}internal/newobj.h +hash.$(OBJEXT): {$(VPATH)}internal/rgengc.h hash.$(OBJEXT): {$(VPATH)}internal/scan_args.h hash.$(OBJEXT): {$(VPATH)}internal/special_consts.h hash.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -7859,21 +7402,18 @@ 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/version.h -hash.$(OBJEXT): {$(VPATH)}prism_compile.h hash.$(OBJEXT): {$(VPATH)}probes.dmyh hash.$(OBJEXT): {$(VPATH)}probes.h hash.$(OBJEXT): {$(VPATH)}ractor.h hash.$(OBJEXT): {$(VPATH)}ruby_assert.h hash.$(OBJEXT): {$(VPATH)}ruby_atomic.h -hash.$(OBJEXT): {$(VPATH)}rubyparser.h hash.$(OBJEXT): {$(VPATH)}shape.h hash.$(OBJEXT): {$(VPATH)}st.h hash.$(OBJEXT): {$(VPATH)}subst.h hash.$(OBJEXT): {$(VPATH)}symbol.h hash.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h hash.$(OBJEXT): {$(VPATH)}thread_native.h +hash.$(OBJEXT): {$(VPATH)}transient_heap.h hash.$(OBJEXT): {$(VPATH)}util.h hash.$(OBJEXT): {$(VPATH)}vm_core.h hash.$(OBJEXT): {$(VPATH)}vm_debug.h @@ -7937,7 +7477,6 @@ inits.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h inits.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h inits.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h inits.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -inits.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h inits.$(OBJEXT): {$(VPATH)}internal/attr/pure.h inits.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h inits.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -7997,6 +7536,7 @@ inits.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h inits.$(OBJEXT): {$(VPATH)}internal/intern/error.h inits.$(OBJEXT): {$(VPATH)}internal/intern/eval.h inits.$(OBJEXT): {$(VPATH)}internal/intern/file.h +inits.$(OBJEXT): {$(VPATH)}internal/intern/gc.h inits.$(OBJEXT): {$(VPATH)}internal/intern/hash.h inits.$(OBJEXT): {$(VPATH)}internal/intern/io.h inits.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -8027,6 +7567,7 @@ inits.$(OBJEXT): {$(VPATH)}internal/memory.h inits.$(OBJEXT): {$(VPATH)}internal/method.h inits.$(OBJEXT): {$(VPATH)}internal/module.h inits.$(OBJEXT): {$(VPATH)}internal/newobj.h +inits.$(OBJEXT): {$(VPATH)}internal/rgengc.h inits.$(OBJEXT): {$(VPATH)}internal/scan_args.h inits.$(OBJEXT): {$(VPATH)}internal/special_consts.h inits.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -8047,7 +7588,6 @@ 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 @@ -8133,7 +7673,6 @@ io.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h io.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h io.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h io.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -io.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h io.$(OBJEXT): {$(VPATH)}internal/attr/pure.h io.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h io.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -8202,6 +7741,7 @@ io.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h io.$(OBJEXT): {$(VPATH)}internal/intern/error.h io.$(OBJEXT): {$(VPATH)}internal/intern/eval.h io.$(OBJEXT): {$(VPATH)}internal/intern/file.h +io.$(OBJEXT): {$(VPATH)}internal/intern/gc.h io.$(OBJEXT): {$(VPATH)}internal/intern/hash.h io.$(OBJEXT): {$(VPATH)}internal/intern/io.h io.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -8232,6 +7772,7 @@ io.$(OBJEXT): {$(VPATH)}internal/memory.h io.$(OBJEXT): {$(VPATH)}internal/method.h io.$(OBJEXT): {$(VPATH)}internal/module.h io.$(OBJEXT): {$(VPATH)}internal/newobj.h +io.$(OBJEXT): {$(VPATH)}internal/rgengc.h io.$(OBJEXT): {$(VPATH)}internal/scan_args.h io.$(OBJEXT): {$(VPATH)}internal/special_consts.h io.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -8255,7 +7796,6 @@ io.$(OBJEXT): {$(VPATH)}oniguruma.h io.$(OBJEXT): {$(VPATH)}ractor.h io.$(OBJEXT): {$(VPATH)}ruby_assert.h io.$(OBJEXT): {$(VPATH)}ruby_atomic.h -io.$(OBJEXT): {$(VPATH)}rubyparser.h io.$(OBJEXT): {$(VPATH)}shape.h io.$(OBJEXT): {$(VPATH)}st.h io.$(OBJEXT): {$(VPATH)}subst.h @@ -8265,12 +7805,7 @@ io.$(OBJEXT): {$(VPATH)}thread_native.h io.$(OBJEXT): {$(VPATH)}util.h io.$(OBJEXT): {$(VPATH)}vm_core.h io.$(OBJEXT): {$(VPATH)}vm_opts.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/bignum.h io_buffer.$(OBJEXT): $(top_srcdir)/internal/bits.h @@ -8337,7 +7872,6 @@ io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/pure.h io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h io_buffer.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -8406,6 +7940,7 @@ io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/error.h io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/eval.h io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/file.h +io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/gc.h io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/hash.h io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/io.h io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -8436,6 +7971,7 @@ io_buffer.$(OBJEXT): {$(VPATH)}internal/memory.h io_buffer.$(OBJEXT): {$(VPATH)}internal/method.h io_buffer.$(OBJEXT): {$(VPATH)}internal/module.h io_buffer.$(OBJEXT): {$(VPATH)}internal/newobj.h +io_buffer.$(OBJEXT): {$(VPATH)}internal/rgengc.h io_buffer.$(OBJEXT): {$(VPATH)}internal/scan_args.h io_buffer.$(OBJEXT): {$(VPATH)}internal/special_consts.h io_buffer.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -8455,14 +7991,12 @@ io_buffer.$(OBJEXT): {$(VPATH)}onigmo.h io_buffer.$(OBJEXT): {$(VPATH)}oniguruma.h io_buffer.$(OBJEXT): {$(VPATH)}st.h io_buffer.$(OBJEXT): {$(VPATH)}subst.h -io_buffer.$(OBJEXT): {$(VPATH)}thread_native.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/bits.h @@ -8475,7 +8009,6 @@ iseq.$(OBJEXT): $(top_srcdir)/internal/gc.h iseq.$(OBJEXT): $(top_srcdir)/internal/hash.h iseq.$(OBJEXT): $(top_srcdir)/internal/imemo.h iseq.$(OBJEXT): $(top_srcdir)/internal/parse.h -iseq.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h iseq.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h iseq.$(OBJEXT): $(top_srcdir)/internal/serial.h iseq.$(OBJEXT): $(top_srcdir)/internal/static_assert.h @@ -8485,27 +8018,6 @@ 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)/prism/defines.h -iseq.$(OBJEXT): $(top_srcdir)/prism/diagnostic.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/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_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_state_stack.h -iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -8524,6 +8036,7 @@ iseq.$(OBJEXT): {$(VPATH)}debug_counter.h iseq.$(OBJEXT): {$(VPATH)}defines.h iseq.$(OBJEXT): {$(VPATH)}encoding.h iseq.$(OBJEXT): {$(VPATH)}eval_intern.h +iseq.$(OBJEXT): {$(VPATH)}gc.h iseq.$(OBJEXT): {$(VPATH)}id.h iseq.$(OBJEXT): {$(VPATH)}id_table.h iseq.$(OBJEXT): {$(VPATH)}insns.def @@ -8569,7 +8082,6 @@ iseq.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h iseq.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h iseq.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h iseq.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -iseq.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h iseq.$(OBJEXT): {$(VPATH)}internal/attr/pure.h iseq.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h iseq.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -8638,6 +8150,7 @@ iseq.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h iseq.$(OBJEXT): {$(VPATH)}internal/intern/error.h iseq.$(OBJEXT): {$(VPATH)}internal/intern/eval.h iseq.$(OBJEXT): {$(VPATH)}internal/intern/file.h +iseq.$(OBJEXT): {$(VPATH)}internal/intern/gc.h iseq.$(OBJEXT): {$(VPATH)}internal/intern/hash.h iseq.$(OBJEXT): {$(VPATH)}internal/intern/io.h iseq.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -8668,6 +8181,7 @@ iseq.$(OBJEXT): {$(VPATH)}internal/memory.h iseq.$(OBJEXT): {$(VPATH)}internal/method.h iseq.$(OBJEXT): {$(VPATH)}internal/module.h iseq.$(OBJEXT): {$(VPATH)}internal/newobj.h +iseq.$(OBJEXT): {$(VPATH)}internal/rgengc.h iseq.$(OBJEXT): {$(VPATH)}internal/scan_args.h iseq.$(OBJEXT): {$(VPATH)}internal/special_consts.h iseq.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -8683,18 +8197,14 @@ iseq.$(OBJEXT): {$(VPATH)}iseq.c iseq.$(OBJEXT): {$(VPATH)}iseq.h iseq.$(OBJEXT): {$(VPATH)}method.h iseq.$(OBJEXT): {$(VPATH)}missing.h +iseq.$(OBJEXT): {$(VPATH)}mjit.h iseq.$(OBJEXT): {$(VPATH)}node.h +iseq.$(OBJEXT): {$(VPATH)}node_name.inc iseq.$(OBJEXT): {$(VPATH)}onigmo.h iseq.$(OBJEXT): {$(VPATH)}oniguruma.h -iseq.$(OBJEXT): {$(VPATH)}prism/ast.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 iseq.$(OBJEXT): {$(VPATH)}shape.h iseq.$(OBJEXT): {$(VPATH)}st.h iseq.$(OBJEXT): {$(VPATH)}subst.h @@ -8703,29 +8213,23 @@ 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)}vm_sync.h iseq.$(OBJEXT): {$(VPATH)}yjit.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/bits.h load.$(OBJEXT): $(top_srcdir)/internal/compilers.h load.$(OBJEXT): $(top_srcdir)/internal/dir.h load.$(OBJEXT): $(top_srcdir)/internal/error.h load.$(OBJEXT): $(top_srcdir)/internal/file.h load.$(OBJEXT): $(top_srcdir)/internal/gc.h -load.$(OBJEXT): $(top_srcdir)/internal/hash.h load.$(OBJEXT): $(top_srcdir)/internal/imemo.h load.$(OBJEXT): $(top_srcdir)/internal/load.h load.$(OBJEXT): $(top_srcdir)/internal/parse.h -load.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h load.$(OBJEXT): $(top_srcdir)/internal/serial.h load.$(OBJEXT): $(top_srcdir)/internal/static_assert.h load.$(OBJEXT): $(top_srcdir)/internal/string.h @@ -8733,27 +8237,6 @@ 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/diagnostic.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/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_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_state_stack.h -load.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -load.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -8814,7 +8297,6 @@ load.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h load.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h load.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h load.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -load.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h load.$(OBJEXT): {$(VPATH)}internal/attr/pure.h load.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h load.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -8883,6 +8365,7 @@ load.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h load.$(OBJEXT): {$(VPATH)}internal/intern/error.h load.$(OBJEXT): {$(VPATH)}internal/intern/eval.h load.$(OBJEXT): {$(VPATH)}internal/intern/file.h +load.$(OBJEXT): {$(VPATH)}internal/intern/gc.h load.$(OBJEXT): {$(VPATH)}internal/intern/hash.h load.$(OBJEXT): {$(VPATH)}internal/intern/io.h load.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -8913,6 +8396,7 @@ load.$(OBJEXT): {$(VPATH)}internal/memory.h load.$(OBJEXT): {$(VPATH)}internal/method.h load.$(OBJEXT): {$(VPATH)}internal/module.h load.$(OBJEXT): {$(VPATH)}internal/newobj.h +load.$(OBJEXT): {$(VPATH)}internal/rgengc.h load.$(OBJEXT): {$(VPATH)}internal/scan_args.h load.$(OBJEXT): {$(VPATH)}internal/special_consts.h load.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -8931,14 +8415,10 @@ 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/version.h -load.$(OBJEXT): {$(VPATH)}prism_compile.h load.$(OBJEXT): {$(VPATH)}probes.dmyh load.$(OBJEXT): {$(VPATH)}probes.h load.$(OBJEXT): {$(VPATH)}ruby_assert.h load.$(OBJEXT): {$(VPATH)}ruby_atomic.h -load.$(OBJEXT): {$(VPATH)}rubyparser.h load.$(OBJEXT): {$(VPATH)}shape.h load.$(OBJEXT): {$(VPATH)}st.h load.$(OBJEXT): {$(VPATH)}subst.h @@ -9000,7 +8480,6 @@ loadpath.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h loadpath.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h loadpath.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h loadpath.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -loadpath.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h loadpath.$(OBJEXT): {$(VPATH)}internal/attr/pure.h loadpath.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h loadpath.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -9060,6 +8539,7 @@ loadpath.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h loadpath.$(OBJEXT): {$(VPATH)}internal/intern/error.h loadpath.$(OBJEXT): {$(VPATH)}internal/intern/eval.h loadpath.$(OBJEXT): {$(VPATH)}internal/intern/file.h +loadpath.$(OBJEXT): {$(VPATH)}internal/intern/gc.h loadpath.$(OBJEXT): {$(VPATH)}internal/intern/hash.h loadpath.$(OBJEXT): {$(VPATH)}internal/intern/io.h loadpath.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -9090,6 +8570,7 @@ loadpath.$(OBJEXT): {$(VPATH)}internal/memory.h loadpath.$(OBJEXT): {$(VPATH)}internal/method.h loadpath.$(OBJEXT): {$(VPATH)}internal/module.h loadpath.$(OBJEXT): {$(VPATH)}internal/newobj.h +loadpath.$(OBJEXT): {$(VPATH)}internal/rgengc.h loadpath.$(OBJEXT): {$(VPATH)}internal/scan_args.h loadpath.$(OBJEXT): {$(VPATH)}internal/special_consts.h loadpath.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -9160,7 +8641,6 @@ localeinit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h localeinit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h localeinit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h localeinit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -localeinit.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h localeinit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h localeinit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h localeinit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -9229,6 +8709,7 @@ localeinit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h localeinit.$(OBJEXT): {$(VPATH)}internal/intern/error.h localeinit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h localeinit.$(OBJEXT): {$(VPATH)}internal/intern/file.h +localeinit.$(OBJEXT): {$(VPATH)}internal/intern/gc.h localeinit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h localeinit.$(OBJEXT): {$(VPATH)}internal/intern/io.h localeinit.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -9259,6 +8740,7 @@ localeinit.$(OBJEXT): {$(VPATH)}internal/memory.h localeinit.$(OBJEXT): {$(VPATH)}internal/method.h localeinit.$(OBJEXT): {$(VPATH)}internal/module.h localeinit.$(OBJEXT): {$(VPATH)}internal/newobj.h +localeinit.$(OBJEXT): {$(VPATH)}internal/rgengc.h localeinit.$(OBJEXT): {$(VPATH)}internal/scan_args.h localeinit.$(OBJEXT): {$(VPATH)}internal/special_consts.h localeinit.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -9329,7 +8811,6 @@ main.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h main.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h main.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h main.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -main.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h main.$(OBJEXT): {$(VPATH)}internal/attr/pure.h main.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h main.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -9389,6 +8870,7 @@ main.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h main.$(OBJEXT): {$(VPATH)}internal/intern/error.h main.$(OBJEXT): {$(VPATH)}internal/intern/eval.h main.$(OBJEXT): {$(VPATH)}internal/intern/file.h +main.$(OBJEXT): {$(VPATH)}internal/intern/gc.h main.$(OBJEXT): {$(VPATH)}internal/intern/hash.h main.$(OBJEXT): {$(VPATH)}internal/intern/io.h main.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -9419,6 +8901,7 @@ main.$(OBJEXT): {$(VPATH)}internal/memory.h main.$(OBJEXT): {$(VPATH)}internal/method.h main.$(OBJEXT): {$(VPATH)}internal/module.h main.$(OBJEXT): {$(VPATH)}internal/newobj.h +main.$(OBJEXT): {$(VPATH)}internal/rgengc.h main.$(OBJEXT): {$(VPATH)}internal/scan_args.h main.$(OBJEXT): {$(VPATH)}internal/special_consts.h main.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -9440,7 +8923,6 @@ 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 @@ -9478,7 +8960,6 @@ 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 @@ -9523,8 +9004,8 @@ 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 marshal.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h marshal.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -9593,6 +9074,7 @@ marshal.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h marshal.$(OBJEXT): {$(VPATH)}internal/intern/error.h marshal.$(OBJEXT): {$(VPATH)}internal/intern/eval.h marshal.$(OBJEXT): {$(VPATH)}internal/intern/file.h +marshal.$(OBJEXT): {$(VPATH)}internal/intern/gc.h marshal.$(OBJEXT): {$(VPATH)}internal/intern/hash.h marshal.$(OBJEXT): {$(VPATH)}internal/intern/io.h marshal.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -9623,6 +9105,7 @@ marshal.$(OBJEXT): {$(VPATH)}internal/memory.h marshal.$(OBJEXT): {$(VPATH)}internal/method.h marshal.$(OBJEXT): {$(VPATH)}internal/module.h marshal.$(OBJEXT): {$(VPATH)}internal/newobj.h +marshal.$(OBJEXT): {$(VPATH)}internal/rgengc.h marshal.$(OBJEXT): {$(VPATH)}internal/scan_args.h marshal.$(OBJEXT): {$(VPATH)}internal/special_consts.h marshal.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -9644,7 +9127,6 @@ marshal.$(OBJEXT): {$(VPATH)}onigmo.h marshal.$(OBJEXT): {$(VPATH)}oniguruma.h marshal.$(OBJEXT): {$(VPATH)}ruby_assert.h marshal.$(OBJEXT): {$(VPATH)}ruby_atomic.h -marshal.$(OBJEXT): {$(VPATH)}rubyparser.h marshal.$(OBJEXT): {$(VPATH)}shape.h marshal.$(OBJEXT): {$(VPATH)}st.h marshal.$(OBJEXT): {$(VPATH)}subst.h @@ -9652,9 +9134,7 @@ 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 @@ -9722,7 +9202,6 @@ math.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h math.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h math.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h math.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -math.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h math.$(OBJEXT): {$(VPATH)}internal/attr/pure.h math.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h math.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -9782,6 +9261,7 @@ math.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h math.$(OBJEXT): {$(VPATH)}internal/intern/error.h math.$(OBJEXT): {$(VPATH)}internal/intern/eval.h math.$(OBJEXT): {$(VPATH)}internal/intern/file.h +math.$(OBJEXT): {$(VPATH)}internal/intern/gc.h math.$(OBJEXT): {$(VPATH)}internal/intern/hash.h math.$(OBJEXT): {$(VPATH)}internal/intern/io.h math.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -9812,6 +9292,7 @@ math.$(OBJEXT): {$(VPATH)}internal/memory.h math.$(OBJEXT): {$(VPATH)}internal/method.h math.$(OBJEXT): {$(VPATH)}internal/module.h math.$(OBJEXT): {$(VPATH)}internal/newobj.h +math.$(OBJEXT): {$(VPATH)}internal/rgengc.h math.$(OBJEXT): {$(VPATH)}internal/scan_args.h math.$(OBJEXT): {$(VPATH)}internal/special_consts.h math.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -9828,24 +9309,13 @@ math.$(OBJEXT): {$(VPATH)}missing.h math.$(OBJEXT): {$(VPATH)}shape.h math.$(OBJEXT): {$(VPATH)}st.h math.$(OBJEXT): {$(VPATH)}subst.h -memory_view.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -memory_view.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -memory_view.$(OBJEXT): $(CCAN_DIR)/list/list.h -memory_view.$(OBJEXT): $(CCAN_DIR)/str/str.h memory_view.$(OBJEXT): $(hdrdir)/ruby/ruby.h -memory_view.$(OBJEXT): $(top_srcdir)/internal/array.h -memory_view.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h 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/serial.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 memory_view.$(OBJEXT): $(top_srcdir)/internal/warnings.h memory_view.$(OBJEXT): {$(VPATH)}assert.h -memory_view.$(OBJEXT): {$(VPATH)}atomic.h memory_view.$(OBJEXT): {$(VPATH)}backward/2/assume.h memory_view.$(OBJEXT): {$(VPATH)}backward/2/attributes.h memory_view.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -9859,8 +9329,6 @@ memory_view.$(OBJEXT): {$(VPATH)}config.h memory_view.$(OBJEXT): {$(VPATH)}constant.h memory_view.$(OBJEXT): {$(VPATH)}debug_counter.h memory_view.$(OBJEXT): {$(VPATH)}defines.h -memory_view.$(OBJEXT): {$(VPATH)}encoding.h -memory_view.$(OBJEXT): {$(VPATH)}id.h memory_view.$(OBJEXT): {$(VPATH)}id_table.h memory_view.$(OBJEXT): {$(VPATH)}intern.h memory_view.$(OBJEXT): {$(VPATH)}internal.h @@ -9902,7 +9370,6 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h memory_view.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h memory_view.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h memory_view.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -memory_view.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h memory_view.$(OBJEXT): {$(VPATH)}internal/attr/pure.h memory_view.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h memory_view.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -9935,15 +9402,6 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h memory_view.$(OBJEXT): {$(VPATH)}internal/ctype.h memory_view.$(OBJEXT): {$(VPATH)}internal/dllexport.h memory_view.$(OBJEXT): {$(VPATH)}internal/dosish.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -memory_view.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h memory_view.$(OBJEXT): {$(VPATH)}internal/error.h memory_view.$(OBJEXT): {$(VPATH)}internal/eval.h memory_view.$(OBJEXT): {$(VPATH)}internal/event.h @@ -9971,6 +9429,7 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h memory_view.$(OBJEXT): {$(VPATH)}internal/intern/error.h memory_view.$(OBJEXT): {$(VPATH)}internal/intern/eval.h memory_view.$(OBJEXT): {$(VPATH)}internal/intern/file.h +memory_view.$(OBJEXT): {$(VPATH)}internal/intern/gc.h memory_view.$(OBJEXT): {$(VPATH)}internal/intern/hash.h memory_view.$(OBJEXT): {$(VPATH)}internal/intern/io.h memory_view.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -10001,6 +9460,7 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/memory.h memory_view.$(OBJEXT): {$(VPATH)}internal/method.h memory_view.$(OBJEXT): {$(VPATH)}internal/module.h memory_view.$(OBJEXT): {$(VPATH)}internal/newobj.h +memory_view.$(OBJEXT): {$(VPATH)}internal/rgengc.h memory_view.$(OBJEXT): {$(VPATH)}internal/scan_args.h memory_view.$(OBJEXT): {$(VPATH)}internal/special_consts.h memory_view.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -10014,62 +9474,29 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/warning_push.h memory_view.$(OBJEXT): {$(VPATH)}internal/xmalloc.h memory_view.$(OBJEXT): {$(VPATH)}memory_view.c memory_view.$(OBJEXT): {$(VPATH)}memory_view.h -memory_view.$(OBJEXT): {$(VPATH)}method.h memory_view.$(OBJEXT): {$(VPATH)}missing.h -memory_view.$(OBJEXT): {$(VPATH)}node.h -memory_view.$(OBJEXT): {$(VPATH)}onigmo.h -memory_view.$(OBJEXT): {$(VPATH)}oniguruma.h -memory_view.$(OBJEXT): {$(VPATH)}ruby_assert.h -memory_view.$(OBJEXT): {$(VPATH)}ruby_atomic.h -memory_view.$(OBJEXT): {$(VPATH)}rubyparser.h memory_view.$(OBJEXT): {$(VPATH)}shape.h memory_view.$(OBJEXT): {$(VPATH)}st.h memory_view.$(OBJEXT): {$(VPATH)}subst.h -memory_view.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -memory_view.$(OBJEXT): {$(VPATH)}thread_native.h memory_view.$(OBJEXT): {$(VPATH)}util.h -memory_view.$(OBJEXT): {$(VPATH)}vm_core.h memory_view.$(OBJEXT): {$(VPATH)}vm_debug.h -memory_view.$(OBJEXT): {$(VPATH)}vm_opts.h memory_view.$(OBJEXT): {$(VPATH)}vm_sync.h miniinit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h 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): $(srcdir)/mjit_c.rb miniinit.$(OBJEXT): $(top_srcdir)/internal/array.h miniinit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h miniinit.$(OBJEXT): $(top_srcdir)/internal/compilers.h miniinit.$(OBJEXT): $(top_srcdir)/internal/gc.h miniinit.$(OBJEXT): $(top_srcdir)/internal/imemo.h -miniinit.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h miniinit.$(OBJEXT): $(top_srcdir)/internal/serial.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/diagnostic.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/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_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_state_stack.h -miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -10132,8 +9559,8 @@ 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 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h miniinit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -10202,6 +9629,7 @@ miniinit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h miniinit.$(OBJEXT): {$(VPATH)}internal/intern/error.h miniinit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h miniinit.$(OBJEXT): {$(VPATH)}internal/intern/file.h +miniinit.$(OBJEXT): {$(VPATH)}internal/intern/gc.h miniinit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h miniinit.$(OBJEXT): {$(VPATH)}internal/intern/io.h miniinit.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -10232,6 +9660,7 @@ miniinit.$(OBJEXT): {$(VPATH)}internal/memory.h miniinit.$(OBJEXT): {$(VPATH)}internal/method.h miniinit.$(OBJEXT): {$(VPATH)}internal/module.h miniinit.$(OBJEXT): {$(VPATH)}internal/newobj.h +miniinit.$(OBJEXT): {$(VPATH)}internal/rgengc.h miniinit.$(OBJEXT): {$(VPATH)}internal/scan_args.h miniinit.$(OBJEXT): {$(VPATH)}internal/special_consts.h miniinit.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -10252,6 +9681,8 @@ miniinit.$(OBJEXT): {$(VPATH)}mini_builtin.c miniinit.$(OBJEXT): {$(VPATH)}miniinit.c miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c miniinit.$(OBJEXT): {$(VPATH)}missing.h +miniinit.$(OBJEXT): {$(VPATH)}mjit.rb +miniinit.$(OBJEXT): {$(VPATH)}mjit_c.rb miniinit.$(OBJEXT): {$(VPATH)}nilclass.rb miniinit.$(OBJEXT): {$(VPATH)}node.h miniinit.$(OBJEXT): {$(VPATH)}numeric.rb @@ -10259,15 +9690,9 @@ 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/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 miniinit.$(OBJEXT): {$(VPATH)}shape.h miniinit.$(OBJEXT): {$(VPATH)}st.h miniinit.$(OBJEXT): {$(VPATH)}subst.h @@ -10281,6 +9706,441 @@ miniinit.$(OBJEXT): {$(VPATH)}vm_core.h miniinit.$(OBJEXT): {$(VPATH)}vm_opts.h miniinit.$(OBJEXT): {$(VPATH)}warning.rb miniinit.$(OBJEXT): {$(VPATH)}yjit.rb +mjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h +mjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h +mjit.$(OBJEXT): $(CCAN_DIR)/list/list.h +mjit.$(OBJEXT): $(CCAN_DIR)/str/str.h +mjit.$(OBJEXT): $(hdrdir)/ruby.h +mjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h +mjit.$(OBJEXT): $(hdrdir)/ruby/version.h +mjit.$(OBJEXT): $(top_srcdir)/internal/array.h +mjit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h +mjit.$(OBJEXT): $(top_srcdir)/internal/class.h +mjit.$(OBJEXT): $(top_srcdir)/internal/cmdlineopt.h +mjit.$(OBJEXT): $(top_srcdir)/internal/compile.h +mjit.$(OBJEXT): $(top_srcdir)/internal/compilers.h +mjit.$(OBJEXT): $(top_srcdir)/internal/cont.h +mjit.$(OBJEXT): $(top_srcdir)/internal/file.h +mjit.$(OBJEXT): $(top_srcdir)/internal/gc.h +mjit.$(OBJEXT): $(top_srcdir)/internal/hash.h +mjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h +mjit.$(OBJEXT): $(top_srcdir)/internal/process.h +mjit.$(OBJEXT): $(top_srcdir)/internal/serial.h +mjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +mjit.$(OBJEXT): $(top_srcdir)/internal/variable.h +mjit.$(OBJEXT): $(top_srcdir)/internal/vm.h +mjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h +mjit.$(OBJEXT): {$(VPATH)}assert.h +mjit.$(OBJEXT): {$(VPATH)}atomic.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/assume.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/attributes.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/bool.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/limits.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/long_long.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h +mjit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h +mjit.$(OBJEXT): {$(VPATH)}builtin.h +mjit.$(OBJEXT): {$(VPATH)}config.h +mjit.$(OBJEXT): {$(VPATH)}constant.h +mjit.$(OBJEXT): {$(VPATH)}debug.h +mjit.$(OBJEXT): {$(VPATH)}debug_counter.h +mjit.$(OBJEXT): {$(VPATH)}defines.h +mjit.$(OBJEXT): {$(VPATH)}dln.h +mjit.$(OBJEXT): {$(VPATH)}encoding.h +mjit.$(OBJEXT): {$(VPATH)}gc.h +mjit.$(OBJEXT): {$(VPATH)}id.h +mjit.$(OBJEXT): {$(VPATH)}id_table.h +mjit.$(OBJEXT): {$(VPATH)}insns.def +mjit.$(OBJEXT): {$(VPATH)}insns.inc +mjit.$(OBJEXT): {$(VPATH)}insns_info.inc +mjit.$(OBJEXT): {$(VPATH)}intern.h +mjit.$(OBJEXT): {$(VPATH)}internal.h +mjit.$(OBJEXT): {$(VPATH)}internal/abi.h +mjit.$(OBJEXT): {$(VPATH)}internal/anyargs.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h +mjit.$(OBJEXT): {$(VPATH)}internal/assume.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/cold.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/const.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/error.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/format.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/warning.h +mjit.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h +mjit.$(OBJEXT): {$(VPATH)}internal/cast.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h +mjit.$(OBJEXT): {$(VPATH)}internal/compiler_since.h +mjit.$(OBJEXT): {$(VPATH)}internal/config.h +mjit.$(OBJEXT): {$(VPATH)}internal/constant_p.h +mjit.$(OBJEXT): {$(VPATH)}internal/core.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rarray.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rclass.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rdata.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rfile.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rhash.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/robject.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rstring.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h +mjit.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h +mjit.$(OBJEXT): {$(VPATH)}internal/ctype.h +mjit.$(OBJEXT): {$(VPATH)}internal/dllexport.h +mjit.$(OBJEXT): {$(VPATH)}internal/dosish.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/re.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/string.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h +mjit.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h +mjit.$(OBJEXT): {$(VPATH)}internal/error.h +mjit.$(OBJEXT): {$(VPATH)}internal/eval.h +mjit.$(OBJEXT): {$(VPATH)}internal/event.h +mjit.$(OBJEXT): {$(VPATH)}internal/fl_type.h +mjit.$(OBJEXT): {$(VPATH)}internal/gc.h +mjit.$(OBJEXT): {$(VPATH)}internal/glob.h +mjit.$(OBJEXT): {$(VPATH)}internal/globals.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/attribute.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/builtin.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/extension.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/feature.h +mjit.$(OBJEXT): {$(VPATH)}internal/has/warning.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/array.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/class.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/compar.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/complex.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/cont.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/dir.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/enum.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/error.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/file.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/gc.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/io.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/load.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/object.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/parse.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/proc.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/process.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/random.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/range.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/rational.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/re.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/select.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/string.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/struct.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/thread.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/time.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/variable.h +mjit.$(OBJEXT): {$(VPATH)}internal/intern/vm.h +mjit.$(OBJEXT): {$(VPATH)}internal/interpreter.h +mjit.$(OBJEXT): {$(VPATH)}internal/iterator.h +mjit.$(OBJEXT): {$(VPATH)}internal/memory.h +mjit.$(OBJEXT): {$(VPATH)}internal/method.h +mjit.$(OBJEXT): {$(VPATH)}internal/module.h +mjit.$(OBJEXT): {$(VPATH)}internal/newobj.h +mjit.$(OBJEXT): {$(VPATH)}internal/rgengc.h +mjit.$(OBJEXT): {$(VPATH)}internal/scan_args.h +mjit.$(OBJEXT): {$(VPATH)}internal/special_consts.h +mjit.$(OBJEXT): {$(VPATH)}internal/static_assert.h +mjit.$(OBJEXT): {$(VPATH)}internal/stdalign.h +mjit.$(OBJEXT): {$(VPATH)}internal/stdbool.h +mjit.$(OBJEXT): {$(VPATH)}internal/symbol.h +mjit.$(OBJEXT): {$(VPATH)}internal/value.h +mjit.$(OBJEXT): {$(VPATH)}internal/value_type.h +mjit.$(OBJEXT): {$(VPATH)}internal/variable.h +mjit.$(OBJEXT): {$(VPATH)}internal/warning_push.h +mjit.$(OBJEXT): {$(VPATH)}internal/xmalloc.h +mjit.$(OBJEXT): {$(VPATH)}iseq.h +mjit.$(OBJEXT): {$(VPATH)}method.h +mjit.$(OBJEXT): {$(VPATH)}missing.h +mjit.$(OBJEXT): {$(VPATH)}mjit.c +mjit.$(OBJEXT): {$(VPATH)}mjit.h +mjit.$(OBJEXT): {$(VPATH)}mjit.rbinc +mjit.$(OBJEXT): {$(VPATH)}mjit_c.h +mjit.$(OBJEXT): {$(VPATH)}mjit_config.h +mjit.$(OBJEXT): {$(VPATH)}node.h +mjit.$(OBJEXT): {$(VPATH)}onigmo.h +mjit.$(OBJEXT): {$(VPATH)}oniguruma.h +mjit.$(OBJEXT): {$(VPATH)}ractor.h +mjit.$(OBJEXT): {$(VPATH)}ractor_core.h +mjit.$(OBJEXT): {$(VPATH)}ruby_assert.h +mjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h +mjit.$(OBJEXT): {$(VPATH)}shape.h +mjit.$(OBJEXT): {$(VPATH)}st.h +mjit.$(OBJEXT): {$(VPATH)}subst.h +mjit.$(OBJEXT): {$(VPATH)}thread.h +mjit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h +mjit.$(OBJEXT): {$(VPATH)}thread_native.h +mjit.$(OBJEXT): {$(VPATH)}util.h +mjit.$(OBJEXT): {$(VPATH)}vm_callinfo.h +mjit.$(OBJEXT): {$(VPATH)}vm_core.h +mjit.$(OBJEXT): {$(VPATH)}vm_debug.h +mjit.$(OBJEXT): {$(VPATH)}vm_opts.h +mjit.$(OBJEXT): {$(VPATH)}vm_sync.h +mjit.$(OBJEXT): {$(VPATH)}yjit.h +mjit_c.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h +mjit_c.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h +mjit_c.$(OBJEXT): $(CCAN_DIR)/list/list.h +mjit_c.$(OBJEXT): $(CCAN_DIR)/str/str.h +mjit_c.$(OBJEXT): $(hdrdir)/ruby.h +mjit_c.$(OBJEXT): $(hdrdir)/ruby/ruby.h +mjit_c.$(OBJEXT): $(srcdir)/mjit_c.rb +mjit_c.$(OBJEXT): $(top_srcdir)/internal/array.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/class.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/compile.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/compilers.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/gc.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/hash.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/imemo.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/object.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/serial.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/variable.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/vm.h +mjit_c.$(OBJEXT): $(top_srcdir)/internal/warnings.h +mjit_c.$(OBJEXT): {$(VPATH)}assert.h +mjit_c.$(OBJEXT): {$(VPATH)}atomic.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/assume.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/attributes.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/bool.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/limits.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/long_long.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h +mjit_c.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h +mjit_c.$(OBJEXT): {$(VPATH)}builtin.h +mjit_c.$(OBJEXT): {$(VPATH)}config.h +mjit_c.$(OBJEXT): {$(VPATH)}constant.h +mjit_c.$(OBJEXT): {$(VPATH)}debug_counter.h +mjit_c.$(OBJEXT): {$(VPATH)}defines.h +mjit_c.$(OBJEXT): {$(VPATH)}id.h +mjit_c.$(OBJEXT): {$(VPATH)}id_table.h +mjit_c.$(OBJEXT): {$(VPATH)}insns.def +mjit_c.$(OBJEXT): {$(VPATH)}insns.inc +mjit_c.$(OBJEXT): {$(VPATH)}insns_info.inc +mjit_c.$(OBJEXT): {$(VPATH)}intern.h +mjit_c.$(OBJEXT): {$(VPATH)}internal.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/abi.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/anyargs.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/assume.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/cold.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/const.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/error.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/format.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/pure.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/warning.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/cast.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_since.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/config.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/constant_p.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rarray.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rclass.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rdata.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rfile.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rhash.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/robject.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rstring.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/ctype.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/dllexport.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/dosish.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/error.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/eval.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/event.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/fl_type.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/gc.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/glob.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/globals.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/attribute.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/builtin.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/extension.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/feature.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/has/warning.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/array.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/class.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/compar.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/complex.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/cont.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/dir.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/enum.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/error.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/eval.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/file.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/gc.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/hash.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/io.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/load.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/object.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/parse.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/proc.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/process.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/random.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/range.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/rational.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/re.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/select.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/signal.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/string.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/struct.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/thread.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/time.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/variable.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/vm.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/interpreter.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/iterator.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/memory.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/method.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/module.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/newobj.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/rgengc.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/scan_args.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/special_consts.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/static_assert.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/stdalign.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/stdbool.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/symbol.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/value.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/value_type.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/variable.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/warning_push.h +mjit_c.$(OBJEXT): {$(VPATH)}internal/xmalloc.h +mjit_c.$(OBJEXT): {$(VPATH)}iseq.h +mjit_c.$(OBJEXT): {$(VPATH)}method.h +mjit_c.$(OBJEXT): {$(VPATH)}missing.h +mjit_c.$(OBJEXT): {$(VPATH)}mjit.h +mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.c +mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.h +mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.rb +mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.rbinc +mjit_c.$(OBJEXT): {$(VPATH)}mjit_sp_inc.inc +mjit_c.$(OBJEXT): {$(VPATH)}node.h +mjit_c.$(OBJEXT): {$(VPATH)}ruby_assert.h +mjit_c.$(OBJEXT): {$(VPATH)}ruby_atomic.h +mjit_c.$(OBJEXT): {$(VPATH)}shape.h +mjit_c.$(OBJEXT): {$(VPATH)}st.h +mjit_c.$(OBJEXT): {$(VPATH)}subst.h +mjit_c.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h +mjit_c.$(OBJEXT): {$(VPATH)}thread_native.h +mjit_c.$(OBJEXT): {$(VPATH)}vm_callinfo.h +mjit_c.$(OBJEXT): {$(VPATH)}vm_core.h +mjit_c.$(OBJEXT): {$(VPATH)}vm_exec.h +mjit_c.$(OBJEXT): {$(VPATH)}vm_insnhelper.h +mjit_c.$(OBJEXT): {$(VPATH)}vm_opts.h +mjit_c.$(OBJEXT): {$(VPATH)}yjit.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 @@ -10311,7 +10171,6 @@ node.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h node.$(OBJEXT): {$(VPATH)}config.h node.$(OBJEXT): {$(VPATH)}constant.h node.$(OBJEXT): {$(VPATH)}defines.h -node.$(OBJEXT): {$(VPATH)}encoding.h node.$(OBJEXT): {$(VPATH)}id.h node.$(OBJEXT): {$(VPATH)}id_table.h node.$(OBJEXT): {$(VPATH)}intern.h @@ -10354,7 +10213,6 @@ node.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h node.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h node.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h node.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -node.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h node.$(OBJEXT): {$(VPATH)}internal/attr/pure.h node.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h node.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -10387,15 +10245,6 @@ node.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h node.$(OBJEXT): {$(VPATH)}internal/ctype.h node.$(OBJEXT): {$(VPATH)}internal/dllexport.h node.$(OBJEXT): {$(VPATH)}internal/dosish.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -node.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h node.$(OBJEXT): {$(VPATH)}internal/error.h node.$(OBJEXT): {$(VPATH)}internal/eval.h node.$(OBJEXT): {$(VPATH)}internal/event.h @@ -10423,6 +10272,7 @@ node.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h node.$(OBJEXT): {$(VPATH)}internal/intern/error.h node.$(OBJEXT): {$(VPATH)}internal/intern/eval.h node.$(OBJEXT): {$(VPATH)}internal/intern/file.h +node.$(OBJEXT): {$(VPATH)}internal/intern/gc.h node.$(OBJEXT): {$(VPATH)}internal/intern/hash.h node.$(OBJEXT): {$(VPATH)}internal/intern/io.h node.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -10453,6 +10303,7 @@ node.$(OBJEXT): {$(VPATH)}internal/memory.h node.$(OBJEXT): {$(VPATH)}internal/method.h node.$(OBJEXT): {$(VPATH)}internal/module.h node.$(OBJEXT): {$(VPATH)}internal/newobj.h +node.$(OBJEXT): {$(VPATH)}internal/rgengc.h node.$(OBJEXT): {$(VPATH)}internal/scan_args.h node.$(OBJEXT): {$(VPATH)}internal/special_consts.h node.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -10468,12 +10319,8 @@ node.$(OBJEXT): {$(VPATH)}method.h node.$(OBJEXT): {$(VPATH)}missing.h node.$(OBJEXT): {$(VPATH)}node.c node.$(OBJEXT): {$(VPATH)}node.h -node.$(OBJEXT): {$(VPATH)}node_name.inc -node.$(OBJEXT): {$(VPATH)}onigmo.h -node.$(OBJEXT): {$(VPATH)}oniguruma.h node.$(OBJEXT): {$(VPATH)}ruby_assert.h node.$(OBJEXT): {$(VPATH)}ruby_atomic.h -node.$(OBJEXT): {$(VPATH)}rubyparser.h node.$(OBJEXT): {$(VPATH)}shape.h node.$(OBJEXT): {$(VPATH)}st.h node.$(OBJEXT): {$(VPATH)}subst.h @@ -10481,212 +10328,8 @@ node.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h node.$(OBJEXT): {$(VPATH)}thread_native.h node.$(OBJEXT): {$(VPATH)}vm_core.h node.$(OBJEXT): {$(VPATH)}vm_opts.h -node_dump.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -node_dump.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -node_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h -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/compilers.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/serial.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 -node_dump.$(OBJEXT): $(top_srcdir)/internal/warnings.h -node_dump.$(OBJEXT): {$(VPATH)}assert.h -node_dump.$(OBJEXT): {$(VPATH)}atomic.h -node_dump.$(OBJEXT): {$(VPATH)}backward/2/assume.h -node_dump.$(OBJEXT): {$(VPATH)}backward/2/attributes.h -node_dump.$(OBJEXT): {$(VPATH)}backward/2/bool.h -node_dump.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h -node_dump.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h -node_dump.$(OBJEXT): {$(VPATH)}backward/2/limits.h -node_dump.$(OBJEXT): {$(VPATH)}backward/2/long_long.h -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)}defines.h -node_dump.$(OBJEXT): {$(VPATH)}encoding.h -node_dump.$(OBJEXT): {$(VPATH)}id.h -node_dump.$(OBJEXT): {$(VPATH)}id_table.h -node_dump.$(OBJEXT): {$(VPATH)}intern.h -node_dump.$(OBJEXT): {$(VPATH)}internal.h -node_dump.$(OBJEXT): {$(VPATH)}internal/abi.h -node_dump.$(OBJEXT): {$(VPATH)}internal/anyargs.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h -node_dump.$(OBJEXT): {$(VPATH)}internal/assume.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/cold.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/const.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/error.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/format.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/pure.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/warning.h -node_dump.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h -node_dump.$(OBJEXT): {$(VPATH)}internal/cast.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h -node_dump.$(OBJEXT): {$(VPATH)}internal/compiler_since.h -node_dump.$(OBJEXT): {$(VPATH)}internal/config.h -node_dump.$(OBJEXT): {$(VPATH)}internal/constant_p.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rarray.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rclass.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rdata.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rfile.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rhash.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/robject.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rstring.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h -node_dump.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h -node_dump.$(OBJEXT): {$(VPATH)}internal/ctype.h -node_dump.$(OBJEXT): {$(VPATH)}internal/dllexport.h -node_dump.$(OBJEXT): {$(VPATH)}internal/dosish.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -node_dump.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h -node_dump.$(OBJEXT): {$(VPATH)}internal/error.h -node_dump.$(OBJEXT): {$(VPATH)}internal/eval.h -node_dump.$(OBJEXT): {$(VPATH)}internal/event.h -node_dump.$(OBJEXT): {$(VPATH)}internal/fl_type.h -node_dump.$(OBJEXT): {$(VPATH)}internal/gc.h -node_dump.$(OBJEXT): {$(VPATH)}internal/glob.h -node_dump.$(OBJEXT): {$(VPATH)}internal/globals.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/attribute.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/builtin.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/extension.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/feature.h -node_dump.$(OBJEXT): {$(VPATH)}internal/has/warning.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/array.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/class.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/compar.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/complex.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/cont.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/dir.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/enum.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/error.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/eval.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/file.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/hash.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/io.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/load.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/object.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/parse.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/proc.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/process.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/random.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/range.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/rational.h -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/signal.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/string.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/struct.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/thread.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/time.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/variable.h -node_dump.$(OBJEXT): {$(VPATH)}internal/intern/vm.h -node_dump.$(OBJEXT): {$(VPATH)}internal/interpreter.h -node_dump.$(OBJEXT): {$(VPATH)}internal/iterator.h -node_dump.$(OBJEXT): {$(VPATH)}internal/memory.h -node_dump.$(OBJEXT): {$(VPATH)}internal/method.h -node_dump.$(OBJEXT): {$(VPATH)}internal/module.h -node_dump.$(OBJEXT): {$(VPATH)}internal/newobj.h -node_dump.$(OBJEXT): {$(VPATH)}internal/scan_args.h -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/symbol.h -node_dump.$(OBJEXT): {$(VPATH)}internal/value.h -node_dump.$(OBJEXT): {$(VPATH)}internal/value_type.h -node_dump.$(OBJEXT): {$(VPATH)}internal/variable.h -node_dump.$(OBJEXT): {$(VPATH)}internal/warning_push.h -node_dump.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -node_dump.$(OBJEXT): {$(VPATH)}method.h -node_dump.$(OBJEXT): {$(VPATH)}missing.h -node_dump.$(OBJEXT): {$(VPATH)}node.h -node_dump.$(OBJEXT): {$(VPATH)}node_dump.c -node_dump.$(OBJEXT): {$(VPATH)}onigmo.h -node_dump.$(OBJEXT): {$(VPATH)}oniguruma.h -node_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h -node_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h -node_dump.$(OBJEXT): {$(VPATH)}rubyparser.h -node_dump.$(OBJEXT): {$(VPATH)}shape.h -node_dump.$(OBJEXT): {$(VPATH)}st.h -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_opts.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 -numeric.$(OBJEXT): $(CCAN_DIR)/str/str.h numeric.$(OBJEXT): $(hdrdir)/ruby/ruby.h numeric.$(OBJEXT): $(top_srcdir)/internal/array.h -numeric.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h numeric.$(OBJEXT): $(top_srcdir)/internal/bignum.h numeric.$(OBJEXT): $(top_srcdir)/internal/bits.h numeric.$(OBJEXT): $(top_srcdir)/internal/class.h @@ -10696,7 +10339,6 @@ numeric.$(OBJEXT): $(top_srcdir)/internal/enumerator.h numeric.$(OBJEXT): $(top_srcdir)/internal/fixnum.h numeric.$(OBJEXT): $(top_srcdir)/internal/gc.h numeric.$(OBJEXT): $(top_srcdir)/internal/hash.h -numeric.$(OBJEXT): $(top_srcdir)/internal/imemo.h numeric.$(OBJEXT): $(top_srcdir)/internal/numeric.h numeric.$(OBJEXT): $(top_srcdir)/internal/object.h numeric.$(OBJEXT): $(top_srcdir)/internal/rational.h @@ -10708,7 +10350,6 @@ numeric.$(OBJEXT): $(top_srcdir)/internal/variable.h numeric.$(OBJEXT): $(top_srcdir)/internal/vm.h numeric.$(OBJEXT): $(top_srcdir)/internal/warnings.h numeric.$(OBJEXT): {$(VPATH)}assert.h -numeric.$(OBJEXT): {$(VPATH)}atomic.h numeric.$(OBJEXT): {$(VPATH)}backward/2/assume.h numeric.$(OBJEXT): {$(VPATH)}backward/2/attributes.h numeric.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -10765,7 +10406,6 @@ numeric.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h numeric.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h numeric.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h numeric.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -numeric.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h numeric.$(OBJEXT): {$(VPATH)}internal/attr/pure.h numeric.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h numeric.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -10834,6 +10474,7 @@ numeric.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h numeric.$(OBJEXT): {$(VPATH)}internal/intern/error.h numeric.$(OBJEXT): {$(VPATH)}internal/intern/eval.h numeric.$(OBJEXT): {$(VPATH)}internal/intern/file.h +numeric.$(OBJEXT): {$(VPATH)}internal/intern/gc.h numeric.$(OBJEXT): {$(VPATH)}internal/intern/hash.h numeric.$(OBJEXT): {$(VPATH)}internal/intern/io.h numeric.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -10864,6 +10505,7 @@ numeric.$(OBJEXT): {$(VPATH)}internal/memory.h numeric.$(OBJEXT): {$(VPATH)}internal/method.h numeric.$(OBJEXT): {$(VPATH)}internal/module.h numeric.$(OBJEXT): {$(VPATH)}internal/newobj.h +numeric.$(OBJEXT): {$(VPATH)}internal/rgengc.h numeric.$(OBJEXT): {$(VPATH)}internal/scan_args.h numeric.$(OBJEXT): {$(VPATH)}internal/special_consts.h numeric.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -10875,30 +10517,21 @@ numeric.$(OBJEXT): {$(VPATH)}internal/value_type.h numeric.$(OBJEXT): {$(VPATH)}internal/variable.h numeric.$(OBJEXT): {$(VPATH)}internal/warning_push.h numeric.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -numeric.$(OBJEXT): {$(VPATH)}method.h numeric.$(OBJEXT): {$(VPATH)}missing.h -numeric.$(OBJEXT): {$(VPATH)}node.h numeric.$(OBJEXT): {$(VPATH)}numeric.c numeric.$(OBJEXT): {$(VPATH)}numeric.rbinc numeric.$(OBJEXT): {$(VPATH)}onigmo.h numeric.$(OBJEXT): {$(VPATH)}oniguruma.h numeric.$(OBJEXT): {$(VPATH)}ruby_assert.h -numeric.$(OBJEXT): {$(VPATH)}ruby_atomic.h -numeric.$(OBJEXT): {$(VPATH)}rubyparser.h numeric.$(OBJEXT): {$(VPATH)}shape.h numeric.$(OBJEXT): {$(VPATH)}st.h numeric.$(OBJEXT): {$(VPATH)}subst.h -numeric.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -numeric.$(OBJEXT): {$(VPATH)}thread_native.h numeric.$(OBJEXT): {$(VPATH)}util.h -numeric.$(OBJEXT): {$(VPATH)}vm_core.h -numeric.$(OBJEXT): {$(VPATH)}vm_opts.h object.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h 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 @@ -10935,7 +10568,6 @@ 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 @@ -10980,7 +10612,6 @@ object.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h object.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h object.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h object.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -object.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h object.$(OBJEXT): {$(VPATH)}internal/attr/pure.h object.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h object.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -11049,6 +10680,7 @@ object.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h object.$(OBJEXT): {$(VPATH)}internal/intern/error.h object.$(OBJEXT): {$(VPATH)}internal/intern/eval.h object.$(OBJEXT): {$(VPATH)}internal/intern/file.h +object.$(OBJEXT): {$(VPATH)}internal/intern/gc.h object.$(OBJEXT): {$(VPATH)}internal/intern/hash.h object.$(OBJEXT): {$(VPATH)}internal/intern/io.h object.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -11079,6 +10711,7 @@ object.$(OBJEXT): {$(VPATH)}internal/memory.h object.$(OBJEXT): {$(VPATH)}internal/method.h object.$(OBJEXT): {$(VPATH)}internal/module.h object.$(OBJEXT): {$(VPATH)}internal/newobj.h +object.$(OBJEXT): {$(VPATH)}internal/rgengc.h object.$(OBJEXT): {$(VPATH)}internal/scan_args.h object.$(OBJEXT): {$(VPATH)}internal/special_consts.h object.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -11102,7 +10735,6 @@ object.$(OBJEXT): {$(VPATH)}probes.dmyh object.$(OBJEXT): {$(VPATH)}probes.h object.$(OBJEXT): {$(VPATH)}ruby_assert.h object.$(OBJEXT): {$(VPATH)}ruby_atomic.h -object.$(OBJEXT): {$(VPATH)}rubyparser.h object.$(OBJEXT): {$(VPATH)}shape.h object.$(OBJEXT): {$(VPATH)}st.h object.$(OBJEXT): {$(VPATH)}subst.h @@ -11111,29 +10743,18 @@ 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 -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 -pack.$(OBJEXT): $(CCAN_DIR)/str/str.h pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h pack.$(OBJEXT): $(top_srcdir)/internal/array.h -pack.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h 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/serial.h pack.$(OBJEXT): $(top_srcdir)/internal/static_assert.h pack.$(OBJEXT): $(top_srcdir)/internal/string.h pack.$(OBJEXT): $(top_srcdir)/internal/symbol.h pack.$(OBJEXT): $(top_srcdir)/internal/variable.h -pack.$(OBJEXT): $(top_srcdir)/internal/vm.h pack.$(OBJEXT): $(top_srcdir)/internal/warnings.h pack.$(OBJEXT): {$(VPATH)}assert.h -pack.$(OBJEXT): {$(VPATH)}atomic.h pack.$(OBJEXT): {$(VPATH)}backward/2/assume.h pack.$(OBJEXT): {$(VPATH)}backward/2/attributes.h pack.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -11148,7 +10769,6 @@ pack.$(OBJEXT): {$(VPATH)}config.h pack.$(OBJEXT): {$(VPATH)}constant.h pack.$(OBJEXT): {$(VPATH)}defines.h pack.$(OBJEXT): {$(VPATH)}encoding.h -pack.$(OBJEXT): {$(VPATH)}id.h pack.$(OBJEXT): {$(VPATH)}id_table.h pack.$(OBJEXT): {$(VPATH)}intern.h pack.$(OBJEXT): {$(VPATH)}internal.h @@ -11190,7 +10810,6 @@ pack.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h pack.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h pack.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h pack.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -pack.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h pack.$(OBJEXT): {$(VPATH)}internal/attr/pure.h pack.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h pack.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -11259,6 +10878,7 @@ pack.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h pack.$(OBJEXT): {$(VPATH)}internal/intern/error.h pack.$(OBJEXT): {$(VPATH)}internal/intern/eval.h pack.$(OBJEXT): {$(VPATH)}internal/intern/file.h +pack.$(OBJEXT): {$(VPATH)}internal/intern/gc.h pack.$(OBJEXT): {$(VPATH)}internal/intern/hash.h pack.$(OBJEXT): {$(VPATH)}internal/intern/io.h pack.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -11289,6 +10909,7 @@ pack.$(OBJEXT): {$(VPATH)}internal/memory.h pack.$(OBJEXT): {$(VPATH)}internal/method.h pack.$(OBJEXT): {$(VPATH)}internal/module.h pack.$(OBJEXT): {$(VPATH)}internal/newobj.h +pack.$(OBJEXT): {$(VPATH)}internal/rgengc.h pack.$(OBJEXT): {$(VPATH)}internal/scan_args.h pack.$(OBJEXT): {$(VPATH)}internal/special_consts.h pack.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -11300,33 +10921,18 @@ pack.$(OBJEXT): {$(VPATH)}internal/value_type.h pack.$(OBJEXT): {$(VPATH)}internal/variable.h pack.$(OBJEXT): {$(VPATH)}internal/warning_push.h pack.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -pack.$(OBJEXT): {$(VPATH)}method.h pack.$(OBJEXT): {$(VPATH)}missing.h -pack.$(OBJEXT): {$(VPATH)}node.h pack.$(OBJEXT): {$(VPATH)}onigmo.h pack.$(OBJEXT): {$(VPATH)}oniguruma.h pack.$(OBJEXT): {$(VPATH)}pack.c pack.$(OBJEXT): {$(VPATH)}pack.rbinc -pack.$(OBJEXT): {$(VPATH)}ruby_assert.h -pack.$(OBJEXT): {$(VPATH)}ruby_atomic.h -pack.$(OBJEXT): {$(VPATH)}rubyparser.h pack.$(OBJEXT): {$(VPATH)}shape.h pack.$(OBJEXT): {$(VPATH)}st.h pack.$(OBJEXT): {$(VPATH)}subst.h -pack.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -pack.$(OBJEXT): {$(VPATH)}thread_native.h pack.$(OBJEXT): {$(VPATH)}util.h -pack.$(OBJEXT): {$(VPATH)}vm_core.h -pack.$(OBJEXT): {$(VPATH)}vm_opts.h -parse.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -parse.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -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 parse.$(OBJEXT): $(top_srcdir)/internal/bits.h parse.$(OBJEXT): $(top_srcdir)/internal/compile.h @@ -11343,7 +10949,6 @@ 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/serial.h parse.$(OBJEXT): $(top_srcdir)/internal/static_assert.h parse.$(OBJEXT): $(top_srcdir)/internal/string.h @@ -11353,7 +10958,6 @@ parse.$(OBJEXT): $(top_srcdir)/internal/variable.h parse.$(OBJEXT): $(top_srcdir)/internal/vm.h parse.$(OBJEXT): $(top_srcdir)/internal/warnings.h parse.$(OBJEXT): {$(VPATH)}assert.h -parse.$(OBJEXT): {$(VPATH)}atomic.h parse.$(OBJEXT): {$(VPATH)}backward/2/assume.h parse.$(OBJEXT): {$(VPATH)}backward/2/attributes.h parse.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -11410,7 +11014,6 @@ parse.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h parse.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h parse.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h parse.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -parse.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h parse.$(OBJEXT): {$(VPATH)}internal/attr/pure.h parse.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h parse.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -11479,6 +11082,7 @@ parse.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h parse.$(OBJEXT): {$(VPATH)}internal/intern/error.h parse.$(OBJEXT): {$(VPATH)}internal/intern/eval.h parse.$(OBJEXT): {$(VPATH)}internal/intern/file.h +parse.$(OBJEXT): {$(VPATH)}internal/intern/gc.h parse.$(OBJEXT): {$(VPATH)}internal/intern/hash.h parse.$(OBJEXT): {$(VPATH)}internal/intern/io.h parse.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -11509,6 +11113,7 @@ parse.$(OBJEXT): {$(VPATH)}internal/memory.h parse.$(OBJEXT): {$(VPATH)}internal/method.h parse.$(OBJEXT): {$(VPATH)}internal/module.h parse.$(OBJEXT): {$(VPATH)}internal/newobj.h +parse.$(OBJEXT): {$(VPATH)}internal/rgengc.h parse.$(OBJEXT): {$(VPATH)}internal/scan_args.h parse.$(OBJEXT): {$(VPATH)}internal/special_consts.h parse.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -11522,7 +11127,6 @@ parse.$(OBJEXT): {$(VPATH)}internal/warning_push.h parse.$(OBJEXT): {$(VPATH)}internal/xmalloc.h parse.$(OBJEXT): {$(VPATH)}io.h parse.$(OBJEXT): {$(VPATH)}lex.c -parse.$(OBJEXT): {$(VPATH)}method.h parse.$(OBJEXT): {$(VPATH)}missing.h parse.$(OBJEXT): {$(VPATH)}node.h parse.$(OBJEXT): {$(VPATH)}onigmo.h @@ -11530,1059 +11134,22 @@ parse.$(OBJEXT): {$(VPATH)}oniguruma.h parse.$(OBJEXT): {$(VPATH)}parse.c parse.$(OBJEXT): {$(VPATH)}parse.h parse.$(OBJEXT): {$(VPATH)}parse.y -parse.$(OBJEXT): {$(VPATH)}parser_node.h -parse.$(OBJEXT): {$(VPATH)}parser_st.h parse.$(OBJEXT): {$(VPATH)}probes.dmyh parse.$(OBJEXT): {$(VPATH)}probes.h parse.$(OBJEXT): {$(VPATH)}ractor.h parse.$(OBJEXT): {$(VPATH)}regenc.h parse.$(OBJEXT): {$(VPATH)}regex.h parse.$(OBJEXT): {$(VPATH)}ruby_assert.h -parse.$(OBJEXT): {$(VPATH)}ruby_atomic.h -parse.$(OBJEXT): {$(VPATH)}rubyparser.h parse.$(OBJEXT): {$(VPATH)}shape.h parse.$(OBJEXT): {$(VPATH)}st.h parse.$(OBJEXT): {$(VPATH)}subst.h parse.$(OBJEXT): {$(VPATH)}symbol.h -parse.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -parse.$(OBJEXT): {$(VPATH)}thread_native.h parse.$(OBJEXT): {$(VPATH)}util.h -parse.$(OBJEXT): {$(VPATH)}vm_core.h -parse.$(OBJEXT): {$(VPATH)}vm_opts.h -parser_st.$(OBJEXT): $(top_srcdir)/internal/compilers.h -parser_st.$(OBJEXT): $(top_srcdir)/internal/static_assert.h -parser_st.$(OBJEXT): $(top_srcdir)/internal/warnings.h -parser_st.$(OBJEXT): {$(VPATH)}assert.h -parser_st.$(OBJEXT): {$(VPATH)}backward/2/assume.h -parser_st.$(OBJEXT): {$(VPATH)}backward/2/attributes.h -parser_st.$(OBJEXT): {$(VPATH)}backward/2/bool.h -parser_st.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h -parser_st.$(OBJEXT): {$(VPATH)}backward/2/long_long.h -parser_st.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h -parser_st.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h -parser_st.$(OBJEXT): {$(VPATH)}config.h -parser_st.$(OBJEXT): {$(VPATH)}defines.h -parser_st.$(OBJEXT): {$(VPATH)}internal/assume.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/cold.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/const.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/error.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/format.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/pure.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h -parser_st.$(OBJEXT): {$(VPATH)}internal/attr/warning.h -parser_st.$(OBJEXT): {$(VPATH)}internal/cast.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_is.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h -parser_st.$(OBJEXT): {$(VPATH)}internal/compiler_since.h -parser_st.$(OBJEXT): {$(VPATH)}internal/config.h -parser_st.$(OBJEXT): {$(VPATH)}internal/dllexport.h -parser_st.$(OBJEXT): {$(VPATH)}internal/dosish.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/attribute.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/builtin.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/extension.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/feature.h -parser_st.$(OBJEXT): {$(VPATH)}internal/has/warning.h -parser_st.$(OBJEXT): {$(VPATH)}internal/static_assert.h -parser_st.$(OBJEXT): {$(VPATH)}internal/stdalign.h -parser_st.$(OBJEXT): {$(VPATH)}internal/stdbool.h -parser_st.$(OBJEXT): {$(VPATH)}internal/warning_push.h -parser_st.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -parser_st.$(OBJEXT): {$(VPATH)}missing.h -parser_st.$(OBJEXT): {$(VPATH)}parser_bits.h -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/diagnostic.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/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_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_state_stack.h -prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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/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/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/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/diagnostic.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/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_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_state_stack.h -prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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/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/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/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/diagnostic.c -prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/diagnostic.h -prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h -prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h -prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/diagnostic.$(OBJEXT): {$(VPATH)}config.h -prism/diagnostic.$(OBJEXT): {$(VPATH)}prism/ast.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/encoding.$(OBJEXT): {$(VPATH)}config.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/diagnostic.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/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_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_state_stack.h -prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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/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/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/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/diagnostic.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/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_list.h -prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h -prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_state_stack.h -prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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)}config.h -prism/node.$(OBJEXT): {$(VPATH)}prism/ast.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_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/pack.$(OBJEXT): {$(VPATH)}config.h -prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/defines.h -prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/encoding.h -prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/parser.h -prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h -prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h -prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.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_state_stack.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)}config.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/diagnostic.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/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_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_state_stack.h -prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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)}config.h -prism/prism.$(OBJEXT): {$(VPATH)}prism/ast.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/parser.h -prism/regexp.$(OBJEXT): $(top_srcdir)/prism/regexp.c -prism/regexp.$(OBJEXT): $(top_srcdir)/prism/regexp.h -prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.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_state_stack.h -prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.h -prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h -prism/regexp.$(OBJEXT): {$(VPATH)}config.h -prism/regexp.$(OBJEXT): {$(VPATH)}prism/ast.h -prism/serialize.$(OBJEXT): $(top_srcdir)/prism/defines.h -prism/serialize.$(OBJEXT): $(top_srcdir)/prism/diagnostic.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/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_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_state_stack.h -prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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)}config.h -prism/serialize.$(OBJEXT): {$(VPATH)}prism/ast.h -prism/serialize.$(OBJEXT): {$(VPATH)}prism/serialize.c -prism/serialize.$(OBJEXT): {$(VPATH)}prism/version.h -prism/token_type.$(OBJEXT): $(top_srcdir)/prism/defines.h -prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h -prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/token_type.$(OBJEXT): {$(VPATH)}config.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): {$(VPATH)}config.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_char.$(OBJEXT): {$(VPATH)}config.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_constant_pool.$(OBJEXT): {$(VPATH)}config.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_list.$(OBJEXT): {$(VPATH)}config.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_state_stack.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)}config.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_newline_list.$(OBJEXT): {$(VPATH)}config.h -prism/util/pm_state_stack.$(OBJEXT): $(top_srcdir)/prism/defines.h -prism/util/pm_state_stack.$(OBJEXT): $(top_srcdir)/prism/util/pm_state_stack.c -prism/util/pm_state_stack.$(OBJEXT): $(top_srcdir)/prism/util/pm_state_stack.h -prism/util/pm_state_stack.$(OBJEXT): {$(VPATH)}config.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_string.$(OBJEXT): {$(VPATH)}config.h -prism/util/pm_string_list.$(OBJEXT): $(top_srcdir)/prism/defines.h -prism/util/pm_string_list.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism/util/pm_string_list.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.c -prism/util/pm_string_list.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.h -prism/util/pm_string_list.$(OBJEXT): {$(VPATH)}config.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/parser.h -prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.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_state_stack.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)}config.h -prism/util/pm_strpbrk.$(OBJEXT): {$(VPATH)}prism/ast.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/diagnostic.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/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_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_state_stack.h -prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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/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/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/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 @@ -12590,6 +11157,7 @@ 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/object.h proc.$(OBJEXT): $(top_srcdir)/internal/proc.h @@ -12600,27 +11168,6 @@ 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/diagnostic.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/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_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_state_stack.h -proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -12634,10 +11181,10 @@ 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 +proc.$(OBJEXT): {$(VPATH)}gc.h proc.$(OBJEXT): {$(VPATH)}id.h proc.$(OBJEXT): {$(VPATH)}id_table.h proc.$(OBJEXT): {$(VPATH)}intern.h @@ -12680,7 +11227,6 @@ proc.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h proc.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h proc.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h proc.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -proc.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h proc.$(OBJEXT): {$(VPATH)}internal/attr/pure.h proc.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h proc.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -12749,6 +11295,7 @@ proc.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h proc.$(OBJEXT): {$(VPATH)}internal/intern/error.h proc.$(OBJEXT): {$(VPATH)}internal/intern/eval.h proc.$(OBJEXT): {$(VPATH)}internal/intern/file.h +proc.$(OBJEXT): {$(VPATH)}internal/intern/gc.h proc.$(OBJEXT): {$(VPATH)}internal/intern/hash.h proc.$(OBJEXT): {$(VPATH)}internal/intern/io.h proc.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -12779,6 +11326,7 @@ proc.$(OBJEXT): {$(VPATH)}internal/memory.h proc.$(OBJEXT): {$(VPATH)}internal/method.h proc.$(OBJEXT): {$(VPATH)}internal/module.h proc.$(OBJEXT): {$(VPATH)}internal/newobj.h +proc.$(OBJEXT): {$(VPATH)}internal/rgengc.h proc.$(OBJEXT): {$(VPATH)}internal/scan_args.h proc.$(OBJEXT): {$(VPATH)}internal/special_consts.h proc.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -12796,22 +11344,16 @@ 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/version.h -proc.$(OBJEXT): {$(VPATH)}prism_compile.h proc.$(OBJEXT): {$(VPATH)}proc.c proc.$(OBJEXT): {$(VPATH)}ruby_assert.h proc.$(OBJEXT): {$(VPATH)}ruby_atomic.h -proc.$(OBJEXT): {$(VPATH)}rubyparser.h proc.$(OBJEXT): {$(VPATH)}shape.h proc.$(OBJEXT): {$(VPATH)}st.h 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 @@ -12819,7 +11361,6 @@ 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 @@ -12833,7 +11374,6 @@ process.$(OBJEXT): $(top_srcdir)/internal/fixnum.h process.$(OBJEXT): $(top_srcdir)/internal/gc.h process.$(OBJEXT): $(top_srcdir)/internal/hash.h process.$(OBJEXT): $(top_srcdir)/internal/imemo.h -process.$(OBJEXT): $(top_srcdir)/internal/io.h process.$(OBJEXT): $(top_srcdir)/internal/numeric.h process.$(OBJEXT): $(top_srcdir)/internal/object.h process.$(OBJEXT): $(top_srcdir)/internal/process.h @@ -12906,7 +11446,6 @@ process.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h process.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h process.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h process.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -process.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h process.$(OBJEXT): {$(VPATH)}internal/attr/pure.h process.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h process.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -12975,6 +11514,7 @@ process.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h process.$(OBJEXT): {$(VPATH)}internal/intern/error.h process.$(OBJEXT): {$(VPATH)}internal/intern/eval.h process.$(OBJEXT): {$(VPATH)}internal/intern/file.h +process.$(OBJEXT): {$(VPATH)}internal/intern/gc.h process.$(OBJEXT): {$(VPATH)}internal/intern/hash.h process.$(OBJEXT): {$(VPATH)}internal/intern/io.h process.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -13005,6 +11545,7 @@ process.$(OBJEXT): {$(VPATH)}internal/memory.h process.$(OBJEXT): {$(VPATH)}internal/method.h process.$(OBJEXT): {$(VPATH)}internal/module.h process.$(OBJEXT): {$(VPATH)}internal/newobj.h +process.$(OBJEXT): {$(VPATH)}internal/rgengc.h process.$(OBJEXT): {$(VPATH)}internal/scan_args.h process.$(OBJEXT): {$(VPATH)}internal/special_consts.h process.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -13019,15 +11560,14 @@ process.$(OBJEXT): {$(VPATH)}internal/xmalloc.h process.$(OBJEXT): {$(VPATH)}io.h process.$(OBJEXT): {$(VPATH)}method.h process.$(OBJEXT): {$(VPATH)}missing.h +process.$(OBJEXT): {$(VPATH)}mjit.h process.$(OBJEXT): {$(VPATH)}node.h 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)}ruby_assert.h process.$(OBJEXT): {$(VPATH)}ruby_atomic.h -process.$(OBJEXT): {$(VPATH)}rubyparser.h process.$(OBJEXT): {$(VPATH)}shape.h process.$(OBJEXT): {$(VPATH)}st.h process.$(OBJEXT): {$(VPATH)}subst.h @@ -13036,16 +11576,13 @@ process.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h process.$(OBJEXT): {$(VPATH)}thread_native.h process.$(OBJEXT): {$(VPATH)}util.h process.$(OBJEXT): {$(VPATH)}vm_core.h -process.$(OBJEXT): {$(VPATH)}vm_debug.h process.$(OBJEXT): {$(VPATH)}vm_opts.h -process.$(OBJEXT): {$(VPATH)}vm_sync.h ractor.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h ractor.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h 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 @@ -13084,7 +11621,7 @@ ractor.$(OBJEXT): {$(VPATH)}constant.h ractor.$(OBJEXT): {$(VPATH)}debug_counter.h ractor.$(OBJEXT): {$(VPATH)}defines.h ractor.$(OBJEXT): {$(VPATH)}encoding.h -ractor.$(OBJEXT): {$(VPATH)}eval_intern.h +ractor.$(OBJEXT): {$(VPATH)}gc.h ractor.$(OBJEXT): {$(VPATH)}id.h ractor.$(OBJEXT): {$(VPATH)}id_table.h ractor.$(OBJEXT): {$(VPATH)}intern.h @@ -13127,7 +11664,6 @@ ractor.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h ractor.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h ractor.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h ractor.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -ractor.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h ractor.$(OBJEXT): {$(VPATH)}internal/attr/pure.h ractor.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h ractor.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -13196,6 +11732,7 @@ ractor.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h ractor.$(OBJEXT): {$(VPATH)}internal/intern/error.h ractor.$(OBJEXT): {$(VPATH)}internal/intern/eval.h ractor.$(OBJEXT): {$(VPATH)}internal/intern/file.h +ractor.$(OBJEXT): {$(VPATH)}internal/intern/gc.h ractor.$(OBJEXT): {$(VPATH)}internal/intern/hash.h ractor.$(OBJEXT): {$(VPATH)}internal/intern/io.h ractor.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -13226,6 +11763,7 @@ ractor.$(OBJEXT): {$(VPATH)}internal/memory.h ractor.$(OBJEXT): {$(VPATH)}internal/method.h ractor.$(OBJEXT): {$(VPATH)}internal/module.h ractor.$(OBJEXT): {$(VPATH)}internal/newobj.h +ractor.$(OBJEXT): {$(VPATH)}internal/rgengc.h ractor.$(OBJEXT): {$(VPATH)}internal/scan_args.h ractor.$(OBJEXT): {$(VPATH)}internal/special_consts.h ractor.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -13239,6 +11777,7 @@ ractor.$(OBJEXT): {$(VPATH)}internal/warning_push.h ractor.$(OBJEXT): {$(VPATH)}internal/xmalloc.h ractor.$(OBJEXT): {$(VPATH)}method.h ractor.$(OBJEXT): {$(VPATH)}missing.h +ractor.$(OBJEXT): {$(VPATH)}mjit.h ractor.$(OBJEXT): {$(VPATH)}node.h ractor.$(OBJEXT): {$(VPATH)}onigmo.h ractor.$(OBJEXT): {$(VPATH)}oniguruma.h @@ -13246,35 +11785,28 @@ 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)}ruby_assert.h ractor.$(OBJEXT): {$(VPATH)}ruby_atomic.h -ractor.$(OBJEXT): {$(VPATH)}rubyparser.h ractor.$(OBJEXT): {$(VPATH)}shape.h ractor.$(OBJEXT): {$(VPATH)}st.h ractor.$(OBJEXT): {$(VPATH)}subst.h ractor.$(OBJEXT): {$(VPATH)}thread.h ractor.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h ractor.$(OBJEXT): {$(VPATH)}thread_native.h +ractor.$(OBJEXT): {$(VPATH)}transient_heap.h ractor.$(OBJEXT): {$(VPATH)}variable.h ractor.$(OBJEXT): {$(VPATH)}vm_core.h ractor.$(OBJEXT): {$(VPATH)}vm_debug.h ractor.$(OBJEXT): {$(VPATH)}vm_opts.h ractor.$(OBJEXT): {$(VPATH)}vm_sync.h ractor.$(OBJEXT): {$(VPATH)}yjit.h -random.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -random.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -random.$(OBJEXT): $(CCAN_DIR)/list/list.h -random.$(OBJEXT): $(CCAN_DIR)/str/str.h random.$(OBJEXT): $(hdrdir)/ruby/ruby.h random.$(OBJEXT): $(top_srcdir)/internal/array.h -random.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h random.$(OBJEXT): $(top_srcdir)/internal/bignum.h random.$(OBJEXT): $(top_srcdir)/internal/bits.h random.$(OBJEXT): $(top_srcdir)/internal/compilers.h random.$(OBJEXT): $(top_srcdir)/internal/fixnum.h random.$(OBJEXT): $(top_srcdir)/internal/gc.h -random.$(OBJEXT): $(top_srcdir)/internal/imemo.h random.$(OBJEXT): $(top_srcdir)/internal/numeric.h random.$(OBJEXT): $(top_srcdir)/internal/random.h random.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h @@ -13297,8 +11829,6 @@ random.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h random.$(OBJEXT): {$(VPATH)}config.h random.$(OBJEXT): {$(VPATH)}constant.h random.$(OBJEXT): {$(VPATH)}defines.h -random.$(OBJEXT): {$(VPATH)}encoding.h -random.$(OBJEXT): {$(VPATH)}id.h random.$(OBJEXT): {$(VPATH)}id_table.h random.$(OBJEXT): {$(VPATH)}intern.h random.$(OBJEXT): {$(VPATH)}internal.h @@ -13340,7 +11870,6 @@ random.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h random.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h random.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h random.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -random.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h random.$(OBJEXT): {$(VPATH)}internal/attr/pure.h random.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h random.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -13373,15 +11902,6 @@ random.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h random.$(OBJEXT): {$(VPATH)}internal/ctype.h random.$(OBJEXT): {$(VPATH)}internal/dllexport.h random.$(OBJEXT): {$(VPATH)}internal/dosish.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -random.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h random.$(OBJEXT): {$(VPATH)}internal/error.h random.$(OBJEXT): {$(VPATH)}internal/eval.h random.$(OBJEXT): {$(VPATH)}internal/event.h @@ -13409,6 +11929,7 @@ random.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h random.$(OBJEXT): {$(VPATH)}internal/intern/error.h random.$(OBJEXT): {$(VPATH)}internal/intern/eval.h random.$(OBJEXT): {$(VPATH)}internal/intern/file.h +random.$(OBJEXT): {$(VPATH)}internal/intern/gc.h random.$(OBJEXT): {$(VPATH)}internal/intern/hash.h random.$(OBJEXT): {$(VPATH)}internal/intern/io.h random.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -13439,6 +11960,7 @@ random.$(OBJEXT): {$(VPATH)}internal/memory.h random.$(OBJEXT): {$(VPATH)}internal/method.h random.$(OBJEXT): {$(VPATH)}internal/module.h random.$(OBJEXT): {$(VPATH)}internal/newobj.h +random.$(OBJEXT): {$(VPATH)}internal/rgengc.h random.$(OBJEXT): {$(VPATH)}internal/scan_args.h random.$(OBJEXT): {$(VPATH)}internal/special_consts.h random.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -13450,29 +11972,18 @@ random.$(OBJEXT): {$(VPATH)}internal/value_type.h random.$(OBJEXT): {$(VPATH)}internal/variable.h random.$(OBJEXT): {$(VPATH)}internal/warning_push.h random.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -random.$(OBJEXT): {$(VPATH)}method.h random.$(OBJEXT): {$(VPATH)}missing.h random.$(OBJEXT): {$(VPATH)}mt19937.c -random.$(OBJEXT): {$(VPATH)}node.h -random.$(OBJEXT): {$(VPATH)}onigmo.h -random.$(OBJEXT): {$(VPATH)}oniguruma.h random.$(OBJEXT): {$(VPATH)}ractor.h random.$(OBJEXT): {$(VPATH)}random.c random.$(OBJEXT): {$(VPATH)}random.h -random.$(OBJEXT): {$(VPATH)}ruby_assert.h random.$(OBJEXT): {$(VPATH)}ruby_atomic.h -random.$(OBJEXT): {$(VPATH)}rubyparser.h random.$(OBJEXT): {$(VPATH)}shape.h random.$(OBJEXT): {$(VPATH)}siphash.c random.$(OBJEXT): {$(VPATH)}siphash.h random.$(OBJEXT): {$(VPATH)}st.h random.$(OBJEXT): {$(VPATH)}subst.h -random.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -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 @@ -13546,7 +12057,6 @@ range.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h range.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h range.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h range.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -range.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h range.$(OBJEXT): {$(VPATH)}internal/attr/pure.h range.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h range.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -13615,6 +12125,7 @@ range.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h range.$(OBJEXT): {$(VPATH)}internal/intern/error.h range.$(OBJEXT): {$(VPATH)}internal/intern/eval.h range.$(OBJEXT): {$(VPATH)}internal/intern/file.h +range.$(OBJEXT): {$(VPATH)}internal/intern/gc.h range.$(OBJEXT): {$(VPATH)}internal/intern/hash.h range.$(OBJEXT): {$(VPATH)}internal/intern/io.h range.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -13645,6 +12156,7 @@ range.$(OBJEXT): {$(VPATH)}internal/memory.h range.$(OBJEXT): {$(VPATH)}internal/method.h range.$(OBJEXT): {$(VPATH)}internal/module.h range.$(OBJEXT): {$(VPATH)}internal/newobj.h +range.$(OBJEXT): {$(VPATH)}internal/rgengc.h range.$(OBJEXT): {$(VPATH)}internal/scan_args.h range.$(OBJEXT): {$(VPATH)}internal/special_consts.h range.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -13663,13 +12175,8 @@ range.$(OBJEXT): {$(VPATH)}range.c range.$(OBJEXT): {$(VPATH)}shape.h range.$(OBJEXT): {$(VPATH)}st.h range.$(OBJEXT): {$(VPATH)}subst.h -rational.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -rational.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -rational.$(OBJEXT): $(CCAN_DIR)/list/list.h -rational.$(OBJEXT): $(CCAN_DIR)/str/str.h rational.$(OBJEXT): $(hdrdir)/ruby/ruby.h rational.$(OBJEXT): $(top_srcdir)/internal/array.h -rational.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h rational.$(OBJEXT): $(top_srcdir)/internal/bignum.h rational.$(OBJEXT): $(top_srcdir)/internal/bits.h rational.$(OBJEXT): $(top_srcdir)/internal/class.h @@ -13677,7 +12184,6 @@ rational.$(OBJEXT): $(top_srcdir)/internal/compilers.h 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/numeric.h rational.$(OBJEXT): $(top_srcdir)/internal/object.h rational.$(OBJEXT): $(top_srcdir)/internal/rational.h @@ -13687,7 +12193,6 @@ rational.$(OBJEXT): $(top_srcdir)/internal/variable.h rational.$(OBJEXT): $(top_srcdir)/internal/vm.h rational.$(OBJEXT): $(top_srcdir)/internal/warnings.h rational.$(OBJEXT): {$(VPATH)}assert.h -rational.$(OBJEXT): {$(VPATH)}atomic.h rational.$(OBJEXT): {$(VPATH)}backward/2/assume.h rational.$(OBJEXT): {$(VPATH)}backward/2/attributes.h rational.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -13700,7 +12205,6 @@ rational.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h rational.$(OBJEXT): {$(VPATH)}config.h rational.$(OBJEXT): {$(VPATH)}constant.h rational.$(OBJEXT): {$(VPATH)}defines.h -rational.$(OBJEXT): {$(VPATH)}encoding.h rational.$(OBJEXT): {$(VPATH)}id.h rational.$(OBJEXT): {$(VPATH)}id_table.h rational.$(OBJEXT): {$(VPATH)}intern.h @@ -13743,7 +12247,6 @@ rational.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h rational.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h rational.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h rational.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -rational.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h rational.$(OBJEXT): {$(VPATH)}internal/attr/pure.h rational.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h rational.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -13776,15 +12279,6 @@ rational.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h rational.$(OBJEXT): {$(VPATH)}internal/ctype.h rational.$(OBJEXT): {$(VPATH)}internal/dllexport.h rational.$(OBJEXT): {$(VPATH)}internal/dosish.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -rational.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h rational.$(OBJEXT): {$(VPATH)}internal/error.h rational.$(OBJEXT): {$(VPATH)}internal/eval.h rational.$(OBJEXT): {$(VPATH)}internal/event.h @@ -13812,6 +12306,7 @@ rational.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h rational.$(OBJEXT): {$(VPATH)}internal/intern/error.h rational.$(OBJEXT): {$(VPATH)}internal/intern/eval.h rational.$(OBJEXT): {$(VPATH)}internal/intern/file.h +rational.$(OBJEXT): {$(VPATH)}internal/intern/gc.h rational.$(OBJEXT): {$(VPATH)}internal/intern/hash.h rational.$(OBJEXT): {$(VPATH)}internal/intern/io.h rational.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -13842,6 +12337,7 @@ rational.$(OBJEXT): {$(VPATH)}internal/memory.h rational.$(OBJEXT): {$(VPATH)}internal/method.h rational.$(OBJEXT): {$(VPATH)}internal/module.h rational.$(OBJEXT): {$(VPATH)}internal/newobj.h +rational.$(OBJEXT): {$(VPATH)}internal/rgengc.h rational.$(OBJEXT): {$(VPATH)}internal/scan_args.h rational.$(OBJEXT): {$(VPATH)}internal/special_consts.h rational.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -13853,30 +12349,15 @@ rational.$(OBJEXT): {$(VPATH)}internal/value_type.h rational.$(OBJEXT): {$(VPATH)}internal/variable.h rational.$(OBJEXT): {$(VPATH)}internal/warning_push.h rational.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -rational.$(OBJEXT): {$(VPATH)}method.h rational.$(OBJEXT): {$(VPATH)}missing.h -rational.$(OBJEXT): {$(VPATH)}node.h -rational.$(OBJEXT): {$(VPATH)}onigmo.h -rational.$(OBJEXT): {$(VPATH)}oniguruma.h rational.$(OBJEXT): {$(VPATH)}rational.c rational.$(OBJEXT): {$(VPATH)}ruby_assert.h -rational.$(OBJEXT): {$(VPATH)}ruby_atomic.h -rational.$(OBJEXT): {$(VPATH)}rubyparser.h rational.$(OBJEXT): {$(VPATH)}shape.h rational.$(OBJEXT): {$(VPATH)}st.h rational.$(OBJEXT): {$(VPATH)}subst.h -rational.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -rational.$(OBJEXT): {$(VPATH)}thread_native.h -rational.$(OBJEXT): {$(VPATH)}vm_core.h -rational.$(OBJEXT): {$(VPATH)}vm_opts.h -re.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -re.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -re.$(OBJEXT): $(CCAN_DIR)/list/list.h -re.$(OBJEXT): $(CCAN_DIR)/str/str.h re.$(OBJEXT): $(hdrdir)/ruby.h re.$(OBJEXT): $(hdrdir)/ruby/ruby.h re.$(OBJEXT): $(top_srcdir)/internal/array.h -re.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h re.$(OBJEXT): $(top_srcdir)/internal/bits.h re.$(OBJEXT): $(top_srcdir)/internal/class.h re.$(OBJEXT): $(top_srcdir)/internal/compilers.h @@ -13892,10 +12373,8 @@ re.$(OBJEXT): $(top_srcdir)/internal/static_assert.h re.$(OBJEXT): $(top_srcdir)/internal/string.h re.$(OBJEXT): $(top_srcdir)/internal/time.h re.$(OBJEXT): $(top_srcdir)/internal/variable.h -re.$(OBJEXT): $(top_srcdir)/internal/vm.h re.$(OBJEXT): $(top_srcdir)/internal/warnings.h re.$(OBJEXT): {$(VPATH)}assert.h -re.$(OBJEXT): {$(VPATH)}atomic.h re.$(OBJEXT): {$(VPATH)}backward/2/assume.h re.$(OBJEXT): {$(VPATH)}backward/2/attributes.h re.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -13911,7 +12390,6 @@ re.$(OBJEXT): {$(VPATH)}defines.h re.$(OBJEXT): {$(VPATH)}encindex.h re.$(OBJEXT): {$(VPATH)}encoding.h re.$(OBJEXT): {$(VPATH)}hrtime.h -re.$(OBJEXT): {$(VPATH)}id.h re.$(OBJEXT): {$(VPATH)}id_table.h re.$(OBJEXT): {$(VPATH)}intern.h re.$(OBJEXT): {$(VPATH)}internal.h @@ -13953,7 +12431,6 @@ re.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h re.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h re.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h re.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -re.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h re.$(OBJEXT): {$(VPATH)}internal/attr/pure.h re.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h re.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -14023,6 +12500,7 @@ re.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h re.$(OBJEXT): {$(VPATH)}internal/intern/error.h re.$(OBJEXT): {$(VPATH)}internal/intern/eval.h re.$(OBJEXT): {$(VPATH)}internal/intern/file.h +re.$(OBJEXT): {$(VPATH)}internal/intern/gc.h re.$(OBJEXT): {$(VPATH)}internal/intern/hash.h re.$(OBJEXT): {$(VPATH)}internal/intern/io.h re.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -14053,6 +12531,7 @@ re.$(OBJEXT): {$(VPATH)}internal/memory.h re.$(OBJEXT): {$(VPATH)}internal/method.h re.$(OBJEXT): {$(VPATH)}internal/module.h re.$(OBJEXT): {$(VPATH)}internal/newobj.h +re.$(OBJEXT): {$(VPATH)}internal/rgengc.h re.$(OBJEXT): {$(VPATH)}internal/scan_args.h re.$(OBJEXT): {$(VPATH)}internal/special_consts.h re.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -14064,9 +12543,7 @@ re.$(OBJEXT): {$(VPATH)}internal/value_type.h re.$(OBJEXT): {$(VPATH)}internal/variable.h re.$(OBJEXT): {$(VPATH)}internal/warning_push.h re.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -re.$(OBJEXT): {$(VPATH)}method.h re.$(OBJEXT): {$(VPATH)}missing.h -re.$(OBJEXT): {$(VPATH)}node.h re.$(OBJEXT): {$(VPATH)}onigmo.h re.$(OBJEXT): {$(VPATH)}oniguruma.h re.$(OBJEXT): {$(VPATH)}re.c @@ -14074,17 +12551,10 @@ re.$(OBJEXT): {$(VPATH)}re.h re.$(OBJEXT): {$(VPATH)}regenc.h re.$(OBJEXT): {$(VPATH)}regex.h re.$(OBJEXT): {$(VPATH)}regint.h -re.$(OBJEXT): {$(VPATH)}ruby_assert.h -re.$(OBJEXT): {$(VPATH)}ruby_atomic.h -re.$(OBJEXT): {$(VPATH)}rubyparser.h re.$(OBJEXT): {$(VPATH)}shape.h re.$(OBJEXT): {$(VPATH)}st.h re.$(OBJEXT): {$(VPATH)}subst.h -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_opts.h regcomp.$(OBJEXT): $(hdrdir)/ruby.h regcomp.$(OBJEXT): $(hdrdir)/ruby/ruby.h regcomp.$(OBJEXT): {$(VPATH)}assert.h @@ -14137,7 +12607,6 @@ regcomp.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h regcomp.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h regcomp.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h regcomp.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -regcomp.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h regcomp.$(OBJEXT): {$(VPATH)}internal/attr/pure.h regcomp.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h regcomp.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -14197,6 +12666,7 @@ regcomp.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h regcomp.$(OBJEXT): {$(VPATH)}internal/intern/error.h regcomp.$(OBJEXT): {$(VPATH)}internal/intern/eval.h regcomp.$(OBJEXT): {$(VPATH)}internal/intern/file.h +regcomp.$(OBJEXT): {$(VPATH)}internal/intern/gc.h regcomp.$(OBJEXT): {$(VPATH)}internal/intern/hash.h regcomp.$(OBJEXT): {$(VPATH)}internal/intern/io.h regcomp.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -14227,6 +12697,7 @@ regcomp.$(OBJEXT): {$(VPATH)}internal/memory.h regcomp.$(OBJEXT): {$(VPATH)}internal/method.h regcomp.$(OBJEXT): {$(VPATH)}internal/module.h regcomp.$(OBJEXT): {$(VPATH)}internal/newobj.h +regcomp.$(OBJEXT): {$(VPATH)}internal/rgengc.h regcomp.$(OBJEXT): {$(VPATH)}internal/scan_args.h regcomp.$(OBJEXT): {$(VPATH)}internal/special_consts.h regcomp.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -14298,7 +12769,6 @@ regenc.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h regenc.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h regenc.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h regenc.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -regenc.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h regenc.$(OBJEXT): {$(VPATH)}internal/attr/pure.h regenc.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h regenc.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -14358,6 +12828,7 @@ regenc.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h regenc.$(OBJEXT): {$(VPATH)}internal/intern/error.h regenc.$(OBJEXT): {$(VPATH)}internal/intern/eval.h regenc.$(OBJEXT): {$(VPATH)}internal/intern/file.h +regenc.$(OBJEXT): {$(VPATH)}internal/intern/gc.h regenc.$(OBJEXT): {$(VPATH)}internal/intern/hash.h regenc.$(OBJEXT): {$(VPATH)}internal/intern/io.h regenc.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -14388,6 +12859,7 @@ regenc.$(OBJEXT): {$(VPATH)}internal/memory.h regenc.$(OBJEXT): {$(VPATH)}internal/method.h regenc.$(OBJEXT): {$(VPATH)}internal/module.h regenc.$(OBJEXT): {$(VPATH)}internal/newobj.h +regenc.$(OBJEXT): {$(VPATH)}internal/rgengc.h regenc.$(OBJEXT): {$(VPATH)}internal/scan_args.h regenc.$(OBJEXT): {$(VPATH)}internal/special_consts.h regenc.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -14458,7 +12930,6 @@ regerror.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h regerror.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h regerror.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h regerror.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -regerror.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h regerror.$(OBJEXT): {$(VPATH)}internal/attr/pure.h regerror.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h regerror.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -14518,6 +12989,7 @@ regerror.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h regerror.$(OBJEXT): {$(VPATH)}internal/intern/error.h regerror.$(OBJEXT): {$(VPATH)}internal/intern/eval.h regerror.$(OBJEXT): {$(VPATH)}internal/intern/file.h +regerror.$(OBJEXT): {$(VPATH)}internal/intern/gc.h regerror.$(OBJEXT): {$(VPATH)}internal/intern/hash.h regerror.$(OBJEXT): {$(VPATH)}internal/intern/io.h regerror.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -14548,6 +13020,7 @@ regerror.$(OBJEXT): {$(VPATH)}internal/memory.h regerror.$(OBJEXT): {$(VPATH)}internal/method.h regerror.$(OBJEXT): {$(VPATH)}internal/module.h regerror.$(OBJEXT): {$(VPATH)}internal/newobj.h +regerror.$(OBJEXT): {$(VPATH)}internal/rgengc.h regerror.$(OBJEXT): {$(VPATH)}internal/scan_args.h regerror.$(OBJEXT): {$(VPATH)}internal/special_consts.h regerror.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -14618,7 +13091,6 @@ regexec.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h regexec.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h regexec.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h regexec.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -regexec.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h regexec.$(OBJEXT): {$(VPATH)}internal/attr/pure.h regexec.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h regexec.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -14678,6 +13150,7 @@ regexec.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h regexec.$(OBJEXT): {$(VPATH)}internal/intern/error.h regexec.$(OBJEXT): {$(VPATH)}internal/intern/eval.h regexec.$(OBJEXT): {$(VPATH)}internal/intern/file.h +regexec.$(OBJEXT): {$(VPATH)}internal/intern/gc.h regexec.$(OBJEXT): {$(VPATH)}internal/intern/hash.h regexec.$(OBJEXT): {$(VPATH)}internal/intern/io.h regexec.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -14708,6 +13181,7 @@ regexec.$(OBJEXT): {$(VPATH)}internal/memory.h regexec.$(OBJEXT): {$(VPATH)}internal/method.h regexec.$(OBJEXT): {$(VPATH)}internal/module.h regexec.$(OBJEXT): {$(VPATH)}internal/newobj.h +regexec.$(OBJEXT): {$(VPATH)}internal/rgengc.h regexec.$(OBJEXT): {$(VPATH)}internal/scan_args.h regexec.$(OBJEXT): {$(VPATH)}internal/special_consts.h regexec.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -14782,7 +13256,6 @@ regparse.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h regparse.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h regparse.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h regparse.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -regparse.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h regparse.$(OBJEXT): {$(VPATH)}internal/attr/pure.h regparse.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h regparse.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -14842,6 +13315,7 @@ regparse.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h regparse.$(OBJEXT): {$(VPATH)}internal/intern/error.h regparse.$(OBJEXT): {$(VPATH)}internal/intern/eval.h regparse.$(OBJEXT): {$(VPATH)}internal/intern/file.h +regparse.$(OBJEXT): {$(VPATH)}internal/intern/gc.h regparse.$(OBJEXT): {$(VPATH)}internal/intern/hash.h regparse.$(OBJEXT): {$(VPATH)}internal/intern/io.h regparse.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -14872,6 +13346,7 @@ regparse.$(OBJEXT): {$(VPATH)}internal/memory.h regparse.$(OBJEXT): {$(VPATH)}internal/method.h regparse.$(OBJEXT): {$(VPATH)}internal/module.h regparse.$(OBJEXT): {$(VPATH)}internal/newobj.h +regparse.$(OBJEXT): {$(VPATH)}internal/rgengc.h regparse.$(OBJEXT): {$(VPATH)}internal/scan_args.h regparse.$(OBJEXT): {$(VPATH)}internal/special_consts.h regparse.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -14943,7 +13418,6 @@ regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/pure.h regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -15003,6 +13477,7 @@ regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/error.h regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/eval.h regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/file.h +regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/gc.h regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/hash.h regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/io.h regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -15033,6 +13508,7 @@ regsyntax.$(OBJEXT): {$(VPATH)}internal/memory.h regsyntax.$(OBJEXT): {$(VPATH)}internal/method.h regsyntax.$(OBJEXT): {$(VPATH)}internal/module.h regsyntax.$(OBJEXT): {$(VPATH)}internal/newobj.h +regsyntax.$(OBJEXT): {$(VPATH)}internal/rgengc.h regsyntax.$(OBJEXT): {$(VPATH)}internal/scan_args.h regsyntax.$(OBJEXT): {$(VPATH)}internal/special_consts.h regsyntax.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -15051,511 +13527,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): $(top_srcdir)/prism/defines.h -rjit.$(OBJEXT): $(top_srcdir)/prism/diagnostic.h -rjit.$(OBJEXT): $(top_srcdir)/prism/encoding.h -rjit.$(OBJEXT): $(top_srcdir)/prism/node.h -rjit.$(OBJEXT): $(top_srcdir)/prism/options.h -rjit.$(OBJEXT): $(top_srcdir)/prism/pack.h -rjit.$(OBJEXT): $(top_srcdir)/prism/parser.h -rjit.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h -rjit.$(OBJEXT): $(top_srcdir)/prism/prism.h -rjit.$(OBJEXT): $(top_srcdir)/prism/regexp.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_state_stack.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h -rjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.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)}prism/ast.h -rjit.$(OBJEXT): {$(VPATH)}prism/version.h -rjit.$(OBJEXT): {$(VPATH)}prism_compile.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): $(top_srcdir)/prism/defines.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/diagnostic.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/encoding.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/node.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/options.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/pack.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/parser.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/prism.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/regexp.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_state_stack.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h -rjit_c.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.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)}prism/ast.h -rjit_c.$(OBJEXT): {$(VPATH)}prism/version.h -rjit_c.$(OBJEXT): {$(VPATH)}prism_compile.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_debug.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)}vm_sync.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 @@ -15592,35 +13563,13 @@ ruby.$(OBJEXT): $(top_srcdir)/internal/loadpath.h ruby.$(OBJEXT): $(top_srcdir)/internal/missing.h ruby.$(OBJEXT): $(top_srcdir)/internal/object.h ruby.$(OBJEXT): $(top_srcdir)/internal/parse.h -ruby.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h +ruby.$(OBJEXT): $(top_srcdir)/internal/process.h ruby.$(OBJEXT): $(top_srcdir)/internal/serial.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/diagnostic.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/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_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_state_stack.h -ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -15681,7 +13630,6 @@ ruby.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h ruby.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h ruby.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h ruby.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -ruby.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h ruby.$(OBJEXT): {$(VPATH)}internal/attr/pure.h ruby.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h ruby.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -15750,6 +13698,7 @@ ruby.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h ruby.$(OBJEXT): {$(VPATH)}internal/intern/error.h ruby.$(OBJEXT): {$(VPATH)}internal/intern/eval.h ruby.$(OBJEXT): {$(VPATH)}internal/intern/file.h +ruby.$(OBJEXT): {$(VPATH)}internal/intern/gc.h ruby.$(OBJEXT): {$(VPATH)}internal/intern/hash.h ruby.$(OBJEXT): {$(VPATH)}internal/intern/io.h ruby.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -15780,6 +13729,7 @@ ruby.$(OBJEXT): {$(VPATH)}internal/memory.h ruby.$(OBJEXT): {$(VPATH)}internal/method.h ruby.$(OBJEXT): {$(VPATH)}internal/module.h ruby.$(OBJEXT): {$(VPATH)}internal/newobj.h +ruby.$(OBJEXT): {$(VPATH)}internal/rgengc.h ruby.$(OBJEXT): {$(VPATH)}internal/scan_args.h ruby.$(OBJEXT): {$(VPATH)}internal/special_consts.h ruby.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -15795,17 +13745,13 @@ ruby.$(OBJEXT): {$(VPATH)}io.h ruby.$(OBJEXT): {$(VPATH)}iseq.h ruby.$(OBJEXT): {$(VPATH)}method.h ruby.$(OBJEXT): {$(VPATH)}missing.h +ruby.$(OBJEXT): {$(VPATH)}mjit.h ruby.$(OBJEXT): {$(VPATH)}node.h ruby.$(OBJEXT): {$(VPATH)}onigmo.h ruby.$(OBJEXT): {$(VPATH)}oniguruma.h -ruby.$(OBJEXT): {$(VPATH)}prism/ast.h -ruby.$(OBJEXT): {$(VPATH)}prism/version.h -ruby.$(OBJEXT): {$(VPATH)}prism_compile.h -ruby.$(OBJEXT): {$(VPATH)}rjit.h ruby.$(OBJEXT): {$(VPATH)}ruby.c ruby.$(OBJEXT): {$(VPATH)}ruby_assert.h ruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h -ruby.$(OBJEXT): {$(VPATH)}rubyparser.h ruby.$(OBJEXT): {$(VPATH)}shape.h ruby.$(OBJEXT): {$(VPATH)}st.h ruby.$(OBJEXT): {$(VPATH)}subst.h @@ -15816,7 +13762,6 @@ 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): {$(VPATH)}ruby_parser.c 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 @@ -15891,7 +13836,6 @@ scheduler.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h scheduler.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h scheduler.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h scheduler.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -scheduler.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h scheduler.$(OBJEXT): {$(VPATH)}internal/attr/pure.h scheduler.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h scheduler.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -15960,6 +13904,7 @@ scheduler.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h scheduler.$(OBJEXT): {$(VPATH)}internal/intern/error.h scheduler.$(OBJEXT): {$(VPATH)}internal/intern/eval.h scheduler.$(OBJEXT): {$(VPATH)}internal/intern/file.h +scheduler.$(OBJEXT): {$(VPATH)}internal/intern/gc.h scheduler.$(OBJEXT): {$(VPATH)}internal/intern/hash.h scheduler.$(OBJEXT): {$(VPATH)}internal/intern/io.h scheduler.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -15990,6 +13935,7 @@ scheduler.$(OBJEXT): {$(VPATH)}internal/memory.h scheduler.$(OBJEXT): {$(VPATH)}internal/method.h scheduler.$(OBJEXT): {$(VPATH)}internal/module.h scheduler.$(OBJEXT): {$(VPATH)}internal/newobj.h +scheduler.$(OBJEXT): {$(VPATH)}internal/rgengc.h scheduler.$(OBJEXT): {$(VPATH)}internal/scan_args.h scheduler.$(OBJEXT): {$(VPATH)}internal/special_consts.h scheduler.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -16010,7 +13956,6 @@ scheduler.$(OBJEXT): {$(VPATH)}onigmo.h scheduler.$(OBJEXT): {$(VPATH)}oniguruma.h scheduler.$(OBJEXT): {$(VPATH)}ruby_assert.h scheduler.$(OBJEXT): {$(VPATH)}ruby_atomic.h -scheduler.$(OBJEXT): {$(VPATH)}rubyparser.h scheduler.$(OBJEXT): {$(VPATH)}scheduler.c scheduler.$(OBJEXT): {$(VPATH)}shape.h scheduler.$(OBJEXT): {$(VPATH)}st.h @@ -16071,7 +14016,6 @@ setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/pure.h setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -16131,6 +14075,7 @@ setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/error.h setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/eval.h setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/file.h +setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/gc.h setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/hash.h setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/io.h setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -16161,6 +14106,7 @@ setproctitle.$(OBJEXT): {$(VPATH)}internal/memory.h setproctitle.$(OBJEXT): {$(VPATH)}internal/method.h setproctitle.$(OBJEXT): {$(VPATH)}internal/module.h setproctitle.$(OBJEXT): {$(VPATH)}internal/newobj.h +setproctitle.$(OBJEXT): {$(VPATH)}internal/rgengc.h setproctitle.$(OBJEXT): {$(VPATH)}internal/scan_args.h setproctitle.$(OBJEXT): {$(VPATH)}internal/special_consts.h setproctitle.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -16182,18 +14128,14 @@ 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 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/object.h shape.$(OBJEXT): $(top_srcdir)/internal/serial.h shape.$(OBJEXT): $(top_srcdir)/internal/static_assert.h -shape.$(OBJEXT): $(top_srcdir)/internal/string.h shape.$(OBJEXT): $(top_srcdir)/internal/symbol.h shape.$(OBJEXT): $(top_srcdir)/internal/variable.h shape.$(OBJEXT): $(top_srcdir)/internal/vm.h @@ -16214,6 +14156,7 @@ shape.$(OBJEXT): {$(VPATH)}constant.h shape.$(OBJEXT): {$(VPATH)}debug_counter.h shape.$(OBJEXT): {$(VPATH)}defines.h shape.$(OBJEXT): {$(VPATH)}encoding.h +shape.$(OBJEXT): {$(VPATH)}gc.h shape.$(OBJEXT): {$(VPATH)}id.h shape.$(OBJEXT): {$(VPATH)}id_table.h shape.$(OBJEXT): {$(VPATH)}intern.h @@ -16256,7 +14199,6 @@ shape.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h shape.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h shape.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h shape.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -shape.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h shape.$(OBJEXT): {$(VPATH)}internal/attr/pure.h shape.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h shape.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -16325,6 +14267,7 @@ shape.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h shape.$(OBJEXT): {$(VPATH)}internal/intern/error.h shape.$(OBJEXT): {$(VPATH)}internal/intern/eval.h shape.$(OBJEXT): {$(VPATH)}internal/intern/file.h +shape.$(OBJEXT): {$(VPATH)}internal/intern/gc.h shape.$(OBJEXT): {$(VPATH)}internal/intern/hash.h shape.$(OBJEXT): {$(VPATH)}internal/intern/io.h shape.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -16355,6 +14298,7 @@ shape.$(OBJEXT): {$(VPATH)}internal/memory.h shape.$(OBJEXT): {$(VPATH)}internal/method.h shape.$(OBJEXT): {$(VPATH)}internal/module.h shape.$(OBJEXT): {$(VPATH)}internal/newobj.h +shape.$(OBJEXT): {$(VPATH)}internal/rgengc.h shape.$(OBJEXT): {$(VPATH)}internal/scan_args.h shape.$(OBJEXT): {$(VPATH)}internal/special_consts.h shape.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -16373,7 +14317,6 @@ shape.$(OBJEXT): {$(VPATH)}onigmo.h shape.$(OBJEXT): {$(VPATH)}oniguruma.h shape.$(OBJEXT): {$(VPATH)}ruby_assert.h shape.$(OBJEXT): {$(VPATH)}ruby_atomic.h -shape.$(OBJEXT): {$(VPATH)}rubyparser.h shape.$(OBJEXT): {$(VPATH)}shape.c shape.$(OBJEXT): {$(VPATH)}shape.h shape.$(OBJEXT): {$(VPATH)}st.h @@ -16391,11 +14334,9 @@ 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 -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 @@ -16466,8 +14407,8 @@ 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 signal.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h signal.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -16536,6 +14477,7 @@ signal.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h signal.$(OBJEXT): {$(VPATH)}internal/intern/error.h signal.$(OBJEXT): {$(VPATH)}internal/intern/eval.h signal.$(OBJEXT): {$(VPATH)}internal/intern/file.h +signal.$(OBJEXT): {$(VPATH)}internal/intern/gc.h signal.$(OBJEXT): {$(VPATH)}internal/intern/hash.h signal.$(OBJEXT): {$(VPATH)}internal/intern/io.h signal.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -16566,6 +14508,7 @@ signal.$(OBJEXT): {$(VPATH)}internal/memory.h signal.$(OBJEXT): {$(VPATH)}internal/method.h signal.$(OBJEXT): {$(VPATH)}internal/module.h signal.$(OBJEXT): {$(VPATH)}internal/newobj.h +signal.$(OBJEXT): {$(VPATH)}internal/rgengc.h signal.$(OBJEXT): {$(VPATH)}internal/scan_args.h signal.$(OBJEXT): {$(VPATH)}internal/special_consts.h signal.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -16586,7 +14529,6 @@ signal.$(OBJEXT): {$(VPATH)}ractor.h signal.$(OBJEXT): {$(VPATH)}ractor_core.h signal.$(OBJEXT): {$(VPATH)}ruby_assert.h signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h -signal.$(OBJEXT): {$(VPATH)}rubyparser.h signal.$(OBJEXT): {$(VPATH)}shape.h signal.$(OBJEXT): {$(VPATH)}signal.c signal.$(OBJEXT): {$(VPATH)}st.h @@ -16597,7 +14539,6 @@ 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 @@ -16672,7 +14613,6 @@ sprintf.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h sprintf.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h sprintf.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h sprintf.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -sprintf.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h sprintf.$(OBJEXT): {$(VPATH)}internal/attr/pure.h sprintf.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h sprintf.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -16742,6 +14682,7 @@ sprintf.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h sprintf.$(OBJEXT): {$(VPATH)}internal/intern/error.h sprintf.$(OBJEXT): {$(VPATH)}internal/intern/eval.h sprintf.$(OBJEXT): {$(VPATH)}internal/intern/file.h +sprintf.$(OBJEXT): {$(VPATH)}internal/intern/gc.h sprintf.$(OBJEXT): {$(VPATH)}internal/intern/hash.h sprintf.$(OBJEXT): {$(VPATH)}internal/intern/io.h sprintf.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -16772,6 +14713,7 @@ sprintf.$(OBJEXT): {$(VPATH)}internal/memory.h sprintf.$(OBJEXT): {$(VPATH)}internal/method.h sprintf.$(OBJEXT): {$(VPATH)}internal/module.h sprintf.$(OBJEXT): {$(VPATH)}internal/newobj.h +sprintf.$(OBJEXT): {$(VPATH)}internal/rgengc.h sprintf.$(OBJEXT): {$(VPATH)}internal/scan_args.h sprintf.$(OBJEXT): {$(VPATH)}internal/special_consts.h sprintf.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -16853,7 +14795,6 @@ st.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h st.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h st.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h st.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -st.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h st.$(OBJEXT): {$(VPATH)}internal/attr/pure.h st.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h st.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -16913,6 +14854,7 @@ st.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h st.$(OBJEXT): {$(VPATH)}internal/intern/error.h st.$(OBJEXT): {$(VPATH)}internal/intern/eval.h st.$(OBJEXT): {$(VPATH)}internal/intern/file.h +st.$(OBJEXT): {$(VPATH)}internal/intern/gc.h st.$(OBJEXT): {$(VPATH)}internal/intern/hash.h st.$(OBJEXT): {$(VPATH)}internal/intern/io.h st.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -16943,6 +14885,7 @@ st.$(OBJEXT): {$(VPATH)}internal/memory.h st.$(OBJEXT): {$(VPATH)}internal/method.h st.$(OBJEXT): {$(VPATH)}internal/module.h st.$(OBJEXT): {$(VPATH)}internal/newobj.h +st.$(OBJEXT): {$(VPATH)}internal/rgengc.h st.$(OBJEXT): {$(VPATH)}internal/scan_args.h st.$(OBJEXT): {$(VPATH)}internal/special_consts.h st.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -16955,6 +14898,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 @@ -17018,7 +14962,6 @@ strftime.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h strftime.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h strftime.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h strftime.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -strftime.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h strftime.$(OBJEXT): {$(VPATH)}internal/attr/pure.h strftime.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h strftime.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -17087,6 +15030,7 @@ strftime.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h strftime.$(OBJEXT): {$(VPATH)}internal/intern/error.h strftime.$(OBJEXT): {$(VPATH)}internal/intern/eval.h strftime.$(OBJEXT): {$(VPATH)}internal/intern/file.h +strftime.$(OBJEXT): {$(VPATH)}internal/intern/gc.h strftime.$(OBJEXT): {$(VPATH)}internal/intern/hash.h strftime.$(OBJEXT): {$(VPATH)}internal/intern/io.h strftime.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -17117,6 +15061,7 @@ strftime.$(OBJEXT): {$(VPATH)}internal/memory.h strftime.$(OBJEXT): {$(VPATH)}internal/method.h strftime.$(OBJEXT): {$(VPATH)}internal/module.h strftime.$(OBJEXT): {$(VPATH)}internal/newobj.h +strftime.$(OBJEXT): {$(VPATH)}internal/rgengc.h strftime.$(OBJEXT): {$(VPATH)}internal/scan_args.h strftime.$(OBJEXT): {$(VPATH)}internal/special_consts.h strftime.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -17136,12 +15081,7 @@ strftime.$(OBJEXT): {$(VPATH)}strftime.c strftime.$(OBJEXT): {$(VPATH)}subst.h strftime.$(OBJEXT): {$(VPATH)}timev.h strftime.$(OBJEXT): {$(VPATH)}util.h -string.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -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 @@ -17153,7 +15093,6 @@ 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/imemo.h string.$(OBJEXT): $(top_srcdir)/internal/numeric.h string.$(OBJEXT): $(top_srcdir)/internal/object.h string.$(OBJEXT): $(top_srcdir)/internal/proc.h @@ -17183,6 +15122,7 @@ string.$(OBJEXT): {$(VPATH)}debug_counter.h string.$(OBJEXT): {$(VPATH)}defines.h string.$(OBJEXT): {$(VPATH)}encindex.h string.$(OBJEXT): {$(VPATH)}encoding.h +string.$(OBJEXT): {$(VPATH)}gc.h string.$(OBJEXT): {$(VPATH)}id.h string.$(OBJEXT): {$(VPATH)}id_table.h string.$(OBJEXT): {$(VPATH)}intern.h @@ -17224,8 +15164,8 @@ 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 string.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h string.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -17295,6 +15235,7 @@ string.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h string.$(OBJEXT): {$(VPATH)}internal/intern/error.h string.$(OBJEXT): {$(VPATH)}internal/intern/eval.h string.$(OBJEXT): {$(VPATH)}internal/intern/file.h +string.$(OBJEXT): {$(VPATH)}internal/intern/gc.h string.$(OBJEXT): {$(VPATH)}internal/intern/hash.h string.$(OBJEXT): {$(VPATH)}internal/intern/io.h string.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -17325,6 +15266,7 @@ string.$(OBJEXT): {$(VPATH)}internal/memory.h string.$(OBJEXT): {$(VPATH)}internal/method.h string.$(OBJEXT): {$(VPATH)}internal/module.h string.$(OBJEXT): {$(VPATH)}internal/newobj.h +string.$(OBJEXT): {$(VPATH)}internal/rgengc.h string.$(OBJEXT): {$(VPATH)}internal/scan_args.h string.$(OBJEXT): {$(VPATH)}internal/special_consts.h string.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -17336,9 +15278,7 @@ string.$(OBJEXT): {$(VPATH)}internal/value_type.h string.$(OBJEXT): {$(VPATH)}internal/variable.h string.$(OBJEXT): {$(VPATH)}internal/warning_push.h string.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -string.$(OBJEXT): {$(VPATH)}method.h string.$(OBJEXT): {$(VPATH)}missing.h -string.$(OBJEXT): {$(VPATH)}node.h string.$(OBJEXT): {$(VPATH)}onigmo.h string.$(OBJEXT): {$(VPATH)}oniguruma.h string.$(OBJEXT): {$(VPATH)}probes.dmyh @@ -17346,18 +15286,13 @@ string.$(OBJEXT): {$(VPATH)}probes.h string.$(OBJEXT): {$(VPATH)}re.h string.$(OBJEXT): {$(VPATH)}regex.h string.$(OBJEXT): {$(VPATH)}ruby_assert.h -string.$(OBJEXT): {$(VPATH)}ruby_atomic.h -string.$(OBJEXT): {$(VPATH)}rubyparser.h string.$(OBJEXT): {$(VPATH)}shape.h string.$(OBJEXT): {$(VPATH)}st.h string.$(OBJEXT): {$(VPATH)}string.c string.$(OBJEXT): {$(VPATH)}subst.h -string.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h string.$(OBJEXT): {$(VPATH)}thread_native.h string.$(OBJEXT): {$(VPATH)}util.h -string.$(OBJEXT): {$(VPATH)}vm_core.h string.$(OBJEXT): {$(VPATH)}vm_debug.h -string.$(OBJEXT): {$(VPATH)}vm_opts.h string.$(OBJEXT): {$(VPATH)}vm_sync.h strlcat.$(OBJEXT): {$(VPATH)}config.h strlcat.$(OBJEXT): {$(VPATH)}internal/attr/format.h @@ -17394,7 +15329,6 @@ 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 @@ -17427,7 +15361,6 @@ 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 @@ -17472,7 +15405,6 @@ struct.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h struct.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h struct.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h struct.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -struct.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h struct.$(OBJEXT): {$(VPATH)}internal/attr/pure.h struct.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h struct.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -17541,6 +15473,7 @@ struct.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h struct.$(OBJEXT): {$(VPATH)}internal/intern/error.h struct.$(OBJEXT): {$(VPATH)}internal/intern/eval.h struct.$(OBJEXT): {$(VPATH)}internal/intern/file.h +struct.$(OBJEXT): {$(VPATH)}internal/intern/gc.h struct.$(OBJEXT): {$(VPATH)}internal/intern/hash.h struct.$(OBJEXT): {$(VPATH)}internal/intern/io.h struct.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -17571,6 +15504,7 @@ struct.$(OBJEXT): {$(VPATH)}internal/memory.h struct.$(OBJEXT): {$(VPATH)}internal/method.h struct.$(OBJEXT): {$(VPATH)}internal/module.h struct.$(OBJEXT): {$(VPATH)}internal/newobj.h +struct.$(OBJEXT): {$(VPATH)}internal/rgengc.h struct.$(OBJEXT): {$(VPATH)}internal/scan_args.h struct.$(OBJEXT): {$(VPATH)}internal/special_consts.h struct.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -17589,31 +15523,21 @@ struct.$(OBJEXT): {$(VPATH)}onigmo.h struct.$(OBJEXT): {$(VPATH)}oniguruma.h struct.$(OBJEXT): {$(VPATH)}ruby_assert.h struct.$(OBJEXT): {$(VPATH)}ruby_atomic.h -struct.$(OBJEXT): {$(VPATH)}rubyparser.h struct.$(OBJEXT): {$(VPATH)}shape.h struct.$(OBJEXT): {$(VPATH)}st.h struct.$(OBJEXT): {$(VPATH)}struct.c struct.$(OBJEXT): {$(VPATH)}subst.h struct.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h struct.$(OBJEXT): {$(VPATH)}thread_native.h +struct.$(OBJEXT): {$(VPATH)}transient_heap.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 symbol.$(OBJEXT): $(top_srcdir)/internal/compilers.h symbol.$(OBJEXT): $(top_srcdir)/internal/error.h symbol.$(OBJEXT): $(top_srcdir)/internal/gc.h symbol.$(OBJEXT): $(top_srcdir)/internal/hash.h -symbol.$(OBJEXT): $(top_srcdir)/internal/imemo.h symbol.$(OBJEXT): $(top_srcdir)/internal/object.h symbol.$(OBJEXT): $(top_srcdir)/internal/serial.h symbol.$(OBJEXT): $(top_srcdir)/internal/static_assert.h @@ -17623,7 +15547,6 @@ symbol.$(OBJEXT): $(top_srcdir)/internal/variable.h symbol.$(OBJEXT): $(top_srcdir)/internal/vm.h symbol.$(OBJEXT): $(top_srcdir)/internal/warnings.h symbol.$(OBJEXT): {$(VPATH)}assert.h -symbol.$(OBJEXT): {$(VPATH)}atomic.h symbol.$(OBJEXT): {$(VPATH)}backward/2/assume.h symbol.$(OBJEXT): {$(VPATH)}backward/2/attributes.h symbol.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -17639,6 +15562,7 @@ symbol.$(OBJEXT): {$(VPATH)}constant.h symbol.$(OBJEXT): {$(VPATH)}debug_counter.h symbol.$(OBJEXT): {$(VPATH)}defines.h symbol.$(OBJEXT): {$(VPATH)}encoding.h +symbol.$(OBJEXT): {$(VPATH)}gc.h symbol.$(OBJEXT): {$(VPATH)}id.c symbol.$(OBJEXT): {$(VPATH)}id.h symbol.$(OBJEXT): {$(VPATH)}id_table.c @@ -17682,8 +15606,8 @@ 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 symbol.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h symbol.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -17752,6 +15676,7 @@ symbol.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h symbol.$(OBJEXT): {$(VPATH)}internal/intern/error.h symbol.$(OBJEXT): {$(VPATH)}internal/intern/eval.h symbol.$(OBJEXT): {$(VPATH)}internal/intern/file.h +symbol.$(OBJEXT): {$(VPATH)}internal/intern/gc.h symbol.$(OBJEXT): {$(VPATH)}internal/intern/hash.h symbol.$(OBJEXT): {$(VPATH)}internal/intern/io.h symbol.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -17782,6 +15707,7 @@ symbol.$(OBJEXT): {$(VPATH)}internal/memory.h symbol.$(OBJEXT): {$(VPATH)}internal/method.h symbol.$(OBJEXT): {$(VPATH)}internal/module.h symbol.$(OBJEXT): {$(VPATH)}internal/newobj.h +symbol.$(OBJEXT): {$(VPATH)}internal/rgengc.h symbol.$(OBJEXT): {$(VPATH)}internal/scan_args.h symbol.$(OBJEXT): {$(VPATH)}internal/special_consts.h symbol.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -17793,16 +15719,12 @@ symbol.$(OBJEXT): {$(VPATH)}internal/value_type.h symbol.$(OBJEXT): {$(VPATH)}internal/variable.h symbol.$(OBJEXT): {$(VPATH)}internal/warning_push.h symbol.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -symbol.$(OBJEXT): {$(VPATH)}method.h symbol.$(OBJEXT): {$(VPATH)}missing.h -symbol.$(OBJEXT): {$(VPATH)}node.h symbol.$(OBJEXT): {$(VPATH)}onigmo.h symbol.$(OBJEXT): {$(VPATH)}oniguruma.h symbol.$(OBJEXT): {$(VPATH)}probes.dmyh symbol.$(OBJEXT): {$(VPATH)}probes.h symbol.$(OBJEXT): {$(VPATH)}ruby_assert.h -symbol.$(OBJEXT): {$(VPATH)}ruby_atomic.h -symbol.$(OBJEXT): {$(VPATH)}rubyparser.h symbol.$(OBJEXT): {$(VPATH)}shape.h symbol.$(OBJEXT): {$(VPATH)}st.h symbol.$(OBJEXT): {$(VPATH)}subst.h @@ -17810,11 +15732,7 @@ symbol.$(OBJEXT): {$(VPATH)}symbol.c symbol.$(OBJEXT): {$(VPATH)}symbol.h symbol.$(OBJEXT): {$(VPATH)}symbol.rb symbol.$(OBJEXT): {$(VPATH)}symbol.rbinc -symbol.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -symbol.$(OBJEXT): {$(VPATH)}thread_native.h -symbol.$(OBJEXT): {$(VPATH)}vm_core.h symbol.$(OBJEXT): {$(VPATH)}vm_debug.h -symbol.$(OBJEXT): {$(VPATH)}vm_opts.h symbol.$(OBJEXT): {$(VPATH)}vm_sync.h thread.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h thread.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h @@ -17822,7 +15740,6 @@ 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 @@ -17845,28 +15762,6 @@ 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/diagnostic.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/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_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_state_stack.h -thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -17887,6 +15782,7 @@ thread.$(OBJEXT): {$(VPATH)}defines.h thread.$(OBJEXT): {$(VPATH)}encoding.h thread.$(OBJEXT): {$(VPATH)}eval_intern.h thread.$(OBJEXT): {$(VPATH)}fiber/scheduler.h +thread.$(OBJEXT): {$(VPATH)}gc.h thread.$(OBJEXT): {$(VPATH)}hrtime.h thread.$(OBJEXT): {$(VPATH)}id.h thread.$(OBJEXT): {$(VPATH)}id_table.h @@ -17930,7 +15826,6 @@ thread.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h thread.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h thread.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h thread.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -thread.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h thread.$(OBJEXT): {$(VPATH)}internal/attr/pure.h thread.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h thread.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -17999,6 +15894,7 @@ thread.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h thread.$(OBJEXT): {$(VPATH)}internal/intern/error.h thread.$(OBJEXT): {$(VPATH)}internal/intern/eval.h thread.$(OBJEXT): {$(VPATH)}internal/intern/file.h +thread.$(OBJEXT): {$(VPATH)}internal/intern/gc.h thread.$(OBJEXT): {$(VPATH)}internal/intern/hash.h thread.$(OBJEXT): {$(VPATH)}internal/intern/io.h thread.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -18029,6 +15925,7 @@ thread.$(OBJEXT): {$(VPATH)}internal/memory.h thread.$(OBJEXT): {$(VPATH)}internal/method.h thread.$(OBJEXT): {$(VPATH)}internal/module.h thread.$(OBJEXT): {$(VPATH)}internal/newobj.h +thread.$(OBJEXT): {$(VPATH)}internal/rgengc.h thread.$(OBJEXT): {$(VPATH)}internal/scan_args.h thread.$(OBJEXT): {$(VPATH)}internal/special_consts.h thread.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -18044,18 +15941,14 @@ thread.$(OBJEXT): {$(VPATH)}io.h thread.$(OBJEXT): {$(VPATH)}iseq.h thread.$(OBJEXT): {$(VPATH)}method.h thread.$(OBJEXT): {$(VPATH)}missing.h +thread.$(OBJEXT): {$(VPATH)}mjit.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/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 thread.$(OBJEXT): {$(VPATH)}shape.h thread.$(OBJEXT): {$(VPATH)}st.h thread.$(OBJEXT): {$(VPATH)}subst.h @@ -18064,7 +15957,6 @@ 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 @@ -18072,10 +15964,6 @@ thread.$(OBJEXT): {$(VPATH)}vm_core.h thread.$(OBJEXT): {$(VPATH)}vm_debug.h thread.$(OBJEXT): {$(VPATH)}vm_opts.h thread.$(OBJEXT): {$(VPATH)}vm_sync.h -time.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -time.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -time.$(OBJEXT): $(CCAN_DIR)/list/list.h -time.$(OBJEXT): $(CCAN_DIR)/str/str.h time.$(OBJEXT): $(hdrdir)/ruby/ruby.h time.$(OBJEXT): $(top_srcdir)/internal/array.h time.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h @@ -18086,7 +15974,6 @@ time.$(OBJEXT): $(top_srcdir)/internal/compilers.h time.$(OBJEXT): $(top_srcdir)/internal/fixnum.h time.$(OBJEXT): $(top_srcdir)/internal/gc.h time.$(OBJEXT): $(top_srcdir)/internal/hash.h -time.$(OBJEXT): $(top_srcdir)/internal/imemo.h time.$(OBJEXT): $(top_srcdir)/internal/numeric.h time.$(OBJEXT): $(top_srcdir)/internal/rational.h time.$(OBJEXT): $(top_srcdir)/internal/serial.h @@ -18097,7 +15984,6 @@ time.$(OBJEXT): $(top_srcdir)/internal/variable.h time.$(OBJEXT): $(top_srcdir)/internal/vm.h time.$(OBJEXT): $(top_srcdir)/internal/warnings.h time.$(OBJEXT): {$(VPATH)}assert.h -time.$(OBJEXT): {$(VPATH)}atomic.h time.$(OBJEXT): {$(VPATH)}backward/2/assume.h time.$(OBJEXT): {$(VPATH)}backward/2/attributes.h time.$(OBJEXT): {$(VPATH)}backward/2/bool.h @@ -18154,7 +16040,6 @@ time.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h time.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h time.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h time.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -time.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h time.$(OBJEXT): {$(VPATH)}internal/attr/pure.h time.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h time.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -18223,6 +16108,7 @@ time.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h time.$(OBJEXT): {$(VPATH)}internal/intern/error.h time.$(OBJEXT): {$(VPATH)}internal/intern/eval.h time.$(OBJEXT): {$(VPATH)}internal/intern/file.h +time.$(OBJEXT): {$(VPATH)}internal/intern/gc.h time.$(OBJEXT): {$(VPATH)}internal/intern/hash.h time.$(OBJEXT): {$(VPATH)}internal/intern/io.h time.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -18253,6 +16139,7 @@ time.$(OBJEXT): {$(VPATH)}internal/memory.h time.$(OBJEXT): {$(VPATH)}internal/method.h time.$(OBJEXT): {$(VPATH)}internal/module.h time.$(OBJEXT): {$(VPATH)}internal/newobj.h +time.$(OBJEXT): {$(VPATH)}internal/rgengc.h time.$(OBJEXT): {$(VPATH)}internal/scan_args.h time.$(OBJEXT): {$(VPATH)}internal/special_consts.h time.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -18264,24 +16151,16 @@ time.$(OBJEXT): {$(VPATH)}internal/value_type.h time.$(OBJEXT): {$(VPATH)}internal/variable.h time.$(OBJEXT): {$(VPATH)}internal/warning_push.h time.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -time.$(OBJEXT): {$(VPATH)}method.h time.$(OBJEXT): {$(VPATH)}missing.h -time.$(OBJEXT): {$(VPATH)}node.h time.$(OBJEXT): {$(VPATH)}onigmo.h time.$(OBJEXT): {$(VPATH)}oniguruma.h time.$(OBJEXT): {$(VPATH)}ruby_assert.h -time.$(OBJEXT): {$(VPATH)}ruby_atomic.h -time.$(OBJEXT): {$(VPATH)}rubyparser.h time.$(OBJEXT): {$(VPATH)}shape.h time.$(OBJEXT): {$(VPATH)}st.h time.$(OBJEXT): {$(VPATH)}subst.h -time.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -time.$(OBJEXT): {$(VPATH)}thread_native.h time.$(OBJEXT): {$(VPATH)}time.c time.$(OBJEXT): {$(VPATH)}timev.h time.$(OBJEXT): {$(VPATH)}timev.rbinc -time.$(OBJEXT): {$(VPATH)}vm_core.h -time.$(OBJEXT): {$(VPATH)}vm_opts.h transcode.$(OBJEXT): $(hdrdir)/ruby/ruby.h transcode.$(OBJEXT): $(top_srcdir)/internal/array.h transcode.$(OBJEXT): $(top_srcdir)/internal/class.h @@ -18351,7 +16230,6 @@ transcode.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h transcode.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h transcode.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h transcode.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -transcode.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h transcode.$(OBJEXT): {$(VPATH)}internal/attr/pure.h transcode.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h transcode.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -18420,6 +16298,7 @@ transcode.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h transcode.$(OBJEXT): {$(VPATH)}internal/intern/error.h transcode.$(OBJEXT): {$(VPATH)}internal/intern/eval.h transcode.$(OBJEXT): {$(VPATH)}internal/intern/file.h +transcode.$(OBJEXT): {$(VPATH)}internal/intern/gc.h transcode.$(OBJEXT): {$(VPATH)}internal/intern/hash.h transcode.$(OBJEXT): {$(VPATH)}internal/intern/io.h transcode.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -18450,6 +16329,7 @@ transcode.$(OBJEXT): {$(VPATH)}internal/memory.h transcode.$(OBJEXT): {$(VPATH)}internal/method.h transcode.$(OBJEXT): {$(VPATH)}internal/module.h transcode.$(OBJEXT): {$(VPATH)}internal/newobj.h +transcode.$(OBJEXT): {$(VPATH)}internal/rgengc.h transcode.$(OBJEXT): {$(VPATH)}internal/scan_args.h transcode.$(OBJEXT): {$(VPATH)}internal/special_consts.h transcode.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -18469,6 +16349,184 @@ transcode.$(OBJEXT): {$(VPATH)}st.h transcode.$(OBJEXT): {$(VPATH)}subst.h transcode.$(OBJEXT): {$(VPATH)}transcode.c transcode.$(OBJEXT): {$(VPATH)}transcode_data.h +transient_heap.$(OBJEXT): $(hdrdir)/ruby/ruby.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/array.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/compilers.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/gc.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/hash.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/static_assert.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/struct.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/variable.h +transient_heap.$(OBJEXT): $(top_srcdir)/internal/warnings.h +transient_heap.$(OBJEXT): {$(VPATH)}assert.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/assume.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/attributes.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/bool.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/limits.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/long_long.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h +transient_heap.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h +transient_heap.$(OBJEXT): {$(VPATH)}config.h +transient_heap.$(OBJEXT): {$(VPATH)}constant.h +transient_heap.$(OBJEXT): {$(VPATH)}debug.h +transient_heap.$(OBJEXT): {$(VPATH)}debug_counter.h +transient_heap.$(OBJEXT): {$(VPATH)}defines.h +transient_heap.$(OBJEXT): {$(VPATH)}gc.h +transient_heap.$(OBJEXT): {$(VPATH)}id_table.h +transient_heap.$(OBJEXT): {$(VPATH)}intern.h +transient_heap.$(OBJEXT): {$(VPATH)}internal.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/abi.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/anyargs.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/assume.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/cold.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/const.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/error.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/format.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/pure.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/warning.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/cast.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_since.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/config.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/constant_p.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rarray.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rclass.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rdata.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rfile.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rhash.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/robject.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rstring.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/ctype.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/dllexport.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/dosish.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/error.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/eval.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/event.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/fl_type.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/gc.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/glob.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/globals.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/attribute.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/builtin.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/extension.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/feature.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/has/warning.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/array.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/class.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/compar.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/complex.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/cont.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/dir.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/enum.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/error.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/eval.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/file.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/gc.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/hash.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/io.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/load.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/object.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/parse.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/proc.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/process.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/random.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/range.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/rational.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/re.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/select.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/signal.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/string.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/struct.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/thread.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/time.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/variable.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/vm.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/interpreter.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/iterator.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/memory.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/method.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/module.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/newobj.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/rgengc.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/scan_args.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/special_consts.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/static_assert.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/stdalign.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/stdbool.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/symbol.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/value.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/value_type.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/variable.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/warning_push.h +transient_heap.$(OBJEXT): {$(VPATH)}internal/xmalloc.h +transient_heap.$(OBJEXT): {$(VPATH)}missing.h +transient_heap.$(OBJEXT): {$(VPATH)}ruby_assert.h +transient_heap.$(OBJEXT): {$(VPATH)}shape.h +transient_heap.$(OBJEXT): {$(VPATH)}st.h +transient_heap.$(OBJEXT): {$(VPATH)}subst.h +transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.c +transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.h +transient_heap.$(OBJEXT): {$(VPATH)}vm_debug.h +transient_heap.$(OBJEXT): {$(VPATH)}vm_sync.h util.$(OBJEXT): $(hdrdir)/ruby/ruby.h util.$(OBJEXT): $(top_srcdir)/internal/compilers.h util.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h @@ -18528,7 +16586,6 @@ util.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h util.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h util.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h util.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -util.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h util.$(OBJEXT): {$(VPATH)}internal/attr/pure.h util.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h util.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -18588,6 +16645,7 @@ util.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h util.$(OBJEXT): {$(VPATH)}internal/intern/error.h util.$(OBJEXT): {$(VPATH)}internal/intern/eval.h util.$(OBJEXT): {$(VPATH)}internal/intern/file.h +util.$(OBJEXT): {$(VPATH)}internal/intern/gc.h util.$(OBJEXT): {$(VPATH)}internal/intern/hash.h util.$(OBJEXT): {$(VPATH)}internal/intern/io.h util.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -18618,6 +16676,7 @@ util.$(OBJEXT): {$(VPATH)}internal/memory.h util.$(OBJEXT): {$(VPATH)}internal/method.h util.$(OBJEXT): {$(VPATH)}internal/module.h util.$(OBJEXT): {$(VPATH)}internal/newobj.h +util.$(OBJEXT): {$(VPATH)}internal/rgengc.h util.$(OBJEXT): {$(VPATH)}internal/scan_args.h util.$(OBJEXT): {$(VPATH)}internal/special_consts.h util.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -18640,7 +16699,6 @@ 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 @@ -18718,7 +16776,6 @@ variable.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h variable.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h variable.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h variable.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -variable.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h variable.$(OBJEXT): {$(VPATH)}internal/attr/pure.h variable.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h variable.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -18787,6 +16844,7 @@ variable.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h variable.$(OBJEXT): {$(VPATH)}internal/intern/error.h variable.$(OBJEXT): {$(VPATH)}internal/intern/eval.h variable.$(OBJEXT): {$(VPATH)}internal/intern/file.h +variable.$(OBJEXT): {$(VPATH)}internal/intern/gc.h variable.$(OBJEXT): {$(VPATH)}internal/intern/hash.h variable.$(OBJEXT): {$(VPATH)}internal/intern/io.h variable.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -18817,6 +16875,7 @@ variable.$(OBJEXT): {$(VPATH)}internal/memory.h variable.$(OBJEXT): {$(VPATH)}internal/method.h variable.$(OBJEXT): {$(VPATH)}internal/module.h variable.$(OBJEXT): {$(VPATH)}internal/newobj.h +variable.$(OBJEXT): {$(VPATH)}internal/rgengc.h variable.$(OBJEXT): {$(VPATH)}internal/scan_args.h variable.$(OBJEXT): {$(VPATH)}internal/special_consts.h variable.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -18837,13 +16896,12 @@ variable.$(OBJEXT): {$(VPATH)}ractor.h variable.$(OBJEXT): {$(VPATH)}ractor_core.h variable.$(OBJEXT): {$(VPATH)}ruby_assert.h variable.$(OBJEXT): {$(VPATH)}ruby_atomic.h -variable.$(OBJEXT): {$(VPATH)}rubyparser.h variable.$(OBJEXT): {$(VPATH)}shape.h variable.$(OBJEXT): {$(VPATH)}st.h variable.$(OBJEXT): {$(VPATH)}subst.h -variable.$(OBJEXT): {$(VPATH)}symbol.h variable.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h variable.$(OBJEXT): {$(VPATH)}thread_native.h +variable.$(OBJEXT): {$(VPATH)}transient_heap.h variable.$(OBJEXT): {$(VPATH)}util.h variable.$(OBJEXT): {$(VPATH)}variable.c variable.$(OBJEXT): {$(VPATH)}variable.h @@ -18885,7 +16943,6 @@ version.$(OBJEXT): {$(VPATH)}config.h version.$(OBJEXT): {$(VPATH)}constant.h version.$(OBJEXT): {$(VPATH)}debug_counter.h version.$(OBJEXT): {$(VPATH)}defines.h -version.$(OBJEXT): {$(VPATH)}encoding.h version.$(OBJEXT): {$(VPATH)}id.h version.$(OBJEXT): {$(VPATH)}id_table.h version.$(OBJEXT): {$(VPATH)}intern.h @@ -18928,7 +16985,6 @@ version.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h version.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h version.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h version.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -version.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h version.$(OBJEXT): {$(VPATH)}internal/attr/pure.h version.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h version.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -18961,15 +17017,6 @@ version.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h version.$(OBJEXT): {$(VPATH)}internal/ctype.h version.$(OBJEXT): {$(VPATH)}internal/dllexport.h version.$(OBJEXT): {$(VPATH)}internal/dosish.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -version.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h version.$(OBJEXT): {$(VPATH)}internal/error.h version.$(OBJEXT): {$(VPATH)}internal/eval.h version.$(OBJEXT): {$(VPATH)}internal/event.h @@ -18997,6 +17044,7 @@ version.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h version.$(OBJEXT): {$(VPATH)}internal/intern/error.h version.$(OBJEXT): {$(VPATH)}internal/intern/eval.h version.$(OBJEXT): {$(VPATH)}internal/intern/file.h +version.$(OBJEXT): {$(VPATH)}internal/intern/gc.h version.$(OBJEXT): {$(VPATH)}internal/intern/hash.h version.$(OBJEXT): {$(VPATH)}internal/intern/io.h version.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -19027,6 +17075,7 @@ version.$(OBJEXT): {$(VPATH)}internal/memory.h version.$(OBJEXT): {$(VPATH)}internal/method.h version.$(OBJEXT): {$(VPATH)}internal/module.h version.$(OBJEXT): {$(VPATH)}internal/newobj.h +version.$(OBJEXT): {$(VPATH)}internal/rgengc.h version.$(OBJEXT): {$(VPATH)}internal/scan_args.h version.$(OBJEXT): {$(VPATH)}internal/special_consts.h version.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -19040,14 +17089,11 @@ version.$(OBJEXT): {$(VPATH)}internal/warning_push.h version.$(OBJEXT): {$(VPATH)}internal/xmalloc.h version.$(OBJEXT): {$(VPATH)}method.h version.$(OBJEXT): {$(VPATH)}missing.h +version.$(OBJEXT): {$(VPATH)}mjit.h 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 version.$(OBJEXT): {$(VPATH)}shape.h version.$(OBJEXT): {$(VPATH)}st.h version.$(OBJEXT): {$(VPATH)}subst.h @@ -19063,7 +17109,6 @@ 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 @@ -19073,7 +17118,6 @@ vm.$(OBJEXT): $(top_srcdir)/internal/compar.h vm.$(OBJEXT): $(top_srcdir)/internal/compile.h vm.$(OBJEXT): $(top_srcdir)/internal/compilers.h vm.$(OBJEXT): $(top_srcdir)/internal/cont.h -vm.$(OBJEXT): $(top_srcdir)/internal/encoding.h vm.$(OBJEXT): $(top_srcdir)/internal/error.h vm.$(OBJEXT): $(top_srcdir)/internal/eval.h vm.$(OBJEXT): $(top_srcdir)/internal/fixnum.h @@ -19087,7 +17131,6 @@ vm.$(OBJEXT): $(top_srcdir)/internal/parse.h vm.$(OBJEXT): $(top_srcdir)/internal/proc.h vm.$(OBJEXT): $(top_srcdir)/internal/random.h vm.$(OBJEXT): $(top_srcdir)/internal/re.h -vm.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h vm.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h vm.$(OBJEXT): $(top_srcdir)/internal/serial.h vm.$(OBJEXT): $(top_srcdir)/internal/static_assert.h @@ -19095,31 +17138,9 @@ 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/diagnostic.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/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_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_state_stack.h -vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -19139,6 +17160,7 @@ vm.$(OBJEXT): {$(VPATH)}defines.h vm.$(OBJEXT): {$(VPATH)}defs/opt_operand.def vm.$(OBJEXT): {$(VPATH)}encoding.h vm.$(OBJEXT): {$(VPATH)}eval_intern.h +vm.$(OBJEXT): {$(VPATH)}gc.h vm.$(OBJEXT): {$(VPATH)}id.h vm.$(OBJEXT): {$(VPATH)}id_table.h vm.$(OBJEXT): {$(VPATH)}insns.def @@ -19184,7 +17206,6 @@ vm.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h vm.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h vm.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h vm.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -vm.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h vm.$(OBJEXT): {$(VPATH)}internal/attr/pure.h vm.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h vm.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -19253,6 +17274,7 @@ vm.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h vm.$(OBJEXT): {$(VPATH)}internal/intern/error.h vm.$(OBJEXT): {$(VPATH)}internal/intern/eval.h vm.$(OBJEXT): {$(VPATH)}internal/intern/file.h +vm.$(OBJEXT): {$(VPATH)}internal/intern/gc.h vm.$(OBJEXT): {$(VPATH)}internal/intern/hash.h vm.$(OBJEXT): {$(VPATH)}internal/intern/io.h vm.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -19283,6 +17305,7 @@ vm.$(OBJEXT): {$(VPATH)}internal/memory.h vm.$(OBJEXT): {$(VPATH)}internal/method.h vm.$(OBJEXT): {$(VPATH)}internal/module.h vm.$(OBJEXT): {$(VPATH)}internal/newobj.h +vm.$(OBJEXT): {$(VPATH)}internal/rgengc.h vm.$(OBJEXT): {$(VPATH)}internal/scan_args.h vm.$(OBJEXT): {$(VPATH)}internal/special_consts.h vm.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -19297,21 +17320,17 @@ vm.$(OBJEXT): {$(VPATH)}internal/xmalloc.h vm.$(OBJEXT): {$(VPATH)}iseq.h vm.$(OBJEXT): {$(VPATH)}method.h vm.$(OBJEXT): {$(VPATH)}missing.h +vm.$(OBJEXT): {$(VPATH)}mjit.h vm.$(OBJEXT): {$(VPATH)}node.h vm.$(OBJEXT): {$(VPATH)}onigmo.h vm.$(OBJEXT): {$(VPATH)}oniguruma.h -vm.$(OBJEXT): {$(VPATH)}prism/ast.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 @@ -19341,10 +17360,8 @@ 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 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/compilers.h vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/error.h vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/gc.h @@ -19355,27 +17372,6 @@ 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/diagnostic.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/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_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_state_stack.h -vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -19390,7 +17386,6 @@ 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 @@ -19436,7 +17431,6 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/pure.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -19505,6 +17499,7 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/error.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/eval.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/file.h +vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/gc.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/hash.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/io.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -19535,6 +17530,7 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}internal/memory.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/method.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/module.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/newobj.h +vm_backtrace.$(OBJEXT): {$(VPATH)}internal/rgengc.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/scan_args.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/special_consts.h vm_backtrace.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -19552,12 +17548,8 @@ 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/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 vm_backtrace.$(OBJEXT): {$(VPATH)}shape.h vm_backtrace.$(OBJEXT): {$(VPATH)}st.h vm_backtrace.$(OBJEXT): {$(VPATH)}subst.h @@ -19565,9 +17557,7 @@ 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 @@ -19583,27 +17573,6 @@ 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/diagnostic.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/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_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_state_stack.h -vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -19619,7 +17588,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h 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)}gc.h vm_dump.$(OBJEXT): {$(VPATH)}id.h vm_dump.$(OBJEXT): {$(VPATH)}id_table.h vm_dump.$(OBJEXT): {$(VPATH)}intern.h @@ -19662,7 +17631,6 @@ vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/pure.h vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -19695,15 +17663,6 @@ vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h vm_dump.$(OBJEXT): {$(VPATH)}internal/ctype.h vm_dump.$(OBJEXT): {$(VPATH)}internal/dllexport.h vm_dump.$(OBJEXT): {$(VPATH)}internal/dosish.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -vm_dump.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h vm_dump.$(OBJEXT): {$(VPATH)}internal/error.h vm_dump.$(OBJEXT): {$(VPATH)}internal/eval.h vm_dump.$(OBJEXT): {$(VPATH)}internal/event.h @@ -19731,6 +17690,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/error.h vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/eval.h vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/file.h +vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/gc.h vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/hash.h vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/io.h vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -19761,6 +17721,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}internal/memory.h vm_dump.$(OBJEXT): {$(VPATH)}internal/method.h vm_dump.$(OBJEXT): {$(VPATH)}internal/module.h vm_dump.$(OBJEXT): {$(VPATH)}internal/newobj.h +vm_dump.$(OBJEXT): {$(VPATH)}internal/rgengc.h vm_dump.$(OBJEXT): {$(VPATH)}internal/scan_args.h vm_dump.$(OBJEXT): {$(VPATH)}internal/special_consts.h vm_dump.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -19776,17 +17737,11 @@ vm_dump.$(OBJEXT): {$(VPATH)}iseq.h vm_dump.$(OBJEXT): {$(VPATH)}method.h 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/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 vm_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h -vm_dump.$(OBJEXT): {$(VPATH)}rubyparser.h vm_dump.$(OBJEXT): {$(VPATH)}shape.h vm_dump.$(OBJEXT): {$(VPATH)}st.h vm_dump.$(OBJEXT): {$(VPATH)}subst.h @@ -19808,7 +17763,6 @@ vm_sync.$(OBJEXT): $(top_srcdir)/internal/gc.h vm_sync.$(OBJEXT): $(top_srcdir)/internal/imemo.h vm_sync.$(OBJEXT): $(top_srcdir)/internal/serial.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 vm_sync.$(OBJEXT): $(top_srcdir)/internal/vm.h vm_sync.$(OBJEXT): $(top_srcdir)/internal/warnings.h @@ -19827,7 +17781,7 @@ vm_sync.$(OBJEXT): {$(VPATH)}config.h vm_sync.$(OBJEXT): {$(VPATH)}constant.h vm_sync.$(OBJEXT): {$(VPATH)}debug_counter.h vm_sync.$(OBJEXT): {$(VPATH)}defines.h -vm_sync.$(OBJEXT): {$(VPATH)}encoding.h +vm_sync.$(OBJEXT): {$(VPATH)}gc.h vm_sync.$(OBJEXT): {$(VPATH)}id.h vm_sync.$(OBJEXT): {$(VPATH)}id_table.h vm_sync.$(OBJEXT): {$(VPATH)}intern.h @@ -19870,7 +17824,6 @@ vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/pure.h vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -19903,15 +17856,6 @@ vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h vm_sync.$(OBJEXT): {$(VPATH)}internal/ctype.h vm_sync.$(OBJEXT): {$(VPATH)}internal/dllexport.h vm_sync.$(OBJEXT): {$(VPATH)}internal/dosish.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -vm_sync.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h vm_sync.$(OBJEXT): {$(VPATH)}internal/error.h vm_sync.$(OBJEXT): {$(VPATH)}internal/eval.h vm_sync.$(OBJEXT): {$(VPATH)}internal/event.h @@ -19939,6 +17883,7 @@ vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/error.h vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/eval.h vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/file.h +vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/gc.h vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/hash.h vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/io.h vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -19969,6 +17914,7 @@ vm_sync.$(OBJEXT): {$(VPATH)}internal/memory.h vm_sync.$(OBJEXT): {$(VPATH)}internal/method.h vm_sync.$(OBJEXT): {$(VPATH)}internal/module.h vm_sync.$(OBJEXT): {$(VPATH)}internal/newobj.h +vm_sync.$(OBJEXT): {$(VPATH)}internal/rgengc.h vm_sync.$(OBJEXT): {$(VPATH)}internal/scan_args.h vm_sync.$(OBJEXT): {$(VPATH)}internal/special_consts.h vm_sync.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -19983,13 +17929,10 @@ vm_sync.$(OBJEXT): {$(VPATH)}internal/xmalloc.h vm_sync.$(OBJEXT): {$(VPATH)}method.h vm_sync.$(OBJEXT): {$(VPATH)}missing.h vm_sync.$(OBJEXT): {$(VPATH)}node.h -vm_sync.$(OBJEXT): {$(VPATH)}onigmo.h -vm_sync.$(OBJEXT): {$(VPATH)}oniguruma.h vm_sync.$(OBJEXT): {$(VPATH)}ractor.h vm_sync.$(OBJEXT): {$(VPATH)}ractor_core.h vm_sync.$(OBJEXT): {$(VPATH)}ruby_assert.h vm_sync.$(OBJEXT): {$(VPATH)}ruby_atomic.h -vm_sync.$(OBJEXT): {$(VPATH)}rubyparser.h vm_sync.$(OBJEXT): {$(VPATH)}shape.h vm_sync.$(OBJEXT): {$(VPATH)}st.h vm_sync.$(OBJEXT): {$(VPATH)}subst.h @@ -20008,8 +17951,6 @@ 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 @@ -20017,31 +17958,9 @@ vm_trace.$(OBJEXT): $(top_srcdir)/internal/imemo.h vm_trace.$(OBJEXT): $(top_srcdir)/internal/serial.h vm_trace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h vm_trace.$(OBJEXT): $(top_srcdir)/internal/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/diagnostic.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/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_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_state_stack.h -vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -20103,7 +18022,6 @@ vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/pure.h vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -20172,6 +18090,7 @@ vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/error.h vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/eval.h vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/file.h +vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/gc.h vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/hash.h vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/io.h vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -20202,6 +18121,7 @@ vm_trace.$(OBJEXT): {$(VPATH)}internal/memory.h vm_trace.$(OBJEXT): {$(VPATH)}internal/method.h vm_trace.$(OBJEXT): {$(VPATH)}internal/module.h vm_trace.$(OBJEXT): {$(VPATH)}internal/newobj.h +vm_trace.$(OBJEXT): {$(VPATH)}internal/rgengc.h vm_trace.$(OBJEXT): {$(VPATH)}internal/scan_args.h vm_trace.$(OBJEXT): {$(VPATH)}internal/special_consts.h vm_trace.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -20216,17 +18136,13 @@ vm_trace.$(OBJEXT): {$(VPATH)}internal/xmalloc.h vm_trace.$(OBJEXT): {$(VPATH)}iseq.h vm_trace.$(OBJEXT): {$(VPATH)}method.h vm_trace.$(OBJEXT): {$(VPATH)}missing.h +vm_trace.$(OBJEXT): {$(VPATH)}mjit.h vm_trace.$(OBJEXT): {$(VPATH)}node.h vm_trace.$(OBJEXT): {$(VPATH)}onigmo.h vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h -vm_trace.$(OBJEXT): {$(VPATH)}prism/ast.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 vm_trace.$(OBJEXT): {$(VPATH)}shape.h vm_trace.$(OBJEXT): {$(VPATH)}st.h vm_trace.$(OBJEXT): {$(VPATH)}subst.h @@ -20234,208 +18150,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 -weakmap.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -weakmap.$(OBJEXT): $(CCAN_DIR)/list/list.h -weakmap.$(OBJEXT): $(CCAN_DIR)/str/str.h -weakmap.$(OBJEXT): $(hdrdir)/ruby/ruby.h -weakmap.$(OBJEXT): $(top_srcdir)/internal/array.h -weakmap.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h -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/proc.h -weakmap.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h -weakmap.$(OBJEXT): $(top_srcdir)/internal/serial.h -weakmap.$(OBJEXT): $(top_srcdir)/internal/static_assert.h -weakmap.$(OBJEXT): $(top_srcdir)/internal/vm.h -weakmap.$(OBJEXT): $(top_srcdir)/internal/warnings.h -weakmap.$(OBJEXT): {$(VPATH)}assert.h -weakmap.$(OBJEXT): {$(VPATH)}atomic.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/assume.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/attributes.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/bool.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/limits.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/long_long.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h -weakmap.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h -weakmap.$(OBJEXT): {$(VPATH)}config.h -weakmap.$(OBJEXT): {$(VPATH)}defines.h -weakmap.$(OBJEXT): {$(VPATH)}encoding.h -weakmap.$(OBJEXT): {$(VPATH)}id.h -weakmap.$(OBJEXT): {$(VPATH)}intern.h -weakmap.$(OBJEXT): {$(VPATH)}internal.h -weakmap.$(OBJEXT): {$(VPATH)}internal/abi.h -weakmap.$(OBJEXT): {$(VPATH)}internal/anyargs.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h -weakmap.$(OBJEXT): {$(VPATH)}internal/assume.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/cold.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/const.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/error.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/format.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/pure.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/warning.h -weakmap.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h -weakmap.$(OBJEXT): {$(VPATH)}internal/cast.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_is.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h -weakmap.$(OBJEXT): {$(VPATH)}internal/compiler_since.h -weakmap.$(OBJEXT): {$(VPATH)}internal/config.h -weakmap.$(OBJEXT): {$(VPATH)}internal/constant_p.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rarray.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rclass.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rdata.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rfile.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rhash.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/robject.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rstring.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h -weakmap.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h -weakmap.$(OBJEXT): {$(VPATH)}internal/ctype.h -weakmap.$(OBJEXT): {$(VPATH)}internal/dllexport.h -weakmap.$(OBJEXT): {$(VPATH)}internal/dosish.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/re.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/string.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h -weakmap.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h -weakmap.$(OBJEXT): {$(VPATH)}internal/error.h -weakmap.$(OBJEXT): {$(VPATH)}internal/eval.h -weakmap.$(OBJEXT): {$(VPATH)}internal/event.h -weakmap.$(OBJEXT): {$(VPATH)}internal/fl_type.h -weakmap.$(OBJEXT): {$(VPATH)}internal/gc.h -weakmap.$(OBJEXT): {$(VPATH)}internal/glob.h -weakmap.$(OBJEXT): {$(VPATH)}internal/globals.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/attribute.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/builtin.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/extension.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/feature.h -weakmap.$(OBJEXT): {$(VPATH)}internal/has/warning.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/array.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/class.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/compar.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/complex.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/cont.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/dir.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/enum.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/error.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/eval.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/file.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/hash.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/io.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/load.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/object.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/parse.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/proc.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/process.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/random.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/range.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/rational.h -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/signal.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/string.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/struct.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/thread.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/time.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/variable.h -weakmap.$(OBJEXT): {$(VPATH)}internal/intern/vm.h -weakmap.$(OBJEXT): {$(VPATH)}internal/interpreter.h -weakmap.$(OBJEXT): {$(VPATH)}internal/iterator.h -weakmap.$(OBJEXT): {$(VPATH)}internal/memory.h -weakmap.$(OBJEXT): {$(VPATH)}internal/method.h -weakmap.$(OBJEXT): {$(VPATH)}internal/module.h -weakmap.$(OBJEXT): {$(VPATH)}internal/newobj.h -weakmap.$(OBJEXT): {$(VPATH)}internal/scan_args.h -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/symbol.h -weakmap.$(OBJEXT): {$(VPATH)}internal/value.h -weakmap.$(OBJEXT): {$(VPATH)}internal/value_type.h -weakmap.$(OBJEXT): {$(VPATH)}internal/variable.h -weakmap.$(OBJEXT): {$(VPATH)}internal/warning_push.h -weakmap.$(OBJEXT): {$(VPATH)}internal/xmalloc.h -weakmap.$(OBJEXT): {$(VPATH)}method.h -weakmap.$(OBJEXT): {$(VPATH)}missing.h -weakmap.$(OBJEXT): {$(VPATH)}node.h -weakmap.$(OBJEXT): {$(VPATH)}onigmo.h -weakmap.$(OBJEXT): {$(VPATH)}oniguruma.h -weakmap.$(OBJEXT): {$(VPATH)}ruby_assert.h -weakmap.$(OBJEXT): {$(VPATH)}ruby_atomic.h -weakmap.$(OBJEXT): {$(VPATH)}rubyparser.h -weakmap.$(OBJEXT): {$(VPATH)}st.h -weakmap.$(OBJEXT): {$(VPATH)}subst.h -weakmap.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h -weakmap.$(OBJEXT): {$(VPATH)}thread_native.h -weakmap.$(OBJEXT): {$(VPATH)}vm_core.h -weakmap.$(OBJEXT): {$(VPATH)}vm_opts.h -weakmap.$(OBJEXT): {$(VPATH)}weakmap.c 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 @@ -20443,8 +18160,6 @@ yjit.$(OBJEXT): $(CCAN_DIR)/str/str.h yjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h yjit.$(OBJEXT): $(top_srcdir)/internal/array.h yjit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h -yjit.$(OBJEXT): $(top_srcdir)/internal/bignum.h -yjit.$(OBJEXT): $(top_srcdir)/internal/bits.h yjit.$(OBJEXT): $(top_srcdir)/internal/class.h yjit.$(OBJEXT): $(top_srcdir)/internal/compile.h yjit.$(OBJEXT): $(top_srcdir)/internal/compilers.h @@ -20453,7 +18168,6 @@ 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/numeric.h yjit.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h yjit.$(OBJEXT): $(top_srcdir)/internal/serial.h yjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h @@ -20461,27 +18175,6 @@ 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/diagnostic.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/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_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_state_stack.h -yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h -yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string_list.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 @@ -20500,6 +18193,7 @@ yjit.$(OBJEXT): {$(VPATH)}debug.h yjit.$(OBJEXT): {$(VPATH)}debug_counter.h yjit.$(OBJEXT): {$(VPATH)}defines.h yjit.$(OBJEXT): {$(VPATH)}encoding.h +yjit.$(OBJEXT): {$(VPATH)}gc.h yjit.$(OBJEXT): {$(VPATH)}id.h yjit.$(OBJEXT): {$(VPATH)}id_table.h yjit.$(OBJEXT): {$(VPATH)}insns.def @@ -20545,7 +18239,6 @@ yjit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h yjit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h yjit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h yjit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -yjit.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h yjit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h yjit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h yjit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h @@ -20614,6 +18307,7 @@ yjit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h yjit.$(OBJEXT): {$(VPATH)}internal/intern/error.h yjit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h yjit.$(OBJEXT): {$(VPATH)}internal/intern/file.h +yjit.$(OBJEXT): {$(VPATH)}internal/intern/gc.h yjit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h yjit.$(OBJEXT): {$(VPATH)}internal/intern/io.h yjit.$(OBJEXT): {$(VPATH)}internal/intern/load.h @@ -20644,7 +18338,7 @@ yjit.$(OBJEXT): {$(VPATH)}internal/memory.h yjit.$(OBJEXT): {$(VPATH)}internal/method.h yjit.$(OBJEXT): {$(VPATH)}internal/module.h yjit.$(OBJEXT): {$(VPATH)}internal/newobj.h -yjit.$(OBJEXT): {$(VPATH)}internal/numeric.h +yjit.$(OBJEXT): {$(VPATH)}internal/rgengc.h yjit.$(OBJEXT): {$(VPATH)}internal/scan_args.h yjit.$(OBJEXT): {$(VPATH)}internal/special_consts.h yjit.$(OBJEXT): {$(VPATH)}internal/static_assert.h @@ -20662,15 +18356,11 @@ 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/version.h -yjit.$(OBJEXT): {$(VPATH)}prism_compile.h yjit.$(OBJEXT): {$(VPATH)}probes.dmyh yjit.$(OBJEXT): {$(VPATH)}probes.h yjit.$(OBJEXT): {$(VPATH)}probes_helper.h yjit.$(OBJEXT): {$(VPATH)}ruby_assert.h yjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h -yjit.$(OBJEXT): {$(VPATH)}rubyparser.h yjit.$(OBJEXT): {$(VPATH)}shape.h yjit.$(OBJEXT): {$(VPATH)}st.h yjit.$(OBJEXT): {$(VPATH)}subst.h @@ -187,12 +187,6 @@ 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 @@ -235,7 +229,7 @@ cmp_clamp(int argc, VALUE *argv, VALUE x) } } if (!NIL_P(min) && !NIL_P(max) && cmpint(min, max) > 0) { - rb_raise(rb_eArgError, "min argument must be less than or equal to max argument"); + rb_raise(rb_eArgError, "min argument must be smaller than max argument"); } if (!NIL_P(min)) { @@ -263,28 +257,25 @@ cmp_clamp(int argc, VALUE *argv, VALUE x) * <code>==</code>, <code>>=</code>, and <code>></code>) and the * method <code>between?</code>. * - * class StringSorter + * class SizeMatters * include Comparable - * * attr :str * def <=>(other) * str.size <=> other.str.size * end - * * def initialize(str) * @str = str * end - * * def inspect * @str * end * end * - * s1 = StringSorter.new("Z") - * s2 = StringSorter.new("YY") - * s3 = StringSorter.new("XXX") - * s4 = StringSorter.new("WWWW") - * s5 = StringSorter.new("VVVVV") + * s1 = SizeMatters.new("Z") + * s2 = SizeMatters.new("YY") + * s3 = SizeMatters.new("XXX") + * s4 = SizeMatters.new("WWWW") + * s5 = SizeMatters.new("VVVVV") * * s1 < s2 #=> true * s4.between?(s1, s3) #=> false @@ -298,8 +289,8 @@ cmp_clamp(int argc, VALUE *argv, VALUE x) * - #<: Returns whether +self+ is less than the given object. * - #<=: Returns whether +self+ is less than or equal to the given object. * - #==: Returns whether +self+ is equal to the given object. - * - #>: Returns whether +self+ is greater than the given object. - * - #>=: Returns whether +self+ is greater than or equal to the given object. + * - #>: Returns whether +self+ is greater than or equal to the given object. + * - #>=: Returns whether +self+ is greater than the given object. * - #between?: Returns +true+ if +self+ is between two given objects. * - #clamp: For given objects +min+ and +max+, or range <tt>(min..max)</tt>, returns: * @@ -17,6 +17,7 @@ #endif #include "encindex.h" +#include "gc.h" #include "id_table.h" #include "internal.h" #include "internal/array.h" @@ -24,7 +25,6 @@ #include "internal/complex.h" #include "internal/encoding.h" #include "internal/error.h" -#include "internal/gc.h" #include "internal/hash.h" #include "internal/numeric.h" #include "internal/object.h" @@ -39,7 +39,6 @@ #include "vm_core.h" #include "vm_callinfo.h" #include "vm_debug.h" -#include "yjit.h" #include "builtin.h" #include "insns.inc" @@ -119,7 +118,7 @@ struct ensure_range { }; struct iseq_compile_data_ensure_node_stack { - const void *ensure_node; + const NODE *ensure_node; struct iseq_compile_data_ensure_node_stack *prev; struct ensure_range *erange; }; @@ -333,10 +332,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, recv) \ +#define COMPILE_RECV(anchor, desc, node) \ (private_recv_p(node) ? \ (ADD_INSN(anchor, node, putself), VM_CALL_FCALL) : \ - COMPILE(anchor, desc, recv) ? 0 : -1) + COMPILE(anchor, desc, node->nd_recv) ? 0 : -1) #define OPERAND_AT(insn, idx) \ (((INSN*)(insn))->operands[(idx)]) @@ -487,6 +486,7 @@ static int iseq_set_local_table(rb_iseq_t *iseq, const rb_ast_id_table_t *tbl); 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); +static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor); 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); @@ -721,117 +721,6 @@ 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))); - } -} - VALUE rb_iseq_compile_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func * ifunc) { @@ -864,8 +753,8 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node) /* 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, RNODE_SCOPE(node)->nd_tbl); - iseq_set_arguments(iseq, ret, (NODE *)RNODE_SCOPE(node)->nd_args); + iseq_set_local_table(iseq, node->nd_tbl); + iseq_set_arguments(iseq, ret, node->nd_args); switch (ISEQ_BODY(iseq)->type) { case ISEQ_TYPE_BLOCK: @@ -880,7 +769,7 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node) 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); - CHECK(COMPILE(ret, "block body", RNODE_SCOPE(node)->nd_body)); + CHECK(COMPILE(ret, "block body", 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; @@ -893,23 +782,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", RNODE_SCOPE(node)->nd_body)); + CHECK(COMPILE(ret, "scoped node", 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 = RNODE_SCOPE(node)->nd_body; + ISEQ_COMPILE_DATA(iseq)->root_node = node->nd_body; ADD_TRACE(ret, RUBY_EVENT_CALL); - CHECK(COMPILE(ret, "scoped node", RNODE_SCOPE(node)->nd_body)); - ISEQ_COMPILE_DATA(iseq)->root_node = RNODE_SCOPE(node)->nd_body; + CHECK(COMPILE(ret, "scoped node", node->nd_body)); + ISEQ_COMPILE_DATA(iseq)->root_node = 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", RNODE_SCOPE(node)->nd_body)); + CHECK(COMPILE(ret, "scoped node", node->nd_body)); break; } } @@ -967,20 +856,6 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node) return iseq_setup(iseq, ret); } -static VALUE rb_translate_prism(pm_parser_t *parser, rb_iseq_t *iseq, pm_scope_node_t *scope_node, LINK_ANCHOR *const ret); - -VALUE -rb_iseq_compile_prism_node(rb_iseq_t * iseq, pm_scope_node_t *scope_node, pm_parser_t *parser) -{ - DECL_ANCHOR(ret); - INIT_ANCHOR(ret); - - CHECK(rb_translate_prism(parser, iseq, scope_node, ret)); - - CHECK(iseq_setup_insn(iseq, ret)); - return iseq_setup(iseq, ret); -} - static int rb_iseq_translate_threaded_code(rb_iseq_t *iseq) { @@ -997,11 +872,6 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq) } FL_SET((VALUE)iseq, ISEQ_TRANSLATED); #endif - -#if USE_YJIT - rb_yjit_live_iseq_count++; -#endif - return COMPILE_OK; } @@ -1374,7 +1244,7 @@ new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line) } static void -iseq_insn_each_markable_object(INSN *insn, void (*func)(VALUE, VALUE), VALUE data) +iseq_insn_each_markable_object(INSN *insn, void (*func)(VALUE *, VALUE), VALUE data) { const char *types = insn_op_types(insn->insn_id); for (int j = 0; types[j]; j++) { @@ -1385,7 +1255,7 @@ iseq_insn_each_markable_object(INSN *insn, void (*func)(VALUE, VALUE), VALUE dat case TS_VALUE: case TS_IC: // constant path array case TS_CALLDATA: // ci is stored. - func(OPERAND_AT(insn, j), data); + func(&OPERAND_AT(insn, j), data); break; default: break; @@ -1394,9 +1264,9 @@ iseq_insn_each_markable_object(INSN *insn, void (*func)(VALUE, VALUE), VALUE dat } static void -iseq_insn_each_object_write_barrier(VALUE obj, VALUE iseq) +iseq_insn_each_object_write_barrier(VALUE *obj_ptr, VALUE iseq) { - RB_OBJ_WRITTEN(iseq, Qundef, obj); + RB_OBJ_WRITTEN(iseq, Qundef, *obj_ptr); } static INSN * @@ -1485,8 +1355,7 @@ new_child_iseq(rb_iseq_t *iseq, const NODE *const node, rb_ast_body_t ast; ast.root = node; - ast.frozen_string_literal = -1; - ast.coverage_enabled = -1; + ast.compile_option = 0; ast.script_lines = ISEQ_BODY(iseq)->variable.script_lines; debugs("[new_child_iseq]> ---------------------------------------\n"); @@ -1515,14 +1384,11 @@ new_child_iseq_with_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_call } static void -set_catch_except_p(rb_iseq_t *iseq) +set_catch_except_p(struct rb_iseq_constant_body *body) { - RUBY_ASSERT(ISEQ_COMPILE_DATA(iseq)); - ISEQ_COMPILE_DATA(iseq)->catch_except_p = true; - if (ISEQ_BODY(iseq)->parent_iseq != NULL) { - if (ISEQ_COMPILE_DATA(ISEQ_BODY(iseq)->parent_iseq)) { - set_catch_except_p((rb_iseq_t *) ISEQ_BODY(iseq)->parent_iseq); - } + body->catch_except_p = true; + if (body->parent_iseq != NULL) { + set_catch_except_p(ISEQ_BODY(body->parent_iseq)); } } @@ -1534,7 +1400,7 @@ set_catch_except_p(rb_iseq_t *iseq) So this function sets true for limited ISeqs with break/next/redo catch table entries whose child ISeq would really raise an exception. */ static void -update_catch_except_flags(rb_iseq_t *iseq, struct rb_iseq_constant_body *body) +update_catch_except_flags(struct rb_iseq_constant_body *body) { unsigned int pos; size_t i; @@ -1547,7 +1413,7 @@ update_catch_except_flags(rb_iseq_t *iseq, struct rb_iseq_constant_body *body) while (pos < body->iseq_size) { insn = rb_vm_insn_decode(body->iseq_encoded[pos]); if (insn == BIN(throw)) { - set_catch_except_p(iseq); + set_catch_except_p(body); break; } pos += insn_len(insn); @@ -1562,8 +1428,7 @@ update_catch_except_flags(rb_iseq_t *iseq, struct rb_iseq_constant_body *body) if (entry->type != CATCH_TYPE_BREAK && entry->type != CATCH_TYPE_NEXT && entry->type != CATCH_TYPE_REDO) { - RUBY_ASSERT(ISEQ_COMPILE_DATA(iseq)); - ISEQ_COMPILE_DATA(iseq)->catch_except_p = true; + body->catch_except_p = true; break; } } @@ -1575,9 +1440,9 @@ iseq_insert_nop_between_end_and_cont(rb_iseq_t *iseq) VALUE catch_table_ary = ISEQ_COMPILE_DATA(iseq)->catch_table_ary; if (NIL_P(catch_table_ary)) return; unsigned int i, tlen = (unsigned int)RARRAY_LEN(catch_table_ary); - const VALUE *tptr = RARRAY_CONST_PTR(catch_table_ary); + const VALUE *tptr = RARRAY_CONST_PTR_TRANSIENT(catch_table_ary); for (i = 0; i < tlen; i++) { - const VALUE *ptr = RARRAY_CONST_PTR(tptr[i]); + const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(tptr[i]); LINK_ELEMENT *end = (LINK_ELEMENT *)(ptr[2] & ~1); LINK_ELEMENT *cont = (LINK_ELEMENT *)(ptr[4] & ~1); LINK_ELEMENT *e; @@ -1624,6 +1489,13 @@ iseq_setup_insn(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) dump_disasm_list(FIRST_ELEMENT(anchor)); } + if (ISEQ_COMPILE_DATA(iseq)->option->stack_caching) { + debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n"); + iseq_set_sequence_stackcaching(iseq, anchor); + if (compile_debug > 5) + dump_disasm_list(FIRST_ELEMENT(anchor)); + } + debugs("[compile step 3.4 (iseq_insert_nop_between_end_and_cont)]\n"); iseq_insert_nop_between_end_and_cont(iseq); if (compile_debug > 5) @@ -1653,12 +1525,10 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) if (!rb_iseq_translate_threaded_code(iseq)) return COMPILE_NG; debugs("[compile step 6 (update_catch_except_flags)] \n"); - RUBY_ASSERT(ISEQ_COMPILE_DATA(iseq)); - update_catch_except_flags(iseq, ISEQ_BODY(iseq)); + update_catch_except_flags(ISEQ_BODY(iseq)); debugs("[compile step 6.1 (remove unused catch tables)] \n"); - RUBY_ASSERT(ISEQ_COMPILE_DATA(iseq)); - if (!ISEQ_COMPILE_DATA(iseq)->catch_except_p && ISEQ_BODY(iseq)->catch_table) { + if (!ISEQ_BODY(iseq)->catch_except_p && ISEQ_BODY(iseq)->catch_table) { xfree(ISEQ_BODY(iseq)->catch_table); ISEQ_BODY(iseq)->catch_table = NULL; } @@ -1899,7 +1769,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 rb_node_kw_arg_t *node = args->kw_args; + const NODE *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); @@ -1918,7 +1788,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, node = args->kw_args; while (node) { - const NODE *val_node = get_nd_value(node->nd_body); + const NODE *val_node = node->nd_body->nd_value; VALUE dv; if (val_node == NODE_SPECIAL_REQUIRED_KEYWORD) { @@ -1927,7 +1797,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, else { switch (nd_type(val_node)) { case NODE_LIT: - dv = RNODE_LIT(val_node)->nd_lit; + dv = val_node->nd_lit; break; case NODE_NIL: dv = Qnil; @@ -1939,7 +1809,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, dv = Qfalse; break; default: - NO_CHECK(COMPILE_POPPED(optargs, "kwarg", RNODE(node))); /* nd_type_p(node, NODE_KW_ARG) */ + NO_CHECK(COMPILE_POPPED(optargs, "kwarg", node)); /* nd_type_p(node, NODE_KW_ARG) */ dv = complex_mark; } @@ -1952,7 +1822,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, keyword->num = kw; - if (RNODE_DVAR(args->kw_rest_arg)->nd_vid != 0) { + if (args->kw_rest_arg->nd_vid != 0) { keyword->rest_start = arg_size++; body->param.flags.has_kwrest = TRUE; } @@ -1983,7 +1853,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 = &RNODE_ARGS(node_args)->nd_ainfo; + struct rb_args_info *args = node_args->nd_ainfo; ID rest_id = 0; int last_comma = 0; ID block_id = 0; @@ -2004,14 +1874,14 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons block_id = args->block_arg; if (args->opt_args) { - const rb_node_opt_arg_t *node = args->opt_args; + const NODE *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(RNODE(node))); + label = NEW_LABEL(nd_line(node)); rb_ary_push(labels, (VALUE)label | 1); ADD_LABEL(optargs, label); NO_CHECK(COMPILE_POPPED(optargs, "optarg", node->nd_body)); @@ -2026,7 +1896,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons opt_table = ALLOC_N(VALUE, i+1); - MEMCPY(opt_table, RARRAY_CONST_PTR(labels), VALUE, i+1); + MEMCPY(opt_table, RARRAY_CONST_PTR_TRANSIENT(labels), VALUE, i+1); for (j = 0; j < i+1; j++) { opt_table[j] &= ~1; } @@ -2512,12 +2382,7 @@ 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); - if (ISEQ_IS_SIZE(body)) { - body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, ISEQ_IS_SIZE(body)); - } - else { - body->is_entries = NULL; - } + 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); ISEQ_COMPILE_DATA(iseq)->ci_index = 0; @@ -2656,8 +2521,8 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) case TS_CALLDATA: { const struct rb_callinfo *source_ci = (const struct rb_callinfo *)operands[j]; - 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; @@ -2799,14 +2664,14 @@ iseq_set_exception_table(rb_iseq_t *iseq) 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); + tptr = RARRAY_CONST_PTR_TRANSIENT(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++) { - ptr = RARRAY_CONST_PTR(tptr[i]); + ptr = RARRAY_CONST_PTR_TRANSIENT(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)); @@ -2975,7 +2840,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]++; } } @@ -2992,8 +2856,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); @@ -3487,7 +3350,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal previ == BIN(getlocal) || previ == BIN(getblockparam) || previ == BIN(getblockparamproxy) || - previ == BIN(getinstancevariable) || + /* getinstancevariable may issue a warning */ previ == BIN(duparray)) { /* just push operand or static value and pop soon, no * side effects */ @@ -3814,10 +3677,6 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal if (IS_TRACE(iobj->link.next)) { 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; - } } } } @@ -3835,166 +3694,6 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal } } - if (IS_INSN_ID(iobj, splatarray) && OPERAND_AT(iobj, 0) == Qtrue) { - LINK_ELEMENT *niobj = &iobj->link; - - /* - * Eliminate array allocation for f(1, *a) - * - * splatarray true - * send ARGS_SPLAT and not KW_SPLAT|ARGS_BLOCKARG - * => - * splatarray false - * send - */ - if (IS_NEXT_INSN_ID(niobj, send)) { - niobj = niobj->next; - unsigned int flag = vm_ci_flag((const struct rb_callinfo *)OPERAND_AT(niobj, 0)); - if ((flag & VM_CALL_ARGS_SPLAT) && !(flag & (VM_CALL_KW_SPLAT|VM_CALL_ARGS_BLOCKARG))) { - OPERAND_AT(iobj, 0) = Qfalse; - } - } else if (IS_NEXT_INSN_ID(niobj, getlocal) || IS_NEXT_INSN_ID(niobj, getinstancevariable)) { - niobj = niobj->next; - - if (IS_NEXT_INSN_ID(niobj, send)) { - niobj = niobj->next; - unsigned int flag = vm_ci_flag((const struct rb_callinfo *)OPERAND_AT(niobj, 0)); - - if ((flag & VM_CALL_ARGS_SPLAT)) { - /* - * Eliminate array allocation for f(1, *a, &lvar) and f(1, *a, &@iv) - * - * splatarray true - * getlocal / getinstancevariable - * send ARGS_SPLAT|ARGS_BLOCKARG and not KW_SPLAT - * => - * splatarray false - * getlocal / getinstancevariable - * send - */ - if ((flag & VM_CALL_ARGS_BLOCKARG) && !(flag & VM_CALL_KW_SPLAT)) { - OPERAND_AT(iobj, 0) = Qfalse; - } - - /* - * Eliminate array allocation for f(*a, **lvar) and f(*a, **@iv) - * - * splatarray true - * getlocal / getinstancevariable - * send ARGS_SPLAT|KW_SPLAT and not ARGS_BLOCKARG - * => - * splatarray false - * getlocal / getinstancevariable - * send - */ - else if (!(flag & VM_CALL_ARGS_BLOCKARG) && (flag & VM_CALL_KW_SPLAT)) { - OPERAND_AT(iobj, 0) = Qfalse; - } - } - } - else if (IS_NEXT_INSN_ID(niobj, getlocal) || IS_NEXT_INSN_ID(niobj, getinstancevariable) || - IS_NEXT_INSN_ID(niobj, getblockparamproxy)) { - niobj = niobj->next; - - /* - * Eliminate array allocation for f(*a, **lvar, &lvar) and f(*a, **@iv, &@iv) - * - * splatarray true - * getlocal / getinstancevariable - * getlocal / getinstancevariable / getblockparamproxy - * send ARGS_SPLAT|KW_SPLAT|ARGS_BLOCKARG - * => - * splatarray false - * getlocal / getinstancevariable - * getlocal / getinstancevariable / getblockparamproxy - * send - */ - if (IS_NEXT_INSN_ID(niobj, send)) { - niobj = niobj->next; - unsigned int flag = vm_ci_flag((const struct rb_callinfo *)OPERAND_AT(niobj, 0)); - - if ((flag & VM_CALL_ARGS_SPLAT) && (flag & VM_CALL_KW_SPLAT) && (flag & VM_CALL_ARGS_BLOCKARG)) { - OPERAND_AT(iobj, 0) = Qfalse; - } - } - } - } - else if (IS_NEXT_INSN_ID(niobj, getblockparamproxy)) { - niobj = niobj->next; - - if (IS_NEXT_INSN_ID(niobj, send)) { - niobj = niobj->next; - unsigned int flag = vm_ci_flag((const struct rb_callinfo *)OPERAND_AT(niobj, 0)); - - /* - * Eliminate array allocation for f(1, *a, &arg) - * - * splatarray true - * getblockparamproxy - * send ARGS_SPLAT|ARGS_BLOCKARG and not KW_SPLAT - * => - * splatarray false - * getblockparamproxy - * send - */ - if ((flag & VM_CALL_ARGS_BLOCKARG) & (flag & VM_CALL_ARGS_SPLAT) && !(flag & VM_CALL_KW_SPLAT)) { - OPERAND_AT(iobj, 0) = Qfalse; - } - } - } - else if (IS_NEXT_INSN_ID(niobj, duphash)) { - niobj = niobj->next; - - /* - * Eliminate array allocation for f(*a, kw: 1) - * - * splatarray true - * duphash - * send ARGS_SPLAT|KW_SPLAT|KW_SPLAT_MUT and not ARGS_BLOCKARG - * => - * splatarray false - * duphash - * send - */ - if (IS_NEXT_INSN_ID(niobj, send)) { - niobj = niobj->next; - unsigned int flag = vm_ci_flag((const struct rb_callinfo *)OPERAND_AT(niobj, 0)); - - if ((flag & VM_CALL_ARGS_SPLAT) && (flag & VM_CALL_KW_SPLAT) && - (flag & VM_CALL_KW_SPLAT_MUT) && !(flag & VM_CALL_ARGS_BLOCKARG)) { - OPERAND_AT(iobj, 0) = Qfalse; - } - } - else if (IS_NEXT_INSN_ID(niobj, getlocal) || IS_NEXT_INSN_ID(niobj, getinstancevariable) || - IS_NEXT_INSN_ID(niobj, getblockparamproxy)) { - niobj = niobj->next; - - /* - * Eliminate array allocation for f(*a, kw: 1, &lvar) and f(*a, kw: 1, &@iv) - * - * splatarray true - * duphash - * getlocal / getinstancevariable / getblockparamproxy - * send ARGS_SPLAT|KW_SPLAT|KW_SPLAT_MUT|ARGS_BLOCKARG - * => - * splatarray false - * duphash - * getlocal / getinstancevariable / getblockparamproxy - * send - */ - if (IS_NEXT_INSN_ID(niobj, send)) { - niobj = niobj->next; - unsigned int flag = vm_ci_flag((const struct rb_callinfo *)OPERAND_AT(niobj, 0)); - - if ((flag & VM_CALL_ARGS_SPLAT) && (flag & VM_CALL_KW_SPLAT) && - (flag & VM_CALL_KW_SPLAT_MUT) && (flag & VM_CALL_ARGS_BLOCKARG)) { - OPERAND_AT(iobj, 0) = Qfalse; - } - } - } - } - } - return COMPILE_OK; } @@ -4030,18 +3729,13 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) if ((vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) && vm_ci_argc(ci) == 0) { switch (vm_ci_mid(ci)) { case idMax: + iobj->insn_id = BIN(opt_newarray_max); + ELEM_REMOVE(&niobj->link); + return COMPILE_OK; case idMin: - case idHash: - { - VALUE num = 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] = num; - iobj->operands[1] = rb_id2sym(vm_ci_mid(ci)); - iobj->operand_size = insn_len(iobj->insn_id) - 1; - ELEM_REMOVE(&niobj->link); - return COMPILE_OK; - } + iobj->insn_id = BIN(opt_newarray_min); + ELEM_REMOVE(&niobj->link); + return COMPILE_OK; } } } @@ -4135,7 +3829,7 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) int do_block_optimization = 0; - if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_BLOCK && !ISEQ_COMPILE_DATA(iseq)->catch_except_p) { + if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_BLOCK && !ISEQ_BODY(iseq)->catch_except_p) { do_block_optimization = 1; } @@ -4273,6 +3967,167 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) return COMPILE_OK; } +#if OPT_STACK_CACHING + +#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)] +#define SC_NEXT(insn) sc_insn_next[(insn)] + +#include "opt_sc.inc" + +static int +insn_set_sc_state(rb_iseq_t *iseq, const LINK_ELEMENT *anchor, INSN *iobj, int state) +{ + int nstate; + int insn_id; + + insn_id = iobj->insn_id; + iobj->insn_id = SC_INSN(insn_id, state); + nstate = SC_NEXT(iobj->insn_id); + + if (insn_id == BIN(jump) || + insn_id == BIN(branchif) || insn_id == BIN(branchunless)) { + LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0); + + if (lobj->sc_state != 0) { + if (lobj->sc_state != nstate) { + BADINSN_DUMP(anchor, iobj, lobj); + COMPILE_ERROR(iseq, iobj->insn_info.line_no, + "insn_set_sc_state error: %d at "LABEL_FORMAT + ", %d expected\n", + lobj->sc_state, lobj->label_no, nstate); + return COMPILE_NG; + } + } + else { + lobj->sc_state = nstate; + } + if (insn_id == BIN(jump)) { + nstate = SCS_XX; + } + } + else if (insn_id == BIN(leave)) { + nstate = SCS_XX; + } + + return nstate; +} + +static int +label_set_sc_state(LABEL *lobj, int state) +{ + if (lobj->sc_state != 0) { + if (lobj->sc_state != state) { + state = lobj->sc_state; + } + } + else { + lobj->sc_state = state; + } + + return state; +} + + +#endif + +static int +iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) +{ +#if OPT_STACK_CACHING + LINK_ELEMENT *list; + int state, insn_id; + + /* initialize */ + state = SCS_XX; + list = FIRST_ELEMENT(anchor); + /* dump_disasm_list(list); */ + + /* for each list element */ + while (list) { + redo_point: + switch (list->type) { + case ISEQ_ELEMENT_INSN: + { + INSN *iobj = (INSN *)list; + insn_id = iobj->insn_id; + + /* dump_disasm_list(list); */ + + switch (insn_id) { + case BIN(nop): + { + /* exception merge point */ + if (state != SCS_AX) { + NODE dummy_line_node = generate_dummy_line_node(0, -1); + INSN *rpobj = + new_insn_body(iseq, &dummy_line_node, BIN(reput), 0); + + /* replace this insn */ + ELEM_REPLACE(list, (LINK_ELEMENT *)rpobj); + list = (LINK_ELEMENT *)rpobj; + goto redo_point; + } + break; + } + case BIN(swap): + { + if (state == SCS_AB || state == SCS_BA) { + state = (state == SCS_AB ? SCS_BA : SCS_AB); + + ELEM_REMOVE(list); + list = list->next; + goto redo_point; + } + break; + } + case BIN(pop): + { + switch (state) { + case SCS_AX: + case SCS_BX: + state = SCS_XX; + break; + case SCS_AB: + state = SCS_AX; + break; + case SCS_BA: + state = SCS_BX; + break; + case SCS_XX: + goto normal_insn; + default: + COMPILE_ERROR(iseq, iobj->insn_info.line_no, + "unreachable"); + return COMPILE_NG; + } + /* remove useless pop */ + ELEM_REMOVE(list); + list = list->next; + goto redo_point; + } + default:; + /* none */ + } /* end of switch */ + normal_insn: + state = insn_set_sc_state(iseq, anchor, iobj, state); + break; + } + case ISEQ_ELEMENT_LABEL: + { + LABEL *lobj; + lobj = (LABEL *)list; + + state = label_set_sc_state(lobj, state); + } + default: + break; + } + list = list->next; + } +#endif + return COMPILE_OK; +} + static int all_string_result_p(const NODE *node) { @@ -4281,16 +4136,16 @@ all_string_result_p(const NODE *node) case NODE_STR: case NODE_DSTR: return TRUE; case NODE_IF: case NODE_UNLESS: - 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); + 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); return FALSE; case NODE_AND: case NODE_OR: - 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)) + if (!node->nd_2nd) + return all_string_result_p(node->nd_1st); + if (!all_string_result_p(node->nd_1st)) return FALSE; - return all_string_result_p(RNODE_AND(node)->nd_2nd); + return all_string_result_p(node->nd_2nd); default: return FALSE; } @@ -4299,8 +4154,8 @@ all_string_result_p(const NODE *node) static int compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int *cntp) { - const struct RNode_LIST *list = RNODE_DSTR(node)->nd_next; - VALUE lit = RNODE_DSTR(node)->nd_lit; + const NODE *list = node->nd_next; + VALUE lit = node->nd_lit; LINK_ELEMENT *first_lit = 0; int cnt = 0; @@ -4321,7 +4176,7 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cons while (list) { const NODE *const head = list->nd_head; if (nd_type_p(head, NODE_STR)) { - lit = rb_fstring(RNODE_STR(head)->nd_lit); + lit = rb_fstring(head->nd_lit); ADD_INSN1(ret, head, putobject, lit); RB_OBJ_WRITTEN(iseq, Qundef, lit); lit = Qnil; @@ -4330,7 +4185,7 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cons CHECK(COMPILE(ret, "each string", head)); } cnt++; - list = (struct RNode_LIST *)list->nd_next; + list = list->nd_next; } if (NIL_P(lit) && first_lit) { ELEM_REMOVE(first_lit); @@ -4345,12 +4200,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", RNODE_BLOCK(node)->nd_head, - (RNODE_BLOCK(node)->nd_next ? 1 : popped))); - node = RNODE_BLOCK(node)->nd_next; + CHECK(COMPILE_(ret, "BLOCK body", node->nd_head, + (node->nd_next ? 1 : popped))); + node = node->nd_next; } if (node) { - CHECK(COMPILE_(ret, "BLOCK next", RNODE_BLOCK(node)->nd_next, popped)); + CHECK(COMPILE_(ret, "BLOCK next", node->nd_next, popped)); } return COMPILE_OK; } @@ -4359,8 +4214,8 @@ static int compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node) { int cnt; - if (!RNODE_DSTR(node)->nd_next) { - VALUE lit = rb_fstring(RNODE_DSTR(node)->nd_lit); + if (!node->nd_next) { + VALUE lit = rb_fstring(node->nd_lit); ADD_INSN1(ret, node, putstring, lit); RB_OBJ_WRITTEN(iseq, Qundef, lit); } @@ -4372,28 +4227,11 @@ compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node) } static int -compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped) +compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node) { int cnt; - - if (!RNODE_DREGX(node)->nd_next) { - VALUE match = RNODE_DREGX(node)->nd_lit; - if (RB_TYPE_P(match, T_REGEXP)) { - if (!popped) { - ADD_INSN1(ret, node, putobject, match); - RB_OBJ_WRITTEN(iseq, Qundef, match); - } - return COMPILE_OK; - } - } - CHECK(compile_dstr_fragments(iseq, ret, node, &cnt)); - ADD_INSN2(ret, node, toregexp, INT2FIX(RNODE_DREGX(node)->nd_cflag), INT2FIX(cnt)); - - if (popped) { - ADD_INSN(ret, node, pop); - } - + ADD_INSN2(ret, node, toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt)); return COMPILE_OK; } @@ -4411,7 +4249,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", RNODE_FLIP2(node)->nd_beg)); + CHECK(COMPILE(ret, "flip2 beg", node->nd_beg)); ADD_INSNL(ret, node, branchunless, else_label); ADD_INSN1(ret, node, putobject, Qtrue); ADD_INSN1(ret, node, setspecial, key); @@ -4421,7 +4259,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", RNODE_FLIP2(node)->nd_end)); + CHECK(COMPILE(ret, "flip2 end", node->nd_end)); ADD_INSNL(ret, node, branchunless, then_label); ADD_INSN1(ret, node, putobject, Qfalse); ADD_INSN1(ret, node, setspecial, key); @@ -4431,62 +4269,37 @@ 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 *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) -{ - DECL_ANCHOR(seq); - INIT_ANCHOR(seq); - LABEL *label = NEW_LABEL(nd_line(cond)); - if (!then_label) then_label = label; - else if (!else_label) else_label = label; - - CHECK(compile_branch_condition(iseq, seq, cond, then_label, else_label)); - - 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 COMPILE_OK; - } - if (!label->refcnt) { - 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 *ret, const NODE *cond, +compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cond, LABEL *then_label, LABEL *else_label) { - int ok; - DECL_ANCHOR(ignore); - again: switch (nd_type(cond)) { case NODE_AND: - 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; + { + LABEL *label = NEW_LABEL(nd_line(cond)); + CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, label, + else_label)); + if (!label->refcnt) { + ADD_INSN(ret, cond, putnil); + break; + } + ADD_LABEL(ret, label); + cond = cond->nd_2nd; + goto again; + } case NODE_OR: - 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; + { + LABEL *label = NEW_LABEL(nd_line(cond)); + CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, then_label, + label)); + if (!label->refcnt) { + ADD_INSN(ret, cond, putnil); + break; + } + ADD_LABEL(ret, label); + cond = cond->nd_2nd; + goto again; + } case NODE_LIT: /* NODE_LIT is always true */ case NODE_TRUE: case NODE_STR: @@ -4517,28 +4330,7 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *cond, CHECK(compile_defined_expr(iseq, ret, cond, Qfalse)); break; default: - { - DECL_ANCHOR(cond_seq); - INIT_ANCHOR(cond_seq); - - CHECK(COMPILE(cond_seq, "branch condition", cond)); - - 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])) { - ADD_INSNL(ret, cond, jump, then_label); - // maybe unreachable - return COMPILE_OK; - } - else { - ADD_INSNL(ret, cond, jump, else_label); - return COMPILE_OK; - } - } - } - ADD_SEQ(ret, cond_seq); - } + CHECK(COMPILE(ret, "branch condition", cond)); break; } @@ -4552,35 +4344,33 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *cond, static int keyword_node_p(const NODE *const node) { - return nd_type_p(node, NODE_HASH) && (RNODE_HASH(node)->nd_brace & HASH_BRACE) != HASH_BRACE; + return nd_type_p(node, NODE_HASH) && (node->nd_brace & HASH_BRACE) != HASH_BRACE; } static int compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, - const NODE *const root_node, - struct rb_callinfo_kwarg **const kw_arg_ptr, - unsigned int *flag) + const NODE *const root_node, + struct rb_callinfo_kwarg **const kw_arg_ptr, + unsigned int *flag) { - RUBY_ASSERT(nd_type_p(root_node, NODE_HASH)); - RUBY_ASSERT(kw_arg_ptr != NULL); - RUBY_ASSERT(flag != NULL); + if (kw_arg_ptr == NULL) return FALSE; - 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; + if (root_node->nd_head && nd_type_p(root_node->nd_head, NODE_LIST)) { + const NODE *node = root_node->nd_head; int seen_nodes = 0; while (node) { - const NODE *key_node = RNODE_LIST(node)->nd_head; + const NODE *key_node = node->nd_head; seen_nodes++; assert(nd_type_p(node, NODE_LIST)); - if (key_node && nd_type_p(key_node, NODE_LIT) && SYMBOL_P(RNODE_LIT(key_node)->nd_lit)) { + if (key_node && nd_type_p(key_node, NODE_LIT) && SYMBOL_P(key_node->nd_lit)) { /* can be keywords */ } else { if (flag) { *flag |= VM_CALL_KW_SPLAT; - if (seen_nodes > 1 || RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) { + if (seen_nodes > 1 || 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. @@ -4590,27 +4380,26 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, } return FALSE; } - node = RNODE_LIST(node)->nd_next; /* skip value node */ - node = RNODE_LIST(node)->nd_next; + node = node->nd_next; /* skip value node */ + node = node->nd_next; } /* may be keywords */ - node = RNODE_HASH(root_node)->nd_head; + node = root_node->nd_head; { - int len = (int)RNODE_LIST(node)->as.nd_alen / 2; + int len = (int)node->nd_alen / 2; 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; - kw_arg->references = 0; kw_arg->keyword_len = len; *kw_arg_ptr = kw_arg; - 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; - keywords[i] = RNODE_LIT(key_node)->nd_lit; + 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)); } assert(i == len); @@ -4621,21 +4410,26 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, } static int -compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, NODE **kwnode_ptr) +compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, + struct rb_callinfo_kwarg **keywords_ptr, unsigned int *flag) { int len = 0; - for (; node; len++, node = RNODE_LIST(node)->nd_next) { + for (; node; len++, node = node->nd_next) { if (CPDEBUG > 0) { EXPECT_NODE("compile_args", node, NODE_LIST, -1); } - 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; + if (node->nd_next == NULL && keyword_node_p(node->nd_head)) { /* last node */ + if (compile_keyword_arg(iseq, ret, node->nd_head, keywords_ptr, flag)) { + len--; + } + else { + compile_hash(iseq, ret, node->nd_head, TRUE, FALSE); + } } else { - RUBY_ASSERT(!keyword_node_p(RNODE_LIST(node)->nd_head)); - NO_CHECK(COMPILE_(ret, "array element", RNODE_LIST(node)->nd_head, FALSE)); + NO_CHECK(COMPILE_(ret, "array element", node->nd_head, FALSE)); } } @@ -4672,15 +4466,15 @@ static_literal_value(const NODE *node, rb_iseq_t *iseq) 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(RNODE_STR(node)->nd_lit); + 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); } else { - return rb_fstring(RNODE_STR(node)->nd_lit); + return rb_fstring(node->nd_lit); } default: - return RNODE_LIT(node)->nd_lit; + return node->nd_lit; } } @@ -4699,8 +4493,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 = RNODE_LIST(node)->nd_next) { - NO_CHECK(COMPILE_(ret, "array element", RNODE_LIST(node)->nd_head, popped)); + for (; node; node = node->nd_next) { + NO_CHECK(COMPILE_(ret, "array element", node->nd_head, popped)); } return 1; } @@ -4759,10 +4553,10 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop int count = 1; /* pre-allocation check (this branch can be omittable) */ - if (static_literal_node_p(RNODE_LIST(node)->nd_head, iseq)) { + if (static_literal_node_p(node->nd_head, iseq)) { /* count the elements that are optimizable */ - const NODE *node_tmp = RNODE_LIST(node)->nd_next; - for (; node_tmp && static_literal_node_p(RNODE_LIST(node_tmp)->nd_head, iseq); node_tmp = RNODE_LIST(node_tmp)->nd_next) + 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) count++; if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_ary_len) { @@ -4770,8 +4564,8 @@ 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 = RNODE_LIST(node)->nd_next) - rb_ary_push(ary, static_literal_value(RNODE_LIST(node)->nd_head, iseq)); + for (; count; count--, node = node->nd_next) + rb_ary_push(ary, static_literal_value(node->nd_head, iseq)); OBJ_FREEZE(ary); /* Emit optimized code */ @@ -4789,15 +4583,15 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop } /* Base case: Compile "count" elements */ - for (; count; count--, node = RNODE_LIST(node)->nd_next) { + for (; count; count--, node = node->nd_next) { if (CPDEBUG > 0) { EXPECT_NODE("compile_array", node, NODE_LIST, -1); } - NO_CHECK(COMPILE_(ret, "array element", RNODE_LIST(node)->nd_head, 0)); + NO_CHECK(COMPILE_(ret, "array element", node->nd_head, 0)); stack_len++; - if (!RNODE_LIST(node)->nd_next && keyword_node_p(RNODE_LIST(node)->nd_head)) { + if (!node->nd_next && keyword_node_p(node->nd_head)) { /* Reached the end, and the last element is a keyword */ FLUSH_CHUNK(newarraykwsplat); return 1; @@ -4826,7 +4620,12 @@ compile_array_1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node) } else { CHECK(COMPILE_(ret, "array element", node, FALSE)); - ADD_INSN1(ret, node, newarray, INT2FIX(1)); + if (keyword_node_p(node)) { + ADD_INSN1(ret, node, newarraykwsplat, INT2FIX(1)); + } + else { + ADD_INSN1(ret, node, newarray, INT2FIX(1)); + } } return 1; @@ -4835,7 +4634,7 @@ compile_array_1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node) static inline int static_literal_node_pair_p(const NODE *node, const rb_iseq_t *iseq) { - return RNODE_LIST(node)->nd_head && static_literal_node_p(RNODE_LIST(node)->nd_head, iseq) && static_literal_node_p(RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head, iseq); + return node->nd_head && static_literal_node_p(node->nd_head, iseq) && static_literal_node_p(node->nd_next->nd_head, iseq); } static int @@ -4843,7 +4642,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth { const NODE *line_node = node; - node = RNODE_HASH(node)->nd_head; + node = node->nd_head; if (!node || nd_type_p(node, NODE_ZLIST)) { if (!popped) { @@ -4855,8 +4654,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 = RNODE_LIST(node)->nd_next) { - NO_CHECK(COMPILE_(ret, "hash element", RNODE_LIST(node)->nd_head, popped)); + for (; node; node = node->nd_next) { + NO_CHECK(COMPILE_(ret, "hash element", node->nd_head, popped)); } return 1; } @@ -4909,8 +4708,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 = 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) + 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) count++; if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_hash_len) { @@ -4918,14 +4717,14 @@ 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 = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) { + for (; count; count--, node = node->nd_next->nd_next) { VALUE elem[2]; - 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); + elem[0] = static_literal_value(node->nd_head, iseq); + elem[1] = static_literal_value(node->nd_next->nd_head, iseq); rb_ary_cat(ary, elem, 2); } VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary) / 2); - rb_hash_bulk_insert(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary), hash); + rb_hash_bulk_insert(RARRAY_LEN(ary), RARRAY_CONST_PTR_TRANSIENT(ary), hash); hash = rb_obj_hide(hash); OBJ_FREEZE(hash); @@ -4948,16 +4747,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 = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) { + for (; count; count--, node = node->nd_next->nd_next) { if (CPDEBUG > 0) { EXPECT_NODE("compile_hash", node, NODE_LIST, -1); } - if (RNODE_LIST(node)->nd_head) { + if (node->nd_head) { /* Normal key-value pair */ - 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)); + NO_CHECK(COMPILE_(anchor, "hash key element", node->nd_head, 0)); + NO_CHECK(COMPILE_(anchor, "hash value element", node->nd_next->nd_head, 0)); stack_len += 2; /* If there are many pushed elements, flush them to avoid stack overflow */ @@ -4967,10 +4766,10 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth /* kwsplat case: foo(..., **kw, ...) */ FLUSH_CHUNK(); - const NODE *kw = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head; - int empty_kw = nd_type_p(kw, NODE_LIT) && RB_TYPE_P(RNODE_LIT(kw)->nd_lit, T_HASH); /* foo( ..., **{}, ...) */ + 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( ..., **{}, ...) */ int first_kw = first_chunk && stack_len == 0; /* foo(1,2,3, **kw, ...) */ - int last_kw = !RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next; /* foo( ..., **kw) */ + int last_kw = !node->nd_next->nd_next; /* foo( ..., **kw) */ int only_kw = last_kw && first_kw; /* foo(1,2,3, **kw) */ if (empty_kw) { @@ -5033,7 +4832,7 @@ rb_node_case_when_optimizable_literal(const NODE *const node) { switch (nd_type(node)) { case NODE_LIT: { - VALUE v = RNODE_LIT(node)->nd_lit; + VALUE v = node->nd_lit; double ival; if (RB_FLOAT_TYPE_P(v) && modf(RFLOAT_VALUE(v), &ival) == 0.0) { @@ -5054,7 +4853,7 @@ rb_node_case_when_optimizable_literal(const NODE *const node) case NODE_FALSE: return Qfalse; case NODE_STR: - return rb_fstring(RNODE_STR(node)->nd_lit); + return rb_fstring(node->nd_lit); } return Qundef; } @@ -5064,7 +4863,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 = RNODE_LIST(vals)->nd_head; + const NODE *val = vals->nd_head; VALUE lit = rb_node_case_when_optimizable_literal(val); if (UNDEF_P(lit)) { @@ -5075,8 +4874,8 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals, } if (nd_type_p(val, NODE_STR)) { - debugp_param("nd_lit", RNODE_STR(val)->nd_lit); - lit = rb_fstring(RNODE_STR(val)->nd_lit); + debugp_param("nd_lit", val->nd_lit); + lit = rb_fstring(val->nd_lit); ADD_INSN1(cond_seq, val, putobject, lit); RB_OBJ_WRITTEN(iseq, Qundef, lit); } @@ -5084,11 +4883,11 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals, if (!COMPILE(cond_seq, "when cond", val)) return -1; } - // Emit pattern === target + // Emit patern === target ADD_INSN1(cond_seq, vals, topn, INT2FIX(1)); ADD_CALL(cond_seq, vals, idEqq, INT2FIX(1)); ADD_INSNL(cond_seq, val, branchif, l1); - vals = RNODE_LIST(vals)->nd_next; + vals = vals->nd_next; } return only_special_literals; } @@ -5106,19 +4905,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", RNODE_SPLAT(vals)->nd_head)); + CHECK(COMPILE(cond_seq, "when 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, 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)); + 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)); break; case NODE_ARGSPUSH: - CHECK(when_splat_vals(iseq, cond_seq, RNODE_ARGSPUSH(vals)->nd_head, l1, only_special_literals, literals)); + CHECK(when_splat_vals(iseq, cond_seq, vals->nd_head, l1, only_special_literals, literals)); ADD_INSN (cond_seq, line_node, dup); - CHECK(COMPILE(cond_seq, "when argspush body", RNODE_ARGSPUSH(vals)->nd_body)); + CHECK(COMPILE(cond_seq, "when argspush body", vals->nd_body)); ADD_INSN1(cond_seq, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE)); ADD_INSNL(cond_seq, line_node, branchif, l1); break; @@ -5277,12 +5076,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; @@ -5301,7 +5105,9 @@ 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); ci = ci_argc_set(iseq, ci, argc - 1); @@ -5310,9 +5116,11 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const INSERT_BEFORE_INSN1(iobj, line_node, newarray, INT2FIX(1)); INSERT_BEFORE_INSN(iobj, line_node, concatarray); } - 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); @@ -5338,7 +5146,7 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const break; } case NODE_CDECL: - if (!RNODE_CDECL(node)->nd_vid) { + if (!node->nd_vid) { /* Special handling only needed for expr::C, not for C */ INSN *iobj; @@ -5376,8 +5184,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, RNODE_LIST(lhsn)->nd_next)); - CHECK(compile_massign_lhs(iseq, ret, ret, ret, ret, RNODE_LIST(lhsn)->nd_head, NULL, 0)); + CHECK(compile_massign_opt_lhs(iseq, ret, lhsn->nd_next)); + CHECK(compile_massign_lhs(iseq, ret, ret, ret, ret, lhsn->nd_head, NULL, 0)); } return COMPILE_OK; } @@ -5407,29 +5215,31 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret, } while (lhsn) { - const NODE *ln = RNODE_LIST(lhsn)->nd_head; + const NODE *ln = 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(get_nd_vid(ln)); + MEMORY(ln->nd_vid); break; default: return 0; } - lhsn = RNODE_LIST(lhsn)->nd_next; + lhsn = lhsn->nd_next; llen++; } while (rhsn) { if (llen <= rlen) { - NO_CHECK(COMPILE_POPPED(ret, "masgn val (popped)", RNODE_LIST(rhsn)->nd_head)); + NO_CHECK(COMPILE_POPPED(ret, "masgn val (popped)", rhsn->nd_head)); } else { - NO_CHECK(COMPILE(ret, "masgn val", RNODE_LIST(rhsn)->nd_head)); + NO_CHECK(COMPILE(ret, "masgn val", rhsn->nd_head)); } - rhsn = RNODE_LIST(rhsn)->nd_next; + rhsn = rhsn->nd_next; rlen++; } @@ -5446,31 +5256,32 @@ 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 = RNODE_MASGN(node)->nd_value; - const NODE *splatn = RNODE_MASGN(node)->nd_args; - const NODE *lhsn = RNODE_MASGN(node)->nd_head; + const NODE *rhsn = node->nd_value; + const NODE *splatn = node->nd_args; + const NODE *lhsn = 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 = RNODE_LIST(lhsn_count)->nd_next; + lhsn_count = lhsn_count->nd_next; } while (lhsn) { - CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, RNODE_LIST(lhsn)->nd_head, state, (llen - lpos) + lhs_splat + state->lhs_level)); + CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, lhsn->nd_head, state, (llen - lpos) + lhs_splat + state->lhs_level)); lpos++; - lhsn = RNODE_LIST(lhsn)->nd_next; + lhsn = lhsn->nd_next; } if (lhs_splat) { if (nd_type_p(splatn, NODE_POSTARG)) { /*a, b, *r, p1, p2 */ - 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; + const NODE *postn = splatn->nd_2nd; + const NODE *restn = splatn->nd_1st; + int plen = (int)postn->nd_alen; int ppos = 0; int flag = 0x02 | (NODE_NAMED_REST_P(restn) ? 0x01 : 0x00); @@ -5480,9 +5291,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, RNODE_LIST(postn)->nd_head, state, (plen - ppos) + state->lhs_level)); + CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, postn->nd_head, state, (plen - ppos) + state->lhs_level)); ppos++; - postn = RNODE_LIST(postn)->nd_next; + postn = postn->nd_next; } } else { @@ -5491,6 +5302,7 @@ 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)); } @@ -5498,14 +5310,16 @@ compile_massign0(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const rhs if (!popped) { ADD_INSN(rhs, node, dup); } - ADD_INSN2(rhs, node, expandarray, INT2FIX(llen), INT2FIX(lhs_splat)); + if (expand) { + 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 || RNODE_MASGN(node)->nd_args || !compile_massign_opt(iseq, ret, RNODE_MASGN(node)->nd_value, RNODE_MASGN(node)->nd_head)) { + if (!popped || node->nd_args || !compile_massign_opt(iseq, ret, node->nd_value, node->nd_head)) { struct masgn_state state; state.lhs_level = popped ? 0 : 1; state.nested = 0; @@ -5554,15 +5368,15 @@ collect_const_segments(rb_iseq_t *iseq, const NODE *node) for (;;) { switch (nd_type(node)) { case NODE_CONST: - rb_ary_unshift(arr, ID2SYM(RNODE_CONST(node)->nd_vid)); + rb_ary_unshift(arr, ID2SYM(node->nd_vid)); return arr; case NODE_COLON3: - rb_ary_unshift(arr, ID2SYM(RNODE_COLON3(node)->nd_mid)); + rb_ary_unshift(arr, ID2SYM(node->nd_mid)); rb_ary_unshift(arr, ID2SYM(idNULL)); return arr; case NODE_COLON2: - rb_ary_unshift(arr, ID2SYM(RNODE_COLON2(node)->nd_mid)); - node = RNODE_COLON2(node)->nd_head; + rb_ary_unshift(arr, ID2SYM(node->nd_mid)); + node = node->nd_head; break; default: return Qfalse; @@ -5576,22 +5390,22 @@ compile_const_prefix(rb_iseq_t *iseq, const NODE *const node, { switch (nd_type(node)) { case NODE_CONST: - debugi("compile_const_prefix - colon", RNODE_CONST(node)->nd_vid); + debugi("compile_const_prefix - colon", node->nd_vid); ADD_INSN1(body, node, putobject, Qtrue); - ADD_INSN1(body, node, getconstant, ID2SYM(RNODE_CONST(node)->nd_vid)); + ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_vid)); break; case NODE_COLON3: - debugi("compile_const_prefix - colon3", RNODE_COLON3(node)->nd_mid); + debugi("compile_const_prefix - 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(RNODE_COLON3(node)->nd_mid)); + ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_mid)); break; case NODE_COLON2: - CHECK(compile_const_prefix(iseq, RNODE_COLON2(node)->nd_head, pref, body)); - debugi("compile_const_prefix - colon2", RNODE_COLON2(node)->nd_mid); + CHECK(compile_const_prefix(iseq, node->nd_head, pref, body)); + debugi("compile_const_prefix - colon2", node->nd_mid); ADD_INSN1(body, node, putobject, Qfalse); - ADD_INSN1(body, node, getconstant, ID2SYM(RNODE_COLON2(node)->nd_mid)); + ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_mid)); break; default: CHECK(COMPILE(pref, "const colon2 prefix", node)); @@ -5608,9 +5422,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 (nd_type_p(cpath, NODE_COLON2) && RNODE_COLON2(cpath)->nd_head) { + else if (cpath->nd_head) { /* Bar::Foo */ - NO_CHECK(COMPILE(ret, "nd_else->nd_head", RNODE_COLON2(cpath)->nd_head)); + NO_CHECK(COMPILE(ret, "nd_else->nd_head", cpath->nd_head)); return VM_DEFINECLASS_FLAG_SCOPED; } else { @@ -5624,9 +5438,9 @@ compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const NODE *cpath) static inline int private_recv_p(const NODE *node) { - NODE *recv = get_nd_recv(node); - if (recv && nd_type_p(recv, NODE_SELF)) { - return RNODE_SELF(recv)->nd_state != 0; + if (nd_type_p(node->nd_recv, NODE_SELF)) { + NODE *self = node->nd_recv; + return self->nd_state != 0; } return 0; } @@ -5668,13 +5482,13 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *vals = node; do { - defined_expr0(iseq, ret, RNODE_LIST(vals)->nd_head, lfinish, Qfalse, false); + defined_expr0(iseq, ret, vals->nd_head, lfinish, Qfalse, false); if (!lfinish[1]) { lfinish[1] = NEW_LABEL(line); } ADD_INSNL(ret, line_node, branchunless, lfinish[1]); - } while ((vals = RNODE_LIST(vals)->nd_next) != NULL); + } while ((vals = vals->nd_next) != NULL); } /* fall through */ case NODE_STR: @@ -5694,48 +5508,49 @@ 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(RNODE_IVAR(node)->nd_vid), get_ivar_ic_value(iseq,RNODE_IVAR(node)->nd_vid), PUSH_VAL(DEFINED_IVAR)); + ADD_INSN(ret, line_node, putnil); + ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_IVAR), + ID2SYM(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(RNODE_GVAR(node)->nd_vid), PUSH_VAL(DEFINED_GVAR)); + ID2SYM(node->nd_entry), PUSH_VAL(DEFINED_GVAR)); return; case NODE_CVAR: ADD_INSN(ret, line_node, putnil); ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_CVAR), - ID2SYM(RNODE_CVAR(node)->nd_vid), PUSH_VAL(DEFINED_CVAR)); + ID2SYM(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(RNODE_CONST(node)->nd_vid), PUSH_VAL(DEFINED_CONST)); + ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_CONST)); return; case NODE_COLON2: if (!lfinish[1]) { lfinish[1] = NEW_LABEL(line); } - defined_expr0(iseq, ret, RNODE_COLON2(node)->nd_head, lfinish, Qfalse, false); + defined_expr0(iseq, ret, node->nd_head, lfinish, Qfalse, false); ADD_INSNL(ret, line_node, branchunless, lfinish[1]); - NO_CHECK(COMPILE(ret, "defined/colon2#nd_head", RNODE_COLON2(node)->nd_head)); + NO_CHECK(COMPILE(ret, "defined/colon2#nd_head", node->nd_head)); - if (rb_is_const_id(RNODE_COLON2(node)->nd_mid)) { + if (rb_is_const_id(node->nd_mid)) { ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_CONST_FROM), - ID2SYM(RNODE_COLON2(node)->nd_mid), PUSH_VAL(DEFINED_CONST)); + ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_CONST)); } else { ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_METHOD), - ID2SYM(RNODE_COLON2(node)->nd_mid), PUSH_VAL(DEFINED_METHOD)); + ID2SYM(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(RNODE_COLON3(node)->nd_mid), PUSH_VAL(DEFINED_CONST)); + INT2FIX(DEFINED_CONST_FROM), ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_CONST)); return; /* method dispatch */ @@ -5748,7 +5563,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 (get_nd_args(node) || explicit_receiver) { + if (node->nd_args || explicit_receiver) { if (!lfinish[1]) { lfinish[1] = NEW_LABEL(line); } @@ -5756,31 +5571,31 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, lfinish[2] = NEW_LABEL(line); } } - if (get_nd_args(node)) { - defined_expr0(iseq, ret, get_nd_args(node), lfinish, Qfalse, false); + if (node->nd_args) { + defined_expr0(iseq, ret, node->nd_args, lfinish, Qfalse, false); ADD_INSNL(ret, line_node, branchunless, lfinish[1]); } if (explicit_receiver) { - defined_expr0(iseq, ret, get_nd_recv(node), lfinish, Qfalse, true); - switch (nd_type(get_nd_recv(node))) { + defined_expr0(iseq, ret, node->nd_recv, lfinish, Qfalse, true); + switch (nd_type(node->nd_recv)) { 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, get_nd_recv(node), nd_type(get_nd_recv(node)), line_node, 0, true); + compile_call(iseq, ret, node->nd_recv, nd_type(node->nd_recv), line_node, 0, true); break; default: ADD_INSNL(ret, line_node, branchunless, lfinish[1]); - NO_CHECK(COMPILE(ret, "defined/recv", get_nd_recv(node))); + NO_CHECK(COMPILE(ret, "defined/recv", node->nd_recv)); break; } if (keep_result) { ADD_INSN(ret, line_node, dup); } ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_METHOD), - ID2SYM(get_node_call_nd_mid(node)), PUSH_VAL(DEFINED_METHOD)); + ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD)); } else { ADD_INSN(ret, line_node, putself); @@ -5788,7 +5603,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(get_node_call_nd_mid(node)), PUSH_VAL(DEFINED_METHOD)); + ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD)); } return; } @@ -5803,7 +5618,7 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, case NODE_NTH_REF: ADD_INSN(ret, line_node, putnil); ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_REF), - INT2FIX((RNODE_BACK_REF(node)->nd_nth << 1) | (type == NODE_BACK_REF)), + INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)), PUSH_VAL(DEFINED_GVAR)); return; @@ -5879,7 +5694,7 @@ compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const { const int line = nd_line(node); const NODE *line_node = node; - if (!RNODE_DEFINED(node)->nd_head) { + if (!node->nd_head) { VALUE str = rb_iseq_defined_string(DEFINED_NIL); ADD_INSN1(ret, line_node, putobject, str); } @@ -5889,7 +5704,7 @@ 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, RNODE_DEFINED(node)->nd_head, lfinish, needstr); + defined_expr(iseq, ret, node->nd_head, lfinish, needstr); if (lfinish[1]) { ELEM_INSERT_NEXT(last, &new_insn_body(iseq, line_node, BIN(putnil), 0)->link); ADD_INSN(ret, line_node, swap); @@ -5930,7 +5745,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 void *const node) + struct ensure_range *er, const NODE *const node) { enl->ensure_node = node; enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack; /* prev */ @@ -6006,138 +5821,79 @@ add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return) ADD_SEQ(ret, ensure); } -#if RUBY_DEBUG static int check_keyword(const NODE *node) { /* This check is essentially a code clone of compile_keyword_arg. */ if (nd_type_p(node, NODE_LIST)) { - while (RNODE_LIST(node)->nd_next) { - node = RNODE_LIST(node)->nd_next; + while (node->nd_next) { + node = node->nd_next; } - node = RNODE_LIST(node)->nd_head; + node = node->nd_head; } return keyword_node_p(node); } -#endif -static bool -keyword_node_single_splat_p(NODE *kwnode) -{ - RUBY_ASSERT(keyword_node_p(kwnode)); - - 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 int +static VALUE 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) -{ - if (!argn) return 0; - - NODE *kwnode = NULL; - - 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); - - if (kwnode) { - if (compile_keyword_arg(iseq, args, kwnode, kwarg_ptr, flag_ptr)) { - len -= 1; + int dup_rest, unsigned int *flag, struct rb_callinfo_kwarg **keywords) +{ + if (argn) { + switch (nd_type(argn)) { + case NODE_SPLAT: { + NO_CHECK(COMPILE(args, "args (splat)", argn->nd_head)); + ADD_INSN1(args, argn, splatarray, RBOOL(dup_rest)); + if (flag) *flag |= VM_CALL_ARGS_SPLAT; + return INT2FIX(1); + } + case NODE_ARGSCAT: + case NODE_ARGSPUSH: { + int next_is_list = (nd_type_p(argn->nd_head, NODE_LIST)); + VALUE argc = setup_args_core(iseq, args, argn->nd_head, 1, NULL, NULL); + if (nd_type_p(argn->nd_body, NODE_LIST)) { + /* This branch is needed to avoid "newarraykwsplat" [Bug #16442] */ + int rest_len = compile_args(iseq, args, argn->nd_body, NULL, NULL); + ADD_INSN1(args, argn, newarray, INT2FIX(rest_len)); } else { - compile_hash(iseq, args, kwnode, TRUE, FALSE); + NO_CHECK(COMPILE(args, "args (cat: splat)", argn->nd_body)); } - } - - return len; - } - case NODE_SPLAT: { - // f(*a) - NO_CHECK(COMPILE(args, "args (splat)", RNODE_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; - } - case NODE_ARGSCAT: { - if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT; - int argc = setup_args_core(iseq, args, RNODE_ARGSCAT(argn)->nd_head, 1, NULL, NULL); - - 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, newarray, INT2FIX(rest_len)); - } - 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(RNODE_ARGSCAT(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); - } - - // 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; - } - - return argc; - } - case NODE_ARGSPUSH: { - if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT; - int argc = setup_args_core(iseq, args, RNODE_ARGSPUSH(argn)->nd_head, 1, NULL, NULL); - - 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, newarray, INT2FIX(1)); - ADD_INSN(args, argn, concatarray); - } - else { - if (keyword_node_p(RNODE_ARGSPUSH(argn)->nd_body)) { - kwnode = RNODE_ARGSPUSH(argn)->nd_body; + if (flag) { + *flag |= VM_CALL_ARGS_SPLAT; + /* This is a dirty hack. It traverses the AST twice. + * In a long term, it should be fixed by a redesign of keyword arguments */ + if (check_keyword(argn->nd_body)) + *flag |= VM_CALL_KW_SPLAT; + } + if (nd_type_p(argn, NODE_ARGSCAT)) { + if (next_is_list) { + ADD_INSN1(args, argn, splatarray, Qtrue); + return INT2FIX(FIX2INT(argc) + 1); + } + else { + ADD_INSN1(args, argn, splatarray, Qfalse); + ADD_INSN(args, argn, concatarray); + return argc; + } } else { - NO_CHECK(COMPILE(args, "args (cat: splat)", RNODE_ARGSPUSH(argn)->nd_body)); ADD_INSN1(args, argn, newarray, INT2FIX(1)); ADD_INSN(args, argn, concatarray); + return argc; } + } + case NODE_LIST: { + int len = compile_args(iseq, args, argn, keywords, flag); + return INT2FIX(len); + } + default: { + UNKNOWN_NODE("setup_arg", argn, Qnil); + } } - - 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; - } - - return argc; - } - default: { - UNKNOWN_NODE("setup_arg", argn, Qnil); - } } + return INT2FIX(0); } static VALUE @@ -6149,7 +5905,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn, unsigned int dup_rest = 1; DECL_ANCHOR(arg_block); INIT_ANCHOR(arg_block); - NO_CHECK(COMPILE(arg_block, "block", RNODE_BLOCK_PASS(argn)->nd_body)); + NO_CHECK(COMPILE(arg_block, "block", argn->nd_body)); *flag |= VM_CALL_ARGS_BLOCKARG; @@ -6163,11 +5919,11 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn, dup_rest = 0; } } - ret = INT2FIX(setup_args_core(iseq, args, RNODE_BLOCK_PASS(argn)->nd_head, dup_rest, flag, keywords)); + ret = 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)); + ret = setup_args_core(iseq, args, argn, 0, flag, keywords); } return ret; } @@ -6203,19 +5959,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 = RNODE_BLOCK(vars)->nd_next) { + for (vars = node; vars; vars = vars->nd_next) { INSN *cap; - if (RNODE_BLOCK(vars)->nd_next) { + if (vars->nd_next) { ADD_INSN(ret, line_node, dup); } last = ret->last; - NO_CHECK(COMPILE_POPPED(ret, "capture", RNODE_BLOCK(vars)->nd_head)); + NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head)); last = last->next; /* putobject :var */ cap = new_insn_send(iseq, 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 (!RNODE_BLOCK(vars)->nd_next && vars == node) { + if (!vars->nd_next && vars == node) { /* only one name */ DECL_ANCHOR(nom); @@ -6236,9 +5992,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 = RNODE_BLOCK(vars)->nd_next) { + for (vars = node; vars; vars = vars->nd_next) { last = ret->last; - NO_CHECK(COMPILE_POPPED(ret, "capture", RNODE_BLOCK(vars)->nd_head)); + NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head)); last = last->next; /* putobject :var */ ((INSN*)last)->insn_id = BIN(putnil); ((INSN*)last)->operand_size = 0; @@ -6252,7 +6008,7 @@ optimizable_range_item_p(const NODE *n) if (!n) return FALSE; switch (nd_type(n)) { case NODE_LIT: - return RB_INTEGER_TYPE_P(RNODE_LIT(n)->nd_lit); + return RB_INTEGER_TYPE_P(n->nd_lit); case NODE_NIL: return TRUE; default: @@ -6263,21 +6019,53 @@ optimizable_range_item_p(const NODE *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 ? 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; + struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq); + 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 int line = nd_line(node); const NODE *line_node = node; DECL_ANCHOR(cond_seq); + DECL_ANCHOR(then_seq); + DECL_ANCHOR(else_seq); LABEL *then_label, *else_label, *end_label; VALUE branches = Qfalse; + int ci_size; + VALUE catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary; + long catch_table_size = NIL_P(catch_table) ? 0 : RARRAY_LEN(catch_table); INIT_ANCHOR(cond_seq); + INIT_ANCHOR(then_seq); + INIT_ANCHOR(else_seq); then_label = NEW_LABEL(line); else_label = NEW_LABEL(line); end_label = 0; - compile_branch_condition(iseq, cond_seq, RNODE_IF(node)->nd_cond, then_label, else_label); + compile_branch_condition(iseq, cond_seq, node->nd_cond, + then_label, else_label); + + ci_size = body->ci_size; + CHECK(COMPILE_(then_seq, "then", node_body, popped)); + catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary; + if (!then_label->refcnt) { + body->ci_size = ci_size; + if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size); + } + else { + if (!NIL_P(catch_table)) catch_table_size = RARRAY_LEN(catch_table); + } + + ci_size = body->ci_size; + CHECK(COMPILE_(else_seq, "else", node_else, popped)); + catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary; + if (!else_label->refcnt) { + body->ci_size = ci_size; + if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size); + } + else { + if (!NIL_P(catch_table)) catch_table_size = RARRAY_LEN(catch_table); + } + ADD_SEQ(ret, cond_seq); if (then_label->refcnt && else_label->refcnt) { @@ -6286,11 +6074,6 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int if (then_label->refcnt) { ADD_LABEL(ret, then_label); - - DECL_ANCHOR(then_seq); - INIT_ANCHOR(then_seq); - CHECK(COMPILE_(then_seq, "then", node_body, popped)); - if (else_label->refcnt) { add_trace_branch_coverage( iseq, @@ -6310,11 +6093,6 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int if (else_label->refcnt) { ADD_LABEL(ret, else_label); - - DECL_ANCHOR(else_seq); - INIT_ANCHOR(else_seq); - CHECK(COMPILE_(else_seq, "else", node_else, popped)); - if (then_label->refcnt) { add_trace_branch_coverage( iseq, @@ -6357,11 +6135,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", RNODE_CASE(node)->nd_head)); + CHECK(COMPILE(head, "case base", node->nd_head)); branches = decl_branch_base(iseq, node, "case"); - node = RNODE_CASE(node)->nd_body; + node = node->nd_body; EXPECT_NODE("NODE_CASE", node, NODE_WHEN, COMPILE_NG); type = nd_type(node); line = nd_line(node); @@ -6381,14 +6159,14 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod add_trace_branch_coverage( iseq, body_seq, - RNODE_WHEN(node)->nd_body ? RNODE_WHEN(node)->nd_body : node, + node->nd_body ? node->nd_body : node, branch_id++, "when", branches); - CHECK(COMPILE_(body_seq, "when body", RNODE_WHEN(node)->nd_body, popped)); + CHECK(COMPILE_(body_seq, "when body", node->nd_body, popped)); ADD_INSNL(body_seq, line_node, jump, endlabel); - vals = RNODE_WHEN(node)->nd_head; + vals = node->nd_head; if (vals) { switch (nd_type(vals)) { case NODE_LIST: @@ -6409,7 +6187,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 = RNODE_WHEN(node)->nd_next; + node = node->nd_next; if (!node) { break; } @@ -6454,7 +6232,7 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no { const NODE *vals; const NODE *val; - const NODE *node = RNODE_CASE2(orig_node)->nd_body; + const NODE *node = orig_node->nd_body; LABEL *endlabel; DECL_ANCHOR(body_seq); VALUE branches = Qfalse; @@ -6472,14 +6250,14 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no add_trace_branch_coverage( iseq, body_seq, - RNODE_WHEN(node)->nd_body ? RNODE_WHEN(node)->nd_body : node, + node->nd_body ? node->nd_body : node, branch_id++, "when", branches); - CHECK(COMPILE_(body_seq, "when", RNODE_WHEN(node)->nd_body, popped)); + CHECK(COMPILE_(body_seq, "when", node->nd_body, popped)); ADD_INSNL(body_seq, node, jump, endlabel); - vals = RNODE_WHEN(node)->nd_head; + vals = node->nd_head; if (!vals) { EXPECT_NODE_NONULL("NODE_WHEN", node, NODE_LIST, COMPILE_NG); } @@ -6487,12 +6265,12 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no case NODE_LIST: while (vals) { LABEL *lnext; - val = RNODE_LIST(vals)->nd_head; + val = 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 = RNODE_LIST(vals)->nd_next; + vals = vals->nd_next; } break; case NODE_SPLAT: @@ -6506,7 +6284,7 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no default: UNKNOWN_NODE("NODE_WHEN", vals, COMPILE_NG); } - node = RNODE_WHEN(node)->nd_next; + node = node->nd_next; } /* else */ add_trace_branch_coverage( @@ -6598,13 +6376,14 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c * match_failed: * goto unmatched */ - 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; + 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 int min_argc = pre_args_num + post_args_num; - 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)); + const int use_rest_num = apinfo->rest_arg && (NODE_NAMED_REST_P(apinfo->rest_arg) || + (!NODE_NAMED_REST_P(apinfo->rest_arg) && post_args_num > 0)); LABEL *match_failed, *type_error, *deconstruct, *deconstructed; int i; @@ -6628,10 +6407,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, RNODE_ARYPTN(node)->rest_arg ? idGE : idEq, INT2FIX(1)); // (1) + ADD_SEND(ret, line_node, apinfo->rest_arg ? idGE : idEq, INT2FIX(1)); // (1) if (in_single_pattern) { CHECK(iseq_compile_pattern_set_length_errmsg(iseq, ret, node, - RNODE_ARYPTN(node)->rest_arg ? rb_fstring_lit("%p length mismatch (given %p, expected %p+)") : + apinfo->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) */)); } @@ -6641,12 +6420,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, RNODE_LIST(args)->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (2) */, false)); - args = RNODE_LIST(args)->nd_next; + 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; } - if (RNODE_ARYPTN(node)->rest_arg) { - if (NODE_NAMED_REST_P(RNODE_ARYPTN(node)->rest_arg)) { + if (apinfo->rest_arg) { + if (NODE_NAMED_REST_P(apinfo->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)); @@ -6656,7 +6435,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, RNODE_ARYPTN(node)->rest_arg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (3) */, false)); + CHECK(iseq_compile_pattern_match(iseq, ret, apinfo->rest_arg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (3) */, false)); } else { if (post_args_num > 0) { @@ -6670,7 +6449,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c } } - args = RNODE_ARYPTN(node)->post_args; + args = apinfo->post_args; for (i = 0; i < post_args_num; i++) { ADD_INSN(ret, line_node, dup); @@ -6679,8 +6458,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, RNODE_LIST(args)->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (4) */, false)); - args = RNODE_LIST(args)->nd_next; + 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; } ADD_INSN(ret, line_node, pop); @@ -6758,8 +6537,9 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c * match_failed: * goto unmatched */ - 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; + 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; LABEL *match_failed, *type_error, *deconstruct, *deconstructed; match_failed = NEW_LABEL(line); @@ -6812,25 +6592,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, 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; + 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; } - if (NODE_NAMED_REST_P(RNODE_FNDPTN(node)->pre_rest_arg)) { + if (NODE_NAMED_REST_P(fpinfo->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, RNODE_FNDPTN(node)->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, fpinfo->pre_rest_arg, find_failed, in_single_pattern, in_alt_pattern, base_index + 4 /* (2), (3), (4), (6) */, false)); } - if (NODE_NAMED_REST_P(RNODE_FNDPTN(node)->post_rest_arg)) { + if (NODE_NAMED_REST_P(fpinfo->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, RNODE_FNDPTN(node)->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, fpinfo->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); @@ -6944,12 +6724,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 (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); + 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); while (kw_args) { - rb_ary_push(keys, RNODE_LIT(RNODE_LIST(kw_args)->nd_head)->nd_lit); - kw_args = RNODE_LIST(RNODE_LIST(kw_args)->nd_next)->nd_next; + rb_ary_push(keys, kw_args->nd_head->nd_lit); + kw_args = kw_args->nd_next->nd_next; } } @@ -6976,28 +6756,28 @@ 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 (RNODE_HSHPTN(node)->nd_pkwrestarg) { + if (node->nd_pkwrestarg) { ADD_SEND(ret, line_node, rb_intern("dup"), INT2FIX(0)); } - if (RNODE_HSHPTN(node)->nd_pkwargs) { + if (node->nd_pkwargs) { int i; int keys_num; const NODE *args; - args = RNODE_HASH(RNODE_HSHPTN(node)->nd_pkwargs)->nd_head; + args = node->nd_pkwargs->nd_head; if (args) { DECL_ANCHOR(match_values); INIT_ANCHOR(match_values); - keys_num = rb_long2int(RNODE_LIST(args)->as.nd_alen) / 2; + keys_num = rb_long2int(args->nd_alen) / 2; for (i = 0; i < keys_num; i++) { - NODE *key_node = RNODE_LIST(args)->nd_head; - NODE *value_node = RNODE_LIST(RNODE_LIST(args)->nd_next)->nd_head; + 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 = RNODE_LIT(key_node)->nd_lit; + key = key_node->nd_lit; ADD_INSN(ret, line_node, dup); ADD_INSN1(ret, line_node, putobject, key); @@ -7026,9 +6806,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, RNODE_HSHPTN(node)->nd_pkwrestarg ? rb_intern("delete") : idAREF, INT2FIX(1)); // (8) + ADD_SEND(match_values, line_node, 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 = RNODE_LIST(RNODE_LIST(args)->nd_next)->nd_next; + args = args->nd_next->nd_next; } ADD_SEQ(ret, match_values); } @@ -7042,8 +6822,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 (RNODE_HSHPTN(node)->nd_pkwrestarg) { - if (RNODE_HSHPTN(node)->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD) { + if (node->nd_pkwrestarg) { + if (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) { @@ -7053,7 +6833,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, RNODE_HSHPTN(node)->nd_pkwrestarg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (11) */, false)); + CHECK(iseq_compile_pattern_match(iseq, ret, node->nd_pkwrestarg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (11) */, false)); } } @@ -7097,7 +6877,6 @@ 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: CHECK(COMPILE(ret, "case in literal", node)); // (1) if (in_single_pattern) { ADD_INSN1(ret, line_node, dupn, INT2FIX(2)); @@ -7111,7 +6890,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 = RNODE_LASGN(node)->nd_vid; + ID id = node->nd_vid; int idx = ISEQ_BODY(body->local_iseq)->local_table_size - get_local_var_idx(iseq, id); if (in_alt_pattern) { @@ -7129,7 +6908,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 = RNODE_DASGN(node)->nd_vid; + ID id = node->nd_vid; idx = get_dyna_var_idx(iseq, id, &lv, &ls); @@ -7155,8 +6934,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, 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)); + 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)); if (in_single_pattern) { LABEL *match_succeeded; match_succeeded = NEW_LABEL(line); @@ -7193,15 +6972,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 = RNODE_HASH(node)->nd_head; - if (! (nd_type_p(n, NODE_LIST) && RNODE_LIST(n)->as.nd_alen == 2)) { + n = node->nd_head; + if (! (nd_type_p(n, NODE_LIST) && n->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, 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)); + 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)); ADD_INSN(ret, line_node, putnil); ADD_LABEL(ret, match_failed); @@ -7215,13 +6994,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, RNODE_OR(node)->nd_1st, match_succeeded, fin, in_single_pattern, true, base_index + 1 /* (1) */, use_deconstructed_cache)); + CHECK(iseq_compile_pattern_each(iseq, ret, 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, RNODE_OR(node)->nd_2nd, matched, unmatched, in_single_pattern, true, base_index, use_deconstructed_cache)); + CHECK(iseq_compile_pattern_each(iseq, ret, node->nd_2nd, matched, unmatched, in_single_pattern, true, base_index, use_deconstructed_cache)); break; } default: @@ -7244,9 +7023,9 @@ iseq_compile_pattern_constant(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NOD { const NODE *line_node = node; - if (RNODE_ARYPTN(node)->nd_pconst) { + if (node->nd_pconst) { ADD_INSN(ret, line_node, dup); // (1) - CHECK(COMPILE(ret, "constant", RNODE_ARYPTN(node)->nd_pconst)); // (2) + CHECK(COMPILE(ret, "constant", node->nd_pconst)); // (2) if (in_single_pattern) { ADD_INSN1(ret, line_node, dupn, INT2FIX(2)); } @@ -7449,12 +7228,12 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no branches = decl_branch_base(iseq, node, "case"); - node = RNODE_CASE3(node)->nd_body; + node = 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 = !RNODE_IN(node)->nd_next; + single_pattern = !node->nd_next; endlabel = NEW_LABEL(line); elselabel = NEW_LABEL(line); @@ -7468,7 +7247,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", RNODE_CASE3(orig_node)->nd_head)); + CHECK(COMPILE(head, "case base", orig_node->nd_head)); ADD_SEQ(ret, head); /* case VAL */ @@ -7484,14 +7263,14 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no add_trace_branch_coverage( iseq, body_seq, - RNODE_IN(node)->nd_body ? RNODE_IN(node)->nd_body : node, + node->nd_body ? node->nd_body : node, branch_id++, "in", branches); - CHECK(COMPILE_(body_seq, "in body", RNODE_IN(node)->nd_body, popped)); + CHECK(COMPILE_(body_seq, "in body", node->nd_body, popped)); ADD_INSNL(body_seq, line_node, jump, endlabel); - pattern = RNODE_IN(node)->nd_head; + pattern = node->nd_head; if (pattern) { int pat_line = nd_line(pattern); LABEL *next_pat = NEW_LABEL(pat_line); @@ -7506,7 +7285,7 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no return COMPILE_NG; } - node = RNODE_IN(node)->nd_next; + node = node->nd_next; if (!node) { break; } @@ -7548,7 +7327,6 @@ 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")); @@ -7632,7 +7410,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 (RNODE_WHILE(node)->nd_state == 1) { + if (node->nd_state == 1) { ADD_INSNL(ret, line_node, jump, next_label); } else { @@ -7651,27 +7429,27 @@ compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in add_trace_branch_coverage( iseq, ret, - RNODE_WHILE(node)->nd_body ? RNODE_WHILE(node)->nd_body : node, + node->nd_body ? node->nd_body : node, 0, "body", branches); - CHECK(COMPILE_POPPED(ret, "while body", RNODE_WHILE(node)->nd_body)); + CHECK(COMPILE_POPPED(ret, "while body", node->nd_body)); ADD_LABEL(ret, next_label); /* next */ if (type == NODE_WHILE) { - compile_branch_condition(iseq, ret, RNODE_WHILE(node)->nd_cond, + compile_branch_condition(iseq, ret, node->nd_cond, redo_label, end_label); } else { /* until */ - compile_branch_condition(iseq, ret, RNODE_WHILE(node)->nd_cond, + compile_branch_condition(iseq, ret, node->nd_cond, end_label, redo_label); } ADD_LABEL(ret, end_label); ADD_ADJUST_RESTORE(ret, adjust_label); - if (UNDEF_P(RNODE_WHILE(node)->nd_state)) { + if (UNDEF_P(node->nd_state)) { /* ADD_INSN(ret, line_node, putundef); */ COMPILE_ERROR(ERROR_ARGS "unsupported: putundef"); return COMPILE_NG; @@ -7713,18 +7491,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)", RNODE_FOR(node)->nd_iter)); + CHECK(COMPILE(ret, "iter caller (for)", node->nd_iter)); ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq = - NEW_CHILD_ISEQ(RNODE_FOR(node)->nd_body, make_name_for_block(iseq), + NEW_CHILD_ISEQ(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(RNODE_ITER(node)->nd_body, make_name_for_block(iseq), + NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); - CHECK(COMPILE(ret, "iter caller", RNODE_ITER(node)->nd_iter)); + CHECK(COMPILE(ret, "iter caller", node->nd_iter)); } { @@ -7768,7 +7546,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 = RNODE_FOR_MASGN(node)->nd_var; + const NODE *var = 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)); @@ -7803,7 +7581,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)", RNODE_BREAK(node)->nd_stts, + CHECK(COMPILE_(ret, "break val (while/until)", 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); @@ -7838,7 +7616,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)", RNODE_BREAK(node)->nd_stts)); + CHECK(COMPILE(ret, "break val (block)", node->nd_stts)); ADD_INSN1(ret, line_node, throw, INT2FIX(throw_flag | TAG_BREAK)); if (popped) { ADD_INSN(ret, line_node, pop); @@ -7861,7 +7639,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?", RNODE_NEXT(node)->nd_stts)); + CHECK(COMPILE(ret, "next val/valid syntax?", 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); @@ -7875,11 +7653,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", RNODE_NEXT(node)->nd_stts)); + CHECK(COMPILE(ret, "next val", 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); @@ -7910,7 +7687,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", RNODE_NEXT(node)->nd_stts)); + CHECK(COMPILE(ret, "next val", node->nd_stts)); ADD_INSN1(ret, line_node, throw, INT2FIX(throw_flag | TAG_NEXT)); if (popped) { @@ -8022,7 +7799,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(RNODE_RESCUE(node)->nd_resq, + const rb_iseq_t *rescue = NEW_CHILD_ISEQ(node->nd_resq, rb_str_concat(rb_str_new2("rescue in "), ISEQ_BODY(iseq)->location.label), ISEQ_TYPE_RESCUE, line); @@ -8034,14 +7811,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", RNODE_RESCUE(node)->nd_head)); + CHECK(COMPILE(ret, "rescue head", node->nd_head)); } ISEQ_COMPILE_DATA(iseq)->in_rescue = prev_in_rescue; ADD_LABEL(ret, lend); - if (RNODE_RESCUE(node)->nd_else) { + if (node->nd_else) { ADD_INSN(ret, line_node, pop); - CHECK(COMPILE(ret, "rescue else", RNODE_RESCUE(node)->nd_else)); + CHECK(COMPILE(ret, "rescue else", node->nd_else)); } ADD_INSN(ret, line_node, nop); ADD_LABEL(ret, lcont); @@ -8069,16 +7846,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 = RNODE_RESBODY(resq)->nd_args; + narg = 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", RNODE_LIST(narg)->nd_head)); + CHECK(COMPILE(ret, "rescue arg", narg->nd_head)); ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE)); ADD_INSNL(ret, line_node, branchif, label_hit); - narg = RNODE_LIST(narg)->nd_next; + narg = narg->nd_next; } break; case NODE_SPLAT: @@ -8101,24 +7878,13 @@ compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, } ADD_INSNL(ret, line_node, jump, label_miss); ADD_LABEL(ret, label_hit); - ADD_TRACE(ret, RUBY_EVENT_RESCUE); - - if (nd_type(RNODE_RESBODY(resq)->nd_body) == NODE_BEGIN && RNODE_BEGIN(RNODE_RESBODY(resq)->nd_body)->nd_body == NULL) { - // empty body - int lineno = nd_line(RNODE_RESBODY(resq)->nd_body); - NODE dummy_line_node = generate_dummy_line_node(lineno, -1); - ADD_INSN(ret, &dummy_line_node, putnil); - } - else { - CHECK(COMPILE(ret, "resbody body", RNODE_RESBODY(resq)->nd_body)); - } - + CHECK(COMPILE(ret, "resbody body", resq->nd_body)); if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) { ADD_INSN(ret, line_node, nop); } ADD_INSN(ret, line_node, leave); ADD_LABEL(ret, label_miss); - resq = RNODE_RESBODY(resq)->nd_head; + resq = resq->nd_head; } return COMPILE_OK; } @@ -8129,7 +7895,7 @@ compile_ensure(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, const int line = nd_line(node); const NODE *line_node = node; DECL_ANCHOR(ensr); - const rb_iseq_t *ensure = NEW_CHILD_ISEQ(RNODE_ENSURE(node)->nd_ensr, + const rb_iseq_t *ensure = NEW_CHILD_ISEQ(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); @@ -8142,17 +7908,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", RNODE_ENSURE(node)->nd_ensr)); + CHECK(COMPILE_POPPED(ensr, "ensure ensr", 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, RNODE_ENSURE(node)->nd_ensr); + push_ensure_entry(iseq, &enl, &er, node->nd_ensr); ADD_LABEL(ret, lstart); - CHECK(COMPILE_(ret, "ensure head", RNODE_ENSURE(node)->nd_head, (popped | last_leave))); + CHECK(COMPILE_(ret, "ensure head", node->nd_head, (popped | last_leave))); ADD_LABEL(ret, lend); ADD_SEQ(ret, ensr); if (!popped && last_leave) ADD_INSN(ret, line_node, putnil); @@ -8181,7 +7947,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 = RNODE_RETURN(node)->nd_stts; + const NODE *retval = node->nd_stts; LABEL *splabel = 0; while (t == ISEQ_TYPE_RESCUE || t == ISEQ_TYPE_ENSURE) { @@ -8290,13 +8056,13 @@ compile_call_precheck_freeze(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE /* optimization shortcut * "literal".freeze -> opt_str_freeze("literal") */ - if (get_nd_recv(node) && nd_type_p(get_nd_recv(node), NODE_STR) && - (get_node_call_nd_mid(node) == idFreeze || get_node_call_nd_mid(node) == idUMinus) && - get_nd_args(node) == NULL && + if (node->nd_recv && nd_type_p(node->nd_recv, NODE_STR) && + (node->nd_mid == idFreeze || node->nd_mid == idUMinus) && + node->nd_args == NULL && ISEQ_COMPILE_DATA(iseq)->current_block == NULL && ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) { - VALUE str = rb_fstring(RNODE_STR(get_nd_recv(node))->nd_lit); - if (get_node_call_nd_mid(node) == idUMinus) { + VALUE str = rb_fstring(node->nd_recv->nd_lit); + if (node->nd_mid == idUMinus) { ADD_INSN2(ret, line_node, opt_str_uminus, str, new_callinfo(iseq, idUMinus, 0, 0, NULL, FALSE)); } @@ -8313,14 +8079,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 (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) && + 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) && 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(RNODE_STR(RNODE_LIST(get_nd_args(node))->nd_head)->nd_lit); - CHECK(COMPILE(ret, "recv", get_nd_recv(node))); + VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit); + CHECK(COMPILE(ret, "recv", node->nd_recv)); ADD_INSN2(ret, line_node, opt_aref_with, str, new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE)); RB_OBJ_WRITTEN(iseq, Qundef, str); @@ -8363,12 +8129,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 (RNODE_VCALL(recv)->nd_mid == rb_intern("__builtin")) { + if (recv->nd_mid == rb_intern("__builtin")) { return name; } break; case NODE_CONST: - if (RNODE_CONST(recv)->nd_vid == rb_intern("Primitive")) { + if (recv->nd_vid == rb_intern("Primitive")) { return name; } break; @@ -8449,60 +8215,16 @@ delegate_call_p(const rb_iseq_t *iseq, unsigned int argc, const LINK_ANCHOR *arg } } -// Compile Primitive.attr! :leaf, ... -static int -compile_builtin_attr(rb_iseq_t *iseq, const NODE *node) -{ - VALUE symbol; - VALUE string; - if (!node) goto no_arg; - while (node) { - if (!nd_type_p(node, NODE_LIST)) goto bad_arg; - const NODE *next = RNODE_LIST(node)->nd_next; - - node = RNODE_LIST(node)->nd_head; - if (!node) goto no_arg; - if (!nd_type_p(node, NODE_LIT)) goto bad_arg; - - symbol = RNODE_LIT(node)->nd_lit; - if (!SYMBOL_P(symbol)) goto non_symbol_arg; - - string = rb_sym_to_s(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 { - goto unknown_arg; - } - node = next; - } - return COMPILE_OK; - no_arg: - COMPILE_ERROR(ERROR_ARGS "attr!: no argument"); - return COMPILE_NG; - non_symbol_arg: - COMPILE_ERROR(ERROR_ARGS "non symbol argument to attr!: %s", rb_builtin_class_name(symbol)); - return COMPILE_NG; - unknown_arg: - COMPILE_ERROR(ERROR_ARGS "unknown argument to attr!: %s", RSTRING_PTR(string)); - return COMPILE_NG; - bad_arg: - UNKNOWN_NODE("attr!", node, COMPILE_NG); -} - static int compile_builtin_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, const NODE *line_node, int popped) { if (!node) goto no_arg; if (!nd_type_p(node, NODE_LIST)) goto bad_arg; - if (RNODE_LIST(node)->nd_next) goto too_many_arg; - node = RNODE_LIST(node)->nd_head; + if (node->nd_next) goto too_many_arg; + node = node->nd_head; if (!node) goto no_arg; if (!nd_type_p(node, NODE_LIT)) goto bad_arg; - VALUE name = RNODE_LIT(node)->nd_lit; + VALUE name = node->nd_lit; if (!SYMBOL_P(name)) goto non_symbol_arg; if (!popped) { compile_lvar(iseq, ret, line_node, SYM2ID(name)); @@ -8526,8 +8248,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 && RNODE_IF(node)->nd_cond == cond_node) { - return RNODE_IF(node)->nd_body; + if (nd_type(node) == NODE_IF && node->nd_cond == cond_node) { + return node->nd_body; } else { rb_bug("mandatory_node: can't find mandatory node"); @@ -8541,9 +8263,8 @@ 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, }; - rb_node_args_t args_node; - rb_node_init(RNODE(&args_node), NODE_ARGS); - args_node.nd_ainfo = args; + NODE args_node; + rb_node_init(&args_node, NODE_ARGS, 0, 0, (VALUE)&args); // local table without non-mandatory parameters const int skip_local_size = ISEQ_BODY(iseq)->param.size - ISEQ_BODY(iseq)->param.lead_num; @@ -8564,25 +8285,24 @@ 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]; } - 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; + NODE scope_node; + rb_node_init(&scope_node, NODE_SCOPE, (VALUE)tbl, (VALUE)mandatory_node(iseq, node), (VALUE)&args_node); rb_ast_body_t ast = { - .root = RNODE(&scope_node), - .frozen_string_literal = -1, - .coverage_enabled = -1, + .root = &scope_node, + .compile_option = 0, .script_lines = ISEQ_BODY(iseq)->variable.script_lines, }; + int prev_inline_index = GET_VM()->builtin_inline_index; + ISEQ_BODY(iseq)->mandatory_only_iseq = rb_iseq_new_with_opt(&ast, 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); + GET_VM()->builtin_inline_index = prev_inline_index; ALLOCV_END(idtmp); return COMPILE_OK; } @@ -8591,15 +8311,15 @@ 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 = get_nd_args(node); + NODE *args_node = node->nd_args; if (parent_block != NULL) { - COMPILE_ERROR(ERROR_ARGS_AT(line_node) "should not call builtins here."); + COMPILE_ERROR(iseq, nd_line(line_node), "should not call builtins here."); return COMPILE_NG; } else { # define BUILTIN_INLINE_PREFIX "_bi" - char inline_func[sizeof(BUILTIN_INLINE_PREFIX) + DECIMAL_SIZE_OF(int)]; + char inline_func[DECIMAL_SIZE_OF_BITS(sizeof(int) * CHAR_BIT) + sizeof(BUILTIN_INLINE_PREFIX)]; bool cconst = false; retry:; const struct rb_builtin_function *bf = iseq_builtin_function_lookup(iseq, builtin_func); @@ -8618,7 +8338,9 @@ compile_builtin_function_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NOD return COMPILE_OK; } else if (strcmp("attr!", builtin_func) == 0) { - return compile_builtin_attr(iseq, args_node); + // There's only "inline" attribute for now + ISEQ_BODY(iseq)->builtin_inline_p = true; + return COMPILE_OK; } else if (strcmp("arg!", builtin_func) == 0) { return compile_builtin_arg(iseq, ret, args_node, line_node, popped); @@ -8694,7 +8416,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co */ DECL_ANCHOR(recv); DECL_ANCHOR(args); - ID mid = get_node_call_nd_mid(node); + ID mid = node->nd_mid; VALUE argc; unsigned int flag = 0; struct rb_callinfo_kwarg *keywords = NULL; @@ -8773,7 +8495,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, get_nd_recv(node), mid)) != NULL) { + (builtin_func = iseq_builtin_function_name(type, node->nd_recv, mid)) != NULL) { return compile_builtin_function_call(iseq, ret, node, line_node, popped, parent_block, args, builtin_func); } @@ -8783,16 +8505,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(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)); + 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)); } else if (private_recv_p(node)) { ADD_INSN(recv, node, putself); flag |= VM_CALL_FCALL; } else { - CHECK(COMPILE(recv, "recv", get_nd_recv(node))); + CHECK(COMPILE(recv, "recv", node->nd_recv)); } if (type == NODE_QCALL) { @@ -8806,7 +8528,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, get_nd_args(node), &flag, &keywords); + argc = setup_args(iseq, args, node->nd_args, &flag, &keywords); CHECK(!NIL_P(argc)); } else { @@ -8827,9 +8549,6 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co flag |= VM_CALL_FCALL; } - if ((flag & VM_CALL_ARGS_BLOCKARG) && (flag & VM_CALL_KW_SPLAT) && !(flag & VM_CALL_KW_SPLAT_MUT)) { - ADD_INSN(ret, line_node, splatkw); - } ADD_SEND_R(ret, line_node, mid, argc, parent_block, INT2FIX(flag), keywords); qcall_branch_end(iseq, ret, else_label, branches, node, line_node); @@ -8846,10 +8565,8 @@ 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 = RNODE_OP_ASGN1(node)->nd_mid; + ID id = node->nd_mid; int boff = 0; - int keyword_len = 0; - struct rb_callinfo_kwarg *keywords = NULL; /* * a[x] (op)= y @@ -8877,9 +8594,9 @@ 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, RNODE_OP_ASGN1(node)->nd_recv); + asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node); CHECK(asgnflag != -1); - switch (nd_type(RNODE_OP_ASGN1(node)->nd_index)) { + switch (nd_type(node->nd_args->nd_head)) { case NODE_ZLIST: argc = INT2FIX(0); break; @@ -8887,28 +8604,12 @@ compile_op_asgn1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node boff = 1; /* fall through */ default: - argc = setup_args(iseq, ret, RNODE_OP_ASGN1(node)->nd_index, &flag, &keywords); - if (flag & VM_CALL_KW_SPLAT) { - if (boff) { - ADD_INSN(ret, node, splatkw); - } - else { - /* Make sure to_hash is only called once and not twice */ - ADD_INSN(ret, node, dup); - ADD_INSN(ret, node, splatkw); - ADD_INSN(ret, node, pop); - } - } + argc = setup_args(iseq, ret, node->nd_args->nd_head, &flag, NULL); CHECK(!NIL_P(argc)); } - int dup_argn = FIX2INT(argc) + 1 + boff; - if (keywords) { - keyword_len = keywords->keyword_len; - dup_argn += keyword_len; - } - ADD_INSN1(ret, node, dupn, INT2FIX(dup_argn)); + ADD_INSN1(ret, node, dupn, FIXNUM_INC(argc, 1 + boff)); flag |= asgnflag; - ADD_SEND_R(ret, node, idAREF, argc, NULL, INT2FIX(flag & ~VM_CALL_KW_SPLAT_MUT), keywords); + ADD_SEND_WITH_FLAG(ret, node, idAREF, argc, INT2FIX(flag)); if (id == idOROP || id == idANDOP) { /* a[x] ||= y or a[x] &&= y @@ -8931,116 +8632,64 @@ 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 nd_rvalue: ", RNODE_OP_ASGN1(node)->nd_rvalue)); + CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body)); if (!popped) { - ADD_INSN1(ret, node, setn, INT2FIX(dup_argn+1)); + ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff)); } if (flag & VM_CALL_ARGS_SPLAT) { - if (flag & VM_CALL_KW_SPLAT) { - ADD_INSN1(ret, node, topn, INT2FIX(2 + boff)); + ADD_INSN1(ret, node, newarray, INT2FIX(1)); + if (boff > 0) { + ADD_INSN1(ret, node, dupn, INT2FIX(3)); ADD_INSN(ret, node, swap); - ADD_INSN1(ret, node, newarray, INT2FIX(1)); - ADD_INSN(ret, node, concatarray); - ADD_INSN1(ret, node, setn, INT2FIX(2 + boff)); ADD_INSN(ret, node, pop); } - else { - ADD_INSN1(ret, node, newarray, INT2FIX(1)); - if (boff > 0) { - ADD_INSN1(ret, node, dupn, INT2FIX(3)); - 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_SEND_R(ret, node, idASET, argc, NULL, INT2FIX(flag), keywords); - } - else if (flag & VM_CALL_KW_SPLAT) { + ADD_INSN(ret, node, concatarray); if (boff > 0) { - ADD_INSN1(ret, node, topn, INT2FIX(2)); - ADD_INSN(ret, node, swap); ADD_INSN1(ret, node, setn, INT2FIX(3)); ADD_INSN(ret, node, pop); + ADD_INSN(ret, node, pop); } - ADD_INSN(ret, node, swap); - ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), keywords); - } - else if (keyword_len) { - ADD_INSN1(ret, node, opt_reverse, INT2FIX(keyword_len+boff+1)); - ADD_INSN1(ret, node, opt_reverse, INT2FIX(keyword_len+boff+0)); - ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), keywords); + ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag)); } else { if (boff > 0) ADD_INSN(ret, node, swap); - ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), keywords); + ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag)); } ADD_INSN(ret, node, pop); ADD_INSNL(ret, node, jump, lfin); ADD_LABEL(ret, label); if (!popped) { - ADD_INSN1(ret, node, setn, INT2FIX(dup_argn+1)); + ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff)); } - ADD_INSN1(ret, node, adjuststack, INT2FIX(dup_argn+1)); + ADD_INSN1(ret, node, adjuststack, FIXNUM_INC(argc, 2+boff)); ADD_LABEL(ret, lfin); } else { - CHECK(COMPILE(ret, "NODE_OP_ASGN1 nd_rvalue: ", RNODE_OP_ASGN1(node)->nd_rvalue)); + CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body)); ADD_SEND(ret, node, id, INT2FIX(1)); if (!popped) { - ADD_INSN1(ret, node, setn, INT2FIX(dup_argn+1)); + ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff)); } if (flag & VM_CALL_ARGS_SPLAT) { - if (flag & VM_CALL_KW_SPLAT) { - ADD_INSN1(ret, node, topn, INT2FIX(2 + boff)); + ADD_INSN1(ret, node, newarray, INT2FIX(1)); + if (boff > 0) { + ADD_INSN1(ret, node, dupn, INT2FIX(3)); ADD_INSN(ret, node, swap); - ADD_INSN1(ret, node, newarray, INT2FIX(1)); - ADD_INSN(ret, node, concatarray); - ADD_INSN1(ret, node, setn, INT2FIX(2 + boff)); ADD_INSN(ret, node, pop); } - else { - ADD_INSN1(ret, node, newarray, INT2FIX(1)); - if (boff > 0) { - ADD_INSN1(ret, node, dupn, INT2FIX(3)); - 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_SEND_R(ret, node, idASET, argc, NULL, INT2FIX(flag), keywords); - } - else if (flag & VM_CALL_KW_SPLAT) { + ADD_INSN(ret, node, concatarray); if (boff > 0) { - ADD_INSN1(ret, node, topn, INT2FIX(2)); - ADD_INSN(ret, node, swap); ADD_INSN1(ret, node, setn, INT2FIX(3)); ADD_INSN(ret, node, pop); + ADD_INSN(ret, node, pop); } - ADD_INSN(ret, node, swap); - ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), keywords); - } - else if (keyword_len) { - ADD_INSN(ret, node, dup); - ADD_INSN1(ret, node, opt_reverse, INT2FIX(keyword_len+boff+2)); - ADD_INSN1(ret, node, opt_reverse, INT2FIX(keyword_len+boff+1)); - ADD_INSN(ret, node, pop); - ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), keywords); + ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag)); } else { if (boff > 0) ADD_INSN(ret, node, swap); - ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), keywords); + ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag)); } ADD_INSN(ret, node, pop); } @@ -9051,8 +8700,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 = RNODE_OP_ASGN2(node)->nd_mid; - ID vid = RNODE_OP_ASGN2(node)->nd_vid, aid = rb_id_attrset(vid); + ID atype = node->nd_next->nd_mid; + ID vid = node->nd_next->nd_vid, aid = rb_id_attrset(vid); int asgnflag; LABEL *lfin = NEW_LABEL(line); LABEL *lcfin = NEW_LABEL(line); @@ -9110,9 +8759,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, RNODE_OP_ASGN2(node)->nd_recv); + asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node); CHECK(asgnflag != -1); - if (RNODE_OP_ASGN2(node)->nd_aid) { + if (node->nd_next->nd_aid) { lskip = NEW_LABEL(line); ADD_INSN(ret, node, dup); ADD_INSNL(ret, node, branchnil, lskip); @@ -9133,7 +8782,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", RNODE_OP_ASGN2(node)->nd_value)); + CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value)); if (!popped) { ADD_INSN(ret, node, swap); ADD_INSN1(ret, node, topn, INT2FIX(1)); @@ -9149,7 +8798,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", RNODE_OP_ASGN2(node)->nd_value)); + CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value)); ADD_SEND(ret, node, atype, INT2FIX(1)); if (!popped) { ADD_INSN(ret, node, swap); @@ -9175,21 +8824,21 @@ compile_op_cdecl(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node LABEL *lassign = 0; ID mid; - switch (nd_type(RNODE_OP_CDECL(node)->nd_head)) { + switch (nd_type(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", RNODE_COLON2(RNODE_OP_CDECL(node)->nd_head)->nd_head)); + CHECK(COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head)); break; default: COMPILE_ERROR(ERROR_ARGS "%s: invalid node in NODE_OP_CDECL", - ruby_node_name(nd_type(RNODE_OP_CDECL(node)->nd_head))); + ruby_node_name(nd_type(node->nd_head))); return COMPILE_NG; } - mid = get_node_colon_nd_mid(RNODE_OP_CDECL(node)->nd_head); + mid = node->nd_head->nd_mid; /* cref */ - if (RNODE_OP_CDECL(node)->nd_aid == idOROP) { + if (node->nd_aid == idOROP) { lassign = NEW_LABEL(line); ADD_INSN(ret, node, dup); /* cref cref */ ADD_INSN3(ret, node, defined, INT2FIX(DEFINED_CONST_FROM), @@ -9200,17 +8849,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 (RNODE_OP_CDECL(node)->nd_aid == idOROP || RNODE_OP_CDECL(node)->nd_aid == idANDOP) { + if (node->nd_aid == idOROP || node->nd_aid == idANDOP) { lfin = NEW_LABEL(line); if (!popped) ADD_INSN(ret, node, dup); /* cref [obj] obj */ - if (RNODE_OP_CDECL(node)->nd_aid == idOROP) + if (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", RNODE_OP_CDECL(node)->nd_value)); + CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value)); /* cref value */ if (popped) ADD_INSN1(ret, node, topn, INT2FIX(1)); /* cref value cref */ @@ -9224,9 +8873,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", RNODE_OP_CDECL(node)->nd_value)); + CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value)); /* cref obj value */ - ADD_CALL(ret, node, RNODE_OP_CDECL(node)->nd_aid, INT2FIX(1)); + ADD_CALL(ret, node, node->nd_aid, INT2FIX(1)); /* cref value */ ADD_INSN(ret, node, swap); /* value cref */ if (!popped) { @@ -9245,11 +8894,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(RNODE_OP_ASGN_OR(node)->nd_head, NODE_IVAR)) { + if (type == NODE_OP_ASGN_OR && !nd_type_p(node->nd_head, NODE_IVAR)) { LABEL *lfinish[2]; lfinish[0] = lfin; lfinish[1] = 0; - defined_expr(iseq, ret, RNODE_OP_ASGN_OR(node)->nd_head, lfinish, Qfalse); + defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse); lassign = lfinish[1]; if (!lassign) { lassign = NEW_LABEL(line); @@ -9260,7 +8909,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", RNODE_OP_ASGN_OR(node)->nd_head)); + CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head)); if (!popped) { ADD_INSN(ret, node, dup); @@ -9278,7 +8927,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", RNODE_OP_ASGN_OR(node)->nd_value, popped)); + CHECK(COMPILE_(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value, popped)); ADD_LABEL(ret, lfin); return COMPILE_OK; } @@ -9296,12 +8945,9 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i INIT_ANCHOR(args); ISEQ_COMPILE_DATA(iseq)->current_block = NULL; if (type == NODE_SUPER) { - VALUE vargc = setup_args(iseq, args, RNODE_SUPER(node)->nd_args, &flag, &keywords); + VALUE vargc = setup_args(iseq, args, 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); - } } else { /* NODE_ZSUPER */ @@ -9372,11 +9018,14 @@ 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); - assert(local_kwd->num > 0); - ADD_SEND (args, node, rb_intern("dup"), INT2FIX(0)); + if (local_kwd->num > 0) { + ADD_SEND (args, node, rb_intern("dup"), INT2FIX(0)); + flag |= VM_CALL_KW_SPLAT_MUT; + } } 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]; @@ -9385,12 +9034,24 @@ 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| VM_CALL_KW_SPLAT_MUT; + if (local_body->param.flags.has_rest) { + ADD_INSN1(args, node, newarray, INT2FIX(1)); + ADD_INSN (args, node, concatarray); + --argc; + } + flag |= VM_CALL_KW_SPLAT; } 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++; + + if (local_body->param.flags.has_rest) { + ADD_INSN1(args, node, newarray, INT2FIX(1)); + ADD_INSN (args, node, concatarray); + } + else { + argc++; + } flag |= VM_CALL_KW_SPLAT; } } @@ -9428,8 +9089,8 @@ compile_yield(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i default: /* valid */; } - if (RNODE_YIELD(node)->nd_head) { - argc = setup_args(iseq, args, RNODE_YIELD(node)->nd_head, &flag, &keywords); + if (node->nd_head) { + argc = setup_args(iseq, args, node->nd_head, &flag, &keywords); CHECK(!NIL_P(argc)); } else { @@ -9463,17 +9124,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, RNODE_MATCH(node)->nd_lit); + ADD_INSN1(recv, node, putobject, node->nd_lit); ADD_INSN2(val, node, getspecial, INT2FIX(0), INT2FIX(0)); break; case NODE_MATCH2: - CHECK(COMPILE(recv, "receiver", RNODE_MATCH2(node)->nd_recv)); - CHECK(COMPILE(val, "value", RNODE_MATCH2(node)->nd_value)); + CHECK(COMPILE(recv, "receiver", node->nd_recv)); + CHECK(COMPILE(val, "value", node->nd_value)); break; case NODE_MATCH3: - CHECK(COMPILE(recv, "receiver", RNODE_MATCH3(node)->nd_value)); - CHECK(COMPILE(val, "value", RNODE_MATCH3(node)->nd_recv)); + CHECK(COMPILE(recv, "receiver", node->nd_value)); + CHECK(COMPILE(val, "value", node->nd_recv)); break; } @@ -9481,8 +9142,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 (nd_type_p(node, NODE_MATCH2) && RNODE_MATCH2(node)->nd_args) { - compile_named_capture_assign(iseq, ret, RNODE_MATCH2(node)->nd_args); + if (node->nd_args) { + compile_named_capture_assign(iseq, ret, node->nd_args); } if (popped) { @@ -9494,7 +9155,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(RNODE_COLON2(node)->nd_mid)) { + if (rb_is_const_id(node->nd_mid)) { /* constant */ VALUE segments; if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache && @@ -9524,8 +9185,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", RNODE_COLON2(node)->nd_head)); - ADD_CALL(ret, node, RNODE_COLON2(node)->nd_mid, INT2FIX(1)); + CHECK(COMPILE(ret, "colon2#nd_head", node->nd_head)); + ADD_CALL(ret, node, node->nd_mid, INT2FIX(1)); } if (popped) { ADD_INSN(ret, node, pop); @@ -9536,19 +9197,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", RNODE_COLON3(node)->nd_mid); + debugi("colon3#nd_mid", 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(RNODE_COLON3(node)->nd_mid)); + VALUE segments = rb_ary_new_from_args(2, ID2SYM(idNULL), ID2SYM(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(RNODE_COLON3(node)->nd_mid)); + ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_mid)); } if (popped) { @@ -9561,13 +9222,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 = RNODE_DOT2(node)->nd_beg; - const NODE *e = RNODE_DOT2(node)->nd_end; + const NODE *b = node->nd_beg; + const NODE *e = node->nd_end; if (optimizable_range_item_p(b) && optimizable_range_item_p(e)) { if (!popped) { - VALUE bv = nd_type_p(b, NODE_LIT) ? RNODE_LIT(b)->nd_lit : Qnil; - VALUE ev = nd_type_p(e, NODE_LIT) ? RNODE_LIT(e)->nd_lit : Qnil; + 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 val = rb_range_new(bv, ev, excl); ADD_INSN1(ret, node, putobject, val); RB_OBJ_WRITTEN(iseq, Qundef, val); @@ -9616,7 +9277,7 @@ compile_kw_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, { 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); + const NODE *default_value = node->nd_body->nd_value; if (default_value == NODE_SPECIAL_REQUIRED_KEYWORD) { /* required argument. do nothing */ @@ -9640,7 +9301,7 @@ compile_kw_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, 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)); + CHECK(COMPILE_POPPED(ret, "keyword default argument", node->nd_body)); ADD_LABEL(ret, end_label); } return COMPILE_OK; @@ -9652,7 +9313,7 @@ compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node DECL_ANCHOR(recv); DECL_ANCHOR(args); unsigned int flag = 0; - ID mid = RNODE_ATTRASGN(node)->nd_mid; + ID mid = node->nd_mid; VALUE argc; LABEL *else_label = NULL; VALUE branches = Qfalse; @@ -9660,16 +9321,17 @@ compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node /* optimization shortcut * obj["literal"] = value -> opt_aset_with(obj, "literal", value) */ - if (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) && + if (!ISEQ_COMPILE_DATA(iseq)->in_masgn && + 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(RNODE_STR(RNODE_LIST(RNODE_ATTRASGN(node)->nd_args)->nd_head)->nd_lit); - 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)); + 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)); @@ -9683,10 +9345,10 @@ compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node INIT_ANCHOR(recv); INIT_ANCHOR(args); - argc = setup_args(iseq, args, RNODE_ATTRASGN(node)->nd_args, &flag, NULL); + argc = setup_args(iseq, args, node->nd_args, &flag, NULL); CHECK(!NIL_P(argc)); - int asgnflag = COMPILE_RECV(recv, "recv", node, RNODE_ATTRASGN(node)->nd_recv); + int asgnflag = COMPILE_RECV(recv, "recv", node); CHECK(asgnflag != -1); flag |= (unsigned int)asgnflag; @@ -9768,7 +9430,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no /* ignore */ } else { - if (nd_fl_newline(node)) { + if (node->flags & NODE_FL_NEWLINE) { int event = RUBY_EVENT_LINE; ISEQ_COMPILE_DATA(iseq)->last_line = line; if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) { @@ -9823,7 +9485,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", RNODE_BEGIN(node)->nd_body, popped)); + CHECK(COMPILE_(ret, "NODE_BEGIN", node->nd_body, popped)); break; } case NODE_RESCUE: @@ -9839,7 +9501,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", RNODE_OR(node)->nd_1st)); + CHECK(COMPILE(ret, "nd_1st", node->nd_1st)); if (!popped) { ADD_INSN(ret, node, dup); } @@ -9852,22 +9514,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", RNODE_OR(node)->nd_2nd, popped)); + CHECK(COMPILE_(ret, "nd_2nd", 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 = RNODE_LASGN(node)->nd_vid; + ID id = 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", RNODE_LASGN(node)->nd_value)); + CHECK(COMPILE(ret, "rvalue", node->nd_value)); if (!popped) { ADD_INSN(ret, node, dup); @@ -9877,8 +9542,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 = RNODE_DASGN(node)->nd_vid; - CHECK(COMPILE(ret, "dvalue", RNODE_DASGN(node)->nd_value)); + ID id = node->nd_vid; + CHECK(COMPILE(ret, "dvalue", node->nd_value)); debugi("dassn id", rb_id2str(id) ? id : '*'); if (!popped) { @@ -9896,27 +9561,27 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no break; } case NODE_GASGN:{ - CHECK(COMPILE(ret, "lvalue", RNODE_GASGN(node)->nd_value)); + CHECK(COMPILE(ret, "lvalue", node->nd_value)); if (!popped) { ADD_INSN(ret, node, dup); } - ADD_INSN1(ret, node, setglobal, ID2SYM(RNODE_GASGN(node)->nd_vid)); + ADD_INSN1(ret, node, setglobal, ID2SYM(node->nd_entry)); break; } case NODE_IASGN:{ - CHECK(COMPILE(ret, "lvalue", RNODE_IASGN(node)->nd_value)); + CHECK(COMPILE(ret, "lvalue", node->nd_value)); if (!popped) { ADD_INSN(ret, node, dup); } ADD_INSN2(ret, node, setinstancevariable, - ID2SYM(RNODE_IASGN(node)->nd_vid), - get_ivar_ic_value(iseq,RNODE_IASGN(node)->nd_vid)); + ID2SYM(node->nd_vid), + get_ivar_ic_value(iseq,node->nd_vid)); break; } case NODE_CDECL:{ - if (RNODE_CDECL(node)->nd_vid) { - CHECK(COMPILE(ret, "lvalue", RNODE_CDECL(node)->nd_value)); + if (node->nd_vid) { + CHECK(COMPILE(ret, "lvalue", node->nd_value)); if (!popped) { ADD_INSN(ret, node, dup); @@ -9924,11 +9589,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(RNODE_CDECL(node)->nd_vid)); + ADD_INSN1(ret, node, setconstant, ID2SYM(node->nd_vid)); } else { - compile_cpath(ret, iseq, RNODE_CDECL(node)->nd_else); - CHECK(COMPILE(ret, "lvalue", RNODE_CDECL(node)->nd_value)); + compile_cpath(ret, iseq, node->nd_else); + CHECK(COMPILE(ret, "lvalue", node->nd_value)); ADD_INSN(ret, node, swap); if (!popped) { @@ -9936,18 +9601,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(get_node_colon_nd_mid(RNODE_CDECL(node)->nd_else))); + ADD_INSN1(ret, node, setconstant, ID2SYM(node->nd_else->nd_mid)); } break; } case NODE_CVASGN:{ - CHECK(COMPILE(ret, "cvasgn val", RNODE_CVASGN(node)->nd_value)); + CHECK(COMPILE(ret, "cvasgn val", node->nd_value)); if (!popped) { ADD_INSN(ret, node, dup); } ADD_INSN2(ret, node, setclassvariable, - ID2SYM(RNODE_CVASGN(node)->nd_vid), - get_cvar_ic_value(iseq, RNODE_CVASGN(node)->nd_vid)); + ID2SYM(node->nd_vid), + get_cvar_ic_value(iseq,node->nd_vid)); break; } case NODE_OP_ASGN1: @@ -9989,6 +9654,18 @@ 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; @@ -10000,18 +9677,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, RNODE_LVAR(node)->nd_vid); + compile_lvar(iseq, ret, node, node->nd_vid); } break; } case NODE_DVAR:{ int lv, idx, ls; - debugi("nd_vid", RNODE_DVAR(node)->nd_vid); + debugi("nd_vid", node->nd_vid); if (!popped) { - idx = get_dyna_var_idx(iseq, RNODE_DVAR(node)->nd_vid, &lv, &ls); + idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls); if (idx < 0) { COMPILE_ERROR(ERROR_ARGS "unknown dvar (%"PRIsVALUE")", - rb_id2str(RNODE_DVAR(node)->nd_vid)); + rb_id2str(node->nd_vid)); goto ng; } ADD_GETLOCAL(ret, node, ls - idx, lv); @@ -10019,34 +9696,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(RNODE_GVAR(node)->nd_vid)); + ADD_INSN1(ret, node, getglobal, ID2SYM(node->nd_entry)); if (popped) { ADD_INSN(ret, node, pop); } break; } case NODE_IVAR:{ - debugi("nd_vid", RNODE_IVAR(node)->nd_vid); + debugi("nd_vid", node->nd_vid); if (!popped) { ADD_INSN2(ret, node, getinstancevariable, - ID2SYM(RNODE_IVAR(node)->nd_vid), - get_ivar_ic_value(iseq, RNODE_IVAR(node)->nd_vid)); + ID2SYM(node->nd_vid), + get_ivar_ic_value(iseq,node->nd_vid)); } break; } case NODE_CONST:{ - debugi("nd_vid", RNODE_CONST(node)->nd_vid); + debugi("nd_vid", node->nd_vid); if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { body->ic_size++; - VALUE segments = rb_ary_new_from_args(1, ID2SYM(RNODE_CONST(node)->nd_vid)); + VALUE segments = rb_ary_new_from_args(1, ID2SYM(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(RNODE_CONST(node)->nd_vid)); + ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_vid)); } if (popped) { @@ -10057,26 +9734,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(RNODE_CVAR(node)->nd_vid), - get_cvar_ic_value(iseq, RNODE_CVAR(node)->nd_vid)); + ID2SYM(node->nd_vid), + get_cvar_ic_value(iseq,node->nd_vid)); } break; } case NODE_NTH_REF:{ if (!popped) { - if (!RNODE_NTH_REF(node)->nd_nth) { + if (!node->nd_nth) { ADD_INSN(ret, node, putnil); break; } ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~' */, - INT2FIX(RNODE_NTH_REF(node)->nd_nth << 1)); + INT2FIX(node->nd_nth << 1)); } break; } case NODE_BACK_REF:{ if (!popped) { ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~' */, - INT2FIX(0x01 | (RNODE_BACK_REF(node)->nd_nth << 1))); + INT2FIX(0x01 | (node->nd_nth << 1))); } break; } @@ -10086,17 +9763,22 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no CHECK(compile_match(iseq, ret, node, popped, type)); break; case NODE_LIT:{ - debugp_param("lit", RNODE_LIT(node)->nd_lit); + debugp_param("lit", node->nd_lit); if (!popped) { - ADD_INSN1(ret, node, putobject, RNODE_LIT(node)->nd_lit); - RB_OBJ_WRITTEN(iseq, Qundef, RNODE_LIT(node)->nd_lit); + if (UNLIKELY(node->nd_lit == rb_mRubyVMFrozenCore)) { + ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); // [Bug #20569] + } + else { + ADD_INSN1(ret, node, putobject, node->nd_lit); + } + RB_OBJ_WRITTEN(iseq, Qundef, node->nd_lit); } break; } case NODE_STR:{ - debugp_param("nd_lit", RNODE_STR(node)->nd_lit); + debugp_param("nd_lit", node->nd_lit); if (!popped) { - VALUE lit = RNODE_STR(node)->nd_lit; + VALUE lit = node->nd_lit; if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) { lit = rb_fstring(lit); ADD_INSN1(ret, node, putstring, lit); @@ -10128,7 +9810,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(RNODE_XSTR(node)->nd_lit); + VALUE str = rb_fstring(node->nd_lit); ADD_INSN1(ret, node, putobject, str); RB_OBJ_WRITTEN(iseq, Qundef, str); ADD_CALL(ret, node, idBackquote, INT2FIX(1)); @@ -10149,15 +9831,20 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no break; } case NODE_EVSTR: - CHECK(compile_evstr(iseq, ret, RNODE_EVSTR(node)->nd_body, popped)); + CHECK(compile_evstr(iseq, ret, node->nd_body, popped)); break; - case NODE_DREGX: - compile_dregx(iseq, ret, node, popped); + case NODE_DREGX:{ + compile_dregx(iseq, ret, node); + + if (popped) { + ADD_INSN(ret, node, pop); + } break; + } case NODE_ONCE:{ int ic_index = body->ise_size++; const rb_iseq_t *block_iseq; - block_iseq = NEW_CHILD_ISEQ(RNODE_ONCE(node)->nd_body, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, line); + block_iseq = NEW_CHILD_ISEQ(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); @@ -10169,36 +9856,36 @@ 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", RNODE_ARGSCAT(node)->nd_head)); + CHECK(COMPILE(ret, "argscat head", node->nd_head)); ADD_INSN1(ret, node, splatarray, Qfalse); ADD_INSN(ret, node, pop); - CHECK(COMPILE(ret, "argscat body", RNODE_ARGSCAT(node)->nd_body)); + CHECK(COMPILE(ret, "argscat body", node->nd_body)); ADD_INSN1(ret, node, splatarray, Qfalse); ADD_INSN(ret, node, pop); } else { - CHECK(COMPILE(ret, "argscat head", RNODE_ARGSCAT(node)->nd_head)); - CHECK(COMPILE(ret, "argscat body", RNODE_ARGSCAT(node)->nd_body)); + CHECK(COMPILE(ret, "argscat head", node->nd_head)); + CHECK(COMPILE(ret, "argscat body", node->nd_body)); ADD_INSN(ret, node, concatarray); } break; } case NODE_ARGSPUSH:{ if (popped) { - CHECK(COMPILE(ret, "argspush head", RNODE_ARGSPUSH(node)->nd_head)); + CHECK(COMPILE(ret, "argspush head", node->nd_head)); ADD_INSN1(ret, node, splatarray, Qfalse); ADD_INSN(ret, node, pop); - CHECK(COMPILE_(ret, "argspush body", RNODE_ARGSPUSH(node)->nd_body, popped)); + CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped)); } else { - CHECK(COMPILE(ret, "argspush head", RNODE_ARGSPUSH(node)->nd_head)); - CHECK(compile_array_1(iseq, ret, RNODE_ARGSPUSH(node)->nd_body)); + CHECK(COMPILE(ret, "argspush head", node->nd_head)); + CHECK(compile_array_1(iseq, ret, node->nd_body)); ADD_INSN(ret, node, concatarray); } break; } case NODE_SPLAT:{ - CHECK(COMPILE(ret, "splat", RNODE_SPLAT(node)->nd_head)); + CHECK(COMPILE(ret, "splat", node->nd_head)); ADD_INSN1(ret, node, splatarray, Qtrue); if (popped) { @@ -10207,8 +9894,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no break; } case NODE_DEFN:{ - ID mid = RNODE_DEFN(node)->nd_mid; - const rb_iseq_t *method_iseq = NEW_ISEQ(RNODE_DEFN(node)->nd_defn, + ID mid = node->nd_mid; + const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn, rb_id2str(mid), ISEQ_TYPE_METHOD, line); @@ -10223,13 +9910,13 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no break; } case NODE_DEFS:{ - ID mid = RNODE_DEFS(node)->nd_mid; - const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(RNODE_DEFS(node)->nd_defn, + ID mid = node->nd_mid; + const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(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", RNODE_DEFS(node)->nd_recv)); + CHECK(COMPILE(ret, "defs: recv", node->nd_recv)); ADD_INSN2(ret, node, definesmethod, ID2SYM(mid), singleton_method_iseq); RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_method_iseq); @@ -10241,8 +9928,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", RNODE_ALIAS(node)->nd_1st)); - CHECK(COMPILE(ret, "alias arg2", RNODE_ALIAS(node)->nd_2nd)); + CHECK(COMPILE(ret, "alias arg1", node->nd_1st)); + CHECK(COMPILE(ret, "alias arg2", node->nd_2nd)); ADD_SEND(ret, node, id_core_set_method_alias, INT2FIX(3)); if (popped) { @@ -10252,8 +9939,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(RNODE_VALIAS(node)->nd_alias)); - ADD_INSN1(ret, node, putobject, ID2SYM(RNODE_VALIAS(node)->nd_orig)); + ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_alias)); + ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_orig)); ADD_SEND(ret, node, id_core_set_variable_alias, INT2FIX(2)); if (popped) { @@ -10264,7 +9951,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no 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", RNODE_UNDEF(node)->nd_undef)); + CHECK(COMPILE(ret, "undef arg", node->nd_undef)); ADD_SEND(ret, node, id_core_undef_method, INT2FIX(2)); if (popped) { @@ -10273,15 +9960,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(RNODE_CLASS(node)->nd_body, - rb_str_freeze(rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(get_node_colon_nd_mid(RNODE_CLASS(node)->nd_cpath)))), + 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))), ISEQ_TYPE_CLASS, line); const int flags = VM_DEFINECLASS_TYPE_CLASS | - (RNODE_CLASS(node)->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) | - compile_cpath(ret, iseq, RNODE_CLASS(node)->nd_cpath); + (node->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) | + compile_cpath(ret, iseq, node->nd_cpath); - 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)); + CHECK(COMPILE(ret, "super", node->nd_super)); + ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags)); RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)class_iseq); if (popped) { @@ -10290,14 +9977,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(RNODE_MODULE(node)->nd_body, - rb_str_freeze(rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(get_node_colon_nd_mid(RNODE_MODULE(node)->nd_cpath)))), + 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))), ISEQ_TYPE_CLASS, line); const int flags = VM_DEFINECLASS_TYPE_MODULE | - compile_cpath(ret, iseq, RNODE_MODULE(node)->nd_cpath); + compile_cpath(ret, iseq, node->nd_cpath); ADD_INSN (ret, node, putnil); /* dummy */ - ADD_INSN3(ret, node, defineclass, ID2SYM(get_node_colon_nd_mid(RNODE_MODULE(node)->nd_cpath)), module_iseq, INT2FIX(flags)); + ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags)); RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)module_iseq); if (popped) { @@ -10307,10 +9994,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(RNODE_SCLASS(node)->nd_body, rb_fstring_lit("singleton class"), + const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_fstring_lit("singleton class"), ISEQ_TYPE_CLASS, line); - CHECK(COMPILE(ret, "sclass#recv", RNODE_SCLASS(node)->nd_recv)); + CHECK(COMPILE(ret, "sclass#recv", node->nd_recv)); ADD_INSN (ret, node, putnil); CONST_ID(singletonclass, "singletonclass"); ADD_INSN3(ret, node, defineclass, @@ -10388,7 +10075,7 @@ 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, RNODE_POSTEXE(node)->nd_body); + rb_iseq_new_with_callback_new_callback(build_postexe_iseq, 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); @@ -10419,7 +10106,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(RNODE_LAMBDA(node)->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); + const rb_iseq_t *block = NEW_CHILD_ISEQ(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)); @@ -10630,12 +10317,6 @@ dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr, fflush(stdout); } -int -rb_insn_len(VALUE insn) -{ - return insn_len(insn); -} - const char * rb_insns_name(int i) { @@ -10799,7 +10480,6 @@ 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); @@ -10825,7 +10505,6 @@ event_name_to_flag(VALUE sym) CHECK_EVENT(RUBY_EVENT_RETURN); CHECK_EVENT(RUBY_EVENT_B_CALL); CHECK_EVENT(RUBY_EVENT_B_RETURN); - CHECK_EVENT(RUBY_EVENT_RESCUE); #undef CHECK_EVENT return RUBY_EVENT_NONE; } @@ -11110,13 +10789,13 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords) } static void -iseq_insn_each_object_mark_and_pin(VALUE obj, VALUE _) +iseq_insn_each_object_mark(VALUE *obj_ptr, VALUE _) { - rb_gc_mark(obj); + rb_gc_mark(*obj_ptr); } void -rb_iseq_mark_and_pin_insn_storage(struct iseq_compile_data_storage *storage) +rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *storage) { INSN *iobj = 0; size_t size = sizeof(INSN); @@ -11141,7 +10820,7 @@ rb_iseq_mark_and_pin_insn_storage(struct iseq_compile_data_storage *storage) iobj = (INSN *)&storage->buff[pos]; if (iobj->operands) { - iseq_insn_each_markable_object(iobj, iseq_insn_each_object_mark_and_pin, (VALUE)0); + iseq_insn_each_markable_object(iobj, iseq_insn_each_object_mark, (VALUE)0); } pos += (int)size; } @@ -11314,7 +10993,7 @@ rb_local_defined(ID id, const rb_iseq_t *iseq) #define IBF_ISEQ_ENABLE_LOCAL_BUFFER 0 #endif -typedef uint32_t ibf_offset_t; +typedef unsigned int ibf_offset_t; #define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr)) #define IBF_MAJOR_VERSION ISEQ_MAJOR_VERSION @@ -11325,27 +11004,17 @@ typedef uint32_t 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 */ - uint32_t major_version; - uint32_t minor_version; - uint32_t size; - uint32_t extra_size; + unsigned int major_version; + unsigned int minor_version; + unsigned int size; + unsigned int extra_size; - uint32_t iseq_list_size; - uint32_t global_object_list_size; + unsigned int iseq_list_size; + unsigned int 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 { @@ -11380,7 +11049,7 @@ struct ibf_load { struct pinned_list { long size; - VALUE buffer[1]; + VALUE * buffer; }; static void @@ -11395,14 +11064,25 @@ 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, - RUBY_DEFAULT_FREE, - NULL, // No external memory to report, - }, - 0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE + {pinned_list_mark, pinned_list_free, pinned_list_memsize,}, + 0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY }; static VALUE @@ -11436,10 +11116,13 @@ pinned_list_store(VALUE list, long offset, VALUE object) static VALUE pinned_list_new(long size) { - 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); + struct pinned_list * ptr; + VALUE obj_list = + TypedData_Make_Struct(0, struct pinned_list, &pinned_list_type, ptr); + + ptr->buffer = xcalloc(size, sizeof(VALUE)); ptr->size = size; + return obj_list; } @@ -12232,34 +11915,13 @@ 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 -store_outer_variable(ID id, VALUE val, void *dump) +dump_outer_variable(ID id, VALUE val, void *dump) { - 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; -} + ibf_dump_write_small_value(dump, ibf_dump_id(dump, id)); + ibf_dump_write_small_value(dump, val); -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; - return rb_str_cmp(ap->name, bp->name); + return ID_TABLE_CONTINUE; } static ibf_offset_t @@ -12269,24 +11931,12 @@ ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq) ibf_offset_t offset = ibf_dump_pos(dump); - 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); - } + 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); } return offset; @@ -12317,7 +11967,6 @@ 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); @@ -12472,7 +12121,8 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) ibf_dump_write_small_value(dump, body->ic_size); 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->catch_except_p); + ibf_dump_write_small_value(dump, body->builtin_inline_p); #undef IBF_BODY_OFFSET @@ -12584,7 +12234,8 @@ 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 char catch_except_p = (char)ibf_load_small_value(load, &reading_pos); + const bool builtin_inline_p = (bool)ibf_load_small_value(load, &reading_pos); // setup fname and dummy frame VALUE path = ibf_load_object(load, location_pathobj_index); @@ -12656,19 +12307,14 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) load_body->location.code_location.beg_pos.column = location_code_location_beg_pos_column; 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->catch_except_p = catch_except_p; + load_body->builtin_inline_p = builtin_inline_p; load_body->ivc_size = ivc_size; load_body->icvarc_size = icvarc_size; load_body->ise_size = ise_size; load_body->ic_size = ic_size; - - 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; - } + load_body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, ISEQ_IS_SIZE(load_body)); 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); @@ -13108,12 +12754,8 @@ 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; - 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)); + VALUE obj = rb_integer_unpack(bignum->digits, len * 2, 2, 0, + INTEGER_PACK_LITTLE_ENDIAN | (sign == 0 ? INTEGER_PACK_NEGATIVE : 0)); if (header->internal) rb_obj_hide(obj); if (header->frozen) rb_obj_freeze(obj); return obj; @@ -13205,7 +12847,7 @@ ibf_load_object_symbol(const struct ibf_load *load, const struct ibf_object_head } typedef void (*ibf_dump_object_function)(struct ibf_dump *dump, VALUE obj); -static const ibf_dump_object_function dump_object_functions[RUBY_T_MASK+1] = { +static ibf_dump_object_function dump_object_functions[RUBY_T_MASK+1] = { ibf_dump_object_unsupported, /* T_NONE */ ibf_dump_object_unsupported, /* T_OBJECT */ ibf_dump_object_class, /* T_CLASS */ @@ -13298,7 +12940,7 @@ ibf_dump_object_object(struct ibf_dump *dump, VALUE obj) } typedef VALUE (*ibf_load_object_function)(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset); -static const ibf_load_object_function load_object_functions[RUBY_T_MASK+1] = { +static ibf_load_object_function load_object_functions[RUBY_T_MASK+1] = { ibf_load_object_unsupported, /* T_NONE */ ibf_load_object_unsupported, /* T_OBJECT */ ibf_load_object_class, /* T_CLASS */ @@ -13441,13 +13083,14 @@ 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 = 0; + size_t size = sizeof(*dump); if (dump->iseq_table) size += st_memsize(dump->iseq_table); if (dump->global_buffer.obj_table) size += st_memsize(dump->global_buffer.obj_table); return size; @@ -13456,7 +13099,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 | RUBY_TYPED_EMBEDDABLE + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; static void @@ -13492,6 +13135,7 @@ 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 */ @@ -13500,8 +13144,6 @@ 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); @@ -13519,6 +13161,8 @@ 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; } @@ -13549,7 +13193,7 @@ rb_ibf_load_iseq_complete(rb_iseq_t *iseq) } #if USE_LAZY_LOAD -const rb_iseq_t * +MJIT_FUNC_EXPORTED const rb_iseq_t * rb_iseq_complete(const rb_iseq_t *iseq) { rb_ibf_load_iseq_complete((rb_iseq_t *)iseq); @@ -13592,12 +13236,16 @@ ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq) #endif pinned_list_store(load->iseq_list, iseq_index, (VALUE)iseq); - if (!USE_LAZY_LOAD || GET_VM()->builtin_function_table) { +#if !USE_LAZY_LOAD #if IBF_ISEQ_DEBUG - fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", (void *)iseq); + fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", (void *)iseq); #endif + rb_ibf_load_iseq_complete(iseq); +#else + if (GET_VM()->builtin_function_table) { rb_ibf_load_iseq_complete(iseq); } +#endif /* !USE_LAZY_LOAD */ #if IBF_ISEQ_DEBUG fprintf(stderr, "ibf_load_iseq: iseq=%p loaded %p\n", @@ -13611,39 +13259,35 @@ 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 = 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)); + 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)); 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 < header->size) { + if (size < load->header->size) { rb_raise(rb_eRuntimeError, "broken binary format"); } - if (strncmp(header->magic, "YARB", 4) != 0) { + if (strncmp(load->header->magic, "YARB", 4) != 0) { rb_raise(rb_eRuntimeError, "unknown binary format"); } - if (header->major_version != IBF_MAJOR_VERSION || - header->minor_version != IBF_MINOR_VERSION) { + if (load->header->major_version != IBF_MAJOR_VERSION || + load->header->minor_version != IBF_MINOR_VERSION) { rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)", - header->major_version, header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION); + load->header->major_version, load->header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION); } - if (header->endian != IBF_ENDIAN_MARK) { - rb_raise(rb_eRuntimeError, "unmatched endian: %c", header->endian); + if (strcmp(load->global_buffer.buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) { + rb_raise(rb_eRuntimeError, "unmatched platform"); } - 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)) { + if (load->header->iseq_list_offset % RUBY_ALIGNOF(ibf_offset_t)) { rb_raise(rb_eArgError, "unaligned iseq list offset: %u", - header->iseq_list_offset); + load->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", @@ -13658,9 +13302,9 @@ ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str) rb_raise(rb_eRuntimeError, "broken binary format"); } - if (USE_LAZY_LOAD) { - str = rb_str_new(RSTRING_PTR(str), RSTRING_LEN(str)); - } +#if USE_LAZY_LOAD + str = rb_str_new(RSTRING_PTR(str), RSTRING_LEN(str)); +#endif ibf_load_setup_bytes(load, loader_obj, StringValuePtr(str), RSTRING_LEN(str)); RB_OBJ_WRITE(loader_obj, &load->str, str); @@ -13734,5 +13378,3 @@ rb_iseq_ibf_load_extra_data(VALUE str) RB_GC_GUARD(loader_obj); return extra_str; } - -#include "prism_compile.c" @@ -24,7 +24,6 @@ #include "internal/numeric.h" #include "internal/object.h" #include "internal/rational.h" -#include "internal/string.h" #include "ruby_assert.h" #define ZERO INT2FIX(0) @@ -392,8 +391,7 @@ k_numeric_p(VALUE x) inline static VALUE nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag) { - NEWOBJ_OF(obj, struct RComplex, klass, - T_COMPLEX | (RGENGC_WB_PROTECTED_COMPLEX ? FL_WB_PROTECTED : 0), sizeof(struct RComplex), 0); + NEWOBJ_OF(obj, struct RComplex, klass, T_COMPLEX | (RGENGC_WB_PROTECTED_COMPLEX ? FL_WB_PROTECTED : 0)); RCOMPLEX_SET_REAL(obj, real); RCOMPLEX_SET_IMAG(obj, imag); @@ -475,19 +473,12 @@ nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag) /* * call-seq: - * Complex.rect(real, imag = 0) -> complex + * Complex.rect(real[, imag]) -> complex + * Complex.rectangular(real[, imag]) -> 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; - * see {Rectangular Coordinates}[rdoc-ref:Complex@Rectangular+Coordinates]: + * Returns a complex object which denotes the given rectangular form. * - * 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. + * Complex.rectangular(1, 2) #=> (1+2i) */ static VALUE nucomp_s_new(int argc, VALUE *argv, VALUE klass) @@ -524,54 +515,39 @@ static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass); /* * call-seq: - * 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) - * + * 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. */ static VALUE nucomp_f_complex(int argc, VALUE *argv, VALUE klass) @@ -721,19 +697,14 @@ rb_dbl_complex_new_polar_pi(double abs, double ang) /* * call-seq: - * Complex.polar(abs, arg = 0) -> complex + * Complex.polar(abs[, arg]) -> 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]: - * - * Complex.polar(3) # => (3+0i) - * Complex.polar(3, 2.0) # => (-1.2484405096414273+2.727892280477045i) - * Complex.polar(-3, -2.0) # => (1.2484405096414273+2.727892280477045i) + * Returns a complex object which denotes the given polar form. * + * 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) @@ -753,19 +724,12 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass) /* * call-seq: - * real -> numeric - * - * Returns the real value for +self+: + * cmp.real -> real * - * Complex(7).real #=> 7 - * Complex(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. + * Returns the real part. * + * Complex(7).real #=> 7 + * Complex(9, -4).real #=> 9 */ VALUE rb_complex_real(VALUE self) @@ -776,19 +740,13 @@ rb_complex_real(VALUE self) /* * call-seq: - * imag -> numeric + * cmp.imag -> real + * cmp.imaginary -> real * - * Returns the imaginary value for +self+: + * Returns the imaginary part. * * Complex(7).imaginary #=> 0 * Complex(9, -4).imaginary #=> -4 - * - * 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. - * */ VALUE rb_complex_imag(VALUE self) @@ -799,13 +757,11 @@ rb_complex_imag(VALUE self) /* * call-seq: - * -complex -> new_complex - * - * Returns the negation of +self+, which is the negation of each of its parts: + * -cmp -> complex * - * -Complex(1, 2) # => (-1-2i) - * -Complex(-1, -2) # => (1+2i) + * Returns negation of the value. * + * -Complex(1, 2) #=> (-1-2i) */ VALUE rb_complex_uminus(VALUE self) @@ -817,16 +773,15 @@ rb_complex_uminus(VALUE self) /* * call-seq: - * complex + numeric -> new_complex + * cmp + numeric -> complex * - * Returns the sum of +self+ and +numeric+: - * - * 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) + * Performs addition. * + * 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) @@ -852,16 +807,15 @@ rb_complex_plus(VALUE self, VALUE other) /* * call-seq: - * complex - numeric -> new_complex - * - * Returns the difference of +self+ and +numeric+: + * cmp - numeric -> complex * - * 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) + * Performs subtraction. * + * 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) @@ -913,16 +867,15 @@ comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE /* * call-seq: - * complex * numeric -> new_complex + * cmp * numeric -> complex * - * Returns the product of +self+ and +numeric+: - * - * 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) + * Performs multiplication. * + * 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) @@ -989,16 +942,16 @@ f_divide(VALUE self, VALUE other, /* * call-seq: - * complex / numeric -> new_complex - * - * Returns the quotient of +self+ and +numeric+: + * cmp / numeric -> complex + * cmp.quo(numeric) -> complex * - * 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) + * Performs division. * + * 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) @@ -1010,12 +963,11 @@ rb_complex_div(VALUE self, VALUE other) /* * call-seq: - * fdiv(numeric) -> new_complex + * cmp.fdiv(numeric) -> complex * - * Returns <tt>Complex(self.real/numeric, self.imag/numeric)</tt>: - * - * Complex(11, 22).fdiv(3) # => (3.6666666666666665+7.333333333333333i) + * Performs division as each part is a float, never returns a float. * + * Complex(11, 22).fdiv(3) #=> (3.6666666666666665+7.333333333333333i) */ static VALUE nucomp_fdiv(VALUE self, VALUE other) @@ -1029,93 +981,14 @@ 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; - } - - if (x == Qundef) 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: - * complex ** numeric -> new_complex - * - * Returns +self+ raised to power +numeric+: + * cmp ** numeric -> complex * - * Complex('i') ** 2 # => (-1+0i) - * Complex(-8) ** Rational(1, 3) # => (1.0000000000000002+1.7320508075688772i) + * Performs exponentiation. * + * Complex('i') ** 2 #=> (-1+0i) + * Complex(-8) ** Rational(1, 3) #=> (1.0000000000000002+1.7320508075688772i) */ VALUE rb_complex_pow(VALUE self, VALUE other) @@ -1133,14 +1006,6 @@ 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 (result != Qundef) return result; - if (RB_TYPE_P(other, T_COMPLEX)) { VALUE r, theta, nr, ntheta; @@ -1213,13 +1078,15 @@ rb_complex_pow(VALUE self, VALUE other) /* * call-seq: - * complex == object -> true or false + * cmp == object -> true or false * - * Returns +true+ if <tt>self.real == object.real</tt> - * and <tt>self.imag == object.imag</tt>: - * - * Complex(2, 3) == Complex(2.0, 3.0) # => true + * Returns true if cmp equals object numerically. * + * 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) @@ -1247,26 +1114,17 @@ nucomp_real_p(VALUE self) /* * call-seq: - * 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. + * cmp <=> object -> 0, 1, -1, or nil * - * Examples: - * - * Complex(2) <=> 3 # => -1 - * Complex(2) <=> 2 # => 0 - * Complex(2) <=> 1 # => 1 - * Complex(2, 1) <=> 1 # => nil # self.imag not zero. - * Complex(1) <=> Complex(1, 1) # => nil # object.imag not zero. - * Complex(1) <=> 'Foo' # => nil # object.imag not defined. + * 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. * + * 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) @@ -1311,19 +1169,13 @@ nucomp_coerce(VALUE self, VALUE other) /* * call-seq: - * abs -> float - * - * Returns the absolute value (magnitude) for +self+; - * see {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates]: - * - * Complex.polar(-1, 0).abs # => 1.0 - * - * If +self+ was created with - * {rectangular coordinates}[rdoc-ref:Complex@Rectangular+Coordinates], the returned value - * is computed, and may be inexact: + * cmp.abs -> real + * cmp.magnitude -> real * - * Complex.rectangular(1, 1).abs # => 1.4142135623730951 # The square root of 2. + * Returns the absolute part of its polar form. * + * Complex(-1).abs #=> 1 + * Complex(3.0, -4.0).abs #=> 5.0 */ VALUE rb_complex_abs(VALUE self) @@ -1347,19 +1199,12 @@ rb_complex_abs(VALUE self) /* * call-seq: - * abs2 -> float + * cmp.abs2 -> real * - * Returns square of the absolute value (magnitude) for +self+; - * see {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates]: - * - * 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 + * Returns square of the absolute value. * + * Complex(-1).abs2 #=> 1 + * Complex(3.0, -4.0).abs2 #=> 25.0 */ static VALUE nucomp_abs2(VALUE self) @@ -1371,19 +1216,13 @@ nucomp_abs2(VALUE self) /* * call-seq: - * arg -> float - * - * Returns the argument (angle) for +self+ in radians; - * see {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates]: + * cmp.arg -> float + * cmp.angle -> float + * cmp.phase -> float * - * 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: - * - * Complex.polar(1, 1.0/3).arg # => 0.33333333333333326 + * Returns the angle part of its polar form. * + * Complex.polar(3, Math::PI/2).arg #=> 1.5707963267948966 */ VALUE rb_complex_arg(VALUE self) @@ -1394,22 +1233,12 @@ rb_complex_arg(VALUE self) /* * call-seq: - * rect -> array - * - * Returns the array <tt>[self.real, self.imag]</tt>: - * - * Complex.rect(1, 2).rect # => [1, 2] + * cmp.rect -> array + * cmp.rectangular -> array * - * See {Rectangular Coordinates}[rdoc-ref:Complex@Rectangular+Coordinates]. + * Returns an array; [cmp.real, cmp.imag]. * - * 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. + * Complex(1, 2).rectangular #=> [1, 2] */ static VALUE nucomp_rect(VALUE self) @@ -1420,20 +1249,11 @@ nucomp_rect(VALUE self) /* * call-seq: - * polar -> array - * - * Returns the array <tt>[self.abs, self.arg]</tt>: + * cmp.polar -> array * - * 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] + * Returns an array; [cmp.abs, cmp.arg]. * + * Complex(1, 2).polar #=> [2.23606797749979, 1.1071487177940904] */ static VALUE nucomp_polar(VALUE self) @@ -1443,12 +1263,12 @@ nucomp_polar(VALUE self) /* * call-seq: - * conj -> complex - * - * Returns the conjugate of +self+, <tt>Complex.rect(self.imag, self.real)</tt>: + * cmp.conj -> complex + * cmp.conjugate -> complex * - * Complex.rect(1, 2).conj # => (1-2i) + * Returns the complex conjugate. * + * Complex(1, 2).conjugate #=> (1-2i) */ VALUE rb_complex_conjugate(VALUE self) @@ -1459,9 +1279,10 @@ rb_complex_conjugate(VALUE self) /* * call-seq: - * real? -> false + * Complex(1).real? -> false + * Complex(1, 2).real? -> false * - * Returns +false+; for compatibility with Numeric#real?. + * Returns false, even if the complex number has no imaginary part. */ static VALUE nucomp_real_p_m(VALUE self) @@ -1471,17 +1292,11 @@ nucomp_real_p_m(VALUE self) /* * call-seq: - * denominator -> integer + * cmp.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 - * - * Note that <tt>n.denominator</tt> of a non-rational numeric is +1+. - * - * Related: Complex#numerator. + * See numerator. */ static VALUE nucomp_denominator(VALUE self) @@ -1492,23 +1307,21 @@ nucomp_denominator(VALUE self) /* * call-seq: - * numerator -> new_complex + * cmp.numerator -> numeric * - * 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(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(8, 9)</tt>. - * - * Related: Complex#denominator. + * 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. */ static VALUE nucomp_numerator(VALUE self) @@ -1541,18 +1354,6 @@ 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(1, 2).hash == Complex(1, 2).hash # => true - * - */ static VALUE nucomp_hash(VALUE self) { @@ -1613,16 +1414,15 @@ f_format(VALUE self, VALUE (*func)(VALUE)) /* * call-seq: - * to_s -> string - * - * Returns a string representation of +self+: + * cmp.to_s -> string * - * 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" + * Returns the value as a string. * + * 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) @@ -1632,16 +1432,15 @@ nucomp_to_s(VALUE self) /* * call-seq: - * inspect -> string + * cmp.inspect -> string * - * Returns a string representation of +self+: - * - * 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)" + * Returns the value as a string for inspection. * + * 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) @@ -1659,15 +1458,10 @@ nucomp_inspect(VALUE self) /* * call-seq: - * finite? -> true or false - * - * Returns +true+ if both <tt>self.real.finite?</tt> and <tt>self.imag.finite?</tt> - * are true, +false+ otherwise: + * cmp.finite? -> true or false * - * Complex(1, 1).finite? # => true - * Complex(Float::INFINITY, 0).finite? # => false - * - * Related: Numeric#finite?, Float#finite?. + * Returns +true+ if +cmp+'s real and imaginary parts are both finite numbers, + * otherwise returns +false+. */ static VALUE rb_complex_finite_p(VALUE self) @@ -1679,15 +1473,15 @@ rb_complex_finite_p(VALUE self) /* * call-seq: - * infinite? -> 1 or nil + * cmp.infinite? -> nil or 1 * - * Returns +1+ if either <tt>self.real.infinite?</tt> or <tt>self.imag.infinite?</tt> - * is true, +nil+ otherwise: + * Returns +1+ if +cmp+'s real or imaginary part is an infinite number, + * otherwise returns +nil+. * - * Complex(Float::INFINITY, 0).infinite? # => 1 - * Complex(1, 1).infinite? # => nil + * For example: * - * Related: Numeric#infinite?, Float#infinite?. + * (1+1i).infinite? #=> nil + * (Float::INFINITY + 1i).infinite? #=> 1 */ static VALUE rb_complex_infinite_p(VALUE self) @@ -1785,15 +1579,14 @@ rb_dbl_complex_new(double real, double imag) /* * call-seq: - * to_i -> integer + * cmp.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(1, 0).to_i # => 1 - * Complex(1, Rational(0, 1)).to_i # => 1 - * - * Raises RangeError if <tt>self.imag</tt> is not exactly zero - * (either <tt>Integer(0)</tt> or <tt>Rational(0, _n_)</tt>). + * Complex(1, 0).to_i #=> 1 + * Complex(1, 0.0).to_i # RangeError + * Complex(1, 2).to_i # RangeError */ static VALUE nucomp_to_i(VALUE self) @@ -1809,15 +1602,14 @@ nucomp_to_i(VALUE self) /* * call-seq: - * to_f -> float - * - * Returns the value of <tt>self.real</tt> as a Float, if possible: + * cmp.to_f -> float * - * Complex(1, 0).to_f # => 1.0 - * Complex(1, Rational(0, 1)).to_f # => 1.0 + * Returns the value as a float if possible (the imaginary part should + * be exactly zero). * - * Raises RangeError if <tt>self.imag</tt> is not exactly zero - * (either <tt>Integer(0)</tt> or <tt>Rational(0, _n_)</tt>). + * Complex(1, 0).to_f #=> 1.0 + * Complex(1, 0.0).to_f # RangeError + * Complex(1, 2).to_f # RangeError */ static VALUE nucomp_to_f(VALUE self) @@ -1833,17 +1625,16 @@ nucomp_to_f(VALUE self) /* * call-seq: - * to_r -> rational + * cmp.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(1, 0).to_r # => (1/1) - * Complex(1, Rational(0, 1)).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>). - * - * Related: Complex#rationalize. + * See rationalize. */ static VALUE nucomp_to_r(VALUE self) @@ -1859,35 +1650,16 @@ nucomp_to_r(VALUE self) /* * call-seq: - * 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(1, 0).rationalize # => (1/1) - * Complex(1, Rational(0, 1)).rationalize # => (1/1) - * Complex(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(3.14159, 0).rationalize(0.1) # => (16/5) - * Complex(3.14159, 0).rationalize(0.01) # => (22/7) - * Complex(3.14159, 0).rationalize(0.001) # => (201/64) - * Complex(3.14159, 0).rationalize(0.0001) # => (333/106) - * Complex(3.14159, 0).rationalize(0.00001) # => (355/113) - * Complex(3.14159, 0).rationalize(0.000001) # => (7433/2366) - * Complex(3.14159, 0).rationalize(0.0000001) # => (9208/2931) - * Complex(3.14159, 0).rationalize(0.00000001) # => (47460/15107) - * Complex(3.14159, 0).rationalize(0.000000001) # => (76149/24239) - * Complex(3.14159, 0).rationalize(0.0000000001) # => (314159/100000) - * Complex(3.14159, 0).rationalize(0.0) # => (3537115888337719/1125899906842624) - * - * Related: Complex#to_r. + * 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. */ static VALUE nucomp_rationalize(int argc, VALUE *argv, VALUE self) @@ -1905,9 +1677,12 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self) /* * call-seq: - * to_c -> self + * complex.to_c -> self * - * Returns +self+. + * Returns self. + * + * Complex(2).to_c #=> (2+0i) + * Complex(-8, 6).to_c #=> (-8+6i) */ static VALUE nucomp_to_c(VALUE self) @@ -1917,12 +1692,9 @@ nucomp_to_c(VALUE self) /* * call-seq: - * to_c -> (0+0i) - * - * Returns zero as a Complex: - * - * nil.to_c # => (0+0i) + * nil.to_c -> (0+0i) * + * Returns zero as a complex. */ static VALUE nilclass_to_c(VALUE self) @@ -1932,9 +1704,9 @@ nilclass_to_c(VALUE self) /* * call-seq: - * to_c -> complex + * num.to_c -> complex * - * Returns +self+ as a Complex object. + * Returns the value as a complex. */ static VALUE numeric_to_c(VALUE self) @@ -2214,14 +1986,23 @@ string_to_c_strict(VALUE self, int raise) rb_must_asciicompat(self); - if (raise) { - s = StringValueCStr(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"); } - else if (!(s = rb_str_to_cstr(self))) { - return Qnil; + + if (s && s[RSTRING_LEN(self)]) { + rb_str_modify(self); + s = RSTRING_PTR(self); + s[RSTRING_LEN(self)] = '\0'; } - if (!parse_comp(s, TRUE, &num)) { + if (!s) + s = (char *)""; + + if (!parse_comp(s, 1, &num)) { if (!raise) return Qnil; rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE, self); @@ -2232,39 +2013,53 @@ string_to_c_strict(VALUE self, int raise) /* * call-seq: - * 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. + * 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. */ static VALUE string_to_c(VALUE self) { + char *s; VALUE num; rb_must_asciicompat(self); - (void)parse_comp(rb_str_fill_terminator(self, 1), FALSE, &num); + 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); return num; } @@ -2369,9 +2164,9 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass) /* * call-seq: - * abs2 -> real + * num.abs2 -> real * - * Returns the square of +self+. + * Returns square of self. */ static VALUE numeric_abs2(VALUE self) @@ -2381,9 +2176,11 @@ numeric_abs2(VALUE self) /* * call-seq: - * arg -> 0 or Math::PI + * num.arg -> 0 or float + * num.angle -> 0 or float + * num.phase -> 0 or float * - * Returns zero if +self+ is positive, Math::PI otherwise. + * Returns 0 if the value is positive, pi otherwise. */ static VALUE numeric_arg(VALUE self) @@ -2395,9 +2192,10 @@ numeric_arg(VALUE self) /* * call-seq: - * rect -> array + * num.rect -> array + * num.rectangular -> array * - * Returns array <tt>[self, 0]</tt>. + * Returns an array; [num, 0]. */ static VALUE numeric_rect(VALUE self) @@ -2407,9 +2205,9 @@ numeric_rect(VALUE self) /* * call-seq: - * polar -> array + * num.polar -> array * - * Returns array <tt>[self.abs, self.arg]</tt>. + * Returns an array; [num.abs, num.arg]. */ static VALUE numeric_polar(VALUE self) @@ -2437,9 +2235,11 @@ numeric_polar(VALUE self) /* * call-seq: - * arg -> 0 or Math::PI + * flo.arg -> 0 or float + * flo.angle -> 0 or float + * flo.phase -> 0 or float * - * Returns 0 if +self+ is positive, Math::PI otherwise. + * Returns 0 if the value is positive, pi otherwise. */ static VALUE float_arg(VALUE self) @@ -2452,63 +2252,45 @@ float_arg(VALUE self) } /* - * 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>. - * - * == 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]. - * - * You can create a \Complex object from rectangular coordinates with: - * - * - A {complex literal}[rdoc-ref:doc/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: + * 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. * - * - Separately, with methods Complex#abs and Complex#arg. - * - Together, with method Complex#polar. + * You can create a \Complex object explicitly with: * - * == Polar Coordinates + * - A {complex literal}[rdoc-ref:syntax/literals.rdoc@Complex+Literals]. * - * 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_complex_plane]. + * You can convert certain objects to \Complex objects with: * - * In this class, the argument part - * in expressed {radians}[https://en.wikipedia.org/wiki/Radian] - * (not {degrees}[https://en.wikipedia.org/wiki/Degree_(angle)]). + * - \Method #Complex. * - * You can create a \Complex object from polar coordinates with: + * Complex object can be created as literal, and also by using + * Kernel#Complex, Complex::rect, Complex::polar or to_c method. * - * - \Method Complex.polar. - * - \Method Kernel#Complex, with certain string arguments. - * - \Method String#to_c, for certain strings. + * 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) * - * 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: + * You can also create complex object from floating-point numbers or + * strings. * - * - Separately, with methods Complex#abs and Complex#arg. - * - Together, with method Complex#polar. + * 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) * - * The corresponding (computed) rectangular values may be retrieved: + * 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) * - * - Separately, with methods Complex#real and Complex#imag. - * - Together, with method Complex#rect. + * A complex object is either an exact or an inexact number. * + * Complex(1, 1) / 2 #=> ((1/2)+(1/2)*i) + * Complex(1, 1) / 2.0 #=> (0.5+0.5i) */ void Init_Complex(void) @@ -2629,11 +2411,7 @@ Init_Complex(void) rb_define_method(rb_cFloat, "phase", float_arg, 0); /* - * Equivalent - * to <tt>Complex(0, 1)</tt>: - * - * Complex::I # => (0+1i) - * + * The imaginary unit. */ rb_define_const(rb_cComplex, "I", f_complex_new_bang2(rb_cComplex, ZERO, ONE)); diff --git a/configure.ac b/configure.ac index 5165735443..220392d120 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,6 @@ 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_header.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 @@ -48,22 +47,11 @@ 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 -AS_IF([test "x${GITHUB_ACTIONS}" = xtrue], -[AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl -dnl 93(bright yellow) is copied from .github/workflows/mingw.yml - begin_group() { AS_ECHO(["::group::@<:@93m$[]1@<:@m"]);} - end_group() { AS_ECHO(["::endgroup::"]);} -], -[dnl - begin_group() { :;} - end_group() { :;} -]) - AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)])dnl AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)])dnl AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)])dnl -[begin]_group "environment section" && { +: "environment section" && { HAVE_BASERUBY=yes BASERUBY_VERSION= AC_ARG_WITH(baseruby, @@ -76,13 +64,13 @@ 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], [ +# BASERUBY must be >= 2.2.0. Note that `"2.2.0" > "2.2"` is true. +AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.2"' 2>/dev/null`" = 42], [ 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 ]) - RUBY_APPEND_OPTION(BASERUBY, "--disable=gems") + BASERUBY="$BASERUBY --disable=gems" BASERUBY_VERSION=`$BASERUBY -v` $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD ], [ @@ -90,7 +78,7 @@ AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'p ]) AS_IF([test "$HAVE_BASERUBY" = no], [ AS_IF([test "$cross_compiling" = yes], [AC_MSG_ERROR([executable host ruby is required for cross-compiling])]) - BASERUBY=$srcdir/tool/missing-baseruby.bat + BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false" ]) AC_SUBST(BASERUBY) AC_SUBST(HAVE_BASERUBY) @@ -226,15 +214,23 @@ AS_CASE(["/${rb_CC} "], [*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. + + # 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], [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([AR], [s/clang/${llvm_prefix}ar/]) +# RUBY_CHECK_PROG_FOR_CC([AS], [s/clang/${llvm_prefix}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/]) + RUBY_CHECK_PROG_FOR_CC([NM], [s/clang/${llvm_prefix}nm/]) + RUBY_CHECK_PROG_FOR_CC([OBJCOPY], [s/clang/${llvm_prefix}objcopy/]) + RUBY_CHECK_PROG_FOR_CC([OBJDUMP], [s/clang/${llvm_prefix}objdump/]) + RUBY_CHECK_PROG_FOR_CC([RANLIB], [s/clang/${llvm_prefix}ranlib/]) + RUBY_CHECK_PROG_FOR_CC([STRIP], [s/clang/${llvm_prefix}strip/]) ]) AS_UNSET(rb_CC) AS_UNSET(rb_dummy) @@ -245,15 +241,9 @@ 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*], [ +[cygwin*|msys*|mingw*], [ ac_cv_prog_ac_ct_OBJCOPY=":" ]) @@ -272,14 +262,10 @@ AC_CHECK_TOOLS([AR], [gar ar]) AC_CHECK_TOOLS([AS], [gas as]) AC_CHECK_TOOLS([LD], [gld ld]) # ... try gold ? AC_CHECK_TOOLS([NM], [gnm nm]) -AC_CHECK_TOOLS([OBJCOPY], [gobjcopy objcopy], [:]) +AC_CHECK_TOOLS([OBJCOPY], [gobjcopy objcopy]) AC_CHECK_TOOLS([OBJDUMP], [gobjdump objdump]) 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([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) @@ -407,6 +393,13 @@ AS_IF([test "$GCC" = yes], [ AS_IF([test "$gcc_major" -lt 4], [ AC_MSG_ERROR([too old GCC: $gcc_major.$gcc_minor]) ]) + + AC_CACHE_CHECK([if thread-local storage is supported], [rb_cv_tls_supported], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int __thread conftest;]])], + [rb_cv_tls_supported=yes], + [rb_cv_tls_supported=no])]) + AS_IF([test x"$rb_cv_tls_supported" != xyes], + [AC_DEFINE(RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED)]) ], [ linker_flag= ]) @@ -421,17 +414,29 @@ AC_SUBST(OUTFLAG) AC_SUBST(COUTFLAG) AC_SUBST(CSRCFLAG) +: ${MJIT_CC=$CC} +AS_IF([test "x$cross_compiling" = xno], [ + AC_PATH_PROG([MJIT_CC], ${MJIT_CC}) + + # if $CC is in /usr/lib/ccache/$CC, search original $CC (disable ccache) + AS_IF([echo $RUBY_DEBUG | grep ci > /dev/null && + echo $MJIT_CC | grep ^/usr/lib/ccache > /dev/null], [ + PATH=`echo $PATH | sed "s/\/usr\/lib\/ccache://"` MJIT_CC=`which $CC`]) + + AS_CASE([$target_os], + [*mingw*], [command -v cygpath > /dev/null && MJIT_CC=`cygpath -ma $MJIT_CC`]) + shift 2 + MJIT_CC="$MJIT_CC${1+ }$*" +]) + AS_CASE(["$build_os"], - [darwin*], [ - # gcc 13 warns duplicate -l options, which are added by the - # default spec. + [darwin1*.*], [ # Xcode linker warns for deprecated architecture and wrongly # installed TBD files. - CC_WRAPPER="" CC_NO_WRAPPER="$CC" + CC_WRAPPER="" echo 'int main(void) {return 0;}' > conftest.c AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 | - grep -e '^ld: warning: ignoring duplicate libraries:' \ - -e '^ld: warning: text-based stub file' >/dev/null], [ + grep '^ld: warning: text-based stub file' >/dev/null], [ CC_WRAPPER=`cd -P "${tooldir}" && pwd`/darwin-cc CC="$CC_WRAPPER $CC" ]) @@ -462,7 +467,7 @@ AC_SUBST(CC_VERSION_MESSAGE, $cc_version_message) : ${DLDFLAGS="$LDFLAGS"} RUBY_UNIVERSAL_ARCH -AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "${universal_binary:-no}" = no], [ +AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "${universal_binary:-no}" = no], [ RUBY_DEFAULT_ARCH("$target_cpu") ]) host_os=$target_os @@ -507,7 +512,6 @@ 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> @@ -591,7 +595,7 @@ AC_MSG_RESULT([$CHDIR]) AC_SUBST(CHDIR) } -[begin]_group "compiler section" && { +: "compiler section" && { RUBY_WERROR_FLAG([ AC_MSG_CHECKING([whether CFLAGS is valid]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], @@ -686,10 +690,6 @@ AS_CASE(["$GCC:${warnflags+set}:${extra_warnflags:+set}:"], AS_IF([test $gcc_major -le 6], [ extra_warnflags="$extra_warnflags -Wno-maybe-uninitialized" ]) - AS_CASE([ $CFLAGS ], [*" -save-temps="*|*" -save-temps "*], [], [ - extra_warnflags="$extra_warnflags -Werror=misleading-indentation" - ]) - # ICC doesn't support -Werror= AS_IF([test $icc_version -gt 0], [ particular_werror_flags=no @@ -701,6 +701,7 @@ AS_CASE(["$GCC:${warnflags+set}:${extra_warnflags:+set}:"], -Werror=duplicated-cond \ -Werror=implicit-function-declaration \ -Werror=implicit-int \ + -Werror=misleading-indentation \ -Werror=pointer-arith \ -Werror=shorten-64-to-32 \ -Werror=write-strings \ @@ -804,6 +805,8 @@ AS_IF([test "$GCC" = yes], [ [@%:@include <stdio.h>]) ]) + : ${MJIT_HEADER_FLAGS='-P -dD'} + # -fstack-protector AS_CASE(["$target_os"], [emscripten*|wasi*], [ @@ -831,10 +834,7 @@ AS_IF([test "$GCC" = yes], [ 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], [ - # C compiler and assembler must be consistent for -mbranch-protection - # since they both check `__ARM_FEATURE_PAC_DEFAULT` definition. RUBY_APPEND_OPTION(XCFLAGS, option) - RUBY_APPEND_OPTION(ASFLAGS, option) break ]) ]) @@ -910,6 +910,7 @@ AS_IF([test "$GCC" = yes], [ ], [ RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no]) ]) + test "$visibility_option" = no || OBJCOPY=: ]) AS_IF([test "$GCC" = yes], [ @@ -992,7 +993,7 @@ 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" && { +: "header and library section" && { AC_ARG_WITH(winnt-ver, AS_HELP_STRING([--with-winnt-ver=0xXXXX], [target Windows NT version (default to 0x0600)]), [with_winnt_ver="$withval"], [with_winnt_ver="0x0600"]) @@ -1095,18 +1096,12 @@ main() ]) POSTLINK="" AC_CHECK_PROGS(codesign, codesign) - 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) + AC_CHECK_PROGS(dsymutil, dsymutil) AS_IF([test -n "$codesign"], [ POSTLINK="{ test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@; }${POSTLINK:+; $POSTLINK}" ]) AS_IF([test -n "$dsymutil"], [ - POSTLINK="$dsymutil \$@ 2>/dev/null${POSTLINK:+; $POSTLINK}" + POSTLINK="$dsymutil \$@${POSTLINK:+; $POSTLINK}" ]) AS_IF([test -n "${POSTLINK}"], [ LINK_SO="$LINK_SO @@ -1208,8 +1203,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 @@ -1253,7 +1246,7 @@ main() AS_CASE(["$target_cpu"], [powerpc64*], [ ac_cv_func___builtin_setjmp=no ]) - # With gcc-8's -fcf-protection, RJIT's __builtin_longjmp fails. + # With gcc-8's -fcf-protection, MJIT's __builtin_longjmp fails. AS_CASE(["$CC $CFLAGS "], [*" -fcf-protection "*], [cf_protection=yes], [cf_protection=no]) AS_IF([test "$cf_protection" = yes], [ ac_cv_func___builtin_setjmp=no @@ -1355,8 +1348,7 @@ AC_CHECK_HEADERS(syscall.h) AC_CHECK_HEADERS(time.h) AC_CHECK_HEADERS(ucontext.h) AC_CHECK_HEADERS(utime.h) -AC_CHECK_HEADERS(sys/epoll.h) -AC_CHECK_HEADERS(sys/event.h) +AC_CHECK_HEADERS(stdatomic.h) AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [ AC_CHECK_HEADERS(x86intrin.h) @@ -1364,7 +1356,7 @@ AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [ RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h) AS_IF([test "x$with_gmp" != xno], - [RUBY_CHECK_HEADER(gmp.h) + [AC_CHECK_HEADERS(gmp.h) AS_IF([test "x$ac_cv_header_gmp_h" != xno], AC_SEARCH_LIBS([__gmpz_init], [gmp], [AC_DEFINE(HAVE_LIBGMP, 1)]))]) @@ -1495,25 +1487,6 @@ 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 @@ -1526,9 +1499,10 @@ AC_CACHE_CHECK(packed struct attribute, rb_cv_packed_struct, [rb_cv_packed_struct=$mac; break]) done]) AS_IF([test "$rb_cv_packed_struct" != no], [ - AC_DEFINE_UNQUOTED([RBIMPL_ATTR_PACKED_STRUCT_BEGIN()], [`echo " $rb_cv_packed_struct " | sed 's/ x .*//;s/^ *//'`]) - AC_DEFINE_UNQUOTED([RBIMPL_ATTR_PACKED_STRUCT_END()], [`echo " $rb_cv_packed_struct " | sed 's/.* x //;s/ *$//'`]) + AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], [$rb_cv_packed_struct]) RUBY_TRY_CFLAGS(-Wno-address-of-packed-member, [AC_DEFINE(USE_UNALIGNED_MEMBER_ACCESS)]) +], [ + AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], x) ]) AS_IF([test "x$ac_cv_type_long_long" = xyes], [ @@ -2037,6 +2011,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) @@ -2060,7 +2035,6 @@ AC_CHECK_FUNCS(execv) AC_CHECK_FUNCS(execve) AC_CHECK_FUNCS(explicit_memset) AC_CHECK_FUNCS(fcopyfile) -AC_CHECK_FUNCS(fchdir) AC_CHECK_FUNCS(fchmod) AC_CHECK_FUNCS(fchown) AC_CHECK_FUNCS(fcntl) @@ -2118,7 +2092,6 @@ 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) @@ -2172,7 +2145,6 @@ AC_CHECK_FUNCS(sigaction) AC_CHECK_FUNCS(sigaltstack) AC_CHECK_FUNCS(sigprocmask) AC_CHECK_FUNCS(sinh) -AC_CHECK_FUNCS(snprintf) AC_CHECK_FUNCS(spawnv) AC_CHECK_FUNCS(symlink) AC_CHECK_FUNCS(syscall) @@ -2197,6 +2169,9 @@ AC_CHECK_FUNCS(__sinpi) AS_IF([test "x$ac_cv_member_struct_statx_stx_btime" = xyes], [AC_CHECK_FUNCS(statx)]) +AS_CASE(["$ac_cv_func_memset_s:$ac_cv_func_qsort_s"], [*yes*], + [RUBY_DEFINE_IF([!defined __STDC_WANT_LIB_EXT1__], [__STDC_WANT_LIB_EXT1__], 1)]) + AS_IF([test "$ac_cv_func_getcwd" = yes], [ AC_CACHE_CHECK(if getcwd allocates buffer if NULL is given, [rb_cv_getcwd_malloc], [AC_RUN_IFELSE([AC_LANG_SOURCE([[ @@ -2265,27 +2240,6 @@ 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) -]) - AS_IF([test "$ac_cv_func_qsort_r" != no], [ AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -2673,9 +2627,6 @@ AS_CASE([$coroutine_type], [yes|''], [ [*86-mingw*], [ coroutine_type=win32 ], - [aarch64-mingw*], [ - coroutine_type=arm64 - ], [arm*-linux*], [ coroutine_type=arm32 ], @@ -2688,9 +2639,6 @@ AS_CASE([$coroutine_type], [yes|''], [ [riscv64-linux*], [ coroutine_type=riscv64 ], - [loongarch64-linux*], [ - coroutine_type=loongarch64 - ], [x86_64-freebsd*], [ coroutine_type=amd64 ], @@ -2715,9 +2663,6 @@ AS_CASE([$coroutine_type], [yes|''], [ [i386-openbsd*], [ coroutine_type=x86 ], - [aarch64-openbsd*], [ - coroutine_type=arm64 - ], [*-openbsd*], [ coroutine_type=pthread ], @@ -2815,22 +2760,6 @@ AS_IF([test "$THREAD_MODEL" = pthread], [ AC_DEFINE_UNQUOTED(SET_ANOTHER_THREAD_NAME(thid,name), $set_another_thread_name) ]) ]) - - AC_CACHE_CHECK([for thread-local storage sepcifier], [rb_cv_tls_specifier], - rb_cv_tls_specifier=none - RUBY_WERROR_FLAG([ - for attr in \ - _Thread_local \ - __thread \ - ; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([[$attr int conftest;]])], - [rb_cv_tls_specifier=$attr; break]) - done - ]) - ) - AS_IF([test x"${rb_cv_tls_specifier}" != xnone], - [AC_DEFINE_UNQUOTED(RB_THREAD_LOCAL_SPECIFIER, ${rb_cv_tls_specifier})] - ) ]) AS_IF([test x"$ac_cv_header_ucontext_h" = xno], [ @@ -2974,7 +2903,7 @@ AS_IF([test "x$ac_cv_func_ioctl" = xyes], [ } -[begin]_group "runtime section" && { +: "runtime section" && { dnl wheather use dln_a_out or not AC_ARG_WITH(dln-a-out, AS_HELP_STRING([--with-dln-a-out], [dln_a_out is deprecated]), @@ -3008,8 +2937,22 @@ AS_CASE(["$target_os"], ])]) LIBEXT=a +AC_ARG_WITH(mjit-tabs, + AS_HELP_STRING([--without-mjit-tabs], [expand tabs in mjit header]), + [AS_IF([test $withval = no], [MJIT_TABS=false])]) +AC_SUBST(MJIT_TABS)dnl AC_SUBST(DLDFLAGS)dnl AC_SUBST(ARCH_FLAG)dnl +AC_SUBST(MJIT_HEADER_FLAGS)dnl +AC_SUBST(MJIT_HEADER_INSTALL_DIR)dnl +AC_SUBST(MJIT_CC)dnl +AS_CASE(["$GCC:$target_os"], + [yes:aix*], [mjit_std_cflag="-std=gnu99"], + [mjit_std_cflag=]) +AC_SUBST(MJIT_CFLAGS, [${MJIT_CFLAGS-"-w ${mjit_std_cflag} ${orig_cflags}"}])dnl +AC_SUBST(MJIT_OPTFLAGS, [${MJIT_OPTFLAGS-'$(optflags)'}])dnl +AC_SUBST(MJIT_DEBUGFLAGS, [${MJIT_DEBUGFLAGS-'$(debugflags)'}])dnl +AC_SUBST(MJIT_LDSHARED)dnl AC_SUBST(STATIC)dnl AC_SUBST(CCDLFLAGS)dnl @@ -3126,7 +3069,8 @@ AC_SUBST(EXTOBJS) : ${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 + # Resolve symbols from libruby.dylib when --enable-shared + EXTDLDFLAGS='$(LIBRUBYARG_SHARED)' ], [test "x$EXTSTATIC" = x], [ # When building exts as bundles, a mach-o bundle needs to know its loader # program to bind symbols from the ruby executable @@ -3475,6 +3419,9 @@ AC_ARG_ENABLE(multiarch, [multiarch=], [unset multiarch]) AS_IF([test ${multiarch+set}], [ AC_DEFINE(ENABLE_MULTIARCH) + MJIT_HEADER_INSTALL_DIR=include/'${arch}/${RUBY_VERSION_NAME}' +], [ + MJIT_HEADER_INSTALL_DIR=include/'${RUBY_VERSION_NAME}/${arch}' ]) archlibdir='${libdir}/${arch}' @@ -3754,7 +3701,7 @@ AS_IF([test x"$gcov" = xyes], [ RUBY_SETJMP_TYPE } -[begin]_group "installation section" && { +: "build section" && { dnl build rdoc index if requested RDOCTARGET="" CAPITARGET="" @@ -3802,19 +3749,20 @@ AC_SUBST(CAPITARGET) AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all]) AC_SUBST(INSTALLDOC) -AC_ARG_ENABLE(install-static-library, - AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]), - [INSTALL_STATIC_LIBRARY=$enableval - AS_IF([test x"$enable_shared" = xno -a x"$INSTALL_STATIC_LIBRARY" = xno], - [AC_MSG_ERROR([must install either static or shared library])], - [])], - AS_IF([test x"$enable_shared" = xyes], - [INSTALL_STATIC_LIBRARY=no], - [INSTALL_STATIC_LIBRARY=yes])) -AC_SUBST(INSTALL_STATIC_LIBRARY) -} +AC_ARG_ENABLE(jit-support, + AS_HELP_STRING([--disable-jit-support], [disable JIT features]), + [MJIT_SUPPORT=$enableval], + [AS_CASE(["$target_os"], + [wasi | mingw* | solaris*], [MJIT_SUPPORT=no], + [MJIT_SUPPORT=yes] + )]) + +AS_IF([test x"$MJIT_SUPPORT" = "xyes"], + [AC_DEFINE(USE_MJIT, 1)], + [AC_DEFINE(USE_MJIT, 0)]) + +AC_SUBST(MJIT_SUPPORT) -[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) @@ -3860,8 +3808,8 @@ 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(["$enable_jit_support:$YJIT_TARGET_OK:$YJIT_RUSTC_OK"], + [yes:yes:yes|:yes:yes], [ YJIT_SUPPORT=yes ], [YJIT_SUPPORT=no] @@ -3873,6 +3821,9 @@ CARGO_BUILD_ARGS= YJIT_LIBS= AS_CASE(["${YJIT_SUPPORT}"], [yes|dev|stats|dev_nodebug], [ + AS_IF([test x"$enable_jit_support" = "xno"], + AC_MSG_ERROR([--disable-jit-support but --enable-yjit. YJIT requires JIT support]) + ) AS_IF([test x"$RUSTC" = "xno"], AC_MSG_ERROR([rustc is required. Installation instructions available at https://www.rust-lang.org/tools/install]) ) @@ -3889,7 +3840,6 @@ AS_CASE(["${YJIT_SUPPORT}"], [dev_nodebug], [ rb_rust_target_subdir=dev_nodebug CARGO_BUILD_ARGS='--profile dev_nodebug --features stats,disasm' - AC_DEFINE(YJIT_STATS, 1) ], [stats], [ rb_rust_target_subdir=stats @@ -3913,9 +3863,7 @@ AS_CASE(["${YJIT_SUPPORT}"], AC_DEFINE_UNQUOTED(YJIT_SUPPORT, [$YJIT_SUPPORT]) ]) AC_DEFINE(USE_YJIT, 1) -], [ - AC_DEFINE(USE_YJIT, 0) -]) +], [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 @@ -3925,53 +3873,17 @@ 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 RJIT supports only x86_64 platforms, but allows arm64/aarch64 for custom JITs. -RJIT_TARGET_OK=no -AS_IF([test "$cross_compiling" = no], - AS_CASE(["$target_cpu-$target_os"], - [*android*], [ - RJIT_TARGET_OK=no - ], - [arm64-darwin*|aarch64-darwin*|x86_64-darwin*], [ - RJIT_TARGET_OK=yes - ], - [arm64-*linux*|aarch64-*linux*|x86_64-*linux*], [ - RJIT_TARGET_OK=yes - ], - [arm64-*bsd*|aarch64-*bsd*|x86_64-*bsd*], [ - RJIT_TARGET_OK=yes - ] - ) -) - -dnl Build RJIT on supported 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(["$RJIT_TARGET_OK"], - [yes], [RJIT_SUPPORT=yes], - [RJIT_SUPPORT=no] - )] -) - -AS_CASE(["$RJIT_SUPPORT"], -[yes|dev], [ - AS_CASE(["$RJIT_SUPPORT"], - [dev], [ - # Link libcapstone for --rjit-dump-disasm - AC_CHECK_LIB([capstone], [cs_disasm]) - ]) - - AC_DEFINE(USE_RJIT, 1) -], [ - AC_DEFINE(USE_RJIT, 0) -]) - -AC_SUBST(RJIT_SUPPORT) -} +AC_ARG_ENABLE(install-static-library, + AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]), + [INSTALL_STATIC_LIBRARY=$enableval + AS_IF([test x"$enable_shared" = xno -a x"$INSTALL_STATIC_LIBRARY" = xno], + [AC_MSG_ERROR([must install either static or shared library])], + [])], + AS_IF([test x"$enable_shared" = xyes], + [INSTALL_STATIC_LIBRARY=no], + [INSTALL_STATIC_LIBRARY=yes])) +AC_SUBST(INSTALL_STATIC_LIBRARY) -[begin]_group "build section" && { AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern void conftest_external(void) {}]], [[]])],[ rb_cv_symbol_prefix=`$NM conftest.$ac_objext | @@ -3982,23 +3894,6 @@ 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"$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]), @@ -4176,9 +4071,8 @@ AS_IF([test "${universal_binary-no}" = yes ], [ const char arch[[]] = __ARCHITECTURE__;]], [[puts(arch);]])], [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no])) ]) -} -[end]_group +: ${MJIT_LDSHARED=`echo "$LDSHARED" | sed ['s|\$(LD)|'"${LD}"'|g;s|\$(CC)|$(MJIT_CC)|g']`} MAINLIBS="$LIBS" LIBS=$ORIG_LIBS @@ -4244,7 +4138,6 @@ 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/.*://'` @@ -4396,10 +4289,6 @@ 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 @@ -4504,7 +4393,7 @@ guard=INCLUDE_RUBY_CONFIG_H { echo "#ifndef $guard" echo "#define $guard 1" - sed "/^@%:@define PACKAGE_/d;s/ *$//" confdefs.h + grep -v "^#define PACKAGE_" confdefs.h echo "#endif /* $guard */" } | tr -d '\015' | ( @@ -4622,6 +4511,7 @@ AC_SUBST(DESTDIR) AC_OUTPUT } +} AS_IF([test "$silent" = yes], [], [ AS_IF([${FOLD+:} false], [], [ @@ -4669,8 +4559,8 @@ config_summary "debugflags" "$debugflags" config_summary "warnflags" "$warnflags" config_summary "strip command" "$STRIP" config_summary "install doc" "$DOCTARGETS" +config_summary "MJIT support" "$MJIT_SUPPORT" config_summary "YJIT support" "$YJIT_SUPPORT" -config_summary "RJIT support" "$RJIT_SUPPORT" config_summary "man page type" "$MANTYPE" config_summary "search path" "$search_path" config_summary "static-linked-ext" ${EXTSTATIC:+"yes"} diff --git a/constant.h b/constant.h index 90a68d447a..e0d36909e1 100644 --- a/constant.h +++ b/constant.h @@ -43,11 +43,13 @@ VALUE rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj); void rb_free_const_table(struct rb_id_table *tbl); VALUE rb_const_source_location(VALUE, ID); +MJIT_SYMBOL_EXPORT_BEGIN int rb_autoloading_value(VALUE mod, ID id, VALUE *value, rb_const_flag_t *flag); rb_const_entry_t *rb_const_lookup(VALUE klass, ID id); VALUE rb_public_const_get_at(VALUE klass, ID id); VALUE rb_public_const_get_from(VALUE klass, ID id); int rb_public_const_defined_from(VALUE klass, ID id); VALUE rb_const_source_location_at(VALUE, ID); +MJIT_SYMBOL_EXPORT_END #endif /* CONSTANT_H */ @@ -26,16 +26,15 @@ extern int madvise(caddr_t, size_t, int); #include COROUTINE_H #include "eval_intern.h" +#include "gc.h" #include "internal.h" #include "internal/cont.h" -#include "internal/thread.h" #include "internal/error.h" -#include "internal/gc.h" #include "internal/proc.h" #include "internal/sanitizers.h" #include "internal/warnings.h" #include "ruby/fiber/scheduler.h" -#include "rjit.h" +#include "mjit.h" #include "yjit.h" #include "vm_core.h" #include "vm_sync.h" @@ -71,6 +70,8 @@ static VALUE rb_cFiberPool; #define FIBER_POOL_ALLOCATION_FREE #endif +#define jit_cont_enabled (mjit_enabled || rb_yjit_enabled_p()) + enum context_type { CONTINUATION_CONTEXT = 0, FIBER_CONTEXT = 1 @@ -177,7 +178,7 @@ struct fiber_pool { // A singly-linked list of allocations which contain 1 or more stacks each. struct fiber_pool_allocation * allocations; - // Free list that provides O(1) stack "allocation". + // Provides O(1) stack "allocation": struct fiber_pool_vacancy * vacancies; // The size of the stack allocations (excluding any guard page). @@ -189,15 +190,13 @@ struct fiber_pool { // The initial number of stacks to allocate. size_t initial_count; - // Whether to madvise(free) the stack or not. - // If this value is set to 1, the stack will be madvise(free)ed - // (or equivalent), where possible, when it is returned to the pool. + // Whether to madvise(free) the stack or not: int free_stacks; // The number of stacks that have been used in this pool. size_t used; - // The amount to allocate for the vm_stack. + // The amount to allocate for the vm_stack: size_t vm_stack_size; }; @@ -230,18 +229,18 @@ typedef struct rb_context_struct { struct rb_jit_cont *jit_cont; // Continuation contexts for JITs } rb_context_t; + /* * Fiber status: - * [Fiber.new] ------> FIBER_CREATED ----> [Fiber#kill] --> | - * | [Fiber#resume] | - * v | - * +--> FIBER_RESUMED ----> [return] ------> | - * [Fiber#resume] | | [Fiber.yield/transfer] | - * [Fiber#transfer] | v | - * +--- FIBER_SUSPENDED --> [Fiber#kill] --> | - * | - * | - * FIBER_TERMINATED <-------------------+ + * [Fiber.new] ------> FIBER_CREATED + * | [Fiber#resume] + * v + * +--> FIBER_RESUMED ----+ + * [Fiber#resume] | | [Fiber.yield] | + * | v | + * +-- FIBER_SUSPENDED | [Terminate] + * | + * FIBER_TERMINATED <-+ */ enum fiber_status { FIBER_CREATED, @@ -267,20 +266,12 @@ struct rb_fiber_struct { unsigned int yielding : 1; unsigned int blocking : 1; - unsigned int killed : 1; - struct coroutine_context context; struct fiber_pool_stack stack; }; static struct fiber_pool shared_fiber_pool = {NULL, NULL, 0, 0, 0, 0}; -void -rb_free_shared_fiber_pool(void) -{ - xfree(shared_fiber_pool.allocations); -} - static ID fiber_initialize_keywords[3] = {0}; /* @@ -701,9 +692,7 @@ fiber_pool_stack_free(struct fiber_pool_stack * stack) // If this is not true, the vacancy information will almost certainly be destroyed: VM_ASSERT(size <= (stack->size - RB_PAGE_SIZE)); - int advice = stack->pool->free_stacks >> 1; - - if (DEBUG) fprintf(stderr, "fiber_pool_stack_free: %p+%"PRIuSIZE" [base=%p, size=%"PRIuSIZE"] advice=%d\n", base, size, stack->base, stack->size, advice); + if (DEBUG) fprintf(stderr, "fiber_pool_stack_free: %p+%"PRIuSIZE" [base=%p, size=%"PRIuSIZE"]\n", base, size, stack->base, stack->size); // The pages being used by the stack can be returned back to the system. // That doesn't change the page mapping, but it does allow the system to @@ -717,29 +706,24 @@ fiber_pool_stack_free(struct fiber_pool_stack * stack) #ifdef __wasi__ // WebAssembly doesn't support madvise, so we just don't do anything. #elif VM_CHECK_MODE > 0 && defined(MADV_DONTNEED) - if (!advice) advice = MADV_DONTNEED; // This immediately discards the pages and the memory is reset to zero. - madvise(base, size, advice); + madvise(base, size, MADV_DONTNEED); #elif defined(MADV_FREE_REUSABLE) - if (!advice) advice = MADV_FREE_REUSABLE; // Darwin / macOS / iOS. // Acknowledge the kernel down to the task info api we make this // page reusable for future use. - // As for MADV_FREE_REUSABLE below we ensure in the rare occasions the task was not + // As for MADV_FREE_REUSE below we ensure in the rare occasions the task was not // completed at the time of the call to re-iterate. - while (madvise(base, size, advice) == -1 && errno == EAGAIN); + while (madvise(base, size, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN); #elif defined(MADV_FREE) - if (!advice) advice = MADV_FREE; // Recent Linux. - madvise(base, size, advice); + madvise(base, size, MADV_FREE); #elif defined(MADV_DONTNEED) - if (!advice) advice = MADV_DONTNEED; // Old Linux. - madvise(base, size, advice); + madvise(base, size, MADV_DONTNEED); #elif defined(POSIX_MADV_DONTNEED) - if (!advice) advice = POSIX_MADV_DONTNEED; // Solaris? - posix_madvise(base, size, advice); + posix_madvise(base, size, POSIX_MADV_DONTNEED); #elif defined(_WIN32) VirtualAlloc(base, size, MEM_RESET, PAGE_READWRITE); // Not available in all versions of Windows. @@ -1066,8 +1050,10 @@ cont_free(void *ptr) RUBY_FREE_UNLESS_NULL(cont->saved_vm_stack.ptr); - VM_ASSERT(cont->jit_cont != NULL); - jit_cont_free(cont->jit_cont); + if (jit_cont_enabled) { + 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"); @@ -1296,42 +1282,26 @@ rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data) if (cont->ec->vm_stack == NULL) continue; - 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); + 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); } - 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; - 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); + if (cfp == cont->ec->cfp) + break; // reached the most recent 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; @@ -1344,8 +1314,9 @@ static void cont_init_jit_cont(rb_context_t *cont) { VM_ASSERT(cont->jit_cont == NULL); - // We always allocate this since YJIT may be enabled later - cont->jit_cont = jit_cont_new(&(cont->saved_ec)); + if (jit_cont_enabled) { + cont->jit_cont = jit_cont_new(&(cont->saved_ec)); + } } struct rb_execution_context_struct * @@ -1392,11 +1363,15 @@ rb_fiberptr_blocking(struct rb_fiber_struct *fiber) return fiber->blocking; } -// Initialize the jit_cont_lock +// Start working with jit_cont. 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 @@ -2021,7 +1996,6 @@ fiber_t_alloc(VALUE fiber_value, unsigned int blocking) fiber->cont.self = fiber_value; fiber->cont.type = FIBER_CONTEXT; fiber->blocking = blocking; - fiber->killed = 0; cont_init(&fiber->cont, th); fiber->cont.saved_ec.fiber_ptr = fiber; @@ -2087,10 +2061,10 @@ fiber_storage_set(struct rb_fiber_struct *fiber, VALUE storage) } static inline VALUE -fiber_storage_get(rb_fiber_t *fiber, int allocate) +fiber_storage_get(rb_fiber_t *fiber) { VALUE storage = fiber->cont.saved_ec.storage; - if (storage == Qnil && allocate) { + if (storage == Qnil) { storage = rb_hash_new(); fiber_storage_set(fiber, storage); } @@ -2117,15 +2091,7 @@ static VALUE rb_fiber_storage_get(VALUE self) { storage_access_must_be_from_same_fiber(self); - - VALUE storage = fiber_storage_get(fiber_ptr(self), FALSE); - - if (storage == Qnil) { - return Qnil; - } - else { - return rb_obj_dup(storage); - } + return rb_obj_dup(fiber_storage_get(fiber_ptr(self))); } static int @@ -2205,7 +2171,8 @@ rb_fiber_storage_aref(VALUE class, VALUE key) { Check_Type(key, T_SYMBOL); - VALUE storage = fiber_storage_get(fiber_current(), FALSE); + VALUE storage = fiber_storage_get(fiber_current()); + if (storage == Qnil) return Qnil; return rb_hash_aref(storage, key); @@ -2226,15 +2193,9 @@ rb_fiber_storage_aset(VALUE class, VALUE key, VALUE value) { Check_Type(key, T_SYMBOL); - VALUE storage = fiber_storage_get(fiber_current(), value != Qnil); - if (storage == Qnil) return Qnil; + VALUE storage = fiber_storage_get(fiber_current()); - if (value == Qnil) { - return rb_hash_delete(storage, key); - } - else { - return rb_hash_aset(storage, key, value); - } + return rb_hash_aset(storage, key, value); } static VALUE @@ -2512,6 +2473,7 @@ rb_fiber_start(rb_fiber_t *fiber) rb_proc_t *proc; enum ruby_tag_type state; + int need_interrupt = TRUE; VM_ASSERT(th->ec == GET_EC()); VM_ASSERT(FIBER_RESUMED_P(fiber)); @@ -2537,7 +2499,6 @@ rb_fiber_start(rb_fiber_t *fiber) } EC_POP_TAG(); - int need_interrupt = TRUE; VALUE err = Qfalse; if (state) { err = th->ec->errinfo; @@ -2546,16 +2507,13 @@ rb_fiber_start(rb_fiber_t *fiber) if (state == TAG_RAISE) { // noop... } - else if (state == TAG_FATAL && err == RUBY_FATAL_FIBER_KILLED) { - need_interrupt = FALSE; - err = Qfalse; - } else if (state == TAG_FATAL) { rb_threadptr_pending_interrupt_enque(th, err); } else { err = rb_vm_make_jump_tag_but_local_jump(state, err); } + need_interrupt = TRUE; } rb_fiber_terminate(fiber, need_interrupt, err); @@ -2574,9 +2532,12 @@ rb_threadptr_root_fiber_setup(rb_thread_t *th) fiber->cont.saved_ec.fiber_ptr = fiber; fiber->cont.saved_ec.thread_ptr = th; fiber->blocking = 1; - 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, mjit_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); } @@ -2587,12 +2548,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 = rb_current_execution_context(false); + rb_execution_context_t *ec = GET_EC(); VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT); VM_ASSERT(th->ec->fiber_ptr->cont.self == 0); - if (ec && th->ec == ec) { + if (th->ec == ec) { rb_ractor_set_current_ec(th->ractor, NULL); } fiber_free(th->ec->fiber_ptr); @@ -2673,19 +2634,6 @@ fiber_store(rb_fiber_t *next_fiber, rb_thread_t *th) fiber_setcontext(next_fiber, fiber); } -static void -fiber_check_killed(rb_fiber_t *fiber) -{ - VM_ASSERT(fiber == fiber_current()); - - if (fiber->killed) { - rb_thread_t *thread = fiber->cont.saved_ec.thread_ptr; - - thread->ec->errinfo = RUBY_FATAL_FIBER_KILLED; - EC_JUMP_TAG(thread->ec, RUBY_TAG_FATAL); - } -} - static inline VALUE fiber_switch(rb_fiber_t *fiber, int argc, const VALUE *argv, int kw_splat, rb_fiber_t *resuming_fiber, bool yielding) { @@ -2774,14 +2722,7 @@ fiber_switch(rb_fiber_t *fiber, int argc, const VALUE *argv, int kw_splat, rb_fi current_fiber = th->ec->fiber_ptr; value = current_fiber->cont.value; - - fiber_check_killed(current_fiber); - - if (current_fiber->cont.argc == -1) { - // Fiber#raise will trigger this path. - rb_exc_raise(value); - } - + if (current_fiber->cont.argc == -1) rb_exc_raise(value); return value; } @@ -2817,8 +2758,6 @@ fiber_blocking_yield(VALUE fiber_value) rb_fiber_t *fiber = fiber_ptr(fiber_value); rb_thread_t * volatile th = fiber->cont.saved_ec.thread_ptr; - VM_ASSERT(fiber->blocking == 0); - // fiber->blocking is `unsigned int : 1`, so we use it as a boolean: fiber->blocking = 1; @@ -3221,13 +3160,12 @@ rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass) } static VALUE -fiber_raise(rb_fiber_t *fiber, VALUE exception) +fiber_raise(rb_fiber_t *fiber, int argc, const VALUE *argv) { - if (fiber == fiber_current()) { - rb_exc_raise(exception); - } - else if (fiber->resuming_fiber) { - return fiber_raise(fiber->resuming_fiber, exception); + VALUE exception = rb_make_exception(argc, argv); + + if (fiber->resuming_fiber) { + rb_raise(rb_eFiberError, "attempt to raise a resuming fiber"); } else if (FIBER_SUSPENDED_P(fiber) && !fiber->yielding) { return fiber_transfer_kw(fiber, -1, &exception, RB_NO_KEYWORDS); @@ -3240,9 +3178,7 @@ fiber_raise(rb_fiber_t *fiber, VALUE exception) VALUE rb_fiber_raise(VALUE fiber, int argc, const VALUE *argv) { - VALUE exception = rb_make_exception(argc, argv); - - return fiber_raise(fiber_ptr(fiber), exception); + return fiber_raise(fiber_ptr(fiber), argc, argv); } /* @@ -3265,8 +3201,6 @@ 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+. */ static VALUE rb_fiber_m_raise(int argc, VALUE *argv, VALUE self) @@ -3276,45 +3210,6 @@ rb_fiber_m_raise(int argc, VALUE *argv, VALUE self) /* * call-seq: - * fiber.kill -> nil - * - * 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) -{ - rb_fiber_t *fiber = fiber_ptr(self); - - if (fiber->killed) return Qfalse; - fiber->killed = 1; - - if (fiber->status == FIBER_CREATED) { - fiber->status = FIBER_TERMINATED; - } - else if (fiber->status != FIBER_TERMINATED) { - if (fiber_current() == fiber) { - fiber_check_killed(fiber); - } else { - fiber_raise(fiber_ptr(self), Qnil); - } - } - - return self; -} - -/* - * call-seq: * Fiber.current -> fiber * * Returns the current fiber. If you are not running in the context of @@ -3471,15 +3366,6 @@ Init_Cont(void) const char *fiber_shared_fiber_pool_free_stacks = getenv("RUBY_SHARED_FIBER_POOL_FREE_STACKS"); if (fiber_shared_fiber_pool_free_stacks) { shared_fiber_pool.free_stacks = atoi(fiber_shared_fiber_pool_free_stacks); - - if (shared_fiber_pool.free_stacks < 0) { - rb_warn("Setting RUBY_SHARED_FIBER_POOL_FREE_STACKS to a negative value is not allowed."); - shared_fiber_pool.free_stacks = 0; - } - - if (shared_fiber_pool.free_stacks > 1) { - rb_warn("Setting RUBY_SHARED_FIBER_POOL_FREE_STACKS to a value greater than 1 is operating system specific, and may cause crashes."); - } } rb_cFiber = rb_define_class("Fiber", rb_cObject); @@ -3497,7 +3383,6 @@ Init_Cont(void) rb_define_method(rb_cFiber, "storage=", rb_fiber_storage_set, 1); rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1); rb_define_method(rb_cFiber, "raise", rb_fiber_m_raise, -1); - rb_define_method(rb_cFiber, "kill", rb_fiber_m_kill, 0); rb_define_method(rb_cFiber, "backtrace", rb_fiber_backtrace, -1); rb_define_method(rb_cFiber, "backtrace_locations", rb_fiber_backtrace_locations, -1); rb_define_method(rb_cFiber, "to_s", fiber_to_s, 0); diff --git a/coroutine/amd64/Context.S b/coroutine/amd64/Context.S index 056c276a31..d50732adbc 100644 --- a/coroutine/amd64/Context.S +++ b/coroutine/amd64/Context.S @@ -13,35 +13,29 @@ .globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer) PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer): - # Make space on the stack for 6 registers: - subq $48, %rsp - - # Save caller state: - movq %rbp, 40(%rsp) - movq %rbx, 32(%rsp) - movq %r12, 24(%rsp) - movq %r13, 16(%rsp) - movq %r14, 8(%rsp) - movq %r15, (%rsp) - - # Save caller stack pointer: + # Save caller state + pushq %rbp + pushq %rbx + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + + # Save caller stack pointer movq %rsp, (%rdi) - # Restore callee stack pointer: + # Restore callee stack pointer movq (%rsi), %rsp # Restore callee state - movq 40(%rsp), %rbp - movq 32(%rsp), %rbx - movq 24(%rsp), %r12 - movq 16(%rsp), %r13 - movq 8(%rsp), %r14 - movq (%rsp), %r15 - - # Adjust stack pointer back: - addq $48, %rsp - - # Put the first argument into the return value: + popq %r15 + popq %r14 + popq %r13 + popq %r12 + popq %rbx + popq %rbp + + # Put the first argument into the return value movq %rdi, %rax # We pop the return address and jump to it diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S index eeb0f774a3..07d50d30df 100644 --- a/coroutine/arm64/Context.S +++ b/coroutine/arm64/Context.S @@ -18,25 +18,11 @@ .align 2 #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(SYMBOL_PREFIX,coroutine_transfer) PREFIXED_SYMBOL(SYMBOL_PREFIX,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 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, 0xa0 + sub sp, sp, 0xb0 # Save caller registers stp d8, d9, [sp, 0x00] @@ -50,6 +36,9 @@ PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer): stp x27, x28, [sp, 0x80] stp x29, x30, [sp, 0x90] + # Save return address + str x30, [sp, 0xa0] + # Save stack pointer to x0 (first argument) mov x2, sp str x2, [x0, 0] @@ -70,51 +59,15 @@ PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer): ldp x27, x28, [sp, 0x80] ldp x29, x30, [sp, 0x90] - # Pop stack frame - add sp, sp, 0xa0 + # Load return address into x4 + ldr x4, [sp, 0xa0] -#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT != 0) - # autiasp: Authenticate x30 (LR) with SP and key A - hint #29 -#endif + # Pop stack frame + add sp, sp, 0xb0 - # Jump to return address (in x30) - ret + # Jump to return address (in x4) + ret x4 #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif - -#if __ARM_FEATURE_BTI_DEFAULT != 0 || __ARM_FEATURE_PAC_DEFAULT != 0 -/* 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 __ARM_FEATURE_BTI_DEFAULT != 0 -# define BTI_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_BTI -# else -# define BTI_FLAG 0 -# endif -# if __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 diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h index 1819fa5be9..1472621f48 100644 --- a/coroutine/arm64/Context.h +++ b/coroutine/arm64/Context.h @@ -17,7 +17,7 @@ #define COROUTINE __attribute__((noreturn)) void -enum {COROUTINE_REGISTERS = 0xa0 / 8}; +enum {COROUTINE_REGISTERS = 0xb0 / 8}; #if defined(__SANITIZE_ADDRESS__) #define COROUTINE_SANITIZE_ADDRESS @@ -50,23 +50,6 @@ static inline void coroutine_initialize_main(struct coroutine_context * context) context->stack_pointer = NULL; } -#if defined(__ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0 -// Sign the given instruction address with the given modifier and key A -static inline void *ptrauth_sign_instruction_addr(void *addr, void *modifier) { - 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; - return addr; -} -#else -// No-op if PAC is not enabled -static inline void *ptrauth_sign_instruction_addr(void *addr, void *modifier) { - return addr; -} -#endif - static inline void coroutine_initialize( struct coroutine_context *context, coroutine_start start, @@ -83,13 +66,12 @@ static inline void coroutine_initialize( // Stack grows down. Force 16-byte alignment. char * top = (char*)stack + size; - top = (char *)((uintptr_t)top & ~0xF); - context->stack_pointer = (void**)top; + context->stack_pointer = (void**)((uintptr_t)top & ~0xF); context->stack_pointer -= COROUTINE_REGISTERS; memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS); - context->stack_pointer[0x98 / 8] = ptrauth_sign_instruction_addr((void*)start, (void*)top); + context->stack_pointer[0xa0 / 8] = (void*)start; } 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 7dba829a1d..71791a4004 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 deleted file mode 100644 index 662f5dfb6c..0000000000 --- a/coroutine/loongarch64/Context.S +++ /dev/null @@ -1,73 +0,0 @@ -#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): - - # Make space on the stack for caller registers - addi.d $sp, $sp, -0xa0 - - # Save caller registers - st.d $s0, $sp, 0x00 - st.d $s1, $sp, 0x08 - st.d $s2, $sp, 0x10 - st.d $s3, $sp, 0x18 - st.d $s4, $sp, 0x20 - st.d $s5, $sp, 0x28 - st.d $s6, $sp, 0x30 - st.d $s7, $sp, 0x38 - st.d $s8, $sp, 0x40 - st.d $fp, $sp, 0x48 - fst.d $fs0, $sp, 0x50 - fst.d $fs1, $sp, 0x58 - fst.d $fs2, $sp, 0x60 - fst.d $fs3, $sp, 0x68 - fst.d $fs4, $sp, 0x70 - fst.d $fs5, $sp, 0x78 - fst.d $fs6, $sp, 0x80 - fst.d $fs7, $sp, 0x88 - - # Save return address - st.d $ra, $sp, 0x90 - - # Save stack pointer to a0 (first argument) - st.d $sp, $a0, 0x00 - - # Load stack pointer from a1 (second argument) - ld.d $sp, $a1, 0x00 - - # Restore caller registers - ld.d $s0, $sp, 0x00 - ld.d $s1, $sp, 0x08 - ld.d $s2, $sp, 0x10 - ld.d $s3, $sp, 0x18 - ld.d $s4, $sp, 0x20 - ld.d $s5, $sp, 0x28 - ld.d $s6, $sp, 0x30 - ld.d $s7, $sp, 0x38 - ld.d $s8, $sp, 0x40 - ld.d $fp, $sp, 0x48 - fld.d $fs0, $sp, 0x50 - fld.d $fs1, $sp, 0x58 - fld.d $fs2, $sp, 0x60 - fld.d $fs3, $sp, 0x68 - fld.d $fs4, $sp, 0x70 - fld.d $fs5, $sp, 0x78 - fld.d $fs6, $sp, 0x80 - fld.d $fs7, $sp, 0x88 - - # Load return address - ld.d $ra, $sp, 0x90 - - # Pop stack frame - addi.d $sp, $sp, 0xa0 - - # Jump to return address - jr $ra - -#if defined(__linux__) && defined(__ELF__) -.section .note.GNU-stack,"",%progbits -#endif diff --git a/coroutine/loongarch64/Context.h b/coroutine/loongarch64/Context.h deleted file mode 100644 index 668c9a965e..0000000000 --- a/coroutine/loongarch64/Context.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include <assert.h> -#include <stddef.h> -#include <stdint.h> -#include <string.h> - -#define COROUTINE __attribute__((noreturn)) void - -enum {COROUTINE_REGISTERS = 0xa0 / 8}; - -struct coroutine_context -{ - void **stack_pointer; - void *argument; -}; - -typedef COROUTINE(* 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 coroutine_initialize( - struct coroutine_context *context, - coroutine_start start, - void *stack, - size_t size -) { - assert(start && stack && size >= 1024); - - // Stack grows down. Force 16-byte alignment. - char * top = (char*)stack + size; - context->stack_pointer = (void**)((uintptr_t)top & ~0xF); - - context->stack_pointer -= COROUTINE_REGISTERS; - memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS); - - context->stack_pointer[0x90 / 8] = (void*)start; -} - -struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target); - -static inline void coroutine_destroy(struct coroutine_context * context) -{ -} diff --git a/coroutine/ppc/Context.S b/coroutine/ppc/Context.S index e2431a9250..cdda93e179 100644 --- a/coroutine/ppc/Context.S +++ b/coroutine/ppc/Context.S @@ -3,7 +3,7 @@ ; 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. diff --git a/coroutine/ppc/Context.h b/coroutine/ppc/Context.h index 8035d08556..1fce112579 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.h b/coroutine/ppc64/Context.h index 085b475ed5..3e6f77f55a 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/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 192a8cc711..f342d2fcf7 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -2,15 +2,13 @@ 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)" -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-cpp := $(CPP) -xc +windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \ + $(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp))) WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED STRIP = @STRIP@ @@ -46,7 +44,6 @@ SOLIBS := $(DLL_BASE_NAME).res.$(OBJEXT) $(SOLIBS) override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT) RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc RUBYDEF = $(DLL_BASE_NAME).def -override LIBRUBY_FOR_LEAKED_GLOBALS := # DLL shows symbols from import library ruby: $(PROGRAM) rubyw: $(WPROGRAM) @@ -69,7 +66,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) @@ -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. @@ -40,79 +37,66 @@ // #define rb_darray_ref(ary, idx) (&((ary)->data[(idx)])) -/* Copy a new element into the array. ptr_to_ary is evaluated multiple times. - * - * 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) - -#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) - -#define rb_darray_append_impl(ptr_to_ary, element, realloc_func) do { \ - rb_darray_ensure_space((ptr_to_ary), \ - sizeof(**(ptr_to_ary)), \ - sizeof((*(ptr_to_ary))->data[0]), \ - realloc_func); \ +// Copy a new element into the array. ptr_to_ary is evaluated multiple times. +// +// void rb_darray_append(rb_darray(T) *ptr_to_ary, T element); +// +#define rb_darray_append(ptr_to_ary, element) do { \ + rb_darray_ensure_space((ptr_to_ary), sizeof(**(ptr_to_ary)), \ + sizeof((*(ptr_to_ary))->data[0])); \ rb_darray_set(*(ptr_to_ary), \ (*(ptr_to_ary))->meta.size, \ (element)); \ (*(ptr_to_ary))->meta.size++; \ } while (0) + +// Last element of the array +// +#define rb_darray_back(ary) ((ary)->data[(ary)->meta.size - 1]) + +// Remove the last element of the array. +// +#define rb_darray_pop_back(ary) ((ary)->meta.size--) + +// Remove element at idx and replace it by the last element +#define rb_darray_remove_unordered(ary, idx) do { \ + rb_darray_set(ary, idx, rb_darray_back(ary)); \ + rb_darray_pop_back(ary); \ +} while (0); + // Iterate over items of the array in a for loop // #define rb_darray_foreach(ary, idx_name, elem_ptr_var) \ for (size_t idx_name = 0; idx_name < rb_darray_size(ary) && ((elem_ptr_var) = rb_darray_ref(ary, idx_name)); ++idx_name) -// Iterate over valid indices in the array in a for loop +// Iterate over valid indicies in the array in a for loop // #define rb_darray_for(ary, idx_name) \ for (size_t idx_name = 0; idx_name < rb_darray_size(ary); ++idx_name) -/* Make a dynamic array of a certain size. All bytes backing the elements are set to zero. - * Return 1 on success and 0 on failure. - * - * Note that NULL is a valid empty dynamic array. - * - * void rb_darray_make(rb_darray(T) *ptr_to_ary, size_t size); - */ +// Make a dynamic array of a certain size. All bytes backing the elements are set to zero. +// +// Note that NULL is a valid empty dynamic array. +// +// void rb_darray_make(rb_darray(T) *ptr_to_ary, size_t size); +// #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) - -#define rb_darray_make_without_gc(ptr_to_ary, size) \ - rb_darray_make_impl((ptr_to_ary), size, sizeof(**(ptr_to_ary)), \ - sizeof((*(ptr_to_ary))->data[0]), rb_darray_calloc_mul_add_without_gc) - -/* Resize the darray to a new capacity. The new capacity must be greater than - * or equal to the size of the darray. - * - * 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)), \ - sizeof((*(ptr_to_ary))->data[0]), rb_darray_realloc_mul_add_without_gc) + sizeof((*(ptr_to_ary))->data[0])) #define rb_darray_data_ptr(ary) ((ary)->data) +// Set the size of the array to zero without freeing the backing memory. +// Allows reusing the same array. +// +#define rb_darray_clear(ary) (ary->meta.size = 0) + typedef struct rb_darray_meta { size_t size; size_t capa; } rb_darray_meta_t; -/* Set the size of the array to zero without freeing the backing memory. - * Allows reusing the same array. */ -static inline void -rb_darray_clear(void *ary) -{ - rb_darray_meta_t *meta = ary; - if (meta) { - meta->size = 0; - } -} - // Get the size of the dynamic array. // static inline size_t @@ -131,86 +115,20 @@ rb_darray_capa(const void *ary) return meta ? meta->capa : 0; } -/* Free the dynamic array. */ +// Free the dynamic array. +// static inline void rb_darray_free(void *ary) { rb_darray_meta_t *meta = ary; - if (meta) ruby_sized_xfree(ary, meta->capa); -} - -static inline void -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. */ -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; - - void *ptr = calloc(1, size); - if (ptr == NULL) rb_bug("rb_darray_calloc_mul_add_without_gc: failed"); - - return ptr; -} - -/* Internal function. Like rb_xrealloc_mul_add but does not trigger GC and does - * not check for overflow in arithmetic. */ -static inline void * -rb_darray_realloc_mul_add_without_gc(const void *orig_ptr, size_t x, size_t y, size_t z) -{ - size_t size = (x * y) + z; - - void *ptr = realloc((void *)orig_ptr, size); - if (ptr == NULL) rb_bug("rb_darray_realloc_mul_add_without_gc: failed"); - - 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) -{ - return (size_t)(1 << (64 - nlz_int64(n))); -} - -/* 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)) -{ - rb_darray_meta_t **ptr_to_ptr_to_meta = ptr_to_ary; - rb_darray_meta_t *meta = *ptr_to_ptr_to_meta; - - rb_darray_meta_t *new_ary = realloc_mul_add_impl(meta, new_capa, element_size, header_size); - - if (meta == NULL) { - /* First allocation. Initialize size. On subsequence allocations - * realloc takes care of carrying over the size. */ - new_ary->size = 0; - } - - assert(new_ary->size <= new_capa); - - new_ary->capa = new_capa; - - // We don't have access to the type of the dynamic array in function context. - // Write out result with memcpy to avoid strict aliasing issue. - memcpy(ptr_to_ary, &new_ary, sizeof(new_ary)); + ruby_sized_xfree(ary, meta->capa); } // Internal function // Ensure there is space for one more element. // 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)) +rb_darray_ensure_space(void *ptr_to_ary, size_t header_size, size_t element_size) { rb_darray_meta_t **ptr_to_ptr_to_meta = ptr_to_ary; rb_darray_meta_t *meta = *ptr_to_ptr_to_meta; @@ -220,12 +138,25 @@ rb_darray_ensure_space(void *ptr_to_ary, size_t header_size, size_t element_size // Double the capacity size_t new_capa = current_capa == 0 ? 1 : current_capa * 2; - rb_darray_resize_capa_impl(ptr_to_ary, new_capa, header_size, element_size, realloc_mul_add_impl); + rb_darray_meta_t *doubled_ary = rb_xrealloc_mul_add(meta, new_capa, element_size, header_size); + // rb_xrealloc functions guarantee that NULL is not returned + assert(doubled_ary != NULL); + + if (meta == NULL) { + // First allocation. Initialize size. On subsequence allocations + // realloc takes care of carrying over the size. + doubled_ary->size = 0; + } + + doubled_ary->capa = new_capa; + + // We don't have access to the type of the dynamic array in function context. + // Write out result with memcpy to avoid strict aliasing issue. + memcpy(ptr_to_ary, &doubled_ary, sizeof(doubled_ary)); } static inline void -rb_darray_make_impl(void *ptr_to_ary, size_t array_size, size_t header_size, size_t element_size, - void *(*calloc_mul_add_impl)(size_t, size_t, size_t)) +rb_darray_make_impl(void *ptr_to_ary, size_t array_size, size_t header_size, size_t element_size) { rb_darray_meta_t **ptr_to_ptr_to_meta = ptr_to_ary; if (array_size == 0) { @@ -233,7 +164,9 @@ rb_darray_make_impl(void *ptr_to_ary, size_t array_size, size_t header_size, siz return; } - rb_darray_meta_t *meta = calloc_mul_add_impl(array_size, element_size, header_size); + rb_darray_meta_t *meta = rb_xcalloc_mul_add(array_size, element_size, header_size); + // rb_xcalloc functions guarantee that NULL is not returned + assert(meta != NULL); meta->size = array_size; meta->capa = array_size; @@ -53,8 +53,14 @@ const union { rb_econv_result_t econv_result; enum ruby_preserved_encindex encoding_index; enum ruby_robject_flags robject_flags; +#if !USE_RVARGC + enum ruby_robject_consts robject_consts; +#endif enum ruby_rmodule_flags rmodule_flags; enum ruby_rstring_flags rstring_flags; +#if !USE_RVARGC + enum ruby_rstring_consts rstring_consts; +#endif enum ruby_rarray_flags rarray_flags; enum ruby_rarray_consts rarray_consts; enum { @@ -70,7 +76,7 @@ const union { RUBY_FMODE_NOREVLOOKUP = 0x00000100, RUBY_FMODE_TRUNC = FMODE_TRUNC, RUBY_FMODE_TEXTMODE = FMODE_TEXTMODE, - RUBY_FMODE_EXTERNAL = 0x00010000, + RUBY_FMODE_PREP = 0x00010000, RUBY_FMODE_SETENC_BY_BOM = FMODE_SETENC_BY_BOM, RUBY_FMODE_UNIX = 0x00200000, RUBY_FMODE_INET = 0x00400000, @@ -112,7 +118,7 @@ ruby_debug_printf(const char *format, ...) va_end(ap); } -#include "internal/gc.h" +#include "gc.h" VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj) @@ -285,20 +291,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; struct debug_log_filter filters[MAX_DEBUG_LOG_FILTER_NUM]; unsigned int filters_num; - bool show_pid; rb_nativethread_lock_t lock; - char output_file[DEBUG_LOG_MAX_PATH+1]; FILE *output; } debug_log; @@ -400,39 +398,7 @@ setup_debug_log(void) } else { ruby_debug_log_mode |= ruby_debug_log_file; - - // 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) { + if ((debug_log.output = fopen(log_config, "w")) == NULL) { fprintf(stderr, "can not open %s for RUBY_DEBUG_LOG\n", log_config); exit(1); } @@ -443,17 +409,9 @@ 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(); - - if (getenv("RUBY_DEBUG_LOG_PID")) { - debug_log.show_pid = true; - } } } @@ -492,7 +450,7 @@ check_filter(const char *str, const struct debug_log_filter *filter, bool *state // (func_name or file_name) contains baz or boo // // RUBY_DEBUG_LOG_FILTER=foo,bar,-baz,-boo -// returns true if +// retunrs true if // (func_name or file_name) contains foo or bar // or // (func_name or file_name) doesn't contain baz and @@ -549,16 +507,10 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm int len = 0; int r = 0; - if (debug_log.show_pid) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "pid:%d\t", getpid()); - if (r < 0) rb_bug("ruby_debug_log returns %d", r); - len += r; - } - // message title if (func_name && len < MAX_DEBUG_LOG_MESSAGE_LEN) { r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "%s\t", func_name); - if (r < 0) rb_bug("ruby_debug_log returns %d", r); + if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); len += r; } @@ -577,67 +529,41 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm // C location if (file && len < MAX_DEBUG_LOG_MESSAGE_LEN) { r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "\t%s:%d", pretty_filename(file), line); - if (r < 0) rb_bug("ruby_debug_log returns %d", r); + if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); len += r; } - rb_execution_context_t *ec = rb_current_execution_context(false); - - // Ruby location - int ruby_line; - const char *ruby_file = ec ? rb_source_location_cstr(&ruby_line) : NULL; - - if (len < MAX_DEBUG_LOG_MESSAGE_LEN) { - if (ruby_file) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t%s:%d", pretty_filename(ruby_file), ruby_line); - } - else { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t"); + if (rb_current_execution_context(false)) { + // Ruby location + int ruby_line; + const char *ruby_file = rb_source_location_cstr(&ruby_line); + if (len < MAX_DEBUG_LOG_MESSAGE_LEN) { + if (ruby_file) { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t%s:%d", pretty_filename(ruby_file), ruby_line); + } + else { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t"); + } + if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); + len += r; } - if (r < 0) rb_bug("ruby_debug_log returns %d", r); - len += r; - } - -#ifdef RUBY_NT_SERIAL - // native thread information - if (len < MAX_DEBUG_LOG_MESSAGE_LEN) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tnt:%d", ruby_nt_serial); - if (r < 0) rb_bug("ruby_debug_log returns %d", r); - len += r; - } -#endif - - if (ec) { - rb_thread_t *th = ec ? rb_ec_thread_ptr(ec) : NULL; // ractor information if (ruby_single_main_ractor == NULL) { - rb_ractor_t *cr = th ? th->ractor : NULL; - rb_vm_t *vm = GET_VM(); - + rb_ractor_t *cr = GET_RACTOR(); if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { - 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); + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tr:#%u/%u", + (unsigned int)rb_ractor_id(cr), GET_VM()->ractor.cnt); + if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); len += r; } } // thread information - if (th && r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { - rb_execution_context_t *rec = th->ractor ? th->ractor->threads.running_ec : NULL; - const rb_thread_t *rth = rec ? rec->thread_ptr : NULL; - const rb_thread_t *sth = th->ractor ? th->ractor->threads.sched.running : NULL; - - if (rth != th || sth != th) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%u (rth:%d,sth:%d)", - rb_th_serial(th), rth ? (int)rb_th_serial(rth) : -1, sth ? (int)rb_th_serial(sth) : -1); - } - else { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%u", rb_th_serial(th)); - } - if (r < 0) rb_bug("ruby_debug_log returns %d", r); + const rb_thread_t *th = GET_THREAD(); + if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%u", rb_th_serial(th)); + if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); len += r; } } diff --git a/debug_counter.c b/debug_counter.c index 3dcc4c6a3a..463bebf849 100644 --- a/debug_counter.c +++ b/debug_counter.c @@ -25,8 +25,10 @@ const char *const rb_debug_counter_names[] = { #undef RB_DEBUG_COUNTER }; +MJIT_SYMBOL_EXPORT_BEGIN size_t rb_debug_counter[numberof(rb_debug_counter_names)]; void rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add); +MJIT_SYMBOL_EXPORT_END static rb_nativethread_lock_t debug_counter_lock; diff --git a/debug_counter.h b/debug_counter.h index a8b95edded..6e0b8dee60 100644 --- a/debug_counter.h +++ b/debug_counter.h @@ -100,13 +100,6 @@ RB_DEBUG_COUNTER(ccf_opt_block_call) RB_DEBUG_COUNTER(ccf_opt_struct_aref) RB_DEBUG_COUNTER(ccf_opt_struct_aset) RB_DEBUG_COUNTER(ccf_super_method) -RB_DEBUG_COUNTER(ccf_cfunc_other) -RB_DEBUG_COUNTER(ccf_cfunc_only_splat) -RB_DEBUG_COUNTER(ccf_cfunc_only_splat_kw) -RB_DEBUG_COUNTER(ccf_iseq_bmethod) -RB_DEBUG_COUNTER(ccf_noniseq_bmethod) -RB_DEBUG_COUNTER(ccf_opt_send_complex) -RB_DEBUG_COUNTER(ccf_opt_send_simple) /* * control frame push counts. @@ -134,22 +127,29 @@ RB_DEBUG_COUNTER(frame_R2C) RB_DEBUG_COUNTER(frame_C2C) RB_DEBUG_COUNTER(frame_C2R) -/* instance variable counts */ -RB_DEBUG_COUNTER(ivar_get_obj_hit) // Only T_OBJECT hits -RB_DEBUG_COUNTER(ivar_get_obj_miss) // Only T_OBJECT misses -RB_DEBUG_COUNTER(ivar_get_ic_hit) // All hits -RB_DEBUG_COUNTER(ivar_get_ic_miss) // All misses -RB_DEBUG_COUNTER(ivar_set_ic_hit) // All hits -RB_DEBUG_COUNTER(ivar_set_obj_hit) // Only T_OBJECT hits -RB_DEBUG_COUNTER(ivar_set_obj_miss) // Only T_OBJECT misses -RB_DEBUG_COUNTER(ivar_set_ic_miss) // All misses -RB_DEBUG_COUNTER(ivar_set_ic_miss_noobject) // Miss because non T_OBJECT -RB_DEBUG_COUNTER(ivar_get_base) // Calls to `rb_ivar_get` (very slow path) -RB_DEBUG_COUNTER(ivar_set_base) // Calls to `ivar_set` (very slow path) -RB_DEBUG_COUNTER(ivar_get_ic_miss_set) // Misses on IV reads where the cache was wrong -RB_DEBUG_COUNTER(ivar_get_cc_miss_set) // Misses on attr_reader where the cache was wrong -RB_DEBUG_COUNTER(ivar_get_ic_miss_unset) // Misses on IV read where the cache wasn't set -RB_DEBUG_COUNTER(ivar_get_cc_miss_unset) // Misses on attr_reader where the cache wasn't set +/* instance variable counts + * + * * ivar_get_ic_hit/miss: ivar_get inline cache (ic) hit/miss counts (VM insn) + * * ivar_get_ic_miss_unset: ... by unset (VM insn) + * * ivar_get_ic_miss_noobject: ... by "not T_OBJECT" (VM insn) + * * ivar_set_...: same counts with ivar_set (VM insn) + * * ivar_get/set_base: call counts of "rb_ivar_get/set()". + * because of (1) ic miss. + * (2) direct call by C extensions. + */ +RB_DEBUG_COUNTER(ivar_get_ic_hit) +RB_DEBUG_COUNTER(ivar_get_ic_miss) +RB_DEBUG_COUNTER(ivar_get_ic_miss_noobject) +RB_DEBUG_COUNTER(ivar_set_ic_hit) +RB_DEBUG_COUNTER(ivar_set_ic_miss) +RB_DEBUG_COUNTER(ivar_set_ic_miss_iv_hit) +RB_DEBUG_COUNTER(ivar_set_ic_miss_noobject) +RB_DEBUG_COUNTER(ivar_get_base) +RB_DEBUG_COUNTER(ivar_set_base) +RB_DEBUG_COUNTER(ivar_get_ic_miss_set) +RB_DEBUG_COUNTER(ivar_get_cc_miss_set) +RB_DEBUG_COUNTER(ivar_get_ic_miss_unset) +RB_DEBUG_COUNTER(ivar_get_cc_miss_unset) /* local variable counts * @@ -185,7 +185,8 @@ RB_DEBUG_COUNTER(gc_major_force) RB_DEBUG_COUNTER(gc_major_oldmalloc) RB_DEBUG_COUNTER(gc_enter_start) -RB_DEBUG_COUNTER(gc_enter_continue) +RB_DEBUG_COUNTER(gc_enter_mark_continue) +RB_DEBUG_COUNTER(gc_enter_sweep_continue) RB_DEBUG_COUNTER(gc_enter_rest) RB_DEBUG_COUNTER(gc_enter_finalizer) @@ -214,6 +215,7 @@ RB_DEBUG_COUNTER(gc_isptr_maybe) * * [attr] * * _ptr: R?? is not embed. * * _embed: R?? is embed. + * * _transient: R?? uses transient heap. * * type specific attr. * * str_shared: str is shared. * * str_nofree: nofree @@ -239,6 +241,7 @@ RB_DEBUG_COUNTER(obj_promote) RB_DEBUG_COUNTER(obj_wb_unprotect) RB_DEBUG_COUNTER(obj_obj_embed) +RB_DEBUG_COUNTER(obj_obj_transient) RB_DEBUG_COUNTER(obj_obj_ptr) RB_DEBUG_COUNTER(obj_obj_too_complex) @@ -249,6 +252,7 @@ RB_DEBUG_COUNTER(obj_str_nofree) RB_DEBUG_COUNTER(obj_str_fstr) RB_DEBUG_COUNTER(obj_ary_embed) +RB_DEBUG_COUNTER(obj_ary_transient) RB_DEBUG_COUNTER(obj_ary_ptr) RB_DEBUG_COUNTER(obj_ary_extracapa) /* @@ -272,9 +276,11 @@ RB_DEBUG_COUNTER(obj_hash_g8) RB_DEBUG_COUNTER(obj_hash_null) RB_DEBUG_COUNTER(obj_hash_ar) RB_DEBUG_COUNTER(obj_hash_st) +RB_DEBUG_COUNTER(obj_hash_transient) RB_DEBUG_COUNTER(obj_hash_force_convert) RB_DEBUG_COUNTER(obj_struct_embed) +RB_DEBUG_COUNTER(obj_struct_transient) RB_DEBUG_COUNTER(obj_struct_ptr) RB_DEBUG_COUNTER(obj_data_empty) @@ -329,6 +335,11 @@ RB_DEBUG_COUNTER(heap_xmalloc) RB_DEBUG_COUNTER(heap_xrealloc) RB_DEBUG_COUNTER(heap_xfree) +/* transient_heap */ +RB_DEBUG_COUNTER(theap_alloc) +RB_DEBUG_COUNTER(theap_alloc_fail) +RB_DEBUG_COUNTER(theap_evacuate) + // VM sync RB_DEBUG_COUNTER(vm_sync_lock) RB_DEBUG_COUNTER(vm_sync_lock_enter) diff --git a/defs/gmake.mk b/defs/gmake.mk index 5489b017b3..54fef6685f 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -1,19 +1,20 @@ # -*- mode: makefile-gmake; indent-tabs-mode: t -*- reconfig config.status: export MAKE:=$(MAKE) -export BASERUBY:=$(BASERUBY) override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+) override mflags := $(filter-out -j%,$(MFLAGS)) MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j) nproc = $(subst -j,,$(filter -j%,$(MFLAGS))) ifeq ($(GITHUB_ACTIONS),true) -# 93(bright yellow) is copied from .github/workflows/mingw.yml -override ACTIONS_GROUP = @echo "::group::[93m$(@:yes-%=%)[m" -override ACTIONS_ENDGROUP = @echo "::endgroup::" +override ACTIONS_GROUP = @echo "\#\#[group]$(patsubst yes-%,%,$@)" +override ACTIONS_ENDGROUP = @echo "\#\#[endgroup]" endif ifneq ($(filter darwin%,$(target_os)),) +# Remove debug option not to generate thousands of .dSYM +MJIT_DEBUGFLAGS := $(filter-out -g%,$(MJIT_DEBUGFLAGS)) + INSTRUBY_ENV += SDKROOT= endif INSTRUBY_ARGS += --gnumake @@ -25,7 +26,7 @@ TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS)) TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS)) -TEST_TARGETS := $(patsubst exam,test-bundled-gems test-bundler-parallel check,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS)) TEST_TARGETS := $(patsubst check,test-syntax-suggest test-spec test-all test-tool test-short,$(TEST_TARGETS)) TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS)) @@ -36,15 +37,12 @@ TEST_DEPENDS := $(filter-out test-all $(TEST_TARGETS),$(TEST_DEPENDS)) 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-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)) TEST_TARGETS := $(patsubst test-syntax-suggest,test-syntax-suggest $(PREPARE_SYNTAX_SUGGEST),$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts) -TEST_TARGETS := $(patsubst yes-%,%,$(filter-out no-%,$(TEST_TARGETS))) endif in-srcdir := $(if $(filter-out .,$(srcdir)),$(CHDIR) $(srcdir) &&) @@ -57,13 +55,6 @@ ifeq ($(if $(filter all main exts enc trans libencs libenc libtrans \ -include $(SHOWFLAGS) endif -ifeq ($(HAVE_BASERUBY):$(HAVE_GIT),yes:yes) -override modified := $(shell $(BASERUBY) -C $(srcdir) tool/file2lastrev.rb --modified='%Y %m %d') -override RUBY_RELEASE_YEAR := $(word 1,$(modified)) -override RUBY_RELEASE_MONTH := $(word 2,$(modified)) -override RUBY_RELEASE_DAY := $(word 3,$(modified)) -endif - ifneq ($(filter universal-%,$(arch)),) define archcmd %.$(1).S: %.c @@ -79,7 +70,7 @@ define archcmd %.i: %.$(1).i endef -$(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\ +$(foreach arch,$(arch_flags),\ $(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch))))) endif @@ -91,31 +82,16 @@ $(addprefix yes-,$(TEST_TARGETS)): $(TEST_DEPENDS) endif ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \ - btest-ruby test-knownbug test-leaked-globals test-basic \ + btest-ruby test-knownbug test-basic \ test-testframework test-tool test-ruby test-all \ test-spec test-syntax-suggest-prepare test-syntax-suggest \ test-bundler-prepare test-bundler test-bundler-parallel \ test-bundled-gems-precheck test-bundled-gems-fetch \ test-bundled-gems-prepare test-bundled-gems-run \ ) - -# grep ^yes-test-.*-precheck: template/Makefile.in defs/gmake.mk common.mk -test_prechecks := $(filter $(ORDERED_TEST_TARGETS),\ - test-leaked-globals \ - test-all \ - test-spec \ - test-syntax-suggest \ - test-bundler \ - test-bundler-parallel \ - test-bundled-gems\ - ) -prev_test := $(subst test-bundler-parallel,test-bundler,$(test_prechecks)) -prev_test := $(addsuffix -precheck,$(prev_test)) -first_test_prechecks := $(prev_test) - +prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck) $(foreach test,$(ORDERED_TEST_TARGETS), \ - $(eval yes-$(value test): $(addprefix yes-,$(value prev_test))); \ - $(eval no-$(value test): $(addprefix no-,$(value prev_test))); \ + $(eval yes-$(value test) no-$(value test): $(value prev_test)); \ $(eval prev_test := $(value test))) endif @@ -193,22 +169,15 @@ $(SCRIPTBINDIR): $(Q) mkdir $@ .PHONY: commit -COMMIT_PREPARE := $(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) +commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) up @$(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) \ - top_srcdir="$(top_srcdir)" srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \ - BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" BOOTSTRAPRUBY_OPT="$(BOOTSTRAPRUBY_OPT)" \ - MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" HAVE_BASERUBY="$(HAVE_BASERUBY)" \ + $(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \ + BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \ VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \ update-src srcs all-incs @@ -299,7 +268,6 @@ HELP_EXTRA_TASKS = \ " checkout-github: checkout GitHub Pull Request [PR=1234]" \ " pull-github: rebase GitHub Pull Request to new worktree [PR=1234]" \ " update-github: merge master branch and push it to Pull Request [PR=1234]" \ - " tags: generate TAGS file" \ "" # 1. squeeze spaces @@ -324,13 +292,12 @@ foreach-bundled-gems-rev = \ foreach-bundled-gems-rev-0 = \ $(call $(1),$(word 1,$(2)),$(word 2,$(2)),$(word 3,$(2)),$(word 4,$(2))) bundled-gem-gemfile = $(srcdir)/gems/$(1)-$(2).gem -bundled-gem-gemspec = $(srcdir)/gems/src/$(1)/$(1).gemspec +bundled-gem-srcdir = $(srcdir)/gems/src/$(1) bundled-gem-extracted = $(srcdir)/.bundle/gems/$(1)-$(2) -bundled-gem-revision = $(srcdir)/.bundle/.timestamp/$(1).revision update-gems: | $(patsubst %,$(srcdir)/gems/%.gem,$(bundled-gems)) update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-gemfile) -update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-gemspec) +update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-srcdir) test-bundler-precheck: | $(srcdir)/.bundle/cache @@ -358,44 +325,27 @@ $(srcdir)/.bundle/gems/%: $(srcdir)/gems/%.gem | .bundle/gems -Itool/lib -rbundled_gem \ -e 'BundledGem.unpack("gems/$(@F).gem", ".bundle")' -$(srcdir)/.bundle/.timestamp: - $(MAKEDIRS) $@ - -define build-gem -$(srcdir)/gems/src/$(1)/.git: | $(srcdir)/gems/src +define copy-gem +$(srcdir)/gems/src/$(1): | $(srcdir)/gems/src $(ECHO) Cloning $(4) - $(Q) $(GIT) clone $(4) $$(@D) + $(Q) $(GIT) clone $(4) $$(@) -$(bundled-gem-revision): \ - $(if $(if $(wildcard $$(@)),$(filter $(3),$(shell cat $$(@)))),,PHONY) \ - | $(srcdir)/.bundle/.timestamp $(srcdir)/gems/src/$(1)/.git - $(ECHO) Update $(1) to $(3) +$(srcdir)/.bundle/gems/$(1)-$(2): | $(srcdir)/gems/src/$(1) .bundle/gems + $(ECHO) Copying $(1)@$(3) to $$(@F) $(Q) $(CHDIR) "$(srcdir)/gems/src/$(1)" && \ - 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. -# This creates a dummy gemspec. -$(bundled-gem-gemspec): $(bundled-gem-revision) \ - | $(srcdir)/gems/src/$(1)/.git - $(Q) $(BASERUBY) -I$(tooldir)/lib -rbundled_gem -e 'BundledGem.dummy_gemspec(*ARGV)' $$(@) - -$(bundled-gem-gemfile): $(bundled-gem-gemspec) $(bundled-gem-revision) - $(ECHO) Building $(1)@$(3) to $$(@) + $(GIT) fetch origin $(3) && \ + $(GIT) checkout --detach $(3) && \ + : $(Q) $(BASERUBY) -C "$(srcdir)" \ -Itool/lib -rbundled_gem \ - -e 'BundledGem.build("gems/src/$(1)/$(1).gemspec", "$(2)", "gems", validation: false)' + -e 'BundledGem.copy("gems/src/$(1)/$(1).gemspec", ".bundle")' endef -define build-gem-0 -$(eval $(call build-gem,$(1),$(2),$(3),$(4))) +define copy-gem-0 +$(eval $(call copy-gem,$(1),$(2),$(3),$(4))) endef -$(call foreach-bundled-gems-rev,build-gem-0) +$(call foreach-bundled-gems-rev,copy-gem-0) $(srcdir)/gems/src: $(MAKEDIRS) $@ @@ -403,36 +353,49 @@ $(srcdir)/gems/src: $(srcdir)/.bundle/gems: $(MAKEDIRS) $@ -ifneq ($(DOT_WAIT),) -up:: $(DOT_WAIT) after-update -endif - ifneq ($(filter update-bundled_gems refresh-gems,$(MAKECMDGOALS)),) update-gems: update-bundled_gems endif +ifeq ($(filter 0 1,$(words $(arch_flags))),) +$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \ + $(eval $$(MJIT_HEADER:.h=)-$(value x).h \ + $$(MJIT_MIN_HEADER:.h=)-$(value x).h \ + $$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time \ + : ARCH_FLAG := -arch $(value x))) + +$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \ + $(eval $$(MJIT_HEADER:.h=)-$(value x).h: \ + $$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time)) + +mjit_min_headers := $(patsubst -arch=%,$(MJIT_MIN_HEADER:.h=-%.h),$(arch_flags)) +$(MJIT_MIN_HEADER): $(mjit_min_headers) $(PREP) + @ set -e; set $(patsubst -arch=%,%,$(arch_flags)); \ + cd $(@D); h=$(@F:.h=); \ + exec > $(@F).new; \ + echo '#if 0'; \ + for arch; do\ + echo "#elif defined __$${arch}__"; \ + echo "# include \"$$h-$$arch.h\""; \ + done; \ + echo "#else"; echo "# error unsupported platform"; echo "#endif" + $(IFCHANGE) $@ $@.new + $(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR) + $(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F) + +endif + .SECONDARY: update-unicode-files .SECONDARY: update-unicode-auxiliary-files .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 REVISION_LATEST := update endif -REVISION_IN_HEADER := $(shell sed '/^\#define RUBY_FULL_REVISION "\(.*\)"/!d;s//\1/;q' $(wildcard $(srcdir)/revision.h revision.h) /dev/null 2>/dev/null) +REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(wildcard $(srcdir)/revision.h revision.h) /dev/null 2>/dev/null) ifeq ($(REVISION_IN_HEADER),) REVISION_IN_HEADER := none endif @@ -503,7 +466,7 @@ update-deps: $(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(srcdir)/$(RUBYSPEC_CAPIEXT)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY) $(ECHO) building $@ $(Q) $(MAKEDIRS) $(@D) - $(Q) $(DLDSHARED) -L. $(XDLDFLAGS) $(XLDFLAGS) $(LDFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBYARG) + $(Q) $(DLDSHARED) $(XDLDFLAGS) $(XLDFLAGS) $(LDFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBYARG) $(Q) $(RMALL) $@.* rubyspec-capiext: $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c))) @@ -517,29 +480,3 @@ spec/%/ spec/%_spec.rb: programs exts PHONY +$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec-run -B $(srcdir)/spec/default.mspec $(SPECOPTS) $(patsubst %,$(srcdir)/%,$@) ruby.pc: $(filter-out ruby.pc,$(ruby_pc)) - -matz: up - $(eval MINOR := $(shell expr $(MINOR) + 1)) - $(eval message := Development of $(MAJOR).$(MINOR).0 started.) - $(eval files := include/ruby/version.h include/ruby/internal/abi.h) - 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) - -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),) -.NOTPARALLEL: ripper_srcs -else -ripper_src = -$(foreach r,$(RIPPER_SRCS),$(eval $(value r): | $(value ripper_src))\ - $(eval ripper_src := $(value r))) -ripper_srcs: $(ripper_src) -endif diff --git a/defs/id.def b/defs/id.def index 2ddde7be70..ebf00506ea 100644 --- a/defs/id.def +++ b/defs/id.def @@ -2,7 +2,6 @@ firstline, predefined = __LINE__+1, %[\ max min - hash freeze nil? inspect @@ -26,6 +25,7 @@ firstline, predefined = __LINE__+1, %[\ lambda send __send__ + __attached__ __recursive_key__ initialize initialize_copy diff --git a/defs/tags.mk b/defs/tags.mk deleted file mode 100644 index d29260c294..0000000000 --- a/defs/tags.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- mode: makefile-gmake; indent-tabs-mode: t -*- - -SRCS := $(shell $(GIT) ls-files \ - *.[chy] *.def *.inc *.rb \ - ccan/ coroutine/ include/ internal/ missing/ \ - 'enc/**/*.[ch]' 'win32/**/*.[ch]' \ - ) - -TAGS: $(SRCS) - @echo updating $@ - @tmp=$$(mktemp); \ - trap 'rm -f "$$tmp"' 0; \ - { \ - $(GIT) grep -h --no-line-number -o '^ *# *define *RBIMPL_ATTR_[A-Z_]*(*' -- include | \ - sed 's/^ *# *define *//;/_H$$/d;y/(/+/' | sort -u && \ - echo 'NORETURN+'; \ - } > "$$tmp" && \ - ctags -e -I@"$$tmp" -h .def.inc --langmap=c:+.y.def.inc $(^) diff --git a/defs/universal.mk b/defs/universal.mk new file mode 100644 index 0000000000..c34a31b356 --- /dev/null +++ b/defs/universal.mk @@ -0,0 +1,5 @@ +arch_flags := $(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))) +ifeq ($(filter 0 1,$(words $(arch_flags))),) +override MJIT_HEADER_SUFFIX = -% +override MJIT_HEADER_ARCH = -$(word 2,$(ARCH_FLAG)) +endif @@ -466,26 +466,31 @@ struct dir_data { }; static void +dir_mark(void *ptr) +{ + struct dir_data *dir = ptr; + rb_gc_mark(dir->path); +} + +static void dir_free(void *ptr) { struct dir_data *dir = ptr; if (dir->dir) closedir(dir->dir); + xfree(dir); } -RUBY_REFERENCES(dir_refs) = { - RUBY_REF_EDGE(struct dir_data, path), - RUBY_REF_END -}; +static size_t +dir_memsize(const void *ptr) +{ + return sizeof(struct dir_data); +} static const rb_data_type_t dir_data_type = { "dir", - { - 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 + {dir_mark, dir_free, dir_memsize,}, + 0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY }; static VALUE dir_close(VALUE); @@ -586,45 +591,6 @@ dir_s_close(rb_execution_context_t *ec, VALUE klass, VALUE dir) return dir_close(dir); } -# if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD) -/* - * call-seq: - * Dir.for_fd(fd) -> dir - * - * Returns a new \Dir object representing the directory specified by the given - * integer directory file descriptor +fd+: - * - * d0 = Dir.new('..') - * d1 = Dir.for_fd(d0.fileno) - * - * Note that the returned +d1+ does not have an associated path: - * - * d0.path # => '..' - * d1.path # => nil - * - * This method uses the - * {fdopendir()}[https://www.man7.org/linux/man-pages/man3/fdopendir.3p.html] - * function defined by POSIX 2008; - * the method is not implemented on non-POSIX platforms (raises NotImplementedError). - */ -static VALUE -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)))) { - rb_sys_fail("fdopendir"); - UNREACHABLE_RETURN(Qnil); - } - - RB_OBJ_WRITE(dir, &dp->path, Qnil); - return dir; -} -#else -#define dir_s_for_fd rb_f_notimplement -#endif - NORETURN(static void dir_closed(void)); static void @@ -652,13 +618,10 @@ dir_check(VALUE dir) /* - * call-seq: - * inspect -> string - * - * Returns a string description of +self+: - * - * Dir.new('example').inspect # => "#<Dir:example>" + * call-seq: + * dir.inspect -> string * + * Return a string describing this Dir object. */ static VALUE dir_inspect(VALUE dir) @@ -692,18 +655,18 @@ dir_inspect(VALUE dir) #ifdef HAVE_DIRFD /* - * call-seq: - * fileno -> integer + * call-seq: + * dir.fileno -> integer + * + * Returns the file descriptor used in <em>dir</em>. * - * Returns the file descriptor used in <em>dir</em>. + * d = Dir.new("..") + * d.fileno #=> 8 * - * d = Dir.new('..') - * d.fileno # => 8 + * This method uses dirfd() function defined by POSIX 2008. + * NotImplementedError is raised on other platforms, such as Windows, + * which doesn't provide the function. * - * This method uses the - * {dirfd()}[https://www.man7.org/linux/man-pages/man3/dirfd.3.html] - * function defined by POSIX 2008; - * the method is not implemented on non-POSIX platforms (raises NotImplementedError). */ static VALUE dir_fileno(VALUE dir) @@ -722,14 +685,14 @@ dir_fileno(VALUE dir) #endif /* - * call-seq: - * path -> string or nil + * call-seq: + * dir.path -> string or nil + * dir.to_path -> string or nil * - * Returns the +dirpath+ string that was used to create +self+ - * (or +nil+ if created by method Dir.for_fd): - * - * Dir.new('example').path # => "example" + * Returns the path parameter passed to <em>dir</em>'s constructor. * + * d = Dir.new("..") + * d.path #=> ".." */ static VALUE dir_path(VALUE dir) @@ -783,18 +746,16 @@ to_be_skipped(const struct dirent *dp) } /* - * call-seq: - * read -> string or nil - * - * Reads and returns the next entry name from +self+; - * returns +nil+ if at end-of-stream; - * see {Dir As Stream-Like}[rdoc-ref:Dir@Dir+As+Stream-Like]: + * call-seq: + * dir.read -> string or nil * - * dir = Dir.new('example') - * dir.read # => "." - * dir.read # => ".." - * dir.read # => "config.h" + * Reads the next entry from <em>dir</em> and returns it as a string. + * Returns <code>nil</code> at the end of the stream. * + * d = Dir.new("testdir") + * d.read #=> "." + * d.read #=> ".." + * d.read #=> "config.h" */ static VALUE dir_read(VALUE dir) @@ -803,7 +764,7 @@ dir_read(VALUE dir) struct dirent *dp; GetDIR(dir, dirp); - rb_errno_set(0); + errno = 0; if ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) { return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc); } @@ -823,23 +784,24 @@ dir_yield(VALUE arg, VALUE path) } /* - * call-seq: - * each {|entry_name| ... } -> self + * call-seq: + * dir.each { |filename| block } -> dir + * dir.each -> an_enumerator * - * Calls the block with each entry name in +self+: + * Calls the block once for each entry in this directory, passing the + * filename of each entry as a parameter to the block. * - * Dir.new('example').each {|entry_name| p entry_name } + * If no block is given, an enumerator is returned instead. * - * Output: - - * "." - * ".." - * "config.h" - * "lib" - * "main.rb" + * d = Dir.new("testdir") + * d.each {|x| puts "Got #{x}" } * - * With no block given, returns an Enumerator. + * <em>produces:</em> * + * Got . + * Got .. + * Got config.h + * Got main.rb */ static VALUE dir_each(VALUE dir) @@ -882,17 +844,16 @@ dir_each_entry(VALUE dir, VALUE (*each)(VALUE, VALUE), VALUE arg, int children_o #ifdef HAVE_TELLDIR /* - * call-seq: - * tell -> integer + * call-seq: + * dir.pos -> integer + * dir.tell -> integer * - * Returns the current position of +self+; - * see {Dir As Stream-Like}[rdoc-ref:Dir@Dir+As+Stream-Like]: - * - * dir = Dir.new('example') - * dir.tell # => 0 - * dir.read # => "." - * dir.tell # => 1 + * Returns the current position in <em>dir</em>. See also Dir#seek. * + * d = Dir.new("testdir") + * d.tell #=> 0 + * d.read #=> "." + * d.tell #=> 12 */ static VALUE dir_tell(VALUE dir) @@ -910,24 +871,18 @@ dir_tell(VALUE dir) #ifdef HAVE_SEEKDIR /* - * call-seq: - * seek(position) -> self - * - * Sets the position in +self+ and returns +self+. - * The value of +position+ should have been returned from an earlier call to #tell; - * if not, the return values from subsequent calls to #read are unspecified. - * - * See {Dir As Stream-Like}[rdoc-ref:Dir@Dir+As+Stream-Like]. - * - * Examples: - * - * dir = Dir.new('example') - * dir.pos # => 0 - * dir.seek(3) # => #<Dir:example> - * dir.pos # => 3 - * dir.seek(30) # => #<Dir:example> - * dir.pos # => 5 - * + * call-seq: + * dir.seek( integer ) -> dir + * + * Seeks to a particular location in <em>dir</em>. <i>integer</i> + * must be a value returned by Dir#tell. + * + * d = Dir.new("testdir") #=> #<Dir:0x401b3c40> + * d.read #=> "." + * i = d.tell #=> 12 + * d.read #=> ".." + * d.seek(i) #=> #<Dir:0x401b3c40> + * d.read #=> ".." */ static VALUE dir_seek(VALUE dir, VALUE pos) @@ -945,24 +900,17 @@ dir_seek(VALUE dir, VALUE pos) #ifdef HAVE_SEEKDIR /* - * call-seq: - * pos = position -> integer - * - * Sets the position in +self+ and returns +position+. - * The value of +position+ should have been returned from an earlier call to #tell; - * if not, the return values from subsequent calls to #read are unspecified. + * call-seq: + * dir.pos = integer -> integer * - * See {Dir As Stream-Like}[rdoc-ref:Dir@Dir+As+Stream-Like]. - * - * Examples: - * - * dir = Dir.new('example') - * dir.pos # => 0 - * dir.pos = 3 # => 3 - * dir.pos # => 3 - * dir.pos = 30 # => 30 - * dir.pos # => 5 + * Synonym for Dir#seek, but returns the position parameter. * + * d = Dir.new("testdir") #=> #<Dir:0x401b3c40> + * d.read #=> "." + * i = d.pos #=> 12 + * d.read #=> ".." + * d.pos = i #=> 12 + * d.read #=> ".." */ static VALUE dir_set_pos(VALUE dir, VALUE pos) @@ -975,19 +923,15 @@ dir_set_pos(VALUE dir, VALUE pos) #endif /* - * call-seq: - * rewind -> self - * - * Sets the position in +self+ to zero; - * see {Dir As Stream-Like}[rdoc-ref:Dir@Dir+As+Stream-Like]: + * call-seq: + * dir.rewind -> dir * - * dir = Dir.new('example') - * dir.read # => "." - * dir.read # => ".." - * dir.pos # => 2 - * dir.rewind # => #<Dir:example> - * dir.pos # => 0 + * Repositions <em>dir</em> to the first entry. * + * d = Dir.new("testdir") + * d.read #=> "." + * d.rewind #=> #<Dir:0x401b3fb0> + * d.read #=> "." */ static VALUE dir_rewind(VALUE dir) @@ -1000,18 +944,14 @@ dir_rewind(VALUE dir) } /* - * call-seq: - * close -> nil - * - * Closes the stream in +self+, if it is open, and returns +nil+; - * ignored if +self+ is already closed: + * call-seq: + * dir.close -> nil * - * dir = Dir.new('example') - * dir.read # => "." - * dir.close # => nil - * dir.close # => nil - * dir.read # Raises IOError. + * Closes the directory stream. + * Calling this method on closed Dir object is ignored since Ruby 2.3. * + * d = Dir.new("testdir") + * d.close #=> nil */ static VALUE dir_close(VALUE dir) @@ -1035,7 +975,7 @@ nogvl_chdir(void *ptr) } static void -dir_chdir0(VALUE path) +dir_chdir(VALUE path) { if (chdir(RSTRING_PTR(path)) < 0) rb_sys_fail_path(path); @@ -1047,19 +987,18 @@ static VALUE chdir_thread = Qnil; struct chdir_data { VALUE old_path, new_path; int done; - bool yield_path; }; static VALUE chdir_yield(VALUE v) { struct chdir_data *args = (void *)v; - dir_chdir0(args->new_path); + dir_chdir(args->new_path); args->done = TRUE; chdir_blocking++; if (NIL_P(chdir_thread)) chdir_thread = rb_thread_current(); - return args->yield_path ? rb_yield(args->new_path) : rb_yield_values2(0, NULL); + return rb_yield(args->new_path); } static VALUE @@ -1070,103 +1009,50 @@ chdir_restore(VALUE v) chdir_blocking--; if (chdir_blocking == 0) chdir_thread = Qnil; - dir_chdir0(args->old_path); + dir_chdir(args->old_path); } return Qnil; } -static VALUE -chdir_path(VALUE path, bool yield_path) -{ - 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; - args.yield_path = yield_path; - 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); -} - /* - * call-seq: - * Dir.chdir(new_dirpath) -> 0 - * Dir.chdir -> 0 - * Dir.chdir(new_dirpath) {|new_dirpath| ... } -> object - * Dir.chdir {|cur_dirpath| ... } -> object - * - * Changes the current working directory. - * - * With argument +new_dirpath+ and no block, - * changes to the given +dirpath+: - * - * Dir.pwd # => "/example" - * Dir.chdir('..') # => 0 - * Dir.pwd # => "/" - * - * With no argument and no block: - * - * - Changes to the value of environment variable +HOME+ if defined. - * - Otherwise changes to the value of environment variable +LOGDIR+ if defined. - * - Otherwise makes no change. - * - * With argument +new_dirpath+ and a block, temporarily changes the working directory: - * - * - Calls the block with the argument. - * - Changes to the given directory. - * - Executes the block (yielding the new path). - * - Restores the previous working directory. - * - Returns the block's return value. - * - * Example: - * - * Dir.chdir('/var/spool/mail') - * Dir.pwd # => "/var/spool/mail" - * Dir.chdir('/tmp') do - * Dir.pwd # => "/tmp" - * end - * Dir.pwd # => "/var/spool/mail" - * - * With no argument and a block, - * calls the block with the current working directory (string) - * and returns the block's return value. - * - * Calls to \Dir.chdir with blocks may be nested: - * - * Dir.chdir('/var/spool/mail') - * Dir.pwd # => "/var/spool/mail" - * Dir.chdir('/tmp') do - * Dir.pwd # => "/tmp" - * Dir.chdir('/usr') do - * Dir.pwd # => "/usr" + * call-seq: + * Dir.chdir( [ string] ) -> 0 + * Dir.chdir( [ string] ) {| path | block } -> anObject + * + * Changes the current working directory of the process to the given + * string. When called without an argument, changes the directory to + * the value of the environment variable <code>HOME</code>, or + * <code>LOGDIR</code>. SystemCallError (probably Errno::ENOENT) if + * the target directory does not exist. + * + * If a block is given, it is passed the name of the new current + * directory, and the block is executed with that as the current + * directory. The original working directory is restored when the block + * exits. The return value of <code>chdir</code> is the value of the + * block. <code>chdir</code> blocks can be nested, but in a + * multi-threaded program an error will be raised if a thread attempts + * to open a <code>chdir</code> block while another thread has one + * open or a call to <code>chdir</code> without a block occurs inside + * a block passed to <code>chdir</code> (even in the same thread). + * + * Dir.chdir("/var/spool/mail") + * puts Dir.pwd + * Dir.chdir("/tmp") do + * puts Dir.pwd + * Dir.chdir("/usr") do + * puts Dir.pwd + * end + * puts Dir.pwd * end - * Dir.pwd # => "/tmp" - * end - * Dir.pwd # => "/var/spool/mail" + * puts Dir.pwd * - * In a multi-threaded program an error is raised if a thread attempts - * to open a +chdir+ block while another thread has one open, - * or a call to +chdir+ without a block occurs inside - * a block passed to +chdir+ (even in the same thread). + * <em>produces:</em> * - * Raises an exception if the target directory does not exist. + * /var/spool/mail + * /tmp + * /usr + * /tmp + * /var/spool/mail */ static VALUE dir_s_chdir(int argc, VALUE *argv, VALUE obj) @@ -1185,114 +1071,6 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj) path = rb_str_new2(dist); } - return chdir_path(path, true); -} - -#if defined(HAVE_FCHDIR) && defined(HAVE_DIRFD) && HAVE_FCHDIR && HAVE_DIRFD -static void * -nogvl_fchdir(void *ptr) -{ - const int *fd = ptr; - - return (void *)(VALUE)fchdir(*fd); -} - -static void -dir_fchdir(int fd) -{ - if (fchdir(fd) < 0) - rb_sys_fail("fchdir"); -} - -struct fchdir_data { - VALUE old_dir; - int fd; - int done; -}; - -static VALUE -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(); - return rb_yield_values(0); -} - -static VALUE -fchdir_restore(VALUE v) -{ - struct fchdir_data *args = (void *)v; - if (args->done) { - chdir_blocking--; - if (chdir_blocking == 0) - chdir_thread = Qnil; - dir_fchdir(RB_NUM2INT(dir_fileno(args->old_dir))); - } - dir_close(args->old_dir); - return Qnil; -} - -/* - * call-seq: - * Dir.fchdir(fd) -> 0 - * Dir.fchdir(fd) { ... } -> object - * - * Changes the current working directory to the directory - * specified by the integer file descriptor +fd+. - * - * When passing a file descriptor over a UNIX socket or to a child process, - * using +fchdir+ instead of +chdir+ avoids the - * {time-of-check to time-of-use vulnerability}[https://en.wikipedia.org/wiki/Time-of-check_to_time-of-use] - * - * With no block, changes to the directory given by +fd+: - * - * Dir.chdir('/var/spool/mail') - * Dir.pwd # => "/var/spool/mail" - * dir = Dir.new('/usr') - * fd = dir.fileno - * 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 (yields no args). - * - Restores the previous working directory. - * - Returns the block's return value. - * - * Example: - * - * Dir.chdir('/var/spool/mail') - * Dir.pwd # => "/var/spool/mail" - * dir = Dir.new('/tmp') - * fd = dir.fileno - * Dir.fchdir(fd) do - * Dir.pwd # => "/tmp" - * end - * Dir.pwd # => "/var/spool/mail" - * - * This method uses the - * {fchdir()}[https://www.man7.org/linux/man-pages/man3/fchdir.3p.html] - * function defined by POSIX 2008; - * the method is not implemented on non-POSIX platforms (raises NotImplementedError). - * - * Raises an exception if the file descriptor is not valid. - * - * In a multi-threaded program an error is raised if a thread attempts - * to open a +chdir+ block while another thread has one open, - * or a call to +chdir+ without a block occurs inside - * a block passed to +chdir+ (even in the same thread). - */ -static VALUE -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"); @@ -1301,58 +1079,23 @@ dir_s_fchdir(VALUE klass, VALUE fd_value) } if (rb_block_given_p()) { - struct fchdir_data args; - args.old_dir = dir_s_alloc(klass); - dir_initialize(NULL, args.old_dir, rb_fstring_cstr("."), Qnil); - args.fd = fd; + struct chdir_data args; + + args.old_path = rb_str_encode_ospath(rb_dir_getwd()); + args.new_path = path; args.done = FALSE; - return rb_ensure(fchdir_yield, (VALUE)&args, fchdir_restore, (VALUE)&args); + return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args); } else { - int r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_fchdir, &fd, - RUBY_UBF_IO, 0); + 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("fchdir"); + rb_sys_fail_path(path); } return INT2FIX(0); } -#else -#define dir_s_fchdir rb_f_notimplement -#endif - -/* - * call-seq: - * chdir -> 0 - * chdir { ... } -> object - * - * Changes the current working directory to +self+: - * - * Dir.pwd # => "/" - * dir = Dir.new('example') - * dir.chdir - * 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 - return dir_s_fchdir(rb_cDir, dir_fileno(dir)); -#else - return chdir_path(dir_get(dir)->path, false); -#endif -} #ifndef _WIN32 VALUE @@ -1400,14 +1143,16 @@ rb_dir_getwd(void) } /* - * call-seq: - * Dir.pwd -> string - * - * Returns the path to the current working directory: + * call-seq: + * Dir.getwd -> string + * Dir.pwd -> string * - * Dir.chdir("/tmp") # => 0 - * Dir.pwd # => "/tmp" + * Returns the path to the current working directory of this process as + * a string. * + * Dir.chdir("/tmp") #=> 0 + * Dir.getwd #=> "/tmp" + * Dir.pwd #=> "/tmp" */ static VALUE dir_s_getwd(VALUE dir) @@ -1437,16 +1182,13 @@ check_dirname(VALUE dir) #if defined(HAVE_CHROOT) /* - * call-seq: - * Dir.chroot(dirpath) -> 0 - * - * Changes the root directory of the calling process to that specified in +dirpath+. - * The new root directory is used for pathnames beginning with <tt>'/'</tt>. - * The root directory is inherited by all children of the calling process. - * - * Only a privileged process may call +chroot+. + * call-seq: + * Dir.chroot( string ) -> 0 * - * See {Linux chroot}[https://man7.org/linux/man-pages/man2/chroot.2.html]. + * Changes this process's idea of the file system root. Only a + * privileged process may make this call. Not available on all + * platforms. On Unix systems, see <code>chroot(2)</code> for more + * information. */ static VALUE dir_s_chroot(VALUE dir, VALUE path) @@ -1475,20 +1217,18 @@ nogvl_mkdir(void *ptr) } /* - * call-seq: - * Dir.mkdir(dirpath, permissions = 0775) -> 0 + * call-seq: + * Dir.mkdir( string [, integer] ) -> 0 * - * Creates a directory in the underlying file system - * at +dirpath+ with the given +permissions+; - * returns zero: + * Makes a new directory named by <i>string</i>, with permissions + * specified by the optional parameter <i>anInteger</i>. The + * permissions may be modified by the value of File::umask, and are + * ignored on NT. Raises a SystemCallError if the directory cannot be + * created. See also the discussion of permissions in the class + * documentation for File. * - * Dir.mkdir('foo') - * File.stat(Dir.new('foo')).mode.to_s(8)[1..4] # => "0755" - * Dir.mkdir('bar', 0644) - * File.stat(Dir.new('bar')).mode.to_s(8)[1..4] # => "0644" + * Dir.mkdir(File.join(Dir.home, ".foo"), 0700) #=> 0 * - * See {File Permissions}[rdoc-ref:File@File+Permissions]. - * Note that argument +permissions+ is ignored on Windows. */ static VALUE dir_s_mkdir(int argc, VALUE *argv, VALUE obj) @@ -1522,14 +1262,13 @@ nogvl_rmdir(void *ptr) } /* - * call-seq: - * Dir.rmdir(dirpath) -> 0 - * - * Removes the directory at +dirpath+ from the underlying file system: + * call-seq: + * Dir.delete( string ) -> 0 + * Dir.rmdir( string ) -> 0 + * Dir.unlink( string ) -> 0 * - * Dir.rmdir('foo') # => 0 - * - * Raises an exception if the directory is not empty. + * Deletes the named directory. Raises a subclass of SystemCallError + * if the directory isn't empty. */ static VALUE dir_s_rmdir(VALUE obj, VALUE dir) @@ -1737,7 +1476,7 @@ nogvl_opendir_at(void *ptr) /* fallthrough*/ case 0: if (fd >= 0) close(fd); - rb_errno_set(e); + errno = e; } } #else /* !USE_OPENDIR_AT */ @@ -3130,7 +2869,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 = RTYPEDDATA_GET_DATA(base); + struct dir_data *dirp = DATA_PTR(base); if (!dirp->dir) dir_closed(); #ifdef HAVE_DIRFD if ((fd = dirfd(dirp->dir)) == -1) @@ -3254,35 +2993,26 @@ dir_open_dir(int argc, VALUE *argv) /* - * call-seq: - * Dir.foreach(dirpath, encoding: 'UTF-8') {|entry_name| ... } -> nil - * - * Calls the block with each entry name in the directory at +dirpath+; - * sets the given encoding onto each passed +entry_name+: - * - * Dir.foreach('/example') {|entry_name| p entry_name } - * - * Output: + * call-seq: + * Dir.foreach( dirname ) {| filename | block } -> nil + * Dir.foreach( dirname, encoding: enc ) {| filename | block } -> nil + * Dir.foreach( dirname ) -> an_enumerator + * Dir.foreach( dirname, encoding: enc ) -> an_enumerator * - * "config.h" - * "lib" - * "main.rb" - * ".." - * "." + * Calls the block once for each entry in the named directory, passing + * the filename of each entry as a parameter to the block. * - * Encoding: + * If no block is given, an enumerator is returned instead. * - * Dir.foreach('/example') {|entry_name| p entry_name.encoding; break } - * Dir.foreach('/example', encoding: 'US-ASCII') {|entry_name| p entry_name.encoding; break } + * Dir.foreach("testdir") {|x| puts "Got #{x}" } * - * Output: + * <em>produces:</em> * - * #<Encoding:UTF-8> - * #<Encoding:US-ASCII> + * Got . + * Got .. + * Got config.h + * Got main.rb * - * See {String Encoding}[rdoc-ref:encodings.rdoc@String+Encoding]. - * - * Returns an enumerator if no block is given. */ static VALUE dir_foreach(int argc, VALUE *argv, VALUE io) @@ -3304,21 +3034,19 @@ dir_collect(VALUE dir) } /* - * call-seq: - * Dir.entries(dirname, encoding: 'UTF-8') -> array + * call-seq: + * Dir.entries( dirname ) -> array + * Dir.entries( dirname, encoding: enc ) -> array * - * Returns an array of the entry names in the directory at +dirpath+; - * sets the given encoding onto each returned entry name: + * Returns an array containing all of the filenames in the given + * directory. Will raise a SystemCallError if the named directory + * doesn't exist. * - * Dir.entries('/example') # => ["config.h", "lib", "main.rb", "..", "."] - * Dir.entries('/example').first.encoding - * # => #<Encoding:UTF-8> - * Dir.entries('/example', encoding: 'US-ASCII').first.encoding - * # => #<Encoding:US-ASCII> + * The optional <i>encoding</i> keyword argument specifies the encoding of the + * directory. If not specified, the filesystem encoding is used. * - * See {String Encoding}[rdoc-ref:encodings.rdoc@String+Encoding]. + * Dir.entries("testdir") #=> [".", "..", "config.h", "main.rb"] * - * Raises an exception if the directory does not exist. */ static VALUE dir_entries(int argc, VALUE *argv, VALUE io) @@ -3336,12 +3064,25 @@ dir_each_child(VALUE dir) } /* - * call-seq: - * Dir.each_child(dirpath) {|entry_name| ... } -> nil - * Dir.each_child(dirpath, encoding: 'UTF-8') {|entry_name| ... } -> nil + * call-seq: + * Dir.each_child( dirname ) {| filename | block } -> nil + * Dir.each_child( dirname, encoding: enc ) {| filename | block } -> nil + * Dir.each_child( dirname ) -> an_enumerator + * Dir.each_child( dirname, encoding: enc ) -> an_enumerator + * + * Calls the block once for each entry except for "." and ".." in the + * named directory, passing the filename of each entry as a parameter + * to the block. + * + * If no block is given, an enumerator is returned instead. + * + * Dir.each_child("testdir") {|x| puts "Got #{x}" } + * + * <em>produces:</em> + * + * Got config.h + * Got main.rb * - * Like Dir.foreach, except that entries <tt>'.'</tt> and <tt>'..'</tt> - * are not included. */ static VALUE dir_s_each_child(int argc, VALUE *argv, VALUE io) @@ -3355,22 +3096,24 @@ dir_s_each_child(int argc, VALUE *argv, VALUE io) } /* - * call-seq: - * each_child {|entry_name| ... } -> self + * call-seq: + * dir.each_child {| filename | block } -> dir + * dir.each_child -> an_enumerator + * + * Calls the block once for each entry except for "." and ".." in + * this directory, passing the filename of each entry as a parameter + * to the block. * - * Calls the block with each entry name in +self+ - * except <tt>'.'</tt> and <tt>'..'</tt>: + * If no block is given, an enumerator is returned instead. * - * dir = Dir.new('/example') - * dir.each_child {|entry_name| p entry_name } + * d = Dir.new("testdir") + * d.each_child {|x| puts "Got #{x}" } * - * Output: + * <em>produces:</em> * - * "config.h" - * "lib" - * "main.rb" + * Got config.h + * Got main.rb * - * If no block is given, returns an enumerator. */ static VALUE dir_each_child_m(VALUE dir) @@ -3380,14 +3123,14 @@ dir_each_child_m(VALUE dir) } /* - * call-seq: - * children -> array + * call-seq: + * dir.children -> array * - * Returns an array of the entry names in +self+ - * except for <tt>'.'</tt> and <tt>'..'</tt>: + * Returns an array containing all of the filenames except for "." + * and ".." in this directory. * - * dir = Dir.new('/example') - * dir.children # => ["config.h", "lib", "main.rb"] + * d = Dir.new("testdir") + * d.children #=> ["config.h", "main.rb"] * */ static VALUE @@ -3399,23 +3142,19 @@ dir_collect_children(VALUE dir) } /* - * call-seq: - * Dir.children(dirpath) -> array - * Dir.children(dirpath, encoding: 'UTF-8') -> array + * call-seq: + * Dir.children( dirname ) -> array + * Dir.children( dirname, encoding: enc ) -> array * - * Returns an array of the entry names in the directory at +dirpath+ - * except for <tt>'.'</tt> and <tt>'..'</tt>; - * sets the given encoding onto each returned entry name: + * Returns an array containing all of the filenames except for "." + * and ".." in the given directory. Will raise a SystemCallError if + * the named directory doesn't exist. * - * Dir.children('/example') # => ["config.h", "lib", "main.rb"] - * Dir.children('/example').first.encoding - * # => #<Encoding:UTF-8> - * Dir.children('/example', encoding: 'US-ASCII').first.encoding - * # => #<Encoding:US-ASCII> + * The optional <i>encoding</i> keyword argument specifies the encoding of the + * directory. If not specified, the filesystem encoding is used. * - * See {String Encoding}[rdoc-ref:encodings.rdoc@String+Encoding]. + * Dir.children("testdir") #=> ["config.h", "main.rb"] * - * Raises an exception if the directory does not exist. */ static VALUE dir_s_children(int argc, VALUE *argv, VALUE io) @@ -3489,16 +3228,12 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj) } /* - * call-seq: - * Dir.home(user_name = nil) -> dirpath + * call-seq: + * Dir.home() -> "/home/me" + * Dir.home("root") -> "/root" * - * Retruns 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" - * - * Raises ArgumentError if +user_name+ is not a user name. + * Returns the home directory of the current user or the named user + * if given. */ static VALUE dir_s_home(int argc, VALUE *argv, VALUE obj) @@ -3523,15 +3258,10 @@ dir_s_home(int argc, VALUE *argv, VALUE obj) #if 0 /* * call-seq: - * Dir.exist?(dirpath) -> true or false - * - * Returns whether +dirpath+ is a directory in the underlying file system: + * Dir.exist?(file_name) -> true or false * - * Dir.exist?('/example') # => true - * Dir.exist?('/nosuch') # => false - * Dir.exist?('/example/main.rb') # => false - * - * Same as File.directory?. + * Returns <code>true</code> if the named file is a directory, + * <code>false</code> otherwise. * */ VALUE @@ -3558,7 +3288,8 @@ nogvl_dir_empty_p(void *ptr) /* fall through */ case 0: if (e == ENOTDIR) return (void *)Qfalse; - return (void *)INT2FIX(e); + errno = e; /* for rb_sys_fail_path */ + return (void *)Qundef; } } while ((dp = READDIR(dir, NULL)) != NULL) { @@ -3573,18 +3304,10 @@ nogvl_dir_empty_p(void *ptr) /* * call-seq: - * Dir.empty?(dirpath) -> true or false - * - * Returns whether +dirpath+ specifies an empty directory: - * - * dirpath = '/tmp/foo' - * Dir.mkdir(dirpath) - * Dir.empty?(dirpath) # => true - * Dir.empty?('/example') # => false - * Dir.empty?('/example/main.rb') # => false + * Dir.empty?(path_name) -> true or false * - * Raises an exception if +dirpath+ does not specify a directory or file - * in the underlying file system. + * Returns <code>true</code> if the named file is an empty directory, + * <code>false</code> if it is not a directory or non-empty. */ static VALUE rb_dir_s_empty_p(VALUE obj, VALUE dirname) @@ -3620,8 +3343,8 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname) result = (VALUE)rb_thread_call_without_gvl(nogvl_dir_empty_p, (void *)path, RUBY_UBF_IO, 0); - if (FIXNUM_P(result)) { - rb_syserr_fail_path((int)FIX2LONG(result), orig); + if (UNDEF_P(result)) { + rb_sys_fail_path(orig); } return result; } @@ -3634,7 +3357,6 @@ Init_Dir(void) rb_include_module(rb_cDir, rb_mEnumerable); rb_define_alloc_func(rb_cDir, dir_s_alloc); - rb_define_singleton_method(rb_cDir,"for_fd", dir_s_for_fd, 1); rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, -1); rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1); rb_define_singleton_method(rb_cDir, "each_child", dir_s_each_child, -1); @@ -3654,9 +3376,7 @@ Init_Dir(void) rb_define_method(rb_cDir,"pos", dir_tell, 0); rb_define_method(rb_cDir,"pos=", dir_set_pos, 1); rb_define_method(rb_cDir,"close", dir_close, 0); - rb_define_method(rb_cDir,"chdir", dir_chdir, 0); - rb_define_singleton_method(rb_cDir,"fchdir", dir_s_fchdir, 1); rb_define_singleton_method(rb_cDir,"chdir", dir_s_chdir, -1); rb_define_singleton_method(rb_cDir,"getwd", dir_s_getwd, 0); rb_define_singleton_method(rb_cDir,"pwd", dir_s_getwd, 0); @@ -3673,26 +3393,51 @@ 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); - /* Document-const: FNM_NOESCAPE - * {File::FNM_NOESCAPE}[rdoc-ref:File::Constants@File-3A-3AFNM_NOESCAPE] */ + /* Document-const: File::Constants::FNM_NOESCAPE + * + * Disables escapes in File.fnmatch and Dir.glob patterns + */ rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE)); - /* Document-const: FNM_PATHNAME - * {File::FNM_PATHNAME}[rdoc-ref:File::Constants@File-3A-3AFNM_PATHNAME] */ + + /* Document-const: File::Constants::FNM_PATHNAME + * + * Wildcards in File.fnmatch and Dir.glob patterns do not match directory + * separators + */ rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME)); - /* Document-const: FNM_DOTMATCH - * {File::FNM_DOTMATCH}[rdoc-ref:File::Constants@File-3A-3AFNM_DOTMATCH] */ + + /* Document-const: File::Constants::FNM_DOTMATCH + * + * The '*' wildcard matches filenames starting with "." in File.fnmatch + * and Dir.glob patterns + */ rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH)); - /* Document-const: FNM_CASEFOLD - * {File::FNM_CASEFOLD}[rdoc-ref:File::Constants@File-3A-3AFNM_CASEFOLD] */ + + /* Document-const: File::Constants::FNM_CASEFOLD + * + * Makes File.fnmatch patterns case insensitive (but not Dir.glob + * patterns). + */ rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD)); - /* Document-const: FNM_EXTGLOB - * {File::FNM_EXTGLOB}[rdoc-ref:File::Constants@File-3A-3AFNM_EXTGLOB] */ + + /* Document-const: File::Constants::FNM_EXTGLOB + * + * Allows file globbing through "{a,b}" in File.fnmatch patterns. + */ rb_file_const("FNM_EXTGLOB", INT2FIX(FNM_EXTGLOB)); - /* Document-const: FNM_SYSCASE - * {File::FNM_SYSCASE}[rdoc-ref:File::Constants@File-3A-3AFNM_SYSCASE] */ + + /* Document-const: File::Constants::FNM_SYSCASE + * + * System default case insensitiveness, equals to FNM_CASEFOLD or + * 0. + */ rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE)); - /* Document-const: FNM_SHORTNAME - * {File::FNM_SHORTNAME}[rdoc-ref:File::Constants@File-3A-3AFNM_SHORTNAME] */ + + /* Document-const: File::Constants::FNM_SHORTNAME + * + * Makes patterns to match short names if existing. Valid only + * on Microsoft Windows. + */ rb_file_const("FNM_SHORTNAME", INT2FIX(FNM_SHORTNAME)); } @@ -1,85 +1,11 @@ -# An object of class \Dir represents a directory in the underlying file system. +# Objects of class Dir are directory streams representing +# directories in the underlying file system. They provide a variety +# of ways to list directories and their contents. See also File. # -# It consists mainly of: -# -# - A string _path_, given when the object is created, -# that specifies a directory in the underlying file system; -# method #path returns the path. -# - A collection of string <i>entry names</i>, -# each of which is the name of a directory or file in the underlying file system; -# the entry names may be retrieved -# in an {array-like fashion}[rdoc-ref:Dir@Dir+As+Array-Like] -# or in a {stream-like fashion}[rdoc-ref:Dir@Dir+As+Stream-Like]. -# -# == About the Examples -# -# Some examples on this page use this simple file tree: -# -# example/ -# ├── config.h -# ├── lib/ -# │ ├── song/ -# │ │ └── karaoke.rb -# │ └── song.rb -# └── main.rb -# -# Others use the file tree for the -# {Ruby project itself}[https://github.com/ruby/ruby]. -# -# == \Dir As \Array-Like -# -# A \Dir object is in some ways array-like: -# -# - It has instance methods #children, #each, and #each_child. -# - It includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here]. -# -# == \Dir As Stream-Like -# -# A \Dir object is in some ways stream-like. -# -# The stream is initially open for reading, -# but may be closed manually (using method #close), -# and will be closed on block exit if created by Dir.open called with a block. -# The closed stream may not be further manipulated, -# and may not be reopened. -# -# 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), -# 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 -# the position; -# if at end-of-stream, does not increment the position. -# - \Method #rewind sets the position to zero. -# -# Examples (using the {simple file tree}[rdoc-ref:Dir@About+the+Examples]): -# -# dir = Dir.new('example') # => #<Dir:example> -# dir.pos # => 0 -# -# dir.read # => "." -# dir.read # => ".." -# dir.read # => "config.h" -# dir.read # => "lib" -# dir.read # => "main.rb" -# dir.pos # => 5 -# dir.read # => nil -# dir.pos # => 5 -# -# dir.rewind # => #<Dir:example> -# dir.pos # => 0 -# -# dir.pos = 3 # => 3 -# dir.pos # => 3 -# -# dir.seek(4) # => #<Dir:example> -# dir.pos # => 4 -# -# dir.close # => nil -# dir.read # Raises IOError. +# The directory used in these examples contains the two regular files +# (<code>config.h</code> and <code>main.rb</code>), the parent +# directory (<code>..</code>), and the directory itself +# (<code>.</code>). # # == What's Here # @@ -154,32 +80,20 @@ # closing it upon block exit. # - ::unlink (aliased as ::delete and ::rmdir): Removes the given directory. # - #inspect: Returns a string description of +self+. -# class Dir # call-seq: - # Dir.open(dirpath) -> dir - # Dir.open(dirpath, encoding: nil) -> dir - # Dir.open(dirpath) {|dir| ... } -> object - # Dir.open(dirpath, encoding: nil) {|dir| ... } -> object - # - # Creates a new \Dir object _dir_ for the directory at +dirpath+. - # - # With no block, the method equivalent to Dir.new(dirpath, encoding): - # - # Dir.open('.') # => #<Dir:.> - # - # With a block given, the block is called with the created _dir_; - # on block exit _dir_ is closed and the block's value is returned: - # - # Dir.open('.') {|dir| dir.inspect } # => "#<Dir:.>" - # - # The value given with optional keyword argument +encoding+ - # specifies the encoding for the directory entry names; - # if +nil+ (the default), the file system's encoding is used: - # - # Dir.open('.').read.encoding # => #<Encoding:UTF-8> - # Dir.open('.', encoding: 'US-ASCII').read.encoding # => #<Encoding:US-ASCII> - # + # Dir.open( string ) -> aDir + # Dir.open( string, encoding: enc ) -> aDir + # Dir.open( string ) {| aDir | block } -> anObject + # Dir.open( string, encoding: enc ) {| aDir | block } -> anObject + # + # The optional <i>encoding</i> keyword argument specifies the encoding of the directory. + # If not specified, the filesystem encoding is used. + # + # With no block, <code>open</code> is a synonym for Dir::new. If a + # block is present, it is passed <i>aDir</i> as a parameter. The + # directory is closed at the end of the block, and Dir::open returns + # the value of the block. def self.open(name, encoding: nil, &block) dir = Primitive.dir_s_open(name, encoding) if block @@ -194,219 +108,114 @@ class Dir end # call-seq: - # Dir.new(dirpath) -> dir - # Dir.new(dirpath, encoding: nil) -> dir - # - # Returns a new \Dir object for the directory at +dirpath+: - # - # Dir.new('.') # => #<Dir:.> + # Dir.new( string ) -> aDir + # Dir.new( string, encoding: enc ) -> aDir # - # The value given with optional keyword argument +encoding+ - # specifies the encoding for the directory entry names; - # if +nil+ (the default), the file system's encoding is used: - # - # Dir.new('.').read.encoding # => #<Encoding:UTF-8> - # Dir.new('.', encoding: 'US-ASCII').read.encoding # => #<Encoding:US-ASCII> + # Returns a new directory object for the named directory. # + # The optional <i>encoding</i> keyword argument specifies the encoding of the directory. + # If not specified, the filesystem encoding is used. def initialize(name, encoding: nil) Primitive.dir_initialize(name, encoding) end # call-seq: - # Dir[*patterns, base: nil, sort: true] -> array - # - # Calls Dir.glob with argument +patterns+ - # and the values of keyword arguments +base+ and +sort+; - # returns the array of selected entry names. + # Dir[ string [, string ...] [, base: path] [, sort: true] ] -> array # + # Equivalent to calling + # <code>Dir.glob([</code><i>string,...</i><code>], 0)</code>. def self.[](*args, base: nil, sort: true) Primitive.dir_s_aref(args, base, sort) 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 - # - # Forms an array _entry_names_ of the entry names selected by the arguments. - # - # Argument +patterns+ is a string pattern or an array of string patterns; - # note that these are not regexps; see below. - # - # Notes for the following examples: - # - # - <tt>'*'</tt> is the pattern that matches any entry name - # except those that begin with <tt>'.'</tt>. - # - We use method Array#take to shorten returned arrays - # that otherwise would be very large. - # - # With no block, returns array _entry_names_; - # example (using the {simple file tree}[rdoc-ref:Dir@About+the+Examples]): - # - # Dir.glob('*') # => ["config.h", "lib", "main.rb"] - # - # With a block, calls the block with each of the _entry_names_ - # and returns +nil+: - # - # Dir.glob('*') {|entry_name| puts entry_name } # => nil + # Dir.glob( pattern, [flags], [base: path] [, sort: true] ) -> array + # Dir.glob( pattern, [flags], [base: path] [, sort: true] ) { |filename| block } -> nil # - # Output: + # Expands +pattern+, which is a pattern string or an Array of pattern + # strings, and returns an array containing the matching filenames. + # If a block is given, calls the block once for each matching filename, + # passing the filename as a parameter to the block. # - # config.h - # lib - # main.rb + # The optional +base+ keyword argument specifies the base directory for + # interpreting relative pathnames instead of the current working directory. + # As the results are not prefixed with the base directory name in this + # case, you will need to prepend the base directory name if you want real + # paths. # - # If optional keyword argument +flags+ is given, - # the value modifies the matching; see below. + # The results which matched single wildcard or character set are sorted in + # binary ascending order, unless +false+ is given as the optional +sort+ + # keyword argument. The order of an Array of pattern strings and braces + # are preserved. # - # If optional keyword argument +base+ is given, - # its value specifies the base directory. - # Each pattern string specifies entries relative to the base directory; - # the default is <tt>'.'</tt>. - # The base directory is not prepended to the entry names in the result: + # Note that the pattern is not a regexp, it's closer to a shell glob. + # See File::fnmatch for the meaning of the +flags+ parameter. + # Case sensitivity depends on your system (+File::FNM_CASEFOLD+ is ignored). # - # Dir.glob(pattern, base: 'lib').take(5) - # # => ["abbrev.gemspec", "abbrev.rb", "base64.gemspec", "base64.rb", "benchmark.gemspec"] - # Dir.glob(pattern, base: 'lib/irb').take(5) - # # => ["cmd", "color.rb", "color_printer.rb", "completion.rb", "context.rb"] - # - # If optional keyword +sort+ is given, its value specifies whether - # the array is to be sorted; the default is +true+. - # Passing value +false+ with that keyword disables sorting - # (though the underlying file system may already have sorted the array). - # - # <b>Patterns</b> - # - # Each pattern string is expanded - # according to certain metacharacters; - # examples below use the {Ruby file tree}[rdoc-ref:Dir@About+the+Examples]: - # - # - <tt>'*'</tt>: Matches any substring in an entry name, - # similar in meaning to regexp <tt>/.*/mx</tt>; - # may be restricted by other values in the pattern strings: - # - # - <tt>'*'</tt> matches all entry names: - # - # Dir.glob('*').take(3) # => ["BSDL", "CONTRIBUTING.md", "COPYING"] - # - # - <tt>'c*'</tt> matches entry names beginning with <tt>'c'</tt>: - # - # Dir.glob('c*').take(3) # => ["CONTRIBUTING.md", "COPYING", "COPYING.ja"] - # - # - <tt>'*c'</tt> matches entry names ending with <tt>'c'</tt>: - # - # Dir.glob('*c').take(3) # => ["addr2line.c", "array.c", "ast.c"] - # - # - <tt>'\*c\*'</tt> matches entry names that contain <tt>'c'</tt>, - # even at the beginning or end: - # - # Dir.glob('*c*').take(3) # => ["CONTRIBUTING.md", "COPYING", "COPYING.ja"] - # - # Does not match Unix-like hidden entry names ("dot files"). - # To include those in the matched entry names, - # use flag IO::FNM_DOTMATCH or something like <tt>'{*,.*}'</tt>. - # - # - <tt>'**'</tt>: Matches entry names recursively - # if followed by the slash character <tt>'/'</tt>: - # - # Dir.glob('**/').take(3) # => ["basictest/", "benchmark/", "benchmark/gc/"] - # - # If the string pattern contains other characters - # or is not followed by a slash character, - # it is equivalent to <tt>'*'</tt>. - # - # - <tt>'?'</tt> Matches any single character; - # similar in meaning to regexp <tt>/./</tt>: - # - # 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@Character+Classes], - # including set negation (<tt>'[^a-z]'</tt>): - # - # Dir.glob('*.[a-z][a-z]').take(3) - # # => ["CONTRIBUTING.md", "COPYING.ja", "KNOWNBUGS.rb"] - # - # - <tt>'{_abc_,_xyz_}'</tt>: - # Matches either string _abc_ or string _xyz_; - # behaves like {Regexp alternation}[rdoc-ref:Regexp@Alternation]: - # - # Dir.glob('{LEGAL,BSDL}') # => ["LEGAL", "BSDL"] - # - # More than two alternatives may be given. - # - # - <tt>\\</tt>: Escapes the following metacharacter. - # - # Note that on Windows, the backslash character may not be used - # in a string pattern: - # <tt>Dir['c:\\foo*']</tt> will not work, use <tt>Dir['c:/foo*']</tt> instead. - # - # More examples (using the {simple file tree}[rdoc-ref:Dir@About+the+Examples]): - # - # # We're in the example directory. - # File.basename(Dir.pwd) # => "example" - # Dir.glob('config.?') # => ["config.h"] - # Dir.glob('*.[a-z][a-z]') # => ["main.rb"] - # Dir.glob('*.[^r]*') # => ["config.h"] - # Dir.glob('*.{rb,h}') # => ["main.rb", "config.h"] - # Dir.glob('*') # => ["config.h", "lib", "main.rb"] - # Dir.glob('*', File::FNM_DOTMATCH) # => [".", "config.h", "lib", "main.rb"] - # Dir.glob(["*.rb", "*.h"]) # => ["main.rb", "config.h"] - # - # Dir.glob('**/*.rb') - # => ["lib/song/karaoke.rb", "lib/song.rb", "main.rb"] - # - # Dir.glob('**/*.rb', base: 'lib') # => ["song/karaoke.rb", "song.rb"] - # - # Dir.glob('**/lib') # => ["lib"] + # <code>*</code>:: + # Matches any file. Can be restricted by other values in the glob. + # Equivalent to <code>/.*/mx</code> in regexp. # - # Dir.glob('**/lib/**/*.rb') # => ["lib/song/karaoke.rb", "lib/song.rb"] + # <code>*</code>:: Matches all files + # <code>c*</code>:: Matches all files beginning with <code>c</code> + # <code>*c</code>:: Matches all files ending with <code>c</code> + # <code>\*c\*</code>:: Match all files that have <code>c</code> in them + # (including at the beginning or end). # - # Dir.glob('**/lib/*.rb') # => ["lib/song.rb"] + # Note, this will not match Unix-like hidden files (dotfiles). In order + # to include those in the match results, you must use the + # File::FNM_DOTMATCH flag or something like <code>"{*,.*}"</code>. # - # <b>Flags</b> + # <code>**</code>:: + # Matches directories recursively if followed by <code>/</code>. If + # this path segment contains any other characters, it is the same as the + # usual <code>*</code>. # - # If optional keyword argument +flags+ is given (the default is zero -- no flags), - # its value should be the bitwise OR of one or more of the constants - # defined in module File::Constants. + # <code>?</code>:: + # Matches any one character. Equivalent to <code>/.{1}/</code> in regexp. # - # Example: + # <code>[set]</code>:: + # Matches any one character in +set+. Behaves exactly like character sets + # in Regexp, including set negation (<code>[^a-z]</code>). # - # flags = File::FNM_EXTGLOB | File::FNM_DOTMATCH + # <code>{p,q}</code>:: + # Matches either literal <code>p</code> or literal <code>q</code>. + # Equivalent to pattern alternation in regexp. # - # Specifying flags can extend, restrict, or otherwise modify the matching. + # Matching literals may be more than one character in length. More than + # two literals may be specified. # - # The flags for this method (other constants in File::Constants do not apply): + # <code>\\</code>:: + # Escapes the next metacharacter. # - # - File::FNM_DOTMATCH: - # specifies that entry names beginning with <tt>'.'</tt> - # should be considered for matching: + # Note that this means you cannot use backslash on windows as part of a + # glob, i.e. <code>Dir["c:\\foo*"]</code> will not work, use + # <code>Dir["c:/foo*"]</code> instead. # - # Dir.glob('*').take(5) - # # => ["BSDL", "CONTRIBUTING.md", "COPYING", "COPYING.ja", "GPL"] - # Dir.glob('*', flags: File::FNM_DOTMATCH).take(5) - # # => [".", ".appveyor.yml", ".cirrus.yml", ".dir-locals.el", ".document"] + # Examples: # - # - File::FNM_EXTGLOB: - # enables the pattern extension - # <tt>'{_a_,_b_}'</tt>, which matches pattern _a_ and pattern _b_; - # behaves like a - # {regexp union}[rdoc-ref:Regexp.union] - # (e.g., <tt>'(?:_a_|_b_)'</tt>): + # Dir["config.?"] #=> ["config.h"] + # Dir.glob("config.?") #=> ["config.h"] + # Dir.glob("*.[a-z][a-z]") #=> ["main.rb"] + # Dir.glob("*.[^r]*") #=> ["config.h"] + # Dir.glob("*.{rb,h}") #=> ["main.rb", "config.h"] + # Dir.glob("*") #=> ["config.h", "main.rb"] + # Dir.glob("*", File::FNM_DOTMATCH) #=> [".", "config.h", "main.rb"] + # Dir.glob(["*.rb", "*.h"]) #=> ["main.rb", "config.h"] # - # pattern = '{LEGAL,BSDL}' - # Dir.glob(pattern) # => ["LEGAL", "BSDL"] + # Dir.glob("**/*.rb") #=> ["main.rb", + # # "lib/song.rb", + # # "lib/song/karaoke.rb"] # - # - File::FNM_NOESCAPE: - # specifies that escaping with the backslash character <tt>'\'</tt> - # is disabled; the character is not an escape character. + # Dir.glob("**/*.rb", base: "lib") #=> ["song.rb", + # # "song/karaoke.rb"] # - # - File::FNM_PATHNAME: - # specifies that metacharacters <tt>'*'</tt> and <tt>'?'</tt> - # do not match directory separators. + # Dir.glob("**/lib") #=> ["lib"] # - # - File::FNM_SHORTNAME: - # specifies that patterns may match short names if they exist; Windows only. + # Dir.glob("**/lib/**/*.rb") #=> ["lib/song.rb", + # # "lib/song/karaoke.rb"] # + # Dir.glob("**/lib/*.rb") #=> ["lib/song.rb"] def self.glob(pattern, _flags = 0, flags: _flags, base: nil, sort: true) Primitive.dir_s_glob(pattern, flags, base, sort) end @@ -272,15 +272,13 @@ 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) - Dl_info dli; if (dladdr(ex, &dli)) { *libname = dli.dli_fname; } -# endif return true; } @@ -394,12 +392,6 @@ dln_open(const char *file) dln_fatalerror("%s - %s", incompatible, file); } else { - if (libruby_name) { - const size_t len = strlen(libruby_name); - char *const tmp = ALLOCA_N(char, len + 1); - if (tmp) memcpy(tmp, libruby_name, len + 1); - libruby_name = tmp; - } dlclose(handle); if (libruby_name) { dln_loaderror("linked to incompatible %s - %s", libruby_name, file); @@ -421,63 +413,33 @@ dln_open(const char *file) static void * dln_sym(void *handle, const char *symbol) { -#if defined(_WIN32) - return GetProcAddress(handle, symbol); -#elif defined(USE_DLN_DLOPEN) - return dlsym(handle, symbol); -#endif -} + void *func; + const char *error; -static void * -dln_sym_func(void *handle, const char *symbol) -{ - void *func = dln_sym(handle, symbol); +#if defined(_WIN32) + char message[1024]; + 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); -#endif - dln_loaderror("%s - %s", error, symbol); + goto failed; } - return func; -} - -#define dln_sym_callable(rettype, argtype, handle, symbol) \ - (*(rettype (*)argtype)dln_sym_func(handle, symbol)) #endif -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 -} + return func; + failed: + dln_loaderror("%s - %s", error, symbol); +} +#endif #if defined(RUBY_DLN_CHECK_ABI) && defined(USE_DLN_DLOPEN) static bool @@ -495,9 +457,8 @@ dln_load(const char *file) void *handle = dln_open(file); #ifdef RUBY_DLN_CHECK_ABI - 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")(); + 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()) { dln_loaderror("incompatible ABI version of binary - %s", file); } @@ -505,9 +466,10 @@ dln_load(const char *file) 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 */ - dln_sym_callable(void, (void), handle, init_fct_name)(); + (*init_fct)(); return handle; @@ -25,7 +25,6 @@ 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_symbol(void*,const char*); RUBY_SYMBOL_EXPORT_END diff --git a/dln_find.c b/dln_find.c index 91c51394a9..5d380f5d39 100644 --- a/dln_find.c +++ b/dln_find.c @@ -75,7 +75,7 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size "."; } buf = dln_find_1(fname, path, buf, size, 1 DLN_FIND_EXTRA_ARG); - free(envpath); + if (envpath) free(envpath); return buf; } @@ -8,12 +8,3 @@ dln_load(const char *file) 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/doc/.document b/doc/.document index 5a58e6e3ad..f589dda07c 100644 --- a/doc/.document +++ b/doc/.document @@ -1,11 +1,9 @@ *.md *.rb -[^_]*.rdoc +*.rdoc contributing NEWS syntax optparse rdoc -regexp -rjit yjit diff --git a/doc/ChangeLog/ChangeLog-0.06_to_0.52 b/doc/ChangeLog-0.06_to_0.52 index 63826081b3..63826081b3 100644 --- a/doc/ChangeLog/ChangeLog-0.06_to_0.52 +++ b/doc/ChangeLog-0.06_to_0.52 diff --git a/doc/ChangeLog/ChangeLog-0.50_to_0.60 b/doc/ChangeLog-0.50_to_0.60 index 5f5b03ff40..5f5b03ff40 100644 --- a/doc/ChangeLog/ChangeLog-0.50_to_0.60 +++ b/doc/ChangeLog-0.50_to_0.60 diff --git a/doc/ChangeLog/ChangeLog-0.60_to_1.1 b/doc/ChangeLog-0.60_to_1.1 index 59d195e780..59d195e780 100644 --- a/doc/ChangeLog/ChangeLog-0.60_to_1.1 +++ b/doc/ChangeLog-0.60_to_1.1 diff --git a/doc/ChangeLog/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0 index 6d9453d011..6d9453d011 100644 --- a/doc/ChangeLog/ChangeLog-1.8.0 +++ b/doc/ChangeLog-1.8.0 diff --git a/doc/ChangeLog/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3 index 0f80eed2d5..0f80eed2d5 100644 --- a/doc/ChangeLog/ChangeLog-1.9.3 +++ b/doc/ChangeLog-1.9.3 diff --git a/doc/ChangeLog/ChangeLog-2.0.0 b/doc/ChangeLog-2.0.0 index 9e654db189..9e654db189 100644 --- a/doc/ChangeLog/ChangeLog-2.0.0 +++ b/doc/ChangeLog-2.0.0 diff --git a/doc/ChangeLog/ChangeLog-2.1.0 b/doc/ChangeLog-2.1.0 index 5b670b31c9..5b670b31c9 100644 --- a/doc/ChangeLog/ChangeLog-2.1.0 +++ b/doc/ChangeLog-2.1.0 diff --git a/doc/ChangeLog/ChangeLog-2.2.0 b/doc/ChangeLog-2.2.0 index 5a7dbf826d..5a7dbf826d 100644 --- a/doc/ChangeLog/ChangeLog-2.2.0 +++ b/doc/ChangeLog-2.2.0 diff --git a/doc/ChangeLog/ChangeLog-2.3.0 b/doc/ChangeLog-2.3.0 index 94996cffd0..94996cffd0 100644 --- a/doc/ChangeLog/ChangeLog-2.3.0 +++ b/doc/ChangeLog-2.3.0 diff --git a/doc/ChangeLog/ChangeLog-2.4.0 b/doc/ChangeLog-2.4.0 index a297a579d1..a297a579d1 100644 --- a/doc/ChangeLog/ChangeLog-2.4.0 +++ b/doc/ChangeLog-2.4.0 diff --git a/doc/ChangeLog/ChangeLog-YARV b/doc/ChangeLog-YARV index 83df05c52c..83df05c52c 100644 --- a/doc/ChangeLog/ChangeLog-YARV +++ b/doc/ChangeLog-YARV diff --git a/doc/NEWS/NEWS-3.2.0.md b/doc/NEWS/NEWS-3.2.0.md deleted file mode 100644 index 33a7b85c47..0000000000 --- a/doc/NEWS/NEWS-3.2.0.md +++ /dev/null @@ -1,820 +0,0 @@ -# NEWS for Ruby 3.2.0 - -This document is a list of user-visible feature changes -since the **3.1.0** release, except for bug fixes. - -Note that each entry is kept to a minimum, see links for details. - -## Language changes - -* Anonymous rest and keyword rest arguments can now be passed as - arguments, instead of just used in method parameters. - [[Feature #18351]] - - ```ruby - def foo(*) - bar(*) - end - def baz(**) - quux(**) - end - ``` - -* A proc that accepts a single positional argument and keywords will - no longer autosplat. [[Bug #18633]] - - ```ruby - proc{|a, **k| a}.call([1, 2]) - # Ruby 3.1 and before - # => 1 - # Ruby 3.2 and after - # => [1, 2] - ``` - -* Constant assignment evaluation order for constants set on explicit - objects has been made consistent with single attribute assignment - evaluation order. With this code: - - ```ruby - foo::BAR = baz - ``` - - `foo` is now called before `baz`. Similarly, for multiple assignments - to constants, left-to-right evaluation order is used. With this - code: - - ```ruby - foo1::BAR1, foo2::BAR2 = baz1, baz2 - ``` - - The following evaluation order is now used: - - 1. `foo1` - 2. `foo2` - 3. `baz1` - 4. `baz2` - - [[Bug #15928]] - -* "Find pattern" is no longer experimental. - [[Feature #18585]] - -* Methods taking a rest parameter (like `*args`) and wishing to delegate keyword - arguments through `foo(*args)` must now be marked with `ruby2_keywords` - (if not already the case). In other words, all methods wishing to delegate - keyword arguments through `*args` must now be marked with `ruby2_keywords`, - with no exception. This will make it easier to transition to other ways of - delegation once a library can require Ruby 3+. Previously, the `ruby2_keywords` - flag was kept if the receiving method took `*args`, but this was a bug and an - inconsistency. A good technique to find the potentially-missing `ruby2_keywords` - is to run the test suite, for where it fails find the last method which must - receive keyword arguments, use `puts nil, caller, nil` there, and check each - method/block on the call chain which must delegate keywords is correctly marked - as `ruby2_keywords`. [[Bug #18625]] [[Bug #16466]] - - ```ruby - def target(**kw) - end - - # Accidentally worked without ruby2_keywords in Ruby 2.7-3.1, ruby2_keywords - # needed in 3.2+. Just like (*args, **kwargs) or (...) would be needed on - # both #foo and #bar when migrating away from ruby2_keywords. - ruby2_keywords def bar(*args) - target(*args) - end - - ruby2_keywords def foo(*args) - bar(*args) - end - - foo(k: 1) - ``` - -## Core classes updates - -Note: We're only listing outstanding class updates. - -* Fiber - - * Introduce Fiber.[] and Fiber.[]= for inheritable fiber storage. - Introduce Fiber#storage and Fiber#storage= (experimental) for - getting and resetting the current storage. Introduce - `Fiber.new(storage:)` for setting the storage when creating a - fiber. [[Feature #19078]] - - Existing Thread and Fiber local variables can be tricky to use. - Thread-local variables are shared between all fibers, making it - hard to isolate, while Fiber-local variables can be hard to - share. It is often desirable to define unit of execution - ("execution context") such that some state is shared between all - fibers and threads created in that context. This is what Fiber - storage provides. - - ```ruby - def log(message) - puts "#{Fiber[:request_id]}: #{message}" - end - - def handle_requests - while request = read_request - Fiber.schedule do - Fiber[:request_id] = SecureRandom.uuid - - request.messages.each do |message| - Fiber.schedule do - log("Handling #{message}") # Log includes inherited request_id. - end - end - end - end - end - ``` - - You should generally consider Fiber storage for any state which - you want to be shared implicitly between all fibers and threads - created in a given context, e.g. a connection pool, a request - id, a logger level, environment variables, configuration, etc. - -* Fiber::Scheduler - - * Introduce `Fiber::Scheduler#io_select` for non-blocking IO.select. - [[Feature #19060]] - -* IO - - * Introduce IO#timeout= and IO#timeout which can cause - IO::TimeoutError to be raised if a blocking operation exceeds the - specified timeout. [[Feature #18630]] - - ```ruby - STDIN.timeout = 1 - STDIN.read # => Blocking operation timed out! (IO::TimeoutError) - ``` - - * Introduce `IO.new(..., path:)` and promote `File#path` to `IO#path`. - [[Feature #19036]] - -* Class - - * Class#attached_object, which returns the object for which - the receiver is the singleton class. Raises TypeError if the - receiver is not a singleton class. - [[Feature #12084]] - - ```ruby - class Foo; end - - Foo.singleton_class.attached_object #=> Foo - Foo.new.singleton_class.attached_object #=> #<Foo:0x000000010491a370> - Foo.attached_object #=> TypeError: `Foo' is not a singleton class - nil.singleton_class.attached_object #=> TypeError: `NilClass' is not a singleton class - ``` - -* Data - - * New core class to represent simple immutable value object. The class is - similar to Struct and partially shares an implementation, but has more - lean and strict API. [[Feature #16122]] - - ```ruby - Measure = Data.define(:amount, :unit) - distance = Measure.new(100, 'km') #=> #<data Measure amount=100, unit="km"> - weight = Measure.new(amount: 50, unit: 'kg') #=> #<data Measure amount=50, unit="kg"> - weight.with(amount: 40) #=> #<data Measure amount=40, unit="kg"> - weight.amount #=> 50 - weight.amount = 40 #=> NoMethodError: undefined method `amount=' - ``` - -* Encoding - - * Encoding#replicate has been deprecated and will be removed in 3.3. [[Feature #18949]] - * The dummy `Encoding::UTF_16` and `Encoding::UTF_32` encodings no longer - try to dynamically guess the endian based on a byte order mark. - Use `Encoding::UTF_16BE`/`UTF_16LE` and `Encoding::UTF_32BE`/`UTF_32LE` instead. - This change speeds up getting the encoding of a String. [[Feature #18949]] - * Limit maximum encoding set size by 256. - If exceeding maximum size, `EncodingError` will be raised. [[Feature #18949]] - -* Enumerator - - * Enumerator.product has been added. Enumerator::Product is the implementation. [[Feature #18685]] - -* Exception - - * Exception#detailed_message has been added. - The default error printer calls this method on the Exception object - instead of #message. [[Feature #18564]] - -* Hash - - * Hash#shift now always returns nil if the hash is - empty, instead of returning the default value or - calling the default proc. [[Bug #16908]] - -* Integer - - * Integer#ceildiv has been added. [[Feature #18809]] - -* Kernel - - * Kernel#binding raises RuntimeError if called from a non-Ruby frame - (such as a method defined in C). [[Bug #18487]] - -* MatchData - - * MatchData#byteoffset has been added. [[Feature #13110]] - * MatchData#deconstruct has been added. [[Feature #18821]] - * MatchData#deconstruct_keys has been added. [[Feature #18821]] - -* Module - - * Module.used_refinements has been added. [[Feature #14332]] - * Module#refinements has been added. [[Feature #12737]] - * Module#const_added has been added. [[Feature #17881]] - * Module#undefined_instance_methods has been added. [[Feature #12655]] - -* Proc - - * Proc#dup returns an instance of subclass. [[Bug #17545]] - * Proc#parameters now accepts lambda keyword. [[Feature #15357]] - -* Process - * Added `RLIMIT_NPTS` constant to FreeBSD platform - -* Regexp - - * The cache-based optimization is introduced. - Many (but not all) Regexp matching is now in linear time, which - will prevent regular expression denial of service (ReDoS) - vulnerability. [[Feature #19104]] - - * Regexp.linear_time? is introduced. [[Feature #19194]] - - * Regexp.new now supports passing the regexp flags not only as an Integer, - but also as a String. Unknown flags raise ArgumentError. - Otherwise, anything other than `true`, `false`, `nil` or Integer will be warned. - [[Feature #18788]] - - * Regexp.timeout= has been added. Also, Regexp.new new supports timeout keyword. - See [[Feature #17837]] - -* Refinement - - * Refinement#refined_class has been added. [[Feature #12737]] - -* RubyVM::AbstractSyntaxTree - - * Add `error_tolerant` option for `parse`, `parse_file` and `of`. [[Feature #19013]] - With this option - - 1. SyntaxError is suppressed - 2. AST is returned for invalid input - 3. `end` is complemented when a parser reaches to the end of input but `end` is insufficient - 4. `end` is treated as keyword based on indent - - ```ruby - # Without error_tolerant option - root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY) - def m - a = 10 - if - end - RUBY - # => <internal:ast>:33:in `parse': syntax error, unexpected `end' (SyntaxError) - - # With error_tolerant option - root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY, error_tolerant: true) - def m - a = 10 - if - end - RUBY - p root # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-4:3> - - # `end` is treated as keyword based on indent - root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY, error_tolerant: true) - module Z - class Foo - foo. - end - - def bar - end - end - RUBY - p root.children[-1].children[-1].children[-1].children[-2..-1] - # => [#<RubyVM::AbstractSyntaxTree::Node:CLASS@2:2-4:5>, #<RubyVM::AbstractSyntaxTree::Node:DEFN@6:2-7:5>] - ``` - - * Add `keep_tokens` option for `parse`, `parse_file` and `of`. Add `#tokens` and `#all_tokens` - for RubyVM::AbstractSyntaxTree::Node [[Feature #19070]] - - ```ruby - root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2", keep_tokens: true) - root.tokens # => [[0, :tIDENTIFIER, "x", [1, 0, 1, 1]], [1, :tSP, " ", [1, 1, 1, 2]], ...] - root.tokens.map{_1[2]}.join # => "x = 1 + 2" - ``` - -* Set - - * Set is now available as a built-in class without the need for `require "set"`. [[Feature #16989]] - It is currently autoloaded via the Set constant or a call to Enumerable#to_set. - -* String - - * String#byteindex and String#byterindex have been added. [[Feature #13110]] - * Update Unicode to Version 15.0.0 and Emoji Version 15.0. [[Feature #18639]] - (also applies to Regexp) - * String#bytesplice has been added. [[Feature #18598]] - * String#dedup has been added as an alias to String#-@. [[Feature #18595]] - -* Struct - - * A Struct class can also be initialized with keyword arguments - without `keyword_init: true` on Struct.new [[Feature #16806]] - - ```ruby - Post = Struct.new(:id, :name) - Post.new(1, "hello") #=> #<struct Post id=1, name="hello"> - # From Ruby 3.2, the following code also works without keyword_init: true. - Post.new(id: 1, name: "hello") #=> #<struct Post id=1, name="hello"> - ``` - -* Thread - - * Thread.each_caller_location is added. [[Feature #16663]] - -* Thread::Queue - - * Thread::Queue#pop(timeout: sec) is added. [[Feature #18774]] - -* Thread::SizedQueue - - * Thread::SizedQueue#pop(timeout: sec) is added. [[Feature #18774]] - * Thread::SizedQueue#push(timeout: sec) is added. [[Feature #18944]] - -* Time - - * Time#deconstruct_keys is added, allowing to use Time instances - in pattern-matching expressions [[Feature #19071]] - - * Time.new now can parse a string like generated by Time#inspect - and return a Time instance based on the given argument. - [[Feature #18033]] - -* SyntaxError - * SyntaxError#path has been added. [[Feature #19138]] - -* TracePoint - - * TracePoint#binding now returns `nil` for `c_call`/`c_return` TracePoints. - [[Bug #18487]] - * TracePoint#enable `target_thread` keyword argument now defaults to the - current thread if a block is given and `target` and `target_line` keyword - arguments are not passed. [[Bug #16889]] - -* UnboundMethod - - * `UnboundMethod#==` returns `true` if the actual method is same. For example, - `String.instance_method(:object_id) == Array.instance_method(:object_id)` - returns `true`. [[Feature #18798]] - - * `UnboundMethod#inspect` does not show the receiver of `instance_method`. - For example `String.instance_method(:object_id).inspect` returns - `"#<UnboundMethod: Kernel#object_id()>"` - (was `"#<UnboundMethod: String(Kernel)#object_id()>"`). - -* GC - - * Expose `need_major_gc` via `GC.latest_gc_info`. [GH-6791] - -* ObjectSpace - - * `ObjectSpace.dump_all` dump shapes as well. [GH-6868] - -## Stdlib updates - -* Bundler - - * Bundler now uses [PubGrub] resolver instead of [Molinillo] for performance improvement. - * Add --ext=rust support to bundle gem for creating simple gems with Rust extensions. - [[GH-rubygems-6149]] - * Make cloning git repos faster [[GH-rubygems-4475]] - -* RubyGems - - * Add mswin support for cargo builder. [[GH-rubygems-6167]] - -* CGI - - * `CGI.escapeURIComponent` and `CGI.unescapeURIComponent` are added. - [[Feature #18822]] - -* Coverage - - * `Coverage.setup` now accepts `eval: true`. By this, `eval` and related methods are - able to generate code coverage. [[Feature #19008]] - - * `Coverage.supported?(mode)` enables detection of what coverage modes are - supported. [[Feature #19026]] - -* Date - - * Added `Date#deconstruct_keys` and `DateTime#deconstruct_keys` same as [[Feature #19071]] - -* ERB - - * `ERB::Util.html_escape` is made faster than `CGI.escapeHTML`. - * It no longer allocates a String object when no character needs to be escaped. - * It skips calling `#to_s` method when an argument is already a String. - * `ERB::Escape.html_escape` is added as an alias to `ERB::Util.html_escape`, - which has not been monkey-patched by Rails. - * `ERB::Util.url_encode` is made faster using `CGI.escapeURIComponent`. - * `-S` option is removed from `erb` command. - -* FileUtils - - * Add FileUtils.ln_sr method and `relative:` option to FileUtils.ln_s. - [[Feature #18925]] - -* IRB - - * debug.gem integration commands have been added: `debug`, `break`, `catch`, - `next`, `delete`, `step`, `continue`, `finish`, `backtrace`, `info` - * They work even if you don't have `gem "debug"` in your Gemfile. - * See also: [What's new in Ruby 3.2's IRB?](https://st0012.dev/whats-new-in-ruby-3-2-irb) - * More Pry-like commands and features have been added. - * `edit` and `show_cmds` (like Pry's `help`) are added. - * `ls` takes `-g` or `-G` option to filter out outputs. - * `show_source` is aliased from `$` and accepts unquoted inputs. - * `whereami` is aliased from `@`. - -* Net::Protocol - - * Improve `Net::BufferedIO` performance. [[GH-net-protocol-14]] - -* Pathname - - * Added `Pathname#lutime`. [[GH-pathname-20]] - -* Socket - - * Added the following constants for supported platforms. - * `SO_INCOMING_CPU` - * `SO_INCOMING_NAPI_ID` - * `SO_RTABLE` - * `SO_SETFIB` - * `SO_USER_COOKIE` - * `TCP_KEEPALIVE` - * `TCP_CONNECTION_INFO` - -* SyntaxSuggest - - * The feature of `syntax_suggest` formerly `dead_end` is integrated in Ruby. - [[Feature #18159]] - -* UNIXSocket - - * Add support for UNIXSocket on Windows. Emulate anonymous sockets. Add - support for File.socket? and File::Stat#socket? where possible. - [[Feature #19135]] - -* The following default gems are updated. - - * RubyGems 3.4.1 - * abbrev 0.1.1 - * benchmark 0.2.1 - * bigdecimal 3.1.3 - * bundler 2.4.1 - * cgi 0.3.6 - * csv 3.2.6 - * date 3.3.3 - * delegate 0.3.0 - * did_you_mean 1.6.3 - * digest 3.1.1 - * drb 2.1.1 - * english 0.7.2 - * erb 4.0.2 - * error_highlight 0.5.1 - * etc 1.4.2 - * fcntl 1.0.2 - * fiddle 1.1.1 - * fileutils 1.7.0 - * forwardable 1.3.3 - * getoptlong 0.2.0 - * io-console 0.6.0 - * io-nonblock 0.2.0 - * io-wait 0.3.0 - * ipaddr 1.2.5 - * irb 1.6.2 - * json 2.6.3 - * logger 1.5.3 - * mutex_m 0.1.2 - * net-http 0.3.2 - * net-protocol 0.2.1 - * nkf 0.1.2 - * open-uri 0.3.0 - * open3 0.1.2 - * openssl 3.1.0 - * optparse 0.3.1 - * ostruct 0.5.5 - * pathname 0.2.1 - * pp 0.4.0 - * pstore 0.1.2 - * psych 5.0.1 - * racc 1.6.2 - * rdoc 6.5.0 - * readline-ext 0.1.5 - * reline 0.3.2 - * resolv 0.2.2 - * resolv-replace 0.1.1 - * securerandom 0.2.2 - * set 1.0.3 - * stringio 3.0.4 - * strscan 3.0.5 - * syntax_suggest 1.0.2 - * syslog 0.1.1 - * tempfile 0.1.3 - * time 0.2.1 - * timeout 0.3.1 - * tmpdir 0.1.3 - * tsort 0.1.1 - * un 0.2.1 - * uri 0.12.0 - * weakref 0.1.2 - * win32ole 1.8.9 - * yaml 0.2.1 - * zlib 3.0.0 - -* The following bundled gems are updated. - - * minitest 5.16.3 - * power_assert 2.0.3 - * test-unit 3.5.7 - * net-ftp 0.2.0 - * net-imap 0.3.4 - * net-pop 0.1.2 - * net-smtp 0.3.3 - * rbs 2.8.2 - * typeprof 0.21.3 - * debug 1.7.1 - -See GitHub releases like [GitHub Releases of Logger](https://github.com/ruby/logger/releases) or changelog for details of the default gems or bundled gems. - -## Supported platforms - -* WebAssembly/WASI is added. See [wasm/README.md] and [ruby.wasm] for more details. [[Feature #18462]] - -## Compatibility issues - -* `String#to_c` currently treat a sequence of underscores as an end of Complex - string. [[Bug #19087]] - -* Now `ENV.clone` raises `TypeError` as well as `ENV.dup` [[Bug #17767]] - -### Removed constants - -The following deprecated constants are removed. - -* `Fixnum` and `Bignum` [[Feature #12005]] -* `Random::DEFAULT` [[Feature #17351]] -* `Struct::Group` -* `Struct::Passwd` - -### Removed methods - -The following deprecated methods are removed. - -* `Dir.exists?` [[Feature #17391]] -* `File.exists?` [[Feature #17391]] -* `Kernel#=~` [[Feature #15231]] -* `Kernel#taint`, `Kernel#untaint`, `Kernel#tainted?` - [[Feature #16131]] -* `Kernel#trust`, `Kernel#untrust`, `Kernel#untrusted?` - [[Feature #16131]] -* `Method#public?`, `Method#private?`, `Method#protected?`, - `UnboundMethod#public?`, `UnboundMethod#private?`, `UnboundMethod#protected?` - [[Bug #18729]] [[Bug #18751]] [[Bug #18435]] - -### Source code incompatibility of extension libraries - -* Extension libraries provide PRNG, subclasses of Random, need updates. - See [PRNG update] below for more information. [[Bug #19100]] - -### Error printer - -* Ruby no longer escapes control characters and backslashes in an - error message. [[Feature #18367]] - -### Constant lookup when defining a class/module - -* When defining a class/module directly under the Object class by class/module - statement, if there is already a class/module defined by `Module#include` - with the same name, the statement was handled as "open class" in Ruby 3.1 or before. - Since Ruby 3.2, a new class is defined instead. [[Feature #18832]] - -## Stdlib compatibility issues - -* Psych no longer bundles libyaml sources. - And also Fiddle no longer bundles libffi sources. - Users need to install the libyaml/libffi library themselves via the package - manager like apt, yum, brew, etc. - - 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 - $ ./configure --with-libyaml-source-dir=/path/to/libyaml-0.2.5 - ``` - - And you can build fiddle with libffi-3.4.4 like this. - - ```bash - $ ./configure --with-libffi-source-dir=/path/to/libffi-3.4.4 - ``` - - [[Feature #18571]] - -* Check cookie name/path/domain characters in `CGI::Cookie`. [[CVE-2021-33621]] - -* `URI.parse` return empty string in host instead of nil. [[sec-156615]] - -## C API updates - -### Updated C APIs - -The following APIs are updated. - -* PRNG update - - `rb_random_interface_t` in ruby/random.h updated and versioned. - Extension libraries which use this interface and built for older - versions need to rebuild with adding `init_int32` function. - -### Added C APIs - -* `VALUE rb_hash_new_capa(long capa)` was added to created hashes with the desired capacity. -* `rb_internal_thread_add_event_hook` and `rb_internal_thread_add_event_hook` were added to instrument threads scheduling. - The following events are available: - * `RUBY_INTERNAL_THREAD_EVENT_STARTED` - * `RUBY_INTERNAL_THREAD_EVENT_READY` - * `RUBY_INTERNAL_THREAD_EVENT_RESUMED` - * `RUBY_INTERNAL_THREAD_EVENT_SUSPENDED` - * `RUBY_INTERNAL_THREAD_EVENT_EXITED` -* `rb_debug_inspector_current_depth` and `rb_debug_inspector_frame_depth` are added for debuggers. - -### Removed C APIs - -The following deprecated APIs are removed. - -* `rb_cData` variable. -* "taintedness" and "trustedness" functions. [[Feature #16131]] - -## Implementation improvements - -* Fixed several race conditions in Kernel#autoload. [[Bug #18782]] -* Cache invalidation for expressions referencing constants is now - more fine-grained. `RubyVM.stat(:global_constant_state)` was - removed because it was closely tied to the previous caching scheme - where setting any constant invalidates all caches in the system. - New keys, `:constant_cache_invalidations` and `:constant_cache_misses`, - were introduced to help with use cases for `:global_constant_state`. - [[Feature #18589]] -* The cache-based optimization for Regexp matching is introduced. - [[Feature #19104]] -* [Variable Width Allocation](https://shopify.engineering/ruby-variable-width-allocation) - is now enabled by default. [[Feature #18239]] -* Added a new instance variable caching mechanism, called object shapes, which - improves inline cache hits for most objects and allows us to generate very - efficient JIT code. Objects whose instance variables are defined in a - consistent order will see the most performance benefits. - [[Feature #18776]] -* Speed up marking instruction sequences by using a bitmap to find "markable" - objects. This change results in faster major collections. - [[Feature #18875]] - -## JIT - -### YJIT - -* YJIT is no longer experimental - * Has been tested on production workloads for over a year and proven to be quite stable. -* YJIT now supports both x86-64 and arm64/aarch64 CPUs on Linux, MacOS, BSD and other UNIX platforms. - * This release brings support for Mac M1/M2, AWS Graviton and Raspberry Pi 4. -* Building YJIT now requires Rust 1.58.0+. [[Feature #18481]] - * In order to ensure that CRuby is built with YJIT, please install `rustc` >= 1.58.0 - before running `./configure` - * Please reach out to the YJIT team should you run into any issues. -* Physical memory for JIT code is lazily allocated. Unlike Ruby 3.1, - the RSS of a Ruby process is minimized because virtual memory pages - allocated by `--yjit-exec-mem-size` will not be mapped to physical - memory pages until actually utilized by JIT code. -* Introduce Code GC that frees all code pages when the memory consumption - by JIT code reaches `--yjit-exec-mem-size`. - * `RubyVM::YJIT.runtime_stats` returns Code GC metrics in addition to - existing `inline_code_size` and `outlined_code_size` keys: - `code_gc_count`, `live_page_count`, `freed_page_count`, and `freed_code_size`. -* Most of the statistics produced by `RubyVM::YJIT.runtime_stats` are now available in release builds. - * Simply run ruby with `--yjit-stats` to compute and dump stats (incurs some run-time overhead). -* YJIT is now optimized to take advantage of object shapes. [[Feature #18776]] -* Take advantage of finer-grained constant invalidation to invalidate less code when defining new constants. [[Feature #18589]] -* The default `--yjit-exec-mem-size` is changed to 64 (MiB). -* The default `--yjit-call-threshold` is changed to 30. - -### MJIT - -* The MJIT compiler is re-implemented in Ruby as `ruby_vm/mjit/compiler`. -* MJIT compiler is executed under a forked Ruby process instead of - doing it in a native thread called MJIT worker. [[Feature #18968]] - * As a result, Microsoft Visual Studio (MSWIN) is no longer supported. -* MinGW is no longer supported. [[Feature #18824]] -* Rename `--mjit-min-calls` to `--mjit-call-threshold`. -* Change default `--mjit-max-cache` back from 10000 to 100. - -[Feature #12005]: https://bugs.ruby-lang.org/issues/12005 -[Feature #12084]: https://bugs.ruby-lang.org/issues/12084 -[Feature #12655]: https://bugs.ruby-lang.org/issues/12655 -[Feature #12737]: https://bugs.ruby-lang.org/issues/12737 -[Feature #13110]: https://bugs.ruby-lang.org/issues/13110 -[Feature #14332]: https://bugs.ruby-lang.org/issues/14332 -[Feature #15231]: https://bugs.ruby-lang.org/issues/15231 -[Feature #15357]: https://bugs.ruby-lang.org/issues/15357 -[Bug #15928]: https://bugs.ruby-lang.org/issues/15928 -[Feature #16122]: https://bugs.ruby-lang.org/issues/16122 -[Feature #16131]: https://bugs.ruby-lang.org/issues/16131 -[Bug #16466]: https://bugs.ruby-lang.org/issues/16466 -[Feature #16663]: https://bugs.ruby-lang.org/issues/16663 -[Feature #16806]: https://bugs.ruby-lang.org/issues/16806 -[Bug #16889]: https://bugs.ruby-lang.org/issues/16889 -[Bug #16908]: https://bugs.ruby-lang.org/issues/16908 -[Feature #16989]: https://bugs.ruby-lang.org/issues/16989 -[Feature #17351]: https://bugs.ruby-lang.org/issues/17351 -[Feature #17391]: https://bugs.ruby-lang.org/issues/17391 -[Bug #17545]: https://bugs.ruby-lang.org/issues/17545 -[Bug #17767]: https://bugs.ruby-lang.org/issues/17767 -[Feature #17837]: https://bugs.ruby-lang.org/issues/17837 -[Feature #17881]: https://bugs.ruby-lang.org/issues/17881 -[Feature #18033]: https://bugs.ruby-lang.org/issues/18033 -[Feature #18159]: https://bugs.ruby-lang.org/issues/18159 -[Feature #18239]: https://bugs.ruby-lang.org/issues/18239#note-17 -[Feature #18351]: https://bugs.ruby-lang.org/issues/18351 -[Feature #18367]: https://bugs.ruby-lang.org/issues/18367 -[Bug #18435]: https://bugs.ruby-lang.org/issues/18435 -[Feature #18462]: https://bugs.ruby-lang.org/issues/18462 -[Feature #18481]: https://bugs.ruby-lang.org/issues/18481 -[Bug #18487]: https://bugs.ruby-lang.org/issues/18487 -[Feature #18564]: https://bugs.ruby-lang.org/issues/18564 -[Feature #18571]: https://bugs.ruby-lang.org/issues/18571 -[Feature #18585]: https://bugs.ruby-lang.org/issues/18585 -[Feature #18589]: https://bugs.ruby-lang.org/issues/18589 -[Feature #18595]: https://bugs.ruby-lang.org/issues/18595 -[Feature #18598]: https://bugs.ruby-lang.org/issues/18598 -[Bug #18625]: https://bugs.ruby-lang.org/issues/18625 -[Feature #18630]: https://bugs.ruby-lang.org/issues/18630 -[Bug #18633]: https://bugs.ruby-lang.org/issues/18633 -[Feature #18639]: https://bugs.ruby-lang.org/issues/18639 -[Feature #18685]: https://bugs.ruby-lang.org/issues/18685 -[Bug #18729]: https://bugs.ruby-lang.org/issues/18729 -[Bug #18751]: https://bugs.ruby-lang.org/issues/18751 -[Feature #18774]: https://bugs.ruby-lang.org/issues/18774 -[Feature #18776]: https://bugs.ruby-lang.org/issues/18776 -[Bug #18782]: https://bugs.ruby-lang.org/issues/18782 -[Feature #18788]: https://bugs.ruby-lang.org/issues/18788 -[Feature #18798]: https://bugs.ruby-lang.org/issues/18798 -[Feature #18809]: https://bugs.ruby-lang.org/issues/18809 -[Feature #18821]: https://bugs.ruby-lang.org/issues/18821 -[Feature #18822]: https://bugs.ruby-lang.org/issues/18822 -[Feature #18824]: https://bugs.ruby-lang.org/issues/18824 -[Feature #18832]: https://bugs.ruby-lang.org/issues/18832 -[Feature #18875]: https://bugs.ruby-lang.org/issues/18875 -[Feature #18925]: https://bugs.ruby-lang.org/issues/18925 -[Feature #18944]: https://bugs.ruby-lang.org/issues/18944 -[Feature #18949]: https://bugs.ruby-lang.org/issues/18949 -[Feature #18968]: https://bugs.ruby-lang.org/issues/18968 -[Feature #19008]: https://bugs.ruby-lang.org/issues/19008 -[Feature #19013]: https://bugs.ruby-lang.org/issues/19013 -[Feature #19026]: https://bugs.ruby-lang.org/issues/19026 -[Feature #19036]: https://bugs.ruby-lang.org/issues/19036 -[Feature #19060]: https://bugs.ruby-lang.org/issues/19060 -[Feature #19070]: https://bugs.ruby-lang.org/issues/19070 -[Feature #19071]: https://bugs.ruby-lang.org/issues/19071 -[Feature #19078]: https://bugs.ruby-lang.org/issues/19078 -[Bug #19087]: https://bugs.ruby-lang.org/issues/19087 -[Bug #19100]: https://bugs.ruby-lang.org/issues/19100 -[Feature #19104]: https://bugs.ruby-lang.org/issues/19104 -[Feature #19135]: https://bugs.ruby-lang.org/issues/19135 -[Feature #19138]: https://bugs.ruby-lang.org/issues/19138 -[Feature #19194]: https://bugs.ruby-lang.org/issues/19194 -[Molinillo]: https://github.com/CocoaPods/Molinillo -[PubGrub]: https://github.com/jhawthorn/pub_grub -[GH-net-protocol-14]: https://github.com/ruby/net-protocol/pull/14 -[GH-pathname-20]: https://github.com/ruby/pathname/pull/20 -[GH-6791]: https://github.com/ruby/ruby/pull/6791 -[GH-6868]: https://github.com/ruby/ruby/pull/6868 -[GH-rubygems-4475]: https://github.com/rubygems/rubygems/pull/4475 -[GH-rubygems-6149]: https://github.com/rubygems/rubygems/pull/6149 -[GH-rubygems-6167]: https://github.com/rubygems/rubygems/pull/6167 -[sec-156615]: https://hackerone.com/reports/156615 -[CVE-2021-33621]: https://www.ruby-lang.org/en/news/2022/11/22/http-response-splitting-in-cgi-cve-2021-33621/ -[wasm/README.md]: https://github.com/ruby/ruby/blob/master/wasm/README.md -[ruby.wasm]: https://github.com/ruby/ruby.wasm diff --git a/doc/_regexp.rdoc b/doc/_regexp.rdoc deleted file mode 100644 index 7b71eee984..0000000000 --- a/doc/_regexp.rdoc +++ /dev/null @@ -1,1276 +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@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. - -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 {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@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"> - -==== 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>: Non-blank character - (excludes spaces, control characters, and similar). -- <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]. - -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, 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 deleted file mode 100644 index c5230ea67d..0000000000 --- a/doc/_timezones.rdoc +++ /dev/null @@ -1,156 +0,0 @@ -== 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+. - - 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 90705853d7..ca8091fc0d 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 57c037b9d8..3c42154973 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. @@ -60,7 +60,7 @@ Case changes may not be reversible: Case changing methods may not maintain Unicode normalization. See String#unicode_normalize). -== Options for Case Mapping +=== Options for Case Mapping Except for +casecmp+ and +casecmp?+, each of the case-mapping methods listed above diff --git a/doc/character_selectors.rdoc b/doc/character_selectors.rdoc index 47cf242be7..e01b0e6a25 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 246b2e6afe..af09be23f0 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. @@ -8,7 +8,6 @@ They should not be called with unknown or unsanitized commands. These methods include: - Kernel.system -- Kernel.open - {\`command` (backtick method)}[rdoc-ref:Kernel#`] (also called by the expression <tt>%x[command]</tt>). - IO.popen(command). @@ -18,7 +17,6 @@ These methods include: - IO.binwrite(command). - IO.readlines(command). - IO.foreach(command). -- URI.open(command). Note that some of these methods do not execute commands when called from subclass \File: diff --git a/doc/contributing/building_ruby.md b/doc/contributing/building_ruby.md index b2a7b007eb..469c9d8361 100644 --- a/doc/contributing/building_ruby.md +++ b/doc/contributing/building_ruby.md @@ -1,113 +1,83 @@ # Building Ruby -## Dependencies +## Quick start guide 1. Install the prerequisite dependencies for building the CRuby interpreter: * C compiler - - For RubyGems, you will also need: - - * 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 - * 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. + * bison - 3.0 or later + * gperf - 3.0.3 or later + * ruby - 2.7 or later 2. Install optional, recommended dependencies: - * libffi (to build fiddle) - * gmp (if you with to accelerate Bignum operations) + * OpenSSL/LibreSSL + * readline/editline (libedit) + * zlib + * libffi + * libyaml * libexecinfo (FreeBSD) - * rustc - 1.58.0 or later, if you wish to build - [YJIT](https://docs.ruby-lang.org/en/master/RubyVM/YJIT.html). + * rustc - 1.58.0 or later (if you wish to build [YJIT](/doc/yjit/yjit.md)) - 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. +3. Checkout the CRuby source code: - ``` shell - export CONFIGURE_ARGS="" - for ext in openssl readline libyaml zlib; do - CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-$ext-dir=$(brew --prefix $ext)" - done + ``` + git clone https://github.com/ruby/ruby.git ``` -## Quick start guide - -1. Download ruby source code: - - Select one of the bellow. - - 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: - - ``` shell - tar -xzf ruby-3.0.2.tar.gz - cd ruby-3.0.2 - ``` - - 2. Build from the git repository: - - Checkout the CRuby source code: - - ``` shell - git clone https://github.com/ruby/ruby.git - cd ruby - ``` - - Generate the configure file: +4. Generate the configure file: - ``` shell - ./autogen.sh - ``` + ``` + ./autogen.sh + ``` -2. Create a `build` directory separate from the source directory: +5. Create a `build` directory outside of the source directory: - ``` shell + ``` mkdir build && cd build ``` While it's not necessary to build in a separate directory, it's good practice to do so. -3. We'll install Ruby in `~/.rubies/ruby-master`, so create the directory: +6. We'll install Ruby in `~/.rubies/ruby-master`, so create the directory: - ``` shell + ``` mkdir ~/.rubies ``` -4. Run configure: +7. Run configure: - ``` shell + ``` ../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: +8. Build Ruby: - ``` shell + ``` make install ``` -6. [Run tests](testing_ruby.md) to confirm your build succeeded. + - If you're on macOS and installed \OpenSSL through Homebrew, you may encounter failure to build \OpenSSL that look like this: -### Unexplainable Build Errors + ``` + openssl: + Could not be configured. It will not be installed. + ruby/ext/openssl/extconf.rb: OpenSSL library could not be found. You might want to use --with-openssl-dir=<dir> option to specify the prefix where OpenSSL is installed. + Check ext/openssl/mkmf.log for more details. + ``` -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. + Adding `--with-openssl-dir=$(brew --prefix openssl)` to the list of options passed to configure may solve the issue. + + Remember to delete your `build` directory and start again from the configure step. -## Building on Windows +9. [Run tests](testing_ruby.md) to confirm your build succeeded. -The documentation for building on Windows can be found [here](../windows.md). +### 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. ## More details @@ -119,7 +89,7 @@ about Ruby's build to help out. 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: -``` shell +``` make test-all -j8 ``` @@ -147,7 +117,7 @@ Miniruby is a version of Ruby which has no external dependencies and lacks certa 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 +``` make miniruby ``` @@ -163,14 +133,6 @@ 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 -### Compiling for Debugging - -You should configure Ruby without optimization and other flags that may interfere with debugging: - -``` shell -./configure --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. @@ -189,7 +151,7 @@ On Linux it is important to specify `-O0` when debugging. This is especially tru You need to be able to use gcc (gcov) and lcov visualizer. -``` shell +``` ./autogen.sh ./configure --enable-gcov make diff --git a/doc/contributing/documentation_guide.md b/doc/contributing/documentation_guide.md index 027be34775..9cfd59d629 100644 --- a/doc/contributing/documentation_guide.md +++ b/doc/contributing/documentation_guide.md @@ -20,16 +20,14 @@ 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 -and relevant information in the shortest time. +and relevant in the shortest time. The reader should be able to quickly understand the usefulness of the subject code and how to use it. @@ -43,17 +41,16 @@ Use your judgment about what the user needs to know. - Write short declarative or imperative sentences. - Group sentences into (ideally short) paragraphs, each covering a single topic. -- Organize material with - [headings](rdoc-ref:RDoc::MarkupReference@Headings). +- Organize material with [headers](rdoc-ref:RDoc::Markup@Headers). - Refer to authoritative and relevant sources using - [links](rdoc-ref:RDoc::MarkupReference@Links). + [links](rdoc-ref:RDoc::Markup@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). + consider a [list](rdoc-ref:RDoc::Markup@Simple+Lists). - Idioms and culture-specific references. - - Overuse of headings. + - Overuse of headers. - Using US-ASCII-incompatible characters in C source files; see [Characters](#label-Characters) below. @@ -127,23 +124,16 @@ a.shuffle! #=> [2, 3, 1] a #=> [2, 3, 1] ``` -### Headings - -Organize a long discussion for a class or module with [headings](rdoc-ref:RDoc::MarkupReference@Headings). +### Headers -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) -as pseudo-headings. +Organize a long discussion with [headers](rdoc-ref:RDoc::Markup@Headers). ### 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) +A [code block](rdoc-ref:RDoc::Markup@Paragraphs+and+Verbatim) +or [list](rdoc-ref:RDoc::Markup@Simple+Lists) should be preceded by and followed by a blank line. This is unnecessary for the HTML output, but helps in the `ri` output. @@ -160,14 +150,6 @@ For a method name in text: or a hash mark for an instance method: <tt>Foo.bar</tt>, <tt>Foo#baz</tt>. -### Embedded Code and Commands - -Code or commands embedded in running text (i.e., not in a code block) -should marked up as -[monofont](rdoc-ref:RDoc::MarkupReference@Monofont). - -Code that is a simple string should include the quote marks. - ### Auto-Linking In general, \RDoc's auto-linking should not be suppressed. @@ -181,61 +163,6 @@ We might consider whether to suppress when: (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: - - - \Class. - - \Method. - - \Module. - -Most often, the name of a class, module, or method -will be autolinked: - -- Array. -- Enumerable. -- File.new -- File#read. - -If not, or if you suppress autolinking, consider forcing -[monofont](rdoc-ref:RDoc::MarkupReference@Monofont). - -### 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}[rdoc-ref:RDoc::MarkupReference@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). - -Also, use monofont text for the name of a transient variable -(i.e., one defined and used only in the discussion, such as +n+). ### HTML Tags @@ -248,21 +175,16 @@ may not render them properly. In particular, avoid building tables with HTML tags (<tt><table></tt>, etc.). -Alternatives: +Alternatives are: -- 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: +- The GFM (GitHub Flavored Markdown) table extension, + which is enabled by default. See + {GFM tables extension}[https://github.github.com/gfm/#tables-extension-]. - - Example {source}[https://github.com/ruby/ruby/blob/34d802f32f00df1ac0220b62f72605827c16bad8/file.c#L6570-L6596]. - - Corresponding {output}[rdoc-ref:File@Read-2FWrite+Mode]. - -- (Markdown format only): A {Github Flavored Markdown (GFM) table}[https://github.github.com/gfm/#tables-extension-], - using special formatting for the text: - - - 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]. +- 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. ## Documenting Classes and Modules @@ -292,12 +214,9 @@ Guidelines: - The section title is `What's Here`. - Consider listing the parent class and any included modules; consider - [links](rdoc-ref:RDoc::MarkupReference@Links) + [links](rdoc-ref:RDoc::Markup@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: +- List methods as a bullet list: - Begin each item with the method name, followed by a colon and a short description. @@ -305,9 +224,9 @@ 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](rdoc-ref:RDoc::Markup@Links). -- If there are numerous entries, consider grouping them into subsections with headings. +- If there are numerous entries, consider grouping them into subsections with headers. - If there are more than a few such subsections, consider adding a table of contents just below the main section title. @@ -322,6 +241,7 @@ The general structure of the method documentation should be: - Details and examples. - Argument description (if necessary). - Corner cases and exceptions. +- Aliases. - Related methods (optional). ### Calling Sequence (for methods written in C) @@ -330,7 +250,7 @@ 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:`](rdoc-ref:RDoc::Markup@Method+arguments). For a singleton method, use the form: @@ -408,11 +328,7 @@ Return types: Aliases: -- Omit aliases from the `call-seq`, unless the alias is an - operator method. If listing both a regular method and an - operator method in the `call-seq`, explain in the details and - examples section when it is recommended to use the regular method - and when it is recommended to use the operator method. +- Omit aliases from the `call-seq`, but mention them near the end (see below). ### Synopsis @@ -469,7 +385,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](rdoc-ref:RDoc::Markup@Labeled+Lists). ### Corner Cases and Exceptions @@ -482,6 +398,14 @@ you do not need to document that a `TypeError` is raised if a non-integer is passed. Do not provide examples of exceptions being raised unless that is a common case, such as `Hash#fetch` raising a `KeyError`. +### Aliases + +Mention aliases in the form + +``` +// Array#find_index is an alias for Array#index. +``` + ### Related Methods (optional) In some cases, it is useful to document which methods are related to diff --git a/doc/contributing/glossary.md b/doc/contributing/glossary.md deleted file mode 100644 index 86c6671fbd..0000000000 --- a/doc/contributing/glossary.md +++ /dev/null @@ -1,41 +0,0 @@ -# Ruby Internals Glossary - -Just a list of acronyms I've run across in the Ruby source code and their meanings. - -| Term | Definition | -| --- | -----------| -| `BIN` | Basic Instruction Name. Used as a macro to reference the YARV instruction. Converts pop into YARVINSN_pop. | -| `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 | -| `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 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` | -| `ec` | Execution Context. The top level VM context, points at the current `cfp` | -| `ep` | Environment Pointer. Local variables, including method parameters are stored in the `ep` array. The `ep` is pointed to by the `cfp` | -| GC | Garbage Collector | -| `gvar` | Global Variable. Refers to a Ruby global variable like `$$`, etc | -| `ICLASS` | Internal Class. When a module is included, the target class gets a new superclass which is an instance of an `ICLASS`. The `ICLASS` represents the module in the inheritance chain. | -| `ifunc` | Internal FUNCtion. A block implemented in C. | -| `iseq` | Instruction Sequence. Usually "iseq" in the C code will refer to an `rb_iseq_t` object that holds a reference to the actual instruction sequences which are executed by the VM. The object also holds information about the code, like the method name associated with the code. | -| `insn` | Instruction. Refers to a YARV instruction. | -| `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. | -| 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. -| 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| -| `svar` | Special Variable. Refers to special local variables like `$~` and `$_`. See the `getspecial` instruction in `insns.def` | -| `VALUE` | VALUE is a pointer to a ruby object from the Ruby C code. | -| VM | Virtual Machine. In MRI's case YARV (Yet Another Ruby VM) -| WB | Write Barrier. To do with GC write barriers | -| WC | Wild Card. As seen in instructions like `getlocal_WC_0`. It means this instruction takes a "wild card" for the parameter (in this case an index for a local) | -| YARV | Yet Another Ruby VM. The virtual machine that CRuby uses | -| ZOMBIE | A zombie object. An object that has a finalizer which hasn't been executed yet. The object has been collected, so is "dead", but the finalizer hasn't run yet so it's still somewhat alive. | diff --git a/doc/contributing/making_changes_to_stdlibs.md b/doc/contributing/making_changes_to_stdlibs.md index 3b33092fea..ef3811ea12 100644 --- a/doc/contributing/making_changes_to_stdlibs.md +++ b/doc/contributing/making_changes_to_stdlibs.md @@ -8,7 +8,7 @@ For example, CSV lives in [a separate repository](https://github.com/ruby/csv) a ## Maintainers -You can find the list of maintainers [here](https://docs.ruby-lang.org/en/master/maintainers_md.html#label-Maintainers). +You can find the list of maintainers [here](https://docs.ruby-lang.org/en/master/maintainers_rdoc.html#label-Maintainers). ## Build diff --git a/doc/contributing/testing_ruby.md b/doc/contributing/testing_ruby.md index dfb7fb3a65..6247686efc 100644 --- a/doc/contributing/testing_ruby.md +++ b/doc/contributing/testing_ruby.md @@ -70,7 +70,7 @@ We can run any of the make scripts [in parallel](building_ruby.md#label-Running+ 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" + make test-all TESTS="../test/ruby/test_alias.rb --name=/test_alias_with_zsuper_method/" ``` To run these specs with logs, we can use: @@ -79,13 +79,7 @@ We can run any of the make scripts [in parallel](building_ruby.md#label-Running+ make test-all TESTS=-v ``` - We can display the help of the `TESTS` option: - - ``` - make test-all TESTS=--help - ``` - - If we would like to run the `test/`, `bootstraptest/` and `spec/` test suites (the `spec/` is explained in a later section), we can run + If we would like to run both the `test/` and `bootstraptest/` test suites, we can run ``` make check @@ -99,28 +93,28 @@ We can run any of the make scripts [in parallel](building_ruby.md#label-Running+ make test-spec ``` - To run a specific directory, we can use `SPECOPTS` to specify the directory: + To run a specific directory, we can use `MSPECOPT` to specify the directory: ``` - make test-spec SPECOPTS=spec/ruby/core/array + make test-spec MSPECOPT=spec/ruby/core/array ``` - To run a specific file, we can also use `SPECOPTS` to specify the file: + To run a specific file, we can also use `MSPECOPT` to specify the file: ``` - make test-spec SPECOPTS=spec/ruby/core/array/any_spec.rb + make test-spec MSPECOPT=spec/ruby/core/array/any_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'" + make test-spec MSPECOPT="../spec/ruby/core/array/any_spec.rb --example='is false if the array is empty'" ``` To run these specs with logs, we can use: ``` - make test-spec SPECOPTS=-Vfs + make test-spec MSPECOPT=-Vfs ``` To run a ruby-spec file or directory with GNU make, we can use @@ -140,17 +134,5 @@ We can run any of the make scripts [in parallel](building_ruby.md#label-Running+ To run a specific bundler spec file, we can use `BUNDLER_SPECS` as follows: ``` - 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: - -``` -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/options/common/col_sep.rdoc b/doc/csv/options/common/col_sep.rdoc index 3f23c6d2d3..05769b5773 100644 --- a/doc/csv/options/common/col_sep.rdoc +++ b/doc/csv/options/common/col_sep.rdoc @@ -55,3 +55,9 @@ Raises an exception if parsing with the empty \String: # Raises ArgumentError (:col_sep must be 1 or more characters: "") CSV.parse("foo0\nbar1\nbaz2\n", col_sep: col_sep) +Raises an exception if the given value is not String-convertible: + col_sep = BasicObject.new + # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>) + CSV.generate(line, col_sep: col_sep) + # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>) + CSV.parse(str, col_sep: col_sep) diff --git a/doc/csv/options/common/row_sep.rdoc b/doc/csv/options/common/row_sep.rdoc index eae15b4a84..872d9d1f3f 100644 --- a/doc/csv/options/common/row_sep.rdoc +++ b/doc/csv/options/common/row_sep.rdoc @@ -89,3 +89,12 @@ if any of the following is true: * The stream is only available for output. Obviously, discovery takes a little time. Set manually if speed is important. Also note that IO objects should be opened in binary mode on Windows if this feature will be used as the line-ending translation can cause problems with resetting the document position to where it was before the read ahead. + +--- + +Raises an exception if the given value is not String-convertible: + row_sep = BasicObject.new + # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>) + CSV.generate(ary, row_sep: row_sep) + # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>) + CSV.parse(str, row_sep: row_sep) diff --git a/doc/csv/options/generating/write_converters.rdoc b/doc/csv/options/generating/write_converters.rdoc index d1a9cc748f..6e5fae5fda 100644 --- a/doc/csv/options/generating/write_converters.rdoc +++ b/doc/csv/options/generating/write_converters.rdoc @@ -23,3 +23,11 @@ With two write converters (called in order): str # => "a,b,c\n" See also {Write Converters}[#class-CSV-label-Write+Converters] + +--- + +Raises an exception if the converter returns a value that is neither +nil+ +nor \String-convertible: + bad_converter = proc {|field| BasicObject.new } + # Raises NoMethodError (undefined method `is_a?' for #<BasicObject:>) + CSV.generate_line(['a', 'b', 'c'], write_converters: bad_converter)
\ No newline at end of file diff --git a/doc/csv/options/generating/write_headers.rdoc b/doc/csv/options/generating/write_headers.rdoc index c56aa48adb..f9faa9d438 100644 --- a/doc/csv/options/generating/write_headers.rdoc +++ b/doc/csv/options/generating/write_headers.rdoc @@ -19,7 +19,7 @@ Without +write_headers+: With +write_headers+": CSV.open(file_path,'w', - :write_headers => true, + :write_headers=> true, :headers => ['Name','Value'] ) do |csv| csv << ['foo', '0'] diff --git a/doc/csv/options/parsing/liberal_parsing.rdoc b/doc/csv/options/parsing/liberal_parsing.rdoc index 603de28613..b8b9b00c98 100644 --- a/doc/csv/options/parsing/liberal_parsing.rdoc +++ b/doc/csv/options/parsing/liberal_parsing.rdoc @@ -1,13 +1,13 @@ ====== Option +liberal_parsing+ -Specifies the boolean or hash value that determines whether +Specifies the boolean value that determines whether CSV will attempt to parse input not conformant with RFC 4180, such as double quotes in unquoted fields. Default value: CSV::DEFAULT_OPTIONS.fetch(:liberal_parsing) # => false -For the next two examples: +For examples in this section: str = 'is,this "three, or four",fields' Without +liberal_parsing+: @@ -17,22 +17,3 @@ Without +liberal_parsing+: With +liberal_parsing+: ary = CSV.parse_line(str, liberal_parsing: true) ary # => ["is", "this \"three", " or four\"", "fields"] - -Use the +backslash_quote+ sub-option to parse values that use -a backslash to escape a double-quote character. This -causes the parser to treat <code>\"</code> as if it were -<code>""</code>. - -For the next two examples: - str = 'Show,"Harry \"Handcuff\" Houdini, the one and only","Tampa Theater"' - -With +liberal_parsing+, but without the +backslash_quote+ sub-option: - # Incorrect interpretation of backslash; incorrectly interprets the quoted comma as a field separator. - ary = CSV.parse_line(str, liberal_parsing: true) - ary # => ["Show", "\"Harry \\\"Handcuff\\\" Houdini", " the one and only\"", "Tampa Theater"] - puts ary[1] # => "Harry \"Handcuff\" Houdini - -With +liberal_parsing+ and its +backslash_quote+ sub-option: - ary = CSV.parse_line(str, liberal_parsing: { backslash_quote: true }) - ary # => ["Show", "Harry \"Handcuff\" Houdini, the one and only", "Tampa Theater"] - puts ary[1] # => Harry "Handcuff" Houdini, the one and only diff --git a/doc/csv/recipes/filtering.rdoc b/doc/csv/recipes/filtering.rdoc index 1552bf0fb8..470649d09a 100644 --- a/doc/csv/recipes/filtering.rdoc +++ b/doc/csv/recipes/filtering.rdoc @@ -1,7 +1,5 @@ == Recipes for Filtering \CSV -These recipes are specific code examples for specific \CSV filtering tasks. - For other recipes, see {Recipes for CSV}[./recipes_rdoc.html]. All code snippets on this page assume that the following has been executed: diff --git a/doc/csv/recipes/generating.rdoc b/doc/csv/recipes/generating.rdoc index a6bd88a714..3ef6df99b4 100644 --- a/doc/csv/recipes/generating.rdoc +++ b/doc/csv/recipes/generating.rdoc @@ -1,7 +1,5 @@ == Recipes for Generating \CSV -These recipes are specific code examples for specific \CSV generating tasks. - For other recipes, see {Recipes for CSV}[./recipes_rdoc.html]. All code snippets on this page assume that the following has been executed: @@ -146,7 +144,7 @@ This example defines and uses a custom write converter to strip whitespace from ==== Recipe: Specify Multiple Write Converters -Use option <tt>:write_converters</tt> and multiple custom converters +Use option <tt>:write_converters</tt> and multiple custom coverters to convert field values when generating \CSV. This example defines and uses two custom write converters to strip and upcase generated fields: diff --git a/doc/csv/recipes/parsing.rdoc b/doc/csv/recipes/parsing.rdoc index f3528fbdf1..7ac96a934b 100644 --- a/doc/csv/recipes/parsing.rdoc +++ b/doc/csv/recipes/parsing.rdoc @@ -1,7 +1,5 @@ == Recipes for Parsing \CSV -These recipes are specific code examples for specific \CSV parsing tasks. - For other recipes, see {Recipes for CSV}[./recipes_rdoc.html]. All code snippets on this page assume that the following has been executed: @@ -520,7 +518,7 @@ Apply multiple header converters by defining and registering a custom header con To capture unconverted field values, use option +:unconverted_fields+: source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n" parsed = CSV.parse(source, converters: :integer, unconverted_fields: true) - parsed # => [["Name", "Value"], ["foo", 0], ["bar", 1], ["baz", 2]] + parsed # => [["foo", "0"], ["bar", "1"], ["baz", "2"]] parsed.each {|row| p row.unconverted_fields } Output: ["Name", "Value"] diff --git a/doc/csv/recipes/recipes.rdoc b/doc/csv/recipes/recipes.rdoc index 9bf7885b1e..9e4eaa1da4 100644 --- a/doc/csv/recipes/recipes.rdoc +++ b/doc/csv/recipes/recipes.rdoc @@ -1,6 +1,6 @@ == Recipes for \CSV -The recipes are specific code examples for specific tasks. See: +See: - {Recipes for Parsing CSV}[./parsing_rdoc.html] - {Recipes for Generating CSV}[./generating_rdoc.html] - {Recipes for Filtering CSV}[./filtering_rdoc.html] diff --git a/doc/distribution.md b/doc/distribution.md deleted file mode 100644 index bc89a7500a..0000000000 --- a/doc/distribution.md +++ /dev/null @@ -1,47 +0,0 @@ -# Distribution - -This document outlines the expected way to distribute Ruby, with a specific focus on building Ruby packages. - -## Getting the Ruby Tarball - -### Official Releases - -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. - -### Using the nightly tarball for testing - -See the Snapshots section of the [Ruby website](https://www.ruby-lang.org/en/downloads/). - -### Building a manual snapshot tarball for testing - -This can be useful if the nightly tarball does not have all changes yet. - -At Ruby source tree cloned using git: -```sh-session -$ ./autogen.sh -$ ./configure -C -$ make -$ make dist -``` - -This will create several tarball in the `tmp` directory. The tarball will be named e.g. `ruby-<version>.tar.gz` (several different compression formats will be generated). - -## Building the Tarball - -See [Building Ruby](contributing/building_ruby.md). - -## Updating the Ruby Standard Library - -The Ruby standard library is a collection of Ruby files that are included with Ruby. These files are used to provide the basic functionality of Ruby. The standard library is located in the `lib` directory and is distributed as part of the Ruby tarball. - -Occasionally, the standard library needs to be updated, for example a security issue might be found in a default gem or standard gem. There are two main ways that Ruby would update this code. - -### Releasing an Updated Ruby Gem - -Normally, the Ruby gem maintainer will release an updated gem. This gem can be installed alongside the default gem. This allows the user to update the gem without having to update Ruby. - -### Releasing a New Ruby Version - -If the update is critical, then the Ruby maintainers may decide to release a new version of Ruby. This new version will include the updated standard library. diff --git a/doc/encodings.rdoc b/doc/encodings.rdoc index 97c0d22616..1f3c54d740 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: @@ -30,9 +30,9 @@ 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. @@ -43,7 +43,7 @@ There can be only one instance of \Encoding for each of these constants. 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: @@ -78,7 +78,7 @@ because it includes both the names and their aliases. 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 for each of these special names: @@ -118,7 +118,7 @@ for each of these special names: Encoding.default_internal = 'US-ASCII' # => "US-ASCII" Encoding.default_internal # => #<Encoding:US-ASCII> -=== Compatible Encodings +==== Compatible Encodings \Method Encoding.compatible? returns whether two given objects are encoding-compatible (that is, whether they can be concatenated); @@ -132,21 +132,20 @@ returns the \Encoding of the concatenated string, or +nil+ if incompatible: s1 = "\xa1\xa1".force_encoding('euc-jp') # => "\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]. +The default encoding for a string literal is the script encoding +(see Encoding@Script+encoding): 's'.encoding # => #<Encoding:UTF-8> The default encoding for a string created with method String.new is: - 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]. +- For a string literal, the script encoding (see Encoding@Script+encoding). In either case, any encoding may be specified: @@ -183,7 +182,7 @@ Here are a couple of useful query methods: s = "\xc2".force_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. @@ -191,23 +190,22 @@ the encoding may be retrieved by method Symbol#encoding or Regexp#encoding. The default encoding for these, however, is: - US-ASCII, if all characters are US-ASCII. -- The script encoding, otherwise; - see (Script Encoding)[rdoc-ref:encodings.rdoc@Script+Encoding]. +- The script encoding, otherwise (see Encoding@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 +220,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. @@ -250,7 +248,7 @@ For an \IO, \File, \ARGF, or \StringIO object, the external encoding may be set - \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 @@ -276,7 +274,7 @@ For an \IO, \File, \ARGF, or \StringIO object, the internal encoding may be set - \Method +set_encoding+. -== Script \Encoding +=== Script \Encoding A Ruby script has a script encoding, which may be retrieved by: @@ -291,7 +289,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 +300,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 +315,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: @@ -352,7 +350,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. diff --git a/doc/extension.ja.rdoc b/doc/extension.ja.rdoc index bde907c916..93f5753cd1 100644 --- a/doc/extension.ja.rdoc +++ b/doc/extension.ja.rdoc @@ -888,12 +888,12 @@ dbm.cではTypedData_Make_Structを以下のように使っています． obj = TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp); -ここではdbmdata構造体へのポインタをRubyオブジェクトにカプセ -ル化しています．DBM*を直接カプセル化しないのはclose()した時 -の処理を考えてのことです． +ここではdbmdata構造体へのポインタをDataにカプセル化してい +ます．DBM*を直接カプセル化しないのはclose()した時の処理を考 +えてのことです． -Rubyオブジェクトからdbmdata構造体のポインタを取り出すために -以下のマクロを使っています． +Dataオブジェクトからdbmstruct構造体のポインタを取り出すため +に以下のマクロを使っています． #define GetDBM(obj, dbmp) do {\ TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\ diff --git a/doc/extension.rdoc b/doc/extension.rdoc index f0e12f27f2..ad9ae641d2 100644 --- a/doc/extension.rdoc +++ b/doc/extension.rdoc @@ -1,6 +1,6 @@ # extension.rdoc - -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995 -= Creating extension libraries for Ruby += Creating Extension Libraries for Ruby This document explains how to make extension libraries for Ruby. @@ -10,8 +10,8 @@ In C, variables have types and data do not have types. In contrast, Ruby variables do not have a static type, and data themselves have types, so data will need to be converted between the languages. -Objects in Ruby are represented by the C type `VALUE'. Each VALUE -data has its data type. +Data in Ruby are represented by the C type `VALUE'. Each VALUE data +has its data type. To retrieve C data from a VALUE, you need to: @@ -20,7 +20,7 @@ To retrieve C data from a VALUE, you need to: Converting to the wrong data type may cause serious problems. -=== Ruby data types +=== Data Types The Ruby interpreter has the following data types: @@ -54,7 +54,7 @@ T_ZOMBIE :: object awaiting finalization Most of the types are represented by C structures. -=== Check type of the VALUE data +=== Check Data Type of the VALUE The macro TYPE() defined in ruby.h shows the data type of the VALUE. TYPE() returns the constant number T_XXXX described above. To handle @@ -88,7 +88,7 @@ There are also faster check macros for fixnums and nil. FIXNUM_P(obj) NIL_P(obj) -=== Convert VALUE into C data +=== Convert VALUE into C Data The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true respectively. They are singletons for the data type. @@ -143,7 +143,7 @@ Notice: Do not change the value of the structure directly, unless you are responsible for the result. This ends up being the cause of interesting bugs. -=== Convert C data into VALUE +=== Convert C Data into VALUE To convert C data to Ruby values: @@ -169,14 +169,14 @@ INT2NUM() :: for arbitrary sized integers. INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM range, but is a bit slower. -=== Manipulating Ruby object +=== Manipulating Ruby Data As I already mentioned, it is not recommended to modify an object's internal structure. To manipulate objects, use the functions supplied by the Ruby interpreter. Some (not all) of the useful functions are listed below: -==== String functions +==== String Functions rb_str_new(const char *ptr, long len) :: @@ -279,7 +279,7 @@ rb_str_modify(VALUE str) :: you MUST call this function before modifying the contents using RSTRING_PTR and/or rb_str_set_len. -==== Array functions +==== Array Functions rb_ary_new() :: @@ -338,13 +338,13 @@ rb_ary_cat(VALUE ary, const VALUE *ptr, long len) :: == Extending Ruby with C -=== Adding new features to Ruby +=== Adding New Features to Ruby You can add new features (classes, methods, etc.) to the Ruby interpreter. Ruby provides APIs for defining the following things: - Classes, Modules -- Methods, singleton methods +- Methods, Singleton Methods - Constants ==== Class and Module Definition @@ -362,7 +362,7 @@ To define nested classes or modules, use the functions below: VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super) VALUE rb_define_module_under(VALUE outer, const char *name) -==== Method and singleton method definition +==== Method and Singleton Method Definition To define methods or singleton methods, use these functions: @@ -467,7 +467,7 @@ available), you can use: VALUE rb_current_receiver(void) -==== Constant definition +==== Constant Definition We have 2 functions to define constants: @@ -477,11 +477,11 @@ We have 2 functions to define constants: The former is to define a constant under specified class/module. The latter is to define a global constant. -=== Use Ruby features from C +=== Use Ruby Features from C There are several ways to invoke Ruby's features from C code. -==== Evaluate Ruby programs in a string +==== Evaluate Ruby Programs in a String The easiest way to use Ruby's functionality from a C program is to evaluate the string as Ruby program. This function will do the job: @@ -550,7 +550,7 @@ and to convert Ruby Symbol object to ID, use ID SYM2ID(VALUE symbol) -==== Invoke Ruby method from C +==== Invoke Ruby Method from C To invoke methods directly, you can use the function below @@ -559,7 +559,7 @@ To invoke methods directly, you can use the function below This function invokes a method on the recv, with the method name specified by the symbol mid. -==== Accessing the variables and constants +==== Accessing the Variables and Constants You can access class variables and instance variables using access functions. Also, global variables can be shared between both @@ -578,9 +578,9 @@ To access the constants of the class/module: See also Constant Definition above. -== Information sharing between Ruby and C +== Information Sharing Between Ruby and C -=== Ruby constants that can be accessed from C +=== Ruby Constants That Can Be Accessed From C As stated in section 1.3, the following Ruby constants can be referred from C. @@ -594,7 +594,7 @@ Qnil :: Ruby nil in C scope. -=== Global variables shared between C and Ruby +=== Global Variables Shared Between C and Ruby Information can be shared between the two environments using shared global variables. To define them, you can use functions listed below: @@ -636,7 +636,7 @@ The prototypes of the getter and setter functions are as follows: VALUE (*getter)(ID id); void (*setter)(VALUE val, ID id); -=== Encapsulate C data into a Ruby object +=== Encapsulate C Data into a Ruby Object Sometimes you need to expose your struct in the C world as a Ruby object. @@ -762,7 +762,7 @@ You can allocate and wrap the structure in one step. TypedData_Make_Struct(klass, type, data_type, sval) -This macro returns an allocated T_DATA object, wrapping the pointer to +This macro returns an allocated Data object, wrapping the pointer to the structure, which is also allocated. This macro works like: (sval = ZALLOC(type), TypedData_Wrap_Struct(klass, data_type, sval)) @@ -771,66 +771,9 @@ 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. -==== Declaratively marking/compacting struct references - -In the case where your struct refers to Ruby objects that are simple values, -not wrapped in conditional logic or complex data structures an alternative -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. - -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 +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_REFERENCES(ref_list_name)</code> - Define _ref_list_name_ as a list of references - -* <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+ - -* +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 struct being wrapped. Notice this contains 3 members of which the second - // is a VALUE reference to another ruby object. - struct dir_data { - DIR *dir; - const VALUE path; - rb_encoding *enc; - } - - // 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", - {RUBY_REFS_LIST_PTR(dir_refs), dir_free, dir_memsize,}, - 0, NULL, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_DECL_MARKING - }; - -Declaring simple references declaratively in this manner allows the GC to both -mark, and move the underlying object, and automatically update the reference to -it during compaction. - ==== Ruby object to C struct -To retrieve the C pointer from the T_DATA object, use the macro +To retrieve the C pointer from the Data object, use the macro TypedData_Get_Struct(). TypedData_Get_Struct(obj, type, &data_type, sval) @@ -845,7 +788,7 @@ OK, here's the example of making an extension library. This is the extension to access DBMs. The full source is included in the ext/ directory in the Ruby's source tree. -=== Make the directory +=== Make the Directory % mkdir ext/dbm @@ -1056,7 +999,7 @@ If a compilation condition is not fulfilled, you should not call ``create_makefile''. The Makefile will not be generated, compilation will not be done. -=== Prepare depend (Optional) +=== Prepare Depend (Optional) If the file named depend exists, Makefile will include that file to check dependencies. You can make this file by invoking @@ -1095,15 +1038,15 @@ You may need to rb_debug the extension. Extensions can be linked statically by adding the directory name in the ext/Setup file so that you can inspect the extension with the debugger. -=== Done! Now you have the extension library +=== Done! Now You Have the Extension Library You can do anything you want with your library. The author of Ruby will not claim any restrictions on your code depending on the Ruby API. Feel free to use, modify, distribute or sell your program. -== Appendix A. Ruby header and source files overview +== Appendix A. Ruby Header and Source Files Overview -=== Ruby header files +=== Ruby Header Files Everything under <tt>$repo_root/include/ruby</tt> is installed with <tt>make install</tt>. @@ -1120,7 +1063,7 @@ Header files under <tt>$repo_root/internal/</tt> or directly under the root <tt>$repo_root/*.h</tt> are not make-installed. They are internal headers with only internal APIs. -=== Ruby language core +=== Ruby Language Core class.c :: classes and modules error.c :: exception classes and exception mechanism @@ -1129,14 +1072,14 @@ load.c :: library loading object.c :: objects variable.c :: variables and constants -=== Ruby syntax parser +=== Ruby Syntax Parser parse.y :: grammar definition parse.c :: automatically generated from parse.y defs/keywords :: reserved keywords lex.c :: automatically generated from keywords -=== Ruby evaluator (a.k.a. YARV) +=== Ruby Evaluator (a.k.a. YARV) compile.c eval.c @@ -1162,7 +1105,7 @@ lex.c :: automatically generated from keywords -> opt*.inc : automatically generated -> vm.inc : automatically generated -=== Regular expression engine (Onigumo) +=== Regular Expression Engine (Onigumo) regcomp.c regenc.c @@ -1171,7 +1114,7 @@ lex.c :: automatically generated from keywords regparse.c regsyntax.c -=== Utility functions +=== Utility Functions debug.c :: debug symbols for C debugger dln.c :: dynamic loading @@ -1179,7 +1122,7 @@ st.c :: general purpose hash table strftime.c :: formatting times util.c :: misc utilities -=== Ruby interpreter implementation +=== Ruby Interpreter Implementation dmyext.c dmydln.c @@ -1193,7 +1136,7 @@ util.c :: misc utilities gem_prelude.rb prelude.rb -=== Class library +=== Class Library array.c :: Array bignum.c :: Bignum @@ -1232,13 +1175,13 @@ transcode.c :: Encoding::Converter enc/*.c :: encoding classes enc/trans/* :: codepoint mapping tables -=== goruby interpreter implementation +=== goruby Interpreter Implementation goruby.c golf_prelude.rb : goruby specific libraries. -> golf_prelude.c : automatically generated -== Appendix B. Ruby extension API reference +== Appendix B. Ruby Extension API Reference === Types @@ -1248,7 +1191,7 @@ VALUE :: such as struct RString, etc. To refer the values in structures, use casting macros like RSTRING(obj). -=== Variables and constants +=== Variables and Constants Qnil :: @@ -1262,7 +1205,7 @@ Qfalse :: false object -=== C pointer wrapping +=== C Pointer Wrapping Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) :: @@ -1282,7 +1225,7 @@ Data_Get_Struct(data, type, sval) :: This macro retrieves the pointer value from DATA, and assigns it to the variable sval. -=== Checking VALUE types +=== Checking Data Types RB_TYPE_P(value, type) :: @@ -1312,7 +1255,7 @@ void Check_Type(VALUE value, int type) :: Ensures +value+ is of the given internal +type+ or raises a TypeError -=== VALUE type conversion +=== Data Type Conversion FIX2INT(value), INT2FIX(i) :: @@ -1396,7 +1339,7 @@ rb_str_new2(s) :: char * -> String -=== Defining classes and modules +=== Defining Classes and Modules VALUE rb_define_class(const char *name, VALUE super) :: @@ -1423,7 +1366,7 @@ void rb_extend_object(VALUE object, VALUE module) :: Extend the object with the module's attributes. -=== Defining global variables +=== Defining Global Variables void rb_define_variable(const char *name, VALUE *var) :: @@ -1467,7 +1410,7 @@ void rb_gc_register_mark_object(VALUE object) :: Tells GC to protect the +object+, which may not be referenced anywhere. -=== Constant definition +=== Constant Definition void rb_define_const(VALUE klass, const char *name, VALUE val) :: @@ -1479,7 +1422,7 @@ void rb_define_global_const(const char *name, VALUE val) :: rb_define_const(rb_cObject, name, val) -=== Method definition +=== Method Definition rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) :: @@ -1655,7 +1598,7 @@ int rb_respond_to(VALUE obj, ID id) :: Returns true if the object responds to the message specified by id. -=== Instance variables +=== Instance Variables VALUE rb_iv_get(VALUE obj, const char *name) :: @@ -1666,7 +1609,7 @@ VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) :: Sets the value of the instance variable. -=== Control structure +=== Control Structure VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2) :: @@ -1762,7 +1705,7 @@ void rb_iter_break_value(VALUE value) :: return the given argument value. This function never return to the caller. -=== Exceptions and errors +=== Exceptions and Errors void rb_warn(const char *fmt, ...) :: @@ -1835,7 +1778,7 @@ int rb_wait_for_single_fd(int fd, int events, struct timeval *timeout) :: Use a NULL +timeout+ to wait indefinitely. -=== I/O multiplexing +=== I/O Multiplexing Ruby supports I/O multiplexing based on the select(2) system call. The Linux select_tut(2) manpage @@ -1887,7 +1830,7 @@ int rb_thread_fd_select(int nfds, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_ rb_io_wait_writable, or rb_wait_for_single_fd functions since they can be optimized for specific platforms (currently, only Linux). -=== Initialize and start the interpreter +=== Initialize and Start the Interpreter The embedding API functions are below (not needed for extension libraries): @@ -1912,7 +1855,7 @@ void ruby_script(char *name) :: Specifies the name of the script ($0). -=== Hooks for the interpreter events +=== Hooks for the Interpreter Events void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data) :: @@ -1954,7 +1897,7 @@ void rb_gc_adjust_memory_usage(ssize_t diff) :: is decreased; a memory block is freed or a block is reallocated as smaller size. This function may trigger the GC. -=== Macros for compatibility +=== Macros for Compatibility Some macros to check API compatibilities are available by default. diff --git a/doc/format_specifications.rdoc b/doc/format_specifications.rdoc index 1111575e74..e589524f27 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,14 @@ 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+ +==== Specifier +d+ Format +argument+ as a decimal integer: @@ -242,7 +242,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 +250,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 +259,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 +281,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 +296,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 +312,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 +329,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 +337,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/globals.rdoc b/doc/globals.rdoc index 1bf78a60ab..1d7cda69f9 100644 --- a/doc/globals.rdoc +++ b/doc/globals.rdoc @@ -1,422 +1,69 @@ -= Pre-Defined Global Variables - -Some of the pre-defined global variables have synonyms -that are available via module Engish. -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> (Input Field Separator) - -An input field separator, initially +nil+. - -English - <tt>$FIELD_SEPARATOR</tt>, <tt>$FS</tt>. - -Aliased as <tt>$-F</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> (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> - -= 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" +# -*- 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. diff --git a/doc/implicit_conversion.rdoc b/doc/implicit_conversion.rdoc index e244096125..ba15fa4bf4 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/irb/indexes.md b/doc/irb/indexes.md deleted file mode 100644 index 24a67b9698..0000000000 --- a/doc/irb/indexes.md +++ /dev/null @@ -1,189 +0,0 @@ -## Indexes - -### Index of Command-Line Options - -These are the \IRB command-line options, with links to explanatory text: - -- `-d`: Set `$DEBUG` and {$VERBOSE}[rdoc-ref:IRB@Verbosity] - to `true`. -- `-E _ex_[:_in_]`: Set initial external (ex) and internal (in) - {encodings}[rdoc-ref:IRB@Encodings] (same as `ruby -E>`). -- `-f`: Don't initialize from {configuration file}[rdoc-ref:IRB@Configuration+File]. -- `-I _dirpath_`: Specify {$LOAD_PATH directory}[rdoc-ref:IRB@Load+Modules] - (same as `ruby -I`). -- `-r _load-module_`: Require {load-module}[rdoc-ref:IRB@Load+Modules] - (same as `ruby -r`). -- `-U`: Set external and internal {encodings}[rdoc-ref:IRB@Encodings] to UTF-8. -- `-w`: Suppress {warnings}[rdoc-ref:IRB@Warnings] (same as `ruby -w`). -- `-W[_level_]`: Set {warning level}[rdoc-ref:IRB@Warnings]; - 0=silence, 1=medium, 2=verbose (same as `ruby -W`). -- `--autocomplete`: Use {auto-completion}[rdoc-ref:IRB@Automatic+Completion]. -- `--back-trace-limit _n_`: Set a {backtrace limit}[rdoc-ref:IRB@Tracer]; - display at most the top `n` and bottom `n` entries. -- `--colorize`: Use {color-highlighting}[rdoc-ref:IRB@Color+Highlighting] - for input and output. -- `--context-mode _n_`: Select method to create Binding object - for new {workspace}[rdoc-ref:IRB@Commands]; `n` in range `0..4`. -- `--echo`: Print ({echo}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - return values. -- `--extra-doc-dir _dirpath_`: - Add a {documentation directory}[rdoc-ref:IRB@RI+Documentation+Directories] - for the documentation dialog. -- `--inf-ruby-mode`: Set prompt mode to {:INF_RUBY}[rdoc-ref:IRB@Pre-Defined+Prompts] - (appropriate for `inf-ruby-mode` on Emacs); - suppresses --multiline and --singleline. -- `--inspect`: Use method `inspect` for printing ({echoing}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - return values. -- `--multiline`: Use the multiline editor as the {input method}[rdoc-ref:IRB@Input+Method]. -- `--noautocomplete`: Don't use {auto-completion}[rdoc-ref:IRB@Automatic+Completion]. -- `--nocolorize`: Don't use {color-highlighting}[rdoc-ref:IRB@Color+Highlighting] - for input and output. -- `--noecho`: Don't print ({echo}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - return values. -- `--noecho-on-assignment`: Don't print ({echo}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - result on assignment. -- `--noinspect`: Don't se method `inspect` for printing ({echoing}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - return values. -- `--nomultiline`: Don't use the multiline editor as the {input method}[rdoc-ref:IRB@Input+Method]. -- `--noprompt`: Don't print {prompts}[rdoc-ref:IRB@Prompt+and+Return+Formats]. -- `--noscript`: Treat the first command-line argument as a normal - {command-line argument}[rdoc-ref:IRB@Initialization+Script], - and include it in `ARGV`. -- `--nosingleline`: Don't use the singleline editor as the {input method}[rdoc-ref:IRB@Input+Method]. -- `--noverbose`Don't print {verbose}[rdoc-ref:IRB@Verbosity] details. -- `--prompt _mode_`, `--prompt-mode _mode_`: - Set {prompt and return formats}[rdoc-ref:IRB@Prompt+and+Return+Formats]; - `mode` may be a {pre-defined prompt}[rdoc-ref:IRB@Pre-Defined+Prompts] - or the name of a {custom prompt}[rdoc-ref:IRB@Custom+Prompts]. -- `--script`: Treat the first command-line argument as the path to an - {initialization script}[rdoc-ref:IRB@Initialization+Script], - and omit it from `ARGV`. -- `--simple-prompt`, `--sample-book-mode`: - Set prompt mode to {:SIMPLE}[rdoc-ref:IRB@Pre-Defined+Prompts]. -- `--singleline`: Use the singleline editor as the {input method}[rdoc-ref:IRB@Input+Method]. -- `--tracer`: Use {Tracer}[rdoc-ref:IRB@Tracer] to print a stack trace for each input command. -- `--truncate-echo-on-assignment`: Print ({echo}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - truncated result on assignment. -- `--verbose`Print {verbose}[rdoc-ref:IRB@Verbosity] details. -- `-v`, `--version`: Print the {IRB version}[rdoc-ref:IRB@Version]. -- `-h`, `--help`: Print the {IRB help text}[rdoc-ref:IRB@Help]. -- `--`: Separate options from {arguments}[rdoc-ref:IRB@Command-Line+Arguments] - on the command-line. - -### Index of \IRB.conf Entries - -These are the keys for hash \IRB.conf entries, with links to explanatory text; -for each entry that is pre-defined, the initial value is given: - -- `:AP_NAME`: \IRB {application name}[rdoc-ref:IRB@Application+Name]; - initial value: `'irb'`. -- `:AT_EXIT`: Array of hooks to call - {at exit}[rdoc-ref:IRB@IRB]; - initial value: `[]`. -- `:AUTO_INDENT`: Whether {automatic indentation}[rdoc-ref:IRB@Automatic+Indentation] - is enabled; initial value: `true`. -- `:BACK_TRACE_LIMIT`: Sets the {back trace limit}[rdoc-ref:IRB@Tracer]; - initial value: `16`. -- `:COMMAND_ALIASES`: Defines input {command aliases}[rdoc-ref:IRB@Command+Aliases]; - initial value: - - { - "$": :show_source, - "@": :whereami, - } - -- `:CONTEXT_MODE`: Sets the {context mode}[rdoc-ref:IRB@Context+Mode], - the type of binding to be used when evaluating statements; - initial value: `4`. -- `:ECHO`: Whether to print ({echo}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - return values; - initial value: `nil`, which would set `conf.echo` to `true`. -- `:ECHO_ON_ASSIGNMENT`: Whether to print ({echo}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) - return values on assignment; - initial value: `nil`, which would set `conf.echo_on_assignment` to `:truncate`. -- `:EVAL_HISTORY`: How much {evaluation history}[rdoc-ref:IRB@Evaluation+History] - is to be stored; initial value: `nil`. -- `:EXTRA_DOC_DIRS`: \Array of - {RI documentation directories}[rdoc-ref:IRB@RI+Documentation+Directories] - to be parsed for the documentation dialog; - initial value: `[]`. -- `:IGNORE_EOF`: Whether to ignore {end-of-file}[rdoc-ref:IRB@End-of-File]; - initial value: `false`. -- `:IGNORE_SIGINT`: Whether to ignore {SIGINT}[rdoc-ref:IRB@SIGINT]; - initial value: `true`. -- `:INSPECT_MODE`: Whether to use method `inspect` for printing - ({echoing}[rdoc-ref:IRB@Return-Value+Printing+-28Echoing-29]) return values; - initial value: `true`. -- `:IRB_LIB_PATH`: The path to the {IRB library directory}[rdoc-ref:IRB@IRB+Library+Directory]; initial value: - - - `"<i>RUBY_DIR</i>/lib/ruby/gems/<i>RUBY_VER_NUM</i>/gems/irb-<i>IRB_VER_NUM</i>/lib/irb"`, - - where: - - - <i>RUBY_DIR</i> is the Ruby installation dirpath. - - <i>RUBY_VER_NUM</i> is the Ruby version number. - - <i>IRB_VER_NUM</i> is the \IRB version number. - -- `:IRB_NAME`: {IRB name}[rdoc-ref:IRB@IRB+Name]; - initial value: `'irb'`. -- `:IRB_RC`: {Configuration monitor}[rdoc-ref:IRB@Configuration+Monitor]; - initial value: `nil`. -- `:LC_MESSAGES`: {Locale}[rdoc-ref:IRB@Locale]; - initial value: IRB::Locale object. -- `:LOAD_MODULES`: deprecated. -- `:MAIN_CONTEXT`: The {context}[rdoc-ref:IRB@Session+Context] for the main \IRB session; - initial value: IRB::Context object. -- `:MEASURE`: Whether to - {measure performance}[rdoc-ref:IRB@Performance+Measurement]; - initial value: `false`. -- `:MEASURE_CALLBACKS`: Callback methods for - {performance measurement}[rdoc-ref:IRB@Performance+Measurement]; - initial value: `[]`. -- `:MEASURE_PROC`: Procs for - {performance measurement}[rdoc-ref:IRB@Performance+Measurement]; - initial value: - - { - :TIME=>#<Proc:0x0000556e271c6598 /var/lib/gems/3.0.0/gems/irb-1.8.3/lib/irb/init.rb:106>, - :STACKPROF=>#<Proc:0x0000556e271c6548 /var/lib/gems/3.0.0/gems/irb-1.8.3/lib/irb/init.rb:116> - } - -- `:PROMPT`: \Hash of {defined prompts}[rdoc-ref:IRB@Prompt+and+Return+Formats]; - initial value: - - { - :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"} - } - -- `:PROMPT_MODE`: Name of {current prompt}[rdoc-ref:IRB@Prompt+and+Return+Formats]; - initial value: `:DEFAULT`. -- `:RC`: Whether a {configuration file}[rdoc-ref:IRB@Configuration+File] - was found and interpreted; - initial value: `true` if a configuration file was found, `false` otherwise. -- `:SAVE_HISTORY`: Number of commands to save in - {input command history}[rdoc-ref:IRB@Input+Command+History]; - initial value: `1000`. -- `:SINGLE_IRB`: Whether command-line option `--single-irb` was given; - initial value: `true` if the option was given, `false` otherwise. - See {Single-IRB Mode}[rdoc-ref:IRB@Single-IRB+Mode]. -- `:USE_AUTOCOMPLETE`: Whether to use - {automatic completion}[rdoc-ref:IRB@Automatic+Completion]; - initial value: `true`. -- `:USE_COLORIZE`: Whether to use - {color highlighting}[rdoc-ref:IRB@Color+Highlighting]; - initial value: `true`. -- `:USE_LOADER`: Whether to use the - {IRB loader}[rdoc-ref:IRB@IRB+Loader] for `require` and `load`; - initial value: `false`. -- `:USE_TRACER`: Whether to use the - {IRB tracer}[rdoc-ref:IRB@Tracer]; - initial value: `false`. -- `:VERBOSE`: Whether to print {verbose output}[rdoc-ref:IRB@Verbosity]; - initial value: `nil`. -- `:__MAIN__`: The main \IRB object; - initial value: `main`. diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja index c51e0bd60d..633c08cbd4 100644 --- a/doc/irb/irb.rd.ja +++ b/doc/irb/irb.rd.ja @@ -125,6 +125,7 @@ irb起動時に``~/.irbrc''を読み込みます. もし存在しない場合は IRB.conf[:PROMPT][:MY_PROMPT] = { # プロンプトモードの名前 :PROMPT_I => nil, # 通常のプロンプト + :PROMPT_N => nil, # 継続行のプロンプト :PROMPT_S => nil, # 文字列などの継続行のプロンプト :PROMPT_C => nil, # 式が継続している時のプロンプト :RETURN => " ==>%s\n" # リターン時のプロンプト @@ -139,7 +140,7 @@ OKです. IRB.conf[:PROMPT_MODE] = :MY_PROMPT -PROMPT_I, PROMPT_S, PROMPT_Cは, フォーマットを指定します. +PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cは, フォーマットを指定します. %N 起動しているコマンド名が出力される. %m mainオブジェクト(self)がto_sで出力される. @@ -154,6 +155,7 @@ PROMPT_I, PROMPT_S, PROMPT_Cは, フォーマットを指定します. IRB.conf[:PROMPT][:DEFAULT] = { :PROMPT_I => "%N(%m):%03n:%i> ", + :PROMPT_N => "%N(%m):%03n:%i> ", :PROMPT_S => "%N(%m):%03n:%i%l ", :PROMPT_C => "%N(%m):%03n:%i* ", :RETURN => "=> %s\n" diff --git a/doc/keywords.rdoc b/doc/keywords.rdoc index 7c368205ef..cb1cff33f0 100644 --- a/doc/keywords.rdoc +++ b/doc/keywords.rdoc @@ -1,4 +1,4 @@ -= Keywords +== Keywords The following keywords are used by Ruby. diff --git a/doc/maintainers.md b/doc/maintainers.md deleted file mode 100644 index 631371e178..0000000000 --- a/doc/maintainers.md +++ /dev/null @@ -1,520 +0,0 @@ -# Maintainers -This page describes the current module, library, and extension maintainers of Ruby. - -## Module Maintainers -A module maintainer is responsible for a certain part of Ruby. - -* The maintainer fixes bugs of the part. Particularly, they should fix - security vulnerabilities as soon as possible. -* They handle issues related the module on the Redmine or ML. -* They may be discharged by the 3 months rule [[ruby-core:25764]](https://blade.ruby-lang.org/ruby-core/25764). -* They have commit right to Ruby's repository to modify their part in the - repository. -* They have "developer" role on the Redmine to modify issues. -* They have authority to decide the feature of their part. But they should - always respect discussions on ruby-core/ruby-dev. - -A submaintainer of a module is like a maintainer. But the submaintainer does -not have authority to change/add a feature on his/her part. They need -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) - -### Evaluator -* Koichi Sasada (ko1) - -### Core classes -* Yukihiro Matsumoto (matz) - -## Standard Library Maintainers -### Libraries -#### lib/mkmf.rb -* *unmaintained* - -#### lib/rubygems.rb, lib/rubygems/* -* Eric Hodel (drbrain) -* Hiroshi SHIBATA (hsbt) -* https://github.com/rubygems/rubygems - -#### lib/unicode_normalize.rb, lib/unicode_normalize/* -* Martin J. Dürst - -### Extensions -#### ext/continuation -* Koichi Sasada (ko1) - -#### ext/coverage -* Yusuke Endoh (mame) - -#### ext/fiber -* Koichi Sasada (ko1) - -#### ext/monitor -* Koichi Sasada (ko1) - -#### ext/objspace -* *unmaintained* - -#### ext/pty -* *unmaintained* - -#### ext/ripper -* *unmaintained* - -#### ext/socket -* 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 - -#### lib/base64.rb -* Yusuke Endoh (mame) -* https://github.com/ruby/base64 -* https://rubygems.org/gems/base64 - -#### lib/benchmark.rb -* *unmaintained* -* https://github.com/ruby/benchmark -* https://rubygems.org/gems/benchmark - -#### lib/bundler.rb, lib/bundler/* -* 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/csv.rb -* Kenta Murata (mrkn) -* Kouhei Sutou (kou) -* https://github.com/ruby/csv -* https://rubygems.org/gems/csv - -#### lib/English.rb -* *unmaintained* -* https://github.com/ruby/English -* 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) -* https://github.com/ruby/did_you_mean -* https://rubygems.org/gems/did_you_mean - -#### ext/digest, ext/digest/* -* 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) -* https://github.com/ruby/erb -* https://rubygems.org/gems/erb - -#### lib/error_highlight.rb, lib/error_highlight/* -* 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) -* https://github.com/ruby/find -* https://rubygems.org/gems/find - -#### lib/forwardable.rb -* 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) -* https://github.com/ruby/ipaddr -* https://rubygems.org/gems/ipaddr - -#### lib/irb.rb, lib/irb/* -* Stan Lo (st0012) -* Tomoya Ishida (tompng) -* Mari Imaizumi (ima1zumi) -* Hitoshi Hasumi (hasumikin) -* 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 - -#### lib/net/http.rb, lib/net/https.rb -* NARUSE, Yui (naruse) -* 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 - -#### lib/pp.rb -* Tanaka Akira (akr) -* https://github.com/ruby/pp -* https://rubygems.org/gems/pp - -#### lib/prettyprint.rb -* Tanaka Akira (akr) -* https://github.com/ruby/prettyprint -* https://rubygems.org/gems/prettyprint - -#### lib/prism.rb -* Kevin Newton (kddnewton) -* Jemma Issroff (jemmaissroff) -* https://github.com/ruby/prism -* https://rubygems.org/gems/prism - -#### lib/pstore.rb -* *unmaintained* -* https://github.com/ruby/pstore -* https://rubygems.org/gems/pstore - -#### lib/readline.rb -* aycabta -* https://github.com/ruby/readline -* https://rubygems.org/gems/readline - -#### lib/resolv.rb -* 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/* -* Tomoya Ishida (tompng) -* Mari Imaizumi (ima1zumi) -* Stan Lo (st0012) -* Hitoshi Hasumi (hasumikin) -* 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) -* 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) -* https://github.com/ruby/shellwords -* https://rubygems.org/gems/shellwords - -#### lib/singleton.rb -* 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) -* https://github.com/ruby/time -* https://rubygems.org/gems/time - -#### lib/timeout.rb -* Yukihiro Matsumoto (matz) -* https://github.com/ruby/timeout -* https://rubygems.org/gems/timeout - -#### lib/thwait.rb -* 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) -* https://github.com/ruby/tsort -* https://rubygems.org/gems/tsort - -#### lib/un.rb -* WATANABE Hirofumi (eban) -* https://github.com/ruby/un -* https://rubygems.org/gems/un - -#### lib/uri.rb, lib/uri/* -* NARUSE, Yui (naruse) -* https://github.com/ruby/uri -* https://rubygems.org/gems/uri - -#### lib/yaml.rb, lib/yaml/* -* 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 - -#### 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) -* https://github.com/ruby/io-console -* https://rubygems.org/gems/io-console - -#### ext/io/nonblock -* Nobuyuki Nakada (nobu) -* https://github.com/ruby/io-nonblock -* https://rubygems.org/gems/io-nonblock - -#### ext/io/wait -* 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 - -#### ext/openssl -* Kazuki Yamaguchi (rhe) -* https://github.com/ruby/openssl -* https://rubygems.org/gems/openssl - -#### ext/pathname -* Tanaka Akira (akr) -* https://github.com/ruby/pathname -* https://rubygems.org/gems/pathname - -#### ext/psych -* Aaron Patterson (tenderlove) -* Hiroshi SHIBATA (hsbt) -* https://github.com/ruby/psych -* https://rubygems.org/gems/psych - -#### ext/stringio -* Nobuyuki Nakada (nobu) -* https://github.com/ruby/stringio -* https://rubygems.org/gems/stringio - -#### ext/strscan -* 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) -* https://github.com/ruby/zlib -* https://rubygems.org/gems/zlib - -## Bundled gems upstream repositories -### 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-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 - - -## Platform Maintainers -### mswin64 (Microsoft Windows) -* NAKAMURA Usaku (usa) - -### mingw32 (Minimalist GNU for Windows) -* Nobuyoshi Nakada (nobu) - -### AIX -* Yutaka Kanemoto (kanemoto) - -### FreeBSD -* Akinori MUSHA (knu) - -### Solaris -* Naohisa Goto (ngoto) - -### RHEL, CentOS -* KOSAKI Motohiro (kosaki) - -### macOS -* Kenta Murata (mrkn) - -### OpenBSD -* Jeremy Evans (jeremyevans0) - -### cygwin, ... -* none. (Maintainer WANTED) - -### WebAssembly/WASI -* Yuta Saito (katei) diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc new file mode 100644 index 0000000000..7e0c35194f --- /dev/null +++ b/doc/maintainers.rdoc @@ -0,0 +1,424 @@ += Maintainers + +This page describes the current module, library, and extension maintainers of Ruby. + +== Module Maintainers + +A module maintainer is responsible for a certain part of Ruby. + +* The maintainer fixes bugs of the part. Particularly, they should fix security vulnerabilities as soon as possible. +* They handle issues related the module on the Redmine or ML. +* They may be discharged by the 3 months rule [ruby-core:25764]. +* They have commit right to Ruby's repository to modify their part in the repository. +* They have "developer" role on the Redmine to modify issues. +* They have authority to decide the feature of their part. But they should always respect discussions on ruby-core/ruby-dev. + +A submaintainer of a module is like a maintainer. But the submaintainer does +not have authority to change/add a feature on his/her part. They need 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) + +=== Evaluator + +Koichi Sasada (ko1) + +=== Core classes + +Yukihiro Matsumoto (matz) + +== Standard Library Maintainers + +=== Libraries + +[lib/mkmf.rb] + _unmaintained_ +[lib/rubygems.rb, lib/rubygems/*] + Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt) + https://github.com/rubygems/rubygems +[lib/unicode_normalize.rb, lib/unicode_normalize/*] + Martin J. Dürst + +=== Extensions + +[ext/continuation] + Koichi Sasada (ko1) +[ext/coverage] + Yusuke Endoh (mame) +[ext/fiber] + Koichi Sasada (ko1) +[ext/monitor] + Koichi Sasada (ko1) +[ext/objspace] + _unmaintained_ +[ext/pty] + _unmaintained_ +[ext/ripper] + _unmaintained_ +[ext/socket] + * 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 +[lib/base64.rb] + Yusuke Endoh (mame) + https://github.com/ruby/base64 + https://rubygems.org/gems/base64 +[lib/benchmark.rb] + _unmaintained_ + https://github.com/ruby/benchmark + https://rubygems.org/gems/benchmark +[lib/bundler.rb, lib/bundler/*] + 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/csv.rb] + Kenta Murata (mrkn), Kouhei Sutou (kou) + https://github.com/ruby/csv + https://rubygems.org/gems/csv +[lib/English.rb] + _unmaintained_ + https://github.com/ruby/English + https://rubygems.org/gems/English +[lib/debug.rb] + _unmaintained_ + https://github.com/ruby/debug +[lib/delegate.rb] + _unmaintained_ + https://github.com/ruby/delegate + https://rubygems.org/gems/delegate +[lib/did_you_mean.rb] + Yuki Nishijima (yuki24) + https://github.com/ruby/did_you_mean + https://rubygems.org/gems/did_you_mean +[ext/digest, ext/digest/*] + 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) + https://github.com/ruby/erb + https://rubygems.org/gems/erb +[lib/error_highlight.rb, lib/error_highlight/*] + 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) + https://github.com/ruby/find + https://rubygems.org/gems/find +[lib/forwardable.rb] + 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) + 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 +[lib/net/http.rb, lib/net/https.rb] + NARUSE, Yui (naruse) + 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 +[lib/pp.rb] + Tanaka Akira (akr) + https://github.com/ruby/pp + https://rubygems.org/gems/pp +[lib/prettyprint.rb] + 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/racc.rb, lib/racc/*] + Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt) + https://github.com/ruby/racc + https://rubygems.org/gems/racc +[lib/readline.rb] + aycabta + https://github.com/ruby/readline + https://rubygems.org/gems/readline +[lib/resolv.rb] + 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/readline.rb] + aycabta + https://github.com/ruby/readline + https://rubygems.org/gems/readline +[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) + 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) + https://github.com/ruby/shellwords + https://rubygems.org/gems/shellwords +[lib/singleton.rb] + 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) + https://github.com/ruby/time + https://rubygems.org/gems/time +[lib/timeout.rb] + Yukihiro Matsumoto (matz) + https://github.com/ruby/timeout + https://rubygems.org/gems/timeout +[lib/thwait.rb] + 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) + https://github.com/ruby/tsort + https://rubygems.org/gems/tsort +[lib/un.rb] + WATANABE Hirofumi (eban) + https://github.com/ruby/un + https://rubygems.org/gems/un +[lib/uri.rb, lib/uri/*] + YAMADA, Akira (akira) + https://github.com/ruby/uri + https://rubygems.org/gems/uri +[lib/yaml.rb, lib/yaml/*] + 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 +[ext/date] + _unmaintained_ + https://github.com/ruby/date + https://rubygems.org/gems/date +[ext/etc] + Ruby core team + https://github.com/ruby/etc + https://rubygems.org/gems/etc +[ext/fcntl] + Ruby core team + 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) + https://github.com/ruby/io-console + https://rubygems.org/gems/io-console +[ext/io/nonblock] + Nobuyuki Nakada (nobu) + https://github.com/ruby/io-nonblock + https://rubygems.org/gems/io-nonblock +[ext/io/wait] + 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 +[ext/openssl] + Kazuki Yamaguchi (rhe) + https://github.com/ruby/openssl + https://rubygems.org/gems/openssl +[ext/pathname] + Tanaka Akira (akr) + https://github.com/ruby/pathname + https://rubygems.org/gems/pathname +[ext/psych] + Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt) + https://github.com/ruby/psych + https://rubygems.org/gems/psych +[ext/racc] + Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt) + https://github.com/ruby/racc + https://rubygems.org/gems/racc +[ext/readline] + TAKAO Kouji (kouji) + https://github.com/ruby/readline-ext + https://rubygems.org/gems/readline-ext +[ext/stringio] + Nobuyuki Nakada (nobu) + https://github.com/ruby/stringio + https://rubygems.org/gems/stringio +[ext/strscan] + 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) + https://github.com/ruby/zlib + https://rubygems.org/gems/zlib + +== Bundled gems upstream repositories + +[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-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 + +=== Platform Maintainers + +[mswin64 (Microsoft Windows)] + NAKAMURA Usaku (usa) +[mingw32 (Minimalist GNU for Windows)] + Nobuyoshi Nakada (nobu) +[AIX] + Yutaka Kanemoto (kanemoto) +[FreeBSD] + Akinori MUSHA (knu) +[Solaris] + Naohisa Goto (ngoto) +[RHEL, CentOS] + KOSAKI Motohiro (kosaki) +[macOS] + Kenta Murata (mrkn) +[OpenBSD] + Jeremy Evans (jeremyevans0) +[cygwin, ...] + none. (Maintainer WANTED) +[WebAssembly/WASI] + Yuta Saito (katei) diff --git a/doc/mjit/mjit.md b/doc/mjit/mjit.md new file mode 100644 index 0000000000..6f19ab3ea7 --- /dev/null +++ b/doc/mjit/mjit.md @@ -0,0 +1,39 @@ +# MJIT + +This document has some tips that might be useful when you work on MJIT. + +## Supported platforms + +The following platforms are either tested on CI or assumed to work. + +* OS: Linux, macOS +* Arch: x86\_64, aarch64, arm64, i686, i386 + +### Not supported + +The MJIT support for the following platforms is no longer maintained. + +* OS: Windows (mswin, MinGW), Solaris +* Arch: SPARC, s390x + +## Developing MJIT + +### Bindgen + +If you see an "MJIT bindgen" GitHub Actions failure, please commit the `git diff` shown on the failed job. + +For doing the same thing locally, run `make mjit-bindgen` after installing libclang. +macOS seems to have libclang by default. On Ubuntu, you can install it with `apt install libclang1`. + +### Always run make install + +Always run `make install` before running MJIT. It could easily cause a SEGV if you don't. +MJIT looks for the installed header for security reasons. + +### --mjit-debug vs --mjit-debug=-ggdb3 + +`--mjit-debug=[flags]` allows you to specify arbitrary flags while keeping other compiler flags like `-O3`, +which is useful for profiling benchmarks. + +`--mjit-debug` alone, on the other hand, disables `-O3` and adds debug flags. +If you're debugging MJIT, what you need to use is not `--mjit-debug=-ggdb3` but `--mjit-debug`. diff --git a/doc/optparse/argument_converters.rdoc b/doc/optparse/argument_converters.rdoc index 4b4b30e8de..ac659da8c5 100644 --- a/doc/optparse/argument_converters.rdoc +++ b/doc/optparse/argument_converters.rdoc @@ -1,7 +1,7 @@ == Argument Converters An option can specify that its argument is to be converted -from the default +String+ to an instance of another class. +from the default \String to an instance of another class. === Contents @@ -27,13 +27,13 @@ from the default +String+ to an instance of another class. === Built-In Argument Converters -+OptionParser+ has a number of built-in argument converters, +\OptionParser has a number of built-in argument converters, which are demonstrated below. -==== +Date+ +==== \Date File +date.rb+ -defines an option whose argument is to be converted to a +Date+ object. +defines an option whose argument is to be converted to a \Date object. The argument is converted by method Date#parse. :include: ruby/date.rb @@ -47,10 +47,10 @@ Executions: $ ruby date.rb --date "3rd Feb 2001" [#<Date: 2001-02-03 ((2451944j,0s,0n),+0s,2299161j)>, Date] -==== +DateTime+ +==== \DateTime File +datetime.rb+ -defines an option whose argument is to be converted to a +DateTime+ object. +defines an option whose argument is to be converted to a \DateTime object. The argument is converted by method DateTime#parse. :include: ruby/datetime.rb @@ -64,10 +64,10 @@ Executions: $ ruby datetime.rb --datetime "3rd Feb 2001 04:05:06 PM" [#<DateTime: 2001-02-03T16:05:06+00:00 ((2451944j,57906s,0n),+0s,2299161j)>, DateTime] -==== +Time+ +==== \Time File +time.rb+ -defines an option whose argument is to be converted to a +Time+ object. +defines an option whose argument is to be converted to a \Time object. The argument is converted by method Time#httpdate or Time#parse. :include: ruby/time.rb @@ -79,10 +79,10 @@ Executions: $ ruby time.rb --time 2010-10-31 [2010-10-31 00:00:00 -0500, Time] -==== +URI+ +==== \URI File +uri.rb+ -defines an option whose argument is to be converted to a +URI+ object. +defines an option whose argument is to be converted to a \URI object. The argument is converted by method URI#parse. :include: ruby/uri.rb @@ -96,10 +96,10 @@ Executions: $ ruby uri.rb --uri file://~/var [#<URI::File file://~/var>, URI::File] -==== +Shellwords+ +==== \Shellwords File +shellwords.rb+ -defines an option whose argument is to be converted to an +Array+ object by method +defines an option whose argument is to be converted to an \Array object by method Shellwords#shellwords. :include: ruby/shellwords.rb @@ -111,10 +111,10 @@ Executions: $ ruby shellwords.rb --shellwords "here are 'two words'" [["here", "are", "two words"], Array] -==== +Integer+ +==== \Integer File +integer.rb+ -defines an option whose argument is to be converted to an +Integer+ object. +defines an option whose argument is to be converted to an \Integer object. The argument is converted by method Kernel#Integer. :include: ruby/integer.rb @@ -132,10 +132,10 @@ Executions: $ ruby integer.rb --integer 0b100 [4, Integer] -==== +Float+ +==== \Float File +float.rb+ -defines an option whose argument is to be converted to a +Float+ object. +defines an option whose argument is to be converted to a \Float object. The argument is converted by method Kernel#Float. :include: ruby/float.rb @@ -151,11 +151,11 @@ Executions: $ ruby float.rb --float 1.234E-2 [0.01234, Float] -==== +Numeric+ +==== \Numeric File +numeric.rb+ defines an option whose argument is to be converted to an instance -of +Rational+, +Float+, or +Integer+. +of \Rational, \Float, or \Integer. The argument is converted by method Kernel#Rational, Kernel#Float, or Kernel#Integer. @@ -170,10 +170,10 @@ Executions: $ ruby numeric.rb --numeric 3 [3, Integer] -==== +DecimalInteger+ +==== \DecimalInteger File +decimal_integer.rb+ -defines an option whose argument is to be converted to an +Integer+ object. +defines an option whose argument is to be converted to an \Integer object. The argument is converted by method Kernel#Integer. :include: ruby/decimal_integer.rb @@ -192,10 +192,10 @@ Executions: $ ruby decimal_integer.rb --decimal_integer -0100 [-100, Integer] -==== +OctalInteger+ +==== \OctalInteger File +octal_integer.rb+ -defines an option whose argument is to be converted to an +Integer+ object. +defines an option whose argument is to be converted to an \Integer object. The argument is converted by method Kernel#Integer. :include: ruby/octal_integer.rb @@ -212,10 +212,10 @@ Executions: $ ruby octal_integer.rb --octal_integer 0100 [64, Integer] -==== +DecimalNumeric+ +==== \DecimalNumeric File +decimal_numeric.rb+ -defines an option whose argument is to be converted to an +Integer+ object. +defines an option whose argument is to be converted to an \Integer object. The argument is converted by method Kernel#Integer :include: ruby/decimal_numeric.rb @@ -232,7 +232,7 @@ Executions: $ ruby decimal_numeric.rb --decimal_numeric 0100 [64, Integer] -==== +TrueClass+ +==== \TrueClass File +true_class.rb+ defines an option whose argument is to be converted to +true+ or +false+. @@ -259,7 +259,7 @@ Executions: $ ruby true_class.rb --true_class nil [false, FalseClass] -==== +FalseClass+ +==== \FalseClass File +false_class.rb+ defines an option whose argument is to be converted to +true+ or +false+. @@ -286,10 +286,10 @@ Executions: $ ruby false_class.rb --false_class + [true, TrueClass] -==== +Object+ +==== \Object File +object.rb+ -defines an option whose argument is not to be converted from +String+. +defines an option whose argument is not to be converted from \String. :include: ruby/object.rb @@ -300,10 +300,10 @@ Executions: $ ruby object.rb --object nil ["nil", String] -==== +String+ +==== \String File +string.rb+ -defines an option whose argument is not to be converted from +String+. +defines an option whose argument is not to be converted from \String. :include: ruby/string.rb @@ -314,10 +314,10 @@ Executions: $ ruby string.rb --string nil ["nil", String] -==== +Array+ +==== \Array File +array.rb+ -defines an option whose argument is to be converted from +String+ +defines an option whose argument is to be converted from \String to an array of strings, based on comma-separated substrings. :include: ruby/array.rb @@ -331,10 +331,10 @@ Executions: $ ruby array.rb --array "foo, bar, baz" [["foo", " bar", " baz"], Array] -==== +Regexp+ +==== \Regexp File +regexp.rb+ -defines an option whose argument is to be converted to a +Regexp+ object. +defines an option whose argument is to be converted to a \Regexp object. :include: ruby/regexp.rb @@ -352,7 +352,7 @@ To create a custom converter, call OptionParser#accept with: - A block that accepts the argument and returns the converted value. This custom converter accepts any argument and converts it, -if possible, to a +Complex+ object. +if possible, to a \Complex object. :include: ruby/custom_converter.rb diff --git a/doc/optparse/option_params.rdoc b/doc/optparse/option_params.rdoc index 55f9b53dff..ace2c4283f 100644 --- a/doc/optparse/option_params.rdoc +++ b/doc/optparse/option_params.rdoc @@ -1,6 +1,6 @@ == Parameters for New Options -Option-creating methods in +OptionParser+ +Option-creating methods in \OptionParser accept arguments that determine the behavior of a new option: - OptionParser#on @@ -405,7 +405,7 @@ Executions: === Argument Converters An option can specify that its argument is to be converted -from the default +String+ to an instance of another class. +from the default \String to an instance of another class. There are a number of built-in converters. You can also define custom converters. diff --git a/doc/optparse/tutorial.rdoc b/doc/optparse/tutorial.rdoc index b104379cf7..b95089826d 100644 --- a/doc/optparse/tutorial.rdoc +++ b/doc/optparse/tutorial.rdoc @@ -1,10 +1,10 @@ == Tutorial -=== Why +OptionParser+? +=== Why \OptionParser? When a Ruby program executes, it captures its command-line arguments and options into variable ARGV. -This simple program just prints its +ARGV+: +This simple program just prints its \ARGV: :include: ruby/argv.rb @@ -18,7 +18,7 @@ the command-line options. OptionParser offers methods for parsing and handling those options. -With +OptionParser+, you can define options so that for each option: +With \OptionParser, you can define options so that for each option: - The code that defines the option and code that handles that option are in the same place. @@ -55,7 +55,7 @@ The class also has method #help, which displays automatically-generated help tex - {Argument Converters}[#label-Argument+Converters] - {Help}[#label-Help] - {Top List and Base List}[#label-Top+List+and+Base+List] -- {Methods for Defining Options}[#label-Methods+for+Defining+Options] +- {Defining Options}[#label-Defining+Options] - {Parsing}[#label-Parsing] - {Method parse!}[#label-Method+parse-21] - {Method parse}[#label-Method+parse] @@ -66,10 +66,10 @@ The class also has method #help, which displays automatically-generated help tex === To Begin With -To use +OptionParser+: +To use \OptionParser: -1. Require the +OptionParser+ code. -2. Create an +OptionParser+ object. +1. Require the \OptionParser code. +2. Create an \OptionParser object. 3. Define one or more options. 4. Parse the command line. @@ -92,9 +92,9 @@ the block defined for the option is called with the argument value. An invalid option raises an exception. Method #parse!, which is used most often in this tutorial, -removes from +ARGV+ the options and arguments it finds, +removes from \ARGV the options and arguments it finds, leaving other non-option arguments for the program to handle on its own. -The method returns the possibly-reduced +ARGV+ array. +The method returns the possibly-reduced \ARGV array. Executions: @@ -115,7 +115,7 @@ Executions: === Defining Options -A common way to define an option in +OptionParser+ +A common way to define an option in \OptionParser is with instance method OptionParser#on. The method may be called with any number of arguments @@ -522,11 +522,11 @@ Executions: === Argument Converters An option can specify that its argument is to be converted -from the default +String+ to an instance of another class. +from the default \String to an instance of another class. There are a number of built-in converters. Example: File +date.rb+ -defines an option whose argument is to be converted to a +Date+ object. +defines an option whose argument is to be converted to a \Date object. The argument is converted by method Date#parse. :include: ruby/date.rb @@ -546,7 +546,7 @@ for both built-in and custom converters. === Help -+OptionParser+ makes automatically generated help text available. +\OptionParser makes automatically generated help text available. The help text consists of: @@ -614,49 +614,49 @@ Execution: === Top List and Base List -An +OptionParser+ object maintains a stack of OptionParser::List objects, +An \OptionParser object maintains a stack of \OptionParser::List objects, each of which has a collection of zero or more options. It is unlikely that you'll need to add or take away from that stack. The stack includes: -- The <em>top list</em>, given by OptionParser#top. -- The <em>base list</em>, given by OptionParser#base. +- The <em>top list</em>, given by \OptionParser#top. +- The <em>base list</em>, given by \OptionParser#base. -When +OptionParser+ builds its help text, the options in the top list +When \OptionParser builds its help text, the options in the top list precede those in the base list. -=== Methods for Defining Options +=== Defining Options Option-defining methods allow you to create an option, and also append/prepend it to the top list or append it to the base list. Each of these next three methods accepts a sequence of parameter arguments and a block, -creates an option object using method OptionParser#make_switch (see below), +creates an option object using method \Option#make_switch (see below), and returns the created option: -- \Method OptionParser#define appends the created option to the top list. +- \Method \OptionParser#define appends the created option to the top list. -- \Method OptionParser#define_head prepends the created option to the top list. +- \Method \OptionParser#define_head prepends the created option to the top list. -- \Method OptionParser#define_tail appends the created option to the base list. +- \Method \OptionParser#define_tail appends the created option to the base list. These next three methods are identical to the three above, except for their return values: -- \Method OptionParser#on is identical to method OptionParser#define, +- \Method \OptionParser#on is identical to method \OptionParser#define, except that it returns the parser object +self+. -- \Method OptionParser#on_head is identical to method OptionParser#define_head, +- \Method \OptionParser#on_head is identical to method \OptionParser#define_head, except that it returns the parser object +self+. -- \Method OptionParser#on_tail is identical to method OptionParser#define_tail, +- \Method \OptionParser#on_tail is identical to method \OptionParser#define_tail, except that it returns the parser object +self+. Though you may never need to call it directly, here's the core method for defining an option: -- \Method OptionParser#make_switch accepts an array of parameters and a block. +- \Method \OptionParser#make_switch accepts an array of parameters and a block. See {Parameters for New Options}[optparse/option_params.rdoc]. This method is unlike others here in that it: - Accepts an <em>array of parameters</em>; @@ -668,7 +668,7 @@ here's the core method for defining an option: === Parsing -+OptionParser+ has six instance methods for parsing. +\OptionParser has six instance methods for parsing. Three have names ending with a "bang" (<tt>!</tt>): @@ -699,9 +699,9 @@ Each of these methods: (see {Keyword Argument into}[#label-Keyword+Argument+into]). - Returns +argv+, possibly with some elements removed. -==== \Method +parse!+ +==== \Method parse! -\Method +parse!+: +\Method parse!: - Accepts an optional array of string arguments +argv+; if not given, +argv+ defaults to the value of OptionParser#default_argv, @@ -756,9 +756,9 @@ Processing ended by non-option found when +POSIXLY_CORRECT+ is defined: ["--xxx", true] Returned: ["input_file.txt", "output_file.txt", "-yyy", "FOO"] (Array) -==== \Method +parse+ +==== \Method parse -\Method +parse+: +\Method parse: - Accepts an array of string arguments _or_ zero or more string arguments. @@ -810,25 +810,25 @@ Processing ended by non-option found when +POSIXLY_CORRECT+ is defined: ["--xxx", true] Returned: ["input_file.txt", "output_file.txt", "-yyy", "FOO"] (Array) -==== \Method +order!+ +==== \Method order! Calling method OptionParser#order! gives exactly the same result as calling method OptionParser#parse! with environment variable +POSIXLY_CORRECT+ defined. -==== \Method +order+ +==== \Method order Calling method OptionParser#order gives exactly the same result as calling method OptionParser#parse with environment variable +POSIXLY_CORRECT+ defined. -==== \Method +permute!+ +==== \Method permute! Calling method OptionParser#permute! gives exactly the same result as calling method OptionParser#parse! with environment variable +POSIXLY_CORRECT+ _not_ defined. -==== \Method +permute+ +==== \Method permute Calling method OptionParser#permute gives exactly the same result as calling method OptionParser#parse with environment variable diff --git a/doc/packed_data.rdoc b/doc/packed_data.rdoc index 59d8c99a3a..ec13b24c69 100644 --- a/doc/packed_data.rdoc +++ b/doc/packed_data.rdoc @@ -1,4 +1,4 @@ -= Packed \Data +== Packed \Data Certain Ruby core methods deal with packing and unpacking data: @@ -64,7 +64,7 @@ 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 +buffer+ that specifies the target string (instead of a new string): @@ -76,7 +76,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 +95,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>): @@ -109,14 +109,14 @@ for one element in the input or output array. s = [0, 1, -1].pack('c*') # => "\x00\x01\xFF" s.unpack('c*') # => [0, 1, -1] -- <tt>'C'</tt> - 8-bit unsigned integer +- <tt>'C'</tt> - 8-bit signed integer (like C <tt>unsigned char</tt>): [0, 1, 255].pack('C*') # => "\x00\x01\xFF" 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 +146,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 +178,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 +196,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,24 +214,26 @@ for one element in the input or output array. s.unpack('I*') # => [67305985, 4244504319] -- <tt>'j'</tt> - Pointer-width signed integer, native-endian - (like C <tt>intptr_t</tt>): +==== Pointer Directives + +- <tt>'j'</tt> - 64-bit 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> - Pointer-width unsigned integer, native-endian - (like C <tt>uintptr_t</tt>): +- <tt>'j'</tt> - 64-bit 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: s = [4194304].pack('U*') @@ -247,30 +249,31 @@ for one element in the input or output array. s.unpack('w*') # => [1073741823] -=== 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: - +==== 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. - <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: @@ -287,7 +290,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: @@ -314,12 +317,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: @@ -377,7 +380,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): @@ -421,7 +424,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): @@ -467,7 +470,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): @@ -485,7 +488,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; @@ -559,7 +562,7 @@ for one byte in the input or output string. [0x40000000].pack("U") # => "\xFD\x80\x80\x80\x80\x80" [0x7fffffff].pack("U") # => "\xFD\xBF\xBF\xBF\xBF\xBF" -== Offset Directives +=== Offset Directives - <tt>'@'</tt> - Begin packing at the given byte offset; for packing, null fill if necessary: @@ -577,7 +580,7 @@ for one byte in the input or output string. [0, 1, 2].pack("CCX2C") # => "\x02" "\x00\x02".unpack("CCXC") # => [0, 2, 2] -== Null Byte Direcive +=== Null Byte Direcive - <tt>'x'</tt> - Null byte: diff --git a/doc/ractor.md b/doc/ractor.md index 3ead510501..843754c263 100644 --- a/doc/ractor.md +++ b/doc/ractor.md @@ -393,7 +393,7 @@ TODO: `select` syntax of go-language uses round-robin technique to make fair sch * `Ractor#close_incoming/outgoing` close incoming/outgoing ports (similar to `Queue#close`). * `Ractor#close_incoming` - * `r.send(obj)` where `r`'s incoming port is closed, will raise an exception. + * `r.send(obj) ` where `r`'s incoming port is closed, will raise an exception. * When the incoming queue is empty and incoming port is closed, `Ractor.receive` raises an exception. If the incoming queue is not empty, it dequeues an object without exceptions. * `Ractor#close_outgoing` * `Ractor.yield` on a Ractor which closed the outgoing port, it will raise an exception. @@ -536,7 +536,7 @@ The following objects are shareable. Implementation: Now shareable objects (`RVALUE`) have `FL_SHAREABLE` flag. This flag can be added lazily. -To make shareable objects, `Ractor.make_shareable(obj)` method is provided. In this case, try to make sharaeble by freezing `obj` and recursively traversable objects. This method accepts `copy:` keyword (default value is false).`Ractor.make_shareable(obj, copy: true)` tries to make a deep copy of `obj` and make the copied object shareable. +To make shareable objects, `Ractor.make_shareable(obj)` method is provided. In this case, try to make sharaeble by freezing `obj` and recursively travasible objects. This method accepts `copy:` keyword (default value is false).`Ractor.make_shareable(obj, copy: true)` tries to make a deep copy of `obj` and make the copied object shareable. ## Language changes to isolate unshareable objects between Ractors @@ -705,8 +705,8 @@ TABLE = {a: 'ko1', b: 'ko2', c: 'ko3'} * none: Do nothing. Same as: `CONST = expr` * literal: - * if `expr` consists of literals, replaced to `CONST = Ractor.make_shareable(expr)`. - * otherwise: replaced to `CONST = expr.tap{|o| raise unless Ractor.shareable?(o)}`. + * if `expr` is consites of literals, replaced to `CONST = Ractor.make_shareable(expr)`. + * otherwise: replaced to `CONST = expr.tap{|o| raise unless Ractor.shareable?}`. * experimental_everything: replaced to `CONST = Ractor.make_shareable(expr)`. * experimental_copy: replaced to `CONST = Ractor.make_shareable(expr, copy: true)`. diff --git a/doc/rdoc/markup_reference.rb b/doc/rdoc/markup_reference.rb index a1bbe13e2d..66ec6786c0 100644 --- a/doc/rdoc/markup_reference.rb +++ b/doc/rdoc/markup_reference.rb @@ -26,7 +26,7 @@ require 'rdoc' # - 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>. +# 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); @@ -66,7 +66,7 @@ require 'rdoc' # 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. +# and is the initial <em>current margin</em> for for the comment. # # The current margin can change, and does so, for example in a list. # @@ -346,7 +346,7 @@ require 'rdoc' # # ===== Lettered Lists # -# A lettered list item begins with letters and a period. +# A numbered list item begins with a letters and a period. # # The items are automatically "re-lettered." # @@ -467,32 +467,8 @@ require 'rdoc' # # - 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. # -# - For method definitions in C code, it must be placed before the -# implementation: -# -# /* :nodoc: */ -# static VALUE -# some_method(VALUE self) -# { -# return self; -# } -# -# Note that this directive has <em>no effect at all</em> at method -# definition places. E.g., -# -# /* :nodoc: */ -# rb_define_method(cMyClass, "do_something", something_func, 0); -# -# The above comment is just a comment and has nothing to do with \RDoc. -# Therefore, +do_something+ method will be reported as "undocumented" -# unless that method or function is documented elsewhere. -# -# - For constant definitions in C code, this directive <em>can not work</em> -# because there is no "implementation" place for constants. -# # - <tt># :nodoc: all</tt>: # # - Appended to a line of code @@ -526,8 +502,8 @@ require 'rdoc' # #++ # # Documented. # -# For C code, any of directives <tt>:startdoc:</tt>, <tt>:stopdoc:</tt>, -# and <tt>:enddoc:</tt> may appear in a stand-alone comment: +# 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: */ @@ -1216,26 +1192,13 @@ require 'rdoc' # class RDoc::MarkupReference - # example class class DummyClass; end - - # example module module DummyModule; end - - # example singleton method def self.dummy_singleton_method(foo, bar); end - - # example instance method def dummy_instance_method(foo, bar); end; - alias dummy_instance_alias dummy_instance_method - - # example attribute attr_accessor :dummy_attribute - alias dummy_attribute_alias dummy_attribute - - # example constant DUMMY_CONSTANT = '' # :call-seq: diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc new file mode 100644 index 0000000000..92c7ecf66e --- /dev/null +++ b/doc/regexp.rdoc @@ -0,0 +1,801 @@ +# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*- + +Regular expressions (<i>regexp</i>s) are patterns which describe the +contents of a string. They're used for testing whether a string contains a +given pattern, or extracting the portions that match. They are created +with the <tt>/</tt><i>pat</i><tt>/</tt> and +<tt>%r{</tt><i>pat</i><tt>}</tt> literals or the <tt>Regexp.new</tt> +constructor. + +A regexp is usually delimited with forward slashes (<tt>/</tt>). For +example: + + /hay/ =~ 'haystack' #=> 0 + /y/.match('haystack') #=> #<MatchData "y"> + +If a string contains the pattern it is said to <i>match</i>. A literal +string matches itself. + +Here 'haystack' does not contain the pattern 'needle', so it doesn't match: + + /needle/.match('haystack') #=> nil + +Here 'haystack' contains the pattern 'hay', so it matches: + + /hay/.match('haystack') #=> #<MatchData "hay"> + +Specifically, <tt>/st/</tt> requires that the string contains the letter +_s_ followed by the letter _t_, so it matches _haystack_, also. + +Note that any Regexp matching will raise a RuntimeError if timeout is set and +exceeded. See {"Timeout"}[#label-Timeout] section in detail. + +== \Regexp Interpolation + +A regexp may contain interpolated strings; trivially: + + foo = 'bar' + /#{foo}/ # => /bar/ + +== <tt>=~</tt> and Regexp#match + +Pattern matching may be achieved by using <tt>=~</tt> operator or Regexp#match +method. + +=== <tt>=~</tt> Operator + +<tt>=~</tt> is Ruby's basic pattern-matching operator. When one operand is a +regular expression and the other is a string then the regular expression is +used as a pattern to match against the string. (This operator is equivalently +defined by Regexp and String so the order of String and Regexp do not matter. +Other classes may have different implementations of <tt>=~</tt>.) If a match +is found, the operator returns index of first match in string, otherwise it +returns +nil+. + + /hay/ =~ 'haystack' #=> 0 + 'haystack' =~ /hay/ #=> 0 + /a/ =~ 'haystack' #=> 1 + /u/ =~ 'haystack' #=> nil + +Using <tt>=~</tt> operator with a String and Regexp the <tt>$~</tt> global +variable is set after a successful match. <tt>$~</tt> holds a MatchData +object. Regexp.last_match is equivalent to <tt>$~</tt>. + +=== Regexp#match Method + +The #match method returns a MatchData object: + + /st/.match('haystack') #=> #<MatchData "st"> + +== Metacharacters and Escapes + +The following are <i>metacharacters</i> <tt>(</tt>, <tt>)</tt>, +<tt>[</tt>, <tt>]</tt>, <tt>{</tt>, <tt>}</tt>, <tt>.</tt>, <tt>?</tt>, +<tt>+</tt>, <tt>*</tt>. They have a specific meaning when appearing in a +pattern. To match them literally they must be backslash-escaped. To match +a backslash literally, backslash-escape it: <tt>\\\\</tt>. + + /1 \+ 2 = 3\?/.match('Does 1 + 2 = 3?') #=> #<MatchData "1 + 2 = 3?"> + /a\\\\b/.match('a\\\\b') #=> #<MatchData "a\\b"> + +Patterns behave like double-quoted strings and can contain the same +backslash escapes (the meaning of <tt>\s</tt> is different, however, +see below[#label-Character+Classes]). + + /\s\u{6771 4eac 90fd}/.match("Go to 東京都") + #=> #<MatchData " 東京都"> + +Arbitrary Ruby expressions can be embedded into patterns with the +<tt>#{...}</tt> construct. + + place = "東京都" + /#{place}/.match("Go to 東京都") + #=> #<MatchData "東京都"> + +== Character Classes + +A <i>character class</i> is delimited with square brackets (<tt>[</tt>, +<tt>]</tt>) and lists characters that may appear at that point in the +match. <tt>/[ab]/</tt> means _a_ or _b_, as opposed to <tt>/ab/</tt> which +means _a_ followed by _b_. + + /W[aeiou]rd/.match("Word") #=> #<MatchData "Word"> + +Within a character class the hyphen (<tt>-</tt>) is a metacharacter +denoting an inclusive range of characters. <tt>[abcd]</tt> is equivalent +to <tt>[a-d]</tt>. A range can be followed by another range, so +<tt>[abcdwxyz]</tt> is equivalent to <tt>[a-dw-z]</tt>. The order in which +ranges or individual characters appear inside a character class is +irrelevant. + + /[0-9a-f]/.match('9f') #=> #<MatchData "9"> + /[9f]/.match('9f') #=> #<MatchData "9"> + +If the first character of a character class is a caret (<tt>^</tt>) the +class is inverted: it matches any character _except_ those named. + + /[^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]/ + +The following metacharacters also behave like character classes: + +* <tt>/./</tt> - Any character except a newline. +* <tt>/./m</tt> - Any character (the +m+ modifier enables multiline mode) +* <tt>/\w/</tt> - A word character (<tt>[a-zA-Z0-9_]</tt>) +* <tt>/\W/</tt> - A non-word character (<tt>[^a-zA-Z0-9_]</tt>). + Please take a look at {Bug #4044}[https://bugs.ruby-lang.org/issues/4044] if + using <tt>/\W/</tt> with the <tt>/i</tt> modifier. +* <tt>/\d/</tt> - A digit character (<tt>[0-9]</tt>) +* <tt>/\D/</tt> - A non-digit character (<tt>[^0-9]</tt>) +* <tt>/\h/</tt> - A hexdigit character (<tt>[0-9a-fA-F]</tt>) +* <tt>/\H/</tt> - A non-hexdigit character (<tt>[^0-9a-fA-F]</tt>) +* <tt>/\s/</tt> - A whitespace character: <tt>/[ \t\r\n\f\v]/</tt> +* <tt>/\S/</tt> - A non-whitespace character: <tt>/[^ \t\r\n\f\v]/</tt> +* <tt>/\R/</tt> - A linebreak: <tt>\n</tt>, <tt>\v</tt>, <tt>\f</tt>, <tt>\r</tt> + <tt>\u0085</tt> (NEXT LINE), <tt>\u2028</tt> (LINE SEPARATOR), <tt>\u2029</tt> (PARAGRAPH SEPARATOR) + or <tt>\r\n</tt>. + +POSIX <i>bracket expressions</i> are also similar to character classes. +They provide a portable alternative to the above, with the added benefit +that they encompass non-ASCII characters. For instance, <tt>/\d/</tt> +matches only the ASCII decimal digits (0-9); whereas <tt>/[[:digit:]]/</tt> +matches any character in the Unicode _Nd_ category. + +* <tt>/[[:alnum:]]/</tt> - Alphabetic and numeric character +* <tt>/[[:alpha:]]/</tt> - Alphabetic character +* <tt>/[[:blank:]]/</tt> - Space or tab +* <tt>/[[:cntrl:]]/</tt> - Control character +* <tt>/[[:digit:]]/</tt> - Digit +* <tt>/[[:graph:]]/</tt> - Non-blank character (excludes spaces, control + characters, and similar) +* <tt>/[[:lower:]]/</tt> - Lowercase alphabetical character +* <tt>/[[:print:]]/</tt> - Like [:graph:], but includes the space character +* <tt>/[[:punct:]]/</tt> - Punctuation character +* <tt>/[[:space:]]/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline, + carriage return, etc.) +* <tt>/[[:upper:]]/</tt> - Uppercase alphabetical +* <tt>/[[:xdigit:]]/</tt> - Digit allowed in a hexadecimal number (i.e., + 0-9a-fA-F) + +Ruby also supports the following non-POSIX character classes: + +* <tt>/[[:word:]]/</tt> - A character in one of the following Unicode + general categories _Letter_, _Mark_, _Number_, + <i>Connector_Punctuation</i> +* <tt>/[[:ascii:]]/</tt> - A character in the ASCII character set + + # U+06F2 is "EXTENDED ARABIC-INDIC DIGIT TWO" + /[[:digit:]]/.match("\u06F2") #=> #<MatchData "\u{06F2}"> + /[[:upper:]][[:lower:]]/.match("Hello") #=> #<MatchData "He"> + /[[:xdigit:]][[:xdigit:]]/.match("A6") #=> #<MatchData "A6"> + +== Repetition + +The constructs described so far match a single character. They can be +followed by a repetition metacharacter to specify how many times they need +to occur. Such metacharacters are called <i>quantifiers</i>. + +* <tt>*</tt> - Zero or more times +* <tt>+</tt> - One or more times +* <tt>?</tt> - Zero or one times (optional) +* <tt>{</tt><i>n</i><tt>}</tt> - Exactly <i>n</i> times +* <tt>{</tt><i>n</i><tt>,}</tt> - <i>n</i> or more times +* <tt>{,</tt><i>m</i><tt>}</tt> - <i>m</i> or less times +* <tt>{</tt><i>n</i><tt>,</tt><i>m</i><tt>}</tt> - At least <i>n</i> and + at most <i>m</i> times + +At least one uppercase character ('H'), at least one lowercase character +('e'), two 'l' characters, then one 'o': + + "Hello".match(/[[:upper:]]+[[:lower:]]+l{2}o/) #=> #<MatchData "Hello"> + +=== Greedy Match + +Repetition is <i>greedy</i> by default: as many occurrences as possible +are matched while still allowing the overall match to succeed. By +contrast, <i>lazy</i> matching makes the minimal amount of matches +necessary for overall success. Most greedy metacharacters can be made lazy +by following them with <tt>?</tt>. For the <tt>{n}</tt> pattern, because +it specifies an exact number of characters to match and not a variable +number of characters, the <tt>?</tt> metacharacter instead makes the +repeated pattern optional. + +Both patterns below match the string. The first uses a greedy quantifier so +'.+' matches '<a><b>'; the second uses a lazy quantifier so '.+?' matches +'<a>': + + /<.+>/.match("<a><b>") #=> #<MatchData "<a><b>"> + /<.+?>/.match("<a><b>") #=> #<MatchData "<a>"> + +=== Possessive Match + +A quantifier followed by <tt>+</tt> matches <i>possessively</i>: once it +has matched it does not backtrack. They behave like greedy quantifiers, +but having matched they refuse to "give up" their match even if this +jeopardises the overall match. + + /<.*><.+>/.match("<a><b>") #=> #<MatchData "<a><b>"> + /<.*+><.+>/.match("<a><b>") #=> nil + /<.*><.++>/.match("<a><b>") #=> nil + +== Capturing + +Parentheses can be used for <i>capturing</i>. The text enclosed by the +<i>n</i>th group of parentheses can be subsequently referred to +with <i>n</i>. Within a pattern use the <i>backreference</i> +<tt>\n</tt> (e.g. <tt>\1</tt>); outside of the pattern use +<tt>MatchData[n]</tt> (e.g. <tt>MatchData[1]</tt>). + +In this example, <tt>'at'</tt> is captured by the first group of +parentheses, then referred to later with <tt>\1</tt>: + + /[csh](..) [csh]\1 in/.match("The cat sat in the hat") + #=> #<MatchData "cat sat in" 1:"at"> + +Regexp#match returns a MatchData object which makes the captured text +available with its #[] method: + + /[csh](..) [csh]\1 in/.match("The cat sat in the hat")[1] #=> 'at' + +While Ruby supports an arbitrary number of numbered captured groups, +only groups 1-9 are supported using the <tt>\n</tt> backreference +syntax. + +Ruby also supports <tt>\0</tt> as a special backreference, which +references the entire matched string. This is also available at +<tt>MatchData[0]</tt>. Note that the <tt>\0</tt> backreference cannot +be used inside the regexp, as backreferences can only be used after the +end of the capture group, and the <tt>\0</tt> backreference uses the +implicit capture group of the entire match. However, you can use +this backreference when doing substitution: + + "The cat sat in the hat".gsub(/[csh]at/, '\0s') + # => "The cats sats in the hats" + +=== Named Captures + +Capture groups can be referred to by name when defined with the +<tt>(?<</tt><i>name</i><tt>>)</tt> or <tt>(?'</tt><i>name</i><tt>')</tt> +constructs. + + /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67") + #=> #<MatchData "$3.67" dollars:"3" cents:"67"> + /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")[:dollars] #=> "3" + +Named groups can be backreferenced with <tt>\k<</tt><i>name</i><tt>></tt>, +where _name_ is the group name. + + /(?<vowel>[aeiou]).\k<vowel>.\k<vowel>/.match('ototomy') + #=> #<MatchData "ototo" vowel:"o"> + +*Note*: A regexp can't use named backreferences and numbered +backreferences simultaneously. Also, if a named capture is used in a +regexp, then parentheses used for grouping which would otherwise result +in a unnamed capture are treated as non-capturing. + + /(\w)(\w)/.match("ab").captures # => ["a", "b"] + /(\w)(\w)/.match("ab").named_captures # => {} + + /(?<c>\w)(\w)/.match("ab").captures # => ["a"] + /(?<c>\w)(\w)/.match("ab").named_captures # => {"c"=>"a"} + +When named capture groups are used with a literal regexp on the left-hand +side of an expression and the <tt>=~</tt> operator, the captured text is +also assigned to local variables with corresponding names. + + /\$(?<dollars>\d+)\.(?<cents>\d+)/ =~ "$3.67" #=> 0 + dollars #=> "3" + +== Grouping + +Parentheses also <i>group</i> the terms they enclose, allowing them to be +quantified as one <i>atomic</i> whole. + +The pattern below matches a vowel followed by 2 word characters: + + /[aeiou]\w{2}/.match("Caenorhabditis elegans") #=> #<MatchData "aen"> + +Whereas the following pattern matches a vowel followed by a word character, +twice, i.e. <tt>[aeiou]\w[aeiou]\w</tt>: 'enor'. + + /([aeiou]\w){2}/.match("Caenorhabditis elegans") + #=> #<MatchData "enor" 1:"or"> + +The <tt>(?:</tt>...<tt>)</tt> construct provides grouping without +capturing. That is, it combines the terms it contains into an atomic whole +without creating a backreference. This benefits performance at the slight +expense of readability. + +The first group of parentheses captures 'n' and the second 'ti'. The second +group is referred to later with the backreference <tt>\2</tt>: + + /I(n)ves(ti)ga\2ons/.match("Investigations") + #=> #<MatchData "Investigations" 1:"n" 2:"ti"> + +The first group of parentheses is now made non-capturing with '?:', so it +still matches 'n', but doesn't create the backreference. Thus, the +backreference <tt>\1</tt> now refers to 'ti'. + + /I(?:n)ves(ti)ga\1ons/.match("Investigations") + #=> #<MatchData "Investigations" 1:"ti"> + +=== Atomic Grouping + +Grouping can be made <i>atomic</i> with +<tt>(?></tt><i>pat</i><tt>)</tt>. This causes the subexpression <i>pat</i> +to be matched independently of the rest of the expression such that what +it matches becomes fixed for the remainder of the match, unless the entire +subexpression must be abandoned and subsequently revisited. In this +way <i>pat</i> is treated as a non-divisible whole. Atomic grouping is +typically used to optimise patterns so as to prevent the regular +expression engine from backtracking needlessly. + +The <tt>"</tt> in the pattern below matches the first character of the string, +then <tt>.*</tt> matches <i>Quote"</i>. This causes the overall match to fail, +so the text matched by <tt>.*</tt> is backtracked by one position, which +leaves the final character of the string available to match <tt>"</tt> + + /".*"/.match('"Quote"') #=> #<MatchData "\"Quote\""> + +If <tt>.*</tt> is grouped atomically, it refuses to backtrack <i>Quote"</i>, +even though this means that the overall match fails + + /"(?>.*)"/.match('"Quote"') #=> nil + +== Subexpression Calls + +The <tt>\g<</tt><i>name</i><tt>></tt> syntax matches the previous +subexpression named _name_, which can be a group name or number, again. +This differs from backreferences in that it re-executes the group rather +than simply trying to re-match the same text. + +This pattern matches a <i>(</i> character and assigns it to the <tt>paren</tt> +group, tries to call that the <tt>paren</tt> sub-expression again but fails, +then matches a literal <i>)</i>: + + /\A(?<paren>\(\g<paren>*\))*\z/ =~ '()' + + + /\A(?<paren>\(\g<paren>*\))*\z/ =~ '(())' #=> 0 + # ^1 + # ^2 + # ^3 + # ^4 + # ^5 + # ^6 + # ^7 + # ^8 + # ^9 + # ^10 + +1. Matches at the beginning of the string, i.e. before the first + character. +2. Enters a named capture group called <tt>paren</tt> +3. Matches a literal <i>(</i>, the first character in the string +4. Calls the <tt>paren</tt> group again, i.e. recurses back to the + second step +5. Re-enters the <tt>paren</tt> group +6. Matches a literal <i>(</i>, the second character in the + string +7. Try to call <tt>paren</tt> a third time, but fail because + doing so would prevent an overall successful match +8. Match a literal <i>)</i>, the third character in the string. + Marks the end of the second recursive call +9. Match a literal <i>)</i>, the fourth character in the string +10. Match the end of the string + +== Alternation + +The vertical bar metacharacter (<tt>|</tt>) combines several expressions into +a single one that matches any of the expressions. Each expression is an +<i>alternative</i>. + + /\w(and|or)\w/.match("Feliformia") #=> #<MatchData "form" 1:"or"> + /\w(and|or)\w/.match("furandi") #=> #<MatchData "randi" 1:"and"> + /\w(and|or)\w/.match("dissemblance") #=> nil + +== Character Properties + +The <tt>\p{}</tt> construct matches characters with the named property, +much like POSIX bracket classes. + +* <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 +* <tt>/\p{Emoji}/</tt> - Unicode emoji +* <tt>/\p{Graph}/</tt> - Non-blank character (excludes spaces, control + 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) +* <tt>/\p{Word}/</tt> - A member of one of the following Unicode general + category <i>Letter</i>, <i>Mark</i>, <i>Number</i>, + <i>Connector\_Punctuation</i> +* <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 + +A Unicode character's <i>General Category</i> value can also be matched +with <tt>\p{</tt><i>Ab</i><tt>}</tt> where <i>Ab</i> is the category's +abbreviation as described below: + +* <tt>/\p{L}/</tt> - 'Letter' +* <tt>/\p{Ll}/</tt> - 'Letter: Lowercase' +* <tt>/\p{Lm}/</tt> - 'Letter: Mark' +* <tt>/\p{Lo}/</tt> - 'Letter: Other' +* <tt>/\p{Lt}/</tt> - 'Letter: Titlecase' +* <tt>/\p{Lu}/</tt> - 'Letter: Uppercase +* <tt>/\p{Lo}/</tt> - 'Letter: Other' +* <tt>/\p{M}/</tt> - 'Mark' +* <tt>/\p{Mn}/</tt> - 'Mark: Nonspacing' +* <tt>/\p{Mc}/</tt> - 'Mark: Spacing Combining' +* <tt>/\p{Me}/</tt> - 'Mark: Enclosing' +* <tt>/\p{N}/</tt> - 'Number' +* <tt>/\p{Nd}/</tt> - 'Number: Decimal Digit' +* <tt>/\p{Nl}/</tt> - 'Number: Letter' +* <tt>/\p{No}/</tt> - 'Number: Other' +* <tt>/\p{P}/</tt> - 'Punctuation' +* <tt>/\p{Pc}/</tt> - 'Punctuation: Connector' +* <tt>/\p{Pd}/</tt> - 'Punctuation: Dash' +* <tt>/\p{Ps}/</tt> - 'Punctuation: Open' +* <tt>/\p{Pe}/</tt> - 'Punctuation: Close' +* <tt>/\p{Pi}/</tt> - 'Punctuation: Initial Quote' +* <tt>/\p{Pf}/</tt> - 'Punctuation: Final Quote' +* <tt>/\p{Po}/</tt> - 'Punctuation: Other' +* <tt>/\p{S}/</tt> - 'Symbol' +* <tt>/\p{Sm}/</tt> - 'Symbol: Math' +* <tt>/\p{Sc}/</tt> - 'Symbol: Currency' +* <tt>/\p{Sc}/</tt> - 'Symbol: Currency' +* <tt>/\p{Sk}/</tt> - 'Symbol: Modifier' +* <tt>/\p{So}/</tt> - 'Symbol: Other' +* <tt>/\p{Z}/</tt> - 'Separator' +* <tt>/\p{Zs}/</tt> - 'Separator: Space' +* <tt>/\p{Zl}/</tt> - 'Separator: Line' +* <tt>/\p{Zp}/</tt> - 'Separator: Paragraph' +* <tt>/\p{C}/</tt> - 'Other' +* <tt>/\p{Cc}/</tt> - 'Other: Control' +* <tt>/\p{Cf}/</tt> - 'Other: Format' +* <tt>/\p{Cn}/</tt> - 'Other: Not Assigned' +* <tt>/\p{Co}/</tt> - 'Other: Private Use' +* <tt>/\p{Cs}/</tt> - 'Other: Surrogate' + +Lastly, <tt>\p{}</tt> matches a character's Unicode <i>script</i>. The +following scripts are supported: <i>Arabic</i>, <i>Armenian</i>, +<i>Balinese</i>, <i>Bengali</i>, <i>Bopomofo</i>, <i>Braille</i>, +<i>Buginese</i>, <i>Buhid</i>, <i>Canadian_Aboriginal</i>, <i>Carian</i>, +<i>Cham</i>, <i>Cherokee</i>, <i>Common</i>, <i>Coptic</i>, +<i>Cuneiform</i>, <i>Cypriot</i>, <i>Cyrillic</i>, <i>Deseret</i>, +<i>Devanagari</i>, <i>Ethiopic</i>, <i>Georgian</i>, <i>Glagolitic</i>, +<i>Gothic</i>, <i>Greek</i>, <i>Gujarati</i>, <i>Gurmukhi</i>, <i>Han</i>, +<i>Hangul</i>, <i>Hanunoo</i>, <i>Hebrew</i>, <i>Hiragana</i>, +<i>Inherited</i>, <i>Kannada</i>, <i>Katakana</i>, <i>Kayah_Li</i>, +<i>Kharoshthi</i>, <i>Khmer</i>, <i>Lao</i>, <i>Latin</i>, <i>Lepcha</i>, +<i>Limbu</i>, <i>Linear_B</i>, <i>Lycian</i>, <i>Lydian</i>, +<i>Malayalam</i>, <i>Mongolian</i>, <i>Myanmar</i>, <i>New_Tai_Lue</i>, +<i>Nko</i>, <i>Ogham</i>, <i>Ol_Chiki</i>, <i>Old_Italic</i>, +<i>Old_Persian</i>, <i>Oriya</i>, <i>Osmanya</i>, <i>Phags_Pa</i>, +<i>Phoenician</i>, <i>Rejang</i>, <i>Runic</i>, <i>Saurashtra</i>, +<i>Shavian</i>, <i>Sinhala</i>, <i>Sundanese</i>, <i>Syloti_Nagri</i>, +<i>Syriac</i>, <i>Tagalog</i>, <i>Tagbanwa</i>, <i>Tai_Le</i>, +<i>Tamil</i>, <i>Telugu</i>, <i>Thaana</i>, <i>Thai</i>, <i>Tibetan</i>, +<i>Tifinagh</i>, <i>Ugaritic</i>, <i>Vai</i>, and <i>Yi</i>. + +Unicode codepoint U+06E9 is named "ARABIC PLACE OF SAJDAH" and belongs to the +Arabic script: + + /\p{Arabic}/.match("\u06E9") #=> #<MatchData "\u06E9"> + +All character properties can be inverted by prefixing their name with a +caret (<tt>^</tt>). + +Letter 'A' is not in the Unicode Ll (Letter; Lowercase) category, so this +match succeeds: + + /\p{^Ll}/.match("A") #=> #<MatchData "A"> + +== Anchors + +Anchors are metacharacter that match the zero-width positions between +characters, <i>anchoring</i> the match to a specific position. + +* <tt>^</tt> - Matches beginning of line +* <tt>$</tt> - Matches end of line +* <tt>\A</tt> - Matches beginning of string. +* <tt>\Z</tt> - Matches end of string. If string ends with a newline, + it matches just before newline +* <tt>\z</tt> - Matches end of string +* <tt>\G</tt> - Matches first matching position: + + In methods like <tt>String#gsub</tt> and <tt>String#scan</tt>, 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 <tt>Regexp#match</tt> and <tt>String#match</tt> that take an (optional) offset, it matches where the search begins. + + "hello, world".match(/,/, 3) #=> #<MatchData ","> + "hello, world".match(/\G,/, 3) #=> nil + +* <tt>\b</tt> - Matches word boundaries when outside brackets; + backspace (0x08) when inside brackets +* <tt>\B</tt> - Matches non-word boundaries +* <tt>(?=</tt><i>pat</i><tt>)</tt> - <i>Positive lookahead</i> assertion: + ensures that the following characters match <i>pat</i>, but doesn't + include those characters in the matched text +* <tt>(?!</tt><i>pat</i><tt>)</tt> - <i>Negative lookahead</i> assertion: + ensures that the following characters do not match <i>pat</i>, but + doesn't include those characters in the matched text +* <tt>(?<=</tt><i>pat</i><tt>)</tt> - <i>Positive lookbehind</i> + assertion: ensures that the preceding characters match <i>pat</i>, but + doesn't include those characters in the matched text +* <tt>(?<!</tt><i>pat</i><tt>)</tt> - <i>Negative lookbehind</i> + assertion: ensures that the preceding characters do not match + <i>pat</i>, but doesn't include those characters in the matched text + +* <tt>\K</tt> - <i>Match reset</i>: 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/ =~ "abc" #=> 0 + /(?<=ab)c/ =~ "abc" #=> 2 + + These match same string and <i>$&</i> equals <tt>"c"</tt>, while the + matched position is different. + + As are the following two regexps: + + /(a)\K(b)\Kc/ + /(?<=(?<=(a))(b))c/ + +If a pattern isn't anchored it can begin at any point in the string: + + /real/.match("surrealist") #=> #<MatchData "real"> + +Anchoring the pattern to the beginning of the string forces the match to start +there. 'real' doesn't occur at the beginning of the string, so now the match +fails: + + /\Areal/.match("surrealist") #=> nil + +The match below fails because although 'Demand' contains 'and', the pattern +does not occur at a word boundary. + + /\band/.match("Demand") + +Whereas in the following example 'and' has been anchored to a non-word +boundary so instead of matching the first 'and' it matches from the fourth +letter of 'demand' instead: + + /\Band.+/.match("Supply and demand curve") #=> #<MatchData "and curve"> + +The pattern below uses positive lookahead and positive lookbehind to match +text appearing in <b></b> tags without including the tags in the match: + + /(?<=<b>)\w+(?=<\/b>)/.match("Fortune favours the <b>bold</b>") + #=> #<MatchData "bold"> + +== Options + +The end delimiter for a regexp can be followed by one or more single-letter +options which control how the pattern can match. + +* <tt>/pat/i</tt> - Ignore case +* <tt>/pat/m</tt> - Treat a newline as a character matched by <tt>.</tt> +* <tt>/pat/x</tt> - Ignore whitespace and comments in the pattern +* <tt>/pat/o</tt> - Perform <tt>#{}</tt> interpolation only once + +<tt>i</tt>, <tt>m</tt>, and <tt>x</tt> can also be applied on the +subexpression level with the +<tt>(?</tt><i>on</i><tt>-</tt><i>off</i><tt>)</tt> construct, which +enables options <i>on</i>, and disables options <i>off</i> for the +expression enclosed by the parentheses: + + /a(?i:b)c/.match('aBc') #=> #<MatchData "aBc"> + /a(?-i:b)c/i.match('ABC') #=> nil + +Additionally, these options can also be toggled for the remainder of the +pattern: + + /a(?i)bc/.match('abC') #=> #<MatchData "abC"> + +Options may also be used with <tt>Regexp.new</tt>: + + Regexp.new("abc", Regexp::IGNORECASE) #=> /abc/i + Regexp.new("abc", Regexp::MULTILINE) #=> /abc/m + Regexp.new("abc # Comment", Regexp::EXTENDED) #=> /abc # Comment/x + Regexp.new("abc", Regexp::IGNORECASE | Regexp::MULTILINE) #=> /abc/mi + + Regexp.new("abc", "i") #=> /abc/i + Regexp.new("abc", "m") #=> /abc/m + Regexp.new("abc # Comment", "x") #=> /abc # Comment/x + Regexp.new("abc", "im") #=> /abc/mi + +== Free-Spacing Mode and Comments + +As mentioned above, the <tt>x</tt> option enables <i>free-spacing</i> +mode. Literal white space inside the pattern is ignored, and the +octothorpe (<tt>#</tt>) character introduces a comment until the end of +the line. This allows the components of the pattern to be organized in a +potentially more readable fashion. + +A contrived pattern to match a number with optional decimal places: + + float_pat = /\A + [[:digit:]]+ # 1 or more digits before the decimal point + (\. # Decimal point + [[:digit:]]+ # 1 or more digits after the decimal point + )? # The decimal point and following digits are optional + \Z/x + float_pat.match('3.14') #=> #<MatchData "3.14" 1:".14"> + +There are a number of strategies for matching whitespace: + +* Use a pattern such as <tt>\s</tt> or <tt>\p{Space}</tt>. +* Use escaped whitespace such as <tt>\ </tt>, i.e. a space preceded by a backslash. +* Use a character class such as <tt>[ ]</tt>. + +Comments can be included in a non-<tt>x</tt> pattern with the +<tt>(?#</tt><i>comment</i><tt>)</tt> construct, where <i>comment</i> is +arbitrary text ignored by the regexp engine. + +Comments in regexp literals cannot include unescaped terminator +characters. + +== Encoding + +Regular expressions are assumed to use the source encoding. This can be +overridden with one of the following modifiers. + +* <tt>/</tt><i>pat</i><tt>/u</tt> - UTF-8 +* <tt>/</tt><i>pat</i><tt>/e</tt> - EUC-JP +* <tt>/</tt><i>pat</i><tt>/s</tt> - Windows-31J +* <tt>/</tt><i>pat</i><tt>/n</tt> - ASCII-8BIT + +A regexp can be matched against a string when they either share an +encoding, or the regexp's encoding is _US-ASCII_ and the string's encoding +is ASCII-compatible. + +If a match between incompatible encodings is attempted an +<tt>Encoding::CompatibilityError</tt> exception is raised. + +The <tt>Regexp#fixed_encoding?</tt> predicate indicates whether the regexp +has a <i>fixed</i> encoding, that is one incompatible with ASCII. A +regexp's encoding can be explicitly fixed by supplying +<tt>Regexp::FIXEDENCODING</tt> as the second argument of +<tt>Regexp.new</tt>: + + r = Regexp.new("a".force_encoding("iso-8859-1"),Regexp::FIXEDENCODING) + r =~ "a\u3042" + # raises Encoding::CompatibilityError: incompatible encoding regexp match + # (ISO-8859-1 regexp with UTF-8 string) + +== \Regexp Global Variables + +Pattern matching sets some global variables : + +* <tt>$~</tt> is equivalent to Regexp.last_match; +* <tt>$&</tt> contains the complete matched text; +* <tt>$`</tt> contains string before match; +* <tt>$'</tt> contains string after match; +* <tt>$1</tt>, <tt>$2</tt> and so on contain text matching first, second, etc + capture group; +* <tt>$+</tt> contains last capture group. + +Example: + + m = /s(\w{2}).*(c)/.match('haystack') #=> #<MatchData "stac" 1:"ta" 2:"c"> + $~ #=> #<MatchData "stac" 1:"ta" 2:"c"> + Regexp.last_match #=> #<MatchData "stac" 1:"ta" 2:"c"> + + $& #=> "stac" + # same as m[0] + $` #=> "hay" + # same as m.pre_match + $' #=> "k" + # same as m.post_match + $1 #=> "ta" + # same as m[1] + $2 #=> "c" + # same as m[2] + $3 #=> nil + # no third group in pattern + $+ #=> "c" + # same as m[-1] + +These global variables are thread-local and method-local variables. + +== Performance + +Certain pathological combinations of constructs can lead to abysmally bad +performance. + +Consider a string of 25 <i>a</i>s, a <i>d</i>, 4 <i>a</i>s, and a +<i>c</i>. + + s = 'a' * 25 + 'd' + 'a' * 4 + 'c' + #=> "aaaaaaaaaaaaaaaaaaaaaaaaadaaaac" + +The following patterns match instantly as you would expect: + + /(b|a)/ =~ s #=> 0 + /(b|a+)/ =~ s #=> 0 + /(b|a+)*/ =~ s #=> 0 + +However, the following pattern takes appreciably longer: + + /(b|a+)*c/ =~ s #=> 26 + +This happens because an atom in the regexp is quantified by both an +immediate <tt>+</tt> and an enclosing <tt>*</tt> with nothing to +differentiate which is in control of any particular character. The +nondeterminism that results produces super-linear performance. (Consult +<i>Mastering Regular Expressions</i> (3rd ed.), pp 222, by +<i>Jeffery Friedl</i>, for an in-depth analysis). This particular case +can be fixed by use of atomic grouping, which prevents the unnecessary +backtracking: + + (start = Time.now) && /(b|a+)*c/ =~ s && (Time.now - start) + #=> 24.702736882 + (start = Time.now) && /(?>b|a+)*c/ =~ s && (Time.now - start) + #=> 0.000166571 + +A similar case is typified by the following example, which takes +approximately 60 seconds to execute for me: + +Match a string of 29 <i>a</i>s against a pattern of 29 optional <i>a</i>s +followed by 29 mandatory <i>a</i>s: + + Regexp.new('a?' * 29 + 'a' * 29) =~ 'a' * 29 + +The 29 optional <i>a</i>s match the string, but this prevents the 29 +mandatory <i>a</i>s that follow from matching. Ruby must then backtrack +repeatedly so as to satisfy as many of the optional matches as it can +while still matching the mandatory 29. It is plain to us that none of the +optional matches can succeed, but this fact unfortunately eludes Ruby. + +The best way to improve performance is to significantly reduce the amount of +backtracking needed. For this case, instead of individually matching 29 +optional <i>a</i>s, a range of optional <i>a</i>s can be matched all at once +with <i>a{0,29}</i>: + + Regexp.new('a{0,29}' + 'a' * 29) =~ 'a' * 29 + +== Timeout + +There are two APIs to set timeout. One is Regexp.timeout=, which is +process-global configuration of timeout for Regexp matching. + + Regexp.timeout = 3 + s = 'a' * 25 + 'd' + 'a' * 4 + 'c' + /(b|a+)*c/ =~ s #=> This raises an exception in three seconds + +The other is timeout keyword of Regexp.new. + + re = Regexp.new("(b|a+)*c", timeout: 3) + s = 'a' * 25 + 'd' + 'a' * 4 + 'c' + /(b|a+)*c/ =~ s #=> This raises an exception in three seconds + +When using Regexps to process untrusted input, you should use the timeout +feature to avoid excessive backtracking. Otherwise, a malicious user can +provide input to Regexp causing Denial-of-Service attack. +Note that the timeout is not set by default because an appropriate limit +highly depends on an application requirement and context. diff --git a/doc/regexp/methods.rdoc b/doc/regexp/methods.rdoc deleted file mode 100644 index 356156ac9a..0000000000 --- a/doc/regexp/methods.rdoc +++ /dev/null @@ -1,41 +0,0 @@ -== \Regexp Methods - -Each of these Ruby core methods can accept a regexp as an argument: - -- Enumerable#all? -- Enumerable#any? -- Enumerable#grep -- Enumerable#grep_v -- Enumerable#none? -- Enumerable#one? -- Enumerable#slice_after -- Enumerable#slice_before -- Regexp#=~ -- Regexp#match -- Regexp#match? -- Regexp.new -- Regexp.union -- String#=~ -- String#[]= -- String#byteindex -- String#byterindex -- String#gsub -- String#gsub! -- String#index -- String#match -- String#match? -- String#partition -- String#rindex -- String#rpartition -- String#scan -- String#slice -- String#slice! -- String#split -- String#start_with? -- String#sub -- String#sub! -- Symbol#=~ -- Symbol#match -- Symbol#match? -- Symbol#slice -- Symbol#start_with? diff --git a/doc/regexp/unicode_properties.rdoc b/doc/regexp/unicode_properties.rdoc deleted file mode 100644 index a1d7ecc380..0000000000 --- a/doc/regexp/unicode_properties.rdoc +++ /dev/null @@ -1,678 +0,0 @@ -== \Regexps Based on Unicode Properties - -The properties shown here are those currently supported in Ruby. -Older versions may not support all of these. - -=== POSIX brackets - -- <tt>\p{ASCII}</tt> -- <tt>\p{Alnum}</tt> -- <tt>\p{Alphabetic}</tt>, <tt>\p{Alpha}</tt> -- <tt>\p{Blank}</tt> -- <tt>\p{Cntrl}</tt> -- <tt>\p{Digit}</tt> -- <tt>\p{Graph}</tt> -- <tt>\p{Lowercase}</tt>, <tt>\p{Lower}</tt> -- <tt>\p{Print}</tt> -- <tt>\p{Punct}</tt> -- <tt>\p{Space}</tt> -- <tt>\p{Uppercase}</tt>, <tt>\p{Upper}</tt> -- <tt>\p{Word}</tt> -- <tt>\p{XDigit}</tt> -- <tt>\p{XPosixPunct}</tt> - -=== Special - -- <tt>\p{Any}</tt> -- <tt>\p{Assigned}</tt> - -=== Major and General Categories - -- <tt>\p{Cased_Letter}</tt>, <tt>\p{LC}</tt> -- <tt>\p{Close_Punctuation}</tt>, <tt>\p{Pe}</tt> -- <tt>\p{Connector_Punctuation}</tt>, <tt>\p{Pc}</tt> -- <tt>\p{Control}</tt>, <tt>\p{Cc}</tt> -- <tt>\p{Currency_Symbol}</tt>, <tt>\p{Sc}</tt> -- <tt>\p{Dash_Punctuation}</tt>, <tt>\p{Pd}</tt> -- <tt>\p{Decimal_Number}</tt>, <tt>\p{Nd}</tt> -- <tt>\p{Enclosing_Mark}</tt>, <tt>\p{Me}</tt> -- <tt>\p{Final_Punctuation}</tt>, <tt>\p{Pf}</tt> -- <tt>\p{Format}</tt>, <tt>\p{Cf}</tt> -- <tt>\p{Initial_Punctuation}</tt>, <tt>\p{Pi}</tt> -- <tt>\p{Letter}</tt>, <tt>\p{L}</tt> -- <tt>\p{Letter_Number}</tt>, <tt>\p{Nl}</tt> -- <tt>\p{Line_Separator}</tt>, <tt>\p{Zl}</tt> -- <tt>\p{Lowercase_Letter}</tt>, <tt>\p{Ll}</tt> -- <tt>\p{Mark}</tt>, <tt>\p{M}</tt> -- <tt>\p{Math_Symbol}</tt>, <tt>\p{Sm}</tt> -- <tt>\p{Modifier_Letter}</tt>, <tt>\p{Lm}</tt> -- <tt>\p{Modifier_Symbol}</tt>, <tt>\p{Sk}</tt> -- <tt>\p{Nonspacing_Mark}</tt>, <tt>\p{Mn}</tt> -- <tt>\p{Number}</tt>, <tt>\p{N}</tt> -- <tt>\p{Open_Punctuation}</tt>, <tt>\p{Ps}</tt> -- <tt>\p{Other}</tt>, <tt>\p{C}</tt> -- <tt>\p{Other_Letter}</tt>, <tt>\p{Lo}</tt> -- <tt>\p{Other_Number}</tt>, <tt>\p{No}</tt> -- <tt>\p{Other_Punctuation}</tt>, <tt>\p{Po}</tt> -- <tt>\p{Other_Symbol}</tt>, <tt>\p{So}</tt> -- <tt>\p{Paragraph_Separator}</tt>, <tt>\p{Zp}</tt> -- <tt>\p{Private_Use}</tt>, <tt>\p{Co}</tt> -- <tt>\p{Punctuation}</tt>, <tt>\p{P}</tt> -- <tt>\p{Separator}</tt>, <tt>\p{Z}</tt> -- <tt>\p{Space_Separator}</tt>, <tt>\p{Zs}</tt> -- <tt>\p{Spacing_Mark}</tt>, <tt>\p{Mc}</tt> -- <tt>\p{Surrogate}</tt>, <tt>\p{Cs}</tt> -- <tt>\p{Symbol}</tt>, <tt>\p{S}</tt> -- <tt>\p{Titlecase_Letter}</tt>, <tt>\p{Lt}</tt> -- <tt>\p{Unassigned}</tt>, <tt>\p{Cn}</tt> -- <tt>\p{Uppercase_Letter}</tt>, <tt>\p{Lu}</tt> - -=== Prop List - -- <tt>\p{ASCII_Hex_Digit}</tt>, <tt>\p{AHex}</tt> -- <tt>\p{Bidi_Control}</tt>, <tt>\p{Bidi_C}</tt> -- <tt>\p{Dash}</tt> -- <tt>\p{Deprecated}</tt>, <tt>\p{Dep}</tt> -- <tt>\p{Diacritic}</tt>, <tt>\p{Dia}</tt> -- <tt>\p{Extender}</tt>, <tt>\p{Ext}</tt> -- <tt>\p{Hex_Digit}</tt>, <tt>\p{Hex}</tt> -- <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{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{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> -- <tt>\p{Other_Grapheme_Extend}</tt>, <tt>\p{OGr_Ext}</tt> -- <tt>\p{Other_ID_Continue}</tt>, <tt>\p{OIDC}</tt> -- <tt>\p{Other_ID_Start}</tt>, <tt>\p{OIDS}</tt> -- <tt>\p{Other_Lowercase}</tt>, <tt>\p{OLower}</tt> -- <tt>\p{Other_Math}</tt>, <tt>\p{OMath}</tt> -- <tt>\p{Other_Uppercase}</tt>, <tt>\p{OUpper}</tt> -- <tt>\p{Pattern_Syntax}</tt>, <tt>\p{Pat_Syn}</tt> -- <tt>\p{Pattern_White_Space}</tt>, <tt>\p{Pat_WS}</tt> -- <tt>\p{Prepended_Concatenation_Mark}</tt>, <tt>\p{PCM}</tt> -- <tt>\p{Quotation_Mark}</tt>, <tt>\p{QMark}</tt> -- <tt>\p{Radical}</tt> -- <tt>\p{Regional_Indicator}</tt>, <tt>\p{RI}</tt> -- <tt>\p{Sentence_Terminal}</tt>, <tt>\p{STerm}</tt> -- <tt>\p{Soft_Dotted}</tt>, <tt>\p{SD}</tt> -- <tt>\p{Terminal_Punctuation}</tt>, <tt>\p{Term}</tt> -- <tt>\p{Unified_Ideograph}</tt>, <tt>\p{UIdeo}</tt> -- <tt>\p{Variation_Selector}</tt>, <tt>\p{VS}</tt> -- <tt>\p{White_Space}</tt>, <tt>\p{WSpace}</tt> - -=== Derived Core Properties - -- <tt>\p{Alphabetic}</tt>, <tt>\p{Alpha}</tt> -- <tt>\p{Case_Ignorable}</tt>, <tt>\p{CI}</tt> -- <tt>\p{Cased}</tt> -- <tt>\p{Changes_When_Casefolded}</tt>, <tt>\p{CWCF}</tt> -- <tt>\p{Changes_When_Casemapped}</tt>, <tt>\p{CWCM}</tt> -- <tt>\p{Changes_When_Lowercased}</tt>, <tt>\p{CWL}</tt> -- <tt>\p{Changes_When_Titlecased}</tt>, <tt>\p{CWT}</tt> -- <tt>\p{Changes_When_Uppercased}</tt>, <tt>\p{CWU}</tt> -- <tt>\p{Default_Ignorable_Code_Point}</tt>, <tt>\p{DI}</tt> -- <tt>\p{Grapheme_Base}</tt>, <tt>\p{Gr_Base}</tt> -- <tt>\p{Grapheme_Extend}</tt>, <tt>\p{Gr_Ext}</tt> -- <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{Lowercase}</tt>, <tt>\p{Lower}</tt> -- <tt>\p{Math}</tt> -- <tt>\p{Uppercase}</tt>, <tt>\p{Upper}</tt> -- <tt>\p{XID_Continue}</tt>, <tt>\p{XIDC}</tt> -- <tt>\p{XID_Start}</tt>, <tt>\p{XIDS}</tt> - -=== Scripts - -- <tt>\p{Adlam}</tt>, <tt>\p{Adlm}</tt> -- <tt>\p{Ahom}</tt> -- <tt>\p{Anatolian_Hieroglyphs}</tt>, <tt>\p{Hluw}</tt> -- <tt>\p{Arabic}</tt>, <tt>\p{Arab}</tt> -- <tt>\p{Armenian}</tt>, <tt>\p{Armn}</tt> -- <tt>\p{Avestan}</tt>, <tt>\p{Avst}</tt> -- <tt>\p{Balinese}</tt>, <tt>\p{Bali}</tt> -- <tt>\p{Bamum}</tt>, <tt>\p{Bamu}</tt> -- <tt>\p{Bassa_Vah}</tt>, <tt>\p{Bass}</tt> -- <tt>\p{Batak}</tt>, <tt>\p{Batk}</tt> -- <tt>\p{Bengali}</tt>, <tt>\p{Beng}</tt> -- <tt>\p{Bhaiksuki}</tt>, <tt>\p{Bhks}</tt> -- <tt>\p{Bopomofo}</tt>, <tt>\p{Bopo}</tt> -- <tt>\p{Brahmi}</tt>, <tt>\p{Brah}</tt> -- <tt>\p{Braille}</tt>, <tt>\p{Brai}</tt> -- <tt>\p{Buginese}</tt>, <tt>\p{Bugi}</tt> -- <tt>\p{Buhid}</tt>, <tt>\p{Buhd}</tt> -- <tt>\p{Canadian_Aboriginal}</tt>, <tt>\p{Cans}</tt> -- <tt>\p{Carian}</tt>, <tt>\p{Cari}</tt> -- <tt>\p{Caucasian_Albanian}</tt>, <tt>\p{Aghb}</tt> -- <tt>\p{Chakma}</tt>, <tt>\p{Cakm}</tt> -- <tt>\p{Cham}</tt> -- <tt>\p{Cherokee}</tt>, <tt>\p{Cher}</tt> -- <tt>\p{Chorasmian}</tt>, <tt>\p{Chrs}</tt> -- <tt>\p{Common}</tt>, <tt>\p{Zyyy}</tt> -- <tt>\p{Coptic}</tt>, <tt>\p{Copt}</tt> -- <tt>\p{Cuneiform}</tt>, <tt>\p{Xsux}</tt> -- <tt>\p{Cypriot}</tt>, <tt>\p{Cprt}</tt> -- <tt>\p{Cypro_Minoan}</tt>, <tt>\p{Cpmn}</tt> -- <tt>\p{Cyrillic}</tt>, <tt>\p{Cyrl}</tt> -- <tt>\p{Deseret}</tt>, <tt>\p{Dsrt}</tt> -- <tt>\p{Devanagari}</tt>, <tt>\p{Deva}</tt> -- <tt>\p{Dives_Akuru}</tt>, <tt>\p{Diak}</tt> -- <tt>\p{Dogra}</tt>, <tt>\p{Dogr}</tt> -- <tt>\p{Duployan}</tt>, <tt>\p{Dupl}</tt> -- <tt>\p{Egyptian_Hieroglyphs}</tt>, <tt>\p{Egyp}</tt> -- <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{Georgian}</tt>, <tt>\p{Geor}</tt> -- <tt>\p{Glagolitic}</tt>, <tt>\p{Glag}</tt> -- <tt>\p{Gothic}</tt>, <tt>\p{Goth}</tt> -- <tt>\p{Grantha}</tt>, <tt>\p{Gran}</tt> -- <tt>\p{Greek}</tt>, <tt>\p{Grek}</tt> -- <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{Han}</tt>, <tt>\p{Hani}</tt> -- <tt>\p{Hangul}</tt>, <tt>\p{Hang}</tt> -- <tt>\p{Hanifi_Rohingya}</tt>, <tt>\p{Rohg}</tt> -- <tt>\p{Hanunoo}</tt>, <tt>\p{Hano}</tt> -- <tt>\p{Hatran}</tt>, <tt>\p{Hatr}</tt> -- <tt>\p{Hebrew}</tt>, <tt>\p{Hebr}</tt> -- <tt>\p{Hiragana}</tt>, <tt>\p{Hira}</tt> -- <tt>\p{Imperial_Aramaic}</tt>, <tt>\p{Armi}</tt> -- <tt>\p{Inherited}</tt>, <tt>\p{Zinh}</tt> -- <tt>\p{Inscriptional_Pahlavi}</tt>, <tt>\p{Phli}</tt> -- <tt>\p{Inscriptional_Parthian}</tt>, <tt>\p{Prti}</tt> -- <tt>\p{Javanese}</tt>, <tt>\p{Java}</tt> -- <tt>\p{Kaithi}</tt>, <tt>\p{Kthi}</tt> -- <tt>\p{Kannada}</tt>, <tt>\p{Knda}</tt> -- <tt>\p{Katakana}</tt>, <tt>\p{Kana}</tt> -- <tt>\p{Kawi}</tt> -- <tt>\p{Kayah_Li}</tt>, <tt>\p{Kali}</tt> -- <tt>\p{Kharoshthi}</tt>, <tt>\p{Khar}</tt> -- <tt>\p{Khitan_Small_Script}</tt>, <tt>\p{Kits}</tt> -- <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{Lao}</tt>, <tt>\p{Laoo}</tt> -- <tt>\p{Latin}</tt>, <tt>\p{Latn}</tt> -- <tt>\p{Lepcha}</tt>, <tt>\p{Lepc}</tt> -- <tt>\p{Limbu}</tt>, <tt>\p{Limb}</tt> -- <tt>\p{Linear_A}</tt>, <tt>\p{Lina}</tt> -- <tt>\p{Linear_B}</tt>, <tt>\p{Linb}</tt> -- <tt>\p{Lisu}</tt> -- <tt>\p{Lycian}</tt>, <tt>\p{Lyci}</tt> -- <tt>\p{Lydian}</tt>, <tt>\p{Lydi}</tt> -- <tt>\p{Mahajani}</tt>, <tt>\p{Mahj}</tt> -- <tt>\p{Makasar}</tt>, <tt>\p{Maka}</tt> -- <tt>\p{Malayalam}</tt>, <tt>\p{Mlym}</tt> -- <tt>\p{Mandaic}</tt>, <tt>\p{Mand}</tt> -- <tt>\p{Manichaean}</tt>, <tt>\p{Mani}</tt> -- <tt>\p{Marchen}</tt>, <tt>\p{Marc}</tt> -- <tt>\p{Masaram_Gondi}</tt>, <tt>\p{Gonm}</tt> -- <tt>\p{Medefaidrin}</tt>, <tt>\p{Medf}</tt> -- <tt>\p{Meetei_Mayek}</tt>, <tt>\p{Mtei}</tt> -- <tt>\p{Mende_Kikakui}</tt>, <tt>\p{Mend}</tt> -- <tt>\p{Meroitic_Cursive}</tt>, <tt>\p{Merc}</tt> -- <tt>\p{Meroitic_Hieroglyphs}</tt>, <tt>\p{Mero}</tt> -- <tt>\p{Miao}</tt>, <tt>\p{Plrd}</tt> -- <tt>\p{Modi}</tt> -- <tt>\p{Mongolian}</tt>, <tt>\p{Mong}</tt> -- <tt>\p{Mro}</tt>, <tt>\p{Mroo}</tt> -- <tt>\p{Multani}</tt>, <tt>\p{Mult}</tt> -- <tt>\p{Myanmar}</tt>, <tt>\p{Mymr}</tt> -- <tt>\p{Nabataean}</tt>, <tt>\p{Nbat}</tt> -- <tt>\p{Nag_Mundari}</tt>, <tt>\p{Nagm}</tt> -- <tt>\p{Nandinagari}</tt>, <tt>\p{Nand}</tt> -- <tt>\p{New_Tai_Lue}</tt>, <tt>\p{Talu}</tt> -- <tt>\p{Newa}</tt> -- <tt>\p{Nko}</tt>, <tt>\p{Nkoo}</tt> -- <tt>\p{Nushu}</tt>, <tt>\p{Nshu}</tt> -- <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{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> -- <tt>\p{Old_Permic}</tt>, <tt>\p{Perm}</tt> -- <tt>\p{Old_Persian}</tt>, <tt>\p{Xpeo}</tt> -- <tt>\p{Old_Sogdian}</tt>, <tt>\p{Sogo}</tt> -- <tt>\p{Old_South_Arabian}</tt>, <tt>\p{Sarb}</tt> -- <tt>\p{Old_Turkic}</tt>, <tt>\p{Orkh}</tt> -- <tt>\p{Old_Uyghur}</tt>, <tt>\p{Ougr}</tt> -- <tt>\p{Oriya}</tt>, <tt>\p{Orya}</tt> -- <tt>\p{Osage}</tt>, <tt>\p{Osge}</tt> -- <tt>\p{Osmanya}</tt>, <tt>\p{Osma}</tt> -- <tt>\p{Pahawh_Hmong}</tt>, <tt>\p{Hmng}</tt> -- <tt>\p{Palmyrene}</tt>, <tt>\p{Palm}</tt> -- <tt>\p{Pau_Cin_Hau}</tt>, <tt>\p{Pauc}</tt> -- <tt>\p{Phags_Pa}</tt>, <tt>\p{Phag}</tt> -- <tt>\p{Phoenician}</tt>, <tt>\p{Phnx}</tt> -- <tt>\p{Psalter_Pahlavi}</tt>, <tt>\p{Phlp}</tt> -- <tt>\p{Rejang}</tt>, <tt>\p{Rjng}</tt> -- <tt>\p{Runic}</tt>, <tt>\p{Runr}</tt> -- <tt>\p{Samaritan}</tt>, <tt>\p{Samr}</tt> -- <tt>\p{Saurashtra}</tt>, <tt>\p{Saur}</tt> -- <tt>\p{Sharada}</tt>, <tt>\p{Shrd}</tt> -- <tt>\p{Shavian}</tt>, <tt>\p{Shaw}</tt> -- <tt>\p{Siddham}</tt>, <tt>\p{Sidd}</tt> -- <tt>\p{SignWriting}</tt>, <tt>\p{Sgnw}</tt> -- <tt>\p{Sinhala}</tt>, <tt>\p{Sinh}</tt> -- <tt>\p{Sogdian}</tt>, <tt>\p{Sogd}</tt> -- <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{Syloti_Nagri}</tt>, <tt>\p{Sylo}</tt> -- <tt>\p{Syriac}</tt>, <tt>\p{Syrc}</tt> -- <tt>\p{Tagalog}</tt>, <tt>\p{Tglg}</tt> -- <tt>\p{Tagbanwa}</tt>, <tt>\p{Tagb}</tt> -- <tt>\p{Tai_Le}</tt>, <tt>\p{Tale}</tt> -- <tt>\p{Tai_Tham}</tt>, <tt>\p{Lana}</tt> -- <tt>\p{Tai_Viet}</tt>, <tt>\p{Tavt}</tt> -- <tt>\p{Takri}</tt>, <tt>\p{Takr}</tt> -- <tt>\p{Tamil}</tt>, <tt>\p{Taml}</tt> -- <tt>\p{Tangsa}</tt>, <tt>\p{Tnsa}</tt> -- <tt>\p{Tangut}</tt>, <tt>\p{Tang}</tt> -- <tt>\p{Telugu}</tt>, <tt>\p{Telu}</tt> -- <tt>\p{Thaana}</tt>, <tt>\p{Thaa}</tt> -- <tt>\p{Thai}</tt> -- <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{Toto}</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> -- <tt>\p{Vithkuqi}</tt>, <tt>\p{Vith}</tt> -- <tt>\p{Wancho}</tt>, <tt>\p{Wcho}</tt> -- <tt>\p{Warang_Citi}</tt>, <tt>\p{Wara}</tt> -- <tt>\p{Yezidi}</tt>, <tt>\p{Yezi}</tt> -- <tt>\p{Yi}</tt>, <tt>\p{Yiii}</tt> -- <tt>\p{Zanabazar_Square}</tt>, <tt>\p{Zanb}</tt> - -=== Blocks - -- <tt>\p{In_Adlam}</tt> -- <tt>\p{In_Aegean_Numbers}</tt> -- <tt>\p{In_Ahom}</tt> -- <tt>\p{In_Alchemical_Symbols}</tt> -- <tt>\p{In_Alphabetic_Presentation_Forms}</tt> -- <tt>\p{In_Anatolian_Hieroglyphs}</tt> -- <tt>\p{In_Ancient_Greek_Musical_Notation}</tt> -- <tt>\p{In_Ancient_Greek_Numbers}</tt> -- <tt>\p{In_Ancient_Symbols}</tt> -- <tt>\p{In_Arabic}</tt> -- <tt>\p{In_Arabic_Extended_A}</tt> -- <tt>\p{In_Arabic_Extended_B}</tt> -- <tt>\p{In_Arabic_Extended_C}</tt> -- <tt>\p{In_Arabic_Mathematical_Alphabetic_Symbols}</tt> -- <tt>\p{In_Arabic_Presentation_Forms_A}</tt> -- <tt>\p{In_Arabic_Presentation_Forms_B}</tt> -- <tt>\p{In_Arabic_Supplement}</tt> -- <tt>\p{In_Armenian}</tt> -- <tt>\p{In_Arrows}</tt> -- <tt>\p{In_Avestan}</tt> -- <tt>\p{In_Balinese}</tt> -- <tt>\p{In_Bamum}</tt> -- <tt>\p{In_Bamum_Supplement}</tt> -- <tt>\p{In_Basic_Latin}</tt> -- <tt>\p{In_Bassa_Vah}</tt> -- <tt>\p{In_Batak}</tt> -- <tt>\p{In_Bengali}</tt> -- <tt>\p{In_Bhaiksuki}</tt> -- <tt>\p{In_Block_Elements}</tt> -- <tt>\p{In_Bopomofo}</tt> -- <tt>\p{In_Bopomofo_Extended}</tt> -- <tt>\p{In_Box_Drawing}</tt> -- <tt>\p{In_Brahmi}</tt> -- <tt>\p{In_Braille_Patterns}</tt> -- <tt>\p{In_Buginese}</tt> -- <tt>\p{In_Buhid}</tt> -- <tt>\p{In_Byzantine_Musical_Symbols}</tt> -- <tt>\p{In_CJK_Compatibility}</tt> -- <tt>\p{In_CJK_Compatibility_Forms}</tt> -- <tt>\p{In_CJK_Compatibility_Ideographs}</tt> -- <tt>\p{In_CJK_Compatibility_Ideographs_Supplement}</tt> -- <tt>\p{In_CJK_Radicals_Supplement}</tt> -- <tt>\p{In_CJK_Strokes}</tt> -- <tt>\p{In_CJK_Symbols_and_Punctuation}</tt> -- <tt>\p{In_CJK_Unified_Ideographs}</tt> -- <tt>\p{In_CJK_Unified_Ideographs_Extension_A}</tt> -- <tt>\p{In_CJK_Unified_Ideographs_Extension_B}</tt> -- <tt>\p{In_CJK_Unified_Ideographs_Extension_C}</tt> -- <tt>\p{In_CJK_Unified_Ideographs_Extension_D}</tt> -- <tt>\p{In_CJK_Unified_Ideographs_Extension_E}</tt> -- <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_Carian}</tt> -- <tt>\p{In_Caucasian_Albanian}</tt> -- <tt>\p{In_Chakma}</tt> -- <tt>\p{In_Cham}</tt> -- <tt>\p{In_Cherokee}</tt> -- <tt>\p{In_Cherokee_Supplement}</tt> -- <tt>\p{In_Chess_Symbols}</tt> -- <tt>\p{In_Chorasmian}</tt> -- <tt>\p{In_Combining_Diacritical_Marks}</tt> -- <tt>\p{In_Combining_Diacritical_Marks_Extended}</tt> -- <tt>\p{In_Combining_Diacritical_Marks_Supplement}</tt> -- <tt>\p{In_Combining_Diacritical_Marks_for_Symbols}</tt> -- <tt>\p{In_Combining_Half_Marks}</tt> -- <tt>\p{In_Common_Indic_Number_Forms}</tt> -- <tt>\p{In_Control_Pictures}</tt> -- <tt>\p{In_Coptic}</tt> -- <tt>\p{In_Coptic_Epact_Numbers}</tt> -- <tt>\p{In_Counting_Rod_Numerals}</tt> -- <tt>\p{In_Cuneiform}</tt> -- <tt>\p{In_Cuneiform_Numbers_and_Punctuation}</tt> -- <tt>\p{In_Currency_Symbols}</tt> -- <tt>\p{In_Cypriot_Syllabary}</tt> -- <tt>\p{In_Cypro_Minoan}</tt> -- <tt>\p{In_Cyrillic}</tt> -- <tt>\p{In_Cyrillic_Extended_A}</tt> -- <tt>\p{In_Cyrillic_Extended_B}</tt> -- <tt>\p{In_Cyrillic_Extended_C}</tt> -- <tt>\p{In_Cyrillic_Extended_D}</tt> -- <tt>\p{In_Cyrillic_Supplement}</tt> -- <tt>\p{In_Deseret}</tt> -- <tt>\p{In_Devanagari}</tt> -- <tt>\p{In_Devanagari_Extended}</tt> -- <tt>\p{In_Devanagari_Extended_A}</tt> -- <tt>\p{In_Dingbats}</tt> -- <tt>\p{In_Dives_Akuru}</tt> -- <tt>\p{In_Dogra}</tt> -- <tt>\p{In_Domino_Tiles}</tt> -- <tt>\p{In_Duployan}</tt> -- <tt>\p{In_Early_Dynastic_Cuneiform}</tt> -- <tt>\p{In_Egyptian_Hieroglyph_Format_Controls}</tt> -- <tt>\p{In_Egyptian_Hieroglyphs}</tt> -- <tt>\p{In_Elbasan}</tt> -- <tt>\p{In_Elymaic}</tt> -- <tt>\p{In_Emoticons}</tt> -- <tt>\p{In_Enclosed_Alphanumeric_Supplement}</tt> -- <tt>\p{In_Enclosed_Alphanumerics}</tt> -- <tt>\p{In_Enclosed_CJK_Letters_and_Months}</tt> -- <tt>\p{In_Enclosed_Ideographic_Supplement}</tt> -- <tt>\p{In_Ethiopic}</tt> -- <tt>\p{In_Ethiopic_Extended}</tt> -- <tt>\p{In_Ethiopic_Extended_A}</tt> -- <tt>\p{In_Ethiopic_Extended_B}</tt> -- <tt>\p{In_Ethiopic_Supplement}</tt> -- <tt>\p{In_General_Punctuation}</tt> -- <tt>\p{In_Geometric_Shapes}</tt> -- <tt>\p{In_Geometric_Shapes_Extended}</tt> -- <tt>\p{In_Georgian}</tt> -- <tt>\p{In_Georgian_Extended}</tt> -- <tt>\p{In_Georgian_Supplement}</tt> -- <tt>\p{In_Glagolitic}</tt> -- <tt>\p{In_Glagolitic_Supplement}</tt> -- <tt>\p{In_Gothic}</tt> -- <tt>\p{In_Grantha}</tt> -- <tt>\p{In_Greek_Extended}</tt> -- <tt>\p{In_Greek_and_Coptic}</tt> -- <tt>\p{In_Gujarati}</tt> -- <tt>\p{In_Gunjala_Gondi}</tt> -- <tt>\p{In_Gurmukhi}</tt> -- <tt>\p{In_Halfwidth_and_Fullwidth_Forms}</tt> -- <tt>\p{In_Hangul_Compatibility_Jamo}</tt> -- <tt>\p{In_Hangul_Jamo}</tt> -- <tt>\p{In_Hangul_Jamo_Extended_A}</tt> -- <tt>\p{In_Hangul_Jamo_Extended_B}</tt> -- <tt>\p{In_Hangul_Syllables}</tt> -- <tt>\p{In_Hanifi_Rohingya}</tt> -- <tt>\p{In_Hanunoo}</tt> -- <tt>\p{In_Hatran}</tt> -- <tt>\p{In_Hebrew}</tt> -- <tt>\p{In_High_Private_Use_Surrogates}</tt> -- <tt>\p{In_High_Surrogates}</tt> -- <tt>\p{In_Hiragana}</tt> -- <tt>\p{In_IPA_Extensions}</tt> -- <tt>\p{In_Ideographic_Description_Characters}</tt> -- <tt>\p{In_Ideographic_Symbols_and_Punctuation}</tt> -- <tt>\p{In_Imperial_Aramaic}</tt> -- <tt>\p{In_Indic_Siyaq_Numbers}</tt> -- <tt>\p{In_Inscriptional_Pahlavi}</tt> -- <tt>\p{In_Inscriptional_Parthian}</tt> -- <tt>\p{In_Javanese}</tt> -- <tt>\p{In_Kaithi}</tt> -- <tt>\p{In_Kaktovik_Numerals}</tt> -- <tt>\p{In_Kana_Extended_A}</tt> -- <tt>\p{In_Kana_Extended_B}</tt> -- <tt>\p{In_Kana_Supplement}</tt> -- <tt>\p{In_Kanbun}</tt> -- <tt>\p{In_Kangxi_Radicals}</tt> -- <tt>\p{In_Kannada}</tt> -- <tt>\p{In_Katakana}</tt> -- <tt>\p{In_Katakana_Phonetic_Extensions}</tt> -- <tt>\p{In_Kawi}</tt> -- <tt>\p{In_Kayah_Li}</tt> -- <tt>\p{In_Kharoshthi}</tt> -- <tt>\p{In_Khitan_Small_Script}</tt> -- <tt>\p{In_Khmer}</tt> -- <tt>\p{In_Khmer_Symbols}</tt> -- <tt>\p{In_Khojki}</tt> -- <tt>\p{In_Khudawadi}</tt> -- <tt>\p{In_Lao}</tt> -- <tt>\p{In_Latin_1_Supplement}</tt> -- <tt>\p{In_Latin_Extended_A}</tt> -- <tt>\p{In_Latin_Extended_Additional}</tt> -- <tt>\p{In_Latin_Extended_B}</tt> -- <tt>\p{In_Latin_Extended_C}</tt> -- <tt>\p{In_Latin_Extended_D}</tt> -- <tt>\p{In_Latin_Extended_E}</tt> -- <tt>\p{In_Latin_Extended_F}</tt> -- <tt>\p{In_Latin_Extended_G}</tt> -- <tt>\p{In_Lepcha}</tt> -- <tt>\p{In_Letterlike_Symbols}</tt> -- <tt>\p{In_Limbu}</tt> -- <tt>\p{In_Linear_A}</tt> -- <tt>\p{In_Linear_B_Ideograms}</tt> -- <tt>\p{In_Linear_B_Syllabary}</tt> -- <tt>\p{In_Lisu}</tt> -- <tt>\p{In_Lisu_Supplement}</tt> -- <tt>\p{In_Low_Surrogates}</tt> -- <tt>\p{In_Lycian}</tt> -- <tt>\p{In_Lydian}</tt> -- <tt>\p{In_Mahajani}</tt> -- <tt>\p{In_Mahjong_Tiles}</tt> -- <tt>\p{In_Makasar}</tt> -- <tt>\p{In_Malayalam}</tt> -- <tt>\p{In_Mandaic}</tt> -- <tt>\p{In_Manichaean}</tt> -- <tt>\p{In_Marchen}</tt> -- <tt>\p{In_Masaram_Gondi}</tt> -- <tt>\p{In_Mathematical_Alphanumeric_Symbols}</tt> -- <tt>\p{In_Mathematical_Operators}</tt> -- <tt>\p{In_Mayan_Numerals}</tt> -- <tt>\p{In_Medefaidrin}</tt> -- <tt>\p{In_Meetei_Mayek}</tt> -- <tt>\p{In_Meetei_Mayek_Extensions}</tt> -- <tt>\p{In_Mende_Kikakui}</tt> -- <tt>\p{In_Meroitic_Cursive}</tt> -- <tt>\p{In_Meroitic_Hieroglyphs}</tt> -- <tt>\p{In_Miao}</tt> -- <tt>\p{In_Miscellaneous_Mathematical_Symbols_A}</tt> -- <tt>\p{In_Miscellaneous_Mathematical_Symbols_B}</tt> -- <tt>\p{In_Miscellaneous_Symbols}</tt> -- <tt>\p{In_Miscellaneous_Symbols_and_Arrows}</tt> -- <tt>\p{In_Miscellaneous_Symbols_and_Pictographs}</tt> -- <tt>\p{In_Miscellaneous_Technical}</tt> -- <tt>\p{In_Modi}</tt> -- <tt>\p{In_Modifier_Tone_Letters}</tt> -- <tt>\p{In_Mongolian}</tt> -- <tt>\p{In_Mongolian_Supplement}</tt> -- <tt>\p{In_Mro}</tt> -- <tt>\p{In_Multani}</tt> -- <tt>\p{In_Musical_Symbols}</tt> -- <tt>\p{In_Myanmar}</tt> -- <tt>\p{In_Myanmar_Extended_A}</tt> -- <tt>\p{In_Myanmar_Extended_B}</tt> -- <tt>\p{In_NKo}</tt> -- <tt>\p{In_Nabataean}</tt> -- <tt>\p{In_Nag_Mundari}</tt> -- <tt>\p{In_Nandinagari}</tt> -- <tt>\p{In_New_Tai_Lue}</tt> -- <tt>\p{In_Newa}</tt> -- <tt>\p{In_No_Block}</tt> -- <tt>\p{In_Number_Forms}</tt> -- <tt>\p{In_Nushu}</tt> -- <tt>\p{In_Nyiakeng_Puachue_Hmong}</tt> -- <tt>\p{In_Ogham}</tt> -- <tt>\p{In_Ol_Chiki}</tt> -- <tt>\p{In_Old_Hungarian}</tt> -- <tt>\p{In_Old_Italic}</tt> -- <tt>\p{In_Old_North_Arabian}</tt> -- <tt>\p{In_Old_Permic}</tt> -- <tt>\p{In_Old_Persian}</tt> -- <tt>\p{In_Old_Sogdian}</tt> -- <tt>\p{In_Old_South_Arabian}</tt> -- <tt>\p{In_Old_Turkic}</tt> -- <tt>\p{In_Old_Uyghur}</tt> -- <tt>\p{In_Optical_Character_Recognition}</tt> -- <tt>\p{In_Oriya}</tt> -- <tt>\p{In_Ornamental_Dingbats}</tt> -- <tt>\p{In_Osage}</tt> -- <tt>\p{In_Osmanya}</tt> -- <tt>\p{In_Ottoman_Siyaq_Numbers}</tt> -- <tt>\p{In_Pahawh_Hmong}</tt> -- <tt>\p{In_Palmyrene}</tt> -- <tt>\p{In_Pau_Cin_Hau}</tt> -- <tt>\p{In_Phags_pa}</tt> -- <tt>\p{In_Phaistos_Disc}</tt> -- <tt>\p{In_Phoenician}</tt> -- <tt>\p{In_Phonetic_Extensions}</tt> -- <tt>\p{In_Phonetic_Extensions_Supplement}</tt> -- <tt>\p{In_Playing_Cards}</tt> -- <tt>\p{In_Private_Use_Area}</tt> -- <tt>\p{In_Psalter_Pahlavi}</tt> -- <tt>\p{In_Rejang}</tt> -- <tt>\p{In_Rumi_Numeral_Symbols}</tt> -- <tt>\p{In_Runic}</tt> -- <tt>\p{In_Samaritan}</tt> -- <tt>\p{In_Saurashtra}</tt> -- <tt>\p{In_Sharada}</tt> -- <tt>\p{In_Shavian}</tt> -- <tt>\p{In_Shorthand_Format_Controls}</tt> -- <tt>\p{In_Siddham}</tt> -- <tt>\p{In_Sinhala}</tt> -- <tt>\p{In_Sinhala_Archaic_Numbers}</tt> -- <tt>\p{In_Small_Form_Variants}</tt> -- <tt>\p{In_Small_Kana_Extension}</tt> -- <tt>\p{In_Sogdian}</tt> -- <tt>\p{In_Sora_Sompeng}</tt> -- <tt>\p{In_Soyombo}</tt> -- <tt>\p{In_Spacing_Modifier_Letters}</tt> -- <tt>\p{In_Specials}</tt> -- <tt>\p{In_Sundanese}</tt> -- <tt>\p{In_Sundanese_Supplement}</tt> -- <tt>\p{In_Superscripts_and_Subscripts}</tt> -- <tt>\p{In_Supplemental_Arrows_A}</tt> -- <tt>\p{In_Supplemental_Arrows_B}</tt> -- <tt>\p{In_Supplemental_Arrows_C}</tt> -- <tt>\p{In_Supplemental_Mathematical_Operators}</tt> -- <tt>\p{In_Supplemental_Punctuation}</tt> -- <tt>\p{In_Supplemental_Symbols_and_Pictographs}</tt> -- <tt>\p{In_Supplementary_Private_Use_Area_A}</tt> -- <tt>\p{In_Supplementary_Private_Use_Area_B}</tt> -- <tt>\p{In_Sutton_SignWriting}</tt> -- <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_Syriac}</tt> -- <tt>\p{In_Syriac_Supplement}</tt> -- <tt>\p{In_Tagalog}</tt> -- <tt>\p{In_Tagbanwa}</tt> -- <tt>\p{In_Tags}</tt> -- <tt>\p{In_Tai_Le}</tt> -- <tt>\p{In_Tai_Tham}</tt> -- <tt>\p{In_Tai_Viet}</tt> -- <tt>\p{In_Tai_Xuan_Jing_Symbols}</tt> -- <tt>\p{In_Takri}</tt> -- <tt>\p{In_Tamil}</tt> -- <tt>\p{In_Tamil_Supplement}</tt> -- <tt>\p{In_Tangsa}</tt> -- <tt>\p{In_Tangut}</tt> -- <tt>\p{In_Tangut_Components}</tt> -- <tt>\p{In_Tangut_Supplement}</tt> -- <tt>\p{In_Telugu}</tt> -- <tt>\p{In_Thaana}</tt> -- <tt>\p{In_Thai}</tt> -- <tt>\p{In_Tibetan}</tt> -- <tt>\p{In_Tifinagh}</tt> -- <tt>\p{In_Tirhuta}</tt> -- <tt>\p{In_Toto}</tt> -- <tt>\p{In_Transport_and_Map_Symbols}</tt> -- <tt>\p{In_Ugaritic}</tt> -- <tt>\p{In_Unified_Canadian_Aboriginal_Syllabics}</tt> -- <tt>\p{In_Unified_Canadian_Aboriginal_Syllabics_Extended}</tt> -- <tt>\p{In_Unified_Canadian_Aboriginal_Syllabics_Extended_A}</tt> -- <tt>\p{In_Vai}</tt> -- <tt>\p{In_Variation_Selectors}</tt> -- <tt>\p{In_Variation_Selectors_Supplement}</tt> -- <tt>\p{In_Vedic_Extensions}</tt> -- <tt>\p{In_Vertical_Forms}</tt> -- <tt>\p{In_Vithkuqi}</tt> -- <tt>\p{In_Wancho}</tt> -- <tt>\p{In_Warang_Citi}</tt> -- <tt>\p{In_Yezidi}</tt> -- <tt>\p{In_Yi_Radicals}</tt> -- <tt>\p{In_Yi_Syllables}</tt> -- <tt>\p{In_Yijing_Hexagram_Symbols}</tt> -- <tt>\p{In_Zanabazar_Square}</tt> -- <tt>\p{In_Znamenny_Musical_Notation}</tt> - -=== Emoji - -- <tt>\p{Emoji}</tt> -- <tt>\p{Emoji_Component}</tt>, <tt>\p{EComp}</tt> -- <tt>\p{Emoji_Modifier}</tt>, <tt>\p{EMod}</tt> -- <tt>\p{Emoji_Modifier_Base}</tt>, <tt>\p{EBase}</tt> -- <tt>\p{Emoji_Presentation}</tt>, <tt>\p{EPres}</tt> -- <tt>\p{Extended_Pictographic}</tt>, <tt>\p{ExtPict}</tt> - -=== Graphemes - -- <tt>\p{Grapheme_Cluster_Break_CR}</tt> -- <tt>\p{Grapheme_Cluster_Break_Control}</tt> -- <tt>\p{Grapheme_Cluster_Break_Extend}</tt> -- <tt>\p{Grapheme_Cluster_Break_L}</tt> -- <tt>\p{Grapheme_Cluster_Break_LF}</tt> -- <tt>\p{Grapheme_Cluster_Break_LV}</tt> -- <tt>\p{Grapheme_Cluster_Break_LVT}</tt> -- <tt>\p{Grapheme_Cluster_Break_Prepend}</tt> -- <tt>\p{Grapheme_Cluster_Break_Regional_Indicator}</tt> -- <tt>\p{Grapheme_Cluster_Break_SpacingMark}</tt> -- <tt>\p{Grapheme_Cluster_Break_T}</tt> -- <tt>\p{Grapheme_Cluster_Break_V}</tt> -- <tt>\p{Grapheme_Cluster_Break_ZWJ}</tt> - -=== Derived Ages - -- <tt>\p{Age_10_0}</tt> -- <tt>\p{Age_11_0}</tt> -- <tt>\p{Age_12_0}</tt> -- <tt>\p{Age_12_1}</tt> -- <tt>\p{Age_13_0}</tt> -- <tt>\p{Age_14_0}</tt> -- <tt>\p{Age_15_0}</tt> -- <tt>\p{Age_1_1}</tt> -- <tt>\p{Age_2_0}</tt> -- <tt>\p{Age_2_1}</tt> -- <tt>\p{Age_3_0}</tt> -- <tt>\p{Age_3_1}</tt> -- <tt>\p{Age_3_2}</tt> -- <tt>\p{Age_4_0}</tt> -- <tt>\p{Age_4_1}</tt> -- <tt>\p{Age_5_0}</tt> -- <tt>\p{Age_5_1}</tt> -- <tt>\p{Age_5_2}</tt> -- <tt>\p{Age_6_0}</tt> -- <tt>\p{Age_6_1}</tt> -- <tt>\p{Age_6_2}</tt> -- <tt>\p{Age_6_3}</tt> -- <tt>\p{Age_7_0}</tt> -- <tt>\p{Age_8_0}</tt> -- <tt>\p{Age_9_0}</tt> diff --git a/doc/reline/face.md b/doc/reline/face.md deleted file mode 100644 index 1fa916123b..0000000000 --- a/doc/reline/face.md +++ /dev/null @@ -1,111 +0,0 @@ -# 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/rjit.md b/doc/rjit/rjit.md deleted file mode 100644 index 9e60e43ce3..0000000000 --- a/doc/rjit/rjit.md +++ /dev/null @@ -1,45 +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. - -## 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. - -### --rjit-dump-disasm - -This dumps all JIT code. You need to install libcapstone before configure and use `--enable-rjit=dev` on configure. - -* Ubuntu: `sudo apt-get install -y libcapstone-dev` -* macOS: `brew install capstone` diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 2282d7226b..7c9938c5b0 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -23,14 +23,6 @@ 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 @@ -61,7 +53,6 @@ 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 -Prism:: A portable, error-tolerant Ruby parser 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. @@ -98,6 +89,8 @@ 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 +Racc:: A LALR(1) parser generator written in Ruby. +Readline:: Provides an interface for GNU Readline and Edit Line (libedit) StringIO:: Pseudo I/O on String objects StringScanner:: Provides lexical scanning operations on a String Syslog:: Ruby interface for the POSIX system logging facility @@ -106,12 +99,6 @@ 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 @@ -129,4 +116,3 @@ 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 7694752a21..30a629bf68 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,12 +348,12 @@ 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], @@ -368,7 +368,7 @@ 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]: @@ -382,7 +382,7 @@ 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], @@ -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/encode.rdoc b/doc/string/encode.rdoc deleted file mode 100644 index 65872fdfd4..0000000000 --- a/doc/string/encode.rdoc +++ /dev/null @@ -1,47 +0,0 @@ -Returns a copy of +self+ transcoded as determined by +dst_encoding+. -By default, raises an exception if +self+ -contains an invalid byte or a character not defined in +dst_encoding+; -that behavior may be modified by encoding options; see below. - -With no arguments: - -- Uses the same encoding if <tt>Encoding.default_internal</tt> is +nil+ - (the default): - - Encoding.default_internal # => nil - s = "Ruby\x99".force_encoding('Windows-1252') - s.encoding # => #<Encoding:Windows-1252> - s.bytes # => [82, 117, 98, 121, 153] - t = s.encode # => "Ruby\x99" - t.encoding # => #<Encoding:Windows-1252> - t.bytes # => [82, 117, 98, 121, 226, 132, 162] - -- Otherwise, uses the encoding <tt>Encoding.default_internal</tt>: - - Encoding.default_internal = 'UTF-8' - t = s.encode # => "Ruby™" - t.encoding # => #<Encoding:UTF-8> - -With only argument +dst_encoding+ given, uses that encoding: - - s = "Ruby\x99".force_encoding('Windows-1252') - s.encoding # => #<Encoding:Windows-1252> - t = s.encode('UTF-8') # => "Ruby™" - t.encoding # => #<Encoding:UTF-8> - -With arguments +dst_encoding+ and +src_encoding+ given, -interprets +self+ using +src_encoding+, encodes the new string using +dst_encoding+: - - s = "Ruby\x99" - t = s.encode('UTF-8', 'Windows-1252') # => "Ruby™" - t.encoding # => #<Encoding:UTF-8> - -Optional keyword arguments +enc_opts+ specify encoding options; -see {Encoding Options}[rdoc-ref:encodings.rdoc@Encoding+Options]. - -Please note that, unless <code>invalid: :replace</code> option is -given, conversion from an encoding +enc+ to the same encoding +enc+ -(independent of whether +enc+ is given explicitly or implicitly) is a -no-op, i.e. the string is simply copied without any changes, and no -exceptions are raised, even if there are invalid bytes. - diff --git a/doc/string/length.rdoc b/doc/string/length.rdoc index 544bca269f..0a7e17f7dc 100644 --- a/doc/string/length.rdoc +++ b/doc/string/length.rdoc @@ -10,3 +10,4 @@ Contrast with String#bytesize: 'тест'.bytesize # => 8 'こんにちは'.bytesize # => 15 +String#size is an alias for String#length. diff --git a/doc/syntax.rdoc b/doc/syntax.rdoc index 6ca5843512..5895673f36 100644 --- a/doc/syntax.rdoc +++ b/doc/syntax.rdoc @@ -37,6 +37,3 @@ 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 e30cb35adf..1321bbf3ac 100644 --- a/doc/syntax/assignment.rdoc +++ b/doc/syntax/assignment.rdoc @@ -107,7 +107,7 @@ Rather than printing "true" you receive a NameError, "undefined local variable or method `a'". Since ruby parses the bare +a+ left of the +if+ first and has not yet seen an assignment to +a+ it assumes you wish to call a method. Ruby then sees the assignment to +a+ and will assume you are referencing a local -variable. +method. The confusion comes from the out-of-order execution of the expression. First the local variable is assigned-to then you attempt to call a nonexistent @@ -403,10 +403,6 @@ assigning. This is similar to multiple assignment: p a # prints [1, 2, 3] - b = *1 - - p b # prints [1] - You can splat anywhere in the right-hand side of the assignment: a = 1, *[2, 3] diff --git a/doc/syntax/calling_methods.rdoc b/doc/syntax/calling_methods.rdoc index 6cc8678450..da061dbfdb 100644 --- a/doc/syntax/calling_methods.rdoc +++ b/doc/syntax/calling_methods.rdoc @@ -322,6 +322,18 @@ 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: + + def my_method(a, b, c: 3) + end + + arguments = [1, 2, { c: 4 }] + my_method(*arguments) + +Note that this behavior is currently deprecated and will emit a warning. +This behavior will be removed in Ruby 3.0. + You may also use the <code>**</code> (described next) to convert a Hash into keyword arguments. diff --git a/doc/syntax/comments.rdoc b/doc/syntax/comments.rdoc index 00d19d588a..dbc7816984 100644 --- a/doc/syntax/comments.rdoc +++ b/doc/syntax/comments.rdoc @@ -196,7 +196,7 @@ The method Module#const_set is not affected. In this mode, all values assigned to constants are deeply copied and made shareable. It is safer mode than +experimental_everything+. - # shareable_constant_value: experimental_copy + # shareable_constant_value: experimental_everything var = [{foo: []}] var.frozen? # => false (assignment was made to local variable) X = var # => calls `Ractor.make_shareable(var, copy: true)` diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc index 5350585f15..df3b5ced38 100644 --- a/doc/syntax/control_expressions.rdoc +++ b/doc/syntax/control_expressions.rdoc @@ -569,71 +569,3 @@ evaluated on the following iteration: Here, the flip-flop turns on when +value+ equals 2, but doesn't turn off on the same iteration. The `off' condition isn't evaluated until the following iteration and +value+ will never be two again. - -== throw/catch - -+throw+ and +catch+ are used to implement non-local control flow in Ruby. They -operate similarly to exceptions, allowing control to pass directly from the -place where +throw+ is called to the place where the matching +catch+ is -called. The main difference between +throw+/+catch+ and the use of exceptions -is that +throw+/+catch+ are designed for expected non-local control flow, -while exceptions are designed for exceptional control flow situations, such -as handling unexpected errors. - -When using +throw+, you provide 1-2 arguments. The first argument is the -value for the matching +catch+. The second argument is optional (defaults to -+nil+), and will be the value that +catch+ returns if there is a matching -+throw+ inside the +catch+ block. If no matching +throw+ method is called -inside a +catch+ block, the +catch+ method returns the return value of the -block passed to it. - - def a(n) - throw :d, :a if n == 0 - b(n) - end - - def b(n) - throw :d, :b if n == 1 - c(n) - end - - def c(n) - throw :d if n == 2 - end - - 4.times.map do |i| - catch(:d) do - a(i) - :default - end - end - # => [:a, :b, nil, :default] - -If the first argument you pass to +throw+ is not handled by a matching -+catch+, an UncaughtThrowError exception will be raised. This is because -+throw+/+catch+ should only be used for expected control flow changes, so -using a value that is not already expected is an error. - -+throw+/+catch+ are implemented as Kernel methods (Kernel#throw and -Kernel#catch), not as keywords. So they are not usable directly if you are -in a BasicObject context. You can use Kernel.throw and Kernel.catch in -this case: - - BasicObject.new.instance_exec do - def a - b - end - - def b - c - end - - def c - ::Kernel.throw :d, :e - end - - result = ::Kernel.catch(:d) do - a - end - result # => :e - end diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc index 0c1e4a434b..b641433249 100644 --- a/doc/syntax/literals.rdoc +++ b/doc/syntax/literals.rdoc @@ -414,9 +414,9 @@ slash (<tt>'/'</tt>) characters: re = /foo/ # => /foo/ re.class # => Regexp -The trailing slash may be followed by one or more modifiers characters -that set modes for the regexp. -See {Regexp modes}[rdoc-ref:Regexp@Modes] for details. +The trailing slash may be followed by one or more _flag_ characters +that modify the behavior. +See {Regexp options}[rdoc-ref:Regexp@Options] for details. Interpolation may be used inside regular expressions along with escaped characters. Note that a regular expression may require additional escaped @@ -523,9 +523,9 @@ A few "symmetrical" character pairs may be used as delimiters: %r(foo) # => /foo/ %r<foo> # => /foo/ -The trailing delimiter may be followed by one or more modifier characters -that set modes for the regexp. -See {Regexp modes}[rdoc-ref:Regexp@Modes] for details. +The trailing delimiter may be followed by one or more _flag_ characters +that modify the behavior. +See {Regexp options}[rdoc-ref:Regexp@Options] for details. === <tt>%x</tt>: Backtick Literals diff --git a/doc/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc index 9e05c5c774..024815a5a6 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 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. +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. == Nesting @@ -259,28 +259,6 @@ 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 deleted file mode 100644 index 236b3413b5..0000000000 --- a/doc/syntax/operators.rdoc +++ /dev/null @@ -1,75 +0,0 @@ -= 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 therefor 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 e49c09a1f8..b7d614770c 100644 --- a/doc/syntax/pattern_matching.rdoc +++ b/doc/syntax/pattern_matching.rdoc @@ -415,11 +415,6 @@ Additionally, when matching custom classes, the expected class can be specified end #=> "matched: 1" -These core and library classes implement deconstruction: - -* MatchData#deconstruct and MatchData#deconstruct_keys; -* Time#deconstruct_keys, Date#deconstruct_keys, DateTime#deconstruct_keys. - == Guard clauses +if+ can be used to attach an additional condition (guard clause) when the pattern matches. This condition may use bound variables: @@ -450,6 +445,29 @@ These core and library classes implement deconstruction: end #=> "matched" +== Current feature status + +As of Ruby 3.1, find patterns are considered _experimental_: its syntax can change in the future. Every time you use these features in code, a warning will be printed: + + [0] => [*, 0, *] + # warning: Find pattern is experimental, and the behavior may change in future versions of Ruby! + # warning: One-line pattern matching is experimental, and the behavior may change in future versions of Ruby! + +To suppress this warning, one may use the Warning::[]= method: + + Warning[:experimental] = false + eval('[0] => [*, 0, *]') + # ...no warning printed... + +Note that pattern-matching warnings are raised at compile time, so this will not suppress the warning: + + Warning[:experimental] = false # At the time this line is evaluated, the parsing happened and warning emitted + [0] => [*, 0, *] + +So, only subsequently loaded files or `eval`-ed code is affected by switching the flag. + +Alternatively, the command line option <code>-W:no-experimental</code> can be used to turn off "experimental" feature warnings. + == Appendix A. Pattern syntax Approximate syntax is: diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc index 17d5e67c21..c900ab1bdc 100644 --- a/doc/syntax/refinements.rdoc +++ b/doc/syntax/refinements.rdoc @@ -279,6 +279,6 @@ Refinements in descendants have higher precedence than those of ancestors. == Further Reading -See https://github.com/ruby/ruby/wiki/Refinements-Spec for the +See https://bugs.ruby-lang.org/projects/ruby-master/wiki/RefinementsSpec for the current specification for implementing refinements. The specification also contains more details. diff --git a/doc/timezones.rdoc b/doc/timezones.rdoc new file mode 100644 index 0000000000..c3aae88fde --- /dev/null +++ b/doc/timezones.rdoc @@ -0,0 +1,108 @@ +== 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/transcode.rdoc b/doc/transcode.rdoc new file mode 100644 index 0000000000..4f15dff94a --- /dev/null +++ b/doc/transcode.rdoc @@ -0,0 +1,52 @@ +# :markup: ruby + +class String + # call-seq: + # encode(dst_encoding = Encoding.default_internal, **enc_opts) -> string + # encode(dst_encoding, src_encoding, **enc_opts) -> string + # + # Returns a copy of +self+ transcoded as determined by +dst_encoding+. + # By default, raises an exception if +self+ + # contains an invalid byte or a character not defined in +dst_encoding+; + # that behavior may be modified by encoding options; see below. + # + # With no arguments: + # + # - Uses the same encoding if <tt>Encoding.default_internal</tt> is +nil+ + # (the default): + # + # Encoding.default_internal # => nil + # s = "Ruby\x99".force_encoding('Windows-1252') + # s.encoding # => #<Encoding:Windows-1252> + # s.bytes # => [82, 117, 98, 121, 153] + # t = s.encode # => "Ruby\x99" + # t.encoding # => #<Encoding:Windows-1252> + # t.bytes # => [82, 117, 98, 121, 226, 132, 162] + # + # - Otherwise, uses the encoding <tt>Encoding.default_internal</tt>: + # + # Encoding.default_internal = 'UTF-8' + # t = s.encode # => "Ruby™" + # t.encoding # => #<Encoding:UTF-8> + # + # With only argument +dst_encoding+ given, uses that encoding: + # + # s = "Ruby\x99".force_encoding('Windows-1252') + # s.encoding # => #<Encoding:Windows-1252> + # t = s.encode('UTF-8') # => "Ruby™" + # t.encoding # => #<Encoding:UTF-8> + # + # With arguments +dst_encoding+ and +src_encoding+ given, + # interprets +self+ using +src_encoding+, encodes the new string using +dst_encoding+: + # + # s = "Ruby\x99" + # t = s.encode('UTF-8', 'Windows-1252') # => "Ruby™" + # t.encoding # => #<Encoding:UTF-8> + # + # Optional keyword arguments +enc_opts+ specify encoding options; + # see {Encoding Options}[rdoc-ref:encodings.rdoc@Encoding+Options]. + def encode(dst_encoding = Encoding.default_internal, **enc_opts) + # Pseudo code + Primitive.str_encode(...) + end +end diff --git a/doc/windows.md b/doc/windows.md deleted file mode 100644 index 65c6b15c45..0000000000 --- a/doc/windows.md +++ /dev/null @@ -1,233 +0,0 @@ -# Windows - -Ruby supports a few native build platforms for Windows. - -* 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 Windows Universal CRT - -## Building Ruby using Mingw with UCRT - -The easiest build environment is just a standard [RubyInstaller-Devkit] -installation and [git-for-windows]. You might like to use [VSCode] as an -editor. - -### Build examples - -Ruby core development can be done either in Windows `cmd` like: - -``` -ridk enable ucrt64 - -pacman -S --needed %MINGW_PACKAGE_PREFIX%-openssl %MINGW_PACKAGE_PREFIX%-libyaml %MINGW_PACKAGE_PREFIX%-libffi - -cd c:\ -mkdir work -cd work -git clone https://github.com/ruby/ruby - -cd c:\work\ruby -sh autogen.sh -sh configure -C --disable-install-doc -make -``` - -or in MSYS2 `bash` like: - -``` -ridk enable ucrt64 -bash - -pacman -S --needed $MINGW_PACKAGE_PREFIX-openssl $MINGW_PACKAGE_PREFIX-libyaml $MINGW_PACKAGE_PREFIX-libffi - -cd /c/ -mkdir work -cd work -git clone https://github.com/ruby/ruby -cd ruby - -./autogen.sh -./configure -C --disable-install-doc -make -``` - -[RubyInstaller-Devkit]: https://rubyinstaller.org/ -[git-for-windows]: https://gitforwindows.org/ -[VSCode]: https://code.visualstudio.com/ - -## Building Ruby using Visual C++ - -### Requirement - -1. Windows 7 or later. - -2. Visual C++ 12.0 (2013) 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. - - **Note** building ruby requires following commands. - - * 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 - - You can use [scoop](https://scoop.sh/) to install them like: - - ``` - scoop install git ruby sed patch - ``` - -5. You need to install required libraries using [vcpkg](https://vcpkg.io/) like: - - ``` - vcpkg --triplet x64-windows install openssl libffi libyaml zlib - ``` - -6. Enable Command Extension of your command line. It's the default behavior - of `cmd.exe`. If you want to enable it explicitly, run `cmd.exe` with - `/E:ON` option. - -### How to compile and install - -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` - You can also specify the 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. - -3. You need specify vcpkg directory to use `--with-opt-dir` - option like `configure --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` - -7. Run `nmake install` - -### Build examples - -* Build on the ruby source directory. - - ``` - ruby source directory: C:\ruby - build directory: C:\ruby - install directory: C:\usr\local - ``` - - ``` - C: - cd \ruby - win32\configure --prefix=/usr/local - nmake - nmake check - nmake install - ``` - -* Build on the relative directory from the ruby source directory. - - ``` - ruby source directory: C:\ruby - build directory: C:\ruby\mswin32 - install directory: C:\usr\local - ``` - - ``` - C: - cd \ruby - mkdir mswin32 - cd mswin32 - ..\win32\configure --prefix=/usr/local - nmake - nmake check - nmake install - ``` - -* Build on the different drive. - - ``` - ruby source directory: C:\src\ruby - build directory: D:\build\ruby - install directory: C:\usr\local - ``` - - ``` - D: - cd D:\build\ruby - C:\src\ruby\win32\configure --prefix=/usr/local - nmake - nmake check - nmake install DESTDIR=C: - ``` - -* Build x64 version (requires native x64 VC++ compiler) - - ``` - ruby source directory: C:\ruby - build directory: C:\ruby - install directory: C:\usr\local - ``` - - ``` - C: - cd \ruby - win32\configure --prefix=/usr/local --target=x64-mswin64 - nmake - nmake check - nmake install - ``` - -### Bugs - -You can **NOT** use a path name that contains any white space characters -as the ruby source directory, this restriction comes from the behavior -of `!INCLUDE` directives of `NMAKE`. - -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`. - -## Icons - -Any icon files(`*.ico`) in the build directory, directories specified with -_icondirs_ make variable and `win32` directory under the ruby -source directory will be included in DLL or executable files, according -to their base names. - $(RUBY_INSTALL_NAME).ico or ruby.ico --> $(RUBY_INSTALL_NAME).exe - $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe - the others --> $(RUBY_SO_NAME).dll - -Although no icons are distributed with the ruby source, you can use -anything you like. You will be able to find many images by search engines. -For example, followings are made from [Ruby logo kit]: - -* Small [favicon] in the official site - -* [vit-ruby.ico] or [icon itself] - -[Ruby logo kit]: https://cache.ruby-lang.org/pub/misc/logo/ruby-logo-kit.zip -[favicon]: https://www.ruby-lang.org/favicon.ico -[vit-ruby.ico]: http://ruby.morphball.net/vit-ruby-ico_en.html -[icon itself]: http://ruby.morphball.net/icon/vit-ruby.ico diff --git a/doc/yjit/yjit.md b/doc/yjit/yjit.md index e6446e3ed1..67b2ffa5f0 100644 --- a/doc/yjit/yjit.md +++ b/doc/yjit/yjit.md @@ -4,27 +4,26 @@ </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: -- 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) @@ -32,31 +31,31 @@ 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 MPLR 2023 paper: +To cite YJIT in your publications, please cite the VMIL 2021 paper: ``` -@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}, +@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}, publisher = {Association for Computing Machinery}, address = {New York, NY, USA}, -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} +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} } ``` ## Current Limitations -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). +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. ## Installation @@ -113,7 +112,7 @@ On macOS, you may need to specify where to find some libraries: ```sh # Install dependencies -brew install openssl libyaml +brew install openssl readline libyaml # Configure in dev (debug) mode for development, build and install ./autogen.sh @@ -165,61 +164,32 @@ The machine code generated for a given method can be printed by adding `puts Rub 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-exec-mem-size=N`: size of the executable memory block to allocate, in MiB (default 48 MiB) -- `--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-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-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-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 specific exits. Automatically enables `--yjit-stats` -- `--yjit-trace-exits-sample-rate=N`: trace exit locations only every Nth occurrence 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 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 --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. +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. ## 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-exec-mem-size When JIT code size (`RubyVM::YJIT.runtime_stats[:code_region_size]`) reaches this value, -YJIT stops compiling new code. Increasing the executable memory size 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 ratio of YJIT-executed instructions in %. -Ideally, `ratio_in_yjit` should be as large as 99%, and increasing `--yjit-exec-mem-size` often -helps improving `ratio_in_yjit`. +YJIT triggers "code GC" that frees all JIT code and starts recompiling everything. +Compiling code takes some time, so scheduling code GC too frequently slows down your application. +Increasing `--yjit-exec-mem-size` may speed up your application if `RubyVM::YJIT.runtime_stats[:code_gc_count]` is not 0 or 1. ### Running workers as long as possible @@ -231,29 +201,30 @@ 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 +## Saving 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. +### Increasing --yjit-call-threshold + +As of Ruby 3.2, `--yjit-call-threshold` defaults to 30. With this default, some applications end up +compiling methods that are used only during the application boot. Increasing this option may help +you reduce the size of JIT code and metadata. It's worth trying different values like `--yjit-call-threshold=100`. + +Note that increasing the value too much may result in compiling code too late. +You should monitor how many requests each worker processes before it's restarted. For example, +if each process only handles 1000 requests, `--yjit-call-threshold=1000` might be too large for your application. + ### Decreasing --yjit-exec-mem-size -The `--yjit-exec-mem-size` option specifies the JIT code size, but YJIT also uses memory for its metadata, +`--yjit-exec-mem-size` specifies the JIT code size, but YJIT also uses memory for its metadata, which often consumes more memory than JIT code. Generally, YJIT adds memory overhead by roughly -3-4x of `--yjit-exec-mem-size` in production as of Ruby 3.3. You should multiply that by the number +3-4x of `--yjit-exec-mem-size` in production as of Ruby 3.2. You should multiply that by the number of worker processes to estimate the worst case memory overhead. -`--yjit-exec-mem-size=48` is the default since Ruby 3.3.1, -but smaller values like 32 MiB might make sense for your application. -While doing so, 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. +Running code GC adds overhead, but it could be still faster than recovering from a whole process killed by OOM. ## Code Optimization Tips @@ -265,7 +236,7 @@ This section contains tips on writing Ruby code that will run as fast as possibl - 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 + - 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 C methods like `Array#each` - This is not idiomatic Ruby, but could help in hot methods @@ -275,16 +246,16 @@ You can also use the `--yjit-stats` command-line option to see which bytecodes c ### Other Statistics -If you run `ruby` with `--yjit-stats`, YJIT will track and return performance statistics in `RubyVM::YJIT.runtime_stats`. +If you run `ruby` with `--yjit --yjit-stats`, YJIT will track and return performance statistics in `RubyVM::YJIT.runtime_stats`. ```rb -$ RUBYOPT="--yjit-stats" irb +$ RUBYOPT="--yjit --yjit-stats" irb irb(main):001:0> RubyVM::YJIT.runtime_stats => {:inline_code_size=>340745, :outlined_code_size=>297664, :all_stats=>true, - :yjit_insns_count=>1547816, + :exec_instruction=>1547816, :send_callsite_not_simple=>7267, :send_kw_splat=>7, :send_ivar_set_method=>72, @@ -293,7 +264,7 @@ irb(main):001:0> RubyVM::YJIT.runtime_stats Some of the counters include: -* :yjit_insns_count - how many Ruby bytecode instructions have been executed +* :exec_instruction - 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 @@ -305,26 +276,25 @@ Some of the counters include: * :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.) +Counters starting with "exit_" show reasons for YJIT code taking a side exit (return to the interpreter.) See yjit_hacking.md for more details. -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 — 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 one does, it's usually best to search the source code for it — 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 `RubyVM::YJIT.runtime_stats`. +The printed text after a --yjit-stats run includes other information that may be named differently than the information in runtime_stats. ## Contributing -We welcome open source contributions. You should feel free to open new issues to report bugs or just to ask questions. +We welcome open source contributors. 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 the [Shopify/ruby repository](https://github.com/Shopify/ruby/issues) so that +If you would like to contribute a large patch to YJIT, we suggest opening an issue or a discussion on this repository 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 so we can have a productive discussion as to how -you can contribute patches we will want to merge into YJIT. +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. ### Source Code Organization @@ -337,8 +307,8 @@ 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/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 +- `yjit/src/cruby.rs`: C bindings manually exposed to the Rust codebase The core of CRuby's interpreter logic is found in: - `insns.def`: defines Ruby's bytecode instructions (gets compiled into `vm.inc`) @@ -361,12 +331,11 @@ add them to `yjit/cruby.rs` instead. ### Coding & Debugging Protips -There are multiple test suites: +There are 3 test suites: - `make btest` (see `/bootstraptest`) - `make test-all` - `make test-spec` - `make check` runs all of the above -- `make yjit-smoke-test` runs quick checks to see that YJIT is working correctly The tests can be run in parallel like this: @@ -446,30 +415,3 @@ 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. - -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 -``` diff --git a/enc/depend b/enc/depend index 12ddbc223a..973ad93010 100644 --- a/enc/depend +++ b/enc/depend @@ -58,8 +58,12 @@ TRANSCLEANOBJS = <%=cleanobjs.map {|clean| LIBTRANS=enc/libtrans.$(LIBEXT) UNICODE_HDR_DIR = --missing-unicode-header-dir-- -encs all: <%= MODULE_TYPE == :static ? "lib" : "mod" %>encs -modencs: enc trans +encs: all +% if MODULE_TYPE == :static +all: libenc libtrans +% else +all: enc trans +%end libencs: libenc libtrans enc: $(ENCSOS) libenc: $(LIBENC) @@ -230,7 +234,6 @@ enc/ascii.$(OBJEXT): internal/attr/noexcept.h enc/ascii.$(OBJEXT): internal/attr/noinline.h enc/ascii.$(OBJEXT): internal/attr/nonnull.h enc/ascii.$(OBJEXT): internal/attr/noreturn.h -enc/ascii.$(OBJEXT): internal/attr/packed_struct.h enc/ascii.$(OBJEXT): internal/attr/pure.h enc/ascii.$(OBJEXT): internal/attr/restrict.h enc/ascii.$(OBJEXT): internal/attr/returns_nonnull.h @@ -299,6 +302,7 @@ enc/ascii.$(OBJEXT): internal/intern/enumerator.h enc/ascii.$(OBJEXT): internal/intern/error.h enc/ascii.$(OBJEXT): internal/intern/eval.h enc/ascii.$(OBJEXT): internal/intern/file.h +enc/ascii.$(OBJEXT): internal/intern/gc.h enc/ascii.$(OBJEXT): internal/intern/hash.h enc/ascii.$(OBJEXT): internal/intern/io.h enc/ascii.$(OBJEXT): internal/intern/load.h @@ -329,6 +333,7 @@ enc/ascii.$(OBJEXT): internal/memory.h enc/ascii.$(OBJEXT): internal/method.h enc/ascii.$(OBJEXT): internal/module.h enc/ascii.$(OBJEXT): internal/newobj.h +enc/ascii.$(OBJEXT): internal/rgengc.h enc/ascii.$(OBJEXT): internal/scan_args.h enc/ascii.$(OBJEXT): internal/special_consts.h enc/ascii.$(OBJEXT): internal/static_assert.h @@ -400,7 +405,6 @@ enc/big5.$(OBJEXT): internal/attr/noexcept.h enc/big5.$(OBJEXT): internal/attr/noinline.h enc/big5.$(OBJEXT): internal/attr/nonnull.h enc/big5.$(OBJEXT): internal/attr/noreturn.h -enc/big5.$(OBJEXT): internal/attr/packed_struct.h enc/big5.$(OBJEXT): internal/attr/pure.h enc/big5.$(OBJEXT): internal/attr/restrict.h enc/big5.$(OBJEXT): internal/attr/returns_nonnull.h @@ -460,6 +464,7 @@ enc/big5.$(OBJEXT): internal/intern/enumerator.h enc/big5.$(OBJEXT): internal/intern/error.h enc/big5.$(OBJEXT): internal/intern/eval.h enc/big5.$(OBJEXT): internal/intern/file.h +enc/big5.$(OBJEXT): internal/intern/gc.h enc/big5.$(OBJEXT): internal/intern/hash.h enc/big5.$(OBJEXT): internal/intern/io.h enc/big5.$(OBJEXT): internal/intern/load.h @@ -490,6 +495,7 @@ enc/big5.$(OBJEXT): internal/memory.h enc/big5.$(OBJEXT): internal/method.h enc/big5.$(OBJEXT): internal/module.h enc/big5.$(OBJEXT): internal/newobj.h +enc/big5.$(OBJEXT): internal/rgengc.h enc/big5.$(OBJEXT): internal/scan_args.h enc/big5.$(OBJEXT): internal/special_consts.h enc/big5.$(OBJEXT): internal/static_assert.h @@ -562,7 +568,6 @@ enc/cesu_8.$(OBJEXT): internal/attr/noexcept.h enc/cesu_8.$(OBJEXT): internal/attr/noinline.h enc/cesu_8.$(OBJEXT): internal/attr/nonnull.h enc/cesu_8.$(OBJEXT): internal/attr/noreturn.h -enc/cesu_8.$(OBJEXT): internal/attr/packed_struct.h enc/cesu_8.$(OBJEXT): internal/attr/pure.h enc/cesu_8.$(OBJEXT): internal/attr/restrict.h enc/cesu_8.$(OBJEXT): internal/attr/returns_nonnull.h @@ -631,6 +636,7 @@ enc/cesu_8.$(OBJEXT): internal/intern/enumerator.h enc/cesu_8.$(OBJEXT): internal/intern/error.h enc/cesu_8.$(OBJEXT): internal/intern/eval.h enc/cesu_8.$(OBJEXT): internal/intern/file.h +enc/cesu_8.$(OBJEXT): internal/intern/gc.h enc/cesu_8.$(OBJEXT): internal/intern/hash.h enc/cesu_8.$(OBJEXT): internal/intern/io.h enc/cesu_8.$(OBJEXT): internal/intern/load.h @@ -661,6 +667,7 @@ enc/cesu_8.$(OBJEXT): internal/memory.h enc/cesu_8.$(OBJEXT): internal/method.h enc/cesu_8.$(OBJEXT): internal/module.h enc/cesu_8.$(OBJEXT): internal/newobj.h +enc/cesu_8.$(OBJEXT): internal/rgengc.h enc/cesu_8.$(OBJEXT): internal/scan_args.h enc/cesu_8.$(OBJEXT): internal/special_consts.h enc/cesu_8.$(OBJEXT): internal/static_assert.h @@ -732,7 +739,6 @@ enc/cp949.$(OBJEXT): internal/attr/noexcept.h enc/cp949.$(OBJEXT): internal/attr/noinline.h enc/cp949.$(OBJEXT): internal/attr/nonnull.h enc/cp949.$(OBJEXT): internal/attr/noreturn.h -enc/cp949.$(OBJEXT): internal/attr/packed_struct.h enc/cp949.$(OBJEXT): internal/attr/pure.h enc/cp949.$(OBJEXT): internal/attr/restrict.h enc/cp949.$(OBJEXT): internal/attr/returns_nonnull.h @@ -792,6 +798,7 @@ enc/cp949.$(OBJEXT): internal/intern/enumerator.h enc/cp949.$(OBJEXT): internal/intern/error.h enc/cp949.$(OBJEXT): internal/intern/eval.h enc/cp949.$(OBJEXT): internal/intern/file.h +enc/cp949.$(OBJEXT): internal/intern/gc.h enc/cp949.$(OBJEXT): internal/intern/hash.h enc/cp949.$(OBJEXT): internal/intern/io.h enc/cp949.$(OBJEXT): internal/intern/load.h @@ -822,6 +829,7 @@ enc/cp949.$(OBJEXT): internal/memory.h enc/cp949.$(OBJEXT): internal/method.h enc/cp949.$(OBJEXT): internal/module.h enc/cp949.$(OBJEXT): internal/newobj.h +enc/cp949.$(OBJEXT): internal/rgengc.h enc/cp949.$(OBJEXT): internal/scan_args.h enc/cp949.$(OBJEXT): internal/special_consts.h enc/cp949.$(OBJEXT): internal/static_assert.h @@ -892,7 +900,6 @@ enc/emacs_mule.$(OBJEXT): internal/attr/noexcept.h enc/emacs_mule.$(OBJEXT): internal/attr/noinline.h enc/emacs_mule.$(OBJEXT): internal/attr/nonnull.h enc/emacs_mule.$(OBJEXT): internal/attr/noreturn.h -enc/emacs_mule.$(OBJEXT): internal/attr/packed_struct.h enc/emacs_mule.$(OBJEXT): internal/attr/pure.h enc/emacs_mule.$(OBJEXT): internal/attr/restrict.h enc/emacs_mule.$(OBJEXT): internal/attr/returns_nonnull.h @@ -952,6 +959,7 @@ enc/emacs_mule.$(OBJEXT): internal/intern/enumerator.h enc/emacs_mule.$(OBJEXT): internal/intern/error.h enc/emacs_mule.$(OBJEXT): internal/intern/eval.h enc/emacs_mule.$(OBJEXT): internal/intern/file.h +enc/emacs_mule.$(OBJEXT): internal/intern/gc.h enc/emacs_mule.$(OBJEXT): internal/intern/hash.h enc/emacs_mule.$(OBJEXT): internal/intern/io.h enc/emacs_mule.$(OBJEXT): internal/intern/load.h @@ -982,6 +990,7 @@ enc/emacs_mule.$(OBJEXT): internal/memory.h enc/emacs_mule.$(OBJEXT): internal/method.h enc/emacs_mule.$(OBJEXT): internal/module.h enc/emacs_mule.$(OBJEXT): internal/newobj.h +enc/emacs_mule.$(OBJEXT): internal/rgengc.h enc/emacs_mule.$(OBJEXT): internal/scan_args.h enc/emacs_mule.$(OBJEXT): internal/special_consts.h enc/emacs_mule.$(OBJEXT): internal/static_assert.h @@ -1053,7 +1062,6 @@ enc/encdb.$(OBJEXT): internal/attr/noexcept.h enc/encdb.$(OBJEXT): internal/attr/noinline.h enc/encdb.$(OBJEXT): internal/attr/nonnull.h enc/encdb.$(OBJEXT): internal/attr/noreturn.h -enc/encdb.$(OBJEXT): internal/attr/packed_struct.h enc/encdb.$(OBJEXT): internal/attr/pure.h enc/encdb.$(OBJEXT): internal/attr/restrict.h enc/encdb.$(OBJEXT): internal/attr/returns_nonnull.h @@ -1122,6 +1130,7 @@ enc/encdb.$(OBJEXT): internal/intern/enumerator.h enc/encdb.$(OBJEXT): internal/intern/error.h enc/encdb.$(OBJEXT): internal/intern/eval.h enc/encdb.$(OBJEXT): internal/intern/file.h +enc/encdb.$(OBJEXT): internal/intern/gc.h enc/encdb.$(OBJEXT): internal/intern/hash.h enc/encdb.$(OBJEXT): internal/intern/io.h enc/encdb.$(OBJEXT): internal/intern/load.h @@ -1152,6 +1161,7 @@ enc/encdb.$(OBJEXT): internal/memory.h enc/encdb.$(OBJEXT): internal/method.h enc/encdb.$(OBJEXT): internal/module.h enc/encdb.$(OBJEXT): internal/newobj.h +enc/encdb.$(OBJEXT): internal/rgengc.h enc/encdb.$(OBJEXT): internal/scan_args.h enc/encdb.$(OBJEXT): internal/special_consts.h enc/encdb.$(OBJEXT): internal/static_assert.h @@ -1225,7 +1235,6 @@ enc/euc_jp.$(OBJEXT): internal/attr/noexcept.h enc/euc_jp.$(OBJEXT): internal/attr/noinline.h enc/euc_jp.$(OBJEXT): internal/attr/nonnull.h enc/euc_jp.$(OBJEXT): internal/attr/noreturn.h -enc/euc_jp.$(OBJEXT): internal/attr/packed_struct.h enc/euc_jp.$(OBJEXT): internal/attr/pure.h enc/euc_jp.$(OBJEXT): internal/attr/restrict.h enc/euc_jp.$(OBJEXT): internal/attr/returns_nonnull.h @@ -1285,6 +1294,7 @@ enc/euc_jp.$(OBJEXT): internal/intern/enumerator.h enc/euc_jp.$(OBJEXT): internal/intern/error.h enc/euc_jp.$(OBJEXT): internal/intern/eval.h enc/euc_jp.$(OBJEXT): internal/intern/file.h +enc/euc_jp.$(OBJEXT): internal/intern/gc.h enc/euc_jp.$(OBJEXT): internal/intern/hash.h enc/euc_jp.$(OBJEXT): internal/intern/io.h enc/euc_jp.$(OBJEXT): internal/intern/load.h @@ -1315,6 +1325,7 @@ enc/euc_jp.$(OBJEXT): internal/memory.h enc/euc_jp.$(OBJEXT): internal/method.h enc/euc_jp.$(OBJEXT): internal/module.h enc/euc_jp.$(OBJEXT): internal/newobj.h +enc/euc_jp.$(OBJEXT): internal/rgengc.h enc/euc_jp.$(OBJEXT): internal/scan_args.h enc/euc_jp.$(OBJEXT): internal/special_consts.h enc/euc_jp.$(OBJEXT): internal/static_assert.h @@ -1385,7 +1396,6 @@ enc/euc_kr.$(OBJEXT): internal/attr/noexcept.h enc/euc_kr.$(OBJEXT): internal/attr/noinline.h enc/euc_kr.$(OBJEXT): internal/attr/nonnull.h enc/euc_kr.$(OBJEXT): internal/attr/noreturn.h -enc/euc_kr.$(OBJEXT): internal/attr/packed_struct.h enc/euc_kr.$(OBJEXT): internal/attr/pure.h enc/euc_kr.$(OBJEXT): internal/attr/restrict.h enc/euc_kr.$(OBJEXT): internal/attr/returns_nonnull.h @@ -1445,6 +1455,7 @@ enc/euc_kr.$(OBJEXT): internal/intern/enumerator.h enc/euc_kr.$(OBJEXT): internal/intern/error.h enc/euc_kr.$(OBJEXT): internal/intern/eval.h enc/euc_kr.$(OBJEXT): internal/intern/file.h +enc/euc_kr.$(OBJEXT): internal/intern/gc.h enc/euc_kr.$(OBJEXT): internal/intern/hash.h enc/euc_kr.$(OBJEXT): internal/intern/io.h enc/euc_kr.$(OBJEXT): internal/intern/load.h @@ -1475,6 +1486,7 @@ enc/euc_kr.$(OBJEXT): internal/memory.h enc/euc_kr.$(OBJEXT): internal/method.h enc/euc_kr.$(OBJEXT): internal/module.h enc/euc_kr.$(OBJEXT): internal/newobj.h +enc/euc_kr.$(OBJEXT): internal/rgengc.h enc/euc_kr.$(OBJEXT): internal/scan_args.h enc/euc_kr.$(OBJEXT): internal/special_consts.h enc/euc_kr.$(OBJEXT): internal/static_assert.h @@ -1545,7 +1557,6 @@ enc/euc_tw.$(OBJEXT): internal/attr/noexcept.h enc/euc_tw.$(OBJEXT): internal/attr/noinline.h enc/euc_tw.$(OBJEXT): internal/attr/nonnull.h enc/euc_tw.$(OBJEXT): internal/attr/noreturn.h -enc/euc_tw.$(OBJEXT): internal/attr/packed_struct.h enc/euc_tw.$(OBJEXT): internal/attr/pure.h enc/euc_tw.$(OBJEXT): internal/attr/restrict.h enc/euc_tw.$(OBJEXT): internal/attr/returns_nonnull.h @@ -1605,6 +1616,7 @@ enc/euc_tw.$(OBJEXT): internal/intern/enumerator.h enc/euc_tw.$(OBJEXT): internal/intern/error.h enc/euc_tw.$(OBJEXT): internal/intern/eval.h enc/euc_tw.$(OBJEXT): internal/intern/file.h +enc/euc_tw.$(OBJEXT): internal/intern/gc.h enc/euc_tw.$(OBJEXT): internal/intern/hash.h enc/euc_tw.$(OBJEXT): internal/intern/io.h enc/euc_tw.$(OBJEXT): internal/intern/load.h @@ -1635,6 +1647,7 @@ enc/euc_tw.$(OBJEXT): internal/memory.h enc/euc_tw.$(OBJEXT): internal/method.h enc/euc_tw.$(OBJEXT): internal/module.h enc/euc_tw.$(OBJEXT): internal/newobj.h +enc/euc_tw.$(OBJEXT): internal/rgengc.h enc/euc_tw.$(OBJEXT): internal/scan_args.h enc/euc_tw.$(OBJEXT): internal/special_consts.h enc/euc_tw.$(OBJEXT): internal/static_assert.h @@ -1705,7 +1718,6 @@ enc/gb18030.$(OBJEXT): internal/attr/noexcept.h enc/gb18030.$(OBJEXT): internal/attr/noinline.h enc/gb18030.$(OBJEXT): internal/attr/nonnull.h enc/gb18030.$(OBJEXT): internal/attr/noreturn.h -enc/gb18030.$(OBJEXT): internal/attr/packed_struct.h enc/gb18030.$(OBJEXT): internal/attr/pure.h enc/gb18030.$(OBJEXT): internal/attr/restrict.h enc/gb18030.$(OBJEXT): internal/attr/returns_nonnull.h @@ -1765,6 +1777,7 @@ enc/gb18030.$(OBJEXT): internal/intern/enumerator.h enc/gb18030.$(OBJEXT): internal/intern/error.h enc/gb18030.$(OBJEXT): internal/intern/eval.h enc/gb18030.$(OBJEXT): internal/intern/file.h +enc/gb18030.$(OBJEXT): internal/intern/gc.h enc/gb18030.$(OBJEXT): internal/intern/hash.h enc/gb18030.$(OBJEXT): internal/intern/io.h enc/gb18030.$(OBJEXT): internal/intern/load.h @@ -1795,6 +1808,7 @@ enc/gb18030.$(OBJEXT): internal/memory.h enc/gb18030.$(OBJEXT): internal/method.h enc/gb18030.$(OBJEXT): internal/module.h enc/gb18030.$(OBJEXT): internal/newobj.h +enc/gb18030.$(OBJEXT): internal/rgengc.h enc/gb18030.$(OBJEXT): internal/scan_args.h enc/gb18030.$(OBJEXT): internal/special_consts.h enc/gb18030.$(OBJEXT): internal/static_assert.h @@ -1865,7 +1879,6 @@ enc/gb2312.$(OBJEXT): internal/attr/noexcept.h enc/gb2312.$(OBJEXT): internal/attr/noinline.h enc/gb2312.$(OBJEXT): internal/attr/nonnull.h enc/gb2312.$(OBJEXT): internal/attr/noreturn.h -enc/gb2312.$(OBJEXT): internal/attr/packed_struct.h enc/gb2312.$(OBJEXT): internal/attr/pure.h enc/gb2312.$(OBJEXT): internal/attr/restrict.h enc/gb2312.$(OBJEXT): internal/attr/returns_nonnull.h @@ -1925,6 +1938,7 @@ enc/gb2312.$(OBJEXT): internal/intern/enumerator.h enc/gb2312.$(OBJEXT): internal/intern/error.h enc/gb2312.$(OBJEXT): internal/intern/eval.h enc/gb2312.$(OBJEXT): internal/intern/file.h +enc/gb2312.$(OBJEXT): internal/intern/gc.h enc/gb2312.$(OBJEXT): internal/intern/hash.h enc/gb2312.$(OBJEXT): internal/intern/io.h enc/gb2312.$(OBJEXT): internal/intern/load.h @@ -1955,6 +1969,7 @@ enc/gb2312.$(OBJEXT): internal/memory.h enc/gb2312.$(OBJEXT): internal/method.h enc/gb2312.$(OBJEXT): internal/module.h enc/gb2312.$(OBJEXT): internal/newobj.h +enc/gb2312.$(OBJEXT): internal/rgengc.h enc/gb2312.$(OBJEXT): internal/scan_args.h enc/gb2312.$(OBJEXT): internal/special_consts.h enc/gb2312.$(OBJEXT): internal/static_assert.h @@ -2025,7 +2040,6 @@ enc/gbk.$(OBJEXT): internal/attr/noexcept.h enc/gbk.$(OBJEXT): internal/attr/noinline.h enc/gbk.$(OBJEXT): internal/attr/nonnull.h enc/gbk.$(OBJEXT): internal/attr/noreturn.h -enc/gbk.$(OBJEXT): internal/attr/packed_struct.h enc/gbk.$(OBJEXT): internal/attr/pure.h enc/gbk.$(OBJEXT): internal/attr/restrict.h enc/gbk.$(OBJEXT): internal/attr/returns_nonnull.h @@ -2085,6 +2099,7 @@ enc/gbk.$(OBJEXT): internal/intern/enumerator.h enc/gbk.$(OBJEXT): internal/intern/error.h enc/gbk.$(OBJEXT): internal/intern/eval.h enc/gbk.$(OBJEXT): internal/intern/file.h +enc/gbk.$(OBJEXT): internal/intern/gc.h enc/gbk.$(OBJEXT): internal/intern/hash.h enc/gbk.$(OBJEXT): internal/intern/io.h enc/gbk.$(OBJEXT): internal/intern/load.h @@ -2115,6 +2130,7 @@ enc/gbk.$(OBJEXT): internal/memory.h enc/gbk.$(OBJEXT): internal/method.h enc/gbk.$(OBJEXT): internal/module.h enc/gbk.$(OBJEXT): internal/newobj.h +enc/gbk.$(OBJEXT): internal/rgengc.h enc/gbk.$(OBJEXT): internal/scan_args.h enc/gbk.$(OBJEXT): internal/special_consts.h enc/gbk.$(OBJEXT): internal/static_assert.h @@ -2186,7 +2202,6 @@ enc/iso_8859_1.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_1.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_1.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_1.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_1.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_1.$(OBJEXT): internal/attr/pure.h enc/iso_8859_1.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_1.$(OBJEXT): internal/attr/returns_nonnull.h @@ -2246,6 +2261,7 @@ enc/iso_8859_1.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_1.$(OBJEXT): internal/intern/error.h enc/iso_8859_1.$(OBJEXT): internal/intern/eval.h enc/iso_8859_1.$(OBJEXT): internal/intern/file.h +enc/iso_8859_1.$(OBJEXT): internal/intern/gc.h enc/iso_8859_1.$(OBJEXT): internal/intern/hash.h enc/iso_8859_1.$(OBJEXT): internal/intern/io.h enc/iso_8859_1.$(OBJEXT): internal/intern/load.h @@ -2276,6 +2292,7 @@ enc/iso_8859_1.$(OBJEXT): internal/memory.h enc/iso_8859_1.$(OBJEXT): internal/method.h enc/iso_8859_1.$(OBJEXT): internal/module.h enc/iso_8859_1.$(OBJEXT): internal/newobj.h +enc/iso_8859_1.$(OBJEXT): internal/rgengc.h enc/iso_8859_1.$(OBJEXT): internal/scan_args.h enc/iso_8859_1.$(OBJEXT): internal/special_consts.h enc/iso_8859_1.$(OBJEXT): internal/static_assert.h @@ -2347,7 +2364,6 @@ enc/iso_8859_10.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_10.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_10.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_10.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_10.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_10.$(OBJEXT): internal/attr/pure.h enc/iso_8859_10.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_10.$(OBJEXT): internal/attr/returns_nonnull.h @@ -2407,6 +2423,7 @@ enc/iso_8859_10.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_10.$(OBJEXT): internal/intern/error.h enc/iso_8859_10.$(OBJEXT): internal/intern/eval.h enc/iso_8859_10.$(OBJEXT): internal/intern/file.h +enc/iso_8859_10.$(OBJEXT): internal/intern/gc.h enc/iso_8859_10.$(OBJEXT): internal/intern/hash.h enc/iso_8859_10.$(OBJEXT): internal/intern/io.h enc/iso_8859_10.$(OBJEXT): internal/intern/load.h @@ -2437,6 +2454,7 @@ enc/iso_8859_10.$(OBJEXT): internal/memory.h enc/iso_8859_10.$(OBJEXT): internal/method.h enc/iso_8859_10.$(OBJEXT): internal/module.h enc/iso_8859_10.$(OBJEXT): internal/newobj.h +enc/iso_8859_10.$(OBJEXT): internal/rgengc.h enc/iso_8859_10.$(OBJEXT): internal/scan_args.h enc/iso_8859_10.$(OBJEXT): internal/special_consts.h enc/iso_8859_10.$(OBJEXT): internal/static_assert.h @@ -2507,7 +2525,6 @@ enc/iso_8859_11.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_11.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_11.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_11.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_11.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_11.$(OBJEXT): internal/attr/pure.h enc/iso_8859_11.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_11.$(OBJEXT): internal/attr/returns_nonnull.h @@ -2567,6 +2584,7 @@ enc/iso_8859_11.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_11.$(OBJEXT): internal/intern/error.h enc/iso_8859_11.$(OBJEXT): internal/intern/eval.h enc/iso_8859_11.$(OBJEXT): internal/intern/file.h +enc/iso_8859_11.$(OBJEXT): internal/intern/gc.h enc/iso_8859_11.$(OBJEXT): internal/intern/hash.h enc/iso_8859_11.$(OBJEXT): internal/intern/io.h enc/iso_8859_11.$(OBJEXT): internal/intern/load.h @@ -2597,6 +2615,7 @@ enc/iso_8859_11.$(OBJEXT): internal/memory.h enc/iso_8859_11.$(OBJEXT): internal/method.h enc/iso_8859_11.$(OBJEXT): internal/module.h enc/iso_8859_11.$(OBJEXT): internal/newobj.h +enc/iso_8859_11.$(OBJEXT): internal/rgengc.h enc/iso_8859_11.$(OBJEXT): internal/scan_args.h enc/iso_8859_11.$(OBJEXT): internal/special_consts.h enc/iso_8859_11.$(OBJEXT): internal/static_assert.h @@ -2668,7 +2687,6 @@ enc/iso_8859_13.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_13.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_13.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_13.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_13.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_13.$(OBJEXT): internal/attr/pure.h enc/iso_8859_13.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_13.$(OBJEXT): internal/attr/returns_nonnull.h @@ -2728,6 +2746,7 @@ enc/iso_8859_13.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_13.$(OBJEXT): internal/intern/error.h enc/iso_8859_13.$(OBJEXT): internal/intern/eval.h enc/iso_8859_13.$(OBJEXT): internal/intern/file.h +enc/iso_8859_13.$(OBJEXT): internal/intern/gc.h enc/iso_8859_13.$(OBJEXT): internal/intern/hash.h enc/iso_8859_13.$(OBJEXT): internal/intern/io.h enc/iso_8859_13.$(OBJEXT): internal/intern/load.h @@ -2758,6 +2777,7 @@ enc/iso_8859_13.$(OBJEXT): internal/memory.h enc/iso_8859_13.$(OBJEXT): internal/method.h enc/iso_8859_13.$(OBJEXT): internal/module.h enc/iso_8859_13.$(OBJEXT): internal/newobj.h +enc/iso_8859_13.$(OBJEXT): internal/rgengc.h enc/iso_8859_13.$(OBJEXT): internal/scan_args.h enc/iso_8859_13.$(OBJEXT): internal/special_consts.h enc/iso_8859_13.$(OBJEXT): internal/static_assert.h @@ -2829,7 +2849,6 @@ enc/iso_8859_14.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_14.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_14.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_14.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_14.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_14.$(OBJEXT): internal/attr/pure.h enc/iso_8859_14.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_14.$(OBJEXT): internal/attr/returns_nonnull.h @@ -2889,6 +2908,7 @@ enc/iso_8859_14.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_14.$(OBJEXT): internal/intern/error.h enc/iso_8859_14.$(OBJEXT): internal/intern/eval.h enc/iso_8859_14.$(OBJEXT): internal/intern/file.h +enc/iso_8859_14.$(OBJEXT): internal/intern/gc.h enc/iso_8859_14.$(OBJEXT): internal/intern/hash.h enc/iso_8859_14.$(OBJEXT): internal/intern/io.h enc/iso_8859_14.$(OBJEXT): internal/intern/load.h @@ -2919,6 +2939,7 @@ enc/iso_8859_14.$(OBJEXT): internal/memory.h enc/iso_8859_14.$(OBJEXT): internal/method.h enc/iso_8859_14.$(OBJEXT): internal/module.h enc/iso_8859_14.$(OBJEXT): internal/newobj.h +enc/iso_8859_14.$(OBJEXT): internal/rgengc.h enc/iso_8859_14.$(OBJEXT): internal/scan_args.h enc/iso_8859_14.$(OBJEXT): internal/special_consts.h enc/iso_8859_14.$(OBJEXT): internal/static_assert.h @@ -2990,7 +3011,6 @@ enc/iso_8859_15.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_15.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_15.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_15.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_15.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_15.$(OBJEXT): internal/attr/pure.h enc/iso_8859_15.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_15.$(OBJEXT): internal/attr/returns_nonnull.h @@ -3050,6 +3070,7 @@ enc/iso_8859_15.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_15.$(OBJEXT): internal/intern/error.h enc/iso_8859_15.$(OBJEXT): internal/intern/eval.h enc/iso_8859_15.$(OBJEXT): internal/intern/file.h +enc/iso_8859_15.$(OBJEXT): internal/intern/gc.h enc/iso_8859_15.$(OBJEXT): internal/intern/hash.h enc/iso_8859_15.$(OBJEXT): internal/intern/io.h enc/iso_8859_15.$(OBJEXT): internal/intern/load.h @@ -3080,6 +3101,7 @@ enc/iso_8859_15.$(OBJEXT): internal/memory.h enc/iso_8859_15.$(OBJEXT): internal/method.h enc/iso_8859_15.$(OBJEXT): internal/module.h enc/iso_8859_15.$(OBJEXT): internal/newobj.h +enc/iso_8859_15.$(OBJEXT): internal/rgengc.h enc/iso_8859_15.$(OBJEXT): internal/scan_args.h enc/iso_8859_15.$(OBJEXT): internal/special_consts.h enc/iso_8859_15.$(OBJEXT): internal/static_assert.h @@ -3151,7 +3173,6 @@ enc/iso_8859_16.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_16.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_16.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_16.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_16.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_16.$(OBJEXT): internal/attr/pure.h enc/iso_8859_16.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_16.$(OBJEXT): internal/attr/returns_nonnull.h @@ -3211,6 +3232,7 @@ enc/iso_8859_16.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_16.$(OBJEXT): internal/intern/error.h enc/iso_8859_16.$(OBJEXT): internal/intern/eval.h enc/iso_8859_16.$(OBJEXT): internal/intern/file.h +enc/iso_8859_16.$(OBJEXT): internal/intern/gc.h enc/iso_8859_16.$(OBJEXT): internal/intern/hash.h enc/iso_8859_16.$(OBJEXT): internal/intern/io.h enc/iso_8859_16.$(OBJEXT): internal/intern/load.h @@ -3241,6 +3263,7 @@ enc/iso_8859_16.$(OBJEXT): internal/memory.h enc/iso_8859_16.$(OBJEXT): internal/method.h enc/iso_8859_16.$(OBJEXT): internal/module.h enc/iso_8859_16.$(OBJEXT): internal/newobj.h +enc/iso_8859_16.$(OBJEXT): internal/rgengc.h enc/iso_8859_16.$(OBJEXT): internal/scan_args.h enc/iso_8859_16.$(OBJEXT): internal/special_consts.h enc/iso_8859_16.$(OBJEXT): internal/static_assert.h @@ -3312,7 +3335,6 @@ enc/iso_8859_2.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_2.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_2.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_2.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_2.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_2.$(OBJEXT): internal/attr/pure.h enc/iso_8859_2.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_2.$(OBJEXT): internal/attr/returns_nonnull.h @@ -3372,6 +3394,7 @@ enc/iso_8859_2.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_2.$(OBJEXT): internal/intern/error.h enc/iso_8859_2.$(OBJEXT): internal/intern/eval.h enc/iso_8859_2.$(OBJEXT): internal/intern/file.h +enc/iso_8859_2.$(OBJEXT): internal/intern/gc.h enc/iso_8859_2.$(OBJEXT): internal/intern/hash.h enc/iso_8859_2.$(OBJEXT): internal/intern/io.h enc/iso_8859_2.$(OBJEXT): internal/intern/load.h @@ -3402,6 +3425,7 @@ enc/iso_8859_2.$(OBJEXT): internal/memory.h enc/iso_8859_2.$(OBJEXT): internal/method.h enc/iso_8859_2.$(OBJEXT): internal/module.h enc/iso_8859_2.$(OBJEXT): internal/newobj.h +enc/iso_8859_2.$(OBJEXT): internal/rgengc.h enc/iso_8859_2.$(OBJEXT): internal/scan_args.h enc/iso_8859_2.$(OBJEXT): internal/special_consts.h enc/iso_8859_2.$(OBJEXT): internal/static_assert.h @@ -3473,7 +3497,6 @@ enc/iso_8859_3.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_3.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_3.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_3.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_3.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_3.$(OBJEXT): internal/attr/pure.h enc/iso_8859_3.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_3.$(OBJEXT): internal/attr/returns_nonnull.h @@ -3533,6 +3556,7 @@ enc/iso_8859_3.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_3.$(OBJEXT): internal/intern/error.h enc/iso_8859_3.$(OBJEXT): internal/intern/eval.h enc/iso_8859_3.$(OBJEXT): internal/intern/file.h +enc/iso_8859_3.$(OBJEXT): internal/intern/gc.h enc/iso_8859_3.$(OBJEXT): internal/intern/hash.h enc/iso_8859_3.$(OBJEXT): internal/intern/io.h enc/iso_8859_3.$(OBJEXT): internal/intern/load.h @@ -3563,6 +3587,7 @@ enc/iso_8859_3.$(OBJEXT): internal/memory.h enc/iso_8859_3.$(OBJEXT): internal/method.h enc/iso_8859_3.$(OBJEXT): internal/module.h enc/iso_8859_3.$(OBJEXT): internal/newobj.h +enc/iso_8859_3.$(OBJEXT): internal/rgengc.h enc/iso_8859_3.$(OBJEXT): internal/scan_args.h enc/iso_8859_3.$(OBJEXT): internal/special_consts.h enc/iso_8859_3.$(OBJEXT): internal/static_assert.h @@ -3634,7 +3659,6 @@ enc/iso_8859_4.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_4.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_4.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_4.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_4.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_4.$(OBJEXT): internal/attr/pure.h enc/iso_8859_4.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_4.$(OBJEXT): internal/attr/returns_nonnull.h @@ -3694,6 +3718,7 @@ enc/iso_8859_4.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_4.$(OBJEXT): internal/intern/error.h enc/iso_8859_4.$(OBJEXT): internal/intern/eval.h enc/iso_8859_4.$(OBJEXT): internal/intern/file.h +enc/iso_8859_4.$(OBJEXT): internal/intern/gc.h enc/iso_8859_4.$(OBJEXT): internal/intern/hash.h enc/iso_8859_4.$(OBJEXT): internal/intern/io.h enc/iso_8859_4.$(OBJEXT): internal/intern/load.h @@ -3724,6 +3749,7 @@ enc/iso_8859_4.$(OBJEXT): internal/memory.h enc/iso_8859_4.$(OBJEXT): internal/method.h enc/iso_8859_4.$(OBJEXT): internal/module.h enc/iso_8859_4.$(OBJEXT): internal/newobj.h +enc/iso_8859_4.$(OBJEXT): internal/rgengc.h enc/iso_8859_4.$(OBJEXT): internal/scan_args.h enc/iso_8859_4.$(OBJEXT): internal/special_consts.h enc/iso_8859_4.$(OBJEXT): internal/static_assert.h @@ -3794,7 +3820,6 @@ enc/iso_8859_5.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_5.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_5.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_5.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_5.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_5.$(OBJEXT): internal/attr/pure.h enc/iso_8859_5.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_5.$(OBJEXT): internal/attr/returns_nonnull.h @@ -3854,6 +3879,7 @@ enc/iso_8859_5.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_5.$(OBJEXT): internal/intern/error.h enc/iso_8859_5.$(OBJEXT): internal/intern/eval.h enc/iso_8859_5.$(OBJEXT): internal/intern/file.h +enc/iso_8859_5.$(OBJEXT): internal/intern/gc.h enc/iso_8859_5.$(OBJEXT): internal/intern/hash.h enc/iso_8859_5.$(OBJEXT): internal/intern/io.h enc/iso_8859_5.$(OBJEXT): internal/intern/load.h @@ -3884,6 +3910,7 @@ enc/iso_8859_5.$(OBJEXT): internal/memory.h enc/iso_8859_5.$(OBJEXT): internal/method.h enc/iso_8859_5.$(OBJEXT): internal/module.h enc/iso_8859_5.$(OBJEXT): internal/newobj.h +enc/iso_8859_5.$(OBJEXT): internal/rgengc.h enc/iso_8859_5.$(OBJEXT): internal/scan_args.h enc/iso_8859_5.$(OBJEXT): internal/special_consts.h enc/iso_8859_5.$(OBJEXT): internal/static_assert.h @@ -3954,7 +3981,6 @@ enc/iso_8859_6.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_6.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_6.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_6.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_6.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_6.$(OBJEXT): internal/attr/pure.h enc/iso_8859_6.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_6.$(OBJEXT): internal/attr/returns_nonnull.h @@ -4014,6 +4040,7 @@ enc/iso_8859_6.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_6.$(OBJEXT): internal/intern/error.h enc/iso_8859_6.$(OBJEXT): internal/intern/eval.h enc/iso_8859_6.$(OBJEXT): internal/intern/file.h +enc/iso_8859_6.$(OBJEXT): internal/intern/gc.h enc/iso_8859_6.$(OBJEXT): internal/intern/hash.h enc/iso_8859_6.$(OBJEXT): internal/intern/io.h enc/iso_8859_6.$(OBJEXT): internal/intern/load.h @@ -4044,6 +4071,7 @@ enc/iso_8859_6.$(OBJEXT): internal/memory.h enc/iso_8859_6.$(OBJEXT): internal/method.h enc/iso_8859_6.$(OBJEXT): internal/module.h enc/iso_8859_6.$(OBJEXT): internal/newobj.h +enc/iso_8859_6.$(OBJEXT): internal/rgengc.h enc/iso_8859_6.$(OBJEXT): internal/scan_args.h enc/iso_8859_6.$(OBJEXT): internal/special_consts.h enc/iso_8859_6.$(OBJEXT): internal/static_assert.h @@ -4114,7 +4142,6 @@ enc/iso_8859_7.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_7.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_7.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_7.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_7.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_7.$(OBJEXT): internal/attr/pure.h enc/iso_8859_7.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_7.$(OBJEXT): internal/attr/returns_nonnull.h @@ -4174,6 +4201,7 @@ enc/iso_8859_7.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_7.$(OBJEXT): internal/intern/error.h enc/iso_8859_7.$(OBJEXT): internal/intern/eval.h enc/iso_8859_7.$(OBJEXT): internal/intern/file.h +enc/iso_8859_7.$(OBJEXT): internal/intern/gc.h enc/iso_8859_7.$(OBJEXT): internal/intern/hash.h enc/iso_8859_7.$(OBJEXT): internal/intern/io.h enc/iso_8859_7.$(OBJEXT): internal/intern/load.h @@ -4204,6 +4232,7 @@ enc/iso_8859_7.$(OBJEXT): internal/memory.h enc/iso_8859_7.$(OBJEXT): internal/method.h enc/iso_8859_7.$(OBJEXT): internal/module.h enc/iso_8859_7.$(OBJEXT): internal/newobj.h +enc/iso_8859_7.$(OBJEXT): internal/rgengc.h enc/iso_8859_7.$(OBJEXT): internal/scan_args.h enc/iso_8859_7.$(OBJEXT): internal/special_consts.h enc/iso_8859_7.$(OBJEXT): internal/static_assert.h @@ -4274,7 +4303,6 @@ enc/iso_8859_8.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_8.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_8.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_8.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_8.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_8.$(OBJEXT): internal/attr/pure.h enc/iso_8859_8.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_8.$(OBJEXT): internal/attr/returns_nonnull.h @@ -4334,6 +4362,7 @@ enc/iso_8859_8.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_8.$(OBJEXT): internal/intern/error.h enc/iso_8859_8.$(OBJEXT): internal/intern/eval.h enc/iso_8859_8.$(OBJEXT): internal/intern/file.h +enc/iso_8859_8.$(OBJEXT): internal/intern/gc.h enc/iso_8859_8.$(OBJEXT): internal/intern/hash.h enc/iso_8859_8.$(OBJEXT): internal/intern/io.h enc/iso_8859_8.$(OBJEXT): internal/intern/load.h @@ -4364,6 +4393,7 @@ enc/iso_8859_8.$(OBJEXT): internal/memory.h enc/iso_8859_8.$(OBJEXT): internal/method.h enc/iso_8859_8.$(OBJEXT): internal/module.h enc/iso_8859_8.$(OBJEXT): internal/newobj.h +enc/iso_8859_8.$(OBJEXT): internal/rgengc.h enc/iso_8859_8.$(OBJEXT): internal/scan_args.h enc/iso_8859_8.$(OBJEXT): internal/special_consts.h enc/iso_8859_8.$(OBJEXT): internal/static_assert.h @@ -4435,7 +4465,6 @@ enc/iso_8859_9.$(OBJEXT): internal/attr/noexcept.h enc/iso_8859_9.$(OBJEXT): internal/attr/noinline.h enc/iso_8859_9.$(OBJEXT): internal/attr/nonnull.h enc/iso_8859_9.$(OBJEXT): internal/attr/noreturn.h -enc/iso_8859_9.$(OBJEXT): internal/attr/packed_struct.h enc/iso_8859_9.$(OBJEXT): internal/attr/pure.h enc/iso_8859_9.$(OBJEXT): internal/attr/restrict.h enc/iso_8859_9.$(OBJEXT): internal/attr/returns_nonnull.h @@ -4495,6 +4524,7 @@ enc/iso_8859_9.$(OBJEXT): internal/intern/enumerator.h enc/iso_8859_9.$(OBJEXT): internal/intern/error.h enc/iso_8859_9.$(OBJEXT): internal/intern/eval.h enc/iso_8859_9.$(OBJEXT): internal/intern/file.h +enc/iso_8859_9.$(OBJEXT): internal/intern/gc.h enc/iso_8859_9.$(OBJEXT): internal/intern/hash.h enc/iso_8859_9.$(OBJEXT): internal/intern/io.h enc/iso_8859_9.$(OBJEXT): internal/intern/load.h @@ -4525,6 +4555,7 @@ enc/iso_8859_9.$(OBJEXT): internal/memory.h enc/iso_8859_9.$(OBJEXT): internal/method.h enc/iso_8859_9.$(OBJEXT): internal/module.h enc/iso_8859_9.$(OBJEXT): internal/newobj.h +enc/iso_8859_9.$(OBJEXT): internal/rgengc.h enc/iso_8859_9.$(OBJEXT): internal/scan_args.h enc/iso_8859_9.$(OBJEXT): internal/special_consts.h enc/iso_8859_9.$(OBJEXT): internal/static_assert.h @@ -4595,7 +4626,6 @@ enc/koi8_r.$(OBJEXT): internal/attr/noexcept.h enc/koi8_r.$(OBJEXT): internal/attr/noinline.h enc/koi8_r.$(OBJEXT): internal/attr/nonnull.h enc/koi8_r.$(OBJEXT): internal/attr/noreturn.h -enc/koi8_r.$(OBJEXT): internal/attr/packed_struct.h enc/koi8_r.$(OBJEXT): internal/attr/pure.h enc/koi8_r.$(OBJEXT): internal/attr/restrict.h enc/koi8_r.$(OBJEXT): internal/attr/returns_nonnull.h @@ -4655,6 +4685,7 @@ enc/koi8_r.$(OBJEXT): internal/intern/enumerator.h enc/koi8_r.$(OBJEXT): internal/intern/error.h enc/koi8_r.$(OBJEXT): internal/intern/eval.h enc/koi8_r.$(OBJEXT): internal/intern/file.h +enc/koi8_r.$(OBJEXT): internal/intern/gc.h enc/koi8_r.$(OBJEXT): internal/intern/hash.h enc/koi8_r.$(OBJEXT): internal/intern/io.h enc/koi8_r.$(OBJEXT): internal/intern/load.h @@ -4685,6 +4716,7 @@ enc/koi8_r.$(OBJEXT): internal/memory.h enc/koi8_r.$(OBJEXT): internal/method.h enc/koi8_r.$(OBJEXT): internal/module.h enc/koi8_r.$(OBJEXT): internal/newobj.h +enc/koi8_r.$(OBJEXT): internal/rgengc.h enc/koi8_r.$(OBJEXT): internal/scan_args.h enc/koi8_r.$(OBJEXT): internal/special_consts.h enc/koi8_r.$(OBJEXT): internal/static_assert.h @@ -4755,7 +4787,6 @@ enc/koi8_u.$(OBJEXT): internal/attr/noexcept.h enc/koi8_u.$(OBJEXT): internal/attr/noinline.h enc/koi8_u.$(OBJEXT): internal/attr/nonnull.h enc/koi8_u.$(OBJEXT): internal/attr/noreturn.h -enc/koi8_u.$(OBJEXT): internal/attr/packed_struct.h enc/koi8_u.$(OBJEXT): internal/attr/pure.h enc/koi8_u.$(OBJEXT): internal/attr/restrict.h enc/koi8_u.$(OBJEXT): internal/attr/returns_nonnull.h @@ -4815,6 +4846,7 @@ enc/koi8_u.$(OBJEXT): internal/intern/enumerator.h enc/koi8_u.$(OBJEXT): internal/intern/error.h enc/koi8_u.$(OBJEXT): internal/intern/eval.h enc/koi8_u.$(OBJEXT): internal/intern/file.h +enc/koi8_u.$(OBJEXT): internal/intern/gc.h enc/koi8_u.$(OBJEXT): internal/intern/hash.h enc/koi8_u.$(OBJEXT): internal/intern/io.h enc/koi8_u.$(OBJEXT): internal/intern/load.h @@ -4845,6 +4877,7 @@ enc/koi8_u.$(OBJEXT): internal/memory.h enc/koi8_u.$(OBJEXT): internal/method.h enc/koi8_u.$(OBJEXT): internal/module.h enc/koi8_u.$(OBJEXT): internal/newobj.h +enc/koi8_u.$(OBJEXT): internal/rgengc.h enc/koi8_u.$(OBJEXT): internal/scan_args.h enc/koi8_u.$(OBJEXT): internal/special_consts.h enc/koi8_u.$(OBJEXT): internal/static_assert.h @@ -4918,7 +4951,6 @@ enc/shift_jis.$(OBJEXT): internal/attr/noexcept.h enc/shift_jis.$(OBJEXT): internal/attr/noinline.h enc/shift_jis.$(OBJEXT): internal/attr/nonnull.h enc/shift_jis.$(OBJEXT): internal/attr/noreturn.h -enc/shift_jis.$(OBJEXT): internal/attr/packed_struct.h enc/shift_jis.$(OBJEXT): internal/attr/pure.h enc/shift_jis.$(OBJEXT): internal/attr/restrict.h enc/shift_jis.$(OBJEXT): internal/attr/returns_nonnull.h @@ -4978,6 +5010,7 @@ enc/shift_jis.$(OBJEXT): internal/intern/enumerator.h enc/shift_jis.$(OBJEXT): internal/intern/error.h enc/shift_jis.$(OBJEXT): internal/intern/eval.h enc/shift_jis.$(OBJEXT): internal/intern/file.h +enc/shift_jis.$(OBJEXT): internal/intern/gc.h enc/shift_jis.$(OBJEXT): internal/intern/hash.h enc/shift_jis.$(OBJEXT): internal/intern/io.h enc/shift_jis.$(OBJEXT): internal/intern/load.h @@ -5008,6 +5041,7 @@ enc/shift_jis.$(OBJEXT): internal/memory.h enc/shift_jis.$(OBJEXT): internal/method.h enc/shift_jis.$(OBJEXT): internal/module.h enc/shift_jis.$(OBJEXT): internal/newobj.h +enc/shift_jis.$(OBJEXT): internal/rgengc.h enc/shift_jis.$(OBJEXT): internal/scan_args.h enc/shift_jis.$(OBJEXT): internal/special_consts.h enc/shift_jis.$(OBJEXT): internal/static_assert.h @@ -5077,7 +5111,6 @@ enc/trans/big5.$(OBJEXT): internal/attr/noexcept.h enc/trans/big5.$(OBJEXT): internal/attr/noinline.h enc/trans/big5.$(OBJEXT): internal/attr/nonnull.h enc/trans/big5.$(OBJEXT): internal/attr/noreturn.h -enc/trans/big5.$(OBJEXT): internal/attr/packed_struct.h enc/trans/big5.$(OBJEXT): internal/attr/pure.h enc/trans/big5.$(OBJEXT): internal/attr/restrict.h enc/trans/big5.$(OBJEXT): internal/attr/returns_nonnull.h @@ -5137,6 +5170,7 @@ enc/trans/big5.$(OBJEXT): internal/intern/enumerator.h enc/trans/big5.$(OBJEXT): internal/intern/error.h enc/trans/big5.$(OBJEXT): internal/intern/eval.h enc/trans/big5.$(OBJEXT): internal/intern/file.h +enc/trans/big5.$(OBJEXT): internal/intern/gc.h enc/trans/big5.$(OBJEXT): internal/intern/hash.h enc/trans/big5.$(OBJEXT): internal/intern/io.h enc/trans/big5.$(OBJEXT): internal/intern/load.h @@ -5167,6 +5201,7 @@ enc/trans/big5.$(OBJEXT): internal/memory.h enc/trans/big5.$(OBJEXT): internal/method.h enc/trans/big5.$(OBJEXT): internal/module.h enc/trans/big5.$(OBJEXT): internal/newobj.h +enc/trans/big5.$(OBJEXT): internal/rgengc.h enc/trans/big5.$(OBJEXT): internal/scan_args.h enc/trans/big5.$(OBJEXT): internal/special_consts.h enc/trans/big5.$(OBJEXT): internal/static_assert.h @@ -5235,7 +5270,6 @@ enc/trans/cesu_8.$(OBJEXT): internal/attr/noexcept.h enc/trans/cesu_8.$(OBJEXT): internal/attr/noinline.h enc/trans/cesu_8.$(OBJEXT): internal/attr/nonnull.h enc/trans/cesu_8.$(OBJEXT): internal/attr/noreturn.h -enc/trans/cesu_8.$(OBJEXT): internal/attr/packed_struct.h enc/trans/cesu_8.$(OBJEXT): internal/attr/pure.h enc/trans/cesu_8.$(OBJEXT): internal/attr/restrict.h enc/trans/cesu_8.$(OBJEXT): internal/attr/returns_nonnull.h @@ -5295,6 +5329,7 @@ enc/trans/cesu_8.$(OBJEXT): internal/intern/enumerator.h enc/trans/cesu_8.$(OBJEXT): internal/intern/error.h enc/trans/cesu_8.$(OBJEXT): internal/intern/eval.h enc/trans/cesu_8.$(OBJEXT): internal/intern/file.h +enc/trans/cesu_8.$(OBJEXT): internal/intern/gc.h enc/trans/cesu_8.$(OBJEXT): internal/intern/hash.h enc/trans/cesu_8.$(OBJEXT): internal/intern/io.h enc/trans/cesu_8.$(OBJEXT): internal/intern/load.h @@ -5325,6 +5360,7 @@ enc/trans/cesu_8.$(OBJEXT): internal/memory.h enc/trans/cesu_8.$(OBJEXT): internal/method.h enc/trans/cesu_8.$(OBJEXT): internal/module.h enc/trans/cesu_8.$(OBJEXT): internal/newobj.h +enc/trans/cesu_8.$(OBJEXT): internal/rgengc.h enc/trans/cesu_8.$(OBJEXT): internal/scan_args.h enc/trans/cesu_8.$(OBJEXT): internal/special_consts.h enc/trans/cesu_8.$(OBJEXT): internal/static_assert.h @@ -5393,7 +5429,6 @@ enc/trans/chinese.$(OBJEXT): internal/attr/noexcept.h enc/trans/chinese.$(OBJEXT): internal/attr/noinline.h enc/trans/chinese.$(OBJEXT): internal/attr/nonnull.h enc/trans/chinese.$(OBJEXT): internal/attr/noreturn.h -enc/trans/chinese.$(OBJEXT): internal/attr/packed_struct.h enc/trans/chinese.$(OBJEXT): internal/attr/pure.h enc/trans/chinese.$(OBJEXT): internal/attr/restrict.h enc/trans/chinese.$(OBJEXT): internal/attr/returns_nonnull.h @@ -5453,6 +5488,7 @@ enc/trans/chinese.$(OBJEXT): internal/intern/enumerator.h enc/trans/chinese.$(OBJEXT): internal/intern/error.h enc/trans/chinese.$(OBJEXT): internal/intern/eval.h enc/trans/chinese.$(OBJEXT): internal/intern/file.h +enc/trans/chinese.$(OBJEXT): internal/intern/gc.h enc/trans/chinese.$(OBJEXT): internal/intern/hash.h enc/trans/chinese.$(OBJEXT): internal/intern/io.h enc/trans/chinese.$(OBJEXT): internal/intern/load.h @@ -5483,6 +5519,7 @@ enc/trans/chinese.$(OBJEXT): internal/memory.h enc/trans/chinese.$(OBJEXT): internal/method.h enc/trans/chinese.$(OBJEXT): internal/module.h enc/trans/chinese.$(OBJEXT): internal/newobj.h +enc/trans/chinese.$(OBJEXT): internal/rgengc.h enc/trans/chinese.$(OBJEXT): internal/scan_args.h enc/trans/chinese.$(OBJEXT): internal/special_consts.h enc/trans/chinese.$(OBJEXT): internal/static_assert.h @@ -5551,7 +5588,6 @@ enc/trans/ebcdic.$(OBJEXT): internal/attr/noexcept.h enc/trans/ebcdic.$(OBJEXT): internal/attr/noinline.h enc/trans/ebcdic.$(OBJEXT): internal/attr/nonnull.h enc/trans/ebcdic.$(OBJEXT): internal/attr/noreturn.h -enc/trans/ebcdic.$(OBJEXT): internal/attr/packed_struct.h enc/trans/ebcdic.$(OBJEXT): internal/attr/pure.h enc/trans/ebcdic.$(OBJEXT): internal/attr/restrict.h enc/trans/ebcdic.$(OBJEXT): internal/attr/returns_nonnull.h @@ -5611,6 +5647,7 @@ enc/trans/ebcdic.$(OBJEXT): internal/intern/enumerator.h enc/trans/ebcdic.$(OBJEXT): internal/intern/error.h enc/trans/ebcdic.$(OBJEXT): internal/intern/eval.h enc/trans/ebcdic.$(OBJEXT): internal/intern/file.h +enc/trans/ebcdic.$(OBJEXT): internal/intern/gc.h enc/trans/ebcdic.$(OBJEXT): internal/intern/hash.h enc/trans/ebcdic.$(OBJEXT): internal/intern/io.h enc/trans/ebcdic.$(OBJEXT): internal/intern/load.h @@ -5641,6 +5678,7 @@ enc/trans/ebcdic.$(OBJEXT): internal/memory.h enc/trans/ebcdic.$(OBJEXT): internal/method.h enc/trans/ebcdic.$(OBJEXT): internal/module.h enc/trans/ebcdic.$(OBJEXT): internal/newobj.h +enc/trans/ebcdic.$(OBJEXT): internal/rgengc.h enc/trans/ebcdic.$(OBJEXT): internal/scan_args.h enc/trans/ebcdic.$(OBJEXT): internal/special_consts.h enc/trans/ebcdic.$(OBJEXT): internal/static_assert.h @@ -5709,7 +5747,6 @@ enc/trans/emoji.$(OBJEXT): internal/attr/noexcept.h enc/trans/emoji.$(OBJEXT): internal/attr/noinline.h enc/trans/emoji.$(OBJEXT): internal/attr/nonnull.h enc/trans/emoji.$(OBJEXT): internal/attr/noreturn.h -enc/trans/emoji.$(OBJEXT): internal/attr/packed_struct.h enc/trans/emoji.$(OBJEXT): internal/attr/pure.h enc/trans/emoji.$(OBJEXT): internal/attr/restrict.h enc/trans/emoji.$(OBJEXT): internal/attr/returns_nonnull.h @@ -5769,6 +5806,7 @@ enc/trans/emoji.$(OBJEXT): internal/intern/enumerator.h enc/trans/emoji.$(OBJEXT): internal/intern/error.h enc/trans/emoji.$(OBJEXT): internal/intern/eval.h enc/trans/emoji.$(OBJEXT): internal/intern/file.h +enc/trans/emoji.$(OBJEXT): internal/intern/gc.h enc/trans/emoji.$(OBJEXT): internal/intern/hash.h enc/trans/emoji.$(OBJEXT): internal/intern/io.h enc/trans/emoji.$(OBJEXT): internal/intern/load.h @@ -5799,6 +5837,7 @@ enc/trans/emoji.$(OBJEXT): internal/memory.h enc/trans/emoji.$(OBJEXT): internal/method.h enc/trans/emoji.$(OBJEXT): internal/module.h enc/trans/emoji.$(OBJEXT): internal/newobj.h +enc/trans/emoji.$(OBJEXT): internal/rgengc.h enc/trans/emoji.$(OBJEXT): internal/scan_args.h enc/trans/emoji.$(OBJEXT): internal/special_consts.h enc/trans/emoji.$(OBJEXT): internal/static_assert.h @@ -5867,7 +5906,6 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/noexcept.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/noinline.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/nonnull.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/noreturn.h -enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/packed_struct.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/pure.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/restrict.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/returns_nonnull.h @@ -5927,6 +5965,7 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/enumerator.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/error.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/eval.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/file.h +enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/gc.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/hash.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/io.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/load.h @@ -5957,6 +5996,7 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/memory.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/method.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/module.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/newobj.h +enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/rgengc.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/scan_args.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/special_consts.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/static_assert.h @@ -6025,7 +6065,6 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/noexcept.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/noinline.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/nonnull.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/noreturn.h -enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/packed_struct.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/pure.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/restrict.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/returns_nonnull.h @@ -6085,6 +6124,7 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/enumerator.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/error.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/eval.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/file.h +enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/gc.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/hash.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/io.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/load.h @@ -6115,6 +6155,7 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/memory.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/method.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/module.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/newobj.h +enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/rgengc.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/scan_args.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/special_consts.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/static_assert.h @@ -6183,7 +6224,6 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/noexcept.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/noinline.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/nonnull.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/noreturn.h -enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/packed_struct.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/pure.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/restrict.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/returns_nonnull.h @@ -6243,6 +6283,7 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/enumerator.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/error.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/eval.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/file.h +enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/gc.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/hash.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/io.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/load.h @@ -6273,6 +6314,7 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/memory.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/method.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/module.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/newobj.h +enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/rgengc.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/scan_args.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/special_consts.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/static_assert.h @@ -6341,7 +6383,6 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/noexcept.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/noinline.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/nonnull.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/noreturn.h -enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/packed_struct.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/pure.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/restrict.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/returns_nonnull.h @@ -6401,6 +6442,7 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/enumerator.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/error.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/eval.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/file.h +enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/gc.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/hash.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/io.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/load.h @@ -6431,6 +6473,7 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/memory.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/method.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/module.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/newobj.h +enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/rgengc.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/scan_args.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/special_consts.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/static_assert.h @@ -6499,7 +6542,6 @@ enc/trans/escape.$(OBJEXT): internal/attr/noexcept.h enc/trans/escape.$(OBJEXT): internal/attr/noinline.h enc/trans/escape.$(OBJEXT): internal/attr/nonnull.h enc/trans/escape.$(OBJEXT): internal/attr/noreturn.h -enc/trans/escape.$(OBJEXT): internal/attr/packed_struct.h enc/trans/escape.$(OBJEXT): internal/attr/pure.h enc/trans/escape.$(OBJEXT): internal/attr/restrict.h enc/trans/escape.$(OBJEXT): internal/attr/returns_nonnull.h @@ -6559,6 +6601,7 @@ enc/trans/escape.$(OBJEXT): internal/intern/enumerator.h enc/trans/escape.$(OBJEXT): internal/intern/error.h enc/trans/escape.$(OBJEXT): internal/intern/eval.h enc/trans/escape.$(OBJEXT): internal/intern/file.h +enc/trans/escape.$(OBJEXT): internal/intern/gc.h enc/trans/escape.$(OBJEXT): internal/intern/hash.h enc/trans/escape.$(OBJEXT): internal/intern/io.h enc/trans/escape.$(OBJEXT): internal/intern/load.h @@ -6589,6 +6632,7 @@ enc/trans/escape.$(OBJEXT): internal/memory.h enc/trans/escape.$(OBJEXT): internal/method.h enc/trans/escape.$(OBJEXT): internal/module.h enc/trans/escape.$(OBJEXT): internal/newobj.h +enc/trans/escape.$(OBJEXT): internal/rgengc.h enc/trans/escape.$(OBJEXT): internal/scan_args.h enc/trans/escape.$(OBJEXT): internal/special_consts.h enc/trans/escape.$(OBJEXT): internal/static_assert.h @@ -6657,7 +6701,6 @@ enc/trans/gb18030.$(OBJEXT): internal/attr/noexcept.h enc/trans/gb18030.$(OBJEXT): internal/attr/noinline.h enc/trans/gb18030.$(OBJEXT): internal/attr/nonnull.h enc/trans/gb18030.$(OBJEXT): internal/attr/noreturn.h -enc/trans/gb18030.$(OBJEXT): internal/attr/packed_struct.h enc/trans/gb18030.$(OBJEXT): internal/attr/pure.h enc/trans/gb18030.$(OBJEXT): internal/attr/restrict.h enc/trans/gb18030.$(OBJEXT): internal/attr/returns_nonnull.h @@ -6717,6 +6760,7 @@ enc/trans/gb18030.$(OBJEXT): internal/intern/enumerator.h enc/trans/gb18030.$(OBJEXT): internal/intern/error.h enc/trans/gb18030.$(OBJEXT): internal/intern/eval.h enc/trans/gb18030.$(OBJEXT): internal/intern/file.h +enc/trans/gb18030.$(OBJEXT): internal/intern/gc.h enc/trans/gb18030.$(OBJEXT): internal/intern/hash.h enc/trans/gb18030.$(OBJEXT): internal/intern/io.h enc/trans/gb18030.$(OBJEXT): internal/intern/load.h @@ -6747,6 +6791,7 @@ enc/trans/gb18030.$(OBJEXT): internal/memory.h enc/trans/gb18030.$(OBJEXT): internal/method.h enc/trans/gb18030.$(OBJEXT): internal/module.h enc/trans/gb18030.$(OBJEXT): internal/newobj.h +enc/trans/gb18030.$(OBJEXT): internal/rgengc.h enc/trans/gb18030.$(OBJEXT): internal/scan_args.h enc/trans/gb18030.$(OBJEXT): internal/special_consts.h enc/trans/gb18030.$(OBJEXT): internal/static_assert.h @@ -6815,7 +6860,6 @@ enc/trans/gbk.$(OBJEXT): internal/attr/noexcept.h enc/trans/gbk.$(OBJEXT): internal/attr/noinline.h enc/trans/gbk.$(OBJEXT): internal/attr/nonnull.h enc/trans/gbk.$(OBJEXT): internal/attr/noreturn.h -enc/trans/gbk.$(OBJEXT): internal/attr/packed_struct.h enc/trans/gbk.$(OBJEXT): internal/attr/pure.h enc/trans/gbk.$(OBJEXT): internal/attr/restrict.h enc/trans/gbk.$(OBJEXT): internal/attr/returns_nonnull.h @@ -6875,6 +6919,7 @@ enc/trans/gbk.$(OBJEXT): internal/intern/enumerator.h enc/trans/gbk.$(OBJEXT): internal/intern/error.h enc/trans/gbk.$(OBJEXT): internal/intern/eval.h enc/trans/gbk.$(OBJEXT): internal/intern/file.h +enc/trans/gbk.$(OBJEXT): internal/intern/gc.h enc/trans/gbk.$(OBJEXT): internal/intern/hash.h enc/trans/gbk.$(OBJEXT): internal/intern/io.h enc/trans/gbk.$(OBJEXT): internal/intern/load.h @@ -6905,6 +6950,7 @@ enc/trans/gbk.$(OBJEXT): internal/memory.h enc/trans/gbk.$(OBJEXT): internal/method.h enc/trans/gbk.$(OBJEXT): internal/module.h enc/trans/gbk.$(OBJEXT): internal/newobj.h +enc/trans/gbk.$(OBJEXT): internal/rgengc.h enc/trans/gbk.$(OBJEXT): internal/scan_args.h enc/trans/gbk.$(OBJEXT): internal/special_consts.h enc/trans/gbk.$(OBJEXT): internal/static_assert.h @@ -6972,8 +7018,8 @@ 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 enc/trans/iso2022.$(OBJEXT): internal/attr/restrict.h enc/trans/iso2022.$(OBJEXT): internal/attr/returns_nonnull.h @@ -7033,6 +7079,7 @@ enc/trans/iso2022.$(OBJEXT): internal/intern/enumerator.h enc/trans/iso2022.$(OBJEXT): internal/intern/error.h enc/trans/iso2022.$(OBJEXT): internal/intern/eval.h enc/trans/iso2022.$(OBJEXT): internal/intern/file.h +enc/trans/iso2022.$(OBJEXT): internal/intern/gc.h enc/trans/iso2022.$(OBJEXT): internal/intern/hash.h enc/trans/iso2022.$(OBJEXT): internal/intern/io.h enc/trans/iso2022.$(OBJEXT): internal/intern/load.h @@ -7063,6 +7110,7 @@ enc/trans/iso2022.$(OBJEXT): internal/memory.h enc/trans/iso2022.$(OBJEXT): internal/method.h enc/trans/iso2022.$(OBJEXT): internal/module.h enc/trans/iso2022.$(OBJEXT): internal/newobj.h +enc/trans/iso2022.$(OBJEXT): internal/rgengc.h enc/trans/iso2022.$(OBJEXT): internal/scan_args.h enc/trans/iso2022.$(OBJEXT): internal/special_consts.h enc/trans/iso2022.$(OBJEXT): internal/static_assert.h @@ -7131,7 +7179,6 @@ enc/trans/japanese.$(OBJEXT): internal/attr/noexcept.h enc/trans/japanese.$(OBJEXT): internal/attr/noinline.h enc/trans/japanese.$(OBJEXT): internal/attr/nonnull.h enc/trans/japanese.$(OBJEXT): internal/attr/noreturn.h -enc/trans/japanese.$(OBJEXT): internal/attr/packed_struct.h enc/trans/japanese.$(OBJEXT): internal/attr/pure.h enc/trans/japanese.$(OBJEXT): internal/attr/restrict.h enc/trans/japanese.$(OBJEXT): internal/attr/returns_nonnull.h @@ -7191,6 +7238,7 @@ enc/trans/japanese.$(OBJEXT): internal/intern/enumerator.h enc/trans/japanese.$(OBJEXT): internal/intern/error.h enc/trans/japanese.$(OBJEXT): internal/intern/eval.h enc/trans/japanese.$(OBJEXT): internal/intern/file.h +enc/trans/japanese.$(OBJEXT): internal/intern/gc.h enc/trans/japanese.$(OBJEXT): internal/intern/hash.h enc/trans/japanese.$(OBJEXT): internal/intern/io.h enc/trans/japanese.$(OBJEXT): internal/intern/load.h @@ -7221,6 +7269,7 @@ enc/trans/japanese.$(OBJEXT): internal/memory.h enc/trans/japanese.$(OBJEXT): internal/method.h enc/trans/japanese.$(OBJEXT): internal/module.h enc/trans/japanese.$(OBJEXT): internal/newobj.h +enc/trans/japanese.$(OBJEXT): internal/rgengc.h enc/trans/japanese.$(OBJEXT): internal/scan_args.h enc/trans/japanese.$(OBJEXT): internal/special_consts.h enc/trans/japanese.$(OBJEXT): internal/static_assert.h @@ -7289,7 +7338,6 @@ enc/trans/japanese_euc.$(OBJEXT): internal/attr/noexcept.h enc/trans/japanese_euc.$(OBJEXT): internal/attr/noinline.h enc/trans/japanese_euc.$(OBJEXT): internal/attr/nonnull.h enc/trans/japanese_euc.$(OBJEXT): internal/attr/noreturn.h -enc/trans/japanese_euc.$(OBJEXT): internal/attr/packed_struct.h enc/trans/japanese_euc.$(OBJEXT): internal/attr/pure.h enc/trans/japanese_euc.$(OBJEXT): internal/attr/restrict.h enc/trans/japanese_euc.$(OBJEXT): internal/attr/returns_nonnull.h @@ -7349,6 +7397,7 @@ enc/trans/japanese_euc.$(OBJEXT): internal/intern/enumerator.h enc/trans/japanese_euc.$(OBJEXT): internal/intern/error.h enc/trans/japanese_euc.$(OBJEXT): internal/intern/eval.h enc/trans/japanese_euc.$(OBJEXT): internal/intern/file.h +enc/trans/japanese_euc.$(OBJEXT): internal/intern/gc.h enc/trans/japanese_euc.$(OBJEXT): internal/intern/hash.h enc/trans/japanese_euc.$(OBJEXT): internal/intern/io.h enc/trans/japanese_euc.$(OBJEXT): internal/intern/load.h @@ -7379,6 +7428,7 @@ enc/trans/japanese_euc.$(OBJEXT): internal/memory.h enc/trans/japanese_euc.$(OBJEXT): internal/method.h enc/trans/japanese_euc.$(OBJEXT): internal/module.h enc/trans/japanese_euc.$(OBJEXT): internal/newobj.h +enc/trans/japanese_euc.$(OBJEXT): internal/rgengc.h enc/trans/japanese_euc.$(OBJEXT): internal/scan_args.h enc/trans/japanese_euc.$(OBJEXT): internal/special_consts.h enc/trans/japanese_euc.$(OBJEXT): internal/static_assert.h @@ -7447,7 +7497,6 @@ enc/trans/japanese_sjis.$(OBJEXT): internal/attr/noexcept.h enc/trans/japanese_sjis.$(OBJEXT): internal/attr/noinline.h enc/trans/japanese_sjis.$(OBJEXT): internal/attr/nonnull.h enc/trans/japanese_sjis.$(OBJEXT): internal/attr/noreturn.h -enc/trans/japanese_sjis.$(OBJEXT): internal/attr/packed_struct.h enc/trans/japanese_sjis.$(OBJEXT): internal/attr/pure.h enc/trans/japanese_sjis.$(OBJEXT): internal/attr/restrict.h enc/trans/japanese_sjis.$(OBJEXT): internal/attr/returns_nonnull.h @@ -7507,6 +7556,7 @@ enc/trans/japanese_sjis.$(OBJEXT): internal/intern/enumerator.h enc/trans/japanese_sjis.$(OBJEXT): internal/intern/error.h enc/trans/japanese_sjis.$(OBJEXT): internal/intern/eval.h enc/trans/japanese_sjis.$(OBJEXT): internal/intern/file.h +enc/trans/japanese_sjis.$(OBJEXT): internal/intern/gc.h enc/trans/japanese_sjis.$(OBJEXT): internal/intern/hash.h enc/trans/japanese_sjis.$(OBJEXT): internal/intern/io.h enc/trans/japanese_sjis.$(OBJEXT): internal/intern/load.h @@ -7537,6 +7587,7 @@ enc/trans/japanese_sjis.$(OBJEXT): internal/memory.h enc/trans/japanese_sjis.$(OBJEXT): internal/method.h enc/trans/japanese_sjis.$(OBJEXT): internal/module.h enc/trans/japanese_sjis.$(OBJEXT): internal/newobj.h +enc/trans/japanese_sjis.$(OBJEXT): internal/rgengc.h enc/trans/japanese_sjis.$(OBJEXT): internal/scan_args.h enc/trans/japanese_sjis.$(OBJEXT): internal/special_consts.h enc/trans/japanese_sjis.$(OBJEXT): internal/static_assert.h @@ -7605,7 +7656,6 @@ enc/trans/korean.$(OBJEXT): internal/attr/noexcept.h enc/trans/korean.$(OBJEXT): internal/attr/noinline.h enc/trans/korean.$(OBJEXT): internal/attr/nonnull.h enc/trans/korean.$(OBJEXT): internal/attr/noreturn.h -enc/trans/korean.$(OBJEXT): internal/attr/packed_struct.h enc/trans/korean.$(OBJEXT): internal/attr/pure.h enc/trans/korean.$(OBJEXT): internal/attr/restrict.h enc/trans/korean.$(OBJEXT): internal/attr/returns_nonnull.h @@ -7665,6 +7715,7 @@ enc/trans/korean.$(OBJEXT): internal/intern/enumerator.h enc/trans/korean.$(OBJEXT): internal/intern/error.h enc/trans/korean.$(OBJEXT): internal/intern/eval.h enc/trans/korean.$(OBJEXT): internal/intern/file.h +enc/trans/korean.$(OBJEXT): internal/intern/gc.h enc/trans/korean.$(OBJEXT): internal/intern/hash.h enc/trans/korean.$(OBJEXT): internal/intern/io.h enc/trans/korean.$(OBJEXT): internal/intern/load.h @@ -7695,6 +7746,7 @@ enc/trans/korean.$(OBJEXT): internal/memory.h enc/trans/korean.$(OBJEXT): internal/method.h enc/trans/korean.$(OBJEXT): internal/module.h enc/trans/korean.$(OBJEXT): internal/newobj.h +enc/trans/korean.$(OBJEXT): internal/rgengc.h enc/trans/korean.$(OBJEXT): internal/scan_args.h enc/trans/korean.$(OBJEXT): internal/special_consts.h enc/trans/korean.$(OBJEXT): internal/static_assert.h @@ -7762,7 +7814,6 @@ enc/trans/newline.$(OBJEXT): internal/attr/noexcept.h enc/trans/newline.$(OBJEXT): internal/attr/noinline.h enc/trans/newline.$(OBJEXT): internal/attr/nonnull.h enc/trans/newline.$(OBJEXT): internal/attr/noreturn.h -enc/trans/newline.$(OBJEXT): internal/attr/packed_struct.h enc/trans/newline.$(OBJEXT): internal/attr/pure.h enc/trans/newline.$(OBJEXT): internal/attr/restrict.h enc/trans/newline.$(OBJEXT): internal/attr/returns_nonnull.h @@ -7822,6 +7873,7 @@ enc/trans/newline.$(OBJEXT): internal/intern/enumerator.h enc/trans/newline.$(OBJEXT): internal/intern/error.h enc/trans/newline.$(OBJEXT): internal/intern/eval.h enc/trans/newline.$(OBJEXT): internal/intern/file.h +enc/trans/newline.$(OBJEXT): internal/intern/gc.h enc/trans/newline.$(OBJEXT): internal/intern/hash.h enc/trans/newline.$(OBJEXT): internal/intern/io.h enc/trans/newline.$(OBJEXT): internal/intern/load.h @@ -7852,6 +7904,7 @@ enc/trans/newline.$(OBJEXT): internal/memory.h enc/trans/newline.$(OBJEXT): internal/method.h enc/trans/newline.$(OBJEXT): internal/module.h enc/trans/newline.$(OBJEXT): internal/newobj.h +enc/trans/newline.$(OBJEXT): internal/rgengc.h enc/trans/newline.$(OBJEXT): internal/scan_args.h enc/trans/newline.$(OBJEXT): internal/special_consts.h enc/trans/newline.$(OBJEXT): internal/static_assert.h @@ -7920,7 +7973,6 @@ enc/trans/single_byte.$(OBJEXT): internal/attr/noexcept.h enc/trans/single_byte.$(OBJEXT): internal/attr/noinline.h enc/trans/single_byte.$(OBJEXT): internal/attr/nonnull.h enc/trans/single_byte.$(OBJEXT): internal/attr/noreturn.h -enc/trans/single_byte.$(OBJEXT): internal/attr/packed_struct.h enc/trans/single_byte.$(OBJEXT): internal/attr/pure.h enc/trans/single_byte.$(OBJEXT): internal/attr/restrict.h enc/trans/single_byte.$(OBJEXT): internal/attr/returns_nonnull.h @@ -7980,6 +8032,7 @@ enc/trans/single_byte.$(OBJEXT): internal/intern/enumerator.h enc/trans/single_byte.$(OBJEXT): internal/intern/error.h enc/trans/single_byte.$(OBJEXT): internal/intern/eval.h enc/trans/single_byte.$(OBJEXT): internal/intern/file.h +enc/trans/single_byte.$(OBJEXT): internal/intern/gc.h enc/trans/single_byte.$(OBJEXT): internal/intern/hash.h enc/trans/single_byte.$(OBJEXT): internal/intern/io.h enc/trans/single_byte.$(OBJEXT): internal/intern/load.h @@ -8010,6 +8063,7 @@ enc/trans/single_byte.$(OBJEXT): internal/memory.h enc/trans/single_byte.$(OBJEXT): internal/method.h enc/trans/single_byte.$(OBJEXT): internal/module.h enc/trans/single_byte.$(OBJEXT): internal/newobj.h +enc/trans/single_byte.$(OBJEXT): internal/rgengc.h enc/trans/single_byte.$(OBJEXT): internal/scan_args.h enc/trans/single_byte.$(OBJEXT): internal/special_consts.h enc/trans/single_byte.$(OBJEXT): internal/static_assert.h @@ -8078,7 +8132,6 @@ enc/trans/transdb.$(OBJEXT): internal/attr/noexcept.h enc/trans/transdb.$(OBJEXT): internal/attr/noinline.h enc/trans/transdb.$(OBJEXT): internal/attr/nonnull.h enc/trans/transdb.$(OBJEXT): internal/attr/noreturn.h -enc/trans/transdb.$(OBJEXT): internal/attr/packed_struct.h enc/trans/transdb.$(OBJEXT): internal/attr/pure.h enc/trans/transdb.$(OBJEXT): internal/attr/restrict.h enc/trans/transdb.$(OBJEXT): internal/attr/returns_nonnull.h @@ -8138,6 +8191,7 @@ enc/trans/transdb.$(OBJEXT): internal/intern/enumerator.h enc/trans/transdb.$(OBJEXT): internal/intern/error.h enc/trans/transdb.$(OBJEXT): internal/intern/eval.h enc/trans/transdb.$(OBJEXT): internal/intern/file.h +enc/trans/transdb.$(OBJEXT): internal/intern/gc.h enc/trans/transdb.$(OBJEXT): internal/intern/hash.h enc/trans/transdb.$(OBJEXT): internal/intern/io.h enc/trans/transdb.$(OBJEXT): internal/intern/load.h @@ -8168,6 +8222,7 @@ enc/trans/transdb.$(OBJEXT): internal/memory.h enc/trans/transdb.$(OBJEXT): internal/method.h enc/trans/transdb.$(OBJEXT): internal/module.h enc/trans/transdb.$(OBJEXT): internal/newobj.h +enc/trans/transdb.$(OBJEXT): internal/rgengc.h enc/trans/transdb.$(OBJEXT): internal/scan_args.h enc/trans/transdb.$(OBJEXT): internal/special_consts.h enc/trans/transdb.$(OBJEXT): internal/static_assert.h @@ -8237,7 +8292,6 @@ enc/trans/utf8_mac.$(OBJEXT): internal/attr/noexcept.h enc/trans/utf8_mac.$(OBJEXT): internal/attr/noinline.h enc/trans/utf8_mac.$(OBJEXT): internal/attr/nonnull.h enc/trans/utf8_mac.$(OBJEXT): internal/attr/noreturn.h -enc/trans/utf8_mac.$(OBJEXT): internal/attr/packed_struct.h enc/trans/utf8_mac.$(OBJEXT): internal/attr/pure.h enc/trans/utf8_mac.$(OBJEXT): internal/attr/restrict.h enc/trans/utf8_mac.$(OBJEXT): internal/attr/returns_nonnull.h @@ -8297,6 +8351,7 @@ enc/trans/utf8_mac.$(OBJEXT): internal/intern/enumerator.h enc/trans/utf8_mac.$(OBJEXT): internal/intern/error.h enc/trans/utf8_mac.$(OBJEXT): internal/intern/eval.h enc/trans/utf8_mac.$(OBJEXT): internal/intern/file.h +enc/trans/utf8_mac.$(OBJEXT): internal/intern/gc.h enc/trans/utf8_mac.$(OBJEXT): internal/intern/hash.h enc/trans/utf8_mac.$(OBJEXT): internal/intern/io.h enc/trans/utf8_mac.$(OBJEXT): internal/intern/load.h @@ -8327,6 +8382,7 @@ enc/trans/utf8_mac.$(OBJEXT): internal/memory.h enc/trans/utf8_mac.$(OBJEXT): internal/method.h enc/trans/utf8_mac.$(OBJEXT): internal/module.h enc/trans/utf8_mac.$(OBJEXT): internal/newobj.h +enc/trans/utf8_mac.$(OBJEXT): internal/rgengc.h enc/trans/utf8_mac.$(OBJEXT): internal/scan_args.h enc/trans/utf8_mac.$(OBJEXT): internal/special_consts.h enc/trans/utf8_mac.$(OBJEXT): internal/static_assert.h @@ -8395,7 +8451,6 @@ enc/trans/utf_16_32.$(OBJEXT): internal/attr/noexcept.h enc/trans/utf_16_32.$(OBJEXT): internal/attr/noinline.h enc/trans/utf_16_32.$(OBJEXT): internal/attr/nonnull.h enc/trans/utf_16_32.$(OBJEXT): internal/attr/noreturn.h -enc/trans/utf_16_32.$(OBJEXT): internal/attr/packed_struct.h enc/trans/utf_16_32.$(OBJEXT): internal/attr/pure.h enc/trans/utf_16_32.$(OBJEXT): internal/attr/restrict.h enc/trans/utf_16_32.$(OBJEXT): internal/attr/returns_nonnull.h @@ -8455,6 +8510,7 @@ enc/trans/utf_16_32.$(OBJEXT): internal/intern/enumerator.h enc/trans/utf_16_32.$(OBJEXT): internal/intern/error.h enc/trans/utf_16_32.$(OBJEXT): internal/intern/eval.h enc/trans/utf_16_32.$(OBJEXT): internal/intern/file.h +enc/trans/utf_16_32.$(OBJEXT): internal/intern/gc.h enc/trans/utf_16_32.$(OBJEXT): internal/intern/hash.h enc/trans/utf_16_32.$(OBJEXT): internal/intern/io.h enc/trans/utf_16_32.$(OBJEXT): internal/intern/load.h @@ -8485,6 +8541,7 @@ enc/trans/utf_16_32.$(OBJEXT): internal/memory.h enc/trans/utf_16_32.$(OBJEXT): internal/method.h enc/trans/utf_16_32.$(OBJEXT): internal/module.h enc/trans/utf_16_32.$(OBJEXT): internal/newobj.h +enc/trans/utf_16_32.$(OBJEXT): internal/rgengc.h enc/trans/utf_16_32.$(OBJEXT): internal/scan_args.h enc/trans/utf_16_32.$(OBJEXT): internal/special_consts.h enc/trans/utf_16_32.$(OBJEXT): internal/static_assert.h @@ -8556,7 +8613,6 @@ enc/unicode.$(OBJEXT): internal/attr/noexcept.h enc/unicode.$(OBJEXT): internal/attr/noinline.h enc/unicode.$(OBJEXT): internal/attr/nonnull.h enc/unicode.$(OBJEXT): internal/attr/noreturn.h -enc/unicode.$(OBJEXT): internal/attr/packed_struct.h enc/unicode.$(OBJEXT): internal/attr/pure.h enc/unicode.$(OBJEXT): internal/attr/restrict.h enc/unicode.$(OBJEXT): internal/attr/returns_nonnull.h @@ -8616,6 +8672,7 @@ enc/unicode.$(OBJEXT): internal/intern/enumerator.h enc/unicode.$(OBJEXT): internal/intern/error.h enc/unicode.$(OBJEXT): internal/intern/eval.h enc/unicode.$(OBJEXT): internal/intern/file.h +enc/unicode.$(OBJEXT): internal/intern/gc.h enc/unicode.$(OBJEXT): internal/intern/hash.h enc/unicode.$(OBJEXT): internal/intern/io.h enc/unicode.$(OBJEXT): internal/intern/load.h @@ -8646,6 +8703,7 @@ enc/unicode.$(OBJEXT): internal/memory.h enc/unicode.$(OBJEXT): internal/method.h enc/unicode.$(OBJEXT): internal/module.h enc/unicode.$(OBJEXT): internal/newobj.h +enc/unicode.$(OBJEXT): internal/rgengc.h enc/unicode.$(OBJEXT): internal/scan_args.h enc/unicode.$(OBJEXT): internal/special_consts.h enc/unicode.$(OBJEXT): internal/static_assert.h @@ -8717,7 +8775,6 @@ enc/us_ascii.$(OBJEXT): internal/attr/noexcept.h enc/us_ascii.$(OBJEXT): internal/attr/noinline.h enc/us_ascii.$(OBJEXT): internal/attr/nonnull.h enc/us_ascii.$(OBJEXT): internal/attr/noreturn.h -enc/us_ascii.$(OBJEXT): internal/attr/packed_struct.h enc/us_ascii.$(OBJEXT): internal/attr/pure.h enc/us_ascii.$(OBJEXT): internal/attr/restrict.h enc/us_ascii.$(OBJEXT): internal/attr/returns_nonnull.h @@ -8786,6 +8843,7 @@ enc/us_ascii.$(OBJEXT): internal/intern/enumerator.h enc/us_ascii.$(OBJEXT): internal/intern/error.h enc/us_ascii.$(OBJEXT): internal/intern/eval.h enc/us_ascii.$(OBJEXT): internal/intern/file.h +enc/us_ascii.$(OBJEXT): internal/intern/gc.h enc/us_ascii.$(OBJEXT): internal/intern/hash.h enc/us_ascii.$(OBJEXT): internal/intern/io.h enc/us_ascii.$(OBJEXT): internal/intern/load.h @@ -8816,6 +8874,7 @@ enc/us_ascii.$(OBJEXT): internal/memory.h enc/us_ascii.$(OBJEXT): internal/method.h enc/us_ascii.$(OBJEXT): internal/module.h enc/us_ascii.$(OBJEXT): internal/newobj.h +enc/us_ascii.$(OBJEXT): internal/rgengc.h enc/us_ascii.$(OBJEXT): internal/scan_args.h enc/us_ascii.$(OBJEXT): internal/special_consts.h enc/us_ascii.$(OBJEXT): internal/static_assert.h @@ -8888,7 +8947,6 @@ enc/utf_16be.$(OBJEXT): internal/attr/noexcept.h enc/utf_16be.$(OBJEXT): internal/attr/noinline.h enc/utf_16be.$(OBJEXT): internal/attr/nonnull.h enc/utf_16be.$(OBJEXT): internal/attr/noreturn.h -enc/utf_16be.$(OBJEXT): internal/attr/packed_struct.h enc/utf_16be.$(OBJEXT): internal/attr/pure.h enc/utf_16be.$(OBJEXT): internal/attr/restrict.h enc/utf_16be.$(OBJEXT): internal/attr/returns_nonnull.h @@ -8948,6 +9006,7 @@ enc/utf_16be.$(OBJEXT): internal/intern/enumerator.h enc/utf_16be.$(OBJEXT): internal/intern/error.h enc/utf_16be.$(OBJEXT): internal/intern/eval.h enc/utf_16be.$(OBJEXT): internal/intern/file.h +enc/utf_16be.$(OBJEXT): internal/intern/gc.h enc/utf_16be.$(OBJEXT): internal/intern/hash.h enc/utf_16be.$(OBJEXT): internal/intern/io.h enc/utf_16be.$(OBJEXT): internal/intern/load.h @@ -8978,6 +9037,7 @@ enc/utf_16be.$(OBJEXT): internal/memory.h enc/utf_16be.$(OBJEXT): internal/method.h enc/utf_16be.$(OBJEXT): internal/module.h enc/utf_16be.$(OBJEXT): internal/newobj.h +enc/utf_16be.$(OBJEXT): internal/rgengc.h enc/utf_16be.$(OBJEXT): internal/scan_args.h enc/utf_16be.$(OBJEXT): internal/special_consts.h enc/utf_16be.$(OBJEXT): internal/static_assert.h @@ -9049,7 +9109,6 @@ enc/utf_16le.$(OBJEXT): internal/attr/noexcept.h enc/utf_16le.$(OBJEXT): internal/attr/noinline.h enc/utf_16le.$(OBJEXT): internal/attr/nonnull.h enc/utf_16le.$(OBJEXT): internal/attr/noreturn.h -enc/utf_16le.$(OBJEXT): internal/attr/packed_struct.h enc/utf_16le.$(OBJEXT): internal/attr/pure.h enc/utf_16le.$(OBJEXT): internal/attr/restrict.h enc/utf_16le.$(OBJEXT): internal/attr/returns_nonnull.h @@ -9109,6 +9168,7 @@ enc/utf_16le.$(OBJEXT): internal/intern/enumerator.h enc/utf_16le.$(OBJEXT): internal/intern/error.h enc/utf_16le.$(OBJEXT): internal/intern/eval.h enc/utf_16le.$(OBJEXT): internal/intern/file.h +enc/utf_16le.$(OBJEXT): internal/intern/gc.h enc/utf_16le.$(OBJEXT): internal/intern/hash.h enc/utf_16le.$(OBJEXT): internal/intern/io.h enc/utf_16le.$(OBJEXT): internal/intern/load.h @@ -9139,6 +9199,7 @@ enc/utf_16le.$(OBJEXT): internal/memory.h enc/utf_16le.$(OBJEXT): internal/method.h enc/utf_16le.$(OBJEXT): internal/module.h enc/utf_16le.$(OBJEXT): internal/newobj.h +enc/utf_16le.$(OBJEXT): internal/rgengc.h enc/utf_16le.$(OBJEXT): internal/scan_args.h enc/utf_16le.$(OBJEXT): internal/special_consts.h enc/utf_16le.$(OBJEXT): internal/static_assert.h @@ -9210,7 +9271,6 @@ enc/utf_32be.$(OBJEXT): internal/attr/noexcept.h enc/utf_32be.$(OBJEXT): internal/attr/noinline.h enc/utf_32be.$(OBJEXT): internal/attr/nonnull.h enc/utf_32be.$(OBJEXT): internal/attr/noreturn.h -enc/utf_32be.$(OBJEXT): internal/attr/packed_struct.h enc/utf_32be.$(OBJEXT): internal/attr/pure.h enc/utf_32be.$(OBJEXT): internal/attr/restrict.h enc/utf_32be.$(OBJEXT): internal/attr/returns_nonnull.h @@ -9270,6 +9330,7 @@ enc/utf_32be.$(OBJEXT): internal/intern/enumerator.h enc/utf_32be.$(OBJEXT): internal/intern/error.h enc/utf_32be.$(OBJEXT): internal/intern/eval.h enc/utf_32be.$(OBJEXT): internal/intern/file.h +enc/utf_32be.$(OBJEXT): internal/intern/gc.h enc/utf_32be.$(OBJEXT): internal/intern/hash.h enc/utf_32be.$(OBJEXT): internal/intern/io.h enc/utf_32be.$(OBJEXT): internal/intern/load.h @@ -9300,6 +9361,7 @@ enc/utf_32be.$(OBJEXT): internal/memory.h enc/utf_32be.$(OBJEXT): internal/method.h enc/utf_32be.$(OBJEXT): internal/module.h enc/utf_32be.$(OBJEXT): internal/newobj.h +enc/utf_32be.$(OBJEXT): internal/rgengc.h enc/utf_32be.$(OBJEXT): internal/scan_args.h enc/utf_32be.$(OBJEXT): internal/special_consts.h enc/utf_32be.$(OBJEXT): internal/static_assert.h @@ -9371,7 +9433,6 @@ enc/utf_32le.$(OBJEXT): internal/attr/noexcept.h enc/utf_32le.$(OBJEXT): internal/attr/noinline.h enc/utf_32le.$(OBJEXT): internal/attr/nonnull.h enc/utf_32le.$(OBJEXT): internal/attr/noreturn.h -enc/utf_32le.$(OBJEXT): internal/attr/packed_struct.h enc/utf_32le.$(OBJEXT): internal/attr/pure.h enc/utf_32le.$(OBJEXT): internal/attr/restrict.h enc/utf_32le.$(OBJEXT): internal/attr/returns_nonnull.h @@ -9431,6 +9492,7 @@ enc/utf_32le.$(OBJEXT): internal/intern/enumerator.h enc/utf_32le.$(OBJEXT): internal/intern/error.h enc/utf_32le.$(OBJEXT): internal/intern/eval.h enc/utf_32le.$(OBJEXT): internal/intern/file.h +enc/utf_32le.$(OBJEXT): internal/intern/gc.h enc/utf_32le.$(OBJEXT): internal/intern/hash.h enc/utf_32le.$(OBJEXT): internal/intern/io.h enc/utf_32le.$(OBJEXT): internal/intern/load.h @@ -9461,6 +9523,7 @@ enc/utf_32le.$(OBJEXT): internal/memory.h enc/utf_32le.$(OBJEXT): internal/method.h enc/utf_32le.$(OBJEXT): internal/module.h enc/utf_32le.$(OBJEXT): internal/newobj.h +enc/utf_32le.$(OBJEXT): internal/rgengc.h enc/utf_32le.$(OBJEXT): internal/scan_args.h enc/utf_32le.$(OBJEXT): internal/special_consts.h enc/utf_32le.$(OBJEXT): internal/static_assert.h @@ -9532,7 +9595,6 @@ enc/utf_8.$(OBJEXT): internal/attr/noexcept.h enc/utf_8.$(OBJEXT): internal/attr/noinline.h enc/utf_8.$(OBJEXT): internal/attr/nonnull.h enc/utf_8.$(OBJEXT): internal/attr/noreturn.h -enc/utf_8.$(OBJEXT): internal/attr/packed_struct.h enc/utf_8.$(OBJEXT): internal/attr/pure.h enc/utf_8.$(OBJEXT): internal/attr/restrict.h enc/utf_8.$(OBJEXT): internal/attr/returns_nonnull.h @@ -9601,6 +9663,7 @@ enc/utf_8.$(OBJEXT): internal/intern/enumerator.h enc/utf_8.$(OBJEXT): internal/intern/error.h enc/utf_8.$(OBJEXT): internal/intern/eval.h enc/utf_8.$(OBJEXT): internal/intern/file.h +enc/utf_8.$(OBJEXT): internal/intern/gc.h enc/utf_8.$(OBJEXT): internal/intern/hash.h enc/utf_8.$(OBJEXT): internal/intern/io.h enc/utf_8.$(OBJEXT): internal/intern/load.h @@ -9631,6 +9694,7 @@ enc/utf_8.$(OBJEXT): internal/memory.h enc/utf_8.$(OBJEXT): internal/method.h enc/utf_8.$(OBJEXT): internal/module.h enc/utf_8.$(OBJEXT): internal/newobj.h +enc/utf_8.$(OBJEXT): internal/rgengc.h enc/utf_8.$(OBJEXT): internal/scan_args.h enc/utf_8.$(OBJEXT): internal/special_consts.h enc/utf_8.$(OBJEXT): internal/static_assert.h @@ -9703,7 +9767,6 @@ enc/windows_1250.$(OBJEXT): internal/attr/noexcept.h enc/windows_1250.$(OBJEXT): internal/attr/noinline.h enc/windows_1250.$(OBJEXT): internal/attr/nonnull.h enc/windows_1250.$(OBJEXT): internal/attr/noreturn.h -enc/windows_1250.$(OBJEXT): internal/attr/packed_struct.h enc/windows_1250.$(OBJEXT): internal/attr/pure.h enc/windows_1250.$(OBJEXT): internal/attr/restrict.h enc/windows_1250.$(OBJEXT): internal/attr/returns_nonnull.h @@ -9763,6 +9826,7 @@ enc/windows_1250.$(OBJEXT): internal/intern/enumerator.h enc/windows_1250.$(OBJEXT): internal/intern/error.h enc/windows_1250.$(OBJEXT): internal/intern/eval.h enc/windows_1250.$(OBJEXT): internal/intern/file.h +enc/windows_1250.$(OBJEXT): internal/intern/gc.h enc/windows_1250.$(OBJEXT): internal/intern/hash.h enc/windows_1250.$(OBJEXT): internal/intern/io.h enc/windows_1250.$(OBJEXT): internal/intern/load.h @@ -9793,6 +9857,7 @@ enc/windows_1250.$(OBJEXT): internal/memory.h enc/windows_1250.$(OBJEXT): internal/method.h enc/windows_1250.$(OBJEXT): internal/module.h enc/windows_1250.$(OBJEXT): internal/newobj.h +enc/windows_1250.$(OBJEXT): internal/rgengc.h enc/windows_1250.$(OBJEXT): internal/scan_args.h enc/windows_1250.$(OBJEXT): internal/special_consts.h enc/windows_1250.$(OBJEXT): internal/static_assert.h @@ -9863,7 +9928,6 @@ enc/windows_1251.$(OBJEXT): internal/attr/noexcept.h enc/windows_1251.$(OBJEXT): internal/attr/noinline.h enc/windows_1251.$(OBJEXT): internal/attr/nonnull.h enc/windows_1251.$(OBJEXT): internal/attr/noreturn.h -enc/windows_1251.$(OBJEXT): internal/attr/packed_struct.h enc/windows_1251.$(OBJEXT): internal/attr/pure.h enc/windows_1251.$(OBJEXT): internal/attr/restrict.h enc/windows_1251.$(OBJEXT): internal/attr/returns_nonnull.h @@ -9923,6 +9987,7 @@ enc/windows_1251.$(OBJEXT): internal/intern/enumerator.h enc/windows_1251.$(OBJEXT): internal/intern/error.h enc/windows_1251.$(OBJEXT): internal/intern/eval.h enc/windows_1251.$(OBJEXT): internal/intern/file.h +enc/windows_1251.$(OBJEXT): internal/intern/gc.h enc/windows_1251.$(OBJEXT): internal/intern/hash.h enc/windows_1251.$(OBJEXT): internal/intern/io.h enc/windows_1251.$(OBJEXT): internal/intern/load.h @@ -9953,6 +10018,7 @@ enc/windows_1251.$(OBJEXT): internal/memory.h enc/windows_1251.$(OBJEXT): internal/method.h enc/windows_1251.$(OBJEXT): internal/module.h enc/windows_1251.$(OBJEXT): internal/newobj.h +enc/windows_1251.$(OBJEXT): internal/rgengc.h enc/windows_1251.$(OBJEXT): internal/scan_args.h enc/windows_1251.$(OBJEXT): internal/special_consts.h enc/windows_1251.$(OBJEXT): internal/static_assert.h @@ -10024,7 +10090,6 @@ enc/windows_1252.$(OBJEXT): internal/attr/noexcept.h enc/windows_1252.$(OBJEXT): internal/attr/noinline.h enc/windows_1252.$(OBJEXT): internal/attr/nonnull.h enc/windows_1252.$(OBJEXT): internal/attr/noreturn.h -enc/windows_1252.$(OBJEXT): internal/attr/packed_struct.h enc/windows_1252.$(OBJEXT): internal/attr/pure.h enc/windows_1252.$(OBJEXT): internal/attr/restrict.h enc/windows_1252.$(OBJEXT): internal/attr/returns_nonnull.h @@ -10084,6 +10149,7 @@ enc/windows_1252.$(OBJEXT): internal/intern/enumerator.h enc/windows_1252.$(OBJEXT): internal/intern/error.h enc/windows_1252.$(OBJEXT): internal/intern/eval.h enc/windows_1252.$(OBJEXT): internal/intern/file.h +enc/windows_1252.$(OBJEXT): internal/intern/gc.h enc/windows_1252.$(OBJEXT): internal/intern/hash.h enc/windows_1252.$(OBJEXT): internal/intern/io.h enc/windows_1252.$(OBJEXT): internal/intern/load.h @@ -10114,6 +10180,7 @@ enc/windows_1252.$(OBJEXT): internal/memory.h enc/windows_1252.$(OBJEXT): internal/method.h enc/windows_1252.$(OBJEXT): internal/module.h enc/windows_1252.$(OBJEXT): internal/newobj.h +enc/windows_1252.$(OBJEXT): internal/rgengc.h enc/windows_1252.$(OBJEXT): internal/scan_args.h enc/windows_1252.$(OBJEXT): internal/special_consts.h enc/windows_1252.$(OBJEXT): internal/static_assert.h @@ -10184,7 +10251,6 @@ enc/windows_1253.$(OBJEXT): internal/attr/noexcept.h enc/windows_1253.$(OBJEXT): internal/attr/noinline.h enc/windows_1253.$(OBJEXT): internal/attr/nonnull.h enc/windows_1253.$(OBJEXT): internal/attr/noreturn.h -enc/windows_1253.$(OBJEXT): internal/attr/packed_struct.h enc/windows_1253.$(OBJEXT): internal/attr/pure.h enc/windows_1253.$(OBJEXT): internal/attr/restrict.h enc/windows_1253.$(OBJEXT): internal/attr/returns_nonnull.h @@ -10244,6 +10310,7 @@ enc/windows_1253.$(OBJEXT): internal/intern/enumerator.h enc/windows_1253.$(OBJEXT): internal/intern/error.h enc/windows_1253.$(OBJEXT): internal/intern/eval.h enc/windows_1253.$(OBJEXT): internal/intern/file.h +enc/windows_1253.$(OBJEXT): internal/intern/gc.h enc/windows_1253.$(OBJEXT): internal/intern/hash.h enc/windows_1253.$(OBJEXT): internal/intern/io.h enc/windows_1253.$(OBJEXT): internal/intern/load.h @@ -10274,6 +10341,7 @@ enc/windows_1253.$(OBJEXT): internal/memory.h enc/windows_1253.$(OBJEXT): internal/method.h enc/windows_1253.$(OBJEXT): internal/module.h enc/windows_1253.$(OBJEXT): internal/newobj.h +enc/windows_1253.$(OBJEXT): internal/rgengc.h enc/windows_1253.$(OBJEXT): internal/scan_args.h enc/windows_1253.$(OBJEXT): internal/special_consts.h enc/windows_1253.$(OBJEXT): internal/static_assert.h @@ -10345,7 +10413,6 @@ enc/windows_1254.$(OBJEXT): internal/attr/noexcept.h enc/windows_1254.$(OBJEXT): internal/attr/noinline.h enc/windows_1254.$(OBJEXT): internal/attr/nonnull.h enc/windows_1254.$(OBJEXT): internal/attr/noreturn.h -enc/windows_1254.$(OBJEXT): internal/attr/packed_struct.h enc/windows_1254.$(OBJEXT): internal/attr/pure.h enc/windows_1254.$(OBJEXT): internal/attr/restrict.h enc/windows_1254.$(OBJEXT): internal/attr/returns_nonnull.h @@ -10405,6 +10472,7 @@ enc/windows_1254.$(OBJEXT): internal/intern/enumerator.h enc/windows_1254.$(OBJEXT): internal/intern/error.h enc/windows_1254.$(OBJEXT): internal/intern/eval.h enc/windows_1254.$(OBJEXT): internal/intern/file.h +enc/windows_1254.$(OBJEXT): internal/intern/gc.h enc/windows_1254.$(OBJEXT): internal/intern/hash.h enc/windows_1254.$(OBJEXT): internal/intern/io.h enc/windows_1254.$(OBJEXT): internal/intern/load.h @@ -10435,6 +10503,7 @@ enc/windows_1254.$(OBJEXT): internal/memory.h enc/windows_1254.$(OBJEXT): internal/method.h enc/windows_1254.$(OBJEXT): internal/module.h enc/windows_1254.$(OBJEXT): internal/newobj.h +enc/windows_1254.$(OBJEXT): internal/rgengc.h enc/windows_1254.$(OBJEXT): internal/scan_args.h enc/windows_1254.$(OBJEXT): internal/special_consts.h enc/windows_1254.$(OBJEXT): internal/static_assert.h @@ -10506,7 +10575,6 @@ enc/windows_1257.$(OBJEXT): internal/attr/noexcept.h enc/windows_1257.$(OBJEXT): internal/attr/noinline.h enc/windows_1257.$(OBJEXT): internal/attr/nonnull.h enc/windows_1257.$(OBJEXT): internal/attr/noreturn.h -enc/windows_1257.$(OBJEXT): internal/attr/packed_struct.h enc/windows_1257.$(OBJEXT): internal/attr/pure.h enc/windows_1257.$(OBJEXT): internal/attr/restrict.h enc/windows_1257.$(OBJEXT): internal/attr/returns_nonnull.h @@ -10566,6 +10634,7 @@ enc/windows_1257.$(OBJEXT): internal/intern/enumerator.h enc/windows_1257.$(OBJEXT): internal/intern/error.h enc/windows_1257.$(OBJEXT): internal/intern/eval.h enc/windows_1257.$(OBJEXT): internal/intern/file.h +enc/windows_1257.$(OBJEXT): internal/intern/gc.h enc/windows_1257.$(OBJEXT): internal/intern/hash.h enc/windows_1257.$(OBJEXT): internal/intern/io.h enc/windows_1257.$(OBJEXT): internal/intern/load.h @@ -10596,6 +10665,7 @@ enc/windows_1257.$(OBJEXT): internal/memory.h enc/windows_1257.$(OBJEXT): internal/method.h enc/windows_1257.$(OBJEXT): internal/module.h enc/windows_1257.$(OBJEXT): internal/newobj.h +enc/windows_1257.$(OBJEXT): internal/rgengc.h enc/windows_1257.$(OBJEXT): internal/scan_args.h enc/windows_1257.$(OBJEXT): internal/special_consts.h enc/windows_1257.$(OBJEXT): internal/static_assert.h @@ -10669,7 +10739,6 @@ enc/windows_31j.$(OBJEXT): internal/attr/noexcept.h enc/windows_31j.$(OBJEXT): internal/attr/noinline.h enc/windows_31j.$(OBJEXT): internal/attr/nonnull.h enc/windows_31j.$(OBJEXT): internal/attr/noreturn.h -enc/windows_31j.$(OBJEXT): internal/attr/packed_struct.h enc/windows_31j.$(OBJEXT): internal/attr/pure.h enc/windows_31j.$(OBJEXT): internal/attr/restrict.h enc/windows_31j.$(OBJEXT): internal/attr/returns_nonnull.h @@ -10729,6 +10798,7 @@ enc/windows_31j.$(OBJEXT): internal/intern/enumerator.h enc/windows_31j.$(OBJEXT): internal/intern/error.h enc/windows_31j.$(OBJEXT): internal/intern/eval.h enc/windows_31j.$(OBJEXT): internal/intern/file.h +enc/windows_31j.$(OBJEXT): internal/intern/gc.h enc/windows_31j.$(OBJEXT): internal/intern/hash.h enc/windows_31j.$(OBJEXT): internal/intern/io.h enc/windows_31j.$(OBJEXT): internal/intern/load.h @@ -10759,6 +10829,7 @@ enc/windows_31j.$(OBJEXT): internal/memory.h enc/windows_31j.$(OBJEXT): internal/method.h enc/windows_31j.$(OBJEXT): internal/module.h enc/windows_31j.$(OBJEXT): internal/newobj.h +enc/windows_31j.$(OBJEXT): internal/rgengc.h enc/windows_31j.$(OBJEXT): internal/scan_args.h enc/windows_31j.$(OBJEXT): internal/special_consts.h enc/windows_31j.$(OBJEXT): internal/static_assert.h diff --git a/enc/trans/big5-uao-tbl.rb b/enc/trans/big5-uao-tbl.rb index a6f37cc7bd..295fbfdda5 100644 --- a/enc/trans/big5-uao-tbl.rb +++ b/enc/trans/big5-uao-tbl.rb @@ -19781,4 +19781,4 @@ BIG5_UAO_TO_UCS_TBL = [ ["FEFC",0x8262], ["FEFD",0x826A], ["FEFE",0x8288], -] +]
\ No newline at end of file diff --git a/enc/trans/cp850-tbl.rb b/enc/trans/cp850-tbl.rb index e0d120c803..615d3b2599 100644 --- a/enc/trans/cp850-tbl.rb +++ b/enc/trans/cp850-tbl.rb @@ -127,4 +127,4 @@ CP850_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/cp852-tbl.rb b/enc/trans/cp852-tbl.rb index ad32cdc59d..6763bfa6e9 100644 --- a/enc/trans/cp852-tbl.rb +++ b/enc/trans/cp852-tbl.rb @@ -127,4 +127,4 @@ CP852_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/cp855-tbl.rb b/enc/trans/cp855-tbl.rb index a2ca9daf97..72e548b9cb 100644 --- a/enc/trans/cp855-tbl.rb +++ b/enc/trans/cp855-tbl.rb @@ -127,4 +127,4 @@ CP855_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/gbk-tbl.rb b/enc/trans/gbk-tbl.rb index 40929f992e..26f5078c45 100644 --- a/enc/trans/gbk-tbl.rb +++ b/enc/trans/gbk-tbl.rb @@ -21791,4 +21791,4 @@ GBK_TO_UCS_TBL= [ ["A3FE",0xFFE3], ["A957",0xFFE4], ["A3A4",0xFFE5], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm437-tbl.rb b/enc/trans/ibm437-tbl.rb index 6a823c293d..5ae64d621e 100644 --- a/enc/trans/ibm437-tbl.rb +++ b/enc/trans/ibm437-tbl.rb @@ -127,4 +127,4 @@ IBM437_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm775-tbl.rb b/enc/trans/ibm775-tbl.rb index 2b79780813..f55679f409 100644 --- a/enc/trans/ibm775-tbl.rb +++ b/enc/trans/ibm775-tbl.rb @@ -127,4 +127,4 @@ IBM775_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm852-tbl.rb b/enc/trans/ibm852-tbl.rb index 3e70daef2e..6cec51cf80 100644 --- a/enc/trans/ibm852-tbl.rb +++ b/enc/trans/ibm852-tbl.rb @@ -127,4 +127,4 @@ IBM852_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm855-tbl.rb b/enc/trans/ibm855-tbl.rb index b4c0244728..7e0cc5014f 100644 --- a/enc/trans/ibm855-tbl.rb +++ b/enc/trans/ibm855-tbl.rb @@ -127,4 +127,4 @@ IBM855_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm857-tbl.rb b/enc/trans/ibm857-tbl.rb index c1c76545ed..5b20d389d3 100644 --- a/enc/trans/ibm857-tbl.rb +++ b/enc/trans/ibm857-tbl.rb @@ -124,4 +124,4 @@ IBM857_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm860-tbl.rb b/enc/trans/ibm860-tbl.rb index 77734cd194..ae218a129f 100644 --- a/enc/trans/ibm860-tbl.rb +++ b/enc/trans/ibm860-tbl.rb @@ -127,4 +127,4 @@ IBM860_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm861-tbl.rb b/enc/trans/ibm861-tbl.rb index 69e0a45019..c24042a76c 100644 --- a/enc/trans/ibm861-tbl.rb +++ b/enc/trans/ibm861-tbl.rb @@ -127,4 +127,4 @@ IBM861_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm862-tbl.rb b/enc/trans/ibm862-tbl.rb index f564051fd6..31d6fb0243 100644 --- a/enc/trans/ibm862-tbl.rb +++ b/enc/trans/ibm862-tbl.rb @@ -127,4 +127,4 @@ IBM862_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm863-tbl.rb b/enc/trans/ibm863-tbl.rb index af1eb97566..db110cf38c 100644 --- a/enc/trans/ibm863-tbl.rb +++ b/enc/trans/ibm863-tbl.rb @@ -127,4 +127,4 @@ IBM863_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm865-tbl.rb b/enc/trans/ibm865-tbl.rb index 4747509d66..22e322fb31 100644 --- a/enc/trans/ibm865-tbl.rb +++ b/enc/trans/ibm865-tbl.rb @@ -127,4 +127,4 @@ IBM865_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm866-tbl.rb b/enc/trans/ibm866-tbl.rb index ed4b0d683e..95b9ee7534 100644 --- a/enc/trans/ibm866-tbl.rb +++ b/enc/trans/ibm866-tbl.rb @@ -127,4 +127,4 @@ IBM866_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/ibm869-tbl.rb b/enc/trans/ibm869-tbl.rb index bee85b84ea..437e41ad98 100644 --- a/enc/trans/ibm869-tbl.rb +++ b/enc/trans/ibm869-tbl.rb @@ -118,4 +118,4 @@ IBM869_TO_UCS_TBL = [ ["B1",0x2592], ["B2",0x2593], ["FE",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/koi8-r-tbl.rb b/enc/trans/koi8-r-tbl.rb index 4cfe523334..a1f55ff2e3 100644 --- a/enc/trans/koi8-r-tbl.rb +++ b/enc/trans/koi8-r-tbl.rb @@ -127,4 +127,4 @@ KOI8_R_TO_UCS_TBL = [ ["91",0x2592], ["92",0x2593], ["94",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/koi8-u-tbl.rb b/enc/trans/koi8-u-tbl.rb index 225931ba5e..e87aa1aa3f 100644 --- a/enc/trans/koi8-u-tbl.rb +++ b/enc/trans/koi8-u-tbl.rb @@ -127,4 +127,4 @@ KOI8_U_TO_UCS_TBL = [ ["91",0x2592], ["92",0x2593], ["94",0x25A0], -] +]
\ No newline at end of file diff --git a/enc/trans/maccroatian-tbl.rb b/enc/trans/maccroatian-tbl.rb index e78f2f373f..359878ec1f 100644 --- a/enc/trans/maccroatian-tbl.rb +++ b/enc/trans/maccroatian-tbl.rb @@ -126,4 +126,4 @@ MACCROATIAN_TO_UCS_TBL = [ ["B2",0x2264], ["B3",0x2265], ["D7",0x25CA], -] +]
\ No newline at end of file diff --git a/enc/trans/maccyrillic-tbl.rb b/enc/trans/maccyrillic-tbl.rb index 2d5af7b466..378aa8c3bc 100644 --- a/enc/trans/maccyrillic-tbl.rb +++ b/enc/trans/maccyrillic-tbl.rb @@ -127,4 +127,4 @@ MACCYRILLIC_TO_UCS_TBL = [ ["AD",0x2260], ["B2",0x2264], ["B3",0x2265], -] +]
\ No newline at end of file diff --git a/enc/trans/macgreek-tbl.rb b/enc/trans/macgreek-tbl.rb index 645aefe5ff..7f75fde6d2 100644 --- a/enc/trans/macgreek-tbl.rb +++ b/enc/trans/macgreek-tbl.rb @@ -126,4 +126,4 @@ MACGREEK_TO_UCS_TBL = [ ["AD",0x2260], ["B2",0x2264], ["B3",0x2265], -] +]
\ No newline at end of file diff --git a/enc/trans/maciceland-tbl.rb b/enc/trans/maciceland-tbl.rb index ee9b5000d9..818d992274 100644 --- a/enc/trans/maciceland-tbl.rb +++ b/enc/trans/maciceland-tbl.rb @@ -126,4 +126,4 @@ MACICELAND_TO_UCS_TBL = [ ["B2",0x2264], ["B3",0x2265], ["D7",0x25CA], -] +]
\ No newline at end of file diff --git a/enc/trans/macroman-tbl.rb b/enc/trans/macroman-tbl.rb index 9a8172554a..8f74eea27f 100644 --- a/enc/trans/macroman-tbl.rb +++ b/enc/trans/macroman-tbl.rb @@ -126,4 +126,4 @@ MACROMAN_TO_UCS_TBL = [ ["D7",0x25CA], ["DE",0xFB01], ["DF",0xFB02], -] +]
\ No newline at end of file diff --git a/enc/trans/macromania-tbl.rb b/enc/trans/macromania-tbl.rb index 29a7942d9b..ff95c5e957 100644 --- a/enc/trans/macromania-tbl.rb +++ b/enc/trans/macromania-tbl.rb @@ -126,4 +126,4 @@ MACROMANIA_TO_UCS_TBL = [ ["B2",0x2264], ["B3",0x2265], ["D7",0x25CA], -] +]
\ No newline at end of file diff --git a/enc/trans/macturkish-tbl.rb b/enc/trans/macturkish-tbl.rb index 883f693e23..2358672ed6 100644 --- a/enc/trans/macturkish-tbl.rb +++ b/enc/trans/macturkish-tbl.rb @@ -125,4 +125,4 @@ MACTURKISH_TO_UCS_TBL = [ ["B2",0x2264], ["B3",0x2265], ["D7",0x25CA], -] +]
\ No newline at end of file diff --git a/enc/trans/macukraine-tbl.rb b/enc/trans/macukraine-tbl.rb index 09acf7c45a..6941af654d 100644 --- a/enc/trans/macukraine-tbl.rb +++ b/enc/trans/macukraine-tbl.rb @@ -127,4 +127,4 @@ MACUKRAINE_TO_UCS_TBL = [ ["AD",0x2260], ["B2",0x2264], ["B3",0x2265], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-1250-tbl.rb b/enc/trans/windows-1250-tbl.rb index 9cdb432a03..52063e17b1 100644 --- a/enc/trans/windows-1250-tbl.rb +++ b/enc/trans/windows-1250-tbl.rb @@ -122,4 +122,4 @@ WINDOWS_1250_TO_UCS_TBL = [ ["9B",0x203A], ["80",0x20AC], ["99",0x2122], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-1251-tbl.rb b/enc/trans/windows-1251-tbl.rb index 3c6c4ca0bb..870c718b72 100644 --- a/enc/trans/windows-1251-tbl.rb +++ b/enc/trans/windows-1251-tbl.rb @@ -126,4 +126,4 @@ WINDOWS_1251_TO_UCS_TBL = [ ["88",0x20AC], ["B9",0x2116], ["99",0x2122], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-1252-tbl.rb b/enc/trans/windows-1252-tbl.rb index 86a7be41e7..cefc72dff2 100644 --- a/enc/trans/windows-1252-tbl.rb +++ b/enc/trans/windows-1252-tbl.rb @@ -122,4 +122,4 @@ WINDOWS_1252_TO_UCS_TBL = [ ["9B",0x203A], ["80",0x20AC], ["99",0x2122], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-1253-tbl.rb b/enc/trans/windows-1253-tbl.rb index b9d47be2e0..132edb60ba 100644 --- a/enc/trans/windows-1253-tbl.rb +++ b/enc/trans/windows-1253-tbl.rb @@ -110,4 +110,4 @@ WINDOWS_1253_TO_UCS_TBL = [ ["9B",0x203A], ["80",0x20AC], ["99",0x2122], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-1254-tbl.rb b/enc/trans/windows-1254-tbl.rb index 84063abf05..81a747afaa 100644 --- a/enc/trans/windows-1254-tbl.rb +++ b/enc/trans/windows-1254-tbl.rb @@ -120,4 +120,4 @@ WINDOWS_1254_TO_UCS_TBL = [ ["9B",0x203A], ["80",0x20AC], ["99",0x2122], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-1256-tbl.rb b/enc/trans/windows-1256-tbl.rb index 0b76c824d1..25c5874fb0 100644 --- a/enc/trans/windows-1256-tbl.rb +++ b/enc/trans/windows-1256-tbl.rb @@ -127,4 +127,4 @@ WINDOWS_1256_TO_UCS_TBL = [ ["9B",0x203A], ["80",0x20AC], ["99",0x2122], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-1257-tbl.rb b/enc/trans/windows-1257-tbl.rb index 7f15cbbd50..9e89b2b0b5 100644 --- a/enc/trans/windows-1257-tbl.rb +++ b/enc/trans/windows-1257-tbl.rb @@ -115,4 +115,4 @@ WINDOWS_1257_TO_UCS_TBL = [ ["9B",0x203A], ["80",0x20AC], ["99",0x2122], -] +]
\ No newline at end of file diff --git a/enc/trans/windows-874-tbl.rb b/enc/trans/windows-874-tbl.rb index a569765bf0..0552df3d28 100644 --- a/enc/trans/windows-874-tbl.rb +++ b/enc/trans/windows-874-tbl.rb @@ -96,4 +96,4 @@ WINDOWS_874_TO_UCS_TBL = [ ["95",0x2022], ["85",0x2026], ["80",0x20AC], -] +]
\ No newline at end of file diff --git a/enc/unicode/15.0.0/name2ctype.h b/enc/unicode/15.0.0/name2ctype.h index 6bbbb3512f..a2c996423d 100644 --- a/enc/unicode/15.0.0/name2ctype.h +++ b/enc/unicode/15.0.0/name2ctype.h @@ -5402,7 +5402,7 @@ static const OnigCodePoint CR_ASCII[] = { 0x0000, 0x007f, }; /* CR_ASCII */ -/* 'Punct': [[:Punct:]] */ +/* 'Punct' */ static const OnigCodePoint CR_Punct[] = { 191, 0x0021, 0x0023, diff --git a/encoding.c b/encoding.c index a0be931c97..2f4b47bdfa 100644 --- a/encoding.c +++ b/encoding.c @@ -71,24 +71,6 @@ 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; @@ -120,7 +102,7 @@ static rb_encoding *global_enc_ascii, static const rb_data_type_t encoding_data_type = { "encoding", {0, 0, 0,}, - 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; #define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type) @@ -523,6 +505,37 @@ enc_replicate(struct enc_table *enc_table, const char *name, rb_encoding *encodi return idx; } +int +rb_enc_replicate(const char *name, rb_encoding *encoding) +{ + int r; + + GLOBAL_ENC_TABLE_EVAL(enc_table, + r = enc_replicate(enc_table, name, encoding)); + + return r; +} + +/* + * call-seq: + * enc.replicate(name) -> encoding + * + * Returns a replicated encoding of _enc_ whose name is _name_. + * The new encoding should have the same byte structure of _enc_. + * If _name_ is used by another encoding, raise ArgumentError. + * + */ +static VALUE +enc_replicate_m(VALUE encoding, VALUE name) +{ + int idx; + rb_warn_deprecated_to_remove("3.3", "Encoding#replicate", "the original encoding"); + + idx = rb_enc_replicate(name_for_encoding(&name), rb_to_encoding(encoding)); + RB_GC_GUARD(name); + return rb_enc_from_encoding_index(idx); +} + static int enc_replicate_with_index(struct enc_table *enc_table, const char *name, rb_encoding *origenc, int idx) { @@ -1908,6 +1921,7 @@ Init_Encoding(void) rb_define_method(rb_cEncoding, "names", enc_names, 0); rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0); rb_define_method(rb_cEncoding, "ascii_compatible?", enc_ascii_compatible_p, 0); + rb_define_method(rb_cEncoding, "replicate", enc_replicate_m, 1); rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0); rb_define_singleton_method(rb_cEncoding, "name_list", rb_enc_name_list, 0); rb_define_singleton_method(rb_cEncoding, "aliases", rb_enc_aliases, 0); @@ -354,7 +354,7 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop)) * {foo: 0, bar: 1, baz: 2}.find {|key, value| key.start_with?('b') } # => [:bar, 1] * {foo: 0, bar: 1, baz: 2}.find(proc {[]}) {|key, value| key.start_with?('c') } # => [] * - * With no block given, returns an Enumerator. + * With no block given, returns an \Enumerator. * */ static VALUE @@ -424,7 +424,7 @@ find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop)) * ['a', 'b', 'c', 'b'].find_index {|element| element.start_with?('b') } # => 1 * {foo: 0, bar: 1, baz: 2}.find_index {|key, value| value > 1 } # => 2 * - * With no argument and no block given, returns an Enumerator. + * With no argument and no block given, returns an \Enumerator. * */ @@ -501,7 +501,7 @@ enum_size_over_p(VALUE obj, long n) * a = {foo: 0, bar: 1, baz: 2}.select {|key, value| key.start_with?('b') } * a # => {:bar=>1, :baz=>2} * - * With no block given, returns an Enumerator. + * With no block given, returns an \Enumerator. * * Related: #reject. */ @@ -543,7 +543,7 @@ filter_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary)) * (0..9).filter_map {|i| i * 2 if i.even? } # => [0, 4, 8, 12, 16] * {foo: 0, bar: 1, baz: 2}.filter_map {|key, value| key if value.even? } # => [:foo, :baz] * - * When no block given, returns an Enumerator. + * When no block given, returns an \Enumerator. * */ static VALUE @@ -584,7 +584,7 @@ reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary)) * (0..9).reject {|i| i * 2 if i.even? } # => [1, 3, 5, 7, 9] * {foo: 0, bar: 1, baz: 2}.reject {|key, value| key if value.odd? } # => {:foo=>0, :baz=>2} * - * When no block given, returns an Enumerator. + * When no block given, returns an \Enumerator. * * Related: #select. */ @@ -631,7 +631,7 @@ collect_all(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary)) * (0..4).map {|i| i*i } # => [0, 1, 4, 9, 16] * {foo: 0, bar: 1, baz: 2}.map {|key, value| value*2} # => [0, 2, 4] * - * With no block given, returns an Enumerator. + * With no block given, returns an \Enumerator. * */ static VALUE @@ -681,7 +681,7 @@ flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary)) * [[0, 1], [2, 3]].flat_map {|e| e + [100] } # => [0, 1, 100, 2, 3, 100] * {foo: 0, bar: 1, baz: 2}.flat_map {|key, value| [key, value] } # => [:foo, 0, :bar, 1, :baz, 2] * - * With no block given, returns an Enumerator. + * With no block given, returns an \Enumerator. * * Alias: #collect_concat. */ @@ -700,12 +700,13 @@ enum_flat_map(VALUE obj) /* * call-seq: - * to_a(*args) -> array + * to_a -> array * * Returns an array containing the items in +self+: * * (0..4).to_a # => [0, 1, 2, 3, 4] * + * Enumerable#entries is an alias for Enumerable#to_a. */ static VALUE enum_to_a(int argc, VALUE *argv, VALUE obj) @@ -745,8 +746,8 @@ enum_to_h_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) /* * call-seq: - * to_h(*args) -> hash - * to_h(*args) {|element| ... } -> hash + * to_h -> hash + * to_h {|element| ... } -> hash * * When +self+ consists of 2-element arrays, * returns a hash each of whose entries is the key-value pair @@ -999,6 +1000,7 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op) * "Memo: 3; element: 3" * "Memo: 6; element: 4" * + * Enumerable#reduce is an alias for Enumerable#inject. * */ static VALUE @@ -1334,12 +1336,10 @@ enum_sort(VALUE obj) } #define SORT_BY_BUFSIZE 16 -#define SORT_BY_UNIFORMED(num, flo, fix) (((num&1)<<2)|((flo&1)<<1)|fix) struct sort_by_data { const VALUE ary; const VALUE buf; - uint8_t n; - uint8_t primitive_uniformed; + long n; }; static VALUE @@ -1360,11 +1360,6 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data)) rb_raise(rb_eRuntimeError, "sort_by reentered"); } - if (data->primitive_uniformed) { - data->primitive_uniformed &= SORT_BY_UNIFORMED((FIXNUM_P(v)) || (RB_FLOAT_TYPE_P(v)), - RB_FLOAT_TYPE_P(v), - FIXNUM_P(v)); - } RARRAY_ASET(data->buf, data->n*2, v); RARRAY_ASET(data->buf, data->n*2+1, i); data->n++; @@ -1392,179 +1387,6 @@ sort_by_cmp(const void *ap, const void *bp, void *data) return OPTIMIZED_CMP(a, b); } - -/* - This is parts of uniform sort -*/ - -#define uless rb_uniform_is_less -#define UNIFORM_SWAP(a,b)\ - do{struct rb_uniform_sort_data tmp = a; a = b; b = tmp;} while(0) - -struct rb_uniform_sort_data { - VALUE v; - VALUE i; -}; - -static inline bool -rb_uniform_is_less(VALUE a, VALUE b) -{ - - if (FIXNUM_P(a) && FIXNUM_P(b)) { - return (SIGNED_VALUE)a < (SIGNED_VALUE)b; - } - else if (FIXNUM_P(a)) { - RUBY_ASSERT(RB_FLOAT_TYPE_P(b)); - return rb_float_cmp(b, a) > 0; - } - else { - RUBY_ASSERT(RB_FLOAT_TYPE_P(a)); - return rb_float_cmp(a, b) < 0; - } -} - -static inline bool -rb_uniform_is_larger(VALUE a, VALUE b) -{ - - if (FIXNUM_P(a) && FIXNUM_P(b)) { - return (SIGNED_VALUE)a > (SIGNED_VALUE)b; - } - else if (FIXNUM_P(a)) { - RUBY_ASSERT(RB_FLOAT_TYPE_P(b)); - return rb_float_cmp(b, a) < 0; - } - else { - RUBY_ASSERT(RB_FLOAT_TYPE_P(a)); - return rb_float_cmp(a, b) > 0; - } -} - -#define med3_val(a,b,c) (uless(a,b)?(uless(b,c)?b:uless(c,a)?a:c):(uless(c,b)?b:uless(a,c)?a:c)) - -static void -rb_uniform_insertionsort_2(struct rb_uniform_sort_data* ptr_begin, - struct rb_uniform_sort_data* ptr_end) -{ - if ((ptr_end - ptr_begin) < 2) return; - struct rb_uniform_sort_data tmp, *j, *k, - *index = ptr_begin+1; - for (; index < ptr_end; index++) { - tmp = *index; - j = k = index; - if (uless(tmp.v, ptr_begin->v)) { - while (ptr_begin < j) { - *j = *(--k); - j = k; - } - } - else { - while (uless(tmp.v, (--k)->v)) { - *j = *k; - j = k; - } - } - *j = tmp; - } -} - -static inline void -rb_uniform_heap_down_2(struct rb_uniform_sort_data* ptr_begin, - size_t offset, size_t len) -{ - size_t c; - struct rb_uniform_sort_data tmp = ptr_begin[offset]; - while ((c = (offset<<1)+1) <= len) { - if (c < len && uless(ptr_begin[c].v, ptr_begin[c+1].v)) { - c++; - } - if (!uless(tmp.v, ptr_begin[c].v)) break; - ptr_begin[offset] = ptr_begin[c]; - offset = c; - } - ptr_begin[offset] = tmp; -} - -static void -rb_uniform_heapsort_2(struct rb_uniform_sort_data* ptr_begin, - struct rb_uniform_sort_data* ptr_end) -{ - size_t n = ptr_end - ptr_begin; - if (n < 2) return; - - for (size_t offset = n>>1; offset > 0;) { - rb_uniform_heap_down_2(ptr_begin, --offset, n-1); - } - for (size_t offset = n-1; offset > 0;) { - UNIFORM_SWAP(*ptr_begin, ptr_begin[offset]); - rb_uniform_heap_down_2(ptr_begin, 0, --offset); - } -} - - -static void -rb_uniform_quicksort_intro_2(struct rb_uniform_sort_data* ptr_begin, - struct rb_uniform_sort_data* ptr_end, size_t d) -{ - - if (ptr_end - ptr_begin <= 16) { - rb_uniform_insertionsort_2(ptr_begin, ptr_end); - return; - } - if (d == 0) { - rb_uniform_heapsort_2(ptr_begin, ptr_end); - return; - } - - VALUE x = med3_val(ptr_begin->v, - ptr_begin[(ptr_end - ptr_begin)>>1].v, - ptr_end[-1].v); - struct rb_uniform_sort_data *i = ptr_begin; - struct rb_uniform_sort_data *j = ptr_end-1; - - do { - while (uless(i->v, x)) i++; - while (uless(x, j->v)) j--; - if (i <= j) { - UNIFORM_SWAP(*i, *j); - i++; - j--; - } - } while (i <= j); - j++; - if (ptr_end - j > 1) rb_uniform_quicksort_intro_2(j, ptr_end, d-1); - if (i - ptr_begin > 1) rb_uniform_quicksort_intro_2(ptr_begin, i, d-1); -} - -/** - * Direct primitive data compare sort. Implement with intro sort. - * @param[in] ptr_begin The begin address of target rb_ary's raw pointer. - * @param[in] ptr_end The end address of target rb_ary's raw pointer. -**/ -static void -rb_uniform_intro_sort_2(struct rb_uniform_sort_data* ptr_begin, - struct rb_uniform_sort_data* ptr_end) -{ - size_t n = ptr_end - ptr_begin; - size_t d = CHAR_BIT * sizeof(n) - nlz_intptr(n) - 1; - bool sorted_flag = true; - - for (struct rb_uniform_sort_data* ptr = ptr_begin+1; ptr < ptr_end; ptr++) { - if (rb_uniform_is_larger((ptr-1)->v, (ptr)->v)) { - sorted_flag = false; - break; - } - } - - if (sorted_flag) { - return; - } - rb_uniform_quicksort_intro_2(ptr_begin, ptr_end, d<<1); -} - -#undef uless - - /* * call-seq: * sort_by {|element| ... } -> array @@ -1671,9 +1493,6 @@ enum_sort_by(VALUE obj) RB_OBJ_WRITE(memo, &data->ary, ary); RB_OBJ_WRITE(memo, &data->buf, buf); data->n = 0; - data->primitive_uniformed = SORT_BY_UNIFORMED((CMP_OPTIMIZABLE(FLOAT) && CMP_OPTIMIZABLE(INTEGER)), - CMP_OPTIMIZABLE(FLOAT), - CMP_OPTIMIZABLE(INTEGER)); rb_block_call(obj, id_each, 0, 0, sort_by_i, (VALUE)memo); ary = data->ary; buf = data->buf; @@ -1682,16 +1501,9 @@ enum_sort_by(VALUE obj) rb_ary_concat(ary, buf); } if (RARRAY_LEN(ary) > 2) { - if (data->primitive_uniformed) { - RARRAY_PTR_USE(ary, ptr, - rb_uniform_intro_sort_2((struct rb_uniform_sort_data*)ptr, - (struct rb_uniform_sort_data*)(ptr + RARRAY_LEN(ary)))); - } - else { - RARRAY_PTR_USE(ary, ptr, - ruby_qsort(ptr, RARRAY_LEN(ary)/2, 2*sizeof(VALUE), - sort_by_cmp, (void *)ary)); - } + RARRAY_PTR_USE(ary, ptr, + ruby_qsort(ptr, RARRAY_LEN(ary)/2, 2*sizeof(VALUE), + sort_by_cmp, (void *)ary)); } if (RBASIC(ary)->klass) { rb_raise(rb_eRuntimeError, "sort_by reentered"); @@ -1757,9 +1569,6 @@ DEFINE_ENUMFUNCS(all) * * Returns whether every element meets a given criterion. * - * If +self+ has no element, returns +true+ and argument or block - * are not used. - * * With no argument and no block, * returns whether every element is truthy: * @@ -1821,9 +1630,6 @@ DEFINE_ENUMFUNCS(any) * * Returns whether any element meets a given criterion. * - * If +self+ has no element, returns +false+ and argument or block - * are not used. - * * With no argument and no block, * returns whether any element is truthy: * @@ -1854,6 +1660,7 @@ DEFINE_ENUMFUNCS(any) * {foo: 0, bar: 1, baz: 2}.any? {|key, value| value < 1 } # => true * {foo: 0, bar: 1, baz: 2}.any? {|key, value| value < 0 } # => false * + * * Related: #all?, #none?, #one?. */ @@ -2915,6 +2722,8 @@ member_i(RB_BLOCK_CALL_FUNC_ARGLIST(iter, args)) * {foo: 0, bar: 1, baz: 2}.include?('foo') # => false * {foo: 0, bar: 1, baz: 2}.include?(0) # => false * + * Enumerable#member? is an alias for Enumerable#include?. + * */ static VALUE @@ -4650,7 +4459,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: @@ -4824,13 +4633,13 @@ uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) * %w[a b c c b a a b c].uniq # => ["a", "b", "c"] * [0, 1, 2, 2, 1, 0, 0, 1, 2].uniq # => [0, 1, 2] * - * With a block, returns a new array containing elements only for which the block + * With a block, returns a new array containing only for which the block * returns a unique value: * * a = [0, 1, 2, 3, 4, 5, 5, 4, 3, 2, 1] * a.uniq {|i| i.even? ? i : 0 } # => [0, 2, 4] * a = %w[a b c d e e d c b a a b c d e] - * a.uniq {|c| c < 'c' } # => ["a", "c"] + a.uniq {|c| c < 'c' } # => ["a", "c"] * */ @@ -4889,7 +4698,7 @@ enum_compact(VALUE obj) * * - {Querying}[rdoc-ref:Enumerable@Methods+for+Querying] * - {Fetching}[rdoc-ref:Enumerable@Methods+for+Fetching] - * - {Searching and Filtering}[rdoc-ref:Enumerable@Methods+for+Searching+and+Filtering] + * - {Searching}[rdoc-ref:Enumerable@Methods+for+Searching] * - {Sorting}[rdoc-ref:Enumerable@Methods+for+Sorting] * - {Iterating}[rdoc-ref:Enumerable@Methods+for+Iterating] * - {And more....}[rdoc-ref:Enumerable@Other+Methods] @@ -4905,7 +4714,7 @@ enum_compact(VALUE obj) * - #one?: Returns +true+ if exactly one element meets a specified criterion; +false+ otherwise. * - #count: Returns the count of elements, * based on an argument or block criterion, if given. - * - #tally: Returns a new Hash containing the counts of occurrences of each element. + * - #tally: Returns a new \Hash containing the counts of occurrences of each element. * * === Methods for Fetching * @@ -4926,21 +4735,21 @@ enum_compact(VALUE obj) * 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. - * - #minmax: Returns a 2-element Array containing the smallest and largest elements. + * - #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. * - #minmax_by: Returns the smallest and largest elements, as determined by the given block. * * <i>Groups, slices, and partitions</i>: * - * - #group_by: Returns a Hash that partitions the elements into groups. + * - #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. - * - #slice_before: Returns a new Enumerator whose entries are a partition of +self+, - * 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. + * - #slice_after: Returns a new \Enumerator whose entries are a partition of +self+, + 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. + * - #slice_when: Returns a new \Enumerator whose entries are a partition of +self+ + 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. * @@ -5040,18 +4849,18 @@ enum_compact(VALUE obj) * * Virtually all methods in \Enumerable call method +#each+ in the including class: * - * - <tt>Hash#each</tt> yields the next key-value pair as a 2-element Array. - * - <tt>Struct#each</tt> yields the next name-value pair as a 2-element Array. + * - <tt>Hash#each</tt> yields the next key-value pair as a 2-element \Array. + * - <tt>Struct#each</tt> yields the next name-value pair as a 2-element \Array. * - For the other classes above, +#each+ yields the next object from the collection. * * == About the Examples * * The example code snippets for the \Enumerable methods: * - * - Always show the use of one or more Array-like classes (often Array itself). - * - Sometimes show the use of a Hash-like class. + * - Always show the use of one or more \Array-like classes (often \Array itself). + * - Sometimes show the use of a \Hash-like class. * 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. + * and so it is not shown. Example: #tally would find exactly one of each \Hash entry. * */ diff --git a/enumerator.c b/enumerator.c index d2819e4049..d587b63d32 100644 --- a/enumerator.c +++ b/enumerator.c @@ -73,7 +73,7 @@ * puts %w[foo bar baz].map.with_index { |w, i| "#{i}:#{w}" } * # => ["0:foo", "1:bar", "2:baz"] * - * == External Iteration + * == External Iteration * * An Enumerator can also be used as an external iterator. * For example, Enumerator#next returns the next value of the iterator @@ -85,31 +85,26 @@ * 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+ internally). + * +next+, +next_values+, +peek+ and +peek_values+ are the only methods + * which use external iteration (and Array#zip(Enumerable-not-Array) which uses +next+). * * 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. - * - The stacktrace will only include the stack from the Enumerator, not above. - * - Fiber-local variables are *not* inherited inside the Enumerator Fiber, - * which instead starts with no Fiber-local variables. - * - Fiber storage variables *are* inherited and are designed - * to handle Enumerator Fibers. Assigning to a Fiber storage variable - * only affects the current Fiber, so if you want to change state - * in the caller Fiber of the Enumerator Fiber, you need to use an - * extra indirection (e.g., use some object in the Fiber storage - * variable and mutate some ivar of it). + * - The Fiber adds some overhead compared to internal enumeration. + * - The stacktrace will only include the stack from the Enumerator, not above. + * - Fiber-local variables are *not* inherited inside the Enumerator Fiber, + * which instead starts with no Fiber-local variables. + * - Fiber storage variables *are* inherited and are designed + * to handle Enumerator Fibers. Assigning to a Fiber storage variable + * only affects the current Fiber, so if you want to change state + * in the caller Fiber of the Enumerator Fiber, you need to use an + * extra indirection (e.g., use some object in the Fiber storage + * variable and mutate some ivar of it). * * Concretely: - * * Thread.current[:fiber_local] = 1 * Fiber[:storage_var] = 1 * e = Enumerator.new do |y| @@ -125,7 +120,7 @@ * e.each { p _1 } * p Fiber[:storage_var] # => 2 (it ran in the same Fiber/"stack" as the current Fiber) * - * == Convert External Iteration to Internal Iteration + * == Convert External Iteration to Internal Iteration * * You can use an external iterator to implement an internal iterator as follows: * @@ -195,19 +190,6 @@ struct enumerator { int kw_splat; }; -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; struct generator { @@ -257,15 +239,56 @@ struct enum_product { VALUE rb_cArithSeq; +/* + * Enumerator + */ +static void +enumerator_mark(void *p) +{ + struct enumerator *ptr = p; + rb_gc_mark_movable(ptr->obj); + rb_gc_mark_movable(ptr->args); + rb_gc_mark_movable(ptr->fib); + rb_gc_mark_movable(ptr->dst); + rb_gc_mark_movable(ptr->lookahead); + rb_gc_mark_movable(ptr->feedvalue); + rb_gc_mark_movable(ptr->stop_exc); + rb_gc_mark_movable(ptr->size); + rb_gc_mark_movable(ptr->procs); +} + +static void +enumerator_compact(void *p) +{ + struct enumerator *ptr = p; + ptr->obj = rb_gc_location(ptr->obj); + ptr->args = rb_gc_location(ptr->args); + ptr->fib = rb_gc_location(ptr->fib); + ptr->dst = rb_gc_location(ptr->dst); + ptr->lookahead = rb_gc_location(ptr->lookahead); + ptr->feedvalue = rb_gc_location(ptr->feedvalue); + ptr->stop_exc = rb_gc_location(ptr->stop_exc); + ptr->size = rb_gc_location(ptr->size); + ptr->procs = rb_gc_location(ptr->procs); +} + +#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", { - RUBY_REFS_LIST_PTR(enumerator_refs), - RUBY_TYPED_DEFAULT_FREE, - NULL, // Nothing allocated externally, so don't need a memsize function - NULL, + enumerator_mark, + enumerator_free, + enumerator_memsize, + enumerator_compact, }, - 0, NULL, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_DECL_MARKING | RUBY_TYPED_EMBEDDABLE + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; static struct enumerator * @@ -296,15 +319,22 @@ 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, - RUBY_TYPED_DEFAULT_FREE, - NULL, // Nothing allocated externally, so don't need a memsize function + proc_entry_free, + proc_entry_memsize, proc_entry_compact, }, - 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE }; static struct proc_entry * @@ -389,7 +419,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()) { - RB_OBJ_WRITE(enumerator, &enumerator_ptr(enumerator)->size, rb_block_proc()); + enumerator_ptr(enumerator)->size = rb_block_proc(); } return enumerator; } @@ -418,15 +448,15 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar rb_raise(rb_eArgError, "unallocated enumerator"); } - RB_OBJ_WRITE(enum_obj, &ptr->obj, obj); + ptr->obj = obj; ptr->meth = rb_to_id(meth); - if (argc) RB_OBJ_WRITE(enum_obj, &ptr->args, rb_ary_new4(argc, argv)); + if (argc) ptr->args = rb_ary_new4(argc, argv); ptr->fib = 0; ptr->dst = Qnil; ptr->lookahead = Qundef; ptr->feedvalue = Qundef; ptr->stop_exc = Qfalse; - RB_OBJ_WRITE(enum_obj, &ptr->size, size); + ptr->size = size; ptr->size_fn = size_fn; ptr->kw_splat = kw_splat; @@ -505,13 +535,13 @@ enumerator_init_copy(VALUE obj, VALUE orig) rb_raise(rb_eArgError, "unallocated enumerator"); } - RB_OBJ_WRITE(obj, &ptr1->obj, ptr0->obj); - RB_OBJ_WRITE(obj, &ptr1->meth, ptr0->meth); - RB_OBJ_WRITE(obj, &ptr1->args, ptr0->args); + ptr1->obj = ptr0->obj; + ptr1->meth = ptr0->meth; + ptr1->args = ptr0->args; ptr1->fib = 0; ptr1->lookahead = Qundef; ptr1->feedvalue = Qundef; - RB_OBJ_WRITE(obj, &ptr1->size, ptr0->size); + ptr1->size = ptr0->size; ptr1->size_fn = ptr0->size_fn; return obj; @@ -559,17 +589,11 @@ enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg) const struct enumerator *e = enumerator_ptr(obj); ID meth = e->meth; - VALUE args = e->args; - if (args) { - argc = RARRAY_LENINT(args); - argv = RARRAY_CONST_PTR(args); + if (e->args) { + argc = RARRAY_LENINT(e->args); + argv = RARRAY_CONST_PTR(e->args); } - - VALUE ret = rb_block_call_kw(e->obj, meth, argc, argv, func, arg, e->kw_splat); - - RB_GC_GUARD(args); - - return ret; + return rb_block_call_kw(e->obj, meth, argc, argv, func, arg, e->kw_splat); } /* @@ -626,7 +650,7 @@ enumerator_each(int argc, VALUE *argv, VALUE obj) else { args = rb_ary_new4(argc, argv); } - RB_OBJ_WRITE(obj, &e->args, args); + e->args = args; e->size = Qnil; e->size_fn = 0; } @@ -767,7 +791,7 @@ next_i(RB_BLOCK_CALL_FUNC_ARGLIST(_, obj)) VALUE result; result = rb_block_call(obj, id_each, 0, 0, next_ii, obj); - RB_OBJ_WRITE(obj, &e->stop_exc, rb_exc_new2(rb_eStopIteration, "iteration reached an end")); + 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); } @@ -776,8 +800,8 @@ static void next_init(VALUE obj, struct enumerator *e) { VALUE curr = rb_fiber_current(); - RB_OBJ_WRITE(obj, &e->dst, curr); - RB_OBJ_WRITE(obj, &e->fib, rb_fiber_new(next_i, obj)); + e->dst = curr; + e->fib = rb_fiber_new(next_i, obj); e->lookahead = Qundef; } @@ -865,8 +889,6 @@ 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; @@ -928,12 +950,9 @@ enumerator_peek_values(VALUE obj) { struct enumerator *e = enumerator_ptr(obj); - rb_check_frozen(obj); - if (UNDEF_P(e->lookahead)) { - RB_OBJ_WRITE(obj, &e->lookahead, get_next_values(obj, e)); + e->lookahead = get_next_values(obj, e); } - return e->lookahead; } @@ -1055,12 +1074,10 @@ 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"); } - RB_OBJ_WRITE(obj, &e->feedvalue, v); + e->feedvalue = v; return Qnil; } @@ -1079,8 +1096,6 @@ 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; @@ -1294,15 +1309,23 @@ 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, - RUBY_TYPED_DEFAULT_FREE, - NULL, + yielder_free, + yielder_memsize, yielder_compact, }, - 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; static struct yielder * @@ -1341,7 +1364,7 @@ yielder_init(VALUE obj, VALUE proc) rb_raise(rb_eArgError, "unallocated yielder"); } - RB_OBJ_WRITE(obj, &ptr->proc, proc); + ptr->proc = proc; return obj; } @@ -1426,15 +1449,23 @@ 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, - RUBY_TYPED_DEFAULT_FREE, - NULL, + generator_free, + generator_memsize, generator_compact, }, - 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; static struct generator * @@ -1474,7 +1505,7 @@ generator_init(VALUE obj, VALUE proc) rb_raise(rb_eArgError, "unallocated generator"); } - RB_OBJ_WRITE(obj, &ptr->proc, proc); + ptr->proc = proc; return obj; } @@ -1522,7 +1553,7 @@ generator_init_copy(VALUE obj, VALUE orig) rb_raise(rb_eArgError, "unallocated generator"); } - RB_OBJ_WRITE(obj, &ptr1->proc, ptr0->proc); + ptr1->proc = ptr0->proc; return obj; } @@ -1689,7 +1720,7 @@ lazy_generator_init(VALUE enumerator, VALUE procs) lazy_init_block, rb_ary_new3(2, obj, procs)); gen_ptr = generator_ptr(generator); - RB_OBJ_WRITE(generator, &gen_ptr->obj, obj); + gen_ptr->obj = obj; return generator; } @@ -1874,10 +1905,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()) { - RB_OBJ_WRITE(entry_obj, &entry->proc, rb_block_proc()); + entry->proc = rb_block_proc(); } entry->fn = fn; - RB_OBJ_WRITE(entry_obj, &entry->memo, args); + entry->memo = args; lazy_set_args(entry_obj, memo); @@ -1886,9 +1917,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 = 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); + new_e = DATA_PTR(new_obj); + new_e->obj = new_generator; + new_e->procs = new_procs; if (argc > 0) { new_e->meth = rb_to_id(*argv++); @@ -1897,9 +1928,7 @@ lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo, else { new_e->meth = id_each; } - - RB_OBJ_WRITE(new_obj, &new_e->args, rb_ary_new4(argc, argv)); - + new_e->args = rb_ary_new4(argc, argv); return new_obj; } @@ -1985,7 +2014,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()) { - RB_OBJ_WRITE(lazy, &enumerator_ptr(lazy)->size, rb_block_proc()); + enumerator_ptr(lazy)->size = rb_block_proc(); } return lazy; } @@ -2371,6 +2400,7 @@ lazy_zip_arrays_func(VALUE proc_entry, struct MEMO *result, VALUE memos, long me rb_ary_push(ary, rb_ary_entry(RARRAY_AREF(arrays, i), count)); } LAZY_MEMO_SET_VALUE(result, ary); + LAZY_MEMO_SET_PACKED(result); rb_ary_store(memos, memo_index, LONG2NUM(++count)); return result; } @@ -2945,7 +2975,7 @@ static const rb_data_type_t producer_data_type = { producer_memsize, producer_compact, }, - 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; static struct producer * @@ -2985,8 +3015,8 @@ producer_init(VALUE obj, VALUE init, VALUE proc) rb_raise(rb_eArgError, "unallocated producer"); } - RB_OBJ_WRITE(obj, &ptr->init, init); - RB_OBJ_WRITE(obj, &ptr->proc, proc); + ptr->init = init; + ptr->proc = proc; return obj; } @@ -23,10 +23,6 @@ # include <unistd.h> #endif -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif - #if defined __APPLE__ # include <AvailabilityMacros.h> #endif @@ -38,14 +34,12 @@ #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" @@ -83,7 +77,6 @@ static ID id_warn; static ID id_category; static ID id_deprecated; static ID id_experimental; -static ID id_performance; static VALUE sym_category; static VALUE sym_highlight; static struct { @@ -155,8 +148,8 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column, } static unsigned int warning_disabled_categories = ( - (1U << RB_WARN_CATEGORY_DEPRECATED) | - ~RB_WARN_CATEGORY_DEFAULT_BITS); + 1U << RB_WARN_CATEGORY_DEPRECATED | + 0); static unsigned int rb_warning_category_mask(VALUE category) @@ -194,7 +187,7 @@ rb_warning_category_update(unsigned int mask, unsigned int bits) warning_disabled_categories |= mask & ~bits; } -bool +MJIT_FUNC_EXPORTED bool rb_warning_category_enabled_p(rb_warning_category_t category) { return !(warning_disabled_categories & (1U << category)); @@ -207,19 +200,14 @@ rb_warning_category_enabled_p(rb_warning_category_t category) * Returns the flag to show the warning messages for +category+. * Supported categories are: * - * +:deprecated+ :: - * deprecation warnings - * * assignment of non-nil value to <code>$,</code> and <code>$;</code> - * * keyword arguments - * etc. + * +:deprecated+ :: 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 - * * Shape variation limit + * +:experimental+ :: experimental features + * * Pattern matching */ static VALUE @@ -291,11 +279,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 <tt>$stderr</tt>. + * warnings somewhere other than $stderr. * * If you want to change the behavior of Warning.warn you should use - * <tt>Warning.extend(MyNewModuleWithWarnMethod)</tt> and you can use +super+ - * to get the default behavior of printing the warning to <tt>$stderr</tt>. + * +Warning.extend(MyNewModuleWithWarnMethod)+ and you can use `super` + * to get the default behavior of printing the warning to $stderr. * * Example: * module MyWarningFilter @@ -312,7 +300,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[https://rubygems.org/gems/warning] gem provides convenient ways to customize Warning.warn. + * The +warning+ gem provides convenient ways to customize Warning.warn. */ static VALUE @@ -432,7 +420,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)); } @@ -464,7 +452,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)); } @@ -628,239 +616,18 @@ 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, rb_pid_t *pid) +bug_report_file(const char *file, int line) { char buf[REPORT_BUG_BUFSIZ]; - const char *report = crash_report; - if (!report) report = getenv("RUBY_CRASH_REPORT"); - FILE *out = open_report_path(report, buf, sizeof(buf), pid); + FILE *out = stderr; int len = err_position_0(buf, sizeof(buf), file, line); - 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; + if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len || + (ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) { + return out; } return NULL; @@ -967,7 +734,7 @@ bug_report_begin_valist(FILE *out, const char *fmt, va_list args) } while (0) static void -bug_report_end(FILE *out, rb_pid_t pid) +bug_report_end(FILE *out) { /* call additional bug reporters */ { @@ -978,45 +745,26 @@ bug_report_end(FILE *out, rb_pid_t pid) } } postscript_dump(out); - finish_report(out, pid); } #define report_bug(file, line, fmt, ctx) do { \ - rb_pid_t pid = -1; \ - FILE *out = bug_report_file(file, line, &pid); \ + FILE *out = bug_report_file(file, line); \ if (out) { \ bug_report_begin(out, fmt); \ - rb_vm_bugreport(ctx, out); \ - bug_report_end(out, pid); \ + rb_vm_bugreport(ctx); \ + bug_report_end(out); \ } \ } while (0) \ #define report_bug_valist(file, line, fmt, ctx, args) do { \ - rb_pid_t pid = -1; \ - FILE *out = bug_report_file(file, line, &pid); \ + FILE *out = bug_report_file(file, line); \ if (out) { \ bug_report_begin_valist(out, fmt, args); \ - rb_vm_bugreport(ctx, out); \ - bug_report_end(out, pid); \ + rb_vm_bugreport(ctx); \ + bug_report_end(out); \ } \ } 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) @@ -1066,7 +814,6 @@ 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(); } @@ -1120,7 +867,7 @@ rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args) report_bug_valist(RSTRING_PTR(file), line, fmt, NULL, args); } -void +MJIT_FUNC_EXPORTED void rb_assert_failure(const char *file, int line, const char *name, const char *expr) { FILE *out = stderr; @@ -1128,8 +875,8 @@ rb_assert_failure(const char *file, int line, const char *name, const char *expr if (name) fprintf(out, "%s:", name); fprintf(out, "%s\n%s\n\n", expr, rb_dynamic_description); preface_dump(out); - rb_vm_bugreport(NULL, out); - bug_report_end(out, -1); + rb_vm_bugreport(NULL); + bug_report_end(out); die(); } @@ -1323,7 +1070,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 RTYPEDDATA_GET_DATA(obj); + return DATA_PTR(obj); } const char *expected = data_type->wrap_struct_name; @@ -1835,7 +1582,7 @@ exc_set_backtrace(VALUE exc, VALUE bt) return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt)); } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt) { return exc_set_backtrace(exc, bt); @@ -2203,50 +1950,50 @@ rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv) return nometh_err_init_attr(exc, args, priv); } -typedef struct name_error_message_struct { - VALUE mesg; - VALUE recv; - VALUE name; -} name_error_message_t; +/* :nodoc: */ +enum { + NAME_ERR_MESG__MESG, + NAME_ERR_MESG__RECV, + NAME_ERR_MESG__NAME, + NAME_ERR_MESG_COUNT +}; static void name_err_mesg_mark(void *p) { - 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); + VALUE *ptr = p; + rb_gc_mark_locations(ptr, ptr+NAME_ERR_MESG_COUNT); } -static void -name_err_mesg_update(void *p) +#define name_err_mesg_free RUBY_TYPED_DEFAULT_FREE + +static size_t +name_err_mesg_memsize(const void *p) { - 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); + return NAME_ERR_MESG_COUNT * sizeof(VALUE); } static const rb_data_type_t name_err_mesg_data_type = { "name_err_mesg", { name_err_mesg_mark, - RUBY_TYPED_DEFAULT_FREE, - NULL, // No external memory to report, - name_err_mesg_update, + name_err_mesg_free, + name_err_mesg_memsize, }, - 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; /* :nodoc: */ static VALUE -rb_name_err_mesg_init(VALUE klass, VALUE mesg, VALUE recv, VALUE name) +rb_name_err_mesg_init(VALUE klass, VALUE mesg, VALUE recv, VALUE method) { - 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); + 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; return result; } @@ -2268,16 +2015,14 @@ 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); - 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); + 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); return obj1; } @@ -2285,18 +2030,19 @@ name_err_mesg_init_copy(VALUE obj1, VALUE obj2) static VALUE name_err_mesg_equal(VALUE obj1, VALUE obj2) { - if (obj1 == obj2) return Qtrue; + VALUE *ptr1, *ptr2; + int i; + if (obj1 == obj2) return Qtrue; if (rb_obj_class(obj2) != rb_cNameErrorMesg) 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; + 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; + } return Qtrue; } @@ -2315,91 +2061,51 @@ name_err_mesg_receiver_name(VALUE obj) static VALUE name_err_mesg_to_str(VALUE obj) { - name_error_message_t *ptr; - TypedData_Get_Struct(obj, name_error_message_t, &name_err_mesg_data_type, ptr); + VALUE *ptr, mesg; + TypedData_Get_Struct(obj, VALUE, &name_err_mesg_data_type, ptr); - VALUE mesg = ptr->mesg; + mesg = ptr[NAME_ERR_MESG__MESG]; if (NIL_P(mesg)) return Qnil; else { - struct RString s_str, c_str, d_str; - VALUE c, s, d = 0, args[4], c2; - int state = 0; + struct RString s_str, d_str; + VALUE c, s, d = 0, args[4]; + int state = 0, singleton = 0; rb_encoding *usascii = rb_usascii_encoding(); #define FAKE_CSTR(v, str) rb_setup_fake_str((v), (str), rb_strlen_lit(str), usascii) - c = s = FAKE_CSTR(&s_str, ""); - obj = ptr->recv; + obj = ptr[NAME_ERR_MESG__RECV]; switch (obj) { case Qnil: - c = d = FAKE_CSTR(&d_str, "nil"); + d = FAKE_CSTR(&d_str, "nil"); break; case Qtrue: - c = d = FAKE_CSTR(&d_str, "true"); + d = FAKE_CSTR(&d_str, "true"); break; case Qfalse: - c = d = FAKE_CSTR(&d_str, "false"); + d = FAKE_CSTR(&d_str, "false"); break; default: - if (strstr(RSTRING_PTR(mesg), "%2$s")) { - d = rb_protect(name_err_mesg_receiver_name, obj, &state); - if (state || NIL_OR_UNDEF_P(d)) - d = rb_protect(rb_inspect, obj, &state); - if (state) { - rb_set_errinfo(Qnil); - } - d = rb_check_string_type(d); - if (NIL_P(d)) { - d = rb_any_to_s(obj); - } - } - - if (!RB_SPECIAL_CONST_P(obj)) { - switch (RB_BUILTIN_TYPE(obj)) { - case T_MODULE: - s = FAKE_CSTR(&s_str, "module "); - c = obj; - break; - case T_CLASS: - s = FAKE_CSTR(&s_str, "class "); - c = obj; - break; - default: - goto object; - } - } - else { - VALUE klass; - object: - klass = CLASS_OF(obj); - if (RB_TYPE_P(klass, T_CLASS) && FL_TEST(klass, FL_SINGLETON)) { - s = FAKE_CSTR(&s_str, ""); - if (obj == rb_vm_top_self()) { - c = FAKE_CSTR(&c_str, "main"); - } - else { - c = rb_any_to_s(obj); - } - break; - } - else { - s = FAKE_CSTR(&s_str, "an instance of "); - c = rb_class_real(klass); - } - } - c2 = rb_protect(name_err_mesg_receiver_name, c, &state); - if (state || NIL_OR_UNDEF_P(c2)) - c2 = rb_protect(rb_inspect, c, &state); + d = rb_protect(name_err_mesg_receiver_name, obj, &state); + if (state || NIL_OR_UNDEF_P(d)) + d = rb_protect(rb_inspect, obj, &state); if (state) { rb_set_errinfo(Qnil); } - c2 = rb_check_string_type(c2); - if (NIL_P(c2)) { - c2 = rb_any_to_s(c); + d = rb_check_string_type(d); + if (NIL_P(d)) { + d = rb_any_to_s(obj); } - c = c2; + singleton = (RSTRING_LEN(d) > 0 && RSTRING_PTR(d)[0] == '#'); break; } - args[0] = rb_obj_as_string(ptr->name); + if (!singleton) { + s = FAKE_CSTR(&s_str, ":"); + c = rb_class_name(CLASS_OF(obj)); + } + else { + c = s = FAKE_CSTR(&s_str, ""); + } + args[0] = rb_obj_as_string(ptr[NAME_ERR_MESG__NAME]); args[1] = d; args[2] = s; args[3] = c; @@ -2432,17 +2138,17 @@ name_err_mesg_load(VALUE klass, VALUE str) static VALUE name_err_receiver(VALUE self) { - VALUE recv = rb_ivar_lookup(self, id_recv, Qundef); + VALUE *ptr, recv, mesg; + + recv = rb_ivar_lookup(self, id_recv, Qundef); if (!UNDEF_P(recv)) return recv; - VALUE mesg = rb_attr_get(self, id_mesg); + 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"); } - - name_error_message_t *ptr; - TypedData_Get_Struct(mesg, name_error_message_t, &name_err_mesg_data_type, ptr); - return ptr->recv; + ptr = DATA_PTR(mesg); + return ptr[NAME_ERR_MESG__RECV]; } /* @@ -2694,14 +2400,6 @@ syntax_error_with_path(VALUE exc, VALUE path, VALUE *mesg, rb_encoding *enc) static st_table *syserr_tbl; -void -rb_free_warning(void) -{ - st_free_table(warning_categories.id2enum); - st_free_table(warning_categories.enum2id); - st_free_table(syserr_tbl); -} - static VALUE set_syserr(int n, const char *name) { @@ -3061,7 +2759,7 @@ syserr_eqq(VALUE self, VALUE exc) * * <em>raises the exception:</em> * - * NoMethodError: undefined method `to_ary' for an instance of String + * NoMethodError: undefined method `to_ary' for "hello":String */ /* @@ -3257,9 +2955,9 @@ exception_dumper(VALUE exc) } static int -ivar_copy_i(ID key, VALUE val, st_data_t exc) +ivar_copy_i(st_data_t key, st_data_t val, st_data_t exc) { - rb_ivar_set((VALUE)exc, key, val); + rb_ivar_set((VALUE) exc, (ID) key, (VALUE) val); return ST_CONTINUE; } @@ -3411,7 +3109,6 @@ Init_Exception(void) id_category = rb_intern_const("category"); id_deprecated = rb_intern_const("deprecated"); id_experimental = rb_intern_const("experimental"); - id_performance = rb_intern_const("performance"); id_top = rb_intern_const("top"); id_bottom = rb_intern_const("bottom"); id_iseq = rb_make_internal_id(); @@ -3423,13 +3120,11 @@ Init_Exception(void) warning_categories.id2enum = rb_init_identtable(); 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); 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); } void @@ -3512,7 +3207,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(stderr); + rb_print_backtrace(); die(); } @@ -3575,14 +3270,12 @@ rb_syserr_fail_str(int e, VALUE mesg) rb_exc_raise(rb_syserr_new_str(e, mesg)); } -#undef rb_sys_fail void rb_sys_fail(const char *mesg) { rb_exc_raise(make_errno_exc(mesg)); } -#undef rb_sys_fail_str void rb_sys_fail_str(VALUE mesg) { @@ -18,12 +18,12 @@ #endif #include "eval_intern.h" +#include "gc.h" #include "internal.h" #include "internal/class.h" #include "internal/cont.h" #include "internal/error.h" #include "internal/eval.h" -#include "internal/gc.h" #include "internal/hash.h" #include "internal/inits.h" #include "internal/io.h" @@ -32,7 +32,7 @@ #include "internal/variable.h" #include "ruby/fiber/scheduler.h" #include "iseq.h" -#include "rjit.h" +#include "mjit.h" #include "probes.h" #include "probes_helper.h" #include "ruby/vm.h" @@ -257,6 +257,8 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex) } } + mjit_finish(true); // We still need ISeqs here, so it's before rb_ec_finalize(). + rb_ec_finalize(ec); /* unlock again if finalizer took mutexes. */ @@ -439,7 +441,7 @@ rb_class_modify_check(VALUE klass) if (FL_TEST(klass, FL_SINGLETON)) { desc = "object"; - klass = RCLASS_ATTACHED_OBJECT(klass); + klass = rb_ivar_get(klass, id__attached__); if (!SPECIAL_CONST_P(klass)) { switch (BUILTIN_TYPE(klass)) { case T_MODULE: @@ -1341,21 +1343,14 @@ rb_using_module(const rb_cref_t *cref, VALUE module) { Check_Type(module, T_MODULE); using_module_recursive(cref, module); - rb_clear_all_refinement_method_cache(); + rb_clear_method_cache_all(); } /* * call-seq: - * target -> class_or_module - * - * Return the class or module refined by the receiver. - * - * module M - * refine String do - * end - * end + * refined_class -> class * - * M.refinements[0].target # => String + * Return the class refined by the receiver. */ VALUE rb_refinement_module_get_refined_class(VALUE module) @@ -1366,21 +1361,6 @@ rb_refinement_module_get_refined_class(VALUE module) return rb_attr_get(module, id_refined_class); } -/* - * call-seq: - * refined_class -> class - * - * Deprecated; prefer #target. - * - * 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) @@ -2093,8 +2073,7 @@ Init_eval(void) rb_mod_s_used_refinements, 0); 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_define_method(rb_cRefinement, "refined_class", rb_refinement_module_get_refined_class, 0); rb_undef_method(rb_cRefinement, "append_features"); rb_undef_method(rb_cRefinement, "prepend_features"); rb_undef_method(rb_cRefinement, "extend_object"); @@ -2123,21 +2102,3 @@ 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 bdce295f6e..9806683000 100644 --- a/eval_error.c +++ b/eval_error.c @@ -7,8 +7,6 @@ (NIL_P(str) ? warn_print(x) : (void)rb_str_cat_cstr(str, x)) #define write_warn2(str, x, l) \ (NIL_P(str) ? warn_print2(x, l) : (void)rb_str_cat(str, x, l)) -#define write_warn_enc(str, x, l, enc) \ - (NIL_P(str) ? warn_print2(x, l) : (void)rb_enc_str_buf_cat(str, x, l, enc)) #ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P #define warn_print(x) RB_GNUC_EXTENSION_BLOCK( \ (__builtin_constant_p(x)) ? \ @@ -105,7 +103,7 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VA if (highlight) write_warn(str, underline); write_warn(str, "unhandled exception"); if (highlight) write_warn(str, reset); - write_warn(str, "\n"); + write_warn2(str, "\n", 1); } else { VALUE epath; @@ -129,17 +127,13 @@ rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight) { const char *einfo = ""; long elen = 0; - rb_encoding *eenc; - VALUE str = rb_usascii_str_new_cstr(""); + VALUE str = rb_str_new2(""); - if (!NIL_P(emesg) && rb_enc_asciicompat(eenc = rb_enc_get(emesg))) { + if (!NIL_P(emesg)) { einfo = RSTRING_PTR(emesg); elen = RSTRING_LEN(emesg); } - else { - eenc = NULL; - } if (eclass == rb_eRuntimeError && elen == 0) { if (highlight) write_warn(str, underline); write_warn(str, "unhandled exception"); @@ -162,7 +156,7 @@ rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight) if (RSTRING_PTR(epath)[0] == '#') epath = 0; if ((tail = memchr(einfo, '\n', elen)) != 0) { - write_warn_enc(str, einfo, tail - einfo, eenc); + write_warn2(str, einfo, tail - einfo); tail++; /* skip newline */ } else { @@ -176,23 +170,23 @@ rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight) write_warn(str, reset); write_warn(str, bold); } - write_warn(str, ")"); + write_warn2(str, ")", 1); if (highlight) write_warn(str, reset); } if (tail && einfo+elen > tail) { if (!highlight) { - write_warn(str, "\n"); - write_warn_enc(str, tail, einfo+elen-tail, eenc); + write_warn2(str, "\n", 1); + write_warn2(str, tail, einfo+elen-tail); } else { elen -= tail - einfo; einfo = tail; - write_warn(str, "\n"); + write_warn2(str, "\n", 1); while (elen > 0) { tail = memchr(einfo, '\n', elen); if (!tail || tail > einfo) { write_warn(str, bold); - write_warn_enc(str, einfo, tail ? tail-einfo : elen, eenc); + write_warn2(str, einfo, tail ? tail-einfo : elen); write_warn(str, reset); if (!tail) { break; @@ -201,7 +195,7 @@ rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight) elen -= tail - einfo; einfo = tail; do ++tail; while (tail < einfo+elen && *tail == '\n'); - write_warn_enc(str, einfo, tail-einfo, eenc); + write_warn2(str, einfo, tail-einfo); elen -= tail - einfo; einfo = tail; } diff --git a/eval_intern.h b/eval_intern.h index d008b17ca1..6cbaa51361 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -110,11 +110,9 @@ 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() \ @@ -153,7 +151,6 @@ 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); return state; } @@ -161,9 +158,8 @@ 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); ec->tag->state = st; - ruby_longjmp(RB_VM_TAG_JMPBUF_GET(ec->tag->buf), 1); + ruby_longjmp(ec->tag->buf, 1); } /* @@ -171,7 +167,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(RB_VM_TAG_JMPBUF_GET(_tag.buf))) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0)) + (ruby_setjmp(_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) diff --git a/ext/-test-/RUBY_ALIGNOF/depend b/ext/-test-/RUBY_ALIGNOF/depend index 3011b637e5..21ef8c6dd0 100644 --- a/ext/-test-/RUBY_ALIGNOF/depend +++ b/ext/-test-/RUBY_ALIGNOF/depend @@ -52,7 +52,6 @@ c.o: $(hdrdir)/ruby/internal/attr/noexcept.h c.o: $(hdrdir)/ruby/internal/attr/noinline.h c.o: $(hdrdir)/ruby/internal/attr/nonnull.h c.o: $(hdrdir)/ruby/internal/attr/noreturn.h -c.o: $(hdrdir)/ruby/internal/attr/packed_struct.h c.o: $(hdrdir)/ruby/internal/attr/pure.h c.o: $(hdrdir)/ruby/internal/attr/restrict.h c.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ c.o: $(hdrdir)/ruby/internal/intern/enumerator.h c.o: $(hdrdir)/ruby/internal/intern/error.h c.o: $(hdrdir)/ruby/internal/intern/eval.h c.o: $(hdrdir)/ruby/internal/intern/file.h +c.o: $(hdrdir)/ruby/internal/intern/gc.h c.o: $(hdrdir)/ruby/internal/intern/hash.h c.o: $(hdrdir)/ruby/internal/intern/io.h c.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ c.o: $(hdrdir)/ruby/internal/memory.h c.o: $(hdrdir)/ruby/internal/method.h c.o: $(hdrdir)/ruby/internal/module.h c.o: $(hdrdir)/ruby/internal/newobj.h +c.o: $(hdrdir)/ruby/internal/rgengc.h c.o: $(hdrdir)/ruby/internal/scan_args.h c.o: $(hdrdir)/ruby/internal/special_consts.h c.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/arith_seq/beg_len_step/depend b/ext/-test-/arith_seq/beg_len_step/depend index dc807eaa99..36a2c4c71b 100644 --- a/ext/-test-/arith_seq/beg_len_step/depend +++ b/ext/-test-/arith_seq/beg_len_step/depend @@ -51,7 +51,6 @@ beg_len_step.o: $(hdrdir)/ruby/internal/attr/noexcept.h beg_len_step.o: $(hdrdir)/ruby/internal/attr/noinline.h beg_len_step.o: $(hdrdir)/ruby/internal/attr/nonnull.h beg_len_step.o: $(hdrdir)/ruby/internal/attr/noreturn.h -beg_len_step.o: $(hdrdir)/ruby/internal/attr/packed_struct.h beg_len_step.o: $(hdrdir)/ruby/internal/attr/pure.h beg_len_step.o: $(hdrdir)/ruby/internal/attr/restrict.h beg_len_step.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -111,6 +110,7 @@ beg_len_step.o: $(hdrdir)/ruby/internal/intern/enumerator.h beg_len_step.o: $(hdrdir)/ruby/internal/intern/error.h beg_len_step.o: $(hdrdir)/ruby/internal/intern/eval.h beg_len_step.o: $(hdrdir)/ruby/internal/intern/file.h +beg_len_step.o: $(hdrdir)/ruby/internal/intern/gc.h beg_len_step.o: $(hdrdir)/ruby/internal/intern/hash.h beg_len_step.o: $(hdrdir)/ruby/internal/intern/io.h beg_len_step.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,6 +141,7 @@ beg_len_step.o: $(hdrdir)/ruby/internal/memory.h beg_len_step.o: $(hdrdir)/ruby/internal/method.h beg_len_step.o: $(hdrdir)/ruby/internal/module.h beg_len_step.o: $(hdrdir)/ruby/internal/newobj.h +beg_len_step.o: $(hdrdir)/ruby/internal/rgengc.h beg_len_step.o: $(hdrdir)/ruby/internal/scan_args.h beg_len_step.o: $(hdrdir)/ruby/internal/special_consts.h beg_len_step.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/arith_seq/extract/depend b/ext/-test-/arith_seq/extract/depend index 231736b277..57cbaa9a0c 100644 --- a/ext/-test-/arith_seq/extract/depend +++ b/ext/-test-/arith_seq/extract/depend @@ -51,7 +51,6 @@ extract.o: $(hdrdir)/ruby/internal/attr/noexcept.h extract.o: $(hdrdir)/ruby/internal/attr/noinline.h extract.o: $(hdrdir)/ruby/internal/attr/nonnull.h extract.o: $(hdrdir)/ruby/internal/attr/noreturn.h -extract.o: $(hdrdir)/ruby/internal/attr/packed_struct.h extract.o: $(hdrdir)/ruby/internal/attr/pure.h extract.o: $(hdrdir)/ruby/internal/attr/restrict.h extract.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -111,6 +110,7 @@ extract.o: $(hdrdir)/ruby/internal/intern/enumerator.h extract.o: $(hdrdir)/ruby/internal/intern/error.h extract.o: $(hdrdir)/ruby/internal/intern/eval.h extract.o: $(hdrdir)/ruby/internal/intern/file.h +extract.o: $(hdrdir)/ruby/internal/intern/gc.h extract.o: $(hdrdir)/ruby/internal/intern/hash.h extract.o: $(hdrdir)/ruby/internal/intern/io.h extract.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,6 +141,7 @@ extract.o: $(hdrdir)/ruby/internal/memory.h extract.o: $(hdrdir)/ruby/internal/method.h extract.o: $(hdrdir)/ruby/internal/module.h extract.o: $(hdrdir)/ruby/internal/newobj.h +extract.o: $(hdrdir)/ruby/internal/rgengc.h extract.o: $(hdrdir)/ruby/internal/scan_args.h extract.o: $(hdrdir)/ruby/internal/special_consts.h extract.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/array/concat/depend b/ext/-test-/array/concat/depend index d66e7a540f..79c833738e 100644 --- a/ext/-test-/array/concat/depend +++ b/ext/-test-/array/concat/depend @@ -52,7 +52,6 @@ to_ary_concat.o: $(hdrdir)/ruby/internal/attr/noexcept.h to_ary_concat.o: $(hdrdir)/ruby/internal/attr/noinline.h to_ary_concat.o: $(hdrdir)/ruby/internal/attr/nonnull.h to_ary_concat.o: $(hdrdir)/ruby/internal/attr/noreturn.h -to_ary_concat.o: $(hdrdir)/ruby/internal/attr/packed_struct.h to_ary_concat.o: $(hdrdir)/ruby/internal/attr/pure.h to_ary_concat.o: $(hdrdir)/ruby/internal/attr/restrict.h to_ary_concat.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ to_ary_concat.o: $(hdrdir)/ruby/internal/intern/enumerator.h to_ary_concat.o: $(hdrdir)/ruby/internal/intern/error.h to_ary_concat.o: $(hdrdir)/ruby/internal/intern/eval.h to_ary_concat.o: $(hdrdir)/ruby/internal/intern/file.h +to_ary_concat.o: $(hdrdir)/ruby/internal/intern/gc.h to_ary_concat.o: $(hdrdir)/ruby/internal/intern/hash.h to_ary_concat.o: $(hdrdir)/ruby/internal/intern/io.h to_ary_concat.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ to_ary_concat.o: $(hdrdir)/ruby/internal/memory.h to_ary_concat.o: $(hdrdir)/ruby/internal/method.h to_ary_concat.o: $(hdrdir)/ruby/internal/module.h to_ary_concat.o: $(hdrdir)/ruby/internal/newobj.h +to_ary_concat.o: $(hdrdir)/ruby/internal/rgengc.h to_ary_concat.o: $(hdrdir)/ruby/internal/scan_args.h to_ary_concat.o: $(hdrdir)/ruby/internal/special_consts.h to_ary_concat.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/array/resize/depend b/ext/-test-/array/resize/depend index a9c02b3db2..49e0f346d3 100644 --- a/ext/-test-/array/resize/depend +++ b/ext/-test-/array/resize/depend @@ -51,7 +51,6 @@ resize.o: $(hdrdir)/ruby/internal/attr/noexcept.h resize.o: $(hdrdir)/ruby/internal/attr/noinline.h resize.o: $(hdrdir)/ruby/internal/attr/nonnull.h resize.o: $(hdrdir)/ruby/internal/attr/noreturn.h -resize.o: $(hdrdir)/ruby/internal/attr/packed_struct.h resize.o: $(hdrdir)/ruby/internal/attr/pure.h resize.o: $(hdrdir)/ruby/internal/attr/restrict.h resize.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -111,6 +110,7 @@ resize.o: $(hdrdir)/ruby/internal/intern/enumerator.h resize.o: $(hdrdir)/ruby/internal/intern/error.h resize.o: $(hdrdir)/ruby/internal/intern/eval.h resize.o: $(hdrdir)/ruby/internal/intern/file.h +resize.o: $(hdrdir)/ruby/internal/intern/gc.h resize.o: $(hdrdir)/ruby/internal/intern/hash.h resize.o: $(hdrdir)/ruby/internal/intern/io.h resize.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,6 +141,7 @@ resize.o: $(hdrdir)/ruby/internal/memory.h resize.o: $(hdrdir)/ruby/internal/method.h resize.o: $(hdrdir)/ruby/internal/module.h resize.o: $(hdrdir)/ruby/internal/newobj.h +resize.o: $(hdrdir)/ruby/internal/rgengc.h resize.o: $(hdrdir)/ruby/internal/scan_args.h resize.o: $(hdrdir)/ruby/internal/special_consts.h resize.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/bignum/depend b/ext/-test-/bignum/depend index d4392bb6a1..d4072fb35c 100644 --- a/ext/-test-/bignum/depend +++ b/ext/-test-/bignum/depend @@ -51,7 +51,6 @@ big2str.o: $(hdrdir)/ruby/internal/attr/noexcept.h big2str.o: $(hdrdir)/ruby/internal/attr/noinline.h big2str.o: $(hdrdir)/ruby/internal/attr/nonnull.h big2str.o: $(hdrdir)/ruby/internal/attr/noreturn.h -big2str.o: $(hdrdir)/ruby/internal/attr/packed_struct.h big2str.o: $(hdrdir)/ruby/internal/attr/pure.h big2str.o: $(hdrdir)/ruby/internal/attr/restrict.h big2str.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -111,6 +110,7 @@ big2str.o: $(hdrdir)/ruby/internal/intern/enumerator.h big2str.o: $(hdrdir)/ruby/internal/intern/error.h big2str.o: $(hdrdir)/ruby/internal/intern/eval.h big2str.o: $(hdrdir)/ruby/internal/intern/file.h +big2str.o: $(hdrdir)/ruby/internal/intern/gc.h big2str.o: $(hdrdir)/ruby/internal/intern/hash.h big2str.o: $(hdrdir)/ruby/internal/intern/io.h big2str.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,6 +141,7 @@ big2str.o: $(hdrdir)/ruby/internal/memory.h big2str.o: $(hdrdir)/ruby/internal/method.h big2str.o: $(hdrdir)/ruby/internal/module.h big2str.o: $(hdrdir)/ruby/internal/newobj.h +big2str.o: $(hdrdir)/ruby/internal/rgengc.h big2str.o: $(hdrdir)/ruby/internal/scan_args.h big2str.o: $(hdrdir)/ruby/internal/special_consts.h big2str.o: $(hdrdir)/ruby/internal/static_assert.h @@ -210,7 +211,6 @@ bigzero.o: $(hdrdir)/ruby/internal/attr/noexcept.h bigzero.o: $(hdrdir)/ruby/internal/attr/noinline.h bigzero.o: $(hdrdir)/ruby/internal/attr/nonnull.h bigzero.o: $(hdrdir)/ruby/internal/attr/noreturn.h -bigzero.o: $(hdrdir)/ruby/internal/attr/packed_struct.h bigzero.o: $(hdrdir)/ruby/internal/attr/pure.h bigzero.o: $(hdrdir)/ruby/internal/attr/restrict.h bigzero.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -270,6 +270,7 @@ bigzero.o: $(hdrdir)/ruby/internal/intern/enumerator.h bigzero.o: $(hdrdir)/ruby/internal/intern/error.h bigzero.o: $(hdrdir)/ruby/internal/intern/eval.h bigzero.o: $(hdrdir)/ruby/internal/intern/file.h +bigzero.o: $(hdrdir)/ruby/internal/intern/gc.h bigzero.o: $(hdrdir)/ruby/internal/intern/hash.h bigzero.o: $(hdrdir)/ruby/internal/intern/io.h bigzero.o: $(hdrdir)/ruby/internal/intern/load.h @@ -300,6 +301,7 @@ bigzero.o: $(hdrdir)/ruby/internal/memory.h bigzero.o: $(hdrdir)/ruby/internal/method.h bigzero.o: $(hdrdir)/ruby/internal/module.h bigzero.o: $(hdrdir)/ruby/internal/newobj.h +bigzero.o: $(hdrdir)/ruby/internal/rgengc.h bigzero.o: $(hdrdir)/ruby/internal/scan_args.h bigzero.o: $(hdrdir)/ruby/internal/special_consts.h bigzero.o: $(hdrdir)/ruby/internal/static_assert.h @@ -369,7 +371,6 @@ div.o: $(hdrdir)/ruby/internal/attr/noexcept.h div.o: $(hdrdir)/ruby/internal/attr/noinline.h div.o: $(hdrdir)/ruby/internal/attr/nonnull.h div.o: $(hdrdir)/ruby/internal/attr/noreturn.h -div.o: $(hdrdir)/ruby/internal/attr/packed_struct.h div.o: $(hdrdir)/ruby/internal/attr/pure.h div.o: $(hdrdir)/ruby/internal/attr/restrict.h div.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -429,6 +430,7 @@ div.o: $(hdrdir)/ruby/internal/intern/enumerator.h div.o: $(hdrdir)/ruby/internal/intern/error.h div.o: $(hdrdir)/ruby/internal/intern/eval.h div.o: $(hdrdir)/ruby/internal/intern/file.h +div.o: $(hdrdir)/ruby/internal/intern/gc.h div.o: $(hdrdir)/ruby/internal/intern/hash.h div.o: $(hdrdir)/ruby/internal/intern/io.h div.o: $(hdrdir)/ruby/internal/intern/load.h @@ -459,6 +461,7 @@ div.o: $(hdrdir)/ruby/internal/memory.h div.o: $(hdrdir)/ruby/internal/method.h div.o: $(hdrdir)/ruby/internal/module.h div.o: $(hdrdir)/ruby/internal/newobj.h +div.o: $(hdrdir)/ruby/internal/rgengc.h div.o: $(hdrdir)/ruby/internal/scan_args.h div.o: $(hdrdir)/ruby/internal/special_consts.h div.o: $(hdrdir)/ruby/internal/static_assert.h @@ -529,7 +532,6 @@ 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 @@ -589,6 +591,7 @@ 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/gc.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 @@ -619,6 +622,7 @@ 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/rgengc.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 @@ -687,7 +691,6 @@ intpack.o: $(hdrdir)/ruby/internal/attr/noexcept.h intpack.o: $(hdrdir)/ruby/internal/attr/noinline.h intpack.o: $(hdrdir)/ruby/internal/attr/nonnull.h intpack.o: $(hdrdir)/ruby/internal/attr/noreturn.h -intpack.o: $(hdrdir)/ruby/internal/attr/packed_struct.h intpack.o: $(hdrdir)/ruby/internal/attr/pure.h intpack.o: $(hdrdir)/ruby/internal/attr/restrict.h intpack.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -747,6 +750,7 @@ intpack.o: $(hdrdir)/ruby/internal/intern/enumerator.h intpack.o: $(hdrdir)/ruby/internal/intern/error.h intpack.o: $(hdrdir)/ruby/internal/intern/eval.h intpack.o: $(hdrdir)/ruby/internal/intern/file.h +intpack.o: $(hdrdir)/ruby/internal/intern/gc.h intpack.o: $(hdrdir)/ruby/internal/intern/hash.h intpack.o: $(hdrdir)/ruby/internal/intern/io.h intpack.o: $(hdrdir)/ruby/internal/intern/load.h @@ -777,6 +781,7 @@ intpack.o: $(hdrdir)/ruby/internal/memory.h intpack.o: $(hdrdir)/ruby/internal/method.h intpack.o: $(hdrdir)/ruby/internal/module.h intpack.o: $(hdrdir)/ruby/internal/newobj.h +intpack.o: $(hdrdir)/ruby/internal/rgengc.h intpack.o: $(hdrdir)/ruby/internal/scan_args.h intpack.o: $(hdrdir)/ruby/internal/special_consts.h intpack.o: $(hdrdir)/ruby/internal/static_assert.h @@ -846,7 +851,6 @@ mul.o: $(hdrdir)/ruby/internal/attr/noexcept.h mul.o: $(hdrdir)/ruby/internal/attr/noinline.h mul.o: $(hdrdir)/ruby/internal/attr/nonnull.h mul.o: $(hdrdir)/ruby/internal/attr/noreturn.h -mul.o: $(hdrdir)/ruby/internal/attr/packed_struct.h mul.o: $(hdrdir)/ruby/internal/attr/pure.h mul.o: $(hdrdir)/ruby/internal/attr/restrict.h mul.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -906,6 +910,7 @@ mul.o: $(hdrdir)/ruby/internal/intern/enumerator.h mul.o: $(hdrdir)/ruby/internal/intern/error.h mul.o: $(hdrdir)/ruby/internal/intern/eval.h mul.o: $(hdrdir)/ruby/internal/intern/file.h +mul.o: $(hdrdir)/ruby/internal/intern/gc.h mul.o: $(hdrdir)/ruby/internal/intern/hash.h mul.o: $(hdrdir)/ruby/internal/intern/io.h mul.o: $(hdrdir)/ruby/internal/intern/load.h @@ -936,6 +941,7 @@ mul.o: $(hdrdir)/ruby/internal/memory.h mul.o: $(hdrdir)/ruby/internal/method.h mul.o: $(hdrdir)/ruby/internal/module.h mul.o: $(hdrdir)/ruby/internal/newobj.h +mul.o: $(hdrdir)/ruby/internal/rgengc.h mul.o: $(hdrdir)/ruby/internal/scan_args.h mul.o: $(hdrdir)/ruby/internal/special_consts.h mul.o: $(hdrdir)/ruby/internal/static_assert.h @@ -1005,7 +1011,6 @@ str2big.o: $(hdrdir)/ruby/internal/attr/noexcept.h str2big.o: $(hdrdir)/ruby/internal/attr/noinline.h str2big.o: $(hdrdir)/ruby/internal/attr/nonnull.h str2big.o: $(hdrdir)/ruby/internal/attr/noreturn.h -str2big.o: $(hdrdir)/ruby/internal/attr/packed_struct.h str2big.o: $(hdrdir)/ruby/internal/attr/pure.h str2big.o: $(hdrdir)/ruby/internal/attr/restrict.h str2big.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -1065,6 +1070,7 @@ str2big.o: $(hdrdir)/ruby/internal/intern/enumerator.h str2big.o: $(hdrdir)/ruby/internal/intern/error.h str2big.o: $(hdrdir)/ruby/internal/intern/eval.h str2big.o: $(hdrdir)/ruby/internal/intern/file.h +str2big.o: $(hdrdir)/ruby/internal/intern/gc.h str2big.o: $(hdrdir)/ruby/internal/intern/hash.h str2big.o: $(hdrdir)/ruby/internal/intern/io.h str2big.o: $(hdrdir)/ruby/internal/intern/load.h @@ -1095,6 +1101,7 @@ str2big.o: $(hdrdir)/ruby/internal/memory.h str2big.o: $(hdrdir)/ruby/internal/method.h str2big.o: $(hdrdir)/ruby/internal/module.h str2big.o: $(hdrdir)/ruby/internal/newobj.h +str2big.o: $(hdrdir)/ruby/internal/rgengc.h str2big.o: $(hdrdir)/ruby/internal/scan_args.h str2big.o: $(hdrdir)/ruby/internal/special_consts.h str2big.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/bug-14834/depend b/ext/-test-/bug-14834/depend index bf26a571aa..7bac8409e8 100644 --- a/ext/-test-/bug-14834/depend +++ b/ext/-test-/bug-14834/depend @@ -52,7 +52,6 @@ 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 @@ -112,6 +111,7 @@ 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/gc.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 @@ -142,6 +142,7 @@ 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/rgengc.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 diff --git a/ext/-test-/bug-3571/depend b/ext/-test-/bug-3571/depend index 9105093b0d..2303f47594 100644 --- a/ext/-test-/bug-3571/depend +++ b/ext/-test-/bug-3571/depend @@ -52,7 +52,6 @@ bug.o: $(hdrdir)/ruby/internal/attr/noexcept.h bug.o: $(hdrdir)/ruby/internal/attr/noinline.h bug.o: $(hdrdir)/ruby/internal/attr/nonnull.h bug.o: $(hdrdir)/ruby/internal/attr/noreturn.h -bug.o: $(hdrdir)/ruby/internal/attr/packed_struct.h bug.o: $(hdrdir)/ruby/internal/attr/pure.h bug.o: $(hdrdir)/ruby/internal/attr/restrict.h bug.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ bug.o: $(hdrdir)/ruby/internal/intern/enumerator.h bug.o: $(hdrdir)/ruby/internal/intern/error.h bug.o: $(hdrdir)/ruby/internal/intern/eval.h bug.o: $(hdrdir)/ruby/internal/intern/file.h +bug.o: $(hdrdir)/ruby/internal/intern/gc.h bug.o: $(hdrdir)/ruby/internal/intern/hash.h bug.o: $(hdrdir)/ruby/internal/intern/io.h bug.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ bug.o: $(hdrdir)/ruby/internal/memory.h bug.o: $(hdrdir)/ruby/internal/method.h bug.o: $(hdrdir)/ruby/internal/module.h bug.o: $(hdrdir)/ruby/internal/newobj.h +bug.o: $(hdrdir)/ruby/internal/rgengc.h bug.o: $(hdrdir)/ruby/internal/scan_args.h bug.o: $(hdrdir)/ruby/internal/special_consts.h bug.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/bug-5832/depend b/ext/-test-/bug-5832/depend index 9105093b0d..2303f47594 100644 --- a/ext/-test-/bug-5832/depend +++ b/ext/-test-/bug-5832/depend @@ -52,7 +52,6 @@ bug.o: $(hdrdir)/ruby/internal/attr/noexcept.h bug.o: $(hdrdir)/ruby/internal/attr/noinline.h bug.o: $(hdrdir)/ruby/internal/attr/nonnull.h bug.o: $(hdrdir)/ruby/internal/attr/noreturn.h -bug.o: $(hdrdir)/ruby/internal/attr/packed_struct.h bug.o: $(hdrdir)/ruby/internal/attr/pure.h bug.o: $(hdrdir)/ruby/internal/attr/restrict.h bug.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ bug.o: $(hdrdir)/ruby/internal/intern/enumerator.h bug.o: $(hdrdir)/ruby/internal/intern/error.h bug.o: $(hdrdir)/ruby/internal/intern/eval.h bug.o: $(hdrdir)/ruby/internal/intern/file.h +bug.o: $(hdrdir)/ruby/internal/intern/gc.h bug.o: $(hdrdir)/ruby/internal/intern/hash.h bug.o: $(hdrdir)/ruby/internal/intern/io.h bug.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ bug.o: $(hdrdir)/ruby/internal/memory.h bug.o: $(hdrdir)/ruby/internal/method.h bug.o: $(hdrdir)/ruby/internal/module.h bug.o: $(hdrdir)/ruby/internal/newobj.h +bug.o: $(hdrdir)/ruby/internal/rgengc.h bug.o: $(hdrdir)/ruby/internal/scan_args.h bug.o: $(hdrdir)/ruby/internal/special_consts.h bug.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/bug_reporter/depend b/ext/-test-/bug_reporter/depend index 20882708d1..603dd53ebf 100644 --- a/ext/-test-/bug_reporter/depend +++ b/ext/-test-/bug_reporter/depend @@ -52,7 +52,6 @@ bug_reporter.o: $(hdrdir)/ruby/internal/attr/noexcept.h bug_reporter.o: $(hdrdir)/ruby/internal/attr/noinline.h bug_reporter.o: $(hdrdir)/ruby/internal/attr/nonnull.h bug_reporter.o: $(hdrdir)/ruby/internal/attr/noreturn.h -bug_reporter.o: $(hdrdir)/ruby/internal/attr/packed_struct.h bug_reporter.o: $(hdrdir)/ruby/internal/attr/pure.h bug_reporter.o: $(hdrdir)/ruby/internal/attr/restrict.h bug_reporter.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ bug_reporter.o: $(hdrdir)/ruby/internal/intern/enumerator.h bug_reporter.o: $(hdrdir)/ruby/internal/intern/error.h bug_reporter.o: $(hdrdir)/ruby/internal/intern/eval.h bug_reporter.o: $(hdrdir)/ruby/internal/intern/file.h +bug_reporter.o: $(hdrdir)/ruby/internal/intern/gc.h bug_reporter.o: $(hdrdir)/ruby/internal/intern/hash.h bug_reporter.o: $(hdrdir)/ruby/internal/intern/io.h bug_reporter.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ bug_reporter.o: $(hdrdir)/ruby/internal/memory.h bug_reporter.o: $(hdrdir)/ruby/internal/method.h bug_reporter.o: $(hdrdir)/ruby/internal/module.h bug_reporter.o: $(hdrdir)/ruby/internal/newobj.h +bug_reporter.o: $(hdrdir)/ruby/internal/rgengc.h bug_reporter.o: $(hdrdir)/ruby/internal/scan_args.h bug_reporter.o: $(hdrdir)/ruby/internal/special_consts.h bug_reporter.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/class/depend b/ext/-test-/class/depend index 0a805f815e..a615eacd74 100644 --- a/ext/-test-/class/depend +++ b/ext/-test-/class/depend @@ -51,7 +51,6 @@ class2name.o: $(hdrdir)/ruby/internal/attr/noexcept.h class2name.o: $(hdrdir)/ruby/internal/attr/noinline.h class2name.o: $(hdrdir)/ruby/internal/attr/nonnull.h class2name.o: $(hdrdir)/ruby/internal/attr/noreturn.h -class2name.o: $(hdrdir)/ruby/internal/attr/packed_struct.h class2name.o: $(hdrdir)/ruby/internal/attr/pure.h class2name.o: $(hdrdir)/ruby/internal/attr/restrict.h class2name.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -111,6 +110,7 @@ class2name.o: $(hdrdir)/ruby/internal/intern/enumerator.h class2name.o: $(hdrdir)/ruby/internal/intern/error.h class2name.o: $(hdrdir)/ruby/internal/intern/eval.h class2name.o: $(hdrdir)/ruby/internal/intern/file.h +class2name.o: $(hdrdir)/ruby/internal/intern/gc.h class2name.o: $(hdrdir)/ruby/internal/intern/hash.h class2name.o: $(hdrdir)/ruby/internal/intern/io.h class2name.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,6 +141,7 @@ class2name.o: $(hdrdir)/ruby/internal/memory.h class2name.o: $(hdrdir)/ruby/internal/method.h class2name.o: $(hdrdir)/ruby/internal/module.h class2name.o: $(hdrdir)/ruby/internal/newobj.h +class2name.o: $(hdrdir)/ruby/internal/rgengc.h class2name.o: $(hdrdir)/ruby/internal/scan_args.h class2name.o: $(hdrdir)/ruby/internal/special_consts.h class2name.o: $(hdrdir)/ruby/internal/static_assert.h @@ -210,7 +211,6 @@ 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 @@ -270,6 +270,7 @@ 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/gc.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 @@ -300,6 +301,7 @@ 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/rgengc.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 diff --git a/ext/-test-/debug/depend b/ext/-test-/debug/depend index 5feeea6d98..c3a0c278aa 100644 --- a/ext/-test-/debug/depend +++ b/ext/-test-/debug/depend @@ -52,7 +52,6 @@ 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 @@ -112,6 +111,7 @@ 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/gc.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 @@ -142,6 +142,7 @@ 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/rgengc.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 @@ -211,7 +212,6 @@ inspector.o: $(hdrdir)/ruby/internal/attr/noexcept.h inspector.o: $(hdrdir)/ruby/internal/attr/noinline.h inspector.o: $(hdrdir)/ruby/internal/attr/nonnull.h inspector.o: $(hdrdir)/ruby/internal/attr/noreturn.h -inspector.o: $(hdrdir)/ruby/internal/attr/packed_struct.h inspector.o: $(hdrdir)/ruby/internal/attr/pure.h inspector.o: $(hdrdir)/ruby/internal/attr/restrict.h inspector.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -271,6 +271,7 @@ inspector.o: $(hdrdir)/ruby/internal/intern/enumerator.h inspector.o: $(hdrdir)/ruby/internal/intern/error.h inspector.o: $(hdrdir)/ruby/internal/intern/eval.h inspector.o: $(hdrdir)/ruby/internal/intern/file.h +inspector.o: $(hdrdir)/ruby/internal/intern/gc.h inspector.o: $(hdrdir)/ruby/internal/intern/hash.h inspector.o: $(hdrdir)/ruby/internal/intern/io.h inspector.o: $(hdrdir)/ruby/internal/intern/load.h @@ -301,6 +302,7 @@ inspector.o: $(hdrdir)/ruby/internal/memory.h inspector.o: $(hdrdir)/ruby/internal/method.h inspector.o: $(hdrdir)/ruby/internal/module.h inspector.o: $(hdrdir)/ruby/internal/newobj.h +inspector.o: $(hdrdir)/ruby/internal/rgengc.h inspector.o: $(hdrdir)/ruby/internal/scan_args.h inspector.o: $(hdrdir)/ruby/internal/special_consts.h inspector.o: $(hdrdir)/ruby/internal/static_assert.h @@ -370,7 +372,6 @@ profile_frames.o: $(hdrdir)/ruby/internal/attr/noexcept.h profile_frames.o: $(hdrdir)/ruby/internal/attr/noinline.h profile_frames.o: $(hdrdir)/ruby/internal/attr/nonnull.h profile_frames.o: $(hdrdir)/ruby/internal/attr/noreturn.h -profile_frames.o: $(hdrdir)/ruby/internal/attr/packed_struct.h profile_frames.o: $(hdrdir)/ruby/internal/attr/pure.h profile_frames.o: $(hdrdir)/ruby/internal/attr/restrict.h profile_frames.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -430,6 +431,7 @@ profile_frames.o: $(hdrdir)/ruby/internal/intern/enumerator.h profile_frames.o: $(hdrdir)/ruby/internal/intern/error.h profile_frames.o: $(hdrdir)/ruby/internal/intern/eval.h profile_frames.o: $(hdrdir)/ruby/internal/intern/file.h +profile_frames.o: $(hdrdir)/ruby/internal/intern/gc.h profile_frames.o: $(hdrdir)/ruby/internal/intern/hash.h profile_frames.o: $(hdrdir)/ruby/internal/intern/io.h profile_frames.o: $(hdrdir)/ruby/internal/intern/load.h @@ -460,6 +462,7 @@ profile_frames.o: $(hdrdir)/ruby/internal/memory.h profile_frames.o: $(hdrdir)/ruby/internal/method.h profile_frames.o: $(hdrdir)/ruby/internal/module.h profile_frames.o: $(hdrdir)/ruby/internal/newobj.h +profile_frames.o: $(hdrdir)/ruby/internal/rgengc.h profile_frames.o: $(hdrdir)/ruby/internal/scan_args.h profile_frames.o: $(hdrdir)/ruby/internal/special_consts.h profile_frames.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/debug/profile_frames.c b/ext/-test-/debug/profile_frames.c index f9a77a5a78..d2bba7d183 100644 --- a/ext/-test-/debug/profile_frames.c +++ b/ext/-test-/debug/profile_frames.c @@ -37,29 +37,8 @@ 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 a460159087..e16082a7dc 100644 --- a/ext/-test-/dln/empty/depend +++ b/ext/-test-/dln/empty/depend @@ -52,7 +52,6 @@ empty.o: $(hdrdir)/ruby/internal/attr/noexcept.h empty.o: $(hdrdir)/ruby/internal/attr/noinline.h empty.o: $(hdrdir)/ruby/internal/attr/nonnull.h empty.o: $(hdrdir)/ruby/internal/attr/noreturn.h -empty.o: $(hdrdir)/ruby/internal/attr/packed_struct.h empty.o: $(hdrdir)/ruby/internal/attr/pure.h empty.o: $(hdrdir)/ruby/internal/attr/restrict.h empty.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ empty.o: $(hdrdir)/ruby/internal/intern/enumerator.h empty.o: $(hdrdir)/ruby/internal/intern/error.h empty.o: $(hdrdir)/ruby/internal/intern/eval.h empty.o: $(hdrdir)/ruby/internal/intern/file.h +empty.o: $(hdrdir)/ruby/internal/intern/gc.h empty.o: $(hdrdir)/ruby/internal/intern/hash.h empty.o: $(hdrdir)/ruby/internal/intern/io.h empty.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ empty.o: $(hdrdir)/ruby/internal/memory.h empty.o: $(hdrdir)/ruby/internal/method.h empty.o: $(hdrdir)/ruby/internal/module.h empty.o: $(hdrdir)/ruby/internal/newobj.h +empty.o: $(hdrdir)/ruby/internal/rgengc.h empty.o: $(hdrdir)/ruby/internal/scan_args.h empty.o: $(hdrdir)/ruby/internal/special_consts.h empty.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/enumerator_kw/depend b/ext/-test-/enumerator_kw/depend index 49ea495421..14a9557e41 100644 --- a/ext/-test-/enumerator_kw/depend +++ b/ext/-test-/enumerator_kw/depend @@ -52,7 +52,6 @@ enumerator_kw.o: $(hdrdir)/ruby/internal/attr/noexcept.h enumerator_kw.o: $(hdrdir)/ruby/internal/attr/noinline.h enumerator_kw.o: $(hdrdir)/ruby/internal/attr/nonnull.h enumerator_kw.o: $(hdrdir)/ruby/internal/attr/noreturn.h -enumerator_kw.o: $(hdrdir)/ruby/internal/attr/packed_struct.h enumerator_kw.o: $(hdrdir)/ruby/internal/attr/pure.h enumerator_kw.o: $(hdrdir)/ruby/internal/attr/restrict.h enumerator_kw.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ enumerator_kw.o: $(hdrdir)/ruby/internal/intern/enumerator.h enumerator_kw.o: $(hdrdir)/ruby/internal/intern/error.h enumerator_kw.o: $(hdrdir)/ruby/internal/intern/eval.h enumerator_kw.o: $(hdrdir)/ruby/internal/intern/file.h +enumerator_kw.o: $(hdrdir)/ruby/internal/intern/gc.h enumerator_kw.o: $(hdrdir)/ruby/internal/intern/hash.h enumerator_kw.o: $(hdrdir)/ruby/internal/intern/io.h enumerator_kw.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ enumerator_kw.o: $(hdrdir)/ruby/internal/memory.h enumerator_kw.o: $(hdrdir)/ruby/internal/method.h enumerator_kw.o: $(hdrdir)/ruby/internal/module.h enumerator_kw.o: $(hdrdir)/ruby/internal/newobj.h +enumerator_kw.o: $(hdrdir)/ruby/internal/rgengc.h enumerator_kw.o: $(hdrdir)/ruby/internal/scan_args.h enumerator_kw.o: $(hdrdir)/ruby/internal/special_consts.h enumerator_kw.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/exception/depend b/ext/-test-/exception/depend index 818b4c79df..e00f0b279d 100644 --- a/ext/-test-/exception/depend +++ b/ext/-test-/exception/depend @@ -51,7 +51,6 @@ dataerror.o: $(hdrdir)/ruby/internal/attr/noexcept.h dataerror.o: $(hdrdir)/ruby/internal/attr/noinline.h dataerror.o: $(hdrdir)/ruby/internal/attr/nonnull.h dataerror.o: $(hdrdir)/ruby/internal/attr/noreturn.h -dataerror.o: $(hdrdir)/ruby/internal/attr/packed_struct.h dataerror.o: $(hdrdir)/ruby/internal/attr/pure.h dataerror.o: $(hdrdir)/ruby/internal/attr/restrict.h dataerror.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -111,6 +110,7 @@ dataerror.o: $(hdrdir)/ruby/internal/intern/enumerator.h dataerror.o: $(hdrdir)/ruby/internal/intern/error.h dataerror.o: $(hdrdir)/ruby/internal/intern/eval.h dataerror.o: $(hdrdir)/ruby/internal/intern/file.h +dataerror.o: $(hdrdir)/ruby/internal/intern/gc.h dataerror.o: $(hdrdir)/ruby/internal/intern/hash.h dataerror.o: $(hdrdir)/ruby/internal/intern/io.h dataerror.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,6 +141,7 @@ dataerror.o: $(hdrdir)/ruby/internal/memory.h dataerror.o: $(hdrdir)/ruby/internal/method.h dataerror.o: $(hdrdir)/ruby/internal/module.h dataerror.o: $(hdrdir)/ruby/internal/newobj.h +dataerror.o: $(hdrdir)/ruby/internal/rgengc.h dataerror.o: $(hdrdir)/ruby/internal/scan_args.h dataerror.o: $(hdrdir)/ruby/internal/special_consts.h dataerror.o: $(hdrdir)/ruby/internal/static_assert.h @@ -211,7 +212,6 @@ enc_raise.o: $(hdrdir)/ruby/internal/attr/noexcept.h enc_raise.o: $(hdrdir)/ruby/internal/attr/noinline.h enc_raise.o: $(hdrdir)/ruby/internal/attr/nonnull.h enc_raise.o: $(hdrdir)/ruby/internal/attr/noreturn.h -enc_raise.o: $(hdrdir)/ruby/internal/attr/packed_struct.h enc_raise.o: $(hdrdir)/ruby/internal/attr/pure.h enc_raise.o: $(hdrdir)/ruby/internal/attr/restrict.h enc_raise.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -280,6 +280,7 @@ enc_raise.o: $(hdrdir)/ruby/internal/intern/enumerator.h enc_raise.o: $(hdrdir)/ruby/internal/intern/error.h enc_raise.o: $(hdrdir)/ruby/internal/intern/eval.h enc_raise.o: $(hdrdir)/ruby/internal/intern/file.h +enc_raise.o: $(hdrdir)/ruby/internal/intern/gc.h enc_raise.o: $(hdrdir)/ruby/internal/intern/hash.h enc_raise.o: $(hdrdir)/ruby/internal/intern/io.h enc_raise.o: $(hdrdir)/ruby/internal/intern/load.h @@ -310,6 +311,7 @@ enc_raise.o: $(hdrdir)/ruby/internal/memory.h enc_raise.o: $(hdrdir)/ruby/internal/method.h enc_raise.o: $(hdrdir)/ruby/internal/module.h enc_raise.o: $(hdrdir)/ruby/internal/newobj.h +enc_raise.o: $(hdrdir)/ruby/internal/rgengc.h enc_raise.o: $(hdrdir)/ruby/internal/scan_args.h enc_raise.o: $(hdrdir)/ruby/internal/special_consts.h enc_raise.o: $(hdrdir)/ruby/internal/static_assert.h @@ -381,7 +383,6 @@ ensured.o: $(hdrdir)/ruby/internal/attr/noexcept.h ensured.o: $(hdrdir)/ruby/internal/attr/noinline.h ensured.o: $(hdrdir)/ruby/internal/attr/nonnull.h ensured.o: $(hdrdir)/ruby/internal/attr/noreturn.h -ensured.o: $(hdrdir)/ruby/internal/attr/packed_struct.h ensured.o: $(hdrdir)/ruby/internal/attr/pure.h ensured.o: $(hdrdir)/ruby/internal/attr/restrict.h ensured.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -441,6 +442,7 @@ ensured.o: $(hdrdir)/ruby/internal/intern/enumerator.h ensured.o: $(hdrdir)/ruby/internal/intern/error.h ensured.o: $(hdrdir)/ruby/internal/intern/eval.h ensured.o: $(hdrdir)/ruby/internal/intern/file.h +ensured.o: $(hdrdir)/ruby/internal/intern/gc.h ensured.o: $(hdrdir)/ruby/internal/intern/hash.h ensured.o: $(hdrdir)/ruby/internal/intern/io.h ensured.o: $(hdrdir)/ruby/internal/intern/load.h @@ -471,6 +473,7 @@ ensured.o: $(hdrdir)/ruby/internal/memory.h ensured.o: $(hdrdir)/ruby/internal/method.h ensured.o: $(hdrdir)/ruby/internal/module.h ensured.o: $(hdrdir)/ruby/internal/newobj.h +ensured.o: $(hdrdir)/ruby/internal/rgengc.h ensured.o: $(hdrdir)/ruby/internal/scan_args.h ensured.o: $(hdrdir)/ruby/internal/special_consts.h ensured.o: $(hdrdir)/ruby/internal/static_assert.h @@ -540,7 +543,6 @@ 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 @@ -600,6 +602,7 @@ 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/gc.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 @@ -630,6 +633,7 @@ 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/rgengc.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 diff --git a/ext/-test-/fatal/depend b/ext/-test-/fatal/depend index 730a72e52a..5b1adb6607 100644 --- a/ext/-test-/fatal/depend +++ b/ext/-test-/fatal/depend @@ -52,7 +52,6 @@ rb_fatal.o: $(hdrdir)/ruby/internal/attr/noexcept.h rb_fatal.o: $(hdrdir)/ruby/internal/attr/noinline.h rb_fatal.o: $(hdrdir)/ruby/internal/attr/nonnull.h rb_fatal.o: $(hdrdir)/ruby/internal/attr/noreturn.h -rb_fatal.o: $(hdrdir)/ruby/internal/attr/packed_struct.h rb_fatal.o: $(hdrdir)/ruby/internal/attr/pure.h rb_fatal.o: $(hdrdir)/ruby/internal/attr/restrict.h rb_fatal.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ rb_fatal.o: $(hdrdir)/ruby/internal/intern/enumerator.h rb_fatal.o: $(hdrdir)/ruby/internal/intern/error.h rb_fatal.o: $(hdrdir)/ruby/internal/intern/eval.h rb_fatal.o: $(hdrdir)/ruby/internal/intern/file.h +rb_fatal.o: $(hdrdir)/ruby/internal/intern/gc.h rb_fatal.o: $(hdrdir)/ruby/internal/intern/hash.h rb_fatal.o: $(hdrdir)/ruby/internal/intern/io.h rb_fatal.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ rb_fatal.o: $(hdrdir)/ruby/internal/memory.h rb_fatal.o: $(hdrdir)/ruby/internal/method.h rb_fatal.o: $(hdrdir)/ruby/internal/module.h rb_fatal.o: $(hdrdir)/ruby/internal/newobj.h +rb_fatal.o: $(hdrdir)/ruby/internal/rgengc.h rb_fatal.o: $(hdrdir)/ruby/internal/scan_args.h rb_fatal.o: $(hdrdir)/ruby/internal/special_consts.h rb_fatal.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/file/depend b/ext/-test-/file/depend index 662136f1ba..f0fffc2485 100644 --- a/ext/-test-/file/depend +++ b/ext/-test-/file/depend @@ -52,7 +52,6 @@ fs.o: $(hdrdir)/ruby/internal/attr/noexcept.h fs.o: $(hdrdir)/ruby/internal/attr/noinline.h fs.o: $(hdrdir)/ruby/internal/attr/nonnull.h fs.o: $(hdrdir)/ruby/internal/attr/noreturn.h -fs.o: $(hdrdir)/ruby/internal/attr/packed_struct.h fs.o: $(hdrdir)/ruby/internal/attr/pure.h fs.o: $(hdrdir)/ruby/internal/attr/restrict.h fs.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -121,6 +120,7 @@ fs.o: $(hdrdir)/ruby/internal/intern/enumerator.h fs.o: $(hdrdir)/ruby/internal/intern/error.h fs.o: $(hdrdir)/ruby/internal/intern/eval.h fs.o: $(hdrdir)/ruby/internal/intern/file.h +fs.o: $(hdrdir)/ruby/internal/intern/gc.h fs.o: $(hdrdir)/ruby/internal/intern/hash.h fs.o: $(hdrdir)/ruby/internal/intern/io.h fs.o: $(hdrdir)/ruby/internal/intern/load.h @@ -151,6 +151,7 @@ fs.o: $(hdrdir)/ruby/internal/memory.h fs.o: $(hdrdir)/ruby/internal/method.h fs.o: $(hdrdir)/ruby/internal/module.h fs.o: $(hdrdir)/ruby/internal/newobj.h +fs.o: $(hdrdir)/ruby/internal/rgengc.h fs.o: $(hdrdir)/ruby/internal/scan_args.h fs.o: $(hdrdir)/ruby/internal/special_consts.h fs.o: $(hdrdir)/ruby/internal/static_assert.h @@ -223,7 +224,6 @@ 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 @@ -283,6 +283,7 @@ 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/gc.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 @@ -313,6 +314,7 @@ 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/rgengc.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 @@ -382,7 +384,6 @@ stat.o: $(hdrdir)/ruby/internal/attr/noexcept.h stat.o: $(hdrdir)/ruby/internal/attr/noinline.h stat.o: $(hdrdir)/ruby/internal/attr/nonnull.h stat.o: $(hdrdir)/ruby/internal/attr/noreturn.h -stat.o: $(hdrdir)/ruby/internal/attr/packed_struct.h stat.o: $(hdrdir)/ruby/internal/attr/pure.h stat.o: $(hdrdir)/ruby/internal/attr/restrict.h stat.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -451,6 +452,7 @@ stat.o: $(hdrdir)/ruby/internal/intern/enumerator.h stat.o: $(hdrdir)/ruby/internal/intern/error.h stat.o: $(hdrdir)/ruby/internal/intern/eval.h stat.o: $(hdrdir)/ruby/internal/intern/file.h +stat.o: $(hdrdir)/ruby/internal/intern/gc.h stat.o: $(hdrdir)/ruby/internal/intern/hash.h stat.o: $(hdrdir)/ruby/internal/intern/io.h stat.o: $(hdrdir)/ruby/internal/intern/load.h @@ -481,6 +483,7 @@ stat.o: $(hdrdir)/ruby/internal/memory.h stat.o: $(hdrdir)/ruby/internal/method.h stat.o: $(hdrdir)/ruby/internal/module.h stat.o: $(hdrdir)/ruby/internal/newobj.h +stat.o: $(hdrdir)/ruby/internal/rgengc.h stat.o: $(hdrdir)/ruby/internal/scan_args.h stat.o: $(hdrdir)/ruby/internal/special_consts.h stat.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/float/depend b/ext/-test-/float/depend index 9580a0416c..9391a445a3 100644 --- a/ext/-test-/float/depend +++ b/ext/-test-/float/depend @@ -55,7 +55,6 @@ 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 @@ -115,6 +114,7 @@ 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/gc.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 @@ -145,6 +145,7 @@ 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/rgengc.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 @@ -214,7 +215,6 @@ nextafter.o: $(hdrdir)/ruby/internal/attr/noexcept.h nextafter.o: $(hdrdir)/ruby/internal/attr/noinline.h nextafter.o: $(hdrdir)/ruby/internal/attr/nonnull.h nextafter.o: $(hdrdir)/ruby/internal/attr/noreturn.h -nextafter.o: $(hdrdir)/ruby/internal/attr/packed_struct.h nextafter.o: $(hdrdir)/ruby/internal/attr/pure.h nextafter.o: $(hdrdir)/ruby/internal/attr/restrict.h nextafter.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -274,6 +274,7 @@ nextafter.o: $(hdrdir)/ruby/internal/intern/enumerator.h nextafter.o: $(hdrdir)/ruby/internal/intern/error.h nextafter.o: $(hdrdir)/ruby/internal/intern/eval.h nextafter.o: $(hdrdir)/ruby/internal/intern/file.h +nextafter.o: $(hdrdir)/ruby/internal/intern/gc.h nextafter.o: $(hdrdir)/ruby/internal/intern/hash.h nextafter.o: $(hdrdir)/ruby/internal/intern/io.h nextafter.o: $(hdrdir)/ruby/internal/intern/load.h @@ -304,6 +305,7 @@ nextafter.o: $(hdrdir)/ruby/internal/memory.h nextafter.o: $(hdrdir)/ruby/internal/method.h nextafter.o: $(hdrdir)/ruby/internal/module.h nextafter.o: $(hdrdir)/ruby/internal/newobj.h +nextafter.o: $(hdrdir)/ruby/internal/rgengc.h nextafter.o: $(hdrdir)/ruby/internal/scan_args.h nextafter.o: $(hdrdir)/ruby/internal/special_consts.h nextafter.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/funcall/depend b/ext/-test-/funcall/depend index 6719e4e676..24e8c54bd9 100644 --- a/ext/-test-/funcall/depend +++ b/ext/-test-/funcall/depend @@ -52,7 +52,6 @@ funcall.o: $(hdrdir)/ruby/internal/attr/noexcept.h funcall.o: $(hdrdir)/ruby/internal/attr/noinline.h funcall.o: $(hdrdir)/ruby/internal/attr/nonnull.h funcall.o: $(hdrdir)/ruby/internal/attr/noreturn.h -funcall.o: $(hdrdir)/ruby/internal/attr/packed_struct.h funcall.o: $(hdrdir)/ruby/internal/attr/pure.h funcall.o: $(hdrdir)/ruby/internal/attr/restrict.h funcall.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ funcall.o: $(hdrdir)/ruby/internal/intern/enumerator.h funcall.o: $(hdrdir)/ruby/internal/intern/error.h funcall.o: $(hdrdir)/ruby/internal/intern/eval.h funcall.o: $(hdrdir)/ruby/internal/intern/file.h +funcall.o: $(hdrdir)/ruby/internal/intern/gc.h funcall.o: $(hdrdir)/ruby/internal/intern/hash.h funcall.o: $(hdrdir)/ruby/internal/intern/io.h funcall.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ funcall.o: $(hdrdir)/ruby/internal/memory.h funcall.o: $(hdrdir)/ruby/internal/method.h funcall.o: $(hdrdir)/ruby/internal/module.h funcall.o: $(hdrdir)/ruby/internal/newobj.h +funcall.o: $(hdrdir)/ruby/internal/rgengc.h funcall.o: $(hdrdir)/ruby/internal/scan_args.h funcall.o: $(hdrdir)/ruby/internal/special_consts.h funcall.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/gvl/call_without_gvl/depend b/ext/-test-/gvl/call_without_gvl/depend index a4987a65ca..cd184aa01c 100644 --- a/ext/-test-/gvl/call_without_gvl/depend +++ b/ext/-test-/gvl/call_without_gvl/depend @@ -51,7 +51,6 @@ call_without_gvl.o: $(hdrdir)/ruby/internal/attr/noexcept.h call_without_gvl.o: $(hdrdir)/ruby/internal/attr/noinline.h call_without_gvl.o: $(hdrdir)/ruby/internal/attr/nonnull.h call_without_gvl.o: $(hdrdir)/ruby/internal/attr/noreturn.h -call_without_gvl.o: $(hdrdir)/ruby/internal/attr/packed_struct.h call_without_gvl.o: $(hdrdir)/ruby/internal/attr/pure.h call_without_gvl.o: $(hdrdir)/ruby/internal/attr/restrict.h call_without_gvl.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -111,6 +110,7 @@ call_without_gvl.o: $(hdrdir)/ruby/internal/intern/enumerator.h call_without_gvl.o: $(hdrdir)/ruby/internal/intern/error.h call_without_gvl.o: $(hdrdir)/ruby/internal/intern/eval.h call_without_gvl.o: $(hdrdir)/ruby/internal/intern/file.h +call_without_gvl.o: $(hdrdir)/ruby/internal/intern/gc.h call_without_gvl.o: $(hdrdir)/ruby/internal/intern/hash.h call_without_gvl.o: $(hdrdir)/ruby/internal/intern/io.h call_without_gvl.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,6 +141,7 @@ call_without_gvl.o: $(hdrdir)/ruby/internal/memory.h call_without_gvl.o: $(hdrdir)/ruby/internal/method.h call_without_gvl.o: $(hdrdir)/ruby/internal/module.h call_without_gvl.o: $(hdrdir)/ruby/internal/newobj.h +call_without_gvl.o: $(hdrdir)/ruby/internal/rgengc.h call_without_gvl.o: $(hdrdir)/ruby/internal/scan_args.h call_without_gvl.o: $(hdrdir)/ruby/internal/special_consts.h call_without_gvl.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/hash/depend b/ext/-test-/hash/depend index 58d9a6247e..a8bc47e640 100644 --- a/ext/-test-/hash/depend +++ b/ext/-test-/hash/depend @@ -52,7 +52,6 @@ delete.o: $(hdrdir)/ruby/internal/attr/noexcept.h delete.o: $(hdrdir)/ruby/internal/attr/noinline.h delete.o: $(hdrdir)/ruby/internal/attr/nonnull.h delete.o: $(hdrdir)/ruby/internal/attr/noreturn.h -delete.o: $(hdrdir)/ruby/internal/attr/packed_struct.h delete.o: $(hdrdir)/ruby/internal/attr/pure.h delete.o: $(hdrdir)/ruby/internal/attr/restrict.h delete.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ delete.o: $(hdrdir)/ruby/internal/intern/enumerator.h delete.o: $(hdrdir)/ruby/internal/intern/error.h delete.o: $(hdrdir)/ruby/internal/intern/eval.h delete.o: $(hdrdir)/ruby/internal/intern/file.h +delete.o: $(hdrdir)/ruby/internal/intern/gc.h delete.o: $(hdrdir)/ruby/internal/intern/hash.h delete.o: $(hdrdir)/ruby/internal/intern/io.h delete.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ delete.o: $(hdrdir)/ruby/internal/memory.h delete.o: $(hdrdir)/ruby/internal/method.h delete.o: $(hdrdir)/ruby/internal/module.h delete.o: $(hdrdir)/ruby/internal/newobj.h +delete.o: $(hdrdir)/ruby/internal/rgengc.h delete.o: $(hdrdir)/ruby/internal/scan_args.h delete.o: $(hdrdir)/ruby/internal/special_consts.h delete.o: $(hdrdir)/ruby/internal/static_assert.h @@ -211,7 +212,6 @@ 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 @@ -271,6 +271,7 @@ 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/gc.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 @@ -301,6 +302,7 @@ 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/rgengc.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 diff --git a/ext/-test-/integer/depend b/ext/-test-/integer/depend index b68a68ce73..b12159f308 100644 --- a/ext/-test-/integer/depend +++ b/ext/-test-/integer/depend @@ -52,7 +52,6 @@ core_ext.o: $(hdrdir)/ruby/internal/attr/noexcept.h core_ext.o: $(hdrdir)/ruby/internal/attr/noinline.h core_ext.o: $(hdrdir)/ruby/internal/attr/nonnull.h core_ext.o: $(hdrdir)/ruby/internal/attr/noreturn.h -core_ext.o: $(hdrdir)/ruby/internal/attr/packed_struct.h core_ext.o: $(hdrdir)/ruby/internal/attr/pure.h core_ext.o: $(hdrdir)/ruby/internal/attr/restrict.h core_ext.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ core_ext.o: $(hdrdir)/ruby/internal/intern/enumerator.h core_ext.o: $(hdrdir)/ruby/internal/intern/error.h core_ext.o: $(hdrdir)/ruby/internal/intern/eval.h core_ext.o: $(hdrdir)/ruby/internal/intern/file.h +core_ext.o: $(hdrdir)/ruby/internal/intern/gc.h core_ext.o: $(hdrdir)/ruby/internal/intern/hash.h core_ext.o: $(hdrdir)/ruby/internal/intern/io.h core_ext.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ core_ext.o: $(hdrdir)/ruby/internal/memory.h core_ext.o: $(hdrdir)/ruby/internal/method.h core_ext.o: $(hdrdir)/ruby/internal/module.h core_ext.o: $(hdrdir)/ruby/internal/newobj.h +core_ext.o: $(hdrdir)/ruby/internal/rgengc.h core_ext.o: $(hdrdir)/ruby/internal/scan_args.h core_ext.o: $(hdrdir)/ruby/internal/special_consts.h core_ext.o: $(hdrdir)/ruby/internal/static_assert.h @@ -219,7 +220,6 @@ 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 @@ -279,6 +279,7 @@ 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/gc.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 @@ -309,6 +310,7 @@ 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/rgengc.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 @@ -378,7 +380,6 @@ my_integer.o: $(hdrdir)/ruby/internal/attr/noexcept.h my_integer.o: $(hdrdir)/ruby/internal/attr/noinline.h my_integer.o: $(hdrdir)/ruby/internal/attr/nonnull.h my_integer.o: $(hdrdir)/ruby/internal/attr/noreturn.h -my_integer.o: $(hdrdir)/ruby/internal/attr/packed_struct.h my_integer.o: $(hdrdir)/ruby/internal/attr/pure.h my_integer.o: $(hdrdir)/ruby/internal/attr/restrict.h my_integer.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -438,6 +439,7 @@ my_integer.o: $(hdrdir)/ruby/internal/intern/enumerator.h my_integer.o: $(hdrdir)/ruby/internal/intern/error.h my_integer.o: $(hdrdir)/ruby/internal/intern/eval.h my_integer.o: $(hdrdir)/ruby/internal/intern/file.h +my_integer.o: $(hdrdir)/ruby/internal/intern/gc.h my_integer.o: $(hdrdir)/ruby/internal/intern/hash.h my_integer.o: $(hdrdir)/ruby/internal/intern/io.h my_integer.o: $(hdrdir)/ruby/internal/intern/load.h @@ -468,6 +470,7 @@ my_integer.o: $(hdrdir)/ruby/internal/memory.h my_integer.o: $(hdrdir)/ruby/internal/method.h my_integer.o: $(hdrdir)/ruby/internal/module.h my_integer.o: $(hdrdir)/ruby/internal/newobj.h +my_integer.o: $(hdrdir)/ruby/internal/rgengc.h my_integer.o: $(hdrdir)/ruby/internal/scan_args.h my_integer.o: $(hdrdir)/ruby/internal/special_consts.h my_integer.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/iseq_load/depend b/ext/-test-/iseq_load/depend index 30deb6e039..308956550c 100644 --- a/ext/-test-/iseq_load/depend +++ b/ext/-test-/iseq_load/depend @@ -52,7 +52,6 @@ iseq_load.o: $(hdrdir)/ruby/internal/attr/noexcept.h iseq_load.o: $(hdrdir)/ruby/internal/attr/noinline.h iseq_load.o: $(hdrdir)/ruby/internal/attr/nonnull.h iseq_load.o: $(hdrdir)/ruby/internal/attr/noreturn.h -iseq_load.o: $(hdrdir)/ruby/internal/attr/packed_struct.h iseq_load.o: $(hdrdir)/ruby/internal/attr/pure.h iseq_load.o: $(hdrdir)/ruby/internal/attr/restrict.h iseq_load.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -112,6 +111,7 @@ iseq_load.o: $(hdrdir)/ruby/internal/intern/enumerator.h iseq_load.o: $(hdrdir)/ruby/internal/intern/error.h iseq_load.o: $(hdrdir)/ruby/internal/intern/eval.h iseq_load.o: $(hdrdir)/ruby/internal/intern/file.h +iseq_load.o: $(hdrdir)/ruby/internal/intern/gc.h iseq_load.o: $(hdrdir)/ruby/internal/intern/hash.h iseq_load.o: $(hdrdir)/ruby/internal/intern/io.h iseq_load.o: $(hdrdir)/ruby/internal/intern/load.h @@ -142,6 +142,7 @@ iseq_load.o: $(hdrdir)/ruby/internal/memory.h iseq_load.o: $(hdrdir)/ruby/internal/method.h iseq_load.o: $(hdrdir)/ruby/internal/module.h iseq_load.o: $(hdrdir)/ruby/internal/newobj.h +iseq_load.o: $(hdrdir)/ruby/internal/rgengc.h iseq_load.o: $(hdrdir)/ruby/internal/scan_args.h iseq_load.o: $(hdrdir)/ruby/internal/special_consts.h iseq_load.o: $(hdrdir)/ruby/internal/static_assert.h diff --git a/ext/-test-/iter/depend b/ext/-test-/iter/depend index 077a283532..d14c164cd4 100644 --- a/ext/-test-/iter/depend +++ b/ext/-test-/iter/depend |