Merge branch 'master' into stable

ref #5906

.editorconfig

@@ -0,0 +1,44 @@
+# About this file, see:
+#   Website: https://editorconfig.org/
+#   For Emacs users: https://github.com/editorconfig/editorconfig-emacs
+#   For Vim users: https://github.com/editorconfig/editorconfig-vim
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 8
+indent_style = tab
+insert_final_newline = true
+tab_width = 8
+
+[{Makefile,Makefile.*,makefile,*.mk}]
+trim_trailing_whitespace = true
+#max_line_length = 80
+
+[*.{c,cc,C,cxx,cpp,h,hh,H,hxx,hpp,inc,y}]
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true
+#max_line_length = 120
+
+[{*.rb,Rakefile,rakefile,*.rake,*.gemspec,*.gembox}]
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true
+#max_line_length = 120
+
+# limitation to US-ASCII
+[*.bat]
+end_of_line = crlf
+indent_style = space
+#max_line_length = 80
+
+[*.{yaml,yml}]
+indent_size = 2
+indent_style = space
+
+[*.md]
+indent_size = 2
+indent_style = space

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Extend the tab with 8 whitespace
+6fc5dc986a5ffc1a74c63ad0617ea1dcc10d3cdd
+# reformatted doc/opcode.md
+61e8a540869c57ebddac53cf9d243db407d57fff
+# reindent parse.y
+650ffb9d8410e1ae2206890ef6e2a8643c600454

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Basic set up
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/linters/.ecrc

@@ -0,0 +1,12 @@
+{
+    "verbose": false,
+    "ignore_defaults": false,
+    "exclude": ["oss-fuzz/", "src/"],
+    "disable": {
+        "end_of_line": false,
+        "trim_trailing_whitespace": false,
+        "insert_final_newline": false,
+        "indent_size": true,
+        "indent_style": true
+   }
+}

.github/linters/.markdown-lint.yml

@@ -0,0 +1,23 @@
+# https://github.com/DavidAnson/markdownlint#rules--aliases
+# markdownlint -c .github/linters/.markdown-lint.yml .
+
+# MD001 heading-increment/header-increment - Heading levels should only increment by one level at a time
+MD001: false
+
+# MD013 line-length - Line length
+MD013: false
+
+# MD014 commands-show-output - Dollar signs used before commands without showing output
+MD014: false
+
+# MD024 no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
+MD024: false
+
+# MD025 single-title/single-h1 - Multiple top-level headings in the same document
+MD025: false
+
+# MD026 no-trailing-punctuation - Trailing punctuation in heading
+MD026: false
+
+# MD040 fenced-code-language - Fenced code blocks should have a language specified
+MD040: false

.github/linters/.yaml-lint.yml

@@ -0,0 +1,9 @@
+---
+# https://yamllint.readthedocs.io/en/stable/
+# yamllint --strict -c .github/linters/.yaml-lint.yml .
+extends: default
+
+rules:
+  document-start: disable
+  line-length: disable
+  truthy: false

.github/workflows/build.yml

@@ -2,24 +2,32 @@ name: Build & Test
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
-  Check-Skip:
-    if: |
-      !contains(github.event.head_commit.message, '[ci skip]') &&
-      !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip gha]')
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo not skip
-
-  Ubuntu-1604:
-    needs: Check-Skip
-    runs-on: ubuntu-16.04
+  GCC-CLANG:
+    name: "${{ matrix.os }}-${{ matrix.altname || matrix.cc }}"
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      max-parallel: 8
+      matrix:
+        include:
+          - {os: ubuntu-22.04, cc: gcc, cxx: g++}
+          - {os: ubuntu-22.04, cc: clang, cxx: clang++}
+          - {os: ubuntu-20.04, cc: gcc, cxx: g++}
+          - {os: ubuntu-20.04, cc: clang, cxx: clang++}
+          - {os: macos-latest, cc: clang, cxx: clang++}
+          - {os: windows-latest, cc: gcc, cxx: g++, altname: "mingw-gcc"}
     env:
       MRUBY_CONFIG: ci/gcc-clang
-      CC: gcc
+      CC: ${{ matrix.cc }}
+      CXX: ${{ matrix.cxx }}
+      LD: ${{ matrix.cc }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Ruby version
         run: ruby -v
       - name: Compiler version
@@ -27,123 +35,17 @@ jobs:
       - name: Build and test
         run: rake -m test:build && rake test:run
 
-  Ubuntu-1804-gcc:
-    needs: Check-Skip
-    runs-on: ubuntu-18.04
-    env:
-      MRUBY_CONFIG: ci/gcc-clang
-      CC: gcc
-    steps:
-      - uses: actions/checkout@v2
-      - name: Ruby version
-        run: ruby -v
-      - name: Compiler version
-        run: ${{ env.CC }} --version
-      - name: Build and test
-        run: rake -m test:build && rake test:run
-
-  Ubuntu-1804-clang:
-    needs: Check-Skip
-    runs-on: ubuntu-18.04
-    env:
-      MRUBY_CONFIG: ci/gcc-clang
-      CC: clang
-    steps:
-      - uses: actions/checkout@v2
-      - name: Ruby version
-        run: ruby -v
-      - name: Compiler version
-        run: ${{ env.CC }} --version
-      - name: Build and test
-        run: rake -m test:build && rake test:run
-
-  macOS:
-    needs: Check-Skip
-    runs-on: macos-latest
-    env:
-      MRUBY_CONFIG: ci/gcc-clang
-      CC: clang
-    steps:
-      - uses: actions/checkout@v2
-      - name: Ruby version
-        run: ruby -v
-      - name: Compiler version
-        run: ${{ env.CC }} --version
-      - name: Build and test
-        run: rake -m test:build && rake test:run
-
-  Windows-MinGW:
-    needs: Check-Skip
-    runs-on: windows-latest
-    env:
-      MRUBY_CONFIG: ci/gcc-clang
-      CC: gcc
-    steps:
-      - uses: actions/checkout@v2
-      - name: Ruby version
-        run: ruby -v
-      - name: Compiler version
-        run: ${{ env.CC }} --version
-      - name: Build and test
-        run: rake -m test:build && rake test:run
-
-  Windows-Cygwin:
-    needs: Check-Skip
-    runs-on: windows-latest
-    env:
-      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-      MRUBY_CONFIG: ci/gcc-clang
-      CC: gcc
-      installer-path: '%TMP%\cygwin-setup.exe'
-      cygwin-root: C:\cygwin
-      package-dir: C:\cygwin-package
-      cache-version: v1
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.package-dir }}
-          key: ${{ runner.os }}-cygwin-${{ env.cache-version }}
-      - name: Download Cygwin installer
-        shell: cmd
-        run: >
-          bitsadmin /transfer download /priority foreground
-          https://cygwin.com/setup-x86_64.exe ${{ env.installer-path }}
-      - name: Install Cygwin
-        shell: cmd
-        run: >
-          ${{ env.installer-path }}
-          --quiet-mode --no-shortcuts --no-startmenu --no-desktop --no-admin
-          --only-site --site http://mirrors.kernel.org/sourceware/cygwin/
-          --root ${{ env.cygwin-root }}
-          --local-package-dir ${{ env.package-dir }}
-          --packages gcc-core,gcc-g++,ruby
-      - name: Set PATH for Cygwin
-        run: |
-          echo '::set-env name=PATH::${{ env.cygwin-root }}\bin;${{ env.cygwin-root }}\usr\bin'
-      - name: Ruby version
-        shell: cmd
-        run: ruby -v
-      - name: Compiler version
-        run: ${{ env.CC }} --version
-      - name: Build and test
-        shell: cmd
-        run: ruby /usr/bin/rake -m test:build && ruby /usr/bin/rake test:run
-      - name: Set PATH for cache archiving (tar)
-        # set Windows path so that Cygwin tar is not used for cache archiving
-        run: echo '::set-env name=PATH::C:\windows\System32'
-
   Windows-VC:
-    needs: Check-Skip
-    runs-on: windows-latest
+    runs-on: windows-2022
+    timeout-minutes: 10
     env:
       MRUBY_CONFIG: ci/msvc
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Ruby version
         run: ruby -v
       - name: Build and test
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           rake -m test:build && rake test:run

.github/workflows/codeql-analysis.yml

@@ -1,36 +1,34 @@
-name: "Code scanning - action"
+name: Code scanning - action
 
 on:
   push:
+    branches-ignore:
+      - dependabot/**
   pull_request:
   schedule:
     - cron: '0 19 * * 4'
 
+permissions:
+  contents: read
+
 jobs:
   CodeQL-Build:
-    if: |
-      !contains(github.event.head_commit.message, '[ci skip]') &&
-      !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip gha]')
-
+    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
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
           fetch-depth: 2
 
-      # If this run was triggered by a pull request event, then checkout
-      # the head of the pull request instead of the merge commit.
-      - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
-
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         # Override language selection by uncommenting this and choosing your languages
         # with:
         #   languages: go, javascript, csharp, python, cpp, java
@@ -38,7 +36,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -52,4 +50,4 @@ jobs:
       #    make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/lint.yml

@@ -1,23 +1,36 @@
-name: ❄️ Lint
+name: Lint
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
-  yamllint:
-    name: 🍶 YAML
+  misspell:
+    name: Check spelling with misspell
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: 🧹 YAML Lint
-        uses: ibiqlik/action-yamllint@v3
-  markdownlint:
-    name: 🍸 Markdown
+      - name: Check Out
+        uses: actions/checkout@v3
+      - name: Install
+        run: wget -O - -q https://git.io/misspell | sh -s -- -b .
+      - name: Run misspell
+        run: git ls-files --empty-directory | xargs ./misspell -error
+  pre-commit:
+    name: Run pre-commit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: 🚀 Use Node.js
-        uses: actions/setup-node@v2.1.4
+      - name: Check Out
+        uses: actions/checkout@v3
+      - name: Install
+        run: |
+          python -m pip install --upgrade pip
+          pip install pre-commit
+      - name: Set PY
+        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+      - uses: actions/cache@v3
         with:
-          node-version: '12.x'
-      - run: npm install -g markdownlint-cli@0.25.0
-      - run: markdownlint '**/*.md'
+          path: ~/.cache/pre-commit
+          key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Run pre-commit
+        run: pre-commit run --all-files

.github/workflows/oss-fuzz.yml

@@ -1,11 +1,10 @@
 name: CIFuzz
 on: [pull_request]
+permissions:
+  contents: read
+
 jobs:
   Fuzzing:
-    if: |
-      !contains(github.event.head_commit.message, '[ci skip]') &&
-      !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip gha]')
     runs-on: ubuntu-latest
     steps:
       - name: Build Fuzzers
@@ -20,7 +19,7 @@ jobs:
           fuzz-seconds: 600
           dry-run: false
       - name: Upload Crash
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: artifacts

.github/workflows/spell-checker.yml

@@ -1,17 +0,0 @@
-name: 💎 Spellchecker
-
-on: [pull_request]
-
-jobs:
-  misspell:
-    name: 🧹 Check Spelling
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🍒 Check Out
-        uses: actions/checkout@v2
-      - name: 🍅 Install
-        run: |
-          wget -O - -q https://git.io/misspell | sh -s -- -b .
-      - name: 🌶️ Misspell
-        run: |
-          git ls-files --empty-directory | xargs ./misspell -error

.github/workflows/super-linter.yml

@@ -0,0 +1,31 @@
+name: Super-Linter
+
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: read  # for actions/checkout to fetch code
+      statuses: write  # for github/super-linter/slim to mark status of each linter run
+    name: Lint Code Base
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+      - name: Lint Code Base
+        uses: github/super-linter/slim@v4.10.1
+        env:
+          ERROR_ON_MISSING_EXEC_BIT: true
+          VALIDATE_BASH: true
+          # VALIDATE_BASH_EXEC: true
+          # VALIDATE_EDITORCONFIG: true
+          # VALIDATE_SHELL_SHFMT: true
+          DEFAULT_BRANCH: master
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VALIDATE_ALL_CODEBASE: false

.markdownlint.yml

@@ -1,16 +0,0 @@
-MD001: false
-MD003: false
-MD004: false
-MD005: false
-MD007: false
-MD010: false
-MD011: false
-MD013: false
-MD014: false
-MD024: false
-MD025: false
-MD026: false
-MD034: false
-MD040: false
-MD041: false
-MD046: false

.pre-commit-config.yaml

@@ -0,0 +1,68 @@
+---
+default_stages: [commit, push]
+default_language_version:
+  # force all unspecified Python hooks to run python3
+  python: python3
+minimum_pre_commit_version: '2.18.1'
+repos:
+  - repo: meta
+    hooks:
+      - id: identity
+      - id: check-hooks-apply
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+        exclude: ^test/t/lang\.rb$
+      - id: check-merge-conflict
+      - id: check-shebang-scripts-are-executable
+      - id: check-vcs-permalinks
+      - id: check-yaml
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: file-contents-sorter
+        files: ^codespell\.txt$
+      - id: fix-byte-order-marker
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.3.1
+    hooks:
+      - id: forbid-tabs
+        exclude: Makefile$|Makefile\..+$|makefile$|\.mk$
+      - id: remove-tabs
+        args: [--whitespaces-count, '2']
+        exclude: Makefile$|Makefile\..+$|makefile$|\.mk$
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.2
+    hooks:
+      - id: codespell
+        name: Run codespell
+        description: Check spelling with codespell
+        entry: codespell --ignore-words=codespell.txt
+  - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    rev: 3.0.0
+    hooks:
+      - id: script-must-not-have-extension
+        name: Local policy is to exclude extension from all shell files
+        types: [shell]
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.33.0
+    hooks:
+      - id: markdownlint
+        name: Run markdownlint
+        description: Checks the style of Markdown files
+        entry: markdownlint -c .github/linters/.markdown-lint.yml .
+        types: [markdown]
+        files: \.(md|mdown|markdown)$
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.28.0
+    hooks:
+      - id: yamllint
+        name: Run yamllint
+        description: Check YAML files with yamllint
+        entry: yamllint --strict -c .github/linters/.yaml-lint.yml
+        types: [yaml]
+        files: \.(yaml|yml)$

.yamllint

@@ -1,8 +0,0 @@
----
-
-extends: default
-
-rules:
-  document-start: disable
-  line-length: disable
-  truthy: false

.yardopts

@@ -11,7 +11,13 @@ mrbgems/*/src/**/*.c
 mrbgems/*/mrblib/**/*.rb
 mrbgems/*/include/**/*.h
 -
-AUTHORS
-LICENSE
 CONTRIBUTING.md
+SECURITY.md
+TODO.md
+doc/*.md
 doc/guides/*.md
+doc/internal/*.md
+AUTHORS
+LEGAL
+LICENSE
+NEWS

AUTHORS

@@ -1,48 +1,321 @@
-This is the (likely incomplete) list of "mruby developers".
-If you submit a patch to mruby, please add your name to the end
-of this list.
+# Authors of mruby (mruby developers)
 
-   Yukihiro Matsumoto (Matz)
+## The List of Contributors sorted by number of commits (as of 2022-01-08 4462e3d)
+
+   8860 Yukihiro "Matz" Matsumoto (@matz)*
+    586 KOBAYASHI Shuji (@shuujii)
+    441 dearblue (@dearblue)*
+    378 Daniel Bovensiepen (@bovi)*
+    346 Takeshi Watanabe (@take-cheeze)*
+    334 Masaki Muranaka (@monaka)
+    328 Tomoyuki Sahara (@tsahara)*
+    234 Jun Hiroe (@suzukaze)
+    220 Cremno (@cremno)*
+    209 Yuki Kurihara (@ksss)+
+    151 Yasuhiro Matsumoto (@mattn)*
+    113 Carson McDonald (@carsonmcdonald)
+    113 John Bampton (@jbampton)
+    103 Tomasz Dąbrowski (@dabroz)*
+     84 Akira Yumiyama (@akiray03)*
+     84 skandhas (@skandhas)
+     80 Masamitsu MURASE (@masamitsu-murase)
+     74 Yuichiro MASUI (@masuidrive)
+     73 Hiroshi Mimaki (@mimaki)*
+     71 Tatsuhiko Kubo (@cubicdaiya)*
+     65 Yuichiro Kaneko (@yui-knk)+
+     64 Paolo Bosetti (@pbosetti)*
+     59 Kurebayashi, Takahiro (@crimsonwoods)*
+     56 h2so5 (@h2so5)
+     52 Ralph Desir (@Mav7)*
+     45 Rory O'Connell (@RoryO)*
+     42 fleuria (@flaneur2020)
+     40 Christopher Aue (@christopheraue)
+     40 Seba Gamboa (@sagmor)
+     38 Koji Yoshioka (@kyab)*+
+     38 Kouhei Sutou (@kou)*
+     32 Masayoshi Takahashi (@takahashim)+
+     31 MATSUMOTO Ryosuke (@matsumotory)*
+     30 Nobuyoshi Nakada (@nobu)
+     26 Julian Aron Prenner (@furunkel)*
+     24 Ryan Scott (@ryan-scott-dev)*
+     22 Clayton Smith (@clayton-shopify)
+     22 Uchio Kondo (@udzura)*
+     22 Zachary Scott (@zzak)*
+     22 mirichi (@mirichi)
+     21 Jared Breeden (@jbreeden)*
+     21 Ryan Lopopolo (@lopopolo)
+     19 Bouke van der Bijl (@bouk)
+     19 Felix Jones (@felixjones)*
+     19 Hidetaka Takano (@TJ-Hidetaka-Takano)
+     19 go kikuta (@gkta)*
+     18 Corey Powell (@IceDragon200)
+     18 Jon Maken (@jonforums)+
+     18 Mitchell Blank Jr (@mitchblank)*
+     16 bggd (@bggd)
+     16 kano4 (@kano4)
+     14 Blaž Hrastnik (@archseer)*
+     14 Jose Narvaez (@goyox86)
+     14 Kazuki Tsujimoto (@k-tsj)
+     14 Tadashi FUKUZAWA (@FUKUZAWA-Tadashi)+
+     14 fn ⌃ ⌥ (@FnControlOption)
+     13 Patrick Hogan (@pbhogan)
+     12 Akira Kuroda (@akuroda)
+     12 Kouki Ooyatsu (kaishuu0123)*
+     12 NAKAMURA Usaku (@unak)*
+     12 RIZAL Reckordp (@Reckordp)+
+     12 Takashi Sawanaka (@sdottaka)*
+     12 Ukrainskiy Sergey (@ukrainskiysergey)
+     12 Xuejie "Rafael" Xiao (@xxuejie)*
+     11 Julien Ammous (@schmurfy)
+     11 Kazuho Oku (@kazuho)
+     11 Seeker (@SeekingMeaning)
+     11 YAMAMOTO Masaya (pandax381)
+     11 takkaw (@takkaw)
+     10 Miura Hideki (@miura1729)
+     10 Narihiro Nakamura (@authorNari)
+     10 Ray Chason (@chasonr)*
+     10 Yuichi Nishiwaki (@nyuichi)
+      9 Akira Mitsui (@murasesyuka)*
+      9 Frank Celler (@fceller)
+      9 Tatsuya Matsumoto (@tmash06)*
+      8 Takashi Sogabe (@sogabe)
+      7 Bhargava Shastry (@bshastry)*
+      7 Kouichi Nakanishi (@keizo042)
+      7 Rubyist (@expeditiousRubyist)
+      7 Simon Génier (@simon-shopify)
+      7 Terence Lee (@hone)
+      7 Wataru Ashihara (@wataash)*
+      7 roco (@rystyle)*
+      6 Akito Mochizuki (@ak-mochi)
+      6 Beoran (@beoran)
+      6 David Siaw (@davidsiaw)*
+      6 Frederick John Milens III (@fjmilens3)
+      6 Hiro Asari (@BanzaiMan)
+      6 INOUE Yasuyuki (@yasuyuki)
+      6 Junji Sawada (@junjis0203)
+      6 Kenji Okimoto (@okkez)+
+      6 Selman ULUG (@selman)
+      6 Yusuke Endoh (@mame)*
+      5 Chris Reuter (@suetanvil)
+      5 Davide D'Agostino (@DAddYE)
+      5 Eric Hodel (@drbrain)
+      5 Hendrik (@Asmod4n)
+      5 Ichito Nagata (@i110)
+      5 Keita Obo (@ktaobo)*
+      5 Max Anselm (@silverhammermba)
+      5 Rodrigo Malizia (@rmalizia44)+
+      5 SiZiOUS (@sizious)
+      5 Syohei YOSHIDA (@syohex)
+      5 TOMITA Masahiro (@tmtm)
+      5 Yurie Yamane (@yurie)+
+      5 dreamedge (@dreamedge)
+      5 masahino (@masahino)
+      5 nkshigeru (@nkshigeru)
+      5 xuejianqing (@joans321)
+      4 Dante Catalfamo (@dantecatalfamo)
+      4 Goro Kikuchi (@gorogit)
+      4 Herwin Weststrate (@herwinw)
+      4 Jon Moss (@maclover7)
+      4 Ken Muramatsu (@ken-mu)+
+      4 Kohei Suzuki (@eagletmt)
+      4 Li Yazhou (@flaneur2020)
+      4 Marcus Stollsteimer (@stomar)
+      4 NARUSE, Yui (@nurse)
+      4 Ravil Bayramgalin (@brainopia)*+
+      4 Satoshi Odawara (@SatoshiOdawara)
+      4 Yuhei Okazaki (@Yuuhei-Okazaki)*
+      4 Yuji Yamano (@yyamano)
+      4 kurodash (@kurodash)*
+      4 wanabe (@wanabe)*
+      3 Anton Davydov (@davydovanton)
+      3 Carlo Prelz (@asfluido)*
+      3 David Turnbull (@AE9RB)
+      3 Franck Verrot (@franckverrot)
+      3 HASUMI Hitoshi (@hasumikin)
+      3 Horimoto Yasuhiro (@komainu8)
+      3 J. Mutua (@katmutua)+
+      3 Jan Berdajs (@mrbrdo)
+      3 Jonas Minnberg (@sasq64)
+      3 Joseph McCullough (@joequery)
+      3 Mark McCurry (@fundamental)
+      3 Nobuhiro Iwamatsu (@iwamatsu)
+      3 Per Lundberg (@perlun)*
+      3 Rob Fors (@robfors)*
+      3 Sebastián Katzer (@katzer)*
+      3 Shouji Kuboyama (@Shokuji)*
+      3 Shuta Kimura (@kimushu)+
+      3 TERAJIMA, Motoyuki (@trmmy)
+      3 Taichi AOKI (@aoki1980taichi)
+      3 Takashi Kokubun (@k0kubun)
+      3 Tatsuhiro Tsujikawa (@tatsuhiro-t)
+      3 Thiago Scalone (@scalone)
+      3 Vladimir Dementyev (@palkan)*
+      3 William Light (@wrl)
+      3 bamchoh (@bamchoh)
+      3 sasaki takeru (@takeru)
+      3 windwiny (@windwiny)
+      2 Akira Moroo (@retrage)
+      2 Artur K (@nemerle)
+      2 Christian Mauceri (@mauceri)
+      2 Craig Lehmann (@craiglrock)*
+      2 Dominic Sisneros (@dsisnero)*
+      2 Dusan D. Majkic (@dmajkic)
+      2 Emiliano Lesende (@3miliano)
+      2 Francois Chagnon (@EiNSTeiN-)*
+      2 Gilad Zohari (@gzohari)
+      2 Go Saito (@govm)
+      2 Hirohito Higashi (@HirohitoHigashi)
+      2 Hiroyuki Iwatsuki (@iwadon)
+      2 Huei-Horng Yo (@hiroshiyui)
+      2 Jonas Kulla (@Ancurio)
+      2 Jun Takeda (@takjn)
+      2 Kazuaki Tanaka (@kaz0505)
+      2 Kazuhiko Yamashita (@pyama86)+
+      2 Kazuhiro Sera (@seratch)
+      2 Kuroda Daisuke (@dycoon)+
+      2 Lanza (@LanzaSchneider)
+      2 Lothar Scholz (@llothar)
+      2 Lukas Joeressen (@kext)
+      2 Masahiro Wakame (@vvkame)+
+      2 Minao Yamamoto (@tarosay)+
+      2 Nihad Abbasov (@NARKOZ)
+      2 Robert Mosolgo (@rmosolgo)
+      2 Russel Hunter Yukawa (@rhykw)+
+      2 Ryunosuke SATO (@tricknotes)
+      2 Santa Zhang (@santazhang)
+      2 Satoru Naba (@snaba)+
+      2 Serg Podtynnyi (@shtirlic)
+      2 Shannen Saez (@shancat)
+      2 SouthWolf (@southwolf)
+      2 TJ Singleton (@tjsingleton)
+      2 Taiyo Mizuhashi (@taiyoslime)+
+      2 Tomás Pollak (@tomas)*
+      2 Yutaka HARA (@yhara)*+
+      2 Zhang Xiaohui (@hifoolno)
+      2 icm7216 (@icm7216)
+      1 A-Sat (@asatou)+
+      1 Abinoam Praxedes Marques Junior (@abinoam)
+      1 Alex Wang (@nanamiwang)+
+      1 Andrew Nordman (@cadwallion)
+      1 Ashish Kurmi (@boahc077)
+      1 Atsushi Morimoto (@mynz)
+      1 Ben A Morgan (@BenMorganIO)
+      1 Benoit Daloze (@eregon)
+      1 Daehyub Kim (@lateau)
+      1 Daniel Varga (@vargad)
+      1 Edgar Boda-Majer (@eboda)
+      1 Fangrui Song (@MaskRay)
+      1 Flavio Medeiros (@flaviommedeiros)
+      1 Francis Bogsanyi (@fbogsany)
+      1 Guo Xiao (@guoxiao)
+      1 Gwen Boatrite (@boatrit)
+      1 Gwendolyn Boatrite (@boatrite)
+      1 HARADA Makoto (@haramako)
+      1 HAYASHI Kentaro (@kenhys)
+      1 Hiroki Mori (@yamori813)+
+      1 Hiromasa Ishii (@Hir0)+
+      1 Hiroyuki Matsuzaki (@Hiroyuki-Matsuzaki)
+      1 Hugo Logmans (@hlogmans)
+      1 Jack Danger Canty (@JackDanger)
+      1 Jeff Federman (@jefffederman)
+      1 Jeffrey Crowell (@crowell)
+      1 Jeremy Ong (@jeremyong)
+      1 Jiro Nishiguchi (@spiritloose)
+      1 Joachim Baran (@indiedotkim)
+      1 Joe Kutner (@jkutner)
+      1 Jun Aruga (@junaruga)
+      1 Junichi Kajiwara (@kjunichi)
+      1 Jurriaan Pruis (@jurriaan)
+      1 Katsuhiko Kageyama (@kishima)+
+      1 Katsuyoshi Ito (@katsuyoshi)
+      1 Kazuhiro NISHIYAMA (@znz)
+      1 Kei Sawada (@remore)
+      1 Kim H Madsen (@kimhmadsen)
+      1 Koichi ITO (@koic)
+      1 Konstantin Haase (@rkh)
+      1 Leo Neat (@Leo-Neat)
+      1 Lian Cheng (@liancheng)
+      1 Luis Lavena (@luislavena)
+      1 Lukas Elmer (@lukaselmer)
+      1 Lukas Stabe (@Ahti)
+      1 M.Naruoka (@fenrir-naru)
+      1 Mark Delk (@jethrodaniel)
+      1 Martin Bosslet (@emboss)+
+      1 Masahiko Sawada (@MasahikoSawada)
+      1 Matt Aimonetti (@mattetti)
+      1 Maxim Abramchuk (@MaximAbramchuck)
+      1 Megumi Tomita (@tomykaira)+
+      1 Mitchell Hashimoto (@mitchellh)
+      1 Mitsutaka Mimura (@takkanm)
+      1 Nathan Ladd (@ntl)
+      1 Nicholas (@knf)
+      1 Nozomi SATO (@nozomiS)
+      1 Okumura Takahiro (@hfm)
+      1 Patrick Ellis (@pje)
+      1 Patrick Pokatilo (@SHyx0rmZ)
+      1 Pavel Evstigneev (@Paxa)+
+      1 Prayag Verma (@pra85)
+      1 Ranmocy (@ranmocy)
+      1 Robert McNally (@wolfmcnally)
+      1 Robert Rowe (@CaptainJet)
+      1 Ryan Scott Lewis (@RyanScottLewis)
+      1 Ryo Okubo (@syucream)
+      1 SAkira a.k.a. Akira Suzuki (@sakisakira)
+      1 Santiago Rodriguez (@sanrodari)
+      1 Satoh, Hiroh (@cho45)+
+      1 Sayed Abdelhaleem (@visualsayed)
+      1 Sergey Ukrainskiy (@ukrainskiysergey)
+      1 Shugo Maeda (@shugo)
+      1 Sorah Fukumori (@sorah)
+      1 Stephen Jothen (@sjothen)
+      1 Stuart Hinson (@stuarth)
+      1 Takuma Kume (@takumakume)+
+      1 Takuya ASADA (@syuu1228)
+      1 Thomas Schmidt (@digitaltom)
+      1 Timo Schilling (@timoschilling)
+      1 Tom Black (@blacktm)
+      1 Utkarsh Kukreti (@utkarshkukreti)
+      1 W (@graywolf)
+      1 Wuffers Lightwolf (@w-x-l)
+      1 YAMAMOTO Yuji (@igrep)
+      1 Yevhen Viktorov (@yevgenko)
+      1 Yoji SHIDARA (@darashi)
+      1 Yoshiori SHOJI (@yoshiori)
+      1 Yukang (@chenyukang)
+      1 Yurii Nakonechnyi (@inobelar)
+      1 Yusuke Suzuki (@Constellation)+
+      1 Yusuke Tanaka (@csouls)
+      1 arton (@arton)
+      1 duangsuse (@duangsuse)
+      1 fl0l0u (@fl0l0u)
+      1 hhc0null (@hhc0null)
+      1 iTitou (@titouanc)
+      1 javier ramírez (@javier)
+      1 liyuray (@liyuray)
+      1 lucas dicioccio (@lucasdicioccio)
+      1 n4o847 (@n4o847)
+      1 robert (@R-obert)
+      1 sbsoftware (@sbsoftware)
+      1 ssmallkirby (@smallkirby)
+      1 taku toyama (@tsuichu)
+
+`*` - Entries unified according to names and addresses
+`+` - Entries with names different from commits
+
+## Contributors without named commits
+
+   Yuichi Osawa (Mitsubishi Electric Micro-Computer Application Software)
+   Shota Nakano (Manycolors)
+   Bjorn De Meyer
+
+## Corporate contributors
+
+   Ministry of Economy, Trade and Industry, Japan
+   Kyushu Bureau of Economy, Trade and Industry
    SCSK KYUSHU CORPORATION
    Kyushu Institute of Technology
    Network Applied Communication Laboratory, Inc.
-   Daniel Bovensiepen
-   Jon Maken
-   Bjorn De Meyer
-   Yuichiro MASUI
-   Masamitsu MURASE
-   Masaki Muranaka
    Internet Initiative Japan Inc.
-   Tadashi FUKUZAWA
-   MATSUMOTO Ryosuke
-   Yasuhiro Matsumoto
-   Koji Yoshioka
-   Jun Hiroe
-   Narihiro Nakamura
-   Yuichi Nishiwaki
-   Tatsuhiko Kubo
-   Takeshi Watanabe
-   Yuki Kurihara
-   specified non-profit corporation mruby Forum
-   Kazuaki Tanaka
-   Hiromasa Ishii
-   Hiroshi Mimaki
-   Satoshi Odawara
+   Specified non-profit organization mruby Forum
    Mitsubishi Electric Micro-Computer Application Software Co.,Ltd.
-   Ralph Desir(Mav7)
-   Hiroyuki Matsuzaki
-   Yuhei Okazaki
    Manycolors, Inc.
-   Shota Nakano
-   Yuichi Osawa
-   Terence Lee
-   Zachary Scott
-   Tomasz Dąbrowski
-   Christopher Aue
-   Masahiro Wakame
-   YAMAMOTO Masaya
-   KOBAYASHI Shuji
-   RIZAL Reckordp
-   Rory O'Connell
-   John Bampton
-   Seeker

CONTRIBUTING.md

@@ -8,16 +8,64 @@ Contributors agree to license their contribution(s) under MIT license.
 To make it easy to review and understand your change please keep the following
 things in mind before submitting your pull request:
 
-* Work on the latest possible state of **mruby/master**
-* Create a branch which is dedicated to your change
-* Test your changes before creating a pull request (```rake test```)
-* If possible write a test case which confirms your change
-* Don't mix several features or bug-fixes in one pull request
-* Create a meaningful commit message
-* Explain your change (i.e. with a link to the issue you are fixing)
-* Use mrbgem to provide non ISO features (classes, modules and methods) unless
+- Work on the latest possible state of **mruby/master**
+- Create a branch which is dedicated to your change
+- Test your changes before creating a pull request (`rake test`)
+- If possible write a test case which confirms your change
+- Don't mix several features or bug-fixes in one pull request
+- Create a meaningful commit message
+- Explain your change (i.e. with a link to the issue you are fixing)
+- Use mrbgem to provide non ISO features (classes, modules and methods) unless
   you have a special reason to implement them in the core
 
+## pre-commit
+
+A framework for managing and maintaining multi-language `pre-commit` hooks.
+`pre-commit` can be [installed](https://pre-commit.com/#installation) with `pip`, `curl`, `brew` or `conda`.
+
+You need to first install `pre-commit` and then install the `pre-commit` hooks with `pre-commit install`.
+Now `pre-commit` will run automatically on git commit!
+
+It's usually a good idea to run the hooks against all the files when adding new hooks (usually `pre-commit` will only run on the changed files during git hooks).
+Use `pre-commit run --all-files` to check all files.
+
+To run a single hook use `pre-commit run --all-files <hook_id>`
+
+To update use `pre-commit autoupdate`
+
+Sometimes you might need to skip one or more hooks which can be done with the `SKIP` environment variable.
+
+`$ SKIP=yamllint git commit -m "foo"`
+
+For convenience, we have added `pre-commit run --all-files` and `pre-commit autoupdate`
+to both the Makefile and the Rakefile. Run them with:
+
+- `make check` or `rake check`
+- `make checkupdate` or `rake checkupdate`
+
+### pre-commit quick links
+
+- [Quick start](https://pre-commit.com/#quick-start)
+- [Usage](https://pre-commit.com/#usage)
+- [pre-commit autoupdate](https://pre-commit.com/#pre-commit-autoupdate)
+- [Temporarily disabling hooks](https://pre-commit.com/#temporarily-disabling-hooks)
+
+## Spell Checking
+
+We are running [misspell](https://github.com/client9/misspell) which is mainly written in
+[Golang](https://golang.org/) to check spelling with [GitHub Actions](.github/workflows/lint.yml).
+Correct commonly misspelled English words quickly with `misspell`. You can run `misspell` locally
+against all files with:
+
+```bash
+find . -type f | xargs ./misspell -error
+```
+
+Notable `misspell` help options or flags are:
+
+- `-i` string: ignore the following corrections, comma separated
+- `-w`: Overwrite file with corrections (default is just to display)
+
 ## Coding conventions
 
 How to style your C and Ruby code which you want to submit.
@@ -32,7 +80,7 @@ C code:
 
 mruby should be highly portable to other systems and compilers. For this it is
 recommended to keep your code as close as possible to the C99 standard
-(http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf).
+(<http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf>).
 
 Visual C++ is also an important target for mruby (supported version is 2013 or
 later). For this reason features that are not supported by Visual C++ may not
@@ -48,13 +96,13 @@ on-demand.
 
 #### Insert a break after the function return value:
 
-    ```C
-    int
-    main(void)
-    {
-      ...
-    }
-    ```
+```c
+int
+main(void)
+{
+  ...
+}
+```
 
 ### Ruby code
 
@@ -64,5 +112,18 @@ language itself. Please note the following hints for your Ruby code:
 #### Comply with the Ruby standard (ISO/IEC 30170:2012)
 
 mruby is currently targeting to execute Ruby code which complies to ISO/IEC
-30170:2012 (https://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579),
+30170:2012 (<https://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579>),
 unless there's a clear reason, e.g. the latest Ruby has changed behavior from ISO.
+
+## Building documentation
+
+### mruby API
+
+- [YARD](https://yardoc.org/) - YARD is a documentation generation tool for the Ruby programming language
+- [yard-mruby](https://rubygems.org/gems/yard-mruby) - Document MRuby sources with YARD
+- [yard-coderay](https://rubygems.org/gems/yard-coderay) - Adds coderay syntax highlighting to YARD docs
+
+### C API
+
+- [Doxygen](https://www.doxygen.nl/) - Generate documentation from source code
+- [Graphviz](https://graphviz.org/) - Graphviz is open source graph visualization software

Doxyfile

@@ -6,7 +6,7 @@
 
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "mruby"
-PROJECT_NUMBER         = 2.1.2
+PROJECT_NUMBER         = 3.1.0
 
 PROJECT_BRIEF          = "mruby is the lightweight implementation of the Ruby language"
 
@@ -16,13 +16,20 @@ OUTPUT_DIRECTORY       = doc/capi
 
 USE_MDFILE_AS_MAINPAGE = README.md
 
-INPUT                  = README.md \
+INPUT                  = CONTRIBUTING.md \
+                         README.md \
+                         SECURITY.md \
+                         TODO.md \
                          src \
                          include \
                          include/mruby \
                          mrblib \
                          doc \
-                         doc/guides
+                         doc/guides \
+                         doc/internal \
+                         LEGAL \
+                         LICENSE \
+                         NEWS
 
 # Red for Ruby
 HTML_COLORSTYLE_HUE    = 359
@@ -275,7 +282,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
 
-EXTENSION_MAPPING      =
+EXTENSION_MAPPING      = no_extension=md
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable

LEGAL

@@ -4,3 +4,37 @@ LEGAL NOTICE INFORMATION
 All the files in this distribution are covered under the MIT license
 (see the file LICENSE) except some files mentioned below:
 
+- src/readfloat.c: public domain by Yasuhiro Matsumoto (@mattn)
+- src/fmt_fp.c: public domain by Dave Hylands (@dhylands)
+- mrbgems/mruby-dir/src/Win/dirent.c: MIT-like license by Kevlin Henney
+
+[src/readfloat.c]
+
+strtod implementation.
+author: Yasuhiro Matsumoto (@mattn)
+license: public domain
+
+The original code can be found in https://github.com/mattn/strtod
+
+[src/fmt_fp.c]
+
+The code in this function was inspired from Fred Bayer's pdouble.c.
+Since pdouble.c was released as Public Domain, I'm releasing this
+code as public domain as well.
+
+Dave Hylands
+
+The original code can be found in https://github.com/dhylands/format-float
+
+[mrbgems/mruby-dir/src/Win/dirent.c] used only for Windows platform
+
+Copyright Kevlin Henney, 1997, 2003, 2012. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose is hereby granted without fee, provided
+that this copyright and permissions notice appear in all copies and
+derivatives.
+
+This software is supplied "as is" without express or implied warranty.
+
+But that said, if there are any problems please get in touch.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2021 mruby developers
+Copyright (c) 2010-2022 mruby developers
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -17,4 +17,3 @@ 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.
-

Makefile

@@ -13,3 +13,11 @@ test : all
 clean :
 	$(RAKE) clean
 .PHONY : clean
+
+check :
+	pre-commit run --all-files
+.PHONY : check
+
+checkupdate :
+	pre-commit autoupdate
+.PHONY : checkupdate

NEWS

@@ -1,4 +1,5 @@
-* NEWS
+NEWS
+----
 
 This document is a list of user visible feature changes made between
 releases except for bug fixes.
@@ -9,5 +10,3 @@ with all sufficient information, see the ChangeLog file.
 
 
 ** Information about first release v1.0.0
-
-

README.md

@@ -1,14 +1,17 @@
-[![Build Status][build-status-img]][travis-ci]
+# mruby
+
+[![GitHub Super-Linter](https://github.com/mruby/mruby/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter)
 
 ## What is mruby
 
 mruby is the lightweight implementation of the Ruby language complying to (part
-of) the [ISO standard][ISO-standard]. Its syntax is Ruby 2.x compatible.
+of) the [ISO standard][ISO-standard] with more recent features provided by Ruby 3.x.
+Also, its syntax is Ruby 3.x compatible except for pattern matching.
 
-mruby can be linked and embedded within your application.  We provide the
-interpreter program "mruby" and the interactive mruby shell "mirb" as examples.
+mruby can be linked and embedded within your application. We provide the
+interpreter program "mruby", and the interactive mruby shell "mirb" as examples.
 You can also compile Ruby programs into compiled byte code using the mruby
-compiler "mrbc".  All those tools reside in the "bin" directory.  "mrbc" is
+compiler "mrbc". All those tools reside in the "bin" directory. "mrbc" is
 also able to generate compiled byte code in a C source file, see the "mrbtest"
 program under the "test" directory for an example.
 
@@ -17,22 +20,22 @@ of the Ministry of Economy, Trade and Industry of Japan.
 
 ## How to get mruby
 
-The releace candidate version 3.0.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.0.0-rc.zip](https://github.com/mruby/mruby/archive/3.0.0-rc.zip)
-
-The stable version 2.1.2 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/2.1.2.zip](https://github.com/mruby/mruby/archive/2.1.2.zip)
+The release candidate version 3.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/3.2.0-rc2.zip](https://github.com/mruby/mruby/archive/3.2.0-rc2.zip)
 
 The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master)
 
 The trunk of the mruby source tree can be checked out with the
 following command:
 
-    $ git clone https://github.com/mruby/mruby.git
+```
+$ git clone https://github.com/mruby/mruby.git
+```
 
 You can also install and compile mruby using [ruby-install](https://github.com/postmodern/ruby-install), [ruby-build](https://github.com/rbenv/ruby-build) or [rvm](https://github.com/rvm/rvm).
 
 ## mruby home-page
 
-The URL of the mruby home-page is: https://mruby.org.
+The URL of the mruby home-page is: <https://mruby.org>.
 
 ## Mailing list
 
@@ -40,31 +43,41 @@ We don't have a mailing list, but you can use [GitHub issues](https://github.com
 
 ## How to compile, test, and install (mruby and gems)
 
-See the [compile.md](https://github.com/mruby/mruby/blob/master/doc/guides/compile.md) file.
+For the simplest case, type
+
+```
+rake all test
+```
+
+See the [compile.md](doc/guides/compile.md) file for the detail.
 
 ## Building documentation
 
-There are two sets of documentation in mruby: the mruby API (generated by yard) and C API (Doxygen)
+There are two sets of documentation in mruby: the mruby API (generated by yard) and C API (Doxygen and Graphviz)
 
 To build both of them, simply go
 
-    rake doc
+```
+rake doc
+```
 
 You can also view them in your browser
 
-    rake view_api
-    rake view_capi
+```
+rake view_api
+rake view_capi
+```
 
 ## How to customize mruby (mrbgems)
 
 mruby contains a package manager called *mrbgems*. To create extensions
 in C and/or Ruby you should create a *GEM*. For a documentation of how to
-use mrbgems consult the file [mrbgems.md](https://github.com/mruby/mruby/blob/master/doc/guides/mrbgems.md).
-For example code of how to use mrbgems look into the folder *examples/mrbgems/*.
+use mrbgems consult the file [mrbgems.md](doc/guides/mrbgems.md).
+For example code of how to use mrbgems look into the folder [examples/mrbgems/](examples/mrbgems).
 
 ## License
 
-mruby is released under the [MIT License](https://github.com/mruby/mruby/blob/master/LICENSE).
+mruby is released under the [MIT License](LICENSE).
 
 ## Note for License
 
@@ -72,13 +85,13 @@ mruby has chosen a MIT License due to its permissive license allowing
 developers to target various environments such as embedded systems.
 However, the license requires the display of the copyright notice and license
 information in manuals for instance. Doing so for big projects can be
-complicated or troublesome.  This is why mruby has decided to display "mruby
+complicated or troublesome. This is why mruby has decided to display "mruby
 developers" as the copyright name to make it simple conventionally.
 In the future, mruby might ask you to distribute your new code
 (that you will commit,) under the MIT License as a member of
 "mruby developers" but contributors will keep their copyright.
 (We did not intend for contributors to transfer or waive their copyrights,
-Actual copyright holder name (contributors) will be listed in the AUTHORS
+actual copyright holder name (contributors) will be listed in the [AUTHORS](AUTHORS)
 file.)
 
 Please ask us if you want to distribute your code under another license.
@@ -86,12 +99,8 @@ Please ask us if you want to distribute your code under another license.
 ## How to Contribute
 
 See the [contribution guidelines][contribution-guidelines], and then send a pull
-request to <https://github.com/mruby/mruby>.  We consider you have granted
-non-exclusive right to your contributed code under MIT license.  If you want to
-be named as one of mruby developers, please include an update to the AUTHORS
-file in your pull request.
+request to <https://github.com/mruby/mruby>. We consider you have granted
+non-exclusive right to your contributed code under MIT license.
 
 [ISO-standard]: https://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579
-[build-status-img]: https://travis-ci.org/mruby/mruby.svg?branch=master
 [contribution-guidelines]: https://github.com/mruby/mruby/blob/master/CONTRIBUTING.md
-[travis-ci]: https://travis-ci.org/mruby/mruby

Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Build description.
 # basic build file for mruby
 MRUBY_ROOT = File.dirname(File.expand_path(__FILE__))
@@ -31,7 +30,6 @@ load "#{MRUBY_ROOT}/tasks/bin.rake"
 load "#{MRUBY_ROOT}/tasks/presym.rake"
 load "#{MRUBY_ROOT}/tasks/test.rake"
 load "#{MRUBY_ROOT}/tasks/benchmark.rake"
-load "#{MRUBY_ROOT}/tasks/gitlab.rake"
 load "#{MRUBY_ROOT}/tasks/doc.rake"
 
 ##############################
@@ -68,3 +66,41 @@ task :deep_clean => %w[clean doc:clean] do
   end
   puts "Cleaned up mrbgems build folder"
 end
+
+PREFIX = ENV['PREFIX'] || ENV['INSTALL_PREFIX'] || '/usr/local'
+
+desc "install compiled products"
+task :install => :install_bin do
+  if host = MRuby.targets['host']
+    install_D host.libmruby_static, File.join(PREFIX, "lib", File.basename(host.libmruby_static))
+    # install mruby.h and mrbconf.h
+    Dir.glob(File.join(MRUBY_ROOT, "include", "*.h")) do |src|
+      install_D src, File.join(PREFIX, "include", File.basename(src))
+    end
+    Dir.glob(File.join(MRUBY_ROOT, "include", "mruby", "*.h")) do |src|
+      install_D src, File.join(PREFIX, "include", "mruby", File.basename(src))
+    end
+    Dir.glob(File.join(File.join(MRUBY_ROOT, "build", "host", "include", "mruby", "presym", "*.h"))) do |src|
+      install_D src, File.join(PREFIX, "include", "mruby", "presym", File.basename(src))
+    end
+  end
+end
+
+desc "install compiled executable (on host)"
+task :install_bin => :all do
+  if host = MRuby.targets['host']
+    Dir.glob(File.join(MRUBY_ROOT, "bin", "*")) do |src|
+      install_D src, File.join(PREFIX, "bin", File.basename(src))
+    end
+  end
+end
+
+desc "run all pre-commit hooks against all files"
+task :check do
+  sh "pre-commit run --all-files"
+end
+
+desc "check the pre-commit hooks for updates"
+task :checkupdate do
+  sh "pre-commit autoupdate"
+end

SECURITY.md

@@ -0,0 +1,20 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you have any security concern, contact <matz@ruby.or.jp>.
+
+## Scope
+
+We consider the following issues as vulnerabilities:
+
+- Remote code execution
+- Crash caused by a valid Ruby script
+
+We *don't* consider the following issues as vulnerabilities:
+
+- Runtime C undefined behavior (including integer overflow)
+- Crash caused by misused API
+- Crash caused by modified compiled binary
+- ASAN/Valgrind warning for too big memory allocation
+  mruby assumes `malloc(3)` returns `NULL` for too big allocations

TODO.md

@@ -1,17 +1,13 @@
-Thing to Do in the future
-===
+# Things to Do in the future
 
-# After mruby 3.0
+# After mruby 3.1
 
-* replace `fp_fmt.c` by `float_format` (https://github.com/dhylands/format-float.git)
-* multi-precision integer
-* WORD_BOXING: Pack some floats in `mrb_value`
-* NAN_BOXING: Allow `MRB_INT64` along with NaN boxing
-* keyword arguments a la Ruby3.0 (using `OP_SENDVK`)
-* parser and code generator independent from `mrb_state` (mmruby?)
+- parser and code generator independent from `mrb_state` (picoruby?)
+- variable sized AST node
+- iv/hash entry cache
+- more peephole optimization (if possible)
 
-# Things to do (Things that are not done yet)
+# Things to do (Things we need to consider)
 
-* `begin ... end while cond` to behave as CRuby
-* special variables ($1,$2..)
-* super in aliased methods
+- `begin ... end while cond` to behave as CRuby
+- special variables ($1,$2..)

appveyor.yml

@@ -32,7 +32,7 @@ environment:
 
 init:
   - call "%visualcpp%" %machine%
-  # For using Rubyins4aller's Ruby 2.6 64bit
+  # For using RubyInstaller's Ruby 2.6 64bit
   # 2.6 is the highest supported Ruby version across all historical
   # Visual Studio AppVeyor images. Ruby 2.7 is only on the 2019 image.
   - set PATH=C:\Ruby26-x64\bin;%PATH%

benchmark/bm_ao_render.rb

@@ -1,29 +1,29 @@
 # AO render benchmark
-# Original program (C) Syoyo Fujita in Javascript (and other languages)
+# Original program (C) Syoyo Fujita in JavaScript (and other languages)
 #      https://code.google.com/p/aobench/
 # Ruby(yarv2llvm) version by Hideki Miura
 # mruby version by Hideki Miura
 #
 
-IMAGE_WIDTH = 64
-IMAGE_HEIGHT = 64
+IMAGE_WIDTH = Integer(ARGV[0] || 64)
+IMAGE_HEIGHT = IMAGE_WIDTH
 NSUBSAMPLES = 2
 NAO_SAMPLES = 8
 
 module Rand
   # Use xorshift
-  @@x = 123456789
-  @@y = 362436069
-  @@z = 521288629
-  @@w = 88675123
+  @x = 123456789
+  @y = 362436069
+  @z = 521288629
+  @w = 88675123
   BNUM = 1 << 29
   BNUMF = BNUM.to_f
   def self.rand
-    x = @@x
+    x = @x
     t = x ^ ((x & 0xfffff) << 11)
-    w = @@w
-    @@x, @@y, @@z = @@y, @@z, w
-    w = @@w = (w ^ (w >> 19) ^ (t ^ (t >> 8)))
+    w = @w
+    @x, @y, @z = @y, @z, w
+    w = @w = (w ^ (w >> 19) ^ (t ^ (t >> 8)))
     (w % BNUM) / BNUMF
   end
 end
@@ -179,7 +179,7 @@ def clamp(f)
   i.to_i
 end
 
-def otherBasis(basis, n)
+def orthoBasis(basis, n)
   basis[2] = Vec.new(n.x, n.y, n.z)
   basis[1] = Vec.new(0.0, 0.0, 0.0)
 
@@ -211,7 +211,7 @@ class Scene
 
   def ambient_occlusion(isect)
     basis = Array.new(3)
-    otherBasis(basis, isect.n)
+    orthoBasis(basis, isect.n)
 
     ntheta    = NAO_SAMPLES
     nphi      = NAO_SAMPLES
@@ -243,8 +243,6 @@ class Scene
         @plane.intersect(ray, occisect)
         if occisect.hit
           occlusion = occlusion + 1.0
-        else
-          0.0
         end
       end
     end
@@ -254,7 +252,6 @@ class Scene
   end
 
   def render(w, h, nsubsamples)
-    cnt = 0
     nsf = nsubsamples.to_f
     h.times do |y|
       w.times do |x|
@@ -263,7 +260,6 @@ class Scene
         # Subsampling
         nsubsamples.times do |v|
           nsubsamples.times do |u|
-            cnt = cnt + 1
             wf = w.to_f
             hf = h.to_f
             xf = x.to_f
@@ -288,8 +284,6 @@ class Scene
               rad.x = rad.x + col.x
               rad.y = rad.y + col.y
               rad.z = rad.z + col.z
-            else
-              0.0
             end
           end
         end

benchmark/bm_fib.rb

@@ -1,4 +1,3 @@
-
 def fib n
   return n if n < 2
   fib(n-2) + fib(n-1)

benchmark/bm_so_lists.rb

@@ -1,9 +1,11 @@
-#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
+# from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
+# which is lost long time ago. The past content can be retrieved from
+# https://web.archive.org/web/20040805115204/http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
 
 NUM = 300
 SIZE = 10000
 
-def test_lists()
+def test_lists
   # create a list of integers (Li1) from 1 to SIZE
   li1 = (1..SIZE).to_a
   # copy the list to li2 (not by individual items)

benchmark/build_config_cc.rb

@@ -1,13 +0,0 @@
-MRuby::Build.new do |conf|
-  toolchain :gcc
-end
-
-MRuby::Build.new('gcc') do |conf|
-  toolchain :gcc
-  conf.gembox 'default'
-end
-
-MRuby::Build.new('clang') do |conf|
-  toolchain :clang
-  conf.gembox 'default'
-end

build_config/ArduinoDue.rb

@@ -11,7 +11,7 @@ MRuby::CrossBuild.new("ArduinoDue") do |conf|
   # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Java'
   # GNU Linux
   ARDUINO_PATH = '/opt/arduino'
-   # Arduino IDE <= 1.5.6
+  # Arduino IDE <= 1.5.6
   BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/g++_arm_none_eabi/bin"
   # Arduino IDE >= 1.5.7
   # BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin"
@@ -32,7 +32,7 @@ MRuby::CrossBuild.new("ArduinoDue") do |conf|
     cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
     cc.defines << %w(KHASH_DEFAULT_SIZE=8)
     cc.defines << %w(MRB_GC_STRESS)
-    #cc.defines << %w(MRB_NO_STDIO) #if you dont need stdio.
+    #cc.defines << %w(MRB_NO_STDIO) #if you don't need stdio.
     #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
   end
 

build_config/IntelEdison.rb

@@ -21,7 +21,7 @@ MRuby::CrossBuild.new('core2-32-poky-linux') do |conf|
   #
   POKY_EDISON_PATH = '/opt/poky-edison/1.7.2'
 
-  POKY_EDISON_SYSROOT =  "#{POKY_EDISON_PATH}/sysroots/core2-32-poky-linux"
+  POKY_EDISON_SYSROOT  = "#{POKY_EDISON_PATH}/sysroots/core2-32-poky-linux"
   POKY_EDISON_X86_PATH = "#{POKY_EDISON_PATH}/sysroots/i386-pokysdk-darwin"
   POKY_EDISON_BIN_PATH = "#{POKY_EDISON_X86_PATH}/usr/bin/i586-poky-linux"
 

build_config/IntelGalileo.rb

@@ -12,7 +12,7 @@ MRuby::CrossBuild.new("Galileo") do |conf|
   #ARDUINO_GALILEO_PATH = '/opt/arduino'
 
   GALILEO_BIN_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i386-pokysdk-darwin/usr/bin/i586-poky-linux-uclibc"
-  GALILEO_SYSROOT =  "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc"
+  GALILEO_SYSROOT  = "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc"
   GALILEO_X86_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/arduino/x86"
 
 
@@ -74,7 +74,7 @@ MRuby::CrossBuild.new("Galileo") do |conf|
   conf.gem :core => "mruby-fiber"
   conf.gem :core => "mruby-toplevel-ext"
 
-  #lightweigh regular expression
+  #lightweight regular expression
   conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
 
   #Arduino API

build_config/RX630.rb

@@ -18,7 +18,7 @@ MRuby::CrossBuild.new("RX630") do |conf|
     cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
     cc.defines << %w(KHASH_DEFAULT_SIZE=8)
     cc.defines << %w(MRB_GC_STRESS)
-    cc.defines << %w(MRB_NO_STDIO) #if you dont need stdio.
+    cc.defines << %w(MRB_NO_STDIO) #if you don't need stdio.
     #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
   end
 

build_config/android_arm64_v8a.rb

@@ -2,7 +2,7 @@
 MRuby::CrossBuild.new('android-arm64-v8a') do |conf|
   params = {
     :arch => 'arm64-v8a',
-    :platform => 'android-24',
+    :sdk_version => 26,
     :toolchain => :clang,
   }
   toolchain :android, params

build_config/android_armeabi.rb

@@ -2,7 +2,7 @@
 MRuby::CrossBuild.new('android-armeabi') do |conf|
   params = {
     :arch => 'armeabi',
-    :platform => 'android-24',
+    :sdk_version => 26,
     :toolchain => :clang,
   }
   toolchain :android, params

build_config/android_armeabi_v7a_neon_hard.rb

@@ -4,7 +4,7 @@ MRuby::CrossBuild.new('android-armeabi-v7a-neon-hard') do |conf|
     :arch => 'armeabi-v7a',
     :mfpu => 'neon',
     :mfloat_abi => 'hard',
-    :platform => 'android-24',
+    :sdk_version => 26,
     :toolchain => :clang,
   }
   toolchain :android, params

build_config/boxing.rb

@@ -3,11 +3,9 @@ bits = [64, 32]
 ints = [64, 32]
 
 boxings.product(bits, ints) do |boxing, bit, int|
-  next if boxing == "nan" && int == 64
-
   MRuby::Build.new("boxing-#{boxing}-m#{bit}-i#{int}") do |conf|
     conf.toolchain :gcc
-    conf.gembox 'default'
+    conf.gembox 'full-core'
     conf.compilers.each do |c|
       c.defines << "MRB_#{boxing.upcase}_BOXING"
       c.defines << "MRB_INT#{int}"

build_config/chipKITMax32.rb

@@ -29,7 +29,7 @@ MRuby::CrossBuild.new("chipKITMax32") do |conf|
     cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
     cc.defines << %w(KHASH_DEFAULT_SIZE=8)
     cc.defines << %w(MRB_GC_STRESS)
-    #cc.defines << %w(MRB_NO_STDIO) #if you dont need stdio.
+    #cc.defines << %w(MRB_NO_STDIO) #if you don't need stdio.
     #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
   end
 

build_config/ci/gcc-clang.rb

@@ -6,7 +6,7 @@ MRuby::Build.new('full-debug') do |conf|
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines += %w(MRB_GC_STRESS MRB_USE_DEBUG_HOOK)
+  conf.cc.defines += %w(MRB_GC_STRESS MRB_USE_DEBUG_HOOK MRB_UTF8_STRING)
 
   conf.enable_test
 end
@@ -18,7 +18,7 @@ MRuby::Build.new do |conf|
   conf.gembox 'full-core'
   conf.gem :core => 'mruby-bin-debugger'
   conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
+    c.defines += %w(MRB_GC_FIXED_ARENA MRB_UTF8_STRING)
   end
   conf.enable_bintest
   conf.enable_test
@@ -28,9 +28,9 @@ MRuby::Build.new('cxx_abi') do |conf|
   conf.toolchain
 
   conf.gembox 'full-core'
-  conf.cc.flags += %w(-fpermissive)
+  conf.cc.flags += %w(-fpermissive -std=gnu++03)
   conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
+    c.defines += %w(MRB_GC_FIXED_ARENA MRB_UTF8_STRING)
   end
   conf.enable_test
 

build_config/clang-asan.rb

@@ -1,7 +1,7 @@
 MRuby::Build.new do |conf|
   conf.toolchain :clang
   # include the GEM box
-  conf.gembox 'default'
+  conf.gembox 'full-core'
 
   # Turn on `enable_debug` for better debugging
   conf.enable_sanitizer "address,undefined"

build_config/cross-mingw-winetest.rb

@@ -0,0 +1,90 @@
+# Cross-compile using MinGW and test using Wine.
+#
+# Steps:
+#
+#   1. Install MinGW; 64-bit target seems to work best.
+#
+#   2. Install Wine.
+#
+#   3. Run command:
+#
+#           wine cmd /c echo "Hello world"'
+#
+#      This will confirm that Wine works and will trigger standard
+#      Wine setup, which is slow.
+#
+#   4. Confirm that drive 'z:' is mapped to your root filesystem.
+#      (This is supposed to be a default but it helps to
+#      double-check.) To confirm, run:
+#
+#           wine cmd /c dir 'z:\\'
+#
+#      This should give you a DOS-style equivalent of 'ls /'. If not,
+#      you'll need to fix that with winecfg or by adding a symlink to
+#      '~/.wine/dosdevices'.
+#
+#   5. You will likely need to tweak the settings below to work with
+#      your configuration unless it is exactly like one of the platforms
+#      I've tested on (Ubuntu 20.04 or macOS using brew.)
+#
+#   6. Run the build command:
+#
+#           MRUBY_CONFIG=build_config/cross-mingw-winetest.rb rake test
+#
+#      If all goes well, you should now have Windows executables and a
+#      set of passing tests.
+#
+#
+#  Caveats:
+#
+#    1. This works by using a helper script that rewrites test output
+#       to make it look *nix-like and then handing it back to the test
+#       cases. Some of the existing tests were (slightly) modified to
+#       make this easier but only for the 'full-core' gembox. Other
+#       gems' bintests may or may not work with the helper script and
+#       may or may not be fixable by extending the script.
+#
+#   2.  MinGW and Wine are both complex and not very consistent so you
+#       will likely need to do some fiddling to get things to work.
+#
+#   3.  This script assumes you are running it on a *nix-style OS.
+#
+#   4.  I recommend building 64-bit targets only. Building a 32-bit
+#       Windows binary with i686-w64-mingw32 seems to work (at least,
+#       it did for me) but the resulting executable failed a number of
+#       unit tests due to small errors in some floating-point
+#       operations. It's unclear if this indicates more serious problems.
+#
+
+
+MRuby::CrossBuild.new("cross-mingw-winetest") do |conf|
+  conf.toolchain :gcc
+
+  conf.host_target = "x86_64-w64-mingw32"
+
+  # Ubuntu 20
+  conf.cc.command = "#{conf.host_target}-gcc-posix"
+
+  # macOS+Wine from brew
+  #conf.cc.command = "#{conf.host_target}-gcc"
+
+  conf.linker.command = conf.cc.command
+  conf.archiver.command = "#{conf.host_target}-gcc-ar"
+  conf.exts.executable = ".exe"
+
+  # By default, we compile as static as possible to remove runtime
+  # MinGW dependencies; they are probably fixable but it gets
+  # complicated.
+  conf.cc.flags = ['-static']
+  conf.linker.flags += ['-static']
+
+  conf.test_runner do |t|
+    thisdir = File.absolute_path( File.dirname(__FILE__) )
+    t.command = File.join(thisdir, * %w{ helpers wine_runner.rb})
+  end
+
+  conf.gembox "full-core"
+
+  conf.enable_bintest
+  conf.enable_test
+end

build_config/cross-mingw.rb

@@ -0,0 +1,14 @@
+#
+# Ubuntu 20.04 requires at least `gcc-mingw-w64-x86-64` package as a
+# cross compiler.
+#
+
+MRuby::CrossBuild.new("cross-mingw") do |conf|
+  conf.toolchain :gcc
+  conf.host_target = "x86_64-w64-mingw32"  # required for `for_windows?` used by `mruby-socket` gem
+  conf.cc.command = "#{conf.host_target}-gcc-posix"
+  conf.linker.command = conf.cc.command
+  conf.archiver.command = "#{conf.host_target}-gcc-ar"
+  conf.exts.executable = ".exe"
+  conf.gembox "default"
+end

build_config/default.rb

@@ -42,7 +42,7 @@ MRuby::Build.new do |conf|
   #   linker.library_paths = []
   #   linker.option_library = '-l%s'
   #   linker.option_library_path = '-L%s'
-  #   linker.link_options = "%{flags} -o "%{outfile}" %{objs} %{libs}"
+  #   linker.link_options = %Q[%{flags} -o "%{outfile}" %{objs} %{libs}]
   # end
 
   # Archiver settings

build_config/dreamcast_shelf.rb

@@ -1,8 +1,14 @@
 # Cross Compiling configuration for the Sega Dreamcast
-# This configuration requires KallistiOS (KOS)
-# https://dreamcast.wiki
+# https://dreamcast.wiki/Using_Ruby_for_Sega_Dreamcast_development
 #
-# Tested on GNU/Linux, MinGW-w64/MSYS2, Cygwin, macOS and MinGW/MSYS (see below)
+# Requires KallistiOS (KOS)
+# http://gamedev.allusion.net/softprj/kos/
+#
+# Tested on GNU/Linux, macOS and Windows (through MinGW-w64/MSYS2, Cygwin and DreamSDK).
+# DreamSDK is based on MinGW/MSYS: https://dreamsdk.org/
+#
+# Input this command on the directory where mruby is installed:
+#   make MRUBY_CONFIG=dreamcast_shelf
 #
 MRuby::CrossBuild.new("dreamcast") do |conf|
   toolchain :gcc
@@ -20,7 +26,7 @@ MRuby::CrossBuild.new("dreamcast") do |conf|
   # C compiler
   # Flags were extracted from KallistiOS environment files
   conf.cc do |cc|
-    cc.command = "#{BIN_PATH}/sh-elf-gcc"	
+    cc.command = "#{BIN_PATH}/sh-elf-gcc"
     cc.include_paths << ["#{KOS_PATH}/include", "#{KOS_PATH}/kernel/arch/dreamcast/include", "#{KOS_PATH}/addons/include", "#{KOS_PATH}/../kos-ports/include"]
     cc.flags << ["-O2", "-fomit-frame-pointer", "-ml", "-m4-single-only", "-ffunction-sections", "-fdata-sections", "-Wall", "-g", "-fno-builtin", "-ml", "-m4-single-only", "-Wl,-Ttext=0x8c010000", "-Wl,--gc-sections", "-T#{KOS_PATH}/utils/ldscripts/shlelf.xc", "-nodefaultlibs"]
     cc.compile_options = %Q[%{flags} -o "%{outfile}" -c "%{infile}"]
@@ -64,31 +70,48 @@ MRuby::CrossBuild.new("dreamcast") do |conf|
   conf.disable_cxx_exception
 
   # Gems from core
-  # removing mruby-io
-  conf.gem :core => "mruby-metaprog"
-  conf.gem :core => "mruby-pack"
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-time"
-  conf.gem :core => "mruby-struct"
-  conf.gem :core => "mruby-compar-ext"
-  conf.gem :core => "mruby-enum-ext"
-  conf.gem :core => "mruby-string-ext"
-  conf.gem :core => "mruby-numeric-ext"
+  # Some Gems are incompatible and were disabled.
+
   conf.gem :core => "mruby-array-ext"
+  conf.gem :core => "mruby-binding"
+  conf.gem :core => "mruby-catch"
+  conf.gem :core => "mruby-class-ext"
+  conf.gem :core => "mruby-cmath"
+  conf.gem :core => "mruby-compar-ext"
+  conf.gem :core => "mruby-compiler"
+  conf.gem :core => "mruby-complex"
+  conf.gem :core => "mruby-enum-chain"
+  conf.gem :core => "mruby-enum-ext"
+  conf.gem :core => "mruby-enum-lazy"
+  conf.gem :core => "mruby-enumerator"
+  conf.gem :core => "mruby-error"
+  conf.gem :core => "mruby-eval"
+  conf.gem :core => "mruby-exit"
+  conf.gem :core => "mruby-fiber"
   conf.gem :core => "mruby-hash-ext"
-  conf.gem :core => "mruby-range-ext"
-  conf.gem :core => "mruby-proc-ext"
-  conf.gem :core => "mruby-symbol-ext"
-  conf.gem :core => "mruby-random"
+#  conf.gem :core => "mruby-io"
+  conf.gem :core => "mruby-kernel-ext"
+  conf.gem :core => "mruby-math"
+  conf.gem :core => "mruby-metaprog"
+  conf.gem :core => "mruby-method"
+  conf.gem :core => "mruby-numeric-ext"
   conf.gem :core => "mruby-object-ext"
   conf.gem :core => "mruby-objectspace"
-  conf.gem :core => "mruby-fiber"
-  conf.gem :core => "mruby-enumerator"
-  conf.gem :core => "mruby-enum-lazy"
+  conf.gem :core => "mruby-os-memsize"
+  conf.gem :core => "mruby-pack"
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-proc-binding"
+  conf.gem :core => "mruby-proc-ext"
+  conf.gem :core => "mruby-random"
+  conf.gem :core => "mruby-range-ext"
+  conf.gem :core => "mruby-rational"
+  conf.gem :core => "mruby-sleep"
+#  conf.gem :core => "mruby-socket"
+  conf.gem :core => "mruby-sprintf"
+  conf.gem :core => "mruby-string-ext"
+  conf.gem :core => "mruby-struct"
+  conf.gem :core => "mruby-symbol-ext"
+#  conf.gem :core => "mruby-test"
+#  conf.gem :core => "mruby-time"
   conf.gem :core => "mruby-toplevel-ext"
-  conf.gem :core => "mruby-kernel-ext"
-  conf.gem :core => "mruby-class-ext"
-  conf.gem :core => "mruby-compiler"
 end

build_config/helpers/wine_runner.rb

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+# Wrapper for running tests for cross-compiled Windows builds in Wine.
+
+require 'open3'
+
+DOSROOT = 'z:'
+
+# Rewrite test output to replace DOS-isms with Unix-isms.
+def clean(output, stderr = false)
+  ends_with_newline = !!(output =~ /\n$/)
+  executable = ARGV[0].gsub(/\.exe\z/i, '')
+
+  # Fix line-ends
+  output = output.gsub(/\r\n/, "\n")
+
+  # Strip out Wine messages
+
+
+  results = output.split(/\n/).map do |line|
+    # Fix file paths
+    if line =~ /#{DOSROOT}\\/i
+      line.gsub!(/#{DOSROOT}([^:]*)/i) { |path|
+        path.gsub!(/^#{DOSROOT}/i, '')
+        path.gsub!(%r{\\}, '/')
+        path
+      }
+    end
+
+    # strip '.exe' off the end of the executable's name if needed
+    line.gsub!(/(#{Regexp.escape executable})\.exe/i, '\1')
+
+    line
+  end
+
+  result_text = results.join("\n")
+  result_text += "\n" if ends_with_newline
+  result_text
+end
+
+
+def main
+  if ARGV.empty? || ARGV[0] =~ /^- (-?) (\?|help|h) $/x
+    puts "#{$0} <command-line>"
+    exit 0
+  end
+
+  # For simplicity, just read all of stdin into memory and pass that
+  # as an argument when invoking wine. (Skipped if STDIN was not
+  # redirected.)
+  if !STDIN.tty?
+    input = STDIN.read
+  else
+    input = ""
+  end
+
+  # Disable all Wine messages so they don't interfere with the output
+  ENV['WINEDEBUG'] = 'err-all,warn-all,fixme-all,trace-all'
+
+  # Run the program in wine and capture the output
+  output, errormsg, status = Open3.capture3('wine', *ARGV, :stdin_data => input)
+
+  # Clean and print the results.
+  STDOUT.write clean(output)
+  STDERR.write clean(errormsg)
+
+  exit(status.exitstatus)
+end
+
+
+main()

build_config/host-debug.rb

@@ -8,7 +8,7 @@ MRuby::Build.new('host') do |conf|
   conf.gembox 'full-core'
 
   # C compiler settings
-  conf.cc.defines = %w(MRB_USE_DEBUG_HOOK MRB_NO_BOXING)
+  conf.cc.defines = %w(MRB_USE_DEBUG_HOOK MRB_NO_BOXING MRB_UTF8_STRING)
 
   # Generate mruby debugger command (require mruby-eval)
   conf.gem :core => "mruby-bin-debugger"

build_config/host-f32.rb

@@ -0,0 +1,14 @@
+MRuby::Build.new do |conf|
+  # load specific toolchain settings
+  toolchain :gcc
+
+  # include the GEM box
+  conf.gembox 'full-core'
+
+  conf.cc.defines << 'MRB_USE_FLOAT32'
+
+  # Turn on `enable_debug` for better debugging
+  conf.enable_debug
+  conf.enable_test
+  conf.enable_bintest
+end

build_config/host-gprof.rb

@@ -3,7 +3,7 @@ MRuby::Build.new do |conf|
   toolchain :gcc
 
   # include the GEM box
-  conf.gembox 'default'
+  conf.gembox 'full-core'
 
   conf.cc.flags << '-pg'
   conf.linker.flags << '-pg'

build_config/host-m32.rb

@@ -3,7 +3,7 @@ MRuby::Build.new do |conf|
   toolchain :gcc
 
   # include the GEM box
-  conf.gembox 'default'
+  conf.gembox 'full-core'
 
   conf.cc.flags << '-m32'
   conf.linker.flags << '-m32'

build_config/host-nofloat.rb

@@ -0,0 +1,22 @@
+MRuby::Build.new do |conf|
+  # load specific toolchain settings
+  toolchain :gcc
+
+  # include the GEM box
+  conf.gembox "stdlib"
+  conf.gembox "stdlib-ext"
+  conf.gembox "stdlib-io"
+  conf.gembox "metaprog"
+
+  conf.gem :core => 'mruby-bin-mruby'
+  conf.gem :core => 'mruby-bin-mirb'
+
+  # Add configuration
+  conf.compilers.each do |c|
+    c.defines << "MRB_NO_FLOAT"
+  end
+
+  conf.enable_debug
+  conf.enable_test
+  conf.enable_bintest
+end

build_config/host-shared.rb

@@ -23,7 +23,7 @@ MRuby::Build.new do |conf|
 
   # file extensions
   conf.exts do |exts|
-     exts.library = '.so'
+    exts.library = '.so'
   end
 
   # file separator

build_config/minimal.rb

@@ -0,0 +1,4 @@
+MRuby::CrossBuild.new('minimal') do |conf|
+  conf.toolchain :gcc
+  conf.cc.defines << 'MRB_NO_STDIO'
+end

build_config/nintendo_switch.rb

@@ -0,0 +1,73 @@
+# Cross Compiling configuration for the Nintendo Switch, it requires Nintendo SDK
+# Tested on windows
+MRuby::CrossBuild.new('nintendo_switch_32bit') do |conf|
+  conf.toolchain :clang
+  NINTENDO_SDK_PATH = ENV['NINTENDO_SDK_ROOT']
+
+  include_paths = [
+    "#{NINTENDO_SDK_PATH}/Include",
+    "#{NINTENDO_SDK_PATH}/Common/Configs/Targets/NX-NXFP2-a32/Include"
+  ]
+
+  conf.cc do |cc|
+    cc.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/bin/nx-clang++"
+    cc.include_paths += include_paths
+    cc.flags += ['-fpic -fno-short-enums -ffunction-sections -fdata-sections -fno-common -fno-strict-aliasing -fomit-frame-pointer -fno-vectorize -funsigned-char -O2 -g -mno-implicit-float']
+    cc.defines += 'NN_SDK_BUILD_RELEASE'
+  end
+
+  conf.cxx do |cxx|
+    cxx.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/bin/nx-clang++"
+    cxx.include_paths += include_paths
+    cxx.flags += ['-fpic -fno-short-enums -ffunction-sections -fdata-sections -fno-common -fno-strict-aliasing -fomit-frame-pointer -fno-vectorize -funsigned-char -O2 -g -mno-implicit-float']
+    cxx.defines += 'NN_SDK_BUILD_RELEASE'
+  end
+
+  conf.archiver do |archiver|
+    archiver.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/nx/armv7l/bin/llvm-ar"
+  end
+
+  conf.linker do |linker|
+    linker.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/nx/armv7l/bin/clang++"
+    linker.libraries = []
+  end
+
+  # Add your mrbgems
+end
+
+MRuby::CrossBuild.new('nintendo_switch_64bit') do |conf|
+  conf.toolchain :clang
+  NINTENDO_SDK_PATH = ENV['NINTENDO_SDK_ROOT']
+
+  include_paths = [
+    "#{NINTENDO_SDK_PATH}/Include",
+    "#{NINTENDO_SDK_PATH}/Common/Configs/Targets/NX-NXFP2-a64/Include"
+  ]
+
+  conf.cc do |cc|
+    cc.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/bin/nx-clang++"
+    cc.include_paths += include_paths
+    cc.flags += ['-fpic -fno-short-enums -ffunction-sections -fdata-sections -fno-common -fno-strict-aliasing -fomit-frame-pointer -fno-vectorize -funsigned-char -O2 -g -mno-implicit-float']
+    cc.flags << '--target=aarch64-nintendo-nx-elf'
+    cc.defines += 'NN_SDK_BUILD_RELEASE'
+  end
+
+  conf.cxx do |cxx|
+    cxx.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/bin/nx-clang++"
+    cxx.include_paths += include_paths
+    cxx.flags += ['-fpic -fno-short-enums -ffunction-sections -fdata-sections -fno-common -fno-strict-aliasing -fomit-frame-pointer -fno-vectorize -funsigned-char -O2 -g -mno-implicit-float']
+    cxx.flags << '--target=aarch64-nintendo-nx-elf'
+    cxx.defines += 'NN_SDK_BUILD_RELEASE'
+  end
+
+  conf.archiver do |archiver|
+    archiver.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/nx/aarch64/bin/llvm-ar"
+  end
+
+  conf.linker do |linker|
+    linker.command = "#{NINTENDO_SDK_PATH}/Compilers/NX/nx/aarch64/bin/clang++"
+    linker.libraries = []
+  end
+
+  # Add your mrbgems
+end

build_config/no-float.rb

@@ -1,17 +0,0 @@
-# Define cross build settings
-MRuby::CrossBuild.new('no-float') do |conf|
-  conf.toolchain
-
-  # Add configuration
-  conf.compilers.each do |c|
-    c.defines << "MRB_NO_FLOAT"
-  end
-
-  conf.gem :core => "mruby-bin-mruby"
-
-  conf.test_runner.command = 'env'
-
-  conf.enable_debug
-#  conf.enable_bintest
-  conf.enable_test
-end

build_config/serenity.rb

@@ -0,0 +1,26 @@
+# Cross compiling configuration for SerenityOS
+# Graphical Unix-like operating system for x86 computers.
+# https://github.com/SerenityOS/serenity
+#
+# Should be built using the SerenityOS Ports system
+# https://github.com/SerenityOS/serenity/tree/master/Ports
+#
+# As of 2021/08/20, SERENITY_ARCH is defined in the SerenityOS Ports
+# build script to always be either "i686" or "x86_64"
+
+MRuby::CrossBuild.new('serenity') do |conf|
+  conf.toolchain :gcc
+
+  conf.archiver.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-ar"
+  conf.linker.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-g++"
+
+  conf.cxx.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-g++"
+  conf.cxx.defines << (ENV['SERENITY_ARCH'].include?('64') ? 'MRB_64BIT' : 'MRB_32BIT')
+
+  conf.cc.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-gcc"
+  conf.cc.defines << (ENV['SERENITY_ARCH'].include?('64') ? 'MRB_64BIT' : 'MRB_32BIT')
+
+  conf.gembox 'full-core'
+
+  conf.test_runner.command = 'env'
+end

codespell.txt

@@ -0,0 +1,20 @@
+ans
+ba
+clen
+creat
+delet
+disabl
+falsy
+filetest
+fo
+hel
+hist
+ist
+methid
+nd
+quitt
+remore
+ro
+runn
+sting
+upto

doc/guides/compile.md

@@ -7,21 +7,22 @@ binaries.
 
 To compile mruby out of the source code you need the following tools:
 
-* C Compiler (e.g. `gcc` or `clang`)
-* Linker (e.g. `gcc` or `clang`)
-* Archive utility (e.g. `ar`)
-* Parser generator (`bison`)
-* Ruby 2.0 or later (e.g. `ruby` or `jruby`)
-
-Note that `bison` bundled with MacOS is too old to compile `mruby`.
-Try `brew install bison` and follow the instruction shown to update
-the `$PATH` to compile `mruby`. We also encourage to upgrade `ruby`
-on MacOS in similar manner.
+- C Compiler (e.g. `gcc` or `clang`)
+- Linker (e.g. `gcc` or `clang`)
+- Archive utility (e.g. `ar`)
+- Ruby 2.5 or later (e.g. `ruby` or `jruby`)
 
 Optional:
 
-* git (to update mruby source and integrate mrbgems easier)
-* C++ compiler (to use GEMs which include \*.cpp, \*.cxx, \*.cc)
+- Git (to update mruby source and integrate mrbgems easier)
+- C++ compiler (to use mrbgems which include `*.cpp`, `*.cxx`, `*.cc`)
+- Bison (to compile `mrbgems/mruby-compiler/core/parse.y`)
+- gperf (to compile `mrbgems/mruby-compiler/core/keywords`)
+
+Note that `bison` bundled with macOS is too old to compile `mruby`.
+Try `brew install bison` and follow the instruction shown to update
+the `$PATH` to compile `mruby`. We also encourage you to upgrade `ruby`
+on macOS in similar manner.
 
 ## Build
 
@@ -32,7 +33,7 @@ line on build, call `rake -v`.
 
 You can specify your own configuration file by the `MRUBY_CONFIG` environment
 variable (you can use `CONFIG` for shorthand for `MRUBY_CONFIG`). If the path
-doesn't exist, *build_config/${MRUBY_CONFIG}.rb* is used. The default
+doesn't exist, `build_config/${MRUBY_CONFIG}.rb` is used. The default
 configuration is defined in the `build_config/default.rb` file.
 
 Those build configuration files contain the build configuration of mruby, for
@@ -48,10 +49,10 @@ All tools necessary to compile mruby can be set or modified here.
 
 ## Build Configuration
 
-We wish you submit a pull-request to *build_config/**PLATFORM**.rb*, once you
+We wish you submit a pull-request to `build_config/PLATFORM.rb`, once you
 created a new configuration for a new platform.
 
-Inside of the configuration file, the following options can be
+Inside the configuration file, the following options can be
 configured based on your environment.
 
 ### Toolchains
@@ -102,8 +103,8 @@ in `ANDROID_STANDALONE_TOOLCHAIN`.
 It is possible to select which tools should be compiled during the compilation
 process. For example,
 
-* `mruby`
-* `mirb`
+- `mruby`
+- `mirb`
 
 The configuration are done via `mrbgems`. See `Mrbgems` section.
 
@@ -134,21 +135,21 @@ end
 
 C Compiler has header searcher to detect installed library.
 
-If you need a include path of header file use `search_header_path`:
+If you need an include path of header file use `search_header_path`:
 
 ```ruby
-# Searches ```iconv.h```.
+# Searches `iconv.h`.
 # If found it will return include path of the header file.
-# Otherwise it will return nil .
+# Otherwise it will return nil.
 fail 'iconv.h not found' unless conf.cc.search_header_path 'iconv.h'
 ```
 
 If you need a full file name of header file use `search_header`:
 
 ```ruby
-# Searches ```iconv.h```.
+# Searches `iconv.h`.
 # If found it will return full path of the header file.
-# Otherwise it will return nil .
+# Otherwise it will return nil.
 iconv_h = conf.cc.search_header 'iconv.h'
 print "iconv.h found: #{iconv_h}\n"
 ```
@@ -228,7 +229,7 @@ end
 
 ### Preallocated Symbols
 
-By far, preallocate symbols are highly compatible with the previous versions, so
+By far, preallocated symbols are highly compatible with the previous versions, so
 we expect you won't see any problem with them. But just in case you face any
 issue, you can disable preallocated symbols by specifying `conf.disable_presym`.
 
@@ -270,7 +271,7 @@ See doc/mrbgems/README.md for more option about mrbgems.
 
 Configuration Mrbtest build process.
 
-If you want mrbtest.a only, You should set `conf.build_mrbtest_lib_only`
+If you want `mrbtest.a` only, You should set `conf.build_mrbtest_lib_only`
 
 ```ruby
 conf.build_mrbtest_lib_only
@@ -279,7 +280,7 @@ conf.build_mrbtest_lib_only
 ### Bintest
 
 Tests for mrbgem tools using CRuby.
-To have bintests place \*.rb scripts to `bintest/` directory of mrbgems.
+To have bintests place `*.rb` scripts to `bintest/` directory of mrbgems.
 See `mruby-bin-*/bintest/*.rb` if you need examples.
 If you want a temporary files use `tempfile` module of CRuby instead of `/tmp/`.
 
@@ -308,9 +309,9 @@ If you need to enable C++ exception explicitly add the following:
 conf.enable_cxx_exception
 ```
 
-#### C++ exception disabling.
+#### C++ exception disabling
 
-If your compiler does not support C++ and you want to ensure
+If your compiler does not support C++, and you want to ensure
 you don't use mrbgem written in C++, you can explicitly disable
 C++ exception, add following:
 
@@ -331,11 +332,11 @@ conf.enable_debug
 
 When debugging mode is enabled
 
-* Macro `MRB_DEBUG` would be defined.
-	* Which means `mrb_assert()` macro is enabled.
-* Debug information of irep would be generated by `mrbc`.
-	* Because `-g` flag would be added to `mrbc` runner.
-    * You can have better backtrace of mruby scripts with this.
+- Macro `MRB_DEBUG` would be defined.
+  - Which means `mrb_assert()` macro is enabled.
+- Debug information of irep would be generated by `mrbc`.
+  - Because `-g` flag would be added to `mrbc` runner.
+    - You can have better backtrace of mruby scripts with this.
 
 ## Cross-Compilation
 
@@ -354,12 +355,12 @@ end
 ```
 
 All configuration options of `MRuby::Build` can also be used in
-`MRuby::CrossBuild`. You can find examples under the *build_config*
+`MRuby::CrossBuild`. You can find examples under the `build_config`
 directory.
 
 ### Mrbtest in Cross-Compilation
 
-In cross compilation, you can run `mrbtest` on emulator if
+In cross compilation, you can run `mrbtest` on an emulator if
 you have it by changing configuration of test runner.
 
 ```ruby
@@ -375,49 +376,44 @@ end
 
 ## Build process
 
-During the build process the directory *build* will be created in the
+During the build process the directory `build` will be created in the
 root directory. The structure of this directory will look like this:
 
-	+- build
-	   |
-	   +-  host
-	       |
-	       +- bin          <- Binaries (mirb, mrbc and mruby)
-	       |
-	       +- lib          <- Libraries (libmruby.a and libmruby_core.a)
-	       |
-	       +- mrblib
-	       |
-	       +- src
-	       |
-	       +- test         <- mrbtest tool
-	       |
-	       +- tools
-	          |
-	          +- mirb
-	          |
-	          +- mrbc
-	          |
-	          +- mruby
+```
++- build
+    |
+    +- host
+        |
+        +- LEGAL        <- License description
+        |
+        +- bin          <- Binaries (mirb, mrbc and mruby)
+        |
+        +- lib          <- Libraries (libmruby.a and libmruby_core.a)
+        |
+        +- mrbc         <- Minimal mrbc place
+        |
+        +- mrbgems      <- Compilation result from mrbgems
+        |
+        +- mrblib       <- Compilation result from mrblib
+        |
+        +- src          <- Compilation result from C sources
+```
 
 The compilation workflow will look like this:
 
-* compile all files under *src* (object files will be stored
-in *build/host/src*)
-* generate parser grammar out of *src/parse.y* (generated
-result will be stored in *build/host/src/y.tab.c*)
-* compile  *build/host/src/y.tab.c* to  *build/host/src/y.tab.o*
-* create *build/host/lib/libmruby_core.a* out of all object files (C only)
-* create `build/host/bin/mrbc` by compiling *tools/mrbc/mrbc.c* and
-linking with *build/host/lib/libmruby_core.a*
-* create *build/host/mrblib/mrblib.c* by compiling all \*.rb files
-under *mrblib* with `build/host/bin/mrbc`
-* compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o*
-* create *build/host/lib/libmruby.a* out of all object files (C and Ruby)
-* create `build/host/bin/mruby` by compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and
-linking with *build/host/lib/libmruby.a*
-* create `build/host/bin/mirb` by compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and
-linking with *build/host/lib/libmruby.a*
+- compile minimal `mrbc` from `src` and `mrblib` sources
+  - compile all files under `src` (object files will be stored in `build/host/mrbc/src`)
+  - compile `mruby-compiler` gem
+  - create `build/host/mrbc/lib/libmruby_core.a` out of all object files (C only)
+  - create `build/host/mrbc/bin/mrbc` via `mruby-bin-mrbc` gem
+- compile all files under `src` and store result in `build/host/src`
+- create `build/host/mrblib/mrblib.c` by compiling all `*.rb` files under `mrblib` with `build/host/mrbc/bin/mrbc`
+- compile `build/host/mrblib/mrblib.c` to `build/host/mrblib/mrblib.o`
+- create `build/host/lib/libmruby.a` out of all object files (C and Ruby)
+- compile (normal) mrbgems specified in the configuration file
+- create `build/host/lib/libmruby.a` from object files from gems and `libmruby_core.a`
+- create binary commands according to binary gems (e.g. `mirb` and `mruby`)
+- copy binaries under `build/host/bin` to `bin` directory
 
 ```
  _____    _____    ______    ____    ____    _____    _____    ____
@@ -428,74 +424,54 @@ linking with *build/host/lib/libmruby.a*
 
 ### Cross-Compilation
 
-In case of a cross-compilation to *i386* the *build* directory structure looks
+In case of a cross-compilation to `i386` the `build` directory structure looks
 like this:
 
-	+- build
-	   |
-	   +-  host
-	   |   |
-	   |   +- bin           <- Native Binaries
-	   |   |
-	   |   +- lib           <- Native Libraries
-	   |   |
-	   |   +- mrblib
-	   |   |
-	   |   +- src
-	   |   |
-	   |   +- test          <- Native mrbtest tool
-	   |   |
-	   |   +- tools
-	   |      |
-	   |      +- mirb
-	   |      |
-	   |      +- mrbc
-	   |      |
-	   |      +- mruby
-	   +- i386
-	      |
-	      +- bin            <- Cross-compiled Binaries
-	      |
-	      +- lib            <- Cross-compiled Libraries
-	      |
-	      +- mrblib
-	      |
-	      +- src
-	      |
-	      +- test           <- Cross-compiled mrbtest tool
-	      |
-	      +- tools
-	         |
-	         +- mirb
-	         |
-	         +- mrbc
-	         |
-	         +- mruby
+```
++- build
+    |
+    +- host
+    |   |
+    |   +- bin           <- Native Binaries
+    |   |
+    |   +- lib           <- Native Libraries
+    |   |
+    |   +- mrbgems
+    |   |
+    |   +- src
+    |
+    +- i386
+        |
+        +- bin            <- Cross-compiled Binaries
+        |
+        +- include        <- Header Directory
+        |
+        +- lib            <- Cross-compiled Libraries
+        |
+        +- mrbgems
+        |
+        +- mrblib
+        |
+        +- src
+```
 
 An extra directory is created for the target platform. In case you
-compile for *i386* a directory called *i386* is created under the
+compile for `i386` a directory called `i386` is created under the
 build directory.
 
 The cross compilation workflow starts in the same way as the normal
-compilation by compiling all *native* libraries and binaries.
-Afterwards the cross compilation process proceeds like this:
+compilation by compiling all *native* libraries and binaries, except
+for we don't have `host/mrbc` directory (`host` directory itself works
+as placeholder for `mrbc`). Afterwards the cross compilation process
+proceeds like this:
 
-* cross-compile all files under *src* (object files will be stored
-in *build/i386/src*)
-* generate parser grammar out of *src/parse.y* (generated
-result will be stored in *build/i386/src/y.tab.c*)
-* cross-compile *build/i386/src/y.tab.c* to *build/i386/src/y.tab.o*
-* create *build/i386/mrblib/mrblib.c* by compiling all \*.rb files
-under *mrblib* with the native `build/host/bin/mrbc`
-* cross-compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o*
-* create *build/i386/lib/libmruby.a* out of all object files (C and Ruby)
-* create `build/i386/bin/mruby` by cross-compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and
-linking with *build/i386/lib/libmruby.a*
-* create `build/i386/bin/mirb` by cross-compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and
-linking with *build/i386/lib/libmruby.a*
-* create *build/i386/lib/libmruby_core.a* out of all object files (C only)
-* create `build/i386/bin/mrbc` by cross-compiling *tools/mrbc/mrbc.c* and
-linking with *build/i386/lib/libmruby_core.a*
+- cross-compile all files under `src` and store result in `build/i386/src`
+- create `build/i386/lib/libmruby_core.a` out of C object files
+- create `build/i386/mrblib/mrblib.c` by compiling all `*.rb` files under `mrblib` with native `build/host/bin/mrbc`
+- cross-compile `build/i386/mrblib/mrblib.c` to `build/i386/mrblib/mrblib.o`
+- create `build/i386/lib/libmruby.a` from object files from gems and `libmruby_core.a`
+- create binary commands according to binary gems (e.g. `mirb` and `mruby`)
+- copy binaries under `build/host/bin` to `bin` directory
 
 ```
  _______________________________________________________________
@@ -526,24 +502,22 @@ feature due to the reason that there are functions (e.g. stdio) which
 can't be disabled for the main build.
 
 ```ruby
-MRuby::CrossBuild.new('Minimal') do |conf|
-  toolchain :gcc
-
-  conf.cc.defines = %w(MRB_NO_STDIO)
-  conf.bins = []
+MRuby::CrossBuild.new('minimal') do |conf|
+  conf.toolchain :gcc
+  conf.cc.defines << 'MRB_NO_STDIO'
 end
 ```
 
-This configuration defines a cross compile build called 'Minimal' which
+This configuration defines a cross compile build called 'minimal' which
 is using the GCC and compiles for the host machine. It also disables
-all usages of stdio and doesn't compile any binaries (e.g. mrbc).
+all usages of stdio and doesn't compile any binaries (e.g. `mrbc`).
 
 ## Test Environment
 
 mruby's build process includes a test environment. In case you start the testing
 of mruby, a native binary called `mrbtest` will be generated and executed.
-This binary contains all test cases which are defined under *test/t*. In case
-of a cross-compilation an additional cross-compiled *mrbtest* binary is
+This binary contains all test cases which are defined under `test/t`. In case
+of a cross-compilation an additional cross-compiled `mrbtest` binary is
 generated. You can copy this binary and run on your target system.
 
 ## Embedding `mruby` in Your Application
@@ -557,18 +531,21 @@ convenience. `mruby-config` command prints the configuration used for `libmruby.
 $ mruby-config --help
 Usage: mruby-config [switches]
   switches:
+  --cc                        print compiler name
   --cflags                    print flags passed to compiler
+  --ld                        print linker name
   --ldflags                   print flags passed to linker
   --ldflags-before-libs       print flags passed to linker before linked libraries
   --libs                      print linked libraries
   --libmruby-path             print libmruby path
+  --help                      print this help
 ```
 
 For example, when you have a C source file (`c.c`) and try to
 compile and link it with `libmruby.a`, you can run the following command,
 
 ```
-gcc `mruby-config --cflags` c.c `mruby-config --ldflags` `mruby-config --libs`
+`mruby-config --cc --cflags` c.c `mruby-config --ldflags --libs`
 ```
 
 When you use `make`, add following lines in `Makefile`
@@ -579,3 +556,7 @@ CFLAGS = `$(MRB_CONFIG) --cflags`
 LDFLAGS = `$(MRB_CONFIG) --ldflags`
 LIBS = `$(MRB_CONFIG) --libs`
 ```
+
+## Tips
+
+- If you see compilation troubles, try `rake clean` first.

doc/guides/debugger.md

@@ -38,7 +38,7 @@ To confirm mrdb was installed properly, run mrdb with the `--version` option:
 
 ```bash
 $ mrdb --version
-mruby 2.1.2 (2020-08-06)
+mruby 3.1.0 (2022-05-12)
 ```
 
 ## 2.2 Basic Operation
@@ -82,7 +82,7 @@ You can debug the mruby binary files.
 
 #### 2.2.2.1 Debugging the binary files
 
-* notice
+- notice
 To debug mruby binary files, you need to compile mruby files with option `-g`.
 
 ```bash
@@ -114,8 +114,8 @@ b [class:]method
 The breakpoint will be ordered in serial from 1.
 The number, which was given to the deleted breakpoint, will never be given to another breakpoint again.
 
-You can give multiple breakpoints to specified the line number and method.
-Be ware that breakpoint command will not check the validity of the class name and method name.
+You can give multiple breakpoints to the specified the line number and method.
+Be aware that the breakpoint command will not check the validity of the class name and method name.
 
 You can get the current breakpoint information by the following options.
 
@@ -165,7 +165,7 @@ Example:
 (foo.rb:1) delete
 ```
 
-This will delete all of the breakpoints.
+This will delete all the breakpoints.
 
 ```
 (foo.rb:1) delete 1 3
@@ -192,7 +192,7 @@ Example:
 (foo.rb:1) disable
 ```
 
-Use `disable` if you would like to disable all of the breakpoints.
+Use `disable` if you would like to disable all the breakpoints.
 
 ```
 (foo.rb:1) disable 1 3
@@ -324,7 +324,7 @@ expr: expression
 
 The expression is mandatory.
 The displayed expressions will be serially ordered from 1.
-If an exception occurs, the exception information will be displayed and the debugging will be continued.
+If an exception occurs, the exception information will be displayed, and the debugging will be continued.
 
 Example:
 
@@ -367,5 +367,5 @@ r
 #### Step Command
 
 This will run the program step by step.
-When the method and the block are invoked, the program will be stop at the first row.
+When the method and the block are invoked, the program will stop at the first row.
 The program, which is developed in C, will be ignored.

doc/guides/gc-arena-howto.md

@@ -3,23 +3,23 @@
 _This is an English translation of [Matz's blog post][matz blog post]
 written in Japanese._
 _Some parts are updated to reflect recent changes._
-[matz blog post]: https://www.rubyist.net/~matz/20130731.html
+[matz blog post]: <https://www.rubyist.net/~matz/20130731.html>
 
 When you are extending mruby using C language, you may encounter
 mysterious "arena overflow error" or memory leak or very slow
-execution speed.  This is an error indicating overflow of "GC arena"
+execution speed. This is an error indicating overflow of "GC arena"
 implementing "conservative GC".
 
 GC (garbage collector) must ensure that object is "alive", in other
-words, that it is referenced by somewhere from program.  This can be
+words, that it is referenced by somewhere from the program. This can be
 determined by checking if the object can be directly or indirectly
-referenced by root.  The local variables, global variables and
-constants etc are root.
+referenced by root. The local variables, global variables and
+constants etc. are root.
 
 If program execution is performed inside mruby VM, there is nothing to
-worry about because GC can access all roots owned by VM.
+worry about because GC can access all roots owned by the VM.
 
-The problem arises when executing C functions.  The object referenced
+The problem arises when executing C functions. The object referenced
 by C variable is also "alive", but mruby GC cannot aware of this, so
 it might mistakenly recognize the objects referenced by only C
 variables as dead.
@@ -27,18 +27,18 @@ variables as dead.
 This can be a fatal bug if the GC tries to collect a live object.
 
 In CRuby, we scan C stack area, and use C variable as root to check
-whether object is alive or not.  Of course, because we are accessing C
+whether object is alive or not. Of course, because we are accessing C
 stack just as memory region, we never know it is an integer or a
-pointer.  We workaround this by assuming that if it looks like a
-pointer, then assume it as a pointer.  We call it "conservative".
+pointer. We work around this by assuming that if it looks like a
+pointer, then assume it as a pointer. We call it "conservative".
 
 By the way, CRuby's "conservative GC" has some problems.
 
 The biggest problem is we have no way to access to the stack area in
-portable way.  Therefore, we cannot use this method if we'd like to
+portable way. Therefore, we cannot use this method if we'd like to
 implement highly portable runtime, like mruby.
 
-So we came up with an another plan to implement "conservative GC" in mruby.
+So we came up with another plan to implement "conservative GC" in mruby.
 
 Again, the problem is when an object which was created in C function, becomes
 no longer referenced in the Ruby world, and cannot be treated as garbage.
@@ -46,7 +46,7 @@ no longer referenced in the Ruby world, and cannot be treated as garbage.
 In mruby, we recognize all objects created in C function are alive.
 Then we have no problem such as confusing a live object as dead.
 
-This means that because we cannot collect truly dead object, we may
+This means that because we cannot collect a truly dead object, we may
 lose efficiency, but as a trade-off the GC itself is highly portable.
 We can say goodbye to the problem that GC deletes live objects due to
 optimization which sometimes occurs in CRuby.
@@ -65,14 +65,14 @@ objects (See `MRB_GC_FIXED_ARENA` and `MRB_GC_ARENA_SIZE` in
 doc/guides/mrbconf.md).
 
 If you create many objects in C functions, memory usage will increase, since
-GC never kick in.  This memory usage may look like memory leak, but will also
+GC never kicks in. This memory usage may look like memory leaks, but will also
 make execution slower as more memory will need to be allocated.
 
 With the build time configuration, you can limit the maximum size of
-arena (e.g., 100).  Then if you create many objects, arena overflows,
+arena (e.g., 100). Then if you create many objects, arena overflows,
 thus you will get an "arena overflow error".
 
-To workaround these problems, we have `mrb_gc_arena_save()` and
+To work around these problems, we have `mrb_gc_arena_save()` and
 `mrb_gc_arena_restore()` functions.
 
 `int mrb_gc_arena_save(mrb)` returns the current position of the stack
@@ -93,7 +93,7 @@ In mruby, C function calls are surrounded by this save/restore, but we
 can further optimize memory usage by surrounding save/restore, and can
 avoid creating arena overflow bugs.
 
-Let's take a real example.  Here is the source code of `Array#inspect`:
+Let's take a real example. Here is the source code of `Array#inspect`:
 
 ```c
 static mrb_value
@@ -140,29 +140,29 @@ inspect_ary(mrb_state *mrb, mrb_value ary, mrb_value list)
 }
 ```
 
-This is a real example, so a little bit complicated, but bear with me.
+This is a real example, so slightly complicated, but bear with me.
 The essence of `Array#inspect` is that after stringifying each element
 of array using `inspect` method, we join them together so that we can
 get `inspect` representation of the entire array.
 
 After the `inspect` representation is created, we no longer require the
-individual string representation.  This means that we don't have to register
+individual string representation. This means that we don't have to register
 these temporal objects into GC arena.
 
 Therefore, in order to keep the arena size small; the `ary_inspect()` function
 will do the following:
 
-* save the position of the stack top using `mrb_gc_arena_save()`.
-* get `inspect` representation of each element.
-* append it to the constructing entire `inspect` representation of array.
-* restore stack top position using `mrb_gc_arena_restore()`.
+- save the position of the stack top using `mrb_gc_arena_save()`.
+- get `inspect` representation of each element.
+- append it to the constructing entire `inspect` representation of array.
+- restore stack top position using `mrb_gc_arena_restore()`.
 
 Please note that the final `inspect` representation of entire array
-was created before the call of `mrb_gc_arena_restore()`.  Otherwise,
+was created before the call of `mrb_gc_arena_restore()`. Otherwise,
 required temporal object may be deleted by GC.
 
-We may have a usecase where after creating many temporal objects, we'd
-like to keep some of them.  In this case, we cannot use the same idea
+We may have an usecase where after creating many temporal objects, we'd
+like to keep some of them. In this case, we cannot use the same idea
 in `ary_inspect()` like appending objects to existing one.
 Instead, after `mrb_gc_arena_restore()`, we must re-register the objects we
 want to keep in the arena using `mrb_gc_protect(mrb, obj)`.

doc/guides/link.md

@@ -0,0 +1,83 @@
+# Linking `libmruby` to your application
+
+You have two ways to link `libmruby` to your application.
+
+- using executable gem.
+- using normal compilation process
+
+## Executable Gems
+
+If your application is relatively small, `mrbgem` is an easier way to
+create the executable. By tradition, the gem name start with
+`mruby-bin-`, e.g. `mruby-bin-debugger`.
+
+### `mrbgem.rake` file
+
+The executable name is specified in `mrbgem.rake` file at the top of
+your `mrbgem` directory.
+
+```ruby
+MRuby::Gem::Specification.new('mruby-bin-example') do |spec|
+  spec.license = 'MIT'
+  spec.author  = 'mruby developers'
+  spec.summary = 'Example for executable command gem'
+  spec.bins = %w(mruby-example)    # <- this is binary name
+end
+```
+
+### Source tree structure
+
+The source file for the gem executable should be in
+`<gem-name>/tools/<bin-name>`. Currently, we support C or C++ source code
+(`.c`, `.cpp`, `.cxx`, `.cc`) for the executable. Ruby source files are not
+supported. Put the functionality in the different gem and specify dependency to
+it in `mrbgem.rake`.
+
+## Normal compilation process
+
+The `libmruby` is a normal library so that you can just link it to your
+application. Specify proper compiler options (`-I` etc.) and linker options
+(`-lmruby` etc.) to compile and link your application. Specify those options in
+your build script (e.g. `Makefile`).
+
+### Compiler options
+
+You need to specify compiler options that are compatible to mruby configuration,
+for example:
+
+- `-I` to specify the place for mruby header files
+- `-D` to specify mruby configuration macros
+
+To retrieve compiler options used to build `mruby`, you can use `mruby-config`
+command with following options:
+
+- `--cc`                    compiler name
+- `--cflags`                options passed to compiler
+
+```
+$ mruby-config --cflags
+-std=gnu99 -g -O3 -Wall -DMRB_GC_FIXED_ARENA -I/home/matz/work/mruby/include -I/home/matz/work/mruby/build/host/include
+```
+
+### Linker options
+
+Just like compiler options, you need to specify linker options that are
+compatible to mruby configuration.
+
+To retrieve linker options, you can use `mruby-config` with following options:
+
+- `--ld`                    linker name
+- `--ldflags`               options passed to linker
+- `--ldflags-before-libs`   options passed to linker before linked libraries
+- `--libs`                  linked libraries
+
+```
+$ mruby-config --ldflags
+-L/home/matz/work/mruby/build/host/lib
+
+$ mruby-config --ldflags-before-libs
+# <nothing in this case>
+
+$ mruby-config --libs
+-lmruby -lm
+```

doc/guides/mrbconf.md

@@ -1,208 +1,252 @@
-# mruby configuration macros.
+# mruby configuration macros
 
-## How to use these macros.
+## The configuration file
 
-You can use mrbconfs with following ways:
+You can do the build configuration in the build configuration file. The default
+configuration file is `build_config/default.rb`.
 
-* Write them in `mrbconf.h`.
- * Using compiler flags is preferred  when building a cross binaries or multiple mruby binaries
- since it's easier to use different mrbconf per each `MRuby::Build`.
- * Most flags can be enabled by just commenting in.
-* Pass them as compiler flags.
- * Make sure you pass the same flags to all compilers since some mrbconf(e.g., `MRB_GC_FIXED_ARENA`)
- changes `struct` layout and cause memory access error when C and other language(e.g., C++) is mixed.
+You can specify your own configuration file by the `MRUBY_CONFIG` environment
+variable (you can use `CONFIG` for shorthand for `MRUBY_CONFIG`). If the path
+doesn't exist, `build_config/${MRUBY_CONFIG}.rb` is used.
 
-## stdio setting.
+## How to use these macros
+
+Just add the configuration value to the `MRuby::Build#defines` attribute.
+This is the same for `MRuby::CrossBuild`.
+
+```ruby
+# build_config.rb
+
+MRuby::Build.new do |conf|
+  .....
+  conf.defines << 'MRB_GC_FIXED_ARENA'
+  conf.defines << 'MRB_NO_METHOD_CACHE'
+  .....
+end
+```
+
+***NOTE***
+
+- Use common definitions (`conf.defines`) instead of per-compiler definitions (e.g., `conf.cc.defines`) unless there is a special reason not to.
+- It is now deprecated to edit the `include/mruby/mrbconf.h` file or give it directly as a compiler flag, as was the case before.
+
+## stdio setting
 
 `MRB_NO_STDIO`
 
-* When defined `<stdio.h>` functions won't be used.
-* Some features will be disabled when this is enabled:
-  * `mrb_irep` load/dump from/to file.
-  * Compiling mruby script from file.
-  * Printing features in **src/print.c**.
+- When defined `<stdio.h>` functions won't be used.
+- Some features will be disabled when this is enabled:
+  - `mrb_irep` load/dump from/to file.
+  - Compiling mruby script from a file.
+  - Printing features in **src/print.c**.
 
-## Debug macros.
+## Debug macros
 
 `MRB_USE_DEBUG_HOOK`
 
-* When defined code fetch hook and debug OP hook will be enabled.
-* When using any of the hook set function pointer `code_fetch_hook` and/or `debug_op_hook` of `mrb_state`.
-* Fetch hook will be called before any OP.
-* Debug OP hook will be called when dispatching `OP_DEBUG`.
+- When defined code fetch hook and debug OP hook will be enabled.
+- When using any of the hook set function pointer `code_fetch_hook` and/or `debug_op_hook` of `mrb_state`.
+- Fetch hook will be called before any OP.
+- Debug OP hook will be called when dispatching `OP_DEBUG`.
 
 `MRB_DEBUG`
 
-* When defined `mrb_assert*` macro will be defined with macros from `<assert.h>`.
-* Could be enabled via `enable_debug` method of `MRuby::Build`.
+- When defined `mrb_assert*` macro will be defined with macros from `<assert.h>`.
+- Could be enabled via `enable_debug` method of `MRuby::Build`.
 
 ## Stack configuration
 
 `MRB_STACK_EXTEND_DOUBLING`
 
-* If defined doubles the stack size when extending it.
-* Else extends stack with `MRB_STACK_GROWTH`.
+- If defined doubles the stack size when extending it.
+- Otherwise extends stack with `MRB_STACK_GROWTH`.
 
 `MRB_STACK_GROWTH`
 
-* Default value is `128`.
-* Used in stack extending.
-* Ignored when `MRB_STACK_EXTEND_DOUBLING` is defined.
+- Default value is `128`.
+- Used in stack extending.
+- Ignored when `MRB_STACK_EXTEND_DOUBLING` is defined.
 
 `MRB_STACK_MAX`
 
-* Default value is `0x40000 - MRB_STACK_GROWTH`.
-* Raises `RuntimeError` when stack size exceeds this value.
+- Default value is `0x40000 - MRB_STACK_GROWTH`.
+- Raises `RuntimeError` when stack size exceeds this value.
 
-## Primitive type configuration.
+## Primitive type configuration
 
 `MRB_USE_FLOAT32`
 
-* When defined single precision floating point type(C type `float`) is used as `mrb_float`.
-* Otherwise double precision floating point type(C type `double`) is used as `mrb_float`.
+- When defined single-precision floating-point type(C type `float`) is used as `mrb_float`.
+- Otherwise, double-precision floating-point type(C type `double`) is used as `mrb_float`.
 
 `MRB_NO_FLOAT`
 
-* When defined removes floating point numbers from mruby.
-* It makes mruby easier to handle in "Microcontroller without FPU" and "Kernel Space".
+- When defined removes floating-point numbers from mruby.
+- It makes mruby easier to handle in "Micro-controller without FPU" and "Kernel Space".
 
 `MRB_INT32`
 
-* When defined, or `MRB_INT64` are not defined on 32-bit CPU mode, `mrb_int` will be defined as `int32_t`.
-* Conflicts with `MRB_INT64`.
+- When defined, or `MRB_INT64` are not defined on 32-bit CPU mode, `mrb_int` will be defined as `int32_t`.
+- Conflicts with `MRB_INT64`.
 
 `MRB_INT64`
 
-* When defined, or `MRB_INT32` are not defined on 64-bit CPU mode, `mrb_int` will be defined as `int64_t`.
-* Conflicts with `MRB_INT32`.
+- When defined, or `MRB_INT32` are not defined on 64-bit CPU mode, `mrb_int` will be defined as `int64_t`.
+- Conflicts with `MRB_INT32`.
 
-## Garbage collector configuration.
+## Garbage collector configuration
 
 `MRB_GC_STRESS`
 
-* When defined full GC is emitted per each `RBasic` allocation.
-* Mainly used in memory manager debugging.
+- When defined full GC is emitted per each `RBasic` allocation.
+- Mainly used in memory manager debugging.
+- If defined at the same time as `MRB_DEBUG`, full GC is emitted also per each heap allocation (`mrb_malloc()` or etc.).
+  This configuration slows down mruby execution by a factor of 2 to 3 or even more.
 
 `MRB_GC_TURN_OFF_GENERATIONAL`
 
-* When defined turns generational GC by default.
+- When defined turns generational GC by default.
 
 `MRB_GC_FIXED_ARENA`
 
-* When defined used fixed size GC arena.
-* Raises `RuntimeError` when this is defined and GC arena size exceeds `MRB_GC_ARENA_SIZE`.
-* Useful tracking unnecessary mruby object allocation.
+- When defined used fixed size GC arena.
+- Raises `RuntimeError` when this is defined and GC arena size exceeds `MRB_GC_ARENA_SIZE`.
+- Useful tracking unnecessary mruby object allocation.
 
 `MRB_GC_ARENA_SIZE`
 
-* Default value is `100`.
-* Ignored when `MRB_GC_FIXED_ARENA` isn't defined.
-* Defines fixed GC arena size.
+- Default value is `100`.
+- Ignored when `MRB_GC_FIXED_ARENA` isn't defined.
+- Defines fixed GC arena size.
 
 `MRB_HEAP_PAGE_SIZE`
 
-* Defines value is `1024`.
-* Specifies number of `RBasic` per each heap page.
+- Defines value is `1024`.
+- Specifies number of `RBasic` per each heap page.
+- To calculate the number of bytes per heap page, it is "(size of management data per heap page) + (size per object) * `MRB_HEAP_PAGE_SIZE`".
+  In mruby 3.1.0, the "size of management data per heap page" is 6 words, also "size per object" is 6 words.
+  For a 32-bit CPU, `(6 * 4) + (6 * 4) * MRB_HEAP_PAGE_SIZE` gives the bytes of size per heap page.
+  Conversely, for example, to keep the size per heap page to 4 Ki bytes,
+  calculate `(4096 - (6 * 4)) / (6 * 4)` to specify `MRB_HEAP_PAGE_SIZE=169`.
 
-## Memory pool configuration.
+## Memory pool configuration
 
 `POOL_ALIGNMENT`
 
-* Default value is `4`.
-* If you're allocating data types that requires alignment more than default value define the
+- Default value is `4`.
+- If you're allocating data types that requires alignment more than default value define the
 largest value of required alignment.
 
 `POOL_PAGE_SIZE`
 
-* Default value is `16000`.
-* Specifies page size of pool page.
-* Smaller the value is increases memory overhead.
+- Default value is `16000`.
+- Specifies page size of pool page.
+- Smaller the value is increases memory overhead.
 
-## State atexit configuration.
+## State atexit configuration
 
 `MRB_FIXED_STATE_ATEXIT_STACK`
 
-* If defined enables fixed size `mrb_state` atexit stack.
-* Raises `RuntimeError` when `mrb_state_atexit` call count to same `mrb_state` exceeds
+- If defined enables fixed size `mrb_state` atexit stack.
+- Raises `RuntimeError` when `mrb_state_atexit` call count to same `mrb_state` exceeds
 `MRB_FIXED_STATE_ATEXIT_STACK_SIZE`'s value.
 
 `MRB_FIXED_STATE_ATEXIT_STACK_SIZE`
 
-* Default value is `5`.
-* If `MRB_FIXED_STATE_ATEXIT_STACK` isn't defined this macro is ignored.
+- Default value is `5`.
+- If `MRB_FIXED_STATE_ATEXIT_STACK` isn't defined this macro is ignored.
 
-## `mrb_value` configuration.
+## `mrb_value` configuration
 
 `MRB_ENDIAN_BIG`
 
-* If defined compiles mruby for big endian machines.
-* Used in `MRB_NAN_BOXING`.
-* Some mrbgem use this mrbconf.
+- If defined compiles mruby for big endian machines.
+- Used in `MRB_NAN_BOXING`.
+- Some mrbgem use this mrbconf.
 
 `MRB_NAN_BOXING`
 
-* If defined represent `mrb_value` in boxed `double`.
-* Conflicts with `MRB_USE_FLOAT32` and `MRB_NO_FLOAT`.
+- If defined represent `mrb_value` in boxed `double`.
+- Conflicts with `MRB_USE_FLOAT32` and `MRB_NO_FLOAT`.
 
 `MRB_WORD_BOXING`
 
-* If defined represent `mrb_value` as a word.
-* If defined `Float` will be a mruby object with `RBasic`.
+- If defined represent `mrb_value` as a word.
+- If defined `Float` will be a mruby object with `RBasic`.
 
-## Reduce heap memory configuration.
+## Reduce heap memory configuration
 
-`MRB_USE_LINK_TIME_RO_DATA_P`
+`MRB_USE_ETEXT_RO_DATA_P`
 
-* Only available on ELF platforms.
-* If you specify the address of a read-only section when creating a symbol or string, that string will be used as it is.
-* Heap memory can be saved.
-* Uses `__ehdr_start` and `__init_array_start`.
-* It must be `__ehdr_start < data_addr < __init_array_start`.
+- Use `etext` and `edata` section addresses defined by the linker to detect read-only data.
+- Those addresses are widely available, but not portable, nor standardized.
+- This macro is defined by default on User-mode Linux.
+
+`MRB_NO_DEFAULT_RO_DATA_P`
+
+- Define this macro when the default `mrb_ro_data_p()` does not work for any reason.
 
 `MRB_USE_CUSTOM_RO_DATA_P`
 
-* Takes precedence over `MRB_USE_LINK_TIME_RO_DATA_P`.
-* Please try if `MRB_USE_LINK_TIME_RO_DATA_P` is not available.
-* The `mrb_ro_data_p()` function is implemented by the user in an arbitrary file.
-* The prototype declaration is `mrb_bool mrb_ro_data_p(const char *ptr)`.
-* Return `TRUE` if `ptr` is in read-only section, otherwise return `FALSE`.
+- Please try if `MRB_USE_LINK_TIME_RO_DATA_P` is not available.
+- The `mrb_ro_data_p()` function is implemented by the user in an arbitrary file.
+- The prototype declaration is `mrb_bool mrb_ro_data_p(const char *ptr)`.
+- Return `TRUE` if `ptr` is in the read-only section, otherwise return `FALSE`.
 
-## Other configuration.
+## Other configuration
+
+`MRB_MALLOC_TRIM`
+
+- call malloc_trim(0) for each mrb_full_gc() call
 
 `MRB_UTF8_STRING`
 
-* Adds UTF-8 encoding support to character-oriented String instance methods.
-* If it isn't defined, they only support the US-ASCII encoding.
+- Adds UTF-8 encoding support to character-oriented String instance methods.
+- If it isn't defined, they only support the US-ASCII encoding.
+
+`MRB_STR_LENGTH_MAX`
+
+- The maximum length of strings (default 1MB)
+- set this value to zero to skip the check
+
+`MRB_ARY_LENGTH_MAX`
+
+- The maximum length of strings (default 1MB)
+- set this value to zero to skip the check
 
 `MRB_FUNCALL_ARGC_MAX`
 
-* Default value is `16`.
-* Specifies 4th argument(`argc`) max value of `mrb_funcall`.
-* Raises `ArgumentError` when the `argc` argument is bigger then this value `mrb_funcall`.
+- Default value is `16`.
+- Specifies 4th argument(`argc`) max value of `mrb_funcall`.
+- Raises `ArgumentError` when the `argc` argument is bigger then this value `mrb_funcall`.
 
 `KHASH_DEFAULT_SIZE`
 
-* Default value is `32`.
-* Specifies default size of khash table bucket.
-* Used in `kh_init_ ## name` function.
+- Default value is `32`.
+- Specifies default size of khash table bucket.
+- Used in `kh_init_ ## name` function.
 
 `MRB_NO_METHOD_CACHE`
 
-* Disable method cache to save memory.
+- Disable method cache to save memory.
 
 `MRB_METHOD_CACHE_SIZE`
 
-* Default value is `256`.
-* Ignored if `MRB_NO_METHOD_CACHE` is defined.
-* Need to be the power of 2.
+- Default value is `256`.
+- Ignored if `MRB_NO_METHOD_CACHE` is defined.
+- Need to be the power of 2.
 
 `MRB_USE_METHOD_T_STRUCT`
 
-* Use C struct to represent `mrb_method_t`
-* No `MRB_USE_METHOD_T_STRUCT` requires highest 2 bits of function pointers to be zero
-* Define this macro on machines that use higher bits of pointers
+- Use C struct to represent `mrb_method_t`
+- No `MRB_USE_METHOD_T_STRUCT` requires highest 2 bits of function pointers to be zero
+- Define this macro on machines that use higher bits of pointers
 
 `MRB_USE_ALL_SYMBOLS`
 
-* Make it available `Symbol.all_symbols` in `mrbgems/mruby-symbol-ext`
-* Increase heap memory usage.
+- Make it available `Symbol.all_symbols` in `mrbgems/mruby-symbol-ext`
+- Increase heap memory usage.
+
+`MRB_NO_DIRECT_THREADING`
+
+- Turn off direct threading optimization in VM loop

doc/guides/mrbgems.md

@@ -1,12 +1,13 @@
 # mrbgems
 
 mrbgems is a library manager to integrate C and Ruby extension in an easy and
-standardised way into mruby.
+standardised way into mruby. Conventionally, each mrbgem name is prefixed by
+`mruby-`, e.g. `mruby-time` for a gem that provides `Time` class functionality.
 
 ## Usage
 
-You have to activate mrbgems explicitly in your build configuration.  To add
-a GEM, add the following line to your build configuration file, for example:
+You have to activate mrbgems explicitly in your build configuration. To add
+a gem, add the following line to your build configuration file, for example:
 
 ```ruby
 conf.gem '/path/to/your/gem/dir'
@@ -20,9 +21,9 @@ conf.gem 'examples/mrbgems/ruby_extension_example'
 
 In that case,
 
-* if your build configuration file is in the `build_config` directory, it's
+- if your build configuration file is in the `build_config` directory, it's
   relative from `MRUBY_ROOT`.
-* otherwise, it is relative from the directory where your build configuration is.
+- otherwise, it is relative from the directory where your build configuration is.
 
 A remote GIT repository location for a GEM is also supported:
 
@@ -32,7 +33,10 @@ conf.gem :github => 'masuidrive/mrbgems-example', :branch => 'master'
 conf.gem :bitbucket => 'mruby/mrbgems-example', :branch => 'master'
 ```
 
-You can specify the sub directory of the repository with `:path` option:
+NOTE: `:bitbucket` option supports only git. Hg is unsupported in this
+version.
+
+You can specify the subdirectory of the repository with `:path` option:
 
 ```ruby
 conf.gem github: 'mruby/mruby', path: 'mrbgems/mruby-socket'
@@ -45,31 +49,60 @@ conf.gem :mgem => 'mruby-yaml'
 conf.gem :mgem => 'yaml' # 'mruby-' prefix could be omitted
 ```
 
-For specifying commit hash to checkout use `:checksum_hash` option:
+For specifying the commit hash to checkout use `:checksum_hash` option:
 
 ```ruby
 conf.gem mgem: 'mruby-redis', checksum_hash: '3446d19fc4a3f9697b5ddbf2a904f301c42f2f4e'
 ```
 
-If there is missing dependencies, mrbgem dependencies solver will reference
-mrbgem from core or mgem-list.
+If there are missing dependencies, mrbgem dependencies solver will reference
+mrbgem from the core or mgem-list.
 
-To pull all gems from remote GIT repository on build, call ```rake -p```,
-or ```rake --pull-gems```.
+Note that if more than one git-based gem has the same base name
+(i.e. the default checkout directory name), it is (now) an error
+**UNLESS** they have the same repository URL, branch name and
+commit-id (i.e. checksum hash). You can bypass this by explicitly
+importing your preferred version **first** and setting the
+`canonical:` option to `true`:
 
-NOTE: `:bitbucket` option supports only git. Hg is unsupported in this version.
+```ruby
+conf.gem github: 'me/mruby-yaml', branch: 'my-hacked-branch', canonical: true
+```
+
+If you do this, the system will (mostly) silently ignore other
+attempts to clone a gem with this name.
+
+Note that this only affects cloning the gem from git. It does not
+resolve version conflicts. If the version as specified in the gem's
+rakefile is incompatible with a dependency, your build will still
+fail.
+
+### Tweak the gem in your build configuration file
+
+You can give blocks in the `conf.gem` call to make adjustments for
+environments where the original gem does not expect them:
+
+```ruby
+conf.gem core: "mruby-bin-mirb" do |g|
+  # For cross build to NetBSD
+  g.linker.libraries = %w(edit termcap)
+end
+```
+
+However, it should be used with caution, as it may deviate from the intent
+of the gem's author.
 
 ## GemBox
 
 There are instances when you wish to add a collection of mrbgems into mruby at
 once, or be able to substitute mrbgems based on configuration, without having to
-add each gem to your build configuration file.  A packaged collection of mrbgems
-is called a GemBox.  A GemBox is a file that contains a list of mrbgems to load
+add each gem to your build configuration file. A packaged collection of mrbgems
+is called a GemBox. A GemBox is a file that contains a list of mrbgems to load
 into mruby, in the same format as if you were adding them to the build config
-via `config.gem`, but wrapped in an `MRuby::GemBox` object.  GemBoxes are
+via `config.gem`, but wrapped in an `MRuby::GemBox` object. GemBoxes are
 loaded into mruby via `config.gembox 'boxname'`.
 
-Below we have created a GemBox containing *mruby-time* and *mrbgems-example*:
+Below we have created a GemBox containing `mruby-time` and `mrbgems-example`:
 
 ```ruby
 MRuby::GemBox.new do |conf|
@@ -78,11 +111,11 @@ MRuby::GemBox.new do |conf|
 end
 ```
 
-As mentioned, the GemBox uses the same conventions as `MRuby::Build`.  The GemBox
-must be saved with a *.gembox* extension inside the *mrbgems* directory to to be
+As mentioned, the GemBox uses the same conventions as `MRuby::Build`. The GemBox
+must be saved with a `.gembox` extension inside the `mrbgems` directory to be
 picked up by mruby.
 
-To use this example GemBox, we save it as `custom.gembox` inside the *mrbgems*
+To use this example GemBox, we save it as `custom.gembox` inside the `mrbgems`
 directory in mruby, and add the following to your build configuration file inside
 the build block:
 
@@ -90,10 +123,10 @@ the build block:
 conf.gembox 'custom'
 ```
 
-This will cause the *custom* GemBox to be read in during the build process,
-adding *mruby-time* and *mrbgems-example* to the build.
+This will cause the `custom` GemBox to be read in during the build process,
+adding `mruby-time` and `mrbgems-example` to the build.
 
-If you want, you can put GemBox outside of mruby directory. In that case you must
+If you want, you can put GemBox outside the mruby directory. In that case you must
 specify an absolute path like below.
 
 ```ruby
@@ -103,61 +136,65 @@ conf.gembox "#{ENV["HOME"]}/mygemboxes/custom"
 There are two GemBoxes that ship with mruby: [default](../../mrbgems/default.gembox)
 and [full-core](../../mrbgems/full-core.gembox). The [default](../../mrbgems/default.gembox) GemBox
 contains several core components of mruby, and [full-core](../../mrbgems/full-core.gembox)
-contains every gem found in the *mrbgems* directory.
+contains every gem found in the `mrbgems` directory.
 
 ## GEM Structure
 
 The maximal GEM structure looks like this:
 
-	+- GEM_NAME         <- Name of GEM
-	   |
-	   +- include/      <- Header for Ruby extension (will exported)
-	   |
-	   +- mrblib/       <- Source for Ruby extension
-	   |
-	   +- src/          <- Source for C extension
-	   |
-	   +- test/         <- Test code (Ruby)
-	   |
-	   +- mrbgem.rake   <- GEM Specification
-	   |
-	   +- README.md     <- Readme for GEM
+```
++- GEM_NAME             <- Name of GEM
+    |
+    +- README.md        <- Readme for GEM
+    |
+    +- mrbgem.rake      <- GEM Specification
+    |
+    +- include/         <- Header for Ruby extension (will exported)
+    |
+    +- mrblib/          <- Source for Ruby extension
+    |
+    +- src/             <- Source for C extension
+    |
+    +- tools/           <- Source for Executable (in C)
+    |
+    +- test/            <- Test code (Ruby)
+```
 
-The folder *mrblib* contains pure Ruby files to extend mruby. The folder *src*
-contains C/C++ files to extend mruby. The folder *include* contains C/C++ header
-files. The folder *test* contains C/C++ and pure Ruby files for testing purposes
-which will be used by `mrbtest`. *mrbgem.rake* contains the specification
-to compile C and Ruby files. *README.md* is a short description of your GEM.
+The folder `mrblib` contains pure Ruby files to extend mruby. The folder `src`
+contains C/C++ files to extend mruby. The folder `include` contains C/C++ header
+files. The folder `test` contains C/C++ and pure Ruby files for testing purposes
+which will be used by `mrbtest`. `mrbgem.rake` contains the specification
+to compile C and Ruby files. `README.md` is a short description of your GEM.
 
 ## Build process
 
-mrbgems expects a specification file called *mrbgem.rake* inside of your
+mrbgems expects a specification file called `mrbgem.rake` inside of your
 GEM directory. A typical GEM specification could look like this for example:
 
 ```ruby
 MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
   spec.license = 'MIT'
   spec.author  = 'mruby developers'
-  spec.summary = 'Example mrbgem using C and ruby'
+  spec.summary = 'Example mrbgem using C and Ruby'
 end
 ```
 
 The mrbgems build process will use this specification to compile Object and Ruby
-files. The compilation results will be added to *lib/libmruby.a*. This file exposes
+files. The compilation results will be added to `lib/libmruby.a`. This file exposes
 the GEM functionality to tools like `mruby` and `mirb`.
 
-The following properties can be set inside of your `MRuby::Gem::Specification` for
+The following properties can be set inside your `MRuby::Gem::Specification` for
 information purpose:
 
-* `spec.license` or `spec.licenses` (A single license or a list of them under which this GEM is licensed)
-* `spec.author` or `spec.authors` (Developer name or a list of them)
-* `spec.version` (Current version)
-* `spec.description` (Detailed description)
-* `spec.summary`
-  * One line short description of mrbgem.
-  * Printed in build summary of rake when set.
-* `spec.homepage` (Homepage)
-* `spec.requirements` (External requirements as information for user)
+- `spec.license` or `spec.licenses` (A single license or a list of them under which this GEM is licensed)
+- `spec.author` or `spec.authors` (Developer name or a list of them)
+- `spec.version` (Current version)
+- `spec.description` (Detailed description)
+- `spec.summary`
+  - One line short description of mrbgem.
+  - Printed in build summary of rake when set.
+- `spec.homepage` (Homepage)
+- `spec.requirements` (External requirements as information for user)
 
 The `license` and `author` properties are required in every GEM!
 
@@ -188,15 +225,15 @@ The version requirements and default gem information are optional.
 
 Version requirement supports following operators:
 
-* '=': is equal
-* '!=': is not equal
-* '>': is greater
-* '<': is lesser
-* '>=': is equal or greater
-* '<=': is equal or lesser
-* '~>': is equal or greater and is lesser than the next major version
-    * example 1: '~> 2.2.2' means '>= 2.2.2' and '< 2.3.0'
-    * example 2: '~> 2.2'   means '>= 2.2.0' and '< 3.0.0'
+- '=': is equal
+- '!=': is not equal
+- '>': is greater
+- '<': is lesser
+- '>=': is equal or greater
+- '<=': is equal or lesser
+- '~>': is equal or greater and is lesser than the next major version
+  - example 1: '~> 2.2.2' means '>= 2.2.2' and '< 2.3.0'
+  - example 2: '~> 2.2'   means '>= 2.2.0' and '< 3.0.0'
 
 When more than one version requirements is passed, the dependency must satisfy all of it.
 
@@ -209,8 +246,8 @@ use `MRuby::Build#gem` in the build configuration to override default gem.
 
 If you have conflicting GEMs use the following method:
 
-* `spec.add_conflict(gem, *requirements)`
-    * The `requirements` argument is same as in `add_dependency` method.
+- `spec.add_conflict(gem, *requirements)`
+  - The `requirements` argument is same as in `add_dependency` method.
 
 like following code:
 
@@ -227,22 +264,22 @@ end
 ```
 
 In case your GEM has more complex build requirements you can use
-the following options additionally inside of your GEM specification:
+the following options additionally inside your GEM specification:
 
-* `spec.cc.flags` (C compiler flags)
-* `spec.cc.defines` (C compiler defines)
-* `spec.cc.include_paths` (C compiler include paths)
-* `spec.linker.flags` (Linker flags)
-* `spec.linker.libraries` (Linker libraries)
-* `spec.linker.library_paths` (Linker additional library path)
-* `spec.bins` (Generate binary file)
-* `spec.rbfiles` (Ruby files to compile)
-* `spec.objs` (Object files to compile)
-* `spec.test_rbfiles` (Ruby test files for integration into mrbtest)
-* `spec.test_objs` (Object test files for integration into mrbtest)
-* `spec.test_preload` (Initialization files for mrbtest)
+- `spec.cc.flags` (C compiler flags)
+- `spec.cc.defines` (C compiler defines)
+- `spec.cc.include_paths` (C compiler include paths)
+- `spec.linker.flags` (Linker flags)
+- `spec.linker.libraries` (Linker libraries)
+- `spec.linker.library_paths` (Linker additional library path)
+- `spec.bins` (Generate binary file)
+- `spec.rbfiles` (Ruby files to compile)
+- `spec.objs` (Object files to compile)
+- `spec.test_rbfiles` (Ruby test files for integration into mrbtest)
+- `spec.test_objs` (Object test files for integration into mrbtest)
+- `spec.test_preload` (Initialization files for mrbtest)
 
-You also can use `spec.mruby.cc` and `spec.mruby.linker` to add extra global parameters for compiler and linker.
+You also can use `spec.mruby.cc` and `spec.mruby.linker` to add extra global parameters for the compiler and linker.
 
 ### include_paths and dependency
 
@@ -251,7 +288,7 @@ By default, `/...absolute path.../{GEM_NAME}/include` will be exported.
 So it is recommended not to put GEM's local header files on include/.
 
 These exports are retroactive.
-For example: when B depends to C and A depends to B, A will get include paths exported by C.
+For example: when B depends on C and A depends on B, A will get include paths exported by C.
 
 Exported include_paths are automatically appended to GEM local include_paths by rake.
 You can use `spec.export_include_paths` accessor if you want more complex build.
@@ -265,10 +302,10 @@ integrate C libraries into mruby.
 
 mrbgems expects that you have implemented a C method called
 `mrb_YOURGEMNAME_gem_init(mrb_state)`. `YOURGEMNAME` will be replaced
-by the name of your GEM. If you call your GEM *c_extension_example*, your
+by the name of your GEM. If you call your GEM `c_extension_example`, your
 initialisation method could look like this:
 
-```C
+```c
 void
 mrb_c_extension_example_gem_init(mrb_state* mrb) {
   struct RClass *class_cextension = mrb_define_module(mrb, "CExtension");
@@ -280,10 +317,10 @@ mrb_c_extension_example_gem_init(mrb_state* mrb) {
 
 mrbgems expects that you have implemented a C method called
 `mrb_YOURGEMNAME_gem_final(mrb_state)`. `YOURGEMNAME` will be replaced
-by the name of your GEM. If you call your GEM *c_extension_example*, your
+by the name of your GEM. If you call your GEM `c_extension_example`, your
 finalizer method could look like this:
 
-```C
+```c
 void
 mrb_c_extension_example_gem_final(mrb_state* mrb) {
   free(someone);
@@ -292,24 +329,26 @@ mrb_c_extension_example_gem_final(mrb_state* mrb) {
 
 ### Example
 
-	+- c_extension_example/
-	   |
-	   +- src/
-	   |  |
-	   |  +- example.c         <- C extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for C extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
+```
++- c_extension_example/
+    |
+    +- README.md        (Optional)
+    |
+    +- src/
+    |   |
+    |   +- example.c    <- C extension source
+    |
+    +- test/
+    |   |
+    |   +- example.rb   <- Test code for C extension
+    |
+    +- mrbgem.rake      <- GEM specification
+```
 
 ## Ruby Extension
 
 mruby can be extended with pure Ruby. It is possible to override existing
-classes or add new ones in this way. Put all Ruby files into the *mrblib*
+classes or add new ones in this way. Put all Ruby files into the `mrblib`
 folder.
 
 ### Pre-Conditions
@@ -318,27 +357,29 @@ none
 
 ### Example
 
-	+- ruby_extension_example/
-	   |
-	   +- mrblib/
-	   |  |
-	   |  +- example.rb        <- Ruby extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for Ruby extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
+```
++- ruby_extension_example/
+    |
+    +- README.md        (Optional)
+    |
+    +- mrblib/
+    |   |
+    |   +- example.rb   <- Ruby extension source
+    |
+    +- test/
+    |   |
+    |   +- example.rb   <- Test code for Ruby extension
+    |
+    +- mrbgem.rake      <- GEM specification
+```
 
 ## C and Ruby Extension
 
 mruby can be extended with C and Ruby at the same time. It is possible to
 override existing classes or add new ones in this way. Put all Ruby files
-into the *mrblib* folder and all C files into the *src* folder.
+into the `mrblib` folder and all C files into the `src` folder.
 
-mruby codes under *mrblib* directory would be executed after gem init C
+mruby codes under `mrblib` directory would be executed after gem init C
 function is called. Make sure *mruby script* depends on *C code* and
 *C code* doesn't depend on *mruby script*.
 
@@ -348,20 +389,61 @@ See C and Ruby example.
 
 ### Example
 
-	+- c_and_ruby_extension_example/
-	   |
-	   +- mrblib/
-	   |  |
-	   |  +- example.rb        <- Ruby extension source
-	   |
-	   +- src/
-	   |  |
-	   |  +- example.c         <- C extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for C and Ruby extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
+```
++- c_and_ruby_extension_example/
+    |
+    +- README.md        (Optional)
+    |
+    +- mrblib/
+    |   |
+    |   +- example.rb   <- Ruby extension source
+    |
+    +- src/
+    |   |
+    |   +- example.c    <- C extension source
+    |
+    +- test/
+    |   |
+    |   +- example.rb   <- Test code for C and Ruby extension
+    |
+    +- mrbgem.rake      <- GEM specification
+```
+
+## Binary gems
+
+Some gems can generate executables under `bin` directory. Those gems are called
+binary gems. Names of binary gems are conventionally prefixed by `mruby-bin`,
+e.g. `mruby-bin-mirb` and `mruby-bin-strip`.
+
+To specify the name of executable, you need to specify `spec.bins` in the
+`mrbgem.rake`. The entry point `main()` should be in the C source file under
+`tools/<bin>/*.c` where `<bin>` is a name of the executable. C files under the
+`<bin>` directory are compiled and linked to the executable, but not included in
+`libmruby.a`, whereas files under `mrblib` and `src` are.
+
+It is strongly recommended not to include `mrblib` and `src` directories in the
+binary gems, to separate normal gems and binary gems.
+
+### Example
+
+```
++- mruby-bin-example/
+    |
+    +- README.md          (Optional)
+    |
+    +- bintest/
+    |   |
+    |   +- example.rb     <- Test code for binary gem
+    |
+    +- mrbgem.rake        <- Gem specification
+    |
+    +- mrblib/            <- Source for Ruby extension (Optional)
+    |
+    +- src/               <- Source for C extension (Optional)
+    |
+    +- tools/
+        |
+        +- example/       <- Executable name directory
+            |
+            +- example.c  <- Source for Executable (includes main)
+```

doc/guides/symbol.md

@@ -1,10 +1,10 @@
 # Symbols
 
 Symbols in `mruby` C source code is represented by `mrb_sym` which is alias of
-`uint32_t`.  Lower 30 bits are used for symbols so that higher 2 bits can be
+`uint32_t`. Lower 30 bits are used for symbols so that higher 2 bits can be
 used as flags, e.g. `struct mt_elem` in `class.c`.
 
-```C
+```c
 struct mt_elem {
   union mt_ptr ptr;
   size_t func_p:1;
@@ -57,13 +57,13 @@ To save RAM, `mruby` can use compile-time allocation of some symbols. You can
 use following macros to get preallocated symbols by including `mruby/presym.h`
 header.
 
- * `MRB_SYM(xor)`    //=> xor    (Word characters)
- * `MRB_SYM_B(xor)`  //=> xor!   (Method with Bang)
- * `MRB_SYM_Q(xor)`  //=> xor?   (Method with Question mark)
- * `MRB_SYM_E(xor)`  //=> xor=   (Method with Equal)
- * `MRB_CVSYM(xor)`  //=> @@xor  (Class Variable)
- * `MRB_IVSYM(xor)`  //=> @xor   (Instance Variable)
- * `MRB_OPSYM(xor)`  //=> ^      (Operator)
+- `MRB_SYM(xor)`    //=> xor    (Word characters)
+- `MRB_SYM_B(xor)`  //=> xor!   (Method with Bang)
+- `MRB_SYM_Q(xor)`  //=> xor?   (Method with Question mark)
+- `MRB_SYM_E(xor)`  //=> xor=   (Method with Equal)
+- `MRB_CVSYM(xor)`  //=> @@xor  (Class Variable)
+- `MRB_IVSYM(xor)`  //=> @xor   (Instance Variable)
+- `MRB_OPSYM(xor)`  //=> ^      (Operator)
 
 For `MRB_OPSYM()`, specify the names corresponding to operators (see
 `MRuby::Presym::OPERATORS` in `lib/mruby/presym.rb` for the names that
@@ -71,9 +71,9 @@ can be specified for it). Other than that, describe only word characters
 excluding leading and ending punctuations.
 
 These macros are converted to static symbol IDs at compile time, unless
-preallocate symbols are disabled by  `conf.disable_presym`. In that case,
+preallocate symbols are disabled by `conf.disable_presym`. In that case,
 these macros are expanded to `mrb_intern_lit` calls, therefore the mruby state
-variable is required. The above macros assume the variable name is `mrb`.  If
+variable is required. The above macros assume the variable name is `mrb`. If
 its name is not `mrb`, you need to use macros with `_2` suffix, such as
 `MRB_SYM_2` to specify `mrb_state*` variable.
 

doc/internal/boxing.md

@@ -0,0 +1,52 @@
+# Boxing
+
+The mruby objects and data are represented by C data type `mrb_value`. There are three options how to pack the data values in the `mrb_value`.
+
+- Word Boxing
+- NaN Boxing
+- No Boxing
+
+## Word Boxing
+
+Word boxing packs the Ruby data in a word, which is a natural integer size that equals to the size of pointers (`intptr_t`). Word boxing can be specified by `MRB_WORD_BOXING`, and it's default configuration for most platforms.
+
+Some values (called immediate values, e.g. integers, booleans, symbols, etc.) are directly packed in the word. The other data types are represented by pointers to the heap allocated structures.
+
+The Word boxing packing bit patterns are like following:
+
+| Types  | Bit Pattern                           |
+|--------|---------------------------------------|
+| object | `xxxxxxxx xxxxxxxx xxxxxxxx xxxxx000` |
+| fixnum | `xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxx1` |
+| nil    | `00000000 00000000 00000000 00000000` |
+| true   | `00000000 00000000 00000000 00001100` |
+| false  | `00000000 00000000 00000000 00000100` |
+| undef  | `00000000 00000000 00000000 00010100` |
+| symbol | `xxxxxxxx xxxxxxxx xxxxxxxx xxxxxx10` |
+
+On 64 bit platform (unless `MRB_WORDBOX_NO_FLOAT_TRUNCATE`), float values are also packed in the `mrb_value`. In that case, we drop least significant 2 bits from mantissa.
+If you need full precision for floating-point numbers, define `MRB_WORDBOX_NO_FLOAT_TRUNCATE`.
+
+## NaN Boxing
+
+NaN boxing packs the Ruby data in a floating-point numbers, which represent NaN (Not a Number) values. Under IEEE753 definitions every value that exponent is all set are considered as NaN. That means NaN can represent `2^51` values. NaN boxing is a teaching to pack the values in those NaN representation. In theory, 64 bits pointers are too big to fit in NaN, but practically most OS uses only 48 bits at most for pointers (except for some OS e.g. Solaris).
+
+The NaN boxing packing bit patterns are like following:
+
+| Types  | Bit Pattern                                                               |
+|--------|---------------------------------------------------------------------------|
+| float  | `SEEEEEEE EEEEFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF` |
+| +/-inf | `S1111111 11110000 00000000 00000000 00000000 00000000 00000000 00000000` |
+| nan    | `01111111 11111000 00000000 00000000 00000000 00000000 00000000 00000000` |
+| fixnum | `01111111 11111001 00000000 00000000 IIIIIIII IIIIIIII IIIIIIII IIIIIIII` |
+| symbol | `01111111 11111110 00000000 00000000 SSSSSSSS SSSSSSSS SSSSSSSS SSSSSSSS` |
+| misc   | `01111111 11111111 00000000 00000000 00000000 00000000 00TTTTTT 0000MMMM` |
+| object | `01111111 11111100 PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPP00` |
+| ptr    | `01111111 11111100 PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPP01` |
+| nil    | `00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000` |
+
+The object values appear far more frequently than floating-point numbers, so we offset the value so that object pointers are unchanged. This technique is called "favor pointer".
+
+## No Boxing
+
+No boxing represents `mrb_value` by the C struct with `type` and the value union. This is the most portable (but inefficient) representation. No boxing can be specified by `MRB_NO_BOXING`, and it's default for debugging configuration (e.g. `host-debug`).

doc/internal/opcode.md

@@ -0,0 +1,136 @@
+# The new bytecode
+
+We will reimplement the VM to use 8bit instruction code. By
+bytecode, we mean real byte code. The whole purpose is
+reducing the memory consumption of mruby VM.
+
+# Instructions
+
+Instructions are bytes. There can be 256 instructions. Currently, we
+have 106 instructions. Instructions can take 0 to 3 operands.
+
+## operands
+
+The size of operands can be either 8bits, 16bits or 24bits.
+In the table.1 below, the second field describes the size
+of operands.
+
+- B: 8bit
+- S: 16bit
+- W: 24bit
+
+If the first and second operands are of type `B` (8bits), they may be
+extended to 16bits by the operand extension instruction immediately
+preceding them.
+See also `OP_EXT1`, `OP_EXT2` and `OP_EXT3`.
+
+## table.1 Instruction Table
+
+| Instruction Name   | Operand type   | Semantics                                                  |
+|--------------------|----------------|------------------------------------------------------------|
+| `OP_NOP`           | `-`            | `no operation`                                             |
+| `OP_MOVE`          | `BB`           | `R(a) = R(b)`                                              |
+| `OP_LOADL`         | `BB`           | `R(a) = Pool(b)`                                           |
+| `OP_LOADI`         | `BB`           | `R(a) = mrb_int(b)`                                        |
+| `OP_LOADINEG`      | `BB`           | `R(a) = mrb_int(-b)`                                       |
+| `OP_LOADI__1`      | `B`            | `R(a) = mrb_int(-1)`                                       |
+| `OP_LOADI_0`       | `B`            | `R(a) = mrb_int(0)`                                        |
+| `OP_LOADI_1`       | `B`            | `R(a) = mrb_int(1)`                                        |
+| `OP_LOADI_2`       | `B`            | `R(a) = mrb_int(2)`                                        |
+| `OP_LOADI_3`       | `B`            | `R(a) = mrb_int(3)`                                        |
+| `OP_LOADI_4`       | `B`            | `R(a) = mrb_int(4)`                                        |
+| `OP_LOADI_5`       | `B`            | `R(a) = mrb_int(5)`                                        |
+| `OP_LOADI_6`       | `B`            | `R(a) = mrb_int(6)`                                        |
+| `OP_LOADI_7`       | `B`            | `R(a) = mrb_int(7)`                                        |
+| `OP_LOADI16`       | `BS`           | `R(a) = mrb_int(b)`                                        |
+| `OP_LOADI32`       | `BSS`          | `R(a) = mrb_int((b<<16)+c)`                                |
+| `OP_LOADSYM`       | `BB`           | `R(a) = Syms(b)`                                           |
+| `OP_LOADNIL`       | `B`            | `R(a) = nil`                                               |
+| `OP_LOADSELF`      | `B`            | `R(a) = self`                                              |
+| `OP_LOADT`         | `B`            | `R(a) = true`                                              |
+| `OP_LOADF`         | `B`            | `R(a) = false`                                             |
+| `OP_GETGV`         | `BB`           | `R(a) = getglobal(Syms(b))`                                |
+| `OP_SETGV`         | `BB`           | `setglobal(Syms(b), R(a))`                                 |
+| `OP_GETSV`         | `BB`           | `R(a) = Special[Syms(b)]`                                  |
+| `OP_SETSV`         | `BB`           | `Special[Syms(b)] = R(a)`                                  |
+| `OP_GETIV`         | `BB`           | `R(a) = ivget(Syms(b))`                                    |
+| `OP_SETIV`         | `BB`           | `ivset(Syms(b),R(a))`                                      |
+| `OP_GETCV`         | `BB`           | `R(a) = cvget(Syms(b))`                                    |
+| `OP_SETCV`         | `BB`           | `cvset(Syms(b),R(a))`                                      |
+| `OP_GETCONST`      | `BB`           | `R(a) = constget(Syms(b))`                                 |
+| `OP_SETCONST`      | `BB`           | `constset(Syms(b),R(a))`                                   |
+| `OP_GETMCNST`      | `BB`           | `R(a) = R(a)::Syms(b)`                                     |
+| `OP_SETMCNST`      | `BB`           | `R(a+1)::Syms(b) = R(a)`                                   |
+| `OP_GETUPVAR`      | `BBB`          | `R(a) = uvget(b,c)`                                        |
+| `OP_SETUPVAR`      | `BBB`          | `uvset(b,c,R(a))`                                          |
+| `OP_GETIDX`        | `B`            | `R(a) = R(a)[R(a+1)]`                                      |
+| `OP_SETIDX`        | `B`            | `R(a)[R(a+1)] = R(a+2)`                                    |
+| `OP_JMP`           | `S`            | `pc+=a`                                                    |
+| `OP_JMPIF`         | `BS`           | `if R(a) pc+=b`                                            |
+| `OP_JMPNOT`        | `BS`           | `if !R(a) pc+=b`                                           |
+| `OP_JMPNIL`        | `BS`           | `if R(a)==nil pc+=b`                                       |
+| `OP_JMPUW`         | `S`            | `unwind_and_jump_to(a)`                                    |
+| `OP_EXCEPT`        | `B`            | `R(a) = exc`                                               |
+| `OP_RESCUE`        | `BB`           | `R(b) = R(a).isa?(R(b))`                                   |
+| `OP_RAISEIF`       | `B`            | `raise(R(a)) if R(a)`                                      |
+| `OP_SSEND`         | `BBB`          | `R(a) = self.send(Syms(b),R(a+1)..,R(a+n+1):R(a+n+2)..) (c=n\|k<<4)` |
+| `OP_SSENDB`        | `BBB`          | `R(a) = self.send(Syms(b),R(a+1)..,R(a+n+1):R(a+n+2)..,&R(a+n+2k+1))` |
+| `OP_SEND`          | `BBB`          | `R(a) = R(a).send(Syms(b),R(a+1)..,R(a+n+1):R(a+n+2)..) (c=n\|k<<4)` |
+| `OP_SENDB`         | `BBB`          | `R(a) = R(a).send(Syms(b),R(a+1)..,R(a+n+1):R(a+n+2)..,&R(a+n+2k+1))` |
+| `OP_CALL`          | `-`            | `self.call(*, **, &) (But overlay the current call frame; tailcall)` |
+| `OP_SUPER`         | `BB`           | `R(a) = super(R(a+1),... ,R(a+b+1))`                       |
+| `OP_ARGARY`        | `BS`           | `R(a) = argument array (16=m5:r1:m5:d1:lv4)`               |
+| `OP_ENTER`         | `W`            | `arg setup according to flags (23=m5:o5:r1:m5:k5:d1:b1)`   |
+| `OP_KEY_P`         | `BB`           | `R(a) = kdict.key?(Syms(b))`                               |
+| `OP_KEYEND`        | `-`            | `raise unless kdict.empty?`                                |
+| `OP_KARG`          | `BB`           | `R(a) = kdict[Syms(b)]; kdict.delete(Syms(b))`             |
+| `OP_RETURN`        | `B`            | `return R(a) (normal)`                                     |
+| `OP_RETURN_BLK`    | `B`            | `return R(a) (in-block return)`                            |
+| `OP_BREAK`         | `B`            | `break R(a)`                                               |
+| `OP_BLKPUSH`       | `BS`           | `R(a) = block (16=m5:r1:m5:d1:lv4)`                        |
+| `OP_ADD`           | `B`            | `R(a) = R(a)+R(a+1)`                                       |
+| `OP_ADDI`          | `BB`           | `R(a) = R(a)+mrb_int(b)`                                   |
+| `OP_SUB`           | `B`            | `R(a) = R(a)-R(a+1)`                                       |
+| `OP_SUBI`          | `BB`           | `R(a) = R(a)-mrb_int(b)`                                   |
+| `OP_MUL`           | `B`            | `R(a) = R(a)*R(a+1)`                                       |
+| `OP_DIV`           | `B`            | `R(a) = R(a)/R(a+1)`                                       |
+| `OP_EQ`            | `B`            | `R(a) = R(a)==R(a+1)`                                      |
+| `OP_LT`            | `B`            | `R(a) = R(a)<R(a+1)`                                       |
+| `OP_LE`            | `B`            | `R(a) = R(a)<=R(a+1)`                                      |
+| `OP_GT`            | `B`            | `R(a) = R(a)>R(a+1)`                                       |
+| `OP_GE`            | `B`            | `R(a) = R(a)>=R(a+1)`                                      |
+| `OP_ARRAY`         | `BB`           | `R(a) = ary_new(R(a),R(a+1)..R(a+b))`                      |
+| `OP_ARRAY2`        | `BBB`          | `R(a) = ary_new(R(b),R(b+1)..R(b+c))`                      |
+| `OP_ARYCAT`        | `B`            | `ary_cat(R(a),R(a+1))`                                     |
+| `OP_ARYPUSH`       | `BB`           | `ary_push(R(a),R(a+1)..R(a+b))`                            |
+| `OP_ARYSPLAT`      | `B`            | `R(a) = ary_splat(R(a))`                                   |
+| `OP_AREF`          | `BBB`          | `R(a) = R(b)[c]`                                           |
+| `OP_ASET`          | `BBB`          | `R(b)[c] = R(a)`                                           |
+| `OP_APOST`         | `BBB`          | `*R(a),R(a+1)..R(a+c) = R(a)[b..]`                         |
+| `OP_INTERN`        | `B`            | `R(a) = intern(R(a))`                                      |
+| `OP_SYMBOL`        | `BB`           | `R(a) = intern(Pool(b))`                                   |
+| `OP_STRING`        | `BB`           | `R(a) = str_dup(Pool(b))`                                  |
+| `OP_STRCAT`        | `B`            | `str_cat(R(a),R(a+1))`                                     |
+| `OP_HASH`          | `BB`           | `R(a) = hash_new(R(a),R(a+1)..R(a+b*2-1))`                 |
+| `OP_HASHADD`       | `BB`           | `hash_push(R(a),R(a+1)..R(a+b*2))`                         |
+| `OP_HASHCAT`       | `B`            | `R(a) = hash_cat(R(a),R(a+1))`                             |
+| `OP_LAMBDA`        | `BB`           | `R(a) = lambda(Irep(b),OP_L_LAMBDA)`                       |
+| `OP_BLOCK`         | `BB`           | `R(a) = lambda(Irep(b),OP_L_BLOCK)`                        |
+| `OP_METHOD`        | `BB`           | `R(a) = lambda(Irep(b),OP_L_METHOD)`                       |
+| `OP_RANGE_INC`     | `B`            | `R(a) = range_new(R(a),R(a+1),FALSE)`                      |
+| `OP_RANGE_EXC`     | `B`            | `R(a) = range_new(R(a),R(a+1),TRUE)`                       |
+| `OP_OCLASS`        | `B`            | `R(a) = ::Object`                                          |
+| `OP_CLASS`         | `BB`           | `R(a) = newclass(R(a),Syms(b),R(a+1))`                     |
+| `OP_MODULE`        | `BB`           | `R(a) = newmodule(R(a),Syms(b))`                           |
+| `OP_EXEC`          | `BB`           | `R(a) = blockexec(R(a),Irep(b))`                           |
+| `OP_DEF`           | `BB`           | `R(a).newmethod(Syms(b),R(a+1)); R(a) = Syms(b)`           |
+| `OP_ALIAS`         | `BB`           | `alias_method(target_class,Syms(a),Syms(b))`               |
+| `OP_UNDEF`         | `B`            | `undef_method(target_class,Syms(a))`                       |
+| `OP_SCLASS`        | `B`            | `R(a) = R(a).singleton_class`                              |
+| `OP_TCLASS`        | `B`            | `R(a) = target_class`                                      |
+| `OP_DEBUG`         | `BBB`          | `print a,b,c`                                              |
+| `OP_ERR`           | `B`            | `raise(LocalJumpError, Pool(a))`                           |
+| `OP_EXT1`          | `-`            | `make 1st operand (a) 16bit`                               |
+| `OP_EXT2`          | `-`            | `make 2nd operand (b) 16bit`                               |
+| `OP_EXT3`          | `-`            | `make 1st and 2nd operands 16bit`                          |
+| `OP_STOP`          | `-`            | `stop VM`                                                  |

doc/limitations.md

@@ -13,28 +13,6 @@ This document is collecting these limitations.
 This document does not contain a complete list of limitations.
 Please help to improve it by submitting your findings.
 
-## `Array` passed to `puts`
-
-Passing an Array to `puts` results in different output.
-
-```ruby
-puts [1,2,3]
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-```
-1
-2
-3
-```
-
-#### mruby [2.1.2 (2020-08-06)]
-
-```
-[1, 2, 3]
-```
-
 ## `Kernel.raise` in rescue clause
 
 `Kernel.raise` without arguments does not raise the current exception within
@@ -52,9 +30,9 @@ end
 
 `ZeroDivisionError` is raised.
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.1.0 (2022-05-12)]
 
-No exception is raised. Instead you have to do:
+`RuntimeError` is raised instead of `ZeroDivisionError`. To re-raise the exception, you have to do:
 
 ```ruby
 begin
@@ -66,7 +44,7 @@ end
 
 ## Fiber execution can't cross C function boundary
 
-mruby's `Fiber` is implemented in a similar way to Lua's co-routine. This
+mruby's `Fiber` is implemented similarly to Lua's co-routine. This
 results in the consequence that you can't switch context within C functions.
 Only exception is `mrb_fiber_yield` at return.
 
@@ -77,7 +55,7 @@ To reduce memory consumption `Array` does not support instance variables.
 ```ruby
 class Liste < Array
   def initialize(str = nil)
-    @feld = str
+    @field = str
   end
 end
 
@@ -88,14 +66,14 @@ p Liste.new "foobar"
 
 ` [] `
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.1.0 (2022-05-12)]
 
 `ArgumentError` is raised.
 
 ## Method visibility
 
 For simplicity reasons no method visibility (public/private/protected) is
-supported. Those methods are defined but they are dummy methods.
+supported. Those methods are defined, but they are dummy methods.
 
 ```ruby
 class VisibleTest
@@ -118,7 +96,7 @@ false
 true
 ```
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.1.0 (2022-05-12)]
 
 ```
 true
@@ -129,10 +107,10 @@ true
 
 The declaration form of following visibility methods are not implemented.
 
-* `public`
-* `private`
-* `protected`
-* `module_function`
+- `public`
+- `private`
+- `protected`
+- `module_function`
 
 Especially, `module_function` method is not dummy, but no declaration form.
 
@@ -155,7 +133,7 @@ p 'ok'
 ok
 ```
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.1.0 (2022-05-12)]
 
 ```
 test.rb:8: undefined method 'test_func' (NoMethodError)
@@ -177,7 +155,7 @@ defined?(Foo)
 nil
 ```
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.1.0 (2022-05-12)]
 
 `NameError` is raised.
 
@@ -194,7 +172,7 @@ alias $a $__a__
 
 ` nil `
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.1.0 (2022-05-12)]
 
 Syntax error
 
@@ -216,12 +194,12 @@ end
 `ArgumentError` is raised.
 The re-defined `+` operator does not accept any arguments.
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.1.0 (2022-05-12)]
 
 ` 'ab' `
 Behavior of the operator wasn't changed.
 
-## `Kernel#binding` is not supported
+## `Kernel#binding` is not supported until [3.0.0 (2021-03-05)]
 
 `Kernel#binding` method is not supported.
 
@@ -232,7 +210,7 @@ $ ruby -e 'puts Proc.new {}.binding'
 #<Binding:0x00000e9deabb9950>
 ```
 
-#### mruby [2.1.2 (2020-08-06)]
+#### mruby [3.0.0 (2021-03-05)]
 
 ```
 $ ./bin/mruby -e 'puts Proc.new {}.binding'
@@ -241,26 +219,11 @@ trace (most recent call last):
 -e:1: undefined method 'binding' (NoMethodError)
 ```
 
-## Keyword arguments
+#### mruby [3.1.0 (2022-05-12)]
 
-mruby keyword arguments behave slightly different from CRuby 2.5
-to make the behavior simpler and less confusing.
+`binding` has been supported since 3.1.0.
 
-#### Ruby [ruby 2.5.1p57 (2018-03-29 revision 63029)]
-
-```
-$ ruby -e 'def m(*r,**k) p [r,k] end; m("a"=>1,:b=>2)'
-[[{"a"=>1}], {:b=>2}]
-```
-
-#### mruby [mruby 2.1.2]
-
-```
-$ ./bin/mruby -e 'def m(*r,**k) p [r,k] end; m("a"=>1,:b=>2)'
-trace (most recent call last):
-	[0] -e:1
--e:1: keyword argument hash with non symbol keys (ArgumentError)
-```
+See also [mrbgems/mruby-binding](https://github.com/mruby/mruby/tree/master/mrbgems/mruby-binding) and [mrbgems/mruby-binding-core](https://github.com/mruby/mruby/tree/master/mrbgems/mruby-binding-core).
 
 ## `nil?` redefinition in conditional expressions
 
@@ -274,7 +237,7 @@ end
 puts(a.nil? ? "truthy" : "falsy")
 ```
 
-Ruby outputs `falsy`. mruby outputs `truthy`.
+Ruby outputs `truthy`. mruby outputs `falsy`.
 
 ## Argument Destructuring
 

doc/mruby3.0.md

@@ -1,5 +1,4 @@
-User visible changes in `mruby3`
-===
+# User visible changes in `mruby3.0`
 
 # Build System
 
@@ -8,17 +7,17 @@ User visible changes in `mruby3`
 Typical build configuration files are located in `build_config`
 directory. For examples:
 
-* `default`: the default configuration
-* `host-gprof`: compiles with `gprof` for performance tuning
-* `host-m32`: compiles in gcc 32bit mode on 64bit platforms
-* `boxing`: compiles all three boxing options
-* `clang-asan`: compiles with `clang`'s Address Sanitizer
+- `default`: the default configuration
+- `host-gprof`: compiles with `gprof` for performance tuning
+- `host-m32`: compiles in gcc 32bit mode on 64bit platforms
+- `boxing`: compiles all three boxing options
+- `clang-asan`: compiles with `clang`'s Address Sanitizer
 
 You can specify the build configuration file with the
 `MRUBY_CONFIG` environment variable (or `CONFIG` in short).
 If the value specified by `MRUBY_CONFIG` is not the path to
 the configuration file, `build_config/${MRUBY_CONFIG}.rb` is
-used.  So you can specify it as `rake MRUBY_CONFIG=boxing`,
+used. So you can specify it as `rake MRUBY_CONFIG=boxing`,
 for example.
 
 # Build Configuration Contribution
@@ -33,10 +32,10 @@ pull-request.
 
 We have ported some new syntax from CRuby.
 
-* Single line pattern matching (`12 => x`);
+- Single line pattern matching (`12 => x`);
   mruby matches only with local variables at the moment
-* Numbered block parameter (`x.map{_1 * 2}`)
-* End-less `def` (`def double(x) = x*2`)
+- Numbered block parameter (`x.map{_1 * 2}`)
+- End-less `def` (`def double(x) = x*2`)
 
 # Configuration Options Changed
 
@@ -60,11 +59,11 @@ Some configuration macro names are changed for consistency (use `MRB_USE_XXX`
 | `ENABLE_READLINE`              | `MRB_USE_READLINE`        |
 | `DISABLE_MIRB_UNDERSCORE`      | `MRB_NO_MIRB_UNDERSCORE`  |
 
-* `MRB_USE_FLOAT32` is changed from `MRB_USE_FLOAT` to make sure `float` here
-   means using single precision float, and not the opposite of `MRB_NO_FLOAT`.
-* `MRB_USE_METHOD_T_STRUCT` uses `struct` version of `mrb_method_t`. More
+- `MRB_USE_FLOAT32` is changed from `MRB_USE_FLOAT` to make sure `float` here
+  means using single-precision float, and not the opposite of `MRB_NO_FLOAT`.
+- `MRB_USE_METHOD_T_STRUCT` uses `struct` version of `mrb_method_t`. More
   portable but consumes more memory. Turned on by default on 32bit platforms.
-* `MRB_` prefix is added to those without.
+- `MRB_` prefix is added to those without.
 
 ## `MRB_NO_BOXING`
 
@@ -76,13 +75,13 @@ to be default `mrb_value` representation. Now the default is
 ## `MRB_WORD_BOXING`
 
 Pack `mrb_value` in an `intptr_t` integer. Consumes less
-memory compared to `MRB_NO_BOXING` especially on 32 bit
+memory compared to `MRB_NO_BOXING` especially on 32-bit
 platforms. `Fixnum` size is 31 bits so some integer values
 does not fit in `Fixnum` integers.
 
 ## `MRB_NAN_BOXING`
 
-Pack `mrb_value` in a floating pointer number. Nothing
+Pack `mrb_value` in a floating-point number. Nothing
 changed from previous versions.
 
 ## `MRB_USE_MALLOC_TRIM`
@@ -113,40 +112,40 @@ $ bin/mruby -r lib1.rb -r lib2.rb < app.mrb
 
 Instructions that access pool[i]/syms[i] where i>255.
 
-* `OP_LOADL16`
-* `OP_STRING16`
-* `OP_LOADSYM16`
+- `OP_LOADL16`
+- `OP_STRING16`
+- `OP_LOADSYM16`
 
-Instructions that load a 32 bit integer.
+Instructions that load a 32-bit integer.
 
-* `OP_LOADI32`
+- `OP_LOADI32`
 
 Instruction that unwinds jump table for rescue/ensure.
 
-* `OP_JMPUW`
+- `OP_JMPUW`
 
 Renamed from `OP_RAISE`
 
-* `OP_RAISEIF`
+- `OP_RAISEIF`
 
 Instruction that is reserved for the future keyword argument support.
 
-* OP_SENDVK
+- OP_SENDVK
 
 ## Removed Instructions
 
 Instructions for old exception handling
 
-* `OP_ONERR`
-* `OP_POPERR`
-* `OP_EPUSH`
-* `OP_EPOP`
+- `OP_ONERR`
+- `OP_POPERR`
+- `OP_EPUSH`
+- `OP_EPOP`
 
 No more operand extension
 
-* `OP_EXT1`
-* `OP_EXT2`
-* `OP_EXT3`
+- `OP_EXT1`
+- `OP_EXT2`
+- `OP_EXT3`
 
 ## Changed Instructions
 

doc/mruby3.1.md

@@ -0,0 +1,255 @@
+# User visible changes in `mruby3.1` from `mruby3.0`
+
+# New Features
+
+## Core Language Features
+
+### Keyword Arguments
+
+CRuby3.0 compatible keyword arguments are introduced.
+Keyword arguments are basically separated from ordinal arguments.
+
+### Other Language Enhancement
+
+- Implement endless-def [Ruby:Feature#16746](https://bugs.ruby-lang.org/issues/16746)
+- Replace `R-assignment` by `single-line pattern matching` [Ruby:Feature#15921](https://bugs.ruby-lang.org/issues/15921)
+- Support squiggly heredocs. [#5246](https://github.com/mruby/mruby/pull/5246)
+- Hash value omission [Ruby:Feature#14579](https://bugs.ruby-lang.org/issues/14579)
+
+## Configuration Options Changed
+
+Some configuration macros are available:
+
+- `MRB_WORDBOX_NO_FLOAT_TRUNCATE`: by default, float values are packed in the word if possible, but define this macro to allocate float values in the heap.
+- `MRB_USE_RO_DATA_P_ETEXT`: define this macro if `_etext` is available on your platform.
+- `MRB_NO_DEFAULT_RO_DATA_P`: define this macro to avoid using predefined `mrb_ro_data_p()` function
+
+---
+
+# Updated Features
+
+## New build configurations
+
+We have added several new build configurations in the `build_config` directory.
+
+- `cross-mingw-winetest.rb`
+- `cross-mingw.rb`
+- `nintendo_switch.rb`
+- `serenity.rb`
+- `minimal`: minimal configuration
+- `host-f32`: compiles with `mrb_float` as 32 bit `float`
+- `host-nofloat`: compiles with no float configuration
+- `android_arm64_v8a.rb`: renamed from `android_arm64-v8a.rb`
+
+## Core Libraries
+
+### New Methods
+
+- `Array#product`
+- `Array#repeated_combination`
+- `Array#repeated_permutation`
+- `Kernel#__ENCODING__`
+- `Random.bytes`
+- `Random#bytes`
+- `String#center`
+
+### New Gem Enhancement
+
+- `mrbgems/mruby-pack` now supports `M` directive (Q encoding)
+- `mrbgems/mruby-pack` now supports `X` directive (back-up by bytes)
+- `mrbgems/mruby-pack` now supports `@` directive (absolute position)
+- `mrbgems/mruby-pack` now supports `w` directive (BER compression)
+
+## Tools
+
+- `mruby-config` now supports `--cc` and `--ld` options.
+- Remove `OP_` prefix from `mruby -v` code dump output.
+- Prohibit use of `OP_EXT{1,2,3}` by `mrbc` with `--no-ext-ops` option.
+
+## Features for mruby Developer
+
+- Add new specifier `c` to `mrb_get_args()` for receive Class/Module.
+
+---
+
+# Breaking Changes
+
+## Incompatibly Changed Methods
+
+- `Kernel#printf` (`mruby-sprintf`) Format specifiers `%a` and `%A` are removed.
+- `Kernel#puts` (`mruby-print`) Now expand Array arguments.
+
+## mruby VM and bytecode
+
+Due to improvements in the binary format, mruby binaries are no longer backward compatible.
+To run the mruby binaries on mruby 3.1, recompile with the mruby 3.1 `mrbc`.
+
+- Upgrade mruby VM version `RITE_VM_VER` to `0300` (means mruby 3.0 or after).
+- Upgrade mruby binary version `RITE_BINARY_FORMAT_VER` to `0300`.
+
+## Reintroduced Instructions
+
+`mruby3.0` removed `OP_EXT1`, `OP_EXT2`, `OP_EXT3` for operand extension. But the operand size limitations was too tight for real-world application.
+`mruby3.1` reintroduces those extension instructions.
+
+## Removed Instructions
+
+`mruby3.1` removed following instructions.
+
+- `OP_LOADL16`
+- `OP_LOADSYM16`
+- `OP_STRING16`
+- `OP_LAMBDA16`
+- `OP_BLOCK16`
+- `OP_METHOD16`
+- `OP_EXEC16`
+
+Those instructions are no longer needed by reintroduction of extension instructions.
+
+- `OP_SENDV`
+- `OP_SENDVB`
+
+Those instructions for method calls with variable number of arguments are no longer needed. They are covered by `OP_SEND` instruction with `n=15`.
+
+## New Instructions
+
+`mruby3.1` introduces following new instructions.
+
+- `OP_GETIDX`: takes 1 operands `R[a][a+1]`
+- `OP_SETIDX`: takes 1 operands `R[a][a+1]=R[a+2]`
+- `OP_SSEND`: takes 3 operands `a=self.b(c...)`; see `OP_SEND`
+- `OP_SSENDB`: takes 3 operands `a=self.b(c...){...}`; see `OP_SEND`
+- `OP_SYMBOL`: takes 2 operands `R[a] = intern(Pool[b])`
+
+### `OP_GETIDX` and `OP_SETIDX`
+
+Execute `obj[int]` and `obj[int] = value` respectively, where `obj` is `string|array|hash`.
+
+### `OP_SSEND` and `OP_SSENDB`
+
+They are similar to `OP_SEND` and `OP_SENDB` respectively. They initialize the `R[a]` by `self` first so that we can skip one `OP_LOADSELF` instruction for each call.
+
+### `OP_SYMBOL`
+
+Extracts the character string placed in the pool as a symbol.
+
+## Changed Instructions
+
+### `OP_SEND` and `OP_SENDB`
+
+Method calling instructions are unified. Now `OP_SEND` and `OP_SENDB` (method call with a block) can support both splat arguments and keyword arguments as well.
+
+The brief description of the instructions:
+
+|`OP_SEND`   | BBB | `R[a] = R[a].call(Syms[b],R[a+1..n],R[a+n+1],R[a+n+2]..nk) c=n|nk<<4`                    |
+|`OP_SENDB`  | BBB | `R[a] = R[a].call(Syms[b],R[a+1..n],R[a+n+1..nk],R[a+n+2..nk],&R[a+n+2*nk+2]) c=n|nk<<4` |
+
+Operand C specifies the number of arguments. Lower 4 bits (`n`) represents the number of ordinal arguments, and higher 4 bits (`nk`) represents the number of keyword arguments.
+When `n == 15`, the method takes arguments packed in an array. When `nk == 15`, the method takes keyword arguments are packed in a hash.
+
+### `OP_ARYPUSH`
+
+Now takes 2 operands and pushes multiple entries to an array.
+
+## Boxing Updated
+
+### Word Boxing
+
+`MRB_WORD_BOXING` now packs floating-point numbers in the word, if the size of `mrb_float` is equal or smaller than the size of `mrb_int` by default.
+If the size of `mrb_float` and `mrb_int` are same, the last 2 bits in the `mrb_float` are trimmed and used as flags. If you need full precision, you need to define `MRB_WORDBOX_NO_FLOAT_TRUNCATE` as described above.
+
+### NaN Boxing
+
+Previous NaN boxing packs values in NaN representation, but pointer retrievals are far more frequent than floating-point number references. So we add constant offset to NaN representation to clear higher bits of pointer representation. This representation is called "Favor Pointer" NaN Boxing.
+
+Also, previous NaN boxing limit the size of `mrb_int` to 4 bytes (32 bits) to fit in NaN values. Now we allocate integer values in the heap, if the value does not fit in the 32 bit range, just like we did in Word Boxing.
+
+## Constant Folding
+
+The code generator was updated to reduce the number of instructions, e.g.
+
+```
+a = 2 * 5
+```
+
+will be interpreted as
+
+```
+a = 10
+```
+
+In addition, we have improved peephole optimizations, for example:
+
+```
+GETIV R4 :@foo
+MOVE R1 R4
+```
+
+to
+
+```
+GETIV R1 :@foo
+```
+
+## `String#hash` now use `FNV1a` algorithm
+
+For better and faster hash values.
+
+---
+
+# Major bug fixes
+
+- Fix infinite recursive call bugs in integer division [98799aa6](https://github.com/mruby/mruby/commit/98799aa6)
+- Fix to raise TypeError with super inside instance_eval / class_eval [#5476](https://github.com/mruby/mruby/pull/5476)
+- Fix to call `method_added` hooks on method definitions; [#2339](https://github.com/mruby/mruby/pull/2339)
+- Fix a potential buffer overflow in `time_zonename` [26340a88](https://github.com/mruby/mruby/commit/26340a88)
+- Fix `Module.instance_eval` bug [#5528](https://github.com/mruby/mruby/pull/5528)
+- Fix fix `M` packing bug [bfe2bd49](https://github.com/mruby/mruby/commit/bfe2bd49)
+- Fix a bug regarding attribute assignment with kargs [de2b4bd0](https://github.com/mruby/mruby/commit/de2b4bd0)
+- Fix SIGSEGV with mrbgems/mruby-method [#5580](https://github.com/mruby/mruby/pull/5580)
+- Fix print error before cleanup in `codegen_error()` [#5603](https://github.com/mruby/mruby/pull/5603)
+- Fix a bug in unpacking BER [#5611](https://github.com/mruby/mruby/pull/5611)
+- Fix a bug with numbered parameters as arguments [#5605](https://github.com/mruby/mruby/pull/5605)
+- Fix `mrb_ary_shift_m` initialization bug [27d1e013](https://github.com/mruby/mruby/commit/27d1e013)
+- Fix keyword argument with `super` [#5628](https://github.com/mruby/mruby/pull/5628)
+- Fix a bug with numbered parameters on toplevel [7e7f1b2f](https://github.com/mruby/mruby/commit/7e7f1b2f)
+- Fix keyword argument bug [#5632](https://github.com/mruby/mruby/issues/5632)
+- Fix multiple assignments in parameters [#5647](https://github.com/mruby/mruby/issues/5647)
+- Fix keyword parameters not passing through super [#5660](https://github.com/mruby/mruby/issues/5660)
+- Fix infinite loop from unclosed here-doc [#5676](https://github.com/mruby/mruby/issues/5676)
+- Fix negative integer division bug [#5678](https://github.com/mruby/mruby/issues/5678)
+
+# CVEs
+
+## Fixed CVEs
+
+Following CVEs are fixed in this release.
+
+- [CVE-2021-4110](https://nvd.nist.gov/vuln/detail/CVE-2021-4110)
+- [CVE-2021-4188](https://nvd.nist.gov/vuln/detail/CVE-2021-4188)
+- [CVE-2022-0080](https://nvd.nist.gov/vuln/detail/CVE-2022-0080)
+- [CVE-2022-0240](https://nvd.nist.gov/vuln/detail/CVE-2022-0240)
+- [CVE-2022-0326](https://nvd.nist.gov/vuln/detail/CVE-2022-0326)
+- [CVE-2022-0481](https://nvd.nist.gov/vuln/detail/CVE-2022-0481)
+- [CVE-2022-0631](https://nvd.nist.gov/vuln/detail/CVE-2022-0631)
+- [CVE-2022-0632](https://nvd.nist.gov/vuln/detail/CVE-2022-0632)
+- [CVE-2022-0890](https://nvd.nist.gov/vuln/detail/CVE-2022-0890)
+- [CVE-2022-1071](https://nvd.nist.gov/vuln/detail/CVE-2022-1071)
+- [CVE-2022-1106](https://nvd.nist.gov/vuln/detail/CVE-2022-1106)
+- [CVE-2022-1201](https://nvd.nist.gov/vuln/detail/CVE-2022-1201)
+- [CVE-2022-1427](https://nvd.nist.gov/vuln/detail/CVE-2022-1427)
+
+## Unaffected CVEs
+
+Following CVEs do not cause problems in this release. They are fixed in the later release.
+
+- [CVE-2022-0481](https://nvd.nist.gov/vuln/detail/CVE-2022-0481)
+- [CVE-2022-0525](https://nvd.nist.gov/vuln/detail/CVE-2022-0525)
+- [CVE-2022-0570](https://nvd.nist.gov/vuln/detail/CVE-2022-0570)
+- [CVE-2022-0614](https://nvd.nist.gov/vuln/detail/CVE-2022-0614)
+- [CVE-2022-0623](https://nvd.nist.gov/vuln/detail/CVE-2022-0623)
+- [CVE-2022-0630](https://nvd.nist.gov/vuln/detail/CVE-2022-0630)
+- [CVE-2022-0717](https://nvd.nist.gov/vuln/detail/CVE-2022-0817)
+- [CVE-2022-1212](https://nvd.nist.gov/vuln/detail/CVE-2022-1212)
+- [CVE-2022-1276](https://nvd.nist.gov/vuln/detail/CVE-2022-1276)
+- [CVE-2022-1286](https://nvd.nist.gov/vuln/detail/CVE-2022-1286)

doc/mruby3.2.md

@@ -0,0 +1,61 @@
+# User visible changes in `mruby3.2` from `mruby3.1`
+
+# The language
+
+- Now `a::B = c` should evaluate `a` then `c`.
+- Anonymous arguments `*`, `**`, `&` can be passed for forwarding.
+- Multi-precision integer is available now via `mruby-bigint` gem.
+
+# mruby VM and bytecode
+
+- `OP_ARYDUP` was renamed to `OP_ARYSPLAT`. The instruction name
+  was changed but instruction number and basic behavior have not
+  changed (except that `ARYDUP nil` makes `[]`).
+
+# Tools
+
+## `mruby`
+
+- `-b` only specifies the script is the binary. The files loaded by `-r` are not affected by the option.
+- `mruby` now loads complied binary if the suffix is `.mrb`.
+
+## `mrbc`
+
+- Add `--no-optimize` option to disable optimization.
+
+# mrbgems
+
+## mruby-class-ext
+
+- Add `Class#subclasses` method.
+- Add `Module#undefined_instance_methods` method.
+
+## New bundled gems
+
+- mruby-errno from [https://github.com/iij/mruby-errno.git]
+- mruby-set from [https://github.com/yui-knk/mruby-set.git]
+- mruby-dir from [https://github.com/iij/mruby-dir.git]
+
+# CVEs
+
+Following CVEs are fixed.
+
+- [CVE-2022-0080](https://nvd.nist.gov/vuln/detail/CVE-2022-0080)
+- [CVE-2022-0240](https://nvd.nist.gov/vuln/detail/CVE-2022-0240)
+- [CVE-2022-0326](https://nvd.nist.gov/vuln/detail/CVE-2022-0326)
+- [CVE-2022-0631](https://nvd.nist.gov/vuln/detail/CVE-2022-0631)
+- [CVE-2022-0481](https://nvd.nist.gov/vuln/detail/CVE-2022-0481)
+- [CVE-2022-0525](https://nvd.nist.gov/vuln/detail/CVE-2022-0525)
+- [CVE-2022-0570](https://nvd.nist.gov/vuln/detail/CVE-2022-0570)
+- [CVE-2022-0614](https://nvd.nist.gov/vuln/detail/CVE-2022-0614)
+- [CVE-2022-0623](https://nvd.nist.gov/vuln/detail/CVE-2022-0623)
+- [CVE-2022-0630](https://nvd.nist.gov/vuln/detail/CVE-2022-0630)
+- [CVE-2022-0631](https://nvd.nist.gov/vuln/detail/CVE-2022-0631)
+- [CVE-2022-0632](https://nvd.nist.gov/vuln/detail/CVE-2022-0632)
+- [CVE-2022-0717](https://nvd.nist.gov/vuln/detail/CVE-2022-0717)
+- [CVE-2022-0890](https://nvd.nist.gov/vuln/detail/CVE-2022-0890)
+- [CVE-2022-1106](https://nvd.nist.gov/vuln/detail/CVE-2022-1106)
+- [CVE-2022-1212](https://nvd.nist.gov/vuln/detail/CVE-2022-1212)
+- [CVE-2022-1276](https://nvd.nist.gov/vuln/detail/CVE-2022-1276)
+- [CVE-2022-1286](https://nvd.nist.gov/vuln/detail/CVE-2022-1286)
+- [CVE-2022-1934](https://nvd.nist.gov/vuln/detail/CVE-2022-1934)

doc/opcode.md

@@ -1,126 +0,0 @@
-# The new bytecode
-
-We will reimplement VM to use 8bit instruction code. By
-bytecode, we mean real byte code. The whole purpose is
-reducing the memory consumption of mruby VM.
-
-# Instructions
-
-Instructions are bytes. There can be 256 instructions. Currently we
-have 94 instructions. Instructions can take 0 to 3 operands.
-
-## operands
-
-The size of operands can be either 8bits, 16bits or 24bits.
-In the table.1 below, the second field describes the size (and
-sign) of operands.
-
-* B: 8bit
-* S: 16bit
-* sS: signed 16bit
-* W: 24bit
-
-## table.1 Instruction Table
-
-| Instruction Name | Operand type | Semantics                                              |
-|------------------|--------------|--------------------------------------------------------|
-| OP_NOP           | -            | no operation                                           |
-| OP_MOVE          | BB           | R(a) = R(b)                                            |
-| OP_LOADL         | BB           | R(a) = Pool(b)                                         |
-| OP_LOADI         | BB           | R(a) = mrb_int(b)                                      |
-| OP_LOADINEG      | BB           | R(a) = mrb_int(-b)                                     |
-| OP_LOADI__1      | B            | R(a) = mrb_int(-1)                                     |
-| OP_LOADI_0       | B            | R(a) = mrb_int(0)                                      |
-| OP_LOADI_1       | B            | R(a) = mrb_int(1)                                      |
-| OP_LOADI_2       | B            | R(a) = mrb_int(2)                                      |
-| OP_LOADI_3       | B            | R(a) = mrb_int(3)                                      |
-| OP_LOADI_4       | B            | R(a) = mrb_int(4)                                      |
-| OP_LOADI_5       | B            | R(a) = mrb_int(5)                                      |
-| OP_LOADI_6       | B            | R(a) = mrb_int(6)                                      |
-| OP_LOADI_7       | B            | R(a) = mrb_int(7)                                      |
-| OP_LOADI16       | BsS          | R(a) = mrb_int(b)                                      |
-| OP_LOADSYM       | BB           | R(a) = Syms(b)                                         |
-| OP_LOADNIL       | B            | R(a) = nil                                             |
-| OP_LOADSELF      | B            | R(a) = self                                            |
-| OP_LOADT         | B            | R(a) = true                                            |
-| OP_LOADF         | B            | R(a) = false                                           |
-| OP_GETGV         | BB           | R(a) = getglobal(Syms(b))                              |
-| OP_SETGV         | BB           | setglobal(Syms(b), R(a))                               |
-| OP_GETSV         | BB           | R(a) = Special[Syms(b)]                                |
-| OP_SETSV         | BB           | Special[Syms(b)] = R(a)                                |
-| OP_GETIV         | BB           | R(a) = ivget(Syms(b))                                  |
-| OP_SETIV         | BB           | ivset(Syms(b),R(a))                                    |
-| OP_GETCV         | BB           | R(a) = cvget(Syms(b))                                  |
-| OP_SETCV         | BB           | cvset(Syms(b),R(a))                                    |
-| OP_GETCONST      | BB           | R(a) = constget(Syms(b))                               |
-| OP_SETCONST      | BB           | constset(Syms(b),R(a))                                 |
-| OP_GETMCNST      | BB           | R(a) = R(a)::Syms(b)                                   |
-| OP_SETMCNST      | BB           | R(a+1)::Syms(b) = R(a)                                 |
-| OP_GETUPVAR      | BBB          | R(a) = uvget(b,c)                                      |
-| OP_SETUPVAR      | BBB          | uvset(b,c,R(a))                                        |
-| OP_JMP           | S            | pc=a                                                   |
-| OP_JMPIF         | BS           | if R(a) pc=b                                           |
-| OP_JMPNOT        | BS           | if !R(a) pc=b                                          |
-| OP_JMPNIL        | BS           | if R(a)==nil pc=b                                      |
-| OP_JMPUW         | S            | unwind_and_jump_to(a)                                  |
-| OP_EXCEPT        | B            | R(a) = exc                                             |
-| OP_RESCUE        | BB           | R(b) = R(a).isa?(R(b))                                 |
-| OP_RAISEIF       | B            | raise(R(a)) if R(a)                                    |
-| OP_SENDV         | BB           | R(a) = call(R(a),Syms(b),*R(a+1))                      |
-| OP_SENDVB        | BB           | R(a) = call(R(a),Syms(b),*R(a+1),&R(a+2))              |
-| OP_SEND          | BBB          | R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c))            |
-| OP_SENDB         | BBB          | R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c),&R(a+c+1))  |
-| OP_CALL          | -            | R(0) = self.call(frame.argc, frame.argv)               |
-| OP_SUPER         | BB           | R(a) = super(R(a+1),... ,R(a+b+1))                     |
-| OP_ARGARY        | BS           | R(a) = argument array (16=5:1:5:1:4)                   |
-| OP_ENTER         | W            | arg setup according to flags (23=5:5:1:5:5:1:1)        |
-| OP_KEY_P         | BB           | R(a) = kdict.key?(Syms(b))                             |
-| OP_KEYEND        | -            | raise unless kdict.empty?                              |
-| OP_KARG          | BB           | R(a) = kdict[Syms(b)]; kdict.delete(Syms(b))           |
-| OP_RETURN        | B            | return R(a) (normal)                                   |
-| OP_RETURN_BLK    | B            | return R(a) (in-block return)                          |
-| OP_BREAK         | B            | break R(a)                                             |
-| OP_BLKPUSH       | BS           | R(a) = block (16=5:1:5:1:4)                            |
-| OP_ADD           | B            | R(a) = R(a)+R(a+1)                                     |
-| OP_ADDI          | BB           | R(a) = R(a)+mrb_int(b)                                 |
-| OP_SUB           | B            | R(a) = R(a)-R(a+1)                                     |
-| OP_SUBI          | BB           | R(a) = R(a)-mrb_int(b)                                 |
-| OP_MUL           | B            | R(a) = R(a)*R(a+1)                                     |
-| OP_DIV           | B            | R(a) = R(a)/R(a+1)                                     |
-| OP_EQ            | B            | R(a) = R(a)==R(a+1)                                    |
-| OP_LT            | B            | R(a) = R(a)<R(a+1)                                     |
-| OP_LE            | B            | R(a) = R(a)<=R(a+1)                                    |
-| OP_GT            | B            | R(a) = R(a)>R(a+1)                                     |
-| OP_GE            | B            | R(a) = R(a)>=R(a+1)                                    |
-| OP_ARRAY         | BB           | R(a) = ary_new(R(a),R(a+1)..R(a+b))                    |
-| OP_ARRAY2        | BBB          | R(a) = ary_new(R(b),R(b+1)..R(b+c))                    |
-| OP_ARYCAT        | B            | ary_cat(R(a),R(a+1))                                   |
-| OP_ARYPUSH       | B            | ary_push(R(a),R(a+1))                                  |
-| OP_ARYDUP        | B            | R(a) = ary_dup(R(a))                                   |
-| OP_AREF          | BBB          | R(a) = R(b)[c]                                         |
-| OP_ASET          | BBB          | R(a)[c] = R(b)                                         |
-| OP_APOST         | BBB          | *R(a),R(a+1)..R(a+c) = R(a)[b..]                       |
-| OP_INTERN        | B            | R(a) = intern(R(a))                                    |
-| OP_STRING        | BB           | R(a) = str_dup(Lit(b))                                 |
-| OP_STRCAT        | B            | str_cat(R(a),R(a+1))                                   |
-| OP_HASH          | BB           | R(a) = hash_new(R(a),R(a+1)..R(a+b))                   |
-| OP_HASHADD       | BB           | R(a) = hash_push(R(a),R(a+1)..R(a+b))                  |
-| OP_HASHCAT       | B            | R(a) = hash_cat(R(a),R(a+1))                           |
-| OP_LAMBDA        | BB           | R(a) = lambda(SEQ[b],OP_L_LAMBDA)                      |
-| OP_BLOCK         | BB           | R(a) = lambda(SEQ[b],OP_L_BLOCK)                       |
-| OP_METHOD        | BB           | R(a) = lambda(SEQ[b],OP_L_METHOD)                      |
-| OP_RANGE_INC     | B            | R(a) = range_new(R(a),R(a+1),FALSE)                    |
-| OP_RANGE_EXC     | B            | R(a) = range_new(R(a),R(a+1),TRUE)                     |
-| OP_OCLASS        | B            | R(a) = ::Object                                        |
-| OP_CLASS         | BB           | R(a) = newclass(R(a),Syms(b),R(a+1))                   |
-| OP_MODULE        | BB           | R(a) = newmodule(R(a),Syms(b))                         |
-| OP_EXEC          | BB           | R(a) = blockexec(R(a),SEQ[b])                          |
-| OP_DEF           | BB           | R(a).newmethod(Syms(b),R(a+1))                         |
-| OP_ALIAS         | BB           | alias_method(target_class,Syms(a),Syms(b))             |
-| OP_UNDEF         | B            | undef_method(target_class,Syms(a))                     |
-| OP_SCLASS        | B            | R(a) = R(a).singleton_class                            |
-| OP_TCLASS        | B            | R(a) = target_class                                    |
-| OP_DEBUG         | BBB          | print a,b,c                                            |
-| OP_ERR           | B            | raise(LocalJumpError, Lit(a))                          |
-| OP_STOP          | -            | stop VM                                                |
-|------------------|--------------|--------------------------------------------------------|

examples/mrbgems/c_and_ruby_extension_example/README.md

@@ -1,4 +1,3 @@
-C and Ruby Extension Example
-=========
+# C and Ruby Extension Example
 
 This is an example gem which implements a C and Ruby extension.

examples/mrbgems/c_and_ruby_extension_example/src/example.c

@@ -5,9 +5,8 @@
 static mrb_value
 mrb_c_method(mrb_state *mrb, mrb_value self)
 {
-  mrb_value self_str = mrb_str_to_str(mrb, self);
-
-  printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self_str));
+  mrb_ensure_string_type(mrb, self);
+  printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self));
 
   return self;
 }

examples/mrbgems/c_extension_example/README.md

@@ -1,4 +1,3 @@
-C Extension Example
-=========
+# C Extension Example
 
 This is an example gem which implements a C extension.

examples/mrbgems/c_extension_example/src/example.c

@@ -5,9 +5,8 @@
 static mrb_value
 mrb_c_method(mrb_state *mrb, mrb_value self)
 {
-  mrb_value self_str = mrb_str_to_str(mrb, self);
-
-  printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self_str));
+  mrb_ensure_string_type(mrb, self);
+  printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self));
 
   return self;
 }

examples/mrbgems/cdata_extension_example/README.md

@@ -0,0 +1,3 @@
+# C Data Extension Example
+
+This is an example gem which implements a C extension with Data.

examples/mrbgems/cdata_extension_example/mrbgem.rake

@@ -0,0 +1,23 @@
+MRuby::Gem::Specification.new('cdata_extension_example') do |spec|
+  spec.license = 'MIT'
+  spec.author  = 'mruby developers'
+
+  # Add compile flags
+  # spec.cc.flags << '-g'
+
+  # Add cflags to all
+  # spec.mruby.cc.flags << '-g'
+
+  # Add libraries
+  # spec.linker.libraries << 'external_lib'
+
+  # Default build files
+  # spec.rbfiles = Dir.glob("#{dir}/mrblib/*.rb")
+  # spec.objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
+  # spec.test_rbfiles = Dir.glob("#{dir}/test/*.rb")
+  # spec.test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
+  # spec.test_preload = 'test/assert.rb'
+
+  # Values accessible as TEST_ARGS inside test scripts
+  # spec.test_args = {'tmp_dir' => Dir::tmpdir}
+end

examples/mrbgems/cdata_extension_example/src/example.c

@@ -0,0 +1,77 @@
+#include <mruby.h>
+#include <mruby/string.h>
+#include <mruby/class.h>
+#include <mruby/data.h>
+#include <stdio.h>
+
+static void mrb_foo_free(mrb_state *mrb, void *ptr) {
+  /* custom destructor */
+  mrb_free(mrb, ptr);
+}
+struct mrb_data_type mrb_foo_type = { "Foo", mrb_foo_free };
+
+struct Foo {
+  int bar;
+  char baz[32];
+};
+
+static mrb_value
+mrb_foo_initialize(mrb_state *mrb, mrb_value self)
+{
+  struct Foo *f;
+
+  f = (struct Foo*)mrb_malloc(mrb, sizeof(struct Foo));
+  f->bar = 0;
+
+  DATA_PTR(self) = f;
+  DATA_TYPE(self) = &mrb_foo_type;
+
+  return self;
+}
+
+static mrb_value
+mrb_foo_get_bar(mrb_state *mrb, mrb_value self)
+{
+  struct Foo *f;
+
+  f = (struct Foo*)mrb_data_get_ptr(mrb, self, &mrb_foo_type);
+  if(f == NULL) {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "uninitialized data");
+  }
+
+  return mrb_fixnum_value(f->bar);
+}
+
+static mrb_value
+mrb_foo_set_bar(mrb_state *mrb, mrb_value self)
+{
+  struct Foo *f;
+  int v;
+
+  f = (struct Foo*)mrb_data_get_ptr(mrb, self, &mrb_foo_type);
+  if(f == NULL) {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "uninitialized data");
+  }
+
+  mrb_get_args(mrb, "i", &v);
+
+  f->bar = v;
+
+  return mrb_fixnum_value(f->bar);
+}
+
+void
+mrb_cdata_extension_example_gem_init(mrb_state* mrb) {
+  struct RClass *class_foo;
+
+  class_foo = mrb_define_class(mrb, "Foo", mrb->object_class);
+  MRB_SET_INSTANCE_TT(class_foo, MRB_TT_CDATA);
+  mrb_define_method(mrb, class_foo, "initialize", mrb_foo_initialize, MRB_ARGS_NONE());
+  mrb_define_method(mrb, class_foo, "bar", mrb_foo_get_bar, MRB_ARGS_NONE());
+  mrb_define_method(mrb, class_foo, "bar=", mrb_foo_set_bar, MRB_ARGS_REQ(1));
+}
+
+void
+mrb_cdata_extension_example_gem_final(mrb_state* mrb) {
+  /* gem finalizer */
+}

examples/mrbgems/cdata_extension_example/test/example.c

@@ -0,0 +1,7 @@
+#include <mruby.h>
+
+void
+mrb_cdata_extension_example_gem_test(mrb_state *mrb)
+{
+  /* test initializer in C */
+}

examples/mrbgems/mruby-YOUR-bigint/TODO-HINT.md

@@ -0,0 +1,39 @@
+# Hints for creating your own bigint GEM
+
+This example gem, mruby-YOUR-bigint, is available under the Creative Commons Zero License (CC0).
+
+This file is placed for the purpose of describing hints for creating a `mruby-bigint` compatible GEM to realize multiple integers.
+
+The file structure in this example is as follows:
+
+```
++- mruby-YOUR-bigint/   <-  Make this directory public if necessary.
+    |                       Change the name of copied directory.
+    |
+    +- TODO-HINT.md     <-  This file is currently viewing by you.
+    |                       Remove this from copied directory.
+    |
+    +- core/
+    |   |
+    |   +- bigint.c     <-  Body of the implementation.
+    |
+    +- mrbgem.rake      <-  GEM name is "mruby-bigint".
+                            May be depended on by other GEMs.
+```
+
+Implementors of own bigints should copy below this directory to another directory and do the following:
+
+- Rewrite `spec.author`, `spec.license`, `spec.homepage` and `spec.summary` in `<gem-dir>/mrbgem.rake` file to those of your own implementors.
+- Implement the respective functions in `<gem-dir>/core/bigint.c`.
+  - Define and use an object structure for `MRB_TT_BIGINT` type-tag.
+    It is recommended to use `mrb_static_assert_object_size()` to ensure that the size of the object structure is within 6 words.
+- Delete this file from the destination of the copy.
+
+If you wish to use it as an alternative to the `mruby-bigint` provided by mruby, please leave the GEM name in `<gem-dir>/mrbgem.rake` as it is.
+This is an important factor when it is depended from other GEMs with `spec.add_dependency 'mruby-bigint'`.
+
+The name of the top directory of GEM can be changed arbitrarily.
+The name of the git repository can also be changed arbitrarily.
+
+Note that there is no need for an initialization function as there is in normal GEM.
+If you need it, create a file `<gem-dir>/src/bigint.c` for example, and implement the `mrb_mruby_bigint_gem_init()` function.

examples/mrbgems/mruby-YOUR-bigint/core/bigint.c

@@ -0,0 +1,70 @@
+/*
+ * If placed under the "mruby/examples/mrbgems/mruby-YOUR-bigint" directory,
+ * this file is available under the Creative Commons Zero License (CC0).
+ * Note that file is incomplete.
+ *
+ * TODO: If this file is copied and another implementation is written,
+ * remove this comment block from the copied file.
+ */
+
+#include <mruby.h>
+#include <mruby/numeric.h>
+
+/*
+ * The "mruby/internal.h" file should be placed after the other mruby header files.
+ */
+#include <mruby/internal.h>
+
+/*
+ * The "mruby/presym.h" file is placed at the end of the mruby header file.
+ */
+#include <mruby/presym.h>
+
+/*
+ * Define your own struct RBigint.
+ *
+ * - Object type must be MRB_TT_BIGINT.
+ * - If the structure is named RBigint, MRB_OBJ_ALLOC() can be used as is.
+ */
+struct RBigint {
+  /*
+   * Put MRB_OBJECT_HEADER before the first member of the structure.
+   */
+  MRB_OBJECT_HEADER;
+
+  /*
+   * Up to 3 words can be freely configured.
+   */
+  size_t len;
+  size_t capa;
+  uintptr_t *num;
+};
+
+/*
+ * Assert with mrb_static_assert_object_size() that the entire structure is within 6 words.
+ */
+mrb_static_assert_object_size(struct RBigint);
+
+/*
+ * The lower 16 bits of the object flags (`obj->flags`) can be used freely by the GEM author.
+ */
+#define MY_BIGINT_NEGATIVE_FLAG 1
+#define MY_BIGINT_NEGATIVE_P(obj) ((obj)->flags & MY_BIGINT_NEGATIVE_FLAG)
+
+/*
+ * Implement the functions declared in `#ifdef MRUBY_USE_BIGINT ... #endif` in the "mruby/internal.h" file.
+ */
+
+mrb_value
+mrb_bint_new_int(mrb_state *mrb, mrb_int x)
+{
+  struct RBigint *obj = MRB_OBJ_ALLOC(mrb, MRB_TT_BIGINT, mrb->integer_class);
+
+  ...
+
+  return mrb_obj_value(obj);
+}
+
+/*
+ * The implementation function continues...
+ */

examples/mrbgems/mruby-YOUR-bigint/mrbgem.rake

@@ -0,0 +1,12 @@
+MRuby::Gem::Specification.new('mruby-bigint') do |spec|
+  spec.author = 'YOUR-NAME-HERE'
+  spec.license = 'YOUR-LICENSE-HERE'
+  spec.summary = 'Yet another multi-precision Integer extension'
+  spec.homepage = 'https://gem.example/for/mruby-YOUR-bigint'
+  spec.build.defines << 'MRB_USE_BIGINT'
+  #spec.build.linker.libraries << 'gmp' # when uses libgmp
+
+  spec.build.libmruby_core_objs << Dir.glob(File.join(__dir__, 'core/**/*.c')).map { |fn|
+    objfile(fn.relative_path_from(__dir__).pathmap("#{spec.build_dir}/%X"))
+  }
+end

examples/mrbgems/ruby_extension_example/README.md

@@ -1,4 +1,3 @@
-Pure Ruby Extension Example
-=========
+# Pure Ruby Extension Example
 
 This is an example gem which implements a pure Ruby extension.

include/mrbconf.h

@@ -7,9 +7,6 @@
 #ifndef MRUBYCONF_H
 #define MRUBYCONF_H
 
-#include <limits.h>
-#include <stdint.h>
-
 /* architecture selection: */
 /* specify -DMRB_32BIT or -DMRB_64BIT to override */
 #if !defined(MRB_32BIT) && !defined(MRB_64BIT)
@@ -25,10 +22,10 @@
 #endif
 
 /* configuration options: */
-/* add -DMRB_USE_FLOAT32 to use float instead of double for floating point numbers */
+/* add -DMRB_USE_FLOAT32 to use float instead of double for floating-point numbers */
 //#define MRB_USE_FLOAT32
 
-/* exclude floating point numbers */
+/* exclude floating-point numbers */
 //#define MRB_NO_FLOAT
 
 /* obsolete configuration */
@@ -49,6 +46,7 @@
 //#define MRB_NO_METHOD_CACHE
 /* size of the method cache (need to be the power of 2) */
 //#define MRB_METHOD_CACHE_SIZE (1<<8)
+//#define MRB_USE_INLINE_METHOD_CACHE
 
 /* add -DMRB_USE_METHOD_T_STRUCT on machines that use higher bits of function pointers */
 /* no MRB_USE_METHOD_T_STRUCT requires highest 2 bits of function pointers to be zero */
@@ -82,6 +80,9 @@
 # define MRB_WORD_BOXING
 #endif
 
+/* if defined mruby allocates Float objects in the heap to keep full precision if needed */
+//#define MRB_WORDBOX_NO_FLOAT_TRUNCATE
+
 /* add -DMRB_INT32 to use 32bit integer for mrb_int; conflict with MRB_INT64;
    Default for 32-bit CPU mode. */
 //#define MRB_INT32
@@ -107,17 +108,33 @@
 /* string class to handle UTF-8 encoding */
 //#define MRB_UTF8_STRING
 
+/* maximum length of strings */
+/* the default value is 1MB */
+/* set this value to zero to skip the check */
+//#define MRB_STR_LENGTH_MAX 1048576
+
+/* maximum length of arrays */
+/* the default value is 2**17 entries */
+/* set this value to zero to skip the check */
+//#define MRB_ARY_LENGTH_MAX 131072
+
 /* argv max size in mrb_funcall */
 //#define MRB_FUNCALL_ARGC_MAX 16
 
 /* number of object per heap page */
 //#define MRB_HEAP_PAGE_SIZE 1024
 
-/* if __ehdr_start is available, mruby can reduce memory used by symbols */
-//#define MRB_USE_LINK_TIME_RO_DATA_P
+/* define if your platform does not support etext, edata */
+//#define MRB_NO_DEFAULT_RO_DATA_P
 
-/* if MRB_USE_LINK_TIME_RO_DATA_P does not work,
-   you can try mrb_ro_data_p() that you have implemented yourself in any file;
+/* define if your platform supports etext, edata */
+//#define MRB_USE_RO_DATA_P_ETEXT
+/* use MRB_USE_ETEXT_RO_DATA_P by default on Linux */
+#if (defined(__linux__) && !defined(__KERNEL__))
+#define MRB_USE_ETEXT_RO_DATA_P
+#endif
+
+/* you can provide and use mrb_ro_data_p() for your platform.
    prototype is `mrb_bool mrb_ro_data_p(const char *ptr)` */
 //#define MRB_USE_CUSTOM_RO_DATA_P
 
@@ -181,14 +198,6 @@
 # include <stdio.h>
 #endif
 
-#ifndef FALSE
-# define FALSE 0
-#endif
-
-#ifndef TRUE
-# define TRUE 1
-#endif
-
 /*
 ** mruby tuning profiles
 **/

include/mruby.h

@@ -1,7 +1,7 @@
 /*
 ** mruby - An embeddable Ruby implementation
 **
-** Copyright (c) mruby developers 2010-2021
+** Copyright (c) mruby developers 2010-2022
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -44,6 +44,9 @@
 #include <limits.h>
 
 #ifdef __cplusplus
+#ifndef UINTPTR_MAX
+#error Must be placed `#include <mruby.h>` before `#include <stdint.h>`
+#endif
 #ifndef SIZE_MAX
 #ifdef __SIZE_MAX__
 #define SIZE_MAX __SIZE_MAX__
@@ -66,14 +69,18 @@
 #define mrb_assert_int_fit(t1,n,t2,max) ((void)0)
 #endif
 
-#if (defined __cplusplus && __cplusplus >= 201103L) || \
+#if (defined __cplusplus && __cplusplus >= 201703L)
+# define mrb_static_assert(...) static_assert(__VA_ARGS__)
+# define mrb_static_assert1(exp) static_assert(exp)
+# define mrb_static_assert2(exp, str) static_assert(exp, str)
+#elif (defined __cplusplus && __cplusplus >= 201103L) || \
     (defined _MSC_VER) || \
     (defined __GXX_EXPERIMENTAL_CXX0X__)  /* for old G++/Clang++ */
-# define mrb_static_assert(exp, str) static_assert(exp, str)
+# define mrb_static_assert2(exp, str) static_assert(exp, str)
 #elif defined __STDC_VERSION__ && \
         ((__STDC_VERSION__ >= 201112L) || \
          (defined __GNUC__ && __GNUC__ * 100 + __GNUC_MINOR__ >= 406))
-# define mrb_static_assert(exp, str) _Static_assert(exp, str)
+# define mrb_static_assert2(exp, str) _Static_assert(exp, str)
 #else
 # /* alternative implementation of static_assert() */
 # define _mrb_static_assert_cat0(a, b) a##b
@@ -83,10 +90,26 @@
 # else
 #  define _mrb_static_assert_id(prefix) _mrb_static_assert_cat(prefix, __LINE__)
 # endif
-# define mrb_static_assert(exp, str) \
+# define mrb_static_assert2(exp, str) \
    struct _mrb_static_assert_id(_mrb_static_assert_) { char x[(exp) ? 1 : -1]; }
 #endif
-#define mrb_static_assert1(exp) mrb_static_assert(exp, #exp)
+
+#ifndef mrb_static_assert
+# define mrb_static_assert1(exp) mrb_static_assert2(exp, #exp)
+# define mrb_static_assert_expand(...) __VA_ARGS__ /* for MSVC behaviour - https://stackoverflow.com/q/5530505 */
+# define mrb_static_assert_selector(a, b, name, ...) name
+/**
+ * The `mrb_static_assert()` macro function takes one or two arguments.
+ *
+ *      !!!c
+ *      mrb_static_assert(expect_condition);
+ *      mrb_static_assert(expect_condition, error_message);
+ */
+# define mrb_static_assert(...) \
+    mrb_static_assert_expand(mrb_static_assert_selector(__VA_ARGS__, mrb_static_assert2, mrb_static_assert1, _)(__VA_ARGS__))
+#endif
+
+#define mrb_static_assert_powerof2(num) mrb_static_assert((num) > 0 && (num) == ((num) & -(num)), "need power of 2 for " #num)
 
 #include "mrbconf.h"
 
@@ -96,6 +119,7 @@
 #include <mruby/version.h>
 
 #ifndef MRB_NO_FLOAT
+#include <math.h>
 #include <float.h>
 #ifndef FLT_EPSILON
 #define FLT_EPSILON (1.19209290e-07f)
@@ -130,7 +154,7 @@ typedef uint8_t mrb_code;
  */
 typedef uint32_t mrb_aspec;
 
-struct mrb_irep;
+typedef struct mrb_irep mrb_irep;
 struct mrb_state;
 
 /**
@@ -149,10 +173,12 @@ typedef void* (*mrb_allocf) (struct mrb_state *mrb, void*, size_t, void *ud);
 #endif
 
 typedef struct {
+  uint8_t n:4;                  /* (15=*) c=n|nk<<4 */
+  uint8_t nk:4;                 /* (15=*) */
+  uint8_t cci;                  /* called from C function */
   mrb_sym mid;
-  int16_t argc;
-  int16_t acc;
   const struct RProc *proc;
+  struct RProc *blk;
   mrb_value *stack;
   const mrb_code *pc;           /* current address on iseq of this proc */
   union {
@@ -185,6 +211,7 @@ struct mrb_context {
 
 #ifdef MRB_METHOD_CACHE_SIZE
 # undef MRB_NO_METHOD_CACHE
+mrb_static_assert_powerof2(MRB_METHOD_CACHE_SIZE);
 #else
 /* default method cache size: 256 */
 /* cache size needs to be power of 2 */
@@ -265,7 +292,9 @@ typedef struct mrb_state {
 #endif
 
   mrb_sym symidx;
-  struct symbol_name *symtbl;   /* symbol table */
+  const char **symtbl;
+  uint8_t *symlink;
+  uint8_t *symflags;
   mrb_sym symhash[256];
   size_t symcapa;
 #ifndef MRB_USE_ALL_SYMBOLS
@@ -284,7 +313,7 @@ typedef struct mrb_state {
   struct RClass *eException_class;
   struct RClass *eStandardError_class;
   struct RObject *nomem_err;              /* pre-allocated NoMemoryError */
-  struct RObject *stack_err;              /* pre-allocated SysStackError */
+  struct RObject *stack_err;              /* pre-allocated SystemStackError */
 #ifdef MRB_GC_FIXED_ARENA
   struct RObject *arena_err;              /* pre-allocated arena overflow error */
 #endif
@@ -333,7 +362,18 @@ MRB_API struct RClass *mrb_define_class_id(mrb_state *mrb, mrb_sym name, struct
 MRB_API struct RClass *mrb_define_module(mrb_state *mrb, const char *name);
 MRB_API struct RClass *mrb_define_module_id(mrb_state *mrb, mrb_sym name);
 
+/**
+ * Returns the singleton class of an object.
+ *
+ * Raises a `TypeError` exception for immediate values.
+ */
 MRB_API mrb_value mrb_singleton_class(mrb_state *mrb, mrb_value val);
+
+/**
+ * Returns the singleton class of an object.
+ *
+ * Returns `NULL` for immediate values,
+ */
 MRB_API struct RClass *mrb_singleton_class_ptr(mrb_state *mrb, mrb_value val);
 
 /**
@@ -658,9 +698,9 @@ MRB_API struct RClass * mrb_module_new(mrb_state *mrb);
  *       example_class = mrb_define_class(mrb, "ExampleClass", mrb->object_class);
  *       cd = mrb_class_defined(mrb, "ExampleClass");
  *
- *       // If mrb_class_defined returns 1 then puts "True"
- *       // If mrb_class_defined returns 0 then puts "False"
- *       if (cd == 1){
+ *       // If mrb_class_defined returns TRUE then puts "True"
+ *       // If mrb_class_defined returns FALSE then puts "False"
+ *       if (cd) {
  *         puts("True");
  *       }
  *       else {
@@ -707,9 +747,9 @@ MRB_API struct RClass* mrb_exc_get_id(mrb_state *mrb, mrb_sym name);
  *       example_inner = mrb_define_class_under(mrb, example_outer, "ExampleInner", mrb->object_class);
  *       cd = mrb_class_defined_under(mrb, example_outer, "ExampleInner");
  *
- *       // If mrb_class_defined_under returns 1 then puts "True"
- *       // If mrb_class_defined_under returns 0 then puts "False"
- *       if (cd == 1){
+ *       // If mrb_class_defined_under returns TRUE then puts "True"
+ *       // If mrb_class_defined_under returns FALSE then puts "False"
+ *       if (cd) {
  *         puts("True");
  *       }
  *       else {
@@ -793,14 +833,14 @@ MRB_API mrb_value mrb_obj_dup(mrb_state *mrb, mrb_value obj);
  *        example_class = mrb_define_class(mrb, "ExampleClass", mrb->object_class);
  *        mrb_define_method(mrb, example_class, "example_method", exampleMethod, MRB_ARGS_NONE());
  *        mid = mrb_intern_str(mrb, mrb_str_new_lit(mrb, "example_method" ));
- *        obj_resp = mrb_obj_respond_to(mrb, example_class, mid); // => 1(true in Ruby world)
+ *        obj_resp = mrb_obj_respond_to(mrb, example_class, mid); // => TRUE (true in Ruby world)
  *
- *        // If mrb_obj_respond_to returns 1 then puts "True"
- *        // If mrb_obj_respond_to returns 0 then puts "False"
- *        if (obj_resp == 1) {
+ *        // If mrb_obj_respond_to returns TRUE then puts "True"
+ *        // If mrb_obj_respond_to returns FALSE then puts "False"
+ *        if (obj_resp) {
  *          puts("True");
  *        }
- *        else if (obj_resp == 0) {
+ *        else {
  *          puts("False");
  *        }
  *      }
@@ -886,19 +926,20 @@ MRB_API struct RClass* mrb_define_module_under_id(mrb_state *mrb, struct RClass
  * | char | Ruby type      | C types           | Notes                                              |
  * |:----:|----------------|-------------------|----------------------------------------------------|
  * | `o`  | {Object}       | {mrb_value}       | Could be used to retrieve any type of argument     |
- * | `C`  | {Class}/{Module} | {mrb_value}     |                                                    |
+ * | `C`  | {Class}/{Module} | {mrb_value}     | when `!` follows, the value may be `nil`           |
  * | `S`  | {String}       | {mrb_value}       | when `!` follows, the value may be `nil`           |
  * | `A`  | {Array}        | {mrb_value}       | when `!` follows, the value may be `nil`           |
  * | `H`  | {Hash}         | {mrb_value}       | when `!` follows, the value may be `nil`           |
  * | `s`  | {String}       | const char *, {mrb_int} | Receive two arguments; `s!` gives (`NULL`,`0`) for `nil` |
  * | `z`  | {String}       | const char *      | `NULL` terminated string; `z!` gives `NULL` for `nil` |
  * | `a`  | {Array}        | const {mrb_value} *, {mrb_int} | Receive two arguments; `a!` gives (`NULL`,`0`) for `nil` |
+ * | `c`  | {Class}/{Module} | strcut RClass * | `c!` gives `NULL` for `nil`                        |
  * | `f`  | {Integer}/{Float} | {mrb_float}    |                                                    |
  * | `i`  | {Integer}/{Float} | {mrb_int}      |                                                    |
  * | `b`  | boolean        | {mrb_bool}        |                                                    |
  * | `n`  | {String}/{Symbol} | {mrb_sym}         |                                                    |
  * | `d`  | data           | void *, {mrb_data_type} const | 2nd argument will be used to check data type so it won't be modified; when `!` follows, the value may be `nil` |
- * | `I`  | inline struct  | void *          |                                                    |
+ * | `I`  | inline struct  | void *, struct RClass | `I!` gives `NULL` for `nil`                    |
  * | `&`  | block          | {mrb_value}       | &! raises exception if no block given.             |
  * | `*`  | rest arguments | const {mrb_value} *, {mrb_int} | Receive the rest of arguments as an array; `*!` avoid copy of the stack.  |
  * | <code>\|</code> | optional     |                   | After this spec following specs would be optional. |
@@ -906,20 +947,27 @@ MRB_API struct RClass* mrb_define_module_under_id(mrb_state *mrb, struct RClass
  * | `:`  | keyword args   | {mrb_kwargs} const | Get keyword arguments. @see mrb_kwargs |
  *
  * @see mrb_get_args
+ *
+ * Immediately after format specifiers it can add format modifiers:
+ *
+ * | char | Notes                                                                                   |
+ * |:----:|-----------------------------------------------------------------------------------------|
+ * | `!`  | Switch to the alternate mode; The behaviour changes depending on the format specifier   |
+ * | `+`  | Request a not frozen object; However, except nil value                                  |
  */
 typedef const char *mrb_args_format;
 
 /**
  * Get keyword arguments by `mrb_get_args()` with `:` specifier.
  *
- * `mrb_kwargs::num` indicates that the number of keyword values.
+ * `mrb_kwargs::num` indicates that the total number of keyword values.
  *
- * `mrb_kwargs::values` is an object array, and the keyword argument corresponding to the string array is assigned.
- * Note that `undef` is assigned if there is no keyword argument corresponding to `mrb_kwargs::optional`.
+ * `mrb_kwargs::required` indicates that the specified number of keywords starting from the beginning of the `mrb_sym` array are required.
  *
- * `mrb_kwargs::table` accepts a string array.
+ * `mrb_kwargs::table` accepts a `mrb_sym` array of C.
  *
- * `mrb_kwargs::required` indicates that the specified number of keywords starting from the beginning of the string array are required.
+ * `mrb_kwargs::values` is an object array of C, and the keyword argument corresponding to the `mrb_sym` array is assigned.
+ * Note that `undef` is assigned if there is no keyword argument corresponding over `mrb_kwargs::required` to `mrb_kwargs::num`.
  *
  * `mrb_kwargs::rest` is the remaining keyword argument that can be accepted as `**rest` in Ruby.
  * If `NULL` is specified, `ArgumentError` is raised when there is an undefined keyword.
@@ -928,11 +976,11 @@ typedef const char *mrb_args_format;
  *
  *      // def method(a: 1, b: 2)
  *
- *      uint32_t kw_num = 2;
- *      const char *kw_names[kw_num] = { "a", "b" };
- *      uint32_t kw_required = 0;
+ *      mrb_int kw_num = 2;
+ *      mrb_int kw_required = 0;
+ *      mrb_sym kw_names[] = { mrb_intern_lit(mrb, "a"), mrb_intern_lit(mrb, "b") };
  *      mrb_value kw_values[kw_num];
- *      const mrb_kwargs kwargs = { kw_num, kw_required, kw_names, kw_values, NULL };
+ *      mrb_kwargs kwargs = { kw_num, kw_required, kw_names, kw_values, NULL };
  *
  *      mrb_get_args(mrb, ":", &kwargs);
  *      if (mrb_undef_p(kw_values[0])) { kw_values[0] = mrb_fixnum_value(1); }
@@ -943,10 +991,12 @@ typedef const char *mrb_args_format;
  *
  *      mrb_value str, kw_rest;
  *      uint32_t kw_num = 3;
- *      const mrb_sym kw_names[kw_num] = { MRB_SYM(x), MRB_SYM(y), MRB_SYM(z) };
  *      uint32_t kw_required = 1;
+ *      // Note that `#include <mruby/presym.h>` is required beforehand because `MRB_SYM()` is used.
+ *      // If the usage of `MRB_SYM()` is not desired, replace it with `mrb_intern_lit()`.
+ *      mrb_sym kw_names[] = { MRB_SYM(x), MRB_SYM(y), MRB_SYM(z) };
  *      mrb_value kw_values[kw_num];
- *      const mrb_kwargs kwargs = { kw_num, kw_required, kw_names, kw_values, &kw_rest };
+ *      mrb_kwargs kwargs = { kw_num, kw_required, kw_names, kw_values, &kw_rest };
  *
  *      mrb_get_args(mrb, "S:", &str, &kwargs);
  *      // or: mrb_get_args(mrb, ":S", &kwargs, &str);
@@ -957,8 +1007,8 @@ typedef struct mrb_kwargs mrb_kwargs;
 
 struct mrb_kwargs
 {
-  uint32_t num;                 /* number of keyword arguments */
-  uint32_t required;            /* number of required keyword arguments */
+  mrb_int num;                  /* number of keyword arguments */
+  mrb_int required;             /* number of required keyword arguments */
   const mrb_sym *table;         /* C array of symbols for keyword names */
   mrb_value *values;            /* keyword argument values */
   mrb_value *rest;              /* keyword rest (dict) */
@@ -976,6 +1026,13 @@ struct mrb_kwargs
  */
 MRB_API mrb_int mrb_get_args(mrb_state *mrb, mrb_args_format format, ...);
 
+/**
+ * Array version of mrb_get_args()
+ *
+ * @param ptr Array of void*, in the same order as the varargs version.
+ */
+MRB_API mrb_int mrb_get_args_a(mrb_state *mrb, mrb_args_format format, void** ptr);
+
 MRB_INLINE mrb_sym
 mrb_get_mid(mrb_state *mrb) /* get method symbol */
 {
@@ -1004,6 +1061,11 @@ MRB_API const mrb_value *mrb_get_argv(mrb_state *mrb);
  */
 MRB_API mrb_value mrb_get_arg1(mrb_state *mrb);
 
+/**
+ * Check if a block argument is given from mrb_state.
+ */
+MRB_API mrb_bool mrb_block_given_p(mrb_state *mrb);
+
 /* `strlen` for character string literals (use with caution or `strlen` instead)
     Adjacent string literals are concatenated in C/C++ in translation phase 6.
     If `lit` is not one, the compiler will report a syntax error:
@@ -1126,13 +1188,24 @@ MRB_API void *mrb_malloc_simple(mrb_state*, size_t);  /* return NULL if no memor
 MRB_API struct RBasic *mrb_obj_alloc(mrb_state*, enum mrb_vtype, struct RClass*);
 MRB_API void mrb_free(mrb_state*, void*);
 
-MRB_API mrb_value mrb_str_new(mrb_state *mrb, const char *p, size_t len);
+/**
+ * Allocates a Ruby object that matches the constant literal defined in
+ * `enum mrb_vtype` and returns a pointer to the corresponding C type.
+ *
+ * @param mrb   The current mruby state
+ * @param tt    The constant literal of `enum mrb_vtype`
+ * @param klass A Class object
+ * @return      Reference to the newly created object
+ */
+#define MRB_OBJ_ALLOC(mrb, tt, klass) ((MRB_VTYPE_TYPEOF(tt)*)mrb_obj_alloc(mrb, tt, klass))
+
+MRB_API mrb_value mrb_str_new(mrb_state *mrb, const char *p, mrb_int len);
 
 /**
  * Turns a C string into a Ruby string value.
  */
 MRB_API mrb_value mrb_str_new_cstr(mrb_state*, const char*);
-MRB_API mrb_value mrb_str_new_static(mrb_state *mrb, const char *p, size_t len);
+MRB_API mrb_value mrb_str_new_static(mrb_state *mrb, const char *p, mrb_int len);
 #define mrb_str_new_lit(mrb, lit) mrb_str_new_static(mrb, (lit), mrb_strlen_lit(lit))
 
 MRB_API mrb_value mrb_obj_freeze(mrb_state*, mrb_value);
@@ -1219,10 +1292,11 @@ MRB_API mrb_sym mrb_obj_to_sym(mrb_state *mrb, mrb_value name);
 MRB_API mrb_bool mrb_obj_eq(mrb_state *mrb, mrb_value a, mrb_value b);
 MRB_API mrb_bool mrb_obj_equal(mrb_state *mrb, mrb_value a, mrb_value b);
 MRB_API mrb_bool mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
-MRB_API mrb_value mrb_convert_to_integer(mrb_state *mrb, mrb_value val, mrb_int base);
-MRB_API mrb_value mrb_Integer(mrb_state *mrb, mrb_value val);
 #ifndef MRB_NO_FLOAT
-MRB_API mrb_value mrb_Float(mrb_state *mrb, mrb_value val);
+MRB_API mrb_value mrb_ensure_float_type(mrb_state *mrb, mrb_value val);
+#define mrb_as_float(mrb, x) mrb_float(mrb_ensure_float_type(mrb, x))
+/* obsolete: use mrb_ensure_float_type() instead */
+#define mrb_to_float(mrb, val) mrb_ensure_float_type(mrb, val)
 #endif
 MRB_API mrb_value mrb_inspect(mrb_state *mrb, mrb_value obj);
 MRB_API mrb_bool mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
@@ -1283,7 +1357,7 @@ MRB_API mrb_value mrb_obj_clone(mrb_state *mrb, mrb_value self);
 #define TOLOWER(c) (ISUPPER(c) ? ((c) | 0x20) : (c))
 #endif
 
-MRB_API mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len);
+MRB_API mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, mrb_int len);
 MRB_API mrb_noreturn void mrb_exc_raise(mrb_state *mrb, mrb_value exc);
 
 MRB_API mrb_noreturn void mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg);
@@ -1339,10 +1413,28 @@ MRB_API void mrb_gc_register(mrb_state *mrb, mrb_value obj);
 /* mrb_gc_unregister() removes the object from GC root. */
 MRB_API void mrb_gc_unregister(mrb_state *mrb, mrb_value obj);
 
-MRB_API mrb_value mrb_to_int(mrb_state *mrb, mrb_value val);
-#define mrb_int(mrb, val) mrb_integer(mrb_to_int(mrb, val))
+/* type conversion/check functions */
+MRB_API mrb_value mrb_ensure_array_type(mrb_state *mrb, mrb_value self);
+MRB_API mrb_value mrb_check_array_type(mrb_state *mrb, mrb_value self);
+MRB_API mrb_value mrb_ensure_hash_type(mrb_state *mrb, mrb_value hash);
+MRB_API mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash);
+MRB_API mrb_value mrb_ensure_string_type(mrb_state *mrb, mrb_value str);
+MRB_API mrb_value mrb_check_string_type(mrb_state *mrb, mrb_value str);
+/* obsolete: use mrb_ensure_string_type() instead */
+#define mrb_string_type(mrb, str) mrb_ensure_string_type(mrb,str)
+#define mrb_to_str(mrb, str) mrb_ensure_string_type(mrb,str)
+/* obsolete: use mrb_obj_as_string() instead */
+#define mrb_str_to_str(mrb, str) mrb_obj_as_string(mrb, str)
+/* check if val is an integer (including Bigint) */
+MRB_API mrb_value mrb_ensure_integer_type(mrb_state *mrb, mrb_value val);
+/* check if val fit in mrb_int */
+MRB_API mrb_value mrb_ensure_int_type(mrb_state *mrb, mrb_value val);
+#define mrb_as_int(mrb, val) mrb_integer(mrb_ensure_int_type(mrb, val))
+/* obsolete: use mrb_ensure_int_type() instead */
+#define mrb_to_integer(mrb, val) mrb_ensure_int_type(mrb, val)
+#define mrb_to_int(mrb, val) mrb_ensure_int_type(mrb, val)
+
 /* string type checking (contrary to the name, it doesn't convert) */
-MRB_API mrb_value mrb_to_str(mrb_state *mrb, mrb_value val);
 MRB_API void mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t);
 
 MRB_INLINE void mrb_check_frozen(mrb_state *mrb, void *o)
@@ -1361,11 +1453,17 @@ MRB_API mrb_bool mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid);
 MRB_API mrb_bool mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c);
 MRB_API mrb_bool mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func);
 
+/* obsolete function(s); will be removed */
+#define mrb_int(mrb, val) mrb_as_int(mrb, val)
 
 /**
  * Resume a Fiber
  *
  * Implemented in mruby-fiber
+ *
+ * Switches to the specified fiber and executes. Like the `Fiber#resume` method.
+ *
+ * @note It can only be called before entering the mruby VM (e.g. in the `main()` function).
  */
 MRB_API mrb_value mrb_fiber_resume(mrb_state *mrb, mrb_value fib, mrb_int argc, const mrb_value *argv);
 
@@ -1373,6 +1471,15 @@ MRB_API mrb_value mrb_fiber_resume(mrb_state *mrb, mrb_value fib, mrb_int argc,
  * Yield a Fiber
  *
  * Implemented in mruby-fiber
+ *
+ * Passes control to the caller fiber of the running fiber. Like the `Fiber.yield` method.
+ *
+ * @note This function is only available from inside a function defined as a method by,
+ *       for example, `mrb_define_method()`.
+ *       Also, the work following `mrb_fiber_yield()` cannot be performed,
+ *       and the return value of `mrb_fiber_yield()` must be returned as is.
+ *
+ *           return mrb_fiber_yield(mrb, argc, argv);
  */
 MRB_API mrb_value mrb_fiber_yield(mrb_state *mrb, mrb_int argc, const mrb_value *argv);
 

include/mruby/array.h

@@ -14,15 +14,17 @@
  */
 MRB_BEGIN_DECL
 
-
 typedef struct mrb_shared_array {
   int refcnt;
   mrb_ssize len;
   mrb_value *ptr;
 } mrb_shared_array;
 
-#if defined(MRB_32BIT) && defined(MRB_NO_BOXING)
+#if defined(MRB_32BIT) && defined(MRB_NO_BOXING) && !defined(MRB_USE_FLOAT32) && !defined(MRB_ARY_NO_EMBED)
 # define MRB_ARY_NO_EMBED
+#endif
+
+#ifdef MRB_ARY_NO_EMBED
 # define MRB_ARY_EMBED_LEN_MAX 0
 #else
 # define MRB_ARY_EMBED_LEN_MAX ((mrb_int)(sizeof(void*)*3/sizeof(mrb_value)))
@@ -65,7 +67,7 @@ struct RArray {
 #define ARY_EMBED_PTR(a) ((a)->as.ary)
 #endif
 
-#define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(a)->as.heap.len)
+#define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(mrb_int)(a)->as.heap.len)
 #define ARY_PTR(a) (ARY_EMBED_P(a)?ARY_EMBED_PTR(a):(a)->as.heap.ptr)
 #define RARRAY_LEN(a) ARY_LEN(RARRAY(a))
 #define RARRAY_PTR(a) ARY_PTR(RARRAY(a))
@@ -83,7 +85,6 @@ struct RArray {
 #define ARY_SET_SHARED_FLAG(a) ((a)->flags |= MRB_ARY_SHARED)
 #define ARY_UNSET_SHARED_FLAG(a) ((a)->flags &= ~MRB_ARY_SHARED)
 
-void mrb_ary_decref(mrb_state*, mrb_shared_array*);
 MRB_API void mrb_ary_modify(mrb_state*, struct RArray*);
 MRB_API mrb_value mrb_ary_new_capa(mrb_state*, mrb_int);
 
@@ -107,7 +108,7 @@ MRB_API mrb_value mrb_ary_new(mrb_state *mrb);
  *      Array[value1, value2, ...]
  *
  * @param mrb The mruby state reference.
- * @param size The numer of values.
+ * @param size The number of values.
  * @param vals The actual values.
  * @return The initialized array.
  */
@@ -176,20 +177,6 @@ MRB_API void mrb_ary_push(mrb_state *mrb, mrb_value array, mrb_value value);
  */
 MRB_API mrb_value mrb_ary_pop(mrb_state *mrb, mrb_value ary);
 
-/*
- * Returns a reference to an element of the array on the given index.
- *
- * Equivalent to:
- *
- *      ary[n]
- *
- * @param mrb The mruby state reference.
- * @param ary The target array.
- * @param n The array index being referenced
- * @return The referenced value.
- */
-MRB_API mrb_value mrb_ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n);
-
 /*
  * Sets a value on an array at the given index
  *
@@ -200,7 +187,7 @@ MRB_API mrb_value mrb_ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n);
  * @param mrb The mruby state reference.
  * @param ary The target array.
  * @param n The array index being referenced.
- * @param val The value being setted.
+ * @param val The value being set.
  */
 MRB_API void mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val);
 
@@ -216,8 +203,6 @@ MRB_API void mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val
  * @param other The array to replace it with.
  */
 MRB_API void mrb_ary_replace(mrb_state *mrb, mrb_value self, mrb_value other);
-MRB_API mrb_value mrb_ensure_array_type(mrb_state *mrb, mrb_value self);
-MRB_API mrb_value mrb_check_array_type(mrb_state *mrb, mrb_value self);
 
 /*
  * Unshift an element into the array
@@ -243,6 +228,7 @@ MRB_API mrb_value mrb_ary_unshift(mrb_state *mrb, mrb_value self, mrb_value item
  * @param offset The element position (negative counts from the tail).
  */
 MRB_API mrb_value mrb_ary_entry(mrb_value ary, mrb_int offset);
+#define mrb_ary_ref(mrb, ary, n) mrb_ary_entry(ary, n)
 
 /*
  * Replace subsequence of an array.
@@ -309,8 +295,6 @@ MRB_API mrb_value mrb_ary_join(mrb_state *mrb, mrb_value ary, mrb_value sep);
  */
 MRB_API mrb_value mrb_ary_resize(mrb_state *mrb, mrb_value ary, mrb_int new_len);
 
-/* helper functions */
-mrb_value mrb_ary_subseq(mrb_state *mrb, mrb_value ary, mrb_int beg, mrb_int len);
 
 MRB_END_DECL
 

include/mruby/boxing_nan.h

@@ -15,116 +15,145 @@
 # error ---->> MRB_NAN_BOXING and MRB_NO_FLOAT conflict <<----
 #endif
 
-#ifdef MRB_INT64
-# error ---->> MRB_NAN_BOXING and MRB_INT64 conflict <<----
-#endif
-
-#define MRB_FIXNUM_SHIFT 0
-#define MRB_SYMBOL_SHIFT 0
 #define MRB_FIXNUM_MIN INT32_MIN
 #define MRB_FIXNUM_MAX INT32_MAX
 
+enum mrb_nanbox_tt_inline {
+  MRB_NANBOX_TT_OBJECT = 0,
+  MRB_NANBOX_TT_INTEGER = 1,
+  MRB_NANBOX_TT_MISC = 2,
+  MRB_NANBOX_TT_CPTR = 3,
+};
+
 /* value representation by nan-boxing:
- *   float : FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF
- *   object: 111111111111TTTT TTPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP
- *   int   : 1111111111110001 0000000000000000 IIIIIIIIIIIIIIII IIIIIIIIIIIIIIII
- *   sym   : 1111111111110001 0100000000000000 SSSSSSSSSSSSSSSS SSSSSSSSSSSSSSSS
- * In order to get enough bit size to save TT, all pointers are shifted 2 bits
- * in the right direction. Also, TTTTTT is the mrb_vtype + 1;
+ *   float : SEEEEEEE EEEEFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF
+ *   +/-inf: S1111111 11110000 00000000 00000000 00000000 00000000 00000000 00000000
+ *   nan   : 01111111 11111000 00000000 00000000 00000000 00000000 00000000 00000000
+ *   int   : 01111111 11111001 00000000 00000000 IIIIIIII IIIIIIII IIIIIIII IIIIIIII
+ *   sym   : 01111111 11111110 00000000 00TTTTTT SSSSSSSS SSSSSSSS SSSSSSSS SSSSSSSS
+ *   misc  : 01111111 11111110 00000000 00TTTTTT 00000000 00000000 00000000 0000MMMM
+ *   object: 01111111 11111100 PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPP00
+ *   cptr  : 01111111 11111111 PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP
+ * Stored as O = R + 0x8004000000000000, retrieved as R = O - 0x8004000000000000.
+ * This makes pointers have all zeros in the top 32 bits.
  */
 typedef struct mrb_value {
   uint64_t u;
 } mrb_value;
 
-union mrb_value_ {
-  mrb_float f;
-  uint64_t u;
-#ifdef MRB_64BIT
-  void *p;
-# define BOXNAN_IMMEDIATE_VALUE uint32_t i
-#else
-# define BOXNAN_IMMEDIATE_VALUE union { uint32_t i; void *p; }
-#endif
-  struct {
-    MRB_ENDIAN_LOHI(
-      uint32_t ttt;
-      ,BOXNAN_IMMEDIATE_VALUE;
-    )
-  };
-  mrb_value value;
-};
-
-mrb_static_assert1(sizeof(mrb_value) == sizeof(union mrb_value_));
-
-static inline union mrb_value_
-mrb_val_union(mrb_value v)
+static inline mrb_float
+mrb_nan_boxing_value_float(mrb_value v)
 {
-  union mrb_value_ x;
-  x.value = v;
-  return x;
+  union {
+    mrb_float f;
+    uint64_t u;
+  } x;
+  x.u = v.u - 0x8004000000000000;
+  return x.f;
 }
 
-#define mrb_tt(o)       ((enum mrb_vtype)((mrb_val_union(o).ttt & 0xfc000)>>14)-1)
-#define mrb_type(o)     (enum mrb_vtype)((uint32_t)0xfff00000 < mrb_val_union(o).ttt ? mrb_tt(o) : MRB_TT_FLOAT)
-#define mrb_float(o)    mrb_val_union(o).f
-#define mrb_fixnum(o)   ((mrb_int)mrb_val_union(o).i)
-#define mrb_integer(o)  mrb_fixnum(o)
-#define mrb_symbol(o)   ((mrb_sym)mrb_val_union(o).i)
-
-#ifdef MRB_64BIT
-#define mrb_ptr(o)      ((void*)((((uintptr_t)0x3fffffffffff)&((uintptr_t)(mrb_val_union(o).p)))<<2))
-#define mrb_cptr(o)     (((struct RCptr*)mrb_ptr(o))->p)
-#define BOXNAN_SHIFT_LONG_POINTER(v) (((uintptr_t)(v)>>34)&0x3fff)
-#else
-#define mrb_ptr(o)      ((void*)mrb_val_union(o).i)
-#define mrb_cptr(o)     mrb_ptr(o)
-#define BOXNAN_SHIFT_LONG_POINTER(v) 0
-#endif
-
-#define BOXNAN_SET_VALUE(o, tt, attr, v) do { \
-  union mrb_value_ mrb_value_union_variable; \
-  mrb_value_union_variable.attr = (v);\
-  mrb_value_union_variable.ttt = 0xfff00000 | (((tt)+1)<<14);\
-  o = mrb_value_union_variable.value;\
-} while (0)
-
-#ifdef MRB_64BIT
-#define BOXNAN_SET_OBJ_VALUE(o, tt, v) do {\
-  union mrb_value_ mrb_value_union_variable;\
-  mrb_value_union_variable.p = (void*)((uintptr_t)(v)>>2);\
-  mrb_value_union_variable.ttt = (0xfff00000|(((tt)+1)<<14)|BOXNAN_SHIFT_LONG_POINTER(v));\
-  o = mrb_value_union_variable.value;\
-} while (0)
-#else
-#define BOXNAN_SET_OBJ_VALUE(o, tt, v) BOXNAN_SET_VALUE(o, tt, i, (uint32_t)v)
-#endif
-
-#define SET_FLOAT_VALUE(mrb,r,v) do { \
-  union mrb_value_ mrb_value_union_variable; \
-  if ((v) != (v)) { /* NaN */ \
-    mrb_value_union_variable.ttt = 0x7ff80000; \
-    mrb_value_union_variable.i = 0; \
+#define SET_FLOAT_VALUE(mrb,r,f) do { \
+  union { \
+    mrb_float f; \
+    uint64_t u; \
+  } float_uint_union; \
+  if ((f) != (f)) { /* NaN */ \
+    float_uint_union.u = 0x7ff8000000000000UL; \
   } \
   else { \
-    mrb_value_union_variable.f = (v); \
+    float_uint_union.f = (f); \
   } \
-  r = mrb_value_union_variable.value; \
+  r.u = float_uint_union.u + 0x8004000000000000; \
 } while(0)
 
-#define SET_NIL_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_FALSE, i, 0)
-#define SET_FALSE_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_FALSE, i, 1)
-#define SET_TRUE_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_TRUE, i, 1)
-#define SET_BOOL_VALUE(r,b) BOXNAN_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, i, 1)
-#define SET_INT_VALUE(mrb, r,n) BOXNAN_SET_VALUE(r, MRB_TT_INTEGER, i, (uint32_t)(n))
-#define SET_FIXNUM_VALUE(r,n) BOXNAN_SET_VALUE(r, MRB_TT_INTEGER, i, (uint32_t)(n))
-#define SET_SYM_VALUE(r,v) BOXNAN_SET_VALUE(r, MRB_TT_SYMBOL, i, (uint32_t)(v))
-#define SET_OBJ_VALUE(r,v) BOXNAN_SET_OBJ_VALUE(r, (((struct RObject*)(v))->tt), (v))
-#ifdef MRB_64BIT
-MRB_API mrb_value mrb_nan_boxing_cptr_value(struct mrb_state*, void*);
-#define SET_CPTR_VALUE(mrb,r,v) ((r) = mrb_nan_boxing_cptr_value(mrb, v))
+#define mrb_float_p(o) (((uint64_t)((o).u)&0xfffc000000000000) != 0)
+
+struct RInteger {
+  MRB_OBJECT_HEADER;
+  mrb_int i;
+};
+
+#define mrb_nb_tt(o) ((enum mrb_nanbox_tt_inline)((uint32_t)((o).u>>48)&3))
+
+MRB_INLINE enum mrb_vtype
+mrb_type(mrb_value o)
+{
+  if (mrb_float_p(o)) return MRB_TT_FLOAT;
+
+  int64_t u = o.u;
+  switch (mrb_nb_tt(o)) {
+  case MRB_NANBOX_TT_OBJECT: {
+    if (u == 0) return MRB_TT_FALSE;
+    return ((struct RBasic*)(uintptr_t)u)->tt;
+  }
+  case MRB_NANBOX_TT_INTEGER:
+    return MRB_TT_INTEGER;
+  case MRB_NANBOX_TT_MISC:
+    return (enum mrb_vtype)((uint32_t)(o.u >> 32) & 0x1f);
+  case MRB_NANBOX_TT_CPTR:
+    return MRB_TT_CPTR;
+  default:
+    /* never happen */
+    return MRB_TT_FLOAT;
+  }
+}
+
+#define NANBOX_SET_MISC_VALUE(r,t,i) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_MISC, ((uint64_t)(t)<<32) | (i))
+
+#define mrb_float(o) mrb_nan_boxing_value_float(o)
+#ifdef MRB_INT64
+/*
+#ifdef MRB_32BIT
+#define mrb_fixnum(o)  ((mrb_int)((intptr_t)0xffffffffffff&((o).u))|(((o).u & 0x800000000000)?0xffff000000000000:0))
 #else
-#define SET_CPTR_VALUE(mrb,r,v) BOXNAN_SET_VALUE(r, MRB_TT_CPTR, p, v)
+#define mrb_fixnum(o)  ((mrb_int)(int32_t)((o).u))
 #endif
-#define SET_UNDEF_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_UNDEF, i, 0)
+*/
+
+#define mrb_fixnum(o)  ((mrb_int)(int32_t)((o).u))
+
+static inline mrb_int
+mrb_nan_boxing_value_int(mrb_value v)
+{
+  uint64_t u = v.u;
+  if (mrb_nb_tt(v)==MRB_NANBOX_TT_OBJECT) {
+    struct RInteger *p = (struct RInteger*)(uintptr_t)u;
+    return p->i;
+  }
+  return mrb_fixnum(v);
+}
+#define mrb_integer(o) mrb_nan_boxing_value_int(o)
+#else
+#define mrb_fixnum(o)  ((mrb_int)(((uintptr_t)0xffffffff)&((o).u)))
+#define mrb_integer(o) mrb_fixnum(o)
+#endif
+#define mrb_symbol(o)  ((mrb_sym)((uintptr_t)0xffffffff)&((o).u))
+#define mrb_ptr(o)     ((void*)(uintptr_t)(o).u)
+#define mrb_cptr(o)    ((void*)(uintptr_t)(0xffffffffffffULL&(o).u))
+
+#define NANBOX_SET_VALUE(o, tt, v) do { \
+  (o).u = ((uint64_t)(tt)<<48) | ((uint64_t)(v)); \
+} while (0)
+
+#define SET_NIL_VALUE(r) ((r).u = 0)
+#define SET_FALSE_VALUE(r) NANBOX_SET_MISC_VALUE(r, MRB_TT_FALSE, 1)
+#define SET_TRUE_VALUE(r) NANBOX_SET_MISC_VALUE(r, MRB_TT_TRUE, 1)
+#define SET_BOOL_VALUE(r,b) NANBOX_SET_MISC_VALUE(r, (b) ? MRB_TT_TRUE : MRB_TT_FALSE, 1)
+#ifdef MRB_INT64
+MRB_API mrb_value mrb_boxing_int_value(struct mrb_state*, mrb_int);
+#define SET_INT_VALUE(mrb, r, n) ((r) = mrb_boxing_int_value(mrb, n))
+#else
+#define SET_INT_VALUE(mrb, r, n) SET_FIXNUM_VALUE(r, n)
+#endif
+#define SET_FIXNUM_VALUE(r,n) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_INTEGER, (uint32_t)(n))
+#define SET_SYM_VALUE(r,v) NANBOX_SET_MISC_VALUE(r, MRB_TT_SYMBOL, (uint32_t)(v))
+#define SET_OBJ_VALUE(r,v) do {(r).u = (uint64_t)(uintptr_t)(v);} while (0)
+#define SET_CPTR_VALUE(mrb,r,v) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_CPTR, (uint64_t)(uintptr_t)(v) & 0x0000ffffffffffffULL)
+#define SET_UNDEF_VALUE(r) NANBOX_SET_MISC_VALUE(r, MRB_TT_UNDEF, 4)
+
+#define mrb_immediate_p(o) ((mrb_float_p(o) || mrb_nb_tt(o) != MRB_NANBOX_TT_OBJECT) || (o).u == 0)
+#define mrb_nil_p(o)  ((o).u == 0)
+#define mrb_false_p(o) (mrb_type(o) == MRB_TT_FALSE || (o).u == 0)
+#define mrb_fixnum_p(o) (!mrb_float_p(o) && mrb_nb_tt(o)==MRB_NANBOX_TT_INTEGER)
 
 #endif  /* MRUBY_BOXING_NAN_H */

include/mruby/boxing_word.h

@@ -7,7 +7,11 @@
 #ifndef MRUBY_BOXING_WORD_H
 #define MRUBY_BOXING_WORD_H
 
-#ifndef MRB_NO_FLOAT
+#if defined(MRB_32BIT) && !defined(MRB_USE_FLOAT32) && !defined(MRB_WORDBOX_NO_FLOAT_TRUNCATE)
+# define MRB_WORDBOX_NO_FLOAT_TRUNCATE
+#endif
+
+#if !defined(MRB_NO_FLOAT) && defined(MRB_WORDBOX_NO_FLOAT_TRUNCATE)
 struct RFloat {
   MRB_OBJECT_HEADER;
   mrb_float f;
@@ -29,9 +33,9 @@ enum mrb_special_consts {
 #if defined(MRB_64BIT) && defined(MRB_INT32)
 #define MRB_FIXNUM_SHIFT        0
 #else
-#define MRB_FIXNUM_SHIFT        BOXWORD_FIXNUM_SHIFT
+#define MRB_FIXNUM_SHIFT        WORDBOX_FIXNUM_SHIFT
 #endif
-#define MRB_SYMBOL_SHIFT        BOXWORD_SYMBOL_SHIFT
+#define MRB_SYMBOL_SHIFT        WORDBOX_SYMBOL_SHIFT
 
 #if defined(MRB_64BIT) && defined(MRB_INT64)
 # define MRB_FIXNUM_MIN (INT64_MIN>>MRB_FIXNUM_SHIFT)
@@ -41,36 +45,68 @@ enum mrb_special_consts {
 # define MRB_FIXNUM_MAX (INT32_MAX>>MRB_FIXNUM_SHIFT)
 #endif
 
-#define BOXWORD_FIXNUM_BIT_POS  1
-#define BOXWORD_SYMBOL_BIT_POS  2
-#define BOXWORD_FIXNUM_SHIFT    BOXWORD_FIXNUM_BIT_POS
-#ifdef MRB_64BIT
-#define BOXWORD_SYMBOL_SHIFT    0
-#else
-#define BOXWORD_SYMBOL_SHIFT    BOXWORD_SYMBOL_BIT_POS
-#endif
-#define BOXWORD_FIXNUM_FLAG     (1 << (BOXWORD_FIXNUM_BIT_POS - 1))
-#define BOXWORD_SYMBOL_FLAG     (1 << (BOXWORD_SYMBOL_BIT_POS - 1))
-#define BOXWORD_FIXNUM_MASK     ((1 << BOXWORD_FIXNUM_BIT_POS) - 1)
-#define BOXWORD_SYMBOL_MASK     ((1 << BOXWORD_SYMBOL_BIT_POS) - 1)
-#define BOXWORD_IMMEDIATE_MASK  0x07
+#define WORDBOX_FIXNUM_BIT_POS  1
+#define WORDBOX_FIXNUM_SHIFT    WORDBOX_FIXNUM_BIT_POS
+#define WORDBOX_FIXNUM_FLAG     (1 << (WORDBOX_FIXNUM_BIT_POS - 1))
+#define WORDBOX_FIXNUM_MASK     ((1 << WORDBOX_FIXNUM_BIT_POS) - 1)
 
-#define BOXWORD_SET_SHIFT_VALUE(o,n,v) \
-  ((o).w = (((uintptr_t)(v)) << BOXWORD_##n##_SHIFT) | BOXWORD_##n##_FLAG)
-#define BOXWORD_SHIFT_VALUE_P(o,n) \
-  (((o).w & BOXWORD_##n##_MASK) == BOXWORD_##n##_FLAG)
-#define BOXWORD_OBJ_TYPE_P(o,n) \
+#if defined(MRB_WORDBOX_NO_FLOAT_TRUNCATE)
+/* floats are allocated in heaps */
+#define WORDBOX_SYMBOL_BIT_POS  2
+#define WORDBOX_SYMBOL_SHIFT    WORDBOX_SYMBOL_BIT_POS
+#define WORDBOX_SYMBOL_FLAG     (1 << (WORDBOX_SYMBOL_BIT_POS - 1))
+#define WORDBOX_SYMBOL_MASK     ((1 << WORDBOX_SYMBOL_BIT_POS) - 1)
+#else
+#define WORDBOX_FLOAT_FLAG      2
+#define WORDBOX_FLOAT_MASK      3
+#if defined(MRB_64BIT)
+#define WORDBOX_SYMBOL_SHIFT    32
+#else  /* MRB_32BIT */
+#define WORDBOX_SYMBOL_SHIFT    5
+#endif
+#define WORDBOX_SYMBOL_FLAG     0x1c
+#define WORDBOX_SYMBOL_MASK     0x1f
+#endif
+
+#define WORDBOX_IMMEDIATE_MASK  0x07
+
+#define WORDBOX_SET_SHIFT_VALUE(o,n,v) \
+  ((o).w = (((uintptr_t)(v)) << WORDBOX_##n##_SHIFT) | WORDBOX_##n##_FLAG)
+#define WORDBOX_SHIFT_VALUE_P(o,n) \
+  (((o).w & WORDBOX_##n##_MASK) == WORDBOX_##n##_FLAG)
+#define WORDBOX_OBJ_TYPE_P(o,n) \
   (!mrb_immediate_p(o) && mrb_val_union(o).bp->tt == MRB_TT_##n)
 
 /*
  * mrb_value representation:
  *
+ * 64bit word with inline float:
+ *   nil   : ...0000 0000 (all bits are 0)
+ *   false : ...0000 0100 (mrb_fixnum(v) != 0)
+ *   true  : ...0000 1100
+ *   undef : ...0001 0100
+ *   symbol: ...0001 1100 (use only upper 32-bit as symbol value with MRB_64BIT)
+ *   fixnum: ...IIII III1
+ *   float : ...FFFF FF10 (51 bit significands; require MRB_64BIT)
+ *   object: ...PPPP P000
+ *
+ * 32bit word with inline float:
+ *   nil   : ...0000 0000 (all bits are 0)
+ *   false : ...0000 0100 (mrb_fixnum(v) != 0)
+ *   true  : ...0000 1100
+ *   undef : ...0001 0100
+ *   symbol: ...SSS1 0100 (symbol occupies 20bits)
+ *   fixnum: ...IIII III1
+ *   float : ...FFFF FF10 (22 bit significands; require MRB_64BIT)
+ *   object: ...PPPP P000
+ *
+ * and word boxing without inline float (MRB_WORDBOX_NO_FLOAT_TRUNCATE):
  *   nil   : ...0000 0000 (all bits are 0)
  *   false : ...0000 0100 (mrb_fixnum(v) != 0)
  *   true  : ...0000 1100
  *   undef : ...0001 0100
  *   fixnum: ...IIII III1
- *   symbol: ...SSSS SS10 (use only upper 32-bit as symbol value on 64-bit CPU)
+ *   symbol: ...SSSS SS10
  *   object: ...PPPP P000 (any bits are 1)
  */
 typedef struct mrb_value {
@@ -79,18 +115,13 @@ typedef struct mrb_value {
 
 union mrb_value_ {
   void *p;
-#ifdef MRB_64BIT
-  /* use struct to avoid bit shift. */
-  struct {
-    MRB_ENDIAN_LOHI(
-      mrb_sym sym;
-      ,uint32_t sym_flag;
-    )
-  };
-#endif
   struct RBasic *bp;
 #ifndef MRB_NO_FLOAT
+#ifndef MRB_WORDBOX_NO_FLOAT_TRUNCATE
+  mrb_float f;
+#else
   struct RFloat *fp;
+#endif
 #endif
   struct RInteger *ip;
   struct RCptr *vp;
@@ -98,7 +129,7 @@ union mrb_value_ {
   mrb_value value;
 };
 
-mrb_static_assert1(sizeof(mrb_value) == sizeof(union mrb_value_));
+mrb_static_assert(sizeof(mrb_value) == sizeof(union mrb_value_));
 
 static inline union mrb_value_
 mrb_val_union(mrb_value v)
@@ -112,61 +143,64 @@ MRB_API mrb_value mrb_word_boxing_cptr_value(struct mrb_state*, void*);
 #ifndef MRB_NO_FLOAT
 MRB_API mrb_value mrb_word_boxing_float_value(struct mrb_state*, mrb_float);
 #endif
-MRB_API mrb_value mrb_word_boxing_int_value(struct mrb_state*, mrb_int);
+MRB_API mrb_value mrb_boxing_int_value(struct mrb_state*, mrb_int);
 
-#define mrb_immediate_p(o) ((o).w & BOXWORD_IMMEDIATE_MASK || (o).w == MRB_Qnil)
+#define mrb_immediate_p(o) ((o).w & WORDBOX_IMMEDIATE_MASK || (o).w == MRB_Qnil)
 
 #define mrb_ptr(o)     mrb_val_union(o).p
 #define mrb_cptr(o)    mrb_val_union(o).vp->p
 #ifndef MRB_NO_FLOAT
-#define mrb_float(o)   mrb_val_union(o).fp->f
+#ifndef MRB_WORDBOX_NO_FLOAT_TRUNCATE
+MRB_API mrb_float mrb_word_boxing_value_float(mrb_value v);
+#define mrb_float(o) mrb_word_boxing_value_float(o)
+#else
+#define mrb_float(o) mrb_val_union(o).fp->f
 #endif
-#define mrb_fixnum(o)  (mrb_int)(((intptr_t)(o).w) >> BOXWORD_FIXNUM_SHIFT)
+#endif
+#define mrb_fixnum(o)  (mrb_int)(((intptr_t)(o).w) >> WORDBOX_FIXNUM_SHIFT)
 MRB_INLINE mrb_int
 mrb_integer_func(mrb_value o) {
   if (mrb_immediate_p(o)) return mrb_fixnum(o);
   return mrb_val_union(o).ip->i;
 }
 #define mrb_integer(o) mrb_integer_func(o)
-#ifdef MRB_64BIT
-#define mrb_symbol(o)  mrb_val_union(o).sym
-#else
-#define mrb_symbol(o)  (mrb_sym)(((o).w) >> BOXWORD_SYMBOL_SHIFT)
-#endif
+#define mrb_symbol(o)  (mrb_sym)(((o).w) >> WORDBOX_SYMBOL_SHIFT)
 #define mrb_bool(o)    (((o).w & ~(uintptr_t)MRB_Qfalse) != 0)
 
-#define mrb_fixnum_p(o) BOXWORD_SHIFT_VALUE_P(o, FIXNUM)
-#define mrb_integer_p(o) (BOXWORD_SHIFT_VALUE_P(o, FIXNUM)||BOXWORD_OBJ_TYPE_P(o, INTEGER))
-#ifdef MRB_64BIT
-#define mrb_symbol_p(o) (mrb_val_union(o).sym_flag == BOXWORD_SYMBOL_FLAG)
-#else
-#define mrb_symbol_p(o) BOXWORD_SHIFT_VALUE_P(o, SYMBOL)
-#endif
+#define mrb_fixnum_p(o) WORDBOX_SHIFT_VALUE_P(o, FIXNUM)
+#define mrb_integer_p(o) (WORDBOX_SHIFT_VALUE_P(o, FIXNUM)||WORDBOX_OBJ_TYPE_P(o, INTEGER))
+#define mrb_symbol_p(o) WORDBOX_SHIFT_VALUE_P(o, SYMBOL)
 #define mrb_undef_p(o) ((o).w == MRB_Qundef)
 #define mrb_nil_p(o)  ((o).w == MRB_Qnil)
 #define mrb_false_p(o) ((o).w == MRB_Qfalse)
 #define mrb_true_p(o)  ((o).w == MRB_Qtrue)
 #ifndef MRB_NO_FLOAT
-#define mrb_float_p(o) BOXWORD_OBJ_TYPE_P(o, FLOAT)
+#ifndef MRB_WORDBOX_NO_FLOAT_TRUNCATE
+#define mrb_float_p(o) WORDBOX_SHIFT_VALUE_P(o, FLOAT)
+#else
+#define mrb_float_p(o) WORDBOX_OBJ_TYPE_P(o, FLOAT)
 #endif
-#define mrb_array_p(o) BOXWORD_OBJ_TYPE_P(o, ARRAY)
-#define mrb_string_p(o) BOXWORD_OBJ_TYPE_P(o, STRING)
-#define mrb_hash_p(o) BOXWORD_OBJ_TYPE_P(o, HASH)
-#define mrb_cptr_p(o) BOXWORD_OBJ_TYPE_P(o, CPTR)
-#define mrb_exception_p(o) BOXWORD_OBJ_TYPE_P(o, EXCEPTION)
-#define mrb_free_p(o) BOXWORD_OBJ_TYPE_P(o, FREE)
-#define mrb_object_p(o) BOXWORD_OBJ_TYPE_P(o, OBJECT)
-#define mrb_class_p(o) BOXWORD_OBJ_TYPE_P(o, CLASS)
-#define mrb_module_p(o) BOXWORD_OBJ_TYPE_P(o, MODULE)
-#define mrb_iclass_p(o) BOXWORD_OBJ_TYPE_P(o, ICLASS)
-#define mrb_sclass_p(o) BOXWORD_OBJ_TYPE_P(o, SCLASS)
-#define mrb_proc_p(o) BOXWORD_OBJ_TYPE_P(o, PROC)
-#define mrb_range_p(o) BOXWORD_OBJ_TYPE_P(o, RANGE)
-#define mrb_env_p(o) BOXWORD_OBJ_TYPE_P(o, ENV)
-#define mrb_data_p(o) BOXWORD_OBJ_TYPE_P(o, DATA)
-#define mrb_fiber_p(o) BOXWORD_OBJ_TYPE_P(o, FIBER)
-#define mrb_istruct_p(o) BOXWORD_OBJ_TYPE_P(o, ISTRUCT)
-#define mrb_break_p(o) BOXWORD_OBJ_TYPE_P(o, BREAK)
+#else
+#define mrb_float_p(o) FALSE
+#endif
+#define mrb_array_p(o) WORDBOX_OBJ_TYPE_P(o, ARRAY)
+#define mrb_string_p(o) WORDBOX_OBJ_TYPE_P(o, STRING)
+#define mrb_hash_p(o) WORDBOX_OBJ_TYPE_P(o, HASH)
+#define mrb_cptr_p(o) WORDBOX_OBJ_TYPE_P(o, CPTR)
+#define mrb_exception_p(o) WORDBOX_OBJ_TYPE_P(o, EXCEPTION)
+#define mrb_free_p(o) WORDBOX_OBJ_TYPE_P(o, FREE)
+#define mrb_object_p(o) WORDBOX_OBJ_TYPE_P(o, OBJECT)
+#define mrb_class_p(o) WORDBOX_OBJ_TYPE_P(o, CLASS)
+#define mrb_module_p(o) WORDBOX_OBJ_TYPE_P(o, MODULE)
+#define mrb_iclass_p(o) WORDBOX_OBJ_TYPE_P(o, ICLASS)
+#define mrb_sclass_p(o) WORDBOX_OBJ_TYPE_P(o, SCLASS)
+#define mrb_proc_p(o) WORDBOX_OBJ_TYPE_P(o, PROC)
+#define mrb_range_p(o) WORDBOX_OBJ_TYPE_P(o, RANGE)
+#define mrb_env_p(o) WORDBOX_OBJ_TYPE_P(o, ENV)
+#define mrb_data_p(o) WORDBOX_OBJ_TYPE_P(o, DATA)
+#define mrb_fiber_p(o) WORDBOX_OBJ_TYPE_P(o, FIBER)
+#define mrb_istruct_p(o) WORDBOX_OBJ_TYPE_P(o, ISTRUCT)
+#define mrb_break_p(o) WORDBOX_OBJ_TYPE_P(o, BREAK)
 
 #ifndef MRB_NO_FLOAT
 #define SET_FLOAT_VALUE(mrb,r,v) ((r) = mrb_word_boxing_float_value(mrb, v))
@@ -177,18 +211,9 @@ mrb_integer_func(mrb_value o) {
 #define SET_FALSE_VALUE(r) ((r).w = MRB_Qfalse)
 #define SET_TRUE_VALUE(r) ((r).w = MRB_Qtrue)
 #define SET_BOOL_VALUE(r,b) ((b) ? SET_TRUE_VALUE(r) : SET_FALSE_VALUE(r))
-#define SET_INT_VALUE(mrb,r,n) ((r) = mrb_word_boxing_int_value(mrb, n))
-#define SET_FIXNUM_VALUE(r,n) BOXWORD_SET_SHIFT_VALUE(r, FIXNUM, n)
-#ifdef MRB_64BIT
-#define SET_SYM_VALUE(r,v) do {\
-  union mrb_value_ mrb_value_union_variable;\
-  mrb_value_union_variable.sym = v;\
-  mrb_value_union_variable.sym_flag = BOXWORD_SYMBOL_FLAG;\
-  (r) = mrb_value_union_variable.value;\
-} while (0)
-#else
-#define SET_SYM_VALUE(r,n) BOXWORD_SET_SHIFT_VALUE(r, SYMBOL, n)
-#endif
+#define SET_INT_VALUE(mrb,r,n) ((r) = mrb_boxing_int_value(mrb, n))
+#define SET_FIXNUM_VALUE(r,n) WORDBOX_SET_SHIFT_VALUE(r, FIXNUM, n)
+#define SET_SYM_VALUE(r,n) WORDBOX_SET_SHIFT_VALUE(r, SYMBOL, n)
 #define SET_OBJ_VALUE(r,v) ((r).w = (uintptr_t)(v))
 
 MRB_INLINE enum mrb_vtype
@@ -199,6 +224,7 @@ mrb_type(mrb_value o)
          mrb_fixnum_p(o) ? MRB_TT_INTEGER :
          mrb_symbol_p(o) ? MRB_TT_SYMBOL :
          mrb_undef_p(o)  ? MRB_TT_UNDEF :
+         mrb_float_p(o)  ? MRB_TT_FLOAT :
          mrb_val_union(o).bp->tt;
 }
 

include/mruby/class.h

@@ -73,8 +73,6 @@ mrb_class(mrb_state *mrb, mrb_value v)
 #define MRB_SET_INSTANCE_TT(c, tt) ((c)->flags = (((c)->flags & ~MRB_INSTANCE_TT_MASK) | (char)(tt)))
 #define MRB_INSTANCE_TT(c) (enum mrb_vtype)((c)->flags & MRB_INSTANCE_TT_MASK)
 
-struct RClass *mrb_vm_define_class(mrb_state*, mrb_value, mrb_value, mrb_sym);
-struct RClass *mrb_vm_define_module(mrb_state*, mrb_value, mrb_sym);
 MRB_API void mrb_define_method_raw(mrb_state*, struct RClass*, mrb_sym, mrb_method_t);
 MRB_API void mrb_alias_method(mrb_state*, struct RClass *c, mrb_sym a, mrb_sym b);
 MRB_API void mrb_remove_method(mrb_state *mrb, struct RClass *c, mrb_sym sym);
@@ -83,15 +81,6 @@ MRB_API mrb_method_t mrb_method_search_vm(mrb_state*, struct RClass**, mrb_sym);
 MRB_API mrb_method_t mrb_method_search(mrb_state*, struct RClass*, mrb_sym);
 
 MRB_API struct RClass* mrb_class_real(struct RClass* cl);
-mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv);
-
-void mrb_class_name_class(mrb_state*, struct RClass*, struct RClass*, mrb_sym);
-mrb_bool mrb_const_name_p(mrb_state*, const char*, mrb_int);
-mrb_value mrb_class_find_path(mrb_state*, struct RClass*);
-mrb_value mrb_mod_to_s(mrb_state*, mrb_value);
-void mrb_gc_mark_mt(mrb_state*, struct RClass*);
-size_t mrb_gc_mark_mt_size(mrb_state*, struct RClass*);
-void mrb_gc_free_mt(mrb_state*, struct RClass*);
 
 #ifndef MRB_NO_METHOD_CACHE
 void mrb_mc_clear_by_class(mrb_state *mrb, struct RClass* c);

include/mruby/common.h

@@ -28,6 +28,12 @@
 # define MRB_END_DECL
 #endif
 
+#include <sys/types.h>
+#if defined _MSC_VER
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 /**
  * Shared compiler macros
  */

include/mruby/compile.h

@@ -16,8 +16,6 @@ MRB_BEGIN_DECL
 
 #include <mruby.h>
 
-struct mrb_jmpbuf;
-
 struct mrb_parser_state;
 /* load context */
 typedef struct mrbc_context {
@@ -33,6 +31,7 @@ typedef struct mrbc_context {
   mrb_bool no_exec:1;
   mrb_bool keep_lv:1;
   mrb_bool no_optimize:1;
+  mrb_bool no_ext_ops:1;
   const struct RProc *upper;
 
   size_t parser_nerr;
@@ -58,7 +57,7 @@ enum mrb_lex_state_enum {
   EXPR_ENDFN,                 /* ditto, and unbound braces. */
   EXPR_ARG,                   /* newline significant, +/- is an operator. */
   EXPR_CMDARG,                /* newline significant, +/- is an operator. */
-  EXPR_MID,                   /* newline significant, +/- is an operator. */
+  EXPR_MID,                   /* newline significant, +/- is a sign. */
   EXPR_FNAME,                 /* ignore newline, no reserved words. */
   EXPR_DOT,                   /* right after '.' or '::', no reserved words. */
   EXPR_CLASS,                 /* immediate after 'class', no here document. */
@@ -100,9 +99,9 @@ enum mrb_string_type {
 struct mrb_parser_heredoc_info {
   mrb_bool allow_indent:1;
   mrb_bool remove_indent:1;
+  mrb_bool line_head:1;
   size_t indent;
   mrb_ast_node *indented;
-  mrb_bool line_head:1;
   enum mrb_string_type type;
   const char *term;
   int term_len;
@@ -128,7 +127,7 @@ struct mrb_parser_state {
   int column;
 
   enum mrb_lex_state_enum lstate;
-  mrb_ast_node *lex_strterm; /* (type nest_level beg . end) */
+  struct parser_lex_strterm *lex_strterm;
 
   unsigned int cond_stack;
   unsigned int cmdarg_stack;
@@ -144,10 +143,8 @@ struct mrb_parser_state {
   int tidx;
   int tsiz;
 
-  mrb_ast_node *all_heredocs; /* list of mrb_parser_heredoc_info* */
   mrb_ast_node *heredocs_from_nextline;
   mrb_ast_node *parsing_heredoc;
-  mrb_ast_node *lex_strterm_before_heredoc;
 
   void *ylval;
 
@@ -157,6 +154,7 @@ struct mrb_parser_state {
 
   mrb_bool no_optimize:1;
   mrb_bool capture_errors:1;
+  mrb_bool no_ext_ops:1;
   const struct RProc *upper;
   struct mrb_parser_message error_buffer[10];
   struct mrb_parser_message warn_buffer[10];
@@ -165,7 +163,6 @@ struct mrb_parser_state {
   uint16_t filename_table_length;
   uint16_t current_filename_index;
 
-  struct mrb_jmpbuf* jmp;
   mrb_ast_node *nvars;
 };
 

include/mruby/debug.h

@@ -16,7 +16,8 @@ MRB_BEGIN_DECL
 
 typedef enum mrb_debug_line_type {
   mrb_debug_line_ary = 0,
-  mrb_debug_line_flat_map = 1
+  mrb_debug_line_flat_map,
+  mrb_debug_line_packed_map
 } mrb_debug_line_type;
 
 typedef struct mrb_irep_debug_info_line {
@@ -30,9 +31,11 @@ typedef struct mrb_irep_debug_info_file {
   uint32_t line_entry_count;
   mrb_debug_line_type line_type;
   union {
+    const char *s;
     void *ptr;
-    mrb_irep_debug_info_line *flat_map;
-    uint16_t *ary;
+    const uint16_t *ary;
+    const mrb_irep_debug_info_line *flat_map;
+    const uint8_t *packed_map;
   } lines;
 } mrb_irep_debug_info_file;
 

include/mruby/dump.h

@@ -16,17 +16,18 @@
  */
 MRB_BEGIN_DECL
 
-#define DUMP_DEBUG_INFO 1
+/* flags for mrb_dump_irep{,_binary,_cfunc,_cstruct} */
+#define MRB_DUMP_DEBUG_INFO 1
+#define MRB_DUMP_STATIC 2
+#define DUMP_DEBUG_INFO MRB_DUMP_DEBUG_INFO  /* deprecated */
 
-int mrb_dump_irep(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size);
 #ifndef MRB_NO_STDIO
-int mrb_dump_irep_binary(mrb_state*, const mrb_irep*, uint8_t, FILE*);
-int mrb_dump_irep_cfunc(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname);
-int mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname);
-mrb_irep *mrb_read_irep_file(mrb_state*, FILE*);
 MRB_API mrb_value mrb_load_irep_file(mrb_state*,FILE*);
 MRB_API mrb_value mrb_load_irep_file_cxt(mrb_state*, FILE*, mrbc_context*);
+mrb_irep *mrb_read_irep_file(mrb_state*, FILE*);
+int mrb_dump_irep_binary(mrb_state*, const mrb_irep*, uint8_t, FILE*);
 #endif
+/* avoid mrb_read_irep(); use mrb_read_irep_buf() instead (may cause buffer overflow) */
 MRB_API mrb_irep *mrb_read_irep(mrb_state*, const uint8_t*);
 MRB_API mrb_irep *mrb_read_irep_buf(mrb_state*, const void*, size_t);
 
@@ -51,7 +52,7 @@ MRB_API mrb_irep *mrb_read_irep_buf(mrb_state*, const void*, size_t);
 /* Binary Format Version Major:Minor */
 /*   Major: Incompatible to prior versions */
 /*   Minor: Upper-compatible to prior versions */
-#define RITE_BINARY_MAJOR_VER          "02"
+#define RITE_BINARY_MAJOR_VER          "03"
 #define RITE_BINARY_MINOR_VER          "00"
 #define RITE_BINARY_FORMAT_VER         RITE_BINARY_MAJOR_VER RITE_BINARY_MINOR_VER
 #define RITE_COMPILER_NAME             "MATZ"

include/mruby/error.h

@@ -17,17 +17,24 @@ MRB_BEGIN_DECL
 struct RException {
   MRB_OBJECT_HEADER;
   struct iv_tbl *iv;
+  struct RObject *mesg;         // NULL or probably RString
+  struct RObject *backtrace;    // NULL, RArray or RData
 };
 
+/* error that should terminate execution */
+#define MRB_EXC_EXIT 65536
+#define MRB_EXC_EXIT_P(e) ((e)->flags & MRB_EXC_EXIT)
+/* retrieve status value from exc; need <mruby/variable.h> and <mruby/presym.h> */
+#define MRB_EXC_EXIT_STATUS(mrb,e) ((int)mrb_as_int((mrb),mrb_obj_iv_get((mrb),(e),MRB_SYM(status))))
+/* exit with SystemExit status */
+#define MRB_EXC_CHECK_EXIT(mrb,e) do {if (MRB_EXC_EXIT_P(e)) exit(MRB_EXC_EXIT_STATUS((mrb),(e)));} while (0)
+
 #define mrb_exc_ptr(v) ((struct RException*)mrb_ptr(v))
 
-MRB_API void mrb_sys_fail(mrb_state *mrb, const char *mesg);
+MRB_API mrb_noreturn void mrb_sys_fail(mrb_state *mrb, const char *mesg);
 MRB_API mrb_value mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str);
 #define mrb_exc_new_lit(mrb, c, lit) mrb_exc_new_str(mrb, c, mrb_str_new_lit(mrb, lit))
-#define mrb_exc_new_str_lit(mrb, c, lit) mrb_exc_new_lit(mrb, c, lit)
 MRB_API mrb_value mrb_make_exception(mrb_state *mrb, mrb_int argc, const mrb_value *argv);
-MRB_API mrb_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);
-MRB_API mrb_value mrb_get_backtrace(mrb_state *mrb);
 MRB_API mrb_noreturn void mrb_no_method_error(mrb_state *mrb, mrb_sym id, mrb_value args, const char *fmt, ...);
 
 /* declaration for `fail` method */
@@ -67,42 +74,16 @@ mrb_break_value_set(struct RBreak *brk, mrb_value val)
 #define mrb_break_proc_get(brk) ((brk)->proc)
 #define mrb_break_proc_set(brk, p) ((brk)->proc = p)
 
-#define RBREAK_TAG_FOREACH(f) \
-  f(RBREAK_TAG_BREAK, 0) \
-  f(RBREAK_TAG_BREAK_UPPER, 1) \
-  f(RBREAK_TAG_BREAK_INTARGET, 2) \
-  f(RBREAK_TAG_RETURN_BLOCK, 3) \
-  f(RBREAK_TAG_RETURN, 4) \
-  f(RBREAK_TAG_RETURN_TOPLEVEL, 5) \
-  f(RBREAK_TAG_JUMP, 6) \
-  f(RBREAK_TAG_STOP, 7)
-
-#define RBREAK_TAG_DEFINE(tag, i) tag = i,
-enum {
-  RBREAK_TAG_FOREACH(RBREAK_TAG_DEFINE)
-};
-#undef RBREAK_TAG_DEFINE
-
-#define RBREAK_TAG_BIT          3
-#define RBREAK_TAG_BIT_OFF      8
-#define RBREAK_TAG_MASK         (~(~UINT32_C(0) << RBREAK_TAG_BIT))
-
-static inline uint32_t
-mrb_break_tag_get(struct RBreak *brk)
-{
-  return (brk->flags >> RBREAK_TAG_BIT_OFF) & RBREAK_TAG_MASK;
-}
-
-static inline void
-mrb_break_tag_set(struct RBreak *brk, uint32_t tag)
-{
-  brk->flags &= ~(RBREAK_TAG_MASK << RBREAK_TAG_BIT_OFF);
-  brk->flags |= (tag & RBREAK_TAG_MASK) << RBREAK_TAG_BIT_OFF;
-}
-
 /**
  * Protect
  *
+ */
+typedef mrb_value mrb_protect_error_func(mrb_state *mrb, void *userdata);
+MRB_API mrb_value mrb_protect_error(mrb_state *mrb, mrb_protect_error_func *body, void *userdata, mrb_bool *error);
+
+/**
+ * Protect (takes mrb_value for body argument)
+ *
  * Implemented in the mruby-error mrbgem
  */
 MRB_API mrb_value mrb_protect(mrb_state *mrb, mrb_func_t body, mrb_value data, mrb_bool *state);

include/mruby/gc.h

@@ -48,7 +48,8 @@ typedef struct mrb_heap_page {
   struct mrb_heap_page *free_next;
   struct mrb_heap_page *free_prev;
   mrb_bool old:1;
-  void *objects[];
+  /* Flexible array members area a C99 feature, not C++ compatible */
+  /* void* objects[]; */
 } mrb_heap_page;
 
 #ifdef _MSC_VER
@@ -84,8 +85,9 @@ typedef struct mrb_gc {
   size_t majorgc_old_threshold;
 } mrb_gc;
 
-MRB_API mrb_bool
-mrb_object_dead_p(struct mrb_state *mrb, struct RBasic *object);
+MRB_API mrb_bool mrb_object_dead_p(struct mrb_state *mrb, struct RBasic *object);
+
+#define MRB_GC_RED 7
 
 MRB_END_DECL
 

include/mruby/hash.h

@@ -29,16 +29,13 @@ struct RHash {
   union {
     struct hash_entry *ea;
     struct hash_table *ht;
-  };
+  } hsh;
 };
 
 #define mrb_hash_ptr(v)    ((struct RHash*)(mrb_ptr(v)))
 #define mrb_hash_value(p)  mrb_obj_value((void*)(p))
 
-size_t mrb_hash_memsize(mrb_value obj);
 MRB_API mrb_value mrb_hash_new_capa(mrb_state *mrb, mrb_int capa);
-MRB_API mrb_value mrb_ensure_hash_type(mrb_state *mrb, mrb_value hash);
-MRB_API mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash);
 
 /*
  * Initializes a new hash.
@@ -228,11 +225,6 @@ MRB_API void mrb_hash_merge(mrb_state *mrb, mrb_value hash1, mrb_value hash2);
 #define MRB_RHASH_DEFAULT_P(hash) (RHASH(hash)->flags & MRB_HASH_DEFAULT)
 #define MRB_RHASH_PROCDEFAULT_P(hash) (RHASH(hash)->flags & MRB_HASH_PROC_DEFAULT)
 
-/* GC functions */
-void mrb_gc_mark_hash(mrb_state*, struct RHash*);
-size_t mrb_gc_mark_hash_size(mrb_state*, struct RHash*);
-void mrb_gc_free_hash(mrb_state*, struct RHash*);
-
 /* return non zero to break the loop */
 typedef int (mrb_hash_foreach_func)(mrb_state *mrb, mrb_value key, mrb_value val, void *data);
 MRB_API void mrb_hash_foreach(mrb_state *mrb, struct RHash *hash, mrb_hash_foreach_func *func, void *p);

include/mruby/internal.h

@@ -0,0 +1,207 @@
+/**
+** @file mruby/internal.h - Functions only called from within the library
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_INTERNAL_H
+#define MRUBY_INTERNAL_H
+
+#ifdef MRUBY_ARRAY_H
+void mrb_ary_decref(mrb_state*, mrb_shared_array*);
+mrb_value mrb_ary_subseq(mrb_state *mrb, mrb_value ary, mrb_int beg, mrb_int len);
+#endif
+
+#ifdef MRUBY_CLASS_H
+struct RClass *mrb_vm_define_class(mrb_state*, mrb_value, mrb_value, mrb_sym);
+struct RClass *mrb_vm_define_module(mrb_state*, mrb_value, mrb_sym);
+mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv);
+void mrb_class_name_class(mrb_state*, struct RClass*, struct RClass*, mrb_sym);
+mrb_bool mrb_const_name_p(mrb_state*, const char*, mrb_int);
+mrb_value mrb_class_find_path(mrb_state*, struct RClass*);
+mrb_value mrb_mod_to_s(mrb_state *, mrb_value);
+void mrb_method_added(mrb_state *mrb, struct RClass *c, mrb_sym mid);
+mrb_noreturn void mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args);
+#endif
+
+/* debug */
+size_t mrb_packed_int_len(uint32_t num);
+size_t mrb_packed_int_encode(uint32_t num, uint8_t *p, uint8_t *pend);
+uint32_t mrb_packed_int_decode(const uint8_t *p, const uint8_t **newpos);
+
+/* dump */
+#ifdef MRUBY_IREP_H
+int mrb_dump_irep(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size);
+#ifndef MRB_NO_STDIO
+int mrb_dump_irep_cfunc(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname);
+int mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname);
+#endif
+#endif
+
+/* codedump */
+void mrb_codedump_all(mrb_state *mrb, struct RProc *proc);
+#ifndef MRB_NO_STDIO
+void mrb_codedump_all_file(mrb_state *mrb, struct RProc *proc, FILE *out);
+#endif
+
+/* error */
+mrb_value mrb_exc_inspect(mrb_state *mrb, mrb_value exc);
+mrb_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);
+mrb_value mrb_get_backtrace(mrb_state *mrb);
+void mrb_exc_mesg_set(mrb_state *mrb, struct RException *exc, mrb_value mesg);
+mrb_value mrb_exc_mesg_get(mrb_state *mrb, struct RException *exc);
+
+/* gc */
+void mrb_gc_mark_mt(mrb_state*, struct RClass*);
+size_t mrb_gc_mark_mt_size(mrb_state*, struct RClass*);
+void mrb_gc_free_mt(mrb_state*, struct RClass*);
+
+/* hash */
+size_t mrb_hash_memsize(mrb_value obj);
+void mrb_gc_mark_hash(mrb_state*, struct RHash*);
+size_t mrb_gc_mark_hash_size(mrb_state*, struct RHash*);
+void mrb_gc_free_hash(mrb_state*, struct RHash*);
+
+/* irep */
+struct mrb_insn_data mrb_decode_insn(const mrb_code *pc);
+#ifdef MRUBY_IREP_H
+void mrb_irep_free(mrb_state*, struct mrb_irep*);
+void mrb_irep_remove_lv(mrb_state *mrb, mrb_irep *irep);
+
+static inline const struct mrb_irep_catch_handler *
+mrb_irep_catch_handler_table(const struct mrb_irep *irep)
+{
+  if (irep->clen > 0) {
+    return (const struct mrb_irep_catch_handler*)(irep->iseq + irep->ilen);
+  }
+  else {
+    return (const struct mrb_irep_catch_handler*)NULL;
+  }
+}
+#endif
+
+/* numeric */
+mrb_value mrb_div_int_value(mrb_state *mrb, mrb_int x, mrb_int y);
+mrb_int mrb_div_int(mrb_int x, mrb_int y);
+mrb_value mrb_int_add(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_int_sub(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_int_mul(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_noreturn void mrb_int_zerodiv(mrb_state *mrb);
+mrb_noreturn void mrb_int_overflow(mrb_state *mrb, const char *reason);
+
+#ifdef MRB_USE_COMPLEX
+mrb_value mrb_complex_new(mrb_state *mrb, mrb_float x, mrb_float y);
+mrb_value mrb_complex_add(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_complex_sub(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_complex_mul(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_complex_div(mrb_state *mrb, mrb_value x, mrb_value y);
+void mrb_complex_copy(mrb_state *mrb, mrb_value x, mrb_value y);
+#endif
+#ifdef MRB_USE_RATIONAL
+mrb_value mrb_rational_new(mrb_state *mrb, mrb_int x, mrb_int y);
+mrb_value mrb_rational_add(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_rational_sub(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_rational_mul(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_rational_div(mrb_state *mrb, mrb_value x, mrb_value y);
+void mrb_rational_copy(mrb_state *mrb, mrb_value x, mrb_value y);
+#endif
+
+#ifdef MRUBY_PROC_H
+struct RProc *mrb_closure_new(mrb_state*, const mrb_irep*);
+void mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b);
+mrb_int mrb_proc_arity(const struct RProc *p);
+struct REnv *mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc);
+#endif
+
+/* range */
+#ifdef MRUBY_RANGE_H
+mrb_value mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, const mrb_value *argv, mrb_value (*func)(mrb_state*, mrb_value, mrb_int));
+void mrb_gc_mark_range(mrb_state *mrb, struct RRange *r);
+#endif
+
+/* string */
+void mrb_gc_free_str(mrb_state*, struct RString*);
+uint32_t mrb_str_hash(mrb_state *mrb, mrb_value str);
+mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);
+mrb_value mrb_str_inspect(mrb_state *mrb, mrb_value str);
+mrb_bool mrb_str_beg_len(mrb_int str_len, mrb_int *begp, mrb_int *lenp);
+mrb_value mrb_str_byte_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len);
+mrb_value mrb_str_aref(mrb_state *mrb, mrb_value str, mrb_value idx, mrb_value len);
+uint32_t mrb_byte_hash(const uint8_t*, mrb_int);
+uint32_t mrb_byte_hash_step(const uint8_t*, mrb_int, uint32_t);
+
+#ifdef MRB_UTF8_STRING
+mrb_int mrb_utf8len(const char *str, const char *end);
+mrb_int mrb_utf8_strlen(const char *str, mrb_int byte_len);
+#endif
+
+/* variable */
+mrb_value mrb_vm_special_get(mrb_state*, mrb_sym);
+void mrb_vm_special_set(mrb_state*, mrb_sym, mrb_value);
+mrb_value mrb_vm_cv_get(mrb_state*, mrb_sym);
+void mrb_vm_cv_set(mrb_state*, mrb_sym, mrb_value);
+mrb_value mrb_vm_const_get(mrb_state*, mrb_sym);
+void mrb_vm_const_set(mrb_state*, mrb_sym, mrb_value);
+size_t mrb_obj_iv_tbl_memsize(mrb_value);
+mrb_value mrb_obj_iv_inspect(mrb_state*, struct RObject*);
+void mrb_obj_iv_set_force(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v);
+mrb_value mrb_mod_constants(mrb_state *mrb, mrb_value mod);
+mrb_value mrb_f_global_variables(mrb_state *mrb, mrb_value self);
+mrb_value mrb_obj_instance_variables(mrb_state*, mrb_value);
+mrb_value mrb_mod_class_variables(mrb_state*, mrb_value);
+mrb_value mrb_mod_cv_get(mrb_state *mrb, struct RClass * c, mrb_sym sym);
+mrb_bool mrb_mod_cv_defined(mrb_state *mrb, struct RClass * c, mrb_sym sym);
+mrb_bool mrb_ident_p(const char *s, mrb_int len);
+
+/* GC functions */
+void mrb_gc_mark_gv(mrb_state*);
+void mrb_gc_free_gv(mrb_state*);
+void mrb_gc_mark_iv(mrb_state*, struct RObject*);
+size_t mrb_gc_mark_iv_size(mrb_state*, struct RObject*);
+void mrb_gc_free_iv(mrb_state*, struct RObject*);
+
+/* VM */
+mrb_int mrb_ci_bidx(mrb_callinfo *ci);
+mrb_int mrb_ci_nregs(mrb_callinfo *ci);
+mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);
+mrb_value mrb_obj_instance_eval(mrb_state*, mrb_value);
+mrb_value mrb_mod_module_eval(mrb_state*, mrb_value);
+mrb_value mrb_f_send(mrb_state *mrb, mrb_value self);
+
+#ifdef MRB_USE_BIGINT
+mrb_value mrb_bint_new_int(mrb_state *mrb, mrb_int x);
+mrb_value mrb_bint_new_str(mrb_state *mrb, const char *x, mrb_int len, mrb_int base);
+mrb_value mrb_as_bint(mrb_state *mrb, mrb_value x);
+mrb_value mrb_bint_add(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_sub(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_mul(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_div(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_divmod(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_add_ii(mrb_state *mrb, mrb_int x, mrb_int y);
+mrb_value mrb_bint_sub_ii(mrb_state *mrb, mrb_int x, mrb_int y);
+mrb_value mrb_bint_mul_ii(mrb_state *mrb, mrb_int x, mrb_int y);
+mrb_value mrb_bint_div_ii(mrb_state *mrb, mrb_int x, mrb_int y);
+mrb_value mrb_bint_mod(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_rem(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_pow(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_powm(mrb_state *mrb, mrb_value x, mrb_int y, mrb_value z);
+mrb_value mrb_bint_and(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_or(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_xor(mrb_state *mrb, mrb_value x, mrb_value y);
+mrb_value mrb_bint_rev(mrb_state *mrb, mrb_value x);
+mrb_value mrb_bint_lshift(mrb_state *mrb, mrb_value x, mrb_int width);
+mrb_value mrb_bint_rshift(mrb_state *mrb, mrb_value x, mrb_int width);
+mrb_value mrb_bint_to_s(mrb_state *mrb, mrb_value x, mrb_int base);
+#ifndef MRB_NO_FLOAT
+mrb_value mrb_bint_new_float(mrb_state *mrb, mrb_float x);
+mrb_float mrb_bint_as_float(mrb_state *mrb, mrb_value x);
+#endif
+mrb_int mrb_bint_as_int(mrb_state *mrb, mrb_value x);
+mrb_int mrb_bint_cmp(mrb_state *mrb, mrb_value x, mrb_value y);
+void mrb_gc_free_bint(mrb_state *mrb, struct RBasic *x);
+void mrb_bint_copy(mrb_state *mrb, mrb_value x, mrb_value y);
+size_t mrb_bint_memsize(mrb_value x);
+mrb_value mrb_bint_hash(mrb_state *mrb, mrb_value x);
+#endif
+
+#endif  /* MRUBY_INTERNAL_H */