开源软件构建与测试

Changes of Revision 9

_service:tar_scm:nghttp2.spec Changed

_service:tar_scm:backport-CVE-2023-35945.patch Deleted

@@ -1,143 +0,0 @@
-From ce385d3f55a4b76da976b3bdf71fe2deddf315ba Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Fri, 14 Jul 2023 20:52:03 +0900
-Subject: PATCH Fix memory leak
-
-This commit fixes memory leak that happens when PUSH_PROMISE or
-HEADERS frame cannot be sent, and nghttp2_on_stream_close_callback
-fails with a fatal error. For example, if GOAWAY frame has been
-received, a HEADERS frame that opens new stream cannot be sent.
-
-This issue has already been made public via CVE-2023-35945 1 issued
-by envoyproxy/envoy project. During embargo period, the patch to fix
-this bug was accidentally submitted to nghttp2/nghttp2 repository 2.
-And they decided to disclose CVE early. I was notified just 1.5 hours
-before disclosure. I had no time to respond.
-
-PoC described in 1 is quite simple, but I think it is not enough to
-trigger this bug. While it is true that receiving GOAWAY prevents a
-client from opening new stream, and nghttp2 enters error handling
-branch, in order to cause the memory leak,
-nghttp2_session_close_stream function must return a fatal error.
-nghttp2 defines 2 fatal error codes:
-
-- NGHTTP2_ERR_NOMEM
-- NGHTTP2_ERR_CALLBACK_FAILURE
-
-NGHTTP2_ERR_NOMEM, as its name suggests, indicates out of memory. It
-is unlikely that a process gets short of memory with this simple PoC
-scenario unless application does something memory heavy processing.
-
-NGHTTP2_ERR_CALLBACK_FAILURE is returned from application defined
-callback function (nghttp2_on_stream_close_callback, in this case),
-which indicates something fatal happened inside a callback, and a
-connection must be closed immediately without any further action. As
-nghttp2_on_stream_close_error_callback documentation says, any error
-code other than 0 or NGHTTP2_ERR_CALLBACK_FAILURE is treated as fatal
-error code. More specifically, it is treated as if
-NGHTTP2_ERR_CALLBACK_FAILURE is returned. I guess that envoy returns
-NGHTTP2_ERR_CALLBACK_FAILURE or other error code which is translated
-into NGHTTP2_ERR_CALLBACK_FAILURE.
-
-1 https://github.com/envoyproxy/envoy/security/advisories/GHSA-jfxv-29pc-x22r
-2 https://github.com/nghttp2/nghttp2/pull/1929
----
- lib/nghttp2_session.c | 10 +++++-----
- tests/nghttp2_session_test.c | 34 ++++++++++++++++++++++++++++++++++
- 2 files changed, 39 insertions(+), 5 deletions(-)
-
-diff --git a/lib/nghttp2_session.c b/lib/nghttp2_session.c
-index 7509ceb5c6..71858a39e0 100644
---- a/lib/nghttp2_session.c
-+++ b/lib/nghttp2_session.c
-@@ -3296,6 +3296,7 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
- if (rv < 0) {
- int32_t opened_stream_id = 0;
- uint32_t error_code = NGHTTP2_INTERNAL_ERROR;
-+ int rv2 = 0;
- 
- DEBUGF("send: frame preparation failed with %s\n",
- nghttp2_strerror(rv));
-@@ -3338,19 +3339,18 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
- }
- if (opened_stream_id) {
- /* careful not to override rv */
-- int rv2;
- rv2 = nghttp2_session_close_stream(session, opened_stream_id,
- error_code);
--
-- if (nghttp2_is_fatal(rv2)) {
-- return rv2;
-- }
- }
- 
- nghttp2_outbound_item_free(item, mem);
- nghttp2_mem_free(mem, item);
- active_outbound_item_reset(aob, mem);
- 
-+ if (nghttp2_is_fatal(rv2)) {
-+ return rv2;
-+ }
-+
- if (rv == NGHTTP2_ERR_HEADER_COMP) {
- /* If header compression error occurred, should terminiate
- connection. */
-diff --git a/tests/nghttp2_session_test.c b/tests/nghttp2_session_test.c
-index b55ff53443..74352426c1 100644
---- a/tests/nghttp2_session_test.c
-+++ b/tests/nghttp2_session_test.c
-@@ -584,6 +584,15 @@ static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
- return 0;
- }
- 
-+static int fatal_error_on_stream_close_callback(nghttp2_session *session,
-+ int32_t stream_id,
-+ uint32_t error_code,
-+ void *user_data) {
-+ on_stream_close_callback(session, stream_id, error_code, user_data);
-+
-+ return NGHTTP2_ERR_CALLBACK_FAILURE;
-+}
-+
- static ssize_t pack_extension_callback(nghttp2_session *session, uint8_t *buf,
- size_t len, const nghttp2_frame *frame,
- void *user_data) {
-@@ -4296,6 +4305,8 @@ void test_nghttp2_session_on_goaway_received(void) {
- nghttp2_frame frame;
- int i;
- nghttp2_mem *mem;
-+ const uint8_t *data;
-+ ssize_t datalen;
- 
- mem = nghttp2_mem_default();
- user_data.frame_recv_cb_called = 0;
-@@ -4337,6 +4348,29 @@ void test_nghttp2_session_on_goaway_received(void) {
- 
- nghttp2_frame_goaway_free(&frame.goaway, mem);
- nghttp2_session_del(session);
-+
-+ /* Make sure that no memory leak when stream_close callback fails
-+ with a fatal error */
-+ memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-+ callbacks.on_stream_close_callback = fatal_error_on_stream_close_callback;
-+
-+ memset(&user_data, 0, sizeof(user_data));
-+
-+ nghttp2_session_client_new(&session, &callbacks, &user_data);
-+
-+ nghttp2_frame_goaway_init(&frame.goaway, 0, NGHTTP2_NO_ERROR, NULL, 0);
-+
-+ CU_ASSERT(0 == nghttp2_session_on_goaway_received(session, &frame));
-+
-+ nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), NULL, NULL);
-+
-+ datalen = nghttp2_session_mem_send(session, &data);
-+
-+ CU_ASSERT(NGHTTP2_ERR_CALLBACK_FAILURE == datalen);
-+ CU_ASSERT(1 == user_data.stream_close_cb_called);
-+
-+ nghttp2_frame_goaway_free(&frame.goaway, mem);
-+ nghttp2_session_del(session);
- }
- 
- void test_nghttp2_session_on_window_update_received(void) {

_service:tar_scm:nghttp2-1.52.0.tar.xz/cmake/FindLibngtcp2_crypto_openssl.cmake Deleted

@@ -1,43 +0,0 @@
-# - Try to find libngtcp2_crypto_openssl
-# Once done this will define
-#  LIBNGTCP2_CRYPTO_OPENSSL_FOUND        - System has libngtcp2_crypto_openssl
-#  LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS - The libngtcp2_crypto_openssl include directories
-#  LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES    - The libraries needed to use libngtcp2_crypto_openssl
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LIBNGTCP2_CRYPTO_OPENSSL QUIET libngtcp2_crypto_openssl)
-
-find_path(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
-  NAMES ngtcp2/ngtcp2_crypto_openssl.h
-  HINTS ${PC_LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS}
-)
-find_library(LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY
-  NAMES ngtcp2_crypto_openssl
-  HINTS ${PC_LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY_DIRS}
-)
-
-if(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR)
-  set(_version_regex "^#define \t+NGTCP2_VERSION \t+\"(^\"+)\".*")
-  file(STRINGS "${LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR}/ngtcp2/version.h"
-    LIBNGTCP2_CRYPTO_OPENSSL_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    LIBNGTCP2_CRYPTO_OPENSSL_VERSION "${LIBNGTCP2_CRYPTO_OPENSSL_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set
-# LIBNGTCP2_CRYPTO_OPENSSL_FOUND to TRUE if all listed variables are
-# TRUE and the requested version matches.
-find_package_handle_standard_args(Libngtcp2_crypto_openssl REQUIRED_VARS
-                                  LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY
-                                  LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
-                                  VERSION_VAR LIBNGTCP2_CRYPTO_OPENSSL_VERSION)
-
-if(LIBNGTCP2_CRYPTO_OPENSSL_FOUND)
-  set(LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES ${LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY})
-  set(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS ${LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
-                 LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY)

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/readflt.c Deleted

@@ -1,119 +0,0 @@
-#include <mruby.h>
-
-#ifndef MRB_NO_FLOAT
-/*
- * strtod implementation.
- * author: Yasuhiro Matsumoto (@mattn)
- * license: public domain
- */
-
-/*
-The original code can be found in https://github.com/mattn/strtod
-
-I modified the routine for mruby:
-
- * renamed the function `vim_strtod` -> `mrb_float_read`
- * simplified the code
-
-My modifications in this file are also placed in the public domain.
-
-Matz (Yukihiro Matsumoto)
-*/
-
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-
-MRB_API double
-mrb_float_read(const char *str, char **end)
-{
- double d = 0.0;
- int sign;
- int n = 0;
- const char *p, *a;
-
- a = p = str;
- while (ISSPACE(*p))
- ++p;
-
- /* decimal part */
- sign = 1;
- if (*p == '-') {
- sign = -1;
- ++p;
- } else if (*p == '+')
- ++p;
- if (ISDIGIT(*p)) {
- d = (double)(*p++ - '0');
- while (*p && ISDIGIT(*p)) {
- d = d * 10.0 + (double)(*p - '0');
- ++p;
- ++n;
- }
- a = p;
- } else if (*p != '.')
- goto done;
- d *= sign;
-
- /* fraction part */
- if (*p == '.') {
- double f = 0.0;
- double base = 0.1;
- ++p;
-
- if (ISDIGIT(*p))
- {
- while (*p && ISDIGIT(*p)) {
- f += base * (*p - '0') ;
- base /= 10.0;
- ++p;
- ++n;
- }
- }
- d += f * sign;
- a = p;
- }
-
- /* exponential part */
- if ((*p == 'E') || (*p == 'e')) {
- int e = 0;
- ++p;
-
- sign = 1;
- if (*p == '-') {
- sign = -1;
- ++p;
- } else if (*p == '+')
- ++p;
-
- if (ISDIGIT(*p)) {
- while (*p == '0')
- ++p;
- if (*p == '\0') --p;
- e = (int)(*p++ - '0');
- for (; *p && ISDIGIT(*p); p++) {
- if (e < 10000)
- e = e * 10 + (*p - '0');
- }
- e *= sign;
- }
- else if (!ISDIGIT(*(a-1))) {
- a = str;
- goto done;
- }
- else if (*p == 0)
- goto done;
- d *= pow(10.0, (double) e);
- a = p;
- }
- else if (p > str && !ISDIGIT(*(p-1))) {
- a = str;
- goto done;
- }
-
-done:
- if (end)
- *end = (char*)a;
- return d;
-}
-#endif

_service:tar_scm:nghttp2-1.52.0.tar.xz/CMakeLists.txt -> _service:tar_scm:nghttp2-1.55.1.tar.xz/CMakeLists.txt Changed

@@ -24,12 +24,12 @@
 
 cmake_minimum_required(VERSION 3.0)
 # XXX using 1.8.90 instead of 1.9.0-DEV
-project(nghttp2 VERSION 1.52.0)
+project(nghttp2 VERSION 1.55.1)
 
 # See versioning rule:
 #  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 set(LT_CURRENT  38)
-set(LT_REVISION 1)
+set(LT_REVISION 3)
 set(LT_AGE      24)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
@@ -61,9 +61,9 @@
 find_package(Libcares 1.7.5)
 find_package(ZLIB 1.2.3)
 find_package(Libngtcp2 0.0.0)
-find_package(Libngtcp2_crypto_openssl 0.0.0)
-if(LIBNGTCP2_CRYPTO_OPENSSL_FOUND)
-  set(HAVE_LIBNGTCP2_CRYPTO_OPENSSL 1)
+find_package(Libngtcp2_crypto_quictls 0.0.0)
+if(LIBNGTCP2_CRYPTO_QUICTLS_FOUND)
+  set(HAVE_LIBNGTCP2_CRYPTO_QUICTLS 1)
 endif()
 find_package(Libnghttp3 0.0.0)
 if(WITH_LIBBPF)
@@ -238,9 +238,9 @@
   message(FATAL_ERROR "Applications were requested (ENABLE_APP=1) but dependencies are not met.")
 endif()
 
-# HTTP/3 requires quictls/openssl, libngtcp2, libngtcp2_crypto_openssl
+# HTTP/3 requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls
 # and libnghttp3.
-if(ENABLE_HTTP3 AND NOT (HAVE_SSL_IS_QUIC AND LIBNGTCP2_FOUND AND LIBNGTCP2_CRYPTO_OPENSSL_FOUND AND LIBNGHTTP3_FOUND))
+if(ENABLE_HTTP3 AND NOT (HAVE_SSL_IS_QUIC AND LIBNGTCP2_FOUND AND LIBNGTCP2_CRYPTO_QUICTLS_FOUND AND LIBNGHTTP3_FOUND))
   message(FATAL_ERROR "HTTP/3 was requested (ENABLE_HTTP3=1) but dependencies are not met.")
 endif()
 
@@ -513,7 +513,7 @@
       Libev:          ${HAVE_LIBEV} (LIBS='${LIBEV_LIBRARIES}')
       Libc-ares:      ${HAVE_LIBCARES} (LIBS='${LIBCARES_LIBRARIES}')
       Libngtcp2:      ${HAVE_LIBNGTCP2} (LIBS='${LIBNGTCP2_LIBRARIES}')
-      Libngtcp2_crypto_openssl: ${HAVE_LIBNGTCP2_CRYPTO_OPENSSL} (LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES}')
+      Libngtcp2_crypto_quictls: ${HAVE_LIBNGTCP2_CRYPTO_QUICTLS} (LIBS='${LIBNGTCP2_CRYPTO_QUICTLS_LIBRARIES}')
       Libnghttp3:     ${HAVE_LIBNGHTTP3} (LIBS='${LIBNGHTTP3_LIBRARIES}')
       Libbpf:         ${HAVE_LIBBPF} (LIBS='${LIBBPF_LIBRARIES}')
       Libevent(SSL):  ${HAVE_LIBEVENT_OPENSSL} (LIBS='${LIBEVENT_OPENSSL_LIBRARIES}')

_service:tar_scm:nghttp2-1.52.0.tar.xz/ChangeLog -> _service:tar_scm:nghttp2-1.55.1.tar.xz/ChangeLog Changed

@@ -1,518 +1,70 @@
-commit be0491294a63d891bd12b6b1b7e372a45a5d0ffe (HEAD, tag: v1.52.0, origin/master, origin/HEAD, master)
+commit 781057e15626bf403c8739c25166ad123aa17ff3 (HEAD, tag: v1.55.1, origin/v1.55.x, origin/HEAD, v1.55.x)
 Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-13
+AuthorDate: 2023-07-14
 Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-13
+CommitDate: 2023-07-14
 
 Update manual pages
 
-commit 17d54064d88f92b3f1d107fef1cb011694d5cb81
+commit 2f87b9c4f8aba3ac0b6b23c03773b70668bfe642
 Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-10
+AuthorDate: 2023-07-14
 Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-12
+CommitDate: 2023-07-14
 
- Bump package version
+ Bump package and library versions
 
-commit d8fb86a987a8259944189c57e1f3243e8543fc4c
+commit 299d2fdaf9d7c9747378e39fc0e8e36bcdab2a5b
 Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-10
+AuthorDate: 2023-07-12
 Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-12
+CommitDate: 2023-07-14
 
- Update AUTHORS
+ doc: Bump boringssl
 
-commit 5967358697c89a2cae2a6e49b2fab782bd423073
-Merge: c597e928 7041b41a
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-02-12
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-02-12
-
- Merge pull request #1862 from nghttp2/bump-quictls
- 
- Bump quictls
-
-commit 7041b41afacb15a0a5013051edf88b280c9ee282
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-12
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-12
-
- Bump quictls
-
-commit c597e928f19fc5acb8be8cef4c0e75bc84aab855
-Merge: b082a6b3 79f261ed
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-02-11
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-02-11
-
- Merge pull request #1861 from nghttp2/simplify-uniform_int_distribution
- 
- Simplify std::uniform_int_distribution call
-
-commit 79f261edf024b5925ac0cb14bb3ed0197faf7a88
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-11
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-11
-
- Simplify std::uniform_int_distribution call
-
-commit b082a6b3dd8ca0ddf90ba10470fd1c57e492e266
-Merge: 93689845 64b97acc
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-02-10
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-02-10
-
- Merge pull request #1860 from nghttp2/bump-llhttp
- 
- Bump llhttp to f2e1914b6c59f5cd88f492abc9d8af6be246bc85
-
-commit 64b97acc334bd4ab3e26af680b1331e22ffd4977
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-10
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-10
-
- Bump llhttp to f2e1914b6c59f5cd88f492abc9d8af6be246bc85
-
-commit 936898453d3e8a173aaaa899de66fbed33b0f673
-Merge: 93118d76 62802342
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-02-10
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-02-10
-
- Merge pull request #1859 from nghttp2/bump-libbpf
- 
- Bump libbpf to v1.1.0
-
-commit 62802342aac93e876105f1c1eecdcaaaf079fb45
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-10
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-10
-
- Bump libbpf to v1.1.0
-
-commit 93118d76f4d2645c2eceff0cefaa551a0051c082
-Merge: 4434fcbd 95b2f946
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-02-09
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-02-09
-
- Merge pull request #1858 from nghttp2/bump-ngtcp2
- 
- Bump ngtcp2 to v0.13.1
-
-commit 95b2f94671ad0c64c419f52eb345ca7fef4c1b95
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-09
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-09
-
- Bump ngtcp2 to v0.13.1
-
-commit 4434fcbde1522553174e8697f251c2bf8fe8186f
-Merge: 10d52f5a cbcfdaa6
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-02-09
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-02-09
-
- Merge pull request #1857 from nghttp2/nghttpx-fix-tls-write-stall
- 
- nghttpx: Fix bug that stalls TLS write
-
-commit cbcfdaa6555778a8c52d7d60b787dbd9d6a755ca
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-02-06
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-02-06
-
- nghttpx: Fix bug that stalls TLS write
-
-commit 10d52f5a272a94a56ca1b9df8bc8085107f94ee4
-Merge: 0dbcf9c0 92c7593c
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-02-02
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-02-02
-
- Merge pull request #1854 from nghttp2/bump-ngtcp2-dockerfile
- 
- Bump ngtcp2 in Dockerfile to v0.13.0
-
-commit 92c7593cffa05a35823e18a054ecf761685e544a
+commit 8720afa30428fdb008b54f5218dd248b1a494b13
 Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-01-31
+AuthorDate: 2023-07-14
 Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-01-31
+CommitDate: 2023-07-14
 
- Bump ngtcp2 in Dockerfile to v0.13.0
-
-commit 0dbcf9c04dc7c53d8048e741cb33eee4e03c9b66
-Merge: 0ba1718e f494e886
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-01-31
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-01-31
-
- Merge pull request #1853 from nghttp2/bump-ngtcp2
+ Fix memory leak
 
- Bump ngtcp2 to v0.13.0
-
-commit f494e88611a99c31269264451dd7342e5fdb58ce
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-01-31
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-01-31
-
- Bump ngtcp2 to v0.13.0
-
-commit 0ba1718e40542d46342e3a0cb69baa0a2212a867
-Merge: a6b0eeac 5c5d978a
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-01-30
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-01-30
-
- Merge pull request #1852 from nghttp2/remove-sphinx-theme-bundle
+ This commit fixes memory leak that happens when PUSH_PROMISE or
+ HEADERS frame cannot be sent, and nghttp2_on_stream_close_callback
+ fails with a fatal error. For example, if GOAWAY frame has been
+ received, a HEADERS frame that opens new stream cannot be sent.
 
- Remove sphinx theme bundle
-
-commit 5c5d978abe5bf14d3b3b82aa40783935b04adc57
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-01-30
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-01-30
-
- Remove sphinx theme bundle
+ This issue has already been made public via CVE-2023-35945 1 issued
+ by envoyproxy/envoy project. During embargo period, the patch to fix
+ this bug was accidentally submitted to nghttp2/nghttp2 repository 2.
+ And they decided to disclose CVE early. I was notified just 1.5 hours
+ before disclosure. I had no time to respond.
 
- Remove sphinx theme bundle, and rely on the locally installed theme
- (e.g., `pip install sphinx_rtd_theme`).
-
-commit a6b0eeacc9f5c095d404832897697eb4951e77b8
-Merge: aea182c5 6993e63a
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-01-29
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-01-29
-
- Merge pull request #1851 from nghttp2/bump-neverbleed
+ PoC described in 1 is quite simple, but I think it is not enough to
+ trigger this bug. While it is true that receiving GOAWAY prevents a
+ client from opening new stream, and nghttp2 enters error handling
+ branch, in order to cause the memory leak,
+ nghttp2_session_close_stream function must return a fatal error.
+ nghttp2 defines 2 fatal error codes:
 
- Bump neverbleed
-
-commit 6993e63ac486d77c5b96b22a401c836bfee655bb
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-01-29
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-01-29
-
- Bump neverbleed
-
-commit aea182c5a4c941eedf2f3d71b03f5cd1b71c419e
-Merge: 05b79290 c78aebf6
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2023-01-29
-Commit: GitHub <noreply@github.com>
-CommitDate: 2023-01-29
-
- Merge pull request #1850 from nghttp2/fix-path-component-resolution
+ - NGHTTP2_ERR_NOMEM
+ - NGHTTP2_ERR_CALLBACK_FAILURE
 
- src: Fix path component resolution
-
-commit c78aebf68f90e1cd31e09e0e19b2e7e42cde1bfb
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2023-01-29
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2023-01-29
-
- src: Fix path component resolution
- 
- Fix path component resolution when '.' is involved.
-
-commit 05b792901933664e7aeb7ebb8c87db81123d484a
-Merge: 5b665b3e b52f96d3
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-26
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-26
-
- Merge pull request #1849 from nghttp2/remove-unused-function
+ NGHTTP2_ERR_NOMEM, as its name suggests, indicates out of memory. It
+ is unlikely that a process gets short of memory with this simple PoC
+ scenario unless application does something memory heavy processing.
 
- Remove unused function
-
-commit 5b665b3e48858505c347dcfdc2c033dc7b2de39e
-Merge: 5089dcd3 2ca0bb0a
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-26
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-26
-
- Merge pull request #1848 from nghttp2/remove-src-includes
+ NGHTTP2_ERR_CALLBACK_FAILURE is returned from application defined
+ callback function (nghttp2_on_stream_close_callback, in this case),
+ which indicates something fatal happened inside a callback, and a
+ connection must be closed immediately without any further action. As
+ nghttp2_on_stream_close_error_callback documentation says, any error
+ code other than 0 or NGHTTP2_ERR_CALLBACK_FAILURE is treated as fatal
+ error code. More specifically, it is treated as if
+ NGHTTP2_ERR_CALLBACK_FAILURE is returned. I guess that envoy returns
+ NGHTTP2_ERR_CALLBACK_FAILURE or other error code which is translated
+ into NGHTTP2_ERR_CALLBACK_FAILURE.
 
- Remove src/includes
-
-commit 5089dcd3f295f364e02c17b515a353a8e6e04e21
-Merge: 30bb4eb8 fa3d1bfc
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-26
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-26
-
- Merge pull request #1847 from nghttp2/bump-zlib
- 
- Bump zlib to 1.2.13
-
-commit b52f96d38a5c32b692ecbfbd4c25c49aa684232b
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-12-26
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-12-26
-
- Remove unused function
-
-commit 2ca0bb0a2fd5faeef0a27c07216f76727981dad2
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-12-26
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-12-26
-
- Remove src/includes
-
-commit fa3d1bfc8f5d61d05aa85918041ebf7335e361ff
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-12-26
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-12-26
-
- Bump zlib to 1.2.13
-
-commit 30bb4eb8f27225341fac5067ece6f47d67dc9dc5
-Merge: 2c62572a b4cb3b00
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-26
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-26
-
- Merge pull request #1846 from nghttp2/remove-python
- 
- Remove deprecated python bindings
-
-commit b4cb3b0090b704f2461766c455568b311013272f
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-12-24
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-12-26
-
- Remove deprecated python bindings
-
-commit 2c62572ae19067a853bb9ca2978b222f7185b1ed
-Merge: 42904a58 e6d608b5
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-26
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-26
-
- Merge pull request #1844 from nghttp2/remove-libnghttp2_asio
- 
- Remove deprecated libnghttp2_asio
-
-commit 42904a586cf7f091e515661734e6287767d299c7
-Merge: 00a33281 8538e1ec
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-25
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-25
-
- Merge pull request #1845 from nghttp2/minor-cleanup
- 
- Minor cleanup
-
-commit 8538e1ec42c5f150213ddc612d5b2268da7364e0
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-12-25
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-12-25
-
- Minor cleanup
-
-commit e6d608b52242c88e151c1e7e500549976e8abacc
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-12-24
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-12-24
-
- Remove deprecated libnghttp2_asio
-
-commit 00a33281bec5a6a53fba80df4036d8037957df64
-Merge: 252c425e 7c7ba058
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-24
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-24
-
- Merge pull request #1843 from nghttp2/bump-ngtcp2
- 
- Bump ngtcp2 dependencies
-
-commit 7c7ba0586e7b837b3c97bfd196a79e242b8c6e36
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-12-24
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-12-24
-
- Bump ngtcp2 dependencies
-
-commit 252c425ea69eeb382bf56c20b3644672dd9c2363
-Merge: 5195e8be 525630ae
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-12-23
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-12-23
-
- Merge pull request #1837 from fredizzimo/fix-libevent-component
- 
- Don't use the unofficial libevent component
-
-commit 525630ae7a02cab36d94733486dcd5a52509a551
-Author: Fred Sundvik <fsundvik@gmail.com>
-AuthorDate: 2022-12-07
-Commit: Fred Sundvik <fsundvik@gmail.com>
-CommitDate: 2022-12-07
-
- Don't use the unofficial libevent component
-
-commit 5195e8be6a44ecd451d8da17c663c267c74c6000
-Merge: b5b18699 358c15e0
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-11-24
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-11-24
-
- Merge pull request #1835 from nghttp2/integration-lint
- 
- integration: Fix lint errors
-
-commit 358c15e015b0ea96b459c6c93fbde789ef90471f
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Fix lint errors
-
-commit b5b18699cb6768fa6fba268c345c254c5335b8a4
-Merge: a945c057 44e4475a
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-11-20
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-11-20
-
- Merge pull request #1834 from nghttp2/integration-http-status-code
- 
- integration: Use HTTP status code constants
-
-commit 44e4475a318007a480c5455326a7434a8df42a9d
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Use HTTP status code constants
-
-commit a945c057c5955f499edde9ed366934f8cf94e6e3
-Merge: 46602a96 babeddb6
-Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
-AuthorDate: 2022-11-20
-Commit: GitHub <noreply@github.com>
-CommitDate: 2022-11-20
-
- Merge pull request #1833 from nghttp2/integration-h3
- 
- Integration h3
-
-commit babeddb6499f3baae5bf3befa5f503e615cdacf9
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- nghttpx: HTTPS redirect should not happen with HTTP/3 upstream
-
-commit 2d790edac596da5da361475c949aec3e4ffedbb1
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Add http3 test which verifies chunked encoding ends prematurely
-
-commit 2bef60a6f4ae42cecc2cfe72a67284322f98c738
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Add http3 test which verifies response ends before request
-
-commit 17e3bb4ec5d1aaac14441b24a849b6c50590a252
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Add http3 mruby tests
-
-commit 5e1b1a088309b3475a86f632f216727374a008b2
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Add http3 affinity cookie test
-
-commit 5b0cbb489248415a250bd4306829ad2cbc9406f5
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Add http3 HTTPS redirect test
-
-commit 17a5ba4969911987cc0adae834b8079033c4aaa8
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Add http3 response content-length test
-
-commit 20d95edc5738a0b7b6a5000b1ed39289e5e62895
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- integration: Add http3 via tests
-
-commit 126b5f9d2b64a87b8da8c0b723bc6ffcffdad84c
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-20
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-20
-
- Add the missing file
-
-commit 46602a961d16d03dbddb6ecd2cd8c16cc63f3ae2
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2022-11-13
-Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2022-11-13
-
- Bump package version
+ 1 https://github.com/envoyproxy/envoy/security/advisories/GHSA-jfxv-29pc-x22r
+ 2 https://github.com/nghttp2/nghttp2/pull/1929

_service:tar_scm:nghttp2-1.52.0.tar.xz/Makefile.am -> _service:tar_scm:nghttp2-1.55.1.tar.xz/Makefile.am Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/README.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/README.rst Changed

@@ -127,11 +127,11 @@
 following libraries are required:
 
 * `OpenSSL with QUIC support
- <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1t+quic>`_; or
+ <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1u+quic>`_; or
 `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
- 80a243e07ef77156af66efa7d22ac35aba44c1b3)
-* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.13.0
-* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 0.7.0
+ 80dcb67d4481fb1194b9669917e35580c32dc388)
+* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ 0.17.x
+* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ 0.13.x
 
 Use ``--enable-http3`` configure option to enable HTTP/3 feature for
 h2load and nghttpx.
@@ -146,7 +146,7 @@
 libelf-dev is needed to build libbpf.
 
 For Ubuntu 20.04, you can build libbpf from `the source code
-<https://github.com/libbpf/libbpf/releases/tag/v1.1.0>`_. nghttpx
+<https://github.com/libbpf/libbpf/releases/tag/v1.2.0>`_. nghttpx
 requires eBPF program for reloading its configuration and hot swapping
 its executable.
 
@@ -343,7 +343,7 @@
 
 .. code-block:: text
 
- $ git clone --depth 1 -b OpenSSL_1_1_1t+quic https://github.com/quictls/openssl
+ $ git clone --depth 1 -b OpenSSL_1_1_1u+quic https://github.com/quictls/openssl
 $ cd openssl
 $ ./config --prefix=$PWD/build --openssldir=/etc/ssl
 $ make -j$(nproc)
@@ -354,7 +354,7 @@
 
 .. code-block:: text
 
- $ git clone --depth 1 -b v0.8.0 https://github.com/ngtcp2/nghttp3
+ $ git clone --depth 1 -b v0.13.0 https://github.com/ngtcp2/nghttp3
 $ cd nghttp3
 $ autoreconf -i
 $ ./configure --prefix=$PWD/build --enable-lib-only
@@ -366,7 +366,7 @@
 
 .. code-block:: text
 
- $ git clone --depth 1 -b v0.13.1 https://github.com/ngtcp2/ngtcp2
+ $ git clone --depth 1 -b v0.17.0 https://github.com/ngtcp2/ngtcp2
 $ cd ngtcp2
 $ autoreconf -i
 $ ./configure --prefix=$PWD/build --enable-lib-only \
@@ -380,7 +380,7 @@
 
 .. code-block:: text
 
- $ git clone --depth 1 -b v1.1.0 https://github.com/libbpf/libbpf
+ $ git clone --depth 1 -b v1.2.0 https://github.com/libbpf/libbpf
 $ cd libbpf
 $ PREFIX=$PWD/build make -C src install
 $ cd ..

_service:tar_scm:nghttp2-1.52.0.tar.xz/aclocal.m4 -> _service:tar_scm:nghttp2-1.55.1.tar.xz/aclocal.m4 Changed

@@ -20,7 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*-
 # serial 12 (pkg-config-0.29.2)
 
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -108,7 +108,7 @@
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
 dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN(PKG_CHECK_EXISTS,
@@ -177,14 +177,14 @@
 AC_MSG_RESULT(no)
 _PKG_SHORT_ERRORS_SUPPORTED
 if test $_pkg_short_errors_supported = yes; then
-	 $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
 else
-	 $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	m4_default($4, AC_MSG_ERROR(
+ m4_default($4, AC_MSG_ERROR(
 Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -196,7 +196,7 @@
 )
 elif test $pkg_failed = untried; then
 AC_MSG_RESULT(no)
-	m4_default($4, AC_MSG_FAILURE(
+ m4_default($4, AC_MSG_FAILURE(
 The pkg-config script could not be found or is too old. Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -206,10 +206,10 @@
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
 )
 else
-	$1_CFLAGS=$pkg_cv_$1_CFLAGS
-	$1_LIBS=$pkg_cv_$1_LIBS
+ $1_CFLAGS=$pkg_cv_$1_CFLAGS
+ $1_LIBS=$pkg_cv_$1_LIBS
 AC_MSG_RESULT(yes)
-	$3
+ $3
 fidnl
 )dnl PKG_CHECK_MODULES
 
@@ -296,6 +296,74 @@
 AS_VAR_IF($1, "", $5, $4)dnl
 )dnl PKG_CHECK_VAR
 
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl ACTION-IF-FOUND,ACTION-IF-NOT-FOUND,
+dnl DESCRIPTION, DEFAULT)
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl VARIABLE-PREFIX name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN(PKG_WITH_MODULES,
+
+m4_pushdef(with_arg, m4_tolower($1))
+
+m4_pushdef(description,
+ m4_default($5, build with with_arg support))
+
+m4_pushdef(def_arg, m4_default($6, auto))
+m4_pushdef(def_action_if_found, AS_TR_SH(with_with_arg)=yes)
+m4_pushdef(def_action_if_not_found, AS_TR_SH(with_with_arg)=no)
+
+m4_case(def_arg,
+ yes,m4_pushdef(with_without, --without-with_arg),
+ m4_pushdef(with_without,--with-with_arg))
+
+AC_ARG_WITH(with_arg,
+ AS_HELP_STRING(with_without, description @<:@default=def_arg@:>@),,
+ AS_TR_SH(with_with_arg)=def_arg)
+
+AS_CASE($AS_TR_SH(with_with_arg),
+ yes,PKG_CHECK_MODULES($1,$2,$3,$4),
+ auto,PKG_CHECK_MODULES($1,$2,
+ m4_n(def_action_if_found) $3,
+ m4_n(def_action_if_not_found) $4))
+
+m4_popdef(with_arg)
+m4_popdef(description)
+m4_popdef(def_arg)
+
+)dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl DESCRIPTION, DEFAULT)
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._VARIABLE-PREFIX is exported as make variable.
+AC_DEFUN(PKG_HAVE_WITH_MODULES,
+
+PKG_WITH_MODULES($1,$2,,,$3,$4)
+
+AM_CONDITIONAL(HAVE_$1,
+ test "$AS_TR_SH(with_m4_tolower($1))" = "yes")
+)dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl DESCRIPTION, DEFAULT)
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_VARIABLE-PREFIX is exported as make
+dnl and preprocessor variable.
+AC_DEFUN(PKG_HAVE_DEFINE_WITH_MODULES,
+
+PKG_HAVE_WITH_MODULES($1,$2,$3,$4)
+
+AS_IF(test "$AS_TR_SH(with_m4_tolower($1))" = "yes",
+ AC_DEFINE(HAVE_$1, 1, Enable m4_tolower($1) support))
+)dnl PKG_HAVE_DEFINE_WITH_MODULES
+
 # Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation

_service:tar_scm:nghttp2-1.52.0.tar.xz/bpf/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/bpf/Makefile.in Changed

_service:tar_scm:nghttp2-1.55.1.tar.xz/cmake/FindLibngtcp2_crypto_quictls.cmake Added

@@ -0,0 +1,43 @@
+# - Try to find libngtcp2_crypto_quictls
+# Once done this will define
+#  LIBNGTCP2_CRYPTO_QUICTLS_FOUND        - System has libngtcp2_crypto_quictls
+#  LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIRS - The libngtcp2_crypto_quictls include directories
+#  LIBNGTCP2_CRYPTO_QUICTLS_LIBRARIES    - The libraries needed to use libngtcp2_crypto_quictls
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_LIBNGTCP2_CRYPTO_QUICTLS QUIET libngtcp2_crypto_quictls)
+
+find_path(LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIR
+  NAMES ngtcp2/ngtcp2_crypto_quictls.h
+  HINTS ${PC_LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIRS}
+)
+find_library(LIBNGTCP2_CRYPTO_QUICTLS_LIBRARY
+  NAMES ngtcp2_crypto_quictls
+  HINTS ${PC_LIBNGTCP2_CRYPTO_QUICTLS_LIBRARY_DIRS}
+)
+
+if(LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIR)
+  set(_version_regex "^#define \t+NGTCP2_VERSION \t+\"(^\"+)\".*")
+  file(STRINGS "${LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIR}/ngtcp2/version.h"
+    LIBNGTCP2_CRYPTO_QUICTLS_VERSION REGEX "${_version_regex}")
+  string(REGEX REPLACE "${_version_regex}" "\\1"
+    LIBNGTCP2_CRYPTO_QUICTLS_VERSION "${LIBNGTCP2_CRYPTO_QUICTLS_VERSION}")
+  unset(_version_regex)
+endif()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set
+# LIBNGTCP2_CRYPTO_QUICTLS_FOUND to TRUE if all listed variables are
+# TRUE and the requested version matches.
+find_package_handle_standard_args(Libngtcp2_crypto_quictls REQUIRED_VARS
+                                  LIBNGTCP2_CRYPTO_QUICTLS_LIBRARY
+                                  LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIR
+                                  VERSION_VAR LIBNGTCP2_CRYPTO_QUICTLS_VERSION)
+
+if(LIBNGTCP2_CRYPTO_QUICTLS_FOUND)
+  set(LIBNGTCP2_CRYPTO_QUICTLS_LIBRARIES ${LIBNGTCP2_CRYPTO_QUICTLS_LIBRARY})
+  set(LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIRS ${LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIR})
+endif()
+
+mark_as_advanced(LIBNGTCP2_CRYPTO_QUICTLS_INCLUDE_DIR
+                 LIBNGTCP2_CRYPTO_QUICTLS_LIBRARY)

_service:tar_scm:nghttp2-1.52.0.tar.xz/cmakeconfig.h.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/cmakeconfig.h.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/config.h.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/config.h.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/configure -> _service:tar_scm:nghttp2-1.55.1.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for nghttp2 1.52.0.
+# Generated by GNU Autoconf 2.71 for nghttp2 1.55.1.
 #
 # Report bugs to <t-tujikawa@users.sourceforge.net>.
 #
@@ -621,8 +621,8 @@
 # Identity of this package.
 PACKAGE_NAME='nghttp2'
 PACKAGE_TARNAME='nghttp2'
-PACKAGE_VERSION='1.52.0'
-PACKAGE_STRING='nghttp2 1.52.0'
+PACKAGE_VERSION='1.55.1'
+PACKAGE_STRING='nghttp2 1.55.1'
 PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net'
 PACKAGE_URL=''
 
@@ -707,8 +707,8 @@
 LIBNGHTTP3_CFLAGS
 LIBNGTCP2_CRYPTO_BORINGSSL_LIBS
 LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS
-LIBNGTCP2_CRYPTO_OPENSSL_LIBS
-LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS
+LIBNGTCP2_CRYPTO_QUICTLS_LIBS
+LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS
 LIBNGTCP2_LIBS
 LIBNGTCP2_CFLAGS
 LIBCARES_LIBS
@@ -952,8 +952,8 @@
 LIBCARES_LIBS
 LIBNGTCP2_CFLAGS
 LIBNGTCP2_LIBS
-LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS
-LIBNGTCP2_CRYPTO_OPENSSL_LIBS
+LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS
+LIBNGTCP2_CRYPTO_QUICTLS_LIBS
 LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS
 LIBNGTCP2_CRYPTO_BORINGSSL_LIBS
 LIBNGHTTP3_CFLAGS
@@ -1516,7 +1516,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures nghttp2 1.52.0 to adapt to many kinds of systems.
+\`configure' configures nghttp2 1.55.1 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1588,7 +1588,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of nghttp2 1.52.0:";;
+ short | recursive ) echo "Configuration of nghttp2 1.55.1:";;
 esac
 cat <<\_ACEOF
 
@@ -1702,11 +1702,11 @@
 C compiler flags for LIBNGTCP2, overriding pkg-config
 LIBNGTCP2_LIBS
 linker flags for LIBNGTCP2, overriding pkg-config
- LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS
- C compiler flags for LIBNGTCP2_CRYPTO_OPENSSL, overriding
+ LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS
+ C compiler flags for LIBNGTCP2_CRYPTO_QUICTLS, overriding
 pkg-config
- LIBNGTCP2_CRYPTO_OPENSSL_LIBS
- linker flags for LIBNGTCP2_CRYPTO_OPENSSL, overriding pkg-config
+ LIBNGTCP2_CRYPTO_QUICTLS_LIBS
+ linker flags for LIBNGTCP2_CRYPTO_QUICTLS, overriding pkg-config
 LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS
 C compiler flags for LIBNGTCP2_CRYPTO_BORINGSSL, overriding
 pkg-config
@@ -1804,7 +1804,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-nghttp2 configure 1.52.0
+nghttp2 configure 1.55.1
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2722,7 +2722,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nghttp2 $as_me 1.52.0, which was
+It was created by nghttp2 $as_me 1.55.1, which was
 generated by GNU Autoconf 2.71. Invocation command line was
 
 $ $0$ac_configure_args_raw
@@ -4944,8 +4944,8 @@
 
 
 
-macro_version='2.4.6'
-macro_revision='2.4.6'
+macro_version='2.4.7'
+macro_revision='2.4.7'
 
 
 
@@ -13709,7 +13709,7 @@
 
 # Define the identity of the package.
 PACKAGE='nghttp2'
- VERSION='1.52.0'
+ VERSION='1.55.1'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -13986,7 +13986,7 @@
 
 LT_CURRENT=38
 
-LT_REVISION=1
+LT_REVISION=3
 
 LT_AGE=24
 
@@ -15312,11 +15312,11 @@
 then :
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
 printf %s "(cached) " >&6
 else $as_nop
- ac_cv_prog_cxx_11=no
+ ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -15358,11 +15358,11 @@
 then :
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
 printf %s "(cached) " >&6
 else $as_nop
- ac_cv_prog_cxx_98=no
+ ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -20361,24 +20361,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib >= 1.2.3" 2>&1`
+ ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib >= 1.2.3" 2>&1`
 else
-	 ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib >= 1.2.3" 2>&1`
+ ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib >= 1.2.3" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ZLIB_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$ZLIB_PKG_ERRORS" >&5
 
-	have_zlib=no
+ have_zlib=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_zlib=no
+ have_zlib=no
 else
-	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
-	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
+ ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
+ ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_zlib=yes
+ have_zlib=yes
 fi
 
 if test "x${have_zlib}" = "xno"; then
@@ -20517,24 +20517,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 CUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cunit >= 2.1" 2>&1`
+ CUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cunit >= 2.1" 2>&1`
 else
-	 CUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cunit >= 2.1" 2>&1`
+ CUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cunit >= 2.1" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CUNIT_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CUNIT_PKG_ERRORS" >&5
 
-	have_cunit=no
+ have_cunit=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_cunit=no
+ have_cunit=no
 else
-	CUNIT_CFLAGS=$pkg_cv_CUNIT_CFLAGS
-	CUNIT_LIBS=$pkg_cv_CUNIT_LIBS
+ CUNIT_CFLAGS=$pkg_cv_CUNIT_CFLAGS
+ CUNIT_LIBS=$pkg_cv_CUNIT_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_cunit=yes
+ have_cunit=yes
 fi
 # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
 # do this because Debian (Ubuntu) lacks pkg-config file for cunit.
@@ -20684,6 +20684,12 @@
 else
 have_libev=yes
 fi
+
+ if test "x${have_libev}" = "xyes"; then
+
+printf "%s\n" "#define HAVE_LIBEV 1" >>confdefs.h
+
+ fi
 fi
 
 if test "x${request_libev}" = "xyes" &&
@@ -20746,24 +20752,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.0.1" 2>&1`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.0.1" 2>&1`
 else
-	 OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.0.1" 2>&1`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.0.1" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$OPENSSL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPENSSL_PKG_ERRORS" >&5
 
-	have_openssl=no
+ have_openssl=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_openssl=no
+ have_openssl=no
 else
-	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
-	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+ OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+ OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_openssl=yes
+ have_openssl=yes
 fi
 if test "x${have_openssl}" = "xno"; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $OPENSSL_PKG_ERRORS" >&5
@@ -20900,24 +20906,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBCARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares >= 1.7.5" 2>&1`
+ LIBCARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares >= 1.7.5" 2>&1`
 else
-	 LIBCARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares >= 1.7.5" 2>&1`
+ LIBCARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares >= 1.7.5" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBCARES_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBCARES_PKG_ERRORS" >&5
 
-	have_libcares=no
+ have_libcares=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libcares=no
+ have_libcares=no
 else
-	LIBCARES_CFLAGS=$pkg_cv_LIBCARES_CFLAGS
-	LIBCARES_LIBS=$pkg_cv_LIBCARES_LIBS
+ LIBCARES_CFLAGS=$pkg_cv_LIBCARES_CFLAGS
+ LIBCARES_LIBS=$pkg_cv_LIBCARES_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libcares=yes
+ have_libcares=yes
 fi
 if test "x${have_libcares}" = "xno"; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $LIBCARES_PKG_ERRORS" >&5
@@ -20935,19 +20941,19 @@
 if test "x${request_libngtcp2}" != "xno"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2 >= 0.13.0" >&5
-printf %s "checking for libngtcp2 >= 0.13.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2 >= 0.17.0" >&5
+printf %s "checking for libngtcp2 >= 0.17.0... " >&6; }
 
 if test -n "$LIBNGTCP2_CFLAGS"; then
 pkg_cv_LIBNGTCP2_CFLAGS="$LIBNGTCP2_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2 >= 0.13.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libngtcp2 >= 0.13.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2 >= 0.17.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libngtcp2 >= 0.17.0") 2>&5
 ac_status=$?
 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBNGTCP2_CFLAGS=`$PKG_CONFIG --cflags "libngtcp2 >= 0.13.0" 2>/dev/null`
+ pkg_cv_LIBNGTCP2_CFLAGS=`$PKG_CONFIG --cflags "libngtcp2 >= 0.17.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -20959,12 +20965,12 @@
 pkg_cv_LIBNGTCP2_LIBS="$LIBNGTCP2_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2 >= 0.13.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libngtcp2 >= 0.13.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2 >= 0.17.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libngtcp2 >= 0.17.0") 2>&5
 ac_status=$?
 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBNGTCP2_LIBS=`$PKG_CONFIG --libs "libngtcp2 >= 0.13.0" 2>/dev/null`
+ pkg_cv_LIBNGTCP2_LIBS=`$PKG_CONFIG --libs "libngtcp2 >= 0.17.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -20985,24 +20991,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBNGTCP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2 >= 0.13.0" 2>&1`
+ LIBNGTCP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2 >= 0.17.0" 2>&1`
 else
-	 LIBNGTCP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2 >= 0.13.0" 2>&1`
+ LIBNGTCP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2 >= 0.17.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNGTCP2_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNGTCP2_PKG_ERRORS" >&5
 
-	have_libngtcp2=no
+ have_libngtcp2=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libngtcp2=no
+ have_libngtcp2=no
 else
-	LIBNGTCP2_CFLAGS=$pkg_cv_LIBNGTCP2_CFLAGS
-	LIBNGTCP2_LIBS=$pkg_cv_LIBNGTCP2_LIBS
+ LIBNGTCP2_CFLAGS=$pkg_cv_LIBNGTCP2_CFLAGS
+ LIBNGTCP2_LIBS=$pkg_cv_LIBNGTCP2_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libngtcp2=yes
+ have_libngtcp2=yes
 fi
 if test "x${have_libngtcp2}" = "xno"; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $LIBNGTCP2_PKG_ERRORS" >&5
@@ -21015,25 +21021,25 @@
 as_fn_error $? "libngtcp2 was requested (--with-libngtcp2) but not found" "$LINENO" 5
 fi
 
-# ngtcp2_crypto_openssl (for src)
-have_libngtcp2_crypto_openssl=no
+# ngtcp2_crypto_quictls (for src)
+have_libngtcp2_crypto_quictls=no
 if test "x${have_ssl_is_quic}" = "xyes" &&
 test "x${request_libngtcp2}" != "xno"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_openssl >= 0.13.0" >&5
-printf %s "checking for libngtcp2_crypto_openssl >= 0.13.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_quictls >= 0.17.0" >&5
+printf %s "checking for libngtcp2_crypto_quictls >= 0.17.0... " >&6; }
 
-if test -n "$LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS"; then
- pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS="$LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS"
+if test -n "$LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS"; then
+ pkg_cv_LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS="$LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2_crypto_openssl >= 0.13.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libngtcp2_crypto_openssl >= 0.13.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2_crypto_quictls >= 0.17.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libngtcp2_crypto_quictls >= 0.17.0") 2>&5
 ac_status=$?
 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "libngtcp2_crypto_openssl >= 0.13.0" 2>/dev/null`
+ pkg_cv_LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS=`$PKG_CONFIG --cflags "libngtcp2_crypto_quictls >= 0.17.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -21041,16 +21047,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$LIBNGTCP2_CRYPTO_OPENSSL_LIBS"; then
- pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_LIBS="$LIBNGTCP2_CRYPTO_OPENSSL_LIBS"
+if test -n "$LIBNGTCP2_CRYPTO_QUICTLS_LIBS"; then
+ pkg_cv_LIBNGTCP2_CRYPTO_QUICTLS_LIBS="$LIBNGTCP2_CRYPTO_QUICTLS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2_crypto_openssl >= 0.13.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libngtcp2_crypto_openssl >= 0.13.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libngtcp2_crypto_quictls >= 0.17.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libngtcp2_crypto_quictls >= 0.17.0") 2>&5
 ac_status=$?
 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_LIBS=`$PKG_CONFIG --libs "libngtcp2_crypto_openssl >= 0.13.0" 2>/dev/null`
+ pkg_cv_LIBNGTCP2_CRYPTO_QUICTLS_LIBS=`$PKG_CONFIG --libs "libngtcp2_crypto_quictls >= 0.17.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -21071,39 +21077,39 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2_crypto_openssl >= 0.13.0" 2>&1`
+ LIBNGTCP2_CRYPTO_QUICTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2_crypto_quictls >= 0.17.0" 2>&1`
 else
-	 LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2_crypto_openssl >= 0.13.0" 2>&1`
+ LIBNGTCP2_CRYPTO_QUICTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2_crypto_quictls >= 0.17.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNGTCP2_CRYPTO_QUICTLS_PKG_ERRORS" >&5
 
-	have_libngtcp2_crypto_openssl=no
+ have_libngtcp2_crypto_quictls=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libngtcp2_crypto_openssl=no
+ have_libngtcp2_crypto_quictls=no
 else
-	LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS=$pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS
-	LIBNGTCP2_CRYPTO_OPENSSL_LIBS=$pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_LIBS
+ LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS=$pkg_cv_LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS
+ LIBNGTCP2_CRYPTO_QUICTLS_LIBS=$pkg_cv_LIBNGTCP2_CRYPTO_QUICTLS_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libngtcp2_crypto_openssl=yes
+ have_libngtcp2_crypto_quictls=yes
 fi
- if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS" >&5
-printf "%s\n" "$as_me: $LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS" >&6;}
+ if test "x${have_libngtcp2_crypto_quictls}" = "xno"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $LIBNGTCP2_CRYPTO_QUICTLS_PKG_ERRORS" >&5
+printf "%s\n" "$as_me: $LIBNGTCP2_CRYPTO_QUICTLS_PKG_ERRORS" >&6;}
 else
 
-printf "%s\n" "#define HAVE_LIBNGTCP2_CRYPTO_OPENSSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNGTCP2_CRYPTO_QUICTLS 1" >>confdefs.h
 
 fi
 fi
 
 if test "x${have_ssl_is_quic}" = "xyes" &&
 test "x${request_libngtcp2}" = "xyes" &&
- test "x${have_libngtcp2_crypto_openssl}" != "xyes"; then
- as_fn_error $? "libngtcp2_crypto_openssl was requested (--with-libngtcp2) but not found" "$LINENO" 5
+ test "x${have_libngtcp2_crypto_quictls}" != "xyes"; then
+ as_fn_error $? "libngtcp2_crypto_quictls was requested (--with-libngtcp2) but not found" "$LINENO" 5
 fi
 
 # ngtcp2_crypto_boringssl (for src)
@@ -21162,24 +21168,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2_crypto_boringssl >= 0.0.0" 2>&1`
+ LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2_crypto_boringssl >= 0.0.0" 2>&1`
 else
-	 LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2_crypto_boringssl >= 0.0.0" 2>&1`
+ LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2_crypto_boringssl >= 0.0.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS" >&5
 
-	have_libngtcp2_crypto_boringssl=no
+ have_libngtcp2_crypto_boringssl=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libngtcp2_crypto_boringssl=no
+ have_libngtcp2_crypto_boringssl=no
 else
-	LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS=$pkg_cv_LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS
-	LIBNGTCP2_CRYPTO_BORINGSSL_LIBS=$pkg_cv_LIBNGTCP2_CRYPTO_BORINGSSL_LIBS
+ LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS=$pkg_cv_LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS
+ LIBNGTCP2_CRYPTO_BORINGSSL_LIBS=$pkg_cv_LIBNGTCP2_CRYPTO_BORINGSSL_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libngtcp2_crypto_boringssl=yes
+ have_libngtcp2_crypto_boringssl=yes
 fi
 if test "x${have_libngtcp2_crypto_boringssl}" = "xno"; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS" >&5
@@ -21202,19 +21208,19 @@
 if test "x${request_libnghttp3}" != "xno"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnghttp3 >= 0.7.0" >&5
-printf %s "checking for libnghttp3 >= 0.7.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnghttp3 >= 0.13.0" >&5
+printf %s "checking for libnghttp3 >= 0.13.0... " >&6; }
 
 if test -n "$LIBNGHTTP3_CFLAGS"; then
 pkg_cv_LIBNGHTTP3_CFLAGS="$LIBNGHTTP3_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnghttp3 >= 0.7.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnghttp3 >= 0.7.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnghttp3 >= 0.13.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnghttp3 >= 0.13.0") 2>&5
 ac_status=$?
 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBNGHTTP3_CFLAGS=`$PKG_CONFIG --cflags "libnghttp3 >= 0.7.0" 2>/dev/null`
+ pkg_cv_LIBNGHTTP3_CFLAGS=`$PKG_CONFIG --cflags "libnghttp3 >= 0.13.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -21226,12 +21232,12 @@
 pkg_cv_LIBNGHTTP3_LIBS="$LIBNGHTTP3_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnghttp3 >= 0.7.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnghttp3 >= 0.7.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnghttp3 >= 0.13.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnghttp3 >= 0.13.0") 2>&5
 ac_status=$?
 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBNGHTTP3_LIBS=`$PKG_CONFIG --libs "libnghttp3 >= 0.7.0" 2>/dev/null`
+ pkg_cv_LIBNGHTTP3_LIBS=`$PKG_CONFIG --libs "libnghttp3 >= 0.13.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -21252,24 +21258,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBNGHTTP3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnghttp3 >= 0.7.0" 2>&1`
+ LIBNGHTTP3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnghttp3 >= 0.13.0" 2>&1`
 else
-	 LIBNGHTTP3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnghttp3 >= 0.7.0" 2>&1`
+ LIBNGHTTP3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnghttp3 >= 0.13.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNGHTTP3_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNGHTTP3_PKG_ERRORS" >&5
 
-	have_libnghttp3=no
+ have_libnghttp3=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libnghttp3=no
+ have_libnghttp3=no
 else
-	LIBNGHTTP3_CFLAGS=$pkg_cv_LIBNGHTTP3_CFLAGS
-	LIBNGHTTP3_LIBS=$pkg_cv_LIBNGHTTP3_LIBS
+ LIBNGHTTP3_CFLAGS=$pkg_cv_LIBNGHTTP3_CFLAGS
+ LIBNGHTTP3_LIBS=$pkg_cv_LIBNGHTTP3_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libnghttp3=yes
+ have_libnghttp3=yes
 fi
 if test "x${have_libnghttp3}" = "xno"; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $LIBNGHTTP3_PKG_ERRORS" >&5
@@ -21337,24 +21343,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBBPF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbpf >= 0.7.0" 2>&1`
+ LIBBPF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbpf >= 0.7.0" 2>&1`
 else
-	 LIBBPF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbpf >= 0.7.0" 2>&1`
+ LIBBPF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbpf >= 0.7.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBBPF_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBBPF_PKG_ERRORS" >&5
 
-	have_libbpf=no
+ have_libbpf=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libbpf=no
+ have_libbpf=no
 else
-	LIBBPF_CFLAGS=$pkg_cv_LIBBPF_CFLAGS
-	LIBBPF_LIBS=$pkg_cv_LIBBPF_LIBS
+ LIBBPF_CFLAGS=$pkg_cv_LIBBPF_CFLAGS
+ LIBBPF_LIBS=$pkg_cv_LIBBPF_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libbpf=yes
+ have_libbpf=yes
 fi
 if test "x${have_libbpf}" = "xyes"; then
 
@@ -21479,24 +21485,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBEVENT_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent_openssl >= 2.0.8" 2>&1`
+ LIBEVENT_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent_openssl >= 2.0.8" 2>&1`
 else
-	 LIBEVENT_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent_openssl >= 2.0.8" 2>&1`
+ LIBEVENT_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent_openssl >= 2.0.8" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBEVENT_OPENSSL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBEVENT_OPENSSL_PKG_ERRORS" >&5
 
-	have_libevent_openssl=no
+ have_libevent_openssl=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libevent_openssl=no
+ have_libevent_openssl=no
 else
-	LIBEVENT_OPENSSL_CFLAGS=$pkg_cv_LIBEVENT_OPENSSL_CFLAGS
-	LIBEVENT_OPENSSL_LIBS=$pkg_cv_LIBEVENT_OPENSSL_LIBS
+ LIBEVENT_OPENSSL_CFLAGS=$pkg_cv_LIBEVENT_OPENSSL_CFLAGS
+ LIBEVENT_OPENSSL_LIBS=$pkg_cv_LIBEVENT_OPENSSL_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libevent_openssl=yes
+ have_libevent_openssl=yes
 fi
 if test "x${have_libevent_openssl}" = "xno"; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $LIBEVENT_OPENSSL_PKG_ERRORS" >&5
@@ -21564,24 +21570,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
+ JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
 else
-	 JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
+ JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JANSSON_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$JANSSON_PKG_ERRORS" >&5
 
-	have_jansson=no
+ have_jansson=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_jansson=no
+ have_jansson=no
 else
-	JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
-	JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
+ JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
+ JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_jansson=yes
+ have_jansson=yes
 fi
 if test "x${have_jansson}" = "xyes"; then
 
@@ -21653,24 +21659,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
 else
-	 SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SYSTEMD_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SYSTEMD_PKG_ERRORS" >&5
 
-	have_libsystemd=no
+ have_libsystemd=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libsystemd=no
+ have_libsystemd=no
 else
-	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
-	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libsystemd=yes
+ have_libsystemd=yes
 fi
 if test "x${have_libsystemd}" = "xyes"; then
 
@@ -21742,24 +21748,24 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.6.26" 2>&1`
+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.6.26" 2>&1`
 else
-	 LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.6.26" 2>&1`
+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.6.26" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBXML2_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBXML2_PKG_ERRORS" >&5
 
-	have_libxml2=no
+ have_libxml2=no
 elif test $pkg_failed = untried; then
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libxml2=no
+ have_libxml2=no
 else
-	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
-	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
+ LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
+ LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libxml2=yes
+ have_libxml2=yes
 fi
 if test "x${have_libxml2}" = "xyes"; then
 
@@ -21966,7 +21972,7 @@
 (test "x${have_ssl_is_quic}" = "xyes" ||
 test "x${have_boringssl_quic}" = "xyes") &&
 test "x${have_libngtcp2}" = "xyes" &&
- (test "x${have_libngtcp2_crypto_openssl}" = "xyes" ||
+ (test "x${have_libngtcp2_crypto_quictls}" = "xyes" ||
 test "x${have_libngtcp2_crypto_boringssl}" = "xyes") &&
 test "x${have_libnghttp3}" = "xyes"; then
 enable_http3=yes
@@ -25566,7 +25572,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/libnghttp2.pc lib/includes/Makefile lib/includes/nghttp2/nghttp2ver.h tests/Makefile tests/testdata/Makefile third-party/Makefile src/Makefile bpf/Makefile examples/Makefile integration-tests/Makefile integration-tests/config.go integration-tests/setenv doc/Makefile doc/conf.py doc/index.rst doc/package_README.rst doc/tutorial-client.rst doc/tutorial-server.rst doc/tutorial-hpack.rst doc/nghttpx-howto.rst doc/h2load-howto.rst doc/building-android-binary.rst doc/nghttp2.h.rst doc/nghttp2ver.h.rst doc/contribute.rst contrib/Makefile script/Makefile"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/libnghttp2.pc lib/includes/Makefile lib/includes/nghttp2/nghttp2ver.h tests/Makefile tests/testdata/Makefile third-party/Makefile src/Makefile src/testdata/Makefile bpf/Makefile examples/Makefile integration-tests/Makefile integration-tests/config.go integration-tests/setenv doc/Makefile doc/conf.py doc/index.rst doc/package_README.rst doc/tutorial-client.rst doc/tutorial-server.rst doc/tutorial-hpack.rst doc/nghttpx-howto.rst doc/h2load-howto.rst doc/building-android-binary.rst doc/nghttp2.h.rst doc/nghttp2ver.h.rst doc/contribute.rst contrib/Makefile script/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -26144,7 +26150,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nghttp2 $as_me 1.52.0, which was
+This file was extended by nghttp2 $as_me 1.55.1, which was
 generated by GNU Autoconf 2.71. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -26212,7 +26218,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-nghttp2 config.status 1.52.0
+nghttp2 config.status 1.55.1
 configured by $0, generated by GNU Autoconf 2.71,
 with options \\"\$ac_cs_config\\"
 
@@ -26736,6 +26742,7 @@
 "tests/testdata/Makefile") CONFIG_FILES="$CONFIG_FILES tests/testdata/Makefile" ;;
 "third-party/Makefile") CONFIG_FILES="$CONFIG_FILES third-party/Makefile" ;;
 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/testdata/Makefile") CONFIG_FILES="$CONFIG_FILES src/testdata/Makefile" ;;
 "bpf/Makefile") CONFIG_FILES="$CONFIG_FILES bpf/Makefile" ;;
 "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
 "integration-tests/Makefile") CONFIG_FILES="$CONFIG_FILES integration-tests/Makefile" ;;
@@ -28246,7 +28253,7 @@
 Libev: ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
 Libc-ares: ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
 libngtcp2: ${have_libngtcp2} (CFLAGS='${LIBNGTCP2_CFLAGS}' LIBS='${LIBNGTCP2_LIBS}')
- libngtcp2_crypto_openssl: ${have_libngtcp2_crypto_openssl} (CFLAGS='${LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBS}')
+ libngtcp2_crypto_quictls: ${have_libngtcp2_crypto_quictls} (CFLAGS='${LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_QUICTLS_LIBS}')
 libngtcp2_crypto_boringssl: ${have_libngtcp2_crypto_boringssl} (CFLAGS='${LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_BORINGSSL_LIBS}')
 libnghttp3: ${have_libnghttp3} (CFLAGS='${LIBNGHTTP3_CFLAGS}' LIBS='${LIBNGHTTP3_LIBS}')
 libbpf: ${have_libbpf} (CFLAGS='${LIBBPF_CFLAGS}' LIBS='${LIBBPF_LIBS}')
@@ -28310,7 +28317,7 @@
 Libev: ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
 Libc-ares: ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
 libngtcp2: ${have_libngtcp2} (CFLAGS='${LIBNGTCP2_CFLAGS}' LIBS='${LIBNGTCP2_LIBS}')
- libngtcp2_crypto_openssl: ${have_libngtcp2_crypto_openssl} (CFLAGS='${LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBS}')
+ libngtcp2_crypto_quictls: ${have_libngtcp2_crypto_quictls} (CFLAGS='${LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_QUICTLS_LIBS}')
 libngtcp2_crypto_boringssl: ${have_libngtcp2_crypto_boringssl} (CFLAGS='${LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_BORINGSSL_LIBS}')
 libnghttp3: ${have_libnghttp3} (CFLAGS='${LIBNGHTTP3_CFLAGS}' LIBS='${LIBNGHTTP3_LIBS}')
 libbpf: ${have_libbpf} (CFLAGS='${LIBBPF_CFLAGS}' LIBS='${LIBBPF_LIBS}')

_service:tar_scm:nghttp2-1.52.0.tar.xz/configure.ac -> _service:tar_scm:nghttp2-1.55.1.tar.xz/configure.ac Changed

@@ -25,7 +25,7 @@
 dnl https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
 
 AC_PREREQ(2.61)
-AC_INIT(nghttp2, 1.52.0, t-tujikawa@users.sourceforge.net)
+AC_INIT(nghttp2, 1.55.1, t-tujikawa@users.sourceforge.net)
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADERS(config.h)
@@ -45,7 +45,7 @@
 dnl See versioning rule:
 dnl  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST(LT_CURRENT, 38)
-AC_SUBST(LT_REVISION, 1)
+AC_SUBST(LT_REVISION, 3)
 AC_SUBST(LT_AGE, 24)
 
 major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/^0-9//g"`
@@ -433,6 +433,10 @@
   else
     have_libev=yes
   fi
+
+  if test "x${have_libev}" = "xyes"; then
+    AC_DEFINE(HAVE_LIBEV, 1, Define to 1 if you have `libev` library.)
+  fi
 fi
 
 if test "x${request_libev}" = "xyes" &&
@@ -504,7 +508,7 @@
 # ngtcp2 (for src)
 have_libngtcp2=no
 if test "x${request_libngtcp2}" != "xno"; then
-  PKG_CHECK_MODULES(LIBNGTCP2, libngtcp2 >= 0.13.0, have_libngtcp2=yes,
+  PKG_CHECK_MODULES(LIBNGTCP2, libngtcp2 >= 0.17.0, have_libngtcp2=yes,
                     have_libngtcp2=no)
   if test "x${have_libngtcp2}" = "xno"; then
     AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS)
@@ -516,26 +520,26 @@
   AC_MSG_ERROR(libngtcp2 was requested (--with-libngtcp2) but not found)
 fi
 
-# ngtcp2_crypto_openssl (for src)
-have_libngtcp2_crypto_openssl=no
+# ngtcp2_crypto_quictls (for src)
+have_libngtcp2_crypto_quictls=no
 if test "x${have_ssl_is_quic}" = "xyes" &&
    test "x${request_libngtcp2}" != "xno"; then
-  PKG_CHECK_MODULES(LIBNGTCP2_CRYPTO_OPENSSL,
-                    libngtcp2_crypto_openssl >= 0.13.0,
-                    have_libngtcp2_crypto_openssl=yes,
-                    have_libngtcp2_crypto_openssl=no)
-  if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then
-    AC_MSG_NOTICE($LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS)
+  PKG_CHECK_MODULES(LIBNGTCP2_CRYPTO_QUICTLS,
+                    libngtcp2_crypto_quictls >= 0.17.0,
+                    have_libngtcp2_crypto_quictls=yes,
+                    have_libngtcp2_crypto_quictls=no)
+  if test "x${have_libngtcp2_crypto_quictls}" = "xno"; then
+    AC_MSG_NOTICE($LIBNGTCP2_CRYPTO_QUICTLS_PKG_ERRORS)
   else
-    AC_DEFINE(HAVE_LIBNGTCP2_CRYPTO_OPENSSL, 1,
-              Define to 1 if you have `libngtcp2_crypto_openssl` library.)
+    AC_DEFINE(HAVE_LIBNGTCP2_CRYPTO_QUICTLS, 1,
+              Define to 1 if you have `libngtcp2_crypto_quictls` library.)
   fi
 fi
 
 if test "x${have_ssl_is_quic}" = "xyes" &&
    test "x${request_libngtcp2}" = "xyes" &&
-   test "x${have_libngtcp2_crypto_openssl}" != "xyes"; then
-  AC_MSG_ERROR(libngtcp2_crypto_openssl was requested (--with-libngtcp2) but not found)
+   test "x${have_libngtcp2_crypto_quictls}" != "xyes"; then
+  AC_MSG_ERROR(libngtcp2_crypto_quictls was requested (--with-libngtcp2) but not found)
 fi
 
 # ngtcp2_crypto_boringssl (for src)
@@ -563,7 +567,7 @@
 # nghttp3 (for src)
 have_libnghttp3=no
 if test "x${request_libnghttp3}" != "xno"; then
-  PKG_CHECK_MODULES(LIBNGHTTP3, libnghttp3 >= 0.7.0, have_libnghttp3=yes,
+  PKG_CHECK_MODULES(LIBNGHTTP3, libnghttp3 >= 0.13.0, have_libnghttp3=yes,
                     have_libnghttp3=no)
   if test "x${have_libnghttp3}" = "xno"; then
     AC_MSG_NOTICE($LIBNGHTTP3_PKG_ERRORS)
@@ -751,7 +755,7 @@
    (test "x${have_ssl_is_quic}" = "xyes" ||
     test "x${have_boringssl_quic}" = "xyes") &&
    test "x${have_libngtcp2}" = "xyes" &&
-   (test "x${have_libngtcp2_crypto_openssl}" = "xyes" ||
+   (test "x${have_libngtcp2_crypto_quictls}" = "xyes" ||
     test "x${have_libngtcp2_crypto_boringssl}" = "xyes") &&
    test "x${have_libnghttp3}" = "xyes"; then
   enable_http3=yes
@@ -1072,6 +1076,7 @@
   tests/testdata/Makefile
   third-party/Makefile
   src/Makefile
+  src/testdata/Makefile
   bpf/Makefile
   examples/Makefile
   integration-tests/Makefile
@@ -1139,7 +1144,7 @@
       Libev:          ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
       Libc-ares:      ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
       libngtcp2:      ${have_libngtcp2} (CFLAGS='${LIBNGTCP2_CFLAGS}' LIBS='${LIBNGTCP2_LIBS}')
-      libngtcp2_crypto_openssl: ${have_libngtcp2_crypto_openssl} (CFLAGS='${LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBS}')
+      libngtcp2_crypto_quictls: ${have_libngtcp2_crypto_quictls} (CFLAGS='${LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_QUICTLS_LIBS}')
       libngtcp2_crypto_boringssl: ${have_libngtcp2_crypto_boringssl} (CFLAGS='${LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_BORINGSSL_LIBS}')
       libnghttp3:     ${have_libnghttp3} (CFLAGS='${LIBNGHTTP3_CFLAGS}' LIBS='${LIBNGHTTP3_LIBS}')
       libbpf:         ${have_libbpf} (CFLAGS='${LIBBPF_CFLAGS}' LIBS='${LIBBPF_LIBS}')

_service:tar_scm:nghttp2-1.52.0.tar.xz/contrib/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/contrib/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/enums.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/enums.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/h2load.1 -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/h2load.1 Changed

@@ -27,7 +27,7 @@
 .\" new: \\nrst2man-indent\\nrst2man-indent-level
 .in \\nrst2man-indent\\nrst2man-indent-levelu
 ..
-.TH "H2LOAD" "1" "Feb 13, 2023" "1.52.0" "nghttp2"
+.TH "H2LOAD" "1" "Jul 14, 2023" "1.55.1" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .SH SYNOPSIS
@@ -246,7 +246,7 @@
 Specify URI from which the scheme, host and port will be
 used for all requests. The base URI overrides all
 values defined either at the command line or inside
-input files. If argument starts with "unix:", then the
+input files. If argument starts with \(dqunix:\(dq, then the
 rest of the argument will be treated as UNIX domain
 socket path. The connection is made through that path
 instead of TCP. In this case, scheme is inferred from
@@ -305,9 +305,9 @@
 .B \-\-qlog\-file\-base=<PATH>
 Enable qlog output and specify base file name for qlogs.
 Qlog is emitted for each connection. For a given base
-name "base", each output file name becomes
-"base.M.N.sqlog" where M is worker ID and N is client ID
-(e.g. "base.0.3.sqlog"). Only effective in QUIC runs.
+name \(dqbase\(dq, each output file name becomes
+\(dqbase.M.N.sqlog\(dq where M is worker ID and N is client ID
+(e.g. \(dqbase.0.3.sqlog\(dq). Only effective in QUIC runs.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -408,7 +408,7 @@
 .INDENT 7.0
 .TP
 .B total
-The number of bytes received from the server "on the wire". If
+The number of bytes received from the server \(dqon the wire\(dq. If
 requests were made via TLS, this value is the number of decrypted
 bytes.
 .TP

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/macros.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/macros.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/mkapiref.py -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/mkapiref.py Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp.1 -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp.1 Changed

@@ -27,7 +27,7 @@
 .\" new: \\nrst2man-indent\\nrst2man-indent-level
 .in \\nrst2man-indent\\nrst2man-indent-levelu
 ..
-.TH "NGHTTP" "1" "Feb 13, 2023" "1.52.0" "nghttp2"
+.TH "NGHTTP" "1" "Jul 14, 2023" "1.55.1" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 client
 .SH SYNOPSIS
@@ -280,7 +280,7 @@
 implementation.
 .sp
 When connection is established, nghttp sends 5 PRIORITY frames to idle
-streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
+streams 3, 5, 7, 9 and 11 to create \(dqanchor\(dq nodes in dependency
 tree:
 .INDENT 0.0
 .INDENT 3.5
@@ -320,8 +320,8 @@
 it.  When requesting those resources, nghttp uses dependency according
 to its resource type.
 .sp
-For CSS, and Javascript files inside "head" element, they depend on
-stream 3 with the weight 2.  The Javascript files outside "head"
+For CSS, and Javascript files inside \(dqhead\(dq element, they depend on
+stream 3 with the weight 2.  The Javascript files outside \(dqhead\(dq
 element depend on stream 5 with the weight 2.  The mages depend on
 stream 11 with the weight 12.  The other resources (e.g., icon) depend
 on stream 11 with the weight 2.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_deflate_change_table_size.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_deflate_change_table_size.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_deflate_hd.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_deflate_hd.rst Changed

@@ -15,21 +15,21 @@
     
     If *buf* is not large enough to store the deflated header block,
     this function fails with
-    :macro:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`.  The caller
+    :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`.  The caller
     should use `nghttp2_hd_deflate_bound()` to know the upper bound of
     buffer size required to deflate given header name/value pairs.
     
     Once this function fails, subsequent call of this function always
-    returns :macro:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
+    returns :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
     
     After this function returns, it is safe to delete the *nva*.
     
     This function returns the number of bytes written to *buf* if it
     succeeds, or one of the following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+    :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
         Deflation process has failed.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
         The provided *buflen* size is too small to hold the output.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_deflate_hd_vec.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_deflate_hd_vec.rst Changed

@@ -16,21 +16,21 @@
     one chunk is filled up completely, next chunk will be used.  If
     *vec* is not large enough to store the deflated header block, this
     function fails with
-    :macro:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`.  The caller
+    :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`.  The caller
     should use `nghttp2_hd_deflate_bound()` to know the upper bound of
     buffer size required to deflate given header name/value pairs.
     
     Once this function fails, subsequent call of this function always
-    returns :macro:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
+    returns :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
     
     After this function returns, it is safe to delete the *nva*.
     
     This function returns the number of bytes written to *vec* if it
     succeeds, or one of the following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+    :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
         Deflation process has failed.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
         The provided *buflen* size is too small to hold the output.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_deflate_new.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_deflate_new.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_inflate_change_table_size.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_inflate_change_table_size.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_inflate_hd.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_inflate_hd.rst Changed

@@ -17,7 +17,7 @@
     Inflates name/value block stored in *in* with length *inlen*.  This
     function performs decompression.  For each successful emission of
     header name/value pair,
-    :macro:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
+    :enum:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
     *\*inflate_flags* and name/value pair is assigned to the *nv_out*
     and the function returns.  The caller must not free the members of
     *nv_out*.
@@ -40,11 +40,11 @@
     This function returns the number of bytes processed if it succeeds,
     or one of the following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+    :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
         Inflation process has failed.
-    :macro:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
+    :enum:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
         The header field name or value is too large.
     
     Example follows::

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_inflate_hd2.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_inflate_hd2.rst Changed

@@ -13,7 +13,7 @@
     Inflates name/value block stored in *in* with length *inlen*.  This
     function performs decompression.  For each successful emission of
     header name/value pair,
-    :macro:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
+    :enum:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
     *\*inflate_flags* and name/value pair is assigned to the *nv_out*
     and the function returns.  The caller must not free the members of
     *nv_out*.
@@ -30,7 +30,7 @@
     
     In other words, if *in_final* is nonzero, and this function returns
     *inlen*, you can assert that
-    :macro:`nghttp2_hd_inflate_final.NGHTTP2_HD_INFLATE_FINAL` is set in
+    :enum:`nghttp2_hd_inflate_final.NGHTTP2_HD_INFLATE_FINAL` is set in
     *\*inflate_flags*.
     
     The caller can feed complete compressed header block.  It also can
@@ -41,11 +41,11 @@
     This function returns the number of bytes processed if it succeeds,
     or one of the following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+    :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
         Inflation process has failed.
-    :macro:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
+    :enum:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
         The header field name or value is too large.
     
     Example follows::

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_hd_inflate_new.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_hd_inflate_new.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_option_new.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_option_new.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_option_set_max_send_header_block_length.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_option_set_max_send_header_block_length.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_option_set_no_auto_ping_ack.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_option_set_no_auto_ping_ack.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_option_set_no_closed_streams.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_option_set_no_closed_streams.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_option_set_no_recv_client_magic.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_option_set_no_recv_client_magic.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_option_set_server_fallback_rfc7540_priorities.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_option_set_server_fallback_rfc7540_priorities.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_pack_settings_payload.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_pack_settings_payload.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_callbacks_new.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_callbacks_new.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_callbacks_set_send_data_callback.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_callbacks_set_send_data_callback.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_change_extpri_stream_priority.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_change_extpri_stream_priority.rst Changed

@@ -15,7 +15,7 @@
 server for :rfc:`9218` extensible prioritization scheme.
 
 If *session* is initialized as client, this function returns
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`. For client, use
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`. For client, use
 `nghttp2_submit_priority_update()` instead.
 
 If :member:`extpri->urgency <nghttp2_extpri.urgency>` is out of
@@ -25,14 +25,14 @@
 client priority signals for this stream.
 
 If
- :macro:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+ :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
 of value of 1 is not submitted via `nghttp2_submit_settings()`,
 this function does nothing and returns 0.
 
- :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
 Out of memory.
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
 The *session* is initialized as client.
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
 *stream_id* is zero; or a stream denoted by *stream_id* is not
 found.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_change_stream_priority.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_change_stream_priority.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_client_new.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_client_new.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_client_new2.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_client_new2.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_client_new3.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_client_new3.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_consume.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_consume.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_consume_connection.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_consume_connection.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_consume_stream.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_consume_stream.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_create_idle_stream.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_create_idle_stream.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_get_local_settings.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_get_local_settings.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_get_remote_settings.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_get_remote_settings.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_mem_recv.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_mem_recv.rst Changed

@@ -21,25 +21,25 @@
     
     In the current implementation, this function always tries to
     processes *inlen* bytes of input data unless either an error occurs or
-    :macro:`nghttp2_error.NGHTTP2_ERR_PAUSE` is returned from
+    :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` is returned from
     :type:`nghttp2_on_header_callback` or
     :type:`nghttp2_on_data_chunk_recv_callback`.  If
-    :macro:`nghttp2_error.NGHTTP2_ERR_PAUSE` is used, the return value
+    :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` is used, the return value
     includes the number of bytes which was used to produce the data or
     frame for the callback.
     
     This function returns the number of processed bytes, or one of the
     following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
         The callback function failed.
-    :macro:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
+    :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
         Invalid client magic was detected.  This error only returns
         when *session* was configured as server and
         `nghttp2_option_set_no_recv_client_magic()` is not used with
         nonzero value.
-    :macro:`nghttp2_error.NGHTTP2_ERR_FLOODED`
+    :enum:`nghttp2_error.NGHTTP2_ERR_FLOODED`
         Flooding was detected in this HTTP/2 session, and it must be
         closed.  This is most likely caused by misbehaviour of peer.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_mem_send.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_mem_send.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_recv.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_recv.rst Changed

@@ -14,7 +14,7 @@
     
     This function receives as many frames as possible until the user
     callback :type:`nghttp2_recv_callback` returns
-    :macro:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  This function calls
+    :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  This function calls
     several callback functions which are passed when initializing the
     *session*.  Here is the simple time chart which tells when each
     callback is invoked:
@@ -60,17 +60,17 @@
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_EOF`
+    :enum:`nghttp2_error.NGHTTP2_ERR_EOF`
         The remote peer did shutdown on the connection.
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
         The callback function failed.
-    :macro:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
+    :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
         Invalid client magic was detected.  This error only returns
         when *session* was configured as server and
         `nghttp2_option_set_no_recv_client_magic()` is not used with
         nonzero value.
-    :macro:`nghttp2_error.NGHTTP2_ERR_FLOODED`
+    :enum:`nghttp2_error.NGHTTP2_ERR_FLOODED`
         Flooding was detected in this HTTP/2 session, and it must be
         closed.  This is most likely caused by misbehaviour of peer.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_resume_data.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_resume_data.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_send.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_send.rst Changed

@@ -16,7 +16,7 @@
     outbound queue and sends it to the remote peer.  It does this as
     many times as possible until the user callback
     :type:`nghttp2_send_callback` returns
-    :macro:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`, the outbound queue
+    :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`, the outbound queue
     becomes empty or flow control is triggered (remote window size
     becomes depleted or maximum number of concurrent streams is
     reached).  This function calls several callback functions which are
@@ -39,7 +39,7 @@
     
     6. :type:`nghttp2_before_frame_send_callback` is invoked.
     
-    7. If :macro:`nghttp2_error.NGHTTP2_ERR_CANCEL` is returned from
+    7. If :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL` is returned from
        :type:`nghttp2_before_frame_send_callback`, the current frame
        transmission is canceled, and
        :type:`nghttp2_on_frame_not_send_callback` is invoked.  Abort
@@ -57,7 +57,7 @@
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
         The callback function failed.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_server_new.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_server_new.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_server_new2.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_server_new2.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_server_new3.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_server_new3.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_set_local_window_size.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_set_local_window_size.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_set_next_stream_id.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_set_next_stream_id.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_set_stream_user_data.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_set_stream_user_data.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_terminate_session.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_terminate_session.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_terminate_session2.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_terminate_session2.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_upgrade.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_upgrade.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_upgrade2.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_session_upgrade2.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_stream_get_state.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_stream_get_state.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_strerror.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_strerror.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_altsvc.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_altsvc.rst Changed

@@ -16,7 +16,7 @@
 `RFC 7383 <https://tools.ietf.org/html/rfc7838#section-4>`_.
 
 The *flags* is currently ignored and should be
- :macro:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
 
 The *origin* points to the origin this alternative service is
 associated with. The *origin_len* is the length of the origin. If
@@ -26,16 +26,16 @@
 
 The ALTSVC frame is only usable from server side. If this function
 is invoked with client side session, this function returns
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
 
 This function returns 0 if it succeeds, or one of the following
 negative error codes:
 
- :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
 Out of memory
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
 The function is called from client side session
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
 The sum of *origin_len* and *field_value_len* is larger than
 16382; or *origin_len* is 0 while *stream_id* is 0; or
 *origin_len* is not 0 while *stream_id* is not 0.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_data.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_data.rst Changed

@@ -12,7 +12,7 @@
     
     Submits one or more DATA frames to the stream *stream_id*.  The
     data to be sent are provided by *data_prd*.  If *flags* contains
-    :macro:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`, the last DATA frame
+    :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`, the last DATA frame
     has END_STREAM flag set.
     
     This function does not take ownership of the *data_prd*.  The
@@ -21,14 +21,14 @@
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
+    :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
         DATA or HEADERS has been already submitted and not fully
         processed yet.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *stream_id* is 0.
-    :macro:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
+    :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
         The stream was already closed; or the *stream_id* is invalid.
     
     .. note::
@@ -36,12 +36,12 @@
       Currently, only one DATA or HEADERS is allowed for a stream at a
       time.  Submitting these frames more than once before first DATA
       or HEADERS is finished results in
-      :macro:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST` error code.  The
+      :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST` error code.  The
       earliest callback which tells that previous frame is done is
       :type:`nghttp2_on_frame_send_callback`.  In side that callback,
       new data can be submitted using `nghttp2_submit_data()`.  Of
       course, all data except for last one must not have
-      :macro:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` flag set in *flags*.
+      :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` flag set in *flags*.
       This sounds a bit complicated, and we recommend to use
       `nghttp2_submit_request()` and `nghttp2_submit_response()` to
       avoid this cascading issue.  The experience shows that for HTTP

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_extension.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_extension.rst Changed

@@ -32,16 +32,16 @@
     The standard HTTP/2 frame cannot be sent with this function, so
     *type* must be strictly grater than 0x9.  Otherwise, this function
     will fail with error code
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`.
     
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
         If :type:`nghttp2_pack_extension_callback` is not set.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         If  *type* specifies  standard  HTTP/2 frame  type.  The  frame
         types  in the  rage 0x0,  0x9, both  inclusive, are  standard
         HTTP/2 frame type, and cannot be sent using this function.
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_goaway.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_goaway.rst Changed

@@ -13,10 +13,10 @@
     Submits GOAWAY frame with the last stream ID *last_stream_id* and
     the error code *error_code*.
     
-    The pre-defined error code is one of :macro:`nghttp2_error_code`.
+    The pre-defined error code is one of :enum:`nghttp2_error_code`.
     
     The *flags* is currently ignored and should be
-    :macro:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+    :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
     
     The *last_stream_id* is peer's stream ID or 0.  So if *session* is
     initialized as client, *last_stream_id* must be even or 0.  If
@@ -46,8 +46,8 @@
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *opaque_data_len* is too large; the *last_stream_id* is
         invalid.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_headers.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_headers.rst Changed

@@ -13,9 +13,9 @@
     Submits HEADERS frame. The *flags* is bitwise OR of the
     following values:
     
-    * :macro:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`
+    * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`
     
-    If *flags* includes :macro:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`,
+    If *flags* includes :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`,
     this frame has END_STREAM flag set.
     
     The library handles the CONTINUATION frame internally and it
@@ -40,7 +40,7 @@
     :macro:`NGHTTP2_MAX_WEIGHT`, it becomes :macro:`NGHTTP2_MAX_WEIGHT`.
     
     If
-    :macro:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+    :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
     of value of 1 is received by a remote endpoint, *pri_spec* is
     ignored, and treated as if ``NULL`` is specified.
     
@@ -53,10 +53,10 @@
     This function creates copies of all name/value pairs in *nva*.  It
     also lower-cases all names in *nva*.  The order of elements in
     *nva* is preserved.  For header fields with
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
     header field name and value are not copied respectively.  With
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
     is responsible to pass header field name in lowercase.  The
     application should maintain the references to them until
     :type:`nghttp2_on_frame_send_callback` or
@@ -76,19 +76,19 @@
     *stream_id* is -1.  Otherwise, this function returns 0 if it
     succeeds, or one of the following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
         No stream ID is available because maximum stream ID was
         reached.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *stream_id* is 0; or trying to depend on itself (stream ID
         equals ``pri_spec->stream_id``).
-    :macro:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
+    :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
         DATA or HEADERS has been already submitted and not fully
         processed yet.  This happens if stream denoted by *stream_id*
         is in reserved state.
-    :macro:`nghttp2_error.NGHTTP2_ERR_PROTO`
+    :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
         The *stream_id* is -1, and *session* is server session.
     
     .. warning::

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_origin.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_origin.rst Changed

@@ -16,7 +16,7 @@
 `RFC 8336 <https://tools.ietf.org/html/rfc8336>`_.
 
 The *flags* is currently ignored and should be
- :macro:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
 
 The *ov* points to the array of origins. The *nov* specifies the
 number of origins included in *ov*. This function creates copies
@@ -24,12 +24,12 @@
 
 The ORIGIN frame is only usable by a server. If this function is
 invoked with client side session, this function returns
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
 
- :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
 Out of memory
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
 The function is called from client side session.
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
 There are too many origins, or an origin is too large to fit
 into a default frame payload.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_ping.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_ping.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_priority.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_priority.rst Changed

@@ -14,7 +14,7 @@
     to the priority specification *pri_spec*.
     
     The *flags* is currently ignored and should be
-    :macro:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+    :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
     
     The *pri_spec* is priority specification of this request.  ``NULL``
     is not allowed for this function. To specify the priority, use
@@ -29,15 +29,15 @@
     :macro:`NGHTTP2_MAX_WEIGHT`.
     
     If
-    :macro:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+    :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
     of value of 1 is received by a remote endpoint, this function does
     nothing and returns 0.
     
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *stream_id* is 0; or the *pri_spec* is NULL; or trying to
         depend on itself.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_priority_update.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_priority_update.rst Changed

@@ -16,27 +16,27 @@
     defined in :rfc:`9218#section-7.1`.
     
     The *flags* is currently ignored and should be
-    :macro:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+    :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
     
     The *stream_id* is the ID of stream which is prioritized.  The
     *field_value* points to the Priority field value.  The
     *field_value_len* is the length of the Priority field value.
     
     If this function is called by server,
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE` is returned.
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE` is returned.
     
     If
-    :macro:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+    :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
     of value of 0 is received by a remote endpoint (or it is omitted),
     this function does nothing and returns 0.
     
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
         The function is called from server side session
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *field_value_len* is larger than 16380; or *stream_id* is
         0.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_push_promise.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_push_promise.rst Changed

@@ -27,10 +27,10 @@
     This function creates copies of all name/value pairs in *nva*.  It
     also lower-cases all names in *nva*.  The order of elements in
     *nva* is preserved.  For header fields with
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
     header field name and value are not copied respectively.  With
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
     is responsible to pass header field name in lowercase.  The
     application should maintain the references to them until
     :type:`nghttp2_on_frame_send_callback` or
@@ -51,18 +51,18 @@
     This function returns assigned promised stream ID if it succeeds,
     or one of the following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_PROTO`
+    :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
         This function was invoked when *session* is initialized as
         client.
-    :macro:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
         No stream ID is available because maximum stream ID was
         reached.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *stream_id* is 0; The *stream_id* does not designate stream
         that peer initiated.
-    :macro:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
+    :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
         The stream was already closed; or the *stream_id* is invalid.
     
     .. warning::

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_request.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_request.rst Changed

@@ -26,7 +26,7 @@
     :macro:`NGHTTP2_MAX_WEIGHT`.
     
     If
-    :macro:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+    :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
     of value of 1 is received by a remote endpoint, *pri_spec* is
     ignored, and treated as if ``NULL`` is specified.
     
@@ -39,10 +39,10 @@
     This function creates copies of all name/value pairs in *nva*.  It
     also lower-cases all names in *nva*.  The order of elements in
     *nva* is preserved.  For header fields with
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
     header field name and value are not copied respectively.  With
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
     is responsible to pass header field name in lowercase.  The
     application should maintain the references to them until
     :type:`nghttp2_on_frame_send_callback` or
@@ -66,15 +66,15 @@
     This function returns assigned stream ID if it succeeds, or one of
     the following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
+    :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
         No stream ID is available because maximum stream ID was
         reached.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         Trying to depend on itself (new stream ID equals
         ``pri_spec->stream_id``).
-    :macro:`nghttp2_error.NGHTTP2_ERR_PROTO`
+    :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
         The *session* is server session.
     
     .. warning::

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_response.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_response.rst Changed

@@ -22,10 +22,10 @@
     This function creates copies of all name/value pairs in *nva*.  It
     also lower-cases all names in *nva*.  The order of elements in
     *nva* is preserved.  For header fields with
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
     header field name and value are not copied respectively.  With
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
     is responsible to pass header field name in lowercase.  The
     application should maintain the references to them until
     :type:`nghttp2_on_frame_send_callback` or
@@ -53,16 +53,16 @@
     This function returns 0 if it succeeds, or one of the following
     negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *stream_id* is 0.
-    :macro:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
+    :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
         DATA or HEADERS has been already submitted and not fully
         processed yet.  Normally, this does not happen, but when
         application wrongly calls `nghttp2_submit_response()` twice,
         this may happen.
-    :macro:`nghttp2_error.NGHTTP2_ERR_PROTO`
+    :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
         The *session* is client session.
     
     .. warning::

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_rst_stream.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_rst_stream.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_settings.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_settings.rst Changed

@@ -15,7 +15,7 @@
 indicates the number of :type:`nghttp2_settings_entry`.
 
 The *flags* is currently ignored and should be
- :macro:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
 
 This function does not take ownership of the *iv*. This function
 copies all the elements in the *iv*.
@@ -24,15 +24,15 @@
 size becomes strictly larger than NGHTTP2_MAX_WINDOW_SIZE,
 RST_STREAM is issued against such a stream.
 
- SETTINGS with :macro:`nghttp2_flag.NGHTTP2_FLAG_ACK` is
+ SETTINGS with :enum:`nghttp2_flag.NGHTTP2_FLAG_ACK` is
 automatically submitted by the library and application could not
 send it at its will.
 
 This function returns 0 if it succeeds, or one of the following
 negative error codes:
 
- :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
 The *iv* contains invalid value (e.g., initial window size
 strictly greater than (1 << 31) - 1.
- :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
 Out of memory.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_shutdown_notice.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_shutdown_notice.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_trailer.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_trailer.rst Changed

@@ -19,10 +19,10 @@
     This function creates copies of all name/value pairs in *nva*.  It
     also lower-cases all names in *nva*.  The order of elements in
     *nva* is preserved.  For header fields with
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
     header field name and value are not copied respectively.  With
-    :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+    :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
     is responsible to pass header field name in lowercase.  The
     application should maintain the references to them until
     :type:`nghttp2_on_frame_send_callback` or
@@ -36,15 +36,15 @@
     *nva* will be sent as response headers, which will result in error.
     
     This function has the same effect with `nghttp2_submit_headers()`,
-    with flags = :macro:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` and both
+    with flags = :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` and both
     pri_spec and stream_user_data to NULL.
     
     To submit trailer fields after `nghttp2_submit_response()` is
     called, the application has to specify
     :type:`nghttp2_data_provider` to `nghttp2_submit_response()`.
     Inside of :type:`nghttp2_data_source_read_callback`, when setting
-    :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF`, also set
-    :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM`.  After
+    :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF`, also set
+    :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM`.  After
     that, the application can send trailer fields using
     `nghttp2_submit_trailer()`.  `nghttp2_submit_trailer()` can be used
     inside :type:`nghttp2_data_source_read_callback`.
@@ -53,7 +53,7 @@
     Otherwise, this function returns 0 if it succeeds, or one of the
     following negative error codes:
     
-    :macro:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+    :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
         Out of memory.
-    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+    :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
         The *stream_id* is 0.

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_window_update.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttp2_submit_window_update.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttpd.1 -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttpd.1 Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttpx.1 -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/nghttpx.1 Changed

@@ -27,7 +27,7 @@
 .\" new: \\nrst2man-indent\\nrst2man-indent-level
 .in \\nrst2man-indent\\nrst2man-indent-levelu
 ..
-.TH "NGHTTPX" "1" "Feb 13, 2023" "1.52.0" "nghttp2"
+.TH "NGHTTPX" "1" "Jul 14, 2023" "1.55.1" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 proxy
 .SH SYNOPSIS
@@ -40,13 +40,13 @@
 .TP
 .B <PRIVATE_KEY>
 Set path to server\(aqs private key. Required unless
-"no\-tls" parameter is used in \fI\%\-\-frontend\fP option.
+\(dqno\-tls\(dq parameter is used in \fI\%\-\-frontend\fP option.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B <CERT>
 Set path to server\(aqs certificate. Required unless
-"no\-tls" parameter is used in \fI\%\-\-frontend\fP option. To
+\(dqno\-tls\(dq parameter is used in \fI\%\-\-frontend\fP option. To
 make OCSP stapling work, this must be an absolute path.
 .UNINDENT
 .SH OPTIONS
@@ -59,56 +59,56 @@
 Set backend host and port. The multiple backend
 addresses are accepted by repeating this option. UNIX
 domain socket can be specified by prefixing path name
-with "unix:" (e.g., unix:/var/run/backend.sock).
+with \(dqunix:\(dq (e.g., unix:/var/run/backend.sock).
 .sp
 Optionally, if <PATTERN>s are given, the backend address
 is only used if request matches the pattern. The
 pattern matching is closely designed to ServeMux in
 net/http package of Go programming language. <PATTERN>
 consists of path, host + path or just host. The path
-must start with "\fI/\fP". If it ends with "\fI/\fP", it matches
+must start with \(dq\fI/\fP\(dq. If it ends with \(dq\fI/\fP\(dq, it matches
 all request path in its subtree. To deal with the
 request to the directory without trailing slash, the
-path which ends with "\fI/\fP" also matches the request path
-which only lacks trailing \(aq\fI/\fP\(aq (e.g., path "\fI/foo/\fP"
-matches request path "\fI/foo\fP"). If it does not end with
-"\fI/\fP", it performs exact match against the request path.
+path which ends with \(dq\fI/\fP\(dq also matches the request path
+which only lacks trailing \(aq\fI/\fP\(aq (e.g., path \(dq\fI/foo/\fP\(dq
+matches request path \(dq\fI/foo\fP\(dq). If it does not end with
+\(dq\fI/\fP\(dq, it performs exact match against the request path.
 If host is given, it performs a match against the
 request host. For a request received on the frontend
-listener with "sni\-fwd" parameter enabled, SNI host is
+listener with \(dqsni\-fwd\(dq parameter enabled, SNI host is
 used instead of a request host. If host alone is given,
-"\fI/\fP" is appended to it, so that it matches all request
-paths under the host (e.g., specifying "nghttp2.org"
-equals to "nghttp2.org/"). CONNECT method is treated
+\(dq\fI/\fP\(dq is appended to it, so that it matches all request
+paths under the host (e.g., specifying \(dqnghttp2.org\(dq
+equals to \(dqnghttp2.org/\(dq). CONNECT method is treated
 specially. It does not have path, and we don\(aqt allow
 empty path. To workaround this, we assume that CONNECT
-method has "\fI/\fP" as path.
+method has \(dq\fI/\fP\(dq as path.
 .sp
 Patterns with host take precedence over patterns with
 just path. Then, longer patterns take precedence over
 shorter ones.
 .sp
-Host can include "*" in the left most position to
+Host can include \(dq*\(dq in the left most position to
 indicate wildcard match (only suffix match is done).
-The "*" must match at least one character. For example,
-host pattern "*.nghttp2.org" matches against
-"www.nghttp2.org" and "git.ngttp2.org", but does not
-match against "nghttp2.org". The exact hosts match
+The \(dq*\(dq must match at least one character. For example,
+host pattern \(dq*.nghttp2.org\(dq matches against
+\(dqwww.nghttp2.org\(dq and \(dqgit.ngttp2.org\(dq, but does not
+match against \(dqnghttp2.org\(dq. The exact hosts match
 takes precedence over the wildcard hosts match.
 .sp
-If path part ends with "*", it is treated as wildcard
+If path part ends with \(dq*\(dq, it is treated as wildcard
 path. The wildcard path behaves differently from the
 normal path. For normal path, match is made around the
-boundary of path component separator,"\fI/\fP". On the other
+boundary of path component separator,\(dq\fI/\fP\(dq. On the other
 hand, the wildcard path does not take into account the
 path component separator. All paths which include the
-wildcard path without last "*" as prefix, and are
-strictly longer than wildcard path without last "*" are
-matched. "*" must match at least one character. For
-example, the pattern "\fI/foo*\fP" matches "\fI/foo/\fP" and
-"\fI/foobar\fP". But it does not match "\fI/foo\fP", or "\fI/fo\fP".
+wildcard path without last \(dq*\(dq as prefix, and are
+strictly longer than wildcard path without last \(dq*\(dq are
+matched. \(dq*\(dq must match at least one character. For
+example, the pattern \(dq\fI/foo*\fP\(dq matches \(dq\fI/foo/\fP\(dq and
+\(dq\fI/foobar\fP\(dq. But it does not match \(dq\fI/foo\fP\(dq, or \(dq\fI/fo\fP\(dq.
 .sp
-If <PATTERN> is omitted or empty string, "\fI/\fP" is used as
+If <PATTERN> is omitted or empty string, \(dq\fI/\fP\(dq is used as
 pattern, which matches all request paths (catch\-all
 pattern). The catch\-all backend must be given.
 .sp
@@ -116,16 +116,16 @@
 pattern, request host and path. For host part, they are
 converted to lower case. For path part, percent\-encoded
 unreserved characters defined in RFC 3986 are decoded,
-and any dot\-segments (".." and ".") are resolved and
+and any dot\-segments (\(dq..\(dq and \(dq.\(dq) are resolved and
 removed.
 .sp
 For example, \fI\%\-b\fP\(aq127.0.0.1,8080;nghttp2.org/httpbin/\(aq
-matches the request host "nghttp2.org" and the request
-path "\fI/httpbin/get\fP", but does not match the request host
-"nghttp2.org" and the request path "\fI/index.html\fP".
+matches the request host \(dqnghttp2.org\(dq and the request
+path \(dq\fI/httpbin/get\fP\(dq, but does not match the request host
+\(dqnghttp2.org\(dq and the request path \(dq\fI/index.html\fP\(dq.
 .sp
 The multiple <PATTERN>s can be specified, delimiting
-them by ":". Specifying
+them by \(dq:\(dq. Specifying
 \fI\%\-b\fP\(aq127.0.0.1,8080;nghttp2.org:www.nghttp2.org\(aq has the
 same effect to specify \fI\%\-b\fP\(aq127.0.0.1,8080;nghttp2.org\(aq
 and \fI\%\-b\fP\(aq127.0.0.1,8080;www.nghttp2.org\(aq.
@@ -134,45 +134,45 @@
 together forming load balancing group.
 .sp
 Several parameters <PARAM> are accepted after <PATTERN>.
-The parameters are delimited by ";". The available
-parameters are: "proto=<PROTO>", "tls",
-"sni=<SNI_HOST>", "fall=<N>", "rise=<N>",
-"affinity=<METHOD>", "dns", "redirect\-if\-not\-tls",
-"upgrade\-scheme", "mruby=<PATH>",
-"read\-timeout=<DURATION>", "write\-timeout=<DURATION>",
-"group=<GROUP>", "group\-weight=<N>", "weight=<N>", and
-"dnf". The parameter consists of keyword, and
-optionally followed by "=" and value. For example, the
-parameter "proto=h2" consists of the keyword "proto" and
-value "h2". The parameter "tls" consists of the keyword
-"tls" without value. Each parameter is described as
+The parameters are delimited by \(dq;\(dq. The available
+parameters are: \(dqproto=<PROTO>\(dq, \(dqtls\(dq,
+\(dqsni=<SNI_HOST>\(dq, \(dqfall=<N>\(dq, \(dqrise=<N>\(dq,
+\(dqaffinity=<METHOD>\(dq, \(dqdns\(dq, \(dqredirect\-if\-not\-tls\(dq,
+\(dqupgrade\-scheme\(dq, \(dqmruby=<PATH>\(dq,
+\(dqread\-timeout=<DURATION>\(dq, \(dqwrite\-timeout=<DURATION>\(dq,
+\(dqgroup=<GROUP>\(dq, \(dqgroup\-weight=<N>\(dq, \(dqweight=<N>\(dq, and
+\(dqdnf\(dq. The parameter consists of keyword, and
+optionally followed by \(dq=\(dq and value. For example, the
+parameter \(dqproto=h2\(dq consists of the keyword \(dqproto\(dq and
+value \(dqh2\(dq. The parameter \(dqtls\(dq consists of the keyword
+\(dqtls\(dq without value. Each parameter is described as
 follows.
 .sp
 The backend application protocol can be specified using
-optional "proto" parameter, and in the form of
-"proto=<PROTO>". <PROTO> should be one of the following
-list without quotes: "h2", "http/1.1". The default
-value of <PROTO> is "http/1.1". Note that usually "h2"
+optional \(dqproto\(dq parameter, and in the form of
+\(dqproto=<PROTO>\(dq. <PROTO> should be one of the following
+list without quotes: \(dqh2\(dq, \(dqhttp/1.1\(dq. The default
+value of <PROTO> is \(dqhttp/1.1\(dq. Note that usually \(dqh2\(dq
 refers to HTTP/2 over TLS. But in this option, it may
-mean HTTP/2 over cleartext TCP unless "tls" keyword is
+mean HTTP/2 over cleartext TCP unless \(dqtls\(dq keyword is
 used (see below).
 .sp
-TLS can be enabled by specifying optional "tls"
+TLS can be enabled by specifying optional \(dqtls\(dq
 parameter. TLS is not enabled by default.
 .sp
-With "sni=<SNI_HOST>" parameter, it can override the TLS
+With \(dqsni=<SNI_HOST>\(dq parameter, it can override the TLS
 SNI field value with given <SNI_HOST>. This will
 default to the backend <HOST> name
 .sp
 The feature to detect whether backend is online or
-offline can be enabled using optional "fall" and "rise"
-parameters. Using "fall=<N>" parameter, if nghttpx
+offline can be enabled using optional \(dqfall\(dq and \(dqrise\(dq
+parameters. Using \(dqfall=<N>\(dq parameter, if nghttpx
 cannot connect to a this backend <N> times in a row,
 this backend is assumed to be offline, and it is
 excluded from load balancing. If <N> is 0, this backend
 never be excluded from load balancing whatever times
 nghttpx cannot connect to it, and this is the default.
-There is also "rise=<N>" parameter. After backend was
+There is also \(dqrise=<N>\(dq parameter. After backend was
 excluded from load balancing group, nghttpx periodically
 attempts to make a connection to the failed backend, and
 if the connection is made successfully <N> times in a
@@ -182,80 +182,80 @@
 state, and this is the default behaviour.
 .sp
 The session affinity is enabled using
-"affinity=<METHOD>" parameter. If "ip" is given in
+\(dqaffinity=<METHOD>\(dq parameter. If \(dqip\(dq is given in
 <METHOD>, client IP based session affinity is enabled.
-If "cookie" is given in <METHOD>, cookie based session
-affinity is enabled. If "none" is given in <METHOD>,
+If \(dqcookie\(dq is given in <METHOD>, cookie based session
+affinity is enabled. If \(dqnone\(dq is given in <METHOD>,
 session affinity is disabled, and this is the default.
 The session affinity is enabled per <PATTERN>. If at
-least one backend has "affinity" parameter, and its
-<METHOD> is not "none", session affinity is enabled for
+least one backend has \(dqaffinity\(dq parameter, and its
+<METHOD> is not \(dqnone\(dq, session affinity is enabled for
 all backend servers sharing the same <PATTERN>. It is
-advised to set "affinity" parameter to all backend
+advised to set \(dqaffinity\(dq parameter to all backend
 explicitly if session affinity is desired. The session
 affinity may break if one of the backend gets
 unreachable, or backend settings are reloaded or
 replaced by API.
 .sp
-If "affinity=cookie" is used, the additional
+If \(dqaffinity=cookie\(dq is used, the additional
 configuration is required.
-"affinity\-cookie\-name=<NAME>" must be used to specify a
+\(dqaffinity\-cookie\-name=<NAME>\(dq must be used to specify a
 name of cookie to use. Optionally,
-"affinity\-cookie\-path=<PATH>" can be used to specify a
+\(dqaffinity\-cookie\-path=<PATH>\(dq can be used to specify a
 path which cookie is applied. The optional
-"affinity\-cookie\-secure=<SECURE>" controls the Secure
-attribute of a cookie. The default value is "auto", and
+\(dqaffinity\-cookie\-secure=<SECURE>\(dq controls the Secure
+attribute of a cookie. The default value is \(dqauto\(dq, and
 the Secure attribute is determined by a request scheme.
-If a request scheme is "https", then Secure attribute is
-set. Otherwise, it is not set. If <SECURE> is "yes",
+If a request scheme is \(dqhttps\(dq, then Secure attribute is
+set. Otherwise, it is not set. If <SECURE> is \(dqyes\(dq,
 the Secure attribute is always set. If <SECURE> is
-"no", the Secure attribute is always omitted.
-"affinity\-cookie\-stickiness=<STICKINESS>" controls
+\(dqno\(dq, the Secure attribute is always omitted.
+\(dqaffinity\-cookie\-stickiness=<STICKINESS>\(dq controls
 stickiness of this affinity. If <STICKINESS> is
-"loose", removing or adding a backend server might break
+\(dqloose\(dq, removing or adding a backend server might break
 the affinity and the request might be forwarded to a
-different backend server. If <STICKINESS> is "strict",
+different backend server. If <STICKINESS> is \(dqstrict\(dq,
 removing the designated backend server breaks affinity,
 but adding new backend server does not cause breakage.
 If the designated backend server becomes unavailable,
 new backend server is chosen as if the request does not
 have an affinity cookie. <STICKINESS> defaults to
-"loose".
+\(dqloose\(dq.
 .sp
 By default, name resolution of backend host name is done
-at start up, or reloading configuration. If "dns"
+at start up, or reloading configuration. If \(dqdns\(dq
 parameter is given, name resolution takes place
 dynamically. This is useful if backend address changes
-frequently. If "dns" is given, name resolution of
+frequently. If \(dqdns\(dq is given, name resolution of
 backend host name at start up, or reloading
 configuration is skipped.
 .sp
-If "redirect\-if\-not\-tls" parameter is used, the matched
+If \(dqredirect\-if\-not\-tls\(dq parameter is used, the matched
 backend requires that frontend connection is TLS
 encrypted. If it isn\(aqt, nghttpx responds to the request
 with 308 status code, and https URI the client should
 use instead is included in Location header field. The
 port number in redirect URI is 443 by default, and can
 be changed using \fI\%\-\-redirect\-https\-port\fP option. If at
-least one backend has "redirect\-if\-not\-tls" parameter,
+least one backend has \(dqredirect\-if\-not\-tls\(dq parameter,
 this feature is enabled for all backend servers sharing
 the same <PATTERN>. It is advised to set
-"redirect\-if\-no\-tls" parameter to all backends
+\(dqredirect\-if\-no\-tls\(dq parameter to all backends
 explicitly if this feature is desired.
 .sp
-If "upgrade\-scheme" parameter is used along with "tls"
+If \(dqupgrade\-scheme\(dq parameter is used along with \(dqtls\(dq
 parameter, HTTP/2 :scheme pseudo header field is changed
-to "https" from "http" when forwarding a request to this
+to \(dqhttps\(dq from \(dqhttp\(dq when forwarding a request to this
 particular backend. This is a workaround for a backend
-server which requires "https" :scheme pseudo header
+server which requires \(dqhttps\(dq :scheme pseudo header
 field on TLS encrypted connection.
 .sp
-"mruby=<PATH>" parameter specifies a path to mruby
+\(dqmruby=<PATH>\(dq parameter specifies a path to mruby
 script file which is invoked when this pattern is
 matched. All backends which share the same pattern must
 have the same mruby path.
 .sp
-"read\-timeout=<DURATION>" and "write\-timeout=<DURATION>"
+\(dqread\-timeout=<DURATION>\(dq and \(dqwrite\-timeout=<DURATION>\(dq
 parameters specify the read and write timeout of the
 backend connection when this pattern is matched. All
 backends which share the same pattern must have the same
@@ -263,42 +263,42 @@
 pattern, \fI\%\-\-backend\-read\-timeout\fP and
 \fI\%\-\-backend\-write\-timeout\fP are used.
 .sp
-"group=<GROUP>" parameter specifies the name of group
+\(dqgroup=<GROUP>\(dq parameter specifies the name of group
 this backend address belongs to. By default, it belongs
 to the unnamed default group. The name of group is
-unique per pattern. "group\-weight=<N>" parameter
+unique per pattern. \(dqgroup\-weight=<N>\(dq parameter
 specifies the weight of the group. The higher weight
 gets more frequently selected by the load balancing
 algorithm. <N> must be 1, 256 inclusive. The weight
 8 has 4 times more weight than 2. <N> must be the same
 for all addresses which share the same <GROUP>. If
-"group\-weight" is omitted in an address, but the other
+\(dqgroup\-weight\(dq is omitted in an address, but the other
 address which belongs to the same group specifies
-"group\-weight", its weight is used. If no
-"group\-weight" is specified for all addresses, the
-weight of a group becomes 1. "group" and "group\-weight"
+\(dqgroup\-weight\(dq, its weight is used. If no
+\(dqgroup\-weight\(dq is specified for all addresses, the
+weight of a group becomes 1. \(dqgroup\(dq and \(dqgroup\-weight\(dq
 are ignored if session affinity is enabled.
 .sp
-"weight=<N>" parameter specifies the weight of the
+\(dqweight=<N>\(dq parameter specifies the weight of the
 backend address inside a group which this address
 belongs to. The higher weight gets more frequently
 selected by the load balancing algorithm. <N> must be
 1, 256 inclusive. The weight 8 has 4 times more
 weight than weight 2. If this parameter is omitted,
-weight becomes 1. "weight" is ignored if session
+weight becomes 1. \(dqweight\(dq is ignored if session
 affinity is enabled.
 .sp
-If "dnf" parameter is specified, an incoming request is
+If \(dqdnf\(dq parameter is specified, an incoming request is
 not forwarded to a backend and just consumed along with
 the request body (actually a backend server never be
 contacted). It is expected that the HTTP response is
-generated by mruby script (see "mruby=<PATH>" parameter
-above). "dnf" is an abbreviation of "do not forward".
+generated by mruby script (see \(dqmruby=<PATH>\(dq parameter
+above). \(dqdnf\(dq is an abbreviation of \(dqdo not forward\(dq.
 .sp
-Since ";" and ":" are used as delimiter, <PATTERN> must
-not contain these characters. In order to include ":"
-in <PATTERN>, one has to specify "%3A" (which is
-percent\-encoded from of ":") instead. Since ";" has
+Since \(dq;\(dq and \(dq:\(dq are used as delimiter, <PATTERN> must
+not contain these characters. In order to include \(dq:\(dq
+in <PATTERN>, one has to specify \(dq%3A\(dq (which is
+percent\-encoded from of \(dq:\(dq) instead. Since \(dq;\(dq has
 special meaning in shell, the option value must be
 quoted.
 .sp
@@ -310,23 +310,23 @@
 Set frontend host and port. If <HOST> is \(aq*\(aq, it
 assumes all addresses including both IPv4 and IPv6.
 UNIX domain socket can be specified by prefixing path
-name with "unix:" (e.g., unix:/var/run/nghttpx.sock).
+name with \(dqunix:\(dq (e.g., unix:/var/run/nghttpx.sock).
 This option can be used multiple times to listen to
 multiple addresses.
 .sp
 This option can take 0 or more parameters, which are
-described below. Note that "api" and "healthmon"
+described below. Note that \(dqapi\(dq and \(dqhealthmon\(dq
 parameters are mutually exclusive.
 .sp
-Optionally, TLS can be disabled by specifying "no\-tls"
+Optionally, TLS can be disabled by specifying \(dqno\-tls\(dq
 parameter. TLS is enabled by default.
 .sp
-If "sni\-fwd" parameter is used, when performing a match
+If \(dqsni\-fwd\(dq parameter is used, when performing a match
 to select a backend server, SNI host name received from
 the client is used instead of the request host. See
 \fI\%\-\-backend\fP option about the pattern match.
 .sp
-To make this frontend as API endpoint, specify "api"
+To make this frontend as API endpoint, specify \(dqapi\(dq
 parameter. This is disabled by default. It is
 important to limit the access to the API frontend.
 Otherwise, someone may change the backend server, and
@@ -334,18 +334,18 @@
 to the outside the world.
 .sp
 To make this frontend as health monitor endpoint,
-specify "healthmon" parameter. This is disabled by
+specify \(dqhealthmon\(dq parameter. This is disabled by
 default. Any requests which come through this address
 are replied with 200 HTTP status, without no body.
 .sp
 To accept PROXY protocol version 1 and 2 on frontend
-connection, specify "proxyproto" parameter. This is
+connection, specify \(dqproxyproto\(dq parameter. This is
 disabled by default.
 .sp
-To receive HTTP/3 (QUIC) traffic, specify "quic"
+To receive HTTP/3 (QUIC) traffic, specify \(dqquic\(dq
 parameter. It makes nghttpx listen on UDP port rather
-than TCP port. UNIX domain socket, "api", and
-"healthmon" parameters cannot be used with "quic"
+than TCP port. UNIX domain socket, \(dqapi\(dq, and
+\(dqhealthmon\(dq parameters cannot be used with \(dqquic\(dq
 parameter.
 .sp
 Default: \fB*,3000\fP
@@ -361,9 +361,9 @@
 .TP
 .B \-\-backend\-address\-family=(auto|IPv4|IPv6)
 Specify address family of backend connections. If
-"auto" is given, both IPv4 and IPv6 are considered. If
-"IPv4" is given, only IPv4 address is considered. If
-"IPv6" is given, only IPv6 address is considered.
+\(dqauto\(dq is given, both IPv4 and IPv6 are considered. If
+\(dqIPv4\(dq is given, only IPv4 address is considered. If
+\(dqIPv6\(dq is given, only IPv6 address is considered.
 .sp
 Default: \fBauto\fP
 .UNINDENT
@@ -538,7 +538,7 @@
 .INDENT 0.0
 .TP
 .B \-\-fastopen=<N>
-Enables "TCP Fast Open" for the listening socket and
+Enables \(dqTCP Fast Open\(dq for the listening socket and
 limits the maximum length for the queue of connections
 that have not yet completed the three\-way handshake. If
 value is 0 then fast open is disabled.
@@ -664,7 +664,7 @@
 .TP
 .B \-\-backend\-max\-backoff=<DURATION>
 Specify maximum backoff interval. This is used when
-doing health check against offline backend (see "fail"
+doing health check against offline backend (see \(dqfail\(dq
 parameter in \fI\%\-\-backend\fP option). It is also used to
 limit the maximum interval to temporarily disable
 backend when nghttpx failed to connect to it. These
@@ -766,9 +766,9 @@
 <CERTPATH> must be absolute path.
 .sp
 Additional parameter can be specified in <PARAM>. The
-available <PARAM> is "sct\-dir=<DIR>".
+available <PARAM> is \(dqsct\-dir=<DIR>\(dq.
 .sp
-"sct\-dir=<DIR>" specifies the path to directory which
+\(dqsct\-dir=<DIR>\(dq specifies the path to directory which
 contains *.sct files for TLS
 signed_certificate_timestamp extension (RFC 6962). This
 feature requires OpenSSL >= 1.0.2. See also
@@ -833,7 +833,7 @@
 \fI\%\-\-tls\-min\-proto\-version\fP and \fI\%\-\-tls\-max\-proto\-version\fP are
 enabled. If the protocol list advertised by client does
 not overlap this range, you will receive the error
-message "unknown protocol". If a protocol version lower
+message \(dqunknown protocol\(dq. If a protocol version lower
 than TLSv1.2 is specified, make sure that the compatible
 ciphers are included in \fI\%\-\-ciphers\fP option. The default
 cipher list only includes ciphers compatible with
@@ -850,7 +850,7 @@
 \fI\%\-\-tls\-min\-proto\-version\fP and \fI\%\-\-tls\-max\-proto\-version\fP are
 enabled. If the protocol list advertised by client does
 not overlap this range, you will receive the error
-message "unknown protocol". The available versions are:
+message \(dqunknown protocol\(dq. The available versions are:
 TLSv1.3, TLSv1.2, TLSv1.1, and TLSv1.0
 .sp
 Default: \fBTLSv1.3\fP
@@ -891,18 +891,18 @@
 ticket keys from memcached, and use them, possibly
 replacing current set of keys. It is up to extern TLS
 ticket key generator to rotate keys frequently. See
-"TLS SESSION TICKET RESUMPTION" section in manual page
+\(dqTLS SESSION TICKET RESUMPTION\(dq section in manual page
 to know the data format in memcached entry. Optionally,
 memcached connection can be encrypted with TLS by
-specifying "tls" parameter.
+specifying \(dqtls\(dq parameter.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-\-tls\-ticket\-key\-memcached\-address\-family=(auto|IPv4|IPv6)
 Specify address family of memcached connections to get
-TLS ticket keys. If "auto" is given, both IPv4 and IPv6
-are considered. If "IPv4" is given, only IPv4 address
-is considered. If "IPv6" is given, only IPv6 address is
+TLS ticket keys. If \(dqauto\(dq is given, both IPv4 and IPv6
+are considered. If \(dqIPv4\(dq is given, only IPv4 address
+is considered. If \(dqIPv6\(dq is given, only IPv6 address is
 considered.
 .sp
 Default: \fBauto\fP
@@ -920,7 +920,7 @@
 Set maximum number of consecutive retries before
 abandoning TLS ticket key retrieval. If this number is
 reached, the attempt is considered as failure, and
-"failure" count is incremented by 1, which contributed
+\(dqfailure\(dq count is incremented by 1, which contributed
 to the value controlled
 \fI\%\-\-tls\-ticket\-key\-memcached\-max\-fail\fP option.
 .sp
@@ -993,16 +993,16 @@
 Specify address of memcached server to store session
 cache. This enables shared session cache between
 multiple nghttpx instances. Optionally, memcached
-connection can be encrypted with TLS by specifying "tls"
+connection can be encrypted with TLS by specifying \(dqtls\(dq
 parameter.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-\-tls\-session\-cache\-memcached\-address\-family=(auto|IPv4|IPv6)
 Specify address family of memcached connections to store
-session cache. If "auto" is given, both IPv4 and IPv6
-are considered. If "IPv4" is given, only IPv4 address
-is considered. If "IPv6" is given, only IPv6 address is
+session cache. If \(dqauto\(dq is given, both IPv4 and IPv6
+are considered. If \(dqIPv4\(dq is given, only IPv4 address
+is considered. If \(dqIPv6\(dq is given, only IPv6 address is
 considered.
 .sp
 Default: \fBauto\fP
@@ -1113,7 +1113,7 @@
 postpones forwarding HTTP requests sent in early data,
 including those sent in partially in it, until TLS
 handshake finishes. If all backend server recognizes
-"Early\-Data" header field, using this option makes
+\(dqEarly\-Data\(dq header field, using this option makes
 nghttpx not postpone forwarding request and get full
 potential of 0\-RTT data.
 .UNINDENT
@@ -1274,7 +1274,7 @@
 .INDENT 0.0
 .TP
 .B (default mode)
-Accept HTTP/2, and HTTP/1.1 over SSL/TLS. "no\-tls"
+Accept HTTP/2, and HTTP/1.1 over SSL/TLS. \(dqno\-tls\(dq
 parameter is used in \fI\%\-\-frontend\fP option, accept HTTP/2
 and HTTP/1.1 over cleartext TCP. The incoming HTTP/1.1
 connection can be upgraded to HTTP/2 through HTTP
@@ -1365,16 +1365,16 @@
 .IP \(bu 2
 $tls_session_id: session ID for SSL/TLS connection.
 .IP \(bu 2
-$tls_session_reused: "r" if SSL/TLS session was
-reused. Otherwise, "."
+$tls_session_reused: \(dqr\(dq if SSL/TLS session was
+reused. Otherwise, \(dq.\(dq
 .IP \(bu 2
 $tls_sni: SNI server name for SSL/TLS connection.
 .IP \(bu 2
 $backend_host: backend host used to fulfill the
-request. "\-" if backend host is not available.
+request. \(dq\-\(dq if backend host is not available.
 .IP \(bu 2
 $backend_port: backend port used to fulfill the
-request. "\-" if backend host is not available.
+request. \(dq\-\(dq if backend host is not available.
 .IP \(bu 2
 $method: HTTP method
 .IP \(bu 2
@@ -1389,10 +1389,10 @@
 HTTP/2)
 .UNINDENT
 .sp
-The variable can be enclosed by "{" and "}" for
+The variable can be enclosed by \(dq{\(dq and \(dq}\(dq for
 disambiguation (e.g., ${remote_addr}).
 .sp
-Default: \fB$remote_addr \- \- $time_local "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"\fP
+Default: \fB$remote_addr \- \- $time_local \(dq$request\(dq $status $body_bytes_sent \(dq$http_referer\(dq \(dq$http_user_agent\(dq\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1456,8 +1456,8 @@
 .B \-\-add\-forwarded=<LIST>
 Append RFC 7239 Forwarded header field with parameters
 specified in comma delimited list <LIST>. The supported
-parameters are "by", "for", "host", and "proto". By
-default, the value of "by" and "for" parameters are
+parameters are \(dqby\(dq, \(dqfor\(dq, \(dqhost\(dq, and \(dqproto\(dq. By
+default, the value of \(dqby\(dq and \(dqfor\(dq parameters are
 obfuscated string. See \fI\%\-\-forwarded\-by\fP and
 \fI\%\-\-forwarded\-for\fP options respectively. Note that nghttpx
 does not translate non\-standard X\-Forwarded\-* header
@@ -1472,15 +1472,15 @@
 .INDENT 0.0
 .TP
 .B \-\-forwarded\-by=(obfuscated|ip|<VALUE>)
-Specify the parameter value sent out with "by" parameter
-of Forwarded header field. If "obfuscated" is given,
-the string is randomly generated at startup. If "ip" is
+Specify the parameter value sent out with \(dqby\(dq parameter
+of Forwarded header field. If \(dqobfuscated\(dq is given,
+the string is randomly generated at startup. If \(dqip\(dq is
 given, the interface address of the connection,
-including port number, is sent with "by" parameter. In
-case of UNIX domain socket, "localhost" is used instead
+including port number, is sent with \(dqby\(dq parameter. In
+case of UNIX domain socket, \(dqlocalhost\(dq is used instead
 of address and port. User can also specify the static
 obfuscated string. The limitation is that it must start
-with "_", and only consists of character set
+with \(dq_\(dq, and only consists of character set
 A\-Za\-z0\-9._\-, as described in RFC 7239.
 .sp
 Default: \fBobfuscated\fP
@@ -1488,13 +1488,13 @@
 .INDENT 0.0
 .TP
 .B \-\-forwarded\-for=(obfuscated|ip)
-Specify the parameter value sent out with "for"
-parameter of Forwarded header field. If "obfuscated" is
+Specify the parameter value sent out with \(dqfor\(dq
+parameter of Forwarded header field. If \(dqobfuscated\(dq is
 given, the string is randomly generated for each client
-connection. If "ip" is given, the remote client address
+connection. If \(dqip\(dq is given, the remote client address
 of the connection, without port number, is sent with
-"for" parameter. In case of UNIX domain socket,
-"localhost" is used instead of address.
+\(dqfor\(dq parameter. In case of UNIX domain socket,
+\(dqlocalhost\(dq is used instead of address.
 .sp
 Default: \fBobfuscated\fP
 .UNINDENT
@@ -1534,7 +1534,7 @@
 advertised in alt\-svc header field only in HTTP/1.1
 frontend. This option can be used multiple times to
 specify multiple alternative services.
-Example: \fI\%\-\-altsvc\fP="h2,443,,,ma=3600; persist=1"
+Example: \fI\%\-\-altsvc\fP=\(dqh2,443,,,ma=3600; persist=1\(dq
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1549,7 +1549,7 @@
 set. This option just appends header field and won\(aqt
 replace anything already set. This option can be used
 several times to specify multiple header fields.
-Example: \fI\%\-\-add\-request\-header\fP="foo: bar"
+Example: \fI\%\-\-add\-request\-header\fP=\(dqfoo: bar\(dq
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1558,7 +1558,7 @@
 header set. This option just appends header field and
 won\(aqt replace anything already set. This option can be
 used several times to specify multiple header fields.
-Example: \fI\%\-\-add\-response\-header\fP="foo: bar"
+Example: \fI\%\-\-add\-response\-header\fP=\(dqfoo: bar\(dq
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1604,7 +1604,7 @@
 Set file path to custom error page served when nghttpx
 originally generates HTTP error status code <CODE>.
 <CODE> must be greater than or equal to 400, and at most
-599. If "*" is used instead of <CODE>, it matches all
+599. If \(dq*\(dq is used instead of <CODE>, it matches all
 HTTP status code. If error status code comes from
 backend server, the custom error pages are not used.
 .UNINDENT
@@ -1627,7 +1627,7 @@
 .B \-\-redirect\-https\-port=<PORT>
 Specify the port number which appears in Location header
 field when redirect to HTTPS URI is made due to
-"redirect\-if\-not\-tls" parameter in \fI\%\-\-backend\fP option.
+\(dqredirect\-if\-not\-tls\(dq parameter in \fI\%\-\-backend\fP option.
 .sp
 Default: \fB443\fP
 .UNINDENT
@@ -1807,7 +1807,7 @@
 .TP
 .B \-\-frontend\-quic\-early\-data
 Enable early data on frontend QUIC connections. nghttpx
-sends "Early\-Data" header field to a backend server if a
+sends \(dqEarly\-Data\(dq header field to a backend server if a
 request is received in early data and handshake has not
 finished. All backend servers should deal with possibly
 replayed requests.
@@ -1818,8 +1818,8 @@
 Specify a directory where a qlog file is written for
 frontend QUIC connections. A qlog file is created per
 each QUIC connection. The file name is ISO8601 basic
-format, followed by "\-", server Source Connection ID and
-".sqlog".
+format, followed by \(dq\-\(dq, server Source Connection ID and
+\(dq.sqlog\(dq.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1832,8 +1832,8 @@
 .TP
 .B \-\-frontend\-quic\-congestion\-controller=<CC>
 Specify a congestion controller algorithm for a frontend
-QUIC connection. <CC> should be one of "cubic", "bbr",
-and "bbr2".
+QUIC connection. <CC> should be one of \(dqcubic\(dq, \(dqbbr\(dq,
+and \(dqbbr2\(dq.
 .sp
 Default: \fBcubic\fP
 .UNINDENT
@@ -2008,7 +2008,7 @@
 .sp
 .nf
 .ft C
-add\-request\-header="foo: bar"
+add\-request\-header=\(dqfoo: bar\(dq
 .ft P
 .fi
 .UNINDENT
@@ -2127,7 +2127,7 @@
 Currently, the following restriction is applied for server push:
 .INDENT 0.0
 .IP 1. 3
-The associated stream must have method "GET" or "POST". The
+The associated stream must have method \(dqGET\(dq or \(dqPOST\(dq. The
 associated stream\(aqs status code must be 200.
 .UNINDENT
 .sp
@@ -2295,7 +2295,7 @@
 There are 2 levels of mruby script invocations: global and
 per\-pattern. The global mruby script is set by \fI\%\-\-mruby\-file\fP
 option and is called for all requests. The per\-pattern mruby script
-is set by "mruby" parameter in \fI\%\-b\fP option. It is invoked for
+is set by \(dqmruby\(dq parameter in \fI\%\-b\fP option. It is invoked for
 a request which matches the particular pattern. The order of hook
 invocation is: global request phase hook, per\-pattern request phase
 hook, per\-pattern response phase hook, and finally global response
@@ -2362,7 +2362,7 @@
 .TP
 .B attribute R remote_addr
 Return IP address of a remote client. If connection is made
-via UNIX domain socket, this returns the string "localhost".
+via UNIX domain socket, this returns the string \(dqlocalhost\(dq.
 .UNINDENT
 .INDENT 7.0
 .TP
@@ -2504,7 +2504,7 @@
 query component. nghttpx makes certain normalization for
 path. It decodes percent\-encoding for unreserved characters
 (see \fI\%https://tools.ietf.org/html/rfc3986#section\-2.3\fP), and
-resolves ".." and ".". But it may leave characters which
+resolves \(dq..\(dq and \(dq.\(dq. But it may leave characters which
 should be percent\-encoded as is. So be careful when comparing
 path against desired string.
 .UNINDENT
@@ -2646,7 +2646,7 @@
 .ft C
 class App
 def on_req(env)
- env.req.path = "/apps#{env.req.path}"
+ env.req.path = \(dq/apps#{env.req.path}\(dq
 end
 end
 
@@ -2667,12 +2667,12 @@
 .ft C
 class App
 def on_req(env)
- allowed_clients = "127.0.0.1", "::1"
+ allowed_clients = \(dq127.0.0.1\(dq, \(dq::1\(dq
 
- if env.req.path.start_with?("/log/") &&
+ if env.req.path.start_with?(\(dq/log/\(dq) &&
 !allowed_clients.include?(env.remote_addr) then
 env.resp.status = 404
- env.resp.return "permission denied"
+ env.resp.return \(dqpermission denied\(dq
 end
 end
 end
@@ -2686,7 +2686,7 @@
 .sp
 nghttpx exposes API endpoints to manipulate it via HTTP based API. By
 default, API endpoint is disabled. To enable it, add a dedicated
-frontend for API using \fI\%\-\-frontend\fP option with "api"
+frontend for API using \fI\%\-\-frontend\fP option with \(dqapi\(dq
 parameter. All requests which come from this frontend address, will
 be treated as API request.
 .sp
@@ -2713,7 +2713,7 @@
 Additionally, depending on the API endpoint, \fBdata\fP key may be
 present, and its value contains the API endpoint specific data.
 .sp
-We wrote "normally", since nghttpx may return ordinal HTML response in
+We wrote \(dqnormally\(dq, since nghttpx may return ordinal HTML response in
 some cases where the error has occurred before reaching API endpoint
 (e.g., header field is too large).
 .sp
@@ -2737,7 +2737,7 @@
 the case with hot swapping with signals.
 .sp
 The one limitation is that only numeric IP address is allowed in
-\fI\%backend\fP in request body unless "dns" parameter
+\fI\%backend\fP in request body unless \(dqdns\(dq parameter
 is used while non numeric hostname is allowed in command\-line or
 configuration file is read using \fI\%\-\-conf\fP\&.
 .SS GET /api/v1beta1/configrevision

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/types.rst -> _service:tar_scm:nghttp2-1.55.1.tar.xz/doc/types.rst Changed

@@ -64,7 +64,7 @@
         :type:`nghttp2_on_frame_send_callback`, and
         :type:`nghttp2_on_frame_not_send_callback`), it may not be
         NULL-terminated if header field is passed from application with
-        the flag :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`).
+        the flag :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`).
         When application is constructing this struct, *name* is not
         required to be NULL-terminated.
     .. member::   uint8_t *value
@@ -76,7 +76,7 @@
         :type:`nghttp2_on_frame_send_callback`, and
         :type:`nghttp2_on_frame_not_send_callback`), it may not be
         NULL-terminated if header field is passed from application with
-        the flag :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE`).
+        the flag :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE`).
         When application is constructing this struct, *value* is not
         required to be NULL-terminated.
     .. member::   size_t namelen
@@ -131,37 +131,37 @@
     The implementation of this function must read at most *length*
     bytes of data from *source* (or possibly other places) and store
     them in *buf* and return number of data stored in *buf*.  If EOF is
-    reached, set :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag
+    reached, set :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag
     in *\*data_flags*.
     
     Sometime it is desirable to avoid copying data into *buf* and let
     application to send data directly.  To achieve this, set
-    :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` to
+    :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` to
     *\*data_flags* (and possibly other flags, just like when we do
     copy), and return the number of bytes to send without copying data
     into *buf*.  The library, seeing
-    :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY`, will invoke
+    :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY`, will invoke
     :type:`nghttp2_send_data_callback`.  The application must send
     complete DATA frame in that callback.
     
     If this callback is set by `nghttp2_submit_request()`,
     `nghttp2_submit_response()` or `nghttp2_submit_headers()` and
     `nghttp2_submit_data()` with flag parameter
-    :macro:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` set, and
-    :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag is set to
+    :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` set, and
+    :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag is set to
     *\*data_flags*, DATA frame will have END_STREAM flag set.  Usually,
     this is expected behaviour and all are fine.  One exception is send
     trailer fields.  You cannot send trailer fields after sending frame
     with END_STREAM set.  To avoid this problem, one can set
-    :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM` along
-    with :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` to signal the
+    :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM` along
+    with :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` to signal the
     library not to set END_STREAM in DATA frame.  Then application can
     use `nghttp2_submit_trailer()` to send trailer fields.
     `nghttp2_submit_trailer()` can be called inside this callback.
     
     If the application wants to postpone DATA frames (e.g.,
     asynchronous I/O, or reading data blocks for long time), it is
-    achieved by returning :macro:`nghttp2_error.NGHTTP2_ERR_DEFERRED`
+    achieved by returning :enum:`nghttp2_error.NGHTTP2_ERR_DEFERRED`
     without reading any data in this invocation.  The library removes
     DATA frame from the outgoing queue temporarily.  To move back
     deferred DATA frame to outgoing queue, call
@@ -174,16 +174,16 @@
     
     If the application just wants to return from
     `nghttp2_session_send()` or `nghttp2_session_mem_send()` without
-    sending anything, return :macro:`nghttp2_error.NGHTTP2_ERR_PAUSE`.
+    sending anything, return :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE`.
     
     In case of error, there are 2 choices. Returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
     close the stream by issuing RST_STREAM with
-    :macro:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  If a different
+    :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  If a different
     error code is desirable, use `nghttp2_submit_rst_stream()` with a
     desired error code and then return
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
-    Returning :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+    Returning :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will
     signal the entire session failure.
 .. type:: nghttp2_data_provider
 
@@ -445,9 +445,9 @@
     *length* bytes of data stored in *data*.  The *flags* is currently
     not used and always 0. It must return the number of bytes sent if
     it succeeds.  If it cannot send any single byte without blocking,
-    it must return :macro:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  For
+    it must return :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  For
     other errors, it must return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  The
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  The
     *user_data* pointer is the third argument passed in to the call to
     `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
     
@@ -471,7 +471,7 @@
 
     
     Callback function invoked when
-    :macro:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` is used in
+    :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` is used in
     :type:`nghttp2_data_source_read_callback` to send complete DATA
     frame.
     
@@ -491,7 +491,7 @@
     If all data were written successfully, return 0.
     
     If it cannot send any data at all, just return
-    :macro:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`; the library will call
+    :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`; the library will call
     this callback with the same parameters later (It is recommended to
     send complete DATA frame at once in this function to deal with
     error; if partial frame data has already sent, it is impossible to
@@ -499,14 +499,14 @@
     connection).  When data is fully processed, but application wants
     to make `nghttp2_session_mem_send()` or `nghttp2_session_send()`
     return immediately without processing next frames, return
-    :macro:`nghttp2_error.NGHTTP2_ERR_PAUSE`.  If application decided to
+    :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE`.  If application decided to
     reset this stream, return
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`, then
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`, then
     the library will send RST_STREAM with INTERNAL_ERROR as error code.
     The application can also return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which will
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which will
     result in connection closure.  Returning any other value is treated
-    as :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
+    as :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
 .. type:: ssize_t (*nghttp2_recv_callback)(nghttp2_session *session, uint8_t *buf, size_t length, int flags, void *user_data)
 
     
@@ -516,12 +516,12 @@
     currently not used and always 0.  It must return the number of
     bytes written in *buf* if it succeeds.  If it cannot read any
     single byte without blocking, it must return
-    :macro:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  If it gets EOF
+    :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  If it gets EOF
     before it reads any single byte, it must return
-    :macro:`nghttp2_error.NGHTTP2_ERR_EOF`.  For other errors, it must
-    return :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_EOF`.  For other errors, it must
+    return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     Returning 0 is treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  The *user_data*
+    :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  The *user_data*
     pointer is the third argument passed in to the call to
     `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
     
@@ -556,7 +556,7 @@
     If nonzero value is returned, it is treated as fatal error and
     `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_frame_recv_callback()`.
@@ -580,7 +580,7 @@
     If nonzero is returned, it is treated as fatal error and
     `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_invalid_frame_recv_callback()`.
@@ -598,7 +598,7 @@
     `nghttp2_session_server_new()`.
     
     If the application uses `nghttp2_session_mem_recv()`, it can return
-    :macro:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
+    :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
     `nghttp2_session_mem_recv()` return without processing further
     input bytes.  The memory by pointed by the *data* is retained until
     `nghttp2_session_mem_recv()` or `nghttp2_session_recv()` is called.
@@ -610,7 +610,7 @@
     If nonzero is returned, it is treated as fatal error, and
     `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_data_chunk_recv_callback()`.
@@ -623,18 +623,18 @@
     `nghttp2_session_server_new()`.
     
     The implementation of this function must return 0 if it succeeds.
-    It can also return :macro:`nghttp2_error.NGHTTP2_ERR_CANCEL` to
+    It can also return :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL` to
     cancel the transmission of the given frame.
     
     If there is a fatal error while executing this callback, the
     implementation should return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which makes
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which makes
     `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     If the other value is returned, it is treated as if
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
     But the implementation should not rely on this since the library
     may define new return value to extend its capability.
     
@@ -651,7 +651,7 @@
     If nonzero is returned, it is treated as fatal error and
     `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_frame_send_callback()`.
@@ -669,7 +669,7 @@
     If nonzero is returned, it is treated as fatal error and
     `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     `nghttp2_session_get_stream_user_data()` can be used to get
     associated data.
@@ -681,7 +681,7 @@
     
     Callback function invoked when the stream *stream_id* is closed.
     The reason of closure is indicated by the *error_code*.  The
-    *error_code* is usually one of :macro:`nghttp2_error_code`, but that
+    *error_code* is usually one of :enum:`nghttp2_error_code`, but that
     is not guaranteed.  The stream_user_data, which was specified in
     `nghttp2_submit_request()` or `nghttp2_submit_headers()`, is still
     available in this function.  The *user_data* pointer is the third
@@ -695,7 +695,7 @@
     `nghttp2_session_recv()`, `nghttp2_session_mem_recv()`,
     `nghttp2_session_send()`, and `nghttp2_session_mem_send()`
     functions immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_stream_close_callback()`.
@@ -707,7 +707,7 @@
     will be emitted by :type:`nghttp2_on_header_callback`.
     
     The ``frame->hd.flags`` may not have
-    :macro:`nghttp2_flag.NGHTTP2_FLAG_END_HEADERS` flag set, which
+    :enum:`nghttp2_flag.NGHTTP2_FLAG_END_HEADERS` flag set, which
     indicates that one or more CONTINUATION frames are involved.  But
     the application does not need to care about that because the header
     name/value pairs are emitted transparently regardless of
@@ -735,30 +735,30 @@
     NGHTTP2_HCAT_HEADERS`` which does not contain any status code.
     
     Returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
     close the stream (promised stream if frame is PUSH_PROMISE) by
     issuing RST_STREAM with
-    :macro:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  In this case,
+    :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  In this case,
     :type:`nghttp2_on_header_callback` and
     :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
     different error code is desirable, use
     `nghttp2_submit_rst_stream()` with a desired error code and then
-    return :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+    return :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
     Again, use ``frame->push_promise.promised_stream_id`` as stream_id
     parameter in `nghttp2_submit_rst_stream()` if frame is
     PUSH_PROMISE.
     
     The implementation of this function must return 0 if it succeeds.
     It can return
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` to
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` to
     reset the stream (promised stream if frame is PUSH_PROMISE).  For
     critical errors, it must return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
     value is returned, it is treated as if
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.  If
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.  If
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
     `nghttp2_session_mem_recv()` function will immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_begin_headers_callback()`.
@@ -770,14 +770,14 @@
     The *value* of length *valuelen* is header value.  The *flags* is
     bitwise OR of one or more of :type:`nghttp2_nv_flag`.
     
-    If :macro:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_INDEX` is set in
+    If :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_INDEX` is set in
     *flags*, the receiver must not index this name/value pair when
     forwarding it to the next hop.  More specifically, "Literal Header
     Field never Indexed" representation must be used in HPACK encoding.
     
     When this callback is invoked, ``frame->hd.type`` is either
-    :macro:`nghttp2_frame_type.NGHTTP2_HEADERS` or
-    :macro:`nghttp2_frame_type.NGHTTP2_PUSH_PROMISE`.  After all header
+    :enum:`nghttp2_frame_type.NGHTTP2_HEADERS` or
+    :enum:`nghttp2_frame_type.NGHTTP2_PUSH_PROMISE`.  After all header
     name/value pairs are processed with this callback, and no error has
     been detected, :type:`nghttp2_on_frame_recv_callback` will be
     invoked.  If there is an error in decompression,
@@ -798,7 +798,7 @@
     explained in :ref:`http-messaging` section.
     
     If the application uses `nghttp2_session_mem_recv()`, it can return
-    :macro:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
+    :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
     `nghttp2_session_mem_recv()` return without processing further
     input bytes.  The memory pointed by *frame*, *name* and *value*
     parameters are retained until `nghttp2_session_mem_recv()` or
@@ -807,30 +807,30 @@
     it may refer to the memory region included in the input bytes.
     
     Returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
     close the stream (promised stream if frame is PUSH_PROMISE) by
     issuing RST_STREAM with
-    :macro:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  In this case,
+    :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  In this case,
     :type:`nghttp2_on_header_callback` and
     :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
     different error code is desirable, use
     `nghttp2_submit_rst_stream()` with a desired error code and then
-    return :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+    return :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
     Again, use ``frame->push_promise.promised_stream_id`` as stream_id
     parameter in `nghttp2_submit_rst_stream()` if frame is
     PUSH_PROMISE.
     
     The implementation of this function must return 0 if it succeeds.
-    It may return :macro:`nghttp2_error.NGHTTP2_ERR_PAUSE` or
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  For
+    It may return :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` or
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  For
     other critical failures, it must return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
     nonzero value is returned, it is treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
     `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_header_callback()`.
@@ -883,12 +883,12 @@
     
     With this callback, application inspects the incoming invalid
     field, and it also can reset stream from this callback by returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By
     default, the error code is
-    :macro:`nghttp2_error_code.NGHTTP2_PROTOCOL_ERROR`.  To change the
+    :enum:`nghttp2_error_code.NGHTTP2_PROTOCOL_ERROR`.  To change the
     error code, call `nghttp2_submit_rst_stream()` with the error code
     of choice in addition to returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
     
     If 0 is returned, the header field is ignored, and the stream is
     not reset.
@@ -913,12 +913,12 @@
     
     With this callback, application inspects the incoming invalid
     field, and it also can reset stream from this callback by returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By
     default, the error code is
-    :macro:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  To change the
+    :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  To change the
     error code, call `nghttp2_submit_rst_stream()` with the error code
     of choice in addition to returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
 .. type:: ssize_t (*nghttp2_select_padding_callback)(nghttp2_session *session, const nghttp2_frame *frame, size_t max_payloadlen, void *user_data)
 
     
@@ -927,12 +927,12 @@
     *frame*.  The application must choose the total length of payload
     including padded bytes in range frame->hd.length, max_payloadlen,
     inclusive.  Choosing number not in this range will be treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Returning
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Returning
     ``frame->hd.length`` means no padding is added.  Returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will make
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will make
     `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_select_padding_callback()`.
@@ -946,16 +946,16 @@
     *remote_max_frame_size*).  If a value greater than this range is
     returned than the max allow value will be used.  Returning a value
     smaller than this range is treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  The
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  The
     *frame_type* is provided for future extensibility and identifies
     the type of frame (see :type:`nghttp2_frame_type`) for which to get
     the length for.  Currently supported frame types are:
-    :macro:`nghttp2_frame_type.NGHTTP2_DATA`.
+    :enum:`nghttp2_frame_type.NGHTTP2_DATA`.
     
     This callback can be used to control the length in bytes for which
     :type:`nghttp2_data_source_read_callback` is allowed to send to the
     remote endpoint.  This callback is optional.  Returning
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will signal the
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will signal the
     entire session failure.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
@@ -978,7 +978,7 @@
     If nonzero value is returned, it is treated as fatal error and
     `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     
     To set this callback to :type:`nghttp2_session_callbacks`, use
     `nghttp2_session_callbacks_set_on_begin_frame_callback()`.
@@ -992,15 +992,15 @@
     The implementation of this function must return 0 if it succeeds.
     
     To abort processing this extension frame, return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
     
     If fatal error occurred, application should return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
     `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
     values are returned, currently they are treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
 .. type:: int (*nghttp2_unpack_extension_callback)(nghttp2_session *session, void **payload, const nghttp2_frame_hd *hd, void *user_data)
 
     
@@ -1025,15 +1025,15 @@
     *\*payload*, and do its own mechanism to process extension frames.
     
     To abort processing this extension frame, return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
     
     If fatal error occurred, application should return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
     `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
     values are returned, currently they are treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
 .. type:: ssize_t (*nghttp2_pack_extension_callback)(nghttp2_session *session, uint8_t *buf, size_t len, const nghttp2_frame *frame, void *user_data)
 
     
@@ -1049,18 +1049,18 @@
     bytes written into *buf* when it succeeds.
     
     To abort processing this extension frame, return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CANCEL`, and
+    :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`, and
     :type:`nghttp2_on_frame_not_send_callback` will be invoked.
     
     If fatal error occurred, application should return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
     `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
     immediately return
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
     values are returned, currently they are treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the return
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the return
     value is strictly larger than *len*, it is treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
 .. type:: int (*nghttp2_error_callback)(nghttp2_session *session, const char *msg, size_t len, void *user_data)
 
     
@@ -1079,11 +1079,11 @@
     
     Normally, application should return 0 from this callback.  If fatal
     error occurred while doing something in this callback, application
-    should return :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    should return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     In this case, library will return immediately with return value
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if
     nonzero value is returned from this callback, they are treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
     should not rely on this details.
 .. type:: int (*nghttp2_error_callback2)(nghttp2_session *session, int lib_error_code, const char *msg, size_t len, void *user_data)
 
@@ -1091,7 +1091,7 @@
     Callback function invoked when library provides the error code, and
     message.  This callback is solely for debugging purpose.
     *lib_error_code* is one of error code defined in
-    :macro:`nghttp2_error`.  The *msg* is typically NULL-terminated
+    :enum:`nghttp2_error`.  The *msg* is typically NULL-terminated
     string of length *len*, and intended for human consumption.  *len*
     does not include the sentinel NULL character.
     
@@ -1101,11 +1101,11 @@
     
     Normally, application should return 0 from this callback.  If fatal
     error occurred while doing something in this callback, application
-    should return :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+    should return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
     In this case, library will return immediately with return value
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if
     nonzero value is returned from this callback, they are treated as
-    :macro:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
+    :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
     should not rely on this details.
 .. type:: nghttp2_session_callbacks
 
@@ -1223,7 +1223,7 @@
     extension to HTTP/2.  If this frame is received, and
     `nghttp2_option_set_user_recv_extension_type()` is not set, and
     `nghttp2_option_set_builtin_recv_extension_type()` is set for
-    :macro:`nghttp2_frame_type.NGHTTP2_ALTSVC`,
+    :enum:`nghttp2_frame_type.NGHTTP2_ALTSVC`,
     ``nghttp2_extension.payload`` will point to this struct.
     
     It has the following members:
@@ -1266,7 +1266,7 @@
     If this frame is received, and
     `nghttp2_option_set_user_recv_extension_type()` is not set, and
     `nghttp2_option_set_builtin_recv_extension_type()` is set for
-    :macro:`nghttp2_frame_type.NGHTTP2_ORIGIN`,
+    :enum:`nghttp2_frame_type.NGHTTP2_ORIGIN`,
     ``nghttp2_extension.payload`` will point to this struct.
     
     It has the following members:
@@ -1285,7 +1285,7 @@
     non-critical extension to HTTP/2.  If this frame is received, and
     `nghttp2_option_set_user_recv_extension_type()` is not set, and
     `nghttp2_option_set_builtin_recv_extension_type()` is set for
-    :macro:`nghttp2_frame_type.NGHTTP2_PRIORITY_UPDATE`,
+    :enum:`nghttp2_frame_type.NGHTTP2_PRIORITY_UPDATE`,
     ``nghttp2_extension.payload`` will point to this struct.
     
     It has the following members:

_service:tar_scm:nghttp2-1.52.0.tar.xz/examples/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/examples/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/integration-tests/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/integration-tests/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/integration-tests/nghttpx_http1_test.go -> _service:tar_scm:nghttp2-1.55.1.tar.xz/integration-tests/nghttpx_http1_test.go Changed

@@ -594,6 +594,76 @@
 	}
 }
 
+// TestH1H1ReqPhaseReturnCONNECTMethod tests that mruby request phase
+// hook resets llhttp HPE_PAUSED_UPGRADE.
+func TestH1H1ReqPhaseReturnCONNECTMethod(t *testing.T) {
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/req-return.rb"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	if _, err := io.WriteString(st.conn, "CONNECT 127.0.0.1:443 HTTP/1.1\r\nTest-Case: TestH1H1ReqPhaseReturnCONNECTMethod\r\nHost: 127.0.0.1:443\r\n\r\n"); err != nil {
+		t.Fatalf("Error io.WriteString() = %v", err)
+	}
+
+	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
+	if err != nil {
+		t.Fatalf("Error http.ReadResponse() = %v", err)
+	}
+
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusNotFound; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+
+	hdCheck := func() {
+		hdtests := struct {
+			k, v string
+		}{
+			{"content-length", "20"},
+			{"from", "mruby"},
+		}
+
+		for _, tt := range hdtests {
+			if got, want := resp.Header.Get(tt.k), tt.v; got != want {
+				t.Errorf("%v = %v; want %v", tt.k, got, want)
+			}
+		}
+
+		if _, err := io.ReadAll(resp.Body); err != nil {
+			t.Fatalf("Error io.ReadAll() = %v", err)
+		}
+	}
+
+	hdCheck()
+
+	if _, err := io.WriteString(st.conn, "CONNECT 127.0.0.1:443 HTTP/1.1\r\nTest-Case: TestH1H1ReqPhaseReturnCONNECTMethod\r\nHost: 127.0.0.1:443\r\n\r\n"); err != nil {
+		t.Fatalf("Error io.WriteString() = %v", err)
+	}
+
+	resp, err = http.ReadResponse(bufio.NewReader(st.conn), nil)
+	if err != nil {
+		t.Fatalf("Error http.ReadResponse() = %v", err)
+	}
+
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusNotFound; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+
+	hdCheck()
+
+	if _, err := io.ReadAll(resp.Body); err != nil {
+		t.Fatalf("Error io.ReadAll() = %v", err)
+	}
+}
+
 // TestH1H1RespPhaseSetHeader tests mruby response phase hook modifies
 // response header fields.
 func TestH1H1RespPhaseSetHeader(t *testing.T) {
@@ -737,6 +807,54 @@
 	}
 }
 
+// TestH1H1CONNECTMethodFailure tests that CONNECT method failure
+// resets llhttp HPE_PAUSED_UPGRADE.
+func TestH1H1CONNECTMethodFailure(t *testing.T) {
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if r.Header.Get("required-header") == "" {
+				w.WriteHeader(http.StatusNotFound)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	if _, err := io.WriteString(st.conn, "CONNECT 127.0.0.1:443 HTTP/1.1\r\nTest-Case: TestH1H1CONNECTMethodFailure\r\nHost: 127.0.0.1:443\r\n\r\n"); err != nil {
+		t.Fatalf("Error io.WriteString() = %v", err)
+	}
+
+	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
+	if err != nil {
+		t.Fatalf("Error http.ReadResponse() = %v", err)
+	}
+
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusNotFound; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+
+	if _, err := io.ReadAll(resp.Body); err != nil {
+		t.Fatalf("Error io.ReadAll() = %v", err)
+	}
+
+	if _, err := io.WriteString(st.conn, "CONNECT 127.0.0.1:443 HTTP/1.1\r\nTest-Case: TestH1H1CONNECTMethodFailure\r\nHost: 127.0.0.1:443\r\nrequired-header: foo\r\n\r\n"); err != nil {
+		t.Fatalf("Error io.WriteString() = %v", err)
+	}
+
+	resp, err = http.ReadResponse(bufio.NewReader(st.conn), nil)
+	if err != nil {
+		t.Fatalf("Error http.ReadResponse() = %v", err)
+	}
+
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusOK; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
 // // TestH1H2ConnectFailure tests that server handles the situation that
 // // connection attempt to HTTP/2 backend failed.
 // func TestH1H2ConnectFailure(t *testing.T) {

_service:tar_scm:nghttp2-1.52.0.tar.xz/integration-tests/server_tester.go -> _service:tar_scm:nghttp2-1.55.1.tar.xz/integration-tests/server_tester.go Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/CMakeLists.txt -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/CMakeLists.txt Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/Makefile.am -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/Makefile.am Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/Makefile.in Changed

@@ -157,7 +157,7 @@
 	nghttp2_hd_huffman.lo nghttp2_hd_huffman_data.lo \
 	nghttp2_version.lo nghttp2_priority_spec.lo nghttp2_option.lo \
 	nghttp2_callbacks.lo nghttp2_mem.lo nghttp2_http.lo \
-	nghttp2_rcbuf.lo nghttp2_extpri.lo nghttp2_debug.lo
+	nghttp2_rcbuf.lo nghttp2_extpri.lo nghttp2_debug.lo sfparse.lo
 am_libnghttp2_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libnghttp2_la_OBJECTS = $(am_libnghttp2_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -196,7 +196,8 @@
 	./$(DEPDIR)/nghttp2_priority_spec.Plo \
 	./$(DEPDIR)/nghttp2_queue.Plo ./$(DEPDIR)/nghttp2_rcbuf.Plo \
 	./$(DEPDIR)/nghttp2_session.Plo ./$(DEPDIR)/nghttp2_stream.Plo \
-	./$(DEPDIR)/nghttp2_submit.Plo ./$(DEPDIR)/nghttp2_version.Plo
+	./$(DEPDIR)/nghttp2_submit.Plo ./$(DEPDIR)/nghttp2_version.Plo \
+	./$(DEPDIR)/sfparse.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -355,8 +356,8 @@
 LIBNGTCP2_CFLAGS = @LIBNGTCP2_CFLAGS@
 LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS = @LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@
 LIBNGTCP2_CRYPTO_BORINGSSL_LIBS = @LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@
-LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS = @LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@
-LIBNGTCP2_CRYPTO_OPENSSL_LIBS = @LIBNGTCP2_CRYPTO_OPENSSL_LIBS@
+LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS = @LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@
+LIBNGTCP2_CRYPTO_QUICTLS_LIBS = @LIBNGTCP2_CRYPTO_QUICTLS_LIBS@
 LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -509,7 +510,8 @@
 	nghttp2_http.c \
 	nghttp2_rcbuf.c \
 	nghttp2_extpri.c \
-	nghttp2_debug.c
+	nghttp2_debug.c \
+	sfparse.c
 
 HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
 	nghttp2_frame.h \
@@ -526,7 +528,8 @@
 	nghttp2_http.h \
 	nghttp2_rcbuf.h \
 	nghttp2_extpri.h \
-	nghttp2_debug.h
+	nghttp2_debug.h \
+	sfparse.h
 
 libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
 libnghttp2_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \
@@ -635,6 +638,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_stream.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_submit.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_version.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfparse.Plo@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -917,6 +921,7 @@
 	-rm -f ./$(DEPDIR)/nghttp2_stream.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_submit.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_version.Plo
+	-rm -f ./$(DEPDIR)/sfparse.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -985,6 +990,7 @@
 	-rm -f ./$(DEPDIR)/nghttp2_stream.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_submit.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_version.Plo
+	-rm -f ./$(DEPDIR)/sfparse.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/includes/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/includes/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/includes/nghttp2/nghttp2ver.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/includes/nghttp2/nghttp2ver.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_http.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/nghttp2_http.c Changed

@@ -31,6 +31,7 @@
 #include "nghttp2_hd.h"
 #include "nghttp2_helper.h"
 #include "nghttp2_extpri.h"
+#include "sfparse.h"
 
 static uint8_t downcase(uint8_t c) {
 return 'A' <= c && c <= 'Z' ? (uint8_t)(c - 'A' + 'a') : c;
@@ -578,713 +579,52 @@
 }
 }
 
-/* Generated by genchartbl.py */
-static const int SF_KEY_CHARS = {
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
- 0 /* RS */, 0 /* US */, 0 /* SPC */, 0 /* ! */, 0 /* " */,
- 0 /* # */, 0 /* $ */, 0 /* % */, 0 /* & */, 0 /* ' */,
- 0 /* ( */, 0 /* ) */, 1 /* * */, 0 /* + */, 0 /* , */,
- 1 /* - */, 1 /* . */, 0 /* / */, 1 /* 0 */, 1 /* 1 */,
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 0 /* : */, 0 /* ; */,
- 0 /* < */, 0 /* = */, 0 /* > */, 0 /* ? */, 0 /* @ */,
- 0 /* A */, 0 /* B */, 0 /* C */, 0 /* D */, 0 /* E */,
- 0 /* F */, 0 /* G */, 0 /* H */, 0 /* I */, 0 /* J */,
- 0 /* K */, 0 /* L */, 0 /* M */, 0 /* N */, 0 /* O */,
- 0 /* P */, 0 /* Q */, 0 /* R */, 0 /* S */, 0 /* T */,
- 0 /* U */, 0 /* V */, 0 /* W */, 0 /* X */, 0 /* Y */,
- 0 /* Z */, 0 /* */, 0 /* \ */, 0 /* */, 0 /* ^ */,
- 1 /* _ */, 0 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
- 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */, 0 /* | */,
- 0 /* } */, 0 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
- 0 /* 0xff */,
-};
-
-static ssize_t sf_parse_key(const uint8_t *begin, const uint8_t *end) {
- const uint8_t *p = begin;
-
- if ((*p < 'a' || 'z' < *p) && *p != '*') {
- return -1;
- }
-
- for (; p != end && SF_KEY_CHARS*p; ++p)
- ;
-
- return p - begin;
-}
-
-static ssize_t sf_parse_integer_or_decimal(nghttp2_sf_value *dest,
- const uint8_t *begin,
- const uint8_t *end) {
- const uint8_t *p = begin;
- int sign = 1;
- int64_t value = 0;
- int type = NGHTTP2_SF_VALUE_TYPE_INTEGER;
- size_t len = 0;
- size_t fpos = 0;
- size_t i;
-
- if (*p == '-') {
- if (++p == end) {
- return -1;
- }
-
- sign = -1;
- }
-
- if (*p < '0' || '9' < *p) {
- return -1;
- }
-
- for (; p != end; ++p) {
- switch (*p) {
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- value *= 10;
- value += *p - '0';
-
- if (++len > 15) {
- return -1;
- }
-
- break;
- case '.':
- if (type != NGHTTP2_SF_VALUE_TYPE_INTEGER) {
- goto fin;
- }
-
- if (len > 12) {
- return -1;
- }
- fpos = len;
- type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
-
- break;
- default:
- goto fin;
- };
- }
-
-fin:
- switch (type) {
- case NGHTTP2_SF_VALUE_TYPE_INTEGER:
- if (dest) {
- dest->type = (uint8_t)type;
- dest->i = value * sign;
- }
-
- return p - begin;
- case NGHTTP2_SF_VALUE_TYPE_DECIMAL:
- if (fpos == len || len - fpos > 3) {
- return -1;
- }
-
- if (dest) {
- dest->type = (uint8_t)type;
- dest->d = (double)value;
- for (i = len - fpos; i > 0; --i) {
- dest->d /= (double)10;
- }
- dest->d *= sign;
- }
-
- return p - begin;
- default:
- assert(0);
- abort();
- }
-}
-
-/* Generated by genchartbl.py */
-static const int SF_DQUOTE_CHARS = {
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
- 0 /* RS */, 0 /* US */, 1 /* SPC */, 1 /* ! */, 0 /* " */,
- 1 /* # */, 1 /* $ */, 1 /* % */, 1 /* & */, 1 /* ' */,
- 1 /* ( */, 1 /* ) */, 1 /* * */, 1 /* + */, 1 /* , */,
- 1 /* - */, 1 /* . */, 1 /* / */, 1 /* 0 */, 1 /* 1 */,
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 1 /* : */, 1 /* ; */,
- 1 /* < */, 1 /* = */, 1 /* > */, 1 /* ? */, 1 /* @ */,
- 1 /* A */, 1 /* B */, 1 /* C */, 1 /* D */, 1 /* E */,
- 1 /* F */, 1 /* G */, 1 /* H */, 1 /* I */, 1 /* J */,
- 1 /* K */, 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
- 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */, 1 /* T */,
- 1 /* U */, 1 /* V */, 1 /* W */, 1 /* X */, 1 /* Y */,
- 1 /* Z */, 1 /* */, 0 /* \ */, 1 /* */, 1 /* ^ */,
- 1 /* _ */, 1 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
- 1 /* x */, 1 /* y */, 1 /* z */, 1 /* { */, 1 /* | */,
- 1 /* } */, 1 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
- 0 /* 0xff */,
-};
-
-static ssize_t sf_parse_string(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- const uint8_t *p = begin;
-
- if (*p++ != '"') {
- return -1;
- }
-
- for (; p != end; ++p) {
- switch (*p) {
- case '\\':
- if (++p == end) {
- return -1;
- }
-
- switch (*p) {
- case '"':
- case '\\':
- break;
- default:
- return -1;
- }
-
- break;
- case '"':
- if (dest) {
- dest->type = NGHTTP2_SF_VALUE_TYPE_STRING;
- dest->s.base = begin + 1;
- dest->s.len = (size_t)(p - dest->s.base);
- }
-
- ++p;
-
- return p - begin;
- default:
- if (!SF_DQUOTE_CHARS*p) {
- return -1;
- }
- }
- }
-
- return -1;
-}
-
-/* Generated by genchartbl.py */
-static const int SF_TOKEN_CHARS = {
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
- 0 /* RS */, 0 /* US */, 0 /* SPC */, 1 /* ! */, 0 /* " */,
- 1 /* # */, 1 /* $ */, 1 /* % */, 1 /* & */, 1 /* ' */,
- 0 /* ( */, 0 /* ) */, 1 /* * */, 1 /* + */, 0 /* , */,
- 1 /* - */, 1 /* . */, 1 /* / */, 1 /* 0 */, 1 /* 1 */,
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 1 /* : */, 0 /* ; */,
- 0 /* < */, 0 /* = */, 0 /* > */, 0 /* ? */, 0 /* @ */,
- 1 /* A */, 1 /* B */, 1 /* C */, 1 /* D */, 1 /* E */,
- 1 /* F */, 1 /* G */, 1 /* H */, 1 /* I */, 1 /* J */,
- 1 /* K */, 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
- 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */, 1 /* T */,
- 1 /* U */, 1 /* V */, 1 /* W */, 1 /* X */, 1 /* Y */,
- 1 /* Z */, 0 /* */, 0 /* \ */, 0 /* */, 1 /* ^ */,
- 1 /* _ */, 1 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
- 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */, 1 /* | */,
- 0 /* } */, 1 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
- 0 /* 0xff */,
-};
-
-static ssize_t sf_parse_token(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- const uint8_t *p = begin;
-
- if ((*p < 'A' || 'Z' < *p) && (*p < 'a' || 'z' < *p) && *p != '*') {
- return -1;
- }
-
- for (; p != end && SF_TOKEN_CHARS*p; ++p)
- ;
-
- if (dest) {
- dest->type = NGHTTP2_SF_VALUE_TYPE_TOKEN;
- dest->s.base = begin;
- dest->s.len = (size_t)(p - begin);
- }
-
- return p - begin;
-}
-
-/* Generated by genchartbl.py */
-static const int SF_BYTESEQ_CHARS = {
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
- 0 /* RS */, 0 /* US */, 0 /* SPC */, 0 /* ! */, 0 /* " */,
- 0 /* # */, 0 /* $ */, 0 /* % */, 0 /* & */, 0 /* ' */,
- 0 /* ( */, 0 /* ) */, 0 /* * */, 1 /* + */, 0 /* , */,
- 0 /* - */, 0 /* . */, 1 /* / */, 1 /* 0 */, 1 /* 1 */,
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 0 /* : */, 0 /* ; */,
- 0 /* < */, 1 /* = */, 0 /* > */, 0 /* ? */, 0 /* @ */,
- 1 /* A */, 1 /* B */, 1 /* C */, 1 /* D */, 1 /* E */,
- 1 /* F */, 1 /* G */, 1 /* H */, 1 /* I */, 1 /* J */,
- 1 /* K */, 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
- 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */, 1 /* T */,
- 1 /* U */, 1 /* V */, 1 /* W */, 1 /* X */, 1 /* Y */,
- 1 /* Z */, 0 /* */, 0 /* \ */, 0 /* */, 0 /* ^ */,
- 0 /* _ */, 0 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
- 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */, 0 /* | */,
- 0 /* } */, 0 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
- 0 /* 0xff */,
-};
-
-static ssize_t sf_parse_byteseq(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- const uint8_t *p = begin;
-
- if (*p++ != ':') {
- return -1;
- }
-
- for (; p != end; ++p) {
- switch (*p) {
- case ':':
- if (dest) {
- dest->type = NGHTTP2_SF_VALUE_TYPE_BYTESEQ;
- dest->s.base = begin + 1;
- dest->s.len = (size_t)(p - dest->s.base);
- }
-
- ++p;
-
- return p - begin;
- default:
- if (!SF_BYTESEQ_CHARS*p) {
- return -1;
- }
- }
- }
-
- return -1;
-}
-
-static ssize_t sf_parse_boolean(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- const uint8_t *p = begin;
- int b;
-
- if (*p++ != '?') {
- return -1;
- }
-
- if (p == end) {
- return -1;
- }
-
- switch (*p++) {
- case '0':
- b = 0;
- break;
- case '1':
- b = 1;
- break;
- default:
- return -1;
- }
-
- if (dest) {
- dest->type = NGHTTP2_SF_VALUE_TYPE_BOOLEAN;
- dest->b = b;
- }
-
- return p - begin;
-}
-
-static ssize_t sf_parse_bare_item(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- switch (*begin) {
- case '-':
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- return sf_parse_integer_or_decimal(dest, begin, end);
- case '"':
- return sf_parse_string(dest, begin, end);
- case '*':
- return sf_parse_token(dest, begin, end);
- case ':':
- return sf_parse_byteseq(dest, begin, end);
- case '?':
- return sf_parse_boolean(dest, begin, end);
- default:
- if (('A' <= *begin && *begin <= 'Z') || ('a' <= *begin && *begin <= 'z')) {
- return sf_parse_token(dest, begin, end);
- }
- return -1;
- }
-}
-
-#define sf_discard_sp_end_err(BEGIN, END, ERR) \
- for (;; ++(BEGIN)) { \
- if ((BEGIN) == (END)) { \
- return (ERR); \
- } \
- if (*(BEGIN) != ' ') { \
- break; \
- } \
- }
-
-static ssize_t sf_parse_params(const uint8_t *begin, const uint8_t *end) {
- const uint8_t *p = begin;
- ssize_t slen;
-
- for (; p != end && *p == ';';) {
- ++p;
-
- sf_discard_sp_end_err(p, end, -1);
-
- slen = sf_parse_key(p, end);
- if (slen < 0) {
- return -1;
- }
-
- p += slen;
-
- if (p == end || *p != '=') {
- /* Boolean true */
- } else if (++p == end) {
- return -1;
- } else {
- slen = sf_parse_bare_item(NULL, p, end);
- if (slen < 0) {
- return -1;
- }
-
- p += slen;
- }
- }
-
- return p - begin;
-}
-
-static ssize_t sf_parse_item(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- const uint8_t *p = begin;
- ssize_t slen;
-
- slen = sf_parse_bare_item(dest, p, end);
- if (slen < 0) {
- return -1;
- }
-
- p += slen;
-
- slen = sf_parse_params(p, end);
- if (slen < 0) {
- return -1;
- }
-
- p += slen;
-
- return p - begin;
-}
-
-ssize_t nghttp2_sf_parse_item(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- return sf_parse_item(dest, begin, end);
-}
-
-static ssize_t sf_parse_inner_list(nghttp2_sf_value *dest, const uint8_t *begin,
- const uint8_t *end) {
- const uint8_t *p = begin;
- ssize_t slen;
-
- if (*p++ != '(') {
- return -1;
- }
-
- for (;;) {
- sf_discard_sp_end_err(p, end, -1);
-
- if (*p == ')') {
- ++p;
-
- slen = sf_parse_params(p, end);
- if (slen < 0) {
- return -1;
- }
-
- p += slen;
-
- if (dest) {
- dest->type = NGHTTP2_SF_VALUE_TYPE_INNER_LIST;
- }
-
- return p - begin;
- }
-
- slen = sf_parse_item(NULL, p, end);
- if (slen < 0) {
- return -1;
- }
-
- p += slen;
-
- if (p == end || (*p != ' ' && *p != ')')) {
- return -1;
- }
- }
-}
-
-ssize_t nghttp2_sf_parse_inner_list(nghttp2_sf_value *dest,
- const uint8_t *begin, const uint8_t *end) {
- return sf_parse_inner_list(dest, begin, end);
-}
-
-static ssize_t sf_parse_item_or_inner_list(nghttp2_sf_value *dest,
- const uint8_t *begin,
- const uint8_t *end) {
- if (*begin == '(') {
- return sf_parse_inner_list(dest, begin, end);
- }
-
- return sf_parse_item(dest, begin, end);
-}
-
-#define sf_discard_ows(BEGIN, END) \
- for (;; ++(BEGIN)) { \
- if ((BEGIN) == (END)) { \
- goto fin; \
- } \
- if (*(BEGIN) != ' ' && *(BEGIN) != '\t') { \
- break; \
- } \
- }
-
-#define sf_discard_ows_end_err(BEGIN, END, ERR) \
- for (;; ++(BEGIN)) { \
- if ((BEGIN) == (END)) { \
- return (ERR); \
- } \
- if (*(BEGIN) != ' ' && *(BEGIN) != '\t') { \
- break; \
- } \
- }
-
 int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,
 size_t valuelen) {
- const uint8_t *p = value, *end = value + valuelen;
- ssize_t slen;
- nghttp2_sf_value val;
 nghttp2_extpri pri = *dest;
- const uint8_t *key;
- size_t keylen;
+ sf_parser sfp;
+ sf_vec key;
+ sf_value val;
+ int rv;
+
+ sf_parser_init(&sfp, value, valuelen);
 
- for (; p != end && *p == ' '; ++p)
- ;
+ for (;;) {
+ rv = sf_parser_dict(&sfp, &key, &val);
+ if (rv != 0) {
+ if (rv == SF_ERR_EOF) {
+ break;
+ }
 
- for (; p != end;) {
- slen = sf_parse_key(p, end);
- if (slen < 0) {
 return NGHTTP2_ERR_INVALID_ARGUMENT;
 }
 
- key = p;
- keylen = (size_t)slen;
-
- p += slen;
-
- if (p == end || *p != '=') {
- /* Boolean true */
- val.type = NGHTTP2_SF_VALUE_TYPE_BOOLEAN;
- val.b = 1;
+ if (key.len != 1) {
+ continue;
+ }
 
- slen = sf_parse_params(p, end);
- if (slen < 0) {
+ switch (key.base0) {
+ case 'i':
+ if (val.type != SF_TYPE_BOOLEAN) {
 return NGHTTP2_ERR_INVALID_ARGUMENT;
 }
- } else if (++p == end) {
- return NGHTTP2_ERR_INVALID_ARGUMENT;
- } else {
- slen = sf_parse_item_or_inner_list(&val, p, end);
- if (slen < 0) {
- return NGHTTP2_ERR_INVALID_ARGUMENT;
- }
- }
-
- p += slen;
 
- if (keylen == 1) {
- switch (key0) {
- case 'i':
- if (val.type != NGHTTP2_SF_VALUE_TYPE_BOOLEAN) {
- return NGHTTP2_ERR_INVALID_ARGUMENT;
- }
-
- pri.inc = val.b;
+ pri.inc = val.boolean;
 
- break;
- case 'u':
- if (val.type != NGHTTP2_SF_VALUE_TYPE_INTEGER ||
- val.i < NGHTTP2_EXTPRI_URGENCY_HIGH ||
- NGHTTP2_EXTPRI_URGENCY_LOW < val.i) {
- return NGHTTP2_ERR_INVALID_ARGUMENT;
- }
-
- pri.urgency = (uint32_t)val.i;
-
- break;
+ break;
+ case 'u':
+ if (val.type != SF_TYPE_INTEGER ||
+ val.integer < NGHTTP2_EXTPRI_URGENCY_HIGH ||
+ NGHTTP2_EXTPRI_URGENCY_LOW < val.integer) {
+ return NGHTTP2_ERR_INVALID_ARGUMENT;
 }
- }
 
- sf_discard_ows(p, end);
+ pri.urgency = (uint32_t)val.integer;
 
- if (*p++ != ',') {
- return NGHTTP2_ERR_INVALID_ARGUMENT;
+ break;
 }
-
- sf_discard_ows_end_err(p, end, NGHTTP2_ERR_INVALID_ARGUMENT);
 }
 
-fin:
 *dest = pri;
 
 return 0;

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_http.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/nghttp2_http.h Changed

@@ -94,54 +94,6 @@
 void nghttp2_http_record_request_method(nghttp2_stream *stream,
                                         nghttp2_frame *frame);
 
-/*
- * RFC 8941 Structured Field Values.
- */
-typedef enum nghttp2_sf_value_type {
-  NGHTTP2_SF_VALUE_TYPE_BOOLEAN,
-  NGHTTP2_SF_VALUE_TYPE_INTEGER,
-  NGHTTP2_SF_VALUE_TYPE_DECIMAL,
-  NGHTTP2_SF_VALUE_TYPE_STRING,
-  NGHTTP2_SF_VALUE_TYPE_TOKEN,
-  NGHTTP2_SF_VALUE_TYPE_BYTESEQ,
-  NGHTTP2_SF_VALUE_TYPE_INNER_LIST,
-} nghttp2_sf_value_type;
-
-/*
- * nghttp2_sf_value stores Structured Field Values item.  For Inner
- * List, only type is set to NGHTTP2_SF_VALUE_TYPE_INNER_LIST.
- */
-typedef struct nghttp2_sf_value {
-  uint8_t type;
-  union {
-    int b;
-    int64_t i;
-    double d;
-    struct {
-      const uint8_t *base;
-      size_t len;
-    } s;
-  };
-} nghttp2_sf_value;
-
-/*
- * nghttp2_sf_parse_item parses the input sequence |begin|, |end|)
- * and stores the parsed an Item in |dest|.  It returns the number of
- * bytes consumed if it succeeds, or -1.  This function is declared
- * here for unit tests.
- */
-ssize_t nghttp2_sf_parse_item(nghttp2_sf_value *dest, const uint8_t *begin,
-                              const uint8_t *end);
-
-/*
- * nghttp2_sf_parse_inner_list parses the input sequence |begin|, |end|)
- * and stores the parsed an Inner List in |dest|.  It returns the number of
- * bytes consumed if it succeeds, or -1.  This function is declared
- * here for unit tests.
- */
-ssize_t nghttp2_sf_parse_inner_list(nghttp2_sf_value *dest,
-                                    const uint8_t *begin, const uint8_t *end);
-
 int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,
                                 size_t valuelen);

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_map.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/nghttp2_map.c Changed

@@ -31,21 +31,14 @@
 
 #include "nghttp2_helper.h"
 
-#define NGHTTP2_INITIAL_TABLE_LENBITS 8
+#define NGHTTP2_INITIAL_TABLE_LENBITS 4
 
-int nghttp2_map_init(nghttp2_map *map, nghttp2_mem *mem) {
+void nghttp2_map_init(nghttp2_map *map, nghttp2_mem *mem) {
 map->mem = mem;
- map->tablelen = 1 << NGHTTP2_INITIAL_TABLE_LENBITS;
- map->tablelenbits = NGHTTP2_INITIAL_TABLE_LENBITS;
- map->table =
- nghttp2_mem_calloc(mem, map->tablelen, sizeof(nghttp2_map_bucket));
- if (map->table == NULL) {
- return NGHTTP2_ERR_NOMEM;
- }
-
+ map->tablelen = 0;
+ map->tablelenbits = 0;
+ map->table = NULL;
 map->size = 0;
-
- return 0;
 }
 
 void nghttp2_map_free(nghttp2_map *map) {
@@ -78,6 +71,10 @@
 uint32_t i;
 nghttp2_map_bucket *bkt;
 
+ if (map->size == 0) {
+ return 0;
+ }
+
 for (i = 0; i < map->tablelen; ++i) {
 bkt = &map->tablei;
 
@@ -223,9 +220,17 @@
 
 /* Load factor is 0.75 */
 if ((map->size + 1) * 4 > map->tablelen * 3) {
- rv = map_resize(map, map->tablelen * 2, map->tablelenbits + 1);
- if (rv != 0) {
- return rv;
+ if (map->tablelen) {
+ rv = map_resize(map, map->tablelen * 2, map->tablelenbits + 1);
+ if (rv != 0) {
+ return rv;
+ }
+ } else {
+ rv = map_resize(map, 1 << NGHTTP2_INITIAL_TABLE_LENBITS,
+ NGHTTP2_INITIAL_TABLE_LENBITS);
+ if (rv != 0) {
+ return rv;
+ }
 }
 }
 
@@ -239,11 +244,18 @@
 }
 
 void *nghttp2_map_find(nghttp2_map *map, nghttp2_map_key_type key) {
- uint32_t h = hash(key);
- size_t idx = h2idx(h, map->tablelenbits);
+ uint32_t h;
+ size_t idx;
 nghttp2_map_bucket *bkt;
 size_t d = 0;
 
+ if (map->size == 0) {
+ return NULL;
+ }
+
+ h = hash(key);
+ idx = h2idx(h, map->tablelenbits);
+
 for (;;) {
 bkt = &map->tableidx;
 
@@ -262,11 +274,18 @@
 }
 
 int nghttp2_map_remove(nghttp2_map *map, nghttp2_map_key_type key) {
- uint32_t h = hash(key);
- size_t idx = h2idx(h, map->tablelenbits), didx;
+ uint32_t h;
+ size_t idx, didx;
 nghttp2_map_bucket *bkt;
 size_t d = 0;
 
+ if (map->size == 0) {
+ return NGHTTP2_ERR_INVALID_ARGUMENT;
+ }
+
+ h = hash(key);
+ idx = h2idx(h, map->tablelenbits);
+
 for (;;) {
 bkt = &map->tableidx;
 
@@ -306,6 +325,10 @@
 }
 
 void nghttp2_map_clear(nghttp2_map *map) {
+ if (map->tablelen == 0) {
+ return;
+ }
+
 memset(map->table, 0, sizeof(*map->table) * map->tablelen);
 map->size = 0;
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_map.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/nghttp2_map.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_session.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/lib/nghttp2_session.c Changed

@@ -584,10 +584,6 @@
 if (rv != 0) {
 goto fail_hd_inflater;
 }
- rv = nghttp2_map_init(&(*session_ptr)->streams, mem);
- if (rv != 0) {
- goto fail_map;
- }
 
 nbuffer = ((*session_ptr)->max_send_header_block_length +
 NGHTTP2_FRAMEBUF_CHUNKLEN - 1) /
@@ -605,6 +601,8 @@
 goto fail_aob_framebuf;
 }
 
+ nghttp2_map_init(&(*session_ptr)->streams, mem);
+
 active_outbound_item_reset(&(*session_ptr)->aob, mem);
 
 (*session_ptr)->callbacks = *callbacks;
@@ -637,8 +635,6 @@
 return 0;
 
 fail_aob_framebuf:
- nghttp2_map_free(&(*session_ptr)->streams);
-fail_map:
 nghttp2_hd_inflate_free(&(*session_ptr)->hd_inflater);
 fail_hd_inflater:
 nghttp2_hd_deflate_free(&(*session_ptr)->hd_deflater);
@@ -3300,6 +3296,7 @@
 if (rv < 0) {
 int32_t opened_stream_id = 0;
 uint32_t error_code = NGHTTP2_INTERNAL_ERROR;
+ int rv2 = 0;
 
 DEBUGF("send: frame preparation failed with %s\n",
 nghttp2_strerror(rv));
@@ -3342,19 +3339,18 @@
 }
 if (opened_stream_id) {
 /* careful not to override rv */
- int rv2;
 rv2 = nghttp2_session_close_stream(session, opened_stream_id,
 error_code);
-
- if (nghttp2_is_fatal(rv2)) {
- return rv2;
- }
 }
 
 nghttp2_outbound_item_free(item, mem);
 nghttp2_mem_free(mem, item);
 active_outbound_item_reset(aob, mem);
 
+ if (nghttp2_is_fatal(rv2)) {
+ return rv2;
+ }
+
 if (rv == NGHTTP2_ERR_HEADER_COMP) {
 /* If header compression error occurred, should terminiate
 connection. */
@@ -5931,7 +5927,7 @@
 in += readlen;
 
 if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 if (iframe->sbuf.pos3 != NGHTTP2_SETTINGS ||
@@ -5968,7 +5964,7 @@
 in += readlen;
 
 if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 nghttp2_frame_unpack_frame_hd(&iframe->frame.hd, iframe->sbuf.pos);
@@ -6468,7 +6464,7 @@
 iframe->payloadleft, nghttp2_buf_mark_avail(&iframe->sbuf));
 
 if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 switch (iframe->frame.hd.type) {
@@ -6772,7 +6768,7 @@
 in += hd_proclen;
 iframe->payloadleft -= hd_proclen;
 
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
@@ -6963,7 +6959,7 @@
 in += readlen;
 
 if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 nghttp2_frame_unpack_frame_hd(&cont_hd, iframe->sbuf.pos);
@@ -7021,7 +7017,7 @@
 iframe->payloadleft, nghttp2_buf_mark_avail(&iframe->sbuf));
 
 if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 /* Pad Length field is subject to flow control */
@@ -7171,7 +7167,7 @@
 session, iframe->frame.hd.flags, iframe->frame.hd.stream_id,
 in - readlen, (size_t)data_readlen, session->user_data);
 if (rv == NGHTTP2_ERR_PAUSE) {
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 if (nghttp2_is_fatal(rv)) {
@@ -7351,7 +7347,7 @@
 
 assert(in == last);
 
- return in - first;
+ return (ssize_t)(in - first);
 }
 
 int nghttp2_session_recv(nghttp2_session *session) {

_service:tar_scm:nghttp2-1.55.1.tar.xz/lib/sfparse.c Added

@@ -0,0 +1,1146 @@
+/*
+ * sfparse
+ *
+ * Copyright (c) 2023 sfparse contributors
+ * Copyright (c) 2019 nghttp3 contributors
+ * Copyright (c) 2015 nghttp2 contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "sfparse.h"
+
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+
+#define SF_STATE_DICT 0x08u
+#define SF_STATE_LIST 0x10u
+#define SF_STATE_ITEM 0x18u
+
+#define SF_STATE_INNER_LIST 0x04u
+
+#define SF_STATE_BEFORE 0x00u
+#define SF_STATE_BEFORE_PARAMS 0x01u
+#define SF_STATE_PARAMS 0x02u
+#define SF_STATE_AFTER 0x03u
+
+#define SF_STATE_OP_MASK 0x03u
+
+#define SF_SET_STATE_AFTER(NAME) (SF_STATE_##NAME | SF_STATE_AFTER)
+#define SF_SET_STATE_BEFORE_PARAMS(NAME) \
+ (SF_STATE_##NAME | SF_STATE_BEFORE_PARAMS)
+#define SF_SET_STATE_INNER_LIST_BEFORE(NAME) \
+ (SF_STATE_##NAME | SF_STATE_INNER_LIST | SF_STATE_BEFORE)
+
+#define SF_STATE_DICT_AFTER SF_SET_STATE_AFTER(DICT)
+#define SF_STATE_DICT_BEFORE_PARAMS SF_SET_STATE_BEFORE_PARAMS(DICT)
+#define SF_STATE_DICT_INNER_LIST_BEFORE SF_SET_STATE_INNER_LIST_BEFORE(DICT)
+
+#define SF_STATE_LIST_AFTER SF_SET_STATE_AFTER(LIST)
+#define SF_STATE_LIST_BEFORE_PARAMS SF_SET_STATE_BEFORE_PARAMS(LIST)
+#define SF_STATE_LIST_INNER_LIST_BEFORE SF_SET_STATE_INNER_LIST_BEFORE(LIST)
+
+#define SF_STATE_ITEM_AFTER SF_SET_STATE_AFTER(ITEM)
+#define SF_STATE_ITEM_BEFORE_PARAMS SF_SET_STATE_BEFORE_PARAMS(ITEM)
+#define SF_STATE_ITEM_INNER_LIST_BEFORE SF_SET_STATE_INNER_LIST_BEFORE(ITEM)
+
+#define SF_STATE_INITIAL 0x00u
+
+#define DIGIT_CASES \
+ case '0': \
+ case '1': \
+ case '2': \
+ case '3': \
+ case '4': \
+ case '5': \
+ case '6': \
+ case '7': \
+ case '8': \
+ case '9'
+
+#define LCALPHA_CASES \
+ case 'a': \
+ case 'b': \
+ case 'c': \
+ case 'd': \
+ case 'e': \
+ case 'f': \
+ case 'g': \
+ case 'h': \
+ case 'i': \
+ case 'j': \
+ case 'k': \
+ case 'l': \
+ case 'm': \
+ case 'n': \
+ case 'o': \
+ case 'p': \
+ case 'q': \
+ case 'r': \
+ case 's': \
+ case 't': \
+ case 'u': \
+ case 'v': \
+ case 'w': \
+ case 'x': \
+ case 'y': \
+ case 'z'
+
+#define UCALPHA_CASES \
+ case 'A': \
+ case 'B': \
+ case 'C': \
+ case 'D': \
+ case 'E': \
+ case 'F': \
+ case 'G': \
+ case 'H': \
+ case 'I': \
+ case 'J': \
+ case 'K': \
+ case 'L': \
+ case 'M': \
+ case 'N': \
+ case 'O': \
+ case 'P': \
+ case 'Q': \
+ case 'R': \
+ case 'S': \
+ case 'T': \
+ case 'U': \
+ case 'V': \
+ case 'W': \
+ case 'X': \
+ case 'Y': \
+ case 'Z'
+
+#define ALPHA_CASES \
+ UCALPHA_CASES: \
+ LCALPHA_CASES
+
+#define X20_21_CASES \
+ case ' ': \
+ case '!'
+
+#define X23_5B_CASES \
+ case '#': \
+ case '$': \
+ case '%': \
+ case '&': \
+ case '\'': \
+ case '(': \
+ case ')': \
+ case '*': \
+ case '+': \
+ case ',': \
+ case '-': \
+ case '.': \
+ case '/': \
+ DIGIT_CASES: \
+ case ':': \
+ case ';': \
+ case '<': \
+ case '=': \
+ case '>': \
+ case '?': \
+ case '@': \
+ UCALPHA_CASES: \
+ case ''
+
+#define X5D_7E_CASES \
+ case '': \
+ case '^': \
+ case '_': \
+ case '`': \
+ LCALPHA_CASES: \
+ case '{': \
+ case '|': \
+ case '}': \
+ case '~'
+
+static int is_ws(uint8_t c) {
+ switch (c) {
+ case ' ':
+ case '\t':
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static int parser_eof(sf_parser *sfp) { return sfp->pos == sfp->end; }
+
+static void parser_discard_ows(sf_parser *sfp) {
+ for (; !parser_eof(sfp) && is_ws(*sfp->pos); ++sfp->pos)
+ ;
+}
+
+static void parser_discard_sp(sf_parser *sfp) {
+ for (; !parser_eof(sfp) && *sfp->pos == ' '; ++sfp->pos)
+ ;
+}
+
+static void parser_set_op_state(sf_parser *sfp, uint32_t op) {
+ sfp->state &= ~SF_STATE_OP_MASK;
+ sfp->state |= op;
+}
+
+static void parser_unset_inner_list_state(sf_parser *sfp) {
+ sfp->state &= ~SF_STATE_INNER_LIST;
+}
+
+static int parser_key(sf_parser *sfp, sf_vec *dest) {
+ const uint8_t *base;
+
+ switch (*sfp->pos) {
+ case '*':
+ LCALPHA_CASES:
+ break;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ base = sfp->pos++;
+
+ for (; !parser_eof(sfp); ++sfp->pos) {
+ switch (*sfp->pos) {
+ case '_':
+ case '-':
+ case '.':
+ case '*':
+ DIGIT_CASES:
+ LCALPHA_CASES:
+ continue;
+ }
+
+ break;
+ }
+
+ if (dest) {
+ dest->base = (uint8_t *)base;
+ dest->len = (size_t)(sfp->pos - dest->base);
+ }
+
+ return 0;
+}
+
+static int parser_number(sf_parser *sfp, sf_value *dest) {
+ int sign = 1;
+ int64_t value = 0;
+ size_t len = 0;
+ size_t fpos = 0;
+
+ if (*sfp->pos == '-') {
+ ++sfp->pos;
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ sign = -1;
+ }
+
+ assert(!parser_eof(sfp));
+
+ for (; !parser_eof(sfp); ++sfp->pos) {
+ switch (*sfp->pos) {
+ DIGIT_CASES:
+ if (++len > 15) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ value *= 10;
+ value += *sfp->pos - '0';
+
+ continue;
+ }
+
+ break;
+ }
+
+ if (len == 0) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ if (parser_eof(sfp) || *sfp->pos != '.') {
+ if (dest) {
+ dest->type = SF_TYPE_INTEGER;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ dest->integer = value * sign;
+ }
+
+ return 0;
+ }
+
+ /* decimal */
+
+ if (len > 12) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ fpos = len;
+
+ ++sfp->pos;
+
+ for (; !parser_eof(sfp); ++sfp->pos) {
+ switch (*sfp->pos) {
+ DIGIT_CASES:
+ if (++len > 15) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ value *= 10;
+ value += *sfp->pos - '0';
+
+ continue;
+ }
+
+ break;
+ }
+
+ if (fpos == len || len - fpos > 3) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ if (dest) {
+ dest->type = SF_TYPE_DECIMAL;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ dest->decimal.numer = value * sign;
+
+ switch (len - fpos) {
+ case 1:
+ dest->decimal.denom = 10;
+
+ break;
+ case 2:
+ dest->decimal.denom = 100;
+
+ break;
+ case 3:
+ dest->decimal.denom = 1000;
+
+ break;
+ }
+ }
+
+ return 0;
+}
+
+static int parser_date(sf_parser *sfp, sf_value *dest) {
+ int rv;
+ sf_value val;
+
+ /* The first byte has already been validated by the caller. */
+ assert('@' == *sfp->pos);
+
+ ++sfp->pos;
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ rv = parser_number(sfp, &val);
+ if (rv != 0) {
+ return rv;
+ }
+
+ if (val.type != SF_TYPE_INTEGER) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ if (dest) {
+ *dest = val;
+ dest->type = SF_TYPE_DATE;
+ }
+
+ return 0;
+}
+
+static int parser_string(sf_parser *sfp, sf_value *dest) {
+ const uint8_t *base;
+ uint32_t flags = SF_VALUE_FLAG_NONE;
+
+ /* The first byte has already been validated by the caller. */
+ assert('"' == *sfp->pos);
+
+ base = ++sfp->pos;
+
+ for (; !parser_eof(sfp); ++sfp->pos) {
+ switch (*sfp->pos) {
+ X20_21_CASES:
+ X23_5B_CASES:
+ X5D_7E_CASES:
+ break;
+ case '\\':
+ ++sfp->pos;
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ switch (*sfp->pos) {
+ case '"':
+ case '\\':
+ flags = SF_VALUE_FLAG_ESCAPED_STRING;
+
+ break;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ break;
+ case '"':
+ if (dest) {
+ dest->type = SF_TYPE_STRING;
+ dest->flags = flags;
+ dest->vec.len = (size_t)(sfp->pos - base);
+ dest->vec.base = dest->vec.len == 0 ? NULL : (uint8_t *)base;
+ }
+
+ ++sfp->pos;
+
+ return 0;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+ }
+
+ return SF_ERR_PARSE_ERROR;
+}
+
+static int parser_token(sf_parser *sfp, sf_value *dest) {
+ const uint8_t *base;
+
+ /* The first byte has already been validated by the caller. */
+ base = sfp->pos++;
+
+ for (; !parser_eof(sfp); ++sfp->pos) {
+ switch (*sfp->pos) {
+ case '!':
+ case '#':
+ case '$':
+ case '%':
+ case '&':
+ case '\'':
+ case '*':
+ case '+':
+ case '-':
+ case '.':
+ case '^':
+ case '_':
+ case '`':
+ case '|':
+ case '~':
+ case ':':
+ case '/':
+ DIGIT_CASES:
+ ALPHA_CASES:
+ continue;
+ }
+
+ break;
+ }
+
+ if (dest) {
+ dest->type = SF_TYPE_TOKEN;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ dest->vec.base = (uint8_t *)base;
+ dest->vec.len = (size_t)(sfp->pos - base);
+ }
+
+ return 0;
+}
+
+static int parser_byteseq(sf_parser *sfp, sf_value *dest) {
+ const uint8_t *base;
+
+ /* The first byte has already been validated by the caller. */
+ assert(':' == *sfp->pos);
+
+ base = ++sfp->pos;
+
+ for (; !parser_eof(sfp); ++sfp->pos) {
+ switch (*sfp->pos) {
+ case '+':
+ case '/':
+ DIGIT_CASES:
+ ALPHA_CASES:
+ continue;
+ case '=':
+ switch ((sfp->pos - base) & 0x3) {
+ case 0:
+ case 1:
+ return SF_ERR_PARSE_ERROR;
+ case 2:
+ switch (*(sfp->pos - 1)) {
+ case 'A':
+ case 'Q':
+ case 'g':
+ case 'w':
+ break;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ ++sfp->pos;
+
+ if (parser_eof(sfp) || *sfp->pos != '=') {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ break;
+ case 3:
+ switch (*(sfp->pos - 1)) {
+ case 'A':
+ case 'E':
+ case 'I':
+ case 'M':
+ case 'Q':
+ case 'U':
+ case 'Y':
+ case 'c':
+ case 'g':
+ case 'k':
+ case 'o':
+ case 's':
+ case 'w':
+ case '0':
+ case '4':
+ case '8':
+ break;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ break;
+ }
+
+ ++sfp->pos;
+
+ if (parser_eof(sfp) || *sfp->pos != ':') {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ goto fin;
+ case ':':
+ if ((sfp->pos - base) & 0x3) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ goto fin;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+ }
+
+ return SF_ERR_PARSE_ERROR;
+
+fin:
+ if (dest) {
+ dest->type = SF_TYPE_BYTESEQ;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ dest->vec.len = (size_t)(sfp->pos - base);
+ dest->vec.base = dest->vec.len == 0 ? NULL : (uint8_t *)base;
+ }
+
+ ++sfp->pos;
+
+ return 0;
+}
+
+static int parser_boolean(sf_parser *sfp, sf_value *dest) {
+ int b;
+
+ /* The first byte has already been validated by the caller. */
+ assert('?' == *sfp->pos);
+
+ ++sfp->pos;
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ switch (*sfp->pos) {
+ case '0':
+ b = 0;
+
+ break;
+ case '1':
+ b = 1;
+
+ break;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ ++sfp->pos;
+
+ if (dest) {
+ dest->type = SF_TYPE_BOOLEAN;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ dest->boolean = b;
+ }
+
+ return 0;
+}
+
+static int parser_bare_item(sf_parser *sfp, sf_value *dest) {
+ switch (*sfp->pos) {
+ case '"':
+ return parser_string(sfp, dest);
+ case '-':
+ DIGIT_CASES:
+ return parser_number(sfp, dest);
+ case '@':
+ return parser_date(sfp, dest);
+ case ':':
+ return parser_byteseq(sfp, dest);
+ case '?':
+ return parser_boolean(sfp, dest);
+ case '*':
+ ALPHA_CASES:
+ return parser_token(sfp, dest);
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+}
+
+static int parser_skip_inner_list(sf_parser *sfp);
+
+int sf_parser_param(sf_parser *sfp, sf_vec *dest_key, sf_value *dest_value) {
+ int rv;
+
+ switch (sfp->state & SF_STATE_OP_MASK) {
+ case SF_STATE_BEFORE:
+ rv = parser_skip_inner_list(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* fall through */
+ case SF_STATE_BEFORE_PARAMS:
+ parser_set_op_state(sfp, SF_STATE_PARAMS);
+
+ break;
+ case SF_STATE_PARAMS:
+ break;
+ default:
+ assert(0);
+ abort();
+ }
+
+ if (parser_eof(sfp) || *sfp->pos != ';') {
+ parser_set_op_state(sfp, SF_STATE_AFTER);
+
+ return SF_ERR_EOF;
+ }
+
+ ++sfp->pos;
+
+ parser_discard_sp(sfp);
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ rv = parser_key(sfp, dest_key);
+ if (rv != 0) {
+ return rv;
+ }
+
+ if (parser_eof(sfp) || *sfp->pos != '=') {
+ if (dest_value) {
+ dest_value->type = SF_TYPE_BOOLEAN;
+ dest_value->flags = SF_VALUE_FLAG_NONE;
+ dest_value->boolean = 1;
+ }
+
+ return 0;
+ }
+
+ ++sfp->pos;
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ return parser_bare_item(sfp, dest_value);
+}
+
+static int parser_skip_params(sf_parser *sfp) {
+ int rv;
+
+ for (;;) {
+ rv = sf_parser_param(sfp, NULL, NULL);
+ switch (rv) {
+ case 0:
+ break;
+ case SF_ERR_EOF:
+ return 0;
+ case SF_ERR_PARSE_ERROR:
+ return rv;
+ default:
+ assert(0);
+ abort();
+ }
+ }
+}
+
+int sf_parser_inner_list(sf_parser *sfp, sf_value *dest) {
+ int rv;
+
+ switch (sfp->state & SF_STATE_OP_MASK) {
+ case SF_STATE_BEFORE:
+ parser_discard_sp(sfp);
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ break;
+ case SF_STATE_BEFORE_PARAMS:
+ rv = parser_skip_params(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* Technically, we are entering SF_STATE_AFTER, but we will set
+ another state without reading the state. */
+ /* parser_set_op_state(sfp, SF_STATE_AFTER); */
+
+ /* fall through */
+ case SF_STATE_AFTER:
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ switch (*sfp->pos) {
+ case ' ':
+ parser_discard_sp(sfp);
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ break;
+ case ')':
+ break;
+ default:
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ break;
+ default:
+ assert(0);
+ abort();
+ }
+
+ if (*sfp->pos == ')') {
+ ++sfp->pos;
+
+ parser_unset_inner_list_state(sfp);
+ parser_set_op_state(sfp, SF_STATE_BEFORE_PARAMS);
+
+ return SF_ERR_EOF;
+ }
+
+ rv = parser_bare_item(sfp, dest);
+ if (rv != 0) {
+ return rv;
+ }
+
+ parser_set_op_state(sfp, SF_STATE_BEFORE_PARAMS);
+
+ return 0;
+}
+
+static int parser_skip_inner_list(sf_parser *sfp) {
+ int rv;
+
+ for (;;) {
+ rv = sf_parser_inner_list(sfp, NULL);
+ switch (rv) {
+ case 0:
+ break;
+ case SF_ERR_EOF:
+ return 0;
+ case SF_ERR_PARSE_ERROR:
+ return rv;
+ default:
+ assert(0);
+ abort();
+ }
+ }
+}
+
+static int parser_next_key_or_item(sf_parser *sfp) {
+ parser_discard_ows(sfp);
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_EOF;
+ }
+
+ if (*sfp->pos != ',') {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ ++sfp->pos;
+
+ parser_discard_ows(sfp);
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ return 0;
+}
+
+static int parser_dict_value(sf_parser *sfp, sf_value *dest) {
+ int rv;
+
+ if (parser_eof(sfp) || *(sfp->pos) != '=') {
+ /* Boolean true */
+ if (dest) {
+ dest->type = SF_TYPE_BOOLEAN;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ dest->boolean = 1;
+ }
+
+ sfp->state = SF_STATE_DICT_BEFORE_PARAMS;
+
+ return 0;
+ }
+
+ ++sfp->pos;
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ if (*sfp->pos == '(') {
+ if (dest) {
+ dest->type = SF_TYPE_INNER_LIST;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ }
+
+ ++sfp->pos;
+
+ sfp->state = SF_STATE_DICT_INNER_LIST_BEFORE;
+
+ return 0;
+ }
+
+ rv = parser_bare_item(sfp, dest);
+ if (rv != 0) {
+ return rv;
+ }
+
+ sfp->state = SF_STATE_DICT_BEFORE_PARAMS;
+
+ return 0;
+}
+
+int sf_parser_dict(sf_parser *sfp, sf_vec *dest_key, sf_value *dest_value) {
+ int rv;
+
+ switch (sfp->state) {
+ case SF_STATE_DICT_INNER_LIST_BEFORE:
+ rv = parser_skip_inner_list(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* fall through */
+ case SF_STATE_DICT_BEFORE_PARAMS:
+ rv = parser_skip_params(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* fall through */
+ case SF_STATE_DICT_AFTER:
+ rv = parser_next_key_or_item(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ break;
+ case SF_STATE_INITIAL:
+ parser_discard_sp(sfp);
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_EOF;
+ }
+
+ break;
+ default:
+ assert(0);
+ abort();
+ }
+
+ rv = parser_key(sfp, dest_key);
+ if (rv != 0) {
+ return rv;
+ }
+
+ return parser_dict_value(sfp, dest_value);
+}
+
+int sf_parser_list(sf_parser *sfp, sf_value *dest) {
+ int rv;
+
+ switch (sfp->state) {
+ case SF_STATE_LIST_INNER_LIST_BEFORE:
+ rv = parser_skip_inner_list(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* fall through */
+ case SF_STATE_LIST_BEFORE_PARAMS:
+ rv = parser_skip_params(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* fall through */
+ case SF_STATE_LIST_AFTER:
+ rv = parser_next_key_or_item(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ break;
+ case SF_STATE_INITIAL:
+ parser_discard_sp(sfp);
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_EOF;
+ }
+
+ break;
+ default:
+ assert(0);
+ abort();
+ }
+
+ if (*sfp->pos == '(') {
+ if (dest) {
+ dest->type = SF_TYPE_INNER_LIST;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ }
+
+ ++sfp->pos;
+
+ sfp->state = SF_STATE_LIST_INNER_LIST_BEFORE;
+
+ return 0;
+ }
+
+ rv = parser_bare_item(sfp, dest);
+ if (rv != 0) {
+ return rv;
+ }
+
+ sfp->state = SF_STATE_LIST_BEFORE_PARAMS;
+
+ return 0;
+}
+
+int sf_parser_item(sf_parser *sfp, sf_value *dest) {
+ int rv;
+
+ switch (sfp->state) {
+ case SF_STATE_INITIAL:
+ parser_discard_sp(sfp);
+
+ if (parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ break;
+ case SF_STATE_ITEM_INNER_LIST_BEFORE:
+ rv = parser_skip_inner_list(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* fall through */
+ case SF_STATE_ITEM_BEFORE_PARAMS:
+ rv = parser_skip_params(sfp);
+ if (rv != 0) {
+ return rv;
+ }
+
+ /* fall through */
+ case SF_STATE_ITEM_AFTER:
+ parser_discard_sp(sfp);
+
+ if (!parser_eof(sfp)) {
+ return SF_ERR_PARSE_ERROR;
+ }
+
+ return SF_ERR_EOF;
+ default:
+ assert(0);
+ abort();
+ }
+
+ if (*sfp->pos == '(') {
+ if (dest) {
+ dest->type = SF_TYPE_INNER_LIST;
+ dest->flags = SF_VALUE_FLAG_NONE;
+ }
+
+ ++sfp->pos;
+
+ sfp->state = SF_STATE_ITEM_INNER_LIST_BEFORE;
+
+ return 0;
+ }
+
+ rv = parser_bare_item(sfp, dest);
+ if (rv != 0) {
+ return rv;
+ }
+
+ sfp->state = SF_STATE_ITEM_BEFORE_PARAMS;
+
+ return 0;
+}
+
+void sf_parser_init(sf_parser *sfp, const uint8_t *data, size_t datalen) {
+ if (datalen == 0) {
+ sfp->pos = sfp->end = NULL;
+ } else {
+ sfp->pos = data;
+ sfp->end = data + datalen;
+ }
+
+ sfp->state = SF_STATE_INITIAL;
+}
+
+void sf_unescape(sf_vec *dest, const sf_vec *src) {
+ const uint8_t *p, *q;
+ uint8_t *o;
+ size_t len, slen;
+
+ if (src->len == 0) {
+ *dest = *src;
+
+ return;
+ }
+
+ o = dest->base;
+ p = src->base;
+ len = src->len;
+
+ for (;;) {
+ q = memchr(p, '\\', len);
+ if (q == NULL) {
+ if (len == src->len) {
+ *dest = *src;
+
+ return;
+ }
+
+ memcpy(o, p, len);
+ o += len;
+
+ break;
+ }
+
+ slen = (size_t)(q - p);
+ memcpy(o, p, slen);
+ o += slen;
+
+ p = q + 1;
+ *o++ = *p++;
+ len -= slen + 2;
+ }
+
+ dest->len = (size_t)(o - dest->base);
+}
+
+void sf_base64decode(sf_vec *dest, const sf_vec *src) {
+ static const int index_tbl = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1};
+ uint8_t *o;
+ const uint8_t *p, *end;
+ uint32_t n;
+ size_t i;
+ int idx;
+
+ assert((src->len & 0x3) == 0);
+
+ if (src->len == 0) {
+ *dest = *src;
+
+ return;
+ }
+
+ o = dest->base;
+ p = src->base;
+ end = src->base + src->len;
+
+ for (; p != end;) {
+ n = 0;
+
+ for (i = 1; i <= 4; ++i, ++p) {
+ idx = index_tbl*p;
+
+ if (idx == -1) {
+ assert(i > 2);
+
+ if (i == 3) {
+ assert(*p == '=' && *(p + 1) == '=' && p + 2 == end);
+
+ *o++ = (uint8_t)(n >> 16);
+
+ goto fin;
+ }
+
+ assert(*p == '=' && p + 1 == end);
+
+ *o++ = (uint8_t)(n >> 16);
+ *o++ = (n >> 8) & 0xffu;
+
+ goto fin;
+ }
+
+ n += (uint32_t)(idx << (24 - i * 6));
+ }
+
+ *o++ = (uint8_t)(n >> 16);
+ *o++ = (n >> 8) & 0xffu;
+ *o++ = n & 0xffu;
+ }
+
+fin:
+ dest->len = (size_t)(o - dest->base);
+}

_service:tar_scm:nghttp2-1.55.1.tar.xz/lib/sfparse.h Added

@@ -0,0 +1,409 @@
+/*
+ * sfparse
+ *
+ * Copyright (c) 2023 sfparse contributors
+ * Copyright (c) 2019 nghttp3 contributors
+ * Copyright (c) 2015 nghttp2 contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef SFPARSE_H
+#define SFPARSE_H
+
+/* Define WIN32 when build target is Win32 API (borrowed from
+ libcurl) */
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+# define WIN32
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER < 1800)
+/* MSVC < 2013 does not have inttypes.h because it is not C99
+ compliant. See compiler macros and version number in
+ https://sourceforge.net/p/predef/wiki/Compilers/ */
+# include <stdint.h>
+#else /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
+# include <inttypes.h>
+#endif /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
+#include <sys/types.h>
+#include <stddef.h>
+
+/**
+ * @enum
+ *
+ * :type:`sf_type` defines value type.
+ */
+typedef enum sf_type {
+ /**
+ * :enum:`SF_TYPE_BOOLEAN` indicates boolean type.
+ */
+ SF_TYPE_BOOLEAN,
+ /**
+ * :enum:`SF_TYPE_INTEGER` indicates integer type.
+ */
+ SF_TYPE_INTEGER,
+ /**
+ * :enum:`SF_TYPE_DECIMAL` indicates decimal type.
+ */
+ SF_TYPE_DECIMAL,
+ /**
+ * :enum:`SF_TYPE_STRING` indicates string type.
+ */
+ SF_TYPE_STRING,
+ /**
+ * :enum:`SF_TYPE_TOKEN` indicates token type.
+ */
+ SF_TYPE_TOKEN,
+ /**
+ * :enum:`SF_TYPE_BYTESEQ` indicates byte sequence type.
+ */
+ SF_TYPE_BYTESEQ,
+ /**
+ * :enum:`SF_TYPE_INNER_LIST` indicates inner list type.
+ */
+ SF_TYPE_INNER_LIST,
+ /**
+ * :enum:`SF_TYPE_DATE` indicates date type.
+ */
+ SF_TYPE_DATE
+} sf_type;
+
+/**
+ * @macro
+ *
+ * :macro:`SF_ERR_PARSE_ERROR` indicates fatal parse error has
+ * occurred, and it is not possible to continue the processing.
+ */
+#define SF_ERR_PARSE_ERROR -1
+
+/**
+ * @macro
+ *
+ * :macro:`SF_ERR_EOF` indicates that there is nothing left to read.
+ * The context of this error varies depending on the function that
+ * returns this error code.
+ */
+#define SF_ERR_EOF -2
+
+/**
+ * @struct
+ *
+ * :type:`sf_vec` stores sequence of bytes.
+ */
+typedef struct sf_vec {
+ /**
+ * :member:`base` points to the beginning of the sequence of bytes.
+ */
+ uint8_t *base;
+ /**
+ * :member:`len` is the number of bytes contained in this sequence.
+ */
+ size_t len;
+} sf_vec;
+
+/**
+ * @macro
+ *
+ * :macro:`SF_VALUE_FLAG_NONE` indicates no flag set.
+ */
+#define SF_VALUE_FLAG_NONE 0x0u
+
+/**
+ * @macro
+ *
+ * :macro:`SF_VALUE_FLAG_ESCAPED_STRING` indicates that a string
+ * contains escaped character(s).
+ */
+#define SF_VALUE_FLAG_ESCAPED_STRING 0x1u
+
+/**
+ * @struct
+ *
+ * :type:`sf_decimal` contains decimal value.
+ */
+typedef struct sf_decimal {
+ /**
+ * :member:`numer` contains numerator of the decimal value.
+ */
+ int64_t numer;
+ /**
+ * :member:`denom` contains denominator of the decimal value.
+ */
+ int64_t denom;
+} sf_decimal;
+
+/**
+ * @struct
+ *
+ * :type:`sf_value` stores a Structured Field item. For Inner List,
+ * only type is set to :enum:`sf_type.SF_TYPE_INNER_LIST`. In order
+ * to read the items contained in an inner list, call
+ * `sf_parser_inner_list`.
+ */
+typedef struct sf_value {
+ /**
+ * :member:`type` is the type of the value contained in this
+ * particular object.
+ */
+ sf_type type;
+ /**
+ * :member:`flags` is bitwise OR of one or more of
+ * :macro:`SF_VALUE_FLAG_* <SF_VALUE_FLAG_NONE>`.
+ */
+ uint32_t flags;
+ /**
+ * @anonunion_start
+ *
+ * @sf_value_value
+ */
+ union {
+ /**
+ * :member:`boolean` contains boolean value if :member:`type` ==
+ * :enum:`sf_type.SF_TYPE_BOOLEAN`. 1 indicates true, and 0
+ * indicates false.
+ */
+ int boolean;
+ /**
+ * :member:`integer` contains integer value if :member:`type` is
+ * either :enum:`sf_type.SF_TYPE_INTEGER` or
+ * :enum:`sf_type.SF_TYPE_DATE`.
+ */
+ int64_t integer;
+ /**
+ * :member:`decimal` contains decimal value if :member:`type` ==
+ * :enum:`sf_type.SF_TYPE_DECIMAL`.
+ */
+ sf_decimal decimal;
+ /**
+ * :member:`vec` contains sequence of bytes if :member:`type` is
+ * either :enum:`sf_type.SF_TYPE_STRING`,
+ * :enum:`sf_type.SF_TYPE_TOKEN`, or
+ * :enum:`sf_type.SF_TYPE_BYTESEQ`.
+ *
+ * For :enum:`sf_type.SF_TYPE_STRING`, this field contains one or
+ * more escaped characters if :member:`flags` has
+ * :macro:`SF_VALUE_FLAG_ESCAPED_STRING` set. To unescape the
+ * string, use `sf_unescape`.
+ *
+ * For :enum:`sf_type.SF_TYPE_BYTESEQ`, this field contains base64
+ * encoded string. To decode this byte string, use
+ * `sf_base64decode`.
+ *
+ * If :member:`vec.len <sf_vec.len>` == 0, :member:`vec.base
+ * <sf_vec.base>` is guaranteed to be NULL.
+ */
+ sf_vec vec;
+ /**
+ * @anonunion_end
+ */
+ };
+} sf_value;
+
+/**
+ * @struct
+ *
+ * :type:`sf_parser` is the Structured Field Values parser. Use
+ * `sf_parser_init` to initialize it.
+ */
+typedef struct sf_parser {
+ /* all fields are private */
+ const uint8_t *pos;
+ const uint8_t *end;
+ uint32_t state;
+} sf_parser;
+
+/**
+ * @function
+ *
+ * `sf_parser_init` initializes |sfp| with the given buffer pointed by
+ * |data| of length |datalen|.
+ */
+void sf_parser_init(sf_parser *sfp, const uint8_t *data, size_t datalen);
+
+/**
+ * @function
+ *
+ * `sf_parser_param` reads a parameter. If this function returns 0,
+ * it stores parameter key and value in |dest_key| and |dest_value|
+ * respectively, if they are not NULL.
+ *
+ * This function does no effort to find duplicated keys. Same key may
+ * be reported more than once.
+ *
+ * Caller should keep calling this function until it returns negative
+ * error code. If it returns :macro:`SF_ERR_EOF`, all parameters have
+ * read, and caller can continue to read rest of the values. If it
+ * returns :macro:`SF_ERR_PARSE_ERROR`, it encountered fatal error
+ * while parsing field value.
+ */
+int sf_parser_param(sf_parser *sfp, sf_vec *dest_key, sf_value *dest_value);
+
+/**
+ * @function
+ *
+ * `sf_parser_dict` reads the next dictionary key and value pair. If
+ * this function returns 0, it stores the key and value in |dest_key|
+ * and |dest_value| respectively, if they are not NULL.
+ *
+ * Caller can optionally read parameters attached to the pair by
+ * calling `sf_parser_param`.
+ *
+ * This function does no effort to find duplicated keys. Same key may
+ * be reported more than once.
+ *
+ * Caller should keep calling this function until it returns negative
+ * error code. If it returns :macro:`SF_ERR_EOF`, all key and value
+ * pairs have been read, and there is nothing left to read.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :macro:`SF_ERR_EOF`
+ * All values in the dictionary have read.
+ * :macro:`SF_ERR_PARSE_ERROR`
+ * It encountered fatal error while parsing field value.
+ */
+int sf_parser_dict(sf_parser *sfp, sf_vec *dest_key, sf_value *dest_value);
+
+/**
+ * @function
+ *
+ * `sf_parser_list` reads the next list item. If this function
+ * returns 0, it stores the item in |dest| if it is not NULL.
+ *
+ * Caller can optionally read parameters attached to the item by
+ * calling `sf_parser_param`.
+ *
+ * Caller should keep calling this function until it returns negative
+ * error code. If it returns :macro:`SF_ERR_EOF`, all values in the
+ * list have been read, and there is nothing left to read.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :macro:`SF_ERR_EOF`
+ * All values in the list have read.
+ * :macro:`SF_ERR_PARSE_ERROR`
+ * It encountered fatal error while parsing field value.
+ */
+int sf_parser_list(sf_parser *sfp, sf_value *dest);
+
+/**
+ * @function
+ *
+ * `sf_parser_item` reads a single item. If this function returns 0,
+ * it stores the item in |dest| if it is not NULL.
+ *
+ * This function is only used for the field value that consists of a
+ * single item.
+ *
+ * Caller can optionally read parameters attached to the item by
+ * calling `sf_parser_param`.
+ *
+ * Caller should call this function again to make sure that there is
+ * nothing left to read. If this 2nd function call returns
+ * :macro:`SF_ERR_EOF`, all data have been processed successfully.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :macro:`SF_ERR_EOF`
+ * There is nothing left to read.
+ * :macro:`SF_ERR_PARSE_ERROR`
+ * It encountered fatal error while parsing field value.
+ */
+int sf_parser_item(sf_parser *sfp, sf_value *dest);
+
+/**
+ * @function
+ *
+ * `sf_parser_inner_list` reads the next inner list item. If this
+ * function returns 0, it stores the item in |dest| if it is not NULL.
+ *
+ * Caller can optionally read parameters attached to the item by
+ * calling `sf_parser_param`.
+ *
+ * Caller should keep calling this function until it returns negative
+ * error code. If it returns :macro:`SF_ERR_EOF`, all values in this
+ * inner list have been read, and caller can optionally read
+ * parameters attached to this inner list by calling
+ * `sf_parser_param`. Then caller can continue to read rest of the
+ * values.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :macro:`SF_ERR_EOF`
+ * All values in the inner list have read.
+ * :macro:`SF_ERR_PARSE_ERROR`
+ * It encountered fatal error while parsing field value.
+ */
+int sf_parser_inner_list(sf_parser *sfp, sf_value *dest);
+
+/**
+ * @function
+ *
+ * `sf_unescape` copies |src| to |dest| by removing escapes (``\``).
+ * |src| should be the pointer to :member:`sf_value.vec` of type
+ * :enum:`sf_type.SF_TYPE_STRING` produced by either `sf_parser_dict`,
+ * `sf_parser_list`, `sf_parser_inner_list`, `sf_parser_item`, or
+ * `sf_parser_param`, otherwise the behavior is undefined.
+ *
+ * :member:`dest->base <sf_vec.base>` must point to the buffer that
+ * has sufficient space to store the unescaped string.
+ *
+ * If there is no escape character in |src|, |*src| is assigned to
+ * |*dest|. This includes the case that :member:`src->len
+ * <sf_vec.len>` == 0.
+ *
+ * This function sets the length of unescaped string to
+ * :member:`dest->len <sf_vec.len>`.
+ */
+void sf_unescape(sf_vec *dest, const sf_vec *src);
+
+/**
+ * @function
+ *
+ * `sf_base64decode` decodes Base64 encoded string |src| and writes
+ * the result into |dest|. |src| should be the pointer to
+ * :member:`sf_value.vec` of type :enum:`sf_type.SF_TYPE_BYTESEQ`
+ * produced by either `sf_parser_dict`, `sf_parser_list`,
+ * `sf_parser_inner_list`, `sf_parser_item`, or `sf_parser_param`,
+ * otherwise the behavior is undefined.
+ *
+ * :member:`dest->base <sf_vec.base>` must point to the buffer that
+ * has sufficient space to store the decoded byte string.
+ *
+ * If :member:`src->len <sf_vec.len>` == 0, |*src| is assigned to
+ * |*dest|.
+ *
+ * This function sets the length of decoded byte string to
+ * :member:`dest->len <sf_vec.len>`.
+ */
+void sf_base64decode(sf_vec *dest, const sf_vec *src);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFPARSE_H */

_service:tar_scm:nghttp2-1.52.0.tar.xz/ltmain.sh -> _service:tar_scm:nghttp2-1.55.1.tar.xz/ltmain.sh Changed

@@ -2,7 +2,7 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ## by inline-source v2019-02-19.15
 
-# libtool (GNU libtool) 2.4.6
+# libtool (GNU libtool) 2.4.7
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.7-2"
-package_revision=2.4.6
+VERSION="2.4.7 Debian-2.4.7-5"
+package_revision=2.4.7
 
 
 ## ------ ##
@@ -2217,7 +2217,7 @@
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.6'
+scriptversion='(GNU libtool) 2.4.7'
 
 
 # func_echo ARG...
@@ -2308,7 +2308,7 @@
 compiler: $LTCC
 compiler flags: $LTCFLAGS
 linker: $LD (gnu? $with_gnu_ld)
- version: $progname $scriptversion Debian-2.4.7-2
+ version: $progname $scriptversion Debian-2.4.7-5
 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
 autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`

_service:tar_scm:nghttp2-1.52.0.tar.xz/m4/ltversion.m4 -> _service:tar_scm:nghttp2-1.55.1.tar.xz/m4/ltversion.m4 Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/script/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/script/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/CMakeLists.txt -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/CMakeLists.txt Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/HttpServer.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/HttpServer.cc Changed

@@ -72,6 +72,8 @@
 # define O_BINARY (0)
 #endif // O_BINARY
 
+using namespace std::chrono_literals;
+
 namespace nghttp2 {
 
 namespace {
@@ -194,7 +196,7 @@
 } // namespace
 
 namespace {
-constexpr ev_tstamp FILE_ENTRY_MAX_AGE = 10.;
+constexpr auto FILE_ENTRY_MAX_AGE = 10s;
 } // namespace
 
 namespace {
@@ -202,13 +204,15 @@
 } // namespace
 
 namespace {
-bool need_validation_file_entry(const FileEntry *ent, ev_tstamp now) {
+bool need_validation_file_entry(
+ const FileEntry *ent, const std::chrono::steady_clock::time_point &now) {
 return ent->last_valid + FILE_ENTRY_MAX_AGE < now;
 }
 } // namespace
 
 namespace {
-bool validate_file_entry(FileEntry *ent, ev_tstamp now) {
+bool validate_file_entry(FileEntry *ent,
+ const std::chrono::steady_clock::time_point &now) {
 struct stat stbuf;
 int rv;
 
@@ -335,7 +339,7 @@
 return nullptr;
 }
 
- auto now = ev_now(loop_);
+ auto now = std::chrono::steady_clock::now();
 
 for (auto it = range.first; it != range.second;) {
 auto &ent = (*it).second;
@@ -1197,7 +1201,7 @@
 // now. We will update it when we get whole request body.
 auto path = std::string("echo:") + tempfn;
 stream->file_ent =
- sessions->cache_fd(path, FileEntry(path, 0, 0, fd, nullptr, 0, true));
+ sessions->cache_fd(path, FileEntry(path, 0, 0, fd, nullptr, {}, true));
 stream->echo_upload = true;
 return true;
 }
@@ -1368,7 +1372,7 @@
 
 file_ent = sessions->cache_fd(
 file_path, FileEntry(file_path, buf.st_size, buf.st_mtime, file,
- content_type, ev_now(sessions->get_loop())));
+ content_type, std::chrono::steady_clock::now()));
 }
 
 stream->file_ent = file_ent;
@@ -1891,7 +1895,7 @@
 public:
 ListenEventHandler(Sessions *sessions, int fd,
 std::shared_ptr<AcceptHandler> acceptor)
- : acceptor_(acceptor), sessions_(sessions), fd_(fd) {
+ : acceptor_(std::move(acceptor)), sessions_(sessions), fd_(fd) {
 ev_io_init(&w_, acceptcb, fd, EV_READ);
 w_.data = this;
 ev_io_start(sessions_->get_loop(), &w_);
@@ -1969,7 +1973,7 @@
 assert(0);
 }
 
- return FileEntry(util::utos(status), nwrite, 0, fd, nullptr, 0);
+ return FileEntry(util::utos(status), nwrite, 0, fd, nullptr, {});
 }
 } // namespace

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/HttpServer.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/HttpServer.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/Makefile.am -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/Makefile.am Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/Makefile.in Changed

@@ -534,11 +534,27 @@
 	$(am__inflatehd_SOURCES_DIST) $(am__nghttp_SOURCES_DIST) \
 	$(am__nghttpd_SOURCES_DIST) $(am__nghttpx_SOURCES_DIST) \
 	$(am__nghttpx_unittest_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	check recheck distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -740,7 +756,6 @@
   bases=`echo $$bases`
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
 LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
@@ -761,9 +776,35 @@
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
+DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
 	$(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$^/*$/.*$$,\1,'; \
+  sed_rest='s,^^/*/*,,'; \
+  sed_last='s,^.*/$^/*$$$,\1,'; \
+  sed_butlast='s,/*^/*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -833,8 +874,8 @@
 LIBNGTCP2_CFLAGS = @LIBNGTCP2_CFLAGS@
 LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS = @LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@
 LIBNGTCP2_CRYPTO_BORINGSSL_LIBS = @LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@
-LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS = @LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@
-LIBNGTCP2_CRYPTO_OPENSSL_LIBS = @LIBNGTCP2_CRYPTO_OPENSSL_LIBS@
+LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS = @LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@
+LIBNGTCP2_CRYPTO_QUICTLS_LIBS = @LIBNGTCP2_CRYPTO_QUICTLS_LIBS@
 LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -960,6 +1001,7 @@
 # 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.
+SUBDIRS = testdata
 EXTRA_DIST = \
 	CMakeLists.txt \
 	test.example.com.pem \
@@ -979,7 +1021,7 @@
 	@LIBXML2_CFLAGS@ \
 	@LIBEV_CFLAGS@ \
 	@LIBNGHTTP3_CFLAGS@ \
-	@LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@ \
+	@LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@ \
 	@LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@ \
 	@LIBNGTCP2_CFLAGS@ \
 	@OPENSSL_CFLAGS@ \
@@ -998,7 +1040,7 @@
 	@LIBXML2_LIBS@ \
 	@LIBEV_LIBS@ \
 	@LIBNGHTTP3_LIBS@ \
-	@LIBNGTCP2_CRYPTO_OPENSSL_LIBS@ \
+	@LIBNGTCP2_CRYPTO_QUICTLS_LIBS@ \
 	@LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@ \
 	@LIBNGTCP2_LIBS@ \
 	@OPENSSL_LIBS@ \
@@ -1133,7 +1175,7 @@
 
 @ENABLE_HPACK_TOOLS_TRUE@inflatehd_SOURCES = inflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
 @ENABLE_HPACK_TOOLS_TRUE@deflatehd_SOURCES = deflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
-all: all-am
+all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .lo .log .o .obj .test .test$(EXEEXT) .trs
@@ -2367,14 +2409,61 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
+tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
@@ -2387,7 +2476,7 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
+ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
@@ -2400,7 +2489,7 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
+cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
@@ -2614,24 +2703,50 @@
 	    || exit 1; \
 	  fi; \
 	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
+check: check-recursive
 all-am: Makefile $(PROGRAMS) $(LIBRARIES)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -2656,12 +2771,12 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 	clean-libtool clean-noinstLIBRARIES mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
 		-rm -f ./$(DEPDIR)/HtmlParser.Po
 	-rm -f ./$(DEPDIR)/HttpServer.Po
 	-rm -f ./$(DEPDIR)/app_helper.Po
@@ -2753,47 +2868,47 @@
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
 html-am:
 
-info: info-am
+info: info-recursive
 
 info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-html: install-html-am
+install-html: install-html-recursive
 
 install-html-am:
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
 		-rm -f ./$(DEPDIR)/HtmlParser.Po
 	-rm -f ./$(DEPDIR)/HttpServer.Po
 	-rm -f ./$(DEPDIR)/app_helper.Po
@@ -2884,34 +2999,35 @@
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: check-am install-am install-strip
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
-	check-am clean clean-binPROGRAMS clean-checkPROGRAMS \
-	clean-generic clean-libtool clean-noinstLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-TESTS check-am clean \
+	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am recheck tags tags-am uninstall \

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/app_helper.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/app_helper.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/h2load.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/h2load.cc Changed

@@ -51,9 +51,9 @@
 #include <openssl/err.h>
 
 #ifdef ENABLE_HTTP3
-# ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
-# include <ngtcp2/ngtcp2_crypto_openssl.h>
-# endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+# ifdef HAVE_LIBNGTCP2_CRYPTO_QUICTLS
+# include <ngtcp2/ngtcp2_crypto_quictls.h>
+# endif // HAVE_LIBNGTCP2_CRYPTO_QUICTLS
 # ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 # include <ngtcp2/ngtcp2_crypto_boringssl.h>
 # endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
@@ -344,11 +344,13 @@
 return;
 }
 
- auto now = ev_now(loop);
+ auto now = std::chrono::steady_clock::now();
 auto d = now - client->rps_duration_started;
- auto n = static_cast<size_t>(round(d * config.rps));
+ auto n = static_cast<size_t>(
+ round(std::chrono::duration<double>(d).count() * config.rps));
 client->rps_req_pending += n;
- client->rps_duration_started = now - d + static_cast<double>(n) / config.rps;
+ client->rps_duration_started +=
+ util::duration_from(static_cast<double>(n) / config.rps);
 
 if (client->rps_req_pending == 0) {
 return;
@@ -425,10 +427,10 @@
 return;
 }
 
- ev_tstamp duration =
+ auto duration =
 config.timingsclient->reqidx - config.timingsclient->reqidx - 1;
 
- while (duration < 1e-9) {
+ while (duration < std::chrono::duration<double>(1e-9)) {
 if (client->submit_request() != 0) {
 ev_timer_stop(client->worker->loop, w);
 client->process_request_failure();
@@ -443,7 +445,7 @@
 config.timingsclient->reqidx - config.timingsclient->reqidx - 1;
 }
 
- client->request_timeout_watcher.repeat = duration;
+ client->request_timeout_watcher.repeat = util::ev_tstamp_from(duration);
 ev_timer_again(client->worker->loop, &client->request_timeout_watcher);
 }
 } // namespace
@@ -470,7 +472,6 @@
 local_addr{},
 new_connection_requested(false),
 final(false),
- rps_duration_started(0),
 rps_req_pending(0),
 rps_req_inflight(0) {
 if (req_todo == 0) { // this means infinite number of requests are to be made
@@ -506,7 +507,7 @@
 quic.tx.data = std::make_unique<uint8_t>(64_k);
 }
 
- ngtcp2_connection_close_error_default(&quic.last_error);
+ ngtcp2_ccerr_default(&quic.last_error);
 #endif // ENABLE_HTTP3
 }
 
@@ -540,6 +541,14 @@
 return -1;
 }
 
+# ifdef UDP_GRO
+ int val = 1;
+ if (setsockopt(fd, IPPROTO_UDP, UDP_GRO, &val, sizeof(val)) != 0) {
+ std::cerr << "setsockopt UDP_GRO failed" << std::endl;
+ return -1;
+ }
+# endif // UDP_GRO
+
 rv = util::bind_any_addr_udp(fd, addr->ai_family);
 if (rv != 0) {
 close(fd);
@@ -1178,7 +1187,7 @@
 if (config.rps_enabled()) {
 rps_watcher.repeat = std::max(0.01, 1. / config.rps);
 ev_timer_again(worker->loop, &rps_watcher);
- rps_duration_started = ev_now(worker->loop);
+ rps_duration_started = std::chrono::steady_clock::now();
 }
 
 if (config.rps_enabled()) {
@@ -1202,9 +1211,9 @@
 }
 } else {
 
- ev_tstamp duration = config.timingsreqidx;
+ auto duration = config.timingsreqidx;
 
- while (duration < 1e-9) {
+ while (duration < std::chrono::duration<double>(1e-9)) {
 if (submit_request() != 0) {
 process_request_failure();
 break;
@@ -1217,10 +1226,10 @@
 }
 }
 
- if (duration >= 1e-9) {
+ if (duration >= std::chrono::duration<double>(1e-9)) {
 // double check since we may have break due to reqidx wraps
 // around back to 0
- request_timeout_watcher.repeat = duration;
+ request_timeout_watcher.repeat = util::ev_tstamp_from(duration);
 ev_timer_again(worker->loop, &request_timeout_watcher);
 }
 }
@@ -1971,9 +1980,10 @@
 } // namespace
 
 namespace {
-void read_script_from_file(std::istream &infile,
- std::vector<ev_tstamp> &timings,
- std::vector<std::string> &uris) {
+void read_script_from_file(
+ std::istream &infile,
+ std::vector<std::chrono::steady_clock::duration> &timings,
+ std::vector<std::string> &uris) {
 std::string script_line;
 int line_count = 0;
 while (std::getline(infile, script_line)) {
@@ -2006,7 +2016,9 @@
 exit(EXIT_FAILURE);
 }
 
- timings.push_back(v / 1000.0);
+ timings.emplace_back(
+ std::chrono::duration_cast<std::chrono::steady_clock::duration>(
+ std::chrono::duration<double, std::milli>(v)));
 uris.push_back(script_line.substr(pos + 1, script_line.size()));
 }
 }
@@ -2915,13 +2927,13 @@
 
 if (config.is_quic()) {
 #ifdef ENABLE_HTTP3
-# ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
- if (ngtcp2_crypto_openssl_configure_client_context(ssl_ctx) != 0) {
- std::cerr << "ngtcp2_crypto_openssl_configure_client_context failed"
+# ifdef HAVE_LIBNGTCP2_CRYPTO_QUICTLS
+ if (ngtcp2_crypto_quictls_configure_client_context(ssl_ctx) != 0) {
+ std::cerr << "ngtcp2_crypto_quictls_configure_client_context failed"
 << std::endl;
 exit(EXIT_FAILURE);
 }
-# endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+# endif // HAVE_LIBNGTCP2_CRYPTO_QUICTLS
 # ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 if (ngtcp2_crypto_boringssl_configure_client_context(ssl_ctx) != 0) {
 std::cerr << "ngtcp2_crypto_boringssl_configure_client_context failed"

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/h2load.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/h2load.h Changed

@@ -73,7 +73,7 @@
 struct Config {
 std::vector<std::vector<nghttp2_nv>> nva;
 std::vector<std::string> h1reqs;
- std::vector<ev_tstamp> timings;
+ std::vector<std::chrono::steady_clock::duration> timings;
 nghttp2::Headers custom_headers;
 std::string scheme;
 std::string host;
@@ -342,7 +342,7 @@
 ngtcp2_crypto_conn_ref conn_ref;
 ev_timer pkt_timer;
 ngtcp2_conn *conn;
- ngtcp2_connection_close_error last_error;
+ ngtcp2_ccerr last_error;
 bool close_requested;
 FILE *qlog_file;
 
@@ -396,7 +396,7 @@
 ev_timer rps_watcher;
 // The timestamp that starts the period which contributes to the
 // next request generation.
- ev_tstamp rps_duration_started;
+ std::chrono::steady_clock::time_point rps_duration_started;
 // The number of requests allowed by rps, but limited by stream
 // concurrency.
 size_t rps_req_pending;
@@ -494,8 +494,9 @@
 int quic_stream_reset(int64_t stream_id, uint64_t app_error_code);
 int quic_stream_stop_sending(int64_t stream_id, uint64_t app_error_code);
 int quic_extend_max_local_streams();
+ int quic_extend_max_stream_data(int64_t stream_id);
 
- int quic_write_client_handshake(ngtcp2_crypto_level level,
+ int quic_write_client_handshake(ngtcp2_encryption_level level,
 const uint8_t *data, size_t datalen);
 int quic_pkt_timeout();
 void quic_restart_pkt_timer();

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/h2load_http3_session.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/h2load_http3_session.cc Changed

@@ -224,7 +224,7 @@
 } // namespace
 
 int Http3Session::stop_sending(int64_t stream_id, uint64_t app_error_code) {
- auto rv = ngtcp2_conn_shutdown_stream_read(client_->quic.conn, stream_id,
+ auto rv = ngtcp2_conn_shutdown_stream_read(client_->quic.conn, 0, stream_id,
 app_error_code);
 if (rv != 0) {
 std::cerr << "ngtcp2_conn_shutdown_stream_read: " << ngtcp2_strerror(rv)
@@ -246,7 +246,7 @@
 } // namespace
 
 int Http3Session::reset_stream(int64_t stream_id, uint64_t app_error_code) {
- auto rv = ngtcp2_conn_shutdown_stream_write(client_->quic.conn, stream_id,
+ auto rv = ngtcp2_conn_shutdown_stream_write(client_->quic.conn, 0, stream_id,
 app_error_code);
 if (rv != 0) {
 std::cerr << "ngtcp2_conn_shutdown_stream_write: " << ngtcp2_strerror(rv)
@@ -305,7 +305,7 @@
 
 assert(conn_ == nullptr);
 
- if (ngtcp2_conn_get_max_local_streams_uni(client_->quic.conn) < 3) {
+ if (ngtcp2_conn_get_streams_uni_left(client_->quic.conn) < 3) {
 return -1;
 }
 
@@ -395,7 +395,7 @@
 if (nconsumed < 0) {
 std::cerr << "nghttp3_conn_read_stream: " << nghttp3_strerror(nconsumed)
 << std::endl;
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &client_->quic.last_error,
 nghttp3_err_infer_quic_app_error_code(nconsumed), nullptr, 0);
 return -1;
@@ -408,7 +408,7 @@
 auto sveccnt =
 nghttp3_conn_writev_stream(conn_, &stream_id, &fin, vec, veccnt);
 if (sveccnt < 0) {
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &client_->quic.last_error,
 nghttp3_err_infer_quic_app_error_code(sveccnt), nullptr, 0);
 return -1;
@@ -420,6 +420,14 @@
 nghttp3_conn_block_stream(conn_, stream_id);
 }
 
+int Http3Session::unblock_stream(int64_t stream_id) {
+ if (nghttp3_conn_unblock_stream(conn_, stream_id) != 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
 void Http3Session::shutdown_stream_write(int64_t stream_id) {
 nghttp3_conn_shutdown_stream_write(conn_, stream_id);
 }
@@ -427,7 +435,7 @@
 int Http3Session::add_write_offset(int64_t stream_id, size_t ndatalen) {
 auto rv = nghttp3_conn_add_write_offset(conn_, stream_id, ndatalen);
 if (rv != 0) {
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &client_->quic.last_error, nghttp3_err_infer_quic_app_error_code(rv),
 nullptr, 0);
 return -1;
@@ -438,7 +446,7 @@
 int Http3Session::add_ack_offset(int64_t stream_id, size_t datalen) {
 auto rv = nghttp3_conn_add_ack_offset(conn_, stream_id, datalen);
 if (rv != 0) {
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &client_->quic.last_error, nghttp3_err_infer_quic_app_error_code(rv),
 nullptr, 0);
 return -1;

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/h2load_http3_session.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/h2load_http3_session.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/h2load_quic.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/h2load_quic.cc Changed

@@ -28,9 +28,9 @@
 
 #include <iostream>
 
-#ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
-# include <ngtcp2/ngtcp2_crypto_openssl.h>
-#endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+#ifdef HAVE_LIBNGTCP2_CRYPTO_QUICTLS
+# include <ngtcp2/ngtcp2_crypto_quictls.h>
+#endif // HAVE_LIBNGTCP2_CRYPTO_QUICTLS
 #ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 # include <ngtcp2/ngtcp2_crypto_boringssl.h>
 #endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
@@ -197,6 +197,28 @@
 }
 
 namespace {
+int extend_max_stream_data(ngtcp2_conn *conn, int64_t stream_id,
+ uint64_t max_data, void *user_data,
+ void *stream_user_data) {
+ auto c = static_cast<Client *>(user_data);
+
+ if (c->quic_extend_max_stream_data(stream_id) != 0) {
+ return NGTCP2_ERR_CALLBACK_FAILURE;
+ }
+
+ return 0;
+}
+} // namespace
+
+int Client::quic_extend_max_stream_data(int64_t stream_id) {
+ auto s = static_cast<Http3Session *>(session.get());
+ if (s->unblock_stream(stream_id) != 0) {
+ return -1;
+ }
+ return 0;
+}
+
+namespace {
 int get_new_connection_id(ngtcp2_conn *conn, ngtcp2_cid *cid, uint8_t *token,
 size_t cidlen, void *user_data) {
 if (RAND_bytes(cid->data, cidlen) != 1) {
@@ -238,8 +260,10 @@
 } // namespace
 
 namespace {
-ngtcp2_tstamp timestamp(struct ev_loop *loop) {
- return ev_now(loop) * NGTCP2_SECONDS;
+ngtcp2_tstamp quic_timestamp() {
+ return std::chrono::duration_cast<std::chrono::nanoseconds>(
+ std::chrono::steady_clock::now().time_since_epoch())
+ .count();
 }
 } // namespace
 
@@ -265,8 +289,9 @@
 } // namespace
 
 namespace {
-int recv_rx_key(ngtcp2_conn *conn, ngtcp2_crypto_level level, void *user_data) {
- if (level != NGTCP2_CRYPTO_LEVEL_APPLICATION) {
+int recv_rx_key(ngtcp2_conn *conn, ngtcp2_encryption_level level,
+ void *user_data) {
+ if (level != NGTCP2_ENCRYPTION_LEVEL_1RTT) {
 return 0;
 }
 
@@ -338,7 +363,7 @@
 h2load::stream_reset,
 nullptr, // extend_max_remote_streams_bidi
 nullptr, // extend_max_remote_streams_uni
- nullptr, // extend_max_stream_data
+ h2load::extend_max_stream_data,
 nullptr, // dcid_status
 nullptr, // handshake_confirmed
 nullptr, // recv_new_token
@@ -369,7 +394,7 @@
 if (config->verbose) {
 settings.log_printf = debug_log_printf;
 }
- settings.initial_ts = timestamp(worker->loop);
+ settings.initial_ts = quic_timestamp();
 settings.rand_ctx.native_handle = &worker->randgen;
 if (!config->qlog_file_base.empty()) {
 assert(quic.qlog_file == nullptr);
@@ -384,7 +409,7 @@
 std::cerr << "Failed to open a qlog file: " << path << std::endl;
 return -1;
 }
- settings.qlog.write = qlog_write_cb;
+ settings.qlog_write = qlog_write_cb;
 }
 if (config->max_udp_payload_size) {
 settings.max_tx_udp_payload_size = config->max_udp_payload_size;
@@ -453,7 +478,7 @@
 
 auto nwrite = ngtcp2_conn_write_connection_close(
 quic.conn, &ps.path, nullptr, buf.data(), buf.size(), &quic.last_error,
- timestamp(worker->loop));
+ quic_timestamp());
 
 if (nwrite <= 0) {
 return;
@@ -463,7 +488,7 @@
 ps.path.remote.addrlen, buf.data(), nwrite, 0);
 }
 
-int Client::quic_write_client_handshake(ngtcp2_crypto_level level,
+int Client::quic_write_client_handshake(ngtcp2_encryption_level level,
 const uint8_t *data, size_t datalen) {
 int rv;
 
@@ -492,12 +517,11 @@
 
 int Client::quic_pkt_timeout() {
 int rv;
- auto now = timestamp(worker->loop);
+ auto now = quic_timestamp();
 
 rv = ngtcp2_conn_handle_expiry(quic.conn, now);
 if (rv != 0) {
- ngtcp2_connection_close_error_set_transport_error_liberr(&quic.last_error,
- rv, nullptr, 0);
+ ngtcp2_ccerr_set_liberr(&quic.last_error, rv, nullptr, 0);
 return -1;
 }
 
@@ -506,7 +530,7 @@
 
 void Client::quic_restart_pkt_timer() {
 auto expiry = ngtcp2_conn_get_expiry(quic.conn);
- auto now = timestamp(worker->loop);
+ auto now = quic_timestamp();
 auto t = expiry > now ? static_cast<ev_tstamp>(expiry - now) / NGTCP2_SECONDS
 : 1e-9;
 quic.pkt_timer.repeat = t;
@@ -514,20 +538,40 @@
 }
 
 int Client::read_quic() {
- std::array<uint8_t, 65536> buf;
+ std::array<uint8_t, 65535> buf;
 sockaddr_union su;
- socklen_t addrlen = sizeof(su);
 int rv;
 size_t pktcnt = 0;
 ngtcp2_pkt_info pi{};
 
+ iovec msg_iov;
+ msg_iov.iov_base = buf.data();
+ msg_iov.iov_len = buf.size();
+
+ msghdr msg{};
+ msg.msg_name = &su;
+ msg.msg_iov = &msg_iov;
+ msg.msg_iovlen = 1;
+
+ uint8_t msg_ctrlCMSG_SPACE(sizeof(uint16_t));
+ msg.msg_control = msg_ctrl;
+
+ auto ts = quic_timestamp();
+
 for (;;) {
- auto nread =
- recvfrom(fd, buf.data(), buf.size(), MSG_DONTWAIT, &su.sa, &addrlen);
+ msg.msg_namelen = sizeof(su);
+ msg.msg_controllen = sizeof(msg_ctrl);
+
+ auto nread = recvmsg(fd, &msg, 0);
 if (nread == -1) {
 return 0;
 }
 
+ auto gso_size = util::msghdr_get_udp_gro(&msg);
+ if (gso_size == 0) {
+ gso_size = static_cast<size_t>(nread);
+ }
+
 assert(quic.conn);
 
 ++worker->stats.udp_dgram_recv;
@@ -539,30 +583,41 @@
 },
 {
 &su.sa,
- addrlen,
+ msg.msg_namelen,
 },
 };
 
- rv = ngtcp2_conn_read_pkt(quic.conn, &path, &pi, buf.data(), nread,
- timestamp(worker->loop));
- if (rv != 0) {
- std::cerr << "ngtcp2_conn_read_pkt: " << ngtcp2_strerror(rv) << std::endl;
-
- if (!quic.last_error.error_code) {
- if (rv == NGTCP2_ERR_CRYPTO) {
- ngtcp2_connection_close_error_set_transport_error_tls_alert(
- &quic.last_error, ngtcp2_conn_get_tls_alert(quic.conn), nullptr,
- 0);
- } else {
- ngtcp2_connection_close_error_set_transport_error_liberr(
- &quic.last_error, rv, nullptr, 0);
+ auto data = buf.data();
+
+ for (;;) {
+ auto datalen = std::min(static_cast<size_t>(nread), gso_size);
+
+ ++pktcnt;
+
+ rv = ngtcp2_conn_read_pkt(quic.conn, &path, &pi, data, datalen, ts);
+ if (rv != 0) {
+ if (!quic.last_error.error_code) {
+ if (rv == NGTCP2_ERR_CRYPTO) {
+ ngtcp2_ccerr_set_tls_alert(&quic.last_error,
+ ngtcp2_conn_get_tls_alert(quic.conn),
+ nullptr, 0);
+ } else {
+ ngtcp2_ccerr_set_liberr(&quic.last_error, rv, nullptr, 0);
+ }
 }
+
+ return -1;
 }
 
- return -1;
+ nread -= datalen;
+ if (nread == 0) {
+ break;
+ }
+
+ data += datalen;
 }
 
- if (++pktcnt == 100) {
+ if (pktcnt >= 100) {
 break;
 }
 }
@@ -607,6 +662,7 @@
 ngtcp2_path_storage_zero(&ps);
 
 auto s = static_cast<Http3Session *>(session.get());
+ auto ts = quic_timestamp();
 
 for (;;) {
 int64_t stream_id = -1;
@@ -631,8 +687,7 @@
 
 auto nwrite = ngtcp2_conn_writev_stream(
 quic.conn, &ps.path, nullptr, bufpos, max_udp_payload_size, &ndatalen,
- flags, stream_id, reinterpret_cast<const ngtcp2_vec *>(v), vcnt,
- timestamp(worker->loop));
+ flags, stream_id, reinterpret_cast<const ngtcp2_vec *>(v), vcnt, ts);
 if (nwrite < 0) {
 switch (nwrite) {
 case NGTCP2_ERR_STREAM_DATA_BLOCKED:
@@ -651,8 +706,7 @@
 continue;
 }
 
- ngtcp2_connection_close_error_set_transport_error_liberr(
- &quic.last_error, nwrite, nullptr, 0);
+ ngtcp2_ccerr_set_liberr(&quic.last_error, nwrite, nullptr, 0);
 return -1;
 } else if (ndatalen >= 0 && s->add_write_offset(stream_id, ndatalen) != 0) {
 return -1;

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/nghttp.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/nghttp.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/nghttp2_gzip.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/nghttp2_gzip.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/nghttp2_gzip_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/nghttp2_gzip_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx-unittest.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx-unittest.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx.cc Changed

@@ -210,31 +210,13 @@
 )
 : loop(loop),
 worker_pid(worker_pid),
- ipc_fd(ipc_fd),
- termination_deadline(0.)
+ ipc_fd(ipc_fd)
 #ifdef ENABLE_HTTP3
 ,
 quic_ipc_fd(quic_ipc_fd),
 cid_prefixes(cid_prefixes)
 #endif // ENABLE_HTTP3
 {
- ev_signal_init(&reopen_log_signalev, signal_cb, REOPEN_LOG_SIGNAL);
- reopen_log_signalev.data = this;
- ev_signal_start(loop, &reopen_log_signalev);
-
- ev_signal_init(&exec_binary_signalev, signal_cb, EXEC_BINARY_SIGNAL);
- exec_binary_signalev.data = this;
- ev_signal_start(loop, &exec_binary_signalev);
-
- ev_signal_init(&graceful_shutdown_signalev, signal_cb,
- GRACEFUL_SHUTDOWN_SIGNAL);
- graceful_shutdown_signalev.data = this;
- ev_signal_start(loop, &graceful_shutdown_signalev);
-
- ev_signal_init(&reload_signalev, signal_cb, RELOAD_SIGNAL);
- reload_signalev.data = this;
- ev_signal_start(loop, &reload_signalev);
-
 ev_child_init(&worker_process_childev, worker_process_child_cb, worker_pid,
 0);
 worker_process_childev.data = this;
@@ -242,8 +224,6 @@
 }
 
 ~WorkerProcess() {
- shutdown_signal_watchers();
-
 ev_child_stop(loop, &worker_process_childev);
 
 #ifdef ENABLE_HTTP3
@@ -258,22 +238,11 @@
 }
 }
 
- void shutdown_signal_watchers() {
- ev_signal_stop(loop, &reopen_log_signalev);
- ev_signal_stop(loop, &exec_binary_signalev);
- ev_signal_stop(loop, &graceful_shutdown_signalev);
- ev_signal_stop(loop, &reload_signalev);
- }
-
- ev_signal reopen_log_signalev;
- ev_signal exec_binary_signalev;
- ev_signal graceful_shutdown_signalev;
- ev_signal reload_signalev;
 ev_child worker_process_childev;
 struct ev_loop *loop;
 pid_t worker_pid;
 int ipc_fd;
- ev_tstamp termination_deadline;
+ std::chrono::steady_clock::time_point termination_deadline;
 #ifdef ENABLE_HTTP3
 int quic_ipc_fd;
 std::vector<std::array<uint8_t, SHRPX_QUIC_CID_PREFIXLEN>> cid_prefixes;
@@ -281,7 +250,7 @@
 };
 
 namespace {
-void reload_config(WorkerProcess *wp);
+void reload_config();
 } // namespace
 
 namespace {
@@ -295,21 +264,22 @@
 namespace {
 void worker_process_grace_period_timercb(struct ev_loop *loop, ev_timer *w,
 int revents) {
- auto now = ev_now(loop);
- ev_tstamp next_repeat = 0.;
+ auto now = std::chrono::steady_clock::now();
+ auto next_repeat = std::chrono::steady_clock::duration::zero();
 
 for (auto it = std::begin(worker_processes);
 it != std::end(worker_processes);) {
 auto &wp = *it;
- if (!(wp->termination_deadline > 0.)) {
+ if (wp->termination_deadline.time_since_epoch().count() == 0) {
 ++it;
 
 continue;
 }
 
 auto d = wp->termination_deadline - now;
- if (d > 0) {
- if (!(next_repeat > 0.) || d < next_repeat) {
+ if (d.count() > 0) {
+ if (next_repeat == std::chrono::steady_clock::duration::zero() ||
+ d < next_repeat) {
 next_repeat = d;
 }
 
@@ -324,8 +294,8 @@
 it = worker_processes.erase(it);
 }
 
- if (next_repeat > 0.) {
- w->repeat = next_repeat;
+ if (next_repeat.count() > 0) {
+ w->repeat = util::ev_tstamp_from(next_repeat);
 ev_timer_again(loop, w);
 
 return;
@@ -345,7 +315,8 @@
 }
 
 wp->termination_deadline =
- ev_now(loop) + config->worker_process_grace_shutdown_period;
+ std::chrono::steady_clock::now() +
+ util::duration_from(config->worker_process_grace_shutdown_period);
 
 if (!ev_is_active(&worker_process_grace_period_timer)) {
 worker_process_grace_period_timer.repeat =
@@ -417,18 +388,6 @@
 } // namespace
 
 namespace {
-// Returns the last PID of worker process. Returns -1 if there is no
-// worker process at the moment.
-int worker_process_last_pid() {
- if (worker_processes.empty()) {
- return -1;
- }
-
- return worker_processes.back()->worker_pid;
-}
-} // namespace
-
-namespace {
 int save_pid() {
 std::array<char, STRERROR_BUFSIZE> errbuf;
 auto config = get_config();
@@ -712,15 +671,12 @@
 
 namespace {
 void signal_cb(struct ev_loop *loop, ev_signal *w, int revents) {
- auto wp = static_cast<WorkerProcess *>(w->data);
- if (wp->worker_pid == -1) {
- ev_break(loop);
- return;
- }
-
 switch (w->signum) {
 case REOPEN_LOG_SIGNAL:
- reopen_log(wp);
+ for (auto &wp : worker_processes) {
+ reopen_log(wp.get());
+ }
+
 return;
 case EXEC_BINARY_SIGNAL:
 exec_binary();
@@ -730,12 +686,17 @@
 for (auto &addr : listenerconf.addrs) {
 close(addr.fd);
 }
- ipc_send(wp, SHRPX_IPC_GRACEFUL_SHUTDOWN);
- worker_process_set_termination_deadline(wp, loop);
+
+ for (auto &wp : worker_processes) {
+ ipc_send(wp.get(), SHRPX_IPC_GRACEFUL_SHUTDOWN);
+ worker_process_set_termination_deadline(wp.get(), loop);
+ }
+
 return;
 }
 case RELOAD_SIGNAL:
- reload_config(wp);
+ reload_config();
+
 return;
 default:
 worker_process_kill(w->signum, loop);
@@ -751,11 +712,9 @@
 
 log_chld(w->rpid, w->rstatus, "Worker process");
 
- auto pid = wp->worker_pid;
-
 worker_process_remove(wp, loop);
 
- if (worker_process_last_pid() == pid) {
+ if (worker_processes.empty()) {
 ev_break(loop);
 }
 }
@@ -1412,6 +1371,30 @@
 }
 } // namespace
 
+namespace {
+int create_worker_process_ready_ipc_socket(std::array<int, 2> &ipc_fd) {
+ std::array<char, STRERROR_BUFSIZE> errbuf;
+ int rv;
+
+ rv = socketpair(AF_UNIX, SOCK_DGRAM, 0, ipc_fd.data());
+ if (rv == -1) {
+ auto error = errno;
+ LOG(WARN) << "Failed to create socket pair to communicate worker process "
+ "readiness: "
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
+ return -1;
+ }
+
+ for (auto fd : ipc_fd) {
+ util::make_socket_closeonexec(fd);
+ }
+
+ util::make_socket_nonblocking(ipc_fd0);
+
+ return 0;
+}
+} // namespace
+
 #ifdef ENABLE_HTTP3
 namespace {
 int create_quic_ipc_socket(std::array<int, 2> &quic_ipc_fd) {
@@ -1484,6 +1467,130 @@
 #endif // ENABLE_HTTP3
 
 namespace {
+ev_signal reopen_log_signalev;
+ev_signal exec_binary_signalev;
+ev_signal graceful_shutdown_signalev;
+ev_signal reload_signalev;
+} // namespace
+
+namespace {
+void start_signal_watchers(struct ev_loop *loop) {
+ ev_signal_init(&reopen_log_signalev, signal_cb, REOPEN_LOG_SIGNAL);
+ ev_signal_start(loop, &reopen_log_signalev);
+
+ ev_signal_init(&exec_binary_signalev, signal_cb, EXEC_BINARY_SIGNAL);
+ ev_signal_start(loop, &exec_binary_signalev);
+
+ ev_signal_init(&graceful_shutdown_signalev, signal_cb,
+ GRACEFUL_SHUTDOWN_SIGNAL);
+ ev_signal_start(loop, &graceful_shutdown_signalev);
+
+ ev_signal_init(&reload_signalev, signal_cb, RELOAD_SIGNAL);
+ ev_signal_start(loop, &reload_signalev);
+}
+} // namespace
+
+namespace {
+void shutdown_signal_watchers(struct ev_loop *loop) {
+ ev_signal_stop(loop, &reload_signalev);
+ ev_signal_stop(loop, &graceful_shutdown_signalev);
+ ev_signal_stop(loop, &exec_binary_signalev);
+ ev_signal_stop(loop, &reopen_log_signalev);
+}
+} // namespace
+
+namespace {
+// A pair of connected socket with which a worker process tells main
+// process that it is ready for service. A worker process writes its
+// PID to worker_process_ready_ipc_fd1 and main process reads it
+// from worker_process_ready_ipc_fd0.
+std::array<int, 2> worker_process_ready_ipc_fd;
+} // namespace
+
+namespace {
+ev_io worker_process_ready_ipcev;
+} // namespace
+
+namespace {
+// PID received via NGHTTPX_ORIG_PID environment variable.
+pid_t orig_pid = -1;
+} // namespace
+
+namespace {
+void worker_process_ready_ipc_readcb(struct ev_loop *loop, ev_io *w,
+ int revents) {
+ std::array<uint8_t, 8> buf;
+ ssize_t nread;
+
+ while ((nread = read(w->fd, buf.data(), buf.size())) == -1 && errno == EINTR)
+ ;
+
+ if (nread == -1) {
+ std::array<char, STRERROR_BUFSIZE> errbuf;
+ auto error = errno;
+
+ LOG(ERROR) << "Failed to read data from worker process ready IPC channel: "
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
+
+ return;
+ }
+
+ if (nread == 0) {
+ return;
+ }
+
+ if (nread != sizeof(pid_t)) {
+ LOG(ERROR) << "Read " << nread
+ << " bytes from worker process ready IPC channel";
+
+ return;
+ }
+
+ pid_t pid;
+
+ memcpy(&pid, buf.data(), sizeof(pid));
+
+ LOG(NOTICE) << "Worker process pid=" << pid << " is ready";
+
+ for (auto &wp : worker_processes) {
+ // Send graceful shutdown signal to all worker processes prior to
+ // pid.
+ if (wp->worker_pid == pid) {
+ break;
+ }
+
+ LOG(INFO) << "Sending graceful shutdown event to worker process pid="
+ << wp->worker_pid;
+
+ ipc_send(wp.get(), SHRPX_IPC_GRACEFUL_SHUTDOWN);
+ worker_process_set_termination_deadline(wp.get(), loop);
+ }
+
+ if (orig_pid != -1) {
+ LOG(NOTICE) << "Send QUIT signal to the original main process to tell "
+ "that we are ready to serve requests.";
+ kill(orig_pid, SIGQUIT);
+
+ orig_pid = -1;
+ }
+}
+} // namespace
+
+namespace {
+void start_worker_process_ready_ipc_watcher(struct ev_loop *loop) {
+ ev_io_init(&worker_process_ready_ipcev, worker_process_ready_ipc_readcb,
+ worker_process_ready_ipc_fd0, EV_READ);
+ ev_io_start(loop, &worker_process_ready_ipcev);
+}
+} // namespace
+
+namespace {
+void shutdown_worker_process_ready_ipc_watcher(struct ev_loop *loop) {
+ ev_io_stop(loop, &worker_process_ready_ipcev);
+}
+} // namespace
+
+namespace {
 // Creates worker process, and returns PID of worker process. On
 // success, file descriptor for IPC (send only) is assigned to
 // |main_ipc_fd|. In child process, we will close file descriptors
@@ -1545,6 +1652,9 @@
 }
 
 if (pid == 0) {
+ // We are in new process now, update pid for logger.
+ log_config()->pid = getpid();
+
 ev_loop_fork(EV_DEFAULT);
 
 for (auto &addr : config->conn.listener.addrs) {
@@ -1565,6 +1675,13 @@
 }
 #endif // ENABLE_HTTP3
 
+ close(worker_process_ready_ipc_fd0);
+ shutdown_worker_process_ready_ipc_watcher(EV_DEFAULT);
+
+ if (!config->single_process) {
+ shutdown_signal_watchers(EV_DEFAULT);
+ }
+
 // Remove all WorkerProcesses to stop any registered watcher on
 // default loop.
 worker_process_remove_all(EV_DEFAULT);
@@ -1595,6 +1712,7 @@
 
 WorkerProcessConfig wpconf{
 .ipc_fd = ipc_fd0,
+ .ready_ipc_fd = worker_process_ready_ipc_fd1,
 #ifdef ENABLE_HTTP3
 .cid_prefixes = cid_prefixes,
 .quic_ipc_fd = quic_ipc_fd0,
@@ -1702,7 +1820,7 @@
 close_unused_inherited_addr(iaddrs);
 }
 
- auto orig_pid = get_orig_pid_from_env();
+ orig_pid = get_orig_pid_from_env();
 
 #ifdef ENABLE_HTTP3
 inherited_quic_lingering_worker_processes =
@@ -1724,6 +1842,13 @@
 }
 #endif // ENABLE_HTTP3
 
+ if (!config->single_process) {
+ start_signal_watchers(loop);
+ }
+
+ create_worker_process_ready_ipc_socket(worker_process_ready_ipc_fd);
+ start_worker_process_ready_ipc_watcher(loop);
+
 auto pid = fork_worker_process(ipc_fd
 #ifdef ENABLE_HTTP3
 ,
@@ -1759,19 +1884,19 @@
 save_pid();
 }
 
- // ready to serve requests
 shrpx_sd_notifyf(0, "READY=1");
 
- if (orig_pid != -1) {
- LOG(NOTICE) << "Send QUIT signal to the original main process to tell "
- "that we are ready to serve requests.";
- kill(orig_pid, SIGQUIT);
- }
-
 ev_run(loop, 0);
 
 ev_timer_stop(loop, &worker_process_grace_period_timer);
 
+ shutdown_worker_process_ready_ipc_watcher(loop);
+
+ // config is now stale if reload has happened.
+ if (!get_config()->single_process) {
+ shutdown_signal_watchers(loop);
+ }
+
 return 0;
 }
 } // namespace
@@ -3837,7 +3962,7 @@
 } // namespace
 
 namespace {
-void reload_config(WorkerProcess *wp) {
+void reload_config() {
 int rv;
 
 LOG(NOTICE) << "Reloading configuration";
@@ -3916,13 +4041,6 @@
 
 close_unused_inherited_addr(iaddrs);
 
- // Send last worker process a graceful shutdown notice
- auto &last_wp = worker_processes.back();
- ipc_send(last_wp.get(), SHRPX_IPC_GRACEFUL_SHUTDOWN);
- worker_process_set_termination_deadline(last_wp.get(), loop);
- // We no longer use signals for this worker.
- last_wp->shutdown_signal_watchers();
-
 worker_process_add(std::make_unique<WorkerProcess>(loop, pid, ipc_fd
 #ifdef ENABLE_HTTP3
 ,

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_connect_blocker.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_connect_blocker.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_connection.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_connection.cc Changed

@@ -41,6 +41,7 @@
 #include "ssl_compat.h"
 
 using namespace nghttp2;
+using namespace std::chrono_literals;
 
 namespace shrpx {
 
@@ -72,9 +73,8 @@
 data(data),
 fd(fd),
 tls_dyn_rec_warmup_threshold(tls_dyn_rec_warmup_threshold),
- tls_dyn_rec_idle_timeout(tls_dyn_rec_idle_timeout),
+ tls_dyn_rec_idle_timeout(util::duration_from(tls_dyn_rec_idle_timeout)),
 proto(proto),
- last_read(0.),
 read_timeout(read_timeout) {
 
 ev_io_init(&wev, writecb, fd, EV_WRITE);
@@ -89,9 +89,6 @@
 wt.data = this;
 rt.data = this;
 
- // set 0. to double field explicitly just in case
- tls.last_write_idle = 0.;
-
 if (ssl) {
 set_ssl(ssl);
 }
@@ -124,7 +121,7 @@
 
 tls.wbuf.reset();
 tls.rbuf.reset();
- tls.last_write_idle = 0.;
+ tls.last_write_idle = {};
 tls.warmup_writelen = 0;
 tls.last_writelen = 0;
 tls.last_readlen = 0;
@@ -881,9 +878,9 @@
 return std::numeric_limits<ssize_t>::max();
 }
 
- auto t = ev_now(loop);
+ auto t = std::chrono::steady_clock::now();
 
- if (tls.last_write_idle >= 0. &&
+ if (tls.last_write_idle.time_since_epoch().count() >= 0 &&
 t - tls.last_write_idle > tls_dyn_rec_idle_timeout) {
 // Time out, use small record size
 tls.warmup_writelen = 0;
@@ -904,8 +901,8 @@
 }
 
 void Connection::start_tls_write_idle() {
- if (tls.last_write_idle < 0.) {
- tls.last_write_idle = ev_now(loop);
+ if (tls.last_write_idle.time_since_epoch().count() < 0) {
+ tls.last_write_idle = std::chrono::steady_clock::now();
 }
 }
 
@@ -927,7 +924,7 @@
 tls.last_writelen = 0;
 }
 
- tls.last_write_idle = -1.;
+ tls.last_write_idle = std::chrono::steady_clock::time_point(-1s);
 
 auto &tlsconf = get_config()->tls;
 auto via_bio =
@@ -1285,17 +1282,18 @@
 read_timeout = t;
 rt.repeat = t;
 ev_timer_again(loop, &rt);
- last_read = ev_now(loop);
+ last_read = std::chrono::steady_clock::now();
 }
 
 void Connection::again_rt() {
 rt.repeat = read_timeout;
 ev_timer_again(loop, &rt);
- last_read = ev_now(loop);
+ last_read = std::chrono::steady_clock::now();
 }
 
 bool Connection::expired_rt() {
- auto delta = read_timeout - (ev_now(loop) - last_read);
+ auto delta = read_timeout - util::ev_tstamp_from(
+ std::chrono::steady_clock::now() - last_read);
 if (delta < 1e-9) {
 return true;
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_connection.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_connection.h Changed

@@ -66,7 +66,7 @@
   SSL_SESSION *cached_session;
   MemcachedRequest *cached_session_lookup_req;
   tls::TLSSessionCache *client_session_cache;
-  ev_tstamp last_write_idle;
+  std::chrono::steady_clock::time_point last_write_idle;
   size_t warmup_writelen;
   // length passed to SSL_write and SSL_read last time.  This is
   // required since these functions require the exact same parameters
@@ -178,14 +178,14 @@
   void *data;
   int fd;
   size_t tls_dyn_rec_warmup_threshold;
-  ev_tstamp tls_dyn_rec_idle_timeout;
+  std::chrono::steady_clock::duration tls_dyn_rec_idle_timeout;
   // Application protocol used over the connection.  This field is not
   // used in this object at the moment.  The rest of the program may
   // use this value when it is useful.
   Proto proto;
   // The point of time when last read is observed.  Note: since we use
   // |rt| as idle timer, the activity is not limited to read.
-  ev_tstamp last_read;
+  std::chrono::steady_clock::time_point last_read;
   // Timeout for read timer |rt|.
   ev_tstamp read_timeout;
 };

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_connection_handler.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_connection_handler.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_dns_tracker.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_dns_tracker.cc Changed

@@ -71,7 +71,8 @@
 switch (status) {
 case DNSResolverStatus::ERROR:
 case DNSResolverStatus::OK:
- ent.expiry = ev_now(loop_) + dnsconf.timeout.cache;
+ ent.expiry = std::chrono::steady_clock::now() +
+ util::duration_from(dnsconf.timeout.cache);
 break;
 default:
 break;
@@ -92,7 +93,8 @@
 switch (status) {
 case DNSResolverStatus::ERROR:
 case DNSResolverStatus::OK:
- ent.expiry = ev_now(loop_) + dnsconf.timeout.cache;
+ ent.expiry = std::chrono::steady_clock::now() +
+ util::duration_from(dnsconf.timeout.cache);
 break;
 default:
 break;
@@ -175,7 +177,8 @@
 
 auto &ent = (*it).second;
 
- if (ent.status != DNSResolverStatus::RUNNING && ent.expiry < ev_now(loop_)) {
+ if (ent.status != DNSResolverStatus::RUNNING &&
+ ent.expiry < std::chrono::steady_clock::now()) {
 if (LOG_ENABLED(INFO)) {
 LOG(INFO) << "DNS entry found for " << dnsq->host
 << ", but it has been expired";
@@ -252,9 +255,8 @@
 }
 
 void DNSTracker::add_to_qlist(ResolverEntry &ent, DNSQuery *dnsq) {
- auto loop = loop_;
 ent.resolv->set_complete_cb(
- &ent, loop(DNSResolverStatus status, const Address *result) {
+ &ent(DNSResolverStatus status, const Address *result) {
 auto &qlist = ent.qlist;
 while (!qlist.empty()) {
 auto head = qlist.head;
@@ -269,7 +271,8 @@
 
 ent.resolv.reset();
 ent.status = status;
- ent.expiry = ev_now(loop) + dnsconf.timeout.cache;
+ ent.expiry = std::chrono::steady_clock::now() +
+ util::duration_from(dnsconf.timeout.cache);
 if (ent.status == DNSResolverStatus::OK) {
 ent.result = *result;
 }
@@ -306,7 +309,7 @@
 LOG(INFO) << "Starting removing expired DNS cache entries";
 }
 
- auto now = ev_now(loop_);
+ auto now = std::chrono::steady_clock::now();
 for (auto it = std::begin(ents_); it != std::end(ents_);) {
 auto &ent = (*it).second;
 if (ent.expiry >= now) {

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_dns_tracker.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_dns_tracker.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http2_session.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_http2_session.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http3_upstream.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_http3_upstream.cc Changed

@@ -127,7 +127,7 @@
 ev_timer_init(&timer_, timeoutcb, 0., 0.);
 timer_.data = this;
 
- ngtcp2_connection_close_error_default(&last_error_);
+ ngtcp2_ccerr_default(&last_error_);
 
 ev_timer_init(&shutdown_timer_, shutdown_timeout_cb, 0., 0.);
 shutdown_timer_.data = this;
@@ -287,7 +287,7 @@
 if (nconsumed < 0) {
 ULOG(ERROR, this) << "nghttp3_conn_read_stream: "
 << nghttp3_strerror(nconsumed);
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &last_error_, nghttp3_err_infer_quic_app_error_code(nconsumed), nullptr,
 0);
 return -1;
@@ -333,7 +333,7 @@
 break;
 default:
 ULOG(ERROR, this) << "nghttp3_conn_close_stream: " << nghttp3_strerror(rv);
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &last_error_, nghttp3_err_infer_quic_app_error_code(rv), nullptr, 0);
 return -1;
 }
@@ -479,19 +479,42 @@
 return -1;
 }
 
+ auto path = ngtcp2_conn_get_path(conn_);
+
+ return send_new_token(&path->remote);
+}
+
+namespace {
+int path_validation(ngtcp2_conn *conn, uint32_t flags, const ngtcp2_path *path,
+ const ngtcp2_path *old_path,
+ ngtcp2_path_validation_result res, void *user_data) {
+ if (res != NGTCP2_PATH_VALIDATION_RESULT_SUCCESS ||
+ !(flags & NGTCP2_PATH_VALIDATION_FLAG_NEW_TOKEN)) {
+ return 0;
+ }
+
+ auto upstream = static_cast<Http3Upstream *>(user_data);
+ if (upstream->send_new_token(&path->remote) != 0) {
+ return NGTCP2_ERR_CALLBACK_FAILURE;
+ }
+
+ return 0;
+}
+} // namespace
+
+int Http3Upstream::send_new_token(const ngtcp2_addr *remote_addr) {
 std::array<uint8_t, NGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN + 1> token;
 size_t tokenlen;
 
- auto path = ngtcp2_conn_get_path(conn_);
 auto worker = handler_->get_worker();
 auto conn_handler = worker->get_connection_handler();
 auto &qkms = conn_handler->get_quic_keying_materials();
 auto &qkm = qkms->keying_materials.front();
 
- if (generate_token(token.data(), tokenlen, path->remote.addr,
- path->remote.addrlen, qkm.secret.data(),
+ if (generate_token(token.data(), tokenlen, remote_addr->addr,
+ remote_addr->addrlen, qkm.secret.data(),
 qkm.secret.size()) != 0) {
- return 0;
+ return -1;
 }
 
 assert(tokenlen == NGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN);
@@ -509,8 +532,9 @@
 }
 
 namespace {
-int recv_tx_key(ngtcp2_conn *conn, ngtcp2_crypto_level level, void *user_data) {
- if (level != NGTCP2_CRYPTO_LEVEL_APPLICATION) {
+int recv_tx_key(ngtcp2_conn *conn, ngtcp2_encryption_level level,
+ void *user_data) {
+ if (level != NGTCP2_ENCRYPTION_LEVEL_1RTT) {
 return 0;
 }
 
@@ -554,7 +578,7 @@
 get_new_connection_id,
 remove_connection_id,
 ngtcp2_crypto_update_key_cb,
- nullptr, // path_validation
+ shrpx::path_validation,
 nullptr, // select_preferred_addr
 shrpx::stream_reset,
 shrpx::extend_max_remote_streams_bidi,
@@ -600,8 +624,7 @@
 auto fd = open_qlog_file(quicconf.upstream.qlog.dir, scid);
 if (fd != -1) {
 qlog_fd_ = fd;
- settings.qlog.odcid = initial_hd.dcid;
- settings.qlog.write = shrpx::qlog_write;
+ settings.qlog_write = shrpx::qlog_write;
 }
 }
 
@@ -615,6 +638,8 @@
 settings.rand_ctx.native_handle = &worker->get_randgen();
 settings.token = token;
 settings.tokenlen = tokenlen;
+ settings.initial_pkt_num = std::uniform_int_distribution<uint32_t>(
+ 0, std::numeric_limits<int32_t>::max())(worker->get_randgen());
 
 ngtcp2_transport_params params;
 ngtcp2_transport_params_default(&params);
@@ -629,24 +654,28 @@
 
 #ifdef OPENSSL_IS_BORINGSSL
 if (quicconf.upstream.early_data) {
- ngtcp2_transport_params early_data_params{
- .initial_max_stream_data_bidi_local =
- params.initial_max_stream_data_bidi_local,
- .initial_max_stream_data_bidi_remote =
- params.initial_max_stream_data_bidi_remote,
- .initial_max_stream_data_uni = params.initial_max_stream_data_uni,
- .initial_max_data = params.initial_max_data,
- .initial_max_streams_bidi = params.initial_max_streams_bidi,
- .initial_max_streams_uni = params.initial_max_streams_uni,
- };
+ ngtcp2_transport_params early_data_params;
+
+ ngtcp2_transport_params_default(&early_data_params);
+
+ early_data_params.initial_max_stream_data_bidi_local =
+ params.initial_max_stream_data_bidi_local;
+ early_data_params.initial_max_stream_data_bidi_remote =
+ params.initial_max_stream_data_bidi_remote;
+ early_data_params.initial_max_stream_data_uni =
+ params.initial_max_stream_data_uni;
+ early_data_params.initial_max_data = params.initial_max_data;
+ early_data_params.initial_max_streams_bidi =
+ params.initial_max_streams_bidi;
+ early_data_params.initial_max_streams_uni = params.initial_max_streams_uni;
 
 // TODO include HTTP/3 SETTINGS
 
 std::array<uint8_t, 128> quic_early_data_ctx;
 
- auto quic_early_data_ctxlen = ngtcp2_encode_transport_params(
+ auto quic_early_data_ctxlen = ngtcp2_transport_params_encode(
 quic_early_data_ctx.data(), quic_early_data_ctx.size(),
- NGTCP2_TRANSPORT_PARAMS_TYPE_ENCRYPTED_EXTENSIONS, &early_data_params);
+ &early_data_params);
 
 assert(quic_early_data_ctxlen > 0);
 assert(static_cast<size_t>(quic_early_data_ctxlen) <=
@@ -669,6 +698,8 @@
 params.original_dcid = initial_hd.dcid;
 }
 
+ params.original_dcid_present = 1;
+
 rv = generate_quic_stateless_reset_token(
 params.stateless_reset_token, scid, qkm.secret.data(), qkm.secret.size());
 if (rv != 0) {
@@ -728,10 +759,16 @@
 }
 }
 
+ handler_->get_connection()->wlimit.stopw();
+
 if (write_streams() != 0) {
 return -1;
 }
 
+ if (httpconn_ && nghttp3_conn_is_drained(httpconn_)) {
+ return -1;
+ }
+
 reset_timer();
 
 return 0;
@@ -767,7 +804,7 @@
 if (sveccnt < 0) {
 ULOG(ERROR, this) << "nghttp3_conn_writev_stream: "
 << nghttp3_strerror(sveccnt);
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &last_error_, nghttp3_err_infer_quic_app_error_code(sveccnt),
 nullptr, 0);
 return handle_error();
@@ -802,7 +839,7 @@
 if (rv != 0) {
 ULOG(ERROR, this)
 << "nghttp3_conn_add_write_offset: " << nghttp3_strerror(rv);
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &last_error_, nghttp3_err_infer_quic_app_error_code(rv), nullptr,
 0);
 return handle_error();
@@ -815,8 +852,7 @@
 ULOG(ERROR, this) << "ngtcp2_conn_writev_stream: "
 << ngtcp2_strerror(nwrite);
 
- ngtcp2_connection_close_error_set_transport_error_liberr(
- &last_error_, nwrite, nullptr, 0);
+ ngtcp2_ccerr_set_liberr(&last_error_, nwrite, nullptr, 0);
 
 return handle_error();
 } else if (ndatalen >= 0) {
@@ -824,7 +860,7 @@
 if (rv != 0) {
 ULOG(ERROR, this) << "nghttp3_conn_add_write_offset: "
 << nghttp3_strerror(rv);
- ngtcp2_connection_close_error_set_application_error(
+ ngtcp2_ccerr_set_application_error(
 &last_error_, nghttp3_err_infer_quic_app_error_code(rv), nullptr,
 0);
 return handle_error();
@@ -845,18 +881,12 @@
 on_send_blocked(faddr, prev_ps.path.remote, prev_ps.path.local,
 prev_pi, data, datalen, gso_size);
 
- ngtcp2_conn_update_pkt_tx_time(conn_, ts);
-
 signal_write_upstream_addr(faddr);
-
- return 0;
 }
 }
 
 ngtcp2_conn_update_pkt_tx_time(conn_, ts);
 
- handler_->get_connection()->wlimit.stopw();
-
 return 0;
 }
 
@@ -902,9 +932,9 @@
 if (rv == SHRPX_ERR_SEND_BLOCKED) {
 on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data,
 nwrite, 0);
- }
 
- signal_write_upstream_addr(faddr);
+ signal_write_upstream_addr(faddr);
+ }
 }
 }
 
@@ -924,12 +954,12 @@
 if (rv == SHRPX_ERR_SEND_BLOCKED) {
 on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data, datalen,
 gso_size);
+
+ signal_write_upstream_addr(faddr);
 }
 
 ngtcp2_conn_update_pkt_tx_time(conn_, ts);
 
- signal_write_upstream_addr(faddr);
-
 return 0;
 }
 #else // !UDP_SEGMENT
@@ -954,8 +984,6 @@
 if (++pktcnt == max_pktcnt) {
 ngtcp2_conn_update_pkt_tx_time(conn_, ts);
 
- signal_write_upstream_addr(faddr);
-
 return 0;
 }
 
@@ -1472,7 +1500,7 @@
 auto worker = handler_->get_worker();
 auto quic_conn_handler = worker->get_quic_connection_handler();
 
- std::vector<ngtcp2_cid> scids(ngtcp2_conn_get_num_scid(conn_) + 1);
+ std::vector<ngtcp2_cid> scids(ngtcp2_conn_get_scid(conn_, nullptr) + 1);
 ngtcp2_conn_get_scid(conn_, scids.data());
 scids.back() = hashed_scid_;
 
@@ -1480,23 +1508,26 @@
 quic_conn_handler->remove_connection_id(cid);
 }
 
- if (retry_close_ ||
- last_error_.type ==
- NGTCP2_CONNECTION_CLOSE_ERROR_CODE_TYPE_TRANSPORT_IDLE_CLOSE) {
+ if (retry_close_ || last_error_.type == NGTCP2_CCERR_TYPE_IDLE_CLOSE) {
 return;
 }
 
 // If this is not idle close, send CONNECTION_CLOSE.
- if (!ngtcp2_conn_is_in_closing_period(conn_) &&
- !ngtcp2_conn_is_in_draining_period(conn_)) {
+ if (!ngtcp2_conn_in_closing_period(conn_) &&
+ !ngtcp2_conn_in_draining_period(conn_)) {
 ngtcp2_path_storage ps;
 ngtcp2_pkt_info pi;
 conn_close_.resize(SHRPX_QUIC_CONN_CLOSE_PKTLEN);
 
 ngtcp2_path_storage_zero(&ps);
 
- ngtcp2_connection_close_error ccerr;
- ngtcp2_connection_close_error_default(&ccerr);
+ ngtcp2_ccerr ccerr;
+ ngtcp2_ccerr_default(&ccerr);
+
+ if (worker->get_graceful_shutdown() &&
+ !ngtcp2_conn_get_handshake_completed(conn_)) {
+ ccerr.error_code = NGTCP2_CONNECTION_REFUSED;
+ }
 
 auto nwrite = ngtcp2_conn_write_connection_close(
 conn_, &ps.path, &pi, conn_close_.data(), conn_close_.size(), &ccerr,
@@ -1759,6 +1790,13 @@
 auto worker = handler_->get_worker();
 auto quic_conn_handler = worker->get_quic_connection_handler();
 
+ if (worker->get_graceful_shutdown()) {
+ ngtcp2_ccerr_set_transport_error(&last_error_,
+ NGTCP2_CONNECTION_REFUSED, nullptr, 0);
+
+ return handle_error();
+ }
+
 ngtcp2_version_cid vc;
 
 rv =
@@ -1767,19 +1805,6 @@
 return -1;
 }
 
- if (worker->get_graceful_shutdown()) {
- ngtcp2_cid ini_dcid, ini_scid;
-
- ngtcp2_cid_init(&ini_dcid, vc.dcid, vc.dcidlen);
- ngtcp2_cid_init(&ini_scid, vc.scid, vc.scidlen);
-
- quic_conn_handler->send_connection_close(
- faddr, vc.version, ini_dcid, ini_scid, remote_addr, local_addr,
- NGTCP2_CONNECTION_REFUSED, datalen * 3);
-
- return -1;
- }
-
 retry_close_ = true;
 
 quic_conn_handler->send_retry(handler_->get_upstream_addr(), vc.version,
@@ -1790,7 +1815,7 @@
 }
 case NGTCP2_ERR_CRYPTO:
 if (!last_error_.error_code) {
- ngtcp2_connection_close_error_set_transport_error_tls_alert(
+ ngtcp2_ccerr_set_tls_alert(
 &last_error_, ngtcp2_conn_get_tls_alert(conn_), nullptr, 0);
 }
 break;
@@ -1798,8 +1823,7 @@
 return -1;
 default:
 if (!last_error_.error_code) {
- ngtcp2_connection_close_error_set_transport_error_liberr(
- &last_error_, rv, nullptr, 0);
+ ngtcp2_ccerr_set_liberr(&last_error_, rv, nullptr, 0);
 }
 }
 
@@ -1904,8 +1928,8 @@
 }
 
 int Http3Upstream::handle_error() {
- if (ngtcp2_conn_is_in_closing_period(conn_) ||
- ngtcp2_conn_is_in_draining_period(conn_)) {
+ if (ngtcp2_conn_in_closing_period(conn_) ||
+ ngtcp2_conn_in_draining_period(conn_)) {
 return -1;
 }
 
@@ -1952,8 +1976,7 @@
 } else {
 ULOG(ERROR, this) << "ngtcp2_conn_handle_expiry: " << ngtcp2_strerror(rv);
 }
- ngtcp2_connection_close_error_set_transport_error_liberr(&last_error_, rv,
- nullptr, 0);
+ ngtcp2_ccerr_set_liberr(&last_error_, rv, nullptr, 0);
 return handle_error();
 }
 
@@ -2525,7 +2548,8 @@
 
 int Http3Upstream::http_stop_sending(int64_t stream_id,
 uint64_t app_error_code) {
- auto rv = ngtcp2_conn_shutdown_stream_read(conn_, stream_id, app_error_code);
+ auto rv =
+ ngtcp2_conn_shutdown_stream_read(conn_, 0, stream_id, app_error_code);
 if (ngtcp2_err_is_fatal(rv)) {
 ULOG(ERROR, this) << "ngtcp2_conn_shutdown_stream_read: "
 << ngtcp2_strerror(rv);
@@ -2551,7 +2575,8 @@
 
 int Http3Upstream::http_reset_stream(int64_t stream_id,
 uint64_t app_error_code) {
- auto rv = ngtcp2_conn_shutdown_stream_write(conn_, stream_id, app_error_code);
+ auto rv =
+ ngtcp2_conn_shutdown_stream_write(conn_, 0, stream_id, app_error_code);
 if (ngtcp2_err_is_fatal(rv)) {
 ULOG(ERROR, this) << "ngtcp2_conn_shutdown_stream_write: "
 << ngtcp2_strerror(rv);
@@ -2564,7 +2589,7 @@
 int Http3Upstream::setup_httpconn() {
 int rv;
 
- if (ngtcp2_conn_get_max_local_streams_uni(conn_) < 3) {
+ if (ngtcp2_conn_get_streams_uni_left(conn_) < 3) {
 return -1;
 }
 
@@ -2704,7 +2729,7 @@
 << " with app_error_code=" << app_error_code;
 }
 
- auto rv = ngtcp2_conn_shutdown_stream(conn_, stream_id, app_error_code);
+ auto rv = ngtcp2_conn_shutdown_stream(conn_, 0, stream_id, app_error_code);
 if (rv != 0) {
 ULOG(FATAL, this) << "ngtcp2_conn_shutdown_stream() failed: "
 << ngtcp2_strerror(rv);
@@ -2716,8 +2741,8 @@
 
 int Http3Upstream::shutdown_stream_read(int64_t stream_id,
 uint64_t app_error_code) {
- auto rv =
- ngtcp2_conn_shutdown_stream_read(conn_, stream_id, NGHTTP3_H3_NO_ERROR);
+ auto rv = ngtcp2_conn_shutdown_stream_read(conn_, 0, stream_id,
+ NGHTTP3_H3_NO_ERROR);
 if (ngtcp2_err_is_fatal(rv)) {
 ULOG(FATAL, this) << "ngtcp2_conn_shutdown_stream_read: "
 << ngtcp2_strerror(rv);
@@ -2783,6 +2808,10 @@
 return 0;
 }
 
+ if (!httpconn_) {
+ return -1;
+ }
+
 rv = nghttp3_conn_submit_shutdown_notice(httpconn_);
 if (rv != 0) {
 ULOG(FATAL, this) << "nghttp3_conn_submit_shutdown_notice: "

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http3_upstream.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_http3_upstream.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http_downstream_connection.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_http_downstream_connection.cc Changed

@@ -450,7 +450,7 @@
 ev_set_cb(&conn_.rt, timeoutcb);
 if (conn_.read_timeout < group_->shared_addr->timeout.read) {
 conn_.read_timeout = group_->shared_addr->timeout.read;
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 } else {
 conn_.again_rt(group_->shared_addr->timeout.read);
 }
@@ -875,7 +875,7 @@
 ev_set_cb(&conn_.rt, idle_timeoutcb);
 if (conn_.read_timeout < downstreamconf.timeout.idle_read) {
 conn_.read_timeout = downstreamconf.timeout.idle_read;
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 } else {
 conn_.again_rt(downstreamconf.timeout.idle_read);
 }
@@ -1231,7 +1231,7 @@
 }
 
 int HttpDownstreamConnection::read_clear() {
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 std::array<uint8_t, 16_k> buf;
 int rv;
@@ -1270,7 +1270,7 @@
 }
 
 int HttpDownstreamConnection::write_clear() {
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 auto upstream = downstream_->get_upstream();
 auto input = downstream_->get_request_buf();
@@ -1318,7 +1318,7 @@
 int HttpDownstreamConnection::tls_handshake() {
 ERR_clear_error();
 
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 auto rv = conn_.tls_handshake();
 if (rv == SHRPX_ERR_INPROGRESS) {
@@ -1360,7 +1360,7 @@
 }
 
 int HttpDownstreamConnection::read_tls() {
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 ERR_clear_error();
 
@@ -1401,7 +1401,7 @@
 }
 
 int HttpDownstreamConnection::write_tls() {
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 ERR_clear_error();

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_https_upstream.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_https_upstream.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_live_check.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_live_check.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_memcached_connection.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_memcached_connection.cc Changed

@@ -259,7 +259,7 @@
 int MemcachedConnection::tls_handshake() {
 ERR_clear_error();
 
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 auto rv = conn_.tls_handshake();
 if (rv == SHRPX_ERR_INPROGRESS) {
@@ -301,7 +301,7 @@
 return 0;
 }
 
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 std::array<struct iovec, MAX_WR_IOVCNT> iov;
 std::array<uint8_t, 16_k> buf;
@@ -340,7 +340,7 @@
 return 0;
 }
 
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 for (;;) {
 auto nread = conn_.read_tls(recvbuf_.last, recvbuf_.wleft());
@@ -368,7 +368,7 @@
 return 0;
 }
 
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 std::array<struct iovec, MAX_WR_IOVCNT> iov;
 
@@ -396,7 +396,7 @@
 return 0;
 }
 
- conn_.last_read = ev_now(conn_.loop);
+ conn_.last_read = std::chrono::steady_clock::now();
 
 for (;;) {
 auto nread = conn_.read_clear(recvbuf_.last, recvbuf_.wleft());

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_quic_connection_handler.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_quic_connection_handler.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_quic_listener.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_quic_listener.cc Changed

@@ -59,8 +59,9 @@
 msg.msg_iov = &msg_iov;
 msg.msg_iovlen = 1;
 
- uint8_t
- msg_ctrlCMSG_SPACE(sizeof(uint8_t)) + CMSG_SPACE(sizeof(in6_pktinfo));
+ uint8_t msg_ctrlCMSG_SPACE(sizeof(uint8_t)) +
+ CMSG_SPACE(sizeof(in6_pktinfo)) +
+ CMSG_SPACE(sizeof(uint16_t));
 msg.msg_control = msg_ctrl;
 
 auto quic_conn_handler = worker_->get_quic_connection_handler();
@@ -74,11 +75,11 @@
 return;
 }
 
- ++pktcnt;
-
 Address local_addr{};
 if (util::msghdr_get_local_addr(local_addr, &msg, su.storage.ss_family) !=
 0) {
+ ++pktcnt;
+
 continue;
 }
 
@@ -88,24 +89,44 @@
 .ecn = util::msghdr_get_ecn(&msg, su.storage.ss_family),
 };
 
- if (LOG_ENABLED(INFO)) {
- LOG(INFO) << "QUIC received packet: local="
- << util::to_numeric_addr(&local_addr)
- << " remote=" << util::to_numeric_addr(&su.sa, msg.msg_namelen)
- << " ecn=" << log::hex << pi.ecn << log::dec << " " << nread
- << " bytes";
+ auto gso_size = util::msghdr_get_udp_gro(&msg);
+ if (gso_size == 0) {
+ gso_size = static_cast<size_t>(nread);
 }
 
- if (nread == 0) {
- continue;
- }
+ auto data = buf.data();
+
+ for (;;) {
+ auto datalen = std::min(static_cast<size_t>(nread), gso_size);
+
+ ++pktcnt;
 
- Address remote_addr;
- remote_addr.su = su;
- remote_addr.len = msg.msg_namelen;
+ if (LOG_ENABLED(INFO)) {
+ LOG(INFO) << "QUIC received packet: local="
+ << util::to_numeric_addr(&local_addr) << " remote="
+ << util::to_numeric_addr(&su.sa, msg.msg_namelen)
+ << " ecn=" << log::hex << pi.ecn << log::dec << " " << datalen
+ << " bytes";
+ }
 
- quic_conn_handler->handle_packet(faddr_, remote_addr, local_addr, pi,
- buf.data(), nread);
+ if (datalen == 0) {
+ break;
+ }
+
+ Address remote_addr;
+ remote_addr.su = su;
+ remote_addr.len = msg.msg_namelen;
+
+ quic_conn_handler->handle_packet(faddr_, remote_addr, local_addr, pi,
+ data, datalen);
+
+ nread -= datalen;
+ if (nread == 0) {
+ break;
+ }
+
+ data += datalen;
+ }
 }
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_tls.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_tls.cc Changed

@@ -64,9 +64,9 @@
 #ifdef ENABLE_HTTP3
 # include <ngtcp2/ngtcp2.h>
 # include <ngtcp2/ngtcp2_crypto.h>
-# ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
-# include <ngtcp2/ngtcp2_crypto_openssl.h>
-# endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+# ifdef HAVE_LIBNGTCP2_CRYPTO_QUICTLS
+# include <ngtcp2/ngtcp2_crypto_quictls.h>
+# endif // HAVE_LIBNGTCP2_CRYPTO_QUICTLS
 # ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 # include <ngtcp2/ngtcp2_crypto_boringssl.h>
 # endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
@@ -90,6 +90,7 @@
 #include "timegm.h"
 
 using namespace nghttp2;
+using namespace std::chrono_literals;
 
 namespace shrpx {
 
@@ -383,7 +384,7 @@
 }
 
 try_cache_tls_session(conn->tls.client_session_cache, session,
- ev_now(conn->loop));
+ std::chrono::steady_clock::now());
 
 return 0;
 }
@@ -1257,12 +1258,12 @@
 
 SSL_CTX_set_options(ssl_ctx, ssl_opts);
 
-# ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
- if (ngtcp2_crypto_openssl_configure_server_context(ssl_ctx) != 0) {
- LOG(FATAL) << "ngtcp2_crypto_openssl_configure_server_context failed";
+# ifdef HAVE_LIBNGTCP2_CRYPTO_QUICTLS
+ if (ngtcp2_crypto_quictls_configure_server_context(ssl_ctx) != 0) {
+ LOG(FATAL) << "ngtcp2_crypto_quictls_configure_server_context failed";
 DIE();
 }
-# endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+# endif // HAVE_LIBNGTCP2_CRYPTO_QUICTLS
 # ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 if (ngtcp2_crypto_boringssl_configure_server_context(ssl_ctx) != 0) {
 LOG(FATAL) << "ngtcp2_crypto_boringssl_configure_server_context failed";
@@ -1813,16 +1814,18 @@
 }
 } // namespace
 
-namespace {
 int verify_numeric_hostname(X509 *cert, const StringRef &hostname,
 const Address *addr) {
 const void *saddr;
+ size_t saddrlen;
 switch (addr->su.storage.ss_family) {
 case AF_INET:
 saddr = &addr->su.in.sin_addr;
+ saddrlen = sizeof(addr->su.in.sin_addr);
 break;
 case AF_INET6:
 saddr = &addr->su.in6.sin6_addr;
+ saddrlen = sizeof(addr->su.in6.sin6_addr);
 break;
 default:
 return -1;
@@ -1847,7 +1850,7 @@
 size_t ip_addrlen = altname->d.iPAddress->length;
 
 ip_found = true;
- if (addr->len == ip_addrlen && memcmp(saddr, ip_addr, ip_addrlen) == 0) {
+ if (saddrlen == ip_addrlen && memcmp(saddr, ip_addr, ip_addrlen) == 0) {
 return 0;
 }
 }
@@ -1872,15 +1875,8 @@
 
 return -1;
 }
-} // namespace
-
-namespace {
-int verify_hostname(X509 *cert, const StringRef &hostname,
- const Address *addr) {
- if (util::numeric_host(hostname.c_str())) {
- return verify_numeric_hostname(cert, hostname, addr);
- }
 
+int verify_dns_hostname(X509 *cert, const StringRef &hostname) {
 auto altnames = static_cast<GENERAL_NAMES *>(
 X509_get_ext_d2i(cert, NID_subject_alt_name, nullptr, nullptr));
 if (altnames) {
@@ -1948,6 +1944,16 @@
 
 return rv ? 0 : -1;
 }
+
+namespace {
+int verify_hostname(X509 *cert, const StringRef &hostname,
+ const Address *addr) {
+ if (util::numeric_host(hostname.c_str())) {
+ return verify_numeric_hostname(cert, hostname, addr);
+ }
+
+ return verify_dns_hostname(cert, hostname);
+}
 } // namespace
 
 int check_cert(SSL *ssl, const Address *addr, const StringRef &host) {
@@ -2422,8 +2428,8 @@
 } // namespace
 
 void try_cache_tls_session(TLSSessionCache *cache, SSL_SESSION *session,
- ev_tstamp t) {
- if (cache->last_updated + 1_min > t) {
+ const std::chrono::steady_clock::time_point &t) {
+ if (cache->last_updated + 1min > t) {
 if (LOG_ENABLED(INFO)) {
 LOG(INFO) << "Client session cache entry is still fresh.";
 }
@@ -2432,7 +2438,7 @@
 
 if (LOG_ENABLED(INFO)) {
 LOG(INFO) << "Update client cache entry "
- << "timestamp = " << t;
+ << "timestamp = " << t.time_since_epoch().count();
 }
 
 cache->session_data = serialize_ssl_session(session);
@@ -2593,13 +2599,6 @@
 return get_x509_name(balloc, X509_get_issuer_name(x));
 }
 
-#ifdef WORDS_BIGENDIAN
-# define bswap64(N) (N)
-#else /* !WORDS_BIGENDIAN */
-# define bswap64(N) \
- ((uint64_t)(ntohl((uint32_t)(N))) << 32 | ntohl((uint32_t)((N) >> 32)))
-#endif /* !WORDS_BIGENDIAN */
-
 StringRef get_x509_serial(BlockAllocator &balloc, X509 *x) {
 auto sn = X509_get_serialNumber(x);
 auto bn = BN_new();

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_tls.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_tls.h Changed

@@ -58,7 +58,7 @@
 // i2d_SSL_SESSION(3SSL).
 std::vector<uint8_t> session_data;
 // The last time stamp when this cache entry is created or updated.
- ev_tstamp last_updated;
+ std::chrono::steady_clock::time_point last_updated;
 };
 
 // This struct stores the additional information per SSL_CTX. This is
@@ -122,6 +122,16 @@
 // point to &addr->addr.
 int check_cert(SSL *ssl, const DownstreamAddr *addr, const Address *raddr);
 
+// Verify |cert| using numeric IP address. |hostname| and |addr|
+// should contain the same numeric IP address. This function returns
+// 0 if it succeeds, or -1.
+int verify_numeric_hostname(X509 *cert, const StringRef &hostname,
+ const Address *addr);
+
+// Verify |cert| using DNS name hostname. This function returns 0 if
+// it succeeds, or -1.
+int verify_dns_hostname(X509 *cert, const StringRef &hostname);
+
 struct WildcardRevPrefix {
 WildcardRevPrefix(const StringRef &prefix, size_t idx)
 : prefix(std::begin(prefix), std::end(prefix)), idx(idx) {}
@@ -273,7 +283,7 @@
 // Depending on the existing cache's time stamp, |session| might not
 // be cached.
 void try_cache_tls_session(TLSSessionCache *cache, SSL_SESSION *session,
- ev_tstamp t);
+ const std::chrono::steady_clock::time_point &t);
 
 // Returns cached session associated |addr|. If no cache entry is
 // found associated to |addr|, nullptr will be returned.

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_tls_test.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_tls_test.cc Changed

@@ -194,4 +194,146 @@
   CU_ASSERT(!tls_hostname_match_wrapper("example.com", "www.example.com"));
 }
 
+static X509 *load_cert(const char *path) {
+  auto f = fopen(path, "r");
+  auto cert = PEM_read_X509(f, nullptr, nullptr, nullptr);
+
+  fclose(f);
+
+  return cert;
+}
+
+static Address parse_addr(const char *ipaddr) {
+  addrinfo hints{};
+
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
+
+  addrinfo *res = nullptr;
+
+  auto rv = getaddrinfo(ipaddr, "443", &hints, &res);
+
+  CU_ASSERT(0 == rv);
+  CU_ASSERT(nullptr != res);
+
+  Address addr;
+  addr.len = res->ai_addrlen;
+  memcpy(&addr.su, res->ai_addr, res->ai_addrlen);
+
+  freeaddrinfo(res);
+
+  return addr;
+}
+
+void test_shrpx_tls_verify_numeric_hostname(void) {
+  {
+    // Successful IPv4 address match in SAN
+    static constexpr char ipaddr = "127.0.0.1";
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/verify_hostname.crt");
+    auto addr = parse_addr(ipaddr);
+    auto rv =
+        tls::verify_numeric_hostname(cert, StringRef::from_lit(ipaddr), &addr);
+
+    CU_ASSERT(0 == rv);
+
+    X509_free(cert);
+  }
+
+  {
+    // Successful IPv6 address match in SAN
+    static constexpr char ipaddr = "::1";
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/verify_hostname.crt");
+    auto addr = parse_addr(ipaddr);
+    auto rv =
+        tls::verify_numeric_hostname(cert, StringRef::from_lit(ipaddr), &addr);
+
+    CU_ASSERT(0 == rv);
+
+    X509_free(cert);
+  }
+
+  {
+    // Unsuccessful IPv4 address match in SAN
+    static constexpr char ipaddr = "192.168.0.127";
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/verify_hostname.crt");
+    auto addr = parse_addr(ipaddr);
+    auto rv =
+        tls::verify_numeric_hostname(cert, StringRef::from_lit(ipaddr), &addr);
+
+    CU_ASSERT(-1 == rv);
+
+    X509_free(cert);
+  }
+
+  {
+    // CommonName is not used if SAN is available
+    static constexpr char ipaddr = "192.168.0.1";
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/ipaddr.crt");
+    auto addr = parse_addr(ipaddr);
+    auto rv =
+        tls::verify_numeric_hostname(cert, StringRef::from_lit(ipaddr), &addr);
+
+    CU_ASSERT(-1 == rv);
+
+    X509_free(cert);
+  }
+
+  {
+    // Successful IPv4 address match in CommonName
+    static constexpr char ipaddr = "127.0.0.1";
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/nosan_ip.crt");
+    auto addr = parse_addr(ipaddr);
+    auto rv =
+        tls::verify_numeric_hostname(cert, StringRef::from_lit(ipaddr), &addr);
+
+    CU_ASSERT(0 == rv);
+
+    X509_free(cert);
+  }
+}
+
+void test_shrpx_tls_verify_dns_hostname(void) {
+  {
+    // Successful exact DNS name match in SAN
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/verify_hostname.crt");
+    auto rv = tls::verify_dns_hostname(
+        cert, StringRef::from_lit("nghttp2.example.com"));
+
+    CU_ASSERT(0 == rv);
+
+    X509_free(cert);
+  }
+
+  {
+    // Successful wildcard DNS name match in SAN
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/verify_hostname.crt");
+    auto rv = tls::verify_dns_hostname(
+        cert, StringRef::from_lit("www.nghttp2.example.com"));
+
+    CU_ASSERT(0 == rv);
+
+    X509_free(cert);
+  }
+
+  {
+    // CommonName is not used if SAN is available.
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/verify_hostname.crt");
+    auto rv = tls::verify_dns_hostname(cert, StringRef::from_lit("localhost"));
+
+    CU_ASSERT(-1 == rv);
+
+    X509_free(cert);
+  }
+
+  {
+    // Successful DNS name match in CommonName
+    auto cert = load_cert(NGHTTP2_SRC_DIR "/testdata/nosan.crt");
+    auto rv = tls::verify_dns_hostname(cert, StringRef::from_lit("localhost"));
+
+    CU_ASSERT(0 == rv);
+
+    X509_free(cert);
+  }
+}
+
 } // namespace shrpx

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_tls_test.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_tls_test.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_worker.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_worker.cc Changed

@@ -27,6 +27,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif // HAVE_UNISTD_H
+#include <netinet/udp.h>
 
 #include <cstdio>
 #include <memory>
@@ -892,6 +893,16 @@
 # endif // defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
 }
 
+# ifdef UDP_GRO
+ if (setsockopt(fd, IPPROTO_UDP, UDP_GRO, &val, sizeof(val)) == -1) {
+ auto error = errno;
+ LOG(WARN) << "Failed to set UDP_GRO option to listener socket: "
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
+ close(fd);
+ continue;
+ }
+# endif // UDP_GRO
+
 if (bind(fd, rp->ai_addr, rp->ai_addrlen) == -1) {
 auto error = errno;
 LOG(WARN) << "bind() syscall failed: "
@@ -919,8 +930,9 @@
 
 rv = bpf_object__load(obj);
 if (rv != 0) {
+ auto error = errno;
 LOG(FATAL) << "Failed to load bpf object file: "
- << xsi_strerror(-rv, errbuf.data(), errbuf.size());
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
 close(fd);
 return -1;
 }
@@ -938,9 +950,9 @@
 
 ref.obj = obj;
 
- auto reuseport_array =
+ ref.reuseport_array =
 bpf_object__find_map_by_name(obj, "reuseport_array");
- if (!reuseport_array) {
+ if (!ref.reuseport_array) {
 auto error = errno;
 LOG(FATAL) << "Failed to get reuseport_array: "
 << xsi_strerror(error, errbuf.data(), errbuf.size());
@@ -948,10 +960,8 @@
 return -1;
 }
 
- ref.reuseport_array = bpf_map__fd(reuseport_array);
-
- auto cid_prefix_map = bpf_object__find_map_by_name(obj, "cid_prefix_map");
- if (!cid_prefix_map) {
+ ref.cid_prefix_map = bpf_object__find_map_by_name(obj, "cid_prefix_map");
+ if (!ref.cid_prefix_map) {
 auto error = errno;
 LOG(FATAL) << "Failed to get cid_prefix_map: "
 << xsi_strerror(error, errbuf.data(), errbuf.size());
@@ -959,8 +969,6 @@
 return -1;
 }
 
- ref.cid_prefix_map = bpf_map__fd(cid_prefix_map);
-
 auto sk_info = bpf_object__find_map_by_name(obj, "sk_info");
 if (!sk_info) {
 auto error = errno;
@@ -973,11 +981,12 @@
 constexpr uint32_t zero = 0;
 uint64_t num_socks = config->num_worker;
 
- rv =
- bpf_map_update_elem(bpf_map__fd(sk_info), &zero, &num_socks, BPF_ANY);
+ rv = bpf_map__update_elem(sk_info, &zero, sizeof(zero), &num_socks,
+ sizeof(num_socks), BPF_ANY);
 if (rv != 0) {
+ auto error = errno;
 LOG(FATAL) << "Failed to update sk_info: "
- << xsi_strerror(-rv, errbuf.data(), errbuf.size());
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
 close(fd);
 return -1;
 }
@@ -988,20 +997,25 @@
 auto &qkms = conn_handler_->get_quic_keying_materials();
 auto &qkm = qkms->keying_materials.front();
 
- rv = bpf_map_update_elem(bpf_map__fd(sk_info), &key_high_idx,
- qkm.cid_encryption_key.data(), BPF_ANY);
+ rv = bpf_map__update_elem(sk_info, &key_high_idx, sizeof(key_high_idx),
+ qkm.cid_encryption_key.data(),
+ qkm.cid_encryption_key.size() / 2, BPF_ANY);
 if (rv != 0) {
+ auto error = errno;
 LOG(FATAL) << "Failed to update key_high_idx sk_info: "
- << xsi_strerror(-rv, errbuf.data(), errbuf.size());
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
 close(fd);
 return -1;
 }
 
- rv = bpf_map_update_elem(bpf_map__fd(sk_info), &key_low_idx,
- qkm.cid_encryption_key.data() + 8, BPF_ANY);
+ rv = bpf_map__update_elem(sk_info, &key_low_idx, sizeof(key_low_idx),
+ qkm.cid_encryption_key.data() +
+ qkm.cid_encryption_key.size() / 2,
+ qkm.cid_encryption_key.size() / 2, BPF_ANY);
 if (rv != 0) {
+ auto error = errno;
 LOG(FATAL) << "Failed to update key_low_idx sk_info: "
- << xsi_strerror(-rv, errbuf.data(), errbuf.size());
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
 close(fd);
 return -1;
 }
@@ -1021,20 +1035,23 @@
 const auto &ref = quic_bpf_refsfaddr.index;
 auto sk_index = compute_sk_index();
 
- rv =
- bpf_map_update_elem(ref.reuseport_array, &sk_index, &fd, BPF_NOEXIST);
+ rv = bpf_map__update_elem(ref.reuseport_array, &sk_index,
+ sizeof(sk_index), &fd, sizeof(fd), BPF_NOEXIST);
 if (rv != 0) {
+ auto error = errno;
 LOG(FATAL) << "Failed to update reuseport_array: "
- << xsi_strerror(-rv, errbuf.data(), errbuf.size());
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
 close(fd);
 return -1;
 }
 
- rv = bpf_map_update_elem(ref.cid_prefix_map, cid_prefix_.data(),
- &sk_index, BPF_NOEXIST);
+ rv = bpf_map__update_elem(ref.cid_prefix_map, cid_prefix_.data(),
+ cid_prefix_.size(), &sk_index, sizeof(sk_index),
+ BPF_NOEXIST);
 if (rv != 0) {
+ auto error = errno;
 LOG(FATAL) << "Failed to update cid_prefix_map: "
- << xsi_strerror(-rv, errbuf.data(), errbuf.size());
+ << xsi_strerror(error, errbuf.data(), errbuf.size());
 close(fd);
 return -1;
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_worker_process.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_worker_process.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_worker_process.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/shrpx_worker_process.h Changed

_service:tar_scm:nghttp2-1.55.1.tar.xz/src/testdata Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/src/testdata/Makefile.am Added

@@ -0,0 +1,27 @@
+# nghttp2 - HTTP/2 C Library
+
+# Copyright (c) 2023 Tatsuhiro Tsujikawa
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+EXTRA_DIST = \
+	ipaddr.crt \
+	nosan.crt \
+	nosan_ip.crt \
+	verify_hostname.crt

_service:tar_scm:nghttp2-1.55.1.tar.xz/src/testdata/Makefile.in Added

@@ -0,0 +1,540 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# nghttp2 - HTTP/2 C Library
+
+# Copyright (c) 2023 Tatsuhiro Tsujikawa
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/testdata
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLDFLAGS = @APPLDFLAGS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BPFCFLAGS = @BPFCFLAGS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CUNIT_CFLAGS = @CUNIT_CFLAGS@
+CUNIT_LIBS = @CUNIT_LIBS@
+CXX = @CXX@
+CXX1XCXXFLAGS = @CXX1XCXXFLAGS@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+EXTRABPFCFLAGS = @EXTRABPFCFLAGS@
+EXTRACFLAG = @EXTRACFLAG@
+EXTRA_DEFS = @EXTRA_DEFS@
+FGREP = @FGREP@
+FILECMD = @FILECMD@
+GREP = @GREP@
+HAVE_CXX14 = @HAVE_CXX14@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
+JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@
+JEMALLOC_LIBS = @JEMALLOC_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBBPF_CFLAGS = @LIBBPF_CFLAGS@
+LIBBPF_LIBS = @LIBBPF_LIBS@
+LIBCARES_CFLAGS = @LIBCARES_CFLAGS@
+LIBCARES_LIBS = @LIBCARES_LIBS@
+LIBEVENT_OPENSSL_CFLAGS = @LIBEVENT_OPENSSL_CFLAGS@
+LIBEVENT_OPENSSL_LIBS = @LIBEVENT_OPENSSL_LIBS@
+LIBEV_CFLAGS = @LIBEV_CFLAGS@
+LIBEV_LIBS = @LIBEV_LIBS@
+LIBMRUBY_CFLAGS = @LIBMRUBY_CFLAGS@
+LIBMRUBY_LIBS = @LIBMRUBY_LIBS@
+LIBNGHTTP3_CFLAGS = @LIBNGHTTP3_CFLAGS@
+LIBNGHTTP3_LIBS = @LIBNGHTTP3_LIBS@
+LIBNGTCP2_CFLAGS = @LIBNGTCP2_CFLAGS@
+LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS = @LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@
+LIBNGTCP2_CRYPTO_BORINGSSL_LIBS = @LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@
+LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS = @LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@
+LIBNGTCP2_CRYPTO_QUICTLS_LIBS = @LIBNGTCP2_CRYPTO_QUICTLS_LIBS@
+LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_LDFLAGS = @LIBTOOL_LDFLAGS@
+LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+LIBXML2_LIBS = @LIBXML2_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_VERSION_NUM = @PACKAGE_VERSION_NUM@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
+TESTLDADD = @TESTLDADD@
+VERSION = @VERSION@
+WARNCFLAGS = @WARNCFLAGS@
+WARNCXXFLAGS = @WARNCXXFLAGS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+EXTRA_DIST = \
+	ipaddr.crt \
+	nosan.crt \
+	nosan_ip.crt \
+	verify_hostname.crt
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/testdata/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/testdata/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions 3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

_service:tar_scm:nghttp2-1.55.1.tar.xz/src/testdata/ipaddr.crt Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/src/testdata/nosan.crt Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/src/testdata/nosan_ip.crt Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/src/testdata/verify_hostname.crt Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/util.cc -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/util.cc Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/src/util.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/src/util.h Changed

@@ -47,6 +47,10 @@
 #include <map>
 #include <random>
 
+#ifdef HAVE_LIBEV
+# include <ev.h>
+#endif // HAVE_LIBEV
+
 #include "url-parser/url_parser.h"
 
 #include "template.h"
@@ -695,6 +699,17 @@
 return duration.count();
 }
 
+#ifdef HAVE_LIBEV
+template <typename Duration = std::chrono::steady_clock::duration>
+Duration duration_from(ev_tstamp d) {
+ return std::chrono::duration_cast<Duration>(std::chrono::duration<double>(d));
+}
+
+template <typename Duration> ev_tstamp ev_tstamp_from(const Duration &d) {
+ return std::chrono::duration<double>(d).count();
+}
+#endif // HAVE_LIBEV
+
 int make_socket_closeonexec(int fd);
 int make_socket_nonblocking(int fd);
 int make_socket_nodelay(int fd);
@@ -944,6 +959,10 @@
 
 unsigned int msghdr_get_ecn(msghdr *msg, int family);
 
+// msghdr_get_udp_gro returns UDP_GRO value from |msg|. If UDP_GRO is
+// not found, or UDP_GRO is not supported, this function returns 0.
+size_t msghdr_get_udp_gro(msghdr *msg);
+
 int fd_set_send_ecn(int fd, int family, unsigned int ecn);
 #endif // ENABLE_HTTP3

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/failmalloc_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/failmalloc_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/main.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/main.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_buf_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_buf_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_extpri_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_extpri_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_frame_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_frame_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_helper_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_helper_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_http_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_http_test.c Changed

@@ -25,6 +25,7 @@
 */
 #include "nghttp2_http_test.h"
 
+#include <stdio.h>
 #include <assert.h>
 
 #include <CUnit/CUnit.h>
@@ -203,453 +204,3 @@
 CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
 }
 }
-
-void test_nghttp2_sf_parse_item(void) {
- {
- nghttp2_sf_value val;
- const uint8_t s = "?1";
- val.type = 0xff;
-
- CU_ASSERT(2 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BOOLEAN == val.type);
- CU_ASSERT(1 == val.b);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "?1 ";
- val.type = 0xff;
-
- CU_ASSERT(2 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BOOLEAN == val.type);
- CU_ASSERT(1 == val.b);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "?1;foo=bar";
- val.type = 0xff;
-
- CU_ASSERT(10 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BOOLEAN == val.type);
- CU_ASSERT(1 == val.b);
- }
-
- {
- const uint8_t s = {'?', '1', ';', 'f', 'o', 'o', '='};
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s)));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "?0";
- val.type = 0xff;
-
- CU_ASSERT(2 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BOOLEAN == val.type);
- CU_ASSERT(0 == val.b);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "?0 ";
- val.type = 0xff;
-
- CU_ASSERT(2 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BOOLEAN == val.type);
- CU_ASSERT(0 == val.b);
- }
-
- {
- const uint8_t s = "?2";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "?";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "?1";
-
- CU_ASSERT(2 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = ":cHJldGVuZCB0aGlzIGlzIGJpbmFyeSBjb250ZW50Lg==:";
- val.type = 0xff;
-
- CU_ASSERT(46 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BYTESEQ == val.type);
- CU_ASSERT(44 == val.s.len);
- CU_ASSERT(0 == memcmp("cHJldGVuZCB0aGlzIGlzIGJpbmFyeSBjb250ZW50Lg==",
- val.s.base, val.s.len));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = ":cHJldGVuZCB0aGlzIGlzIGJpbmFyeSBjb250ZW50Lg==: ";
- val.type = 0xff;
-
- CU_ASSERT(46 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BYTESEQ == val.type);
- CU_ASSERT(44 == val.s.len);
- CU_ASSERT(0 == memcmp("cHJldGVuZCB0aGlzIGlzIGJpbmFyeSBjb250ZW50Lg==",
- val.s.base, val.s.len));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "::";
- val.type = 0xff;
-
- CU_ASSERT(2 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BYTESEQ == val.type);
- CU_ASSERT(0 == val.s.len);
- }
-
- {
- const uint8_t s = ":cHJldGVuZCB0aGlzIGlzIGJpbmFyeSBjb250ZW50Lg==";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = ":";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = ":@:";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = ":foo:";
-
- CU_ASSERT(5 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s =
- ":abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=:";
- val.type = 0xff;
-
- CU_ASSERT(67 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_BYTESEQ == val.type);
- CU_ASSERT(65 == val.s.len);
- CU_ASSERT(
- 0 ==
- memcmp(
- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=",
- val.s.base, val.s.len));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "foo123/456";
- val.type = 0xff;
-
- CU_ASSERT(10 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_TOKEN == val.type);
- CU_ASSERT(10 == val.s.len);
- CU_ASSERT(0 == memcmp(s, val.s.base, val.s.len));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "foo123/456 ";
- val.type = 0xff;
-
- CU_ASSERT(10 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_TOKEN == val.type);
- CU_ASSERT(10 == val.s.len);
- CU_ASSERT(0 == memcmp(s, val.s.base, val.s.len));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "*";
- val.type = 0xff;
-
- CU_ASSERT(1 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_TOKEN == val.type);
- CU_ASSERT(1 == val.s.len);
- CU_ASSERT(0 == memcmp(s, val.s.base, val.s.len));
- }
-
- {
- const uint8_t s = "*";
-
- CU_ASSERT(1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "\"hello world\"";
- val.type = 0xff;
-
- CU_ASSERT(13 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_STRING == val.type);
- CU_ASSERT(11 == val.s.len);
- CU_ASSERT(0 == memcmp("hello world", val.s.base, val.s.len));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "\"hello world\" ";
- val.type = 0xff;
-
- CU_ASSERT(13 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_STRING == val.type);
- CU_ASSERT(11 == val.s.len);
- CU_ASSERT(0 == memcmp("hello world", val.s.base, val.s.len));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "\"foo\\\"\\\\\"";
- val.type = 0xff;
-
- CU_ASSERT(9 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_STRING == val.type);
- CU_ASSERT(7 == val.s.len);
- CU_ASSERT(0 == memcmp("foo\\\"\\\\", val.s.base, val.s.len));
- }
-
- {
- const uint8_t s = "\"foo\\x\"";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "\"foo";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "\"\x7f\"";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "\"\x1f\"";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "\"foo\"";
-
- CU_ASSERT(5 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "4.5";
- val.type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
-
- CU_ASSERT(3 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_DECIMAL == val.type);
- CU_ASSERT(fabs(4.5 - val.d) < 1e-9);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "4.5 ";
- val.type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
-
- CU_ASSERT(3 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_DECIMAL == val.type);
- CU_ASSERT(fabs(4.5 - val.d) < 1e-9);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "-4.5";
- val.type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
-
- CU_ASSERT(4 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_DECIMAL == val.type);
- CU_ASSERT(fabs(-4.5 - val.d) < 1e-9);
- }
-
- {
- const uint8_t s = "4.5";
-
- CU_ASSERT(3 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "123456789012.123";
- val.type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
-
- CU_ASSERT(16 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_DECIMAL == val.type);
- CU_ASSERT(fabs(123456789012.123 - val.d) < 1e-9);
- }
-
- {
- const uint8_t s = "1123456789012.123";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "123456789012.1234";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "1.";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "123456789012345";
- val.type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
-
- CU_ASSERT(15 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INTEGER == val.type);
- CU_ASSERT(123456789012345 == val.i);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "1 ";
- val.type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
-
- CU_ASSERT(1 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INTEGER == val.type);
- CU_ASSERT(1 == val.i);
- }
-
- {
- const uint8_t s = "1";
-
- CU_ASSERT(1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "1234567890123456";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "\"foo\";a; b=\"bar\";c=1.3;d=9;e=baz;f=:aaa:";
- val.type = 0xff;
-
- CU_ASSERT(41 == nghttp2_sf_parse_item(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_STRING == val.type);
- CU_ASSERT(0 == memcmp("foo", val.s.base, val.s.len));
- }
-
- {
- const uint8_t s = "\"foo\";a; b=\"bar";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "foo;";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_item(NULL, s, s + sizeof(s) - 1));
- }
-}
-
-void test_nghttp2_sf_parse_inner_list(void) {
- {
- nghttp2_sf_value val;
- const uint8_t s = "()";
- val.type = 0xff;
-
- CU_ASSERT(2 == nghttp2_sf_parse_inner_list(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INNER_LIST == val.type);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "( )";
- val.type = 0xff;
-
- CU_ASSERT(7 == nghttp2_sf_parse_inner_list(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INNER_LIST == val.type);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "(a)";
- val.type = 0xff;
-
- CU_ASSERT(3 == nghttp2_sf_parse_inner_list(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INNER_LIST == val.type);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "(a b)";
- val.type = 0xff;
-
- CU_ASSERT(5 == nghttp2_sf_parse_inner_list(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INNER_LIST == val.type);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "( a b )";
- val.type = 0xff;
-
- CU_ASSERT(10 == nghttp2_sf_parse_inner_list(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INNER_LIST == val.type);
- }
-
- {
- nghttp2_sf_value val;
- const uint8_t s = "( a;foo=bar)";
- val.type = 0xff;
-
- CU_ASSERT(12 == nghttp2_sf_parse_inner_list(&val, s, s + sizeof(s) - 1));
- CU_ASSERT(NGHTTP2_SF_VALUE_TYPE_INNER_LIST == val.type);
- }
-
- {
- const uint8_t s = "(";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_inner_list(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "(a";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_inner_list(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "(a ";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_inner_list(NULL, s, s + sizeof(s) - 1));
- }
-
- {
- const uint8_t s = "(a;b";
-
- CU_ASSERT(-1 == nghttp2_sf_parse_inner_list(NULL, s, s + sizeof(s) - 1));
- }
-}

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_http_test.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_http_test.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_map_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_map_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_npn_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_npn_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_pq_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_pq_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_queue_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_queue_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_session_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_session_test.c Changed

@@ -572,8 +572,7 @@
 }
 
 static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                                    nghttp2_error_code error_code,
-                                    void *user_data) {
+                                    uint32_t error_code, void *user_data) {
   my_user_data *my_data = (my_user_data *)user_data;
   (void)session;
   (void)stream_id;
@@ -585,6 +584,15 @@
   return 0;
 }
 
+static int fatal_error_on_stream_close_callback(nghttp2_session *session,
+                                                int32_t stream_id,
+                                                uint32_t error_code,
+                                                void *user_data) {
+  on_stream_close_callback(session, stream_id, error_code, user_data);
+
+  return NGHTTP2_ERR_CALLBACK_FAILURE;
+}
+
 static ssize_t pack_extension_callback(nghttp2_session *session, uint8_t *buf,
                                        size_t len, const nghttp2_frame *frame,
                                        void *user_data) {
@@ -4297,6 +4305,8 @@
   nghttp2_frame frame;
   int i;
   nghttp2_mem *mem;
+  const uint8_t *data;
+  ssize_t datalen;
 
   mem = nghttp2_mem_default();
   user_data.frame_recv_cb_called = 0;
@@ -4338,6 +4348,29 @@
 
   nghttp2_frame_goaway_free(&frame.goaway, mem);
   nghttp2_session_del(session);
+
+  /* Make sure that no memory leak when stream_close callback fails
+     with a fatal error */
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+  callbacks.on_stream_close_callback = fatal_error_on_stream_close_callback;
+
+  memset(&user_data, 0, sizeof(user_data));
+
+  nghttp2_session_client_new(&session, &callbacks, &user_data);
+
+  nghttp2_frame_goaway_init(&frame.goaway, 0, NGHTTP2_NO_ERROR, NULL, 0);
+
+  CU_ASSERT(0 == nghttp2_session_on_goaway_received(session, &frame));
+
+  nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), NULL, NULL);
+
+  datalen = nghttp2_session_mem_send(session, &data);
+
+  CU_ASSERT(NGHTTP2_ERR_CALLBACK_FAILURE == datalen);
+  CU_ASSERT(1 == user_data.stream_close_cb_called);
+
+  nghttp2_frame_goaway_free(&frame.goaway, mem);
+  nghttp2_session_del(session);
 }
 
 void test_nghttp2_session_on_window_update_received(void) {

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_stream_test.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_stream_test.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_test_helper.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/nghttp2_test_helper.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/testdata/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/tests/testdata/Makefile.in Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/CMakeLists.txt -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/CMakeLists.txt Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/Makefile.am -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/Makefile.am Changed

@@ -100,6 +100,7 @@
 	mruby/lib/mruby/lockfile.rb \
 	mruby/lib/mruby/build.rb \
 	mruby/lib/mruby/core_ext.rb \
+	mruby/lib/mruby/doc.rb \
 	mruby/lib/mruby/gem.rb \
 	mruby/lib/mruby/presym.rb \
 	mruby/lib/mruby/source.rb \
@@ -107,6 +108,10 @@
 	mruby/examples/mrbgems/ruby_extension_example/README.md \
 	mruby/examples/mrbgems/ruby_extension_example/test/example.rb \
 	mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb \
+	mruby/examples/mrbgems/cdata_extension_example/mrbgem.rake \
+	mruby/examples/mrbgems/cdata_extension_example/README.md \
+	mruby/examples/mrbgems/cdata_extension_example/test/example.c \
+	mruby/examples/mrbgems/cdata_extension_example/src/example.c \
 	mruby/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake \
 	mruby/examples/mrbgems/c_and_ruby_extension_example/README.md \
 	mruby/examples/mrbgems/c_and_ruby_extension_example/test/example.rb \
@@ -117,6 +122,9 @@
 	mruby/examples/mrbgems/c_extension_example/test/example.rb \
 	mruby/examples/mrbgems/c_extension_example/test/example.c \
 	mruby/examples/mrbgems/c_extension_example/src/example.c \
+	mruby/examples/mrbgems/mruby-YOUR-bigint/TODO-HINT.md \
+	mruby/examples/mrbgems/mruby-YOUR-bigint/core/bigint.c \
+	mruby/examples/mrbgems/mruby-YOUR-bigint/mrbgem.rake \
 	mruby/test/bintest.rb \
 	mruby/test/t/enumerable.rb \
 	mruby/test/t/comparable.rb \
@@ -162,8 +170,10 @@
 	mruby/test/t/standarderror.rb \
 	mruby/test/t/superclass.rb \
 	mruby/test/assert.rb \
+	mruby/super-linter.report/.keep \
 	mruby/TODO.md \
 	mruby/Doxyfile \
+	mruby/mrblib/00kernel.rb \
 	mruby/mrblib/range.rb \
 	mruby/mrblib/kernel.rb \
 	mruby/mrblib/hash.rb \
@@ -186,12 +196,15 @@
 	mruby/src/load.c \
 	mruby/src/codedump.c \
 	mruby/src/error.c \
+	mruby/src/readfloat.c \
 	mruby/src/state.c \
 	mruby/src/string.c \
 	mruby/src/numeric.c \
+	mruby/src/readnum.c \
 	mruby/src/enum.c \
 	mruby/src/print.c \
 	mruby/src/readint.c \
+	mruby/src/numops.c \
 	mruby/src/hash.c \
 	mruby/src/version.c \
 	mruby/src/backtrace.c \
@@ -210,7 +223,6 @@
 	mruby/src/compar.c \
 	mruby/src/value_array.h \
 	mruby/src/pool.c \
-	mruby/src/readflt.c \
 	mruby/mruby-source.gemspec \
 	mruby/mrbgems/mruby-eval/mrbgem.rake \
 	mruby/mrbgems/mruby-eval/test/eval.rb \
@@ -223,6 +235,12 @@
 	mruby/mrbgems/mruby-string-ext/mrblib/string.rb \
 	mruby/mrbgems/mruby-string-ext/src/string.c \
 	mruby/mrbgems/default-no-stdio.gembox \
+	mruby/mrbgems/mruby-set/mrbgem.rake \
+	mruby/mrbgems/mruby-set/README.md \
+	mruby/mrbgems/mruby-set/test/set.rb \
+	mruby/mrbgems/mruby-set/mrblib/set.rb \
+	mruby/mrbgems/mruby-set/LICENSE \
+	mruby/mrbgems/mruby-set/mruby-set.gem \
 	mruby/mrbgems/mruby-method/mrbgem.rake \
 	mruby/mrbgems/mruby-method/README.md \
 	mruby/mrbgems/mruby-method/test/method.rb \
@@ -249,6 +267,12 @@
 	mruby/mrbgems/mruby-struct/test/struct.rb \
 	mruby/mrbgems/mruby-struct/mrblib/struct.rb \
 	mruby/mrbgems/mruby-struct/src/struct.c \
+	mruby/mrbgems/mruby-bigint/core/bigint.c \
+	mruby/mrbgems/mruby-bigint/core/bigint.h \
+	mruby/mrbgems/mruby-bigint/mrbgem.rake \
+	mruby/mrbgems/mruby-bigint/README.md \
+	mruby/mrbgems/mruby-bigint/test/bigint.rb \
+	mruby/mrbgems/mruby-bigint/README-fgmp.md \
 	mruby/mrbgems/mruby-symbol-ext/mrbgem.rake \
 	mruby/mrbgems/mruby-symbol-ext/test/symbol.rb \
 	mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb \
@@ -283,6 +307,16 @@
 	mruby/mrbgems/mruby-proc-ext/test/proc.c \
 	mruby/mrbgems/mruby-proc-ext/mrblib/proc.rb \
 	mruby/mrbgems/mruby-proc-ext/src/proc.c \
+	mruby/mrbgems/mruby-data/mrbgem.rake \
+	mruby/mrbgems/mruby-data/test/data.rb \
+	mruby/mrbgems/mruby-data/src/data.c \
+	mruby/mrbgems/mruby-dir/mrbgem.rake \
+	mruby/mrbgems/mruby-dir/README.md \
+	mruby/mrbgems/mruby-dir/test/dir.rb \
+	mruby/mrbgems/mruby-dir/test/dirtest.c \
+	mruby/mrbgems/mruby-dir/mrblib/dir.rb \
+	mruby/mrbgems/mruby-dir/src/Win/dirent.c \
+	mruby/mrbgems/mruby-dir/src/dir.c \
 	mruby/mrbgems/mruby-object-ext/mrbgem.rake \
 	mruby/mrbgems/mruby-object-ext/test/nil.rb \
 	mruby/mrbgems/mruby-object-ext/test/object.rb \
@@ -292,6 +326,7 @@
 	mruby/mrbgems/mruby-kernel-ext/test/kernel.rb \
 	mruby/mrbgems/mruby-kernel-ext/src/kernel.c \
 	mruby/mrbgems/mruby-class-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-class-ext/test/class.rb \
 	mruby/mrbgems/mruby-class-ext/test/module.rb \
 	mruby/mrbgems/mruby-class-ext/mrblib/module.rb \
 	mruby/mrbgems/mruby-class-ext/src/class.c \
@@ -425,12 +460,21 @@
 	mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c \
 	mruby/mrbgems/mruby-bin-strip/mrbgem.rake \
 	mruby/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb \
+	mruby/mrbgems/mruby-errno/mrbgem.rake \
+	mruby/mrbgems/mruby-errno/README.md \
+	mruby/mrbgems/mruby-errno/test/errno.rb \
+	mruby/mrbgems/mruby-errno/mrblib/errno.rb \
+	mruby/mrbgems/mruby-errno/src/gen.rb \
+	mruby/mrbgems/mruby-errno/src/known_errors_def.cstub \
+	mruby/mrbgems/mruby-errno/src/known_errors.def \
+	mruby/mrbgems/mruby-errno/src/errno.c \
 	mruby/mrbgems/mruby-toplevel-ext/mrbgem.rake \
 	mruby/mrbgems/mruby-toplevel-ext/test/toplevel.rb \
 	mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb \
 	mruby/mrbgems/mruby-math/mrbgem.rake \
 	mruby/mrbgems/mruby-math/test/math.rb \
 	mruby/mrbgems/mruby-math/src/math.c \
+	mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/stub.c \
 	mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c \
 	mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake \
 	mruby/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb \
@@ -451,6 +495,7 @@
 	mruby/doc/internal/opcode.md \
 	mruby/doc/internal/boxing.md \
 	mruby/doc/limitations.md \
+	mruby/doc/mruby3.2.md \
 	mruby/doc/guides/compile.md \
 	mruby/doc/guides/mrbgems.md \
 	mruby/doc/guides/debugger.md \
@@ -484,6 +529,7 @@
 	mruby/include/mruby/boxing_nan.h \
 	mruby/include/mruby/value.h \
 	mruby/include/mruby/endian.h \
+	mruby/include/mruby/internal.h \
 	mruby/include/mruby/dump.h \
 	mruby/include/mruby/version.h \
 	mruby/include/mruby/khash.h \
@@ -528,10 +574,9 @@
 	MRUBY_CONFIG="${abs_builddir}/mruby/build/build_config.rb" \
 	BUILD_DIR="${abs_builddir}/mruby/build" \
 	INSTALL_DIR="${abs_builddir}/mruby/build/install/bin" \
-	CC="${CC}" CXX="$(firstword $(CXX))" LD="${LD}" \
-	CFLAGS="${CPPFLAGS} ${CFLAGS}" \
-	CXXFLAGS="$(wordlist 2, $(words $(CXX)), $(CXX)) ${CPPFLAGS} ${CXXFLAGS}" \
-	LDFLAGS="${LDFLAGS}" \
+	MRUBY_CC="${CC}" MRUBY_CXX="$(firstword $(CXX))" MRUBY_LD="${LD}" \
+	MRUBY_AR="${AR}" \
+	HOST="${host}" BUILD="${build}" \
 	"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile"
 
 all-local: mruby
@@ -540,7 +585,7 @@
 	 ! -f "${abs_builddir}/mruby/build/build_config.rb"  || \
 	MRUBY_CONFIG="${abs_builddir}/mruby/build/build_config.rb" \
 	BUILD_DIR="${abs_builddir}/mruby/build" \
-	CC="${CC}" \
+	MRUBY_CC="${CC}" \
 	"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile" clean
 
 endif # HAVE_MRUBY

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/Makefile.in -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/Makefile.in Changed

@@ -292,8 +292,8 @@
 LIBNGTCP2_CFLAGS = @LIBNGTCP2_CFLAGS@
 LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS = @LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@
 LIBNGTCP2_CRYPTO_BORINGSSL_LIBS = @LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@
-LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS = @LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@
-LIBNGTCP2_CRYPTO_OPENSSL_LIBS = @LIBNGTCP2_CRYPTO_OPENSSL_LIBS@
+LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS = @LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@
+LIBNGTCP2_CRYPTO_QUICTLS_LIBS = @LIBNGTCP2_CRYPTO_QUICTLS_LIBS@
 LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -465,12 +465,16 @@
 	mruby/lib/mruby/build/command.rb \
 	mruby/lib/mruby/build/load_gems.rb mruby/lib/mruby/lockfile.rb \
 	mruby/lib/mruby/build.rb mruby/lib/mruby/core_ext.rb \
-	mruby/lib/mruby/gem.rb mruby/lib/mruby/presym.rb \
-	mruby/lib/mruby/source.rb \
+	mruby/lib/mruby/doc.rb mruby/lib/mruby/gem.rb \
+	mruby/lib/mruby/presym.rb mruby/lib/mruby/source.rb \
 	mruby/examples/mrbgems/ruby_extension_example/mrbgem.rake \
 	mruby/examples/mrbgems/ruby_extension_example/README.md \
 	mruby/examples/mrbgems/ruby_extension_example/test/example.rb \
 	mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb \
+	mruby/examples/mrbgems/cdata_extension_example/mrbgem.rake \
+	mruby/examples/mrbgems/cdata_extension_example/README.md \
+	mruby/examples/mrbgems/cdata_extension_example/test/example.c \
+	mruby/examples/mrbgems/cdata_extension_example/src/example.c \
 	mruby/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake \
 	mruby/examples/mrbgems/c_and_ruby_extension_example/README.md \
 	mruby/examples/mrbgems/c_and_ruby_extension_example/test/example.rb \
@@ -481,6 +485,9 @@
 	mruby/examples/mrbgems/c_extension_example/test/example.rb \
 	mruby/examples/mrbgems/c_extension_example/test/example.c \
 	mruby/examples/mrbgems/c_extension_example/src/example.c \
+	mruby/examples/mrbgems/mruby-YOUR-bigint/TODO-HINT.md \
+	mruby/examples/mrbgems/mruby-YOUR-bigint/core/bigint.c \
+	mruby/examples/mrbgems/mruby-YOUR-bigint/mrbgem.rake \
 	mruby/test/bintest.rb mruby/test/t/enumerable.rb \
 	mruby/test/t/comparable.rb mruby/test/t/false.rb \
 	mruby/test/t/exception.rb mruby/test/t/rangeerror.rb \
@@ -503,7 +510,8 @@
 	mruby/test/t/vformat.rb mruby/test/t/numeric.rb \
 	mruby/test/t/bs_block.rb mruby/test/t/float.rb \
 	mruby/test/t/standarderror.rb mruby/test/t/superclass.rb \
-	mruby/test/assert.rb mruby/TODO.md mruby/Doxyfile \
+	mruby/test/assert.rb mruby/super-linter.report/.keep \
+	mruby/TODO.md mruby/Doxyfile mruby/mrblib/00kernel.rb \
 	mruby/mrblib/range.rb mruby/mrblib/kernel.rb \
 	mruby/mrblib/hash.rb mruby/mrblib/00class.rb \
 	mruby/mrblib/10error.rb mruby/mrblib/array.rb \
@@ -513,15 +521,16 @@
 	mruby/src/etc.c mruby/src/variable.c mruby/src/cdump.c \
 	mruby/src/init.c mruby/src/opcode.h mruby/src/gc.c \
 	mruby/src/load.c mruby/src/codedump.c mruby/src/error.c \
-	mruby/src/state.c mruby/src/string.c mruby/src/numeric.c \
-	mruby/src/enum.c mruby/src/print.c mruby/src/readint.c \
+	mruby/src/readfloat.c mruby/src/state.c mruby/src/string.c \
+	mruby/src/numeric.c mruby/src/readnum.c mruby/src/enum.c \
+	mruby/src/print.c mruby/src/readint.c mruby/src/numops.c \
 	mruby/src/hash.c mruby/src/version.c mruby/src/backtrace.c \
 	mruby/src/fmt_fp.c mruby/src/range.c mruby/src/vm.c \
 	mruby/src/debug.c mruby/src/symbol.c mruby/src/error.h \
 	mruby/src/kernel.c mruby/src/object.c mruby/src/proc.c \
 	mruby/src/array.c mruby/src/dump.c mruby/src/class.c \
 	mruby/src/compar.c mruby/src/value_array.h mruby/src/pool.c \
-	mruby/src/readflt.c mruby/mruby-source.gemspec \
+	mruby/mruby-source.gemspec \
 	mruby/mrbgems/mruby-eval/mrbgem.rake \
 	mruby/mrbgems/mruby-eval/test/eval.rb \
 	mruby/mrbgems/mruby-eval/src/eval.c \
@@ -533,6 +542,12 @@
 	mruby/mrbgems/mruby-string-ext/mrblib/string.rb \
 	mruby/mrbgems/mruby-string-ext/src/string.c \
 	mruby/mrbgems/default-no-stdio.gembox \
+	mruby/mrbgems/mruby-set/mrbgem.rake \
+	mruby/mrbgems/mruby-set/README.md \
+	mruby/mrbgems/mruby-set/test/set.rb \
+	mruby/mrbgems/mruby-set/mrblib/set.rb \
+	mruby/mrbgems/mruby-set/LICENSE \
+	mruby/mrbgems/mruby-set/mruby-set.gem \
 	mruby/mrbgems/mruby-method/mrbgem.rake \
 	mruby/mrbgems/mruby-method/README.md \
 	mruby/mrbgems/mruby-method/test/method.rb \
@@ -559,6 +574,12 @@
 	mruby/mrbgems/mruby-struct/test/struct.rb \
 	mruby/mrbgems/mruby-struct/mrblib/struct.rb \
 	mruby/mrbgems/mruby-struct/src/struct.c \
+	mruby/mrbgems/mruby-bigint/core/bigint.c \
+	mruby/mrbgems/mruby-bigint/core/bigint.h \
+	mruby/mrbgems/mruby-bigint/mrbgem.rake \
+	mruby/mrbgems/mruby-bigint/README.md \
+	mruby/mrbgems/mruby-bigint/test/bigint.rb \
+	mruby/mrbgems/mruby-bigint/README-fgmp.md \
 	mruby/mrbgems/mruby-symbol-ext/mrbgem.rake \
 	mruby/mrbgems/mruby-symbol-ext/test/symbol.rb \
 	mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb \
@@ -593,6 +614,16 @@
 	mruby/mrbgems/mruby-proc-ext/test/proc.c \
 	mruby/mrbgems/mruby-proc-ext/mrblib/proc.rb \
 	mruby/mrbgems/mruby-proc-ext/src/proc.c \
+	mruby/mrbgems/mruby-data/mrbgem.rake \
+	mruby/mrbgems/mruby-data/test/data.rb \
+	mruby/mrbgems/mruby-data/src/data.c \
+	mruby/mrbgems/mruby-dir/mrbgem.rake \
+	mruby/mrbgems/mruby-dir/README.md \
+	mruby/mrbgems/mruby-dir/test/dir.rb \
+	mruby/mrbgems/mruby-dir/test/dirtest.c \
+	mruby/mrbgems/mruby-dir/mrblib/dir.rb \
+	mruby/mrbgems/mruby-dir/src/Win/dirent.c \
+	mruby/mrbgems/mruby-dir/src/dir.c \
 	mruby/mrbgems/mruby-object-ext/mrbgem.rake \
 	mruby/mrbgems/mruby-object-ext/test/nil.rb \
 	mruby/mrbgems/mruby-object-ext/test/object.rb \
@@ -602,6 +633,7 @@
 	mruby/mrbgems/mruby-kernel-ext/test/kernel.rb \
 	mruby/mrbgems/mruby-kernel-ext/src/kernel.c \
 	mruby/mrbgems/mruby-class-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-class-ext/test/class.rb \
 	mruby/mrbgems/mruby-class-ext/test/module.rb \
 	mruby/mrbgems/mruby-class-ext/mrblib/module.rb \
 	mruby/mrbgems/mruby-class-ext/src/class.c \
@@ -734,12 +766,21 @@
 	mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c \
 	mruby/mrbgems/mruby-bin-strip/mrbgem.rake \
 	mruby/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb \
+	mruby/mrbgems/mruby-errno/mrbgem.rake \
+	mruby/mrbgems/mruby-errno/README.md \
+	mruby/mrbgems/mruby-errno/test/errno.rb \
+	mruby/mrbgems/mruby-errno/mrblib/errno.rb \
+	mruby/mrbgems/mruby-errno/src/gen.rb \
+	mruby/mrbgems/mruby-errno/src/known_errors_def.cstub \
+	mruby/mrbgems/mruby-errno/src/known_errors.def \
+	mruby/mrbgems/mruby-errno/src/errno.c \
 	mruby/mrbgems/mruby-toplevel-ext/mrbgem.rake \
 	mruby/mrbgems/mruby-toplevel-ext/test/toplevel.rb \
 	mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb \
 	mruby/mrbgems/mruby-math/mrbgem.rake \
 	mruby/mrbgems/mruby-math/test/math.rb \
 	mruby/mrbgems/mruby-math/src/math.c \
+	mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/stub.c \
 	mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c \
 	mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake \
 	mruby/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb \
@@ -754,27 +795,27 @@
 	mruby/SECURITY.md mruby/doc/mruby_logo_red_icon.png \
 	mruby/doc/mruby3.0.md mruby/doc/mruby3.1.md \
 	mruby/doc/internal/opcode.md mruby/doc/internal/boxing.md \
-	mruby/doc/limitations.md mruby/doc/guides/compile.md \
-	mruby/doc/guides/mrbgems.md mruby/doc/guides/debugger.md \
-	mruby/doc/guides/link.md mruby/doc/guides/symbol.md \
-	mruby/doc/guides/gc-arena-howto.md mruby/doc/guides/mrbconf.md \
-	mruby/minirake mruby/include/mruby/opcode.h \
-	mruby/include/mruby/re.h mruby/include/mruby/hash.h \
-	mruby/include/mruby/string.h mruby/include/mruby/presym.h \
-	mruby/include/mruby/object.h mruby/include/mruby/class.h \
-	mruby/include/mruby/ops.h mruby/include/mruby/irep.h \
-	mruby/include/mruby/compile.h mruby/include/mruby/array.h \
-	mruby/include/mruby/range.h mruby/include/mruby/throw.h \
-	mruby/include/mruby/variable.h \
+	mruby/doc/limitations.md mruby/doc/mruby3.2.md \
+	mruby/doc/guides/compile.md mruby/doc/guides/mrbgems.md \
+	mruby/doc/guides/debugger.md mruby/doc/guides/link.md \
+	mruby/doc/guides/symbol.md mruby/doc/guides/gc-arena-howto.md \
+	mruby/doc/guides/mrbconf.md mruby/minirake \
+	mruby/include/mruby/opcode.h mruby/include/mruby/re.h \
+	mruby/include/mruby/hash.h mruby/include/mruby/string.h \
+	mruby/include/mruby/presym.h mruby/include/mruby/object.h \
+	mruby/include/mruby/class.h mruby/include/mruby/ops.h \
+	mruby/include/mruby/irep.h mruby/include/mruby/compile.h \
+	mruby/include/mruby/array.h mruby/include/mruby/range.h \
+	mruby/include/mruby/throw.h mruby/include/mruby/variable.h \
 	mruby/include/mruby/boxing_word.h \
 	mruby/include/mruby/istruct.h mruby/include/mruby/data.h \
 	mruby/include/mruby/common.h mruby/include/mruby/error.h \
 	mruby/include/mruby/debug.h mruby/include/mruby/boxing_no.h \
 	mruby/include/mruby/numeric.h mruby/include/mruby/boxing_nan.h \
 	mruby/include/mruby/value.h mruby/include/mruby/endian.h \
-	mruby/include/mruby/dump.h mruby/include/mruby/version.h \
-	mruby/include/mruby/khash.h mruby/include/mruby/gc.h \
-	mruby/include/mruby/presym/enable.h \
+	mruby/include/mruby/internal.h mruby/include/mruby/dump.h \
+	mruby/include/mruby/version.h mruby/include/mruby/khash.h \
+	mruby/include/mruby/gc.h mruby/include/mruby/presym/enable.h \
 	mruby/include/mruby/presym/disable.h \
 	mruby/include/mruby/presym/scanning.h \
 	mruby/include/mruby/proc.h mruby/include/mrbconf.h \
@@ -1197,10 +1238,9 @@
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	MRUBY_CONFIG="${abs_builddir}/mruby/build/build_config.rb" \
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	BUILD_DIR="${abs_builddir}/mruby/build" \
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	INSTALL_DIR="${abs_builddir}/mruby/build/install/bin" \
-@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	CC="${CC}" CXX="$(firstword $(CXX))" LD="${LD}" \
-@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	CFLAGS="${CPPFLAGS} ${CFLAGS}" \
-@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	CXXFLAGS="$(wordlist 2, $(words $(CXX)), $(CXX)) ${CPPFLAGS} ${CXXFLAGS}" \
-@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	LDFLAGS="${LDFLAGS}" \
+@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	MRUBY_CC="${CC}" MRUBY_CXX="$(firstword $(CXX))" MRUBY_LD="${LD}" \
+@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	MRUBY_AR="${AR}" \
+@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	HOST="${host}" BUILD="${build}" \
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile"
 
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@all-local: mruby
@@ -1209,7 +1249,7 @@
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	 ! -f "${abs_builddir}/mruby/build/build_config.rb"  || \
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	MRUBY_CONFIG="${abs_builddir}/mruby/build/build_config.rb" \
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	BUILD_DIR="${abs_builddir}/mruby/build" \
-@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	CC="${CC}" \
+@ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	MRUBY_CC="${CC}" \
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_MRUBY_TRUE@	"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile" clean
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/build_config.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/build_config.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/llhttp/include/llhttp.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/llhttp/include/llhttp.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/llhttp/src/llhttp.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/llhttp/src/llhttp.c Changed

@@ -373,7 +373,7 @@
   s_n_llhttp__internal__n_header_value_lws,
   s_n_llhttp__internal__n_header_value_almost_done,
   s_n_llhttp__internal__n_header_value_lenient,
-  s_n_llhttp__internal__n_error_40,
+  s_n_llhttp__internal__n_error_41,
   s_n_llhttp__internal__n_header_value_otherwise,
   s_n_llhttp__internal__n_header_value_connection_token,
   s_n_llhttp__internal__n_header_value_connection_ws,
@@ -381,12 +381,12 @@
   s_n_llhttp__internal__n_header_value_connection_2,
   s_n_llhttp__internal__n_header_value_connection_3,
   s_n_llhttp__internal__n_header_value_connection,
-  s_n_llhttp__internal__n_error_42,
   s_n_llhttp__internal__n_error_43,
+  s_n_llhttp__internal__n_error_44,
   s_n_llhttp__internal__n_header_value_content_length_ws,
   s_n_llhttp__internal__n_header_value_content_length,
+  s_n_llhttp__internal__n_error_46,
   s_n_llhttp__internal__n_error_45,
-  s_n_llhttp__internal__n_error_44,
   s_n_llhttp__internal__n_header_value_te_token_ows,
   s_n_llhttp__internal__n_header_value,
   s_n_llhttp__internal__n_header_value_te_token,
@@ -418,12 +418,12 @@
   s_n_llhttp__internal__n_req_http_complete,
   s_n_llhttp__internal__n_invoke_load_method_1,
   s_n_llhttp__internal__n_invoke_llhttp__on_version_complete,
-  s_n_llhttp__internal__n_error_50,
-  s_n_llhttp__internal__n_error_55,
-  s_n_llhttp__internal__n_req_http_minor,
+  s_n_llhttp__internal__n_error_51,
   s_n_llhttp__internal__n_error_56,
-  s_n_llhttp__internal__n_req_http_dot,
+  s_n_llhttp__internal__n_req_http_minor,
   s_n_llhttp__internal__n_error_57,
+  s_n_llhttp__internal__n_req_http_dot,
+  s_n_llhttp__internal__n_error_58,
   s_n_llhttp__internal__n_req_http_major,
   s_n_llhttp__internal__n_span_start_llhttp__on_version,
   s_n_llhttp__internal__n_req_http_start_1,
@@ -536,12 +536,12 @@
   s_n_llhttp__internal__n_res_status_code_digit_1,
   s_n_llhttp__internal__n_res_after_version,
   s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1,
-  s_n_llhttp__internal__n_error_72,
-  s_n_llhttp__internal__n_error_84,
-  s_n_llhttp__internal__n_res_http_minor,
+  s_n_llhttp__internal__n_error_73,
   s_n_llhttp__internal__n_error_85,
-  s_n_llhttp__internal__n_res_http_dot,
+  s_n_llhttp__internal__n_res_http_minor,
   s_n_llhttp__internal__n_error_86,
+  s_n_llhttp__internal__n_res_http_dot,
+  s_n_llhttp__internal__n_error_87,
   s_n_llhttp__internal__n_res_http_major,
   s_n_llhttp__internal__n_span_start_llhttp__on_version_1,
   s_n_llhttp__internal__n_start_res,
@@ -976,7 +976,7 @@
   return (state->flags & 8) == 8;
 }
 
-int llhttp__internal__c_test_lenient_flags_6(
+int llhttp__internal__c_test_lenient_flags_8(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -1040,7 +1040,7 @@
   return 0;
 }
 
-int llhttp__internal__c_test_lenient_flags_8(
+int llhttp__internal__c_test_lenient_flags_10(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -1963,7 +1963,7 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_14;
         default:
-          goto s_n_llhttp__internal__n_error_36;
+          goto s_n_llhttp__internal__n_error_37;
       }
       /* UNREACHABLE */;
       abort();
@@ -1987,11 +1987,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_header_value_discard_ws;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
         }
         case ' ': {
           p++;
-          goto s_n_llhttp__internal__n_header_value_discard_ws;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
         }
         default: {
           goto s_n_llhttp__internal__n_invoke_load_header_state;
@@ -2011,7 +2011,7 @@
           goto s_n_llhttp__internal__n_header_value_discard_lws;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_38;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_6;
         }
       }
       /* UNREACHABLE */;
@@ -2047,7 +2047,7 @@
           goto s_n_llhttp__internal__n_header_value_lws;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_39;
+          goto s_n_llhttp__internal__n_error_40;
         }
       }
       /* UNREACHABLE */;
@@ -2073,8 +2073,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_40:
-    s_n_llhttp__internal__n_error_40: {
+    case s_n_llhttp__internal__n_error_41:
+    s_n_llhttp__internal__n_error_41: {
       state->error = 0xa;
       state->reason = "Invalid header value char";
       state->error_pos = (const char*) p;
@@ -2093,7 +2093,7 @@
           goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_7;
         }
       }
       /* UNREACHABLE */;
@@ -2270,8 +2270,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_42:
-    s_n_llhttp__internal__n_error_42: {
+    case s_n_llhttp__internal__n_error_43:
+    s_n_llhttp__internal__n_error_43: {
       state->error = 0xb;
       state->reason = "Content-Length overflow";
       state->error_pos = (const char*) p;
@@ -2280,8 +2280,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_43:
-    s_n_llhttp__internal__n_error_43: {
+    case s_n_llhttp__internal__n_error_44:
+    s_n_llhttp__internal__n_error_44: {
       state->error = 0xb;
       state->reason = "Invalid character in Content-Length";
       state->error_pos = (const char*) p;
@@ -2376,8 +2376,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_45:
-    s_n_llhttp__internal__n_error_45: {
+    case s_n_llhttp__internal__n_error_46:
+    s_n_llhttp__internal__n_error_46: {
       state->error = 0xf;
       state->reason = "Invalid `Transfer-Encoding` header value";
       state->error_pos = (const char*) p;
@@ -2386,8 +2386,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_44:
-    s_n_llhttp__internal__n_error_44: {
+    case s_n_llhttp__internal__n_error_45:
+    s_n_llhttp__internal__n_error_45: {
       state->error = 0xf;
       state->reason = "Invalid `Transfer-Encoding` header value";
       state->error_pos = (const char*) p;
@@ -2628,7 +2628,7 @@
           goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_46;
+          goto s_n_llhttp__internal__n_error_47;
         }
       }
       /* UNREACHABLE */;
@@ -3025,7 +3025,7 @@
           goto s_n_llhttp__internal__n_url_to_http_09;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_47;
+          goto s_n_llhttp__internal__n_error_48;
         }
       }
       /* UNREACHABLE */;
@@ -3050,7 +3050,7 @@
           goto s_n_llhttp__internal__n_url_skip_lf_to_http09_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_47;
+          goto s_n_llhttp__internal__n_error_48;
         }
       }
       /* UNREACHABLE */;
@@ -3068,13 +3068,13 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_error_53;
+          goto s_n_llhttp__internal__n_error_54;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_req_pri_upgrade;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_54;
+          goto s_n_llhttp__internal__n_error_55;
         }
       }
       /* UNREACHABLE */;
@@ -3091,7 +3091,7 @@
           goto s_n_llhttp__internal__n_headers_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_52;
+          goto s_n_llhttp__internal__n_error_53;
         }
       }
       /* UNREACHABLE */;
@@ -3112,7 +3112,7 @@
           goto s_n_llhttp__internal__n_req_http_complete_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_52;
+          goto s_n_llhttp__internal__n_error_53;
         }
       }
       /* UNREACHABLE */;
@@ -3137,13 +3137,13 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_17;
         default:
-          goto s_n_llhttp__internal__n_error_51;
+          goto s_n_llhttp__internal__n_error_52;
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_50:
-    s_n_llhttp__internal__n_error_50: {
+    case s_n_llhttp__internal__n_error_51:
+    s_n_llhttp__internal__n_error_51: {
       state->error = 0x9;
       state->reason = "Invalid HTTP version";
       state->error_pos = (const char*) p;
@@ -3152,8 +3152,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_55:
-    s_n_llhttp__internal__n_error_55: {
+    case s_n_llhttp__internal__n_error_56:
+    s_n_llhttp__internal__n_error_56: {
       state->error = 0x9;
       state->reason = "Invalid minor version";
       state->error_pos = (const char*) p;
@@ -3225,8 +3225,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_56:
-    s_n_llhttp__internal__n_error_56: {
+    case s_n_llhttp__internal__n_error_57:
+    s_n_llhttp__internal__n_error_57: {
       state->error = 0x9;
       state->reason = "Expected dot";
       state->error_pos = (const char*) p;
@@ -3252,8 +3252,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_57:
-    s_n_llhttp__internal__n_error_57: {
+    case s_n_llhttp__internal__n_error_58:
+    s_n_llhttp__internal__n_error_58: {
       state->error = 0x9;
       state->reason = "Invalid major version";
       state->error_pos = (const char*) p;
@@ -3354,7 +3354,7 @@
           return s_n_llhttp__internal__n_req_http_start_1;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_60;
+          goto s_n_llhttp__internal__n_error_61;
         }
       }
       /* UNREACHABLE */;
@@ -3378,7 +3378,7 @@
           return s_n_llhttp__internal__n_req_http_start_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_60;
+          goto s_n_llhttp__internal__n_error_61;
         }
       }
       /* UNREACHABLE */;
@@ -3402,7 +3402,7 @@
           return s_n_llhttp__internal__n_req_http_start_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_60;
+          goto s_n_llhttp__internal__n_error_61;
         }
       }
       /* UNREACHABLE */;
@@ -3431,7 +3431,7 @@
           goto s_n_llhttp__internal__n_req_http_start_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_60;
+          goto s_n_llhttp__internal__n_error_61;
         }
       }
       /* UNREACHABLE */;
@@ -3522,7 +3522,7 @@
           goto s_n_llhttp__internal__n_url_fragment;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_61;
+          goto s_n_llhttp__internal__n_error_62;
         }
       }
       /* UNREACHABLE */;
@@ -3583,7 +3583,7 @@
           goto s_n_llhttp__internal__n_span_end_stub_query_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_62;
+          goto s_n_llhttp__internal__n_error_63;
         }
       }
       /* UNREACHABLE */;
@@ -3621,7 +3621,7 @@
           goto s_n_llhttp__internal__n_url_query;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_63;
+          goto s_n_llhttp__internal__n_error_64;
         }
       }
       /* UNREACHABLE */;
@@ -3746,10 +3746,10 @@
         }
         case 8: {
           p++;
-          goto s_n_llhttp__internal__n_error_64;
+          goto s_n_llhttp__internal__n_error_65;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_65;
+          goto s_n_llhttp__internal__n_error_66;
         }
       }
       /* UNREACHABLE */;
@@ -3808,7 +3808,7 @@
           goto s_n_llhttp__internal__n_url_server_with_at;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_66;
+          goto s_n_llhttp__internal__n_error_67;
         }
       }
       /* UNREACHABLE */;
@@ -3825,7 +3825,7 @@
           goto s_n_llhttp__internal__n_url_server;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_68;
+          goto s_n_llhttp__internal__n_error_69;
         }
       }
       /* UNREACHABLE */;
@@ -3843,7 +3843,7 @@
         }
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_error_67;
+          goto s_n_llhttp__internal__n_error_68;
         }
         case 12: {
           p++;
@@ -3851,18 +3851,18 @@
         }
         case 13: {
           p++;
-          goto s_n_llhttp__internal__n_error_67;
+          goto s_n_llhttp__internal__n_error_68;
         }
         case ' ': {
           p++;
-          goto s_n_llhttp__internal__n_error_67;
+          goto s_n_llhttp__internal__n_error_68;
         }
         case '/': {
           p++;
           goto s_n_llhttp__internal__n_url_schema_delim_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_68;
+          goto s_n_llhttp__internal__n_error_69;
         }
       }
       /* UNREACHABLE */;
@@ -3908,7 +3908,7 @@
         }
         case 2: {
           p++;
-          goto s_n_llhttp__internal__n_error_67;
+          goto s_n_llhttp__internal__n_error_68;
         }
         case 3: {
           goto s_n_llhttp__internal__n_span_end_stub_schema;
@@ -3918,7 +3918,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_69;
+          goto s_n_llhttp__internal__n_error_70;
         }
       }
       /* UNREACHABLE */;
@@ -3954,7 +3954,7 @@
         }
         case 2: {
           p++;
-          goto s_n_llhttp__internal__n_error_67;
+          goto s_n_llhttp__internal__n_error_68;
         }
         case 3: {
           goto s_n_llhttp__internal__n_span_start_stub_path_2;
@@ -3963,7 +3963,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_70;
+          goto s_n_llhttp__internal__n_error_71;
         }
       }
       /* UNREACHABLE */;
@@ -4061,7 +4061,7 @@
           goto s_n_llhttp__internal__n_req_spaces_before_url;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_71;
+          goto s_n_llhttp__internal__n_error_72;
         }
       }
       /* UNREACHABLE */;
@@ -4075,7 +4075,7 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_22;
         default:
-          goto s_n_llhttp__internal__n_error_88;
+          goto s_n_llhttp__internal__n_error_89;
       }
       /* UNREACHABLE */;
       abort();
@@ -4092,7 +4092,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4117,7 +4117,7 @@
           return s_n_llhttp__internal__n_after_start_req_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4138,7 +4138,7 @@
           goto s_n_llhttp__internal__n_after_start_req_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4163,7 +4163,7 @@
           return s_n_llhttp__internal__n_after_start_req_4;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4188,7 +4188,7 @@
           return s_n_llhttp__internal__n_after_start_req_6;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4213,7 +4213,7 @@
           return s_n_llhttp__internal__n_after_start_req_8;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4231,7 +4231,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4252,7 +4252,7 @@
           goto s_n_llhttp__internal__n_after_start_req_9;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4273,7 +4273,7 @@
           goto s_n_llhttp__internal__n_after_start_req_7;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4298,7 +4298,7 @@
           return s_n_llhttp__internal__n_after_start_req_12;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4323,7 +4323,7 @@
           return s_n_llhttp__internal__n_after_start_req_13;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4344,7 +4344,7 @@
           goto s_n_llhttp__internal__n_after_start_req_13;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4361,7 +4361,7 @@
           goto s_n_llhttp__internal__n_after_start_req_11;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4386,7 +4386,7 @@
           return s_n_llhttp__internal__n_after_start_req_14;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4411,7 +4411,7 @@
           return s_n_llhttp__internal__n_after_start_req_17;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4453,7 +4453,7 @@
           return s_n_llhttp__internal__n_after_start_req_15;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4478,7 +4478,7 @@
           return s_n_llhttp__internal__n_after_start_req_18;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4503,7 +4503,7 @@
           return s_n_llhttp__internal__n_after_start_req_20;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4528,7 +4528,7 @@
           return s_n_llhttp__internal__n_after_start_req_21;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4549,7 +4549,7 @@
           goto s_n_llhttp__internal__n_after_start_req_21;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4574,7 +4574,7 @@
           return s_n_llhttp__internal__n_after_start_req_23;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4599,7 +4599,7 @@
           return s_n_llhttp__internal__n_after_start_req_24;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4624,7 +4624,7 @@
           return s_n_llhttp__internal__n_after_start_req_26;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4649,7 +4649,7 @@
           return s_n_llhttp__internal__n_after_start_req_28;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4667,7 +4667,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4688,7 +4688,7 @@
           goto s_n_llhttp__internal__n_after_start_req_29;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4709,7 +4709,7 @@
           goto s_n_llhttp__internal__n_after_start_req_27;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4734,7 +4734,7 @@
           return s_n_llhttp__internal__n_after_start_req_30;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4763,7 +4763,7 @@
           goto s_n_llhttp__internal__n_after_start_req_30;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4788,7 +4788,7 @@
           return s_n_llhttp__internal__n_after_start_req_31;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4813,7 +4813,7 @@
           return s_n_llhttp__internal__n_after_start_req_32;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4838,7 +4838,7 @@
           return s_n_llhttp__internal__n_after_start_req_35;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4863,7 +4863,7 @@
           return s_n_llhttp__internal__n_after_start_req_36;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4884,7 +4884,7 @@
           goto s_n_llhttp__internal__n_after_start_req_36;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4909,7 +4909,7 @@
           return s_n_llhttp__internal__n_after_start_req_37;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4934,7 +4934,7 @@
           return s_n_llhttp__internal__n_after_start_req_38;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4959,7 +4959,7 @@
           return s_n_llhttp__internal__n_after_start_req_42;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -4984,7 +4984,7 @@
           return s_n_llhttp__internal__n_after_start_req_43;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5005,7 +5005,7 @@
           goto s_n_llhttp__internal__n_after_start_req_43;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5022,7 +5022,7 @@
           goto s_n_llhttp__internal__n_after_start_req_41;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5044,7 +5044,7 @@
           goto s_n_llhttp__internal__n_after_start_req_40;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5069,7 +5069,7 @@
           return s_n_llhttp__internal__n_after_start_req_45;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5091,7 +5091,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5124,7 +5124,7 @@
           goto s_n_llhttp__internal__n_after_start_req_44;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5149,7 +5149,7 @@
           return s_n_llhttp__internal__n_after_start_req_48;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5174,7 +5174,7 @@
           return s_n_llhttp__internal__n_after_start_req_49;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5199,7 +5199,7 @@
           return s_n_llhttp__internal__n_after_start_req_50;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5224,7 +5224,7 @@
           return s_n_llhttp__internal__n_after_start_req_51;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5253,7 +5253,7 @@
           goto s_n_llhttp__internal__n_after_start_req_51;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5270,7 +5270,7 @@
           goto s_n_llhttp__internal__n_after_start_req_47;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5295,7 +5295,7 @@
           return s_n_llhttp__internal__n_after_start_req_54;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5313,7 +5313,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5338,7 +5338,7 @@
           return s_n_llhttp__internal__n_after_start_req_57;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5359,7 +5359,7 @@
           goto s_n_llhttp__internal__n_after_start_req_57;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5380,7 +5380,7 @@
           goto s_n_llhttp__internal__n_after_start_req_55;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5405,7 +5405,7 @@
           return s_n_llhttp__internal__n_after_start_req_58;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5430,7 +5430,7 @@
           return s_n_llhttp__internal__n_after_start_req_59;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5455,7 +5455,7 @@
           goto s_n_llhttp__internal__n_after_start_req_59;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5480,7 +5480,7 @@
           return s_n_llhttp__internal__n_after_start_req_61;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5505,7 +5505,7 @@
           return s_n_llhttp__internal__n_after_start_req_62;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5526,7 +5526,7 @@
           goto s_n_llhttp__internal__n_after_start_req_62;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5551,7 +5551,7 @@
           return s_n_llhttp__internal__n_after_start_req_65;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5576,7 +5576,7 @@
           return s_n_llhttp__internal__n_after_start_req_67;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5601,7 +5601,7 @@
           return s_n_llhttp__internal__n_after_start_req_68;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5622,7 +5622,7 @@
           goto s_n_llhttp__internal__n_after_start_req_68;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5647,7 +5647,7 @@
           return s_n_llhttp__internal__n_after_start_req_69;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5672,7 +5672,7 @@
           goto s_n_llhttp__internal__n_after_start_req_69;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5689,7 +5689,7 @@
           goto s_n_llhttp__internal__n_after_start_req_64;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5766,7 +5766,7 @@
           goto s_n_llhttp__internal__n_after_start_req_63;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
@@ -5791,7 +5791,7 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_20;
         default:
-          goto s_n_llhttp__internal__n_error_74;
+          goto s_n_llhttp__internal__n_error_75;
       }
       /* UNREACHABLE */;
       abort();
@@ -5807,7 +5807,7 @@
           goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_75;
+          goto s_n_llhttp__internal__n_error_76;
         }
       }
       /* UNREACHABLE */;
@@ -5882,7 +5882,7 @@
           goto s_n_llhttp__internal__n_res_status_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_76;
+          goto s_n_llhttp__internal__n_error_77;
         }
       }
       /* UNREACHABLE */;
@@ -5945,7 +5945,7 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_78;
+          goto s_n_llhttp__internal__n_error_79;
         }
       }
       /* UNREACHABLE */;
@@ -6008,7 +6008,7 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_80;
+          goto s_n_llhttp__internal__n_error_81;
         }
       }
       /* UNREACHABLE */;
@@ -6071,7 +6071,7 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_83;
         }
       }
       /* UNREACHABLE */;
@@ -6088,7 +6088,7 @@
           goto s_n_llhttp__internal__n_invoke_update_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_83;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -6102,13 +6102,13 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_21;
         default:
-          goto s_n_llhttp__internal__n_error_73;
+          goto s_n_llhttp__internal__n_error_74;
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_72:
-    s_n_llhttp__internal__n_error_72: {
+    case s_n_llhttp__internal__n_error_73:
+    s_n_llhttp__internal__n_error_73: {
       state->error = 0x9;
       state->reason = "Invalid HTTP version";
       state->error_pos = (const char*) p;
@@ -6117,8 +6117,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_84:
-    s_n_llhttp__internal__n_error_84: {
+    case s_n_llhttp__internal__n_error_85:
+    s_n_llhttp__internal__n_error_85: {
       state->error = 0x9;
       state->reason = "Invalid minor version";
       state->error_pos = (const char*) p;
@@ -6190,8 +6190,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_85:
-    s_n_llhttp__internal__n_error_85: {
+    case s_n_llhttp__internal__n_error_86:
+    s_n_llhttp__internal__n_error_86: {
       state->error = 0x9;
       state->reason = "Expected dot";
       state->error_pos = (const char*) p;
@@ -6217,8 +6217,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_86:
-    s_n_llhttp__internal__n_error_86: {
+    case s_n_llhttp__internal__n_error_87:
+    s_n_llhttp__internal__n_error_87: {
       state->error = 0x9;
       state->reason = "Invalid major version";
       state->error_pos = (const char*) p;
@@ -6319,7 +6319,7 @@
           return s_n_llhttp__internal__n_start_res;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_90;
+          goto s_n_llhttp__internal__n_error_91;
         }
       }
       /* UNREACHABLE */;
@@ -6357,7 +6357,7 @@
           return s_n_llhttp__internal__n_req_or_res_method_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_87;
+          goto s_n_llhttp__internal__n_error_88;
         }
       }
       /* UNREACHABLE */;
@@ -6390,7 +6390,7 @@
           return s_n_llhttp__internal__n_req_or_res_method_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_87;
+          goto s_n_llhttp__internal__n_error_88;
         }
       }
       /* UNREACHABLE */;
@@ -6411,7 +6411,7 @@
           goto s_n_llhttp__internal__n_req_or_res_method_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_87;
+          goto s_n_llhttp__internal__n_error_88;
         }
       }
       /* UNREACHABLE */;
@@ -6428,7 +6428,7 @@
           goto s_n_llhttp__internal__n_req_or_res_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_87;
+          goto s_n_llhttp__internal__n_error_88;
         }
       }
       /* UNREACHABLE */;
@@ -6517,7 +6517,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_67: {
+  s_n_llhttp__internal__n_error_68: {
     state->error = 0x7;
     state->reason = "Invalid characters in url";
     state->error_pos = (const char*) p;
@@ -7309,7 +7309,26 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_37: {
+  s_n_llhttp__internal__n_error_36: {
+    state->error = 0xa;
+    state->reason = "Invalid header value char";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_5: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_value_discard_ws;
+      default:
+        goto s_n_llhttp__internal__n_error_36;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_38: {
     state->error = 0xb;
     state->reason = "Empty Content-Length";
     state->error_pos = (const char*) p;
@@ -7327,7 +7346,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_36: {
+  s_n_llhttp__internal__n_error_37: {
     state->error = 0x1d;
     state->reason = "`on_header_value_complete` callback error";
     state->error_pos = (const char*) p;
@@ -7412,7 +7431,7 @@
   s_n_llhttp__internal__n_invoke_load_header_state: {
     switch (llhttp__internal__c_load_header_state(state, p, endp)) {
       case 2:
-        goto s_n_llhttp__internal__n_error_37;
+        goto s_n_llhttp__internal__n_error_38;
       default:
         goto s_n_llhttp__internal__n_invoke_load_header_state_1;
     }
@@ -7438,7 +7457,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_38: {
+  s_n_llhttp__internal__n_error_39: {
     state->error = 0x2;
     state->reason = "Expected LF after CR";
     state->error_pos = (const char*) p;
@@ -7447,6 +7466,16 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_6: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_value_discard_lws;
+      default:
+        goto s_n_llhttp__internal__n_error_39;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_update_header_state_1: {
     switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
@@ -7521,7 +7550,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_39: {
+  s_n_llhttp__internal__n_error_40: {
     state->error = 0x3;
     state->reason = "Missing expected LF after header value";
     state->error_pos = (const char*) p;
@@ -7593,14 +7622,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_40;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_41;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_40;
+    goto s_n_llhttp__internal__n_error_41;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_5: {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_7: {
     switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
       case 1:
         goto s_n_llhttp__internal__n_header_value_lenient;
@@ -7708,10 +7737,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_42;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_43;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_42;
+    goto s_n_llhttp__internal__n_error_43;
     /* UNREACHABLE */;
     abort();
   }
@@ -7743,14 +7772,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_43;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_44;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_43;
+    goto s_n_llhttp__internal__n_error_44;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_41: {
+  s_n_llhttp__internal__n_error_42: {
     state->error = 0x4;
     state->reason = "Duplicate Content-Length";
     state->error_pos = (const char*) p;
@@ -7764,7 +7793,7 @@
       case 0:
         goto s_n_llhttp__internal__n_header_value_content_length;
       default:
-        goto s_n_llhttp__internal__n_error_41;
+        goto s_n_llhttp__internal__n_error_42;
     }
     /* UNREACHABLE */;
     abort();
@@ -7779,11 +7808,11 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) (p + 1);
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_45;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_46;
       return s_error;
     }
     p++;
-    goto s_n_llhttp__internal__n_error_45;
+    goto s_n_llhttp__internal__n_error_46;
     /* UNREACHABLE */;
     abort();
   }
@@ -7805,16 +7834,16 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) (p + 1);
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_44;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_45;
       return s_error;
     }
     p++;
-    goto s_n_llhttp__internal__n_error_44;
+    goto s_n_llhttp__internal__n_error_45;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_6: {
-    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_8: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
       case 0:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_7;
       default:
@@ -7826,7 +7855,7 @@
   s_n_llhttp__internal__n_invoke_load_type_1: {
     switch (llhttp__internal__c_load_type(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_6;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_8;
       default:
         goto s_n_llhttp__internal__n_header_value_te_chunked;
     }
@@ -7857,8 +7886,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_7: {
-    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_9: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
       case 0:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_8;
       default:
@@ -7870,7 +7899,7 @@
   s_n_llhttp__internal__n_invoke_load_type_2: {
     switch (llhttp__internal__c_load_type(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_7;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_9;
       default:
         goto s_n_llhttp__internal__n_invoke_or_flags_17;
     }
@@ -7973,7 +8002,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_46: {
+  s_n_llhttp__internal__n_error_47: {
     state->error = 0xa;
     state->reason = "Invalid header token";
     state->error_pos = (const char*) p;
@@ -8088,7 +8117,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_47: {
+  s_n_llhttp__internal__n_error_48: {
     state->error = 0x7;
     state->reason = "Expected CRLF";
     state->error_pos = (const char*) p;
@@ -8114,7 +8143,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_53: {
+  s_n_llhttp__internal__n_error_54: {
     state->error = 0x17;
     state->reason = "Pause on PRI/Upgrade";
     state->error_pos = (const char*) p;
@@ -8123,7 +8152,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_54: {
+  s_n_llhttp__internal__n_error_55: {
     state->error = 0x9;
     state->reason = "Expected HTTP/2 Connection Preface";
     state->error_pos = (const char*) p;
@@ -8132,7 +8161,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_52: {
+  s_n_llhttp__internal__n_error_53: {
     state->error = 0x9;
     state->reason = "Expected CRLF after version";
     state->error_pos = (const char*) p;
@@ -8150,7 +8179,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_51: {
+  s_n_llhttp__internal__n_error_52: {
     state->error = 0x21;
     state->reason = "`on_version_complete` callback error";
     state->error_pos = (const char*) p;
@@ -8186,10 +8215,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_50;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_51;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_50;
+    goto s_n_llhttp__internal__n_error_51;
     /* UNREACHABLE */;
     abort();
   }
@@ -8239,8 +8268,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_8: {
-    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_10: {
+    switch (llhttp__internal__c_test_lenient_flags_10(state, p, endp)) {
       case 1:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
       default:
@@ -8252,7 +8281,7 @@
   s_n_llhttp__internal__n_invoke_store_http_minor: {
     switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_8;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_10;
     }
     /* UNREACHABLE */;
     abort();
@@ -8267,10 +8296,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_55;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_56;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_55;
+    goto s_n_llhttp__internal__n_error_56;
     /* UNREACHABLE */;
     abort();
   }
@@ -8284,10 +8313,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_56;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_57;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_56;
+    goto s_n_llhttp__internal__n_error_57;
     /* UNREACHABLE */;
     abort();
   }
@@ -8309,14 +8338,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_57;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_58;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_57;
+    goto s_n_llhttp__internal__n_error_58;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_49: {
+  s_n_llhttp__internal__n_error_50: {
     state->error = 0x8;
     state->reason = "Invalid method for HTTP/x.x request";
     state->error_pos = (const char*) p;
@@ -8398,12 +8427,12 @@
       case 34:
         goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_49;
+        goto s_n_llhttp__internal__n_error_50;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_60: {
+  s_n_llhttp__internal__n_error_61: {
     state->error = 0x8;
     state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
@@ -8412,7 +8441,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_58: {
+  s_n_llhttp__internal__n_error_59: {
     state->error = 0x8;
     state->reason = "Expected SOURCE method for ICE/x.x request";
     state->error_pos = (const char*) p;
@@ -8426,12 +8455,12 @@
       case 33:
         goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_58;
+        goto s_n_llhttp__internal__n_error_59;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_59: {
+  s_n_llhttp__internal__n_error_60: {
     state->error = 0x8;
     state->reason = "Invalid method for RTSP/x.x request";
     state->error_pos = (const char*) p;
@@ -8471,7 +8500,7 @@
       case 45:
         goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_59;
+        goto s_n_llhttp__internal__n_error_60;
     }
     /* UNREACHABLE */;
     abort();
@@ -8485,7 +8514,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_48: {
+  s_n_llhttp__internal__n_error_49: {
     state->error = 0x1a;
     state->reason = "`on_url_complete` callback error";
     state->error_pos = (const char*) p;
@@ -8501,7 +8530,7 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_18;
       default:
-        goto s_n_llhttp__internal__n_error_48;
+        goto s_n_llhttp__internal__n_error_49;
     }
     /* UNREACHABLE */;
     abort();
@@ -8574,7 +8603,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_61: {
+  s_n_llhttp__internal__n_error_62: {
     state->error = 0x7;
     state->reason = "Invalid char in url fragment start";
     state->error_pos = (const char*) p;
@@ -8634,7 +8663,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_62: {
+  s_n_llhttp__internal__n_error_63: {
     state->error = 0x7;
     state->reason = "Invalid char in url query";
     state->error_pos = (const char*) p;
@@ -8643,7 +8672,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_63: {
+  s_n_llhttp__internal__n_error_64: {
     state->error = 0x7;
     state->reason = "Invalid char in url path";
     state->error_pos = (const char*) p;
@@ -8754,7 +8783,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_64: {
+  s_n_llhttp__internal__n_error_65: {
     state->error = 0x7;
     state->reason = "Double @ in url";
     state->error_pos = (const char*) p;
@@ -8763,7 +8792,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_65: {
+  s_n_llhttp__internal__n_error_66: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -8772,7 +8801,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_66: {
+  s_n_llhttp__internal__n_error_67: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -8781,7 +8810,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_68: {
+  s_n_llhttp__internal__n_error_69: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -8790,7 +8819,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_69: {
+  s_n_llhttp__internal__n_error_70: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -8799,7 +8828,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_70: {
+  s_n_llhttp__internal__n_error_71: {
     state->error = 0x7;
     state->reason = "Unexpected start char in url";
     state->error_pos = (const char*) p;
@@ -8818,7 +8847,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_71: {
+  s_n_llhttp__internal__n_error_72: {
     state->error = 0x6;
     state->reason = "Expected space after method";
     state->error_pos = (const char*) p;
@@ -8836,7 +8865,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_88: {
+  s_n_llhttp__internal__n_error_89: {
     state->error = 0x20;
     state->reason = "`on_method_complete` callback error";
     state->error_pos = (const char*) p;
@@ -8870,7 +8899,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_89: {
+  s_n_llhttp__internal__n_error_90: {
     state->error = 0x6;
     state->reason = "Invalid method encountered";
     state->error_pos = (const char*) p;
@@ -8879,7 +8908,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_81: {
+  s_n_llhttp__internal__n_error_82: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -8888,7 +8917,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_79: {
+  s_n_llhttp__internal__n_error_80: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -8897,7 +8926,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_77: {
+  s_n_llhttp__internal__n_error_78: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -8915,7 +8944,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_74: {
+  s_n_llhttp__internal__n_error_75: {
     state->error = 0x1b;
     state->reason = "`on_status_complete` callback error";
     state->error_pos = (const char*) p;
@@ -8924,7 +8953,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_75: {
+  s_n_llhttp__internal__n_error_76: {
     state->error = 0x2;
     state->reason = "Expected LF after CR";
     state->error_pos = (const char*) p;
@@ -8969,7 +8998,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_76: {
+  s_n_llhttp__internal__n_error_77: {
     state->error = 0xd;
     state->reason = "Invalid response status";
     state->error_pos = (const char*) p;
@@ -8981,14 +9010,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_status_code_2: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_77;
+        goto s_n_llhttp__internal__n_error_78;
       default:
         goto s_n_llhttp__internal__n_res_status_code_otherwise;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_78: {
+  s_n_llhttp__internal__n_error_79: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9000,14 +9029,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_status_code_1: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_79;
+        goto s_n_llhttp__internal__n_error_80;
       default:
         goto s_n_llhttp__internal__n_res_status_code_digit_3;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_80: {
+  s_n_llhttp__internal__n_error_81: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9019,14 +9048,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_status_code: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_81;
+        goto s_n_llhttp__internal__n_error_82;
       default:
         goto s_n_llhttp__internal__n_res_status_code_digit_2;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_82: {
+  s_n_llhttp__internal__n_error_83: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9043,7 +9072,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_83: {
+  s_n_llhttp__internal__n_error_84: {
     state->error = 0x9;
     state->reason = "Expected space after version";
     state->error_pos = (const char*) p;
@@ -9061,7 +9090,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_73: {
+  s_n_llhttp__internal__n_error_74: {
     state->error = 0x21;
     state->reason = "`on_version_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9097,10 +9126,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_72;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_73;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_72;
+    goto s_n_llhttp__internal__n_error_73;
     /* UNREACHABLE */;
     abort();
   }
@@ -9150,8 +9179,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_9: {
-    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_11: {
+    switch (llhttp__internal__c_test_lenient_flags_10(state, p, endp)) {
       case 1:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
       default:
@@ -9163,7 +9192,7 @@
   s_n_llhttp__internal__n_invoke_store_http_minor_1: {
     switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_9;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_11;
     }
     /* UNREACHABLE */;
     abort();
@@ -9178,10 +9207,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_84;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_85;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_84;
+    goto s_n_llhttp__internal__n_error_85;
     /* UNREACHABLE */;
     abort();
   }
@@ -9195,10 +9224,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_85;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_86;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_85;
+    goto s_n_llhttp__internal__n_error_86;
     /* UNREACHABLE */;
     abort();
   }
@@ -9220,14 +9249,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_86;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_87;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_86;
+    goto s_n_llhttp__internal__n_error_87;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_90: {
+  s_n_llhttp__internal__n_error_91: {
     state->error = 0x8;
     state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
@@ -9287,7 +9316,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_87: {
+  s_n_llhttp__internal__n_error_88: {
     state->error = 0x8;
     state->reason = "Invalid word encountered";
     state->error_pos = (const char*) p;
@@ -9360,7 +9389,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_91: {
+  s_n_llhttp__internal__n_error_92: {
     state->error = 0x1f;
     state->reason = "`on_reset` callback error";
     state->error_pos = (const char*) p;
@@ -9376,7 +9405,7 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_24;
       default:
-        goto s_n_llhttp__internal__n_error_91;
+        goto s_n_llhttp__internal__n_error_92;
     }
     /* UNREACHABLE */;
     abort();
@@ -9809,7 +9838,7 @@
   s_n_llhttp__internal__n_header_value_lws,
   s_n_llhttp__internal__n_header_value_almost_done,
   s_n_llhttp__internal__n_header_value_lenient,
-  s_n_llhttp__internal__n_error_34,
+  s_n_llhttp__internal__n_error_36,
   s_n_llhttp__internal__n_header_value_otherwise,
   s_n_llhttp__internal__n_header_value_connection_token,
   s_n_llhttp__internal__n_header_value_connection_ws,
@@ -9817,12 +9846,12 @@
   s_n_llhttp__internal__n_header_value_connection_2,
   s_n_llhttp__internal__n_header_value_connection_3,
   s_n_llhttp__internal__n_header_value_connection,
-  s_n_llhttp__internal__n_error_36,
-  s_n_llhttp__internal__n_error_37,
+  s_n_llhttp__internal__n_error_38,
+  s_n_llhttp__internal__n_error_39,
   s_n_llhttp__internal__n_header_value_content_length_ws,
   s_n_llhttp__internal__n_header_value_content_length,
-  s_n_llhttp__internal__n_error_39,
-  s_n_llhttp__internal__n_error_38,
+  s_n_llhttp__internal__n_error_41,
+  s_n_llhttp__internal__n_error_40,
   s_n_llhttp__internal__n_header_value_te_token_ows,
   s_n_llhttp__internal__n_header_value,
   s_n_llhttp__internal__n_header_value_te_token,
@@ -9852,12 +9881,12 @@
   s_n_llhttp__internal__n_req_http_complete,
   s_n_llhttp__internal__n_invoke_load_method_1,
   s_n_llhttp__internal__n_invoke_llhttp__on_version_complete,
-  s_n_llhttp__internal__n_error_44,
-  s_n_llhttp__internal__n_error_49,
+  s_n_llhttp__internal__n_error_46,
+  s_n_llhttp__internal__n_error_51,
   s_n_llhttp__internal__n_req_http_minor,
-  s_n_llhttp__internal__n_error_50,
+  s_n_llhttp__internal__n_error_52,
   s_n_llhttp__internal__n_req_http_dot,
-  s_n_llhttp__internal__n_error_51,
+  s_n_llhttp__internal__n_error_53,
   s_n_llhttp__internal__n_req_http_major,
   s_n_llhttp__internal__n_span_start_llhttp__on_version,
   s_n_llhttp__internal__n_req_http_start_1,
@@ -9967,12 +9996,12 @@
   s_n_llhttp__internal__n_res_status_code_digit_1,
   s_n_llhttp__internal__n_res_after_version,
   s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1,
-  s_n_llhttp__internal__n_error_66,
-  s_n_llhttp__internal__n_error_77,
+  s_n_llhttp__internal__n_error_68,
+  s_n_llhttp__internal__n_error_79,
   s_n_llhttp__internal__n_res_http_minor,
-  s_n_llhttp__internal__n_error_78,
+  s_n_llhttp__internal__n_error_80,
   s_n_llhttp__internal__n_res_http_dot,
-  s_n_llhttp__internal__n_error_79,
+  s_n_llhttp__internal__n_error_81,
   s_n_llhttp__internal__n_res_http_major,
   s_n_llhttp__internal__n_span_start_llhttp__on_version_1,
   s_n_llhttp__internal__n_start_res,
@@ -10407,7 +10436,7 @@
   return (state->flags & 8) == 8;
 }
 
-int llhttp__internal__c_test_lenient_flags_6(
+int llhttp__internal__c_test_lenient_flags_8(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -10471,7 +10500,7 @@
   return 0;
 }
 
-int llhttp__internal__c_test_lenient_flags_8(
+int llhttp__internal__c_test_lenient_flags_10(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -11364,7 +11393,7 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_14;
         default:
-          goto s_n_llhttp__internal__n_error_31;
+          goto s_n_llhttp__internal__n_error_32;
       }
       /* UNREACHABLE */;
       abort();
@@ -11388,11 +11417,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_header_value_discard_ws;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
         }
         case ' ': {
           p++;
-          goto s_n_llhttp__internal__n_header_value_discard_ws;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
         }
         default: {
           goto s_n_llhttp__internal__n_invoke_load_header_state;
@@ -11406,8 +11435,15 @@
       if (p == endp) {
         return s_n_llhttp__internal__n_header_value_discard_ws_almost_done;
       }
-      p++;
-      goto s_n_llhttp__internal__n_header_value_discard_lws;
+      switch (*p) {
+        case 10: {
+          p++;
+          goto s_n_llhttp__internal__n_header_value_discard_lws;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_6;
+        }
+      }
       /* UNREACHABLE */;
       abort();
     }
@@ -11441,7 +11477,7 @@
           goto s_n_llhttp__internal__n_header_value_lws;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_33;
+          goto s_n_llhttp__internal__n_error_35;
         }
       }
       /* UNREACHABLE */;
@@ -11467,8 +11503,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_34:
-    s_n_llhttp__internal__n_error_34: {
+    case s_n_llhttp__internal__n_error_36:
+    s_n_llhttp__internal__n_error_36: {
       state->error = 0xa;
       state->reason = "Invalid header value char";
       state->error_pos = (const char*) p;
@@ -11487,7 +11523,7 @@
           goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_7;
         }
       }
       /* UNREACHABLE */;
@@ -11664,8 +11700,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_36:
-    s_n_llhttp__internal__n_error_36: {
+    case s_n_llhttp__internal__n_error_38:
+    s_n_llhttp__internal__n_error_38: {
       state->error = 0xb;
       state->reason = "Content-Length overflow";
       state->error_pos = (const char*) p;
@@ -11674,8 +11710,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_37:
-    s_n_llhttp__internal__n_error_37: {
+    case s_n_llhttp__internal__n_error_39:
+    s_n_llhttp__internal__n_error_39: {
       state->error = 0xb;
       state->reason = "Invalid character in Content-Length";
       state->error_pos = (const char*) p;
@@ -11770,8 +11806,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_39:
-    s_n_llhttp__internal__n_error_39: {
+    case s_n_llhttp__internal__n_error_41:
+    s_n_llhttp__internal__n_error_41: {
       state->error = 0xf;
       state->reason = "Invalid `Transfer-Encoding` header value";
       state->error_pos = (const char*) p;
@@ -11780,8 +11816,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_38:
-    s_n_llhttp__internal__n_error_38: {
+    case s_n_llhttp__internal__n_error_40:
+    s_n_llhttp__internal__n_error_40: {
       state->error = 0xf;
       state->reason = "Invalid `Transfer-Encoding` header value";
       state->error_pos = (const char*) p;
@@ -12022,7 +12058,7 @@
           goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_40;
+          goto s_n_llhttp__internal__n_error_42;
         }
       }
       /* UNREACHABLE */;
@@ -12393,7 +12429,7 @@
           return s_n_llhttp__internal__n_url_skip_lf_to_http09;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_41;
+          goto s_n_llhttp__internal__n_error_43;
         }
       }
       /* UNREACHABLE */;
@@ -12411,13 +12447,13 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_error_47;
+          goto s_n_llhttp__internal__n_error_49;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_req_pri_upgrade;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_48;
+          goto s_n_llhttp__internal__n_error_50;
         }
       }
       /* UNREACHABLE */;
@@ -12434,7 +12470,7 @@
           goto s_n_llhttp__internal__n_headers_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_46;
+          goto s_n_llhttp__internal__n_error_48;
         }
       }
       /* UNREACHABLE */;
@@ -12455,7 +12491,7 @@
           goto s_n_llhttp__internal__n_req_http_complete_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_46;
+          goto s_n_llhttp__internal__n_error_48;
         }
       }
       /* UNREACHABLE */;
@@ -12480,13 +12516,13 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_17;
         default:
-          goto s_n_llhttp__internal__n_error_45;
+          goto s_n_llhttp__internal__n_error_47;
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_44:
-    s_n_llhttp__internal__n_error_44: {
+    case s_n_llhttp__internal__n_error_46:
+    s_n_llhttp__internal__n_error_46: {
       state->error = 0x9;
       state->reason = "Invalid HTTP version";
       state->error_pos = (const char*) p;
@@ -12495,8 +12531,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_49:
-    s_n_llhttp__internal__n_error_49: {
+    case s_n_llhttp__internal__n_error_51:
+    s_n_llhttp__internal__n_error_51: {
       state->error = 0x9;
       state->reason = "Invalid minor version";
       state->error_pos = (const char*) p;
@@ -12568,8 +12604,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_50:
-    s_n_llhttp__internal__n_error_50: {
+    case s_n_llhttp__internal__n_error_52:
+    s_n_llhttp__internal__n_error_52: {
       state->error = 0x9;
       state->reason = "Expected dot";
       state->error_pos = (const char*) p;
@@ -12595,8 +12631,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_51:
-    s_n_llhttp__internal__n_error_51: {
+    case s_n_llhttp__internal__n_error_53:
+    s_n_llhttp__internal__n_error_53: {
       state->error = 0x9;
       state->reason = "Invalid major version";
       state->error_pos = (const char*) p;
@@ -12697,7 +12733,7 @@
           return s_n_llhttp__internal__n_req_http_start_1;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_54;
+          goto s_n_llhttp__internal__n_error_56;
         }
       }
       /* UNREACHABLE */;
@@ -12721,7 +12757,7 @@
           return s_n_llhttp__internal__n_req_http_start_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_54;
+          goto s_n_llhttp__internal__n_error_56;
         }
       }
       /* UNREACHABLE */;
@@ -12745,7 +12781,7 @@
           return s_n_llhttp__internal__n_req_http_start_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_54;
+          goto s_n_llhttp__internal__n_error_56;
         }
       }
       /* UNREACHABLE */;
@@ -12774,7 +12810,7 @@
           goto s_n_llhttp__internal__n_req_http_start_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_54;
+          goto s_n_llhttp__internal__n_error_56;
         }
       }
       /* UNREACHABLE */;
@@ -12828,7 +12864,7 @@
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url_8;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_55;
+          goto s_n_llhttp__internal__n_error_57;
         }
       }
       /* UNREACHABLE */;
@@ -12885,7 +12921,7 @@
           goto s_n_llhttp__internal__n_span_end_stub_query_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_58;
         }
       }
       /* UNREACHABLE */;
@@ -12915,7 +12951,7 @@
           goto s_n_llhttp__internal__n_url_query;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_57;
+          goto s_n_llhttp__internal__n_error_59;
         }
       }
       /* UNREACHABLE */;
@@ -13056,10 +13092,10 @@
         }
         case 7: {
           p++;
-          goto s_n_llhttp__internal__n_error_58;
+          goto s_n_llhttp__internal__n_error_60;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_59;
+          goto s_n_llhttp__internal__n_error_61;
         }
       }
       /* UNREACHABLE */;
@@ -13114,7 +13150,7 @@
           goto s_n_llhttp__internal__n_url_server_with_at;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_60;
+          goto s_n_llhttp__internal__n_error_62;
         }
       }
       /* UNREACHABLE */;
@@ -13131,7 +13167,7 @@
           goto s_n_llhttp__internal__n_url_server;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_62;
+          goto s_n_llhttp__internal__n_error_64;
         }
       }
       /* UNREACHABLE */;
@@ -13145,22 +13181,22 @@
       switch (*p) {
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_error_61;
+          goto s_n_llhttp__internal__n_error_63;
         }
         case 13: {
           p++;
-          goto s_n_llhttp__internal__n_error_61;
+          goto s_n_llhttp__internal__n_error_63;
         }
         case ' ': {
           p++;
-          goto s_n_llhttp__internal__n_error_61;
+          goto s_n_llhttp__internal__n_error_63;
         }
         case '/': {
           p++;
           goto s_n_llhttp__internal__n_url_schema_delim_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_62;
+          goto s_n_llhttp__internal__n_error_64;
         }
       }
       /* UNREACHABLE */;
@@ -13202,7 +13238,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_61;
+          goto s_n_llhttp__internal__n_error_63;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_end_stub_schema;
@@ -13212,7 +13248,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_63;
+          goto s_n_llhttp__internal__n_error_65;
         }
       }
       /* UNREACHABLE */;
@@ -13244,7 +13280,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_61;
+          goto s_n_llhttp__internal__n_error_63;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_start_stub_path_2;
@@ -13253,7 +13289,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_64;
+          goto s_n_llhttp__internal__n_error_66;
         }
       }
       /* UNREACHABLE */;
@@ -13309,7 +13345,7 @@
           goto s_n_llhttp__internal__n_req_spaces_before_url;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_65;
+          goto s_n_llhttp__internal__n_error_67;
         }
       }
       /* UNREACHABLE */;
@@ -13323,7 +13359,7 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_22;
         default:
-          goto s_n_llhttp__internal__n_error_81;
+          goto s_n_llhttp__internal__n_error_83;
       }
       /* UNREACHABLE */;
       abort();
@@ -13340,7 +13376,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13365,7 +13401,7 @@
           return s_n_llhttp__internal__n_after_start_req_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13386,7 +13422,7 @@
           goto s_n_llhttp__internal__n_after_start_req_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13411,7 +13447,7 @@
           return s_n_llhttp__internal__n_after_start_req_4;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13436,7 +13472,7 @@
           return s_n_llhttp__internal__n_after_start_req_6;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13461,7 +13497,7 @@
           return s_n_llhttp__internal__n_after_start_req_8;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13479,7 +13515,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13500,7 +13536,7 @@
           goto s_n_llhttp__internal__n_after_start_req_9;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13521,7 +13557,7 @@
           goto s_n_llhttp__internal__n_after_start_req_7;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13546,7 +13582,7 @@
           return s_n_llhttp__internal__n_after_start_req_12;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13571,7 +13607,7 @@
           return s_n_llhttp__internal__n_after_start_req_13;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13592,7 +13628,7 @@
           goto s_n_llhttp__internal__n_after_start_req_13;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13609,7 +13645,7 @@
           goto s_n_llhttp__internal__n_after_start_req_11;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13634,7 +13670,7 @@
           return s_n_llhttp__internal__n_after_start_req_14;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13659,7 +13695,7 @@
           return s_n_llhttp__internal__n_after_start_req_17;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13701,7 +13737,7 @@
           return s_n_llhttp__internal__n_after_start_req_15;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13726,7 +13762,7 @@
           return s_n_llhttp__internal__n_after_start_req_18;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13751,7 +13787,7 @@
           return s_n_llhttp__internal__n_after_start_req_20;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13776,7 +13812,7 @@
           return s_n_llhttp__internal__n_after_start_req_21;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13797,7 +13833,7 @@
           goto s_n_llhttp__internal__n_after_start_req_21;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13822,7 +13858,7 @@
           return s_n_llhttp__internal__n_after_start_req_23;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13847,7 +13883,7 @@
           return s_n_llhttp__internal__n_after_start_req_24;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13872,7 +13908,7 @@
           return s_n_llhttp__internal__n_after_start_req_26;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13897,7 +13933,7 @@
           return s_n_llhttp__internal__n_after_start_req_28;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13915,7 +13951,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13936,7 +13972,7 @@
           goto s_n_llhttp__internal__n_after_start_req_29;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13957,7 +13993,7 @@
           goto s_n_llhttp__internal__n_after_start_req_27;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -13982,7 +14018,7 @@
           return s_n_llhttp__internal__n_after_start_req_30;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14011,7 +14047,7 @@
           goto s_n_llhttp__internal__n_after_start_req_30;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14036,7 +14072,7 @@
           return s_n_llhttp__internal__n_after_start_req_31;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14061,7 +14097,7 @@
           return s_n_llhttp__internal__n_after_start_req_32;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14086,7 +14122,7 @@
           return s_n_llhttp__internal__n_after_start_req_35;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14111,7 +14147,7 @@
           return s_n_llhttp__internal__n_after_start_req_36;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14132,7 +14168,7 @@
           goto s_n_llhttp__internal__n_after_start_req_36;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14157,7 +14193,7 @@
           return s_n_llhttp__internal__n_after_start_req_37;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14182,7 +14218,7 @@
           return s_n_llhttp__internal__n_after_start_req_38;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14207,7 +14243,7 @@
           return s_n_llhttp__internal__n_after_start_req_42;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14232,7 +14268,7 @@
           return s_n_llhttp__internal__n_after_start_req_43;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14253,7 +14289,7 @@
           goto s_n_llhttp__internal__n_after_start_req_43;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14270,7 +14306,7 @@
           goto s_n_llhttp__internal__n_after_start_req_41;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14292,7 +14328,7 @@
           goto s_n_llhttp__internal__n_after_start_req_40;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14317,7 +14353,7 @@
           return s_n_llhttp__internal__n_after_start_req_45;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14339,7 +14375,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14372,7 +14408,7 @@
           goto s_n_llhttp__internal__n_after_start_req_44;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14397,7 +14433,7 @@
           return s_n_llhttp__internal__n_after_start_req_48;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14422,7 +14458,7 @@
           return s_n_llhttp__internal__n_after_start_req_49;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14447,7 +14483,7 @@
           return s_n_llhttp__internal__n_after_start_req_50;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14472,7 +14508,7 @@
           return s_n_llhttp__internal__n_after_start_req_51;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14501,7 +14537,7 @@
           goto s_n_llhttp__internal__n_after_start_req_51;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14518,7 +14554,7 @@
           goto s_n_llhttp__internal__n_after_start_req_47;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14543,7 +14579,7 @@
           return s_n_llhttp__internal__n_after_start_req_54;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14561,7 +14597,7 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14586,7 +14622,7 @@
           return s_n_llhttp__internal__n_after_start_req_57;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14607,7 +14643,7 @@
           goto s_n_llhttp__internal__n_after_start_req_57;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14628,7 +14664,7 @@
           goto s_n_llhttp__internal__n_after_start_req_55;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14653,7 +14689,7 @@
           return s_n_llhttp__internal__n_after_start_req_58;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14678,7 +14714,7 @@
           return s_n_llhttp__internal__n_after_start_req_59;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14703,7 +14739,7 @@
           goto s_n_llhttp__internal__n_after_start_req_59;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14728,7 +14764,7 @@
           return s_n_llhttp__internal__n_after_start_req_61;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14753,7 +14789,7 @@
           return s_n_llhttp__internal__n_after_start_req_62;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14774,7 +14810,7 @@
           goto s_n_llhttp__internal__n_after_start_req_62;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14799,7 +14835,7 @@
           return s_n_llhttp__internal__n_after_start_req_65;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14824,7 +14860,7 @@
           return s_n_llhttp__internal__n_after_start_req_67;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14849,7 +14885,7 @@
           return s_n_llhttp__internal__n_after_start_req_68;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14870,7 +14906,7 @@
           goto s_n_llhttp__internal__n_after_start_req_68;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14895,7 +14931,7 @@
           return s_n_llhttp__internal__n_after_start_req_69;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14920,7 +14956,7 @@
           goto s_n_llhttp__internal__n_after_start_req_69;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -14937,7 +14973,7 @@
           goto s_n_llhttp__internal__n_after_start_req_64;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -15014,7 +15050,7 @@
           goto s_n_llhttp__internal__n_after_start_req_63;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_82;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       /* UNREACHABLE */;
@@ -15039,7 +15075,7 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_20;
         default:
-          goto s_n_llhttp__internal__n_error_68;
+          goto s_n_llhttp__internal__n_error_70;
       }
       /* UNREACHABLE */;
       abort();
@@ -15123,7 +15159,7 @@
           goto s_n_llhttp__internal__n_res_status_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_69;
+          goto s_n_llhttp__internal__n_error_71;
         }
       }
       /* UNREACHABLE */;
@@ -15186,7 +15222,7 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_71;
+          goto s_n_llhttp__internal__n_error_73;
         }
       }
       /* UNREACHABLE */;
@@ -15249,7 +15285,7 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_73;
+          goto s_n_llhttp__internal__n_error_75;
         }
       }
       /* UNREACHABLE */;
@@ -15312,7 +15348,7 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_75;
+          goto s_n_llhttp__internal__n_error_77;
         }
       }
       /* UNREACHABLE */;
@@ -15329,7 +15365,7 @@
           goto s_n_llhttp__internal__n_invoke_update_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_76;
+          goto s_n_llhttp__internal__n_error_78;
         }
       }
       /* UNREACHABLE */;
@@ -15343,13 +15379,13 @@
         case 21:
           goto s_n_llhttp__internal__n_pause_21;
         default:
-          goto s_n_llhttp__internal__n_error_67;
+          goto s_n_llhttp__internal__n_error_69;
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_66:
-    s_n_llhttp__internal__n_error_66: {
+    case s_n_llhttp__internal__n_error_68:
+    s_n_llhttp__internal__n_error_68: {
       state->error = 0x9;
       state->reason = "Invalid HTTP version";
       state->error_pos = (const char*) p;
@@ -15358,8 +15394,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_77:
-    s_n_llhttp__internal__n_error_77: {
+    case s_n_llhttp__internal__n_error_79:
+    s_n_llhttp__internal__n_error_79: {
       state->error = 0x9;
       state->reason = "Invalid minor version";
       state->error_pos = (const char*) p;
@@ -15431,8 +15467,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_78:
-    s_n_llhttp__internal__n_error_78: {
+    case s_n_llhttp__internal__n_error_80:
+    s_n_llhttp__internal__n_error_80: {
       state->error = 0x9;
       state->reason = "Expected dot";
       state->error_pos = (const char*) p;
@@ -15458,8 +15494,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_79:
-    s_n_llhttp__internal__n_error_79: {
+    case s_n_llhttp__internal__n_error_81:
+    s_n_llhttp__internal__n_error_81: {
       state->error = 0x9;
       state->reason = "Invalid major version";
       state->error_pos = (const char*) p;
@@ -15560,7 +15596,7 @@
           return s_n_llhttp__internal__n_start_res;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_83;
+          goto s_n_llhttp__internal__n_error_85;
         }
       }
       /* UNREACHABLE */;
@@ -15598,7 +15634,7 @@
           return s_n_llhttp__internal__n_req_or_res_method_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_80;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
@@ -15631,7 +15667,7 @@
           return s_n_llhttp__internal__n_req_or_res_method_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_80;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
@@ -15652,7 +15688,7 @@
           goto s_n_llhttp__internal__n_req_or_res_method_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_80;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
@@ -15669,7 +15705,7 @@
           goto s_n_llhttp__internal__n_req_or_res_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_80;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
@@ -15749,7 +15785,7 @@
       /* UNREACHABLE */
       abort();
   }
-  s_n_llhttp__internal__n_error_61: {
+  s_n_llhttp__internal__n_error_63: {
     state->error = 0x7;
     state->reason = "Invalid characters in url";
     state->error_pos = (const char*) p;
@@ -16505,7 +16541,26 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_32: {
+  s_n_llhttp__internal__n_error_31: {
+    state->error = 0xa;
+    state->reason = "Invalid header value char";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_5: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_value_discard_ws;
+      default:
+        goto s_n_llhttp__internal__n_error_31;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_33: {
     state->error = 0xb;
     state->reason = "Empty Content-Length";
     state->error_pos = (const char*) p;
@@ -16523,7 +16578,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_31: {
+  s_n_llhttp__internal__n_error_32: {
     state->error = 0x1d;
     state->reason = "`on_header_value_complete` callback error";
     state->error_pos = (const char*) p;
@@ -16608,7 +16663,7 @@
   s_n_llhttp__internal__n_invoke_load_header_state: {
     switch (llhttp__internal__c_load_header_state(state, p, endp)) {
       case 2:
-        goto s_n_llhttp__internal__n_error_32;
+        goto s_n_llhttp__internal__n_error_33;
       default:
         goto s_n_llhttp__internal__n_invoke_load_header_state_1;
     }
@@ -16634,6 +16689,25 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_error_34: {
+    state->error = 0x2;
+    state->reason = "Expected LF after CR";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_6: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_value_discard_lws;
+      default:
+        goto s_n_llhttp__internal__n_error_34;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_update_header_state_1: {
     switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
@@ -16708,7 +16782,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_33: {
+  s_n_llhttp__internal__n_error_35: {
     state->error = 0x3;
     state->reason = "Missing expected LF after header value";
     state->error_pos = (const char*) p;
@@ -16780,14 +16854,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_34;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_36;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_34;
+    goto s_n_llhttp__internal__n_error_36;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_5: {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_7: {
     switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
       case 1:
         goto s_n_llhttp__internal__n_header_value_lenient;
@@ -16895,10 +16969,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_36;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_38;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_36;
+    goto s_n_llhttp__internal__n_error_38;
     /* UNREACHABLE */;
     abort();
   }
@@ -16930,14 +17004,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_37;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_39;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_37;
+    goto s_n_llhttp__internal__n_error_39;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_35: {
+  s_n_llhttp__internal__n_error_37: {
     state->error = 0x4;
     state->reason = "Duplicate Content-Length";
     state->error_pos = (const char*) p;
@@ -16951,7 +17025,7 @@
       case 0:
         goto s_n_llhttp__internal__n_header_value_content_length;
       default:
-        goto s_n_llhttp__internal__n_error_35;
+        goto s_n_llhttp__internal__n_error_37;
     }
     /* UNREACHABLE */;
     abort();
@@ -16966,11 +17040,11 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) (p + 1);
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_39;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_41;
       return s_error;
     }
     p++;
-    goto s_n_llhttp__internal__n_error_39;
+    goto s_n_llhttp__internal__n_error_41;
     /* UNREACHABLE */;
     abort();
   }
@@ -16992,16 +17066,16 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) (p + 1);
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_38;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_40;
       return s_error;
     }
     p++;
-    goto s_n_llhttp__internal__n_error_38;
+    goto s_n_llhttp__internal__n_error_40;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_6: {
-    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_8: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
       case 0:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_7;
       default:
@@ -17013,7 +17087,7 @@
   s_n_llhttp__internal__n_invoke_load_type_1: {
     switch (llhttp__internal__c_load_type(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_6;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_8;
       default:
         goto s_n_llhttp__internal__n_header_value_te_chunked;
     }
@@ -17044,8 +17118,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_7: {
-    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_9: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
       case 0:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_8;
       default:
@@ -17057,7 +17131,7 @@
   s_n_llhttp__internal__n_invoke_load_type_2: {
     switch (llhttp__internal__c_load_type(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_7;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_9;
       default:
         goto s_n_llhttp__internal__n_invoke_or_flags_17;
     }
@@ -17160,7 +17234,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_40: {
+  s_n_llhttp__internal__n_error_42: {
     state->error = 0xa;
     state->reason = "Invalid header token";
     state->error_pos = (const char*) p;
@@ -17275,7 +17349,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_41: {
+  s_n_llhttp__internal__n_error_43: {
     state->error = 0x7;
     state->reason = "Expected CRLF";
     state->error_pos = (const char*) p;
@@ -17301,7 +17375,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_47: {
+  s_n_llhttp__internal__n_error_49: {
     state->error = 0x17;
     state->reason = "Pause on PRI/Upgrade";
     state->error_pos = (const char*) p;
@@ -17310,7 +17384,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_48: {
+  s_n_llhttp__internal__n_error_50: {
     state->error = 0x9;
     state->reason = "Expected HTTP/2 Connection Preface";
     state->error_pos = (const char*) p;
@@ -17319,7 +17393,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_46: {
+  s_n_llhttp__internal__n_error_48: {
     state->error = 0x9;
     state->reason = "Expected CRLF after version";
     state->error_pos = (const char*) p;
@@ -17337,7 +17411,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_45: {
+  s_n_llhttp__internal__n_error_47: {
     state->error = 0x21;
     state->reason = "`on_version_complete` callback error";
     state->error_pos = (const char*) p;
@@ -17373,10 +17447,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_44;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_46;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_44;
+    goto s_n_llhttp__internal__n_error_46;
     /* UNREACHABLE */;
     abort();
   }
@@ -17426,8 +17500,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_8: {
-    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_10: {
+    switch (llhttp__internal__c_test_lenient_flags_10(state, p, endp)) {
       case 1:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
       default:
@@ -17439,7 +17513,7 @@
   s_n_llhttp__internal__n_invoke_store_http_minor: {
     switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_8;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_10;
     }
     /* UNREACHABLE */;
     abort();
@@ -17454,10 +17528,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_49;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_51;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_49;
+    goto s_n_llhttp__internal__n_error_51;
     /* UNREACHABLE */;
     abort();
   }
@@ -17471,10 +17545,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_50;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_52;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_50;
+    goto s_n_llhttp__internal__n_error_52;
     /* UNREACHABLE */;
     abort();
   }
@@ -17496,14 +17570,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_51;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_53;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_51;
+    goto s_n_llhttp__internal__n_error_53;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_43: {
+  s_n_llhttp__internal__n_error_45: {
     state->error = 0x8;
     state->reason = "Invalid method for HTTP/x.x request";
     state->error_pos = (const char*) p;
@@ -17585,12 +17659,12 @@
       case 34:
         goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_43;
+        goto s_n_llhttp__internal__n_error_45;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_54: {
+  s_n_llhttp__internal__n_error_56: {
     state->error = 0x8;
     state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
@@ -17599,7 +17673,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_52: {
+  s_n_llhttp__internal__n_error_54: {
     state->error = 0x8;
     state->reason = "Expected SOURCE method for ICE/x.x request";
     state->error_pos = (const char*) p;
@@ -17613,12 +17687,12 @@
       case 33:
         goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_52;
+        goto s_n_llhttp__internal__n_error_54;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_53: {
+  s_n_llhttp__internal__n_error_55: {
     state->error = 0x8;
     state->reason = "Invalid method for RTSP/x.x request";
     state->error_pos = (const char*) p;
@@ -17658,7 +17732,7 @@
       case 45:
         goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_53;
+        goto s_n_llhttp__internal__n_error_55;
     }
     /* UNREACHABLE */;
     abort();
@@ -17672,7 +17746,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_42: {
+  s_n_llhttp__internal__n_error_44: {
     state->error = 0x1a;
     state->reason = "`on_url_complete` callback error";
     state->error_pos = (const char*) p;
@@ -17688,7 +17762,7 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_18;
       default:
-        goto s_n_llhttp__internal__n_error_42;
+        goto s_n_llhttp__internal__n_error_44;
     }
     /* UNREACHABLE */;
     abort();
@@ -17761,7 +17835,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_55: {
+  s_n_llhttp__internal__n_error_57: {
     state->error = 0x7;
     state->reason = "Invalid char in url fragment start";
     state->error_pos = (const char*) p;
@@ -17821,7 +17895,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_56: {
+  s_n_llhttp__internal__n_error_58: {
     state->error = 0x7;
     state->reason = "Invalid char in url query";
     state->error_pos = (const char*) p;
@@ -17830,7 +17904,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_57: {
+  s_n_llhttp__internal__n_error_59: {
     state->error = 0x7;
     state->reason = "Invalid char in url path";
     state->error_pos = (const char*) p;
@@ -17941,7 +18015,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_58: {
+  s_n_llhttp__internal__n_error_60: {
     state->error = 0x7;
     state->reason = "Double @ in url";
     state->error_pos = (const char*) p;
@@ -17950,7 +18024,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_59: {
+  s_n_llhttp__internal__n_error_61: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -17959,7 +18033,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_60: {
+  s_n_llhttp__internal__n_error_62: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -17968,7 +18042,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_62: {
+  s_n_llhttp__internal__n_error_64: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -17977,7 +18051,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_63: {
+  s_n_llhttp__internal__n_error_65: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -17986,7 +18060,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_64: {
+  s_n_llhttp__internal__n_error_66: {
     state->error = 0x7;
     state->reason = "Unexpected start char in url";
     state->error_pos = (const char*) p;
@@ -18005,7 +18079,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_65: {
+  s_n_llhttp__internal__n_error_67: {
     state->error = 0x6;
     state->reason = "Expected space after method";
     state->error_pos = (const char*) p;
@@ -18023,7 +18097,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_81: {
+  s_n_llhttp__internal__n_error_83: {
     state->error = 0x20;
     state->reason = "`on_method_complete` callback error";
     state->error_pos = (const char*) p;
@@ -18057,7 +18131,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_82: {
+  s_n_llhttp__internal__n_error_84: {
     state->error = 0x6;
     state->reason = "Invalid method encountered";
     state->error_pos = (const char*) p;
@@ -18066,7 +18140,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_74: {
+  s_n_llhttp__internal__n_error_76: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -18075,7 +18149,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_72: {
+  s_n_llhttp__internal__n_error_74: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -18084,7 +18158,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_70: {
+  s_n_llhttp__internal__n_error_72: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -18102,7 +18176,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_68: {
+  s_n_llhttp__internal__n_error_70: {
     state->error = 0x1b;
     state->reason = "`on_status_complete` callback error";
     state->error_pos = (const char*) p;
@@ -18147,7 +18221,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_69: {
+  s_n_llhttp__internal__n_error_71: {
     state->error = 0xd;
     state->reason = "Invalid response status";
     state->error_pos = (const char*) p;
@@ -18159,14 +18233,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_status_code_2: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_70;
+        goto s_n_llhttp__internal__n_error_72;
       default:
         goto s_n_llhttp__internal__n_res_status_code_otherwise;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_71: {
+  s_n_llhttp__internal__n_error_73: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -18178,14 +18252,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_status_code_1: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_72;
+        goto s_n_llhttp__internal__n_error_74;
       default:
         goto s_n_llhttp__internal__n_res_status_code_digit_3;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_73: {
+  s_n_llhttp__internal__n_error_75: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -18197,14 +18271,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_status_code: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_74;
+        goto s_n_llhttp__internal__n_error_76;
       default:
         goto s_n_llhttp__internal__n_res_status_code_digit_2;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_75: {
+  s_n_llhttp__internal__n_error_77: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -18221,7 +18295,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_76: {
+  s_n_llhttp__internal__n_error_78: {
     state->error = 0x9;
     state->reason = "Expected space after version";
     state->error_pos = (const char*) p;
@@ -18239,7 +18313,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_67: {
+  s_n_llhttp__internal__n_error_69: {
     state->error = 0x21;
     state->reason = "`on_version_complete` callback error";
     state->error_pos = (const char*) p;
@@ -18275,10 +18349,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_66;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_68;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_66;
+    goto s_n_llhttp__internal__n_error_68;
     /* UNREACHABLE */;
     abort();
   }
@@ -18328,8 +18402,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_9: {
-    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_11: {
+    switch (llhttp__internal__c_test_lenient_flags_10(state, p, endp)) {
       case 1:
         goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
       default:
@@ -18341,7 +18415,7 @@
   s_n_llhttp__internal__n_invoke_store_http_minor_1: {
     switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_9;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_11;
     }
     /* UNREACHABLE */;
     abort();
@@ -18356,10 +18430,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_77;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_79;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_77;
+    goto s_n_llhttp__internal__n_error_79;
     /* UNREACHABLE */;
     abort();
   }
@@ -18373,10 +18447,10 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_78;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_80;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_78;
+    goto s_n_llhttp__internal__n_error_80;
     /* UNREACHABLE */;
     abort();
   }
@@ -18398,14 +18472,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_79;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_81;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_79;
+    goto s_n_llhttp__internal__n_error_81;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_83: {
+  s_n_llhttp__internal__n_error_85: {
     state->error = 0x8;
     state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
@@ -18465,7 +18539,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_80: {
+  s_n_llhttp__internal__n_error_82: {
     state->error = 0x8;
     state->reason = "Invalid word encountered";
     state->error_pos = (const char*) p;
@@ -18538,7 +18612,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_84: {
+  s_n_llhttp__internal__n_error_86: {
     state->error = 0x1f;
     state->reason = "`on_reset` callback error";
     state->error_pos = (const char*) p;
@@ -18554,7 +18628,7 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_24;
       default:
-        goto s_n_llhttp__internal__n_error_84;
+        goto s_n_llhttp__internal__n_error_86;
     }
     /* UNREACHABLE */;
     abort();

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/AUTHORS -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/AUTHORS Changed

@@ -1,48 +1,49 @@
 # Authors of mruby (mruby developers)
 
-## The List of Contributors sorted by number of commits (as of 2022-01-10 69b1667)
+## The List of Contributors sorted by number of commits (as of 2022-01-08 4462e3d)
 
-   7956 Yukihiro "Matz" Matsumoto (@matz)*
+   8860 Yukihiro "Matz" Matsumoto (@matz)*
     586 KOBAYASHI Shuji (@shuujii)
-    376 Daniel Bovensiepen (@bovi)
+    441 dearblue (@dearblue)*
+    378 Daniel Bovensiepen (@bovi)*
     346 Takeshi Watanabe (@take-cheeze)*
-    342 dearblue (@dearblue)*
     334 Masaki Muranaka (@monaka)
-    298 Tomoyuki Sahara (@tsahara)*
+    328 Tomoyuki Sahara (@tsahara)*
     234 Jun Hiroe (@suzukaze)
-    219 Cremno (@cremno)*
-    208 Yuki Kurihara (@ksss)+
-    148 Yasuhiro Matsumoto (@mattn)*
+    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)*
-     68 Hiroshi Mimaki (@mimaki)*
-     63 Akira Yumiyama (@akiray03)*
-     62 Paolo Bosetti (@pbosetti)*
+     65 Yuichiro Kaneko (@yui-knk)+
+     64 Paolo Bosetti (@pbosetti)*
      59 Kurebayashi, Takahiro (@crimsonwoods)*
      56 h2so5 (@h2so5)
      52 Ralph Desir (@Mav7)*
-     49 John Bampton (@jbampton)
      45 Rory O'Connell (@RoryO)*
-     43 Yuichiro Kaneko (@yui-knk)+
      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)
-     28 Masayoshi Takahashi (@takahashim)+
-     24 Julian Aron Prenner (@furunkel)*
+     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)*
-     20 Uchio Kondo (@udzura)*
+     21 Ryan Lopopolo (@lopopolo)
      19 Bouke van der Bijl (@bouk)
      19 Felix Jones (@felixjones)*
      19 Hidetaka Takano (@TJ-Hidetaka-Takano)
@@ -50,13 +51,13 @@
      18 Corey Powell (@IceDragon200)
      18 Jon Maken (@jonforums)+
      18 Mitchell Blank Jr (@mitchblank)*
-     17 Ryan Lopopolo (@lopopolo)
      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)*
@@ -66,10 +67,10 @@
      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 Kazuho Oku (@kazuho)
      10 Miura Hideki (@miura1729)
      10 Narihiro Nakamura (@authorNari)
      10 Ray Chason (@chasonr)*
@@ -95,18 +96,22 @@
       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)
@@ -121,26 +126,26 @@
       4 Yuhei Okazaki (@Yuuhei-Okazaki)*
       4 Yuji Yamano (@yyamano)
       4 kurodash (@kurodash)*
-      4 masahino (@masahino)
       4 wanabe (@wanabe)*
-      4 xuejianqing (@joans321)
       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 Rodrigo Malizia (@rmalizia44)+
       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)
@@ -148,6 +153,7 @@
       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)
@@ -158,7 +164,6 @@
       2 Francois Chagnon (@EiNSTeiN-)*
       2 Gilad Zohari (@gzohari)
       2 Go Saito (@govm)
-      2 HASUMI Hitoshi (@hasumikin)
       2 Hirohito Higashi (@HirohitoHigashi)
       2 Hiroyuki Iwatsuki (@iwadon)
       2 Huei-Horng Yo (@hiroshiyui)
@@ -188,15 +193,14 @@
       2 Yutaka HARA (@yhara)*+
       2 Zhang Xiaohui (@hifoolno)
       2 icm7216 (@icm7216)
-      2 windwiny (@windwiny)
       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 Chris Reuter (@suetanvil)
       1 Daehyub Kim (@lateau)
       1 Daniel Varga (@vargad)
       1 Edgar Boda-Majer (@eboda)
@@ -205,6 +209,8 @@
       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)+
@@ -225,6 +231,7 @@
       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)
@@ -253,13 +260,17 @@
       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)

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/CONTRIBUTING.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/CONTRIBUTING.md Changed

@@ -8,14 +8,14 @@
 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
@@ -33,9 +33,22 @@
 
 To update use `pre-commit autoupdate`
 
-* Quick start(https://pre-commit.com/#quick-start)
-* Usage(https://pre-commit.com/#usage)
-* pre-commit-autoupdate(https://pre-commit.com/#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
 
@@ -50,8 +63,8 @@
 
 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)
+- `-i` string: ignore the following corrections, comma separated
+- `-w`: Overwrite file with corrections (default is just to display)
 
 ## Coding conventions
 
@@ -101,3 +114,16 @@
 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>),
 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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/Doxyfile -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/Doxyfile Changed

@@ -16,13 +16,20 @@
 
 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 @@
 # 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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/LEGAL -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/LEGAL Changed

@@ -3,3 +3,38 @@
 
 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.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/LICENSE -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/LICENSE Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/Makefile -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/Makefile Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/NEWS -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/NEWS Changed

@@ -1,11 +1,64 @@
-* NEWS
+NEWS
+----
 
-This document is a list of user visible feature changes made between
-releases except for bug fixes.
+# User visible changes in `mruby3.2`
 
-Note that each entry is kept so brief that no reason behind or
-reference information is supplied with.  For a full list of changes
-with all sufficient information, see the ChangeLog file.
+# 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.
 
-** Information about first release v1.0.0
+# 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)

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/README.md Changed

@@ -1,17 +1,17 @@
 # mruby
 
-!Build Statusbuild-status-imgtravis-ci
 !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 standardISO-standard. Its syntax is Ruby 2.x compatible.
+of) the ISO standardISO-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
+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.
 
@@ -20,7 +20,7 @@
 
 ## How to get mruby
 
-The stable version 3.1.0 of mruby can be downloaded via the following URL: https://github.com/mruby/mruby/archive/3.1.0.zip(https://github.com/mruby/mruby/archive/3.1.0.zip)
+The stable version 3.2.0 of mruby can be downloaded via the following URL: https://github.com/mruby/mruby/archive/3.2.0.zip(https://github.com/mruby/mruby/archive/3.2.0.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)
 
@@ -43,11 +43,17 @@
 
 ## How to compile, test, and install (mruby and gems)
 
-See the compile.md(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
 
@@ -67,7 +73,7 @@
 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(doc/guides/mrbgems.md).
-For example code of how to use mrbgems look into the folder *examples/mrbgems/*.
+For example code of how to use mrbgems look into the folder examples/mrbgems/(examples/mrbgems).
 
 ## License
 
@@ -79,7 +85,7 @@
 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
@@ -93,10 +99,8 @@
 ## How to Contribute
 
 See the contribution guidelinescontribution-guidelines, and then send a pull
-request to <https://github.com/mruby/mruby>. We consider you have granted
+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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/Rakefile -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/Rakefile Changed

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Build description.
 # basic build file for mruby
 MRUBY_ROOT = File.dirname(File.expand_path(__FILE__))
@@ -67,3 +66,41 @@
   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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/SECURITY.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/SECURITY.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/TODO.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/TODO.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/benchmark/bm_ao_render.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/benchmark/bm_ao_render.rb Changed

@@ -179,7 +179,7 @@
   i.to_i
 end
 
-def otherBasis(basis, n)
+def orthoBasis(basis, n)
   basis2 = Vec.new(n.x, n.y, n.z)
   basis1 = Vec.new(0.0, 0.0, 0.0)
 
@@ -211,7 +211,7 @@
 
   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 @@
         @plane.intersect(ray, occisect)
         if occisect.hit
           occlusion = occlusion + 1.0
-        else
-          0.0
         end
       end
     end
@@ -254,7 +252,6 @@
   end
 
   def render(w, h, nsubsamples)
-    cnt = 0
     nsf = nsubsamples.to_f
     h.times do |y|
       w.times do |x|
@@ -263,7 +260,6 @@
         # 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 @@
               rad.x = rad.x + col.x
               rad.y = rad.y + col.y
               rad.z = rad.z + col.z
-            else
-              0.0
             end
           end
         end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/benchmark/bm_fib.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/benchmark/bm_fib.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/benchmark/bm_so_lists.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/benchmark/bm_so_lists.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/IntelGalileo.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/IntelGalileo.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/android_arm64_v8a.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/android_arm64_v8a.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/android_armeabi.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/android_armeabi.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/android_armeabi_v7a_neon_hard.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/android_armeabi_v7a_neon_hard.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/boxing.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/boxing.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/cross-mingw-winetest.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/cross-mingw-winetest.rb Changed

@@ -1,4 +1,3 @@
-
 # Cross-compile using MinGW and test using Wine.
 #
 # Steps:
@@ -16,11 +15,11 @@
 #
 #   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:
+#      double-check.) To confirm, run:
 #
 #           wine cmd /c dir 'z:\\'
 #
-#      This should give you a DOS-style equivalent of 'ls /'.  If not,
+#      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'.
 #
@@ -40,8 +39,8 @@
 #
 #    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
+#       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.
 #
@@ -50,11 +49,11 @@
 #
 #   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
+#   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.
+#       unit tests due to small errors in some floating-point
+#       operations. It's unclear if this indicates more serious problems.
 #

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/helpers/wine_runner.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/helpers/wine_runner.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/host-debug.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/host-debug.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/host-f32.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/host-f32.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/host-gprof.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/host-gprof.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/host-m32.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/build_config/host-m32.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/codespell.txt -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/codespell.txt Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/guides/compile.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/guides/compile.md Changed

@@ -7,17 +7,17 @@
 
 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`)
-* Ruby 2.5 or later (e.g. `ruby` or `jruby`)
+- 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 mrbgems which include `*.cpp`, `*.cxx`, `*.cc`)
-* Bison (to compile `mrbgems/mruby-compiler/core/parse.y`)
-* gperf (to compile `mrbgems/mruby-compiler/core/keywords`)
+- 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
@@ -103,8 +103,8 @@
 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.
 
@@ -332,11 +332,11 @@
 
 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
 
@@ -401,19 +401,19 @@
 
 The compilation workflow will look like this:
 
-* 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
+- 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
 
 ```
  _____    _____    ______    ____    ____    _____    _____    ____
@@ -465,13 +465,13 @@
 as placeholder for `mrbc`). Afterwards the cross compilation process
 proceeds like this:
 
-* 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
+- 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
 
 ```
  _______________________________________________________________
@@ -545,7 +545,7 @@
 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`
@@ -556,3 +556,7 @@
 LDFLAGS = `$(MRB_CONFIG) --ldflags`
 LIBS = `$(MRB_CONFIG) --libs`
 ```
+
+## Tips
+
+- If you see compilation troubles, try `rake clean` first.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/guides/debugger.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/guides/debugger.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/guides/gc-arena-howto.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/guides/gc-arena-howto.md Changed

@@ -7,19 +7,19 @@
 
 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 the 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 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,15 +27,15 @@
 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 another plan to implement "conservative GC" in mruby.
@@ -65,14 +65,14 @@
 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 @@
 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
@@ -146,23 +146,23 @@
 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 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
+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)`.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/guides/link.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/guides/link.md Changed

@@ -2,13 +2,13 @@
 
 You have two ways to link `libmruby` to your application.
 
-* using executable gem.
-* using normal compilation process
+- 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
+create the executable. By tradition, the gem name start with
 `mruby-bin-`, e.g. `mruby-bin-debugger`.
 
 ### `mrbgem.rake` file
@@ -28,7 +28,7 @@
 ### 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
+`<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`.
@@ -37,7 +37,7 @@
 
 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
+(`-lmruby` etc.) to compile and link your application. Specify those options in
 your build script (e.g. `Makefile`).
 
 ### Compiler options
@@ -45,14 +45,14 @@
 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
+- `-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
+- `--cc` compiler name
+- `--cflags` options passed to compiler
 
 ```
 $ mruby-config --cflags
@@ -66,10 +66,10 @@
 
 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
+- `--ld` linker name
+- `--ldflags` options passed to linker
+- `--ldflags-before-libs` options passed to linker before linked libraries
+- `--libs` linked libraries
 
 ```
 $ mruby-config --ldflags

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/guides/mrbconf.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/guides/mrbconf.md Changed

@@ -1,209 +1,252 @@
 # mruby configuration macros
 
+## The configuration file
+
+You can do the build configuration in the build configuration file. The default
+configuration file is `build_config/default.rb`.
+
+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.
+
 ## How to use these macros
 
-You can use mrbconfs with following ways:
+Just add the configuration value to the `MRuby::Build#defines` attribute.
+This is the same for `MRuby::CrossBuild`.
+
+```ruby
+# build_config.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.
+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 a 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
 
 `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
 
 `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
 
 `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
 
 `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
 
 `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_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
 
 `MRB_USE_ETEXT_RO_DATA_P`
 
-* 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.
+- 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.
+- Define this macro when the default `mrb_ro_data_p()` does not work for any reason.
 
 `MRB_USE_CUSTOM_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 the 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
 
+`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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/guides/mrbgems.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/guides/mrbgems.md Changed

@@ -6,7 +6,7 @@
 
 ## Usage
 
-You have to activate mrbgems explicitly in your build configuration. To add
+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
@@ -21,9 +21,9 @@
 
 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:
 
@@ -33,6 +33,9 @@
 conf.gem :bitbucket => 'mruby/mrbgems-example', :branch => 'master'
 ```
 
+NOTE: `:bitbucket` option supports only git. Hg is unsupported in this
+version.
+
 You can specify the subdirectory of the repository with `:path` option:
 
 ```ruby
@@ -55,19 +58,48 @@
 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`:
+
+```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
 
-NOTE: `:bitbucket` option supports only git. Hg is unsupported in this version.
+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`:
@@ -79,7 +111,7 @@
 end
 ```
 
-As mentioned, the GemBox uses the same conventions as `MRuby::Build`. The GemBox
+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.
 
@@ -94,7 +126,7 @@
 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
@@ -143,7 +175,7 @@
 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
 ```
 
@@ -154,15 +186,15 @@
 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!
 
@@ -193,15 +225,15 @@
 
 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.
 
@@ -214,8 +246,8 @@
 
 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:
 
@@ -234,18 +266,18 @@
 In case your GEM has more complex build requirements you can use
 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 the compiler and linker.
 
@@ -380,7 +412,7 @@
 ## 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`,
+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
@@ -397,21 +429,21 @@
 ```
 +- mruby-bin-example/
 |
- +- README.md (Optional)
+ +- README.md (Optional)
 |
 +- bintest/
 | |
- | +- example.rb <- Test code for binary gem
+ | +- example.rb <- Test code for binary gem
 |
- +- mrbgem.rake <- Gem specification
+ +- mrbgem.rake <- Gem specification
 |
- +- mrblib/ <- Source for Ruby extension (Optional)
+ +- mrblib/ <- Source for Ruby extension (Optional)
 |
- +- src/ <- Source for C extension (Optional)
+ +- src/ <- Source for C extension (Optional)
 |
 +- tools/
 |
- +- example/ <- Executable name directory
- |
- +- example.c <- Source for Executable (includes main)
+ +- example/ <- Executable name directory
+ |
+ +- example.c <- Source for Executable (includes main)
 ```

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/guides/symbol.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/guides/symbol.md Changed

@@ -1,7 +1,7 @@
 # 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
@@ -57,13 +57,13 @@
 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 @@
 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.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/internal/boxing.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/internal/boxing.md Changed

@@ -2,9 +2,9 @@
 
 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
+- NaN Boxing
+- No Boxing
 
 ## Word Boxing
 
@@ -14,38 +14,38 @@
 
 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 |
+| 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`.
+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).
+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"".
+| 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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/internal/opcode.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/internal/opcode.md Changed

@@ -7,122 +7,130 @@
 # Instructions
 
 Instructions are bytes. There can be 256 instructions. Currently, we
-have 94 instructions. Instructions can take 0 to 3 operands.
+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 (and
-sign) of operands.
+In the table.1 below, the second field describes the size
+of operands.
 
-* B: 8bit
-* S: 16bit
-* sS: signed 16bit
-* W: 24bit
+- 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) = SpecialSyms(b)` |
-| `OP_SETSV` | `BB` | `SpecialSyms(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_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=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) = kdictSyms(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_ARYDUP` | `B` | `R(a) = ary_dup(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_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),Irepb)` |
-| `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 16bit` |
-| `OP_EXT2` | `-` | `make 2nd operand 16bit` |
-| `OP_EXT3` | `-` | `make 1st and 2nd operands 16bit` |
-| `OP_STOP` | `-` | `stop VM` |
-|------------------|--------------|----------------------------------------------------------|
+| 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) = SpecialSyms(b)` |
+| `OP_SETSV` | `BB` | `SpecialSyms(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) = kdictSyms(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` |

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/limitations.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/limitations.md Changed

@@ -107,10 +107,10 @@
 
 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.
 
@@ -199,7 +199,7 @@
 ` '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.
 
@@ -210,7 +210,7 @@
 #<Binding:0x00000e9deabb9950>
 ```
 
-#### mruby 3.1.0 (2022-05-12)
+#### mruby 3.0.0 (2021-03-05)
 
 ```
 $ ./bin/mruby -e 'puts Proc.new {}.binding'
@@ -219,6 +219,12 @@
 -e:1: undefined method 'binding' (NoMethodError)
 ```
 
+#### mruby 3.1.0 (2022-05-12)
+
+`binding` has been supported since 3.1.0.
+
+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
 
 Redefinition of `nil?` is ignored in conditional expressions.
@@ -231,7 +237,7 @@
 puts(a.nil? ? "truthy" : "falsy")
 ```
 
-Ruby outputs `falsy`. mruby outputs `truthy`.
+Ruby outputs `truthy`. mruby outputs `falsy`.
 
 ## Argument Destructuring

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/mruby3.0.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/mruby3.0.md Changed

@@ -7,17 +7,17 @@
 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
@@ -32,10 +32,10 @@
 
 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
 
@@ -59,11 +59,11 @@
 | `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`
 
@@ -75,13 +75,13 @@
 ## `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`
@@ -112,40 +112,40 @@
 
 Instructions that access pooli/symsi 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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/mruby3.1.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/mruby3.1.md Changed

@@ -155,12 +155,12 @@
 
 ### 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.
+`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.
+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.

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/doc/mruby3.2.md Added

@@ -0,0 +1,80 @@
+# 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
+- mruby-data
+
+# Breaking Changes
+
+## `mrb_vm_run()` may detach top-level local variables referenced from blocks
+
+When the `mrb_vm_run()` function (including `mrb_top_run()`) is called,
+the previous top-level local variables referenced from blocks is detached under either of the following conditions.
+
+- If the `stack_keep` parameter is given as 0.
+- If the number of variables in `irep` to be executed is less than the number of previous top-level local variables.
+
+This change also affects API functions such as `mrb_load_string()` and `mrb_load_file()`.
+The conditions under which the previous top-level local variables referenced from blocks is detached in these functions are as follows:
+
+- If the function has no `mrbc_context` pointer parameter, or the `mrbc_context` pointer parameter is set to `NULL`.
+- If the number of variables held in the `mrbc_context` pointer is less than the number of previous top-level local variables.
+
+Intentional reliance on previous behavior may cause compatibility problems in your application.
+
+# 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)

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/README.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/examples/mrbgems/c_extension_example/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/c_extension_example/README.md Changed

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/cdata_extension_example Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/cdata_extension_example/README.md Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/cdata_extension_example/mrbgem.rake Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/cdata_extension_example/src Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/cdata_extension_example/src/example.c Added

@@ -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 baz32;
+};
+
+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 */
+}

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/cdata_extension_example/test Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/cdata_extension_example/test/example.c Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/mruby-YOUR-bigint Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/mruby-YOUR-bigint/TODO-HINT.md Added

@@ -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.

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/mruby-YOUR-bigint/core Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/mruby-YOUR-bigint/core/bigint.c Added

@@ -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...
+ */

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/mruby-YOUR-bigint/mrbgem.rake Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/examples/mrbgems/ruby_extension_example/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/examples/mrbgems/ruby_extension_example/README.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mrbconf.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mrbconf.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby.h Changed

@@ -1,7 +1,7 @@
 /*
 ** mruby - An embeddable Ruby implementation
 **
-** Copyright (c) mruby developers 2010-2021
+** Copyright (c) mruby developers 2010-2023
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -154,7 +154,7 @@
 */
 typedef uint32_t mrb_aspec;
 
-struct mrb_irep;
+typedef struct mrb_irep mrb_irep;
 struct mrb_state;
 
 /**
@@ -178,6 +178,7 @@
 uint8_t cci; /* called from C function */
 mrb_sym mid;
 const struct RProc *proc;
+ struct RProc *blk;
 mrb_value *stack;
 const mrb_code *pc; /* current address on iseq of this proc */
 union {
@@ -312,7 +313,7 @@
 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
@@ -361,7 +362,18 @@
 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);
 
 /**
@@ -686,9 +698,9 @@
 * 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 {
@@ -735,9 +747,9 @@
 * 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 {
@@ -821,14 +833,14 @@
 * 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");
 * }
 * }
@@ -948,14 +960,14 @@
 /**
 * 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.
@@ -964,11 +976,11 @@
 *
 * // def method(a: 1, b: 2)
 *
- * uint32_t kw_num = 2;
- * const char *kw_nameskw_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_valueskw_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_values0)) { kw_values0 = mrb_fixnum_value(1); }
@@ -979,10 +991,12 @@
 *
 * mrb_value str, kw_rest;
 * uint32_t kw_num = 3;
- * const mrb_sym kw_nameskw_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_valueskw_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);
@@ -993,8 +1007,8 @@
 
 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) */
@@ -1012,6 +1026,13 @@
 */
 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 */
 {
@@ -1178,13 +1199,13 @@
 */
 #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, size_t len);
+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);
@@ -1336,7 +1357,7 @@
 #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);
@@ -1404,6 +1425,9 @@
 #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 */
@@ -1436,6 +1460,10 @@
 * 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);
 
@@ -1443,6 +1471,15 @@
 * 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);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/array.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/array.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/boxing_word.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/boxing_word.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/class.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/class.h Changed

@@ -73,8 +73,6 @@
 #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(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);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/compile.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/compile.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/debug.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/debug.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/dump.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/dump.h Changed

@@ -21,15 +21,13 @@
 #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);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/error.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/error.h Changed

@@ -17,20 +17,24 @@
 struct RException {
 MRB_OBJECT_HEADER;
 struct iv_tbl *iv;
- struct RString *mesg;
+ 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))
-#define MRB_EXC_MESG_STRING_FLAG 0x100
 
-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_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);
-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 */
@@ -70,39 +74,6 @@
 #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
 *

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/gc.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/gc.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/hash.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/hash.h Changed

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/internal.h Added

@@ -0,0 +1,208 @@
+/**
+** @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);
+mrb_method_t mrb_vm_find_method(mrb_state *mrb, struct RClass *c, struct RClass **cp, mrb_sym mid);
+#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 */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/irep.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/irep.h Changed

@@ -52,7 +52,7 @@
 };
 
 /* Program data array struct */
-typedef struct mrb_irep {
+struct mrb_irep {
   uint16_t nlocals;        /* Number of local variables */
   uint16_t nregs;          /* Number of register variables */
   uint16_t clen;           /* Number of catch handlers */
@@ -76,7 +76,7 @@
   uint16_t plen, slen;
   uint16_t rlen;
   uint16_t refcnt;
-} mrb_irep;
+};
 
 #define MRB_ISEQ_NO_FREE 1
 #define MRB_IREP_NO_FREE 2
@@ -99,7 +99,7 @@
 
 /*
  * @param const void* irep code
- * @param size_t size of irep buffer. If -1 is given, it is considered unrestricted.
+ * @param size_t size of irep buffer.
  */
 MRB_API mrb_value mrb_load_irep_buf(mrb_state*, const void*, size_t);
 
@@ -108,40 +108,25 @@
 
 /*
  * @param const void* irep code
- * @param size_t size of irep buffer. If -1 is given, it is considered unrestricted.
+ * @param size_t size of irep buffer.
  */
 MRB_API mrb_value mrb_load_irep_buf_cxt(mrb_state*, const void*, size_t, mrbc_context*);
 
-void mrb_irep_free(mrb_state*, struct mrb_irep*);
-void mrb_irep_incref(mrb_state*, struct mrb_irep*);
-void mrb_irep_decref(mrb_state*, struct mrb_irep*);
-void mrb_irep_cutref(mrb_state*, struct mrb_irep*);
-void mrb_irep_remove_lv(mrb_state *mrb, mrb_irep *irep);
-
 struct mrb_insn_data {
   uint8_t insn;
-  uint16_t a;
+  uint32_t a;
   uint16_t b;
   uint16_t c;
   const mrb_code *addr;
 };
 
-struct mrb_insn_data mrb_decode_insn(const mrb_code *pc);
-
-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;
-  }
-}
-
 #define mrb_irep_catch_handler_pack(n, v)   uint32_to_bin(n, v)
 #define mrb_irep_catch_handler_unpack(v)    bin_to_uint32(v)
 
+void mrb_irep_incref(mrb_state*, struct mrb_irep*);
+void mrb_irep_decref(mrb_state*, struct mrb_irep*);
+void mrb_irep_cutref(mrb_state*, struct mrb_irep*);
+
 MRB_END_DECL
 
 #endif  /* MRUBY_IREP_H */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/numeric.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/numeric.h Changed

@@ -30,16 +30,17 @@
 #endif
 #endif
 
-MRB_API mrb_value mrb_num_plus(mrb_state *mrb, mrb_value x, mrb_value y);
-MRB_API mrb_value mrb_num_minus(mrb_state *mrb, mrb_value x, mrb_value y);
+/* utility functions */
+MRB_API mrb_value mrb_num_add(mrb_state *mrb, mrb_value x, mrb_value y);
+MRB_API mrb_value mrb_num_sub(mrb_state *mrb, mrb_value x, mrb_value y);
 MRB_API mrb_value mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y);
+/* obsolete old names */
+#define mrb_num_plus(mrb, x, y) mrb_num_add(mrb, x, y)
+#define mrb_num_minus(mrb, x, y) mrb_num_sub(mrb, x, y)
 
 MRB_API mrb_value mrb_integer_to_str(mrb_state *mrb, mrb_value x, mrb_int base);
 MRB_API char *mrb_int_to_cstr(char *buf, size_t len, mrb_int n, mrb_int base);
 
-/* internal function(s) */
-mrb_int mrb_div_int(mrb_state *mrb, mrb_int x, mrb_int y);
-
 /* obsolete function(s); will be removed */
 #define mrb_fixnum_to_str(mrb, x, base) mrb_integer_to_str(mrb, x, base)
 
@@ -166,10 +167,6 @@
 mrb_value mrb_float_to_str(mrb_state *mrb, mrb_value x, const char *fmt);
 int mrb_format_float(mrb_float f, char *buf, size_t buf_size, char fmt, int prec, char sign);
 
-/* obsolete functions; will be removed */
-#define mrb_flo_to_fixnum(mrb, val) mrb_float_to_integer(mrb, val)
-#define mrb_to_flo(mrb, x) mrb_as_float(mrb, x)
-
 #endif /* MRB_NO_FLOAT */
 
 MRB_END_DECL

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/object.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/object.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/ops.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/ops.h Changed

@@ -61,7 +61,7 @@
 OPCODE(SSENDB, BBB) /* Ra = self.send(Symsb,Ra+1..,Ra+n+1:Ra+n+2..,&Ra+n+2k+1) */
 OPCODE(SEND, BBB) /* Ra = Ra.send(Symsb,Ra+1..,Ra+n+1:Ra+n+2..) (c=n|k<<4) */
 OPCODE(SENDB, BBB) /* Ra = Ra.send(Symsb,Ra+1..,Ra+n+1:Ra+n+2..,&Ra+n+2k+1) */
-OPCODE(CALL, Z) /* R0 = self.call(frame.argc, frame.argv) */
+OPCODE(CALL, Z) /* self.call(*, **, &) (But overlay the current call frame; tailcall) */
 OPCODE(SUPER, BB) /* Ra = super(Ra+1,... ,Ra+b+1) */
 OPCODE(ARGARY, BS) /* Ra = argument array (16=m5:r1:m5:d1:lv4) */
 OPCODE(ENTER, W) /* arg setup according to flags (23=m5:o5:r1:m5:k5:d1:b1) */
@@ -87,7 +87,7 @@
 OPCODE(ARRAY2, BBB) /* Ra = ary_new(Rb,Rb+1..Rb+c) */
 OPCODE(ARYCAT, B) /* ary_cat(Ra,Ra+1) */
 OPCODE(ARYPUSH, BB) /* ary_push(Ra,Ra+1..Ra+b) */
-OPCODE(ARYDUP, B) /* Ra = ary_dup(Ra) */
+OPCODE(ARYSPLAT, B) /* Ra = ary_splat(Ra) */
 OPCODE(AREF, BBB) /* Ra = Rbc */
 OPCODE(ASET, BBB) /* Rbc = Ra */
 OPCODE(APOST, BBB) /* *Ra,Ra+1..Ra+c = Rab.. */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/proc.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/proc.h Changed

@@ -26,17 +26,18 @@
 #define MRB_ENV_SET_LEN(e,len) ((e)->flags = (((e)->flags & ~0xff)|((unsigned int)(len) & 0xff)))
 #define MRB_ENV_LEN(e) ((mrb_int)((e)->flags & 0xff))
 #define MRB_ENV_CLOSED (1<<20)
-#define MRB_ENV_TOUCHED (1<<19)
-#define MRB_ENV_HEAPED (1<<18)
 #define MRB_ENV_CLOSE(e) ((e)->flags |= MRB_ENV_CLOSED)
-#define MRB_ENV_TOUCH(e) ((e)->flags |= MRB_ENV_TOUCHED)
-#define MRB_ENV_HEAP(e) ((e)->flags |= MRB_ENV_HEAPED)
-#define MRB_ENV_HEAP_P(e) ((e)->flags & MRB_ENV_HEAPED)
 #define MRB_ENV_ONSTACK_P(e) (((e)->flags & MRB_ENV_CLOSED) == 0)
 #define MRB_ENV_BIDX(e) (((e)->flags >> 8) & 0xff)
 #define MRB_ENV_SET_BIDX(e,idx) ((e)->flags = (((e)->flags & ~(0xff<<8))|((unsigned int)(idx) & 0xff)<<8))
 
-void mrb_env_unshare(mrb_state*, struct REnv*);
+/*
+ * Returns TRUE on success.
+ * If the function fails:
+ * * Returns FALSE if noraise is TRUE.
+ * * Raises a NoMemoryError exception if noraise is FALSE.
+ */
+mrb_bool mrb_env_unshare(mrb_state*, struct REnv*, mrb_bool noraise);
 
 struct RProc {
 MRB_OBJECT_HEADER;
@@ -89,11 +90,8 @@
 #define mrb_proc_ptr(v) ((struct RProc*)(mrb_ptr(v)))
 
 struct RProc *mrb_proc_new(mrb_state*, const mrb_irep*);
-struct RProc *mrb_closure_new(mrb_state*, const mrb_irep*);
 MRB_API struct RProc *mrb_proc_new_cfunc(mrb_state*, mrb_func_t);
 MRB_API struct RProc *mrb_closure_new_cfunc(mrb_state *mrb, mrb_func_t func, int nlocals);
-void mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b);
-mrb_int mrb_proc_arity(const struct RProc *p);
 
 /* following functions are defined in mruby-proc-ext so please include it when using */
 MRB_API struct RProc *mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t func, mrb_int argc, const mrb_value *argv);
@@ -138,73 +136,11 @@
 
 MRB_API mrb_value mrb_load_proc(mrb_state *mrb, const struct RProc *proc);
 
-static inline void
-mrb_vm_ci_proc_set(mrb_callinfo *ci, const struct RProc *p)
-{
- ci->proc = p;
- ci->pc = (p && !MRB_PROC_CFUNC_P(p)) ? p->body.irep->iseq : NULL;
-}
-
-static inline struct RClass *
-mrb_vm_ci_target_class(const mrb_callinfo *ci)
-{
- if (ci->u.env && ci->u.env->tt == MRB_TT_ENV) {
- return ci->u.env->c;
- }
- else {
- return ci->u.target_class;
- }
-}
-
-static inline void
-mrb_vm_ci_target_class_set(mrb_callinfo *ci, struct RClass *tc)
-{
- struct REnv *e = ci->u.env;
- if (e) {
- if (e->tt == MRB_TT_ENV) {
- e->c = tc;
- }
- else {
- ci->u.target_class = tc;
- }
- }
-}
-
-static inline struct REnv *
-mrb_vm_ci_env(const mrb_callinfo *ci)
-{
- if (ci->u.env && ci->u.env->tt == MRB_TT_ENV) {
- return ci->u.env;
- }
- else {
- return NULL;
- }
-}
-
-static inline void
-mrb_vm_ci_env_set(mrb_callinfo *ci, struct REnv *e)
-{
- if (ci->u.env) {
- if (ci->u.env->tt == MRB_TT_ENV) {
- if (e) {
- e->c = ci->u.env->c;
- ci->u.env = e;
- }
- else {
- ci->u.target_class = ci->u.env->c;
- }
- }
- else {
- if (e) {
- e->c = ci->u.target_class;
- ci->u.env = e;
- }
- }
- }
- else {
- ci->u.env = e;
- }
-}
+void mrb_vm_ci_proc_set(mrb_callinfo *ci, const struct RProc *p);
+struct RClass * mrb_vm_ci_target_class(const mrb_callinfo *ci);
+void mrb_vm_ci_target_class_set(mrb_callinfo *ci, struct RClass *tc);
+struct REnv * mrb_vm_ci_env(const mrb_callinfo *ci);
+void mrb_vm_ci_env_set(mrb_callinfo *ci, struct REnv *e);
 
 MRB_END_DECL

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/range.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/range.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/string.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/string.h Changed

@@ -102,7 +102,6 @@
 #define RSTRING_LEN(s) RSTR_LEN(RSTRING(s))
 #define RSTRING_CAPA(s) RSTR_CAPA(RSTRING(s))
 #define RSTRING_END(s) (RSTRING_PTR(s) + RSTRING_LEN(s))
-MRB_API mrb_int mrb_str_strlen(mrb_state*, struct RString*);
 #define RSTRING_CSTR(mrb,s) mrb_string_cstr(mrb, s)
 
 #define MRB_STR_SHARED 1
@@ -115,8 +114,6 @@
 #define MRB_STR_EMBED_LEN_MASK (((1 << MRB_STR_EMBED_LEN_BIT) - 1) << MRB_STR_EMBED_LEN_SHIFT)
 #define MRB_STR_TYPE_MASK 15
 
-void mrb_gc_free_str(mrb_state*, struct RString*);
-
 MRB_API void mrb_str_modify(mrb_state *mrb, struct RString *s);
 /* mrb_str_modify() with keeping ASCII flag if set */
 MRB_API void mrb_str_modify_keep_ascii(mrb_state *mrb, struct RString *s);
@@ -324,7 +321,7 @@
 */
 MRB_API mrb_value mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len);
 
-MRB_API mrb_value mrb_str_new_capa(mrb_state *mrb, size_t capa);
+MRB_API mrb_value mrb_str_new_capa(mrb_state *mrb, mrb_int capa);
 #define mrb_str_buf_new(mrb, capa) mrb_str_new_capa(mrb, (capa))
 
 /* NULL terminated C string from mrb_value */
@@ -332,9 +329,11 @@
 /* NULL terminated C string from mrb_value; `str` will be updated */
 MRB_API const char *mrb_string_value_cstr(mrb_state *mrb, mrb_value *str);
 /* obsolete: use RSTRING_PTR() */
-MRB_API const char *mrb_string_value_ptr(mrb_state *mrb, mrb_value str);
+#define mrb_string_value_ptr(mrb, str) RSTRING_PTR(str)
 /* obsolete: use RSTRING_LEN() */
-MRB_API mrb_int mrb_string_value_len(mrb_state *mrb, mrb_value str);
+#define mrb_string_value_len(mrb, str) RSTRING_LEN(str)
+/* obsolete: substituted by a macro; shall be removed */
+#define mrb_str_strlen(mrb, s) strlen(RSTR_PTR(s))
 
 /**
 * Duplicates a string object.
@@ -422,27 +421,11 @@
 */
 MRB_API char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
 
-uint32_t mrb_str_hash(mrb_state *mrb, mrb_value str);
-mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);
-
-/**
- * Returns a printable version of str, surrounded by quote marks, with special characters escaped.
- */
-mrb_value mrb_str_inspect(mrb_state *mrb, mrb_value str);
-
 /* For backward compatibility */
 #define mrb_str_cat2(mrb, str, ptr) mrb_str_cat_cstr(mrb, str, ptr)
 #define mrb_str_buf_cat(mrb, str, ptr, len) mrb_str_cat(mrb, str, ptr, len)
 #define mrb_str_buf_append(mrb, str, str2) mrb_str_cat_str(mrb, str, str2)
 
-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);
-
-#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
-
 MRB_END_DECL
 
 #endif /* MRUBY_STRING_H */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/throw.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/throw.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/value.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/value.h Changed

@@ -100,9 +100,13 @@
 # define MRB_ENDIAN_LOHI(a,b) b a
 #endif
 
-MRB_API mrb_int mrb_int_read(const char *p, const char *e, char **endp);
+MRB_API mrb_bool mrb_read_int(const char *p, const char *e, char **endp, mrb_int *np);
+/* obsolete; do not use mrb_int_read() */
+MRB_API mrb_int mrb_int_read(const char*, const char*, char**);
 #ifndef MRB_NO_FLOAT
-MRB_API double mrb_float_read(const char*, char**);
+MRB_API mrb_bool mrb_read_float(const char *p, char **endp, double *fp);
+/* obsolete; do not use mrb_float_read() */
+MRB_API double mrb_float_read(const char *p, char **endp);
 #ifdef MRB_USE_FLOAT32
 typedef float mrb_float;
 #else
@@ -148,13 +152,14 @@
 f(MRB_TT_RANGE, struct RRange, "Range") \
 f(MRB_TT_EXCEPTION, struct RException, "Exception") \
 f(MRB_TT_ENV, struct REnv, "env") \
- f(MRB_TT_DATA, struct RData, "Data") \
+ f(MRB_TT_CDATA, struct RData, "C data") \
 f(MRB_TT_FIBER, struct RFiber, "Fiber") \
 f(MRB_TT_STRUCT, struct RArray, "Struct") \
 f(MRB_TT_ISTRUCT, struct RIStruct, "istruct") \
 f(MRB_TT_BREAK, struct RBreak, "break") \
 f(MRB_TT_COMPLEX, struct RComplex, "Complex") \
- f(MRB_TT_RATIONAL, struct RRational, "Rational")
+ f(MRB_TT_RATIONAL, struct RRational, "Rational") \
+ f(MRB_TT_BIGINT, struct RBigint, "Integer")
 
 enum mrb_vtype {
 #define MRB_VTYPE_DEFINE(tt, type, name) tt,
@@ -163,6 +168,9 @@
 MRB_TT_MAXDEFINE
 };
 
+/* obsolete name for MRB_TT_CDATA */
+#define MRB_TT_DATA MRB_TT_CDATA
+
 #define MRB_VTYPE_TYPEOF(tt) MRB_TYPEOF_##tt
 
 #define MRB_VTYPE_TYPEDEF(tt, type, name) typedef type MRB_VTYPE_TYPEOF(tt);
@@ -182,8 +190,8 @@
 *
 * Actual implementation depends on configured boxing type.
 *
- * @see mruby/boxing_no.h Default boxing representation
- * @see mruby/boxing_word.h Word representation
+ * @see mruby/boxing_word.h Word boxing representation (Default)
+ * @see mruby/boxing_no.h No boxing representation
 * @see mruby/boxing_nan.h Boxed double representation
 */
 typedef void mrb_value;
@@ -237,9 +245,11 @@
 #ifndef mrb_true_p
 #define mrb_true_p(o) (mrb_type(o) == MRB_TT_TRUE)
 #endif
-#ifndef MRB_NO_FLOAT
 #ifndef mrb_float_p
+#ifndef MRB_NO_FLOAT
 #define mrb_float_p(o) (mrb_type(o) == MRB_TT_FLOAT)
+#else
+#define mrb_float_p(o) FALSE
 #endif
 #endif
 #ifndef mrb_array_p
@@ -285,7 +295,7 @@
 #define mrb_env_p(o) (mrb_type(o) == MRB_TT_ENV)
 #endif
 #ifndef mrb_data_p
-#define mrb_data_p(o) (mrb_type(o) == MRB_TT_DATA)
+#define mrb_data_p(o) (mrb_type(o) == MRB_TT_CDATA)
 #endif
 #ifndef mrb_fiber_p
 #define mrb_fiber_p(o) (mrb_type(o) == MRB_TT_FIBER)
@@ -300,6 +310,9 @@
 #define mrb_bool(o) (mrb_type(o) != MRB_TT_FALSE)
 #endif
 #define mrb_test(o) mrb_bool(o)
+#ifndef mrb_bigint_p
+#define mrb_bigint_p(o) (mrb_type(o) == MRB_TT_BIGINT)
+#endif
 
 /**
 * Returns a float in Ruby.
@@ -355,8 +368,6 @@
 {
 mrb_value v;
 SET_OBJ_VALUE(v, (struct RBasic*)p);
- mrb_assert(p == mrb_ptr(v));
- mrb_assert(((struct RBasic*)p)->tt == mrb_type(v));
 return v;
 }
 
@@ -424,10 +435,20 @@
 #elif defined(__APPLE__)
 #define MRB_LINK_TIME_RO_DATA_P
 #include <mach-o/getsect.h>
+#include <crt_externs.h> // for _NSGetMachExecuteHeader
 static inline mrb_bool
 mrb_ro_data_p(const char *p)
 {
- return (char*)get_etext() < p && p < (char*)get_edata();
+#ifdef __LP64__
+ struct mach_header_64 *mhp;
+#else
+ struct mach_header *mhp;
+#endif
+ mhp = _NSGetMachExecuteHeader();
+ unsigned long textsize, datasize;
+ char *text = (char*)getsegmentdata(mhp, SEG_TEXT, &textsize);
+ char *data = (char*)getsegmentdata(mhp, SEG_DATA, &datasize);
+ return text + textsize < p && p < data + datasize;
 }
 #endif /* Linux or macOS */
 #endif /* MRB_NO_DEFAULT_RO_DATA_P */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/variable.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/variable.h Changed

@@ -14,13 +14,6 @@
  */
 MRB_BEGIN_DECL
 
-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_API mrb_value mrb_const_get(mrb_state*, mrb_value, mrb_sym);
 MRB_API void mrb_const_set(mrb_state*, mrb_value, mrb_sym, mrb_value);
 MRB_API mrb_bool mrb_const_defined(mrb_state*, mrb_value, mrb_sym);
@@ -99,22 +92,6 @@
 MRB_API void mrb_mod_cv_set(mrb_state *mrb, struct RClass * c, mrb_sym sym, mrb_value v);
 MRB_API void mrb_cv_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v);
 MRB_API mrb_bool mrb_cv_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym);
-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*);
 
 /* return non zero to break the loop */
 typedef int (mrb_iv_foreach_func)(mrb_state*,mrb_sym,mrb_value,void*);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/version.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/include/mruby/version.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/lib/mruby/build.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/lib/mruby/build.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/lib/mruby/build/command.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/lib/mruby/build/command.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/lib/mruby/build/load_gems.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/lib/mruby/build/load_gems.rb Changed

@@ -1,5 +1,8 @@
+require 'yaml'
+
 module MRuby
 module LoadGems
+
 def gembox(gemboxfile)
 gembox = File.expand_path("#{gemboxfile}.gembox", "#{MRUBY_ROOT}/mrbgems")
 fail "Can't find gembox '#{gembox}'" unless File.exist?(gembox)
@@ -12,28 +15,30 @@
 GemBox.path = nil
 end
 
- def gem(gemdir, &block)
- if gemdir.is_a?(Hash)
- gemdir = load_special_path_gem(gemdir)
- elsif GemBox.path
- gemdir = File.expand_path(gemdir, File.dirname(GemBox.path))
- else
- caller_dir = File.expand_path(File.dirname(caller(1,1)0/^(.*?):\d/,1))
- if caller_dir == "#{MRUBY_ROOT}/build_config"
- caller_dir = MRUBY_ROOT
- end
- gemdir = File.expand_path(gemdir, caller_dir)
- end
+ def gem(gem_src, &block)
+
+ caller_dir = File.expand_path(File.dirname(caller(1,1)0/^(.*?):\d/,1))
+
+ gem_src = {gemdir: gem_src} if gem_src.is_a? String
 
- gemrake = File.join(gemdir, "mrbgem.rake")
+ @gem_checkouts ||= {}
+ checkout = GemLoader
+ .new(self, caller_dir, @gem_checkouts, **gem_src)
+ .fetch!
+ return nil unless checkout
+ @gem_checkoutscheckout.gemdir = checkout
 
+ # Load the gem's rakefile
+ gemrake = File.join(checkout.full_gemdir, "mrbgem.rake")
 fail "Can't find #{gemrake}" unless File.exist?(gemrake)
+
 Gem.current = nil
 load gemrake
 return nil unless Gem.current
 current = Gem.current
 
- current.dir = gemdir
+ # Add it to gems
+ current.dir = checkout.full_gemdir
 current.build = self.is_a?(MRuby::Build) ? self : MRuby::Build.current
 current.build_config_initializer = block
 gems << current
@@ -44,92 +49,324 @@
 current
 end
 
- def load_special_path_gem(params)
- if params:github
- params:git = "https://github.com/#{params:github}.git"
- elsif params:bitbucket
- if params:method == "ssh"
- params:git = "git@bitbucket.org:#{params:bitbucket}.git"
+
+ # Class to represent the relationship between a gem dependency and
+ # its remote repository (if any).
+ class GemCheckout
+ attr_reader :gemdir, :repo, :branch, :commit
+
+ def initialize(gemdir, repo, branch, commit, canonical, path = nil)
+ @gemdir = gemdir # Working copy of the gem
+ @path = path # Path to gem relative to checkout
+
+ @repo = repo # Remote gem repo
+ @branch = branch # Branch to check out
+ @commit = commit # Commit-id to use
+
+ @canonical = canonical # This is the One True checkout
+ end
+
+ def full_gemdir
+ return @gemdir unless @path
+ return File.join(@gemdir, @path)
+ end
+
+ def canonical?() return @canonical; end
+ def git?() return !!@repo; end
+ def gemname() return File.basename(@gemdir); end
+
+ def hash
+ return @gemdir, @repo, @branch, @commit, @canonical, @path.hash
+ end
+
+ def ==(other)
+ return @gemdir == other.gemdir &&
+ @repo == other.repo &&
+ @branch == other.branch &&
+ @commit == other.commit &&
+ @canonical == other.canonical? &&
+ full_gemdir == other.full_gemdir
+ end
+ alias_method :eql?, :==
+
+ def to_s
+ desc = @gemdir
+ desc += " -> #{@repo}/#{@branch}" if git?
+ desc += "/#{commit}" if commit
+ return desc
+ end
+ end
+
+ # Class to decode the argument set given to 'MRuby::Build::gem',
+ # and git-clone+git-checkout the sources if needed.
+ class GemLoader
+ def initialize(build,
+ build_config_dir, # Parent dir. of build_config
+ gem_checkouts, # Hash of existing checkouts
+
+ # Git repo:
+ git: nil,
+ branch: "master",
+ checksum_hash: nil,
+ options: ,
+ path: nil, # path to root relative to gem checkout
+
+ # Git repo on GitHub
+ github: nil,
+
+ # Git repo on BitBucket
+ bitbucket: nil,
+ method: nil,
+
+ # mgem entry
+ mgem: nil,
+
+ # Core package
+ core: nil,
+
+ # Local file(s)
+ gemdir: nil,
+
+ # Related flags:
+ canonical: false # Ignore subsequent checkout of this gem
+ )
+ # Tolerate a single string option
+ options = options unless options.is_a? Array
+
+ @build = build
+ @build_config_dir = build_config_dir
+ @gem_checkouts = gem_checkouts
+ @canonical = canonical
+
+ @git = git
+ @path = path
+ @branch = branch
+ @checksum_hash = checksum_hash
+ @options = options
+ @canonical = canonical
+
+ @github = github
+
+ @bitbucket = bitbucket
+ @method = method
+
+ @mgem = mgem
+ @core = core
+ @gemdir = gemdir
+
+
+ actions = git, github, bitbucket, mgem, core, gemdir
+ fail("Need to set exactly ONE of git, github, bitbucket, mgem, core, " +
+ "or gemdir") unless actions.compact.size == 1
+ end
+
+ # Retrieve the repo and return the details in a GemCheckout
+ # object or nil if nothing needed to be done.
+ def fetch!
+ return fromGemdir! if @gemdir
+ return fromCore! if @core
+ return fromGitHub! if @github
+ return fromBitBucket! if @bitbucket
+
+ return fromMGem! if @mgem
+
+ return fromGit!(@git, @branch) if @git
+
+ # Shouldn't be reachable, but...
+ fail "Invalid gem configuration!"
+ end
+
+ private
+
+ #
+ # Local Paths
+ #
+
+ def fromGemdir!
+ gem_src = @gemdir
+
+ # If @gemdir is a relative path, we first convert it to an
+ # absolute path; this depends on circumstances.
+ if MRuby::GemBox.path
+ # If GemBox.path is set, it means that this fetch operation is
+ # happening as part of a gembox evaluation and we use the
+ # gembox's path as the starting point.
+ gem_src = File.expand_path(gem_src, File.dirname(MRuby::GemBox.path))
 else
- params:git = "https://bitbucket.org/#{params:bitbucket}.git"
+ # Otherwise, we use the path to the build_config.rb file that
+ # requested this gem. This path was extracted earlier and
+ # stored in @build_config_dir via the second argument of
+ # 'initialize'.
+ root_dir = @build_config_dir
+
+ # And we default to the repo root if the file is one of the
+ # stock configs in build_config/.
+ root_dir = MRUBY_ROOT if root_dir == "#{MRUBY_ROOT}/build_config"
+
+ gem_src = File.expand_path(gem_src, root_dir)
 end
- elsif params:mgem
- mgem_list_dir = "#{gem_clone_dir}/mgem-list"
- mgem_list_url = 'https://github.com/mruby/mgem-list.git'
- if File.exist? mgem_list_dir
- git.run_pull mgem_list_dir, mgem_list_url if $pull_gems
+
+ return GemCheckout.new(gem_src, nil, nil, nil, @canonical)
+ end
+
+ def fromCore!
+ return GemCheckout.new("#{@build.root}/mrbgems/#{@core}", nil, nil,
+ nil, @canonical)
+ end
+
+
+ #
+ # Git forges
+ #
+
+ def fromGitHub!
+ url = "https://github.com/#{@github}.git"
+ return fromGit!(url, @branch)
+ end
+
+ def fromBitBucket!
+ if @method == "ssh"
+ url = "git@bitbucket.org:#{@bitbucket}.git"
 else
- mkdir_p mgem_list_dir
- git.run_clone mgem_list_dir, mgem_list_url, "--depth 1"
+ url = "https://bitbucket.org/#{@bitbucket}.git"
 end
 
- require 'yaml'
+ return fromGit!(url, @branch)
+ end
+
+
+ #
+ # mgem file
+ #
+
+ def fromMGem!
+ mgem = fetchMGem(@mgem)
+
+ url = mgem'repository'
+ branch = mgem'branch' || @branch
+
+ return fromGit!(url, branch)
+ end
+
+ # Fetch the contents of the named mgem item. Will clone the
+ # mgem-list repo if not present
+ def fetchMGem(mgem)
+ list_dir = "#{@build.gem_clone_dir}/mgem-list"
+ url = 'https://github.com/mruby/mgem-list.git'
+
+ git_clone_dependency(url, list_dir, nil, 'master')
+
+ conf_path = "#{list_dir}/#{mgem}.gem"
+ conf_path = "#{list_dir}/mruby-#{mgem}.gem" unless
+ File.exist? conf_path
+ fail "mgem not found: #{mgem}" unless File.exist? conf_path
 
- conf_path = "#{mgem_list_dir}/#{params:mgem}.gem"
- conf_path = "#{mgem_list_dir}/mruby-#{params:mgem}.gem" unless File.exist? conf_path
- fail "mgem not found: #{params:mgem}" unless File.exist? conf_path
 conf = YAML.load File.read conf_path
+ fail "unknown mgem protocol: #{conf'protocol'}" if
+ conf'protocol' != 'git'
 
- fail "unknown mgem protocol: #{conf'protocol'}" if conf'protocol' != 'git'
- params:git = conf'repository'
- params:branch = conf'branch' if conf'branch'
+ return conf
 end
 
- if params:core
- gemdir = "#{root}/mrbgems/#{params:core}"
- elsif params:git
- url = params:git
- gemdir = "#{gem_clone_dir}/#{url.match(/(-\w+)(\.-\w+|)$/).to_a1}"
 
- # by default the 'master' branch is used
- branch = params:branch ? params:branch : 'master'
+ #
+ # Git checkouts
+ #
 
- lock = locksurl if lock_enabled?
+ def fromGit!(url, branch)
+ repo_dir = "#{@build.gem_clone_dir}/" +
+ "#{url.match(/(-\w+)(\.-\w+|)$/).to_a1}"
+ commit = @checksum_hash
 
- if File.exist?(gemdir)
- if $pull_gems
- # Jump to the top of the branch
- git.run_checkout gemdir, branch
- git.run_pull gemdir, url
- elsif params:checksum_hash
- git.run_checkout_detach gemdir, params:checksum_hash
- elsif lock
- git.run_checkout_detach gemdir, lock'commit'
- end
- else
- options = params:options || 
- options << "--recursive"
- options << "--branch \"#{branch}\""
- options << "--depth 1" unless params:checksum_hash || lock
- mkdir_p "#{gem_clone_dir}"
- git.run_clone gemdir, url, options
-
- # Jump to the specified commit
- if params:checksum_hash
- git.run_checkout_detach gemdir, params:checksum_hash
- elsif lock
- git.run_checkout_detach gemdir, lock'commit'
- end
+ return nil if skip_this?(url, repo_dir, branch, commit)
+
+ # If there's a lockfile entry for this repo AND the user hasn't
+ # specified a specific commit ID, we use the locked branch and
+ # commit.
+ lock = @build.locksurl if @build.lock_enabled?
+ if !commit && lock
+ branch = lock'branch'
+ commit = lock'commit'
 end
 
- if lock_enabled?
- @gem_dir_to_repo_urlgemdir = url unless params:path
- locksurl = {
+ # Clone the dependency (if needed) and checkout the expected
+ # revision.
+ git_clone_dependency(url, repo_dir, commit, branch)
+ git_checkout_dependency(repo_dir, commit, branch)
+
+ # Set the lockfile entry if enabled
+ if @build.lock_enabled?
+ @build.gem_dir_to_repo_urlrepo_dir = url
+ @build.locksurl = {
 'url' => url,
- 'branch' => git.current_branch(gemdir),
- 'commit' => git.commit_hash(gemdir),
+ 'branch' => @build.git.current_branch(repo_dir),
+ 'commit' => @build.git.commit_hash(repo_dir),
 }
 end
 
- gemdir << "/#{params:path}" if params:path
- elsif params:path
- require 'pathname'
- gemdir = Pathname.new(params:path).absolute? ? params:path : "#{root}/#{params:path}"
- else
- fail "unknown gem option #{params}"
+ return GemCheckout.new(repo_dir, url, branch, commit, @canonical,@path)
 end
 
- gemdir
+
+ # Test if this repo can be skipped. This will happen if it's
+ # already in @gem_checkouts and EITHER it is identical (same
+ # url, branch, commit-ID and subdirectory path) as the current
+ # checkout OR its "canonical" flag is true. If it's in
+ # @gem_checkouts and neither of these conditions is true, that's
+ # a fatal error; it means there are multiple incompatible
+ # versions of this gem to be checked out into this directory.
+ #
+ # Otherwise, returns false.
+ def skip_this?(url, repo_dir, branch, commit)
+ prev = @gem_checkoutsrepo_dir
+ return false unless prev
+
+ # Canonical declarations must precede all others.
+ fail("Attempted to re-declare #{prev.gemname} as canonical!\n" +
+ "('canonical' can only be used on its first declaration.)") if
+ prev && @canonical
+
+ # If prev is canonical, we can ignore this
+ if prev.canonical?
+ puts "Found canonical #{prev.gemname}; skipping this one."
+ return true
+ end
+
+ # If this checkout is identical to the current one, we can skip it.
+ candidate = GemCheckout.new(repo_dir, url, branch, commit, @canonical,
+ @path)
+ if prev == candidate
+ puts "Found duplicate checkout for #{repo_dir}; ignoring."
+ return true
+ end
+
+ # Otherwise, we have a checkout conflict. This is an error.
+ fail "Conflicting gem definitions for '#{repo_dir}':\n" +
+ " #{candidate}\n" +
+ " #{prev}\n"
+ end
+
+
+ # Retrieve a git repo if it's not present. Return
+ # path_to_checkout, did_clone
+ def git_clone_dependency(url, repo_dir, commit, branch)
+ return if
+ File.exist?(repo_dir) && File.exist?(File.join(repo_dir, '.git'))
+
+ FileUtils.mkdir_p repo_dir
+
+ options = @options.dup
+ options << "--recursive"
+ options << "--branch \"#{branch}\""
+ options << "--depth 1" unless commit
+
+ @build.git.run_clone repo_dir, url, options
+ end
+
+ def git_checkout_dependency(repo_dir, commit, branch)
+ return unless commit
+ @build.git.run_checkout_detach(repo_dir, commit)
+ end
 end
 
 def enable_gems?

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/lib/mruby/doc.rb Added

@@ -0,0 +1,50 @@
+autoload :Pathname, 'pathname'
+
+module MRuby
+ module Documentation
+ def Documentation.update_opcode_md
+ mrubydir = Pathname(MRUBY_ROOT)
+ path_ops_h = mrubydir + "include/mruby/ops.h"
+ path_opcode_md = mrubydir + "doc/internal/opcode.md"
+
+ opspecs = {
+ "Z" => { prefix: "", modified: "-" },
+ "B" => { prefix: "\'" },
+ "BB" => { prefix: "\"" },
+ "BBB" => { prefix: "\"" },
+ "BS" => { prefix: "\'" },
+ "BSS" => { prefix: "\'" },
+ "S" => { prefix: "" },
+ "W" => { prefix: "" },
+ }
+
+ diff = ""
+
+ spliter = <<~'SPLITER'
+ | Instruction Name | Operand type | Semantics |
+ |--------------------|----------------|------------------------------------------------------------|
+ SPLITER
+
+ diff = path_opcode_md.read.sub(/^#{Regexp.escape spliter}.*?(?=\z|^$\n)/m) do
+ repl = spliter
+
+ ops = path_ops_h.read
+ ops.scan(/^\s*OPCODE\s*$\s*(\w+)\s*,\s*(\w+)\s*$\s*(?:\/\*\s*(.*?)\s*\*\/\s*)?/).each do |ins, opr, cmt|
+ if cmt
+ cmt.sub!(/\s*#.*/, "")
+ cmt.sub!(/\b(?=L_\w+\b)/, "OP_")
+ cmt.gsub!(/\b(Irep|Pool|R|Syms)\(^\\+)\/, "\\1(\\2)")
+ cmt.gsub!(/\\\|/) { |m| "\\#{m}" } # Ruby-2.5 is not support "Numbered block parameter"
+ end
+ spec = opspecsopr or raise "unknown operand type: #{opr}"
+ item = format(%(| %-18s | %-14s | %-58s |\n), "`OP_#{ins}`", "`#{spec:modified || opr}`", cmt && "`#{cmt}`")
+ repl << item
+ end
+
+ repl
+ end
+
+ path_opcode_md.binwrite diff
+ end
+ end
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/lib/mruby/gem.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/lib/mruby/gem.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/lib/mruby/presym.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/lib/mruby/presym.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/math.gembox -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/math.gembox Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-array-ext/mrblib/array.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-array-ext/mrblib/array.rb Changed

@@ -239,7 +239,7 @@
 #
 # Returns a new array that is a one-dimensional flattening of this
 # array (recursively). That is, for every element that is an array,
- # extract its elements into the new array. If the optional
+ # extract its elements into the new array. If the optional
 # level argument determines the level of recursion to flatten.
 #
 # s = 1, 2, 3 #=> 1, 2, 3
@@ -262,7 +262,7 @@
 #
 # Flattens +self+ in place.
 # Returns <code>nil</code> if no modifications were made (i.e.,
- # ary contains no subarrays.) If the optional level
+ # ary contains no subarrays.) If the optional level
 # argument determines the level of recursion to flatten.
 #
 # a = 1, 2, 3, 4, 5 
@@ -313,7 +313,7 @@
 # ary.fetch(index) { |index| block } -> obj
 #
 # Tries to return the element at position +index+, but throws an IndexError
- # exception if the referenced +index+ lies outside of the array bounds. This
+ # exception if the referenced +index+ lies outside of the array bounds. This
 # error can be prevented by supplying a second argument, which will act as a
 # +default+ value.
 #
@@ -539,7 +539,7 @@
 # the given condition in O(log n) where n is the size of the array.
 #
 # You can use this method in two use cases: a find-minimum mode and
- # a find-any mode. In either case, the elements of the array must be
+ # a find-any mode. In either case, the elements of the array must be
 # monotone (or sorted) with respect to the block.
 #
 # In find-minimum mode (this is a good choice for typical use case),
@@ -551,7 +551,7 @@
 # - the block returns true for any element whose index is greater
 # than or equal to i.
 #
- # This method returns the i-th element. If i is equal to ary.size,
+ # This method returns the i-th element. If i is equal to ary.size,
 # it returns nil.
 #
 # ary = 0, 4, 7, 10, 12
@@ -570,7 +570,7 @@
 # j <= k < ary.size.
 #
 # Under this condition, this method returns any element whose index
- # is within i...j. If i is equal to j (i.e., there is no element
+ # is within i...j. If i is equal to j (i.e., there is no element
 # that satisfies the block), this method returns nil.
 #
 # ary = 0, 4, 7, 10, 12
@@ -580,7 +580,7 @@
 # ary.bsearch {|x| 4 - (x / 2).truncate } #=> nil
 #
 # You must not mix the two modes at a time; the block must always
- # return either true/false, or always return a number. It is
+ # return either true/false, or always return a number. It is
 # undefined which value is actually picked up at each iteration.
 
 def bsearch(&block)
@@ -707,7 +707,7 @@
 # <code>==</code> to +obj+.
 #
 # If a block is given instead of an argument, returns the _index_ of the
- # first object for which the block returns +true+. Returns +nil+ if no
+ # first object for which the block returns +true+. Returns +nil+ if no
 # match is found.
 #
 # ISO 15.2.12.5.14

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-array-ext/src/array.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-array-ext/src/array.c Changed

@@ -3,6 +3,7 @@
 #include <mruby/array.h>
 #include <mruby/range.h>
 #include <mruby/hash.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 /*
@@ -32,7 +33,7 @@
 mrb_value v;
 mrb_value k = mrb_get_arg1(mrb);
 
- for (i = 0; i < RARRAY_LEN(ary); ++i) {
+ for (i = 0; i < RARRAY_LEN(ary); i++) {
 v = mrb_check_array_type(mrb, RARRAY_PTR(ary)i);
 if (!mrb_nil_p(v) && RARRAY_LEN(v) > 0 &&
 mrb_equal(mrb, RARRAY_PTR(v)0, k))
@@ -62,7 +63,7 @@
 mrb_value v;
 mrb_value value = mrb_get_arg1(mrb);
 
- for (i = 0; i < RARRAY_LEN(ary); ++i) {
+ for (i = 0; i < RARRAY_LEN(ary); i++) {
 v = RARRAY_PTR(ary)i;
 if (mrb_array_p(v) &&
 RARRAY_LEN(v) > 1 &&
@@ -103,14 +104,14 @@
 static mrb_value
 mrb_ary_values_at(mrb_state *mrb, mrb_value self)
 {
- mrb_int argc;
- const mrb_value *argv;
-
- mrb_get_args(mrb, "*", &argv, &argc);
+ mrb_int argc = mrb_get_argc(mrb);
+ const mrb_value *argv = mrb_get_argv(mrb);
 
 return mrb_get_values_at(mrb, self, RARRAY_LEN(self), argc, argv, ary_ref);
 }
 
+mrb_value mrb_ary_delete_at(mrb_state *mrb, mrb_value self);
+
 /*
 * call-seq:
 * ary.slice!(index) -> obj or nil
@@ -136,8 +137,7 @@
 mrb_ary_slice_bang(mrb_state *mrb, mrb_value self)
 {
 struct RArray *a = mrb_ary_ptr(self);
- mrb_int i, j, k, len, alen;
- mrb_value val;
+ mrb_int i, j, len, alen;
 mrb_value *ptr;
 mrb_value ary;
 
@@ -146,21 +146,13 @@
 if (mrb_get_argc(mrb) == 1) {
 mrb_value index = mrb_get_arg1(mrb);
 
- switch (mrb_type(index)) {
- case MRB_TT_RANGE:
+ if (mrb_type(index) == MRB_TT_RANGE) {
 if (mrb_range_beg_len(mrb, index, &i, &len, ARY_LEN(a), TRUE) == MRB_RANGE_OK) {
 goto delete_pos_len;
 }
- else {
- return mrb_nil_value();
- }
- case MRB_TT_INTEGER:
- val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
- return val;
- default:
- val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
- return val;
+ return mrb_nil_value();
 }
+ return mrb_ary_delete_at(mrb, self);
 }
 
 mrb_get_args(mrb, "ii", &i, &len);
@@ -172,16 +164,12 @@
 if (alen == i) return mrb_ary_new(mrb);
 if (len > alen - i) len = alen - i;
 
- ary = mrb_ary_new_capa(mrb, len);
- ptr = ARY_PTR(a);
- for (j = i, k = 0; k < len; ++j, ++k) {
- mrb_ary_push(mrb, ary, ptrj);
- }
+ ptr = ARY_PTR(a) + i;
+ ary = mrb_ary_new_from_values(mrb, len, ptr);
 
- ptr += i;
- for (j = i; j < alen - len; ++j) {
+ for (j = i; j < alen - len; j++) {
 *ptr = *(ptr+len);
- ++ptr;
+ ptr++;
 }
 
 mrb_ary_resize(mrb, self, alen - len);
@@ -205,7 +193,7 @@
 mrb_int len = RARRAY_LEN(self);
 mrb_value *p = RARRAY_PTR(self);
 
- for (mrb_int i = 0; i < len; ++i) {
+ for (mrb_int i = 0; i < len; i++) {
 if (!mrb_nil_p(pi)) {
 mrb_ary_push(mrb, ary, pi);
 }
@@ -233,7 +221,7 @@
 mrb_value *p = ARY_PTR(a);
 
 mrb_ary_modify(mrb, a);
- for (i = 0; i < len; ++i) {
+ for (i = 0; i < len; i++) {
 if (!mrb_nil_p(pi)) {
 if (i != j) pj = pi;
 j++;

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/README-fgmp.md Added

@@ -0,0 +1,154 @@
+# fgmp
+
+FGMP is a public domain implementation of a subset of the GNU gmp library with the same API.
+
+WELCOME TO FGMP.
+
+FGMP is a public domain implementation of a subset of the GNU gmp library
+with the same API.
+
+For instance, you can link the following trivial program with either
+this code, or libgmp.a and get the same results.
+
+```c
+#include <stdio.h>
+#include "gmp.h"
+main()
+{
+ MP_INT a; MP_INT b; MP_INT c;
+
+ mpz_init_set_ui(&a,1); mpz_init_set_ui(&b,2); mpz_init(&c);
+ mpz_add(&c,&a,&b);
+ printf("\n%s\n", mpz_get_str(NULL,10,&c));
+}
+```
+
+FGMP is really in the public domain. You can do whatever you want with
+it.
+
+I wrote FGMP so that we would all have access to a (truly free)
+implementation of this subset of the API of GNU libgmp. I encourage
+everyone to distribute this as widely as possible.
+
+If you need more documentation, I suggest you look at the file
+gmp.texi which is included with the GNU gmp library.
+
+You can send me bug reports, implementations of missing functions, flames
+and rants by Email.
+
+Any submissions of new code to be integrated into fgmp must also be
+placed in the public domain (For the particularly dense, you can
+release a new fgmp yourself under different licensing terms. This
+is a condition for including a submission in a release of FGMP that
+I personally prepare).
+
+Mark Henderson <markh@wimsey.bc.ca>
+
+# This is the fifth BETA release. 1.0b5
+
+I hearby place this file and all of FGMP in the public domain.
+
+Thanks to Paul Rouse <par@r-cube.demon.co.uk> for changes to get fgmp
+to work on a 286 MS-DOS compiler, the functions mpz_sqrt and
+mpz_sqrtrem, plus other general bug fixes.
+
+Thanks also to Erick Gallesio <eg@kaolin.unice.fr> for a fix
+to mpz_init_set_str
+
+Define B64 if your "long" type is 64 bits. Otherwise we assume 32
+bit longs. (The 64 bit version hasn't been tested enough)
+
+```
+Platforms:
+Linux 0.99 (gcc)
+IBM RS6000/AIX 3.2 (IBM xlc compiler and gcc 2.3)
+Sun OS 4.1, Sun 3/4
+DEC Alpha OSF/1 (only lightly tested, 64 bit longs do make a difference,
+ thanks to DEC for providing access via axposf.pa.dec.com). Define B64
+ for this platform
+MS-DOS 286 C compiler (see credits above)
+```
+
+# Some differences between gmp and fgmp
+
+1. fgmp is considerably slower than gmp
+2. fgmp does not implement the following:
+ all mpq_*
+ internal mpn_* functions
+ mpz_perfect_square_p
+ mpz_inp_raw, mpz_out_raw
+ mp_set_memory_functions, mpz_out_str, mpz_inp_str
+3. fgmp implements the following in addition to the routines in GNU gmp.
+ `int mpz_jacobi(MP_INT *a, MP_INT *b)`
+ - finds the jacobi symbol (a/b)
+4. mpz_sizeinbase often overestimates the exact value
+
+5. To convert your gmp based program to fgmp (subject to the
+above)
+
+- recompile your source. Make sure to include the gmp.h file included
+ with fgmp rather than that included with gmp. (The point is to recompile
+ all files which include gmp.h)
+- link with gmp.o instead of libgmp.a
+
+Here's a complete sorted list of function implemented in fgmp:
+
+```
+_mpz_realloc
+mpz_abs
+mpz_add
+mpz_add_ui
+mpz_and
+mpz_clear
+mpz_cmp
+mpz_cmp_si
+mpz_cmp_ui
+mpz_div
+mpz_div_2exp
+mpz_div_ui
+mpz_divmod
+mpz_divmod_ui
+mpz_fac_ui
+mpz_gcd
+mpz_gcdext
+mpz_get_si
+mpz_get_str
+mpz_get_ui
+mpz_init
+mpz_init_set
+mpz_init_set_si
+mpz_init_set_str
+mpz_init_set_ui
+mpz_jacobi
+mpz_mdiv
+mpz_mdiv_ui
+mpz_mdivmod
+mpz_mdivmod_ui
+mpz_mmod
+mpz_mmod_ui
+mpz_mod
+mpz_mod_2exp
+mpz_mod_ui
+mpz_mul
+mpz_mul_2exp
+mpz_mul_ui
+mpz_neg
+mpz_or
+mpz_pow_ui
+mpz_powm
+mpz_powm_ui
+mpz_probab_prime_p
+mpz_random
+mpz_random2
+mpz_set
+mpz_set_si
+mpz_set_str
+mpz_set_ui
+mpz_size
+mpz_sizeinbase
+mpz_sqrt
+mpz_sqrtrem
+mpz_sub
+mpz_sub_ui
+mpz_xor
+```

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/README.md Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/core Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/core/bigint.c Added

@@ -0,0 +1,1506 @@
+/**
+** @file mruby/bigint.c - Multi-precision Integer
+**
+** See Copyright Notice in mruby.h
+*/
+
+#include <mruby.h>
+#include <mruby/object.h>
+#include <mruby/numeric.h>
+#include <mruby/array.h>
+#include <mruby/string.h>
+#include <mruby/internal.h>
+#include <string.h>
+#include "bigint.h"
+
+#define DIG_SIZE (MPZ_DIG_SIZE)
+#define DIG_BASE (1ULL << DIG_SIZE)
+#define DIG_MASK (DIG_BASE - 1)
+#define HIGH(x) ((x) >> DIG_SIZE)
+#define LOW(x) ((x) & DIG_MASK)
+
+#define iabs(x) (((x)>0)?(x):(-x))
+#define imax(x,y) (((x)>(y))?(x):(y))
+#define imin(x,y) (((x)<(y))?(x):(y))
+#define dg(x,i) (((size_t)i < (x)->sz)?(x)->pi:0)
+
+static void
+mpz_init(mrb_state *mrb, mpz_t *s)
+{
+ s->p = NULL;
+ s->sn=0;
+ s->sz=0;
+}
+
+static void
+mpz_realloc(mrb_state *mrb, mpz_t *x, size_t size)
+{
+ if (x->sz < size) {
+ x->p=(mp_limb*)mrb_realloc(mrb, x->p, size*sizeof(mp_limb));
+ for (size_t i=x->sz; i<size; i++)
+ x->pi = 0;
+ x->sz = size;
+ }
+}
+
+static void
+mpz_set(mrb_state *mrb, mpz_t *y, mpz_t *x)
+{
+ size_t i, k = x->sz;
+
+ mpz_realloc(mrb, y, k);
+ for (i=0;i < k; i++)
+ y->pi = x->pi;
+
+ for (;i<y->sz;i++)
+ y->pi = 0;
+
+ y->sn = x->sn;
+}
+
+static void
+mpz_init_set(mrb_state *mrb, mpz_t *s, mpz_t *t)
+{
+ mpz_init(mrb, s);
+ mpz_set(mrb, s, t);
+}
+
+static void
+mpz_set_int(mrb_state *mrb, mpz_t *y, mrb_int v)
+{
+ mrb_uint u;
+
+ if (v == 0) {
+ y->sn=0;
+ u = 0;
+ }
+ else if (v > 0) {
+ y->sn = 1;
+ u = v;
+ }
+ if (v < 0) {
+ y->sn = -1;
+ if (v == MRB_INT_MIN) u = v;
+ else u = -v;
+ }
+#if MRB_INT_BIT > DIG_SIZE
+ if ((u & ~DIG_MASK) != 0) {
+ mpz_realloc(mrb, y, 2);
+ y->p1 = (mp_limb)HIGH(u);
+ y->p0 = (mp_limb)LOW(u);
+ }
+ else
+#endif
+ {
+ mpz_realloc(mrb, y, 1);
+ y->p0 = (mp_limb)u;
+ }
+}
+
+static void
+mpz_init_set_int(mrb_state *mrb, mpz_t *y, mrb_int v)
+{
+ mpz_init(mrb, y);
+ mpz_set_int(mrb, y, v);
+}
+
+static void
+mpz_clear(mrb_state *mrb, mpz_t *s)
+{
+ if (s->p) mrb_free(mrb, s->p);
+ s->p = NULL;
+ s->sn = 0;
+ s->sz = 0;
+}
+
+static void
+mpz_move(mrb_state *mrb, mpz_t *y, mpz_t *x)
+{
+ mpz_clear(mrb, y);
+ y->sn = x->sn;
+ y->sz = x->sz;
+ y->p = x->p;
+ x->p = NULL;
+ x->sn = 0;
+ x->sz = 0;
+}
+
+static size_t
+digits(mpz_t *x)
+{
+ size_t i;
+
+ if (x->sz == 0) return 0;
+ for (i = x->sz - 1; x->pi == 0 ; i--)
+ if (i == 0) break;
+ return i+1;
+}
+
+static void
+trim(mpz_t *x)
+{
+ while (x->sz && x->px->sz-1 == 0) {
+ x->sz--;
+ }
+}
+
+/* z = x + y, without regard for sign */
+static void
+uadd(mrb_state *mrb, mpz_t *z, mpz_t *x, mpz_t *y)
+{
+ if (y->sz < x->sz) {
+ mpz_t *t; /* swap x,y */
+ t=x; x=y; y=t;
+ }
+
+ /* now y->sz >= x->sz */
+ mpz_realloc(mrb, z, y->sz+1);
+
+ mp_dbl_limb c = 0;
+ size_t i;
+ for (i=0; i<x->sz; i++) {
+ c += (mp_dbl_limb)y->pi + (mp_dbl_limb)x->pi;
+ z->pi = LOW(c);
+ c >>= DIG_SIZE;
+ }
+ for (;i<y->sz; i++) {
+ c += y->pi;
+ z->pi = LOW(c);
+ c >>= DIG_SIZE;
+ }
+ z->py->sz = (mp_limb)c;
+ trim(z);
+}
+
+/* z = y - x, ignoring sign */
+/* precondition: abs(y) >= abs(x) */
+static void
+usub(mrb_state *mrb, mpz_t *z, mpz_t *y, mpz_t *x)
+{
+ mpz_realloc(mrb, z, (size_t)(y->sz));
+ mp_dbl_limb_signed b = 0;
+ size_t i;
+ for (i=0;i<x->sz;i++) {
+ b += (mp_dbl_limb_signed)y->pi;
+ b -= (mp_dbl_limb_signed)x->pi;
+ z->pi = LOW(b);
+ b = HIGH(b);
+ }
+ for (;i<y->sz; i++) {
+ b += y->pi;
+ z->pi = LOW(b);
+ b = HIGH(b);
+ }
+ z->sz = digits(z);
+}
+
+/* compare abs(x) and abs(y) */
+static int
+ucmp(mpz_t *y, mpz_t *x)
+{
+ if (y->sz < x->sz) return -1;
+ if (y->sz > x->sz) return 1;
+ if (x->sz == 0) return 0;
+ for (size_t i=x->sz-1;; i--) {
+ mp_limb a = y->pi;
+ mp_limb b = x->pi;
+ if (a > b) return 1;
+ if (a < b) return -1;
+ if (i == 0) break;
+ }
+ return 0;
+}
+
+static int
+uzero(mpz_t *x)
+{
+ for (size_t i=0; i < x->sz; i++)
+ if (x->pi != 0)
+ return 0;
+ return 1;
+}
+
+static void
+zero(mpz_t *x)
+{
+ x->sn=0;
+ if (x->p) {
+ x->sz=1;
+ x->p0=0;
+ }
+ else {
+ x->sz=0;
+ }
+}
+
+/* z = x + y */
+static void
+mpz_add(mrb_state *mrb, mpz_t *zz, mpz_t *x, mpz_t *y)
+{
+ int mg;
+ mpz_t z;
+
+ if (x->sn == 0) {
+ mpz_set(mrb, zz, y);
+ return;
+ }
+ if (y->sn == 0) {
+ mpz_set(mrb, zz, x);
+ return;
+ }
+ mpz_init(mrb, &z);
+
+ if (x->sn > 0 && y->sn > 0) {
+ uadd(mrb, &z, x, y);
+ z.sn = 1;
+ }
+ else if (x->sn < 0 && y->sn < 0) {
+ uadd(mrb, &z, x, y);
+ z.sn = -1;
+ }
+ else {
+ /* signs differ */
+ if ((mg = ucmp(x,y)) == 0) {
+ zero(&z);
+ }
+ else if (mg > 0) { /* abs(y) < abs(x) */
+ usub(mrb, &z, x, y);
+ z.sn = (x->sn > 0 && y->sn < 0) ? 1 : (-1);
+ }
+ else { /* abs(y) > abs(x) */
+ usub(mrb, &z, y, x);
+ z.sn = (x->sn < 0 && y->sn > 0) ? 1 : (-1);
+ }
+ }
+ trim(&z);
+ mpz_move(mrb, zz, &z);
+}
+
+/* z = x - y -- just use mpz_add - I'm lazy */
+static void
+mpz_sub(mrb_state *mrb, mpz_t *z, mpz_t *x, mpz_t *y)
+{
+ mpz_t u;
+
+ mpz_init(mrb, &u);
+ mpz_set(mrb, &u, y);
+ u.sn = -(u.sn);
+ mpz_add(mrb, z, x, &u);
+ mpz_clear(mrb, &u);
+}
+
+/* x = y - n */
+static void
+mpz_sub_int(mrb_state *mrb, mpz_t *x, mpz_t *y, mrb_int n)
+{
+ mpz_t z;
+
+ mpz_init_set_int(mrb, &z, n);
+ mpz_sub(mrb, x, y, &z);
+ mpz_clear(mrb, &z);
+}
+
+/* w = u * v */
+static void
+mpz_mul(mrb_state *mrb, mpz_t *ww, mpz_t *u, mpz_t *v)
+{
+ size_t i, j;
+ mpz_t w;
+
+ if (uzero(u) || uzero(v)) {
+ mpz_set_int(mrb, ww, 0);
+ return;
+ }
+ mpz_init(mrb, &w);
+ mpz_realloc(mrb, &w, u->sz + v->sz);
+ for (j=0; j < u->sz; j++) {
+ mp_dbl_limb cc = (mp_limb)0;
+ mp_limb u0 = u->pj;
+ if (u0 == 0) continue;
+ for (i=0; i < v->sz; i++) {
+ mp_limb v0 = v->pi;
+ if (v0 == 0) continue;
+ cc += (mp_dbl_limb)w.pi+j + (mp_dbl_limb)u0 * (mp_dbl_limb)v0;
+ w.pi+j = LOW(cc);
+ cc = HIGH(cc);
+ }
+ if (cc) {
+ w.pi+j = (mp_limb)cc;
+ }
+ }
+ w.sn = u->sn * v->sn;
+ trim(&w);
+ mpz_move(mrb, ww, &w);
+}
+
+static void
+mpz_mul_int(mrb_state *mrb, mpz_t *x, mpz_t *y, mrb_int n)
+{
+ if (n == 0) {
+ zero(x);
+ return;
+ }
+
+ mpz_t z;
+
+ mpz_init_set_int(mrb, &z, n);
+ mpz_mul(mrb, x, y, &z);
+ mpz_clear(mrb, &z);
+}
+
+/* number of leading zero bits in digit */
+static int
+lzb(mp_limb x)
+{
+ if (x == 0) return 0;
+#if (defined(__GNUC__) || __has_builtin(__builtin_clz))
+ if (sizeof(mp_limb) == sizeof(int64_t))
+ return __builtin_clzll(x);
+ else if (sizeof(mp_limb) == sizeof(int32_t))
+ return __builtin_clz(x);
+#endif
+
+ int j=0;
+
+ for (mp_limb i = ((mp_limb)1 << (DIG_SIZE-1)); i && !(x&i) ; j++,i>>=1)
+ ;
+ return j;
+}
+
+/* c1 = a>>n */
+/* n must be < DIG_SIZE */
+static void
+urshift(mrb_state *mrb, mpz_t *c1, mpz_t *a, size_t n)
+{
+ mrb_assert(n < DIG_SIZE);
+
+ if (n == 0)
+ mpz_set(mrb, c1, a);
+ else if (uzero(a)) {
+ mpz_set_int(mrb, c1, 0);
+ }
+ else {
+ mpz_t c;
+ mp_limb cc = 0;
+ mp_dbl_limb rm = (((mp_dbl_limb)1<<n) - 1);
+
+ mpz_init(mrb, &c);
+ mpz_realloc(mrb, &c, a->sz);
+ for (size_t i=a->sz-1;; i--) {
+ c.pi = ((a->pi >> n) | cc) & DIG_MASK;
+ cc = (a->pi & rm) << (DIG_SIZE - n);
+ if (i == 0) break;
+ }
+ trim(&c);
+ mpz_move(mrb, c1, &c);
+ }
+}
+
+/* c1 = a<<n */
+/* n must be < DIG_SIZE */
+static void
+ulshift(mrb_state *mrb, mpz_t *c1, mpz_t *a, size_t n)
+{
+ mrb_assert(n < DIG_SIZE);
+ if (n == 0)
+ mpz_set(mrb, c1, a);
+ else if (uzero(a)) {
+ mpz_set_int(mrb, c1, 0);
+ }
+ else {
+ mp_limb cc = 0;
+ mpz_t c;
+ mp_limb rm = (((mp_dbl_limb)1<<n) - 1) << (DIG_SIZE-n);
+
+ mpz_init(mrb, &c);
+ mpz_realloc(mrb, &c, a->sz+1);
+
+ size_t i;
+ for (i=0; i<a->sz; i++) {
+ c.pi = ((a->pi << n) | cc) & DIG_MASK;
+ cc = (a->pi & rm) >> (DIG_SIZE-n);
+ }
+ c.pi = cc;
+ trim(&c);
+ mpz_move(mrb, c1, &c);
+ }
+}
+
+/* internal routine to compute x/y and x%y ignoring signs */
+/* qq = xx/yy; rr = xx%yy */
+static void
+udiv(mrb_state *mrb, mpz_t *qq, mpz_t *rr, mpz_t *xx, mpz_t *yy)
+{
+ /* simple cases */
+ int cmp = ucmp(xx, yy);
+ if (cmp == 0) {
+ mpz_set_int(mrb, qq, 1);
+ zero(rr);
+ return;
+ }
+ else if (cmp < 0) {
+ zero(qq);
+ mpz_set(mrb, rr, xx);
+ return;
+ }
+
+ mpz_t q, x, y;
+ size_t i;
+
+ mrb_assert(!uzero(yy)); /* divided by zero */
+ mpz_init(mrb, &q);
+ mpz_init(mrb, &x);
+ mpz_init(mrb, &y);
+ mpz_realloc(mrb, &x, xx->sz+1);
+ size_t yd = digits(yy);
+ size_t ns = lzb(yy->pyd-1);
+ ulshift(mrb, &x, xx, ns);
+ ulshift(mrb, &y, yy, ns);
+ size_t xd = digits(&x);
+ mpz_realloc(mrb, &q, xd);
+ mp_dbl_limb z = y.pyd-1;
+ if (xd>=yd) {
+ for (size_t j=xd-yd;; j--) {
+ mp_dbl_limb_signed b=0;
+ mp_dbl_limb qhat;
+
+ if (j+yd == xd)
+ qhat = x.pj+yd-1 / z;
+ else
+ qhat = (((mp_dbl_limb)x.pj+yd << DIG_SIZE) + x.pj+yd-1) / z;
+ if (qhat) {
+ for (i=0; i<yd; i++) {
+ mp_dbl_limb zz = qhat * y.pi;
+ mp_dbl_limb_signed u = LOW(b)+x.pi+j-LOW(zz);
+ x.pi+j = LOW(u);
+ b = HIGH(b) - HIGH(zz) + HIGH(u);
+ }
+ b += x.pi+j;
+ }
+ for (; b!=0; qhat--) {
+ mp_dbl_limb c = 0;
+ for (i=0; i<yd; i++) {
+ c += (mp_dbl_limb)x.pi+j + (mp_dbl_limb)y.pi;
+ x.pi+j = LOW(c);
+ c = HIGH(c);
+ }
+ b += c;
+ }
+ q.pj = (mp_limb)qhat;
+ if (j == 0) break;
+ }
+ }
+ x.sz = yy->sz;
+ urshift(mrb, rr, &x, ns);
+ trim(&q);
+ mpz_move(mrb, qq, &q);
+ mpz_clear(mrb, &x);
+ mpz_clear(mrb, &y);
+}
+
+static void
+mpz_mdiv(mrb_state *mrb, mpz_t *q, mpz_t *x, mpz_t *y)
+{
+ mpz_t r;
+ short sn1 = x->sn, sn2 = y->sn, qsign;
+
+ if (uzero(x)) {
+ mpz_init_set_int(mrb, q, 0);
+ return;
+ }
+ mpz_init(mrb, &r);
+ udiv(mrb, q, &r, x, y);
+ qsign = q->sn = sn1*sn2;
+ if (uzero(q))
+ q->sn = 0;
+ /* now if r != 0 and q < 0 we need to round q towards -inf */
+ if (!uzero(&r) && qsign < 0)
+ mpz_sub_int(mrb, q, q, 1);
+ mpz_clear(mrb, &r);
+}
+
+static void
+mpz_mmod(mrb_state *mrb, mpz_t *r, mpz_t *x, mpz_t *y)
+{
+ mpz_t q;
+ short sn1 = x->sn, sn2 = y->sn, sn3;
+
+ mpz_init(mrb, &q);
+ if (sn1 == 0) {
+ zero(r);
+ return;
+ }
+ udiv(mrb, &q, r, x, y);
+ mpz_clear(mrb, &q);
+ if (uzero(r)) {
+ r->sn = 0;
+ return;
+ }
+ sn3 = sn1*sn2;
+ if (sn3 > 0)
+ r->sn = sn1;
+ else if (sn1 < 0 && sn2 > 0) {
+ r->sn = 1;
+ mpz_sub(mrb, r, y, r);
+ }
+ else {
+ r->sn = 1;
+ mpz_add(mrb, r, y, r);
+ }
+}
+
+static void
+mpz_mdivmod(mrb_state *mrb, mpz_t *q, mpz_t *r, mpz_t *x, mpz_t *y)
+{
+ short sn1 = x->sn, sn2 = y->sn, qsign;
+
+ if (sn1 == 0) {
+ zero(q);
+ zero(r);
+ return;
+ }
+ udiv(mrb, q, r, x, y);
+ qsign = q->sn = sn1*sn2;
+ if (uzero(r)) {
+ /* q != 0, since q=r=0 would mean x=0, which was tested above */
+ r->sn = 0;
+ return;
+ }
+ if (q->sn > 0)
+ r->sn = sn1;
+ else if (sn1 < 0 && sn2 > 0) {
+ r->sn = 1;
+ mpz_sub(mrb, r, y, r);
+ }
+ else {
+ r->sn = 1;
+ mpz_add(mrb, r, y, r);
+ }
+ if (uzero(q))
+ q->sn = 0;
+ /* now if r != 0 and q < 0 we need to round q towards -inf */
+ if (!uzero(r) && qsign < 0)
+ mpz_sub_int(mrb, q, q, 1);
+}
+
+static void
+mpz_mod(mrb_state *mrb, mpz_t *r, mpz_t *x, mpz_t *y)
+{
+ mpz_t q;
+ short sn = x->sn;
+ mpz_init(mrb, &q);
+ if (x->sn == 0) {
+ zero(r);
+ return;
+ }
+ udiv(mrb, &q, r, x, y);
+ r->sn = sn;
+ if (uzero(r))
+ r->sn = 0;
+ mpz_clear(mrb, &q);
+}
+
+static mrb_int
+mpz_cmp(mrb_state *mrb, mpz_t *x, mpz_t *y)
+{
+ int abscmp;
+ if (x->sn < 0 && y->sn > 0)
+ return (-1);
+ if (x->sn > 0 && y->sn < 0)
+ return 1;
+ abscmp=ucmp(x, y);
+ if (x->sn >=0 && y->sn >=0)
+ return abscmp;
+ return (-abscmp); // if (x->sn <=0 && y->sn <=0)
+}
+
+/* 2<=base<=36 - this overestimates the optimal value, which is OK */
+static size_t
+mpz_sizeinbase(mpz_t *x, mrb_int base)
+{
+ size_t i, j;
+
+ size_t bits = digits(x) * DIG_SIZE;
+ mrb_assert(2 <= base && base <= 36);
+
+ if (x->sz == 0) return 0;
+ for (j=0,i=1; i<=(size_t)base; i*=2,j++)
+ ;
+ return bits/(j-1)+1;
+}
+
+static int
+mpz_init_set_str(mrb_state *mrb, mpz_t *x, const char *s, mrb_int len, mrb_int base)
+{
+ int retval = 0;
+ mpz_t t, m, bb;
+ short sn;
+ uint8_t k;
+ mpz_init(mrb, x);
+ mpz_init_set_int(mrb, &m, 1);
+ mpz_init(mrb, &t);
+ zero(x);
+ if (*s == '-') {
+ sn = -1; s++;
+ }
+ else
+ sn = 1;
+ mpz_init_set_int(mrb, &bb, base);
+ for (mrb_int i = len-1; i>=0; i--) {
+ if (si=='_') continue;
+ if (si >= '0' && si <= '9')
+ k = (uint8_t)si - (uint8_t)'0';
+ else if (si >= 'A' && si <= 'Z')
+ k = (uint8_t)si - (uint8_t)'A'+10;
+ else if (si >= 'a' && si <= 'z')
+ k = (uint8_t)si - (uint8_t)'a'+10;
+ else {
+ retval = (-1);
+ break;
+ }
+ if (k >= base) {
+ retval = (-1);
+ break;
+ }
+ mpz_mul_int(mrb, &t, &m, (mrb_int)k);
+ mpz_add(mrb, x, x, &t);
+ mpz_mul(mrb, &m, &m, &bb);
+ }
+ x->sn = sn;
+ mpz_clear(mrb, &m);
+ mpz_clear(mrb, &bb);
+ mpz_clear(mrb, &t);
+ return retval;
+}
+
+static char*
+mpz_get_str(mrb_state *mrb, char *s, mrb_int sz, mrb_int base, mpz_t *x)
+{
+ mrb_assert(2 <= base && base <= 36);
+ if (uzero(x)) {
+ *s='0';
+ *(s+1)='\0';
+ return s;
+ }
+
+ char *ps = s;
+ char *se = s+sz;
+ int xlen = (int)digits(x);
+ mp_limb *t = (mp_limb*)mrb_malloc(mrb, xlen*sizeof(mp_limb));
+ mp_limb *tend = t + xlen;
+ memcpy(t, x->p, xlen*sizeof(mp_limb));
+ mp_limb b2 = (mp_limb)base;
+ const int blim = (sizeof(mp_limb)<4)?(base<=10?4:3):(base<=10?9:5);
+ for (int i=1; i<blim; i++) {
+ b2 *= (mp_limb)base;
+ }
+
+ for (;;) {
+ mp_limb *d = tend;
+ mp_dbl_limb a = 0;
+ while (--d >= t) {
+ mp_limb d0 = *d;
+ a = (a<<DIG_SIZE) | d0;
+ *d = (mp_limb)(a / b2);
+ a %= b2;
+ }
+
+ // convert to character
+ for (int i=0; i<blim; i++) {
+ mp_limb a0 = (mp_limb)(a % base);
+ if (a0 < 10) a0 += '0';
+ else a0 += 'a' - 10;
+ if (s == se) break;
+ *s++ = (char)a0;
+ a /= base;
+ }
+
+ // check if number is zero
+ for (d = t; d < tend; d++) {
+ if (*d != 0) break;
+ }
+ if (d == tend) goto done;
+ }
+
+ done:
+ while (ps<s && s-1=='0') s--;
+ mrb_free(mrb, t);
+ if (x->sn < 0) {
+ *s++ = '-';
+ }
+
+ /* reverse string */
+ for (char *u = ps,*v=s-1; u < v; u++,v--) {
+ char temp = *u;
+ *u = *v;
+ *v = temp;
+ }
+ *s = '\0'; /* null termination */
+ return ps;
+}
+
+static int
+mpz_get_int(mpz_t *y, mrb_int *v)
+{
+ if (uzero(y)) {
+ *v = 0;
+ return TRUE;
+ }
+
+ mp_dbl_limb i = 0;
+ mp_limb *d = y->p + y->sz;
+
+ while (d-- > y->p) {
+ if (HIGH(i) != 0) {
+ /* will overflow */
+ return FALSE;
+ }
+ i = (i << DIG_SIZE) | *d;
+ }
+ if (i > MRB_INT_MAX) {
+ /* overflow */
+ return FALSE;
+ }
+ if (y->sn < 0) {
+ *v = -(mrb_int)i;
+ }
+ else {
+ *v = (mrb_int)i;
+ }
+ return TRUE;
+}
+
+static void
+mpz_mul_2exp(mrb_state *mrb, mpz_t *z, mpz_t *x, mrb_int e)
+{
+ if (e==0)
+ mpz_set(mrb, z, x);
+ else {
+ short sn = x->sn;
+ size_t digs = e / DIG_SIZE;
+ size_t bs = e % DIG_SIZE;
+ mpz_t y;
+
+ mpz_init(mrb, &y);
+ mpz_realloc(mrb, &y, x->sz+digs);
+ for (size_t i=0;i<x->sz;i++)
+ y.pi+digs = x->pi;
+ if (bs) {
+ ulshift(mrb, z, &y, bs);
+ mpz_clear(mrb, &y);
+ }
+ else {
+ mpz_move(mrb, z, &y);
+ }
+ z->sn = sn;
+ }
+}
+
+static void
+mpz_div_2exp(mrb_state *mrb, mpz_t *z, mpz_t *x, mrb_int e)
+{
+ short sn = x->sn;
+ if (e==0)
+ mpz_set(mrb, z, x);
+ else {
+ size_t digs = e / DIG_SIZE;
+ size_t bs = e % DIG_SIZE;
+ mpz_t y;
+
+ mpz_init(mrb, &y);
+ mpz_realloc(mrb, &y, x->sz-digs);
+ for (size_t i=0; i < x->sz-digs; i++)
+ y.pi = x->pi+digs;
+ if (bs) {
+ urshift(mrb, z, &y, bs);
+ mpz_clear(mrb, &y);
+ }
+ else {
+ mpz_move(mrb, z, &y);
+ }
+ if (uzero(z))
+ z->sn = 0;
+ else {
+ z->sn = sn;
+ }
+ }
+}
+
+static void
+mpz_neg(mrb_state *mrb, mpz_t *x, mpz_t *y)
+{
+ if (x!=y)
+ mpz_set(mrb, x, y);
+ x->sn = -(y->sn);
+}
+
+static void
+mpz_and(mrb_state *mrb, mpz_t *z, mpz_t *x, mpz_t *y) /* not the most efficient way to do this */
+{
+ size_t sz = imin(x->sz, y->sz);
+
+ mpz_realloc(mrb, z, sz);
+ for (size_t i=0; i < sz; i++)
+ z->pi = x->pi & y->pi;
+ if (x->sn < 0 && y->sn < 0)
+ z->sn = (-1);
+ else
+ z->sn = 1;
+ if (uzero(z))
+ z->sn = 0;
+}
+
+static void
+mpz_or(mrb_state *mrb, mpz_t *z, mpz_t *x, mpz_t *y) /* not the most efficient way to do this */
+{
+ size_t i;
+ size_t sz = imax(x->sz, y->sz);
+
+ mpz_realloc(mrb, z, sz);
+ for (i=0; i < sz; i++)
+ z->pi = dg(x,i) | dg(y,i);
+ if (x->sn < 0 || y->sn < 0)
+ z->sn = (-1);
+ else
+ z->sn = 1;
+ if (uzero(z))
+ z->sn = 0;
+}
+
+static void
+mpz_xor(mrb_state *mrb, mpz_t *z, mpz_t *x, mpz_t *y) /* not the most efficient way to do this */
+{
+ size_t i;
+
+ size_t sz = imax(x->sz, y->sz);
+ mpz_realloc(mrb, z, sz);
+ for (i=0; i < sz; i++)
+ z->pi = dg(x,i) ^ dg(y,i);
+ if ((x->sn <= 0 && y->sn > 0) || (x->sn > 0 && y->sn <=0))
+ z->sn = (-1);
+ else
+ z->sn = 1;
+ if (uzero(z))
+ z->sn = 0;
+}
+
+static void
+mpz_pow(mrb_state *mrb, mpz_t *zz, mpz_t *x, mrb_int e)
+{
+ mpz_t t;
+ mrb_uint mask = 1ULL<<(sizeof(mrb_int)*8-1);
+
+ if (e==0) {
+ mpz_set_int(mrb, zz, 1L);
+ return;
+ }
+
+ mpz_init(mrb, &t);
+ mpz_set(mrb, &t, x);
+ for (;!(mask &e); mask>>=1)
+ ;
+ mask>>=1;
+ for (;mask!=0; mask>>=1) {
+ mpz_mul(mrb, &t, &t, &t);
+ if (e & mask)
+ mpz_mul(mrb, &t, &t, x);
+ }
+ mpz_move(mrb, zz, &t);
+}
+
+static void
+mpz_powm(mrb_state *mrb, mpz_t *zz, mpz_t *x, mrb_int ex, mpz_t *n)
+{
+ mpz_t t, b;
+
+ if (ex == 0) {
+ mpz_set_int(mrb, zz, 1);
+ return;
+ }
+
+ if (ex < 0) {
+ return;
+ }
+
+ mpz_init_set_int(mrb, &t, 1);
+ mpz_init_set(mrb, &b, x);
+
+ while (ex > 0) {
+ if ((ex & 1) == 1) {
+ mpz_mul(mrb, &t, &t, &b);
+ mpz_mod(mrb, &t, &t, n);
+ }
+ ex >>= 1;
+ mpz_mul(mrb, &b, &b, &b);
+ mpz_mod(mrb, &b, &b, n);
+ }
+ mpz_move(mrb, zz, &t);
+ mpz_clear(mrb, &b);
+}
+
+/* --- mruby functions --- */
+static struct RBigint*
+bint_new(mrb_state *mrb)
+{
+ struct RBigint *b = MRB_OBJ_ALLOC(mrb, MRB_TT_BIGINT, mrb->integer_class);
+ mpz_init(mrb, &b->mp);
+ return b;
+}
+
+static struct RBigint*
+bint_new_int(mrb_state *mrb, mrb_int x)
+{
+ struct RBigint *b = MRB_OBJ_ALLOC(mrb, MRB_TT_BIGINT, mrb->integer_class);
+ mpz_init_set_int(mrb, &b->mp, x);
+ return b;
+}
+
+mrb_value
+mrb_bint_new(mrb_state *mrb)
+{
+ struct RBigint *b = bint_new(mrb);
+ return mrb_obj_value(b);
+}
+
+mrb_value
+mrb_bint_new_int(mrb_state *mrb, mrb_int x)
+{
+ struct RBigint *b = bint_new_int(mrb, x);
+ return mrb_obj_value(b);
+}
+
+mrb_value
+mrb_bint_new_str(mrb_state *mrb, const char *x, mrb_int len, mrb_int base)
+{
+ struct RBigint *b = MRB_OBJ_ALLOC(mrb, MRB_TT_BIGINT, mrb->integer_class);
+ int sn = 1;
+ if (base < 0) {
+ base = -base;
+ sn = -1;
+ }
+ mrb_assert(2 <= base && base <= 36);
+ mpz_init_set_str(mrb, &b->mp, x, len, base);
+ if (sn < 0) {
+ b->mp.sn = sn;
+ }
+ return mrb_obj_value(b);
+}
+
+static mrb_value
+bint_norm(mrb_state *mrb, struct RBigint *b)
+{
+ mrb_int i;
+
+ if (mpz_get_int(&b->mp, &i)) {
+ return mrb_int_value(mrb, i);
+ }
+ return mrb_obj_value(b);
+}
+
+void
+mrb_gc_free_bint(mrb_state *mrb, struct RBasic *x)
+{
+ struct RBigint *b = (struct RBigint*)x;
+ mpz_clear(mrb, &b->mp);
+}
+
+#ifndef MRB_NO_FLOAT
+mrb_value
+mrb_bint_new_float(mrb_state *mrb, mrb_float x)
+{
+ /* x should not be NaN nor Infinity */
+ mrb_assert(x == x && x != x * 0.5);
+
+ int sn;
+ if (x < 0.0) {
+ x = -x;
+ sn = -1;
+ }
+ else {
+ sn = 1;
+ }
+ if (x < 1.0) {
+ return mrb_fixnum_value(0);
+ }
+
+ struct RBigint *bint = bint_new(mrb);
+ mpz_t *r = &bint->mp;
+ r->sn = sn;
+
+ mrb_float b = (double)DIG_BASE;
+ mrb_float bi = 1.0 / b;
+ size_t rn;
+ mp_limb *rp;
+ mp_limb f;
+
+ for (rn = 1; x >= b; rn++)
+ x *= bi;
+
+ mpz_realloc(mrb, r, rn);
+ rp = r->p;
+ for (size_t i=rn-1;;i--) {
+ f = LOW((mp_limb)x);
+ x -= f;
+ mrb_assert(x < 1.0);
+ rpi = f;
+ if (i == 0) break;
+ }
+ return bint_norm(mrb, bint);
+}
+
+mrb_float
+mrb_bint_as_float(mrb_state *mrb, mrb_value self)
+{
+ struct RBigint *b = RBIGINT(self);
+ mpz_t *i = &b->mp;
+ mp_limb *d = i->p + i->sz;
+ mrb_float val = 0;
+
+ while (d-- > i->p) {
+ val = val * DIG_BASE + *d;
+ }
+
+ if (i->sn < 0) {
+ val = -val;
+ }
+ return val;
+}
+#endif
+
+mrb_value
+mrb_as_bint(mrb_state *mrb, mrb_value x)
+{
+ if (mrb_bigint_p(x)) return x;
+ return mrb_bint_new_int(mrb, mrb_as_int(mrb, x));
+}
+
+mrb_int
+mrb_bint_as_int(mrb_state *mrb, mrb_value x)
+{
+ struct RBigint *b = RBIGINT(x);
+ mrb_int i;
+
+ if (!mpz_get_int(&b->mp, &i)) {
+ mrb_raise(mrb, E_RANGE_ERROR, "integer out of range");
+ }
+ return i;
+}
+
+mrb_value
+mrb_bint_add(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mrb_float v1 = mrb_bint_as_float(mrb, x);
+ mrb_float v2 = mrb_float(y);
+ return mrb_float_value(mrb,v1+v2);
+ }
+#endif
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ struct RBigint *b3 = bint_new(mrb);
+ mpz_add(mrb, &b3->mp, &b->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_sub(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mrb_float v1 = mrb_bint_as_float(mrb, x);
+ mrb_float v2 = mrb_float(y);
+ return mrb_float_value(mrb,v1-v2);
+ }
+#endif
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ struct RBigint *b3 = bint_new(mrb);
+ mpz_sub(mrb, &b3->mp, &b->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_mul(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mrb_float v1 = mrb_bint_as_float(mrb, x);
+ mrb_float v2 = mrb_float(y);
+ return mrb_float_value(mrb,v1*v2);
+ }
+#endif
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ struct RBigint *b3 = bint_new(mrb);
+ mpz_mul(mrb, &b3->mp, &b->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_div(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mrb_float v1 = mrb_bint_as_float(mrb, x);
+ mrb_float v2 = mrb_float(y);
+ return mrb_float_value(mrb,v1*v2);
+ }
+#endif
+ if (mrb_integer_p(y) && mrb_integer(y) == 0) {
+ mrb_int_zerodiv(mrb);
+ }
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ struct RBigint *b3 = bint_new(mrb);
+ if (b2->mp.sn == 0 || uzero(&b2->mp)) {
+ mrb_int_zerodiv(mrb);
+ }
+ mpz_mdiv(mrb, &b3->mp, &b->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_add_ii(mrb_state *mrb, mrb_int x, mrb_int y)
+{
+ struct RBigint *b = bint_new(mrb);
+ mpz_t z1, z2;
+
+ mpz_init_set_int(mrb, &z1, x);
+ mpz_init_set_int(mrb, &z2, y);
+ mpz_add(mrb, &b->mp, &z1, &z2);
+ mpz_clear(mrb, &z1);
+ mpz_clear(mrb, &z2);
+ return bint_norm(mrb, b);
+}
+
+mrb_value
+mrb_bint_sub_ii(mrb_state *mrb, mrb_int x, mrb_int y)
+{
+ struct RBigint *b = bint_new(mrb);
+ mpz_t z1, z2;
+
+ mpz_init_set_int(mrb, &z1, x);
+ mpz_init_set_int(mrb, &z2, y);
+ mpz_sub(mrb, &b->mp, &z1, &z2);
+ mpz_clear(mrb, &z1);
+ mpz_clear(mrb, &z2);
+ return bint_norm(mrb, b);
+}
+
+mrb_value
+mrb_bint_mul_ii(mrb_state *mrb, mrb_int x, mrb_int y)
+{
+ struct RBigint *b = bint_new(mrb);
+ mpz_t z1, z2;
+
+ mpz_init_set_int(mrb, &z1, x);
+ mpz_init_set_int(mrb, &z2, y);
+ mpz_mul(mrb, &b->mp, &z1, &z2);
+ mpz_clear(mrb, &z1);
+ mpz_clear(mrb, &z2);
+ return bint_norm(mrb, b);
+}
+
+mrb_value
+mrb_bint_div_ii(mrb_state *mrb, mrb_int x, mrb_int y)
+{
+ struct RBigint *b = bint_new(mrb);
+ mpz_t z1, z2;
+
+ mpz_init_set_int(mrb, &z1, x);
+ mpz_init_set_int(mrb, &z2, y);
+ mpz_mdiv(mrb, &b->mp, &z1, &z2);
+ mpz_clear(mrb, &z1);
+ mpz_clear(mrb, &z2);
+ return bint_norm(mrb, b);
+}
+
+mrb_value
+mrb_bint_mod(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mrb_float v1 = mrb_bint_as_float(mrb, x);
+ mrb_float v2 = mrb_float(y);
+ return mrb_float_value(mrb, fmod(v1, v2));
+ }
+#endif
+ if (mrb_integer_p(y) && mrb_integer(y) == 0) {
+ mrb_int_zerodiv(mrb);
+ }
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ struct RBigint *b3 = bint_new(mrb);
+ if (b2->mp.sn == 0 || uzero(&b2->mp)) {
+ mrb_int_zerodiv(mrb);
+ }
+ mpz_mmod(mrb, &b3->mp, &b->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_rem(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ /* called from mrbgems/mruby-numeric-ext/src/numeric_ext.c */
+ /* y should not be float */
+ if (mrb_integer_p(y) && mrb_integer(y) == 0) {
+ mrb_int_zerodiv(mrb);
+ }
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ struct RBigint *b3 = bint_new(mrb);
+ if (b2->mp.sn == 0 || uzero(&b2->mp)) {
+ mrb_int_zerodiv(mrb);
+ }
+ mpz_mod(mrb, &b3->mp, &b->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_divmod(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ /* called from src/numeric.c */
+ /* y should not be float */
+ if (mrb_integer_p(y) && mrb_integer(y) == 0) {
+ mrb_int_zerodiv(mrb);
+ }
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ struct RBigint *b3 = bint_new(mrb);
+ struct RBigint *b4 = bint_new(mrb);
+ if (b2->mp.sn == 0 || uzero(&b2->mp)) {
+ mrb_int_zerodiv(mrb);
+ }
+ mpz_mdivmod(mrb, &b3->mp, &b4->mp, &b->mp, &b2->mp);
+ x = bint_norm(mrb, b3);
+ y = bint_norm(mrb, b4);
+ return mrb_assoc_new(mrb, x, y);
+}
+
+mrb_int
+mrb_bint_cmp(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mrb_float v1 = mrb_bint_as_float(mrb, x);
+ mrb_float v2 = mrb_float(y);
+ if (v1 == v2) return 0;
+ if (v1 > v2) return 1;
+ return -1;
+ }
+#endif
+ struct RBigint *b = RBIGINT(x);
+ if (!mrb_bigint_p(y)) {
+ if (!mrb_integer_p(y)) return -2; /* type mismatch */
+
+ mrb_int i1, i2 = mrb_integer(y);
+ if (mpz_get_int(&b->mp, &i1)) {
+ if (i1 == i2) return 0;
+ if (i1 > i2) return 1;
+ return -1;
+ }
+ if (b->mp.sn > 0) return 1;
+ return -1;
+ }
+ struct RBigint *b2 = RBIGINT(y);
+ return mpz_cmp(mrb, &b->mp, &b2->mp);
+}
+
+mrb_value
+mrb_bint_pow(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct RBigint *b = RBIGINT(x);
+ switch (mrb_type(y)) {
+ case MRB_TT_INTEGER:
+ {
+ struct RBigint *b3 = bint_new(mrb);
+ mpz_pow(mrb, &b3->mp, &b->mp, mrb_integer(y));
+ return mrb_obj_value(b3);
+ }
+ case MRB_TT_BIGINT:
+ mrb_raise(mrb, E_TYPE_ERROR, "too big power");
+ default:
+ mrb_raisef(mrb, E_TYPE_ERROR, "%v cannot be convert to integer", y);
+ }
+ return mrb_nil_value();
+}
+
+mrb_value
+mrb_bint_powm(mrb_state *mrb, mrb_value x, mrb_int exp, mrb_value mod)
+{
+ struct RBigint *b = RBIGINT(x);
+ switch (mrb_type(mod)) {
+ case MRB_TT_INTEGER:
+ {
+ mrb_int m = mrb_integer(mod);
+ if (m == 0) mrb_int_zerodiv(mrb);
+ struct RBigint *b2 = bint_new_int(mrb, m);
+ struct RBigint *b3 = bint_new(mrb);
+ mpz_powm(mrb, &b3->mp, &b->mp, exp, &b2->mp);
+ return bint_norm(mrb, b3);
+ }
+ case MRB_TT_BIGINT:
+ {
+ struct RBigint *b2 = RBIGINT(mod);
+ struct RBigint *b3 = bint_new(mrb);
+ if (uzero(&b2->mp)) mrb_int_zerodiv(mrb);
+ mpz_powm(mrb, &b3->mp, &b->mp, exp, &b2->mp);
+ return bint_norm(mrb, b3);
+ }
+ mrb_raise(mrb, E_TYPE_ERROR, "too big power");
+ default:
+ mrb_raisef(mrb, E_TYPE_ERROR, "%v cannot be convert to integer", mod);
+ }
+ return mrb_nil_value();
+}
+
+mrb_value
+mrb_bint_to_s(mrb_state *mrb, mrb_value x, mrb_int base)
+{
+ struct RBigint *b = RBIGINT(x);
+
+ if (b->mp.sz == 0) return mrb_str_new_lit(mrb, "0");
+
+ size_t len = mpz_sizeinbase(&b->mp, (int)base);
+ if (MRB_INT_MAX-2 < len) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "too long string from Integer");
+ }
+ mrb_value str = mrb_str_new(mrb, NULL, len+2);
+ mpz_get_str(mrb, RSTRING_PTR(str), len, base, &b->mp);
+ RSTR_SET_LEN(RSTRING(str), strlen(RSTRING_PTR(str)));
+ return str;
+}
+
+mrb_value
+mrb_bint_and(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct RBigint *b1 = RBIGINT(x);
+ struct RBigint *b3 = bint_new(mrb);
+
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mpz_t z;
+ mpz_init_set_int(mrb, &z, (mrb_int)mrb_float(y));
+ mpz_and(mrb, &b3->mp, &b1->mp, &z);
+ mpz_clear(mrb, &z);
+ return bint_norm(mrb, b3);
+ }
+#endif
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b2 = RBIGINT(y);
+ mpz_and(mrb, &b3->mp, &b1->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_or(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct RBigint *b1 = RBIGINT(x);
+ struct RBigint *b3 = bint_new(mrb);
+
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mpz_t z;
+ mpz_init_set_int(mrb, &z, (mrb_int)mrb_float(y));
+ mpz_or(mrb, &b3->mp, &b1->mp, &z);
+ mpz_clear(mrb, &z);
+ return bint_norm(mrb, b3);
+ }
+#endif
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b2 = RBIGINT(y);
+ mpz_or(mrb, &b3->mp, &b1->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_xor(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct RBigint *b3 = bint_new(mrb);
+ struct RBigint *b1 = RBIGINT(x);
+
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mpz_t z;
+ mpz_init_set_int(mrb, &z, (mrb_int)mrb_float(y));
+ mpz_xor(mrb, &b3->mp, &b1->mp, &z);
+ mpz_clear(mrb, &z);
+ return bint_norm(mrb, b3);
+ }
+#endif
+ y = mrb_as_bint(mrb, y);
+ struct RBigint *b2 = RBIGINT(y);
+ mpz_xor(mrb, &b3->mp, &b1->mp, &b2->mp);
+ return bint_norm(mrb, b3);
+}
+
+mrb_value
+mrb_bint_rev(mrb_state *mrb, mrb_value x)
+{
+ struct RBigint *b1 = RBIGINT(x);
+ struct RBigint *b2 = bint_new(mrb);
+
+ mpz_neg(mrb, &b2->mp, &b1->mp);
+ mpz_sub_int(mrb, &b2->mp, &b2->mp, 1);
+ return bint_norm(mrb, b2);
+}
+
+mrb_value
+mrb_bint_lshift(mrb_state *mrb, mrb_value x, mrb_int width)
+{
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = bint_new(mrb);
+ if (width < 0) {
+ mpz_div_2exp(mrb, &b2->mp, &b->mp, -width);
+ }
+ else {
+ mpz_mul_2exp(mrb, &b2->mp, &b->mp, width);
+ }
+ return bint_norm(mrb, b2);
+}
+
+mrb_value
+mrb_bint_rshift(mrb_state *mrb, mrb_value x, mrb_int width)
+{
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = bint_new(mrb);
+ if (width < 0) {
+ mpz_mul_2exp(mrb, &b2->mp, &b->mp, -width);
+ }
+ else {
+ mpz_div_2exp(mrb, &b2->mp, &b->mp, width);
+ }
+ return bint_norm(mrb, b2);
+}
+
+void
+mrb_bint_copy(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct RBigint *b = RBIGINT(x);
+ struct RBigint *b2 = RBIGINT(y);
+ mpz_init_set(mrb, &b->mp, &b2->mp);
+}
+
+size_t
+mrb_bint_memsize(mrb_value x)
+{
+ struct RBigint *b = RBIGINT(x);
+ return b->mp.sz * sizeof(mp_limb);
+}
+
+mrb_value
+mrb_bint_hash(mrb_state *mrb, mrb_value x)
+{
+ struct RBigint *b = RBIGINT(x);
+ uint32_t hash = mrb_byte_hash((uint8_t*)b->mp.p, b->mp.sz);
+ hash = mrb_byte_hash_step((uint8_t*)&b->mp.sn, sizeof(b->mp.sn), hash);
+ return mrb_int_value(mrb, hash);
+}

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/core/bigint.h Added

@@ -0,0 +1,63 @@
+/**
+** @file mruby/bigint.h - Multi-precision Integer
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_BIGINT_H
+#define MRUBY_BIGINT_H
+/*
+ * FREE GMP - a public domain implementation of a subset of the
+ * gmp library
+ *
+ * I hearby place the file in the public domain.
+ *
+ * Do whatever you want with this code. Change it. Sell it. Claim you
+ * wrote it.
+ * Bugs, complaints, flames, rants: please send email to
+ * Mark Henderson <markh@wimsey.bc.ca>
+ * I'm already aware that fgmp is considerably slower than gmp
+ *
+ * CREDITS:
+ * Paul Rouse <par@r-cube.demon.co.uk> - generic bug fixes, mpz_sqrt and
+ * mpz_sqrtrem, and modifications to get fgmp to compile on a system
+ * with int and long of different sizes (specifically MS-DOS,286 compiler)
+ * Also see the file "notes" included with the fgmp distribution, for
+ * more credits.
+ *
+ * VERSION 1.0 - beta 5
+ */
+
+#include <sys/types.h>
+
+#if defined(MRB_INT32) && defined(_WIN32) && !defined(MRB_NO_MPZ64BIT)
+#define MRB_NO_MPZ64BIT
+#endif
+
+#ifdef MRB_NO_MPZ64BIT
+typedef uint16_t mp_limb;
+typedef uint32_t mp_dbl_limb;
+typedef int32_t mp_dbl_limb_signed;
+#define MPZ_DIG_SIZE 16
+#else
+typedef uint32_t mp_limb;
+typedef uint64_t mp_dbl_limb;
+typedef int64_t mp_dbl_limb_signed;
+#define MPZ_DIG_SIZE 32
+#endif
+
+typedef struct _mpz_t {
+ mp_limb *p;
+ short sn;
+ size_t sz;
+} mpz_t;
+
+struct RBigint {
+ MRB_OBJECT_HEADER;
+ mpz_t mp;
+};
+#define RBIGINT(v) ((struct RBigint*)mrb_ptr(v))
+
+mrb_static_assert_object_size(struct RBigint);
+
+#endif /* MRUBY_BIGINT_H */

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/mrbgem.rake Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/test Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bigint/test/bigint.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c Changed

@@ -18,7 +18,9 @@
 #include <mruby/dump.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/error.h>
 #include <mruby/presym.h>
+#include <mruby/internal.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -148,7 +150,7 @@
 
 /* check if parser error are available */
 if (0 < parser->nerr) {
- const char unexpected_end = "syntax error, unexpected $end";
+ const char unexpected_end = "syntax error, unexpected end of file";
 const char *message = parser->error_buffer0.message;
 
 /* a parser error occur, we have to check if */
@@ -379,8 +381,6 @@
 }
 #endif
 
-void mrb_codedump_all(mrb_state*, struct RProc*);
-
 static int
 check_keyword(const char *buf, const char *word)
 {
@@ -519,7 +519,7 @@
 fclose(lfp);
 e = mrb_vm_ci_env(mrb->c->cibase);
 mrb_vm_ci_env_set(mrb->c->cibase, NULL);
- mrb_env_unshare(mrb, e);
+ mrb_env_unshare(mrb, e, FALSE);
 mrbc_cleanup_local_variables(mrb, cxt);
 }
 
@@ -674,6 +674,7 @@
 stack_keep = proc->body.irep->nlocals;
 /* did an exception occur? */
 if (mrb->exc) {
+ MRB_EXC_CHECK_EXIT(mrb, mrb->exc);
 p(mrb, mrb_obj_value(mrb->exc), 0);
 mrb->exc = 0;
 }
@@ -704,7 +705,7 @@
 if (args.rfp) fclose(args.rfp);
 mrb_free(mrb, args.argv);
 if (args.libv) {
- for (i = 0; i < args.libc; ++i) {
+ for (i = 0; i < args.libc; i++) {
 mrb_free(mrb, args.libvi);
 }
 mrb_free(mrb, args.libv);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c Changed

@@ -9,6 +9,7 @@
 #include <mruby/compile.h>
 #include <mruby/dump.h>
 #include <mruby/proc.h>
+#include <mruby/internal.h>
 
 #define RITEBIN_EXT ".mrb"
 #define C_EXT ".c"
@@ -25,7 +26,8 @@
 mrb_bool verbose : 1;
 mrb_bool remove_lv : 1;
 mrb_bool no_ext_ops : 1;
- uint8_t flags : 4;
+ mrb_bool no_optimize : 1;
+ uint8_t flags : 2;
 };
 
 static void
@@ -42,6 +44,7 @@
 "-s define <symbol> as static variable",
 "--remove-lv remove local variables",
 "--no-ext-ops prohibit using OP_EXTs",
+ "--no-optimize disable peephole optimization",
 "--verbose run at verbose mode",
 "--version print the version",
 "--copyright print the copyright",
@@ -169,6 +172,10 @@
 args->no_ext_ops = TRUE;
 break;
 }
+ else if (strcmp(argvi + 2, "no-optimize") == 0) {
+ args->no_optimize = TRUE;
+ break;
+ }
 return -1;
 default:
 return i;
@@ -224,6 +231,7 @@
 c->dump_result = TRUE;
 c->no_exec = TRUE;
 c->no_ext_ops = args->no_ext_ops;
+ c->no_optimize = args->no_optimize;
 if (input0 == '-' && input1 == '\0') {
 infile = stdin;
 }
@@ -338,7 +346,7 @@
 }
 }
 else {
- fprintf(stderr, "Output file is required\n");
+ fputs("Output file is required\n", stderr);
 return EXIT_FAILURE;
 }
 result = dump_file(mrb, wfp, args.outfile, mrb_proc_ptr(load), &args);
@@ -366,31 +374,3 @@
 {
 }
 #endif
-
-#ifdef MRB_USE_COMPLEX
-mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value comp)
-{
- /* dummy method */
- return mrb_nil_value();
-}
-mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp)
-{
- /* dummy method */
- return mrb_nil_value();
-}
-#endif
-
-#ifdef MRB_USE_RATIONAL
-mrb_value
-mrb_rational_to_i(mrb_state *mrb, mrb_value rat)
-{
- /* dummy method */
- return mrb_nil_value();
-}
-mrb_value
-mrb_rational_to_f(mrb_state *mrb, mrb_value rat)
-{
- /* dummy method */
- return mrb_nil_value();
-}
-#endif

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/stub.c Added

@@ -0,0 +1,74 @@
+#include <mruby.h>
+
+/*
+ functions defined in mrbgems referenced from the core should be listed here
+ to avoid link errors, since mrbc does not link any mrbgem ignoring configuration.
+*/
+
+#ifdef MRB_USE_COMPLEX
+mrb_value mrb_complex_new(mrb_state *mrb, mrb_float x, mrb_float y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_complex_add(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_complex_sub(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_complex_mul(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_complex_div(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value x)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value x)
+{
+ return mrb_nil_value();
+}
+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)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_rational_add(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_rational_sub(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_rational_mul(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_rational_div(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_rational_to_i(mrb_state *mrb, mrb_value x)
+{
+ return mrb_nil_value();
+}
+mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value x)
+{
+ return mrb_nil_value();
+}
+void mrb_rational_copy(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+}
+#endif

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c Changed

@@ -11,6 +11,8 @@
 #include <mruby/dump.h>
 #include <mruby/variable.h>
 #include <mruby/proc.h>
+#include <mruby/error.h>
+#include <mruby/presym.h>
 
 #if defined(_WIN32) || defined(_WIN64)
 # include <io.h> /* for setmode */
@@ -63,6 +65,16 @@
 printf(" %s\n", *p++);
 }
 
+static mrb_bool
+mrb_extension_p(const char *path)
+{
+ const char *e = strrchr(path, '.');
+ if (e && e1 == 'm' && e2 == 'r' && e3 == 'b' && e4 == '\0') {
+ return TRUE;
+ }
+ return FALSE;
+}
+
 static void
 options_init(struct options *opts, int argc, char **argv)
 {
@@ -92,7 +104,7 @@
 if (opts->opt1 == '-') {
 /* `--` */
 if (!opts->opt2) {
- ++opts->argv, --opts->argc;
+ opts->argv++, opts->argc--;
 return NULL;
 }
 /* long option */
@@ -102,7 +114,7 @@
 }
 else {
 /* short option */
- ++opts->opt;
+ opts->opt++;
 goto short_opt;
 }
 }
@@ -323,7 +335,7 @@
 return EXIT_FAILURE;
 }
 mrbc_filename(mrb, c, args.libvi);
- if (args.mrbfile) {
+ if (mrb_extension_p(args.libvi)) {
 v = mrb_load_irep_file_cxt(mrb, lfp, c);
 }
 else {
@@ -332,7 +344,7 @@
 fclose(lfp);
 e = mrb_vm_ci_env(mrb->c->cibase);
 mrb_vm_ci_env_set(mrb->c->cibase, NULL);
- mrb_env_unshare(mrb, e);
+ mrb_env_unshare(mrb, e, FALSE);
 mrbc_cleanup_local_variables(mrb, c);
 }
 
@@ -340,7 +352,7 @@
 mrbc_filename(mrb, c, cmdline);
 
 /* Load program */
- if (args.mrbfile) {
+ if (args.mrbfile || mrb_extension_p(cmdline)) {
 v = mrb_load_irep_file_cxt(mrb, args.rfp, c);
 }
 else if (args.rfp) {
@@ -356,6 +368,7 @@
 mrb_gc_arena_restore(mrb, ai);
 mrbc_context_free(mrb, c);
 if (mrb->exc) {
+ MRB_EXC_CHECK_EXIT(mrb, mrb->exc);
 if (!mrb_undef_p(v)) {
 mrb_print_error(mrb);
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding-core/src/binding-core.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-binding-core/src/binding-core.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding/src/binding.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-binding/src/binding.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding/test/binding.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-binding/test/binding.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-class-ext/src/class.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-class-ext/src/class.c Changed

@@ -1,7 +1,10 @@
 #include "mruby.h"
 #include "mruby/class.h"
 #include "mruby/string.h"
+#include "mruby/array.h"
 #include "mruby/proc.h"
+#include "mruby/variable.h"
+#include "mruby/presym.h"
 
 static mrb_value
 mrb_mod_name(mrb_state *mrb, mrb_value self)
@@ -56,6 +59,84 @@
 return mrb_yield_cont(mrb, blk, self, argc, argv);
 }
 
+struct subclass_args {
+ struct RClass *c;
+ mrb_value ary;
+};
+
+static int
+add_subclasses(mrb_state *mrb, struct RBasic *obj, void *data)
+{
+ struct subclass_args *args = (struct subclass_args*)data;
+ if (obj->tt == MRB_TT_CLASS) {
+ struct RClass *c = (struct RClass*)obj;
+ if (mrb_class_real(c->super) == args->c) {
+ mrb_ary_push(mrb, args->ary, mrb_obj_value(obj));
+ }
+ }
+ return MRB_EACH_OBJ_OK;
+}
+
+/*
+ * call-seq:
+ * subclasses -> array
+ *
+ * Returns an array of classes where the receiver is the
+ * direct superclass of the class, excluding singleton classes.
+ * The order of the returned array is not defined.
+ *
+ * class A; end
+ * class B < A; end
+ * class C < B; end
+ * class D < A; end
+ *
+ * A.subclasses #=> D, B
+ * B.subclasses #=> C
+ * C.subclasses #=> 
+ */
+static mrb_value
+mrb_class_subclasses(mrb_state *mrb, mrb_value self)
+{
+ struct RClass *c;
+ mrb_value ary;
+
+ c = mrb_class_ptr(self);
+ ary = mrb_ary_new(mrb);
+
+ if (c->flags & MRB_FL_CLASS_IS_INHERITED) {
+ struct subclass_args arg = {c, ary};
+ mrb_objspace_each_objects(mrb, add_subclasses, &arg);
+ }
+ return ary;
+}
+
+/*
+ * call-seq:
+ * attached_object -> object
+ *
+ * Returns the object for which the receiver is the singleton class.
+ * Raises an TypeError if the class is not a singleton class.
+ *
+ * class Foo; end
+ *
+ * Foo.singleton_class.attached_object #=> Foo
+ * Foo.attached_object #=> TypeError: not a singleton class
+ * Foo.new.singleton_class.attached_object #=> #<Foo:0x000000010491a370>
+ * TrueClass.attached_object #=> TypeError: not a singleton class
+ * NilClass.attached_object #=> TypeError: not a singleton class
+ */
+static mrb_value
+mrb_class_attached_object(mrb_state *mrb, mrb_value self)
+{
+ struct RClass *c;
+
+ c = mrb_class_ptr(self);
+ if (c->tt != MRB_TT_SCLASS) {
+ mrb_raise(mrb, E_TYPE_ERROR, "not a singleton class");
+ }
+ return mrb_obj_iv_get(mrb, (struct RObject*)c, MRB_SYM(__attached__));
+}
+
 void
 mrb_mruby_class_ext_gem_init(mrb_state *mrb)
 {
@@ -65,6 +146,10 @@
 mrb_define_method(mrb, mod, "singleton_class?", mrb_mod_singleton_class_p, MRB_ARGS_NONE());
 mrb_define_method(mrb, mod, "module_exec", mrb_mod_module_exec, MRB_ARGS_ANY()|MRB_ARGS_BLOCK());
 mrb_define_method(mrb, mod, "class_exec", mrb_mod_module_exec, MRB_ARGS_ANY()|MRB_ARGS_BLOCK());
+
+ struct RClass *cls = mrb->class_class;
+ mrb_define_method(mrb, cls, "subclasses", mrb_class_subclasses, MRB_ARGS_NONE());
+ mrb_define_method(mrb, cls, "attached_object", mrb_class_attached_object, MRB_ARGS_NONE());
 }
 
 void

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-class-ext/test/class.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-cmath/mrbgem.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-cmath/mrbgem.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-cmath/test/cmath.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-cmath/test/cmath.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-compar-ext/mrblib/compar.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-compar-ext/mrblib/compar.rb Changed

@@ -1,28 +1,80 @@
 module Comparable
 ##
- # Returns min if obj <code><=></code> min is less
- # than zero, max if obj <code><=></code> max is
- # greater than zero and obj otherwise.
+ # call-seq:
+ # obj.clamp(min, max) -> obj
+ # obj.clamp(range) -> obj
 #
- # 12.clamp(0, 100) #=> 12
- # 523.clamp(0, 100) #=> 100
- # -3.123.clamp(0, 100) #=> 0
+ # In <code>(min, max)</code> form, returns _min_ if _obj_
+ # <code><=></code> _min_ is less than zero, _max_ if _obj_
+ # <code><=></code> _max_ is greater than zero, and _obj_
+ # otherwise.
 #
- # 'd'.clamp('a', 'f') #=> 'd'
- # 'z'.clamp('a', 'f') #=> 'f'
+ # 12.clamp(0, 100) #=> 12
+ # 523.clamp(0, 100) #=> 100
+ # -3.123.clamp(0, 100) #=> 0
 #
- def clamp(min, max)
- if (min <=> max) > 0
+ # 'd'.clamp('a', 'f') #=> 'd'
+ # 'z'.clamp('a', 'f') #=> 'f'
+ #
+ # In <code>(range)</code> form, returns _range.begin_ if _obj_
+ # <code><=></code> _range.begin_ is less than zero, _range.end_
+ # if _obj_ <code><=></code> _range.end_ is greater than zero, and
+ # _obj_ otherwise.
+ #
+ # 12.clamp(0..100) #=> 12
+ # 523.clamp(0..100) #=> 100
+ # -3.123.clamp(0..100) #=> 0
+ #
+ # 'd'.clamp('a'..'f') #=> 'd'
+ # 'z'.clamp('a'..'f') #=> 'f'
+ #
+ # If _range.begin_ is +nil+, it is considered smaller than _obj_,
+ # and if _range.end_ is +nil+, it is considered greater than
+ # _obj_.
+ #
+ # -20.clamp(0..) #=> 0
+ # 523.clamp(..100) #=> 100
+ #
+ # When _range.end_ is excluded and not +nil+, an exception is
+ # raised.
+ #
+ # 100.clamp(0...100) # ArgumentError
+ #
+ def clamp(min, max=nil)
+ if max.nil?
+ if min.kind_of?(Range)
+ max = min.end
+ if max.nil?
+ max = self
+ elsif min.exclude_end?
+ raise ArgumentError, "cannot clamp with an exclusive range"
+ end
+ min = min.begin
+ if min.nil?
+ min = self
+ end
+ else
+ raise TypeError, "wrong argument type #{min.class}"
+ end
+ end
+ c = min <=> max
+ if c.nil?
+ raise ArgumentError, "comparison of #{min.class} with #{max.class} failed"
+ elsif c > 0
 raise ArgumentError, "min argument must be smaller than max argument"
 end
 c = self <=> min
- if c == 0
+ if c.nil?
+ raise ArgumentError, "comparison of #{self.class} with #{min.class} failed"
+ elsif c == 0
 return self
 elsif c < 0
 return min
 end
 c = self <=> max
- if c > 0
+ if c.nil?
+ raise ArgumentError, "comparison of #{self.class} with #{max.class} failed"
+ elsif c > 0
 return max
 else
 return self

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/codegen.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/codegen.c Changed

@@ -18,6 +18,7 @@
 #include <mruby/throw.h>
 #include <ctype.h>
 #include <string.h>
+#include <mruby/internal.h>
 
 #ifndef MRB_CODEGEN_LEVEL_MAX
 #define MRB_CODEGEN_LEVEL_MAX 256
@@ -57,7 +58,7 @@
 uint32_t pc;
 uint32_t lastpc;
 uint32_t lastlabel;
- size_t ainfo:15;
+ uint16_t ainfo:15;
 mrb_bool mscope:1;
 
 struct loopinfo *loop;
@@ -101,8 +102,8 @@
 static int catch_handler_new(codegen_scope *s);
 static void catch_handler_set(codegen_scope *s, int ent, enum mrb_catch_type type, uint32_t begin, uint32_t end, uint32_t target);
 
-static void gen_assignment(codegen_scope *s, node *tree, int sp, int val);
-static void gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val);
+static void gen_assignment(codegen_scope *s, node *tree, node *rhs, int sp, int val);
+static void gen_massignment(codegen_scope *s, node *tree, int sp, int val);
 
 static void codegen(codegen_scope *s, node *tree, int val);
 static void raise_error(codegen_scope *s, const char *msg);
@@ -194,7 +195,7 @@
 else {
 s->icapa *= 2;
 }
- s->iseq = (mrb_code *)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->icapa);
+ s->iseq = (mrb_code*)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->icapa);
 if (s->lines) {
 s->lines = (uint16_t*)codegen_realloc(s, s->lines, sizeof(uint16_t)*s->icapa);
 }
@@ -286,10 +287,10 @@
 }
 
 static void
-genop_3(codegen_scope *s, mrb_code i, uint16_t a, uint16_t b, uint8_t c)
+genop_3(codegen_scope *s, mrb_code i, uint16_t a, uint16_t b, uint16_t c)
 {
 genop_2(s, i, a, b);
- gen_B(s, c);
+ gen_B(s, (uint8_t)c);
 }
 
 static void
@@ -594,9 +595,22 @@
 
 switch (data.insn) {
 case OP_MOVE:
- if (dst == src) return; /* remove useless MOVE */
- if (data.b == dst && data.a == src) /* skip swapping MOVE */
+ if (dst == src) return; /* remove useless MOVE */
+ if (data.a == src) {
+ if (data.b == dst) /* skip swapping MOVE */
+ return;
+ if (data.a < s->nlocals) goto normal;
+ rewind_pc(s);
+ s->lastpc = addr_pc(s, mrb_prev_pc(s, data.addr));
+ gen_move(s, dst, data.b, FALSE);
+ return;
+ }
+ if (dst == data.a) { /* skip overwritten move */
+ rewind_pc(s);
+ s->lastpc = addr_pc(s, mrb_prev_pc(s, data.addr));
+ gen_move(s, dst, src, FALSE);
 return;
+ }
 goto normal;
 case OP_LOADNIL: case OP_LOADSELF: case OP_LOADT: case OP_LOADF:
 case OP_LOADI__1:
@@ -606,7 +620,7 @@
 rewind_pc(s);
 genop_1(s, data.insn, dst);
 return;
- case OP_HASH: case OP_ARRAY:
+ case OP_HASH:
 if (data.b != 0) goto normal;
 /* fall through */
 case OP_LOADI: case OP_LOADINEG:
@@ -631,6 +645,19 @@
 genop_2SS(s, data.insn, dst, i);
 }
 return;
+ case OP_ARRAY:
+ if (data.a != src || data.a < s->nlocals || data.a < dst) goto normal;
+ rewind_pc(s);
+ if (data.b == 0 || dst == data.a)
+ genop_2(s, OP_ARRAY, dst, 0);
+ else
+ genop_3(s, OP_ARRAY2, dst, data.a, data.b);
+ return;
+ case OP_ARRAY2:
+ if (data.a != src || data.a < s->nlocals || data.a < dst) goto normal;
+ rewind_pc(s);
+ genop_3(s, OP_ARRAY2, dst, data.b, data.c);
+ return;
 case OP_AREF:
 case OP_GETUPVAR:
 if (data.a != src || data.a < s->nlocals) goto normal;
@@ -831,15 +858,16 @@
 goto normal;
 }
 struct mrb_insn_data data0 = mrb_decode_insn(mrb_prev_pc(s, data.addr));
- if (!get_int_operand(s, &data0, &n0) || n == 0) {
+ if (!get_int_operand(s, &data0, &n0)) {
 goto normal;
 }
 if (op == OP_MUL) {
 if (mrb_int_mul_overflow(n0, n, &n)) goto normal;
 }
 else { /* OP_DIV */
+ if (n == 0) goto normal;
 if (n0 == MRB_INT_MIN && n == -1) goto normal;
- n = mrb_div_int(s->mrb, n0, n);
+ n = mrb_div_int(n0, n);
 }
 s->pc = addr_pc(s, data0.addr);
 gen_int(s, dst, n);
@@ -961,8 +989,19 @@
 #define pop_n(n) pop_n_(s,n)
 #define cursp() (s->sp)
 
+static mrb_pool_value*
+lit_pool_extend(codegen_scope *s)
+{
+ if (s->irep->plen == s->pcapa) {
+ s->pcapa *= 2;
+ s->pool = (mrb_pool_value*)codegen_realloc(s, s->pool, sizeof(mrb_pool_value)*s->pcapa);
+ }
+
+ return &s->pools->irep->plen++;
+}
+
 static int
-new_litbn(codegen_scope *s, const char *p, int base, mrb_bool neg)
+new_litbint(codegen_scope *s, const char *p, int base, mrb_bool neg)
 {
 int i;
 size_t plen;
@@ -981,125 +1020,115 @@
 return i;
 }
 
- if (s->irep->plen == s->pcapa) {
- s->pcapa *= 2;
- s->pool = (mrb_pool_value*)codegen_realloc(s, s->pool, sizeof(mrb_pool_value)*s->pcapa);
- }
+ pv = lit_pool_extend(s);
+
+ char *buf;
+ pv->tt = IREP_TT_BIGINT;
+ buf = (char*)codegen_realloc(s, NULL, plen+3);
+ buf0 = (char)plen;
+ if (neg) buf1 = -base;
+ else buf1 = base;
+ memcpy(buf+2, p, plen);
+ bufplen+2 = '\0';
+ pv->u.str = buf;
 
- pv = &s->pools->irep->plen;
- i = s->irep->plen++;
- {
- char *buf;
- pv->tt = IREP_TT_BIGINT;
- buf = (char*)codegen_realloc(s, NULL, plen+3);
- buf0 = (char)plen;
- buf1 = base;
- if (neg) buf1 = 0x80;
- memcpy(buf+2, p, plen);
- bufplen+2 = '\0';
- pv->u.str = buf;
- }
 return i;
 }
 
 static int
-new_lit(codegen_scope *s, mrb_value val)
+new_lit_str(codegen_scope *s, const char *str, mrb_int len)
 {
 int i;
 mrb_pool_value *pv;
 
- switch (mrb_type(val)) {
- case MRB_TT_STRING:
- for (i=0; i<s->irep->plen; i++) {
- mrb_int len;
- pv = &s->pooli;
- if (pv->tt & IREP_TT_NFLAG) continue;
- len = pv->tt>>2;
- if (RSTRING_LEN(val) != len) continue;
- if (memcmp(pv->u.str, RSTRING_PTR(val), len) == 0)
- return i;
- }
- break;
-#ifndef MRB_NO_FLOAT
- case MRB_TT_FLOAT:
- for (i=0; i<s->irep->plen; i++) {
- mrb_float f1, f2;
- pv = &s->pooli;
- if (pv->tt != IREP_TT_FLOAT) continue;
- pv = &s->pooli;
- f1 = pv->u.f;
- f2 = mrb_float(val);
- if (f1 == f2 && !signbit(f1) == !signbit(f2)) return i;
- }
- break;
-#endif
- case MRB_TT_INTEGER:
- for (i=0; i<s->irep->plen; i++) {
- mrb_int v = mrb_integer(val);
- pv = &s->pooli;
- if (pv->tt == IREP_TT_INT32) {
- if (v == pv->u.i32) return i;
- }
-#ifdef MRB_64BIT
- else if (pv->tt == IREP_TT_INT64) {
- if (v == pv->u.i64) return i;
- }
- continue;
-#endif
- }
- break;
- default:
- /* should not happen */
- return 0;
+ for (i=0; i<s->irep->plen; i++) {
+ pv = &s->pooli;
+ if (pv->tt & IREP_TT_NFLAG) continue;
+ mrb_int plen = pv->tt>>2;
+ if (len != plen) continue;
+ if (memcmp(pv->u.str, str, plen) == 0)
+ return i;
 }
 
- if (s->irep->plen == s->pcapa) {
- s->pcapa *= 2;
- s->pool = (mrb_pool_value*)codegen_realloc(s, s->pool, sizeof(mrb_pool_value)*s->pcapa);
+ pv = lit_pool_extend(s);
+
+ if (mrb_ro_data_p(str)) {
+ pv->tt = (uint32_t)(len<<2) | IREP_TT_SSTR;
+ pv->u.str = str;
+ }
+ else {
+ char *p;
+ pv->tt = (uint32_t)(len<<2) | IREP_TT_STR;
+ p = (char*)codegen_realloc(s, NULL, len+1);
+ memcpy(p, str, len);
+ plen = '\0';
+ pv->u.str = p;
 }
 
- pv = &s->pools->irep->plen;
- i = s->irep->plen++;
+ return i;
+}
 
- switch (mrb_type(val)) {
- case MRB_TT_STRING:
- if (RSTR_NOFREE_P(RSTRING(val))) {
- pv->tt = (uint32_t)(RSTRING_LEN(val)<<2) | IREP_TT_SSTR;
- pv->u.str = RSTRING_PTR(val);
+static int
+new_lit_cstr(codegen_scope *s, const char *str)
+{
+ return new_lit_str(s, str, (mrb_int)strlen(str));
+}
+
+static int
+new_lit_int(codegen_scope *s, mrb_int num)
+{
+ int i;
+ mrb_pool_value *pv;
+
+ for (i=0; i<s->irep->plen; i++) {
+ pv = &s->pooli;
+ if (pv->tt == IREP_TT_INT32) {
+ if (num == pv->u.i32) return i;
 }
- else {
- char *p;
- mrb_int len = RSTRING_LEN(val);
- pv->tt = (uint32_t)(len<<2) | IREP_TT_STR;
- p = (char*)codegen_realloc(s, NULL, len+1);
- memcpy(p, RSTRING_PTR(val), len);
- plen = '\0';
- pv->u.str = p;
+#ifdef MRB_64BIT
+ else if (pv->tt == IREP_TT_INT64) {
+ if (num == pv->u.i64) return i;
 }
- break;
-
-#ifndef MRB_NO_FLOAT
- case MRB_TT_FLOAT:
- pv->tt = IREP_TT_FLOAT;
- pv->u.f = mrb_float(val);
- break;
+ continue;
 #endif
- case MRB_TT_INTEGER:
+ }
+
+ pv = lit_pool_extend(s);
+
 #ifdef MRB_INT64
- pv->tt = IREP_TT_INT64;
- pv->u.i64 = mrb_integer(val);
+ pv->tt = IREP_TT_INT64;
+ pv->u.i64 = num;
 #else
- pv->tt = IREP_TT_INT32;
- pv->u.i32 = mrb_integer(val);
+ pv->tt = IREP_TT_INT32;
+ pv->u.i32 = num;
 #endif
- break;
 
- default:
- /* should not happen */
- break;
+ return i;
+}
+
+#ifndef MRB_NO_FLOAT
+static int
+new_lit_float(codegen_scope *s, mrb_float num)
+{
+ int i;
+ mrb_pool_value *pv;
+
+ for (i=0; i<s->irep->plen; i++) {
+ mrb_float f;
+ pv = &s->pooli;
+ if (pv->tt != IREP_TT_FLOAT) continue;
+ f = pv->u.f;
+ if (f == num && !signbit(f) == !signbit(num)) return i;
 }
+
+ pv = lit_pool_extend(s);
+
+ pv->tt = IREP_TT_FLOAT;
+ pv->u.f = num;
+
 return i;
 }
+#endif
 
 static int
 new_sym(codegen_scope *s, mrb_sym sym)
@@ -1153,7 +1182,7 @@
 else if (i <= INT32_MAX) genop_2SS(s, OP_LOADI32, dst, (uint32_t)i);
 else {
 int_lit:
- genop_2(s, OP_LOADL, dst, new_lit(s, mrb_int_value(s->mrb, i)));
+ genop_2(s, OP_LOADL, dst, new_lit_int(s, i));
 }
 }
 
@@ -1227,7 +1256,7 @@
 if (*idx > 0) {
 return lv;
 }
- lv ++;
+ lv++;
 up = up->prev;
 }
 
@@ -1249,10 +1278,21 @@
 }
 if (MRB_PROC_SCOPE_P(u)) break;
 u = u->upper;
- lv ++;
+ lv++;
 }
 
- codegen_error(s, "Can't found local variables");
+ if (id == MRB_OPSYM_2(s->mrb, and)) {
+ codegen_error(s, "No anonymous block parameter");
+ }
+ else if (id == MRB_OPSYM_2(s->mrb, mul)) {
+ codegen_error(s, "No anonymous rest parameter");
+ }
+ else if (id == MRB_OPSYM_2(s->mrb, pow)) {
+ codegen_error(s, "No anonymous keyword rest parameter");
+ }
+ else {
+ codegen_error(s, "Can't find local variables");
+ }
 return -1; /* not reached */
 }
 
@@ -1275,10 +1315,10 @@
 n2 = tree->car;
 genop_W(s, OP_ENTER, 0x40000);
 if (n2->car && !n2->car->cdr && !n2->cdr) {
- gen_assignment(s, n2->car->car, 1, NOVAL);
+ gen_assignment(s, n2->car->car, NULL, 1, NOVAL);
 }
 else {
- gen_vmassignment(s, n2, 1, VAL);
+ gen_massignment(s, n2, 1, VAL);
 }
 /* construct loop */
 lp = loop_push(s, LOOP_FOR);
@@ -1444,7 +1484,7 @@
 pos = 1;
 while (n) {
 if (nint(n->car->car) == NODE_MASGN) {
- gen_vmassignment(s, n->car->cdr->car, pos, NOVAL);
+ gen_massignment(s, n->car->cdr->car, pos, NOVAL);
 }
 pos++;
 n = n->cdr;
@@ -1456,7 +1496,7 @@
 pos = ma+oa+ra+1;
 while (n) {
 if (nint(n->car->car) == NODE_MASGN) {
- gen_vmassignment(s, n->car->cdr->car, pos, NOVAL);
+ gen_massignment(s, n->car->cdr->car, pos, NOVAL);
 }
 pos++;
 n = n->cdr;
@@ -1512,11 +1552,11 @@
 char *name2;
 
 name = mrb_sym_name_len(s->mrb, a, &len);
- name2 = (char *)codegen_palloc(s,
- (size_t)len
- + 1 /* '=' */
- + 1 /* '\0' */
- );
+ name2 = (char*)codegen_palloc(s,
+ (size_t)len
+ + 1 /* '=' */
+ + 1 /* '\0' */
+ );
 mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
 memcpy(name2, name, (size_t)len);
 name2len = '=';
@@ -1530,7 +1570,7 @@
 #define GEN_VAL_STACK_MAX 99
 
 static int
-gen_values(codegen_scope *s, node *t, int val, int extra, int limit)
+gen_values(codegen_scope *s, node *t, int val, int limit)
 {
 int n = 0;
 int first = 1;
@@ -1551,7 +1591,7 @@
 while (t) {
 int is_splat = nint(t->car->car) == NODE_SPLAT;
 
- if (is_splat || n+extra >= limit-1 || cursp() >= slimit) { /* flush stack */
+ if (is_splat || cursp() >= slimit) { /* flush stack */
 pop_n(n);
 if (first) {
 if (n == 0) {
@@ -1590,6 +1630,11 @@
 }
 return -1; /* variable length */
 }
+ else if (n > limit) {
+ pop_n(n);
+ genop_2(s, OP_ARRAY, cursp(), n);
+ return -1;
+ }
 return n;
 }
 
@@ -1600,10 +1645,16 @@
 if (cursp() >= GEN_LIT_ARY_MAX) slimit = INT16_MAX;
 int len = 0;
 mrb_bool update = FALSE;
+ mrb_bool first = TRUE;
 
 while (tree) {
 if (nint(tree->car->car->car) == NODE_KW_REST_ARGS) {
- if (val && len > 0) {
+ if (val && first) {
+ genop_2(s, OP_HASH, cursp(), 0);
+ push();
+ update = TRUE;
+ }
+ else if (val && len > 0) {
 pop_n(len*2);
 if (!update) {
 genop_2(s, OP_HASH, cursp(), len);
@@ -1642,6 +1693,13 @@
 update = TRUE;
 len = 0;
 }
+ first = FALSE;
+ }
+ if (val && len > limit) {
+ pop_n(len*2);
+ genop_2(s, OP_HASH, cursp(), len);
+ push();
+ return -1;
 }
 if (update) {
 if (val && len > 0) {
@@ -1655,10 +1713,10 @@
 }
 
 static void
-gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
+gen_call(codegen_scope *s, node *tree, int val, int safe)
 {
- mrb_sym sym = name ? name : nsym(tree->cdr->car);
- int skip = 0, n = 0, nk = 0, noop = 0, noself = 0, blk = 0, sp_save = cursp();
+ mrb_sym sym = nsym(tree->cdr->car);
+ int skip = 0, n = 0, nk = 0, noop = no_optimize(s), noself = 0, blk = 0, sp_save = cursp();
 
 if (!tree->car) {
 noself = noop = 1;
@@ -1675,7 +1733,7 @@
 tree = tree->cdr->cdr->car;
 if (tree) {
 if (tree->car) { /* positional arguments */
- n = gen_values(s, tree->car, VAL, sp?1:0, 14);
+ n = gen_values(s, tree->car, VAL, 14);
 if (n < 0) { /* variable length */
 noop = 1; /* not operator */
 n = 15;
@@ -1688,32 +1746,6 @@
 if (nk < 0) nk = 15;
 }
 }
- if (sp) { /* last argument pushed (attr=, =) */
- /* pack keyword arguments */
- if (nk > 0 && nk < 15) {
- pop_n(nk*2);
- genop_2(s, OP_HASH, cursp(), nk);
- push();
- }
- if (n == CALL_MAXARGS) {
- if (nk > 0) {
- pop(); pop();
- genop_2(s, OP_ARYPUSH, cursp(), 1);
- push();
- }
- gen_move(s, cursp(), sp, 0);
- pop();
- genop_2(s, OP_ARYPUSH, cursp(), 1);
- push();
- }
- else {
- gen_move(s, cursp(), sp, 0);
- push();
- if (nk > 0) n++;
- n++;
- }
- nk = 0;
- }
 if (tree && tree->cdr && tree->cdr->cdr) {
 codegen(s, tree->cdr->cdr, VAL);
 pop();
@@ -1773,11 +1805,44 @@
 }
 
 static void
-gen_assignment(codegen_scope *s, node *tree, int sp, int val)
+gen_assignment(codegen_scope *s, node *tree, node *rhs, int sp, int val)
 {
 int idx;
 int type = nint(tree->car);
 
+ switch (type) {
+ case NODE_GVAR:
+ case NODE_ARG:
+ case NODE_LVAR:
+ case NODE_IVAR:
+ case NODE_CVAR:
+ case NODE_CONST:
+ case NODE_NIL:
+ case NODE_MASGN:
+ if (rhs) {
+ codegen(s, rhs, VAL);
+ pop();
+ sp = cursp();
+ }
+ break;
+
+ case NODE_COLON2:
+ case NODE_COLON3:
+ case NODE_CALL:
+ case NODE_SCALL:
+ /* keep evaluation order */
+ break;
+
+ case NODE_NVAR:
+ /* never happens; should have already checked in the parser */
+ codegen_error(s, "Can't assign to numbered parameter");
+ break;
+
+ default:
+ codegen_error(s, "unknown lhs");
+ break;
+ }
+
 tree = tree->cdr;
 switch (type) {
 case NODE_GVAR:
@@ -1796,10 +1861,6 @@
 gen_setupvar(s, sp, nsym(tree));
 }
 break;
- case NODE_NVAR:
- idx = nint(tree);
- codegen_error(s, "Can't assign to numbered parameter");
- break;
 case NODE_IVAR:
 gen_setxv(s, OP_SETIV, sp, nsym(tree), val);
 break;
@@ -1810,27 +1871,122 @@
 gen_setxv(s, OP_SETCONST, sp, nsym(tree), val);
 break;
 case NODE_COLON2:
- gen_move(s, cursp(), sp, 0);
+ case NODE_COLON3:
+ if (sp) {
+ gen_move(s, cursp(), sp, 0);
+ }
+ sp = cursp();
 push();
- codegen(s, tree->car, VAL);
+ if (type == NODE_COLON2) {
+ codegen(s, tree->car, VAL);
+ idx = new_sym(s, nsym(tree->cdr));
+ }
+ else { /* NODE_COLON3 */
+ genop_1(s, OP_OCLASS, cursp());
+ push();
+ idx = new_sym(s, nsym(tree));
+ }
+ if (rhs) {
+ codegen(s, rhs, VAL); pop();
+ gen_move(s, sp, cursp(), 0);
+ }
 pop_n(2);
- idx = new_sym(s, nsym(tree->cdr));
 genop_2(s, OP_SETMCNST, sp, idx);
 break;
 
 case NODE_CALL:
 case NODE_SCALL:
- push();
- gen_call(s, tree, attrsym(s, nsym(tree->cdr->car)), sp, NOVAL,
- type == NODE_SCALL);
- pop();
- if (val && cursp() != sp) {
- gen_move(s, cursp(), sp, 0);
+ {
+ int noself = 0, safe = (type == NODE_SCALL), skip = 0, top, call, n = 0;
+ mrb_sym mid = nsym(tree->cdr->car);
+
+ top = cursp();
+ if (val || sp == cursp()) {
+ push(); /* room for retval */
+ }
+ call = cursp();
+ if (!tree->car) {
+ noself = 1;
+ push();
+ }
+ else {
+ codegen(s, tree->car, VAL); /* receiver */
+ }
+ if (safe) {
+ int recv = cursp()-1;
+ gen_move(s, cursp(), recv, 1);
+ skip = genjmp2_0(s, OP_JMPNIL, cursp(), val);
+ }
+ tree = tree->cdr->cdr->car;
+ if (tree) {
+ if (tree->car) { /* positional arguments */
+ n = gen_values(s, tree->car, VAL, (tree->cdr->car)?13:14);
+ if (n < 0) { /* variable length */
+ n = 15;
+ push();
+ }
+ }
+ if (tree->cdr->car) { /* keyword arguments */
+ if (n == 13 || n == 14) {
+ pop_n(n);
+ genop_2(s, OP_ARRAY, cursp(), n);
+ push();
+ n = 15;
+ }
+ gen_hash(s, tree->cdr->car->cdr, VAL, 0);
+ if (n < 14) {
+ n++;
+ }
+ else {
+ pop_n(2);
+ genop_2(s, OP_ARYPUSH, cursp(), 1);
+ }
+ push();
+ }
+ }
+ if (rhs) {
+ codegen(s, rhs, VAL);
+ pop();
+ }
+ else {
+ gen_move(s, cursp(), sp, 0);
+ }
+ if (val) {
+ gen_move(s, top, cursp(), 1);
+ }
+ if (n < 15) {
+ n++;
+ if (n == 15) {
+ pop_n(14);
+ genop_2(s, OP_ARRAY, cursp(), 15);
+ }
+ }
+ else {
+ pop();
+ genop_2(s, OP_ARYPUSH, cursp(), 1);
+ }
+ push(); pop();
+ s->sp = call;
+ if (mid == MRB_OPSYM_2(s->mrb, aref) && n == 2) {
+ push_n(4); pop_n(4); /* self + idx + value + (invisible block for OP_SEND) */
+ genop_1(s, OP_SETIDX, cursp());
+ }
+ else {
+ int st = 2 /* self + block */ +
+ (((n >> 0) & 0x0f) < 15 ? ((n >> 0) & 0x0f) : 1) +
+ (((n >> 4) & 0x0f) < 15 ? ((n >> 4) & 0x0f) * 2 : 1);
+ push_n(st); pop_n(st);
+ genop_3(s, noself ? OP_SSEND : OP_SEND, cursp(), new_sym(s, attrsym(s, mid)), n);
+ }
+ if (safe) {
+ dispatch(s, skip);
+ }
+ s->sp = top;
 }
 break;
 
 case NODE_MASGN:
- gen_vmassignment(s, tree->car, sp, val);
+ gen_massignment(s, tree->car, sp, val);
 break;
 
 /* splat without assignment */
@@ -1845,7 +2001,7 @@
 }
 
 static void
-gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val)
+gen_massignment(codegen_scope *s, node *tree, int rhs, int val)
 {
 int n = 0, post = 0;
 node *t, *p;
@@ -1858,7 +2014,7 @@
 
 genop_3(s, OP_AREF, sp, rhs, n);
 push();
- gen_assignment(s, t->car, sp, NOVAL);
+ gen_assignment(s, t->car, NULL, sp, NOVAL);
 pop();
 n++;
 t = t->cdr;
@@ -1879,12 +2035,12 @@
 genop_3(s, OP_APOST, cursp(), n, post);
 n = 1;
 if (t->car && t->car != (node*)-1) { /* rest */
- gen_assignment(s, t->car, cursp(), NOVAL);
+ gen_assignment(s, t->car, NULL, cursp(), NOVAL);
 }
 if (t->cdr && t->cdr->car) {
 t = t->cdr->car;
 while (t) {
- gen_assignment(s, t->car, cursp()+n, NOVAL);
+ gen_assignment(s, t->car, NULL, cursp()+n, NOVAL);
 t = t->cdr;
 n++;
 }
@@ -1927,13 +2083,13 @@
 /* fall through */
 case NODE_BEGIN:
 codegen(s, tree->car, VAL);
- ++j;
+ j++;
 break;
 
 case NODE_LITERAL_DELIM:
 if (j > 0) {
 j = 0;
- ++i;
+ i++;
 if (sym)
 gen_intern(s);
 }
@@ -1961,7 +2117,7 @@
 tree = tree->cdr;
 }
 if (j > 0) {
- ++i;
+ i++;
 if (sym)
 gen_intern(s);
 }
@@ -1989,7 +2145,7 @@
 static void
 raise_error(codegen_scope *s, const char *msg)
 {
- int idx = new_lit(s, mrb_str_new_cstr(s->mrb, msg));
+ int idx = new_lit_cstr(s, msg);
 
 genop_1(s, OP_ERR, idx);
 }
@@ -2046,7 +2202,7 @@
 if (nint(tree->car) == NODE_SPLAT) {
 codegen(s, tree, VAL);
 pop();
- genop_1(s, OP_ARYDUP, cursp());
+ genop_1(s, OP_ARYSPLAT, cursp());
 }
 else {
 codegen(s, tree, VAL);
@@ -2204,7 +2360,7 @@
 
 pop();
 if (n3->cdr->car) {
- gen_assignment(s, n3->cdr->car, exc, NOVAL);
+ gen_assignment(s, n3->cdr->car, NULL, exc, NOVAL);
 }
 if (n3->cdr->cdr->car) {
 codegen(s, n3->cdr->cdr->car, val);
@@ -2467,7 +2623,7 @@
 else {
 pop();
 }
- tmp = genjmp2(s, OP_JMPIF, cursp(), pos2, NOVAL);
+ tmp = genjmp2(s, OP_JMPIF, cursp(), pos2, !head);
 pos2 = tmp;
 n = n->cdr;
 }
@@ -2509,10 +2665,10 @@
 
 case NODE_FCALL:
 case NODE_CALL:
- gen_call(s, tree, 0, 0, val, 0);
+ gen_call(s, tree, val, 0);
 break;
 case NODE_SCALL:
- gen_call(s, tree, 0, 0, val, 1);
+ gen_call(s, tree, val, 1);
 break;
 
 case NODE_DOT2:
@@ -2560,7 +2716,7 @@
 {
 int n;
 
- n = gen_values(s, tree, val, 0, 0);
+ n = gen_values(s, tree, val, 0);
 if (val) {
 if (n >= 0) {
 pop_n(n);
@@ -2588,9 +2744,7 @@
 break;
 
 case NODE_ASGN:
- codegen(s, tree->cdr, VAL);
- pop();
- gen_assignment(s, tree->car, cursp(), val);
+ gen_assignment(s, tree->car, tree->cdr, 0, val);
 break;
 
 case NODE_MASGN:
@@ -2599,7 +2753,7 @@
 node *t = tree->cdr, *p;
 int rhs = cursp();
 
- if (nint(t->car) == NODE_ARRAY && t->cdr && nosplat(t->cdr)) {
+ if (!val && nint(t->car) == NODE_ARRAY && t->cdr && nosplat(t->cdr)) {
 /* fixed rhs */
 t = t->cdr;
 while (t) {
@@ -2613,12 +2767,12 @@
 n = 0;
 while (t) {
 if (n < len) {
- gen_assignment(s, t->car, rhs+n, NOVAL);
+ gen_assignment(s, t->car, NULL, rhs+n, NOVAL);
 n++;
 }
 else {
 genop_1(s, OP_LOADNIL, rhs+n);
- gen_assignment(s, t->car, rhs+n, NOVAL);
+ gen_assignment(s, t->car, NULL, rhs+n, NOVAL);
 }
 t = t->cdr;
 }
@@ -2641,29 +2795,36 @@
 else {
 rn = len - post - n;
 }
- genop_3(s, OP_ARRAY2, cursp(), rhs+n, rn);
- gen_assignment(s, t->car, cursp(), NOVAL);
+ if (cursp() == rhs+n) {
+ genop_2(s, OP_ARRAY, cursp(), rn);
+ }
+ else {
+ genop_3(s, OP_ARRAY2, cursp(), rhs+n, rn);
+ }
+ gen_assignment(s, t->car, NULL, cursp(), NOVAL);
 n += rn;
 }
 if (t->cdr && t->cdr->car) {
 t = t->cdr->car;
- while (n<len) {
- gen_assignment(s, t->car, rhs+n, NOVAL);
+ while (t) {
+ if (n<len) {
+ gen_assignment(s, t->car, NULL, rhs+n, NOVAL);
+ }
+ else {
+ genop_1(s, OP_LOADNIL, cursp());
+ gen_assignment(s, t->car, NULL, cursp(), NOVAL);
+ }
 t = t->cdr;
 n++;
 }
 }
 }
 pop_n(len);
- if (val) {
- genop_2(s, OP_ARRAY, rhs, len);
- push();
- }
 }
 else {
 /* variable rhs */
 codegen(s, t, VAL);
- gen_vmassignment(s, tree->car, rhs, val);
+ gen_massignment(s, tree->car, rhs, val);
 if (!val) {
 pop();
 }
@@ -2713,7 +2874,7 @@
 idx = new_sym(s, nsym(n->cdr->car));
 base = cursp()-1;
 if (n->cdr->cdr->car) {
- nargs = gen_values(s, n->cdr->cdr->car->car, VAL, 1, 14);
+ nargs = gen_values(s, n->cdr->cdr->car->car, VAL, 13);
 if (nargs >= 0) {
 callargs = nargs;
 }
@@ -2769,7 +2930,7 @@
 genop_3(s, OP_SEND, cursp(), idx, callargs);
 }
 else {
- gen_assignment(s, tree->car, cursp(), val);
+ gen_assignment(s, tree->car, NULL, cursp(), val);
 }
 dispatch(s, pos);
 goto exit;
@@ -2807,7 +2968,7 @@
 genop_3(s, OP_SEND, cursp(), idx, 1);
 }
 if (callargs < 0) {
- gen_assignment(s, tree->car, cursp(), val);
+ gen_assignment(s, tree->car, NULL, cursp(), val);
 }
 else {
 if (val && vsp >= 0) {
@@ -2843,7 +3004,7 @@
 if (tree) {
 node *args = tree->car;
 if (args) {
- st = n = gen_values(s, args, VAL, 0, 14);
+ st = n = gen_values(s, args, VAL, 14);
 if (n < 0) {
 st = 1; n = 15;
 push();
@@ -2884,7 +3045,7 @@
 {
 codegen_scope *s2 = s;
 int lv = 0;
- size_t ainfo = 0;
+ uint16_t ainfo = 0;
 int n = CALL_MAXARGS;
 int sp = cursp();
 
@@ -2961,7 +3122,7 @@
 if (ainfo < 0) codegen_error(s, "invalid yield (SyntaxError)");
 push();
 if (tree) {
- n = gen_values(s, tree, VAL, 0, 14);
+ n = gen_values(s, tree, VAL, 14);
 if (n < 0) {
 n = sendv = 1;
 push();
@@ -3122,9 +3283,11 @@
 int idx = lv_idx(s, MRB_OPSYM_2(s->mrb, and));
 
 if (idx == 0) {
- codegen_error(s, "no anonymous block argument");
+ gen_getupvar(s, cursp(), MRB_OPSYM_2(s->mrb, and));
+ }
+ else {
+ gen_move(s, cursp(), idx, val);
 }
- gen_move(s, cursp(), idx, val);
 if (val) push();
 }
 else {
@@ -3141,7 +3304,7 @@
 
 i = readint(s, p, base, FALSE, &overflow);
 if (overflow) {
- int off = new_litbn(s, p, base, FALSE);
+ int off = new_litbint(s, p, base, FALSE);
 genop_2(s, OP_LOADL, cursp(), off);
 }
 else {
@@ -3155,8 +3318,9 @@
 case NODE_FLOAT:
 if (val) {
 char *p = (char*)tree;
- mrb_float f = mrb_float_read(p, NULL);
- int off = new_lit(s, mrb_float_value(s->mrb, f));
+ double f;
+ mrb_read_float(p, NULL, &f);
+ int off = new_lit_float(s, (mrb_float)f);
 
 genop_2(s, OP_LOADL, cursp(), off);
 push();
@@ -3172,8 +3336,9 @@
 case NODE_FLOAT:
 if (val) {
 char *p = (char*)tree->cdr;
- mrb_float f = mrb_float_read(p, NULL);
- int off = new_lit(s, mrb_float_value(s->mrb, -f));
+ double f;
+ mrb_read_float(p, NULL, &f);
+ int off = new_lit_float(s, (mrb_float)-f);
 
 genop_2(s, OP_LOADL, cursp(), off);
 push();
@@ -3190,7 +3355,7 @@
 
 i = readint(s, p, base, TRUE, &overflow);
 if (overflow) {
- int off = new_litbn(s, p, base, TRUE);
+ int off = new_litbint(s, p, base, TRUE);
 genop_2(s, OP_LOADL, cursp(), off);
 }
 else {
@@ -3222,18 +3387,16 @@
 case NODE_STR:
 if (val) {
 char *p = (char*)tree->car;
- size_t len = (intptr_t)tree->cdr;
- int ai = mrb_gc_arena_save(s->mrb);
- int off = new_lit(s, mrb_str_new(s->mrb, p, len));
+ mrb_int len = nint(tree->cdr);
+ int off = new_lit_str(s, p, len);
 
- mrb_gc_arena_restore(s->mrb, ai);
 genop_2(s, OP_STRING, cursp(), off);
 push();
 }
 break;
 
 case NODE_HEREDOC:
- tree = ((struct mrb_parser_heredoc_info *)tree)->doc;
+ tree = ((struct mrb_parser_heredoc_info*)tree)->doc;
 /* fall through */
 case NODE_DSTR:
 if (val) {
@@ -3277,7 +3440,6 @@
 case NODE_DXSTR:
 {
 node *n;
- int ai = mrb_gc_arena_save(s->mrb);
 int sym = new_sym(s, MRB_SYM_2(s->mrb, Kernel));
 
 genop_1(s, OP_LOADSELF, cursp());
@@ -3300,16 +3462,14 @@
 sym = new_sym(s, MRB_OPSYM_2(s->mrb, tick)); /* ` */
 genop_3(s, OP_SEND, cursp(), sym, 1);
 if (val) push();
- mrb_gc_arena_restore(s->mrb, ai);
 }
 break;
 
 case NODE_XSTR:
 {
 char *p = (char*)tree->car;
- size_t len = (intptr_t)tree->cdr;
- int ai = mrb_gc_arena_save(s->mrb);
- int off = new_lit(s, mrb_str_new(s->mrb, p, len));
+ mrb_int len = nint(tree->cdr);
+ int off = new_lit_str(s, p, len);
 int sym;
 
 genop_1(s, OP_LOADSELF, cursp());
@@ -3320,7 +3480,6 @@
 sym = new_sym(s, MRB_OPSYM_2(s->mrb, tick)); /* ` */
 genop_3(s, OP_SEND, cursp(), sym, 1);
 if (val) push();
- mrb_gc_arena_restore(s->mrb, ai);
 }
 break;
 
@@ -3329,9 +3488,8 @@
 char *p1 = (char*)tree->car;
 char *p2 = (char*)tree->cdr->car;
 char *p3 = (char*)tree->cdr->cdr;
- int ai = mrb_gc_arena_save(s->mrb);
 int sym = new_sym(s, mrb_intern_lit(s->mrb, REGEXP_CLASS));
- int off = new_lit(s, mrb_str_new_cstr(s->mrb, p1));
+ int off = new_lit_cstr(s, p1);
 int argc = 1;
 
 genop_1(s, OP_OCLASS, cursp());
@@ -3341,7 +3499,7 @@
 push();
 if (p2 || p3) {
 if (p2) { /* opt */
- off = new_lit(s, mrb_str_new_cstr(s->mrb, p2));
+ off = new_lit_cstr(s, p2);
 genop_2(s, OP_STRING, cursp(), off);
 }
 else {
@@ -3350,7 +3508,7 @@
 push();
 argc++;
 if (p3) { /* enc */
- off = new_lit(s, mrb_str_new(s->mrb, p3, 1));
+ off = new_lit_str(s, p3, 1);
 genop_2(s, OP_STRING, cursp(), off);
 push();
 argc++;
@@ -3360,7 +3518,6 @@
 pop_n(argc+2);
 sym = new_sym(s, MRB_SYM_2(s->mrb, compile));
 genop_3(s, OP_SEND, cursp(), sym, argc);
- mrb_gc_arena_restore(s->mrb, ai);
 push();
 }
 break;
@@ -3368,7 +3525,6 @@
 case NODE_DREGX:
 if (val) {
 node *n = tree->car;
- int ai = mrb_gc_arena_save(s->mrb);
 int sym = new_sym(s, mrb_intern_lit(s->mrb, REGEXP_CLASS));
 int argc = 1;
 int off;
@@ -3389,7 +3545,7 @@
 n = tree->cdr->cdr;
 if (n->car) { /* tail */
 p = (char*)n->car;
- off = new_lit(s, mrb_str_new_cstr(s->mrb, p));
+ off = new_lit_cstr(s, p);
 codegen(s, tree->car, VAL);
 genop_2(s, OP_STRING, cursp(), off);
 pop();
@@ -3398,14 +3554,14 @@
 }
 if (n->cdr->car) { /* opt */
 char *p2 = (char*)n->cdr->car;
- off = new_lit(s, mrb_str_new_cstr(s->mrb, p2));
+ off = new_lit_cstr(s, p2);
 genop_2(s, OP_STRING, cursp(), off);
 push();
 argc++;
 }
 if (n->cdr->cdr) { /* enc */
 char *p2 = (char*)n->cdr->cdr;
- off = new_lit(s, mrb_str_new_cstr(s->mrb, p2));
+ off = new_lit_cstr(s, p2);
 genop_2(s, OP_STRING, cursp(), off);
 push();
 argc++;
@@ -3414,7 +3570,6 @@
 pop_n(argc+2);
 sym = new_sym(s, MRB_SYM_2(s->mrb, compile));
 genop_3(s, OP_SEND, cursp(), sym, argc);
- mrb_gc_arena_restore(s->mrb, ai);
 push();
 }
 else {
@@ -3621,6 +3776,7 @@
 genop_1(s, OP_SCLASS, cursp());
 push();
 genop_2(s, OP_METHOD, cursp(), idx);
+ push(); pop();
 pop();
 genop_2(s, OP_DEF, cursp(), sym);
 if (val) push();
@@ -3668,7 +3824,7 @@
 {
 static const codegen_scope codegen_scope_zero = { 0 };
 mrb_pool *pool = mrb_pool_open(mrb);
- codegen_scope *s = (codegen_scope *)mrb_pool_alloc(pool, sizeof(codegen_scope));
+ codegen_scope *s = (codegen_scope*)mrb_pool_alloc(pool, sizeof(codegen_scope));
 
 if (!s) {
 if (prev)
@@ -3747,10 +3903,10 @@
 irep->flags = 0;
 if (s->iseq) {
 size_t catchsize = sizeof(struct mrb_irep_catch_handler) * irep->clen;
- irep->iseq = (const mrb_code *)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->pc + catchsize);
+ irep->iseq = (const mrb_code*)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->pc + catchsize);
 irep->ilen = s->pc;
 if (irep->clen > 0) {
- memcpy((void *)(irep->iseq + irep->ilen), s->catch_table, catchsize);
+ memcpy((void*)(irep->iseq + irep->ilen), s->catch_table, catchsize);
 }
 }
 else {
@@ -3780,7 +3936,7 @@
 static struct loopinfo*
 loop_push(codegen_scope *s, enum looptype t)
 {
- struct loopinfo *p = (struct loopinfo *)codegen_palloc(s, sizeof(struct loopinfo));
+ struct loopinfo *p = (struct loopinfo*)codegen_palloc(s, sizeof(struct loopinfo));
 
 p->type = t;
 p->pc0 = p->pc1 = p->pc2 = JMPLINK_START;
@@ -3865,8 +4021,8 @@
 catch_handler_new(codegen_scope *s)
 {
 size_t newsize = sizeof(struct mrb_irep_catch_handler) * (s->irep->clen + 1);
- s->catch_table = (struct mrb_irep_catch_handler *)codegen_realloc(s, (void *)s->catch_table, newsize);
- return s->irep->clen ++;
+ s->catch_table = (struct mrb_irep_catch_handler*)codegen_realloc(s, (void*)s->catch_table, newsize);
+ return s->irep->clen++;
 }
 
 static void
@@ -3937,7 +4093,7 @@
 irep->lv = NULL;
 }
 if (!irep->reps) return;
- for (i = 0; i < irep->rlen; ++i) {
+ for (i = 0; i < irep->rlen; i++) {
 mrb_irep_remove_lv(mrb, (mrb_irep*)irep->repsi);
 }
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/parse.y -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/parse.y Changed

@@ -12,7 +12,6 @@
 #define YYSTACK_USE_ALLOCA 1
 
 #include <ctype.h>
-#include <errno.h>
 #include <string.h>
 #include <mruby.h>
 #include <mruby/compile.h>
@@ -21,6 +20,7 @@
 #include <mruby/throw.h>
 #include <mruby/string.h>
 #include <mruby/dump.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 #include "node.h"
 
@@ -90,6 +90,15 @@
 
 #define intern_op(op) MRB_OPSYM_2(p->mrb, op)
 
+static mrb_sym
+intern_numparam_gen(parser_state *p, int num)
+{
+ char buf3;
+ buf0 = '_'; buf1 = '0'+num; buf2 = '\0';
+ return intern(buf, 2);
+}
+#define intern_numparam(n) intern_numparam_gen(p,(n))
+
 static void
 cons_free_gen(parser_state *p, node *cons)
 {
@@ -109,6 +118,8 @@
 return m;
 }
 
+#define parser_pfree(ptr) do { if (sizeof(node) <= sizeof(*(ptr))) cons_free((node*)ptr);} while (0)
+
 static node*
 cons_gen(parser_state *p, node *car, node *cdr)
 {
@@ -119,7 +130,7 @@
 p->cells = p->cells->cdr;
 }
 else {
- c = (node *)parser_palloc(p, sizeof(mrb_ast_node));
+ c = (node*)parser_palloc(p, sizeof(mrb_ast_node));
 }
 
 c->car = car;
@@ -195,7 +206,7 @@
 static char*
 parser_strndup(parser_state *p, const char *s, size_t len)
 {
- char *b = (char *)parser_palloc(p, len+1);
+ char *b = (char*)parser_palloc(p, len+1);
 
 memcpy(b, s, len);
 blen = '\0';
@@ -327,7 +338,7 @@
 local_add_blk(parser_state *p, mrb_sym blk)
 {
 /* allocate register for block */
- local_add_f(p, blk ? blk : intern_op(and));
+ local_add_f(p, blk ? blk : 0);
 }
 
 static void
@@ -891,9 +902,9 @@
 
 /* (:kw_rest_args . a) */
 static node*
-new_kw_rest_args(parser_state *p, node *a)
+new_kw_rest_args(parser_state *p, mrb_sym sym)
 {
- return cons((node*)NODE_KW_REST_ARGS, a);
+ return cons((node*)NODE_KW_REST_ARGS, nsym(sym));
 }
 
 static node*
@@ -904,7 +915,7 @@
 mrb_sym b = intern_op(and);
 local_add_f(p, r);
 return new_args(p, m, 0, r, 0,
- new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
+ new_args_tail(p, 0, new_kw_rest_args(p, k), b));
 }
 
 /* (:block_arg . a) */
@@ -994,13 +1005,13 @@
 new_imaginary(parser_state *p, node *imaginary)
 {
 return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Complex),
- new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary), 0, 0), 1);
+ new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary), 0, 0), '.');
 }
 
 static node*
 new_rational(parser_state *p, node *rational)
 {
- return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Rational), new_callargs(p, list1(rational), 0, 0), 1);
+ return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Rational), new_callargs(p, list1(rational), 0, 0), '.');
 }
 
 /* (:int . i) */
@@ -1180,7 +1191,7 @@
 static node*
 new_heredoc(parser_state *p)
 {
- parser_heredoc_info *inf = (parser_heredoc_info *)parser_palloc(p, sizeof(parser_heredoc_info));
+ parser_heredoc_info *inf = (parser_heredoc_info*)parser_palloc(p, sizeof(parser_heredoc_info));
 return cons((node*)NODE_HEREDOC, (node*)inf);
 }
 
@@ -1216,14 +1227,14 @@
 call_uni_op(parser_state *p, node *recv, const char *m)
 {
 void_expr_error(p, recv);
- return new_call(p, recv, intern_cstr(m), 0, 1);
+ return new_call(p, recv, intern_cstr(m), 0, '.');
 }
 
 /* (:call a op b) */
 static node*
 call_bin_op(parser_state *p, node *recv, const char *m, node *arg1)
 {
- return new_call(p, recv, intern_cstr(m), new_callargs(p, list1(arg1), 0, 0), 1);
+ return new_call(p, recv, intern_cstr(m), new_callargs(p, list1(arg1), 0, 0), '.');
 }
 
 static void
@@ -1271,6 +1282,12 @@
 if (!n->car) n->car = new_callargs(p, 0, 0, b);
 else args_with_block(p, n->car, b);
 break;
+ case NODE_RETURN:
+ case NODE_BREAK:
+ case NODE_NEXT:
+ if (a->cdr == NULL) return;
+ call_with_block(p, a->cdr, b);
+ break;
 default:
 break;
 }
@@ -1344,23 +1361,52 @@
 
 typedef enum mrb_string_type string_type;
 
-static node*
+typedef struct parser_lex_strterm {
+ int type;
+ int level;
+ int term;
+ int paren;
+ struct parser_lex_strterm *prev;
+} parser_lex_strterm;
+
+static parser_lex_strterm*
 new_strterm(parser_state *p, string_type type, int term, int paren)
 {
- return cons(nint(type), cons(nint(0), cons(nint(paren), nint(term))));
+ parser_lex_strterm *lex = (parser_lex_strterm*)parser_palloc(p, sizeof(parser_lex_strterm));
+ lex->type = type;
+ lex->level = 0;
+ lex->term = term;
+ lex->paren = paren;
+ lex->prev = p->lex_strterm;
+ return lex;
 }
 
 static void
 end_strterm(parser_state *p)
 {
- cons_free(p->lex_strterm->cdr->cdr);
- cons_free(p->lex_strterm->cdr);
- cons_free(p->lex_strterm);
+ parser_lex_strterm *term = p->lex_strterm->prev;
+ parser_pfree(p->lex_strterm);
+ p->lex_strterm = term;
+}
+
+static node*
+push_strterm(parser_state *p)
+{
+ node *n = cons((node*)p->lex_strterm, p->parsing_heredoc);
 p->lex_strterm = NULL;
+ return n;
+}
+
+static void
+pop_strterm(parser_state *p, node *n)
+{
+ p->lex_strterm = (parser_lex_strterm*)n->car;
+ p->parsing_heredoc = n->cdr;
+ cons_free(n);
 }
 
 static parser_heredoc_info *
-parsing_heredoc_inf(parser_state *p)
+parsing_heredoc_info(parser_state *p)
 {
 node *nd = p->parsing_heredoc;
 if (nd == NULL)
@@ -1372,45 +1418,12 @@
 static void
 heredoc_treat_nextline(parser_state *p)
 {
- if (p->heredocs_from_nextline == NULL)
- return;
- if (p->parsing_heredoc == NULL) {
- node *n;
- p->parsing_heredoc = p->heredocs_from_nextline;
- p->lex_strterm_before_heredoc = p->lex_strterm;
- p->lex_strterm = new_strterm(p, parsing_heredoc_inf(p)->type, 0, 0);
- n = p->all_heredocs;
- if (n) {
- while (n->cdr)
- n = n->cdr;
- n->cdr = p->parsing_heredoc;
- }
- else {
- p->all_heredocs = p->parsing_heredoc;
- }
- }
- else {
- node *n, *m;
- m = p->heredocs_from_nextline;
- while (m->cdr)
- m = m->cdr;
- n = p->all_heredocs;
- mrb_assert(n != NULL);
- if (n == p->parsing_heredoc) {
- m->cdr = n;
- p->all_heredocs = p->heredocs_from_nextline;
- p->parsing_heredoc = p->heredocs_from_nextline;
- }
- else {
- while (n->cdr != p->parsing_heredoc) {
- n = n->cdr;
- mrb_assert(n != NULL);
- }
- m->cdr = n->cdr;
- n->cdr = p->heredocs_from_nextline;
- p->parsing_heredoc = p->heredocs_from_nextline;
- }
+ if (p->heredocs_from_nextline == NULL) return;
+ if (p->parsing_heredoc && p->lex_strterm) {
+ append(p->heredocs_from_nextline, p->parsing_heredoc);
 }
+ p->parsing_heredoc = p->heredocs_from_nextline;
+ p->lex_strterm = new_strterm(p, parsing_heredoc_info(p)->type, 0, 0);
 p->heredocs_from_nextline = NULL;
 }
 
@@ -1421,15 +1434,13 @@
 if (p->parsing_heredoc == NULL) {
 p->lstate = EXPR_BEG;
 end_strterm(p);
- p->lex_strterm = p->lex_strterm_before_heredoc;
- p->lex_strterm_before_heredoc = NULL;
 }
 else {
 /* next heredoc */
- p->lex_strterm->car = nint(parsing_heredoc_inf(p)->type);
+ p->lex_strterm->type = parsing_heredoc_info(p)->type;
 }
 }
-#define is_strterm_type(p,str_func) (intn((p)->lex_strterm->car) & (str_func))
+#define is_strterm_type(p,str_func) ((p)->lex_strterm->type & (str_func))
 
 /* xxx ----------------------------- */
 
@@ -2626,6 +2637,10 @@
 $$ = list1($1);
 NODE_LINENO($$, $1);
 }
+ | tSTAR
+ {
+ $$ = list1(new_splat(p, new_lvar(p, intern_op(mul))));
+ }
 | tSTAR arg
 {
 $$ = list1(new_splat(p, $2));
@@ -2636,6 +2651,10 @@
 void_expr_error(p, $3);
 $$ = push($1, $3);
 }
+ | args comma tSTAR
+ {
+ $$ = push($1, new_splat(p, new_lvar(p, intern_op(mul))));
+ }
 | args comma tSTAR arg
 {
 $$ = push($1, new_splat(p, $4));
@@ -3358,13 +3377,12 @@
 }
 | tSTRING_PART
 {
- $<nd>$ = p->lex_strterm;
- p->lex_strterm = NULL;
+ $<nd>$ = push_strterm(p);
 }
 compstmt
 '}'
 {
- p->lex_strterm = $<nd>2;
+ pop_strterm(p,$<nd>2);
 $$ = list2($1, $3);
 }
 | tLITERAL_DELIM
@@ -3413,8 +3431,8 @@
 
 heredoc_body : tHEREDOC_END
 {
- parser_heredoc_info * inf = parsing_heredoc_inf(p);
- inf->doc = push(inf->doc, new_str(p, "", 0));
+ parser_heredoc_info *info = parsing_heredoc_info(p);
+ info->doc = push(info->doc, new_str(p, "", 0));
 heredoc_end(p);
 }
 | heredoc_string_rep tHEREDOC_END
@@ -3429,21 +3447,20 @@
 
 heredoc_string_interp : tHD_STRING_MID
 {
- parser_heredoc_info * inf = parsing_heredoc_inf(p);
- inf->doc = push(inf->doc, $1);
+ parser_heredoc_info *info = parsing_heredoc_info(p);
+ info->doc = push(info->doc, $1);
 heredoc_treat_nextline(p);
 }
 | tHD_STRING_PART
 {
- $<nd>$ = p->lex_strterm;
- p->lex_strterm = NULL;
+ $<nd>$ = push_strterm(p);
 }
 compstmt
 '}'
 {
- parser_heredoc_info * inf = parsing_heredoc_inf(p);
- p->lex_strterm = $<nd>2;
- inf->doc = push(push(inf->doc, $1), $3);
+ pop_strterm(p, $<nd>2);
+ parser_heredoc_info *info = parsing_heredoc_info(p);
+ info->doc = push(push(info->doc, $1), $3);
 }
 ;
 
@@ -3667,6 +3684,10 @@
 {
 local_nest(p);
 }
+ | tNUMPARAM tLABEL_TAG
+ {
+ local_nest(p);
+ }
 ;
 
 f_kw : f_label arg
@@ -3721,7 +3742,7 @@
 
 f_kwrest : kwrest_mark tIDENTIFIER
 {
- $$ = new_kw_rest_args(p, nsym($2));
+ $$ = new_kw_rest_args(p, $2);
 }
 | kwrest_mark
 {
@@ -3815,7 +3836,7 @@
 }
 | /* none */
 {
- local_add_f(p, intern_op(and));
+ local_add_f(p, 0);
 $$ = new_args(p, 0, 0, 0, 0, 0);
 }
 ;
@@ -4031,6 +4052,16 @@
 {
 $$ = cons(new_sym(p, $1), label_reference(p, $1));
 }
+ | tNUMPARAM tLABEL_TAG
+ {
+ mrb_sym sym = intern_numparam($1);
+ $$ = cons(new_sym(p, sym), label_reference(p, sym));
+ }
+ | tNUMPARAM tLABEL_TAG arg
+ {
+ void_expr_error(p, $3);
+ $$ = cons(new_sym(p, intern_numparam($1)), $3);
+ }
 | string_fragment tLABEL_TAG arg
 {
 void_expr_error(p, $3);
@@ -4046,6 +4077,10 @@
 void_expr_error(p, $2);
 $$ = cons(new_kw_rest_args(p, 0), $2);
 }
+ | tDSTAR
+ {
+ $$ = cons(new_kw_rest_args(p, 0), new_lvar(p, intern_op(pow)));
+ }
 ;
 
 operation : tIDENTIFIER
@@ -4144,7 +4179,7 @@
 }
 else if (p->nerr < sizeof(p->error_buffer) / sizeof(p->error_buffer0)) {
 n = strlen(s);
- c = (char *)parser_palloc(p, n + 1);
+ c = (char*)parser_palloc(p, n + 1);
 memcpy(c, s, n + 1);
 p->error_bufferp->nerr.message = c;
 p->error_bufferp->nerr.lineno = p->lineno;
@@ -4183,7 +4218,7 @@
 }
 else if (p->nwarn < sizeof(p->warn_buffer) / sizeof(p->warn_buffer0)) {
 n = strlen(s);
- c = (char *)parser_palloc(p, n + 1);
+ c = (char*)parser_palloc(p, n + 1);
 memcpy(c, s, n + 1);
 p->warn_bufferp->nwarn.message = c;
 p->warn_bufferp->nwarn.lineno = p->lineno;
@@ -4218,7 +4253,7 @@
 yyerror_c(p, "can't set variable $", (char)intn(n->cdr));
 }
 else {
- mrb_bug(p->mrb, "Internal error in backref_error() : n=>car == %d", c);
+ yyerror(p, "Internal error in backref_error()");
 }
 }
 
@@ -4264,22 +4299,20 @@
 static inline int
 nextc0(parser_state *p)
 {
- int c;
-
 if (p->s && p->s < p->send) {
- c = (unsigned char)*p->s++;
+ return (unsigned char)*p->s++;
 }
 else {
 #ifndef MRB_NO_STDIO
+ int c;
+
 if (p->f) {
 c = fgetc(p->f);
- if (feof(p->f)) return -1;
+ if (!feof(p->f)) return c;
 }
- else
 #endif
- return -1;
+ return -1;
 }
- return c;
 }
 
 static inline int
@@ -4684,7 +4717,7 @@
 c = read_escape_unicode(p, 4);
 if (c < 0) return 0;
 }
- return -c;
+ return -c;
 
 case 'b':/* backspace */
 return '\010';
@@ -4733,7 +4766,7 @@
 }
 
 static void
-heredoc_count_indent(parser_heredoc_info *hinf, const char *str, size_t len, size_t spaces, size_t *offset)
+heredoc_count_indent(parser_heredoc_info *hinfo, const char *str, size_t len, size_t spaces, size_t *offset)
 {
 size_t indent = 0;
 *offset = 0;
@@ -4748,7 +4781,7 @@
 else
 break;
 size_t nindent = indent + size;
- if (nindent > spaces || nindent > hinf->indent)
+ if (nindent > spaces || nindent > hinfo->indent)
 break;
 indent = nindent;
 *offset += 1;
@@ -4756,14 +4789,14 @@
 }
 
 static void
-heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinf)
+heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinfo)
 {
- if (!hinf->remove_indent || hinf->indent == 0)
+ if (!hinfo->remove_indent || hinfo->indent == 0)
 return;
 node *indented, *n, *pair, *escaped, *nspaces;
 const char *str;
 size_t len, spaces, offset, start, end;
- indented = hinf->indented;
+ indented = hinfo->indented;
 while (indented) {
 n = indented->car;
 pair = n->car;
@@ -4780,7 +4813,7 @@
 if (end > len) end = len;
 spaces = (size_t)nspaces->car;
 size_t esclen = end - start;
- heredoc_count_indent(hinf, str + start, esclen, spaces, &offset);
+ heredoc_count_indent(hinfo, str + start, esclen, spaces, &offset);
 esclen -= offset;
 memcpy(newstr + newlen, str + start + offset, esclen);
 newlen += esclen;
@@ -4795,7 +4828,7 @@
 pair->cdr = (node*)newlen;
 } else {
 spaces = (size_t)nspaces->car;
- heredoc_count_indent(hinf, str, len, spaces, &offset);
+ heredoc_count_indent(hinfo, str, len, spaces, &offset);
 pair->car = (node*)(str + offset);
 pair->cdr = (node*)(len - offset);
 }
@@ -4804,13 +4837,13 @@
 }
 
 static void
-heredoc_push_indented(parser_state *p, parser_heredoc_info *hinf, node *pair, node *escaped, node *nspaces, mrb_bool empty_line)
+heredoc_push_indented(parser_state *p, parser_heredoc_info *hinfo, node *pair, node *escaped, node *nspaces, mrb_bool empty_line)
 {
- hinf->indented = push(hinf->indented, cons(pair, cons(escaped, nspaces)));
+ hinfo->indented = push(hinfo->indented, cons(pair, cons(escaped, nspaces)));
 while (nspaces) {
 size_t tspaces = (size_t)nspaces->car;
- if ((hinf->indent == ~0U || tspaces < hinf->indent) && !empty_line)
- hinf->indent = tspaces;
+ if ((hinfo->indent == ~0U || tspaces < hinfo->indent) && !empty_line)
+ hinfo->indent = tspaces;
 nspaces = nspaces->cdr;
 }
 }
@@ -4819,14 +4852,14 @@
 parse_string(parser_state *p)
 {
 int c;
- string_type type = (string_type)(intptr_t)p->lex_strterm->car;
- int nest_level = intn(p->lex_strterm->cdr->car);
- int beg = intn(p->lex_strterm->cdr->cdr->car);
- int end = intn(p->lex_strterm->cdr->cdr->cdr);
- parser_heredoc_info *hinf = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_inf(p) : NULL;
+ string_type type = (string_type)p->lex_strterm->type;
+ int nest_level = p->lex_strterm->level;
+ int beg = p->lex_strterm->paren;
+ int end = p->lex_strterm->term;
+ parser_heredoc_info *hinfo = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_info(p) : NULL;
 
- mrb_bool unindent = hinf && hinf->remove_indent;
- mrb_bool head = hinf && hinf->line_head;
+ mrb_bool unindent = hinfo && hinfo->remove_indent;
+ mrb_bool head = hinfo && hinfo->line_head;
 mrb_bool empty = TRUE;
 size_t spaces = 0;
 size_t pos = -1;
@@ -4838,26 +4871,26 @@
 newtok(p);
 while ((c = nextc(p)) != end || nest_level != 0) {
 pos++;
- if (hinf && (c == '\n' || c < 0)) {
+ if (hinfo && (c == '\n' || c < 0)) {
 mrb_bool line_head;
 tokadd(p, '\n');
 tokfix(p);
 p->lineno++;
 p->column = 0;
- line_head = hinf->line_head;
- hinf->line_head = TRUE;
+ line_head = hinfo->line_head;
+ hinfo->line_head = TRUE;
 if (line_head) {
 /* check whether end of heredoc */
 const char *s = tok(p);
 int len = toklen(p);
- if (hinf->allow_indent) {
+ if (hinfo->allow_indent) {
 while (ISSPACE(*s) && len > 0) {
- ++s;
- --len;
+ s++;
+ len--;
 }
 }
- if (hinf->term_len > 0 && len-1 == hinf->term_len && strncmp(s, hinf->term, len-1) == 0) {
- heredoc_remove_indent(p, hinf);
+ if (hinfo->term_len > 0 && len-1 == hinfo->term_len && strncmp(s, hinfo->term, len-1) == 0) {
+ heredoc_remove_indent(p, hinfo);
 return tHEREDOC_END;
 }
 }
@@ -4866,11 +4899,11 @@
 const char s1 = "can't find heredoc delimiter \"";
 const char s2 = "\" anywhere before EOF";
 
- if (sizeof(s1)+sizeof(s2)+strlen(hinf->term)+1 >= sizeof(buf)) {
+ if (sizeof(s1)+sizeof(s2)+strlen(hinfo->term)+1 >= sizeof(buf)) {
 yyerror(p, "can't find heredoc delimiter anywhere before EOF");
 } else {
 strcpy(buf, s1);
- strcat(buf, hinf->term);
+ strcat(buf, hinfo->term);
 strcat(buf, s2);
 yyerror(p, buf);
 }
@@ -4880,7 +4913,7 @@
 pylval.nd = nd;
 if (unindent && head) {
 nspaces = push(nspaces, nint(spaces));
- heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, empty && line_head);
+ heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, empty && line_head);
 }
 return tHD_STRING_MID;
 }
@@ -4888,7 +4921,7 @@
 if (c == '\t')
 spaces += 8;
 else if (ISSPACE(c))
- ++spaces;
+ spaces++;
 else
 empty = FALSE;
 }
@@ -4898,11 +4931,11 @@
 }
 else if (c == beg) {
 nest_level++;
- p->lex_strterm->cdr->car = nint(nest_level);
+ p->lex_strterm->level = nest_level;
 }
 else if (c == end) {
 nest_level--;
- p->lex_strterm->cdr->car = nint(nest_level);
+ p->lex_strterm->level = nest_level;
 }
 else if (c == '\\') {
 c = nextc(p);
@@ -4939,14 +4972,14 @@
 if (c < 0) break;
 tokadd(p, -c);
 }
- if (hinf)
- hinf->line_head = FALSE;
+ if (hinfo)
+ hinfo->line_head = FALSE;
 }
 else {
 pushback(p, c);
 tokadd(p, read_escape(p));
- if (hinf)
- hinf->line_head = FALSE;
+ if (hinfo)
+ hinfo->line_head = FALSE;
 }
 }
 else {
@@ -4971,12 +5004,12 @@
 p->cmd_start = TRUE;
 node *nd = new_str(p, tok(p), toklen(p));
 pylval.nd = nd;
- if (hinf) {
+ if (hinfo) {
 if (unindent && head) {
 nspaces = push(nspaces, nint(spaces));
- heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, FALSE);
+ heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, FALSE);
 }
- hinf->line_head = FALSE;
+ hinfo->line_head = FALSE;
 return tHD_STRING_PART;
 }
 return tSTRING_PART;
@@ -5943,17 +5976,10 @@
 return tINTEGER;
 #else
 double d;
- char *endp;
 
- errno = 0;
- d = mrb_float_read(tok(p), &endp);
- if (d == 0 && endp == tok(p)) {
+ if (!mrb_read_float(tok(p), NULL, &d)) {
 yywarning_s(p, "corrupted float value", tok(p));
 }
- else if (errno == ERANGE) {
- yywarning_s(p, "float out of range", tok(p));
- errno = 0;
- }
 suffix = number_literal_suffix(p);
 if (seen_e && (suffix & NUM_SUFFIX_R)) {
 pushback(p, 'r');
@@ -6298,8 +6324,8 @@
 if (last_state == EXPR_FNAME) goto gvar;
 tokfix(p);
 {
- mrb_int n = mrb_int_read(tok(p), NULL, NULL);
- if (n > INT32_MAX) {
+ mrb_int n;
+ if (!mrb_read_int(tok(p), NULL, NULL, &n)) {
 yywarning(p, "capture group index too big; always nil");
 return keyword_nil;
 }
@@ -6513,7 +6539,7 @@
 return keyword_do_block;
 return keyword_do;
 }
- if (state == EXPR_BEG || state == EXPR_VALUE)
+ if (state == EXPR_BEG || state == EXPR_VALUE || state == EXPR_CLASS)
 return kw->id0;
 else {
 if (kw->id0 != kw->id1)
@@ -6594,14 +6620,13 @@
 i++;
 n = n->cdr;
 }
- cxt->syms = (mrb_sym *)mrb_realloc(p->mrb, cxt->syms, i*sizeof(mrb_sym));
+ cxt->syms = (mrb_sym*)mrb_realloc(p->mrb, cxt->syms, i*sizeof(mrb_sym));
 cxt->slen = i;
 for (i=0, n=n0; n; i++,n=n->cdr) {
 cxt->symsi = sym(n->car);
 }
 }
 
-void mrb_codedump_all(mrb_state*, struct RProc*);
 void mrb_parser_dump(mrb_state *mrb, node *tree, int offset);
 
 MRB_API void
@@ -6652,7 +6677,7 @@
 
 pool = mrb_pool_open(mrb);
 if (!pool) return NULL;
- p = (parser_state *)mrb_pool_alloc(pool, sizeof(parser_state));
+ p = (parser_state*)mrb_pool_alloc(pool, sizeof(parser_state));
 if (!p) return NULL;
 
 *p = parser_state_zero;
@@ -6677,8 +6702,6 @@
 p->tokbuf = p->buf;
 
 p->lex_strterm = NULL;
- p->all_heredocs = p->parsing_heredoc = NULL;
- p->lex_strterm_before_heredoc = NULL;
 
 p->current_filename_index = -1;
 p->filename_table = NULL;
@@ -6698,7 +6721,7 @@
 MRB_API mrbc_context*
 mrbc_context_new(mrb_state *mrb)
 {
- return (mrbc_context *)mrb_calloc(mrb, 1, sizeof(mrbc_context));
+ return (mrbc_context*)mrb_calloc(mrb, 1, sizeof(mrbc_context));
 }
 
 MRB_API void
@@ -6714,7 +6737,7 @@
 {
 if (s) {
 size_t len = strlen(s);
- char *p = (char *)mrb_malloc(mrb, len + 1);
+ char *p = (char*)mrb_malloc(mrb, len + 1);
 
 memcpy(p, s, len + 1);
 if (c->filename) {
@@ -6740,6 +6763,7 @@
 c->syms = NULL;
 c->slen = 0;
 }
+ c->keep_lv = FALSE;
 }
 
 MRB_API void
@@ -6753,7 +6777,7 @@
 p->filename_sym = sym;
 p->lineno = (p->filename_table_length > 0)? 0 : 1;
 
- for (i = 0; i < p->filename_table_length; ++i) {
+ for (i = 0; i < p->filename_table_length; i++) {
 if (p->filename_tablei == sym) {
 p->current_filename_index = i;
 return;
@@ -6791,8 +6815,8 @@
 p = mrb_parser_new(mrb);
 if (!p) return NULL;
 if (prebuf) {
- p->s = (const char *)prebuf;
- p->send = (const char *)prebuf + prebufsize;
+ p->s = (const char*)prebuf;
+ p->send = (const char*)prebuf + prebufsize;
 }
 else {
 p->s = p->send = NULL;
@@ -6933,19 +6957,20 @@
 return mrb_load_exec(mrb, mrb_parse_file_continue(mrb, fp, leading.b, bufsize, c), c);
 }
 else {
- size_t binsize;
+ mrb_int binsize;
 uint8_t *bin;
 mrb_value bin_obj = mrb_nil_value(); /* temporary string object */
 mrb_value result;
 
 binsize = bin_to_uint32(leading.h.binary_size);
 bin_obj = mrb_str_new(mrb, NULL, binsize);
- bin = (uint8_t *)RSTRING_PTR(bin_obj);
- memcpy(bin, leading.b, bufsize);
- if (binsize > bufsize &&
- fread(bin + bufsize, binsize - bufsize, 1, fp) == 0) {
- binsize = bufsize;
- /* The error is reported by mrb_load_irep_buf_cxt() */
+ bin = (uint8_t*)RSTRING_PTR(bin_obj);
+ if ((size_t)binsize > bufsize) {
+ memcpy(bin, leading.b, bufsize);
+ if (fread(bin + bufsize, binsize - bufsize, 1, fp) == 0) {
+ binsize = bufsize;
+ /* The error is reported by mrb_load_irep_buf_cxt() */
+ }
 }
 
 result = mrb_load_irep_buf_cxt(mrb, bin, binsize, c);
@@ -7417,12 +7442,10 @@
 }
 }
 n2 = n2->cdr;
- if (n2) {
- if (n2->car) {
- dump_prefix(n2, offset+2);
- printf("post:\n");
- dump_recur(mrb, n2->car, offset+3);
- }
+ if (n2 && n2->car) {
+ dump_prefix(n2, offset+2);
+ printf("post:\n");
+ dump_recur(mrb, n2->car, offset+3);
 }
 }
 }
@@ -7582,20 +7605,28 @@
 break;
 
 case NODE_REGX:
- printf("NODE_REGX /%s/%s\n", (char*)tree->car, (char*)tree->cdr);
+ printf("NODE_REGX /%s/\n", (char*)tree->car);
+ if (tree->cdr->car) {
+ dump_prefix(tree, offset+1);
+ printf("opt: %s\n", (char*)tree->cdr->car);
+ }
+ if (tree->cdr->cdr) {
+ dump_prefix(tree, offset+1);
+ printf("enc: %s\n", (char*)tree->cdr->cdr);
+ }
 break;
 
 case NODE_DREGX:
 printf("NODE_DREGX:\n");
 dump_recur(mrb, tree->car, offset+1);
- dump_prefix(tree, offset);
+ dump_prefix(tree, offset+1);
 printf("tail: %s\n", (char*)tree->cdr->cdr->car);
 if (tree->cdr->cdr->cdr->car) {
- dump_prefix(tree, offset);
+ dump_prefix(tree, offset+1);
 printf("opt: %s\n", (char*)tree->cdr->cdr->cdr->car);
 }
 if (tree->cdr->cdr->cdr->cdr) {
- dump_prefix(tree, offset);
+ dump_prefix(tree, offset+1);
 printf("enc: %s\n", (char*)tree->cdr->cdr->cdr->cdr);
 }
 break;

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/y.tab.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/y.tab.c Changed

@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5.1. */
+/* A Bison parser, made by GNU Bison 3.8.2. */
 
 /* Bison implementation for Yacc-like parsers in C
 
- Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
 Inc.
 
 This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
 
 /* As a special exception, you may create a larger work that contains
 part or all of the Bison parser skeleton and distribute that work
@@ -34,6 +34,10 @@
 /* C LALR(1) parser skeleton written by Richard Stallman, by
 simplifying the original so-called "semantic" parser. */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+ especially those whose name start with YY_ or yy_. They are
+ private implementation details that can be changed or removed. */
+
 /* All symbols defined below should begin with yy or YY, to avoid
 infringing on user name space. This should be done even for local
 variables, as they might otherwise be expanded by user macros.
@@ -41,14 +45,11 @@
 define necessary library symbols; they are noted "INFRINGES ON
 USER NAME SPACE" below. */
 
-/* Undocumented macros, especially those whose name start with YY_,
- are private implementation details. Do not rely on them. */
-
-/* Identify Bison output. */
-#define YYBISON 1
+/* Identify Bison output, and Bison version. */
+#define YYBISON 30802
 
-/* Bison version. */
-#define YYBISON_VERSION "3.5.1"
+/* Bison version string. */
+#define YYBISON_VERSION "3.8.2"
 
 /* Skeleton name. */
 #define YYSKELETON_NAME "yacc.c"
@@ -75,7 +76,6 @@
 #define YYSTACK_USE_ALLOCA 1
 
 #include <ctype.h>
-#include <errno.h>
 #include <string.h>
 #include <mruby.h>
 #include <mruby/compile.h>
@@ -84,6 +84,7 @@
 #include <mruby/throw.h>
 #include <mruby/string.h>
 #include <mruby/dump.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 #include "node.h"
 
@@ -153,6 +154,15 @@
 
 #define intern_op(op) MRB_OPSYM_2(p->mrb, op)
 
+static mrb_sym
+intern_numparam_gen(parser_state *p, int num)
+{
+ char buf3;
+ buf0 = '_'; buf1 = '0'+num; buf2 = '\0';
+ return intern(buf, 2);
+}
+#define intern_numparam(n) intern_numparam_gen(p,(n))
+
 static void
 cons_free_gen(parser_state *p, node *cons)
 {
@@ -172,6 +182,8 @@
 return m;
 }
 
+#define parser_pfree(ptr) do { if (sizeof(node) <= sizeof(*(ptr))) cons_free((node*)ptr);} while (0)
+
 static node*
 cons_gen(parser_state *p, node *car, node *cdr)
 {
@@ -182,7 +194,7 @@
 p->cells = p->cells->cdr;
 }
 else {
- c = (node *)parser_palloc(p, sizeof(mrb_ast_node));
+ c = (node*)parser_palloc(p, sizeof(mrb_ast_node));
 }
 
 c->car = car;
@@ -258,7 +270,7 @@
 static char*
 parser_strndup(parser_state *p, const char *s, size_t len)
 {
- char *b = (char *)parser_palloc(p, len+1);
+ char *b = (char*)parser_palloc(p, len+1);
 
 memcpy(b, s, len);
 blen = '\0';
@@ -390,7 +402,7 @@
 local_add_blk(parser_state *p, mrb_sym blk)
 {
 /* allocate register for block */
- local_add_f(p, blk ? blk : intern_op(and));
+ local_add_f(p, blk ? blk : 0);
 }
 
 static void
@@ -954,9 +966,9 @@
 
 /* (:kw_rest_args . a) */
 static node*
-new_kw_rest_args(parser_state *p, node *a)
+new_kw_rest_args(parser_state *p, mrb_sym sym)
 {
- return cons((node*)NODE_KW_REST_ARGS, a);
+ return cons((node*)NODE_KW_REST_ARGS, nsym(sym));
 }
 
 static node*
@@ -967,7 +979,7 @@
 mrb_sym b = intern_op(and);
 local_add_f(p, r);
 return new_args(p, m, 0, r, 0,
- new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
+ new_args_tail(p, 0, new_kw_rest_args(p, k), b));
 }
 
 /* (:block_arg . a) */
@@ -1057,13 +1069,13 @@
 new_imaginary(parser_state *p, node *imaginary)
 {
 return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Complex),
- new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary), 0, 0), 1);
+ new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary), 0, 0), '.');
 }
 
 static node*
 new_rational(parser_state *p, node *rational)
 {
- return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Rational), new_callargs(p, list1(rational), 0, 0), 1);
+ return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Rational), new_callargs(p, list1(rational), 0, 0), '.');
 }
 
 /* (:int . i) */
@@ -1243,7 +1255,7 @@
 static node*
 new_heredoc(parser_state *p)
 {
- parser_heredoc_info *inf = (parser_heredoc_info *)parser_palloc(p, sizeof(parser_heredoc_info));
+ parser_heredoc_info *inf = (parser_heredoc_info*)parser_palloc(p, sizeof(parser_heredoc_info));
 return cons((node*)NODE_HEREDOC, (node*)inf);
 }
 
@@ -1279,14 +1291,14 @@
 call_uni_op(parser_state *p, node *recv, const char *m)
 {
 void_expr_error(p, recv);
- return new_call(p, recv, intern_cstr(m), 0, 1);
+ return new_call(p, recv, intern_cstr(m), 0, '.');
 }
 
 /* (:call a op b) */
 static node*
 call_bin_op(parser_state *p, node *recv, const char *m, node *arg1)
 {
- return new_call(p, recv, intern_cstr(m), new_callargs(p, list1(arg1), 0, 0), 1);
+ return new_call(p, recv, intern_cstr(m), new_callargs(p, list1(arg1), 0, 0), '.');
 }
 
 static void
@@ -1334,6 +1346,12 @@
 if (!n->car) n->car = new_callargs(p, 0, 0, b);
 else args_with_block(p, n->car, b);
 break;
+ case NODE_RETURN:
+ case NODE_BREAK:
+ case NODE_NEXT:
+ if (a->cdr == NULL) return;
+ call_with_block(p, a->cdr, b);
+ break;
 default:
 break;
 }
@@ -1407,23 +1425,52 @@
 
 typedef enum mrb_string_type string_type;
 
-static node*
+typedef struct parser_lex_strterm {
+ int type;
+ int level;
+ int term;
+ int paren;
+ struct parser_lex_strterm *prev;
+} parser_lex_strterm;
+
+static parser_lex_strterm*
 new_strterm(parser_state *p, string_type type, int term, int paren)
 {
- return cons(nint(type), cons(nint(0), cons(nint(paren), nint(term))));
+ parser_lex_strterm *lex = (parser_lex_strterm*)parser_palloc(p, sizeof(parser_lex_strterm));
+ lex->type = type;
+ lex->level = 0;
+ lex->term = term;
+ lex->paren = paren;
+ lex->prev = p->lex_strterm;
+ return lex;
 }
 
 static void
 end_strterm(parser_state *p)
 {
- cons_free(p->lex_strterm->cdr->cdr);
- cons_free(p->lex_strterm->cdr);
- cons_free(p->lex_strterm);
+ parser_lex_strterm *term = p->lex_strterm->prev;
+ parser_pfree(p->lex_strterm);
+ p->lex_strterm = term;
+}
+
+static node*
+push_strterm(parser_state *p)
+{
+ node *n = cons((node*)p->lex_strterm, p->parsing_heredoc);
 p->lex_strterm = NULL;
+ return n;
+}
+
+static void
+pop_strterm(parser_state *p, node *n)
+{
+ p->lex_strterm = (parser_lex_strterm*)n->car;
+ p->parsing_heredoc = n->cdr;
+ cons_free(n);
 }
 
 static parser_heredoc_info *
-parsing_heredoc_inf(parser_state *p)
+parsing_heredoc_info(parser_state *p)
 {
 node *nd = p->parsing_heredoc;
 if (nd == NULL)
@@ -1435,45 +1482,12 @@
 static void
 heredoc_treat_nextline(parser_state *p)
 {
- if (p->heredocs_from_nextline == NULL)
- return;
- if (p->parsing_heredoc == NULL) {
- node *n;
- p->parsing_heredoc = p->heredocs_from_nextline;
- p->lex_strterm_before_heredoc = p->lex_strterm;
- p->lex_strterm = new_strterm(p, parsing_heredoc_inf(p)->type, 0, 0);
- n = p->all_heredocs;
- if (n) {
- while (n->cdr)
- n = n->cdr;
- n->cdr = p->parsing_heredoc;
- }
- else {
- p->all_heredocs = p->parsing_heredoc;
- }
- }
- else {
- node *n, *m;
- m = p->heredocs_from_nextline;
- while (m->cdr)
- m = m->cdr;
- n = p->all_heredocs;
- mrb_assert(n != NULL);
- if (n == p->parsing_heredoc) {
- m->cdr = n;
- p->all_heredocs = p->heredocs_from_nextline;
- p->parsing_heredoc = p->heredocs_from_nextline;
- }
- else {
- while (n->cdr != p->parsing_heredoc) {
- n = n->cdr;
- mrb_assert(n != NULL);
- }
- m->cdr = n->cdr;
- n->cdr = p->heredocs_from_nextline;
- p->parsing_heredoc = p->heredocs_from_nextline;
- }
+ if (p->heredocs_from_nextline == NULL) return;
+ if (p->parsing_heredoc && p->lex_strterm) {
+ append(p->heredocs_from_nextline, p->parsing_heredoc);
 }
+ p->parsing_heredoc = p->heredocs_from_nextline;
+ p->lex_strterm = new_strterm(p, parsing_heredoc_info(p)->type, 0, 0);
 p->heredocs_from_nextline = NULL;
 }
 
@@ -1484,20 +1498,18 @@
 if (p->parsing_heredoc == NULL) {
 p->lstate = EXPR_BEG;
 end_strterm(p);
- p->lex_strterm = p->lex_strterm_before_heredoc;
- p->lex_strterm_before_heredoc = NULL;
 }
 else {
 /* next heredoc */
- p->lex_strterm->car = nint(parsing_heredoc_inf(p)->type);
+ p->lex_strterm->type = parsing_heredoc_info(p)->type;
 }
 }
-#define is_strterm_type(p,str_func) (intn((p)->lex_strterm->car) & (str_func))
+#define is_strterm_type(p,str_func) ((p)->lex_strterm->type & (str_func))
 
 /* xxx ----------------------------- */
 
 
-#line 1501 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 1513 "mrbgems/mruby-compiler/core/y.tab.c"
 
 # ifndef YY_CAST
 # ifdef __cplusplus
@@ -1520,14 +1532,6 @@
 # endif
 # endif
 
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 1
-#endif
-
 
 /* Debug traces. */
 #ifndef YYDEBUG
@@ -1537,139 +1541,144 @@
 extern int yydebug;
 #endif
 
-/* Token type. */
+/* Token kinds. */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
 enum yytokentype
 {
- keyword_class = 258,
- keyword_module = 259,
- keyword_def = 260,
- keyword_begin = 261,
- keyword_if = 262,
- keyword_unless = 263,
- keyword_while = 264,
- keyword_until = 265,
- keyword_for = 266,
- keyword_undef = 267,
- keyword_rescue = 268,
- keyword_ensure = 269,
- keyword_end = 270,
- keyword_then = 271,
- keyword_elsif = 272,
- keyword_else = 273,
- keyword_case = 274,
- keyword_when = 275,
- keyword_break = 276,
- keyword_next = 277,
- keyword_redo = 278,
- keyword_retry = 279,
- keyword_in = 280,
- keyword_do = 281,
- keyword_do_cond = 282,
- keyword_do_block = 283,
- keyword_do_LAMBDA = 284,
- keyword_return = 285,
- keyword_yield = 286,
- keyword_super = 287,
- keyword_self = 288,
- keyword_nil = 289,
- keyword_true = 290,
- keyword_false = 291,
- keyword_and = 292,
- keyword_or = 293,
- keyword_not = 294,
- modifier_if = 295,
- modifier_unless = 296,
- modifier_while = 297,
- modifier_until = 298,
- modifier_rescue = 299,
- keyword_alias = 300,
- keyword_BEGIN = 301,
- keyword_END = 302,
- keyword__LINE__ = 303,
- keyword__FILE__ = 304,
- keyword__ENCODING__ = 305,
- tIDENTIFIER = 306,
- tFID = 307,
- tGVAR = 308,
- tIVAR = 309,
- tCONSTANT = 310,
- tCVAR = 311,
- tLABEL_TAG = 312,
- tINTEGER = 313,
- tFLOAT = 314,
- tCHAR = 315,
- tXSTRING = 316,
- tREGEXP = 317,
- tSTRING = 318,
- tSTRING_PART = 319,
- tSTRING_MID = 320,
- tNTH_REF = 321,
- tBACK_REF = 322,
- tREGEXP_END = 323,
- tNUMPARAM = 324,
- tUPLUS = 325,
- tUMINUS = 326,
- tCMP = 327,
- tEQ = 328,
- tEQQ = 329,
- tNEQ = 330,
- tGEQ = 331,
- tLEQ = 332,
- tANDOP = 333,
- tOROP = 334,
- tMATCH = 335,
- tNMATCH = 336,
- tDOT2 = 337,
- tDOT3 = 338,
- tBDOT2 = 339,
- tBDOT3 = 340,
- tAREF = 341,
- tASET = 342,
- tLSHFT = 343,
- tRSHFT = 344,
- tCOLON2 = 345,
- tCOLON3 = 346,
- tOP_ASGN = 347,
- tASSOC = 348,
- tLPAREN = 349,
- tLPAREN_ARG = 350,
- tRPAREN = 351,
- tLBRACK = 352,
- tLBRACE = 353,
- tLBRACE_ARG = 354,
- tSTAR = 355,
- tPOW = 356,
- tDSTAR = 357,
- tAMPER = 358,
- tLAMBDA = 359,
- tANDDOT = 360,
- tSYMBEG = 361,
- tSTRING_BEG = 362,
- tXSTRING_BEG = 363,
- tSTRING_DVAR = 364,
- tREGEXP_BEG = 365,
- tWORDS_BEG = 366,
- tSYMBOLS_BEG = 367,
- tLAMBEG = 368,
- tHEREDOC_BEG = 369,
- tHEREDOC_END = 370,
- tLITERAL_DELIM = 371,
- tHD_LITERAL_DELIM = 372,
- tHD_STRING_PART = 373,
- tHD_STRING_MID = 374,
- tLOWEST = 375,
- tUMINUS_NUM = 376,
- tLAST_TOKEN = 377
+ YYEMPTY = -2,
+ YYEOF = 0, /* "end of file" */
+ YYerror = 256, /* error */
+ YYUNDEF = 257, /* "invalid token" */
+ keyword_class = 258, /* keyword_class */
+ keyword_module = 259, /* keyword_module */
+ keyword_def = 260, /* keyword_def */
+ keyword_begin = 261, /* keyword_begin */
+ keyword_if = 262, /* keyword_if */
+ keyword_unless = 263, /* keyword_unless */
+ keyword_while = 264, /* keyword_while */
+ keyword_until = 265, /* keyword_until */
+ keyword_for = 266, /* keyword_for */
+ keyword_undef = 267, /* keyword_undef */
+ keyword_rescue = 268, /* keyword_rescue */
+ keyword_ensure = 269, /* keyword_ensure */
+ keyword_end = 270, /* keyword_end */
+ keyword_then = 271, /* keyword_then */
+ keyword_elsif = 272, /* keyword_elsif */
+ keyword_else = 273, /* keyword_else */
+ keyword_case = 274, /* keyword_case */
+ keyword_when = 275, /* keyword_when */
+ keyword_break = 276, /* keyword_break */
+ keyword_next = 277, /* keyword_next */
+ keyword_redo = 278, /* keyword_redo */
+ keyword_retry = 279, /* keyword_retry */
+ keyword_in = 280, /* keyword_in */
+ keyword_do = 281, /* keyword_do */
+ keyword_do_cond = 282, /* keyword_do_cond */
+ keyword_do_block = 283, /* keyword_do_block */
+ keyword_do_LAMBDA = 284, /* keyword_do_LAMBDA */
+ keyword_return = 285, /* keyword_return */
+ keyword_yield = 286, /* keyword_yield */
+ keyword_super = 287, /* keyword_super */
+ keyword_self = 288, /* keyword_self */
+ keyword_nil = 289, /* keyword_nil */
+ keyword_true = 290, /* keyword_true */
+ keyword_false = 291, /* keyword_false */
+ keyword_and = 292, /* keyword_and */
+ keyword_or = 293, /* keyword_or */
+ keyword_not = 294, /* keyword_not */
+ modifier_if = 295, /* modifier_if */
+ modifier_unless = 296, /* modifier_unless */
+ modifier_while = 297, /* modifier_while */
+ modifier_until = 298, /* modifier_until */
+ modifier_rescue = 299, /* modifier_rescue */
+ keyword_alias = 300, /* keyword_alias */
+ keyword_BEGIN = 301, /* keyword_BEGIN */
+ keyword_END = 302, /* keyword_END */
+ keyword__LINE__ = 303, /* keyword__LINE__ */
+ keyword__FILE__ = 304, /* keyword__FILE__ */
+ keyword__ENCODING__ = 305, /* keyword__ENCODING__ */
+ tIDENTIFIER = 306, /* "local variable or method" */
+ tFID = 307, /* "method" */
+ tGVAR = 308, /* "global variable" */
+ tIVAR = 309, /* "instance variable" */
+ tCONSTANT = 310, /* "constant" */
+ tCVAR = 311, /* "class variable" */
+ tLABEL_TAG = 312, /* "label" */
+ tINTEGER = 313, /* "integer literal" */
+ tFLOAT = 314, /* "float literal" */
+ tCHAR = 315, /* "character literal" */
+ tXSTRING = 316, /* tXSTRING */
+ tREGEXP = 317, /* tREGEXP */
+ tSTRING = 318, /* tSTRING */
+ tSTRING_PART = 319, /* tSTRING_PART */
+ tSTRING_MID = 320, /* tSTRING_MID */
+ tNTH_REF = 321, /* tNTH_REF */
+ tBACK_REF = 322, /* tBACK_REF */
+ tREGEXP_END = 323, /* tREGEXP_END */
+ tNUMPARAM = 324, /* "numbered parameter" */
+ tUPLUS = 325, /* "unary plus" */
+ tUMINUS = 326, /* "unary minus" */
+ tCMP = 327, /* "<=>" */
+ tEQ = 328, /* "==" */
+ tEQQ = 329, /* "===" */
+ tNEQ = 330, /* "!=" */
+ tGEQ = 331, /* ">=" */
+ tLEQ = 332, /* "<=" */
+ tANDOP = 333, /* "&&" */
+ tOROP = 334, /* "||" */
+ tMATCH = 335, /* "=~" */
+ tNMATCH = 336, /* "!~" */
+ tDOT2 = 337, /* ".." */
+ tDOT3 = 338, /* "..." */
+ tBDOT2 = 339, /* tBDOT2 */
+ tBDOT3 = 340, /* tBDOT3 */
+ tAREF = 341, /* tAREF */
+ tASET = 342, /* tASET */
+ tLSHFT = 343, /* "<<" */
+ tRSHFT = 344, /* ">>" */
+ tCOLON2 = 345, /* "::" */
+ tCOLON3 = 346, /* tCOLON3 */
+ tOP_ASGN = 347, /* tOP_ASGN */
+ tASSOC = 348, /* "=>" */
+ tLPAREN = 349, /* tLPAREN */
+ tLPAREN_ARG = 350, /* "(" */
+ tRPAREN = 351, /* ")" */
+ tLBRACK = 352, /* "" */
+ tLBRACE = 353, /* tLBRACE */
+ tLBRACE_ARG = 354, /* "{" */
+ tSTAR = 355, /* "*" */
+ tPOW = 356, /* tPOW */
+ tDSTAR = 357, /* "**" */
+ tAMPER = 358, /* "&" */
+ tLAMBDA = 359, /* "->" */
+ tANDDOT = 360, /* "&." */
+ tSYMBEG = 361, /* "symbol" */
+ tSTRING_BEG = 362, /* "string literal" */
+ tXSTRING_BEG = 363, /* tXSTRING_BEG */
+ tSTRING_DVAR = 364, /* tSTRING_DVAR */
+ tREGEXP_BEG = 365, /* tREGEXP_BEG */
+ tWORDS_BEG = 366, /* tWORDS_BEG */
+ tSYMBOLS_BEG = 367, /* tSYMBOLS_BEG */
+ tLAMBEG = 368, /* tLAMBEG */
+ tHEREDOC_BEG = 369, /* "here document" */
+ tHEREDOC_END = 370, /* tHEREDOC_END */
+ tLITERAL_DELIM = 371, /* tLITERAL_DELIM */
+ tHD_LITERAL_DELIM = 372, /* tHD_LITERAL_DELIM */
+ tHD_STRING_PART = 373, /* tHD_STRING_PART */
+ tHD_STRING_MID = 374, /* tHD_STRING_MID */
+ tLOWEST = 375, /* tLOWEST */
+ tUMINUS_NUM = 376, /* tUMINUS_NUM */
+ tLAST_TOKEN = 377 /* tLAST_TOKEN */
 };
+ typedef enum yytokentype yytoken_kind_t;
 #endif
 
 /* Value type. */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 1443 "mrbgems/mruby-compiler/core/parse.y"
+#line 1454 "mrbgems/mruby-compiler/core/parse.y"
 
 node *nd;
 mrb_sym id;
@@ -1677,7 +1686,7 @@
 stack_type stack;
 const struct vtable *vars;
 
-#line 1681 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 1690 "mrbgems/mruby-compiler/core/y.tab.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -1687,10 +1696,344 @@
 
 
 
+
 int yyparse (parser_state *p);
 
 
 
+/* Symbol kind. */
+enum yysymbol_kind_t
+{
+ YYSYMBOL_YYEMPTY = -2,
+ YYSYMBOL_YYEOF = 0, /* "end of file" */
+ YYSYMBOL_YYerror = 1, /* error */
+ YYSYMBOL_YYUNDEF = 2, /* "invalid token" */
+ YYSYMBOL_keyword_class = 3, /* keyword_class */
+ YYSYMBOL_keyword_module = 4, /* keyword_module */
+ YYSYMBOL_keyword_def = 5, /* keyword_def */
+ YYSYMBOL_keyword_begin = 6, /* keyword_begin */
+ YYSYMBOL_keyword_if = 7, /* keyword_if */
+ YYSYMBOL_keyword_unless = 8, /* keyword_unless */
+ YYSYMBOL_keyword_while = 9, /* keyword_while */
+ YYSYMBOL_keyword_until = 10, /* keyword_until */
+ YYSYMBOL_keyword_for = 11, /* keyword_for */
+ YYSYMBOL_keyword_undef = 12, /* keyword_undef */
+ YYSYMBOL_keyword_rescue = 13, /* keyword_rescue */
+ YYSYMBOL_keyword_ensure = 14, /* keyword_ensure */
+ YYSYMBOL_keyword_end = 15, /* keyword_end */
+ YYSYMBOL_keyword_then = 16, /* keyword_then */
+ YYSYMBOL_keyword_elsif = 17, /* keyword_elsif */
+ YYSYMBOL_keyword_else = 18, /* keyword_else */
+ YYSYMBOL_keyword_case = 19, /* keyword_case */
+ YYSYMBOL_keyword_when = 20, /* keyword_when */
+ YYSYMBOL_keyword_break = 21, /* keyword_break */
+ YYSYMBOL_keyword_next = 22, /* keyword_next */
+ YYSYMBOL_keyword_redo = 23, /* keyword_redo */
+ YYSYMBOL_keyword_retry = 24, /* keyword_retry */
+ YYSYMBOL_keyword_in = 25, /* keyword_in */
+ YYSYMBOL_keyword_do = 26, /* keyword_do */
+ YYSYMBOL_keyword_do_cond = 27, /* keyword_do_cond */
+ YYSYMBOL_keyword_do_block = 28, /* keyword_do_block */
+ YYSYMBOL_keyword_do_LAMBDA = 29, /* keyword_do_LAMBDA */
+ YYSYMBOL_keyword_return = 30, /* keyword_return */
+ YYSYMBOL_keyword_yield = 31, /* keyword_yield */
+ YYSYMBOL_keyword_super = 32, /* keyword_super */
+ YYSYMBOL_keyword_self = 33, /* keyword_self */
+ YYSYMBOL_keyword_nil = 34, /* keyword_nil */
+ YYSYMBOL_keyword_true = 35, /* keyword_true */
+ YYSYMBOL_keyword_false = 36, /* keyword_false */
+ YYSYMBOL_keyword_and = 37, /* keyword_and */
+ YYSYMBOL_keyword_or = 38, /* keyword_or */
+ YYSYMBOL_keyword_not = 39, /* keyword_not */
+ YYSYMBOL_modifier_if = 40, /* modifier_if */
+ YYSYMBOL_modifier_unless = 41, /* modifier_unless */
+ YYSYMBOL_modifier_while = 42, /* modifier_while */
+ YYSYMBOL_modifier_until = 43, /* modifier_until */
+ YYSYMBOL_modifier_rescue = 44, /* modifier_rescue */
+ YYSYMBOL_keyword_alias = 45, /* keyword_alias */
+ YYSYMBOL_keyword_BEGIN = 46, /* keyword_BEGIN */
+ YYSYMBOL_keyword_END = 47, /* keyword_END */
+ YYSYMBOL_keyword__LINE__ = 48, /* keyword__LINE__ */
+ YYSYMBOL_keyword__FILE__ = 49, /* keyword__FILE__ */
+ YYSYMBOL_keyword__ENCODING__ = 50, /* keyword__ENCODING__ */
+ YYSYMBOL_tIDENTIFIER = 51, /* "local variable or method" */
+ YYSYMBOL_tFID = 52, /* "method" */
+ YYSYMBOL_tGVAR = 53, /* "global variable" */
+ YYSYMBOL_tIVAR = 54, /* "instance variable" */
+ YYSYMBOL_tCONSTANT = 55, /* "constant" */
+ YYSYMBOL_tCVAR = 56, /* "class variable" */
+ YYSYMBOL_tLABEL_TAG = 57, /* "label" */
+ YYSYMBOL_tINTEGER = 58, /* "integer literal" */
+ YYSYMBOL_tFLOAT = 59, /* "float literal" */
+ YYSYMBOL_tCHAR = 60, /* "character literal" */
+ YYSYMBOL_tXSTRING = 61, /* tXSTRING */
+ YYSYMBOL_tREGEXP = 62, /* tREGEXP */
+ YYSYMBOL_tSTRING = 63, /* tSTRING */
+ YYSYMBOL_tSTRING_PART = 64, /* tSTRING_PART */
+ YYSYMBOL_tSTRING_MID = 65, /* tSTRING_MID */
+ YYSYMBOL_tNTH_REF = 66, /* tNTH_REF */
+ YYSYMBOL_tBACK_REF = 67, /* tBACK_REF */
+ YYSYMBOL_tREGEXP_END = 68, /* tREGEXP_END */
+ YYSYMBOL_tNUMPARAM = 69, /* "numbered parameter" */
+ YYSYMBOL_tUPLUS = 70, /* "unary plus" */
+ YYSYMBOL_tUMINUS = 71, /* "unary minus" */
+ YYSYMBOL_tCMP = 72, /* "<=>" */
+ YYSYMBOL_tEQ = 73, /* "==" */
+ YYSYMBOL_tEQQ = 74, /* "===" */
+ YYSYMBOL_tNEQ = 75, /* "!=" */
+ YYSYMBOL_tGEQ = 76, /* ">=" */
+ YYSYMBOL_tLEQ = 77, /* "<=" */
+ YYSYMBOL_tANDOP = 78, /* "&&" */
+ YYSYMBOL_tOROP = 79, /* "||" */
+ YYSYMBOL_tMATCH = 80, /* "=~" */
+ YYSYMBOL_tNMATCH = 81, /* "!~" */
+ YYSYMBOL_tDOT2 = 82, /* ".." */
+ YYSYMBOL_tDOT3 = 83, /* "..." */
+ YYSYMBOL_tBDOT2 = 84, /* tBDOT2 */
+ YYSYMBOL_tBDOT3 = 85, /* tBDOT3 */
+ YYSYMBOL_tAREF = 86, /* tAREF */
+ YYSYMBOL_tASET = 87, /* tASET */
+ YYSYMBOL_tLSHFT = 88, /* "<<" */
+ YYSYMBOL_tRSHFT = 89, /* ">>" */
+ YYSYMBOL_tCOLON2 = 90, /* "::" */
+ YYSYMBOL_tCOLON3 = 91, /* tCOLON3 */
+ YYSYMBOL_tOP_ASGN = 92, /* tOP_ASGN */
+ YYSYMBOL_tASSOC = 93, /* "=>" */
+ YYSYMBOL_tLPAREN = 94, /* tLPAREN */
+ YYSYMBOL_tLPAREN_ARG = 95, /* "(" */
+ YYSYMBOL_tRPAREN = 96, /* ")" */
+ YYSYMBOL_tLBRACK = 97, /* "" */
+ YYSYMBOL_tLBRACE = 98, /* tLBRACE */
+ YYSYMBOL_tLBRACE_ARG = 99, /* "{" */
+ YYSYMBOL_tSTAR = 100, /* "*" */
+ YYSYMBOL_tPOW = 101, /* tPOW */
+ YYSYMBOL_tDSTAR = 102, /* "**" */
+ YYSYMBOL_tAMPER = 103, /* "&" */
+ YYSYMBOL_tLAMBDA = 104, /* "->" */
+ YYSYMBOL_tANDDOT = 105, /* "&." */
+ YYSYMBOL_tSYMBEG = 106, /* "symbol" */
+ YYSYMBOL_tSTRING_BEG = 107, /* "string literal" */
+ YYSYMBOL_tXSTRING_BEG = 108, /* tXSTRING_BEG */
+ YYSYMBOL_tSTRING_DVAR = 109, /* tSTRING_DVAR */
+ YYSYMBOL_tREGEXP_BEG = 110, /* tREGEXP_BEG */
+ YYSYMBOL_tWORDS_BEG = 111, /* tWORDS_BEG */
+ YYSYMBOL_tSYMBOLS_BEG = 112, /* tSYMBOLS_BEG */
+ YYSYMBOL_tLAMBEG = 113, /* tLAMBEG */
+ YYSYMBOL_tHEREDOC_BEG = 114, /* "here document" */
+ YYSYMBOL_tHEREDOC_END = 115, /* tHEREDOC_END */
+ YYSYMBOL_tLITERAL_DELIM = 116, /* tLITERAL_DELIM */
+ YYSYMBOL_tHD_LITERAL_DELIM = 117, /* tHD_LITERAL_DELIM */
+ YYSYMBOL_tHD_STRING_PART = 118, /* tHD_STRING_PART */
+ YYSYMBOL_tHD_STRING_MID = 119, /* tHD_STRING_MID */
+ YYSYMBOL_tLOWEST = 120, /* tLOWEST */
+ YYSYMBOL_121_ = 121, /* '=' */
+ YYSYMBOL_122_ = 122, /* '?' */
+ YYSYMBOL_123_ = 123, /* ':' */
+ YYSYMBOL_124_ = 124, /* '>' */
+ YYSYMBOL_125_ = 125, /* '<' */
+ YYSYMBOL_126_ = 126, /* '|' */
+ YYSYMBOL_127_ = 127, /* '^' */
+ YYSYMBOL_128_ = 128, /* '&' */
+ YYSYMBOL_129_ = 129, /* '+' */
+ YYSYMBOL_130_ = 130, /* '-' */
+ YYSYMBOL_131_ = 131, /* '*' */
+ YYSYMBOL_132_ = 132, /* '/' */
+ YYSYMBOL_133_ = 133, /* '%' */
+ YYSYMBOL_tUMINUS_NUM = 134, /* tUMINUS_NUM */
+ YYSYMBOL_135_ = 135, /* '!' */
+ YYSYMBOL_136_ = 136, /* '~' */
+ YYSYMBOL_tLAST_TOKEN = 137, /* tLAST_TOKEN */
+ YYSYMBOL_138_ = 138, /* '{' */
+ YYSYMBOL_139_ = 139, /* '}' */
+ YYSYMBOL_140_ = 140, /* '' */
+ YYSYMBOL_141_ = 141, /* '' */
+ YYSYMBOL_142_ = 142, /* ',' */
+ YYSYMBOL_143_ = 143, /* '`' */
+ YYSYMBOL_144_ = 144, /* '(' */
+ YYSYMBOL_145_ = 145, /* ')' */
+ YYSYMBOL_146_ = 146, /* ';' */
+ YYSYMBOL_147_ = 147, /* '.' */
+ YYSYMBOL_148_n_ = 148, /* '\n' */
+ YYSYMBOL_YYACCEPT = 149, /* $accept */
+ YYSYMBOL_program = 150, /* program */
+ YYSYMBOL_151_1 = 151, /* $@1 */
+ YYSYMBOL_top_compstmt = 152, /* top_compstmt */
+ YYSYMBOL_top_stmts = 153, /* top_stmts */
+ YYSYMBOL_top_stmt = 154, /* top_stmt */
+ YYSYMBOL_155_2 = 155, /* @2 */
+ YYSYMBOL_bodystmt = 156, /* bodystmt */
+ YYSYMBOL_compstmt = 157, /* compstmt */
+ YYSYMBOL_stmts = 158, /* stmts */
+ YYSYMBOL_stmt = 159, /* stmt */
+ YYSYMBOL_160_3 = 160, /* $@3 */
+ YYSYMBOL_command_asgn = 161, /* command_asgn */
+ YYSYMBOL_command_rhs = 162, /* command_rhs */
+ YYSYMBOL_expr = 163, /* expr */
+ YYSYMBOL_defn_head = 164, /* defn_head */
+ YYSYMBOL_defs_head = 165, /* defs_head */
+ YYSYMBOL_166_4 = 166, /* $@4 */
+ YYSYMBOL_expr_value = 167, /* expr_value */
+ YYSYMBOL_command_call = 168, /* command_call */
+ YYSYMBOL_block_command = 169, /* block_command */
+ YYSYMBOL_cmd_brace_block = 170, /* cmd_brace_block */
+ YYSYMBOL_171_5 = 171, /* $@5 */
+ YYSYMBOL_command = 172, /* command */
+ YYSYMBOL_mlhs = 173, /* mlhs */
+ YYSYMBOL_mlhs_inner = 174, /* mlhs_inner */
+ YYSYMBOL_mlhs_basic = 175, /* mlhs_basic */
+ YYSYMBOL_mlhs_item = 176, /* mlhs_item */
+ YYSYMBOL_mlhs_list = 177, /* mlhs_list */
+ YYSYMBOL_mlhs_post = 178, /* mlhs_post */
+ YYSYMBOL_mlhs_node = 179, /* mlhs_node */
+ YYSYMBOL_lhs = 180, /* lhs */
+ YYSYMBOL_cname = 181, /* cname */
+ YYSYMBOL_cpath = 182, /* cpath */
+ YYSYMBOL_fname = 183, /* fname */
+ YYSYMBOL_fsym = 184, /* fsym */
+ YYSYMBOL_undef_list = 185, /* undef_list */
+ YYSYMBOL_186_6 = 186, /* $@6 */
+ YYSYMBOL_op = 187, /* op */
+ YYSYMBOL_reswords = 188, /* reswords */
+ YYSYMBOL_arg = 189, /* arg */
+ YYSYMBOL_aref_args = 190, /* aref_args */
+ YYSYMBOL_arg_rhs = 191, /* arg_rhs */
+ YYSYMBOL_paren_args = 192, /* paren_args */
+ YYSYMBOL_opt_paren_args = 193, /* opt_paren_args */
+ YYSYMBOL_opt_call_args = 194, /* opt_call_args */
+ YYSYMBOL_call_args = 195, /* call_args */
+ YYSYMBOL_command_args = 196, /* command_args */
+ YYSYMBOL_197_7 = 197, /* @7 */
+ YYSYMBOL_block_arg = 198, /* block_arg */
+ YYSYMBOL_opt_block_arg = 199, /* opt_block_arg */
+ YYSYMBOL_comma = 200, /* comma */
+ YYSYMBOL_args = 201, /* args */
+ YYSYMBOL_mrhs = 202, /* mrhs */
+ YYSYMBOL_primary = 203, /* primary */
+ YYSYMBOL_204_8 = 204, /* @8 */
+ YYSYMBOL_205_9 = 205, /* @9 */
+ YYSYMBOL_206_10 = 206, /* $@10 */
+ YYSYMBOL_207_11 = 207, /* $@11 */
+ YYSYMBOL_208_12 = 208, /* @12 */
+ YYSYMBOL_209_13 = 209, /* @13 */
+ YYSYMBOL_210_14 = 210, /* $@14 */
+ YYSYMBOL_211_15 = 211, /* $@15 */
+ YYSYMBOL_212_16 = 212, /* $@16 */
+ YYSYMBOL_213_17 = 213, /* $@17 */
+ YYSYMBOL_214_18 = 214, /* $@18 */
+ YYSYMBOL_215_19 = 215, /* $@19 */
+ YYSYMBOL_216_20 = 216, /* @20 */
+ YYSYMBOL_217_21 = 217, /* @21 */
+ YYSYMBOL_218_22 = 218, /* @22 */
+ YYSYMBOL_219_23 = 219, /* @23 */
+ YYSYMBOL_primary_value = 220, /* primary_value */
+ YYSYMBOL_then = 221, /* then */
+ YYSYMBOL_do = 222, /* do */
+ YYSYMBOL_if_tail = 223, /* if_tail */
+ YYSYMBOL_opt_else = 224, /* opt_else */
+ YYSYMBOL_for_var = 225, /* for_var */
+ YYSYMBOL_f_margs = 226, /* f_margs */
+ YYSYMBOL_227_24 = 227, /* $@24 */
+ YYSYMBOL_block_args_tail = 228, /* block_args_tail */
+ YYSYMBOL_opt_block_args_tail = 229, /* opt_block_args_tail */
+ YYSYMBOL_block_param = 230, /* block_param */
+ YYSYMBOL_opt_block_param = 231, /* opt_block_param */
+ YYSYMBOL_block_param_def = 232, /* block_param_def */
+ YYSYMBOL_233_25 = 233, /* $@25 */
+ YYSYMBOL_opt_bv_decl = 234, /* opt_bv_decl */
+ YYSYMBOL_bv_decls = 235, /* bv_decls */
+ YYSYMBOL_bvar = 236, /* bvar */
+ YYSYMBOL_f_larglist = 237, /* f_larglist */
+ YYSYMBOL_lambda_body = 238, /* lambda_body */
+ YYSYMBOL_do_block = 239, /* do_block */
+ YYSYMBOL_240_26 = 240, /* $@26 */
+ YYSYMBOL_block_call = 241, /* block_call */
+ YYSYMBOL_method_call = 242, /* method_call */
+ YYSYMBOL_brace_block = 243, /* brace_block */
+ YYSYMBOL_244_27 = 244, /* @27 */
+ YYSYMBOL_245_28 = 245, /* @28 */
+ YYSYMBOL_case_body = 246, /* case_body */
+ YYSYMBOL_cases = 247, /* cases */
+ YYSYMBOL_opt_rescue = 248, /* opt_rescue */
+ YYSYMBOL_exc_list = 249, /* exc_list */
+ YYSYMBOL_exc_var = 250, /* exc_var */
+ YYSYMBOL_opt_ensure = 251, /* opt_ensure */
+ YYSYMBOL_literal = 252, /* literal */
+ YYSYMBOL_string = 253, /* string */
+ YYSYMBOL_string_fragment = 254, /* string_fragment */
+ YYSYMBOL_string_rep = 255, /* string_rep */
+ YYSYMBOL_string_interp = 256, /* string_interp */
+ YYSYMBOL_257_29 = 257, /* @29 */
+ YYSYMBOL_xstring = 258, /* xstring */
+ YYSYMBOL_regexp = 259, /* regexp */
+ YYSYMBOL_heredoc = 260, /* heredoc */
+ YYSYMBOL_heredoc_bodies = 261, /* heredoc_bodies */
+ YYSYMBOL_heredoc_body = 262, /* heredoc_body */
+ YYSYMBOL_heredoc_string_rep = 263, /* heredoc_string_rep */
+ YYSYMBOL_heredoc_string_interp = 264, /* heredoc_string_interp */
+ YYSYMBOL_265_30 = 265, /* @30 */
+ YYSYMBOL_words = 266, /* words */
+ YYSYMBOL_symbol = 267, /* symbol */
+ YYSYMBOL_basic_symbol = 268, /* basic_symbol */
+ YYSYMBOL_sym = 269, /* sym */
+ YYSYMBOL_symbols = 270, /* symbols */
+ YYSYMBOL_numeric = 271, /* numeric */
+ YYSYMBOL_variable = 272, /* variable */
+ YYSYMBOL_var_lhs = 273, /* var_lhs */
+ YYSYMBOL_var_ref = 274, /* var_ref */
+ YYSYMBOL_backref = 275, /* backref */
+ YYSYMBOL_superclass = 276, /* superclass */
+ YYSYMBOL_277_31 = 277, /* $@31 */
+ YYSYMBOL_f_opt_arglist_paren = 278, /* f_opt_arglist_paren */
+ YYSYMBOL_f_arglist_paren = 279, /* f_arglist_paren */
+ YYSYMBOL_f_arglist = 280, /* f_arglist */
+ YYSYMBOL_f_label = 281, /* f_label */
+ YYSYMBOL_f_kw = 282, /* f_kw */
+ YYSYMBOL_f_block_kw = 283, /* f_block_kw */
+ YYSYMBOL_f_block_kwarg = 284, /* f_block_kwarg */
+ YYSYMBOL_f_kwarg = 285, /* f_kwarg */
+ YYSYMBOL_kwrest_mark = 286, /* kwrest_mark */
+ YYSYMBOL_f_kwrest = 287, /* f_kwrest */
+ YYSYMBOL_args_tail = 288, /* args_tail */
+ YYSYMBOL_opt_args_tail = 289, /* opt_args_tail */
+ YYSYMBOL_f_args = 290, /* f_args */
+ YYSYMBOL_f_bad_arg = 291, /* f_bad_arg */
+ YYSYMBOL_f_norm_arg = 292, /* f_norm_arg */
+ YYSYMBOL_f_arg_item = 293, /* f_arg_item */
+ YYSYMBOL_294_32 = 294, /* @32 */
+ YYSYMBOL_f_arg = 295, /* f_arg */
+ YYSYMBOL_f_opt_asgn = 296, /* f_opt_asgn */
+ YYSYMBOL_f_opt = 297, /* f_opt */
+ YYSYMBOL_f_block_opt = 298, /* f_block_opt */
+ YYSYMBOL_f_block_optarg = 299, /* f_block_optarg */
+ YYSYMBOL_f_optarg = 300, /* f_optarg */
+ YYSYMBOL_restarg_mark = 301, /* restarg_mark */
+ YYSYMBOL_f_rest_arg = 302, /* f_rest_arg */
+ YYSYMBOL_blkarg_mark = 303, /* blkarg_mark */
+ YYSYMBOL_f_block_arg = 304, /* f_block_arg */
+ YYSYMBOL_opt_f_block_arg = 305, /* opt_f_block_arg */
+ YYSYMBOL_singleton = 306, /* singleton */
+ YYSYMBOL_307_33 = 307, /* $@33 */
+ YYSYMBOL_assoc_list = 308, /* assoc_list */
+ YYSYMBOL_assocs = 309, /* assocs */
+ YYSYMBOL_assoc = 310, /* assoc */
+ YYSYMBOL_operation = 311, /* operation */
+ YYSYMBOL_operation2 = 312, /* operation2 */
+ YYSYMBOL_operation3 = 313, /* operation3 */
+ YYSYMBOL_dot_or_colon = 314, /* dot_or_colon */
+ YYSYMBOL_call_op = 315, /* call_op */
+ YYSYMBOL_call_op2 = 316, /* call_op2 */
+ YYSYMBOL_opt_terms = 317, /* opt_terms */
+ YYSYMBOL_opt_nl = 318, /* opt_nl */
+ YYSYMBOL_rparen = 319, /* rparen */
+ YYSYMBOL_trailer = 320, /* trailer */
+ YYSYMBOL_term = 321, /* term */
+ YYSYMBOL_nl = 322, /* nl */
+ YYSYMBOL_terms = 323, /* terms */
+ YYSYMBOL_none = 324 /* none */
+};
+typedef enum yysymbol_kind_t yysymbol_kind_t;
+
+
 
 
 #ifdef short
@@ -1730,6 +2073,18 @@
 typedef short yytype_int16;
 #endif
 
+/* Work around bug in HP-UX 11.23, which defines these macros
+ incorrectly for preprocessor constants. This workaround can likely
+ be removed in 2023, as HPE has promised support for HP-UX 11.23
+ (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of
+ <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>. */
+#ifdef __hpux
+# undef UINT_LEAST8_MAX
+# undef UINT_LEAST16_MAX
+# define UINT_LEAST8_MAX 255
+# define UINT_LEAST16_MAX 65535
+#endif
+
 #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
 typedef __UINT_LEAST8_TYPE__ yytype_uint8;
 #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
@@ -1789,6 +2144,7 @@
 
 #define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
 
+
 /* Stored state numbers (used for stacks). */
 typedef yytype_int16 yy_state_t;
 
@@ -1807,6 +2163,7 @@
 # endif
 #endif
 
+
 #ifndef YY_ATTRIBUTE_PURE
 # if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
 # define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -1825,17 +2182,23 @@
 
 /* Suppress unused-variable warnings by "using" E. */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
+# define YY_USE(E) ((void) (E))
 #else
-# define YYUSE(E) /* empty */
+# define YY_USE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized. */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
+# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
+# else
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
 _Pragma ("GCC diagnostic push") \
 _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \
 _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
 _Pragma ("GCC diagnostic pop")
 #else
@@ -1864,7 +2227,7 @@
 
 #define YY_ASSERT(E) ((void) (0 && (E)))
 
-#if ! defined yyoverflow || YYERROR_VERBOSE
+#if 1
 
 /* The parser invokes alloca or malloc; define the necessary symbols. */
 
@@ -1929,8 +2292,7 @@
 # endif
 # endif
 # endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
+#endif /* 1 */
 
 #if (! defined yyoverflow \
 && (! defined __cplusplus \
@@ -1995,25 +2357,27 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL 3
 /* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 13387
+#define YYLAST 13092
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS 149
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS 176
 /* YYNRULES -- Number of rules. */
-#define YYNRULES 613
+#define YYNRULES 619
 /* YYNSTATES -- Number of states. */
-#define YYNSTATES 1078
+#define YYNSTATES 1084
 
-#define YYUNDEFTOK 2
+/* YYMAXUTOK -- Last valid token kind. */
 #define YYMAXUTOK 377
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
 as returned by yylex, with out-of-bounds checking. */
-#define YYTRANSLATE(YYX) \
- (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslateYYX : YYUNDEFTOK)
+#define YYTRANSLATE(YYX) \
+ (0 <= (YYX) && (YYX) <= YYMAXUTOK \
+ ? YY_CAST (yysymbol_kind_t, yytranslateYYX) \
+ : YYSYMBOL_YYUNDEF)
 
 /* YYTRANSLATETOKEN-NUM -- Symbol number corresponding to TOKEN-NUM
 as returned by yylex. */
@@ -2060,94 +2424,102 @@
 };
 
 #if YYDEBUG
- /* YYRLINEYYN -- Source line where rule number YYN was defined. */
+/* YYRLINEYYN -- Source line where rule number YYN was defined. */
 static const yytype_int16 yyrline =
 {
- 0, 1614, 1614, 1614, 1625, 1631, 1635, 1640, 1644, 1650,
- 1652, 1651, 1665, 1692, 1698, 1702, 1707, 1711, 1717, 1717,
- 1721, 1725, 1729, 1733, 1737, 1741, 1745, 1750, 1751, 1755,
- 1759, 1763, 1767, 1773, 1776, 1780, 1784, 1788, 1792, 1796,
- 1801, 1805, 1814, 1823, 1832, 1841, 1848, 1849, 1853, 1857,
- 1858, 1862, 1866, 1870, 1874, 1878, 1888, 1887, 1902, 1911,
- 1912, 1915, 1916, 1923, 1922, 1937, 1941, 1946, 1950, 1955,
- 1959, 1964, 1968, 1972, 1976, 1980, 1986, 1990, 1996, 1997,
- 2003, 2007, 2011, 2015, 2019, 2023, 2027, 2031, 2035, 2039,
- 2045, 2046, 2052, 2056, 2062, 2066, 2072, 2076, 2080, 2084,
- 2088, 2092, 2098, 2104, 2111, 2115, 2119, 2123, 2127, 2131,
- 2137, 2143, 2148, 2154, 2158, 2161, 2165, 2169, 2176, 2177,
- 2178, 2179, 2184, 2191, 2192, 2195, 2199, 2199, 2205, 2206,
- 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2216,
- 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226,
- 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2237, 2237,
- 2237, 2238, 2238, 2239, 2239, 2239, 2240, 2240, 2240, 2240,
- 2241, 2241, 2241, 2242, 2242, 2242, 2243, 2243, 2243, 2243,
- 2244, 2244, 2244, 2244, 2245, 2245, 2245, 2245, 2246, 2246,
- 2246, 2246, 2247, 2247, 2247, 2247, 2248, 2248, 2251, 2255,
- 2259, 2263, 2267, 2271, 2275, 2280, 2285, 2290, 2294, 2298,
- 2302, 2306, 2310, 2314, 2318, 2322, 2326, 2330, 2334, 2338,
- 2342, 2346, 2350, 2354, 2358, 2362, 2366, 2370, 2374, 2378,
- 2382, 2386, 2390, 2394, 2398, 2402, 2406, 2410, 2414, 2418,
- 2422, 2426, 2430, 2434, 2438, 2447, 2456, 2465, 2474, 2480,
- 2481, 2486, 2490, 2497, 2501, 2508, 2512, 2521, 2538, 2539,
- 2542, 2543, 2544, 2549, 2554, 2561, 2567, 2572, 2577, 2582,
- 2589, 2589, 2600, 2604, 2610, 2614, 2620, 2623, 2629, 2634,
- 2639, 2645, 2650, 2654, 2660, 2661, 2662, 2663, 2664, 2665,
- 2666, 2667, 2671, 2676, 2675, 2687, 2691, 2686, 2696, 2696,
- 2700, 2704, 2708, 2712, 2717, 2722, 2726, 2730, 2734, 2738,
- 2742, 2743, 2749, 2756, 2748, 2769, 2777, 2785, 2785, 2785,
- 2792, 2792, 2792, 2799, 2805, 2810, 2812, 2809, 2821, 2819,
- 2837, 2842, 2835, 2859, 2857, 2873, 2883, 2894, 2898, 2902,
- 2906, 2912, 2919, 2920, 2921, 2924, 2925, 2928, 2929, 2937,
- 2938, 2944, 2948, 2951, 2955, 2959, 2963, 2968, 2972, 2976,
- 2980, 2986, 2985, 2995, 2999, 3003, 3007, 3013, 3018, 3023,
- 3027, 3031, 3035, 3039, 3043, 3047, 3051, 3055, 3059, 3063,
- 3067, 3071, 3075, 3079, 3085, 3090, 3097, 3097, 3101, 3106,
- 3113, 3117, 3123, 3124, 3127, 3132, 3135, 3139, 3145, 3149,
- 3156, 3155, 3170, 3180, 3184, 3189, 3196, 3200, 3204, 3208,
- 3212, 3216, 3220, 3224, 3228, 3235, 3234, 3249, 3248, 3264,
- 3272, 3281, 3284, 3291, 3294, 3298, 3299, 3302, 3306, 3309,
- 3313, 3316, 3317, 3318, 3319, 3322, 3323, 3329, 3330, 3331,
- 3335, 3348, 3349, 3355, 3360, 3359, 3370, 3374, 3380, 3384,
- 3397, 3401, 3407, 3410, 3411, 3414, 3420, 3426, 3427, 3430,
- 3437, 3436, 3450, 3454, 3468, 3473, 3487, 3493, 3494, 3495,
- 3496, 3497, 3501, 3507, 3511, 3521, 3522, 3523, 3527, 3533,
- 3537, 3541, 3545, 3549, 3555, 3559, 3565, 3569, 3573, 3577,
- 3581, 3585, 3593, 3600, 3606, 3607, 3611, 3615, 3614, 3631,
- 3632, 3635, 3641, 3645, 3651, 3652, 3656, 3660, 3666, 3672,
- 3678, 3685, 3691, 3698, 3702, 3708, 3712, 3718, 3719, 3722,
- 3726, 3732, 3736, 3740, 3744, 3750, 3755, 3760, 3764, 3768,
- 3772, 3776, 3780, 3784, 3788, 3792, 3796, 3800, 3804, 3808,
- 3812, 3817, 3823, 3828, 3833, 3838, 3843, 3850, 3854, 3861,
- 3866, 3865, 3877, 3881, 3887, 3895, 3903, 3911, 3915, 3921,
- 3925, 3931, 3932, 3935, 3940, 3947, 3948, 3951, 3955, 3961,
- 3965, 3971, 3976, 3976, 4001, 4002, 4008, 4013, 4019, 4025,
- 4030, 4034, 4044, 4051, 4052, 4053, 4056, 4057, 4058, 4059,
- 4062, 4063, 4064, 4067, 4068, 4071, 4075, 4081, 4082, 4088,
- 4089, 4092, 4093, 4096, 4099, 4100, 4101, 4104, 4105, 4108,
- 4113, 4116, 4117, 4121
+ 0, 1625, 1625, 1625, 1636, 1642, 1646, 1651, 1655, 1661,
+ 1663, 1662, 1676, 1703, 1709, 1713, 1718, 1722, 1728, 1728,
+ 1732, 1736, 1740, 1744, 1748, 1752, 1756, 1761, 1762, 1766,
+ 1770, 1774, 1778, 1784, 1787, 1791, 1795, 1799, 1803, 1807,
+ 1812, 1816, 1825, 1834, 1843, 1852, 1859, 1860, 1864, 1868,
+ 1869, 1873, 1877, 1881, 1885, 1889, 1899, 1898, 1913, 1922,
+ 1923, 1926, 1927, 1934, 1933, 1948, 1952, 1957, 1961, 1966,
+ 1970, 1975, 1979, 1983, 1987, 1991, 1997, 2001, 2007, 2008,
+ 2014, 2018, 2022, 2026, 2030, 2034, 2038, 2042, 2046, 2050,
+ 2056, 2057, 2063, 2067, 2073, 2077, 2083, 2087, 2091, 2095,
+ 2099, 2103, 2109, 2115, 2122, 2126, 2130, 2134, 2138, 2142,
+ 2148, 2154, 2159, 2165, 2169, 2172, 2176, 2180, 2187, 2188,
+ 2189, 2190, 2195, 2202, 2203, 2206, 2210, 2210, 2216, 2217,
+ 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227,
+ 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237,
+ 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2248, 2248,
+ 2248, 2249, 2249, 2250, 2250, 2250, 2251, 2251, 2251, 2251,
+ 2252, 2252, 2252, 2253, 2253, 2253, 2254, 2254, 2254, 2254,
+ 2255, 2255, 2255, 2255, 2256, 2256, 2256, 2256, 2257, 2257,
+ 2257, 2257, 2258, 2258, 2258, 2258, 2259, 2259, 2262, 2266,
+ 2270, 2274, 2278, 2282, 2286, 2291, 2296, 2301, 2305, 2309,
+ 2313, 2317, 2321, 2325, 2329, 2333, 2337, 2341, 2345, 2349,
+ 2353, 2357, 2361, 2365, 2369, 2373, 2377, 2381, 2385, 2389,
+ 2393, 2397, 2401, 2405, 2409, 2413, 2417, 2421, 2425, 2429,
+ 2433, 2437, 2441, 2445, 2449, 2458, 2467, 2476, 2485, 2491,
+ 2492, 2497, 2501, 2508, 2512, 2519, 2523, 2532, 2549, 2550,
+ 2553, 2554, 2555, 2560, 2565, 2572, 2578, 2583, 2588, 2593,
+ 2600, 2600, 2611, 2615, 2621, 2625, 2631, 2634, 2640, 2644,
+ 2649, 2654, 2658, 2664, 2669, 2673, 2679, 2680, 2681, 2682,
+ 2683, 2684, 2685, 2686, 2690, 2695, 2694, 2706, 2710, 2705,
+ 2715, 2715, 2719, 2723, 2727, 2731, 2736, 2741, 2745, 2749,
+ 2753, 2757, 2761, 2762, 2768, 2775, 2767, 2788, 2796, 2804,
+ 2804, 2804, 2811, 2811, 2811, 2818, 2824, 2829, 2831, 2828,
+ 2840, 2838, 2856, 2861, 2854, 2878, 2876, 2892, 2902, 2913,
+ 2917, 2921, 2925, 2931, 2938, 2939, 2940, 2943, 2944, 2947,
+ 2948, 2956, 2957, 2963, 2967, 2970, 2974, 2978, 2982, 2987,
+ 2991, 2995, 2999, 3005, 3004, 3014, 3018, 3022, 3026, 3032,
+ 3037, 3042, 3046, 3050, 3054, 3058, 3062, 3066, 3070, 3074,
+ 3078, 3082, 3086, 3090, 3094, 3098, 3104, 3109, 3116, 3116,
+ 3120, 3125, 3132, 3136, 3142, 3143, 3146, 3151, 3154, 3158,
+ 3164, 3168, 3175, 3174, 3189, 3199, 3203, 3208, 3215, 3219,
+ 3223, 3227, 3231, 3235, 3239, 3243, 3247, 3254, 3253, 3268,
+ 3267, 3283, 3291, 3300, 3303, 3310, 3313, 3317, 3318, 3321,
+ 3325, 3328, 3332, 3335, 3336, 3337, 3338, 3341, 3342, 3348,
+ 3349, 3350, 3354, 3367, 3368, 3374, 3379, 3378, 3388, 3392,
+ 3398, 3402, 3415, 3419, 3425, 3428, 3429, 3432, 3438, 3444,
+ 3445, 3448, 3455, 3454, 3467, 3471, 3485, 3490, 3504, 3510,
+ 3511, 3512, 3513, 3514, 3518, 3524, 3528, 3538, 3539, 3540,
+ 3544, 3550, 3554, 3558, 3562, 3566, 3572, 3576, 3582, 3586,
+ 3590, 3594, 3598, 3602, 3610, 3617, 3623, 3624, 3628, 3632,
+ 3631, 3648, 3649, 3652, 3658, 3662, 3668, 3669, 3673, 3677,
+ 3683, 3687, 3693, 3699, 3706, 3712, 3719, 3723, 3729, 3733,
+ 3739, 3740, 3743, 3747, 3753, 3757, 3761, 3765, 3771, 3776,
+ 3781, 3785, 3789, 3793, 3797, 3801, 3805, 3809, 3813, 3817,
+ 3821, 3825, 3829, 3833, 3838, 3844, 3849, 3854, 3859, 3864,
+ 3871, 3875, 3882, 3887, 3886, 3898, 3902, 3908, 3916, 3924,
+ 3932, 3936, 3942, 3946, 3952, 3953, 3956, 3961, 3968, 3969,
+ 3972, 3976, 3982, 3986, 3992, 3997, 3997, 4022, 4023, 4029,
+ 4034, 4040, 4046, 4051, 4055, 4060, 4065, 4075, 4080, 4086,
+ 4087, 4088, 4091, 4092, 4093, 4094, 4097, 4098, 4099, 4102,
+ 4103, 4106, 4110, 4116, 4117, 4123, 4124, 4127, 4128, 4131,
+ 4134, 4135, 4136, 4139, 4140, 4143, 4148, 4151, 4152, 4156
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 1
+/** Accessing symbol of state STATE. */
+#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystosState)
+
+#if 1
+/* The user-facing name of the symbol whose (internal) number is
+ YYSYMBOL. No bounds checking. */
+static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED;
+
 /* YYTNAMESYMBOL-NUM -- String name of the symbol SYMBOL-NUM.
 First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname =
 {
- "$end", "error", "$undefined", "keyword_class", "keyword_module",
- "keyword_def", "keyword_begin", "keyword_if", "keyword_unless",
- "keyword_while", "keyword_until", "keyword_for", "keyword_undef",
- "keyword_rescue", "keyword_ensure", "keyword_end", "keyword_then",
- "keyword_elsif", "keyword_else", "keyword_case", "keyword_when",
- "keyword_break", "keyword_next", "keyword_redo", "keyword_retry",
- "keyword_in", "keyword_do", "keyword_do_cond", "keyword_do_block",
- "keyword_do_LAMBDA", "keyword_return", "keyword_yield", "keyword_super",
- "keyword_self", "keyword_nil", "keyword_true", "keyword_false",
- "keyword_and", "keyword_or", "keyword_not", "modifier_if",
- "modifier_unless", "modifier_while", "modifier_until", "modifier_rescue",
- "keyword_alias", "keyword_BEGIN", "keyword_END", "keyword__LINE__",
- "keyword__FILE__", "keyword__ENCODING__", "\"local variable or method\"",
- "\"method\"", "\"global variable\"", "\"instance variable\"",
- "\"constant\"", "\"class variable\"", "\"label\"", "\"integer literal\"",
+ "\"end of file\"", "error", "\"invalid token\"", "keyword_class",
+ "keyword_module", "keyword_def", "keyword_begin", "keyword_if",
+ "keyword_unless", "keyword_while", "keyword_until", "keyword_for",
+ "keyword_undef", "keyword_rescue", "keyword_ensure", "keyword_end",
+ "keyword_then", "keyword_elsif", "keyword_else", "keyword_case",
+ "keyword_when", "keyword_break", "keyword_next", "keyword_redo",
+ "keyword_retry", "keyword_in", "keyword_do", "keyword_do_cond",
+ "keyword_do_block", "keyword_do_LAMBDA", "keyword_return",
+ "keyword_yield", "keyword_super", "keyword_self", "keyword_nil",
+ "keyword_true", "keyword_false", "keyword_and", "keyword_or",
+ "keyword_not", "modifier_if", "modifier_unless", "modifier_while",
+ "modifier_until", "modifier_rescue", "keyword_alias", "keyword_BEGIN",
+ "keyword_END", "keyword__LINE__", "keyword__FILE__",
+ "keyword__ENCODING__", "\"local variable or method\"", "\"method\"",
+ "\"global variable\"", "\"instance variable\"", "\"constant\"",
+ "\"class variable\"", "\"label\"", "\"integer literal\"",
 "\"float literal\"", "\"character literal\"", "tXSTRING", "tREGEXP",
 "tSTRING", "tSTRING_PART", "tSTRING_MID", "tNTH_REF", "tBACK_REF",
 "tREGEXP_END", "\"numbered parameter\"", "\"unary plus\"",
@@ -2195,827 +2567,838 @@
 "dot_or_colon", "call_op", "call_op2", "opt_terms", "opt_nl", "rparen",
 "trailer", "term", "nl", "terms", "none", YY_NULLPTR
 };
-#endif
 
-# ifdef YYPRINT
-/* YYTOKNUMNUM -- (External) token number corresponding to the
- (internal) symbol number NUM (which must be that of a token). */
-static const yytype_int16 yytoknum =
-{
- 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
- 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
- 355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
- 365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
- 375, 61, 63, 58, 62, 60, 124, 94, 38, 43,
- 45, 42, 47, 37, 376, 33, 126, 377, 123, 125,
- 91, 93, 44, 96, 40, 41, 59, 46, 10
-};
-# endif
+static const char *
+yysymbol_name (yysymbol_kind_t yysymbol)
+{
+ return yytnameyysymbol;
+}
+#endif
 
-#define YYPACT_NINF (-873)
+#define YYPACT_NINF (-868)
 
 #define yypact_value_is_default(Yyn) \
 ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF (-614)
+#define YYTABLE_NINF (-620)
 
 #define yytable_value_is_error(Yyn) \
 ((Yyn) == YYTABLE_NINF)
 
- /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
- STATE-NUM. */
+/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
 static const yytype_int16 yypact =
 {
- -873, 124, 3686, -873, 8674, 10798, 11140, 6982, -873, 10444,
- 10444, -873, -873, 10912, 8164, 6598, 8910, 8910, -873, -873,
- 8910, 4343, 3935, -873, -873, -873, -873, -13, 8164, -873,
- -4, -873, -873, -873, 7124, 3799, -873, -873, 7266, -873,
- -873, -873, -873, -873, -873, -873, 45, 10562, 10562, 10562,
- 10562, 89, 5857, 585, 9382, 9736, 8446, -873, 7882, 681,
- 776, 904, 1227, 1252, -873, 288, 10680, 10562, -873, 448,
- -873, 1256, -873, 328, 1307, 1307, -873, -873, 152, 44,
- -873, 98, 11026, -873, 87, 13068, 318, 487, 56, 117,
- -873, 466, -873, -873, -873, -873, -873, -873, -873, -873,
- -873, 212, 123, -873, 291, 92, -873, -873, -873, -873,
- -873, 106, 106, -13, 623, 777, -873, 10444, 364, 5976,
- 355, 1435, 1435, -873, 139, -873, 669, -873, -873, 92,
- -873, -873, -873, -873, -873, -873, -873, -873, -873, -873,
- -873, -873, -873, -873, -873, -873, -873, -873, -873, -873,
- -873, -873, -873, -873, -873, -873, -873, -873, 23, 46,
- 60, 82, -873, -873, -873, -873, -873, -873, 127, 191,
- 203, 204, -873, 229, -873, -873, -873, -873, -873, -873,
- -873, -873, -873, -873, -873, -873, -873, -873, -873, -873,
- -873, -873, -873, -873, -873, -873, -873, -873, -873, -873,
- -873, -873, -873, -873, -873, -873, -873, -873, -873, 253,
- 5035, 211, 328, 1307, 1307, 160, 193, 13192, 712, 118,
- 248, 207, 160, 10444, 10444, 887, 312, -873, -873, 908,
- 347, 58, 86, -873, -873, -873, -873, -873, -873, -873,
- -873, -873, 8023, -873, -873, 240, -873, -873, -873, -873,
- -873, -873, 448, -873, 632, -873, 369, -873, -873, 448,
- 4071, 10562, 10562, 10562, 10562, -873, 13130, -873, -873, 292,
- 373, 292, -873, -873, -873, 9028, -873, -873, -873, 8910,
- -873, -873, -873, 6598, 6836, -873, 309, 6095, -873, 955,
- 350, 13254, 13254, 299, 8792, 5857, 325, 448, 1256, 448,
- 353, -873, 8792, 448, 352, 1511, 1511, -873, 13130, 344,
- 1511, -873, 434, 11254, 358, 1013, 1040, 1057, 1610, -873,
- -873, -873, -873, 1255, -873, -873, -873, -873, -873, -873,
- 653, 1276, -873, -873, 825, -873, 1003, -873, 1314, -873,
- 1348, 396, 414, -873, -873, -873, -873, 6360, 10444, 10444,
- 10444, 10444, 8792, 10444, 10444, 48, -873, -873, -873, -873,
- -873, 448, -873, -873, -873, -873, -873, -873, -873, 1963,
- 399, 410, 5035, 10562, -873, 392, 486, 413, -873, 448,
- -873, -873, -873, 419, 10562, -873, 430, 490, 441, 530,
- -873, -873, 464, 5035, -873, -873, 9854, -873, 5857, 8560,
- 458, 9854, 10562, 10562, 10562, 10562, 10562, 10562, 10562, 10562,
- 10562, 10562, 10562, 10562, 10562, 10562, 553, 10562, 10562, 10562,
- 10562, 10562, 10562, 10562, 10562, 10562, 10562, 10562, 10562, 2428,
- -873, 8910, -873, 3143, -873, -873, 12650, -873, -873, -873,
- -873, 10680, 10680, -873, 516, -873, 328, -873, 1068, -873,
- -873, -873, -873, -873, -873, 11532, 8910, 11618, 5035, 10444,
- -873, -873, -873, 606, 615, 215, 509, 510, -873, 5181,
- 617, 10562, 11704, 8910, 11790, 10562, 10562, 5473, 101, 101,
- 115, 11876, 8910, 11962, -873, 573, -873, 6095, 369, -873,
- -873, 9972, 625, -873, 10562, 13192, 13192, 13192, 10562, -873,
- -873, 9146, -873, 10562, -873, 9500, 6717, 506, 448, 292,
- 292, -873, -873, 838, 511, -873, -873, -873, 8164, 5592,
- 522, 11704, 11790, 10562, 1256, 448, -873, -873, 6479, 500,
- 1256, -873, -873, 9618, -873, 448, 9736, -873, -873, -873,
- 1068, 98, 11254, -873, 11254, 12048, 8910, 12134, 2259, -873,
- -873, 526, -873, 1353, 6095, 653, -873, -873, -873, -873,
- -873, -873, -873, 10562, 10562, -873, -873, -873, -873, -873,
- -873, -873, -873, -873, -873, -873, 1454, 448, 448, 537,
- 10680, 666, 13192, 335, -873, -873, -873, 54, -873, -873,
- 2093, -873, 13192, 2259, -873, -873, 1038, -873, -873, 10680,
- 672, 47, 10562, -873, 12784, 292, -873, 448, 11254, 559,
- -873, -873, -873, 655, 581, 2039, -873, -873, 1078, 220,
- 3042, 3042, 3042, 3042, 1617, 1617, 3376, 2927, 3042, 3042,
- 13254, 13254, 1146, 1146, -873, 350, 13192, 1617, 1617, 1427,
- 1427, 1442, 378, 378, 350, 350, 350, 4479, 7622, 4751,
- 7740, -873, 106, -873, 568, 292, 461, -873, 501, -873,
- -873, 4207, -873, -873, 1791, 47, 47, -873, 2539, -873,
- -873, -873, -873, -873, 448, 10444, 5035, 906, 51, -873,
- 106, 571, 106, 703, 838, 8305, -873, 10090, 706, -873,
- 10562, 10562, 439, -873, 7384, 7503, 594, 256, 282, 706,
- -873, -873, -873, -873, 55, 79, 598, 126, 129, 10444,
- 8164, 621, 741, 13192, 639, -873, 13192, 13192, 852, 10562,
- 13130, -873, 292, 13192, -873, -873, -873, -873, 9264, 9500,
- -873, -873, -873, 637, -873, -873, 138, 1256, 448, 1511,
- 458, -873, 906, 51, 636, 933, 934, -873, 91, 2259,
- -873, 640, -873, 350, 350, -873, 276, 448, 620, -873,
- -873, 2153, 720, 3255, -873, 721, -873, 413, -873, 448,
- -873, -873, 644, 646, 647, -873, 651, 721, 647, 752,
- 12722, -873, -873, 2259, 5035, -873, -873, 12855, 10208, -873,
- -873, 11254, 8792, 10680, 10562, 12220, 8910, 12306, 167, 10680,
- 10680, -873, 516, 577, 9146, 10680, 10680, -873, 516, 117,
- 152, 5035, 6095, 47, -873, 448, 795, -873, -873, -873,
- -873, 12784, -873, 719, -873, 5738, 801, -873, 10444, 803,
- -873, 10562, 10562, 307, 10562, 10562, 807, 6241, 6241, 130,
- 101, -873, -873, -873, 10326, 5327, 13192, -873, 6717, 292,
- -873, -873, -873, 497, 678, 1326, 5035, 6095, -873, -873,
- -873, 683, -873, 1671, 448, 10562, 10562, -873, -873, 2259,
- -873, 1038, -873, 1038, -873, 1038, -873, -873, 10562, 10562,
- -873, -873, -873, 11368, -873, 689, 413, 693, 11368, -873,
- 696, 708, -873, 836, 10562, 12926, -873, -873, 13192, 4615,
- 4887, 716, 324, 348, 10562, 10562, -873, -873, -873, -873,
- -873, 10680, -873, -873, -873, -873, -873, -873, -873, 843,
- 722, 6095, 5035, -873, -873, 11482, 160, -873, -873, 6241,
- -873, -873, 160, -873, 10562, -873, 848, 854, -873, 13192,
- 157, -873, 9500, -873, 849, 858, 735, 1330, 1330, 342,
- -873, 13192, 13192, 647, 736, 647, 647, 13192, 13192, 755,
- 761, 840, 1091, 335, -873, -873, 1746, -873, 1091, 2259,
- -873, 1038, -873, -873, 12997, 412, 13192, 13192, -873, -873,
- -873, -873, 759, 892, 857, -873, 1117, 1040, 1057, 5035,
- -873, 5181, -873, -873, 6241, -873, -873, -873, -873, 778,
- -873, -873, -873, -873, 780, 780, 1330, 781, -873, 1038,
- -873, -873, -873, -873, -873, -873, 12392, -873, 413, 335,
- -873, -873, 784, 785, 792, -873, 794, 792, -873, -873,
- 1068, 12478, 8910, 12564, 615, 439, 931, 849, 852, 1330,
- 780, 1330, 647, 804, 808, -873, 2259, -873, 1038, -873,
- 1038, -873, 1038, -873, -873, 906, 51, 806, 592, 753,
- -873, -873, -873, -873, 780, -873, 792, 812, 792, 792,
- 497, -873, 1038, -873, -873, -873, 792, -873
+ -868, 115, 3515, -868, 8231, 10355, 10697, 6539, -868, 10001,
+ 10001, -868, -868, 10469, 7721, 6155, 8467, 8467, -868, -868,
+ 8467, 4172, 3764, -868, -868, -868, -868, 18, 7721, -868,
+ 38, -868, -868, -868, 6681, 3628, -868, -868, 6823, -868,
+ -868, -868, -868, -868, -868, -868, 45, 10119, 10119, 10119,
+ 10119, 217, 5414, 792, 8939, 9293, 8003, -868, 7439, 1134,
+ 894, 67, 1139, 1203, -868, 94, 10237, 10119, -868, 780,
+ -868, 1204, -868, 529, 1741, 1741, -868, -868, 271, 173,
+ -868, 184, 10583, -868, 272, 12773, 579, 668, 228, 75,
+ -868, 381, -868, -868, -868, -868, -868, -868, -868, -868,
+ -868, 48, 278, -868, 300, 129, -868, -868, -868, -868,
+ -868, 243, 243, 18, 110, 646, -868, 10001, 360, 5533,
+ 517, 1837, 1837, -868, 279, -868, 756, -868, -868, 129,
+ -868, -868, -868, -868, -868, -868, -868, -868, -868, -868,
+ -868, -868, -868, -868, -868, -868, -868, -868, -868, -868,
+ -868, -868, -868, -868, -868, -868, -868, -868, 33, 89,
+ 108, 109, -868, -868, -868, -868, -868, -868, 117, 154,
+ 192, 199, -868, 208, -868, -868, -868, -868, -868, -868,
+ -868, -868, -868, -868, -868, -868, -868, -868, -868, -868,
+ -868, -868, -868, -868, -868, -868, -868, -868, -868, -868,
+ -868, -868, -868, -868, -868, -868, -868, -868, -868, 290,
+ 4592, 354, 529, 1741, 1741, 77, 305, 12897, 801, 159,
+ 347, 193, 77, 10001, 10001, 866, 397, -868, -868, 890,
+ 433, 78, 85, -868, -868, -868, -868, -868, -868, -868,
+ -868, -868, 7580, -868, -868, 320, -868, -868, -868, -868,
+ -868, -868, 780, -868, 944, -868, 444, -868, -868, 780,
+ 3900, 124, 10119, 10119, 10119, 10119, -868, 12835, -868, -868,
+ 324, 428, 324, -868, -868, -868, 8585, -868, -868, -868,
+ 8467, -868, -868, -868, 6155, 6393, -868, 367, 5652, -868,
+ 974, 391, 12959, 12959, 355, 8349, 5414, 378, 780, 1204,
+ 780, 416, -868, 8349, 780, 408, 714, 714, -868, 12835,
+ 423, 714, -868, 500, 10811, 429, 988, 999, 1035, 1982,
+ -868, -868, -868, -868, 1241, -868, -868, -868, -868, -868,
+ -868, 981, 1248, -868, -868, 1126, -868, 1051, -868, 1252,
+ -868, 1265, 480, 482, -868, -868, -868, -868, 5917, 10001,
+ 10001, 10001, 10001, 8349, 10001, 10001, 93, -868, -868, -868,
+ -868, 536, 780, -868, -868, -868, -868, -868, -868, -868,
+ 2113, 475, 479, 4592, 10119, -868, 463, 563, 476, -868,
+ 780, -868, -868, -868, 483, 10119, -868, 487, 576, 489,
+ 581, -868, -868, 521, 4592, -868, -868, 9411, -868, 5414,
+ 8117, 503, 9411, 10119, 10119, 10119, 10119, 10119, 10119, 10119,
+ 10119, 10119, 10119, 10119, 10119, 10119, 10119, 592, 10119, 10119,
+ 10119, 10119, 10119, 10119, 10119, 10119, 10119, 10119, 10119, 10119,
+ 3310, -868, 8467, -868, 11089, -868, -868, 12293, -868, -868,
+ -868, -868, 10237, 10237, -868, 550, -868, 529, -868, 1036,
+ -868, -868, -868, -868, -868, -868, 11175, 8467, 11261, 4592,
+ 10001, -868, -868, -868, 636, 642, 210, 538, 540, -868,
+ 4738, 659, 10119, 11347, 8467, 11433, 10119, 10119, 5030, 620,
+ 620, 134, 11519, 8467, 11605, -868, 616, -868, 5652, 444,
+ -868, -868, 9529, 665, -868, 10119, 10119, 12897, 12897, 12897,
+ 10119, -868, -868, 8703, -868, 10119, -868, 9057, 6274, 546,
+ 780, 324, 324, -868, -868, 313, 547, -868, -868, -868,
+ 7721, 5149, 557, 11347, 11433, 10119, 1204, 780, -868, -868,
+ 6036, 555, 1204, -868, -868, 9175, -868, 780, 9293, -868,
+ -868, -868, 1036, 184, 10811, -868, 10811, 11691, 8467, 11777,
+ 2314, -868, -868, 561, -868, 1290, 5652, 981, -868, -868,
+ -868, -868, -868, -868, -868, 10119, 10119, -868, -868, -868,
+ -868, -868, -868, -868, -868, -868, -868, -868, -868, 1428,
+ 780, 780, 564, 10237, 699, 12897, 266, -868, -868, -868,
+ 263, -868, -868, 2562, -868, 12897, 2314, -868, -868, 2042,
+ -868, -868, 10237, 701, 65, 10119, -868, 12489, 324, -868,
+ 780, 10811, 566, -868, -868, -868, 674, 591, 2410, -868,
+ -868, 1037, 220, 3100, 3100, 3100, 3100, 1377, 1377, 3375,
+ 2808, 3100, 3100, 12959, 12959, 1279, 1279, -868, 391, 12897,
+ 1377, 1377, 1483, 1483, 1288, 383, 383, 391, 391, 391,
+ 2930, 7179, 4308, 7297, -868, 243, -868, 584, 324, 452,
+ -868, 516, -868, -868, 4036, -868, -868, 1908, 65, 65,
+ -868, 3027, -868, -868, -868, -868, -868, 780, 10001, 4592,
+ 697, 530, -868, 243, 587, 243, 707, 313, 7862, -868,
+ 9647, 715, -868, 10119, 10119, 572, -868, 6941, 7060, 596,
+ 223, 285, 715, -868, -868, -868, -868, 116, 121, 603,
+ 135, 136, 10001, 7721, 609, 734, 12897, 206, -868, 12897,
+ 12897, 12897, 281, 10119, 12835, -868, 324, 12897, -868, -868,
+ -868, -868, 8821, 9057, -868, -868, -868, 611, -868, -868,
+ 211, 1204, 780, 714, 503, -868, 697, 530, 613, 860,
+ 904, -868, 36, 2314, -868, 618, -868, 391, 391, -868,
+ -868, 812, 780, 619, -868, -868, 2628, 711, 12365, -868,
+ 706, 536, -868, 476, -868, 780, -868, -868, 623, 627,
+ 628, -868, 630, 706, 628, 731, 12427, -868, -868, 2314,
+ 4592, -868, -868, 12560, 9765, -868, -868, 10811, 8349, 10237,
+ 10119, 11863, 8467, 11949, 413, 10237, 10237, -868, 550, 560,
+ 8703, 10237, 10237, -868, 550, 75, 271, 4592, 5652, 65,
+ -868, 780, 766, -868, -868, -868, -868, 12489, -868, 689,
+ -868, 5295, 771, -868, 10001, 774, -868, 10119, 10119, 333,
+ 10119, 10119, 776, 5798, 5798, 148, 620, -868, -868, -868,
+ 9883, 4884, 12897, -868, 6274, 324, -868, -868, -868, 88,
+ 647, 990, 4592, 5652, -868, -868, -868, 653, -868, 1554,
+ 780, 10119, 10119, -868, -868, 2314, -868, 2042, -868, 2042,
+ -868, 2042, -868, -868, 10119, 10119, -868, -868, -868, 10925,
+ -868, 655, 476, 657, 10925, -868, 661, 667, -868, 786,
+ 10119, 12631, -868, -868, 12897, 3179, 4444, 670, 406, 426,
+ 10119, 10119, -868, -868, -868, -868, -868, 10237, -868, -868,
+ -868, -868, -868, -868, -868, 803, 677, 5652, 4592, -868,
+ -868, 11039, 77, -868, -868, 5798, -868, -868, 77, -868,
+ 10119, -868, 808, 809, -868, 12897, 219, -868, 9057, -868,
+ 1629, 813, 682, 1445, 1445, 1019, -868, 12897, 12897, 628,
+ 694, 628, 628, 12897, 12897, 705, 712, 788, 1054, 266,
+ -868, -868, 1801, -868, 1054, 2314, -868, 2042, -868, -868,
+ 12702, 432, 12897, 12897, -868, -868, -868, -868, 718, 830,
+ 795, -868, 1083, 999, 1035, 4592, -868, 4738, -868, -868,
+ 5798, -868, -868, -868, -868, 722, -868, -868, -868, -868,
+ 727, 727, 1445, 733, -868, 2042, -868, -868, -868, -868,
+ -868, -868, 12035, -868, 476, 266, -868, -868, 736, 746,
+ 750, -868, 751, 750, -868, -868, 1036, 12121, 8467, 12207,
+ 642, 572, 879, 1629, 281, 1445, 727, 1445, 628, 757,
+ 761, -868, 2314, -868, 2042, -868, 2042, -868, 2042, -868,
+ -868, 697, 530, 772, 201, 467, -868, -868, -868, -868,
+ 727, -868, 750, 781, 750, 750, 88, -868, 2042, -868,
+ -868, -868, 750, -868
 };
 
- /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
- Performed when YYTABLE does not specify something else to do. Zero
- means the default is an error. */
+/* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE does not specify something else to do. Zero
+ means the default is an error. */
 static const yytype_int16 yydefact =
 {
- 2, 0, 0, 1, 0, 0, 0, 0, 293, 0,
- 0, 317, 320, 0, 0, 599, 337, 338, 339, 340,
- 305, 270, 270, 488, 487, 489, 490, 601, 0, 10,
- 0, 492, 491, 493, 479, 585, 481, 480, 483, 482,
- 475, 476, 437, 438, 494, 495, 291, 0, 0, 0,
- 0, 0, 0, 295, 613, 613, 88, 312, 0, 0,
- 0, 0, 0, 0, 452, 0, 0, 0, 3, 599,
- 6, 9, 27, 33, 541, 541, 49, 60, 59, 0,
- 76, 0, 80, 90, 0, 54, 248, 0, 61, 310,
- 284, 285, 435, 286, 287, 288, 433, 432, 464, 434,
- 431, 486, 0, 289, 290, 270, 5, 8, 337, 338,
- 305, 613, 413, 0, 113, 114, 291, 0, 0, 0,
- 0, 541, 541, 116, 496, 341, 0, 486, 290, 0,
- 333, 168, 178, 169, 165, 194, 195, 196, 197, 176,
+ 2, 0, 0, 1, 0, 0, 0, 0, 295, 0,
+ 0, 319, 322, 0, 0, 605, 339, 340, 341, 342,
+ 307, 270, 270, 490, 489, 491, 492, 607, 0, 10,
+ 0, 494, 493, 495, 481, 591, 483, 482, 485, 484,
+ 477, 478, 439, 440, 496, 497, 293, 0, 0, 0,
+ 0, 0, 0, 297, 619, 619, 88, 314, 0, 0,
+ 0, 0, 0, 0, 454, 0, 0, 0, 3, 605,
+ 6, 9, 27, 33, 544, 544, 49, 60, 59, 0,
+ 76, 0, 80, 90, 0, 54, 248, 0, 61, 312,
+ 286, 287, 437, 288, 289, 290, 435, 434, 466, 436,
+ 433, 488, 0, 291, 292, 270, 5, 8, 339, 340,
+ 307, 619, 415, 0, 113, 114, 293, 0, 0, 0,
+ 0, 544, 544, 116, 498, 343, 0, 488, 292, 0,
+ 335, 168, 178, 169, 165, 194, 195, 196, 197, 176,
 191, 184, 174, 173, 189, 172, 171, 167, 192, 166,
 179, 183, 185, 177, 170, 186, 193, 188, 187, 180,
 190, 175, 164, 182, 181, 163, 161, 162, 158, 159,
 160, 118, 120, 119, 153, 154, 131, 132, 133, 140,
 137, 139, 134, 135, 155, 156, 141, 142, 146, 149,
 150, 136, 138, 128, 129, 130, 143, 144, 145, 147,
- 148, 151, 152, 157, 572, 55, 121, 122, 571, 0,
- 0, 0, 58, 541, 541, 0, 0, 54, 0, 486,
- 0, 290, 0, 0, 0, 112, 0, 352, 351, 0,
- 0, 486, 290, 187, 180, 190, 175, 158, 159, 160,
- 118, 119, 0, 123, 125, 20, 124, 455, 460, 459,
- 607, 609, 599, 610, 0, 457, 0, 611, 608, 600,
- 583, 0, 0, 273, 0, 265, 277, 74, 269, 613,
- 435, 613, 576, 75, 73, 613, 259, 306, 72, 0,
- 258, 412, 71, 599, 0, 18, 0, 0, 221, 0,
- 222, 209, 212, 302, 0, 0, 0, 599, 15, 599,
- 78, 14, 0, 599, 0, 604, 604, 249, 0, 0,
- 604, 574, 0, 0, 86, 0, 96, 103, 541, 469,
- 468, 470, 471, 0, 467, 466, 439, 444, 443, 446,
- 0, 0, 441, 448, 0, 450, 0, 462, 0, 473,
- 0, 477, 478, 53, 236, 237, 4, 600, 0, 0,
- 0, 0, 0, 0, 0, 548, 544, 543, 542, 545,
- 546, 0, 550, 562, 517, 518, 566, 565, 561, 541,
- 0, 504, 0, 510, 515, 613, 520, 613, 540, 0,
- 547, 549, 552, 526, 0, 559, 526, 564, 526, 568,
- 524, 500, 0, 0, 400, 402, 0, 92, 0, 84,
- 81, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 208, 211, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 596, 613, 595, 0, 598, 597, 0, 417, 415, 311,
- 436, 0, 0, 406, 65, 309, 330, 113, 114, 115,
- 477, 478, 504, 497, 328, 0, 613, 0, 0, 0,
- 594, 593, 56, 0, 613, 302, 0, 0, 343, 0,
- 342, 0, 0, 613, 0, 0, 0, 0, 0, 0,
- 302, 0, 613, 0, 325, 0, 126, 0, 0, 456,
- 458, 0, 0, 612, 580, 278, 582, 272, 0, 601,
- 266, 0, 275, 0, 267, 0, 599, 0, 599, 613,
- 613, 260, 271, 599, 0, 308, 52, 602, 0, 0,
- 0, 0, 0, 0, 17, 599, 300, 13, 600, 77,
- 296, 299, 303, 606, 250, 605, 606, 252, 304, 575,
- 102, 94, 0, 89, 0, 0, 613, 0, 541, 313,
- 397, 526, 472, 0, 0, 447, 453, 440, 442, 449,
- 451, 463, 474, 0, 0, 7, 21, 22, 23, 24,
- 25, 50, 51, 508, 554, 507, 0, 599, 599, 526,
- 0, 0, 509, 0, 522, 570, 519, 0, 523, 505,
- 0, 533, 555, 0, 536, 563, 0, 538, 567, 0,
- 0, 613, 0, 28, 30, 0, 31, 599, 0, 82,
- 93, 48, 34, 46, 0, 253, 198, 29, 0, 290,
- 226, 231, 232, 233, 228, 230, 240, 241, 234, 235,
- 207, 210, 238, 239, 32, 218, 601, 227, 229, 223,
- 224, 225, 213, 214, 215, 216, 217, 586, 591, 587,
- 592, 411, 270, 409, 0, 613, 586, 588, 587, 589,
- 410, 270, 586, 587, 270, 613, 613, 35, 253, 199,
- 45, 206, 63, 66, 0, 0, 0, 113, 114, 117,
- 0, 0, 613, 0, 599, 0, 294, 613, 613, 423,
- 0, 0, 613, 344, 590, 301, 0, 586, 587, 613,
- 346, 318, 345, 321, 590, 301, 0, 586, 587, 0,
- 0, 0, 0, 277, 0, 324, 579, 578, 276, 0,
- 279, 274, 613, 581, 577, 257, 255, 261, 262, 264,
- 307, 603, 19, 0, 26, 205, 79, 16, 599, 604,
- 95, 87, 99, 101, 0, 98, 100, 601, 0, 0,
- 465, 0, 454, 219, 220, 548, 360, 599, 353, 503,
- 501, 0, 41, 244, 335, 0, 516, 613, 569, 0,
- 525, 553, 526, 526, 526, 560, 526, 548, 526, 43,
- 246, 336, 388, 386, 0, 385, 384, 283, 0, 91,
- 85, 0, 0, 0, 0, 0, 613, 0, 0, 0,
- 0, 408, 69, 414, 262, 0, 0, 407, 67, 403,
- 62, 0, 0, 613, 331, 0, 0, 414, 334, 573,
- 57, 424, 425, 613, 426, 0, 613, 349, 0, 0,
- 347, 0, 0, 414, 0, 0, 0, 0, 0, 414,
- 0, 127, 461, 323, 0, 0, 280, 268, 599, 613,
- 11, 297, 251, 97, 0, 390, 0, 0, 314, 445,
- 361, 358, 551, 0, 599, 0, 0, 521, 506, 0,
- 529, 0, 531, 0, 537, 0, 534, 539, 0, 0,
- 383, 601, 601, 512, 513, 613, 613, 368, 0, 557,
- 368, 368, 366, 0, 0, 281, 83, 47, 254, 586,
- 587, 0, 586, 587, 0, 0, 40, 203, 39, 204,
- 70, 0, 37, 201, 38, 202, 68, 404, 405, 0,
- 0, 0, 0, 498, 329, 0, 0, 428, 350, 0,
- 12, 430, 0, 315, 0, 316, 0, 0, 326, 279,
- 613, 256, 263, 396, 0, 0, 0, 0, 0, 356,
- 502, 42, 245, 526, 526, 526, 526, 44, 247, 0,
- 0, 0, 511, 0, 364, 365, 368, 376, 556, 0,
- 379, 0, 381, 401, 282, 414, 243, 242, 36, 200,
- 418, 416, 0, 0, 0, 427, 0, 104, 111, 0,
- 429, 0, 319, 322, 0, 420, 421, 419, 394, 601,
- 392, 395, 399, 398, 362, 359, 0, 354, 530, 0,
- 527, 532, 535, 389, 387, 302, 0, 514, 613, 0,
- 367, 374, 368, 368, 368, 558, 368, 368, 64, 332,
- 110, 0, 613, 0, 613, 613, 0, 0, 391, 0,
- 357, 0, 526, 590, 301, 363, 0, 371, 0, 373,
- 0, 380, 0, 377, 382, 107, 109, 0, 586, 587,
- 422, 348, 327, 393, 355, 528, 368, 368, 368, 368,
- 105, 372, 0, 369, 375, 378, 368, 370
+ 148, 151, 152, 157, 575, 55, 121, 122, 574, 0,
+ 0, 0, 58, 544, 544, 0, 0, 54, 0, 488,
+ 0, 292, 0, 0, 0, 112, 0, 354, 353, 0,
+ 0, 488, 292, 187, 180, 190, 175, 158, 159, 160,
+ 118, 119, 0, 123, 125, 20, 124, 457, 462, 461,
+ 613, 615, 605, 616, 0, 459, 0, 617, 614, 606,
+ 589, 293, 278, 588, 273, 0, 265, 277, 74, 269,
+ 619, 437, 619, 579, 75, 73, 619, 259, 308, 72,
+ 0, 258, 414, 71, 605, 0, 18, 0, 0, 221,
+ 0, 222, 209, 212, 304, 0, 0, 0, 605, 15,
+ 605, 78, 14, 0, 605, 0, 610, 610, 249, 0,
+ 0, 610, 577, 0, 0, 86, 0, 96, 103, 544,
+ 471, 470, 472, 473, 0, 469, 468, 441, 446, 445,
+ 448, 0, 0, 443, 450, 0, 452, 0, 464, 0,
+ 475, 0, 479, 480, 53, 236, 237, 4, 606, 0,
+ 0, 0, 0, 0, 0, 0, 551, 547, 546, 545,
+ 548, 549, 0, 553, 565, 520, 521, 569, 568, 564,
+ 544, 0, 506, 0, 513, 518, 619, 523, 619, 543,
+ 0, 550, 552, 555, 529, 0, 562, 529, 567, 529,
+ 571, 527, 502, 0, 0, 402, 404, 0, 92, 0,
+ 84, 81, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 208, 211, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 602, 619, 601, 0, 604, 603, 0, 419, 417,
+ 313, 438, 0, 0, 408, 65, 311, 332, 113, 114,
+ 115, 479, 480, 506, 499, 330, 0, 619, 0, 0,
+ 0, 600, 599, 56, 0, 619, 304, 0, 0, 345,
+ 0, 344, 0, 0, 619, 0, 0, 0, 0, 0,
+ 0, 304, 0, 619, 0, 327, 0, 126, 0, 0,
+ 458, 460, 0, 0, 618, 583, 584, 279, 587, 272,
+ 0, 607, 266, 0, 275, 0, 267, 0, 605, 0,
+ 605, 619, 619, 260, 271, 605, 0, 310, 52, 608,
+ 0, 0, 0, 0, 0, 0, 17, 605, 302, 13,
+ 606, 77, 298, 301, 305, 612, 250, 611, 612, 252,
+ 306, 578, 102, 94, 0, 89, 0, 0, 619, 0,
+ 544, 315, 399, 529, 474, 0, 0, 449, 455, 442,
+ 444, 451, 453, 465, 476, 0, 0, 7, 21, 22,
+ 23, 24, 25, 50, 51, 510, 557, 511, 509, 0,
+ 605, 605, 529, 0, 0, 512, 0, 525, 573, 522,
+ 0, 526, 507, 0, 536, 558, 0, 539, 566, 0,
+ 541, 570, 0, 0, 619, 278, 28, 30, 0, 31,
+ 605, 0, 82, 93, 48, 34, 46, 0, 253, 198,
+ 29, 0, 292, 226, 231, 232, 233, 228, 230, 240,
+ 241, 234, 235, 207, 210, 238, 239, 32, 218, 607,
+ 227, 229, 223, 224, 225, 213, 214, 215, 216, 217,
+ 592, 597, 593, 598, 413, 270, 411, 0, 619, 592,
+ 594, 593, 595, 412, 270, 592, 593, 270, 619, 619,
+ 35, 253, 199, 45, 206, 63, 66, 0, 0, 0,
+ 113, 114, 117, 0, 0, 619, 0, 605, 0, 296,
+ 619, 619, 425, 0, 0, 619, 346, 596, 303, 0,
+ 592, 593, 619, 348, 320, 347, 323, 596, 303, 0,
+ 592, 593, 0, 0, 0, 0, 277, 0, 326, 582,
+ 585, 581, 276, 281, 280, 274, 619, 586, 580, 257,
+ 255, 261, 262, 264, 309, 609, 19, 0, 26, 205,
+ 79, 16, 605, 610, 95, 87, 99, 101, 0, 98,
+ 100, 607, 0, 0, 467, 0, 456, 219, 220, 551,
+ 549, 362, 605, 355, 505, 503, 0, 41, 244, 337,
+ 0, 0, 519, 619, 572, 0, 528, 556, 529, 529,
+ 529, 563, 529, 551, 529, 43, 246, 338, 390, 388,
+ 0, 387, 386, 285, 0, 91, 85, 0, 0, 0,
+ 0, 0, 619, 0, 0, 0, 0, 410, 69, 416,
+ 262, 0, 0, 409, 67, 405, 62, 0, 0, 619,
+ 333, 0, 0, 416, 336, 576, 57, 426, 427, 619,
+ 428, 0, 619, 351, 0, 0, 349, 0, 0, 416,
+ 0, 0, 0, 0, 0, 416, 0, 127, 463, 325,
+ 0, 0, 282, 268, 605, 619, 11, 299, 251, 97,
+ 0, 392, 0, 0, 316, 447, 363, 360, 554, 0,
+ 605, 0, 0, 524, 508, 0, 532, 0, 534, 0,
+ 540, 0, 537, 542, 0, 0, 385, 607, 607, 515,
+ 516, 619, 619, 370, 0, 560, 370, 370, 368, 0,
+ 281, 283, 83, 47, 254, 592, 593, 0, 592, 593,
+ 0, 0, 40, 203, 39, 204, 70, 0, 37, 201,
+ 38, 202, 68, 406, 407, 0, 0, 0, 0, 500,
+ 331, 0, 0, 430, 352, 0, 12, 432, 0, 317,
+ 0, 318, 0, 0, 328, 280, 619, 256, 263, 398,
+ 0, 0, 0, 0, 0, 358, 504, 42, 245, 529,
+ 529, 529, 529, 44, 247, 0, 0, 0, 514, 0,
+ 366, 367, 370, 378, 559, 0, 381, 0, 383, 403,
+ 284, 416, 243, 242, 36, 200, 420, 418, 0, 0,
+ 0, 429, 0, 104, 111, 0, 431, 0, 321, 324,
+ 0, 422, 423, 421, 396, 607, 394, 397, 401, 400,
+ 364, 361, 0, 356, 533, 0, 530, 535, 538, 391,
+ 389, 304, 0, 517, 619, 0, 369, 376, 370, 370,
+ 370, 561, 370, 370, 64, 334, 110, 0, 619, 0,
+ 619, 619, 0, 0, 393, 0, 359, 0, 529, 596,
+ 303, 365, 0, 373, 0, 375, 0, 382, 0, 379,
+ 384, 107, 109, 0, 592, 593, 424, 350, 329, 395,
+ 357, 531, 370, 370, 370, 370, 105, 374, 0, 371,
+ 377, 380, 370, 372
 };
 
- /* YYPGOTONTERM-NUM. */
+/* YYPGOTONTERM-NUM. */
 static const yytype_int16 yypgoto =
 {
- -873, -873, -873, 436, -873, 34, -873, -233, 137, -873,
- 40, -873, -188, -215, 560, 1421, 1889, -873, 20, -57,
- -873, -640, -873, 30, 948, -211, -19, -50, -286, -475,
- -11, 2634, -61, 957, 9, -17, -873, -873, 42, -873,
- 1196, -873, 503, 73, -209, -365, 99, -7, -873, -440,
- -240, -157, 147, -350, 97, -873, -873, -873, -873, -873,
- -873, -873, -873, -873, -873, -873, -873, -873, -873, -873,
- -873, 8, -200, -450, -71, -620, -873, -873, -873, 182,
- 260, -873, -536, -873, -873, -302, -873, -65, -873, -873,
- 163, -873, -873, -873, -88, -873, -873, -452, -873, -53,
- -873, -873, -873, -873, -873, -14, 26, -148, -873, -873,
- -873, -873, -873, -259, -873, 729, -873, -873, -873, 6,
- -873, -873, -873, 2469, 2735, 980, 2054, -873, -873, 24,
- 504, 0, 142, 405, 27, -873, -873, -873, 302, 84,
- -126, -222, -843, -697, -438, -873, 301, -721, -545, -872,
- 29, -527, -873, -448, -873, 208, -340, -873, -873, -873,
- 38, -429, 656, -351, -873, -873, -80, -873, 66, -23,
- 557, -267, 327, -258, -64, -2
+ -868, -868, -868, 411, -868, 25, -868, -282, 693, -868,
+ 42, -868, -254, -213, 768, 1343, 1513, -868, 84, -59,
+ -868, -429, -868, -14, 916, -190, 4, -33, -271, -487,
+ -11, 1993, -84, 936, 29, -19, -868, -868, 19, -868,
+ 867, -868, -392, 46, -461, -327, 118, -7, -868, -446,
+ -233, -184, 15, -360, 57, -868, -868, -868, -868, -868,
+ -868, -868, -868, -868, -868, -868, -868, -868, -868, -868,
+ -868, 8, -211, -460, -94, -610, -868, -868, -868, 163,
+ 501, -868, -572, -868, -868, -276, -868, -90, -868, -868,
+ 145, -868, -868, -868, -81, -868, -868, -451, -868, -78,
+ -868, -868, -868, -868, -868, 147, 58, -167, -868, -868,
+ -868, -868, -868, -248, -868, 710, -868, -868, -868, 2,
+ -868, -868, -868, 2347, 2558, 960, 1777, -868, -868, -27,
+ 502, 20, -9, 396, 16, -868, -868, -868, 181, 485,
+ 249, -244, -839, -672, -556, -868, 180, -723, -541, -867,
+ 14, -513, -868, -388, -868, 675, -351, -868, -868, -868,
+ 62, -436, 624, -330, -868, -868, -47, -868, 7, -22,
+ 806, -253, 394, -284, -65, -2
 };
 
- /* YYDEFGOTONTERM-NUM. */
+/* YYDEFGOTONTERM-NUM. */
 static const yytype_int16 yydefgoto =
 {
- -1, 1, 2, 68, 69, 70, 286, 463, 464, 297,
- 298, 518, 72, 612, 73, 213, 214, 685, 215, 76,
- 77, 673, 813, 78, 79, 299, 80, 81, 82, 543,
- 83, 216, 123, 124, 243, 244, 245, 710, 650, 207,
- 85, 304, 616, 651, 277, 507, 508, 278, 279, 268,
- 500, 536, 655, 606, 86, 210, 302, 738, 303, 318,
- 748, 223, 837, 224, 838, 709, 994, 676, 674, 922,
- 458, 289, 469, 701, 829, 830, 230, 757, 947, 1020,
- 967, 881, 784, 785, 882, 854, 999, 1000, 549, 858,
- 395, 601, 88, 89, 445, 666, 665, 492, 997, 688,
- 823, 926, 930, 90, 91, 92, 331, 332, 554, 93,
- 94, 95, 555, 253, 254, 255, 487, 96, 97, 98,
- 325, 99, 100, 219, 220, 103, 221, 454, 675, 370,
- 371, 372, 373, 374, 884, 885, 375, 376, 377, 770,
- 591, 379, 380, 381, 382, 576, 383, 384, 385, 889,
- 890, 386, 387, 388, 389, 390, 584, 209, 459, 309,
- 510, 272, 129, 680, 653, 462, 457, 436, 514, 855,
- 515, 534, 257, 258, 259, 301
+ 0, 1, 2, 68, 69, 70, 287, 464, 465, 298,
+ 299, 520, 72, 615, 73, 213, 214, 688, 215, 76,
+ 77, 676, 819, 78, 79, 300, 80, 81, 82, 545,
+ 83, 216, 123, 124, 243, 244, 245, 713, 653, 207,
+ 85, 305, 619, 654, 278, 509, 510, 279, 280, 269,
+ 502, 538, 658, 609, 86, 210, 303, 742, 304, 319,
+ 752, 223, 843, 224, 844, 712, 1000, 679, 677, 928,
+ 459, 290, 470, 704, 835, 836, 230, 762, 953, 1026,
+ 973, 887, 790, 791, 888, 860, 1005, 1006, 551, 864,
+ 396, 604, 88, 89, 446, 669, 668, 493, 1003, 691,
+ 829, 932, 936, 90, 91, 92, 332, 333, 556, 93,
+ 94, 95, 557, 253, 254, 255, 488, 96, 97, 98,
+ 326, 99, 100, 219, 220, 103, 221, 455, 678, 371,
+ 372, 373, 374, 375, 890, 891, 376, 377, 378, 776,
+ 594, 380, 381, 382, 383, 579, 384, 385, 386, 895,
+ 896, 387, 388, 389, 390, 391, 587, 209, 460, 310,
+ 512, 273, 129, 683, 656, 463, 458, 437, 516, 861,
+ 517, 536, 257, 258, 259, 302
 };
 
- /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule whose
- number is the opposite. If YYTABLE_NINF, syntax error. */
+/* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule whose
+ number is the opposite. If YYTABLE_NINF, syntax error. */
 static const yytype_int16 yytable =
 {
- 106, 439, 270, 270, 284, 347, 270, 433, 435, 343,
- 87, 285, 87, 126, 126, 282, 205, 218, 218, 280,
- 246, 229, 477, 218, 218, 218, 517, 542, 218, 703,
- 222, 504, 400, 300, 246, 252, 712, 588, 107, 537,
- 270, 270, 71, 539, 71, 314, 265, 265, 775, 206,
- 265, 617, 307, 311, 271, 271, 206, 449, 271, 861,
- 87, 721, 888, 772, 315, 721, 654, 324, 826, 741,
- 206, 556, 391, 391, 218, 393, 724, 440, 652, 836,
- -107, 256, 661, -104, 525, 664, 334, 336, 338, 340,
- 315, 681, 306, 310, 276, 281, 550, 1025, 444, 392,
- 206, 1001, 125, 125, -109, 573, 682, 724, 696, 280,
- 125, -111, 501, -488, 505, 267, 273, 706, 437, 274,
- 856, 652, 393, 661, 3, 218, 782, 87, 700, 811,
- 812, 283, 682, 790, 287, 346, -487, -485, 474, 581,
- -110, -301, 773, 437, 293, 776, 434, 578, 533, 483,
- -489, -106, 771, 125, -108, -105, -301, 366, 378, 378,
- 600, 430, 910, 269, 269, 396, -112, 269, 916, 574,
- -488, 682, -490, 783, 1025, 825, 468, 491, 443, 125,
- 394, 744, 367, 558, 276, 281, 558, 607, 558, 296,
- 558, -301, 558, -487, 1001, -587, 682, -99, -301, -586,
- -96, 305, 443, 432, 857, 378, 378, -489, 401, 522,
- -484, 391, 391, 611, 393, 441, 247, -492, 87, 248,
- 249, -101, 772, -587, 904, 683, 667, 670, -103, -490,
- 438, 218, 218, 528, 772, 547, 275, 466, 467, -104,
- 397, 535, 535, 478, 479, 888, 535, 250, 888, 251,
- 275, 324, 1007, 611, 611, 438, 296, -102, 542, -77,
- 594, 270, 597, 541, 453, 270, 465, 502, -98, 502,
- 504, -100, -97, 511, -492, 247, 300, 921, 248, 249,
- -91, -491, 247, 218, 206, 248, 249, 218, 721, 721,
- 905, 218, 218, -493, -479, 87, 752, 378, 378, 476,
- 724, 773, 87, 87, -484, 265, 250, 523, 251, 265,
- 87, 771, 442, 773, 471, 251, 896, 271, 488, -483,
- 995, 315, 542, 771, 775, 888, 747, 755, -111, 356,
- 357, 358, 359, -104, 524, 891, -110, 822, -491, 603,
- 475, -111, 530, 460, 613, 360, 341, 342, 834, 553,
- -493, -479, 728, 729, -96, 87, 218, 218, 218, 218,
- 87, 218, 218, 527, 721, 353, 354, 480, 566, 567,
- 568, 569, 484, 585, 835, 585, -483, -106, 512, 300,
- 87, 565, 486, 442, 613, 613, 765, 71, 609, 491,
- 938, 523, 570, 755, 679, 356, 357, 358, 359, 934,
- 461, 87, 378, -108, 218, 558, 87, 315, -341, 618,
- 125, 360, -111, 450, 451, 447, 805, 270, 860, 448,
- -110, 954, 509, -341, 520, 771, 269, 867, -105, 511,
- 503, 901, 296, -103, 499, 771, 364, 365, 366, 218,
- 806, -102, 270, 816, 652, -106, 661, 519, 788, 618,
- 618, 417, 807, 378, 511, 809, 828, 825, -341, 270,
- 517, 265, 689, 367, 218, -341, 87, 218, 270, -108,
- 526, 511, 852, 807, -76, 659, 718, 87, 659, 417,
- 511, 218, 847, 538, 1006, 87, 265, 270, 996, 540,
- 218, 270, 740, 532, 541, 87, 125, 563, 804, 659,
- 544, 732, 721, 265, 911, 542, 660, 502, 502, 426,
- 427, 428, 265, 724, 845, 564, 659, 106, 1023, 270,
- 580, 1026, 270, -414, 246, 659, 42, 87, 771, 43,
- 660, -499, 270, -105, 583, 296, 87, 586, 797, 722,
- 517, 595, 470, 605, 511, 964, 965, 660, 605, 470,
- 315, 893, 315, 805, 218, 587, 660, 844, 541, 71,
- 206, 590, 87, 247, 659, 505, 248, 249, 737, 212,
- 212, 739, 593, 59, 727, 212, 265, 429, 919, 959,
- 960, 598, -106, 596, 906, 599, 493, -414, 218, 659,
- 912, 914, 430, 806, 250, 660, 251, 517, 1067, 786,
- 610, 771, -414, -98, 634, 611, 692, 218, -106, 847,
- 762, 611, 771, 798, 699, 672, 315, 611, 611, 551,
- 660, 686, -108, 945, 711, 452, 452, 431, 687, 779,
- 690, 691, 378, 693, 432, -414, 552, -414, 714, 125,
- 715, 125, -91, -100, -414, 802, 870, 872, 874, -583,
- 876, 726, 877, 502, 808, 468, 731, 810, 105, 280,
- 105, 734, 280, 786, 786, 105, 105, 1057, 749, 911,
- 579, 105, 105, 105, 493, 535, 105, 446, 1045, 761,
- 280, 764, 682, 218, 87, 824, 827, 781, 575, 983,
- 827, 751, 942, 841, 820, 815, 978, 827, -105, 792,
- -298, 791, 793, -298, -298, 125, 589, -106, 105, 803,
- -106, -106, 817, -479, 270, 270, 246, 218, 818, -97,
- 502, 917, 105, 611, 825, 801, 989, 206, -479, 840,
- -298, -298, 991, -298, 276, 833, 613, 276, -106, 839,
- -106, 541, 613, 908, 326, 327, 328, 489, 613, 613,
- 248, 249, 206, 801, 247, 276, 843, 248, 249, 455,
- 842, -583, 863, -479, 865, 585, 849, -583, 247, -108,
- -479, 248, 249, 105, 430, 105, 850, 853, 573, 859,
- 517, 499, 270, 212, 212, 250, 869, 251, 871, 873,
- 270, 768, 87, 875, 511, 768, 878, 329, 330, 315,
- 87, 618, 472, -584, 218, 702, 702, 618, 218, 456,
- 924, 786, 925, 618, 618, 929, 432, 430, 933, 87,
- 87, 927, 935, 943, 931, 948, 265, 1008, 1010, 1011,
- 1012, 963, 897, 87, 605, 966, 218, 333, 969, 659,
- 327, 328, 849, 513, 516, 87, 87, 502, 932, 551,
- 971, 973, 473, 87, 613, 493, 529, 975, 980, 432,
- 531, 981, 493, 992, 87, 87, 105, -483, -108, 993,
- 660, -108, -108, 1002, 1003, 353, 354, 758, 1009, 105,
- 105, 1013, -483, 585, 585, 767, 559, 1014, 125, 327,
- 328, 962, 329, 330, 774, 1015, 968, 778, 1028, -108,
- 998, -108, 356, 357, 358, 359, 1033, 1029, 212, 212,
- 212, 212, 1030, 571, 572, -584, 1065, -483, 360, 618,
- 1037, -584, 1039, 1041, -483, 883, 1046, 1048, 270, 87,
- 87, 105, -590, 986, 1050, 105, 1052, 87, 827, 105,
- 105, 329, 330, 105, 669, 671, 1062, 1070, -586, 920,
- 105, 105, -587, 247, 1072, 733, 248, 249, 105, -586,
- -587, 227, 928, 130, 1061, 880, 335, 247, 327, 328,
- 248, 249, 1063, 918, 936, 937, 1038, -291, 669, 671,
- 125, 1060, 940, 490, 250, 125, 251, 208, 766, 0,
- 1017, 892, -291, 0, 946, 1022, -590, 87, 481, 87,
- 251, 814, 87, 105, 105, 105, 105, 105, 105, 105,
- 105, -590, 0, 430, 0, 0, 585, 0, 270, 684,
- 329, 330, 125, -586, -587, 0, 735, -291, 105, 0,
- 511, 0, 689, 827, -291, 0, 0, 0, -586, -587,
- 218, 470, 0, 0, -590, 521, -590, 0, 482, 105,
- -586, 0, 105, -590, 105, 432, 0, 105, 982, 0,
- 430, 0, 265, 725, 0, 560, 990, 327, 328, 0,
- 730, -586, -587, -586, -587, 659, 0, -586, -587, 0,
- -586, -587, 736, 0, 887, 886, 0, 105, 0, 777,
- 0, 356, 357, 358, 359, 473, 868, 105, 105, 0,
- 0, 0, 432, 545, 0, 883, 660, 360, 883, 0,
- 0, 883, 105, 883, 105, 105, 0, 0, 430, 329,
- 330, 0, 0, 0, 0, 105, 1034, 0, 1035, 105,
- -486, 1036, 362, 105, 759, 760, 0, 0, 105, 364,
- 365, 366, 923, 105, 0, -486, 0, -290, 0, 0,
- 970, 972, 0, 546, 0, 0, 0, 0, -302, 0,
- 432, 883, -290, 0, 789, 0, 367, 702, 795, 0,
- 953, 768, 955, -302, 892, 105, 956, 892, 0, 892,
- -486, 1016, 0, 430, 105, 0, 0, -486, 883, 0,
- 883, 0, 883, 0, 883, 0, 430, -290, 0, 0,
- 0, 0, 105, 0, -290, 217, 217, 1031, -302, 0,
- 105, 217, 266, 266, 883, -302, 266, 0, 796, 0,
- 0, 0, 430, 0, 0, 432, 1021, 892, 0, 0,
- 0, 456, 0, 0, 0, 212, 105, 0, 432, 0,
- 0, 819, 0, 288, 290, 291, 292, 417, 1004, 1005,
- 266, 308, 0, 470, 892, 105, 892, 1032, 892, 470,
- 892, 0, 344, 345, 432, 1018, 0, 0, 886, 212,
- 1024, 886, 1027, 886, 0, 424, 425, 426, 427, 428,
- 892, 0, 1047, 1049, 1051, 0, 1053, 1054, 0, 0,
- 337, 327, 328, 0, 0, 851, 348, 349, 350, 351,
- 352, 0, 907, 909, 0, 0, 0, 1040, 913, 915,
- 1042, 0, 0, 217, 862, 339, 327, 328, 552, 327,
- 328, 886, 0, 0, 0, 0, 1071, 1073, 1074, 1075,
- 0, 105, 105, 0, 907, 909, 1077, 913, 915, 557,
- 327, 328, 1064, 329, 330, 0, 0, 1066, 886, 1068,
- 886, 0, 886, 1069, 886, 0, 0, 0, 355, 0,
- 356, 357, 358, 359, 0, 105, 0, 0, 329, 330,
- 0, 329, 330, 1076, 886, 0, 360, 561, 327, 328,
- 0, 755, 0, 356, 357, 358, 359, 0, 212, 0,
- 361, 0, 329, 330, 0, 0, 0, 0, 0, 360,
- 0, 362, 0, 0, 0, 941, 0, 363, 364, 365,
- 366, 562, 327, 328, 979, 0, 750, 327, 328, 217,
- 217, 950, 0, 74, 362, 74, 121, 121, -613, 0,
- 329, 330, 0, 0, 121, 367, 0, 979, 368, 0,
- 105, 247, 0, 0, 248, 249, 0, 0, 105, 105,
- 0, 369, 105, 0, 0, 105, 105, 495, 496, 497,
- 344, 105, 105, 0, 329, 330, 0, 105, 105, 329,
- 330, 266, 944, 74, 251, 266, 0, 121, 0, 217,
- 217, 105, 0, 0, 105, 0, 355, 0, 356, 357,
- 358, 359, 0, 105, 105, 0, 0, 0, 0, 0,
- 0, 105, 0, 121, 360, 755, 0, 356, 357, 358,
- 359, 0, 105, 105, 0, 414, 415, 0, 361, 0,
- 0, 0, 0, 360, 0, 0, 0, 0, 417, 362,
- 414, 415, 0, 0, 0, 363, 364, 365, 366, 0,
- 74, 0, 0, 417, 217, 217, 217, 217, 362, 217,
- 217, 0, 0, 0, 756, 423, 424, 425, 426, 427,
- 428, 0, 0, 367, 0, 0, 368, 105, 0, 582,
- 0, 424, 425, 426, 427, 428, 0, 105, 105, 369,
- 592, 0, 0, 0, 0, 105, 0, 0, 0, 0,
- 0, 0, 604, 0, 0, 0, 0, 615, 620, 621,
- 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
- 632, 633, 0, 635, 636, 637, 638, 639, 640, 641,
- 642, 643, 644, 645, 646, 0, 247, 266, 0, 248,
- 249, 74, 0, 0, 0, 0, 0, 668, 668, 0,
- 0, 0, 0, 0, 0, 105, 0, 105, 0, 0,
- 105, 0, 266, 499, 0, 217, 0, 250, 0, 251,
- 0, 355, 0, 356, 357, 358, 359, 668, 0, 266,
- 0, 668, 668, 0, 0, 0, 0, 0, 266, 360,
- 0, 0, 0, 0, 0, 0, 0, 713, 105, 0,
- 716, 0, 0, 0, 717, 0, 0, 720, 0, 723,
- 0, 308, 292, 0, 362, 414, 415, 0, 74, 0,
- 363, 364, 365, 366, 0, 74, 74, 0, 417, 668,
- 0, 0, 755, 74, 356, 357, 358, 359, 0, 720,
- 0, 0, 308, 0, 121, 0, 0, 0, 367, 0,
- 360, 368, 266, 421, 422, 423, 424, 425, 426, 427,
- 428, 0, 0, 0, 548, 0, 0, 0, 0, 753,
- 754, 0, 0, 0, 0, 362, 0, 0, 74, 0,
- 0, 949, 0, 74, 0, 0, 763, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -613, 0, 74, 0, 780, 0, 355, 787, 356,
- 357, 358, 359, 0, -613, -613, -613, -613, -613, -613,
- 0, -613, 0, 0, 74, 360, 0, -613, -613, 74,
- 121, 0, 74, 0, 0, 0, 0, 0, -613, -613,
- 0, -613, -613, -613, -613, -613, 0, 0, 0, 0,
- 362, 0, 0, 0, 0, 0, 363, 364, 365, 366,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 74, 74, 0, 0, 0, 0, 0, 0,
- 0, 217, 0, 0, 367, 0, 0, 368, 0, 74,
- 0, -613, 0, 821, 0, 0, 763, 780, 1019, 0,
- 74, 75, 0, 75, 122, 122, -613, 0, 74, 0,
- 0, 0, 122, 0, 0, 217, -613, 0, 74, -613,
- -613, 0, 0, 0, 0, 846, 0, 0, 0, 0,
- 0, 0, 0, 0, 720, 308, 0, 0, 0, -613,
- -613, 0, 0, 0, 0, 275, -613, -613, -613, -613,
- 74, 75, 0, 0, 0, 122, 0, 0, 0, 74,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 121, 0, 121, 0, 0, 0, 0,
- 0, 122, 0, 0, 0, 74, 0, 0, 0, 0,
- 0, 0, 0, 0, 895, 0, 0, 0, 0, 668,
- 898, 0, 266, 0, 0, 668, 668, 0, 0, 0,
- 720, 668, 668, 0, 0, 0, 0, 0, 75, 0,
- 0, 0, 0, 0, 355, 0, 356, 357, 358, 359,
- 0, 0, 0, 0, 217, 0, 0, 668, 668, 121,
- 668, 668, 360, 0, 0, 0, 0, 0, 0, 0,
- 939, 0, 0, 0, 292, 0, 0, 0, 577, 0,
- 0, 0, 0, 0, 0, 0, 104, 362, 104, 128,
- 128, 951, 952, 363, 364, 365, 366, 232, 0, 0,
- 0, 0, 0, 0, 957, 958, 0, 0, 0, 0,
- 0, 0, 0, 794, 0, 0, 0, 0, 0, 0,
- 974, 367, 0, 0, 368, 0, 0, 74, 0, 75,
- 976, 977, 0, 0, 0, 0, 104, 668, 0, 0,
- 317, 402, 403, 404, 405, 406, 407, 408, 409, 410,
- 411, 412, 413, 0, 0, 0, 0, 414, 415, 0,
- 668, 0, 0, 0, 0, 0, 317, 0, 308, 0,
- 417, 0, 0, 0, 355, 0, 356, 357, 358, 359,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 418, 360, 419, 420, 421, 422, 423, 424, 425,
- 426, 427, 428, 104, 0, 0, 75, 0, 769, 0,
- 0, -277, 0, 75, 75, 0, 0, 362, 0, 0,
- 0, 75, 0, 363, 364, 365, 366, 0, 0, 0,
- 0, 0, 122, 0, 355, 74, 356, 357, 358, 359,
- 0, 0, 121, 74, 74, 0, 0, 0, 0, 0,
- 74, 367, 360, 0, 368, 0, 74, 74, 266, 0,
- 0, 0, 74, 74, 0, 0, 75, 0, 864, 0,
- 0, 75, 0, 0, 0, 0, 74, 362, 0, 0,
- 0, 0, 0, 363, 364, 365, 366, 0, 74, 74,
- 0, 75, 0, 0, 104, 0, 74, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 74, 74, 0,
- 0, 367, 75, 0, 368, 0, 0, 75, 122, 0,
- 75, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 121, 0, 0, 0, 0, 121,
- 355, 0, 356, 357, 358, 359, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 360, 0,
- 75, 75, 74, 0, 0, 0, 0, 0, 0, 0,
- 0, 104, 74, 74, 0, 0, 121, 75, 104, 104,
- 74, 0, 0, 362, 0, 0, 104, 0, 75, 363,
- 364, 365, 366, 0, 0, 0, 75, 317, 0, 0,
- 0, 0, 0, 0, 0, 0, 75, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 367, 0, 0,
- 368, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 104, 0, 0, 0, 0, 104, 0, 75, 0,
- 74, 0, 74, 0, 0, 74, 0, 75, 0, 0,
- 0, 0, 0, 0, 0, 0, 104, 0, 0, 0,
- 0, 122, 0, 122, 0, 0, 0, 0, 0, 0,
+ 106, 519, 266, 266, 348, 285, 266, 344, 440, 286,
+ 87, 478, 87, 126, 126, 283, 246, 218, 218, 281,
+ 706, 229, 256, 218, 218, 218, 206, 591, 218, 107,
+ 246, 270, 270, 206, 450, 270, 205, 777, 715, 506,
+ 434, 436, 620, 544, 71, 315, 71, 206, 393, 401,
+ 672, 674, 308, 312, 539, 781, 301, 725, 541, 745,
+ 87, 725, 125, 125, 316, 862, 894, 277, 282, 306,
+ 125, 728, 392, 392, 218, 552, 347, 206, 272, 272,
+ 778, 832, 272, 558, 672, 674, 503, 325, 507, 867,
+ 316, 584, 842, 469, 222, 394, 817, 818, 445, 252,
+ 655, 438, 728, -104, 664, 657, 527, 667, 1031, 281,
+ -111, 1007, 603, 125, -416, 3, 307, 311, 335, 337,
+ 339, 341, 535, -490, 796, 218, 581, 87, 685, 336,
+ 684, 328, 329, 739, 268, 274, -589, -487, 275, 125,
+ -486, -107, 394, 655, 788, 664, -109, 699, 614, 863,
+ 575, 444, 342, 343, 685, 438, 709, 277, 282, -110,
+ -106, -108, 284, 271, 271, 560, -112, 271, 560, -104,
+ 560, 475, 560, -105, 560, 444, 288, 686, -416, -489,
+ -490, 496, 484, 330, 331, 1031, 467, 468, 614, 614,
+ -96, 789, 247, -416, 685, 248, 249, 777, -491, -492,
+ -481, 271, 271, 813, 1007, 779, 815, -494, 782, 610,
+ 777, 392, 392, 439, 576, -481, -487, -106, 87, 685,
+ -96, 748, 469, 250, 813, 251, -416, -103, -416, 670,
+ 673, 218, 218, 530, 394, -416, -489, 831, 441, 492,
+ 778, 537, 537, 524, -493, -112, 537, 927, -589, 894,
+ -481, -486, 894, 778, -589, -491, -492, -481, -99, 489,
+ -592, 206, 266, -101, -494, -593, 266, 439, 504, 549,
+ 504, 325, 294, 276, 513, 544, -102, -98, -100, 506,
+ -104, 543, -495, 1013, 218, 477, 725, 725, 218, -481,
+ -97, 511, 218, 218, 397, 270, 87, 728, -485, 395,
+ 301, -493, 525, 87, 87, 529, 751, 479, 480, 756,
+ 902, 87, 443, 777, -111, 840, -106, 770, 435, -106,
+ -106, 247, 316, 777, 248, 249, 398, 732, 733, 894,
+ 828, -110, -77, 431, 781, 771, 1001, 526, 606, -495,
+ 544, -111, 272, 616, -106, 532, -481, -106, 501, -106,
+ 354, 355, 250, -91, 251, -485, 87, 218, 218, 218,
+ 218, 87, 218, 218, 725, 779, 367, 365, 366, 367,
+ 442, 125, 682, 567, 588, 433, 588, 841, 779, 916,
+ 461, 87, 555, 616, 616, 922, 944, 276, 560, 612,
+ 71, 368, 443, 402, 368, 572, 247, 822, 514, 248,
+ 249, 897, 87, 301, 454, 218, -108, 87, 316, 466,
+ 621, 448, 608, 913, 915, 449, 777, 608, 266, 919,
+ 921, -111, 873, 271, 794, 940, 472, 271, 247, 251,
+ 513, 248, 249, 568, 569, 570, 571, 462, 519, 476,
+ 218, 42, -103, 266, 43, 913, 915, 525, 919, 921,
+ 621, 621, 481, 662, -105, 513, 662, 125, 485, 250,
+ 266, 251, 487, 692, 492, 218, 501, 87, 218, 266,
+ 910, 655, 513, 664, 810, 907, -110, 662, 87, 722,
+ 663, 513, 218, -108, 418, 505, 87, 960, 59, 777,
+ 858, 218, 418, 853, 662, 1002, 87, -102, 811, 553,
+ 777, 736, 725, 662, 663, 521, 851, 717, 899, 504,
+ 504, 744, 728, 543, 427, 428, 429, 731, 812, 106,
+ 519, 663, 246, 528, 917, 985, 544, -106, 247, 87,
+ 663, 248, 249, 850, 266, 925, 911, -76, 87, 206,
+ 970, 971, 507, 662, 811, 614, 513, -108, 985, 534,
+ 582, 614, 316, -105, 316, 542, 218, 614, 614, 379,
+ 379, 251, 540, 71, 87, 726, 354, 355, 662, 767,
+ 663, 546, 741, -106, 803, 451, 452, 519, 543, 271,
+ 951, 565, -108, 566, 1029, -108, -108, 1032, 785, 834,
+ 831, 218, 912, 577, -98, 663, 583, 743, 918, 920,
+ -501, 125, 792, 125, 271, 586, 379, 379, 812, 471,
+ 218, 965, 966, -108, 589, -108, 471, 804, 590, 316,
+ -303, 271, 853, 453, 453, 593, 105, 598, 105, 596,
+ 271, 599, 601, 105, 105, -303, 597, -108, 600, 105,
+ 105, 105, 602, 637, 105, 613, 989, 703, 808, 675,
+ 271, 689, 917, 494, 271, 690, 504, 814, -100, 693,
+ 816, 694, 281, 614, 1073, 281, 792, 792, 125, -343,
+ -303, 948, -590, 1051, -593, 696, 105, -303, 537, 554,
+ 718, -105, 271, 281, -343, 271, 218, 87, 830, 833,
+ 105, 730, 735, 833, 847, 271, 738, -91, 379, 379,
+ 833, 807, -97, 753, 984, 608, 766, 206, 797, 685,
+ 277, 1063, 799, 277, 769, 246, 787, 826, 798, -343,
+ 218, 995, 824, -596, 504, 809, -343, 997, 823, 807,
+ 553, 277, 206, 831, 923, 247, -485, 839, 248, 249,
+ 616, 105, 494, 105, 845, 297, 616, 914, 848, 849,
+ 856, -485, 616, 616, 859, 871, 578, 865, 430, 763,
+ 519, 869, 821, 575, 543, 875, 250, 773, 251, 877,
+ 879, 588, 881, 431, 592, 884, 780, 212, 212, 784,
+ 889, 930, 931, 212, -590, 935, -485, -596, 266, 939,
+ -590, 941, 949, -485, 855, 954, 846, 969, 87, 972,
+ 513, 979, -596, 975, 379, 316, 87, 621, 432, 977,
+ 218, 981, 297, 621, 218, 433, 987, 792, 986, 621,
+ 621, 1009, 662, 998, 999, 87, 87, 933, 1008, 247,
+ 937, 1019, 248, 249, 105, -596, 1015, -596, 1020, 87,
+ 903, -592, 218, 1021, -596, 1035, 456, 105, 105, 663,
+ 1036, 87, 87, 504, 125, 379, 501, 1034, 616, 87,
+ 250, 431, 251, 759, 1043, 357, 358, 359, 360, 1045,
+ 87, 87, 855, 705, 705, 1047, 217, 217, 1052, 271,
+ 271, 760, 217, 267, 267, 447, -592, 267, 1054, 588,
+ 588, 473, 1056, 1058, 1068, 247, 457, 968, 248, 249,
+ 105, -592, 974, 433, 105, -593, 431, -300, 105, 105,
+ -300, -300, 105, 1076, 289, 291, 292, 293, 938, 105,
+ 105, 267, 309, 1078, 494, 621, 250, 105, 251, 227,
+ -593, 494, 737, 345, 346, 87, 87, -300, -300, 992,
+ -300, 474, 130, 87, 833, 1039, 125, 1067, 433, 271,
+ -592, 125, 886, 1069, 866, 334, -293, 271, 328, 329,
+ 889, 924, 1066, 889, 491, -592, 889, 208, 889, 893,
+ 892, -293, 105, 105, 105, 105, 105, 105, 105, 105,
+ 482, 522, 772, 1044, 217, 1023, 1028, 0, 125, 297,
+ 0, 212, 212, 0, -593, 431, 0, 105, -592, 0,
+ -592, 0, 0, 87, -592, 87, -293, -592, 87, -593,
+ 330, 331, 0, -293, 0, 0, 889, 0, 105, 0,
+ 0, 105, 588, 105, 266, 0, 105, 876, 878, 880,
+ 483, 882, 0, 883, 0, 379, 513, 433, 692, 833,
+ 0, 0, -593, 889, -593, 889, 218, 889, -593, 889,
+ 0, -593, 515, 518, 0, 959, 105, 961, 662, 490,
+ 0, 962, 248, 249, 523, 0, 105, 105, 0, 889,
+ 759, 820, 357, 358, 359, 360, 0, 0, 547, 431,
+ 0, 105, 0, 105, 105, 663, 0, 0, 760, -488,
+ 217, 217, 297, 431, 105, 271, 247, 0, 105, 248,
+ 249, 0, 105, 0, -488, 247, 531, 105, 248, 249,
+ 533, 471, 105, 562, 474, 328, 329, 212, 212, 212,
+ 212, 433, 573, 574, 0, -292, -304, 801, 548, 497,
+ 498, 499, 345, 1010, 1011, 433, 950, 0, 251, -488,
+ -292, -304, 431, 267, 1022, 105, -488, 267, 0, 0,
+ 1024, 217, 217, 892, 105, 1030, 892, 1033, 892, 431,
+ 0, 1012, 0, 695, 0, 0, 0, 330, 331, 874,
+ 0, 702, 105, 1037, 0, -292, -304, 802, 0, 0,
+ 105, 714, -292, -304, 433, 271, 0, 561, 431, 0,
+ 328, 329, 1046, 0, 457, 1048, 0, 327, 328, 329,
+ 0, 433, 338, 328, 329, 0, 892, 105, 1014, 1016,
+ 1017, 1018, 0, 0, 0, 929, 217, 217, 217, 217,
+ 0, 217, 217, 1038, 0, 0, 105, 1070, 687, 0,
+ 433, 0, 1072, 892, 1074, 892, 0, 892, 1075, 892,
+ 705, 585, 330, 331, 349, 350, 351, 352, 353, 755,
+ 330, 331, 595, 0, 0, 330, 331, 0, 1082, 892,
+ 0, 774, 0, 0, 607, 774, 340, 328, 329, 618,
+ 623, 624, 625, 626, 627, 628, 629, 630, 631, 632,
+ 633, 634, 635, 636, 0, 638, 639, 640, 641, 642,
+ 643, 644, 645, 646, 647, 648, 649, 1071, 0, 267,
+ 0, 0, 105, 105, 554, 328, 329, 0, 0, 671,
+ 671, 559, 328, 329, 729, 563, 328, 329, 0, 330,
+ 331, 734, 0, 0, 267, 0, 471, 217, 564, 328,
+ 329, 0, 471, 740, 0, 0, 105, 0, 0, 671,
+ 0, 267, 0, 671, 671, 74, 0, 74, 121, 121,
+ 267, 0, 0, 754, 328, 329, 121, 330, 331, 716,
+ 0, 0, 719, 720, 330, 331, 0, 721, 330, 331,
+ 724, 0, 727, 0, 309, 293, 415, 416, 0, 0,
+ 418, 330, 331, 0, 0, 0, 764, 765, 0, 418,
+ 0, 0, 671, 0, 0, 74, 0, 976, 978, 121,
+ 0, 0, 724, 0, 0, 309, 330, 331, 425, 426,
+ 427, 428, 429, 0, 105, 267, 795, 425, 426, 427,
+ 428, 429, 105, 105, 0, 121, 105, 0, 0, 105,
+ 105, 0, 757, 758, 0, 105, 105, 0, 0, 0,
+ 0, 105, 105, 0, 0, 0, 212, 0, 0, 0,
+ 768, 0, 0, 0, 0, 105, 0, 0, 105, 0,
+ 0, 0, 74, 0, 898, 415, 416, 105, 105, 786,
+ 0, 0, 793, 1027, 0, 105, 0, 0, 418, 759,
+ 212, 357, 358, 359, 360, 0, 105, 105, 0, 0,
+ 0, 0, 0, 825, 0, 0, 759, 760, 357, 358,
+ 359, 360, 0, 422, 423, 424, 425, 426, 427, 428,
+ 429, 926, 0, 0, 760, 75, 0, 75, 122, 122,
+ 0, 0, 363, 0, 934, 0, 122, 0, 761, 1053,
+ 1055, 1057, 0, 1059, 1060, 0, 942, 943, 0, 363,
+ 0, 105, 0, 0, 946, 217, 0, 0, 857, 0,
+ 0, 105, 105, 74, 0, 0, 952, 827, 0, 105,
+ 768, 786, 0, 0, 0, 75, 0, 0, 868, 122,
+ 0, 415, 416, 1077, 1079, 1080, 1081, 0, 0, 217,
+ 0, 0, 0, 1083, 418, 0, 0, 0, 0, 0,
+ 852, 0, 0, 0, 0, 122, 0, 0, 0, 724,
+ 309, 0, 212, 0, 0, 759, 0, 357, 358, 359,
+ 360, 424, 425, 426, 427, 428, 429, 0, 0, 105,
+ 988, 105, 0, 760, 105, 0, 0, 0, 996, 0,
+ 0, 74, 75, 0, 0, 0, 0, 0, 74, 74,
+ 0, 0, 0, 0, 774, 0, 74, 898, 363, 0,
+ 898, 0, 898, 0, 955, 0, 0, 121, 0, 0,
+ 947, 901, 105, 0, 0, 0, 671, 904, 0, 267,
+ 0, 0, 671, 671, 0, 0, 956, 724, 671, 671,
+ 1004, 0, 357, 358, 359, 360, 0, 0, 1040, 0,
+ 1041, 74, 0, 1042, 0, 0, 74, 0, 760, 0,
+ 898, 217, 0, 0, 671, 671, 0, 671, 671, 0,
+ 0, 0, 0, 0, 0, 0, 74, 945, 0, 0,
+ 0, 293, 0, 75, 0, 0, 0, 898, 0, 898,
+ 0, 898, 0, 898, 0, 0, 0, 74, 957, 958,
+ 0, 0, 74, 121, 0, 74, 0, 0, 0, 0,
+ 0, 963, 964, 898, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 980, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 982, 983, 104,
+ 0, 104, 128, 128, 671, 74, 74, 0, 0, 0,
+ 232, 0, 356, 0, 357, 358, 359, 360, 0, 0,
+ 0, 75, 74, 0, 0, 0, 0, 671, 75, 75,
+ 361, 0, 0, 74, 0, 309, 75, 0, 0, 0,
+ 0, 74, 0, 0, 362, 0, 0, 122, 0, 104,
+ 0, 74, 0, 318, 0, 363, 0, 0, 0, 0,
+ 0, 364, 365, 366, 367, 0, 0, 0, 0, 0,
+ 0, 0, 356, 0, 357, 358, 359, 360, 0, 318,
+ 0, 75, -619, 0, 74, 0, 75, 0, 0, 368,
+ 361, 0, 369, 74, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 370, 75, 121, 356, 121,
+ 357, 358, 359, 360, 0, 363, 104, 0, 0, 74,
+ 0, 364, 365, 366, 367, 267, 361, 75, -619, 0,
+ 0, 0, 75, 122, 0, 75, 0, 0, 0, 0,
+ 362, -619, -619, -619, -619, -619, -619, 0, -619, 368,
+ 0, 363, 369, 0, -619, -619, 0, 364, 365, 366,
+ 367, 0, 0, 1025, 0, -619, -619, 0, -619, -619,
+ -619, -619, -619, 0, 121, 75, 75, 0, 0, 0,
+ 0, 0, 0, 0, 0, 368, 0, 0, 369, 0,
+ 0, 0, 75, 0, 0, 0, 0, 0, 0, 0,
+ 0, 370, 0, 75, 0, 0, 0, 104, 0, 0,
+ 0, 75, 0, 0, 0, 84, 0, 84, -619, 0,
+ 0, 75, 0, 0, 0, 0, 228, 0, 0, 0,
+ 0, 0, 0, -619, 0, 0, 0, 0, 0, 0,
+ 0, 0, 74, -619, 0, 0, -619, -619, 0, 0,
+ 0, 0, 0, 356, 75, 357, 358, 359, 360, 0,
+ 0, 0, 0, 75, 0, 84, -619, -619, 0, 0,
+ 0, 361, 276, -619, -619, -619, -619, 122, 0, 122,
+ 0, 0, 0, 0, 0, 104, 0, 0, 0, 75,
+ 0, 0, 104, 104, 0, 0, 363, 0, 0, 0,
+ 104, 0, 364, 365, 366, 367, 0, 0, 0, 0,
+ 0, 318, 0, 783, 0, 357, 358, 359, 360, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 368, 361, 84, 369, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 122, 104, 550, 0, 0, 0,
+ 104, 0, 0, 74, 0, 0, 363, 0, 0, 0,
+ 121, 74, 74, 365, 366, 367, 0, 0, 74, 0,
+ 104, 0, 0, 0, 74, 74, 0, 0, 0, 0,
+ 74, 74, 0, 0, 356, 0, 357, 358, 359, 360,
+ 368, 104, 0, 0, 74, 0, 104, 318, 0, 622,
+ 0, 0, 361, 0, 0, 0, 74, 74, 0, 0,
+ 0, 0, 75, 0, 74, 0, 0, 0, 580, 0,
+ 0, 0, 0, 84, 0, 74, 74, 363, 0, 0,
+ 0, 0, 0, 364, 365, 366, 367, 0, 0, 622,
+ 622, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 121, 0, 0, 0, 104, 121, 0, 0,
+ 0, 368, 0, 0, 369, 0, 0, 104, 0, 0,
+ 0, 0, 0, 0, 0, 104, 0, 0, 0, 0,
+ 74, 0, 0, 0, 0, 104, 0, 0, 0, 0,
+ 74, 74, 0, 0, 121, 0, 0, 0, 74, 0,
+ 0, 84, 0, 0, 0, 0, 0, 0, 84, 84,
+ 0, 0, 0, 0, 0, 0, 84, 0, 104, 0,
 0, 0, 0, 75, 0, 0, 0, 104, 0, 0,
- 0, 0, 104, 317, 0, 619, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 101, 0, 101, 127, 127, 127, 0, 0, 647,
- 648, 0, 231, 649, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 619, 619, 122, 174, 175,
- 176, 177, 178, 179, 180, 181, 0, 0, 182, 183,
- 0, 0, 104, 0, 184, 185, 186, 187, 0, 0,
- 0, 101, 0, 104, 0, 316, 0, 0, 188, 189,
- 190, 104, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 104, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 316, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 0, 201, 202, 75, 0, 0, 0, 0,
- 0, 203, 275, 104, 0, 0, 0, 0, 0, 0,
- 0, 0, 104, 794, 0, 0, 0, 0, 101, 0,
- 0, 0, 0, 0, 0, 0, 317, 0, 317, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 104, 0,
- 0, 402, 403, 404, 405, 406, 407, 408, 409, 410,
- 411, 412, 413, 0, 0, 0, 0, 414, 415, 0,
- 0, 0, 0, 0, 0, 0, 84, 0, 84, 0,
- 417, 0, 0, 0, 0, 0, 0, 228, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 418, 317, 419, 420, 421, 422, 423, 424, 425,
- 426, 427, 428, 75, 0, 0, 0, 0, 0, 101,
- 122, 75, 75, 0, 0, 0, 84, 0, 75, 0,
- 0, 0, 0, 0, 75, 75, 0, 0, 0, 0,
- 75, 75, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 75, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 75, 75, 0, 0,
- 104, 0, 0, 0, 75, 0, 0, 102, 0, 102,
- 0, 0, 0, 0, 0, 75, 75, 0, 0, 0,
+ 122, 75, 75, 0, 0, 0, 0, 0, 75, 0,
+ 0, 318, 0, 318, 75, 75, 0, 0, 0, 0,
+ 75, 75, 0, 104, 0, 0, 0, 0, 74, 0,
+ 74, 84, 0, 74, 75, 0, 84, 0, 0, 101,
+ 0, 101, 127, 127, 127, 0, 75, 75, 0, 0,
+ 231, 0, 0, 0, 75, 356, 84, 357, 358, 359,
+ 360, 0, 0, 0, 0, 75, 75, 0, 0, 0,
+ 0, 0, 0, 361, 0, 0, 0, 84, 318, 0,
+ 0, 0, 84, 0, 0, 617, 0, 0, 0, 101,
+ 0, 0, 122, 317, 0, 0, 0, 122, 363, 0,
+ 0, 0, 0, 0, 364, 365, 366, 367, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 317,
+ 75, 0, 0, 0, 0, 617, 617, 0, 0, 0,
+ 75, 75, 368, 0, 122, 369, 0, 0, 75, 0,
+ 0, 0, 84, 0, 800, 0, 104, 0, 0, 0,
 0, 0, 0, 84, 0, 0, 101, 0, 0, 0,
- 0, 0, 0, 101, 101, 0, 0, 0, 0, 0,
- 0, 101, 122, 0, 0, 0, 0, 122, 0, 0,
- 0, 0, 316, 0, 0, 0, 0, 102, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 75, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 75, 75, 0, 0, 122, 0, 101, 0, 75, 0,
- 0, 101, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 84, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 84, 403, 404, 405, 406, 407, 408, 409, 410,
+ 411, 412, 413, 414, 0, 0, 0, 0, 415, 416,
+ 0, 0, 0, 0, 0, 0, 0, 0, 75, 0,
+ 75, 418, 0, 75, 84, 0, 0, 0, 0, 0,
+ 0, 0, 0, 84, 0, 0, 0, 0, 0, 0,
+ 0, 0, 419, 0, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 0, 0, 0, 0, 0, 84,
+ 0, 0, -277, 0, 0, 0, 0, 101, 0, 0,
+ 102, 0, 102, 0, 0, 0, 0, 104, 0, 0,
+ 0, 0, 0, 0, 318, 104, 622, 0, 0, 0,
+ 0, 0, 622, 0, 0, 0, 0, 0, 622, 622,
+ 0, 0, 0, 0, 104, 104, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 104, 0,
- 0, 101, 0, 0, 84, 317, 104, 619, 0, 0,
- 0, 0, 0, 619, 102, 0, 0, 0, 0, 619,
- 619, 0, 101, 0, 0, 104, 104, 101, 316, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 75, 104,
- 75, 0, 0, 75, 0, 0, 0, 0, 0, 0,
- 0, 104, 104, 0, 0, 0, 0, 0, 0, 104,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 104, 104, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 84, 0, 0, 0, 0, 0, 101, 84, 84,
- 0, 0, 0, 0, 0, 0, 84, 128, 101, 0,
- 0, 0, 128, 0, 0, 102, 101, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 101, 0, 0, 0,
- 0, 0, 0, 0, 0, 619, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 104, 104, 0, 0, 988,
- 0, 84, 0, 104, 0, 0, 84, 0, 101, 0,
- 0, 0, 0, 0, 0, 0, 0, 101, 0, 402,
- 403, 404, 405, 406, 407, 408, 84, 410, 411, 0,
- 0, 316, 0, 316, 0, 414, 415, 0, 0, 0,
- 0, 0, 102, 101, 0, 0, 0, 84, 417, 102,
- 102, 0, 84, 0, 0, 614, 0, 102, 0, 0,
- 0, 0, 0, 104, 0, 104, 0, 0, 104, 0,
- 0, 419, 420, 421, 422, 423, 424, 425, 426, 427,
- 428, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 614, 614, 316, 0, 0,
- 0, 0, 102, 0, 0, 0, 0, 102, 0, 0,
- 0, 0, 84, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 84, 0, 0, 0, 102, 0, 0,
- 0, 84, 0, 0, -614, -614, -614, -614, 406, 407,
- 0, 84, -614, -614, 0, 0, 0, 0, 102, 0,
- 414, 415, 0, 102, 0, 0, 102, 0, 0, 0,
- 0, 0, 0, 417, 0, 101, 0, 0, 0, 0,
+ 102, 0, 0, 356, 0, 357, 358, 359, 360, 0,
+ 104, 104, 0, 0, 0, 0, 0, 0, 104, 0,
+ 0, 361, 0, 0, 0, 101, 0, 0, 0, 104,
+ 104, 0, 101, 101, 0, 0, 0, 775, 0, 0,
+ 101, 0, 0, 0, 0, 0, 363, 0, 0, 0,
+ 0, 317, 364, 365, 366, 367, 128, 0, 0, 0,
+ 0, 128, 84, 0, 0, 0, 0, 102, 0, 356,
+ 0, 357, 358, 359, 360, 0, 0, 0, 0, 0,
+ 368, 0, 0, 369, 622, 101, 0, 361, 0, 0,
+ 101, 0, 0, 0, 104, 104, 0, 0, 994, 0,
+ 0, 0, 104, 870, 0, 0, 0, 0, 0, 0,
+ 101, 0, 363, 0, 0, 0, 0, 0, 364, 365,
+ 366, 367, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 101, 0, 0, 0, 0, 101, 317, 0, 0,
+ 0, 0, 0, 0, 0, 0, 368, 0, 0, 369,
+ 0, 0, 0, 0, 0, 0, 0, 0, 102, 0,
+ 0, 0, 104, 0, 104, 0, 0, 104, 0, 0,
 0, 0, 0, 84, 0, 0, 0, 0, 0, 0,
- 0, 0, 84, 0, 0, 0, 419, 420, 421, 422,
- 423, 424, 425, 426, 427, 428, 102, 102, 0, 0,
+ 0, 84, 617, 0, 0, 0, 0, 0, 617, 0,
+ 0, 0, 0, 0, 617, 617, 101, 0, 0, 0,
+ 84, 84, 0, 0, 0, 0, 0, 101, 0, 0,
+ 0, 0, 0, 0, 84, 101, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 101, 84, 84, 0, 0,
+ 0, 0, 0, 0, 84, 0, 102, 0, 0, 0,
+ 0, 0, 0, 102, 102, 84, 84, 0, 0, 0,
+ 0, 102, 0, 0, 0, 0, 0, 0, 101, 0,
+ 0, 0, 0, 0, 0, 0, 0, 101, 0, 0,
+ 403, 404, 405, 406, 407, 408, 409, 0, 411, 412,
+ 0, 317, 0, 317, 0, 0, 415, 416, 0, 0,
+ 0, 0, 0, 101, 0, 0, 102, 0, 0, 418,
+ 617, 102, 0, 0, 0, 0, 0, 0, 0, 0,
+ 84, 84, 0, 0, 991, 0, 0, 0, 84, 0,
+ -596, 102, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 0, -596, -596, -596, 0, -596, -596, 0,
+ -596, 0, 102, 0, 0, 0, -596, 102, 317, 0,
+ 102, 0, 0, 0, 0, 0, 0, -596, -596, 0,
+ -596, -596, -596, -596, -596, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 84, 0,
- 0, 0, 0, 102, 656, 657, 0, 0, 658, 0,
- 0, 0, 0, 0, 102, 0, 0, 0, 0, 0,
- 0, 0, 102, 174, 175, 176, 177, 178, 179, 180,
- 181, 0, 102, 182, 183, 0, 0, 0, 0, 184,
- 185, 186, 187, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 188, 189, 190, 0, 0, 0, 0,
- 0, 0, 0, 101, 102, 0, 0, 0, 0, 0,
- 316, 101, 0, 102, 0, 0, 0, 191, 192, 193,
- 194, 195, 196, 197, 198, 199, 200, 0, 201, 202,
- 101, 101, 0, 0, 0, 0, 203, 275, 0, 102,
- 0, 0, 0, 0, 101, 0, 0, 0, 0, 866,
- 0, 0, 0, 0, 0, 0, 101, 101, 0, 0,
- 84, 0, 0, 0, 101, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 101, 101, 402, 403, 404,
- 405, 406, 407, 408, 409, 410, 411, 412, 413, 0,
- 0, 0, 0, 414, 415, 0, 0, 0, 0, 0,
- 0, 0, 127, 0, 0, 0, 417, 127, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 418, 0, 419,
- 420, 421, 422, 423, 424, 425, 426, 427, 428, 0,
- 101, 101, 0, 0, 987, 0, 0, 0, 101, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 102, 0, 0, 0, 0, 0, 0, 84, 0,
- 0, 0, 0, 0, 0, 0, 84, 614, 0, 0,
- 0, 0, 0, 614, 0, 0, 0, 0, 0, 614,
- 614, 0, 0, 0, 0, 84, 84, 0, 402, 403,
- 404, 405, 406, 407, 0, 0, 410, 411, 101, 84,
- 101, 0, 0, 101, 414, 415, 0, 0, 0, 0,
- 0, 84, 84, 0, 0, 0, 0, 417, 0, 84,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 84, 84, 0, 0, 0, 0, 0, 0, 0, 0,
- 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 102,
- 0, 0, 0, 0, 0, 0, 0, 102, 102, 0,
- 0, 0, 0, 0, 102, 0, 0, 0, 0, 0,
- 102, 102, 0, 0, 0, 614, 102, 102, 0, 0,
- 0, 0, 0, 0, 0, 84, 84, 0, 0, 985,
- 102, 0, 0, 84, 0, 0, 0, 0, 0, 0,
- 0, 0, 102, 102, 0, 0, 0, 0, 0, 0,
- 102, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 102, 102, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 84, 0, 84, 0, 0, 84, 0,
+ 84, 0, 0, 84, 0, 0, 0, 0, 0, 0,
+ 102, 102, -596, -596, -596, -596, -596, -596, -596, -596,
+ -596, -596, -596, -596, 0, 0, 0, 102, -596, -596,
+ -596, 0, 805, -596, 0, 0, 101, 0, 102, 0,
+ 0, -596, 0, 0, 0, -596, 102, 0, 0, 0,
+ 0, 0, 0, 0, 0, -596, 102, 0, -596, -596,
+ 0, -107, -596, 0, -596, -596, -596, -596, -596, -596,
+ -596, -596, -596, -596, 0, 0, 0, 0, -596, -596,
+ -596, 800, -99, 0, 0, -596, -596, -596, -596, 102,
+ 0, 0, 0, 0, 0, 0, 0, 0, 102, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 403,
+ 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
+ 414, 0, 0, 0, 102, 415, 416, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 418, 0,
+ 0, 0, 0, 0, 0, 0, 0, 101, 0, 0,
+ 0, 0, 0, 0, 317, 101, 0, 0, 0, 419,
+ 0, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 0, 0, 0, 101, 101, 0, 0, 0, 0,
+ 0, 0, -620, -620, -620, -620, 407, 408, 101, -596,
+ -620, -620, 0, 0, 0, 0, 0, 0, 415, 416,
+ 101, 101, -596, -596, -596, 0, -596, -596, 101, -596,
+ 0, 418, 0, 0, 0, -596, 0, 0, 0, 101,
+ 101, 0, 0, 0, 0, 0, -596, -596, 0, -596,
+ -596, -596, -596, -596, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 0, 0, 127, 102, 0, 0,
+ 0, 127, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, -596, -596, -596, -596, -596, -596, -596, -596, -596,
+ -596, -596, -596, 0, 0, 0, 0, -596, -596, -596,
+ 0, 805, -596, 0, 101, 101, 0, 0, 993, 0,
+ -596, 0, 101, 0, -596, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, -596, 0, 0, -596, -596, 0,
+ -107, -596, 0, -596, -596, -596, -596, -596, -596, -596,
+ -596, -596, -596, 0, 0, 0, 0, -596, -596, -596,
+ 0, -596, 0, 0, -596, -596, -596, -596, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 102, 0, 0, 0,
+ 0, 0, 101, 0, 101, 0, 0, 101, 102, 0,
 0, 0, 0, 0, 0, 0, 102, 102, 0, 0,
- 0, 0, 0, 0, 102, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -613, 4, 0, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 0,
- 0, 0, 0, 0, 0, 15, 0, 16, 17, 18,
- 19, 0, 0, 0, 0, 0, 20, 21, 22, 23,
- 24, 25, 26, 0, 102, 27, 102, 0, 0, 102,
- 0, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
- 0, 0, 44, 45, 0, 46, 47, 48, 0, 0,
+ 0, 650, 651, 102, 0, 652, 0, 0, 0, 102,
+ 102, 0, 0, 0, 0, 102, 102, 0, 0, 0,
+ 174, 175, 176, 177, 178, 179, 180, 181, 0, 102,
+ 182, 183, 0, 0, 0, 0, 184, 185, 186, 187,
+ 0, 102, 102, 0, 0, 0, 0, 0, 0, 102,
+ 188, 189, 190, 0, 0, 0, 0, 0, 0, 0,
+ 102, 102, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 0, 201, 202, 403, 404, 405,
+ 406, 407, 408, 203, 276, 411, 412, 0, 0, 0,
+ 0, 0, 0, 415, 416, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 102, 418, 0, 0, 0,
+ 0, 0, 0, 0, 0, 102, 102, 0, 0, 0,
+ 0, 0, 0, 102, 0, 0, 0, 0, 0, 420,
+ 421, 422, 423, 424, 425, 426, 427, 428, 429, 0,
+ 0, 0, 0, 0, 0, -619, 4, 0, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 0, 0,
+ 0, 0, 0, 0, 15, 0, 16, 17, 18, 19,
+ 0, 0, 0, 0, 0, 20, 21, 22, 23, 24,
+ 25, 26, 0, 102, 27, 102, 0, 0, 102, 0,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 0, 40, 41, 42, 0, 0, 43, 0,
+ 0, 44, 45, 0, 46, 47, 48, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 49,
+ 50, 0, 0, 0, 0, 0, 51, 0, 0, 52,
+ 53, 0, 54, 55, 0, 56, 0, 0, 0, 57,
+ 0, 58, 59, 60, 0, 61, 62, 63, -294, 64,
+ -619, 0, 0, -619, -619, 0, 0, 0, 0, 0,
+ 0, -294, -294, -294, -294, -294, -294, 0, -294, 65,
+ 66, 67, 0, 0, 0, -294, -294, -294, 0, 0,
+ 0, -619, 0, -619, 0, -294, -294, 0, -294, -294,
+ -294, -294, -294, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, -294, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
+ -294, -294, 0, 0, 0, 0, -294, -294, -294, 0,
+ 0, -294, 0, 0, 0, 0, 0, -294, 0, -294,
+ 0, 0, 0, -294, 0, 0, 0, 0, 0, 0,
+ 0, -294, 0, -294, 0, 0, -294, -294, 0, 0,
+ -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
+ -294, -294, 0, 0, -415, 0, 0, -294, -294, -294,
+ -294, 0, 0, -294, -294, -294, -294, -415, -415, -415,
+ -415, -415, -415, 0, -415, 0, 0, 0, 0, 0,
+ -415, -415, -415, 0, 0, 0, 0, 0, 0, 0,
+ 0, -415, -415, 0, -415, -415, -415, -415, -415, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, -415, -415, -415, -415,
+ -415, -415, -415, -415, -415, -415, -415, -415, 0, 0,
+ 0, 0, -415, -415, -415, 0, 0, -415, 0, 0,
+ 0, 0, 0, -415, 0, -415, 0, 0, 0, -415,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, -415,
+ 0, 0, -415, -415, 0, 0, -415, 0, -415, -415,
+ -415, -415, -415, -415, -415, -415, -415, -415, 0, 0,
+ -481, 0, -415, -415, -415, -415, -415, 0, 276, -415,
+ -415, -415, -415, -481, -481, -481, -481, -481, -481, 0,
+ -481, 0, 0, 0, 0, 0, 0, -481, -481, 0,
+ 0, 0, 0, 0, 0, 0, 0, -481, -481, 0,
+ -481, -481, -481, -481, -481, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 495, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, -481, -481, -481, -481, -481, -481, -481, -481,
+ -481, -481, -481, -481, 0, 0, 0, 0, -481, -481,
+ -481, 0, -481, -481, 0, 0, 0, 0, 0, -481,
+ 0, -481, 0, 0, 0, -481, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, -481, 0, 0, -481, -481,
+ 0, -481, -481, 0, -481, -481, -481, -481, -481, -481,
+ -481, -481, -481, -481, 0, 0, -619, 0, 0, -481,
+ -481, -481, -481, 0, 0, -481, -481, -481, -481, -619,
+ -619, -619, -619, -619, -619, 0, -619, 0, 0, 0,
+ 0, 0, -619, -619, -619, 0, 0, 0, 0, 0,
+ 0, 0, 0, -619, -619, 0, -619, -619, -619, -619,
+ -619, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, -619, -619,
+ -619, -619, -619, -619, -619, -619, -619, -619, -619, -619,
+ 0, 0, 0, 0, -619, -619, -619, 0, 0, -619,
+ 0, 0, 0, 0, 0, -619, 0, -619, 0, 0,
+ 0, -619, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, -619, 0, 0, -619, -619, 0, 0, -619, 0,
+ -619, -619, -619, -619, -619, -619, -619, -619, -619, -619,
+ 0, 0, -619, 0, -619, -619, -619, -619, -619, 0,
+ 276, -619, -619, -619, -619, -619, -619, -619, -619, -619,
+ -619, 0, -619, 0, 0, 0, 0, 0, 0, -619,
+ -619, 0, 0, 0, 0, 0, 0, 0, 0, -619,
+ -619, 0, -619, -619, -619, -619, -619, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, -619, -619, -619, -619, -619, -619,
+ -619, -619, -619, -619, -619, -619, 0, 0, 0, 0,
+ -619, -619, -619, 0, 0, -619, 0, 0, 0, 0,
+ 0, -619, 0, -619, 0, 0, 0, -619, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, -619, 0, 0,
+ -619, -619, 0, 0, -619, 0, -619, -619, -619, -619,
+ -619, -619, -619, -619, -619, -619, 0, 0, -303, 0,
+ 0, -619, -619, -619, -619, 0, 276, -619, -619, -619,
+ -619, -303, -303, -303, 0, -303, -303, 0, -303, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, -303, -303, 0, -303, -303,
+ -303, -303, -303, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ -303, -303, -303, -303, -303, -303, -303, -303, -303, -303,
+ -303, -303, 0, 0, 0, 0, -303, -303, -303, 0,
+ 806, -303, 0, 0, 0, 0, 0, 0, 0, -303,
+ 0, 0, 0, -303, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, -303, 0, 0, -303, -303, 0, -109,
+ -303, 0, -303, -303, -303, -303, -303, -303, -303, -303,
+ -303, -303, 0, 0, -303, 0, 0, -303, -303, 0,
+ -101, 0, 0, -303, -303, -303, -303, -303, -303, -303,
+ 0, -303, -303, 0, -303, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, -303, -303, 0, -303, -303, -303, -303, -303, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, -303, -303, -303, -303,
+ -303, -303, -303, -303, -303, -303, -303, -303, 0, 0,
+ 0, 0, -303, -303, -303, 0, 806, -303, 0, 0,
+ 0, 0, 0, 0, 0, -303, 0, 0, 0, -303,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, -303,
+ 0, 0, -303, -303, 0, -109, -303, 0, -303, -303,
+ -303, -303, -303, -303, -303, -303, -303, -303, 0, 0,
+ 0, 0, 0, -303, -303, 0, -303, 0, 0, -303,
+ -303, -303, -303, 295, 0, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, -619, -619, -619, 0, 0,
+ -619, 15, 0, 16, 17, 18, 19, 0, 0, 0,
+ 0, 0, 20, 21, 22, 23, 24, 25, 26, 0,
+ 0, 27, 0, 0, 0, 0, 0, 28, 0, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 0,
+ 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
+ 0, 46, 47, 48, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 49, 50, 0, 0,
+ 0, 0, 0, 51, 0, 0, 52, 53, 0, 54,
+ 55, 0, 56, 0, 0, 0, 57, 0, 58, 59,
+ 60, 0, 61, 62, 63, 0, 64, -619, 0, 0,
+ -619, -619, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 65, 66, 67, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, -619, 295,
+ -619, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 0, 0, -619, 0, -619, -619, 15, 0, 16,
+ 17, 18, 19, 0, 0, 0, 0, 0, 20, 21,
+ 22, 23, 24, 25, 26, 0, 0, 27, 0, 0,
+ 0, 0, 0, 28, 0, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 0, 40, 41, 42, 0,
+ 0, 43, 0, 0, 44, 45, 0, 46, 47, 48,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 49, 50, 0, 0, 0, 0, 0, 51, 0, 0,
- 52, 53, 0, 54, 55, 0, 56, 0, 0, 0,
- 57, 0, 58, 59, 60, 0, 61, 62, 63, -292,
- 64, -613, 0, 0, -613, -613, 0, 0, 0, 0,
- 0, 0, -292, -292, -292, -292, -292, -292, 0, -292,
- 65, 66, 67, 0, 0, 0, -292, -292, -292, 0,
- 0, 0, -613, 0, -613, 0, -292, -292, 0, -292,
- -292, -292, -292, -292, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -292, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -292, -292, -292, -292, -292, -292, -292, -292, -292,
- -292, -292, -292, 0, 0, 0, 0, -292, -292, -292,
- 0, 0, -292, 0, 0, 0, 0, 0, -292, 0,
- -292, 0, 0, 0, -292, 0, 0, 0, 0, 0,
- 0, 0, -292, 0, -292, 0, 0, -292, -292, 0,
- 0, -292, -292, -292, -292, -292, -292, -292, -292, -292,
- -292, -292, -292, 0, 0, -413, 0, 0, -292, -292,
- -292, -292, 0, 0, -292, -292, -292, -292, -413, -413,
- -413, -413, -413, -413, 0, -413, 0, 0, 0, 0,
- 0, -413, -413, -413, 0, 0, 0, 0, 0, 0,
- 0, 0, -413, -413, 0, -413, -413, -413, -413, -413,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -413, -413, -413,
- -413, -413, -413, -413, -413, -413, -413, -413, -413, 0,
- 0, 0, 0, -413, -413, -413, 0, 0, -413, 0,
- 0, 0, 0, 0, -413, 0, -413, 0, 0, 0,
- -413, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- -413, 0, 0, -413, -413, 0, 0, -413, 0, -413,
- -413, -413, -413, -413, -413, -413, -413, -413, -413, 0,
- 0, -479, 0, -413, -413, -413, -413, -413, 0, 275,
- -413, -413, -413, -413, -479, -479, -479, -479, -479, -479,
- 0, -479, 0, 0, 0, 0, 0, 0, -479, -479,
- 0, 0, 0, 0, 0, 0, 0, 0, -479, -479,
- 0, -479, -479, -479, -479, -479, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 494, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, -479, -479, -479, -479, -479, -479, -479,
- -479, -479, -479, -479, -479, 0, 0, 0, 0, -479,
- -479, -479, 0, -479, -479, 0, 0, 0, 0, 0,
- -479, 0, -479, 0, 0, 0, -479, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -479, 0, 0, -479,
- -479, 0, -479, -479, 0, -479, -479, -479, -479, -479,
- -479, -479, -479, -479, -479, 0, 0, -613, 0, 0,
- -479, -479, -479, -479, 0, 0, -479, -479, -479, -479,
- -613, -613, -613, -613, -613, -613, 0, -613, 0, 0,
- 0, 0, 0, -613, -613, -613, 0, 0, 0, 0,
- 0, 0, 0, 0, -613, -613, 0, -613, -613, -613,
- -613, -613, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, -613,
- -613, -613, -613, -613, -613, -613, -613, -613, -613, -613,
- -613, 0, 0, 0, 0, -613, -613, -613, 0, 0,
- -613, 0, 0, 0, 0, 0, -613, 0, -613, 0,
- 0, 0, -613, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, -613, 0, 0, -613, -613, 0, 0, -613,
- 0, -613, -613, -613, -613, -613, -613, -613, -613, -613,
- -613, 0, 0, -613, 0, -613, -613, -613, -613, -613,
- 0, 275, -613, -613, -613, -613, -613, -613, -613, -613,
- -613, -613, 0, -613, 0, 0, 0, 0, 0, 0,
- -613, -613, 0, 0, 0, 0, 0, 0, 0, 0,
- -613, -613, 0, -613, -613, -613, -613, -613, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, -613, -613, -613, -613, -613,
- -613, -613, -613, -613, -613, -613, -613, 0, 0, 0,
- 0, -613, -613, -613, 0, 0, -613, 0, 0, 0,
- 0, 0, -613, 0, -613, 0, 0, 0, -613, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -613, 0,
- 0, -613, -613, 0, 0, -613, 0, -613, -613, -613,
- -613, -613, -613, -613, -613, -613, -613, 0, 0, -590,
- 0, 0, -613, -613, -613, -613, 0, 275, -613, -613,
- -613, -613, -590, -590, -590, 0, -590, -590, 0, -590,
- 0, 0, 0, 0, 0, -590, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -590, -590, 0, -590,
- -590, -590, -590, -590, 0, 0, 0, 0, 0, 0,
+ 0, 0, 49, 50, 0, 0, 0, 0, 0, 51,
+ 0, 0, 52, 53, 0, 54, 55, 0, 56, 0,
+ 0, 0, 57, 0, 58, 59, 60, 0, 61, 62,
+ 63, 0, 64, -619, 0, 0, -619, -619, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 65, 66, 67, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, -619, 295, -619, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 0, 0, -619,
+ 0, 0, -619, 15, -619, 16, 17, 18, 19, 0,
+ 0, 0, 0, 0, 20, 21, 22, 23, 24, 25,
+ 26, 0, 0, 27, 0, 0, 0, 0, 0, 28,
+ 0, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
+ 44, 45, 0, 46, 47, 48, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 49, 50,
+ 0, 0, 0, 0, 0, 51, 0, 0, 52, 53,
+ 0, 54, 55, 0, 56, 0, 0, 0, 57, 0,
+ 58, 59, 60, 0, 61, 62, 63, 0, 64, -619,
+ 0, 0, -619, -619, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 65, 66,
+ 67, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ -619, 295, -619, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 0, 0, -619, 0, 0, -619, 15,
+ 0, 16, 17, 18, 19, 0, 0, 0, 0, 0,
+ 20, 21, 22, 23, 24, 25, 26, 0, 0, 27,
+ 0, 0, 0, 0, 0, 28, 0, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 0, 40, 41,
+ 42, 0, 0, 43, 0, 0, 44, 45, 0, 46,
+ 47, 48, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 49, 50, 0, 0, 0, 0,
+ 0, 51, 0, 0, 52, 53, 0, 54, 55, 0,
+ 56, 0, 0, 0, 57, 0, 58, 59, 60, 0,
+ 61, 62, 63, 0, 64, -619, 0, 0, -619, -619,
+ 4, 0, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 0, 0, 65, 66, 67, 0, 15, 0,
+ 16, 17, 18, 19, 0, 0, -619, 0, -619, 20,
+ 21, 22, 23, 24, 25, 26, 0, 0, 27, 0,
+ 0, 0, 0, 0, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 0, 40, 41, 42,
+ 0, 0, 43, 0, 0, 44, 45, 0, 46, 47,
+ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 49, 50, 0, 0, 0, 0, 0,
+ 51, 0, 0, 52, 53, 0, 54, 55, 0, 56,
+ 0, 0, 0, 57, 0, 58, 59, 60, 0, 61,
+ 62, 63, 0, 64, -619, 0, 0, -619, -619, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -590, -590, -590, -590, -590, -590, -590, -590, -590,
- -590, -590, -590, 0, 0, 0, 0, -590, -590, -590,
- 0, 799, -590, 0, 0, 0, 0, 0, 0, 0,
- -590, 0, 0, 0, -590, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, -590, 0, 0, -590, -590, 0,
- -107, -590, 0, -590, -590, -590, -590, -590, -590, -590,
- -590, -590, -590, 0, 0, -590, 0, -590, -590, -590,
- 0, -99, 0, 0, -590, -590, -590, -590, -590, -590,
- -590, 0, -590, -590, 0, -590, 0, 0, 0, 0,
- 0, -590, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, -590, -590, 0, -590, -590, -590, -590, -590,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -590, -590, -590,
- -590, -590, -590, -590, -590, -590, -590, -590, -590, 0,
- 0, 0, 0, -590, -590, -590, 0, 799, -590, 0,
- 0, 0, 0, 0, 0, 0, -590, 0, 0, 0,
- -590, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- -590, 0, 0, -590, -590, 0, -107, -590, 0, -590,
- -590, -590, -590, -590, -590, -590, -590, -590, -590, 0,
- 0, -301, 0, -590, -590, -590, 0, -590, 0, 0,
- -590, -590, -590, -590, -301, -301, -301, 0, -301, -301,
- 0, -301, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -301, -301,
- 0, -301, -301, -301, -301, -301, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, -301, -301, -301, -301, -301, -301, -301,
- -301, -301, -301, -301, -301, 0, 0, 0, 0, -301,
- -301, -301, 0, 800, -301, 0, 0, 0, 0, 0,
- 0, 0, -301, 0, 0, 0, -301, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -301, 0, 0, -301,
- -301, 0, -109, -301, 0, -301, -301, -301, -301, -301,
- -301, -301, -301, -301, -301, 0, 0, -301, 0, 0,
- -301, -301, 0, -101, 0, 0, -301, -301, -301, -301,
- -301, -301, -301, 0, -301, -301, 0, -301, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, -301, -301, 0, -301, -301, -301,
- -301, -301, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, -301,
- -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
- -301, 0, 0, 0, 0, -301, -301, -301, 0, 800,
- -301, 0, 0, 0, 0, 0, 0, 0, -301, 0,
- 0, 0, -301, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, -301, 0, 0, -301, -301, 0, -109, -301,
- 0, -301, -301, -301, -301, -301, -301, -301, -301, -301,
- -301, 0, 0, 0, 0, 0, -301, -301, 0, -301,
- 0, 0, -301, -301, -301, -301, 294, 0, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, -613, -613,
- -613, 0, 0, -613, 15, 0, 16, 17, 18, 19,
+ 0, 0, 0, 65, 66, 67, 0, 0, -619, 0,
+ 0, 0, 0, 0, 0, -619, 295, -619, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 0, -619,
+ -619, 0, 0, 0, 15, 0, 16, 17, 18, 19,
 0, 0, 0, 0, 0, 20, 21, 22, 23, 24,
 25, 26, 0, 0, 27, 0, 0, 0, 0, 0,
 28, 0, 30, 31, 32, 33, 34, 35, 36, 37,
@@ -3025,42 +3408,22 @@
 50, 0, 0, 0, 0, 0, 51, 0, 0, 52,
 53, 0, 54, 55, 0, 56, 0, 0, 0, 57,
 0, 58, 59, 60, 0, 61, 62, 63, 0, 64,
- -613, 0, 0, -613, -613, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 65,
- 66, 67, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -613, 294, -613, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 0, 0, -613, 0, -613, -613,
- 15, 0, 16, 17, 18, 19, 0, 0, 0, 0,
- 0, 20, 21, 22, 23, 24, 25, 26, 0, 0,
- 27, 0, 0, 0, 0, 0, 28, 0, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 0, 40,
- 41, 42, 0, 0, 43, 0, 0, 44, 45, 0,
- 46, 47, 48, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 49, 50, 0, 0, 0,
- 0, 0, 51, 0, 0, 52, 53, 0, 54, 55,
- 0, 56, 0, 0, 0, 57, 0, 58, 59, 60,
- 0, 61, 62, 63, 0, 64, -613, 0, 0, -613,
- -613, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 65, 66, 67, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -613, 294, -613,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 0, 0, -613, 0, 0, -613, 15, -613, 16, 17,
- 18, 19, 0, 0, 0, 0, 0, 20, 21, 22,
- 23, 24, 25, 26, 0, 0, 27, 0, 0, 0,
- 0, 0, 28, 0, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 0, 40, 41, 42, 0, 0,
- 43, 0, 0, 44, 45, 0, 46, 47, 48, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 49, 50, 0, 0, 0, 0, 0, 51, 0,
- 0, 52, 53, 0, 54, 55, 0, 56, 0, 0,
- 0, 57, 0, 58, 59, 60, 0, 61, 62, 63,
- 0, 64, -613, 0, 0, -613, -613, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 65, 66, 67, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, -613, 294, -613, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 0, 0, -613, 0,
- 0, -613, 15, 0, 16, 17, 18, 19, 0, 0,
- 0, 0, 0, 20, 21, 22, 23, 24, 25, 26,
+ -619, 0, 0, -619, -619, 295, 0, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 0, 0, 65,
+ 66, 67, 0, 15, 0, 16, 17, 18, 19, 0,
+ 0, -619, 0, -619, 20, 21, 22, 23, 24, 25,
+ 26, 0, 0, 27, 0, 0, 0, 0, 0, 28,
+ 0, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
+ 44, 45, 0, 46, 47, 48, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 49, 50,
+ 0, 0, 0, 0, 0, 51, 0, 0, 296, 53,
+ 0, 54, 55, 0, 56, 0, 0, 0, 57, 0,
+ 58, 59, 60, 0, 61, 62, 63, 0, 64, -619,
+ 0, 0, -619, -619, 295, 0, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 14, 0, 0, 65, 66,
+ 67, 0, 15, 0, 16, 17, 18, 19, 0, -619,
+ -619, 0, -619, 20, 21, 22, 23, 24, 25, 26,
 0, 0, 27, 0, 0, 0, 0, 0, 28, 0,
 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
 0, 40, 41, 42, 0, 0, 43, 0, 0, 44,
@@ -3068,24 +3431,24 @@
 0, 0, 0, 0, 0, 0, 0, 49, 50, 0,
 0, 0, 0, 0, 51, 0, 0, 52, 53, 0,
 54, 55, 0, 56, 0, 0, 0, 57, 0, 58,
- 59, 60, 0, 61, 62, 63, 0, 64, -613, 0,
- 0, -613, -613, 4, 0, 5, 6, 7, 8, 9,
+ 59, 60, 0, 61, 62, 63, 0, 64, -619, 0,
+ 0, -619, -619, 295, 0, 5, 6, 7, 8, 9,
 10, 11, 12, 13, 14, 0, 0, 65, 66, 67,
- 0, 15, 0, 16, 17, 18, 19, 0, 0, -613,
- 0, -613, 20, 21, 22, 23, 24, 25, 26, 0,
- 0, 27, 0, 0, 0, 0, 0, 28, 29, 30,
+ 0, 15, 0, 16, 17, 18, 19, 0, -619, -619,
+ 0, -619, 20, 21, 22, 23, 24, 25, 26, 0,
+ 0, 27, 0, 0, 0, 0, 0, 28, 0, 30,
 31, 32, 33, 34, 35, 36, 37, 38, 39, 0,
 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
 0, 46, 47, 48, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 49, 50, 0, 0,
 0, 0, 0, 51, 0, 0, 52, 53, 0, 54,
 55, 0, 56, 0, 0, 0, 57, 0, 58, 59,
- 60, 0, 61, 62, 63, 0, 64, -613, 0, 0,
- -613, -613, 0, 0, 0, 0, 0, 0, 0, 0,
+ 60, 0, 61, 62, 63, 0, 64, -619, 0, 0,
+ -619, -619, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 65, 66, 67, 0,
- 0, -613, 0, 0, 0, 0, 0, 0, -613, 294,
- -613, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 0, -613, -613, 0, 0, 0, 15, 0, 16,
+ 0, -619, 0, 0, 0, 0, 0, 0, -619, 295,
+ -619, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 0, 0, -619, 0, 0, 0, 15, 0, 16,
 17, 18, 19, 0, 0, 0, 0, 0, 20, 21,
 22, 23, 24, 25, 26, 0, 0, 27, 0, 0,
 0, 0, 0, 28, 0, 30, 31, 32, 33, 34,
@@ -3095,22 +3458,22 @@
 0, 0, 49, 50, 0, 0, 0, 0, 0, 51,
 0, 0, 52, 53, 0, 54, 55, 0, 56, 0,
 0, 0, 57, 0, 58, 59, 60, 0, 61, 62,
- 63, 0, 64, -613, 0, 0, -613, -613, 294, 0,
+ 63, 0, 64, -619, 0, 0, -619, -619, 0, 0,
 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
 0, 0, 65, 66, 67, 0, 15, 0, 16, 17,
- 18, 19, 0, 0, -613, 0, -613, 20, 21, 22,
+ 18, 19, 0, 0, -619, 0, -619, 20, 21, 22,
 23, 24, 25, 26, 0, 0, 27, 0, 0, 0,
- 0, 0, 28, 0, 30, 31, 32, 33, 34, 35,
+ 0, 0, 28, 29, 30, 31, 32, 33, 34, 35,
 36, 37, 38, 39, 0, 40, 41, 42, 0, 0,
 43, 0, 0, 44, 45, 0, 46, 47, 48, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 49, 50, 0, 0, 0, 0, 0, 51, 0,
- 0, 295, 53, 0, 54, 55, 0, 56, 0, 0,
+ 0, 52, 53, 0, 54, 55, 0, 56, 0, 0,
 0, 57, 0, 58, 59, 60, 0, 61, 62, 63,
- 0, 64, -613, 0, 0, -613, -613, 294, 0, 5,
+ 0, 64, 247, 0, 0, 248, 249, 0, 0, 5,
 6, 7, 8, 9, 10, 11, 12, 13, 14, 0,
 0, 65, 66, 67, 0, 15, 0, 16, 17, 18,
- 19, 0, -613, -613, 0, -613, 20, 21, 22, 23,
+ 19, 0, 0, 250, 0, 251, 20, 21, 22, 23,
 24, 25, 26, 0, 0, 27, 0, 0, 0, 0,
 0, 28, 0, 30, 31, 32, 33, 34, 35, 36,
 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
@@ -3119,48 +3482,229 @@
 49, 50, 0, 0, 0, 0, 0, 51, 0, 0,
 52, 53, 0, 54, 55, 0, 56, 0, 0, 0,
 57, 0, 58, 59, 60, 0, 61, 62, 63, 0,
- 64, -613, 0, 0, -613, -613, 294, 0, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 0, 0,
+ 64, 247, 0, 0, 248, 249, 0, 0, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
 65, 66, 67, 0, 15, 0, 16, 17, 18, 19,
- 0, -613, -613, 0, -613, 20, 21, 22, 23, 24,
+ 0, 0, 250, 0, 251, 20, 21, 22, 23, 24,
 25, 26, 0, 0, 27, 0, 0, 0, 0, 0,
- 28, 0, 30, 31, 32, 33, 34, 35, 36, 37,
+ 0, 0, 0, 31, 32, 33, 34, 35, 36, 37,
 38, 39, 0, 40, 41, 42, 0, 0, 43, 0,
 0, 44, 45, 0, 46, 47, 48, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 49,
- 50, 0, 0, 0, 0, 0, 51, 0, 0, 52,
- 53, 0, 54, 55, 0, 56, 0, 0, 0, 57,
+ 50, 0, 0, 0, 0, 0, 211, 0, 0, 119,
+ 53, 0, 54, 55, 0, 0, 0, 0, 0, 57,
 0, 58, 59, 60, 0, 61, 62, 63, 0, 64,
- -613, 0, 0, -613, -613, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 65,
- 66, 67, 0, 0, -613, 0, 0, 0, 0, 0,
- 0, -613, 294, -613, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 0, 0, -613, 0, 0, 0,
- 15, 0, 16, 17, 18, 19, 0, 0, 0, 0,
+ 247, 0, 0, 248, 249, 0, 0, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 0, 0, 0, 65,
+ 66, 67, 0, 15, 0, 108, 109, 18, 19, 0,
+ 0, 250, 0, 251, 110, 111, 112, 23, 24, 25,
+ 26, 0, 0, 113, 0, 0, 0, 0, 0, 0,
+ 0, 0, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
+ 44, 45, 0, 46, 47, 48, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 49, 50,
+ 0, 0, 0, 0, 0, 211, 0, 0, 119, 53,
+ 0, 54, 55, 0, 0, 0, 0, 0, 57, 0,
+ 58, 59, 60, 0, 61, 62, 63, 0, 64, 247,
+ 0, 0, 248, 249, 0, 0, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 0, 0, 0, 65, 265,
+ 67, 0, 15, 0, 16, 17, 18, 19, 0, 0,
+ 250, 0, 251, 20, 21, 22, 23, 24, 25, 26,
+ 0, 0, 27, 0, 0, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 0, 40, 41, 42, 0, 0, 43, 0, 0, 44,
+ 45, 0, 46, 47, 48, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 49, 50, 0,
+ 0, 0, 0, 0, 211, 0, 0, 119, 53, 0,
+ 54, 55, 0, 0, 0, 0, 0, 57, 0, 58,
+ 59, 60, 0, 61, 62, 63, 0, 64, 247, 0,
+ 0, 248, 249, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 65, 66, 67,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 251, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 151, 152, 153, 154, 0, 0, 0, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 0,
+ 0, 0, 0, 0, 165, 166, 167, 168, 169, 170,
+ 171, 172, 36, 37, 173, 39, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 174,
+ 175, 176, 177, 178, 179, 180, 181, 0, 0, 182,
+ 183, 0, 0, 0, 0, 184, 185, 186, 187, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 188,
+ 189, 190, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 0, 201, 202, 0, 0, 0, 0,
+ 0, 0, 203, 204, -589, -589, -589, -589, -589, -589,
+ -589, -589, -589, 0, 0, 0, 0, 0, 0, 0,
+ -589, 0, -589, -589, -589, -589, 0, -589, 0, 0,
+ 0, -589, -589, -589, -589, -589, -589, -589, 0, 0,
+ -589, 0, 0, 0, 0, 0, 0, 0, 0, -589,
+ -589, -589, -589, -589, -589, -589, -589, -589, 0, -589,
+ -589, -589, 0, 0, -589, 0, 0, -589, -589, 0,
+ -589, -589, -589, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, -589, -589, 0, 0, 0,
+ 0, 0, -589, 0, 0, -589, -589, 0, -589, -589,
+ 0, -589, 0, -589, -589, -589, 0, -589, -589, -589,
+ 0, -589, -589, -589, 0, -589, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, -589, -589, -589, 0, -589,
+ 0, 0, 0, 0, 0, -589, -590, -590, -590, -590,
+ -590, -590, -590, -590, -590, 0, 0, 0, 0, 0,
+ 0, 0, -590, 0, -590, -590, -590, -590, 0, -590,
+ 0, 0, 0, -590, -590, -590, -590, -590, -590, -590,
+ 0, 0, -590, 0, 0, 0, 0, 0, 0, 0,
+ 0, -590, -590, -590, -590, -590, -590, -590, -590, -590,
+ 0, -590, -590, -590, 0, 0, -590, 0, 0, -590,
+ -590, 0, -590, -590, -590, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, -590, -590, 0,
+ 0, 0, 0, 0, -590, 0, 0, -590, -590, 0,
+ -590, -590, 0, -590, 0, -590, -590, -590, 0, -590,
+ -590, -590, 0, -590, -590, -590, 0, -590, 0, 0,
+ 0, 0, 0, 0, -592, -592, -592, -592, -592, -592,
+ -592, -592, -592, 0, 0, 0, 0, -590, -590, -590,
+ -592, -590, -592, -592, -592, -592, 0, -590, 0, 0,
+ 0, -592, -592, -592, -592, -592, -592, -592, 0, 0,
+ -592, 0, 0, 0, 0, 0, 0, 0, 0, -592,
+ -592, -592, -592, -592, -592, -592, -592, -592, 0, -592,
+ -592, -592, 0, 0, -592, 0, 0, -592, -592, 0,
+ -592, -592, -592, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, -592, -592, 0, 0, 0,
+ 0, 0, -592, 837, 0, -592, -592, 0, -592, -592,
+ 0, -592, 0, -592, -592, -592, 0, -592, -592, -592,
+ 0, -592, -592, -592, 0, -592, 0, 0, 0, 0,
+ 0, 0, -107, -593, -593, -593, -593, -593, -593, -593,
+ -593, -593, 0, 0, 0, -592, -592, -592, 0, -593,
+ 0, -593, -593, -593, -593, -592, 0, 0, 0, 0,
+ -593, -593, -593, -593, -593, -593, -593, 0, 0, -593,
+ 0, 0, 0, 0, 0, 0, 0, 0, -593, -593,
+ -593, -593, -593, -593, -593, -593, -593, 0, -593, -593,
+ -593, 0, 0, -593, 0, 0, -593, -593, 0, -593,
+ -593, -593, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, -593, -593, 0, 0, 0, 0,
+ 0, -593, 838, 0, -593, -593, 0, -593, -593, 0,
+ -593, 0, -593, -593, -593, 0, -593, -593, -593, 0,
+ -593, -593, -593, 0, -593, 0, 0, 0, 0, 0,
+ 0, -109, -594, -594, -594, -594, -594, -594, -594, -594,
+ -594, 0, 0, 0, -593, -593, -593, 0, -594, 0,
+ -594, -594, -594, -594, -593, 0, 0, 0, 0, -594,
+ -594, -594, -594, -594, -594, -594, 0, 0, -594, 0,
+ 0, 0, 0, 0, 0, 0, 0, -594, -594, -594,
+ -594, -594, -594, -594, -594, -594, 0, -594, -594, -594,
+ 0, 0, -594, 0, 0, -594, -594, 0, -594, -594,
+ -594, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, -594, -594, 0, 0, 0, 0, 0,
+ -594, 0, 0, -594, -594, 0, -594, -594, 0, -594,
+ 0, -594, -594, -594, 0, -594, -594, -594, 0, -594,
+ -594, -594, 0, -594, 0, 0, 0, 0, 0, 0,
+ -595, -595, -595, -595, -595, -595, -595, -595, -595, 0,
+ 0, 0, 0, -594, -594, -594, -595, 0, -595, -595,
+ -595, -595, 0, -594, 0, 0, 0, -595, -595, -595,
+ -595, -595, -595, -595, 0, 0, -595, 0, 0, 0,
+ 0, 0, 0, 0, 0, -595, -595, -595, -595, -595,
+ -595, -595, -595, -595, 0, -595, -595, -595, 0, 0,
+ -595, 0, 0, -595, -595, 0, -595, -595, -595, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, -595, -595, 0, 0, 0, 0, 0, -595, 0,
+ 0, -595, -595, 0, -595, -595, 0, -595, 0, -595,
+ -595, -595, 0, -595, -595, -595, 0, -595, -595, -595,
+ 0, -595, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, -595, -595, -595, 0, 0, 0, 0, 0, 0,
+ 0, -595, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 151, 152, 153, 154, 0, 0, 0, 155,
+ 156, 157, 233, 234, 235, 236, 162, 163, 164, 0,
+ 0, 0, 0, 0, 165, 166, 167, 237, 238, 239,
+ 240, 172, 320, 321, 241, 322, 0, 0, 0, 0,
+ 0, 0, 323, 0, 0, 0, 0, 0, 0, 174,
+ 175, 176, 177, 178, 179, 180, 181, 0, 0, 182,
+ 183, 0, 0, 0, 0, 184, 185, 186, 187, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 188,
+ 189, 190, 0, 0, 0, 0, 324, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 0, 201, 202, 0, 0, 0, 0,
+ 0, 0, 203, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 0, 0, 0,
+ 155, 156, 157, 233, 234, 235, 236, 162, 163, 164,
+ 0, 0, 0, 0, 0, 165, 166, 167, 237, 238,
+ 239, 240, 172, 320, 321, 241, 322, 0, 0, 0,
+ 0, 0, 0, 323, 0, 0, 0, 0, 0, 0,
+ 174, 175, 176, 177, 178, 179, 180, 181, 0, 0,
+ 182, 183, 0, 0, 0, 0, 184, 185, 186, 187,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 188, 189, 190, 0, 0, 0, 0, 486, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 0, 201, 202, 0, 0, 0,
+ 0, 0, 0, 203, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 0, 0,
+ 0, 155, 156, 157, 233, 234, 235, 236, 162, 163,
+ 164, 0, 0, 0, 0, 0, 165, 166, 167, 237,
+ 238, 239, 240, 172, 0, 0, 241, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 174, 175, 176, 177, 178, 179, 180, 181, 0,
+ 0, 182, 183, 0, 0, 0, 0, 184, 185, 186,
+ 187, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 188, 189, 190, 0, 0, 0, 242, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 0, 201, 202, 0, 0,
+ 0, 0, 0, 0, 203, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 0,
+ 0, 0, 155, 156, 157, 233, 234, 235, 236, 162,
+ 163, 164, 0, 0, 0, 0, 0, 165, 166, 167,
+ 237, 238, 239, 240, 172, 0, 0, 241, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 174, 175, 176, 177, 178, 179, 180, 181,
+ 0, 0, 182, 183, 0, 0, 0, 0, 184, 185,
+ 186, 187, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 188, 189, 190, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 191, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200, 0, 201, 202, 0,
+ 0, 0, 0, 0, 0, 203, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 0, 0, 0, 0, 0,
+ 0, 0, 15, 0, 108, 109, 18, 19, 0, 0,
+ 0, 0, 0, 110, 111, 112, 23, 24, 25, 26,
+ 0, 0, 113, 0, 0, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 0, 40, 41, 42, 0, 0, 43, 0, 0, 44,
+ 45, 0, 116, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 313, 0, 0, 119, 53, 0,
+ 54, 55, 0, 0, 0, 0, 0, 57, 0, 58,
+ 59, 60, 0, 61, 62, 63, 0, 64, 0, 0,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
+ 0, 0, 0, 0, 0, 0, 15, 120, 108, 109,
+ 18, 19, 0, 0, 0, 314, 0, 110, 111, 112,
+ 23, 24, 25, 26, 0, 0, 113, 0, 0, 0,
+ 0, 0, 0, 0, 0, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 0, 40, 41, 42, 0, 0,
+ 43, 0, 0, 44, 45, 0, 116, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 313, 0,
+ 0, 119, 53, 0, 54, 55, 0, 0, 0, 0,
+ 0, 57, 0, 58, 59, 60, 0, 61, 62, 63,
+ 0, 64, 0, 0, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 14, 0, 0, 0, 0, 0, 0,
+ 15, 120, 16, 17, 18, 19, 0, 0, 0, 611,
 0, 20, 21, 22, 23, 24, 25, 26, 0, 0,
- 27, 0, 0, 0, 0, 0, 28, 0, 30, 31,
+ 27, 0, 0, 0, 0, 0, 28, 29, 30, 31,
 32, 33, 34, 35, 36, 37, 38, 39, 0, 40,
 41, 42, 0, 0, 43, 0, 0, 44, 45, 0,
 46, 47, 48, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 49, 50, 0, 0, 0,
 0, 0, 51, 0, 0, 52, 53, 0, 54, 55,
 0, 56, 0, 0, 0, 57, 0, 58, 59, 60,
- 0, 61, 62, 63, 0, 64, -613, 0, 0, -613,
- -613, 0, 0, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 14, 0, 0, 65, 66, 67, 0, 15,
- 0, 16, 17, 18, 19, 0, 0, -613, 0, -613,
- 20, 21, 22, 23, 24, 25, 26, 0, 0, 27,
- 0, 0, 0, 0, 0, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 0, 40, 41,
- 42, 0, 0, 43, 0, 0, 44, 45, 0, 46,
- 47, 48, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 49, 50, 0, 0, 0, 0,
- 0, 51, 0, 0, 52, 53, 0, 54, 55, 0,
- 56, 0, 0, 0, 57, 0, 58, 59, 60, 0,
- 61, 62, 63, 0, 64, 247, 0, 0, 248, 249,
+ 0, 61, 62, 63, 0, 64, 0, 0, 0, 0,
 0, 0, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 0, 0, 65, 66, 67, 0, 15, 0,
- 16, 17, 18, 19, 0, 0, 250, 0, 251, 20,
+ 13, 14, 0, 0, 0, 65, 66, 67, 15, 0,
+ 16, 17, 18, 19, 0, 0, 0, 0, 0, 20,
 21, 22, 23, 24, 25, 26, 0, 0, 27, 0,
 0, 0, 0, 0, 28, 0, 30, 31, 32, 33,
 34, 35, 36, 37, 38, 39, 0, 40, 41, 42,
@@ -3169,22 +3713,187 @@
 0, 0, 0, 49, 50, 0, 0, 0, 0, 0,
 51, 0, 0, 52, 53, 0, 54, 55, 0, 56,
 0, 0, 0, 57, 0, 58, 59, 60, 0, 61,
- 62, 63, 0, 64, 247, 0, 0, 248, 249, 0,
- 0, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 0, 0, 0, 65, 66, 67, 0, 15, 0, 16,
- 17, 18, 19, 0, 0, 250, 0, 251, 20, 21,
- 22, 23, 24, 25, 26, 0, 0, 27, 0, 0,
- 0, 0, 0, 0, 0, 0, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 0, 40, 41, 42, 0,
- 0, 43, 0, 0, 44, 45, 0, 46, 47, 48,
+ 62, 63, 0, 64, 0, 0, 0, 0, 0, 0,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
+ 0, 0, 0, 65, 66, 67, 15, 0, 16, 17,
+ 18, 19, 0, 0, 0, 0, 0, 20, 21, 22,
+ 23, 24, 25, 26, 0, 0, 113, 0, 0, 0,
+ 0, 0, 0, 0, 0, 31, 32, 33, 260, 35,
+ 36, 37, 38, 39, 0, 40, 41, 42, 0, 0,
+ 43, 0, 0, 44, 45, 0, 261, 47, 48, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 49, 50, 0, 0, 0, 0, 0, 211,
- 0, 0, 119, 53, 0, 54, 55, 0, 0, 0,
- 0, 0, 57, 0, 58, 59, 60, 0, 61, 62,
- 63, 0, 64, 247, 0, 0, 248, 249, 0, 0,
+ 0, 49, 50, 0, 0, 0, 0, 0, 211, 0,
+ 0, 119, 53, 0, 54, 55, 0, 262, 0, 263,
+ 264, 57, 0, 58, 59, 60, 0, 61, 62, 63,
+ 0, 64, 0, 0, 0, 0, 0, 0, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
+ 0, 65, 265, 67, 15, 0, 16, 17, 18, 19,
+ 0, 0, 0, 0, 0, 20, 21, 22, 23, 24,
+ 25, 26, 0, 0, 113, 0, 0, 0, 0, 0,
+ 0, 0, 0, 31, 32, 33, 260, 35, 36, 37,
+ 38, 39, 0, 40, 41, 42, 0, 0, 43, 0,
+ 0, 44, 45, 0, 261, 47, 48, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 49,
+ 508, 0, 0, 0, 0, 0, 211, 0, 0, 119,
+ 53, 0, 54, 55, 0, 262, 0, 263, 264, 57,
+ 0, 58, 59, 60, 0, 61, 62, 63, 0, 64,
+ 0, 0, 0, 0, 0, 0, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 0, 0, 0, 0, 65,
+ 265, 67, 15, 0, 108, 109, 18, 19, 0, 0,
+ 0, 0, 0, 110, 111, 112, 23, 24, 25, 26,
+ 0, 0, 113, 0, 0, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 260, 35, 36, 37, 38, 39,
+ 0, 40, 41, 42, 0, 0, 43, 0, 0, 44,
+ 45, 0, 261, 47, 48, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 49, 50, 0,
+ 0, 0, 0, 0, 211, 0, 0, 119, 53, 0,
+ 54, 55, 0, 723, 0, 263, 264, 57, 0, 58,
+ 59, 60, 0, 61, 62, 63, 0, 64, 0, 0,
+ 0, 0, 0, 0, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 0, 0, 0, 0, 65, 265, 67,
+ 15, 0, 108, 109, 18, 19, 0, 0, 0, 0,
+ 0, 110, 111, 112, 23, 24, 25, 26, 0, 0,
+ 113, 0, 0, 0, 0, 0, 0, 0, 0, 31,
+ 32, 33, 260, 35, 36, 37, 38, 39, 0, 40,
+ 41, 42, 0, 0, 43, 0, 0, 44, 45, 0,
+ 261, 47, 48, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 49, 854, 0, 0, 0,
+ 0, 0, 211, 0, 0, 119, 53, 0, 54, 55,
+ 0, 723, 0, 263, 264, 57, 0, 58, 59, 60,
+ 0, 61, 62, 63, 0, 64, 0, 0, 0, 0,
+ 0, 0, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 0, 0, 0, 0, 65, 265, 67, 15, 0,
+ 108, 109, 18, 19, 0, 0, 0, 0, 0, 110,
+ 111, 112, 23, 24, 25, 26, 0, 0, 113, 0,
+ 0, 0, 0, 0, 0, 0, 0, 31, 32, 33,
+ 260, 35, 36, 37, 38, 39, 0, 40, 41, 42,
+ 0, 0, 43, 0, 0, 44, 45, 0, 261, 47,
+ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 49, 50, 0, 0, 0, 0, 0,
+ 211, 0, 0, 119, 53, 0, 54, 55, 0, 262,
+ 0, 263, 0, 57, 0, 58, 59, 60, 0, 61,
+ 62, 63, 0, 64, 0, 0, 0, 0, 0, 0,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
+ 0, 0, 0, 65, 265, 67, 15, 0, 108, 109,
+ 18, 19, 0, 0, 0, 0, 0, 110, 111, 112,
+ 23, 24, 25, 26, 0, 0, 113, 0, 0, 0,
+ 0, 0, 0, 0, 0, 31, 32, 33, 260, 35,
+ 36, 37, 38, 39, 0, 40, 41, 42, 0, 0,
+ 43, 0, 0, 44, 45, 0, 261, 47, 48, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 49, 50, 0, 0, 0, 0, 0, 211, 0,
+ 0, 119, 53, 0, 54, 55, 0, 0, 0, 263,
+ 264, 57, 0, 58, 59, 60, 0, 61, 62, 63,
+ 0, 64, 0, 0, 0, 0, 0, 0, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
+ 0, 65, 265, 67, 15, 0, 108, 109, 18, 19,
+ 0, 0, 0, 0, 0, 110, 111, 112, 23, 24,
+ 25, 26, 0, 0, 113, 0, 0, 0, 0, 0,
+ 0, 0, 0, 31, 32, 33, 260, 35, 36, 37,
+ 38, 39, 0, 40, 41, 42, 0, 0, 43, 0,
+ 0, 44, 45, 0, 261, 47, 48, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 49,
+ 50, 0, 0, 0, 0, 0, 211, 0, 0, 119,
+ 53, 0, 54, 55, 0, 723, 0, 263, 0, 57,
+ 0, 58, 59, 60, 0, 61, 62, 63, 0, 64,
+ 0, 0, 0, 0, 0, 0, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 0, 0, 0, 0, 65,
+ 265, 67, 15, 0, 108, 109, 18, 19, 0, 0,
+ 0, 0, 0, 110, 111, 112, 23, 24, 25, 26,
+ 0, 0, 113, 0, 0, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 260, 35, 36, 37, 38, 39,
+ 0, 40, 41, 42, 0, 0, 43, 0, 0, 44,
+ 45, 0, 261, 47, 48, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 49, 50, 0,
+ 0, 0, 0, 0, 211, 0, 0, 119, 53, 0,
+ 54, 55, 0, 0, 0, 263, 0, 57, 0, 58,
+ 59, 60, 0, 61, 62, 63, 0, 64, 0, 0,
+ 0, 0, 0, 0, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 0, 0, 0, 0, 65, 265, 67,
+ 15, 0, 16, 17, 18, 19, 0, 0, 0, 0,
+ 0, 20, 21, 22, 23, 24, 25, 26, 0, 0,
+ 113, 0, 0, 0, 0, 0, 0, 0, 0, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 0, 40,
+ 41, 42, 0, 0, 43, 0, 0, 44, 45, 0,
+ 46, 47, 48, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 49, 50, 0, 0, 0,
+ 0, 0, 211, 0, 0, 119, 53, 0, 54, 55,
+ 0, 605, 0, 0, 0, 57, 0, 58, 59, 60,
+ 0, 61, 62, 63, 0, 64, 0, 0, 0, 0,
+ 0, 0, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 0, 0, 0, 0, 65, 265, 67, 15, 0,
+ 108, 109, 18, 19, 0, 0, 0, 0, 0, 110,
+ 111, 112, 23, 24, 25, 26, 0, 0, 113, 0,
+ 0, 0, 0, 0, 0, 0, 0, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 0, 40, 41, 42,
+ 0, 0, 43, 0, 0, 44, 45, 0, 46, 47,
+ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 49, 50, 0, 0, 0, 0, 0,
+ 211, 0, 0, 119, 53, 0, 54, 55, 0, 262,
+ 0, 0, 0, 57, 0, 58, 59, 60, 0, 61,
+ 62, 63, 0, 64, 0, 0, 0, 0, 0, 0,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
+ 0, 0, 0, 65, 265, 67, 15, 0, 108, 109,
+ 18, 19, 0, 0, 0, 0, 0, 110, 111, 112,
+ 23, 24, 25, 26, 0, 0, 113, 0, 0, 0,
+ 0, 0, 0, 0, 0, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 0, 40, 41, 42, 0, 0,
+ 43, 0, 0, 44, 45, 0, 46, 47, 48, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 49, 50, 0, 0, 0, 0, 0, 211, 0,
+ 0, 119, 53, 0, 54, 55, 0, 605, 0, 0,
+ 0, 57, 0, 58, 59, 60, 0, 61, 62, 63,
+ 0, 64, 0, 0, 0, 0, 0, 0, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
+ 0, 65, 265, 67, 15, 0, 108, 109, 18, 19,
+ 0, 0, 0, 0, 0, 110, 111, 112, 23, 24,
+ 25, 26, 0, 0, 113, 0, 0, 0, 0, 0,
+ 0, 0, 0, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 0, 40, 41, 42, 0, 0, 43, 0,
+ 0, 44, 45, 0, 46, 47, 48, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 49,
+ 50, 0, 0, 0, 0, 0, 211, 0, 0, 119,
+ 53, 0, 54, 55, 0, 900, 0, 0, 0, 57,
+ 0, 58, 59, 60, 0, 61, 62, 63, 0, 64,
+ 0, 0, 0, 0, 0, 0, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 0, 0, 0, 0, 65,
+ 265, 67, 15, 0, 108, 109, 18, 19, 0, 0,
+ 0, 0, 0, 110, 111, 112, 23, 24, 25, 26,
+ 0, 0, 113, 0, 0, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 0, 40, 41, 42, 0, 0, 43, 0, 0, 44,
+ 45, 0, 46, 47, 48, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 49, 50, 0,
+ 0, 0, 0, 0, 211, 0, 0, 119, 53, 0,
+ 54, 55, 0, 723, 0, 0, 0, 57, 0, 58,
+ 59, 60, 0, 61, 62, 63, 0, 64, 0, 0,
+ 0, 0, 0, 0, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 0, 0, 0, 0, 65, 265, 67,
+ 15, 0, 16, 17, 18, 19, 0, 0, 0, 0,
+ 0, 20, 21, 22, 23, 24, 25, 26, 0, 0,
+ 27, 0, 0, 0, 0, 0, 0, 0, 0, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 0, 40,
+ 41, 42, 0, 0, 43, 0, 0, 44, 45, 0,
+ 46, 47, 48, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 49, 50, 0, 0, 0,
+ 0, 0, 211, 0, 0, 119, 53, 0, 54, 55,
+ 0, 0, 0, 0, 0, 57, 0, 58, 59, 60,
+ 0, 61, 62, 63, 0, 64, 0, 0, 0, 0,
+ 0, 0, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 0, 0, 0, 0, 65, 66, 67, 15, 0,
+ 108, 109, 18, 19, 0, 0, 0, 0, 0, 110,
+ 111, 112, 23, 24, 25, 26, 0, 0, 113, 0,
+ 0, 0, 0, 0, 0, 0, 0, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 0, 40, 41, 42,
+ 0, 0, 43, 0, 0, 44, 45, 0, 46, 47,
+ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 49, 50, 0, 0, 0, 0, 0,
+ 211, 0, 0, 119, 53, 0, 54, 55, 0, 0,
+ 0, 0, 0, 57, 0, 58, 59, 60, 0, 61,
+ 62, 63, 0, 64, 0, 0, 0, 0, 0, 0,
 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
- 0, 0, 65, 66, 67, 0, 15, 0, 108, 109,
- 18, 19, 0, 0, 250, 0, 251, 110, 111, 112,
+ 0, 0, 0, 65, 265, 67, 15, 0, 16, 17,
+ 18, 19, 0, 0, 0, 0, 0, 20, 21, 22,
 23, 24, 25, 26, 0, 0, 113, 0, 0, 0,
 0, 0, 0, 0, 0, 31, 32, 33, 34, 35,
 36, 37, 38, 39, 0, 40, 41, 42, 0, 0,
@@ -3193,160 +3902,138 @@
 0, 49, 50, 0, 0, 0, 0, 0, 211, 0,
 0, 119, 53, 0, 54, 55, 0, 0, 0, 0,
 0, 57, 0, 58, 59, 60, 0, 61, 62, 63,
- 0, 64, 247, 0, 0, 248, 249, 0, 0, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
- 0, 65, 264, 67, 0, 15, 0, 16, 17, 18,
- 19, 0, 0, 250, 0, 251, 20, 21, 22, 23,
- 24, 25, 26, 0, 0, 27, 0, 0, 0, 0,
- 0, 0, 0, 0, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
- 0, 0, 44, 45, 0, 46, 47, 48, 0, 0,
+ 0, 64, 0, 0, 0, 0, 0, 0, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
+ 0, 65, 265, 67, 15, 0, 108, 109, 18, 19,
+ 0, 0, 0, 0, 0, 110, 111, 112, 23, 24,
+ 25, 26, 0, 0, 113, 0, 0, 0, 0, 0,
+ 0, 0, 0, 31, 32, 33, 114, 35, 36, 37,
+ 115, 39, 0, 40, 41, 42, 0, 0, 43, 0,
+ 0, 44, 45, 0, 116, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 49, 50, 0, 0, 0, 0, 0, 211, 0, 0,
- 119, 53, 0, 54, 55, 0, 0, 0, 0, 0,
- 57, 0, 58, 59, 60, 0, 61, 62, 63, 0,
- 64, 247, 0, 0, 248, 249, 0, 0, 0, 0,
+ 0, 0, 0, 117, 0, 0, 118, 0, 0, 119,
+ 53, 0, 54, 55, 0, 0, 0, 0, 0, 57,
+ 0, 58, 59, 60, 0, 61, 62, 63, 0, 64,
+ 0, 0, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 0, 0, 0, 0, 0, 0, 0, 15, 120,
+ 108, 109, 18, 19, 0, 0, 0, 0, 0, 110,
+ 111, 112, 23, 24, 25, 26, 0, 0, 113, 0,
+ 0, 0, 0, 0, 0, 0, 0, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 0, 40, 41, 42,
+ 0, 0, 43, 0, 0, 44, 45, 0, 225, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 65, 66, 67, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 251, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 147, 148, 149, 150, 151, 152, 153, 154, 0,
- 0, 0, 155, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 0, 0, 0, 0, 0, 165, 166, 167,
- 168, 169, 170, 171, 172, 36, 37, 173, 39, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 174, 175, 176, 177, 178, 179, 180, 181,
- 0, 0, 182, 183, 0, 0, 0, 0, 184, 185,
- 186, 187, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 188, 189, 190, 0, 0, 0, 0, 0,
+ 226, 0, 0, 52, 53, 0, 54, 55, 0, 56,
+ 0, 0, 0, 57, 0, 58, 59, 60, 0, 61,
+ 62, 63, 0, 64, 0, 0, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 0, 0, 0, 0, 0,
+ 0, 0, 15, 120, 108, 109, 18, 19, 0, 0,
+ 0, 0, 0, 110, 111, 112, 23, 24, 25, 26,
+ 0, 0, 113, 0, 0, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 0, 40, 41, 42, 0, 0, 43, 0, 0, 44,
+ 45, 0, 116, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 0, 201, 202, 0,
- 0, 0, 0, 0, 0, 203, 204, -583, -583, -583,
- -583, -583, -583, -583, -583, -583, 0, 0, 0, 0,
- 0, 0, 0, -583, 0, -583, -583, -583, -583, 0,
- -583, 0, 0, 0, -583, -583, -583, -583, -583, -583,
- -583, 0, 0, -583, 0, 0, 0, 0, 0, 0,
- 0, 0, -583, -583, -583, -583, -583, -583, -583, -583,
- -583, 0, -583, -583, -583, 0, 0, -583, 0, 0,
- -583, -583, 0, -583, -583, -583, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -583, -583,
- 0, 0, 0, 0, 0, -583, 0, 0, -583, -583,
- 0, -583, -583, 0, -583, 0, -583, -583, -583, 0,
- -583, -583, -583, 0, -583, -583, -583, 0, -583, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -583, -583,
- -583, 0, -583, 0, 0, 0, 0, 0, -583, -584,
- -584, -584, -584, -584, -584, -584, -584, -584, 0, 0,
- 0, 0, 0, 0, 0, -584, 0, -584, -584, -584,
- -584, 0, -584, 0, 0, 0, -584, -584, -584, -584,
- -584, -584, -584, 0, 0, -584, 0, 0, 0, 0,
- 0, 0, 0, 0, -584, -584, -584, -584, -584, -584,
- -584, -584, -584, 0, -584, -584, -584, 0, 0, -584,
- 0, 0, -584, -584, 0, -584, -584, -584, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- -584, -584, 0, 0, 0, 0, 0, -584, 0, 0,
- -584, -584, 0, -584, -584, 0, -584, 0, -584, -584,
- -584, 0, -584, -584, -584, 0, -584, -584, -584, 0,
- -584, 0, 0, 0, 0, 0, 0, -586, -586, -586,
- -586, -586, -586, -586, -586, -586, 0, 0, 0, 0,
- -584, -584, -584, -586, -584, -586, -586, -586, -586, 0,
- -584, 0, 0, 0, -586, -586, -586, -586, -586, -586,
- -586, 0, 0, -586, 0, 0, 0, 0, 0, 0,
- 0, 0, -586, -586, -586, -586, -586, -586, -586, -586,
- -586, 0, -586, -586, -586, 0, 0, -586, 0, 0,
- -586, -586, 0, -586, -586, -586, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -586, -586,
- 0, 0, 0, 0, 0, -586, 831, 0, -586, -586,
- 0, -586, -586, 0, -586, 0, -586, -586, -586, 0,
- -586, -586, -586, 0, -586, -586, -586, 0, -586, 0,
- 0, 0, 0, 0, 0, -107, -587, -587, -587, -587,
- -587, -587, -587, -587, -587, 0, 0, 0, -586, -586,
- -586, 0, -587, 0, -587, -587, -587, -587, -586, 0,
- 0, 0, 0, -587, -587, -587, -587, -587, -587, -587,
- 0, 0, -587, 0, 0, 0, 0, 0, 0, 0,
- 0, -587, -587, -587, -587, -587, -587, -587, -587, -587,
- 0, -587, -587, -587, 0, 0, -587, 0, 0, -587,
- -587, 0, -587, -587, -587, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -587, -587, 0,
- 0, 0, 0, 0, -587, 832, 0, -587, -587, 0,
- -587, -587, 0, -587, 0, -587, -587, -587, 0, -587,
- -587, -587, 0, -587, -587, -587, 0, -587, 0, 0,
- 0, 0, 0, 0, -109, -588, -588, -588, -588, -588,
- -588, -588, -588, -588, 0, 0, 0, -587, -587, -587,
- 0, -588, 0, -588, -588, -588, -588, -587, 0, 0,
- 0, 0, -588, -588, -588, -588, -588, -588, -588, 0,
- 0, -588, 0, 0, 0, 0, 0, 0, 0, 0,
- -588, -588, -588, -588, -588, -588, -588, -588, -588, 0,
- -588, -588, -588, 0, 0, -588, 0, 0, -588, -588,
- 0, -588, -588, -588, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -588, -588, 0, 0,
- 0, 0, 0, -588, 0, 0, -588, -588, 0, -588,
- -588, 0, -588, 0, -588, -588, -588, 0, -588, -588,
- -588, 0, -588, -588, -588, 0, -588, 0, 0, 0,
- 0, 0, 0, -589, -589, -589, -589, -589, -589, -589,
- -589, -589, 0, 0, 0, 0, -588, -588, -588, -589,
- 0, -589, -589, -589, -589, 0, -588, 0, 0, 0,
- -589, -589, -589, -589, -589, -589, -589, 0, 0, -589,
- 0, 0, 0, 0, 0, 0, 0, 0, -589, -589,
- -589, -589, -589, -589, -589, -589, -589, 0, -589, -589,
- -589, 0, 0, -589, 0, 0, -589, -589, 0, -589,
- -589, -589, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, -589, -589, 0, 0, 0, 0,
- 0, -589, 0, 0, -589, -589, 0, -589, -589, 0,
- -589, 0, -589, -589, -589, 0, -589, -589, -589, 0,
- -589, -589, -589, 0, -589, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 313, 0, 0, 399, 53, 0,
+ 54, 55, 0, 400, 0, 0, 0, 57, 0, 58,
+ 59, 60, 0, 61, 62, 63, 0, 64, 0, 0,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
+ 0, 0, 0, 0, 0, 0, 15, 120, 108, 109,
+ 18, 19, 0, 0, 0, 0, 0, 110, 111, 112,
+ 23, 24, 25, 26, 0, 0, 113, 0, 0, 0,
+ 0, 0, 0, 0, 0, 31, 32, 33, 114, 35,
+ 36, 37, 115, 39, 0, 40, 41, 42, 0, 0,
+ 43, 0, 0, 44, 45, 0, 116, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, -589, -589, -589, 0, 0, 0,
- 0, 0, 0, 0, -589, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 147, 148, 149, 150, 151, 152, 153, 154, 0,
- 0, 0, 155, 156, 157, 233, 234, 235, 236, 162,
- 163, 164, 0, 0, 0, 0, 0, 165, 166, 167,
- 237, 238, 239, 240, 172, 319, 320, 241, 321, 0,
- 0, 0, 0, 0, 0, 322, 0, 0, 0, 0,
- 0, 0, 174, 175, 176, 177, 178, 179, 180, 181,
- 0, 0, 182, 183, 0, 0, 0, 0, 184, 185,
- 186, 187, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 188, 189, 190, 0, 0, 0, 0, 323,
+ 0, 0, 0, 0, 0, 0, 0, 0, 118, 0,
+ 0, 119, 53, 0, 54, 55, 0, 0, 0, 0,
+ 0, 57, 0, 58, 59, 60, 0, 61, 62, 63,
+ 0, 64, 0, 0, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 0, 0, 0, 0, 0, 0, 0,
+ 15, 120, 108, 109, 18, 19, 0, 0, 0, 0,
+ 0, 110, 111, 112, 23, 24, 25, 26, 0, 0,
+ 113, 0, 0, 0, 0, 0, 0, 0, 0, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 0, 40,
+ 41, 42, 0, 0, 43, 0, 0, 44, 45, 0,
+ 116, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 0, 201, 202, 0,
- 0, 0, 0, 0, 0, 203, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 0, 0, 0, 155, 156, 157, 233, 234, 235, 236,
- 162, 163, 164, 0, 0, 0, 0, 0, 165, 166,
- 167, 237, 238, 239, 240, 172, 319, 320, 241, 321,
- 0, 0, 0, 0, 0, 0, 322, 0, 0, 0,
+ 0, 0, 313, 0, 0, 399, 53, 0, 54, 55,
+ 0, 0, 0, 0, 0, 57, 0, 58, 59, 60,
+ 0, 61, 62, 63, 0, 64, 0, 0, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
+ 0, 0, 0, 0, 15, 120, 108, 109, 18, 19,
+ 0, 0, 0, 0, 0, 110, 111, 112, 23, 24,
+ 25, 26, 0, 0, 113, 0, 0, 0, 0, 0,
+ 0, 0, 0, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 0, 40, 41, 42, 0, 0, 43, 0,
+ 0, 44, 45, 0, 116, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 967, 0, 0, 119,
+ 53, 0, 54, 55, 0, 0, 0, 0, 0, 57,
+ 0, 58, 59, 60, 0, 61, 62, 63, 0, 64,
+ 0, 0, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 0, 0, 0, 0, 0, 0, 0, 15, 120,
+ 108, 109, 18, 19, 0, 0, 0, 0, 0, 110,
+ 111, 112, 23, 24, 25, 26, 0, 0, 113, 0,
+ 0, 0, 0, 0, 0, 0, 0, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 0, 40, 41, 42,
+ 0, 0, 43, 0, 0, 44, 45, 0, 225, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 990, 0, 0, 119, 53, 0, 54, 55, 0, 0,
+ 659, 660, 0, 57, 661, 58, 59, 60, 0, 61,
+ 62, 63, 0, 64, 0, 0, 0, 0, 0, 174,
+ 175, 176, 177, 178, 179, 180, 181, 0, 0, 182,
+ 183, 0, 0, 120, 0, 184, 185, 186, 187, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 188,
+ 189, 190, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 0, 201, 202, 680, 651, 0, 0,
+ 681, 0, 203, 276, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 174, 175, 176, 177, 178,
+ 179, 180, 181, 0, 0, 182, 183, 0, 0, 0,
+ 0, 184, 185, 186, 187, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 188, 189, 190, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 0,
+ 201, 202, 665, 660, 0, 0, 666, 0, 203, 276,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 174, 175, 176, 177, 178, 179, 180, 181, 0,
+ 0, 182, 183, 0, 0, 0, 0, 184, 185, 186,
+ 187, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 188, 189, 190, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 0, 201, 202, 697, 651,
+ 0, 0, 698, 0, 203, 276, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 174, 175, 176,
+ 177, 178, 179, 180, 181, 0, 0, 182, 183, 0,
+ 0, 0, 0, 184, 185, 186, 187, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 188, 189, 190,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 0, 201, 202, 700, 660, 0, 0, 701, 0,
+ 203, 276, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 174, 175, 176, 177, 178, 179, 180,
 181, 0, 0, 182, 183, 0, 0, 0, 0, 184,
 185, 186, 187, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 188, 189, 190, 0, 0, 0, 0,
- 485, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 191, 192, 193,
 194, 195, 196, 197, 198, 199, 200, 0, 201, 202,
- 0, 0, 0, 0, 0, 0, 203, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 0, 0, 0, 155, 156, 157, 233, 234, 235,
- 236, 162, 163, 164, 0, 0, 0, 0, 0, 165,
- 166, 167, 237, 238, 239, 240, 172, 0, 0, 241,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 174, 175, 176, 177, 178, 179,
- 180, 181, 0, 0, 182, 183, 0, 0, 0, 0,
- 184, 185, 186, 187, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 188, 189, 190, 0, 0, 0,
- 242, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 0, 201,
- 202, 0, 0, 0, 0, 0, 0, 203, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
- 153, 154, 0, 0, 0, 155, 156, 157, 233, 234,
- 235, 236, 162, 163, 164, 0, 0, 0, 0, 0,
- 165, 166, 167, 237, 238, 239, 240, 172, 0, 0,
- 241, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 707, 651, 0, 0, 708, 0, 203, 276, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 174,
+ 175, 176, 177, 178, 179, 180, 181, 0, 0, 182,
+ 183, 0, 0, 0, 0, 184, 185, 186, 187, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 188,
+ 189, 190, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 0, 201, 202, 710, 660, 0, 0,
+ 711, 0, 203, 276, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 174, 175, 176, 177, 178,
 179, 180, 181, 0, 0, 182, 183, 0, 0, 0,
 0, 184, 185, 186, 187, 0, 0, 0, 0, 0,
@@ -3354,1011 +4041,678 @@
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,
 192, 193, 194, 195, 196, 197, 198, 199, 200, 0,
- 201, 202, 0, 0, 0, 0, 0, 0, 203, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
- 0, 0, 0, 0, 0, 15, 0, 108, 109, 18,
- 19, 0, 0, 0, 0, 0, 110, 111, 112, 23,
- 24, 25, 26, 0, 0, 113, 0, 0, 0, 0,
- 0, 0, 0, 0, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
- 0, 0, 44, 45, 0, 116, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 312, 0, 0,
- 119, 53, 0, 54, 55, 0, 0, 0, 0, 0,
- 57, 0, 58, 59, 60, 0, 61, 62, 63, 0,
- 64, 0, 0, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 0, 0, 0, 0, 0, 0, 0, 15,
- 120, 108, 109, 18, 19, 0, 0, 0, 313, 0,
- 110, 111, 112, 23, 24, 25, 26, 0, 0, 113,
- 0, 0, 0, 0, 0, 0, 0, 0, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 0, 40, 41,
- 42, 0, 0, 43, 0, 0, 44, 45, 0, 116,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 312, 0, 0, 119, 53, 0, 54, 55, 0,
- 0, 0, 0, 0, 57, 0, 58, 59, 60, 0,
- 61, 62, 63, 0, 64, 0, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 0, 0, 0,
- 0, 0, 0, 15, 120, 16, 17, 18, 19, 0,
- 0, 0, 608, 0, 20, 21, 22, 23, 24, 25,
- 26, 0, 0, 27, 0, 0, 0, 0, 0, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
- 44, 45, 0, 46, 47, 48, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 49, 50,
- 0, 0, 0, 0, 0, 51, 0, 0, 52, 53,
- 0, 54, 55, 0, 56, 0, 0, 0, 57, 0,
- 58, 59, 60, 0, 61, 62, 63, 0, 64, 0,
- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 14, 0, 0, 0, 65, 66,
- 67, 15, 0, 16, 17, 18, 19, 0, 0, 0,
- 0, 0, 20, 21, 22, 23, 24, 25, 26, 0,
- 0, 27, 0, 0, 0, 0, 0, 28, 0, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 0,
- 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
- 0, 46, 47, 48, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 49, 50, 0, 0,
- 0, 0, 0, 51, 0, 0, 52, 53, 0, 54,
- 55, 0, 56, 0, 0, 0, 57, 0, 58, 59,
- 60, 0, 61, 62, 63, 0, 64, 0, 0, 0,
- 0, 0, 0, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 0, 0, 0, 0, 65, 66, 67, 15,
- 0, 16, 17, 18, 19, 0, 0, 0, 0, 0,
- 20, 21, 22, 23, 24, 25, 26, 0, 0, 113,
- 0, 0, 0, 0, 0, 0, 0, 0, 31, 32,
- 33, 260, 35, 36, 37, 38, 39, 0, 40, 41,
- 42, 0, 0, 43, 0, 0, 44, 45, 0, 46,
- 47, 48, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 49, 50, 0, 0, 0, 0,
- 0, 211, 0, 0, 119, 53, 0, 54, 55, 0,
- 261, 0, 262, 263, 57, 0, 58, 59, 60, 0,
- 61, 62, 63, 0, 64, 0, 0, 0, 0, 0,
- 0, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 0, 0, 0, 0, 65, 264, 67, 15, 0, 16,
- 17, 18, 19, 0, 0, 0, 0, 0, 20, 21,
- 22, 23, 24, 25, 26, 0, 0, 113, 0, 0,
- 0, 0, 0, 0, 0, 0, 31, 32, 33, 260,
- 35, 36, 37, 38, 39, 0, 40, 41, 42, 0,
- 0, 43, 0, 0, 44, 45, 0, 46, 47, 48,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 49, 506, 0, 0, 0, 0, 0, 211,
- 0, 0, 119, 53, 0, 54, 55, 0, 261, 0,
- 262, 263, 57, 0, 58, 59, 60, 0, 61, 62,
- 63, 0, 64, 0, 0, 0, 0, 0, 0, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
- 0, 0, 65, 264, 67, 15, 0, 108, 109, 18,
- 19, 0, 0, 0, 0, 0, 110, 111, 112, 23,
- 24, 25, 26, 0, 0, 113, 0, 0, 0, 0,
- 0, 0, 0, 0, 31, 32, 33, 260, 35, 36,
- 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
- 0, 0, 44, 45, 0, 46, 47, 48, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 49, 50, 0, 0, 0, 0, 0, 211, 0, 0,
- 119, 53, 0, 54, 55, 0, 719, 0, 262, 263,
- 57, 0, 58, 59, 60, 0, 61, 62, 63, 0,
- 64, 0, 0, 0, 0, 0, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 0, 0, 0, 0,
- 65, 264, 67, 15, 0, 108, 109, 18, 19, 0,
- 0, 0, 0, 0, 110, 111, 112, 23, 24, 25,
- 26, 0, 0, 113, 0, 0, 0, 0, 0, 0,
- 0, 0, 31, 32, 33, 260, 35, 36, 37, 38,
- 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
- 44, 45, 0, 46, 47, 48, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 49, 848,
- 0, 0, 0, 0, 0, 211, 0, 0, 119, 53,
- 0, 54, 55, 0, 719, 0, 262, 263, 57, 0,
- 58, 59, 60, 0, 61, 62, 63, 0, 64, 0,
- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 0, 0, 0, 0, 65, 264,
- 67, 15, 0, 108, 109, 18, 19, 0, 0, 0,
- 0, 0, 110, 111, 112, 23, 24, 25, 26, 0,
- 0, 113, 0, 0, 0, 0, 0, 0, 0, 0,
- 31, 32, 33, 260, 35, 36, 37, 38, 39, 0,
- 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
- 0, 46, 47, 48, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 49, 50, 0, 0,
- 0, 0, 0, 211, 0, 0, 119, 53, 0, 54,
- 55, 0, 261, 0, 262, 0, 57, 0, 58, 59,
- 60, 0, 61, 62, 63, 0, 64, 0, 0, 0,
- 0, 0, 0, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 0, 0, 0, 0, 65, 264, 67, 15,
- 0, 108, 109, 18, 19, 0, 0, 0, 0, 0,
- 110, 111, 112, 23, 24, 25, 26, 0, 0, 113,
- 0, 0, 0, 0, 0, 0, 0, 0, 31, 32,
- 33, 260, 35, 36, 37, 38, 39, 0, 40, 41,
- 42, 0, 0, 43, 0, 0, 44, 45, 0, 46,
- 47, 48, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 49, 50, 0, 0, 0, 0,
- 0, 211, 0, 0, 119, 53, 0, 54, 55, 0,
- 0, 0, 262, 263, 57, 0, 58, 59, 60, 0,
- 61, 62, 63, 0, 64, 0, 0, 0, 0, 0,
- 0, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 0, 0, 0, 0, 65, 264, 67, 15, 0, 108,
- 109, 18, 19, 0, 0, 0, 0, 0, 110, 111,
- 112, 23, 24, 25, 26, 0, 0, 113, 0, 0,
- 0, 0, 0, 0, 0, 0, 31, 32, 33, 260,
- 35, 36, 37, 38, 39, 0, 40, 41, 42, 0,
- 0, 43, 0, 0, 44, 45, 0, 46, 47, 48,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 49, 50, 0, 0, 0, 0, 0, 211,
- 0, 0, 119, 53, 0, 54, 55, 0, 719, 0,
- 262, 0, 57, 0, 58, 59, 60, 0, 61, 62,
- 63, 0, 64, 0, 0, 0, 0, 0, 0, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
- 0, 0, 65, 264, 67, 15, 0, 108, 109, 18,
- 19, 0, 0, 0, 0, 0, 110, 111, 112, 23,
- 24, 25, 26, 0, 0, 113, 0, 0, 0, 0,
- 0, 0, 0, 0, 31, 32, 33, 260, 35, 36,
- 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
- 0, 0, 44, 45, 0, 46, 47, 48, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 49, 50, 0, 0, 0, 0, 0, 211, 0, 0,
- 119, 53, 0, 54, 55, 0, 0, 0, 262, 0,
- 57, 0, 58, 59, 60, 0, 61, 62, 63, 0,
- 64, 0, 0, 0, 0, 0, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 0, 0, 0, 0,
- 65, 264, 67, 15, 0, 16, 17, 18, 19, 0,
- 0, 0, 0, 0, 20, 21, 22, 23, 24, 25,
- 26, 0, 0, 113, 0, 0, 0, 0, 0, 0,
- 0, 0, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
- 44, 45, 0, 46, 47, 48, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 49, 50,
- 0, 0, 0, 0, 0, 211, 0, 0, 119, 53,
- 0, 54, 55, 0, 602, 0, 0, 0, 57, 0,
- 58, 59, 60, 0, 61, 62, 63, 0, 64, 0,
- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 0, 0, 0, 0, 65, 264,
- 67, 15, 0, 108, 109, 18, 19, 0, 0, 0,
- 0, 0, 110, 111, 112, 23, 24, 25, 26, 0,
- 0, 113, 0, 0, 0, 0, 0, 0, 0, 0,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 0,
- 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
- 0, 46, 47, 48, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 49, 50, 0, 0,
- 0, 0, 0, 211, 0, 0, 119, 53, 0, 54,
- 55, 0, 261, 0, 0, 0, 57, 0, 58, 59,
- 60, 0, 61, 62, 63, 0, 64, 0, 0, 0,
- 0, 0, 0, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 0, 0, 0, 0, 65, 264, 67, 15,
- 0, 108, 109, 18, 19, 0, 0, 0, 0, 0,
- 110, 111, 112, 23, 24, 25, 26, 0, 0, 113,
- 0, 0, 0, 0, 0, 0, 0, 0, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 0, 40, 41,
- 42, 0, 0, 43, 0, 0, 44, 45, 0, 46,
- 47, 48, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 49, 50, 0, 0, 0, 0,
- 0, 211, 0, 0, 119, 53, 0, 54, 55, 0,
- 602, 0, 0, 0, 57, 0, 58, 59, 60, 0,
- 61, 62, 63, 0, 64, 0, 0, 0, 0, 0,
- 0, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 0, 0, 0, 0, 65, 264, 67, 15, 0, 108,
- 109, 18, 19, 0, 0, 0, 0, 0, 110, 111,
- 112, 23, 24, 25, 26, 0, 0, 113, 0, 0,
- 0, 0, 0, 0, 0, 0, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 0, 40, 41, 42, 0,
- 0, 43, 0, 0, 44, 45, 0, 46, 47, 48,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 49, 50, 0, 0, 0, 0, 0, 211,
- 0, 0, 119, 53, 0, 54, 55, 0, 894, 0,
- 0, 0, 57, 0, 58, 59, 60, 0, 61, 62,
- 63, 0, 64, 0, 0, 0, 0, 0, 0, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
- 0, 0, 65, 264, 67, 15, 0, 108, 109, 18,
- 19, 0, 0, 0, 0, 0, 110, 111, 112, 23,
- 24, 25, 26, 0, 0, 113, 0, 0, 0, 0,
- 0, 0, 0, 0, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
- 0, 0, 44, 45, 0, 46, 47, 48, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 49, 50, 0, 0, 0, 0, 0, 211, 0, 0,
- 119, 53, 0, 54, 55, 0, 719, 0, 0, 0,
- 57, 0, 58, 59, 60, 0, 61, 62, 63, 0,
- 64, 0, 0, 0, 0, 0, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 0, 0, 0, 0,
- 65, 264, 67, 15, 0, 16, 17, 18, 19, 0,
- 0, 0, 0, 0, 20, 21, 22, 23, 24, 25,
- 26, 0, 0, 27, 0, 0, 0, 0, 0, 0,
- 0, 0, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
- 44, 45, 0, 46, 47, 48, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 49, 50,
- 0, 0, 0, 0, 0, 211, 0, 0, 119, 53,
- 0, 54, 55, 0, 0, 0, 0, 0, 57, 0,
- 58, 59, 60, 0, 61, 62, 63, 0, 64, 0,
- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 0, 0, 0, 0, 65, 66,
- 67, 15, 0, 108, 109, 18, 19, 0, 0, 0,
- 0, 0, 110, 111, 112, 23, 24, 25, 26, 0,
- 0, 113, 0, 0, 0, 0, 0, 0, 0, 0,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 0,
- 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
- 0, 46, 47, 48, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 49, 50, 0, 0,
- 0, 0, 0, 211, 0, 0, 119, 53, 0, 54,
- 55, 0, 0, 0, 0, 0, 57, 0, 58, 59,
- 60, 0, 61, 62, 63, 0, 64, 0, 0, 0,
- 0, 0, 0, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 0, 0, 0, 0, 65, 264, 67, 15,
- 0, 16, 17, 18, 19, 0, 0, 0, 0, 0,
- 20, 21, 22, 23, 24, 25, 26, 0, 0, 113,
- 0, 0, 0, 0, 0, 0, 0, 0, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 0, 40, 41,
- 42, 0, 0, 43, 0, 0, 44, 45, 0, 46,
- 47, 48, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 49, 50, 0, 0, 0, 0,
- 0, 211, 0, 0, 119, 53, 0, 54, 55, 0,
- 0, 0, 0, 0, 57, 0, 58, 59, 60, 0,
- 61, 62, 63, 0, 64, 0, 0, 0, 0, 0,
- 0, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 0, 0, 0, 0, 65, 264, 67, 15, 0, 108,
- 109, 18, 19, 0, 0, 0, 0, 0, 110, 111,
- 112, 23, 24, 25, 26, 0, 0, 113, 0, 0,
- 0, 0, 0, 0, 0, 0, 31, 32, 33, 114,
- 35, 36, 37, 115, 39, 0, 40, 41, 42, 0,
- 0, 43, 0, 0, 44, 45, 0, 116, 0, 0,
+ 201, 202, 746, 651, 0, 0, 747, 0, 203, 276,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 117, 0, 0, 118,
- 0, 0, 119, 53, 0, 54, 55, 0, 0, 0,
- 0, 0, 57, 0, 58, 59, 60, 0, 61, 62,
- 63, 0, 64, 0, 0, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 0, 0, 0, 0, 0, 0,
- 0, 15, 120, 108, 109, 18, 19, 0, 0, 0,
- 0, 0, 110, 111, 112, 23, 24, 25, 26, 0,
- 0, 113, 0, 0, 0, 0, 0, 0, 0, 0,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 0,
- 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
- 0, 225, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 226, 0, 0, 52, 53, 0, 54,
- 55, 0, 56, 0, 0, 0, 57, 0, 58, 59,
- 60, 0, 61, 62, 63, 0, 64, 0, 0, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
- 0, 0, 0, 0, 0, 15, 120, 108, 109, 18,
- 19, 0, 0, 0, 0, 0, 110, 111, 112, 23,
- 24, 25, 26, 0, 0, 113, 0, 0, 0, 0,
- 0, 0, 0, 0, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 0, 40, 41, 42, 0, 0, 43,
- 0, 0, 44, 45, 0, 116, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 312, 0, 0,
- 398, 53, 0, 54, 55, 0, 399, 0, 0, 0,
- 57, 0, 58, 59, 60, 0, 61, 62, 63, 0,
- 64, 0, 0, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 0, 0, 0, 0, 0, 0, 0, 15,
- 120, 108, 109, 18, 19, 0, 0, 0, 0, 0,
- 110, 111, 112, 23, 24, 25, 26, 0, 0, 113,
- 0, 0, 0, 0, 0, 0, 0, 0, 31, 32,
- 33, 114, 35, 36, 37, 115, 39, 0, 40, 41,
- 42, 0, 0, 43, 0, 0, 44, 45, 0, 116,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 118, 0, 0, 119, 53, 0, 54, 55, 0,
- 0, 0, 0, 0, 57, 0, 58, 59, 60, 0,
- 61, 62, 63, 0, 64, 0, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 0, 0, 0, 0,
- 0, 0, 0, 15, 120, 108, 109, 18, 19, 0,
- 0, 0, 0, 0, 110, 111, 112, 23, 24, 25,
- 26, 0, 0, 113, 0, 0, 0, 0, 0, 0,
- 0, 0, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 0, 40, 41, 42, 0, 0, 43, 0, 0,
- 44, 45, 0, 116, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 312, 0, 0, 398, 53,
- 0, 54, 55, 0, 0, 0, 0, 0, 57, 0,
- 58, 59, 60, 0, 61, 62, 63, 0, 64, 0,
- 0, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 0, 0, 0, 0, 0, 0, 0, 15, 120, 108,
- 109, 18, 19, 0, 0, 0, 0, 0, 110, 111,
- 112, 23, 24, 25, 26, 0, 0, 113, 0, 0,
- 0, 0, 0, 0, 0, 0, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 0, 40, 41, 42, 0,
- 0, 43, 0, 0, 44, 45, 0, 116, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 961,
- 0, 0, 119, 53, 0, 54, 55, 0, 0, 0,
- 0, 0, 57, 0, 58, 59, 60, 0, 61, 62,
- 63, 0, 64, 0, 0, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 0, 0, 0, 0, 0, 0,
- 0, 15, 120, 108, 109, 18, 19, 0, 0, 0,
- 0, 0, 110, 111, 112, 23, 24, 25, 26, 0,
- 0, 113, 0, 0, 0, 0, 0, 0, 0, 0,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 0,
- 40, 41, 42, 0, 0, 43, 0, 0, 44, 45,
- 0, 225, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 984, 0, 0, 119, 53, 0, 54,
- 55, 0, 0, 677, 648, 0, 57, 678, 58, 59,
- 60, 0, 61, 62, 63, 0, 64, 0, 0, 0,
- 0, 0, 174, 175, 176, 177, 178, 179, 180, 181,
- 0, 0, 182, 183, 0, 0, 120, 0, 184, 185,
- 186, 187, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 188, 189, 190, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 0, 201, 202, 662,
- 657, 0, 0, 663, 0, 203, 275, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 174, 175,
- 176, 177, 178, 179, 180, 181, 0, 0, 182, 183,
- 0, 0, 0, 0, 184, 185, 186, 187, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 188, 189,
- 190, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 0, 201, 202, 694, 648, 0, 0, 695,
- 0, 203, 275, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 174, 175, 176, 177, 178, 179,
- 180, 181, 0, 0, 182, 183, 0, 0, 0, 0,
- 184, 185, 186, 187, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 188, 189, 190, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 0, 201,
- 202, 697, 657, 0, 0, 698, 0, 203, 275, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 174, 175, 176, 177, 178, 179, 180, 181, 0, 0,
- 182, 183, 0, 0, 0, 0, 184, 185, 186, 187,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 188, 189, 190, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 0, 201, 202, 704, 648, 0,
- 0, 705, 0, 203, 275, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 174, 175, 176, 177,
- 178, 179, 180, 181, 0, 0, 182, 183, 0, 0,
- 0, 0, 184, 185, 186, 187, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 188, 189, 190, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 0, 201, 202, 707, 657, 0, 0, 708, 0, 203,
- 275, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 174, 175, 176, 177, 178, 179, 180, 181,
- 0, 0, 182, 183, 0, 0, 0, 0, 184, 185,
- 186, 187, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 188, 189, 190, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 0, 201, 202, 742,
- 648, 0, 0, 743, 0, 203, 275, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 174, 175,
- 176, 177, 178, 179, 180, 181, 0, 0, 182, 183,
- 0, 0, 0, 0, 184, 185, 186, 187, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 188, 189,
- 190, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 0, 201, 202, 745, 657, 0, 0, 746,
- 0, 203, 275, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 174, 175, 176, 177, 178, 179,
- 180, 181, 0, 0, 182, 183, 0, 0, 0, 0,
- 184, 185, 186, 187, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 188, 189, 190, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 0, 201,
- 202, 899, 648, 0, 0, 900, 0, 203, 275, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 174, 175, 176, 177, 178, 179, 180, 181, 0, 0,
- 182, 183, 0, 0, 0, 0, 184, 185, 186, 187,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 188, 189, 190, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 0, 201, 202, 902, 657, 0,
- 0, 903, 0, 203, 275, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 174, 175, 176, 177,
- 178, 179, 180, 181, 0, 0, 182, 183, 0, 0,
- 0, 0, 184, 185, 186, 187, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 188, 189, 190, 0,
+ 0, 174, 175, 176, 177, 178, 179, 180, 181, 0,
+ 0, 182, 183, 0, 0, 0, 0, 184, 185, 186,
+ 187, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 188, 189, 190, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 0, 201, 202, 749, 660,
+ 0, 0, 750, 0, 203, 276, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 174, 175, 176,
+ 177, 178, 179, 180, 181, 0, 0, 182, 183, 0,
+ 0, 0, 0, 184, 185, 186, 187, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 188, 189, 190,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 0, 201, 202, 905, 651, 0, 0, 906, 0,
+ 203, 276, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 174, 175, 176, 177, 178, 179, 180,
+ 181, 0, 0, 182, 183, 0, 0, 0, 0, 184,
+ 185, 186, 187, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 188, 189, 190, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 0, 201, 202,
+ 908, 660, 0, 0, 909, 0, 203, 276, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 174,
+ 175, 176, 177, 178, 179, 180, 181, 0, 0, 182,
+ 183, 0, 0, 0, 0, 184, 185, 186, 187, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 188,
+ 189, 190, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 0, 201, 202, 1049, 651, 0, 0,
+ 1050, 0, 203, 276, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 174, 175, 176, 177, 178,
+ 179, 180, 181, 0, 0, 182, 183, 0, 0, 0,
+ 0, 184, 185, 186, 187, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 188, 189, 190, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 0, 201, 202, 1043, 648, 0, 0, 1044, 0, 203,
- 275, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 174, 175, 176, 177, 178, 179, 180, 181,
- 0, 0, 182, 183, 0, 0, 0, 0, 184, 185,
- 186, 187, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 188, 189, 190, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 0,
+ 201, 202, 1061, 651, 0, 0, 1062, 0, 203, 276,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 0, 201, 202, 1055,
- 648, 0, 0, 1056, 0, 203, 275, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 174, 175,
- 176, 177, 178, 179, 180, 181, 0, 0, 182, 183,
- 0, 0, 0, 0, 184, 185, 186, 187, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 188, 189,
- 190, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 0, 201, 202, 1058, 657, 0, 0, 1059,
- 0, 203, 275, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 174, 175, 176, 177, 178, 179,
- 180, 181, 0, 0, 182, 183, 0, 0, 0, 0,
- 184, 185, 186, 187, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 188, 189, 190, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 0, 201,
- 202, 662, 657, 0, 0, 663, 0, 203, 275, 0,
+ 0, 174, 175, 176, 177, 178, 179, 180, 181, 0,
+ 0, 182, 183, 0, 0, 0, 0, 184, 185, 186,
+ 187, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 188, 189, 190, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 0, 201, 202, 1064, 660,
+ 0, 0, 1065, 0, 203, 276, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 174, 175, 176,
+ 177, 178, 179, 180, 181, 0, 0, 182, 183, 0,
+ 0, 0, 0, 184, 185, 186, 187, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 188, 189, 190,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 0, 201, 202, 665, 660, 0, 0, 666, 0,
+ 203, 276, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 174, 175, 176, 177, 178, 179, 180,
+ 181, 0, 0, 182, 183, 0, 0, 0, 0, 184,
+ 185, 186, 187, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 188, 189, 190, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 872,
+ 0, 0, 0, 0, 0, 0, 0, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 0, 201, 202,
+ 0, 0, 0, 0, 0, 0, 203, 403, 404, 405,
+ 406, 407, 408, 409, 410, 411, 412, 413, 414, 0,
+ 0, 0, 0, 415, 416, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 418, 0, 0, 0,
+ 0, 885, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 419, 0, 420,
+ 421, 422, 423, 424, 425, 426, 427, 428, 429, 403,
+ 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
+ 414, 0, 0, 0, 0, 415, 416, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 418, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 174, 175, 176, 177, 178, 179, 180, 181, 0, 0,
- 182, 183, 0, 0, 0, 0, 184, 185, 186, 187,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 419,
+ 0, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+ 412, 413, 414, 0, 0, 0, 0, 415, 416, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 418, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 419, 0, 420, 421, 422, 423, 424, 425, 426,
+ 427, 428, 429, 0, 0, 0, 0, 0, 0, 0,
+ 0, -277, 403, 404, 405, 406, 407, 408, 409, 410,
+ 411, 412, 413, 414, 0, 0, 0, 0, 415, 416,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 418, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 419, 0, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 0, 0, 0, 0, 0, 0,
+ 0, 0, -279, 403, 404, 405, 406, 407, 408, 409,
+ 410, 411, 412, 413, 414, 0, 0, 0, 0, 415,
+ 416, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 418, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 419, 0, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 429, 0, 0, 0, 0, 0,
+ 0, 0, 0, -280, 403, 404, 405, 406, 407, 408,
+ 409, 410, 411, 412, 413, 414, 0, 0, 0, 0,
+ 415, 416, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 418, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 419, 0, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 0, 0, 0, 0,
+ 0, 0, 0, 0, -282, 403, 404, 405, 406, 407,
+ 408, 409, 410, 411, 412, 413, 414, 0, 0, 0,
+ 0, 415, 416, 0, 0, 0, 417, 0, 0, 0,
+ 0, 0, 0, 0, 418, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 419, 0, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 403, 404, 405,
+ 406, 407, 408, 409, 410, 411, 412, 413, 414, 0,
+ 0, 0, 0, 415, 416, 0, 0, 0, 500, 0,
+ 0, 0, 0, 0, 0, 0, 418, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 188, 189, 190, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 879, 0, 0, 0,
- 0, 0, 0, 0, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 0, 201, 202, 0, 0, 0,
- 0, 0, 0, 203, 402, 403, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 0, 0, 0, 0,
- 414, 415, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 417, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 418, 0, 419, 420, 421, 422,
- 423, 424, 425, 426, 427, 428, 402, 403, 404, 405,
- 406, 407, 408, 409, 410, 411, 412, 413, 0, 0,
- 0, 0, 414, 415, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 417, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 418, 0, 419, 420,
- 421, 422, 423, 424, 425, 426, 427, 428, 0, 0,
- 0, 0, 0, 0, 0, 0, -277, 402, 403, 404,
- 405, 406, 407, 408, 409, 410, 411, 412, 413, 0,
- 0, 0, 0, 414, 415, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 417, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 418, 0, 419,
- 420, 421, 422, 423, 424, 425, 426, 427, 428, 0,
- 0, 0, 0, 0, 0, 0, 0, -278, 402, 403,
+ 0, 0, 0, 0, 0, 0, 0, 419, 0, 420,
+ 421, 422, 423, 424, 425, 426, 427, 428, 429, 403,
 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 0, 0, 0, 0, 414, 415, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 417, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 414, 0, 0, 0, 0, 415, 416, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 418, 0,
- 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
- 0, 0, 0, 0, 0, 0, 0, 0, -279, 402,
- 403, 404, 405, 406, 407, 408, 409, 410, 411, 412,
- 413, 0, 0, 0, 0, 414, 415, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 417, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 418,
- 0, 419, 420, 421, 422, 423, 424, 425, 426, 427,
- 428, 0, 0, 0, 0, 0, 0, 0, 0, -280,
- 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
- 412, 413, 0, 0, 0, 0, 414, 415, 0, 0,
- 0, 416, 0, 0, 0, 0, 0, 0, 0, 417,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 418, 0, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 402, 403, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 0, 0, 0, 0, 414, 415,
- 0, 0, 0, 498, 0, 0, 0, 0, 0, 0,
- 0, 417, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 418, 0, 419, 420, 421, 422, 423, 424,
- 425, 426, 427, 428, 402, 403, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 0, 0, 0, 0,
- 414, 415, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 417, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 418, 0, 419, 420, 421, 422,
- 423, 424, 425, 426, 427, 428, 402, 403, 404, 405,
- 406, 407, 408, 409, 410, 411, -614, -614, 0, 0,
- 0, 0, 414, 415, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 417, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 419,
+ 0, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+ 412, -620, -620, 0, 0, 0, 0, 415, 416, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 418, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 419, 420,
- 421, 422, 423, 424, 425, 426, 427, 428
+ 0, 0, 0, 420, 421, 422, 423, 424, 425, 426,
+ 427, 428, 429
 };
 
 static const yytype_int16 yycheck =
 {
- 2, 89, 16, 17, 27, 69, 20, 87, 88, 66,
- 2, 28, 4, 5, 6, 22, 7, 9, 10, 21,
- 14, 13, 222, 15, 16, 17, 284, 313, 20, 479,
- 10, 271, 82, 52, 28, 15, 488, 377, 4, 306,
- 54, 55, 2, 310, 4, 56, 16, 17, 593, 7,
- 20, 401, 54, 55, 16, 17, 14, 118, 20, 756,
- 52, 501, 783, 590, 56, 505, 431, 58, 688, 544,
- 28, 330, 74, 75, 66, 75, 505, 91, 429, 699,
- 25, 15, 433, 25, 295, 436, 60, 61, 62, 63,
- 82, 456, 54, 55, 21, 22, 318, 969, 105, 75,
- 58, 944, 5, 6, 25, 57, 457, 536, 473, 111,
- 13, 25, 269, 90, 271, 16, 17, 482, 26, 20,
- 29, 472, 122, 474, 0, 117, 79, 119, 27, 665,
- 666, 144, 483, 608, 138, 69, 90, 92, 218, 372,
- 25, 90, 590, 26, 55, 593, 90, 369, 305, 229,
- 90, 25, 590, 56, 25, 25, 105, 103, 74, 75,
- 393, 105, 802, 16, 17, 121, 121, 20, 808, 121,
- 147, 522, 90, 126, 1046, 18, 16, 20, 105, 82,
- 28, 546, 128, 331, 111, 112, 334, 398, 336, 52,
- 338, 140, 340, 147, 1037, 144, 547, 142, 147, 144,
- 142, 54, 129, 147, 113, 121, 122, 147, 121, 289,
- 92, 213, 214, 401, 214, 92, 115, 90, 210, 118,
- 119, 142, 749, 144, 57, 458, 441, 442, 142, 147,
- 138, 223, 224, 297, 761, 315, 144, 213, 214, 121,
- 142, 305, 306, 223, 224, 966, 310, 146, 969, 148,
- 144, 242, 949, 441, 442, 138, 119, 142, 544, 121,
- 386, 275, 388, 313, 125, 279, 55, 269, 142, 271,
- 510, 142, 142, 275, 147, 115, 295, 813, 118, 119,
- 142, 90, 115, 275, 242, 118, 119, 279, 728, 729,
- 123, 283, 284, 90, 90, 287, 555, 213, 214, 92,
- 729, 749, 294, 295, 92, 275, 146, 92, 148, 279,
- 302, 749, 92, 761, 121, 148, 791, 279, 252, 90,
- 940, 313, 608, 761, 869, 1046, 548, 51, 121, 53,
- 54, 55, 56, 121, 294, 783, 121, 687, 147, 396,
- 92, 121, 302, 90, 401, 69, 58, 59, 92, 323,
- 147, 147, 509, 510, 142, 347, 348, 349, 350, 351,
- 352, 353, 354, 297, 804, 37, 38, 55, 348, 349,
- 350, 351, 25, 375, 92, 377, 147, 121, 279, 398,
- 372, 347, 142, 92, 441, 442, 51, 347, 399, 20,
- 840, 92, 352, 51, 455, 53, 54, 55, 56, 92,
- 147, 393, 318, 121, 396, 553, 398, 399, 90, 401,
- 313, 69, 121, 58, 59, 51, 92, 431, 142, 55,
- 121, 869, 275, 105, 287, 863, 279, 767, 121, 431,
- 57, 796, 295, 142, 142, 873, 101, 102, 103, 431,
- 92, 142, 456, 676, 795, 121, 797, 138, 605, 441,
- 442, 101, 661, 369, 456, 664, 17, 18, 140, 473,
- 718, 431, 464, 128, 456, 147, 458, 459, 482, 121,
- 145, 473, 739, 682, 121, 433, 499, 469, 436, 101,
- 482, 473, 722, 139, 142, 477, 456, 501, 940, 55,
- 482, 505, 542, 141, 544, 487, 399, 101, 655, 457,
- 142, 518, 942, 473, 92, 791, 433, 509, 510, 131,
- 132, 133, 482, 942, 714, 101, 474, 519, 966, 533,
- 121, 969, 536, 26, 518, 483, 60, 519, 966, 63,
- 457, 121, 546, 121, 142, 398, 528, 51, 618, 501,
- 798, 51, 215, 396, 546, 885, 886, 474, 401, 222,
- 542, 784, 544, 92, 546, 142, 483, 714, 608, 519,
- 518, 142, 554, 115, 522, 722, 118, 119, 528, 9,
- 10, 533, 142, 107, 508, 15, 546, 90, 811, 881,
- 882, 51, 121, 142, 799, 121, 259, 90, 580, 547,
- 805, 806, 105, 92, 146, 522, 148, 855, 1046, 601,
- 142, 1039, 105, 142, 51, 793, 469, 599, 16, 849,
- 580, 799, 1050, 636, 477, 99, 608, 805, 806, 318,
- 547, 15, 121, 856, 487, 121, 122, 140, 13, 599,
- 121, 121, 548, 16, 147, 138, 63, 140, 491, 542,
- 15, 544, 142, 142, 147, 652, 772, 773, 774, 26,
- 776, 145, 778, 655, 661, 16, 145, 664, 2, 661,
- 4, 139, 664, 665, 666, 9, 10, 1032, 142, 92,
- 369, 15, 16, 17, 347, 739, 20, 117, 1018, 142,
- 682, 15, 1033, 675, 676, 687, 688, 15, 361, 922,
- 692, 554, 849, 710, 685, 675, 911, 699, 121, 44,
- 115, 142, 121, 118, 119, 608, 379, 115, 52, 141,
- 118, 119, 141, 90, 728, 729, 710, 709, 15, 142,
- 722, 809, 66, 911, 18, 652, 926, 685, 105, 709,
- 145, 146, 932, 148, 661, 141, 793, 664, 146, 141,
- 148, 791, 799, 800, 63, 64, 65, 115, 805, 806,
- 118, 119, 710, 680, 115, 682, 15, 118, 119, 90,
- 139, 138, 142, 140, 44, 767, 728, 144, 115, 16,
- 147, 118, 119, 117, 105, 119, 139, 141, 57, 139,
- 1038, 142, 796, 223, 224, 146, 142, 148, 142, 142,
- 804, 583, 784, 142, 796, 587, 44, 116, 117, 791,
- 792, 793, 90, 26, 796, 478, 479, 799, 800, 140,
- 15, 813, 93, 805, 806, 14, 147, 105, 15, 811,
- 812, 823, 15, 145, 826, 142, 796, 953, 954, 955,
- 956, 142, 792, 825, 687, 142, 828, 61, 142, 797,
- 64, 65, 804, 283, 284, 837, 838, 849, 828, 548,
- 142, 15, 140, 845, 911, 528, 299, 141, 15, 147,
- 303, 139, 535, 15, 856, 857, 210, 90, 115, 15,
- 797, 118, 119, 15, 139, 37, 38, 576, 142, 223,
- 224, 126, 105, 885, 886, 583, 61, 126, 791, 64,
- 65, 883, 116, 117, 593, 55, 888, 596, 139, 146,
- 51, 148, 53, 54, 55, 56, 986, 15, 348, 349,
- 350, 351, 55, 353, 354, 138, 1042, 140, 69, 911,
- 142, 144, 142, 142, 147, 783, 142, 142, 942, 921,
- 922, 275, 26, 925, 142, 279, 142, 929, 940, 283,
- 284, 116, 117, 287, 441, 442, 15, 141, 144, 812,
- 294, 295, 144, 115, 142, 519, 118, 119, 302, 26,
- 26, 13, 825, 6, 1035, 783, 62, 115, 64, 65,
- 118, 119, 1037, 810, 837, 838, 999, 90, 475, 476,
- 883, 1034, 845, 254, 146, 888, 148, 7, 583, -1,
- 963, 783, 105, -1, 857, 966, 90, 989, 90, 991,
- 148, 674, 994, 347, 348, 349, 350, 351, 352, 353,
- 354, 105, -1, 105, -1, -1, 1018, -1, 1032, 459,
- 116, 117, 925, 90, 90, -1, 523, 140, 372, -1,
- 1032, -1, 1034, 1035, 147, -1, -1, -1, 105, 105,
- 1032, 714, -1, -1, 138, 90, 140, -1, 140, 393,
- 144, -1, 396, 147, 398, 147, -1, 401, 921, -1,
- 105, -1, 1032, 506, -1, 62, 929, 64, 65, -1,
- 513, 138, 138, 140, 140, 1033, -1, 144, 144, -1,
- 147, 147, 525, -1, 783, 783, -1, 431, -1, 51,
- -1, 53, 54, 55, 56, 140, 769, 441, 442, -1,
- -1, -1, 147, 90, -1, 963, 1033, 69, 966, -1,
- -1, 969, 456, 971, 458, 459, -1, -1, 105, 116,
- 117, -1, -1, -1, -1, 469, 989, -1, 991, 473,
- 90, 994, 94, 477, 577, 578, -1, -1, 482, 101,
- 102, 103, 815, 487, -1, 105, -1, 90, -1, -1,
- 890, 891, -1, 140, -1, -1, -1, -1, 90, -1,
- 147, 1019, 105, -1, 607, -1, 128, 840, 90, -1,
- 869, 963, 871, 105, 966, 519, 875, 969, -1, 971,
- 140, 90, -1, 105, 528, -1, -1, 147, 1046, -1,
- 1048, -1, 1050, -1, 1052, -1, 105, 140, -1, -1,
- -1, -1, 546, -1, 147, 9, 10, 90, 140, -1,
- 554, 15, 16, 17, 1072, 147, 20, -1, 140, -1,
- -1, -1, 105, -1, -1, 147, 966, 1019, -1, -1,
- -1, 140, -1, -1, -1, 675, 580, -1, 147, -1,
- -1, 684, -1, 47, 48, 49, 50, 101, 947, 948,
- 54, 55, -1, 926, 1046, 599, 1048, 140, 1050, 932,
- 1052, -1, 66, 67, 147, 963, -1, -1, 966, 709,
- 969, 969, 971, 971, -1, 129, 130, 131, 132, 133,
- 1072, -1, 1022, 1023, 1024, -1, 1026, 1027, -1, -1,
- 63, 64, 65, -1, -1, 738, 40, 41, 42, 43,
- 44, -1, 799, 800, -1, -1, -1, 1006, 805, 806,
- 1009, -1, -1, 117, 757, 63, 64, 65, 63, 64,
- 65, 1019, -1, -1, -1, -1, 1066, 1067, 1068, 1069,
- -1, 675, 676, -1, 831, 832, 1076, 834, 835, 63,
- 64, 65, 1041, 116, 117, -1, -1, 1046, 1046, 1048,
- 1048, -1, 1050, 1052, 1052, -1, -1, -1, 51, -1,
- 53, 54, 55, 56, -1, 709, -1, -1, 116, 117,
- -1, 116, 117, 1072, 1072, -1, 69, 63, 64, 65,
- -1, 51, -1, 53, 54, 55, 56, -1, 828, -1,
- 83, -1, 116, 117, -1, -1, -1, -1, -1, 69,
- -1, 94, -1, -1, -1, 848, -1, 100, 101, 102,
- 103, 63, 64, 65, 911, -1, 63, 64, 65, 223,
- 224, 864, -1, 2, 94, 4, 5, 6, 121, -1,
- 116, 117, -1, -1, 13, 128, -1, 934, 131, -1,
- 784, 115, -1, -1, 118, 119, -1, -1, 792, 793,
- -1, 144, 796, -1, -1, 799, 800, 261, 262, 263,
- 264, 805, 806, -1, 116, 117, -1, 811, 812, 116,
- 117, 275, 146, 52, 148, 279, -1, 56, -1, 283,
- 284, 825, -1, -1, 828, -1, 51, -1, 53, 54,
- 55, 56, -1, 837, 838, -1, -1, -1, -1, -1,
- -1, 845, -1, 82, 69, 51, -1, 53, 54, 55,
- 56, -1, 856, 857, -1, 88, 89, -1, 83, -1,
- -1, -1, -1, 69, -1, -1, -1, -1, 101, 94,
- 88, 89, -1, -1, -1, 100, 101, 102, 103, -1,
- 119, -1, -1, 101, 348, 349, 350, 351, 94, 353,
- 354, -1, -1, -1, 100, 128, 129, 130, 131, 132,
- 133, -1, -1, 128, -1, -1, 131, 911, -1, 373,
- -1, 129, 130, 131, 132, 133, -1, 921, 922, 144,
- 384, -1, -1, -1, -1, 929, -1, -1, -1, -1,
- -1, -1, 396, -1, -1, -1, -1, 401, 402, 403,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, -1, 417, 418, 419, 420, 421, 422, 423,
- 424, 425, 426, 427, 428, -1, 115, 431, -1, 118,
- 119, 210, -1, -1, -1, -1, -1, 441, 442, -1,
- -1, -1, -1, -1, -1, 989, -1, 991, -1, -1,
- 994, -1, 456, 142, -1, 459, -1, 146, -1, 148,
- -1, 51, -1, 53, 54, 55, 56, 471, -1, 473,
- -1, 475, 476, -1, -1, -1, -1, -1, 482, 69,
- -1, -1, -1, -1, -1, -1, -1, 491, 1032, -1,
- 494, -1, -1, -1, 498, -1, -1, 501, -1, 503,
- -1, 505, 506, -1, 94, 88, 89, -1, 287, -1,
- 100, 101, 102, 103, -1, 294, 295, -1, 101, 523,
- -1, -1, 51, 302, 53, 54, 55, 56, -1, 533,
- -1, -1, 536, -1, 313, -1, -1, -1, 128, -1,
- 69, 131, 546, 126, 127, 128, 129, 130, 131, 132,
- 133, -1, -1, -1, 144, -1, -1, -1, -1, 563,
- 564, -1, -1, -1, -1, 94, -1, -1, 347, -1,
- -1, 100, -1, 352, -1, -1, 580, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 0, -1, 372, -1, 599, -1, 51, 602, 53,
- 54, 55, 56, -1, 13, 14, 15, 16, 17, 18,
- -1, 20, -1, -1, 393, 69, -1, 26, 27, 398,
- 399, -1, 401, -1, -1, -1, -1, -1, 37, 38,
- -1, 40, 41, 42, 43, 44, -1, -1, -1, -1,
- 94, -1, -1, -1, -1, -1, 100, 101, 102, 103,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 441, 442, -1, -1, -1, -1, -1, -1,
- -1, 675, -1, -1, 128, -1, -1, 131, -1, 458,
- -1, 90, -1, 687, -1, -1, 690, 691, 142, -1,
- 469, 2, -1, 4, 5, 6, 105, -1, 477, -1,
- -1, -1, 13, -1, -1, 709, 115, -1, 487, 118,
- 119, -1, -1, -1, -1, 719, -1, -1, -1, -1,
- -1, -1, -1, -1, 728, 729, -1, -1, -1, 138,
- 139, -1, -1, -1, -1, 144, 145, 146, 147, 148,
- 519, 52, -1, -1, -1, 56, -1, -1, -1, 528,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 542, -1, 544, -1, -1, -1, -1,
- -1, 82, -1, -1, -1, 554, -1, -1, -1, -1,
- -1, -1, -1, -1, 788, -1, -1, -1, -1, 793,
- 794, -1, 796, -1, -1, 799, 800, -1, -1, -1,
- 804, 805, 806, -1, -1, -1, -1, -1, 119, -1,
- -1, -1, -1, -1, 51, -1, 53, 54, 55, 56,
- -1, -1, -1, -1, 828, -1, -1, 831, 832, 608,
- 834, 835, 69, -1, -1, -1, -1, -1, -1, -1,
- 844, -1, -1, -1, 848, -1, -1, -1, 85, -1,
- -1, -1, -1, -1, -1, -1, 2, 94, 4, 5,
- 6, 865, 866, 100, 101, 102, 103, 13, -1, -1,
- -1, -1, -1, -1, 878, 879, -1, -1, -1, -1,
- -1, -1, -1, 44, -1, -1, -1, -1, -1, -1,
- 894, 128, -1, -1, 131, -1, -1, 676, -1, 210,
- 904, 905, -1, -1, -1, -1, 52, 911, -1, -1,
- 56, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, -1, -1, -1, -1, 88, 89, -1,
- 934, -1, -1, -1, -1, -1, 82, -1, 942, -1,
- 101, -1, -1, -1, 51, -1, 53, 54, 55, 56,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 122, 69, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 119, -1, -1, 287, -1, 85, -1,
- -1, 142, -1, 294, 295, -1, -1, 94, -1, -1,
- -1, 302, -1, 100, 101, 102, 103, -1, -1, -1,
- -1, -1, 313, -1, 51, 784, 53, 54, 55, 56,
- -1, -1, 791, 792, 793, -1, -1, -1, -1, -1,
- 799, 128, 69, -1, 131, -1, 805, 806, 1032, -1,
- -1, -1, 811, 812, -1, -1, 347, -1, 85, -1,
- -1, 352, -1, -1, -1, -1, 825, 94, -1, -1,
- -1, -1, -1, 100, 101, 102, 103, -1, 837, 838,
- -1, 372, -1, -1, 210, -1, 845, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 856, 857, -1,
- -1, 128, 393, -1, 131, -1, -1, 398, 399, -1,
- 401, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 883, -1, -1, -1, -1, 888,
- 51, -1, 53, 54, 55, 56, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 69, -1,
- 441, 442, 911, -1, -1, -1, -1, -1, -1, -1,
- -1, 287, 921, 922, -1, -1, 925, 458, 294, 295,
- 929, -1, -1, 94, -1, -1, 302, -1, 469, 100,
- 101, 102, 103, -1, -1, -1, 477, 313, -1, -1,
- -1, -1, -1, -1, -1, -1, 487, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 128, -1, -1,
- 131, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 347, -1, -1, -1, -1, 352, -1, 519, -1,
- 989, -1, 991, -1, -1, 994, -1, 528, -1, -1,
- -1, -1, -1, -1, -1, -1, 372, -1, -1, -1,
- -1, 542, -1, 544, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 554, -1, -1, -1, 393, -1, -1,
- -1, -1, 398, 399, -1, 401, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 2, -1, 4, 5, 6, 7, -1, -1, 51,
- 52, -1, 13, 55, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 441, 442, 608, 70, 71,
- 72, 73, 74, 75, 76, 77, -1, -1, 80, 81,
- -1, -1, 458, -1, 86, 87, 88, 89, -1, -1,
- -1, 52, -1, 469, -1, 56, -1, -1, 100, 101,
- 102, 477, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 487, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 82, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, -1, 135, 136, 676, -1, -1, -1, -1,
- -1, 143, 144, 519, -1, -1, -1, -1, -1, -1,
- -1, -1, 528, 44, -1, -1, -1, -1, 119, -1,
- -1, -1, -1, -1, -1, -1, 542, -1, 544, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 554, -1,
+ 2, 285, 16, 17, 69, 27, 20, 66, 89, 28,
+ 2, 222, 4, 5, 6, 22, 14, 9, 10, 21,
+ 480, 13, 15, 15, 16, 17, 7, 378, 20, 4,
+ 28, 16, 17, 14, 118, 20, 7, 593, 489, 272,
+ 87, 88, 402, 314, 2, 56, 4, 28, 75, 82,
+ 442, 443, 54, 55, 307, 596, 52, 503, 311, 546,
+ 52, 507, 5, 6, 56, 29, 789, 21, 22, 54,
+ 13, 507, 74, 75, 66, 319, 69, 58, 16, 17,
+ 593, 691, 20, 331, 476, 477, 270, 58, 272, 761,
+ 82, 373, 702, 16, 10, 75, 668, 669, 105, 15,
+ 430, 26, 538, 25, 434, 432, 296, 437, 975, 111,
+ 25, 950, 394, 56, 26, 0, 54, 55, 60, 61,
+ 62, 63, 306, 90, 611, 117, 370, 119, 458, 62,
+ 457, 64, 65, 525, 16, 17, 26, 92, 20, 82,
+ 92, 25, 122, 473, 79, 475, 25, 474, 402, 113,
+ 57, 105, 58, 59, 484, 26, 483, 111, 112, 25,
+ 25, 25, 144, 16, 17, 332, 121, 20, 335, 121,
+ 337, 218, 339, 25, 341, 129, 138, 459, 90, 90,
+ 147, 57, 229, 116, 117, 1052, 213, 214, 442, 443,
+ 142, 126, 115, 105, 524, 118, 119, 753, 90, 90,
+ 90, 54, 55, 664, 1043, 593, 667, 90, 596, 399,
+ 766, 213, 214, 138, 121, 105, 92, 16, 210, 549,
+ 142, 548, 16, 146, 685, 148, 138, 142, 140, 442,
+ 443, 223, 224, 298, 214, 147, 147, 18, 91, 20,
+ 753, 306, 307, 290, 90, 121, 311, 819, 138, 972,
+ 140, 92, 975, 766, 144, 147, 147, 147, 142, 252,
+ 144, 242, 276, 142, 147, 144, 280, 138, 270, 316,
+ 272, 242, 55, 144, 276, 546, 142, 142, 142, 512,
+ 121, 314, 90, 955, 276, 92, 732, 733, 280, 90,
+ 142, 276, 284, 285, 121, 280, 288, 733, 90, 28,
+ 296, 147, 92, 295, 296, 298, 550, 223, 224, 557,
+ 797, 303, 92, 869, 121, 92, 115, 51, 90, 118,
+ 119, 115, 314, 879, 118, 119, 142, 511, 512, 1052,
+ 690, 121, 121, 105, 875, 69, 946, 295, 397, 147,
+ 611, 121, 280, 402, 121, 303, 147, 146, 142, 148,
+ 37, 38, 146, 142, 148, 147, 348, 349, 350, 351,
+ 352, 353, 354, 355, 810, 753, 103, 101, 102, 103,
+ 92, 314, 456, 348, 376, 147, 378, 92, 766, 808,
+ 90, 373, 324, 442, 443, 814, 846, 144, 555, 400,
+ 348, 128, 92, 121, 128, 353, 115, 679, 280, 118,
+ 119, 789, 394, 399, 125, 397, 121, 399, 400, 55,
+ 402, 51, 397, 805, 806, 55, 972, 402, 432, 811,
+ 812, 121, 773, 276, 608, 92, 121, 280, 115, 148,
+ 432, 118, 119, 349, 350, 351, 352, 147, 722, 92,
+ 432, 60, 142, 457, 63, 837, 838, 92, 840, 841,
+ 442, 443, 55, 434, 121, 457, 437, 400, 25, 146,
+ 474, 148, 142, 465, 20, 457, 142, 459, 460, 483,
+ 57, 801, 474, 803, 658, 802, 121, 458, 470, 501,
+ 434, 483, 474, 16, 101, 57, 478, 875, 107, 1045,
+ 743, 483, 101, 726, 475, 946, 488, 142, 92, 319,
+ 1056, 520, 948, 484, 458, 138, 717, 492, 790, 511,
+ 512, 544, 948, 546, 131, 132, 133, 510, 92, 521,
+ 804, 475, 520, 145, 92, 917, 797, 121, 115, 521,
+ 484, 118, 119, 717, 548, 817, 123, 121, 530, 520,
+ 891, 892, 726, 524, 92, 799, 548, 121, 940, 141,
+ 370, 805, 544, 121, 546, 55, 548, 811, 812, 74,
+ 75, 148, 139, 521, 556, 503, 37, 38, 549, 583,
+ 524, 142, 530, 121, 621, 58, 59, 861, 611, 432,
+ 862, 101, 115, 101, 972, 118, 119, 975, 602, 17,
+ 18, 583, 805, 57, 142, 549, 121, 535, 811, 812,
+ 121, 544, 604, 546, 457, 142, 121, 122, 92, 215,
+ 602, 887, 888, 146, 51, 148, 222, 639, 142, 611,
+ 90, 474, 855, 121, 122, 142, 2, 51, 4, 142,
+ 483, 142, 51, 9, 10, 105, 387, 121, 389, 15,
+ 16, 17, 121, 51, 20, 142, 928, 27, 655, 99,
+ 503, 15, 92, 259, 507, 13, 658, 664, 142, 121,
+ 667, 121, 664, 917, 1052, 667, 668, 669, 611, 90,
+ 140, 855, 26, 1024, 144, 16, 52, 147, 743, 63,
+ 15, 121, 535, 685, 105, 538, 678, 679, 690, 691,
+ 66, 145, 145, 695, 713, 548, 139, 142, 213, 214,
+ 702, 655, 142, 142, 917, 690, 142, 688, 142, 1039,
+ 664, 1038, 121, 667, 15, 713, 15, 688, 44, 140,
+ 712, 932, 15, 26, 726, 141, 147, 938, 141, 683,
+ 550, 685, 713, 18, 815, 115, 90, 141, 118, 119,
+ 799, 117, 348, 119, 141, 52, 805, 806, 139, 15,
+ 139, 105, 811, 812, 141, 44, 362, 139, 90, 579,
+ 1044, 142, 678, 57, 797, 142, 146, 586, 148, 142,
+ 142, 773, 142, 105, 380, 44, 596, 9, 10, 599,
+ 789, 15, 93, 15, 138, 14, 140, 90, 802, 15,
+ 144, 15, 145, 147, 732, 142, 712, 142, 790, 142,
+ 802, 15, 105, 142, 319, 797, 798, 799, 140, 142,
+ 802, 141, 119, 805, 806, 147, 139, 819, 15, 811,
+ 812, 139, 803, 15, 15, 817, 818, 829, 15, 115,
+ 832, 126, 118, 119, 210, 138, 142, 140, 126, 831,
+ 798, 144, 834, 55, 147, 15, 90, 223, 224, 803,
+ 55, 843, 844, 855, 797, 370, 142, 139, 917, 851,
+ 146, 105, 148, 51, 142, 53, 54, 55, 56, 142,
+ 862, 863, 810, 479, 480, 142, 9, 10, 142, 732,
+ 733, 69, 15, 16, 17, 117, 26, 20, 142, 891,
+ 892, 90, 142, 142, 15, 115, 140, 889, 118, 119,
+ 276, 144, 894, 147, 280, 144, 105, 115, 284, 285,
+ 118, 119, 288, 141, 47, 48, 49, 50, 834, 295,
+ 296, 54, 55, 142, 530, 917, 146, 303, 148, 13,
+ 26, 537, 521, 66, 67, 927, 928, 145, 146, 931,
+ 148, 140, 6, 935, 946, 992, 889, 1041, 147, 802,
+ 90, 894, 789, 1043, 142, 61, 90, 810, 64, 65,
+ 969, 816, 1040, 972, 254, 105, 975, 7, 977, 789,
+ 789, 105, 348, 349, 350, 351, 352, 353, 354, 355,
+ 90, 288, 586, 1005, 117, 969, 972, -1, 931, 296,
+ -1, 223, 224, -1, 90, 105, -1, 373, 138, -1,
+ 140, -1, -1, 995, 144, 997, 140, 147, 1000, 105,
+ 116, 117, -1, 147, -1, -1, 1025, -1, 394, -1,
+ -1, 397, 1024, 399, 1038, -1, 402, 778, 779, 780,
+ 140, 782, -1, 784, -1, 550, 1038, 147, 1040, 1041,
+ -1, -1, 138, 1052, 140, 1054, 1038, 1056, 144, 1058,
+ -1, 147, 284, 285, -1, 875, 432, 877, 1039, 115,
+ -1, 881, 118, 119, 90, -1, 442, 443, -1, 1078,
+ 51, 677, 53, 54, 55, 56, -1, -1, 90, 105,
+ -1, 457, -1, 459, 460, 1039, -1, -1, 69, 90,
+ 223, 224, 399, 105, 470, 948, 115, -1, 474, 118,
+ 119, -1, 478, -1, 105, 115, 300, 483, 118, 119,
+ 304, 717, 488, 62, 140, 64, 65, 349, 350, 351,
+ 352, 147, 354, 355, -1, 90, 90, 90, 140, 262,
+ 263, 264, 265, 953, 954, 147, 146, -1, 148, 140,
+ 105, 105, 105, 276, 90, 521, 147, 280, -1, -1,
+ 969, 284, 285, 972, 530, 975, 975, 977, 977, 105,
+ -1, 142, -1, 470, -1, -1, -1, 116, 117, 775,
+ -1, 478, 548, 90, -1, 140, 140, 140, -1, -1,
+ 556, 488, 147, 147, 147, 1038, -1, 61, 105, -1,
+ 64, 65, 1012, -1, 140, 1015, -1, 63, 64, 65,
+ -1, 147, 63, 64, 65, -1, 1025, 583, 959, 960,
+ 961, 962, -1, -1, -1, 821, 349, 350, 351, 352,
+ -1, 354, 355, 140, -1, -1, 602, 1047, 460, -1,
+ 147, -1, 1052, 1052, 1054, 1054, -1, 1056, 1058, 1058,
+ 846, 374, 116, 117, 40, 41, 42, 43, 44, 556,
+ 116, 117, 385, -1, -1, 116, 117, -1, 1078, 1078,
+ -1, 586, -1, -1, 397, 590, 63, 64, 65, 402,
+ 403, 404, 405, 406, 407, 408, 409, 410, 411, 412,
+ 413, 414, 415, 416, -1, 418, 419, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 1048, -1, 432,
+ -1, -1, 678, 679, 63, 64, 65, -1, -1, 442,
+ 443, 63, 64, 65, 508, 63, 64, 65, -1, 116,
+ 117, 515, -1, -1, 457, -1, 932, 460, 63, 64,
+ 65, -1, 938, 527, -1, -1, 712, -1, -1, 472,
+ -1, 474, -1, 476, 477, 2, -1, 4, 5, 6,
+ 483, -1, -1, 63, 64, 65, 13, 116, 117, 492,
+ -1, -1, 495, 496, 116, 117, -1, 500, 116, 117,
+ 503, -1, 505, -1, 507, 508, 88, 89, -1, -1,
+ 101, 116, 117, -1, -1, -1, 580, 581, -1, 101,
+ -1, -1, 525, -1, -1, 52, -1, 896, 897, 56,
+ -1, -1, 535, -1, -1, 538, 116, 117, 129, 130,
+ 131, 132, 133, -1, 790, 548, 610, 129, 130, 131,
+ 132, 133, 798, 799, -1, 82, 802, -1, -1, 805,
+ 806, -1, 565, 566, -1, 811, 812, -1, -1, -1,
+ -1, 817, 818, -1, -1, -1, 678, -1, -1, -1,
+ 583, -1, -1, -1, -1, 831, -1, -1, 834, -1,
+ -1, -1, 119, -1, 789, 88, 89, 843, 844, 602,
+ -1, -1, 605, 972, -1, 851, -1, -1, 101, 51,
+ 712, 53, 54, 55, 56, -1, 862, 863, -1, -1,
+ -1, -1, -1, 687, -1, -1, 51, 69, 53, 54,
+ 55, 56, -1, 126, 127, 128, 129, 130, 131, 132,
+ 133, 818, -1, -1, 69, 2, -1, 4, 5, 6,
+ -1, -1, 94, -1, 831, -1, 13, -1, 100, 1028,
+ 1029, 1030, -1, 1032, 1033, -1, 843, 844, -1, 94,
+ -1, 917, -1, -1, 851, 678, -1, -1, 742, -1,
+ -1, 927, 928, 210, -1, -1, 863, 690, -1, 935,
+ 693, 694, -1, -1, -1, 52, -1, -1, 762, 56,
+ -1, 88, 89, 1072, 1073, 1074, 1075, -1, -1, 712,
+ -1, -1, -1, 1082, 101, -1, -1, -1, -1, -1,
+ 723, -1, -1, -1, -1, 82, -1, -1, -1, 732,
+ 733, -1, 834, -1, -1, 51, -1, 53, 54, 55,
+ 56, 128, 129, 130, 131, 132, 133, -1, -1, 995,
+ 927, 997, -1, 69, 1000, -1, -1, -1, 935, -1,
+ -1, 288, 119, -1, -1, -1, -1, -1, 295, 296,
+ -1, -1, -1, -1, 969, -1, 303, 972, 94, -1,
+ 975, -1, 977, -1, 100, -1, -1, 314, -1, -1,
+ 854, 794, 1038, -1, -1, -1, 799, 800, -1, 802,
+ -1, -1, 805, 806, -1, -1, 870, 810, 811, 812,
+ 51, -1, 53, 54, 55, 56, -1, -1, 995, -1,
+ 997, 348, -1, 1000, -1, -1, 353, -1, 69, -1,
+ 1025, 834, -1, -1, 837, 838, -1, 840, 841, -1,
+ -1, -1, -1, -1, -1, -1, 373, 850, -1, -1,
+ -1, 854, -1, 210, -1, -1, -1, 1052, -1, 1054,
+ -1, 1056, -1, 1058, -1, -1, -1, 394, 871, 872,
+ -1, -1, 399, 400, -1, 402, -1, -1, -1, -1,
+ -1, 884, 885, 1078, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 900, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 910, 911, 2,
+ -1, 4, 5, 6, 917, 442, 443, -1, -1, -1,
+ 13, -1, 51, -1, 53, 54, 55, 56, -1, -1,
+ -1, 288, 459, -1, -1, -1, -1, 940, 295, 296,
+ 69, -1, -1, 470, -1, 948, 303, -1, -1, -1,
+ -1, 478, -1, -1, 83, -1, -1, 314, -1, 52,
+ -1, 488, -1, 56, -1, 94, -1, -1, -1, -1,
+ -1, 100, 101, 102, 103, -1, -1, -1, -1, -1,
+ -1, -1, 51, -1, 53, 54, 55, 56, -1, 82,
+ -1, 348, 121, -1, 521, -1, 353, -1, -1, 128,
+ 69, -1, 131, 530, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 144, 373, 544, 51, 546,
+ 53, 54, 55, 56, -1, 94, 119, -1, -1, 556,
+ -1, 100, 101, 102, 103, 1038, 69, 394, 0, -1,
+ -1, -1, 399, 400, -1, 402, -1, -1, -1, -1,
+ 83, 13, 14, 15, 16, 17, 18, -1, 20, 128,
+ -1, 94, 131, -1, 26, 27, -1, 100, 101, 102,
+ 103, -1, -1, 142, -1, 37, 38, -1, 40, 41,
+ 42, 43, 44, -1, 611, 442, 443, -1, -1, -1,
+ -1, -1, -1, -1, -1, 128, -1, -1, 131, -1,
+ -1, -1, 459, -1, -1, -1, -1, -1, -1, -1,
+ -1, 144, -1, 470, -1, -1, -1, 210, -1, -1,
+ -1, 478, -1, -1, -1, 2, -1, 4, 90, -1,
+ -1, 488, -1, -1, -1, -1, 13, -1, -1, -1,
+ -1, -1, -1, 105, -1, -1, -1, -1, -1, -1,
+ -1, -1, 679, 115, -1, -1, 118, 119, -1, -1,
+ -1, -1, -1, 51, 521, 53, 54, 55, 56, -1,
+ -1, -1, -1, 530, -1, 52, 138, 139, -1, -1,
+ -1, 69, 144, 145, 146, 147, 148, 544, -1, 546,
+ -1, -1, -1, -1, -1, 288, -1, -1, -1, 556,
+ -1, -1, 295, 296, -1, -1, 94, -1, -1, -1,
+ 303, -1, 100, 101, 102, 103, -1, -1, -1, -1,
+ -1, 314, -1, 51, -1, 53, 54, 55, 56, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 128, 69, 119, 131, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 611, 348, 144, -1, -1, -1,
+ 353, -1, -1, 790, -1, -1, 94, -1, -1, -1,
+ 797, 798, 799, 101, 102, 103, -1, -1, 805, -1,
+ 373, -1, -1, -1, 811, 812, -1, -1, -1, -1,
+ 817, 818, -1, -1, 51, -1, 53, 54, 55, 56,
+ 128, 394, -1, -1, 831, -1, 399, 400, -1, 402,
+ -1, -1, 69, -1, -1, -1, 843, 844, -1, -1,
+ -1, -1, 679, -1, 851, -1, -1, -1, 85, -1,
+ -1, -1, -1, 210, -1, 862, 863, 94, -1, -1,
+ -1, -1, -1, 100, 101, 102, 103, -1, -1, 442,
+ 443, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 889, -1, -1, -1, 459, 894, -1, -1,
+ -1, 128, -1, -1, 131, -1, -1, 470, -1, -1,
+ -1, -1, -1, -1, -1, 478, -1, -1, -1, -1,
+ 917, -1, -1, -1, -1, 488, -1, -1, -1, -1,
+ 927, 928, -1, -1, 931, -1, -1, -1, 935, -1,
+ -1, 288, -1, -1, -1, -1, -1, -1, 295, 296,
+ -1, -1, -1, -1, -1, -1, 303, -1, 521, -1,
+ -1, -1, -1, 790, -1, -1, -1, 530, -1, -1,
+ 797, 798, 799, -1, -1, -1, -1, -1, 805, -1,
+ -1, 544, -1, 546, 811, 812, -1, -1, -1, -1,
+ 817, 818, -1, 556, -1, -1, -1, -1, 995, -1,
+ 997, 348, -1, 1000, 831, -1, 353, -1, -1, 2,
+ -1, 4, 5, 6, 7, -1, 843, 844, -1, -1,
+ 13, -1, -1, -1, 851, 51, 373, 53, 54, 55,
+ 56, -1, -1, -1, -1, 862, 863, -1, -1, -1,
+ -1, -1, -1, 69, -1, -1, -1, 394, 611, -1,
+ -1, -1, 399, -1, -1, 402, -1, -1, -1, 52,
+ -1, -1, 889, 56, -1, -1, -1, 894, 94, -1,
+ -1, -1, -1, -1, 100, 101, 102, 103, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 82,
+ 917, -1, -1, -1, -1, 442, 443, -1, -1, -1,
+ 927, 928, 128, -1, 931, 131, -1, -1, 935, -1,
+ -1, -1, 459, -1, 44, -1, 679, -1, -1, -1,
+ -1, -1, -1, 470, -1, -1, 119, -1, -1, -1,
+ -1, 478, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 488, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, -1, -1, -1, -1, 88, 89,
+ -1, -1, -1, -1, -1, -1, -1, -1, 995, -1,
+ 997, 101, -1, 1000, 521, -1, -1, -1, -1, -1,
+ -1, -1, -1, 530, -1, -1, -1, -1, -1, -1,
+ -1, -1, 122, -1, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, -1, -1, -1, -1, -1, 556,
+ -1, -1, 142, -1, -1, -1, -1, 210, -1, -1,
+ 2, -1, 4, -1, -1, -1, -1, 790, -1, -1,
+ -1, -1, -1, -1, 797, 798, 799, -1, -1, -1,
+ -1, -1, 805, -1, -1, -1, -1, -1, 811, 812,
+ -1, -1, -1, -1, 817, 818, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 831, -1,
+ 52, -1, -1, 51, -1, 53, 54, 55, 56, -1,
+ 843, 844, -1, -1, -1, -1, -1, -1, 851, -1,
+ -1, 69, -1, -1, -1, 288, -1, -1, -1, 862,
+ 863, -1, 295, 296, -1, -1, -1, 85, -1, -1,
+ 303, -1, -1, -1, -1, -1, 94, -1, -1, -1,
+ -1, 314, 100, 101, 102, 103, 889, -1, -1, -1,
+ -1, 894, 679, -1, -1, -1, -1, 119, -1, 51,
+ -1, 53, 54, 55, 56, -1, -1, -1, -1, -1,
+ 128, -1, -1, 131, 917, 348, -1, 69, -1, -1,
+ 353, -1, -1, -1, 927, 928, -1, -1, 931, -1,
+ -1, -1, 935, 85, -1, -1, -1, -1, -1, -1,
+ 373, -1, 94, -1, -1, -1, -1, -1, 100, 101,
+ 102, 103, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 394, -1, -1, -1, -1, 399, 400, -1, -1,
+ -1, -1, -1, -1, -1, -1, 128, -1, -1, 131,
+ -1, -1, -1, -1, -1, -1, -1, -1, 210, -1,
+ -1, -1, 995, -1, 997, -1, -1, 1000, -1, -1,
+ -1, -1, -1, 790, -1, -1, -1, -1, -1, -1,
+ -1, 798, 799, -1, -1, -1, -1, -1, 805, -1,
+ -1, -1, -1, -1, 811, 812, 459, -1, -1, -1,
+ 817, 818, -1, -1, -1, -1, -1, 470, -1, -1,
+ -1, -1, -1, -1, 831, 478, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 488, 843, 844, -1, -1,
+ -1, -1, -1, -1, 851, -1, 288, -1, -1, -1,
+ -1, -1, -1, 295, 296, 862, 863, -1, -1, -1,
+ -1, 303, -1, -1, -1, -1, -1, -1, 521, -1,
+ -1, -1, -1, -1, -1, -1, -1, 530, -1, -1,
+ 72, 73, 74, 75, 76, 77, 78, -1, 80, 81,
+ -1, 544, -1, 546, -1, -1, 88, 89, -1, -1,
+ -1, -1, -1, 556, -1, -1, 348, -1, -1, 101,
+ 917, 353, -1, -1, -1, -1, -1, -1, -1, -1,
+ 927, 928, -1, -1, 931, -1, -1, -1, 935, -1,
+ 0, 373, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, -1, 13, 14, 15, -1, 17, 18, -1,
+ 20, -1, 394, -1, -1, -1, 26, 399, 611, -1,
+ 402, -1, -1, -1, -1, -1, -1, 37, 38, -1,
+ 40, 41, 42, 43, 44, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 995, -1,
+ 997, -1, -1, 1000, -1, -1, -1, -1, -1, -1,
+ 442, 443, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, -1, -1, -1, 459, 88, 89,
+ 90, -1, 92, 93, -1, -1, 679, -1, 470, -1,
+ -1, 101, -1, -1, -1, 105, 478, -1, -1, -1,
+ -1, -1, -1, -1, -1, 115, 488, -1, 118, 119,
+ -1, 121, 122, -1, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, -1, -1, -1, -1, 138, 139,
+ 140, 44, 142, -1, -1, 145, 146, 147, 148, 521,
+ -1, -1, -1, -1, -1, -1, -1, -1, 530, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, -1, -1, -1, 556, 88, 89, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 101, -1,
+ -1, -1, -1, -1, -1, -1, -1, 790, -1, -1,
+ -1, -1, -1, -1, 797, 798, -1, -1, -1, 122,
+ -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, -1, -1, -1, 817, 818, -1, -1, -1, -1,
+ -1, -1, 72, 73, 74, 75, 76, 77, 831, 0,
+ 80, 81, -1, -1, -1, -1, -1, -1, 88, 89,
+ 843, 844, 13, 14, 15, -1, 17, 18, 851, 20,
+ -1, 101, -1, -1, -1, 26, -1, -1, -1, 862,
+ 863, -1, -1, -1, -1, -1, 37, 38, -1, 40,
+ 41, 42, 43, 44, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, -1, -1, 889, 679, -1, -1,
+ -1, 894, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, -1, -1, -1, -1, 88, 89, -1,
- -1, -1, -1, -1, -1, -1, 2, -1, 4, -1,
- 101, -1, -1, -1, -1, -1, -1, 13, -1, -1,
+ 81, 82, 83, -1, -1, -1, -1, 88, 89, 90,
+ -1, 92, 93, -1, 927, 928, -1, -1, 931, -1,
+ 101, -1, 935, -1, 105, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 115, -1, -1, 118, 119, -1,
+ 121, 122, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, -1, -1, -1, -1, 138, 139, 140,
+ -1, 142, -1, -1, 145, 146, 147, 148, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 122, 608, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 784, -1, -1, -1, -1, -1, 210,
- 791, 792, 793, -1, -1, -1, 52, -1, 799, -1,
- -1, -1, -1, -1, 805, 806, -1, -1, -1, -1,
- 811, 812, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 825, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 837, 838, -1, -1,
- 676, -1, -1, -1, 845, -1, -1, 2, -1, 4,
- -1, -1, -1, -1, -1, 856, 857, -1, -1, -1,
- -1, -1, -1, 119, -1, -1, 287, -1, -1, -1,
- -1, -1, -1, 294, 295, -1, -1, -1, -1, -1,
- -1, 302, 883, -1, -1, -1, -1, 888, -1, -1,
- -1, -1, 313, -1, -1, -1, -1, 52, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 911, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 921, 922, -1, -1, 925, -1, 347, -1, 929, -1,
- -1, 352, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 784, -1,
- -1, 372, -1, -1, 210, 791, 792, 793, -1, -1,
- -1, -1, -1, 799, 119, -1, -1, -1, -1, 805,
- 806, -1, 393, -1, -1, 811, 812, 398, 399, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 989, 825,
- 991, -1, -1, 994, -1, -1, -1, -1, -1, -1,
- -1, 837, 838, -1, -1, -1, -1, -1, -1, 845,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 856, 857, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 287, -1, -1, -1, -1, -1, 458, 294, 295,
- -1, -1, -1, -1, -1, -1, 302, 883, 469, -1,
- -1, -1, 888, -1, -1, 210, 477, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 487, -1, -1, -1,
- -1, -1, -1, -1, -1, 911, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 921, 922, -1, -1, 925,
- -1, 347, -1, 929, -1, -1, 352, -1, 519, -1,
- -1, -1, -1, -1, -1, -1, -1, 528, -1, 72,
- 73, 74, 75, 76, 77, 78, 372, 80, 81, -1,
- -1, 542, -1, 544, -1, 88, 89, -1, -1, -1,
- -1, -1, 287, 554, -1, -1, -1, 393, 101, 294,
- 295, -1, 398, -1, -1, 401, -1, 302, -1, -1,
- -1, -1, -1, 989, -1, 991, -1, -1, 994, -1,
- -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 441, 442, 608, -1, -1,
- -1, -1, 347, -1, -1, -1, -1, 352, -1, -1,
- -1, -1, 458, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 469, -1, -1, -1, 372, -1, -1,
- -1, 477, -1, -1, 72, 73, 74, 75, 76, 77,
- -1, 487, 80, 81, -1, -1, -1, -1, 393, -1,
- 88, 89, -1, 398, -1, -1, 401, -1, -1, -1,
- -1, -1, -1, 101, -1, 676, -1, -1, -1, -1,
- -1, -1, -1, 519, -1, -1, -1, -1, -1, -1,
- -1, -1, 528, -1, -1, -1, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 441, 442, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 554, -1,
- -1, -1, -1, 458, 51, 52, -1, -1, 55, -1,
- -1, -1, -1, -1, 469, -1, -1, -1, -1, -1,
- -1, -1, 477, 70, 71, 72, 73, 74, 75, 76,
- 77, -1, 487, 80, 81, -1, -1, -1, -1, 86,
- 87, 88, 89, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 100, 101, 102, -1, -1, -1, -1,
- -1, -1, -1, 784, 519, -1, -1, -1, -1, -1,
- 791, 792, -1, 528, -1, -1, -1, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, -1, 135, 136,
- 811, 812, -1, -1, -1, -1, 143, 144, -1, 554,
- -1, -1, -1, -1, 825, -1, -1, -1, -1, 44,
- -1, -1, -1, -1, -1, -1, 837, 838, -1, -1,
- 676, -1, -1, -1, 845, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 856, 857, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, -1,
+ -1, -1, 995, -1, 997, -1, -1, 1000, 790, -1,
+ -1, -1, -1, -1, -1, -1, 798, 799, -1, -1,
+ -1, 51, 52, 805, -1, 55, -1, -1, -1, 811,
+ 812, -1, -1, -1, -1, 817, 818, -1, -1, -1,
+ 70, 71, 72, 73, 74, 75, 76, 77, -1, 831,
+ 80, 81, -1, -1, -1, -1, 86, 87, 88, 89,
+ -1, 843, 844, -1, -1, -1, -1, -1, -1, 851,
+ 100, 101, 102, -1, -1, -1, -1, -1, -1, -1,
+ 862, 863, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, -1, 135, 136, 72, 73, 74,
+ 75, 76, 77, 143, 144, 80, 81, -1, -1, -1,
 -1, -1, -1, 88, 89, -1, -1, -1, -1, -1,
- -1, -1, 883, -1, -1, -1, 101, 888, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 122, -1, 124,
+ -1, -1, -1, -1, -1, 917, 101, -1, -1, -1,
+ -1, -1, -1, -1, -1, 927, 928, -1, -1, -1,
+ -1, -1, -1, 935, -1, -1, -1, -1, -1, 124,
 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
- 921, 922, -1, -1, 925, -1, -1, -1, 929, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 676, -1, -1, -1, -1, -1, -1, 784, -1,
- -1, -1, -1, -1, -1, -1, 792, 793, -1, -1,
- -1, -1, -1, 799, -1, -1, -1, -1, -1, 805,
- 806, -1, -1, -1, -1, 811, 812, -1, 72, 73,
- 74, 75, 76, 77, -1, -1, 80, 81, 989, 825,
- 991, -1, -1, 994, 88, 89, -1, -1, -1, -1,
- -1, 837, 838, -1, -1, -1, -1, 101, -1, 845,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 856, 857, -1, -1, -1, -1, -1, -1, -1, -1,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 784,
- -1, -1, -1, -1, -1, -1, -1, 792, 793, -1,
- -1, -1, -1, -1, 799, -1, -1, -1, -1, -1,
- 805, 806, -1, -1, -1, 911, 811, 812, -1, -1,
- -1, -1, -1, -1, -1, 921, 922, -1, -1, 925,
- 825, -1, -1, 929, -1, -1, -1, -1, -1, -1,
- -1, -1, 837, 838, -1, -1, -1, -1, -1, -1,
- 845, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 856, 857, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 989, -1, 991, -1, -1, 994, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 911, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 921, 922, -1, -1,
- -1, -1, -1, -1, 929, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 0, 1, -1, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, -1,
- -1, -1, -1, -1, -1, 19, -1, 21, 22, 23,
- 24, -1, -1, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, -1, 989, 39, 991, -1, -1, 994,
- -1, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, 70, 71, -1, -1,
+ -1, -1, -1, -1, -1, 0, 1, -1, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, -1, -1,
+ -1, -1, -1, -1, 19, -1, 21, 22, 23, 24,
+ -1, -1, -1, -1, -1, 30, 31, 32, 33, 34,
+ 35, 36, -1, 995, 39, 997, -1, -1, 1000, -1,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, -1, 58, 59, 60, -1, -1, 63, -1,
+ -1, 66, 67, -1, 69, 70, 71, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 84,
+ 85, -1, -1, -1, -1, -1, 91, -1, -1, 94,
+ 95, -1, 97, 98, -1, 100, -1, -1, -1, 104,
+ -1, 106, 107, 108, -1, 110, 111, 112, 0, 114,
+ 115, -1, -1, 118, 119, -1, -1, -1, -1, -1,
+ -1, 13, 14, 15, 16, 17, 18, -1, 20, 134,
+ 135, 136, -1, -1, -1, 27, 28, 29, -1, -1,
+ -1, 146, -1, 148, -1, 37, 38, -1, 40, 41,
+ 42, 43, 44, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 57, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, 100, -1, -1, -1,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, 0,
- 114, 115, -1, -1, 118, 119, -1, -1, -1, -1,
- -1, -1, 13, 14, 15, 16, 17, 18, -1, 20,
- 134, 135, 136, -1, -1, -1, 27, 28, 29, -1,
- -1, -1, 146, -1, 148, -1, 37, 38, -1, 40,
- 41, 42, 43, 44, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 57, -1, -1, -1,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, -1, -1, -1, -1, 88, 89, 90, -1,
+ -1, 93, -1, -1, -1, -1, -1, 99, -1, 101,
+ -1, -1, -1, 105, -1, -1, -1, -1, -1, -1,
+ -1, 113, -1, 115, -1, -1, 118, 119, -1, -1,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, -1, -1, 0, -1, -1, 139, 140, 141,
+ 142, -1, -1, 145, 146, 147, 148, 13, 14, 15,
+ 16, 17, 18, -1, 20, -1, -1, -1, -1, -1,
+ 26, 27, 28, -1, -1, -1, -1, -1, -1, -1,
+ -1, 37, 38, -1, 40, 41, 42, 43, 44, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, -1, -1, -1, -1, 88, 89, 90,
- -1, -1, 93, -1, -1, -1, -1, -1, 99, -1,
- 101, -1, -1, -1, 105, -1, -1, -1, -1, -1,
- -1, -1, 113, -1, 115, -1, -1, 118, 119, -1,
- -1, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, -1, -1, 0, -1, -1, 139, 140,
- 141, 142, -1, -1, 145, 146, 147, 148, 13, 14,
- 15, 16, 17, 18, -1, 20, -1, -1, -1, -1,
- -1, 26, 27, 28, -1, -1, -1, -1, -1, -1,
- -1, -1, 37, 38, -1, 40, 41, 42, 43, 44,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, -1, -1,
+ -1, -1, 88, 89, 90, -1, -1, 93, -1, -1,
+ -1, -1, -1, 99, -1, 101, -1, -1, -1, 105,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 115,
+ -1, -1, 118, 119, -1, -1, 122, -1, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, -1, -1,
+ 0, -1, 138, 139, 140, 141, 142, -1, 144, 145,
+ 146, 147, 148, 13, 14, 15, 16, 17, 18, -1,
+ 20, -1, -1, -1, -1, -1, -1, 27, 28, -1,
+ -1, -1, -1, -1, -1, -1, -1, 37, 38, -1,
+ 40, 41, 42, 43, 44, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 57, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, -1,
- -1, -1, -1, 88, 89, 90, -1, -1, 93, -1,
- -1, -1, -1, -1, 99, -1, 101, -1, -1, -1,
- 105, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 115, -1, -1, 118, 119, -1, -1, 122, -1, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
- -1, 0, -1, 138, 139, 140, 141, 142, -1, 144,
- 145, 146, 147, 148, 13, 14, 15, 16, 17, 18,
- -1, 20, -1, -1, -1, -1, -1, -1, 27, 28,
- -1, -1, -1, -1, -1, -1, -1, -1, 37, 38,
- -1, 40, 41, 42, 43, 44, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 57, -1,
+ -1, -1, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, -1, -1, -1, -1, 88, 89,
+ 90, -1, 92, 93, -1, -1, -1, -1, -1, 99,
+ -1, 101, -1, -1, -1, 105, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 115, -1, -1, 118, 119,
+ -1, 121, 122, -1, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, -1, -1, 0, -1, -1, 139,
+ 140, 141, 142, -1, -1, 145, 146, 147, 148, 13,
+ 14, 15, 16, 17, 18, -1, 20, -1, -1, -1,
+ -1, -1, 26, 27, 28, -1, -1, -1, -1, -1,
+ -1, -1, -1, 37, 38, -1, 40, 41, 42, 43,
+ 44, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, -1, -1, -1, -1, 88,
- 89, 90, -1, 92, 93, -1, -1, -1, -1, -1,
- 99, -1, 101, -1, -1, -1, 105, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 115, -1, -1, 118,
- 119, -1, 121, 122, -1, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, -1, -1, 0, -1, -1,
- 139, 140, 141, 142, -1, -1, 145, 146, 147, 148,
- 13, 14, 15, 16, 17, 18, -1, 20, -1, -1,
- -1, -1, -1, 26, 27, 28, -1, -1, -1, -1,
- -1, -1, -1, -1, 37, 38, -1, 40, 41, 42,
- 43, 44, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ -1, -1, -1, -1, 88, 89, 90, -1, -1, 93,
+ -1, -1, -1, -1, -1, 99, -1, 101, -1, -1,
+ -1, 105, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 115, -1, -1, 118, 119, -1, -1, 122, -1,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ -1, -1, 0, -1, 138, 139, 140, 141, 142, -1,
+ 144, 145, 146, 147, 148, 13, 14, 15, 16, 17,
+ 18, -1, 20, -1, -1, -1, -1, -1, -1, 27,
+ 28, -1, -1, -1, -1, -1, -1, -1, -1, 37,
+ 38, -1, 40, 41, 42, 43, 44, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, -1, -1, -1, -1, 88, 89, 90, -1, -1,
- 93, -1, -1, -1, -1, -1, 99, -1, 101, -1,
- -1, -1, 105, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 115, -1, -1, 118, 119, -1, -1, 122,
- -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, -1, -1, 0, -1, 138, 139, 140, 141, 142,
- -1, 144, 145, 146, 147, 148, 13, 14, 15, 16,
- 17, 18, -1, 20, -1, -1, -1, -1, -1, -1,
- 27, 28, -1, -1, -1, -1, -1, -1, -1, -1,
- 37, 38, -1, 40, 41, 42, 43, 44, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, -1, -1, -1, -1,
+ 88, 89, 90, -1, -1, 93, -1, -1, -1, -1,
+ -1, 99, -1, 101, -1, -1, -1, 105, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 115, -1, -1,
+ 118, 119, -1, -1, 122, -1, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, -1, -1, 0, -1,
+ -1, 139, 140, 141, 142, -1, 144, 145, 146, 147,
+ 148, 13, 14, 15, -1, 17, 18, -1, 20, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, -1, -1, -1,
- -1, 88, 89, 90, -1, -1, 93, -1, -1, -1,
- -1, -1, 99, -1, 101, -1, -1, -1, 105, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 115, -1,
- -1, 118, 119, -1, -1, 122, -1, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, -1, -1, 0,
- -1, -1, 139, 140, 141, 142, -1, 144, 145, 146,
- 147, 148, 13, 14, 15, -1, 17, 18, -1, 20,
- -1, -1, -1, -1, -1, 26, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 37, 38, -1, 40,
- 41, 42, 43, 44, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 37, 38, -1, 40, 41,
+ 42, 43, 44, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, -1, -1, -1, -1, 88, 89, 90,
- -1, 92, 93, -1, -1, -1, -1, -1, -1, -1,
- 101, -1, -1, -1, 105, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 115, -1, -1, 118, 119, -1,
- 121, 122, -1, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, -1, -1, 0, -1, 138, 139, 140,
- -1, 142, -1, -1, 145, 146, 147, 148, 13, 14,
- 15, -1, 17, 18, -1, 20, -1, -1, -1, -1,
- -1, 26, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 37, 38, -1, 40, 41, 42, 43, 44,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, -1, -1, -1, -1, 88, 89, 90, -1,
+ 92, 93, -1, -1, -1, -1, -1, -1, -1, 101,
+ -1, -1, -1, 105, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 115, -1, -1, 118, 119, -1, 121,
+ 122, -1, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, -1, -1, 0, -1, -1, 139, 140, -1,
+ 142, -1, -1, 145, 146, 147, 148, 13, 14, 15,
+ -1, 17, 18, -1, 20, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 37, 38, -1, 40, 41, 42, 43, 44, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, -1,
- -1, -1, -1, 88, 89, 90, -1, 92, 93, -1,
- -1, -1, -1, -1, -1, -1, 101, -1, -1, -1,
- 105, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 115, -1, -1, 118, 119, -1, 121, 122, -1, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
- -1, 0, -1, 138, 139, 140, -1, 142, -1, -1,
- 145, 146, 147, 148, 13, 14, 15, -1, 17, 18,
- -1, 20, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 37, 38,
- -1, 40, 41, 42, 43, 44, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, -1, -1,
+ -1, -1, 88, 89, 90, -1, 92, 93, -1, -1,
+ -1, -1, -1, -1, -1, 101, -1, -1, -1, 105,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 115,
+ -1, -1, 118, 119, -1, 121, 122, -1, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, -1, -1,
+ -1, -1, -1, 139, 140, -1, 142, -1, -1, 145,
+ 146, 147, 148, 1, -1, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, -1, -1,
+ 18, 19, -1, 21, 22, 23, 24, -1, -1, -1,
+ -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
+ -1, 39, -1, -1, -1, -1, -1, 45, -1, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
+ 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
+ -1, 69, 70, 71, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 84, 85, -1, -1,
+ -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
+ 98, -1, 100, -1, -1, -1, 104, -1, 106, 107,
+ 108, -1, 110, 111, 112, -1, 114, 115, -1, -1,
+ 118, 119, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 134, 135, 136, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 146, 1,
+ 148, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, -1, -1, 15, -1, 17, 18, 19, -1, 21,
+ 22, 23, 24, -1, -1, -1, -1, -1, 30, 31,
+ 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
+ -1, -1, -1, 45, -1, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, -1, 58, 59, 60, -1,
+ -1, 63, -1, -1, 66, 67, -1, 69, 70, 71,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, -1, -1, -1, -1, 88,
- 89, 90, -1, 92, 93, -1, -1, -1, -1, -1,
- -1, -1, 101, -1, -1, -1, 105, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 115, -1, -1, 118,
- 119, -1, 121, 122, -1, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, -1, -1, 0, -1, -1,
- 139, 140, -1, 142, -1, -1, 145, 146, 147, 148,
- 13, 14, 15, -1, 17, 18, -1, 20, -1, -1,
+ -1, -1, 84, 85, -1, -1, -1, -1, -1, 91,
+ -1, -1, 94, 95, -1, 97, 98, -1, 100, -1,
+ -1, -1, 104, -1, 106, 107, 108, -1, 110, 111,
+ 112, -1, 114, 115, -1, -1, 118, 119, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 37, 38, -1, 40, 41, 42,
- 43, 44, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 134, 135, 136, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 146, 1, 148, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, -1, -1, 15,
+ -1, -1, 18, 19, 20, 21, 22, 23, 24, -1,
+ -1, -1, -1, -1, 30, 31, 32, 33, 34, 35,
+ 36, -1, -1, 39, -1, -1, -1, -1, -1, 45,
+ -1, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
+ 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
+ -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
+ -1, 97, 98, -1, 100, -1, -1, -1, 104, -1,
+ 106, 107, 108, -1, 110, 111, 112, -1, 114, 115,
+ -1, -1, 118, 119, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 134, 135,
+ 136, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 146, 1, 148, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, -1, -1, 15, -1, -1, 18, 19,
+ -1, 21, 22, 23, 24, -1, -1, -1, -1, -1,
+ 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
+ -1, -1, -1, -1, -1, 45, -1, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
+ 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
+ 70, 71, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 84, 85, -1, -1, -1, -1,
+ -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
+ 100, -1, -1, -1, 104, -1, 106, 107, 108, -1,
+ 110, 111, 112, -1, 114, 115, -1, -1, 118, 119,
+ 1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, -1, -1, 134, 135, 136, -1, 19, -1,
+ 21, 22, 23, 24, -1, -1, 146, -1, 148, 30,
+ 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
+ -1, -1, -1, -1, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
+ -1, -1, 63, -1, -1, 66, 67, -1, 69, 70,
+ 71, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 84, 85, -1, -1, -1, -1, -1,
+ 91, -1, -1, 94, 95, -1, 97, 98, -1, 100,
+ -1, -1, -1, 104, -1, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, 115, -1, -1, 118, 119, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, -1, -1, -1, -1, 88, 89, 90, -1, 92,
- 93, -1, -1, -1, -1, -1, -1, -1, 101, -1,
- -1, -1, 105, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 115, -1, -1, 118, 119, -1, 121, 122,
- -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, -1, -1, -1, -1, -1, 139, 140, -1, 142,
- -1, -1, 145, 146, 147, 148, 1, -1, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, -1, -1, 18, 19, -1, 21, 22, 23, 24,
+ -1, -1, -1, 134, 135, 136, -1, -1, 139, -1,
+ -1, -1, -1, -1, -1, 146, 1, 148, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, -1, 14,
+ 15, -1, -1, -1, 19, -1, 21, 22, 23, 24,
 -1, -1, -1, -1, -1, 30, 31, 32, 33, 34,
 35, 36, -1, -1, 39, -1, -1, -1, -1, -1,
 45, -1, 47, 48, 49, 50, 51, 52, 53, 54,
@@ -4368,42 +4722,22 @@
 85, -1, -1, -1, -1, -1, 91, -1, -1, 94,
 95, -1, 97, 98, -1, 100, -1, -1, -1, 104,
 -1, 106, 107, 108, -1, 110, 111, 112, -1, 114,
- 115, -1, -1, 118, 119, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 134,
- 135, 136, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 146, 1, 148, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, -1, -1, 15, -1, 17, 18,
- 19, -1, 21, 22, 23, 24, -1, -1, -1, -1,
- -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
- 39, -1, -1, -1, -1, -1, 45, -1, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
- 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
- 69, 70, 71, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 84, 85, -1, -1, -1,
- -1, -1, 91, -1, -1, 94, 95, -1, 97, 98,
- -1, 100, -1, -1, -1, 104, -1, 106, 107, 108,
- -1, 110, 111, 112, -1, 114, 115, -1, -1, 118,
- 119, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 134, 135, 136, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 146, 1, 148,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- -1, -1, 15, -1, -1, 18, 19, 20, 21, 22,
- 23, 24, -1, -1, -1, -1, -1, 30, 31, 32,
- 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
- -1, -1, 45, -1, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
- 63, -1, -1, 66, 67, -1, 69, 70, 71, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 84, 85, -1, -1, -1, -1, -1, 91, -1,
- -1, 94, 95, -1, 97, 98, -1, 100, -1, -1,
- -1, 104, -1, 106, 107, 108, -1, 110, 111, 112,
- -1, 114, 115, -1, -1, 118, 119, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 134, 135, 136, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 146, 1, 148, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, -1, -1, 15, -1,
- -1, 18, 19, -1, 21, 22, 23, 24, -1, -1,
- -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
+ 115, -1, -1, 118, 119, 1, -1, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, -1, -1, 134,
+ 135, 136, -1, 19, -1, 21, 22, 23, 24, -1,
+ -1, 146, -1, 148, 30, 31, 32, 33, 34, 35,
+ 36, -1, -1, 39, -1, -1, -1, -1, -1, 45,
+ -1, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
+ 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
+ -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
+ -1, 97, 98, -1, 100, -1, -1, -1, 104, -1,
+ 106, 107, 108, -1, 110, 111, 112, -1, 114, 115,
+ -1, -1, 118, 119, 1, -1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, -1, -1, 134, 135,
+ 136, -1, 19, -1, 21, 22, 23, 24, -1, 145,
+ 146, -1, 148, 30, 31, 32, 33, 34, 35, 36,
 -1, -1, 39, -1, -1, -1, -1, -1, 45, -1,
 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
 -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
@@ -4414,9 +4748,9 @@
 107, 108, -1, 110, 111, 112, -1, 114, 115, -1,
 -1, 118, 119, 1, -1, 3, 4, 5, 6, 7,
 8, 9, 10, 11, 12, -1, -1, 134, 135, 136,
- -1, 19, -1, 21, 22, 23, 24, -1, -1, 146,
+ -1, 19, -1, 21, 22, 23, 24, -1, 145, 146,
 -1, 148, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, 45, 46, 47,
+ -1, 39, -1, -1, -1, -1, -1, 45, -1, 47,
 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
 -1, 69, 70, 71, -1, -1, -1, -1, -1, -1,
@@ -4428,7 +4762,7 @@
 -1, -1, -1, -1, -1, -1, 134, 135, 136, -1,
 -1, 139, -1, -1, -1, -1, -1, -1, 146, 1,
 148, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- 12, -1, 14, 15, -1, -1, -1, 19, -1, 21,
+ 12, -1, -1, 15, -1, -1, -1, 19, -1, 21,
 22, 23, 24, -1, -1, -1, -1, -1, 30, 31,
 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
 -1, -1, -1, 45, -1, 47, 48, 49, 50, 51,
@@ -4438,22 +4772,22 @@
 -1, -1, 84, 85, -1, -1, -1, -1, -1, 91,
 -1, -1, 94, 95, -1, 97, 98, -1, 100, -1,
 -1, -1, 104, -1, 106, 107, 108, -1, 110, 111,
- 112, -1, 114, 115, -1, -1, 118, 119, 1, -1,
+ 112, -1, 114, 115, -1, -1, 118, 119, -1, -1,
 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
 -1, -1, 134, 135, 136, -1, 19, -1, 21, 22,
 23, 24, -1, -1, 146, -1, 148, 30, 31, 32,
 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
- -1, -1, 45, -1, 47, 48, 49, 50, 51, 52,
+ -1, -1, 45, 46, 47, 48, 49, 50, 51, 52,
 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
 63, -1, -1, 66, 67, -1, 69, 70, 71, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, 84, 85, -1, -1, -1, -1, -1, 91, -1,
 -1, 94, 95, -1, 97, 98, -1, 100, -1, -1,
 -1, 104, -1, 106, 107, 108, -1, 110, 111, 112,
- -1, 114, 115, -1, -1, 118, 119, 1, -1, 3,
+ -1, 114, 115, -1, -1, 118, 119, -1, -1, 3,
 4, 5, 6, 7, 8, 9, 10, 11, 12, -1,
 -1, 134, 135, 136, -1, 19, -1, 21, 22, 23,
- 24, -1, 145, 146, -1, 148, 30, 31, 32, 33,
+ 24, -1, -1, 146, -1, 148, 30, 31, 32, 33,
 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
 -1, 45, -1, 47, 48, 49, 50, 51, 52, 53,
 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
@@ -4462,101 +4796,183 @@
 84, 85, -1, -1, -1, -1, -1, 91, -1, -1,
 94, 95, -1, 97, 98, -1, 100, -1, -1, -1,
 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, 115, -1, -1, 118, 119, 1, -1, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, -1, -1,
+ 114, 115, -1, -1, 118, 119, -1, -1, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, -1, -1, -1,
 134, 135, 136, -1, 19, -1, 21, 22, 23, 24,
- -1, 145, 146, -1, 148, 30, 31, 32, 33, 34,
+ -1, -1, 146, -1, 148, 30, 31, 32, 33, 34,
 35, 36, -1, -1, 39, -1, -1, -1, -1, -1,
- 45, -1, 47, 48, 49, 50, 51, 52, 53, 54,
+ -1, -1, -1, 48, 49, 50, 51, 52, 53, 54,
 55, 56, -1, 58, 59, 60, -1, -1, 63, -1,
 -1, 66, 67, -1, 69, 70, 71, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, 84,
 85, -1, -1, -1, -1, -1, 91, -1, -1, 94,
- 95, -1, 97, 98, -1, 100, -1, -1, -1, 104,
+ 95, -1, 97, 98, -1, -1, -1, -1, -1, 104,
 -1, 106, 107, 108, -1, 110, 111, 112, -1, 114,
- 115, -1, -1, 118, 119, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 134,
- 135, 136, -1, -1, 139, -1, -1, -1, -1, -1,
- -1, 146, 1, 148, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, -1, -1, 15, -1, -1, -1,
- 19, -1, 21, 22, 23, 24, -1, -1, -1, -1,
+ 115, -1, -1, 118, 119, -1, -1, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, -1, -1, -1, 134,
+ 135, 136, -1, 19, -1, 21, 22, 23, 24, -1,
+ -1, 146, -1, 148, 30, 31, 32, 33, 34, 35,
+ 36, -1, -1, 39, -1, -1, -1, -1, -1, -1,
+ -1, -1, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
+ 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
+ -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
+ -1, 97, 98, -1, -1, -1, -1, -1, 104, -1,
+ 106, 107, 108, -1, 110, 111, 112, -1, 114, 115,
+ -1, -1, 118, 119, -1, -1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, -1, -1, -1, 134, 135,
+ 136, -1, 19, -1, 21, 22, 23, 24, -1, -1,
+ 146, -1, 148, 30, 31, 32, 33, 34, 35, 36,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
+ 67, -1, 69, 70, 71, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 84, 85, -1,
+ -1, -1, -1, -1, 91, -1, -1, 94, 95, -1,
+ 97, 98, -1, -1, -1, -1, -1, 104, -1, 106,
+ 107, 108, -1, 110, 111, 112, -1, 114, 115, -1,
+ -1, 118, 119, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 134, 135, 136,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 148, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, -1,
+ -1, -1, -1, -1, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, -1, -1, 80,
+ 81, -1, -1, -1, -1, 86, 87, 88, 89, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 100,
+ 101, 102, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, -1, 135, 136, -1, -1, -1, -1,
+ -1, -1, 143, 144, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, -1, -1, -1, -1, -1, -1, -1,
+ 19, -1, 21, 22, 23, 24, -1, 26, -1, -1,
 -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
- 39, -1, -1, -1, -1, -1, 45, -1, 47, 48,
+ 39, -1, -1, -1, -1, -1, -1, -1, -1, 48,
 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
 69, 70, 71, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, 84, 85, -1, -1, -1,
 -1, -1, 91, -1, -1, 94, 95, -1, 97, 98,
- -1, 100, -1, -1, -1, 104, -1, 106, 107, 108,
- -1, 110, 111, 112, -1, 114, 115, -1, -1, 118,
- 119, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, 12, -1, -1, 134, 135, 136, -1, 19,
- -1, 21, 22, 23, 24, -1, -1, 146, -1, 148,
+ -1, 100, -1, 102, 103, 104, -1, 106, 107, 108,
+ -1, 110, 111, 112, -1, 114, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 134, 135, 136, -1, 138,
+ -1, -1, -1, -1, -1, 144, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, -1, -1, -1, -1, -1,
+ -1, -1, 19, -1, 21, 22, 23, 24, -1, 26,
+ -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
+ 67, -1, 69, 70, 71, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 84, 85, -1,
+ -1, -1, -1, -1, 91, -1, -1, 94, 95, -1,
+ 97, 98, -1, 100, -1, 102, 103, 104, -1, 106,
+ 107, 108, -1, 110, 111, 112, -1, 114, -1, -1,
+ -1, -1, -1, -1, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, -1, -1, -1, -1, 134, 135, 136,
+ 19, 138, 21, 22, 23, 24, -1, 144, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
+ 39, -1, -1, -1, -1, -1, -1, -1, -1, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
+ 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
+ 69, 70, 71, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 84, 85, -1, -1, -1,
+ -1, -1, 91, 92, -1, 94, 95, -1, 97, 98,
+ -1, 100, -1, 102, 103, 104, -1, 106, 107, 108,
+ -1, 110, 111, 112, -1, 114, -1, -1, -1, -1,
+ -1, -1, 121, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, -1, -1, -1, 134, 135, 136, -1, 19,
+ -1, 21, 22, 23, 24, 144, -1, -1, -1, -1,
 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, 45, 46, 47, 48, 49,
+ -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
 70, 71, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, 84, 85, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- 100, -1, -1, -1, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, 115, -1, -1, 118, 119,
- -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, -1, -1, 134, 135, 136, -1, 19, -1,
- 21, 22, 23, 24, -1, -1, 146, -1, 148, 30,
+ -1, 91, 92, -1, 94, 95, -1, 97, 98, -1,
+ 100, -1, 102, 103, 104, -1, 106, 107, 108, -1,
+ 110, 111, 112, -1, 114, -1, -1, -1, -1, -1,
+ -1, 121, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, -1, -1, 134, 135, 136, -1, 19, -1,
+ 21, 22, 23, 24, 144, -1, -1, -1, -1, 30,
 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
- -1, -1, -1, -1, 45, -1, 47, 48, 49, 50,
+ -1, -1, -1, -1, -1, -1, -1, 48, 49, 50,
 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
 -1, -1, 63, -1, -1, 66, 67, -1, 69, 70,
 71, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, 84, 85, -1, -1, -1, -1, -1,
 91, -1, -1, 94, 95, -1, 97, 98, -1, 100,
- -1, -1, -1, 104, -1, 106, 107, 108, -1, 110,
- 111, 112, -1, 114, 115, -1, -1, 118, 119, -1,
- -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- -1, -1, -1, 134, 135, 136, -1, 19, -1, 21,
- 22, 23, 24, -1, -1, 146, -1, 148, 30, 31,
- 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
- -1, -1, -1, -1, -1, -1, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, -1, 58, 59, 60, -1,
- -1, 63, -1, -1, 66, 67, -1, 69, 70, 71,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 84, 85, -1, -1, -1, -1, -1, 91,
- -1, -1, 94, 95, -1, 97, 98, -1, -1, -1,
- -1, -1, 104, -1, 106, 107, 108, -1, 110, 111,
- 112, -1, 114, 115, -1, -1, 118, 119, -1, -1,
+ -1, 102, 103, 104, -1, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, -1, -1, -1, -1, -1, -1,
 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
- -1, -1, 134, 135, 136, -1, 19, -1, 21, 22,
- 23, 24, -1, -1, 146, -1, 148, 30, 31, 32,
+ -1, -1, -1, 134, 135, 136, 19, -1, 21, 22,
+ 23, 24, -1, 144, -1, -1, -1, 30, 31, 32,
 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
 -1, -1, -1, -1, -1, 48, 49, 50, 51, 52,
 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
 63, -1, -1, 66, 67, -1, 69, 70, 71, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, 84, 85, -1, -1, -1, -1, -1, 91, -1,
- -1, 94, 95, -1, 97, 98, -1, -1, -1, -1,
- -1, 104, -1, 106, 107, 108, -1, 110, 111, 112,
- -1, 114, 115, -1, -1, 118, 119, -1, -1, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, -1,
- -1, 134, 135, 136, -1, 19, -1, 21, 22, 23,
- 24, -1, -1, 146, -1, 148, 30, 31, 32, 33,
- 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, 70, 71, -1, -1,
+ -1, 94, 95, -1, 97, 98, -1, 100, -1, 102,
+ 103, 104, -1, 106, 107, 108, -1, 110, 111, 112,
+ -1, 114, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, -1, -1, -1, -1,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, 115, -1, -1, 118, 119, -1, -1, -1, -1,
+ -1, 134, 135, 136, -1, -1, -1, -1, -1, -1,
+ -1, 144, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, -1,
+ -1, -1, -1, -1, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, -1, -1, -1,
+ -1, -1, 63, -1, -1, -1, -1, -1, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, -1, -1, 80,
+ 81, -1, -1, -1, -1, 86, 87, 88, 89, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 100,
+ 101, 102, -1, -1, -1, -1, 107, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, -1, 135, 136, -1, -1, -1, -1,
+ -1, -1, 143, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, -1, -1, -1,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ -1, -1, -1, -1, -1, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, -1, -1, -1,
+ -1, -1, -1, 63, -1, -1, -1, -1, -1, -1,
+ 70, 71, 72, 73, 74, 75, 76, 77, -1, -1,
+ 80, 81, -1, -1, -1, -1, 86, 87, 88, 89,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 100, 101, 102, -1, -1, -1, -1, 107, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 134, 135, 136, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 148, 3, 4, 5, 6, 7,
+ -1, -1, -1, -1, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, -1, 135, 136, -1, -1, -1,
+ -1, -1, -1, 143, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, -1, -1, -1, -1, -1, 45, 46, 47, 48,
+ 49, 50, 51, 52, -1, -1, 55, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 70, 71, 72, 73, 74, 75, 76, 77, -1,
+ -1, 80, 81, -1, -1, -1, -1, 86, 87, 88,
+ 89, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 100, 101, 102, -1, -1, -1, 106, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, -1, 135, 136, -1, -1,
+ -1, -1, -1, -1, 143, 3, 4, 5, 6, 7,
 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
 18, 19, 20, 21, 22, 23, 24, 25, 26, -1,
 -1, -1, 30, 31, 32, 33, 34, 35, 36, 37,
 38, 39, -1, -1, -1, -1, -1, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
+ 48, 49, 50, 51, 52, -1, -1, 55, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, 70, 71, 72, 73, 74, 75, 76, 77,
 -1, -1, 80, 81, -1, -1, -1, -1, 86, 87,
@@ -4565,637 +4981,520 @@
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, 124, 125, 126, 127,
 128, 129, 130, 131, 132, 133, -1, 135, 136, -1,
- -1, -1, -1, -1, -1, 143, 144, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, -1, -1, -1, -1,
- -1, -1, -1, 19, -1, 21, 22, 23, 24, -1,
- 26, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
- 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
- -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
- -1, 97, 98, -1, 100, -1, 102, 103, 104, -1,
- 106, 107, 108, -1, 110, 111, 112, -1, 114, -1,
+ -1, -1, -1, -1, -1, 143, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, -1, -1, -1, -1, -1,
+ -1, -1, 19, -1, 21, 22, 23, 24, -1, -1,
+ -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
+ 67, -1, 69, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 134, 135,
- 136, -1, 138, -1, -1, -1, -1, -1, 144, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, -1,
- -1, -1, -1, -1, -1, 19, -1, 21, 22, 23,
- 24, -1, 26, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, 70, 71, -1, -1,
+ -1, -1, -1, -1, 91, -1, -1, 94, 95, -1,
+ 97, 98, -1, -1, -1, -1, -1, 104, -1, 106,
+ 107, 108, -1, 110, 111, 112, -1, 114, -1, -1,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
+ -1, -1, -1, -1, -1, -1, 19, 134, 21, 22,
+ 23, 24, -1, -1, -1, 142, -1, 30, 31, 32,
+ 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
+ 63, -1, -1, 66, 67, -1, 69, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, 100, -1, 102, 103,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, -1, -1, -1, -1, -1, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, -1, -1, -1, -1,
- 134, 135, 136, 19, 138, 21, 22, 23, 24, -1,
- 144, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
- 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
- -1, -1, -1, -1, -1, 91, 92, -1, 94, 95,
- -1, 97, 98, -1, 100, -1, 102, 103, 104, -1,
- 106, 107, 108, -1, 110, 111, 112, -1, 114, -1,
- -1, -1, -1, -1, -1, 121, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, -1, -1, -1, 134, 135,
- 136, -1, 19, -1, 21, 22, 23, 24, 144, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 91, -1,
+ -1, 94, 95, -1, 97, 98, -1, -1, -1, -1,
+ -1, 104, -1, 106, 107, 108, -1, 110, 111, 112,
+ -1, 114, -1, -1, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, 12, -1, -1, -1, -1, -1, -1,
+ 19, 134, 21, 22, 23, 24, -1, -1, -1, 142,
+ -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
+ 39, -1, -1, -1, -1, -1, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
+ 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
+ 69, 70, 71, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 84, 85, -1, -1, -1,
+ -1, -1, 91, -1, -1, 94, 95, -1, 97, 98,
+ -1, 100, -1, -1, -1, 104, -1, 106, 107, 108,
+ -1, 110, 111, 112, -1, 114, -1, -1, -1, -1,
+ -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, -1, -1, -1, 134, 135, 136, 19, -1,
+ 21, 22, 23, 24, -1, -1, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
+ -1, -1, -1, -1, 45, -1, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
+ -1, -1, 63, -1, -1, 66, 67, -1, 69, 70,
+ 71, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 84, 85, -1, -1, -1, -1, -1,
+ 91, -1, -1, 94, 95, -1, 97, 98, -1, 100,
+ -1, -1, -1, 104, -1, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, -1, -1, -1, -1, -1, -1,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
+ -1, -1, -1, 134, 135, 136, 19, -1, 21, 22,
+ 23, 24, -1, -1, -1, -1, -1, 30, 31, 32,
+ 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
+ 63, -1, -1, 66, 67, -1, 69, 70, 71, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 84, 85, -1, -1, -1, -1, -1, 91, -1,
+ -1, 94, 95, -1, 97, 98, -1, 100, -1, 102,
+ 103, 104, -1, 106, 107, 108, -1, 110, 111, 112,
+ -1, 114, -1, -1, -1, -1, -1, -1, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, -1, -1, -1,
+ -1, 134, 135, 136, 19, -1, 21, 22, 23, 24,
+ -1, -1, -1, -1, -1, 30, 31, 32, 33, 34,
+ 35, 36, -1, -1, 39, -1, -1, -1, -1, -1,
+ -1, -1, -1, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, -1, 58, 59, 60, -1, -1, 63, -1,
+ -1, 66, 67, -1, 69, 70, 71, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 84,
+ 85, -1, -1, -1, -1, -1, 91, -1, -1, 94,
+ 95, -1, 97, 98, -1, 100, -1, 102, 103, 104,
+ -1, 106, 107, 108, -1, 110, 111, 112, -1, 114,
+ -1, -1, -1, -1, -1, -1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, -1, -1, -1, -1, 134,
+ 135, 136, 19, -1, 21, 22, 23, 24, -1, -1,
 -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
 -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
 -1, 48, 49, 50, 51, 52, 53, 54, 55, 56,
 -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
 67, -1, 69, 70, 71, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, 84, 85, -1,
- -1, -1, -1, -1, 91, 92, -1, 94, 95, -1,
+ -1, -1, -1, -1, 91, -1, -1, 94, 95, -1,
 97, 98, -1, 100, -1, 102, 103, 104, -1, 106,
 107, 108, -1, 110, 111, 112, -1, 114, -1, -1,
- -1, -1, -1, -1, 121, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, -1, -1, -1, 134, 135, 136,
- -1, 19, -1, 21, 22, 23, 24, 144, -1, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
- -1, 69, 70, 71, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 84, 85, -1, -1,
- -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
- 98, -1, 100, -1, 102, 103, 104, -1, 106, 107,
- 108, -1, 110, 111, 112, -1, 114, -1, -1, -1,
- -1, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, -1, -1, -1, 134, 135, 136, 19,
- -1, 21, 22, 23, 24, -1, 144, -1, -1, -1,
- 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
- 70, 71, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 84, 85, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- 100, -1, 102, 103, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 134, 135, 136, -1, -1, -1,
- -1, -1, -1, -1, 144, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, -1, -1, -1, -1, -1, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- -1, -1, -1, -1, -1, 63, -1, -1, -1, -1,
- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77,
- -1, -1, 80, 81, -1, -1, -1, -1, 86, 87,
- 88, 89, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 100, 101, 102, -1, -1, -1, -1, 107,
+ -1, -1, -1, -1, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, -1, -1, -1, -1, 134, 135, 136,
+ 19, -1, 21, 22, 23, 24, -1, -1, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
+ 39, -1, -1, -1, -1, -1, -1, -1, -1, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
+ 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
+ 69, 70, 71, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 84, 85, -1, -1, -1,
+ -1, -1, 91, -1, -1, 94, 95, -1, 97, 98,
+ -1, 100, -1, 102, 103, 104, -1, 106, 107, 108,
+ -1, 110, 111, 112, -1, 114, -1, -1, -1, -1,
+ -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, -1, -1, -1, 134, 135, 136, 19, -1,
+ 21, 22, 23, 24, -1, -1, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
+ -1, -1, 63, -1, -1, 66, 67, -1, 69, 70,
+ 71, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 84, 85, -1, -1, -1, -1, -1,
+ 91, -1, -1, 94, 95, -1, 97, 98, -1, 100,
+ -1, 102, -1, 104, -1, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, -1, -1, -1, -1, -1, -1,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
+ -1, -1, -1, 134, 135, 136, 19, -1, 21, 22,
+ 23, 24, -1, -1, -1, -1, -1, 30, 31, 32,
+ 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
+ 63, -1, -1, 66, 67, -1, 69, 70, 71, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, -1, 135, 136, -1,
- -1, -1, -1, -1, -1, 143, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ -1, 84, 85, -1, -1, -1, -1, -1, 91, -1,
+ -1, 94, 95, -1, 97, 98, -1, -1, -1, 102,
+ 103, 104, -1, 106, 107, 108, -1, 110, 111, 112,
+ -1, 114, -1, -1, -1, -1, -1, -1, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, -1, -1, -1,
+ -1, 134, 135, 136, 19, -1, 21, 22, 23, 24,
+ -1, -1, -1, -1, -1, 30, 31, 32, 33, 34,
+ 35, 36, -1, -1, 39, -1, -1, -1, -1, -1,
+ -1, -1, -1, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, -1, 58, 59, 60, -1, -1, 63, -1,
+ -1, 66, 67, -1, 69, 70, 71, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 84,
+ 85, -1, -1, -1, -1, -1, 91, -1, -1, 94,
+ 95, -1, 97, 98, -1, 100, -1, 102, -1, 104,
+ -1, 106, 107, 108, -1, 110, 111, 112, -1, 114,
+ -1, -1, -1, -1, -1, -1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, -1, -1, -1, -1, 134,
+ 135, 136, 19, -1, 21, 22, 23, 24, -1, -1,
 -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, -1, -1, -1, -1, -1, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- -1, -1, -1, -1, -1, -1, 63, -1, -1, -1,
- -1, -1, -1, 70, 71, 72, 73, 74, 75, 76,
- 77, -1, -1, 80, 81, -1, -1, -1, -1, 86,
- 87, 88, 89, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 100, 101, 102, -1, -1, -1, -1,
- 107, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, -1, 135, 136,
- -1, -1, -1, -1, -1, -1, 143, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, -1, -1, -1, -1, -1, 45,
- 46, 47, 48, 49, 50, 51, 52, -1, -1, 55,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, -1, -1, 80, 81, -1, -1, -1, -1,
- 86, 87, 88, 89, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 100, 101, 102, -1, -1, -1,
- 106, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, -1, 135,
- 136, -1, -1, -1, -1, -1, -1, 143, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, -1, -1, -1, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, -1, -1, -1, -1, -1,
- 45, 46, 47, 48, 49, 50, 51, 52, -1, -1,
- 55, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 70, 71, 72, 73, 74,
- 75, 76, 77, -1, -1, 80, 81, -1, -1, -1,
- -1, 86, 87, 88, 89, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 100, 101, 102, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
- 135, 136, -1, -1, -1, -1, -1, -1, 143, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, -1,
- -1, -1, -1, -1, -1, 19, -1, 21, 22, 23,
- 24, -1, -1, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, -1, -1, -1, -1,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
+ 67, -1, 69, 70, 71, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 84, 85, -1,
+ -1, -1, -1, -1, 91, -1, -1, 94, 95, -1,
+ 97, 98, -1, -1, -1, 102, -1, 104, -1, 106,
+ 107, 108, -1, 110, 111, 112, -1, 114, -1, -1,
+ -1, -1, -1, -1, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, -1, -1, -1, -1, 134, 135, 136,
+ 19, -1, 21, 22, 23, 24, -1, -1, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
+ 39, -1, -1, -1, -1, -1, -1, -1, -1, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
+ 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
+ 69, 70, 71, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 84, 85, -1, -1, -1,
+ -1, -1, 91, -1, -1, 94, 95, -1, 97, 98,
+ -1, 100, -1, -1, -1, 104, -1, 106, 107, 108,
+ -1, 110, 111, 112, -1, 114, -1, -1, -1, -1,
+ -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, -1, -1, -1, 134, 135, 136, 19, -1,
+ 21, 22, 23, 24, -1, -1, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
+ -1, -1, 63, -1, -1, 66, 67, -1, 69, 70,
+ 71, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 84, 85, -1, -1, -1, -1, -1,
+ 91, -1, -1, 94, 95, -1, 97, 98, -1, 100,
+ -1, -1, -1, 104, -1, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, -1, -1, -1, -1, -1, -1,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
+ -1, -1, -1, 134, 135, 136, 19, -1, 21, 22,
+ 23, 24, -1, -1, -1, -1, -1, 30, 31, 32,
+ 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
+ 63, -1, -1, 66, 67, -1, 69, 70, 71, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, -1, -1, -1, -1,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, -1, -1, -1, -1, -1, -1, 19,
- 134, 21, 22, 23, 24, -1, -1, -1, 142, -1,
- 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
+ -1, 84, 85, -1, -1, -1, -1, -1, 91, -1,
+ -1, 94, 95, -1, 97, 98, -1, 100, -1, -1,
+ -1, 104, -1, 106, 107, 108, -1, 110, 111, 112,
+ -1, 114, -1, -1, -1, -1, -1, -1, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, -1, -1, -1,
+ -1, 134, 135, 136, 19, -1, 21, 22, 23, 24,
+ -1, -1, -1, -1, -1, 30, 31, 32, 33, 34,
+ 35, 36, -1, -1, 39, -1, -1, -1, -1, -1,
+ -1, -1, -1, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, -1, 58, 59, 60, -1, -1, 63, -1,
+ -1, 66, 67, -1, 69, 70, 71, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 84,
+ 85, -1, -1, -1, -1, -1, 91, -1, -1, 94,
+ 95, -1, 97, 98, -1, 100, -1, -1, -1, 104,
+ -1, 106, 107, 108, -1, 110, 111, 112, -1, 114,
+ -1, -1, -1, -1, -1, -1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, -1, -1, -1, -1, 134,
+ 135, 136, 19, -1, 21, 22, 23, 24, -1, -1,
+ -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
+ 67, -1, 69, 70, 71, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 84, 85, -1,
+ -1, -1, -1, -1, 91, -1, -1, 94, 95, -1,
+ 97, 98, -1, 100, -1, -1, -1, 104, -1, 106,
+ 107, 108, -1, 110, 111, 112, -1, 114, -1, -1,
+ -1, -1, -1, -1, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, -1, -1, -1, -1, 134, 135, 136,
+ 19, -1, 21, 22, 23, 24, -1, -1, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
+ 39, -1, -1, -1, -1, -1, -1, -1, -1, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
+ 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
+ 69, 70, 71, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 84, 85, -1, -1, -1,
+ -1, -1, 91, -1, -1, 94, 95, -1, 97, 98,
+ -1, -1, -1, -1, -1, 104, -1, 106, 107, 108,
+ -1, 110, 111, 112, -1, 114, -1, -1, -1, -1,
+ -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, -1, -1, -1, 134, 135, 136, 19, -1,
+ 21, 22, 23, 24, -1, -1, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
+ -1, -1, 63, -1, -1, 66, 67, -1, 69, 70,
+ 71, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 84, 85, -1, -1, -1, -1, -1,
+ 91, -1, -1, 94, 95, -1, 97, 98, -1, -1,
+ -1, -1, -1, 104, -1, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, -1, -1, -1, -1, -1, -1,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
+ -1, -1, -1, 134, 135, 136, 19, -1, 21, 22,
+ 23, 24, -1, -1, -1, -1, -1, 30, 31, 32,
+ 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
+ 63, -1, -1, 66, 67, -1, 69, 70, 71, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 84, 85, -1, -1, -1, -1, -1, 91, -1,
+ -1, 94, 95, -1, 97, 98, -1, -1, -1, -1,
+ -1, 104, -1, 106, 107, 108, -1, 110, 111, 112,
+ -1, 114, -1, -1, -1, -1, -1, -1, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, -1, -1, -1,
+ -1, 134, 135, 136, 19, -1, 21, 22, 23, 24,
+ -1, -1, -1, -1, -1, 30, 31, 32, 33, 34,
+ 35, 36, -1, -1, 39, -1, -1, -1, -1, -1,
+ -1, -1, -1, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, -1, 58, 59, 60, -1, -1, 63, -1,
+ -1, 66, 67, -1, 69, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- -1, -1, -1, -1, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, -1, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, -1, -1, -1,
- -1, -1, -1, 19, 134, 21, 22, 23, 24, -1,
- -1, -1, 142, -1, 30, 31, 32, 33, 34, 35,
- 36, -1, -1, 39, -1, -1, -1, -1, -1, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
- 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
- -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
- -1, 97, 98, -1, 100, -1, -1, -1, 104, -1,
- 106, 107, 108, -1, 110, 111, 112, -1, 114, -1,
- -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, -1, -1, -1, 134, 135,
- 136, 19, -1, 21, 22, 23, 24, -1, -1, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, 45, -1, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
- -1, 69, 70, 71, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 84, 85, -1, -1,
- -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
- 98, -1, 100, -1, -1, -1, 104, -1, 106, 107,
- 108, -1, 110, 111, 112, -1, 114, -1, -1, -1,
- -1, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, -1, -1, -1, 134, 135, 136, 19,
- -1, 21, 22, 23, 24, -1, -1, -1, -1, -1,
- 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
- 70, 71, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 84, 85, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- 100, -1, 102, 103, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, -1, -1, -1, -1, -1,
- -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- -1, -1, -1, -1, 134, 135, 136, 19, -1, 21,
- 22, 23, 24, -1, -1, -1, -1, -1, 30, 31,
- 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
- -1, -1, -1, -1, -1, -1, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, -1, 58, 59, 60, -1,
- -1, 63, -1, -1, 66, 67, -1, 69, 70, 71,
+ -1, -1, -1, 88, -1, -1, 91, -1, -1, 94,
+ 95, -1, 97, 98, -1, -1, -1, -1, -1, 104,
+ -1, 106, 107, 108, -1, 110, 111, 112, -1, 114,
+ -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, -1, -1, -1, -1, -1, -1, 19, 134,
+ 21, 22, 23, 24, -1, -1, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
+ -1, -1, 63, -1, -1, 66, 67, -1, 69, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 84, 85, -1, -1, -1, -1, -1, 91,
- -1, -1, 94, 95, -1, 97, 98, -1, 100, -1,
- 102, 103, 104, -1, 106, 107, 108, -1, 110, 111,
- 112, -1, 114, -1, -1, -1, -1, -1, -1, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, -1,
- -1, -1, 134, 135, 136, 19, -1, 21, 22, 23,
- 24, -1, -1, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, 70, 71, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, 100, -1, 102, 103,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, -1, -1, -1, -1, -1, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, -1, -1, -1, -1,
- 134, 135, 136, 19, -1, 21, 22, 23, 24, -1,
- -1, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
- 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
- -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
- -1, 97, 98, -1, 100, -1, 102, 103, 104, -1,
- 106, 107, 108, -1, 110, 111, 112, -1, 114, -1,
- -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, -1, -1, -1, -1, 134, 135,
- 136, 19, -1, 21, 22, 23, 24, -1, -1, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
- -1, 69, 70, 71, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 84, 85, -1, -1,
- -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
- 98, -1, 100, -1, 102, -1, 104, -1, 106, 107,
- 108, -1, 110, 111, 112, -1, 114, -1, -1, -1,
- -1, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, -1, -1, -1, 134, 135, 136, 19,
- -1, 21, 22, 23, 24, -1, -1, -1, -1, -1,
- 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
- 70, 71, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 84, 85, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- -1, -1, 102, 103, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, -1, -1, -1, -1, -1,
- -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- -1, -1, -1, -1, 134, 135, 136, 19, -1, 21,
- 22, 23, 24, -1, -1, -1, -1, -1, 30, 31,
- 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
- -1, -1, -1, -1, -1, -1, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, -1, 58, 59, 60, -1,
- -1, 63, -1, -1, 66, 67, -1, 69, 70, 71,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 84, 85, -1, -1, -1, -1, -1, 91,
- -1, -1, 94, 95, -1, 97, 98, -1, 100, -1,
- 102, -1, 104, -1, 106, 107, 108, -1, 110, 111,
- 112, -1, 114, -1, -1, -1, -1, -1, -1, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, -1,
- -1, -1, 134, 135, 136, 19, -1, 21, 22, 23,
- 24, -1, -1, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, 70, 71, -1, -1,
+ 91, -1, -1, 94, 95, -1, 97, 98, -1, 100,
+ -1, -1, -1, 104, -1, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, -1, -1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, -1, -1, -1, -1, -1,
+ -1, -1, 19, 134, 21, 22, 23, 24, -1, -1,
+ -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ -1, 58, 59, 60, -1, -1, 63, -1, -1, 66,
+ 67, -1, 69, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, -1, -1, 102, -1,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, -1, -1, -1, -1, -1, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, -1, -1, -1, -1,
- 134, 135, 136, 19, -1, 21, 22, 23, 24, -1,
- -1, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
- 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
- -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
- -1, 97, 98, -1, 100, -1, -1, -1, 104, -1,
- 106, 107, 108, -1, 110, 111, 112, -1, 114, -1,
- -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, -1, -1, -1, -1, 134, 135,
- 136, 19, -1, 21, 22, 23, 24, -1, -1, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
- -1, 69, 70, 71, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 84, 85, -1, -1,
- -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
- 98, -1, 100, -1, -1, -1, 104, -1, 106, 107,
- 108, -1, 110, 111, 112, -1, 114, -1, -1, -1,
- -1, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, -1, -1, -1, 134, 135, 136, 19,
- -1, 21, 22, 23, 24, -1, -1, -1, -1, -1,
- 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
- 70, 71, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 84, 85, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- 100, -1, -1, -1, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, -1, -1, -1, -1, -1,
- -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- -1, -1, -1, -1, 134, 135, 136, 19, -1, 21,
- 22, 23, 24, -1, -1, -1, -1, -1, 30, 31,
- 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
- -1, -1, -1, -1, -1, -1, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, -1, 58, 59, 60, -1,
- -1, 63, -1, -1, 66, 67, -1, 69, 70, 71,
+ -1, -1, -1, -1, 91, -1, -1, 94, 95, -1,
+ 97, 98, -1, 100, -1, -1, -1, 104, -1, 106,
+ 107, 108, -1, 110, 111, 112, -1, 114, -1, -1,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
+ -1, -1, -1, -1, -1, -1, 19, 134, 21, 22,
+ 23, 24, -1, -1, -1, -1, -1, 30, 31, 32,
+ 33, 34, 35, 36, -1, -1, 39, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, -1, 58, 59, 60, -1, -1,
+ 63, -1, -1, 66, 67, -1, 69, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 84, 85, -1, -1, -1, -1, -1, 91,
- -1, -1, 94, 95, -1, 97, 98, -1, 100, -1,
- -1, -1, 104, -1, 106, 107, 108, -1, 110, 111,
- 112, -1, 114, -1, -1, -1, -1, -1, -1, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, -1,
- -1, -1, 134, 135, 136, 19, -1, 21, 22, 23,
- 24, -1, -1, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, 70, 71, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 91, -1,
+ -1, 94, 95, -1, 97, 98, -1, -1, -1, -1,
+ -1, 104, -1, 106, 107, 108, -1, 110, 111, 112,
+ -1, 114, -1, -1, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, -1, -1, -1, -1, -1, -1, -1,
+ 19, 134, 21, 22, 23, 24, -1, -1, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
+ 39, -1, -1, -1, -1, -1, -1, -1, -1, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, -1, 58,
+ 59, 60, -1, -1, 63, -1, -1, 66, 67, -1,
+ 69, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, 100, -1, -1, -1,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, -1, -1, -1, -1, -1, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, -1, -1, -1, -1,
- 134, 135, 136, 19, -1, 21, 22, 23, 24, -1,
- -1, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
- 66, 67, -1, 69, 70, 71, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 84, 85,
- -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
- -1, 97, 98, -1, -1, -1, -1, -1, 104, -1,
- 106, 107, 108, -1, 110, 111, 112, -1, 114, -1,
- -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, -1, -1, -1, -1, 134, 135,
- 136, 19, -1, 21, 22, 23, 24, -1, -1, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
- -1, 69, 70, 71, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 84, 85, -1, -1,
- -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
- 98, -1, -1, -1, -1, -1, 104, -1, 106, 107,
- 108, -1, 110, 111, 112, -1, 114, -1, -1, -1,
- -1, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, -1, -1, -1, 134, 135, 136, 19,
- -1, 21, 22, 23, 24, -1, -1, -1, -1, -1,
- 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
- 70, 71, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 84, 85, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- -1, -1, -1, -1, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, -1, -1, -1, -1, -1,
- -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- -1, -1, -1, -1, 134, 135, 136, 19, -1, 21,
- 22, 23, 24, -1, -1, -1, -1, -1, 30, 31,
- 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
- -1, -1, -1, -1, -1, -1, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, -1, 58, 59, 60, -1,
- -1, 63, -1, -1, 66, 67, -1, 69, -1, -1,
+ -1, -1, 91, -1, -1, 94, 95, -1, 97, 98,
+ -1, -1, -1, -1, -1, 104, -1, 106, 107, 108,
+ -1, 110, 111, 112, -1, 114, -1, -1, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, -1, -1, -1,
+ -1, -1, -1, -1, 19, 134, 21, 22, 23, 24,
+ -1, -1, -1, -1, -1, 30, 31, 32, 33, 34,
+ 35, 36, -1, -1, 39, -1, -1, -1, -1, -1,
+ -1, -1, -1, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, -1, 58, 59, 60, -1, -1, 63, -1,
+ -1, 66, 67, -1, 69, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 88, -1, -1, 91,
- -1, -1, 94, 95, -1, 97, 98, -1, -1, -1,
- -1, -1, 104, -1, 106, 107, 108, -1, 110, 111,
- 112, -1, 114, -1, -1, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, -1, -1, -1, -1, -1, -1,
- -1, 19, 134, 21, 22, 23, 24, -1, -1, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
- -1, 69, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 91, -1, -1, 94,
+ 95, -1, 97, 98, -1, -1, -1, -1, -1, 104,
+ -1, 106, 107, 108, -1, 110, 111, 112, -1, 114,
+ -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, -1, -1, -1, -1, -1, -1, 19, 134,
+ 21, 22, 23, 24, -1, -1, -1, -1, -1, 30,
+ 31, 32, 33, 34, 35, 36, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, -1, 58, 59, 60,
+ -1, -1, 63, -1, -1, 66, 67, -1, 69, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
- 98, -1, 100, -1, -1, -1, 104, -1, 106, 107,
- 108, -1, 110, 111, 112, -1, 114, -1, -1, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, -1,
- -1, -1, -1, -1, -1, 19, 134, 21, 22, 23,
- 24, -1, -1, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, -1, -1, 63,
- -1, -1, 66, 67, -1, 69, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 91, -1, -1,
- 94, 95, -1, 97, 98, -1, 100, -1, -1, -1,
- 104, -1, 106, 107, 108, -1, 110, 111, 112, -1,
- 114, -1, -1, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, -1, -1, -1, -1, -1, -1, 19,
- 134, 21, 22, 23, 24, -1, -1, -1, -1, -1,
- 30, 31, 32, 33, 34, 35, 36, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, -1, -1, 63, -1, -1, 66, 67, -1, 69,
+ 91, -1, -1, 94, 95, -1, 97, 98, -1, -1,
+ 51, 52, -1, 104, 55, 106, 107, 108, -1, 110,
+ 111, 112, -1, 114, -1, -1, -1, -1, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, -1, -1, 80,
+ 81, -1, -1, 134, -1, 86, 87, 88, 89, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 100,
+ 101, 102, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, -1, 135, 136, 51, 52, -1, -1,
+ 55, -1, 143, 144, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, -1, -1, 80, 81, -1, -1, -1,
+ -1, 86, 87, 88, 89, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 100, 101, 102, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
+ 135, 136, 51, 52, -1, -1, 55, -1, 143, 144,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 91, -1, -1, 94, 95, -1, 97, 98, -1,
- -1, -1, -1, -1, 104, -1, 106, 107, 108, -1,
- 110, 111, 112, -1, 114, -1, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, -1, -1, -1, -1,
- -1, -1, -1, 19, 134, 21, 22, 23, 24, -1,
- -1, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, -1, 58, 59, 60, -1, -1, 63, -1, -1,
- 66, 67, -1, 69, -1, -1, -1, -1, -1, -1,
+ -1, 70, 71, 72, 73, 74, 75, 76, 77, -1,
+ -1, 80, 81, -1, -1, -1, -1, 86, 87, 88,
+ 89, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 100, 101, 102, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, -1, 135, 136, 51, 52,
+ -1, -1, 55, -1, 143, 144, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 70, 71, 72,
+ 73, 74, 75, 76, 77, -1, -1, 80, 81, -1,
+ -1, -1, -1, 86, 87, 88, 89, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 100, 101, 102,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 91, -1, -1, 94, 95,
- -1, 97, 98, -1, -1, -1, -1, -1, 104, -1,
- 106, 107, 108, -1, 110, 111, 112, -1, 114, -1,
- -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- -1, -1, -1, -1, -1, -1, -1, 19, 134, 21,
- 22, 23, 24, -1, -1, -1, -1, -1, 30, 31,
- 32, 33, 34, 35, 36, -1, -1, 39, -1, -1,
- -1, -1, -1, -1, -1, -1, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, -1, 58, 59, 60, -1,
- -1, 63, -1, -1, 66, 67, -1, 69, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 91,
- -1, -1, 94, 95, -1, 97, 98, -1, -1, -1,
- -1, -1, 104, -1, 106, 107, 108, -1, 110, 111,
- 112, -1, 114, -1, -1, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, -1, -1, -1, -1, -1, -1,
- -1, 19, 134, 21, 22, 23, 24, -1, -1, -1,
- -1, -1, 30, 31, 32, 33, 34, 35, 36, -1,
- -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, -1,
- 58, 59, 60, -1, -1, 63, -1, -1, 66, 67,
- -1, 69, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, -1, 135, 136, 51, 52, -1, -1, 55, -1,
+ 143, 144, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 70, 71, 72, 73, 74, 75, 76,
+ 77, -1, -1, 80, 81, -1, -1, -1, -1, 86,
+ 87, 88, 89, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 100, 101, 102, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 91, -1, -1, 94, 95, -1, 97,
- 98, -1, -1, 51, 52, -1, 104, 55, 106, 107,
- 108, -1, 110, 111, 112, -1, 114, -1, -1, -1,
- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77,
- -1, -1, 80, 81, -1, -1, 134, -1, 86, 87,
- 88, 89, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 100, 101, 102, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, -1, 135, 136,
+ 51, 52, -1, -1, 55, -1, 143, 144, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, -1, -1, 80,
+ 81, -1, -1, -1, -1, 86, 87, 88, 89, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 100,
+ 101, 102, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, -1, 135, 136, 51, 52, -1, -1,
+ 55, -1, 143, 144, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, -1, -1, 80, 81, -1, -1, -1,
+ -1, 86, 87, 88, 89, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 100, 101, 102, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, -1, 135, 136, 51,
- 52, -1, -1, 55, -1, 143, 144, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 70, 71,
- 72, 73, 74, 75, 76, 77, -1, -1, 80, 81,
- -1, -1, -1, -1, 86, 87, 88, 89, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 100, 101,
- 102, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, -1, 135, 136, 51, 52, -1, -1, 55,
- -1, 143, 144, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, -1, -1, 80, 81, -1, -1, -1, -1,
- 86, 87, 88, 89, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 100, 101, 102, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, -1, 135,
- 136, 51, 52, -1, -1, 55, -1, 143, 144, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
+ 135, 136, 51, 52, -1, -1, 55, -1, 143, 144,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, -1, -1,
- 80, 81, -1, -1, -1, -1, 86, 87, 88, 89,
+ -1, 70, 71, 72, 73, 74, 75, 76, 77, -1,
+ -1, 80, 81, -1, -1, -1, -1, 86, 87, 88,
+ 89, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 100, 101, 102, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, -1, 135, 136, 51, 52,
+ -1, -1, 55, -1, 143, 144, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 70, 71, 72,
+ 73, 74, 75, 76, 77, -1, -1, 80, 81, -1,
+ -1, -1, -1, 86, 87, 88, 89, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 100, 101, 102,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 100, 101, 102, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, -1, 135, 136, 51, 52, -1,
- -1, 55, -1, 143, 144, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 70, 71, 72, 73,
- 74, 75, 76, 77, -1, -1, 80, 81, -1, -1,
- -1, -1, 86, 87, 88, 89, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 100, 101, 102, -1,
+ -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, -1, 135, 136, 51, 52, -1, -1, 55, -1,
+ 143, 144, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 70, 71, 72, 73, 74, 75, 76,
+ 77, -1, -1, 80, 81, -1, -1, -1, -1, 86,
+ 87, 88, 89, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 100, 101, 102, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, -1, 135, 136,
+ 51, 52, -1, -1, 55, -1, 143, 144, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, -1, -1, 80,
+ 81, -1, -1, -1, -1, 86, 87, 88, 89, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 100,
+ 101, 102, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, -1, 135, 136, 51, 52, -1, -1,
+ 55, -1, 143, 144, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, -1, -1, 80, 81, -1, -1, -1,
+ -1, 86, 87, 88, 89, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 100, 101, 102, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- -1, 135, 136, 51, 52, -1, -1, 55, -1, 143,
- 144, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77,
- -1, -1, 80, 81, -1, -1, -1, -1, 86, 87,
- 88, 89, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 100, 101, 102, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
+ 135, 136, 51, 52, -1, -1, 55, -1, 143, 144,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, -1, 135, 136, 51,
- 52, -1, -1, 55, -1, 143, 144, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 70, 71,
- 72, 73, 74, 75, 76, 77, -1, -1, 80, 81,
- -1, -1, -1, -1, 86, 87, 88, 89, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 100, 101,
- 102, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, -1, 135, 136, 51, 52, -1, -1, 55,
- -1, 143, 144, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, -1, -1, 80, 81, -1, -1, -1, -1,
- 86, 87, 88, 89, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 100, 101, 102, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, -1, 135,
- 136, 51, 52, -1, -1, 55, -1, 143, 144, -1,
+ -1, 70, 71, 72, 73, 74, 75, 76, 77, -1,
+ -1, 80, 81, -1, -1, -1, -1, 86, 87, 88,
+ 89, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 100, 101, 102, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, -1, 135, 136, 51, 52,
+ -1, -1, 55, -1, 143, 144, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 70, 71, 72,
+ 73, 74, 75, 76, 77, -1, -1, 80, 81, -1,
+ -1, -1, -1, 86, 87, 88, 89, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 100, 101, 102,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, -1, -1,
- 80, 81, -1, -1, -1, -1, 86, 87, 88, 89,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 100, 101, 102, -1, -1, -1, -1, -1, -1, -1,
+ -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, -1, 135, 136, 51, 52, -1, -1, 55, -1,
+ 143, 144, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 70, 71, 72, 73, 74, 75, 76,
+ 77, -1, -1, 80, 81, -1, -1, -1, -1, 86,
+ 87, 88, 89, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 100, 101, 102, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 44,
+ -1, -1, -1, -1, -1, -1, -1, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, -1, 135, 136,
+ -1, -1, -1, -1, -1, -1, 143, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, -1,
+ -1, -1, -1, 88, 89, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 101, -1, -1, -1,
+ -1, 44, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 122, -1, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, -1, -1, -1, -1, 88, 89, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 101, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, -1, 135, 136, 51, 52, -1,
- -1, 55, -1, 143, 144, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 70, 71, 72, 73,
- 74, 75, 76, 77, -1, -1, 80, 81, -1, -1,
- -1, -1, 86, 87, 88, 89, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 100, 101, 102, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 122,
+ -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, -1, -1, -1, -1, 88, 89, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 101, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- -1, 135, 136, 51, 52, -1, -1, 55, -1, 143,
- 144, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77,
- -1, -1, 80, 81, -1, -1, -1, -1, 86, 87,
- 88, 89, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 100, 101, 102, -1, -1, -1, -1, -1,
+ -1, 122, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, -1, -1, -1, -1, -1, -1, -1,
+ -1, 142, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, -1, -1, -1, -1, 88, 89,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, -1, 135, 136, 51,
- 52, -1, -1, 55, -1, 143, 144, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 70, 71,
- 72, 73, 74, 75, 76, 77, -1, -1, 80, 81,
- -1, -1, -1, -1, 86, 87, 88, 89, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 100, 101,
- 102, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, -1, 135, 136, 51, 52, -1, -1, 55,
- -1, 143, 144, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, -1, -1, 80, 81, -1, -1, -1, -1,
- 86, 87, 88, 89, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 100, 101, 102, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, -1, 135,
- 136, 51, 52, -1, -1, 55, -1, 143, 144, -1,
+ -1, 101, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, -1, -1,
- 80, 81, -1, -1, -1, -1, 86, 87, 88, 89,
+ -1, -1, 122, -1, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, -1, -1, -1, -1, -1, -1,
+ -1, -1, 142, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, -1, -1, -1, -1, 88,
+ 89, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 101, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 100, 101, 102, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 44, -1, -1, -1,
- -1, -1, -1, -1, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, -1, 135, 136, -1, -1, -1,
- -1, -1, -1, 143, 72, 73, 74, 75, 76, 77,
+ -1, -1, -1, 122, -1, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, -1, -1, -1, -1, -1,
+ -1, -1, -1, 142, 72, 73, 74, 75, 76, 77,
 78, 79, 80, 81, 82, 83, -1, -1, -1, -1,
 88, 89, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, 101, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, 122, -1, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, -1, -1,
- -1, -1, 88, 89, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 101, -1, -1, -1, -1,
+ 128, 129, 130, 131, 132, 133, -1, -1, -1, -1,
+ -1, -1, -1, -1, 142, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, -1, -1, -1,
+ -1, 88, 89, -1, -1, -1, 93, -1, -1, -1,
+ -1, -1, -1, -1, 101, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 122, -1, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, -1, -1,
- -1, -1, -1, -1, -1, -1, 142, 72, 73, 74,
+ -1, -1, -1, -1, -1, 122, -1, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 72, 73, 74,
 75, 76, 77, 78, 79, 80, 81, 82, 83, -1,
- -1, -1, -1, 88, 89, -1, -1, -1, -1, -1,
+ -1, -1, -1, 88, 89, -1, -1, -1, 93, -1,
 -1, -1, -1, -1, -1, -1, 101, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, 122, -1, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, -1,
- -1, -1, -1, -1, -1, -1, -1, 142, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- -1, -1, -1, -1, 88, 89, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 101, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 122, -1,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- -1, -1, -1, -1, -1, -1, -1, -1, 142, 72,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 72,
 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
 83, -1, -1, -1, -1, 88, 89, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, 101, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, 122,
 -1, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, -1, -1, -1, -1, -1, -1, -1, -1, 142,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, -1, -1, -1, -1, 88, 89, -1, -1,
- -1, 93, -1, -1, -1, -1, -1, -1, -1, 101,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 122, -1, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, -1, -1, -1, -1, 88, 89,
- -1, -1, -1, 93, -1, -1, -1, -1, -1, -1,
- -1, 101, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 122, -1, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, -1, -1, -1, -1,
- 88, 89, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 101, -1, -1, -1, -1, -1, -1,
+ 133, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, -1, -1, -1, -1, 88, 89, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 122, -1, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, -1, -1,
- -1, -1, 88, 89, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 101, -1, -1, -1, -1,
+ 101, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133
+ -1, -1, -1, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133
 };
 
- /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
+/* YYSTOSSTATE-NUM -- The symbol kind of the accessing symbol of
+ state STATE-NUM. */
 static const yytype_int16 yystos =
 {
 0, 150, 151, 0, 1, 3, 4, 5, 6, 7,
@@ -5224,91 +5523,92 @@
 225, 272, 275, 33, 34, 35, 36, 48, 49, 50,
 51, 55, 106, 183, 184, 185, 268, 115, 118, 119,
 146, 148, 167, 262, 263, 264, 317, 321, 322, 323,
- 51, 100, 102, 103, 135, 172, 189, 195, 198, 201,
- 254, 309, 310, 195, 195, 144, 192, 193, 196, 197,
- 324, 192, 196, 144, 318, 184, 155, 138, 189, 220,
- 189, 189, 189, 55, 1, 94, 157, 158, 159, 174,
- 175, 324, 205, 207, 190, 201, 309, 324, 189, 308,
- 309, 324, 91, 142, 179, 220, 272, 275, 208, 53,
- 54, 56, 63, 107, 183, 269, 63, 64, 65, 116,
- 117, 255, 256, 61, 255, 62, 255, 63, 255, 63,
- 255, 58, 59, 168, 189, 189, 317, 323, 40, 41,
- 42, 43, 44, 37, 38, 51, 53, 54, 55, 56,
- 69, 83, 94, 100, 101, 102, 103, 128, 131, 144,
- 278, 279, 280, 281, 282, 285, 286, 287, 288, 290,
- 291, 292, 293, 295, 296, 297, 300, 301, 302, 303,
- 304, 324, 278, 280, 28, 239, 121, 142, 94, 100,
- 176, 121, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 88, 89, 93, 101, 122, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 90,
- 105, 140, 147, 315, 90, 315, 316, 26, 138, 243,
- 254, 92, 92, 192, 196, 243, 163, 51, 55, 181,
- 58, 59, 279, 125, 276, 90, 140, 315, 219, 307,
- 90, 147, 314, 156, 157, 55, 278, 278, 16, 221,
- 321, 121, 90, 140, 315, 92, 92, 221, 167, 167,
- 55, 90, 140, 315, 25, 107, 142, 265, 317, 115,
- 264, 20, 246, 321, 57, 189, 189, 189, 93, 142,
- 199, 200, 324, 57, 199, 200, 85, 194, 195, 201,
- 309, 324, 195, 163, 317, 319, 163, 322, 160, 138,
- 157, 90, 315, 92, 159, 174, 145, 317, 323, 319,
- 159, 319, 141, 200, 320, 323, 200, 320, 139, 320,
- 55, 176, 177, 178, 142, 90, 140, 315, 144, 237,
- 290, 295, 63, 255, 257, 261, 262, 63, 256, 61,
- 62, 63, 63, 101, 101, 154, 167, 167, 167, 167,
- 159, 163, 163, 57, 121, 321, 294, 85, 290, 295,
- 121, 156, 189, 142, 305, 324, 51, 142, 305, 321,
- 142, 289, 189, 142, 289, 51, 142, 289, 51, 121,
- 156, 240, 100, 168, 189, 201, 202, 174, 142, 179,
- 142, 161, 162, 168, 180, 189, 191, 202, 220, 275,
+ 51, 69, 100, 102, 103, 135, 172, 189, 195, 198,
+ 201, 254, 309, 310, 195, 195, 144, 192, 193, 196,
+ 197, 324, 192, 196, 144, 318, 184, 155, 138, 189,
+ 220, 189, 189, 189, 55, 1, 94, 157, 158, 159,
+ 174, 175, 324, 205, 207, 190, 201, 309, 324, 189,
+ 308, 309, 324, 91, 142, 179, 220, 272, 275, 208,
+ 53, 54, 56, 63, 107, 183, 269, 63, 64, 65,
+ 116, 117, 255, 256, 61, 255, 62, 255, 63, 255,
+ 63, 255, 58, 59, 168, 189, 189, 317, 323, 40,
+ 41, 42, 43, 44, 37, 38, 51, 53, 54, 55,
+ 56, 69, 83, 94, 100, 101, 102, 103, 128, 131,
+ 144, 278, 279, 280, 281, 282, 285, 286, 287, 288,
+ 290, 291, 292, 293, 295, 296, 297, 300, 301, 302,
+ 303, 304, 324, 278, 280, 28, 239, 121, 142, 94,
+ 100, 176, 121, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 88, 89, 93, 101, 122,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 90, 105, 140, 147, 315, 90, 315, 316, 26, 138,
+ 243, 254, 92, 92, 192, 196, 243, 163, 51, 55,
+ 181, 58, 59, 279, 125, 276, 90, 140, 315, 219,
+ 307, 90, 147, 314, 156, 157, 55, 278, 278, 16,
+ 221, 321, 121, 90, 140, 315, 92, 92, 221, 167,
+ 167, 55, 90, 140, 315, 25, 107, 142, 265, 317,
+ 115, 264, 20, 246, 321, 57, 57, 189, 189, 189,
+ 93, 142, 199, 200, 324, 57, 199, 200, 85, 194,
+ 195, 201, 309, 324, 195, 163, 317, 319, 163, 322,
+ 160, 138, 157, 90, 315, 92, 159, 174, 145, 317,
+ 323, 319, 159, 319, 141, 200, 320, 323, 200, 320,
+ 139, 320, 55, 176, 177, 178, 142, 90, 140, 315,
+ 144, 237, 290, 295, 63, 255, 257, 261, 262, 63,
+ 256, 61, 62, 63, 63, 101, 101, 154, 167, 167,
+ 167, 167, 159, 163, 163, 57, 121, 57, 321, 294,
+ 85, 290, 295, 121, 156, 189, 142, 305, 324, 51,
+ 142, 305, 321, 142, 289, 189, 142, 289, 51, 142,
+ 289, 51, 121, 156, 240, 100, 168, 189, 201, 202,
+ 174, 142, 179, 142, 161, 162, 168, 180, 189, 191,
+ 202, 220, 275, 189, 189, 189, 189, 189, 189, 189,
+ 189, 189, 189, 189, 189, 189, 189, 51, 189, 189,
 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 51, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 51, 52, 55,
- 187, 192, 312, 313, 194, 201, 51, 52, 55, 187,
- 192, 312, 51, 55, 312, 245, 244, 162, 189, 191,
- 162, 191, 99, 170, 217, 277, 216, 51, 55, 181,
- 312, 194, 312, 156, 163, 166, 15, 13, 248, 324,
- 121, 121, 157, 16, 51, 55, 194, 51, 55, 157,
- 27, 222, 321, 222, 51, 55, 194, 51, 55, 214,
- 186, 157, 246, 189, 201, 15, 189, 189, 318, 100,
- 189, 198, 309, 189, 310, 319, 145, 317, 200, 200,
- 319, 145, 184, 152, 139, 191, 319, 159, 206, 309,
- 176, 178, 51, 55, 194, 51, 55, 290, 209, 142,
- 63, 157, 262, 189, 189, 51, 100, 226, 295, 319,
- 319, 142, 172, 189, 15, 51, 282, 287, 304, 85,
- 288, 293, 300, 302, 295, 297, 302, 51, 295, 172,
- 189, 15, 79, 126, 231, 232, 324, 189, 200, 319,
- 178, 142, 44, 121, 44, 90, 140, 315, 318, 92,
- 92, 192, 196, 141, 200, 92, 92, 193, 196, 193,
- 196, 231, 231, 171, 321, 167, 156, 141, 15, 319,
- 183, 189, 202, 249, 324, 18, 224, 324, 17, 223,
- 224, 92, 92, 141, 92, 92, 224, 211, 213, 141,
- 167, 184, 139, 15, 200, 221, 189, 199, 85, 309,
- 139, 319, 320, 141, 234, 318, 29, 113, 238, 139,
- 142, 292, 319, 142, 85, 44, 44, 305, 321, 142,
- 289, 142, 289, 142, 289, 142, 289, 289, 44, 44,
- 228, 230, 233, 281, 283, 284, 287, 295, 296, 298,
- 299, 302, 304, 156, 100, 189, 178, 159, 189, 51,
- 55, 194, 51, 55, 57, 123, 162, 191, 168, 191,
- 170, 92, 162, 191, 162, 191, 170, 243, 239, 156,
- 157, 231, 218, 321, 15, 93, 250, 324, 157, 14,
- 251, 324, 167, 15, 92, 15, 157, 157, 222, 189,
- 157, 319, 200, 145, 146, 156, 157, 227, 142, 100,
- 319, 189, 189, 295, 302, 295, 295, 189, 189, 234,
- 234, 91, 220, 142, 305, 305, 142, 229, 220, 142,
- 229, 142, 229, 15, 189, 141, 189, 189, 162, 191,
- 15, 139, 157, 156, 91, 180, 220, 272, 275, 221,
- 157, 221, 15, 15, 215, 224, 246, 247, 51, 235,
- 236, 291, 15, 139, 295, 295, 142, 292, 289, 142,
- 289, 289, 289, 126, 126, 55, 90, 283, 287, 142,
- 228, 229, 299, 302, 295, 298, 302, 295, 139, 15,
- 55, 90, 140, 315, 157, 157, 157, 142, 318, 142,
- 295, 142, 295, 51, 55, 305, 142, 229, 142, 229,
- 142, 229, 142, 229, 229, 51, 55, 194, 51, 55,
- 248, 223, 15, 236, 295, 289, 295, 302, 295, 295,
- 141, 229, 142, 229, 229, 229, 295, 229
+ 51, 52, 55, 187, 192, 312, 313, 194, 201, 51,
+ 52, 55, 187, 192, 312, 51, 55, 312, 245, 244,
+ 162, 189, 191, 162, 191, 99, 170, 217, 277, 216,
+ 51, 55, 181, 312, 194, 312, 156, 163, 166, 15,
+ 13, 248, 324, 121, 121, 157, 16, 51, 55, 194,
+ 51, 55, 157, 27, 222, 321, 222, 51, 55, 194,
+ 51, 55, 214, 186, 157, 246, 189, 201, 15, 189,
+ 189, 189, 318, 100, 189, 198, 309, 189, 310, 319,
+ 145, 317, 200, 200, 319, 145, 184, 152, 139, 191,
+ 319, 159, 206, 309, 176, 178, 51, 55, 194, 51,
+ 55, 290, 209, 142, 63, 157, 262, 189, 189, 51,
+ 69, 100, 226, 295, 319, 319, 142, 172, 189, 15,
+ 51, 69, 282, 287, 304, 85, 288, 293, 300, 302,
+ 295, 297, 302, 51, 295, 172, 189, 15, 79, 126,
+ 231, 232, 324, 189, 200, 319, 178, 142, 44, 121,
+ 44, 90, 140, 315, 318, 92, 92, 192, 196, 141,
+ 200, 92, 92, 193, 196, 193, 196, 231, 231, 171,
+ 321, 167, 156, 141, 15, 319, 183, 189, 202, 249,
+ 324, 18, 224, 324, 17, 223, 224, 92, 92, 141,
+ 92, 92, 224, 211, 213, 141, 167, 184, 139, 15,
+ 200, 221, 189, 199, 85, 309, 139, 319, 320, 141,
+ 234, 318, 29, 113, 238, 139, 142, 292, 319, 142,
+ 85, 44, 44, 305, 321, 142, 289, 142, 289, 142,
+ 289, 142, 289, 289, 44, 44, 228, 230, 233, 281,
+ 283, 284, 287, 295, 296, 298, 299, 302, 304, 156,
+ 100, 189, 178, 159, 189, 51, 55, 194, 51, 55,
+ 57, 123, 162, 191, 168, 191, 170, 92, 162, 191,
+ 162, 191, 170, 243, 239, 156, 157, 231, 218, 321,
+ 15, 93, 250, 324, 157, 14, 251, 324, 167, 15,
+ 92, 15, 157, 157, 222, 189, 157, 319, 200, 145,
+ 146, 156, 157, 227, 142, 100, 319, 189, 189, 295,
+ 302, 295, 295, 189, 189, 234, 234, 91, 220, 142,
+ 305, 305, 142, 229, 220, 142, 229, 142, 229, 15,
+ 189, 141, 189, 189, 162, 191, 15, 139, 157, 156,
+ 91, 180, 220, 272, 275, 221, 157, 221, 15, 15,
+ 215, 224, 246, 247, 51, 235, 236, 291, 15, 139,
+ 295, 295, 142, 292, 289, 142, 289, 289, 289, 126,
+ 126, 55, 90, 283, 287, 142, 228, 229, 299, 302,
+ 295, 298, 302, 295, 139, 15, 55, 90, 140, 315,
+ 157, 157, 157, 142, 318, 142, 295, 142, 295, 51,
+ 55, 305, 142, 229, 142, 229, 142, 229, 142, 229,
+ 229, 51, 55, 194, 51, 55, 248, 223, 15, 236,
+ 295, 289, 295, 302, 295, 295, 141, 229, 142, 229,
+ 229, 229, 295, 229
 };
 
- /* YYR1YYN -- Symbol number of symbol that rule YYN derives. */
+/* YYR1RULE-NUM -- Symbol kind of the left-hand side of rule RULE-NUM. */
 static const yytype_int16 yyr1 =
 {
 0, 149, 151, 150, 152, 153, 153, 153, 153, 154,
@@ -5339,43 +5639,43 @@
 190, 190, 190, 191, 191, 192, 192, 192, 193, 193,
 194, 194, 194, 194, 194, 195, 195, 195, 195, 195,
 197, 196, 198, 198, 199, 199, 200, 201, 201, 201,
- 201, 202, 202, 202, 203, 203, 203, 203, 203, 203,
- 203, 203, 203, 204, 203, 205, 206, 203, 207, 203,
- 203, 203, 203, 203, 203, 203, 203, 203, 203, 203,
- 203, 203, 208, 209, 203, 203, 203, 210, 211, 203,
- 212, 213, 203, 203, 203, 214, 215, 203, 216, 203,
- 217, 218, 203, 219, 203, 203, 203, 203, 203, 203,
- 203, 220, 221, 221, 221, 222, 222, 223, 223, 224,
- 224, 225, 225, 226, 226, 226, 226, 226, 226, 226,
- 226, 227, 226, 228, 228, 228, 228, 229, 229, 230,
- 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
- 230, 230, 230, 230, 231, 231, 233, 232, 232, 232,
- 234, 234, 235, 235, 236, 236, 237, 237, 238, 238,
- 240, 239, 241, 241, 241, 241, 242, 242, 242, 242,
- 242, 242, 242, 242, 242, 244, 243, 245, 243, 246,
- 247, 247, 248, 248, 249, 249, 249, 250, 250, 251,
- 251, 252, 252, 252, 252, 253, 253, 254, 254, 254,
- 254, 255, 255, 256, 257, 256, 256, 256, 258, 258,
- 259, 259, 260, 261, 261, 262, 262, 263, 263, 264,
- 265, 264, 266, 266, 267, 267, 268, 269, 269, 269,
- 269, 269, 269, 270, 270, 271, 271, 271, 271, 272,
- 272, 272, 272, 272, 273, 273, 274, 274, 274, 274,
- 274, 274, 274, 274, 275, 275, 276, 277, 276, 278,
- 278, 279, 279, 279, 280, 280, 280, 280, 281, 282,
- 282, 283, 283, 284, 284, 285, 285, 286, 286, 287,
- 287, 288, 288, 288, 288, 289, 289, 290, 290, 290,
+ 201, 201, 201, 202, 202, 202, 203, 203, 203, 203,
+ 203, 203, 203, 203, 203, 204, 203, 205, 206, 203,
+ 207, 203, 203, 203, 203, 203, 203, 203, 203, 203,
+ 203, 203, 203, 203, 208, 209, 203, 203, 203, 210,
+ 211, 203, 212, 213, 203, 203, 203, 214, 215, 203,
+ 216, 203, 217, 218, 203, 219, 203, 203, 203, 203,
+ 203, 203, 203, 220, 221, 221, 221, 222, 222, 223,
+ 223, 224, 224, 225, 225, 226, 226, 226, 226, 226,
+ 226, 226, 226, 227, 226, 228, 228, 228, 228, 229,
+ 229, 230, 230, 230, 230, 230, 230, 230, 230, 230,
+ 230, 230, 230, 230, 230, 230, 231, 231, 233, 232,
+ 232, 232, 234, 234, 235, 235, 236, 236, 237, 237,
+ 238, 238, 240, 239, 241, 241, 241, 241, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 244, 243, 245,
+ 243, 246, 247, 247, 248, 248, 249, 249, 249, 250,
+ 250, 251, 251, 252, 252, 252, 252, 253, 253, 254,
+ 254, 254, 254, 255, 255, 256, 257, 256, 256, 256,
+ 258, 258, 259, 259, 260, 261, 261, 262, 262, 263,
+ 263, 264, 265, 264, 266, 266, 267, 267, 268, 269,
+ 269, 269, 269, 269, 269, 270, 270, 271, 271, 271,
+ 271, 272, 272, 272, 272, 272, 273, 273, 274, 274,
+ 274, 274, 274, 274, 274, 274, 275, 275, 276, 277,
+ 276, 278, 278, 279, 279, 279, 280, 280, 280, 280,
+ 281, 281, 282, 282, 283, 283, 284, 284, 285, 285,
+ 286, 286, 287, 287, 288, 288, 288, 288, 289, 289,
 290, 290, 290, 290, 290, 290, 290, 290, 290, 290,
- 290, 290, 291, 291, 291, 291, 291, 292, 292, 293,
- 294, 293, 295, 295, 296, 297, 298, 299, 299, 300,
- 300, 301, 301, 302, 302, 303, 303, 304, 304, 305,
- 305, 306, 307, 306, 308, 308, 309, 309, 310, 310,
- 310, 310, 310, 311, 311, 311, 312, 312, 312, 312,
- 313, 313, 313, 314, 314, 315, 315, 316, 316, 317,
- 317, 318, 318, 319, 320, 320, 320, 321, 321, 322,
- 322, 323, 323, 324
+ 290, 290, 290, 290, 290, 291, 291, 291, 291, 291,
+ 292, 292, 293, 294, 293, 295, 295, 296, 297, 298,
+ 299, 299, 300, 300, 301, 301, 302, 302, 303, 303,
+ 304, 304, 305, 305, 306, 307, 306, 308, 308, 309,
+ 309, 310, 310, 310, 310, 310, 310, 310, 310, 311,
+ 311, 311, 312, 312, 312, 312, 313, 313, 313, 314,
+ 314, 315, 315, 316, 316, 317, 317, 318, 318, 319,
+ 320, 320, 320, 321, 321, 322, 322, 323, 323, 324
 };
 
- /* YYR2YYN -- Number of symbols on the right hand side of rule YYN. */
+/* YYR2RULE-NUM -- Number of symbols on the right-hand side of rule RULE-NUM. */
 static const yytype_int8 yyr2 =
 {
 0, 2, 0, 2, 2, 1, 1, 3, 2, 1,
@@ -5405,52 +5705,53 @@
 3, 3, 6, 6, 4, 6, 4, 6, 1, 1,
 2, 4, 2, 1, 3, 3, 5, 3, 1, 1,
 1, 2, 2, 4, 2, 1, 2, 2, 4, 1,
- 0, 2, 2, 1, 2, 1, 2, 1, 2, 3,
- 4, 3, 4, 2, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 4, 0, 0, 5, 0, 3,
- 3, 3, 2, 3, 3, 1, 2, 4, 3, 2,
- 1, 2, 0, 0, 5, 6, 6, 0, 0, 7,
- 0, 0, 7, 5, 4, 0, 0, 9, 0, 6,
- 0, 0, 8, 0, 5, 4, 4, 1, 1, 1,
- 1, 1, 1, 1, 2, 1, 1, 1, 5, 1,
- 2, 1, 1, 1, 4, 6, 3, 5, 2, 4,
- 1, 0, 4, 4, 2, 2, 1, 2, 0, 6,
- 8, 4, 6, 4, 3, 6, 2, 4, 6, 2,
- 4, 2, 4, 1, 1, 1, 0, 4, 1, 4,
- 1, 4, 1, 3, 1, 1, 4, 1, 3, 3,
- 0, 5, 2, 4, 5, 5, 2, 4, 4, 3,
- 3, 3, 2, 1, 4, 0, 5, 0, 5, 5,
- 1, 1, 6, 1, 1, 1, 1, 2, 1, 2,
- 1, 1, 1, 1, 1, 1, 2, 1, 1, 2,
- 3, 1, 2, 1, 0, 4, 1, 2, 2, 3,
- 2, 3, 1, 1, 2, 1, 2, 1, 2, 1,
- 0, 4, 2, 3, 1, 4, 2, 1, 1, 1,
- 1, 1, 2, 2, 3, 1, 1, 2, 2, 1,
+ 0, 2, 2, 1, 2, 1, 2, 1, 1, 2,
+ 3, 3, 4, 3, 4, 2, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 0, 4, 0, 0, 5,
+ 0, 3, 3, 3, 2, 3, 3, 1, 2, 4,
+ 3, 2, 1, 2, 0, 0, 5, 6, 6, 0,
+ 0, 7, 0, 0, 7, 5, 4, 0, 0, 9,
+ 0, 6, 0, 0, 8, 0, 5, 4, 4, 1,
+ 1, 1, 1, 1, 1, 1, 2, 1, 1, 1,
+ 5, 1, 2, 1, 1, 1, 4, 6, 3, 5,
+ 2, 4, 1, 0, 4, 4, 2, 2, 1, 2,
+ 0, 6, 8, 4, 6, 4, 3, 6, 2, 4,
+ 6, 2, 4, 2, 4, 1, 1, 1, 0, 4,
+ 1, 4, 1, 4, 1, 3, 1, 1, 4, 1,
+ 3, 3, 0, 5, 2, 4, 5, 5, 2, 4,
+ 4, 3, 3, 3, 2, 1, 4, 0, 5, 0,
+ 5, 5, 1, 1, 6, 1, 1, 1, 1, 2,
+ 1, 2, 1, 1, 1, 1, 1, 1, 2, 1,
+ 1, 2, 3, 1, 2, 1, 0, 4, 1, 2,
+ 2, 3, 2, 3, 1, 1, 2, 1, 2, 1,
+ 2, 1, 0, 4, 2, 3, 1, 4, 2, 1,
+ 1, 1, 1, 1, 2, 2, 3, 1, 1, 2,
+ 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 4, 1, 1, 3, 5, 3, 1, 2, 4, 2,
+ 2, 2, 2, 1, 2, 1, 1, 3, 1, 3,
+ 1, 1, 2, 1, 4, 2, 2, 1, 2, 0,
+ 6, 8, 4, 6, 4, 6, 2, 4, 6, 2,
+ 4, 2, 4, 1, 0, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 4, 1, 3, 2, 2, 2,
+ 1, 3, 1, 3, 1, 1, 2, 1, 1, 1,
+ 2, 1, 2, 1, 1, 0, 4, 1, 2, 1,
+ 3, 3, 3, 2, 2, 3, 3, 2, 1, 1,
 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 0, 0, 4, 1,
- 1, 3, 5, 3, 1, 2, 4, 2, 2, 2,
- 1, 2, 1, 1, 3, 1, 3, 1, 1, 2,
- 1, 4, 2, 2, 1, 2, 0, 6, 8, 4,
- 6, 4, 6, 2, 4, 6, 2, 4, 2, 4,
- 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 4, 1, 3, 2, 2, 2, 1, 3, 1,
- 3, 1, 1, 2, 1, 1, 1, 2, 1, 2,
- 1, 1, 0, 4, 1, 2, 1, 3, 3, 3,
- 2, 3, 2, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 0, 2, 2, 0, 1, 1, 1, 1, 1,
- 1, 1, 2, 0
+ 1, 1, 1, 1, 1, 0, 1, 0, 2, 2,
+ 0, 1, 1, 1, 1, 1, 1, 1, 2, 0
 };
 
 
+enum { YYENOMEM = -2 };
+
 #define yyerrok (yyerrstatus = 0)
 #define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
 
 #define YYACCEPT goto yyacceptlab
 #define YYABORT goto yyabortlab
 #define YYERROR goto yyerrorlab
+#define YYNOMEM goto yyexhaustedlab
 
 
 #define YYRECOVERING() (!!yyerrstatus)
@@ -5472,10 +5773,9 @@
 } \
 while (0)
 
-/* Error token number */
-#define YYTERROR 1
-#define YYERRCODE 256
-
+/* Backward compatibility with an undocumented macro.
+ Use YYerror or YYUNDEF. */
+#define YYERRCODE YYUNDEF
 
 
 /* Enable debugging if requested. */
@@ -5492,19 +5792,16 @@
 YYFPRINTF Args; \
 } while (0)
 
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
 
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \
 do { \
 if (yydebug) \
 { \
 YYFPRINTF (stderr, "%s ", Title); \
 yy_symbol_print (stderr, \
- Type, Value, p); \
+ Kind, Value, p); \
 YYFPRINTF (stderr, "\n"); \
 } \
 } while (0)
@@ -5515,19 +5812,16 @@
 `-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, parser_state *p)
+yy_symbol_value_print (FILE *yyo,
+ yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, parser_state *p)
 {
 FILE *yyoutput = yyo;
- YYUSE (yyoutput);
- YYUSE (p);
+ YY_USE (yyoutput);
+ YY_USE (p);
 if (!yyvaluep)
 return;
-# ifdef YYPRINT
- if (yytype < YYNTOKENS)
- YYPRINT (yyo, yytoknumyytype, *yyvaluep);
-# endif
 YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
- YYUSE (yytype);
+ YY_USE (yykind);
 YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
@@ -5537,12 +5831,13 @@
 `---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, parser_state *p)
+yy_symbol_print (FILE *yyo,
+ yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, parser_state *p)
 {
 YYFPRINTF (yyo, "%s %s (",
- yytype < YYNTOKENS ? "token" : "nterm", yytnameyytype);
+ yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
 
- yy_symbol_value_print (yyo, yytype, yyvaluep, p);
+ yy_symbol_value_print (yyo, yykind, yyvaluep, p);
 YYFPRINTF (yyo, ")");
 }
 
@@ -5575,7 +5870,8 @@
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule, parser_state *p)
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,
+ int yyrule, parser_state *p)
 {
 int yylno = yyrlineyyrule;
 int yynrhs = yyr2yyrule;
@@ -5587,9 +5883,8 @@
 {
 YYFPRINTF (stderr, " $%d = ", yyi + 1);
 yy_symbol_print (stderr,
- yystos+yysspyyi + 1 - yynrhs,
- &yyvsp(yyi + 1) - (yynrhs)
- , p);
+ YY_ACCESSING_SYMBOL (+yysspyyi + 1 - yynrhs),
+ &yyvsp(yyi + 1) - (yynrhs), p);
 YYFPRINTF (stderr, "\n");
 }
 }
@@ -5604,8 +5899,8 @@
 multiple parsers can coexist. */
 int yydebug;
 #else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDPRINTF(Args) ((void) 0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -5628,12 +5923,60 @@
 #endif
 
 
-#if YYERROR_VERBOSE
+/* Context of a parse error. */
+typedef struct
+{
+ yy_state_t *yyssp;
+ yysymbol_kind_t yytoken;
+} yypcontext_t;
+
+/* Put in YYARG at most YYARGN of the expected tokens given the
+ current YYCTX, and return the number of tokens stored in YYARG. If
+ YYARG is null, return the number of expected tokens (guaranteed to
+ be less than YYNTOKENS). Return YYENOMEM on memory exhaustion.
+ Return 0 if there are more than YYARGN expected tokens, yet fill
+ YYARG up to YYARGN. */
+static int
+yypcontext_expected_tokens (const yypcontext_t *yyctx,
+ yysymbol_kind_t yyarg, int yyargn)
+{
+ /* Actual size of YYARG. */
+ int yycount = 0;
+ int yyn = yypact+*yyctx->yyssp;
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yyx;
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheckyyx + yyn == yyx && yyx != YYSYMBOL_YYerror
+ && !yytable_value_is_error (yytableyyx + yyn))
+ {
+ if (!yyarg)
+ ++yycount;
+ else if (yycount == yyargn)
+ return 0;
+ else
+ yyargyycount++ = YY_CAST (yysymbol_kind_t, yyx);
+ }
+ }
+ if (yyarg && yycount == 0 && 0 < yyargn)
+ yyarg0 = YYSYMBOL_YYEMPTY;
+ return yycount;
+}
+
+
 
-# ifndef yystrlen
-# if defined __GLIBC__ && defined _STRING_H
-# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
-# else
+
+#ifndef yystrlen
+# if defined __GLIBC__ && defined _STRING_H
+# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
+# else
 /* Return the length of YYSTR. */
 static YYPTRDIFF_T
 yystrlen (const char *yystr)
@@ -5643,13 +5986,13 @@
 continue;
 return yylen;
 }
-# endif
 # endif
+#endif
 
-# ifndef yystpcpy
-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-# define yystpcpy stpcpy
-# else
+#ifndef yystpcpy
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+# define yystpcpy stpcpy
+# else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
 YYDEST. */
 static char *
@@ -5663,10 +6006,10 @@
 
 return yyd - 1;
 }
-# endif
 # endif
+#endif
 
-# ifndef yytnamerr
+#ifndef yytnamerr
 /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
 quotes and backslashes, so that it's suitable for yyerror. The
 heuristic is that double-quoting is unnecessary unless the string
@@ -5681,7 +6024,6 @@
 {
 YYPTRDIFF_T yyn = 0;
 char const *yyp = yystr;
-
 for (;;)
 switch (*++yyp)
 {
@@ -5715,31 +6057,15 @@
 else
 return yystrlen (yystr);
 }
-# endif
+#endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
- about the unexpected token YYTOKEN for the state stack whose top is
- YYSSP.
 
- Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
- not large enough to hold the message. In that case, also set
- *YYMSG_ALLOC to the required number of bytes. Return 2 if the
- required number of bytes is too large to store. */
 static int
-yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
- yy_state_t *yyssp, int yytoken)
+yy_syntax_error_arguments (const yypcontext_t *yyctx,
+ yysymbol_kind_t yyarg, int yyargn)
 {
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- /* Internationalized format string. */
- const char *yyformat = YY_NULLPTR;
- /* Arguments of yyformat: reported tokens (one for the "unexpected",
- one per "expected"). */
- char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
 /* Actual size of YYARG. */
 int yycount = 0;
- /* Cumulated lengths of YYARG. */
- YYPTRDIFF_T yysize = 0;
-
 /* There are many possibilities here to consider:
 - If this state is a consistent state with a default action, then
 the only way this function was invoked is if the default action
@@ -5763,52 +6089,54 @@
 one exception: it will still contain any token that will not be
 accepted due to an error action in a later state.
 */
- if (yytoken != YYEMPTY)
+ if (yyctx->yytoken != YYSYMBOL_YYEMPTY)
 {
- int yyn = yypact+*yyssp;
- YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytnameyytoken);
- yysize = yysize0;
- yyargyycount++ = yytnameyytoken;
- if (!yypact_value_is_default (yyn))
- {
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. In other words, skip the first -YYN actions for
- this state because they are default actions. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yyx;
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheckyyx + yyn == yyx && yyx != YYTERROR
- && !yytable_value_is_error (yytableyyx + yyn))
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- break;
- }
- yyargyycount++ = yytnameyyx;
- {
- YYPTRDIFF_T yysize1
- = yysize + yytnamerr (YY_NULLPTR, yytnameyyx);
- if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
- yysize = yysize1;
- else
- return 2;
- }
- }
- }
+ int yyn;
+ if (yyarg)
+ yyargyycount = yyctx->yytoken;
+ ++yycount;
+ yyn = yypcontext_expected_tokens (yyctx,
+ yyarg ? yyarg + 1 : yyarg, yyargn - 1);
+ if (yyn == YYENOMEM)
+ return YYENOMEM;
+ else
+ yycount += yyn;
 }
+ return yycount;
+}
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
+
+ Return 0 if *YYMSG was successfully written. Return -1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return YYENOMEM if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
+ const yypcontext_t *yyctx)
+{
+ enum { YYARGS_MAX = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = YY_NULLPTR;
+ /* Arguments of yyformat: reported tokens (one for the "unexpected",
+ one per "expected"). */
+ yysymbol_kind_t yyargYYARGS_MAX;
+ /* Cumulated lengths of YYARG. */
+ YYPTRDIFF_T yysize = 0;
+
+ /* Actual size of YYARG. */
+ int yycount = yy_syntax_error_arguments (yyctx, yyarg, YYARGS_MAX);
+ if (yycount == YYENOMEM)
+ return YYENOMEM;
 
 switch (yycount)
 {
-# define YYCASE_(N, S) \
+#define YYCASE_(N, S) \
 case N: \
 yyformat = S; \
- break
+ break
 default: /* Avoid compiler warnings. */
 YYCASE_(0, YY_("syntax error"));
 YYCASE_(1, YY_("syntax error, unexpected %s"));
@@ -5816,17 +6144,23 @@
 YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
 YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
 YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
+#undef YYCASE_
 }
 
+ /* Compute error message size. Don't count the "%s"s, but reserve
+ room for the terminator. */
+ yysize = yystrlen (yyformat) - 2 * yycount + 1;
 {
- /* Don't count the "%s"s in the final size, but reserve room for
- the terminator. */
- YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
- if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
- yysize = yysize1;
- else
- return 2;
+ int yyi;
+ for (yyi = 0; yyi < yycount; ++yyi)
+ {
+ YYPTRDIFF_T yysize1
+ = yysize + yytnamerr (YY_NULLPTR, yytnameyyargyyi);
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
+ return YYENOMEM;
+ }
 }
 
 if (*yymsg_alloc < yysize)
@@ -5835,7 +6169,7 @@
 if (! (yysize <= *yymsg_alloc
 && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
 *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
- return 1;
+ return -1;
 }
 
 /* Avoid sprintf, as that infringes on the user's name space.
@@ -5847,7 +6181,7 @@
 while ((*yyp = *yyformat) != '\0')
 if (*yyp == '%' && yyformat1 == 's' && yyi < yycount)
 {
- yyp += yytnamerr (yyp, yyargyyi++);
+ yyp += yytnamerr (yyp, yytnameyyargyyi++);
 yyformat += 2;
 }
 else
@@ -5858,29 +6192,32 @@
 }
 return 0;
 }
-#endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol. |
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, parser_state *p)
+yydestruct (const char *yymsg,
+ yysymbol_kind_t yykind, YYSTYPE *yyvaluep, parser_state *p)
 {
- YYUSE (yyvaluep);
- YYUSE (p);
+ YY_USE (yyvaluep);
+ YY_USE (p);
 if (!yymsg)
 yymsg = "Deleting";
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+ YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
 
 YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
- YYUSE (yytype);
+ YY_USE (yykind);
 YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
 
 
+
+
 /*----------.
 | yyparse. |
 `----------*/
@@ -5888,7 +6225,7 @@
 int
 yyparse (parser_state *p)
 {
-/* The lookahead symbol. */
+/* Lookahead token kind. */
 int yychar;
 
 
@@ -5899,45 +6236,41 @@
 YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
 /* Number of syntax errors so far. */
- int yynerrs;
+ int yynerrs = 0;
 
- yy_state_fast_t yystate;
+ yy_state_fast_t yystate = 0;
 /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- 'yyss': related to states.
- 'yyvs': related to semantic values.
+ int yyerrstatus = 0;
 
- Refer to the stacks through separate pointers, to allow yyoverflow
+ /* Refer to the stacks through separate pointers, to allow yyoverflow
 to reallocate them elsewhere. */
 
- /* The state stack. */
+ /* Their size. */
+ YYPTRDIFF_T yystacksize = YYINITDEPTH;
+
+ /* The state stack: array, bottom, top. */
 yy_state_t yyssaYYINITDEPTH;
- yy_state_t *yyss;
- yy_state_t *yyssp;
+ yy_state_t *yyss = yyssa;
+ yy_state_t *yyssp = yyss;
 
- /* The semantic value stack. */
+ /* The semantic value stack: array, bottom, top. */
 YYSTYPE yyvsaYYINITDEPTH;
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYPTRDIFF_T yystacksize;
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp = yyvs;
 
 int yyn;
+ /* The return value of yyparse. */
 int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken = 0;
+ /* Lookahead symbol kind. */
+ yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
 /* The variables used to return semantic value and location from the
 action routines. */
 YYSTYPE yyval;
 
-#if YYERROR_VERBOSE
 /* Buffer for error messages, and its allocated size. */
 char yymsgbuf128;
 char *yymsg = yymsgbuf;
 YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
-#endif
 
 #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
 
@@ -5945,16 +6278,10 @@
 Keep to zero when no symbol should be popped. */
 int yylen = 0;
 
- yyssp = yyss = yyssa;
- yyvsp = yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
 YYDPRINTF ((stderr, "Starting parse\n"));
 
- yystate = 0;
- yyerrstatus = 0;
- yynerrs = 0;
 yychar = YYEMPTY; /* Cause a token to be read. */
+
 goto yysetstate;
 
 
@@ -5976,10 +6303,11 @@
 YY_IGNORE_USELESS_CAST_BEGIN
 *yyssp = YY_CAST (yy_state_t, yystate);
 YY_IGNORE_USELESS_CAST_END
+ YY_STACK_PRINT (yyss, yyssp);
 
 if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
- goto yyexhaustedlab;
+ YYNOMEM;
 #else
 {
 /* Get the current used size of the three stacks, in elements. */
@@ -6007,7 +6335,7 @@
 # else /* defined YYSTACK_RELOCATE */
 /* Extend the stack our own way. */
 if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ YYNOMEM;
 yystacksize *= 2;
 if (YYMAXDEPTH < yystacksize)
 yystacksize = YYMAXDEPTH;
@@ -6018,10 +6346,10 @@
 YY_CAST (union yyalloc *,
 YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
 if (! yyptr)
- goto yyexhaustedlab;
+ YYNOMEM;
 YYSTACK_RELOCATE (yyss_alloc, yyss);
 YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
 if (yyss1 != yyssa)
 YYSTACK_FREE (yyss1);
 }
@@ -6040,6 +6368,7 @@
 }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
+
 if (yystate == YYFINAL)
 YYACCEPT;
 
@@ -6060,18 +6389,29 @@
 
 /* Not known => get a lookahead token if don't already have one. */
 
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */
 if (yychar == YYEMPTY)
 {
- YYDPRINTF ((stderr, "Reading a token: "));
+ YYDPRINTF ((stderr, "Reading a token\n"));
 yychar = yylex (&yylval, p);
 }
 
 if (yychar <= YYEOF)
 {
- yychar = yytoken = YYEOF;
+ yychar = YYEOF;
+ yytoken = YYSYMBOL_YYEOF;
 YYDPRINTF ((stderr, "Now at end of input.\n"));
 }
+ else if (yychar == YYerror)
+ {
+ /* The scanner already issued an error message, process directly
+ to error recovery. But do not keep the error token as
+ lookahead, it is too special and may lead us to an endless
+ loop in error recovery. */
+ yychar = YYUNDEF;
+ yytoken = YYSYMBOL_YYerror;
+ goto yyerrlab1;
+ }
 else
 {
 yytoken = YYTRANSLATE (yychar);
@@ -6140,87 +6480,87 @@
 YY_REDUCE_PRINT (yyn);
 switch (yyn)
 {
- case 2:
-#line 1614 "mrbgems/mruby-compiler/core/parse.y"
+ case 2: /* $@1: %empty */
+#line 1625 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lstate = EXPR_BEG;
 if (!p->locals) p->locals = cons(0,0);
 }
-#line 6150 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6490 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 3:
-#line 1619 "mrbgems/mruby-compiler/core/parse.y"
+ case 3: /* program: $@1 top_compstmt */
+#line 1630 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->tree = new_scope(p, (yyvsp0.nd));
 NODE_LINENO(p->tree, (yyvsp0.nd));
 }
-#line 6159 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6499 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 4:
-#line 1626 "mrbgems/mruby-compiler/core/parse.y"
+ case 4: /* top_compstmt: top_stmts opt_terms */
+#line 1637 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 6167 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6507 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 5:
-#line 1632 "mrbgems/mruby-compiler/core/parse.y"
+ case 5: /* top_stmts: none */
+#line 1643 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_begin(p, 0);
 }
-#line 6175 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6515 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 6:
-#line 1636 "mrbgems/mruby-compiler/core/parse.y"
+ case 6: /* top_stmts: top_stmt */
+#line 1647 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_begin(p, (yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp0.nd));
 }
-#line 6184 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6524 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 7:
-#line 1641 "mrbgems/mruby-compiler/core/parse.y"
+ case 7: /* top_stmts: top_stmts terms top_stmt */
+#line 1652 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), newline_node((yyvsp0.nd)));
 }
-#line 6192 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6532 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 8:
-#line 1645 "mrbgems/mruby-compiler/core/parse.y"
+ case 8: /* top_stmts: error top_stmt */
+#line 1656 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_begin(p, 0);
 }
-#line 6200 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6540 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 10:
-#line 1652 "mrbgems/mruby-compiler/core/parse.y"
+ case 10: /* @2: %empty */
+#line 1663 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = local_switch(p);
 nvars_block(p);
 }
-#line 6209 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6549 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 11:
-#line 1657 "mrbgems/mruby-compiler/core/parse.y"
+ case 11: /* top_stmt: keyword_BEGIN @2 '{' top_compstmt '}' */
+#line 1668 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "BEGIN not supported");
 local_resume(p, (yyvsp-3.nd));
 nvars_unnest(p);
 (yyval.nd) = 0;
 }
-#line 6220 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6560 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 12:
-#line 1669 "mrbgems/mruby-compiler/core/parse.y"
+ case 12: /* bodystmt: compstmt opt_rescue opt_else opt_ensure */
+#line 1680 "mrbgems/mruby-compiler/core/parse.y"
 {
 if ((yyvsp-2.nd)) {
 (yyval.nd) = new_rescue(p, (yyvsp-3.nd), (yyvsp-2.nd), (yyvsp-1.nd));
@@ -6242,222 +6582,222 @@
 }
 }
 }
-#line 6246 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6586 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 13:
-#line 1693 "mrbgems/mruby-compiler/core/parse.y"
+ case 13: /* compstmt: stmts opt_terms */
+#line 1704 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 6254 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6594 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 14:
-#line 1699 "mrbgems/mruby-compiler/core/parse.y"
+ case 14: /* stmts: none */
+#line 1710 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_begin(p, 0);
 }
-#line 6262 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6602 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 15:
-#line 1703 "mrbgems/mruby-compiler/core/parse.y"
+ case 15: /* stmts: stmt */
+#line 1714 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_begin(p, (yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp0.nd));
 }
-#line 6271 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6611 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 16:
-#line 1708 "mrbgems/mruby-compiler/core/parse.y"
+ case 16: /* stmts: stmts terms stmt */
+#line 1719 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), newline_node((yyvsp0.nd)));
 }
-#line 6279 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6619 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 17:
-#line 1712 "mrbgems/mruby-compiler/core/parse.y"
+ case 17: /* stmts: error stmt */
+#line 1723 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_begin(p, (yyvsp0.nd));
 }
-#line 6287 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6627 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 18:
-#line 1717 "mrbgems/mruby-compiler/core/parse.y"
+ case 18: /* $@3: %empty */
+#line 1728 "mrbgems/mruby-compiler/core/parse.y"
 {p->lstate = EXPR_FNAME;}
-#line 6293 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6633 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 19:
-#line 1718 "mrbgems/mruby-compiler/core/parse.y"
+ case 19: /* stmt: keyword_alias fsym $@3 fsym */
+#line 1729 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_alias(p, (yyvsp-2.id), (yyvsp0.id));
 }
-#line 6301 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6641 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 20:
-#line 1722 "mrbgems/mruby-compiler/core/parse.y"
+ case 20: /* stmt: keyword_undef undef_list */
+#line 1733 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 6309 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6649 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 21:
-#line 1726 "mrbgems/mruby-compiler/core/parse.y"
+ case 21: /* stmt: stmt modifier_if expr_value */
+#line 1737 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_if(p, cond((yyvsp0.nd)), (yyvsp-2.nd), 0);
 }
-#line 6317 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6657 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 22:
-#line 1730 "mrbgems/mruby-compiler/core/parse.y"
+ case 22: /* stmt: stmt modifier_unless expr_value */
+#line 1741 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_unless(p, cond((yyvsp0.nd)), (yyvsp-2.nd), 0);
 }
-#line 6325 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6665 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 23:
-#line 1734 "mrbgems/mruby-compiler/core/parse.y"
+ case 23: /* stmt: stmt modifier_while expr_value */
+#line 1745 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_while(p, cond((yyvsp0.nd)), (yyvsp-2.nd));
 }
-#line 6333 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6673 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 24:
-#line 1738 "mrbgems/mruby-compiler/core/parse.y"
+ case 24: /* stmt: stmt modifier_until expr_value */
+#line 1749 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_until(p, cond((yyvsp0.nd)), (yyvsp-2.nd));
 }
-#line 6341 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6681 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 25:
-#line 1742 "mrbgems/mruby-compiler/core/parse.y"
+ case 25: /* stmt: stmt modifier_rescue stmt */
+#line 1753 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6349 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6689 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 26:
-#line 1746 "mrbgems/mruby-compiler/core/parse.y"
+ case 26: /* stmt: keyword_END '{' compstmt '}' */
+#line 1757 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "END not supported");
 (yyval.nd) = new_postexe(p, (yyvsp-1.nd));
 }
-#line 6358 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6698 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 28:
-#line 1752 "mrbgems/mruby-compiler/core/parse.y"
+ case 28: /* stmt: mlhs '=' command_call */
+#line 1763 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_masgn(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6366 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6706 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 29:
-#line 1756 "mrbgems/mruby-compiler/core/parse.y"
+ case 29: /* stmt: lhs '=' mrhs */
+#line 1767 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_asgn(p, (yyvsp-2.nd), new_array(p, (yyvsp0.nd)));
 }
-#line 6374 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6714 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 30:
-#line 1760 "mrbgems/mruby-compiler/core/parse.y"
+ case 30: /* stmt: mlhs '=' arg */
+#line 1771 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_masgn(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6382 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6722 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 31:
-#line 1764 "mrbgems/mruby-compiler/core/parse.y"
+ case 31: /* stmt: mlhs '=' mrhs */
+#line 1775 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_masgn(p, (yyvsp-2.nd), new_array(p, (yyvsp0.nd)));
 }
-#line 6390 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6730 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 32:
-#line 1768 "mrbgems/mruby-compiler/core/parse.y"
+ case 32: /* stmt: arg "=>" "local variable or method" */
+#line 1779 "mrbgems/mruby-compiler/core/parse.y"
 {
 node *lhs = new_lvar(p, (yyvsp0.id));
 assignable(p, lhs);
 (yyval.nd) = new_asgn(p, lhs, (yyvsp-2.nd));
 }
-#line 6400 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6740 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 34:
-#line 1777 "mrbgems/mruby-compiler/core/parse.y"
+ case 34: /* command_asgn: lhs '=' command_rhs */
+#line 1788 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_asgn(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6408 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6748 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 35:
-#line 1781 "mrbgems/mruby-compiler/core/parse.y"
+ case 35: /* command_asgn: var_lhs tOP_ASGN command_rhs */
+#line 1792 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, (yyvsp-2.nd), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 6416 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6756 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 36:
-#line 1785 "mrbgems/mruby-compiler/core/parse.y"
+ case 36: /* command_asgn: primary_value '' opt_call_args '' tOP_ASGN command_rhs */
+#line 1796 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-5.nd), intern_op(aref), (yyvsp-3.nd), '.'), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 6424 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6764 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 37:
-#line 1789 "mrbgems/mruby-compiler/core/parse.y"
+ case 37: /* command_asgn: primary_value call_op "local variable or method" tOP_ASGN command_rhs */
+#line 1800 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-4.nd), (yyvsp-2.id), 0, (yyvsp-3.num)), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 6432 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6772 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 38:
-#line 1793 "mrbgems/mruby-compiler/core/parse.y"
+ case 38: /* command_asgn: primary_value call_op "constant" tOP_ASGN command_rhs */
+#line 1804 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-4.nd), (yyvsp-2.id), 0, (yyvsp-3.num)), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 6440 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6780 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 39:
-#line 1797 "mrbgems/mruby-compiler/core/parse.y"
+ case 39: /* command_asgn: primary_value "::" "constant" tOP_ASGN command_call */
+#line 1808 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "constant re-assignment");
 (yyval.nd) = 0;
 }
-#line 6449 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6789 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 40:
-#line 1802 "mrbgems/mruby-compiler/core/parse.y"
+ case 40: /* command_asgn: primary_value "::" "local variable or method" tOP_ASGN command_rhs */
+#line 1813 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-4.nd), (yyvsp-2.id), 0, tCOLON2), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 6457 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6797 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 41:
-#line 1806 "mrbgems/mruby-compiler/core/parse.y"
+ case 41: /* command_asgn: defn_head f_opt_arglist_paren '=' command */
+#line 1817 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-3.nd);
 endless_method_name(p, (yyvsp-3.nd));
@@ -6466,11 +6806,11 @@
 nvars_unnest(p);
 p->in_def--;
 }
-#line 6470 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6810 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 42:
-#line 1815 "mrbgems/mruby-compiler/core/parse.y"
+ case 42: /* command_asgn: defn_head f_opt_arglist_paren '=' command modifier_rescue arg */
+#line 1826 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-5.nd);
 endless_method_name(p, (yyvsp-5.nd));
@@ -6479,11 +6819,11 @@
 nvars_unnest(p);
 p->in_def--;
 }
-#line 6483 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6823 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 43:
-#line 1824 "mrbgems/mruby-compiler/core/parse.y"
+ case 43: /* command_asgn: defs_head f_opt_arglist_paren '=' command */
+#line 1835 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-3.nd);
 void_expr_error(p, (yyvsp0.nd));
@@ -6492,11 +6832,11 @@
 p->in_def--;
 p->in_single--;
 }
-#line 6496 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6836 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 44:
-#line 1833 "mrbgems/mruby-compiler/core/parse.y"
+ case 44: /* command_asgn: defs_head f_opt_arglist_paren '=' command modifier_rescue arg */
+#line 1844 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-5.nd);
 void_expr_error(p, (yyvsp-2.nd));
@@ -6505,79 +6845,79 @@
 p->in_def--;
 p->in_single--;
 }
-#line 6509 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6849 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 45:
-#line 1842 "mrbgems/mruby-compiler/core/parse.y"
+ case 45: /* command_asgn: backref tOP_ASGN command_rhs */
+#line 1853 "mrbgems/mruby-compiler/core/parse.y"
 {
 backref_error(p, (yyvsp-2.nd));
 (yyval.nd) = new_begin(p, 0);
 }
-#line 6518 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6858 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 47:
-#line 1850 "mrbgems/mruby-compiler/core/parse.y"
+ case 47: /* command_rhs: command_call modifier_rescue stmt */
+#line 1861 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6526 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6866 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 50:
-#line 1859 "mrbgems/mruby-compiler/core/parse.y"
+ case 50: /* expr: expr keyword_and expr */
+#line 1870 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_and(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6534 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6874 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 51:
-#line 1863 "mrbgems/mruby-compiler/core/parse.y"
+ case 51: /* expr: expr keyword_or expr */
+#line 1874 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_or(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6542 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6882 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 52:
-#line 1867 "mrbgems/mruby-compiler/core/parse.y"
+ case 52: /* expr: keyword_not opt_nl expr */
+#line 1878 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "!");
 }
-#line 6550 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6890 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 53:
-#line 1871 "mrbgems/mruby-compiler/core/parse.y"
+ case 53: /* expr: '!' command_call */
+#line 1882 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "!");
 }
-#line 6558 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6898 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 55:
-#line 1879 "mrbgems/mruby-compiler/core/parse.y"
+ case 55: /* defn_head: keyword_def fname */
+#line 1890 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_def(p, (yyvsp0.id), nint(p->cmdarg_stack), local_switch(p));
 p->cmdarg_stack = 0;
 p->in_def++;
 nvars_block(p);
 }
-#line 6569 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6909 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 56:
-#line 1888 "mrbgems/mruby-compiler/core/parse.y"
+ case 56: /* $@4: %empty */
+#line 1899 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lstate = EXPR_FNAME;
 }
-#line 6577 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6917 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 57:
-#line 1892 "mrbgems/mruby-compiler/core/parse.y"
+ case 57: /* defs_head: keyword_def singleton dot_or_colon $@4 fname */
+#line 1903 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_sdef(p, (yyvsp-3.nd), (yyvsp0.id), nint(p->cmdarg_stack), local_switch(p));
 p->cmdarg_stack = 0;
@@ -6586,1054 +6926,1054 @@
 nvars_block(p);
 p->lstate = EXPR_ENDFN; /* force for args */
 }
-#line 6590 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6930 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 58:
-#line 1903 "mrbgems/mruby-compiler/core/parse.y"
+ case 58: /* expr_value: expr */
+#line 1914 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (!(yyvsp0.nd)) (yyval.nd) = new_nil(p);
 else {
 (yyval.nd) = (yyvsp0.nd);
 }
 }
-#line 6601 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6941 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 62:
-#line 1917 "mrbgems/mruby-compiler/core/parse.y"
+ case 62: /* block_command: block_call call_op2 operation2 command_args */
+#line 1928 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
 }
-#line 6609 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6949 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 63:
-#line 1923 "mrbgems/mruby-compiler/core/parse.y"
+ case 63: /* $@5: %empty */
+#line 1934 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_nest(p);
 nvars_nest(p);
 }
-#line 6618 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6958 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 64:
-#line 1930 "mrbgems/mruby-compiler/core/parse.y"
+ case 64: /* cmd_brace_block: "{" $@5 opt_block_param compstmt '}' */
+#line 1941 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_block(p, (yyvsp-2.nd), (yyvsp-1.nd));
 local_unnest(p);
 nvars_unnest(p);
 }
-#line 6628 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6968 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 65:
-#line 1938 "mrbgems/mruby-compiler/core/parse.y"
+ case 65: /* command: operation command_args */
+#line 1949 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_fcall(p, (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 6636 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6976 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 66:
-#line 1942 "mrbgems/mruby-compiler/core/parse.y"
+ case 66: /* command: operation command_args cmd_brace_block */
+#line 1953 "mrbgems/mruby-compiler/core/parse.y"
 {
 args_with_block(p, (yyvsp-1.nd), (yyvsp0.nd));
 (yyval.nd) = new_fcall(p, (yyvsp-2.id), (yyvsp-1.nd));
 }
-#line 6645 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6985 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 67:
-#line 1947 "mrbgems/mruby-compiler/core/parse.y"
+ case 67: /* command: primary_value call_op operation2 command_args */
+#line 1958 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
 }
-#line 6653 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6993 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 68:
-#line 1951 "mrbgems/mruby-compiler/core/parse.y"
+ case 68: /* command: primary_value call_op operation2 command_args cmd_brace_block */
+#line 1962 "mrbgems/mruby-compiler/core/parse.y"
 {
 args_with_block(p, (yyvsp-1.nd), (yyvsp0.nd));
 (yyval.nd) = new_call(p, (yyvsp-4.nd), (yyvsp-2.id), (yyvsp-1.nd), (yyvsp-3.num));
 }
-#line 6662 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7002 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 69:
-#line 1956 "mrbgems/mruby-compiler/core/parse.y"
+ case 69: /* command: primary_value "::" operation2 command_args */
+#line 1967 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), tCOLON2);
 }
-#line 6670 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7010 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 70:
-#line 1960 "mrbgems/mruby-compiler/core/parse.y"
+ case 70: /* command: primary_value "::" operation2 command_args cmd_brace_block */
+#line 1971 "mrbgems/mruby-compiler/core/parse.y"
 {
 args_with_block(p, (yyvsp-1.nd), (yyvsp0.nd));
 (yyval.nd) = new_call(p, (yyvsp-4.nd), (yyvsp-2.id), (yyvsp-1.nd), tCOLON2);
 }
-#line 6679 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7019 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 71:
-#line 1965 "mrbgems/mruby-compiler/core/parse.y"
+ case 71: /* command: keyword_super command_args */
+#line 1976 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_super(p, (yyvsp0.nd));
 }
-#line 6687 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7027 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 72:
-#line 1969 "mrbgems/mruby-compiler/core/parse.y"
+ case 72: /* command: keyword_yield command_args */
+#line 1980 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_yield(p, (yyvsp0.nd));
 }
-#line 6695 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7035 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 73:
-#line 1973 "mrbgems/mruby-compiler/core/parse.y"
+ case 73: /* command: keyword_return call_args */
+#line 1984 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_return(p, ret_args(p, (yyvsp0.nd)));
 }
-#line 6703 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7043 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 74:
-#line 1977 "mrbgems/mruby-compiler/core/parse.y"
+ case 74: /* command: keyword_break call_args */
+#line 1988 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_break(p, ret_args(p, (yyvsp0.nd)));
 }
-#line 6711 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7051 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 75:
-#line 1981 "mrbgems/mruby-compiler/core/parse.y"
+ case 75: /* command: keyword_next call_args */
+#line 1992 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_next(p, ret_args(p, (yyvsp0.nd)));
 }
-#line 6719 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7059 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 76:
-#line 1987 "mrbgems/mruby-compiler/core/parse.y"
+ case 76: /* mlhs: mlhs_basic */
+#line 1998 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 6727 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7067 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 77:
-#line 1991 "mrbgems/mruby-compiler/core/parse.y"
+ case 77: /* mlhs: tLPAREN mlhs_inner rparen */
+#line 2002 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 6735 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7075 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 79:
-#line 1998 "mrbgems/mruby-compiler/core/parse.y"
+ case 79: /* mlhs_inner: tLPAREN mlhs_inner rparen */
+#line 2009 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 6743 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7083 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 80:
-#line 2004 "mrbgems/mruby-compiler/core/parse.y"
+ case 80: /* mlhs_basic: mlhs_list */
+#line 2015 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 6751 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7091 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 81:
-#line 2008 "mrbgems/mruby-compiler/core/parse.y"
+ case 81: /* mlhs_basic: mlhs_list mlhs_item */
+#line 2019 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1(push((yyvsp-1.nd),(yyvsp0.nd)));
 }
-#line 6759 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7099 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 82:
-#line 2012 "mrbgems/mruby-compiler/core/parse.y"
+ case 82: /* mlhs_basic: mlhs_list "*" mlhs_node */
+#line 2023 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list2((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6767 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7107 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 83:
-#line 2016 "mrbgems/mruby-compiler/core/parse.y"
+ case 83: /* mlhs_basic: mlhs_list "*" mlhs_node ',' mlhs_post */
+#line 2027 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3((yyvsp-4.nd), (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6775 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7115 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 84:
-#line 2020 "mrbgems/mruby-compiler/core/parse.y"
+ case 84: /* mlhs_basic: mlhs_list "*" */
+#line 2031 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list2((yyvsp-1.nd), new_nil(p));
 }
-#line 6783 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7123 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 85:
-#line 2024 "mrbgems/mruby-compiler/core/parse.y"
+ case 85: /* mlhs_basic: mlhs_list "*" ',' mlhs_post */
+#line 2035 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3((yyvsp-3.nd), new_nil(p), (yyvsp0.nd));
 }
-#line 6791 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7131 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 86:
-#line 2028 "mrbgems/mruby-compiler/core/parse.y"
+ case 86: /* mlhs_basic: "*" mlhs_node */
+#line 2039 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list2(0, (yyvsp0.nd));
 }
-#line 6799 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7139 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 87:
-#line 2032 "mrbgems/mruby-compiler/core/parse.y"
+ case 87: /* mlhs_basic: "*" mlhs_node ',' mlhs_post */
+#line 2043 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3(0, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 6807 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7147 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 88:
-#line 2036 "mrbgems/mruby-compiler/core/parse.y"
+ case 88: /* mlhs_basic: "*" */
+#line 2047 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list2(0, new_nil(p));
 }
-#line 6815 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7155 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 89:
-#line 2040 "mrbgems/mruby-compiler/core/parse.y"
+ case 89: /* mlhs_basic: "*" ',' mlhs_post */
+#line 2051 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3(0, new_nil(p), (yyvsp0.nd));
 }
-#line 6823 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7163 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 91:
-#line 2047 "mrbgems/mruby-compiler/core/parse.y"
+ case 91: /* mlhs_item: tLPAREN mlhs_inner rparen */
+#line 2058 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_masgn(p, (yyvsp-1.nd), NULL);
 }
-#line 6831 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7171 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 92:
-#line 2053 "mrbgems/mruby-compiler/core/parse.y"
+ case 92: /* mlhs_list: mlhs_item ',' */
+#line 2064 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp-1.nd));
 }
-#line 6839 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7179 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 93:
-#line 2057 "mrbgems/mruby-compiler/core/parse.y"
+ case 93: /* mlhs_list: mlhs_list mlhs_item ',' */
+#line 2068 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp-1.nd));
 }
-#line 6847 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7187 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 94:
-#line 2063 "mrbgems/mruby-compiler/core/parse.y"
+ case 94: /* mlhs_post: mlhs_item */
+#line 2074 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 6855 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7195 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 95:
-#line 2067 "mrbgems/mruby-compiler/core/parse.y"
+ case 95: /* mlhs_post: mlhs_list mlhs_item */
+#line 2078 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 6863 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7203 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 96:
-#line 2073 "mrbgems/mruby-compiler/core/parse.y"
+ case 96: /* mlhs_node: variable */
+#line 2084 "mrbgems/mruby-compiler/core/parse.y"
 {
 assignable(p, (yyvsp0.nd));
 }
-#line 6871 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7211 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 97:
-#line 2077 "mrbgems/mruby-compiler/core/parse.y"
+ case 97: /* mlhs_node: primary_value '' opt_call_args '' */
+#line 2088 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_op(aref), (yyvsp-1.nd), '.');
 }
-#line 6879 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7219 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 98:
-#line 2081 "mrbgems/mruby-compiler/core/parse.y"
+ case 98: /* mlhs_node: primary_value call_op "local variable or method" */
+#line 2092 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
 }
-#line 6887 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7227 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 99:
-#line 2085 "mrbgems/mruby-compiler/core/parse.y"
+ case 99: /* mlhs_node: primary_value "::" "local variable or method" */
+#line 2096 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, tCOLON2);
 }
-#line 6895 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7235 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 100:
-#line 2089 "mrbgems/mruby-compiler/core/parse.y"
+ case 100: /* mlhs_node: primary_value call_op "constant" */
+#line 2100 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
 }
-#line 6903 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7243 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 101:
-#line 2093 "mrbgems/mruby-compiler/core/parse.y"
+ case 101: /* mlhs_node: primary_value "::" "constant" */
+#line 2104 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (p->in_def || p->in_single)
 yyerror(p, "dynamic constant assignment");
 (yyval.nd) = new_colon2(p, (yyvsp-2.nd), (yyvsp0.id));
 }
-#line 6913 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7253 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 102:
-#line 2099 "mrbgems/mruby-compiler/core/parse.y"
+ case 102: /* mlhs_node: tCOLON3 "constant" */
+#line 2110 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (p->in_def || p->in_single)
 yyerror(p, "dynamic constant assignment");
 (yyval.nd) = new_colon3(p, (yyvsp0.id));
 }
-#line 6923 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7263 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 103:
-#line 2105 "mrbgems/mruby-compiler/core/parse.y"
+ case 103: /* mlhs_node: backref */
+#line 2116 "mrbgems/mruby-compiler/core/parse.y"
 {
 backref_error(p, (yyvsp0.nd));
 (yyval.nd) = 0;
 }
-#line 6932 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7272 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 104:
-#line 2112 "mrbgems/mruby-compiler/core/parse.y"
+ case 104: /* lhs: variable */
+#line 2123 "mrbgems/mruby-compiler/core/parse.y"
 {
 assignable(p, (yyvsp0.nd));
 }
-#line 6940 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7280 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 105:
-#line 2116 "mrbgems/mruby-compiler/core/parse.y"
+ case 105: /* lhs: primary_value '' opt_call_args '' */
+#line 2127 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_op(aref), (yyvsp-1.nd), '.');
 }
-#line 6948 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7288 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 106:
-#line 2120 "mrbgems/mruby-compiler/core/parse.y"
+ case 106: /* lhs: primary_value call_op "local variable or method" */
+#line 2131 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
 }
-#line 6956 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7296 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 107:
-#line 2124 "mrbgems/mruby-compiler/core/parse.y"
+ case 107: /* lhs: primary_value "::" "local variable or method" */
+#line 2135 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, tCOLON2);
 }
-#line 6964 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7304 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 108:
-#line 2128 "mrbgems/mruby-compiler/core/parse.y"
+ case 108: /* lhs: primary_value call_op "constant" */
+#line 2139 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
 }
-#line 6972 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7312 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 109:
-#line 2132 "mrbgems/mruby-compiler/core/parse.y"
+ case 109: /* lhs: primary_value "::" "constant" */
+#line 2143 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (p->in_def || p->in_single)
 yyerror(p, "dynamic constant assignment");
 (yyval.nd) = new_colon2(p, (yyvsp-2.nd), (yyvsp0.id));
 }
-#line 6982 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7322 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 110:
-#line 2138 "mrbgems/mruby-compiler/core/parse.y"
+ case 110: /* lhs: tCOLON3 "constant" */
+#line 2149 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (p->in_def || p->in_single)
 yyerror(p, "dynamic constant assignment");
 (yyval.nd) = new_colon3(p, (yyvsp0.id));
 }
-#line 6992 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7332 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 111:
-#line 2144 "mrbgems/mruby-compiler/core/parse.y"
+ case 111: /* lhs: backref */
+#line 2155 "mrbgems/mruby-compiler/core/parse.y"
 {
 backref_error(p, (yyvsp0.nd));
 (yyval.nd) = 0;
 }
-#line 7001 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7341 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 112:
-#line 2149 "mrbgems/mruby-compiler/core/parse.y"
+ case 112: /* lhs: "numbered parameter" */
+#line 2160 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "can't assign to numbered parameter");
 }
-#line 7009 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7349 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 113:
-#line 2155 "mrbgems/mruby-compiler/core/parse.y"
+ case 113: /* cname: "local variable or method" */
+#line 2166 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "class/module name must be CONSTANT");
 }
-#line 7017 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7357 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 115:
-#line 2162 "mrbgems/mruby-compiler/core/parse.y"
+ case 115: /* cpath: tCOLON3 cname */
+#line 2173 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = cons(nint(1), nsym((yyvsp0.id)));
 }
-#line 7025 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7365 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 116:
-#line 2166 "mrbgems/mruby-compiler/core/parse.y"
+ case 116: /* cpath: cname */
+#line 2177 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = cons(nint(0), nsym((yyvsp0.id)));
 }
-#line 7033 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7373 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 117:
-#line 2170 "mrbgems/mruby-compiler/core/parse.y"
+ case 117: /* cpath: primary_value "::" cname */
+#line 2181 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp-2.nd));
 (yyval.nd) = cons((yyvsp-2.nd), nsym((yyvsp0.id)));
 }
-#line 7042 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7382 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 121:
-#line 2180 "mrbgems/mruby-compiler/core/parse.y"
+ case 121: /* fname: op */
+#line 2191 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lstate = EXPR_ENDFN;
 (yyval.id) = (yyvsp0.id);
 }
-#line 7051 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7391 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 122:
-#line 2185 "mrbgems/mruby-compiler/core/parse.y"
+ case 122: /* fname: reswords */
+#line 2196 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lstate = EXPR_ENDFN;
 (yyval.id) = (yyvsp0.id);
 }
-#line 7060 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7400 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 125:
-#line 2196 "mrbgems/mruby-compiler/core/parse.y"
+ case 125: /* undef_list: fsym */
+#line 2207 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_undef(p, (yyvsp0.id));
 }
-#line 7068 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7408 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 126:
-#line 2199 "mrbgems/mruby-compiler/core/parse.y"
+ case 126: /* $@6: %empty */
+#line 2210 "mrbgems/mruby-compiler/core/parse.y"
 {p->lstate = EXPR_FNAME;}
-#line 7074 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7414 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 127:
-#line 2200 "mrbgems/mruby-compiler/core/parse.y"
+ case 127: /* undef_list: undef_list ',' $@6 fsym */
+#line 2211 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-3.nd), nsym((yyvsp0.id)));
 }
-#line 7082 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7422 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 128:
-#line 2205 "mrbgems/mruby-compiler/core/parse.y"
+ case 128: /* op: '|' */
+#line 2216 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(or); }
-#line 7088 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7428 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 129:
-#line 2206 "mrbgems/mruby-compiler/core/parse.y"
+ case 129: /* op: '^' */
+#line 2217 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(xor); }
-#line 7094 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7434 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 130:
-#line 2207 "mrbgems/mruby-compiler/core/parse.y"
+ case 130: /* op: '&' */
+#line 2218 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(and); }
-#line 7100 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7440 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 131:
-#line 2208 "mrbgems/mruby-compiler/core/parse.y"
+ case 131: /* op: "<=>" */
+#line 2219 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(cmp); }
-#line 7106 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7446 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 132:
-#line 2209 "mrbgems/mruby-compiler/core/parse.y"
+ case 132: /* op: "==" */
+#line 2220 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(eq); }
-#line 7112 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7452 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 133:
-#line 2210 "mrbgems/mruby-compiler/core/parse.y"
+ case 133: /* op: "===" */
+#line 2221 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(eqq); }
-#line 7118 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7458 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 134:
-#line 2211 "mrbgems/mruby-compiler/core/parse.y"
+ case 134: /* op: "=~" */
+#line 2222 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(match); }
-#line 7124 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7464 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 135:
-#line 2212 "mrbgems/mruby-compiler/core/parse.y"
+ case 135: /* op: "!~" */
+#line 2223 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(nmatch); }
-#line 7130 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7470 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 136:
-#line 2213 "mrbgems/mruby-compiler/core/parse.y"
+ case 136: /* op: '>' */
+#line 2224 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(gt); }
-#line 7136 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7476 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 137:
-#line 2214 "mrbgems/mruby-compiler/core/parse.y"
+ case 137: /* op: ">=" */
+#line 2225 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(ge); }
-#line 7142 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7482 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 138:
-#line 2215 "mrbgems/mruby-compiler/core/parse.y"
+ case 138: /* op: '<' */
+#line 2226 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(lt); }
-#line 7148 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7488 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 139:
-#line 2216 "mrbgems/mruby-compiler/core/parse.y"
+ case 139: /* op: "<=" */
+#line 2227 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(le); }
-#line 7154 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7494 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 140:
-#line 2217 "mrbgems/mruby-compiler/core/parse.y"
+ case 140: /* op: "!=" */
+#line 2228 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(neq); }
-#line 7160 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7500 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 141:
-#line 2218 "mrbgems/mruby-compiler/core/parse.y"
+ case 141: /* op: "<<" */
+#line 2229 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(lshift); }
-#line 7166 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7506 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 142:
-#line 2219 "mrbgems/mruby-compiler/core/parse.y"
+ case 142: /* op: ">>" */
+#line 2230 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(rshift); }
-#line 7172 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7512 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 143:
-#line 2220 "mrbgems/mruby-compiler/core/parse.y"
+ case 143: /* op: '+' */
+#line 2231 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(add); }
-#line 7178 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7518 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 144:
-#line 2221 "mrbgems/mruby-compiler/core/parse.y"
+ case 144: /* op: '-' */
+#line 2232 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(sub); }
-#line 7184 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7524 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 145:
-#line 2222 "mrbgems/mruby-compiler/core/parse.y"
+ case 145: /* op: '*' */
+#line 2233 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(mul); }
-#line 7190 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7530 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 146:
-#line 2223 "mrbgems/mruby-compiler/core/parse.y"
+ case 146: /* op: "*" */
+#line 2234 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(mul); }
-#line 7196 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7536 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 147:
-#line 2224 "mrbgems/mruby-compiler/core/parse.y"
+ case 147: /* op: '/' */
+#line 2235 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(div); }
-#line 7202 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7542 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 148:
-#line 2225 "mrbgems/mruby-compiler/core/parse.y"
+ case 148: /* op: '%' */
+#line 2236 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(mod); }
-#line 7208 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7548 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 149:
-#line 2226 "mrbgems/mruby-compiler/core/parse.y"
+ case 149: /* op: tPOW */
+#line 2237 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(pow); }
-#line 7214 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7554 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 150:
-#line 2227 "mrbgems/mruby-compiler/core/parse.y"
+ case 150: /* op: "**" */
+#line 2238 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(pow); }
-#line 7220 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7560 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 151:
-#line 2228 "mrbgems/mruby-compiler/core/parse.y"
+ case 151: /* op: '!' */
+#line 2239 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(not); }
-#line 7226 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7566 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 152:
-#line 2229 "mrbgems/mruby-compiler/core/parse.y"
+ case 152: /* op: '~' */
+#line 2240 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(neg); }
-#line 7232 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7572 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 153:
-#line 2230 "mrbgems/mruby-compiler/core/parse.y"
+ case 153: /* op: "unary plus" */
+#line 2241 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(plus); }
-#line 7238 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7578 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 154:
-#line 2231 "mrbgems/mruby-compiler/core/parse.y"
+ case 154: /* op: "unary minus" */
+#line 2242 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(minus); }
-#line 7244 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7584 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 155:
-#line 2232 "mrbgems/mruby-compiler/core/parse.y"
+ case 155: /* op: tAREF */
+#line 2243 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(aref); }
-#line 7250 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7590 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 156:
-#line 2233 "mrbgems/mruby-compiler/core/parse.y"
+ case 156: /* op: tASET */
+#line 2244 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(aset); }
-#line 7256 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7596 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 157:
-#line 2234 "mrbgems/mruby-compiler/core/parse.y"
+ case 157: /* op: '`' */
+#line 2245 "mrbgems/mruby-compiler/core/parse.y"
 { (yyval.id) = intern_op(tick); }
-#line 7262 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7602 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 198:
-#line 2252 "mrbgems/mruby-compiler/core/parse.y"
+ case 198: /* arg: lhs '=' arg_rhs */
+#line 2263 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_asgn(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7270 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7610 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 199:
-#line 2256 "mrbgems/mruby-compiler/core/parse.y"
+ case 199: /* arg: var_lhs tOP_ASGN arg_rhs */
+#line 2267 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, (yyvsp-2.nd), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 7278 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7618 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 200:
-#line 2260 "mrbgems/mruby-compiler/core/parse.y"
+ case 200: /* arg: primary_value '' opt_call_args '' tOP_ASGN arg_rhs */
+#line 2271 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-5.nd), intern_op(aref), (yyvsp-3.nd), '.'), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 7286 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7626 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 201:
-#line 2264 "mrbgems/mruby-compiler/core/parse.y"
+ case 201: /* arg: primary_value call_op "local variable or method" tOP_ASGN arg_rhs */
+#line 2275 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-4.nd), (yyvsp-2.id), 0, (yyvsp-3.num)), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 7294 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7634 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 202:
-#line 2268 "mrbgems/mruby-compiler/core/parse.y"
+ case 202: /* arg: primary_value call_op "constant" tOP_ASGN arg_rhs */
+#line 2279 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-4.nd), (yyvsp-2.id), 0, (yyvsp-3.num)), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 7302 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7642 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 203:
-#line 2272 "mrbgems/mruby-compiler/core/parse.y"
+ case 203: /* arg: primary_value "::" "local variable or method" tOP_ASGN arg_rhs */
+#line 2283 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-4.nd), (yyvsp-2.id), 0, tCOLON2), (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 7310 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7650 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 204:
-#line 2276 "mrbgems/mruby-compiler/core/parse.y"
+ case 204: /* arg: primary_value "::" "constant" tOP_ASGN arg_rhs */
+#line 2287 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "constant re-assignment");
 (yyval.nd) = new_begin(p, 0);
 }
-#line 7319 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7659 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 205:
-#line 2281 "mrbgems/mruby-compiler/core/parse.y"
+ case 205: /* arg: tCOLON3 "constant" tOP_ASGN arg_rhs */
+#line 2292 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "constant re-assignment");
 (yyval.nd) = new_begin(p, 0);
 }
-#line 7328 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7668 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 206:
-#line 2286 "mrbgems/mruby-compiler/core/parse.y"
+ case 206: /* arg: backref tOP_ASGN arg_rhs */
+#line 2297 "mrbgems/mruby-compiler/core/parse.y"
 {
 backref_error(p, (yyvsp-2.nd));
 (yyval.nd) = new_begin(p, 0);
 }
-#line 7337 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7677 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 207:
-#line 2291 "mrbgems/mruby-compiler/core/parse.y"
+ case 207: /* arg: arg ".." arg */
+#line 2302 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_dot2(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7345 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7685 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 208:
-#line 2295 "mrbgems/mruby-compiler/core/parse.y"
+ case 208: /* arg: arg ".." */
+#line 2306 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_dot2(p, (yyvsp-1.nd), new_nil(p));
 }
-#line 7353 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7693 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 209:
-#line 2299 "mrbgems/mruby-compiler/core/parse.y"
+ case 209: /* arg: tBDOT2 arg */
+#line 2310 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_dot2(p, new_nil(p), (yyvsp0.nd));
 }
-#line 7361 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7701 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 210:
-#line 2303 "mrbgems/mruby-compiler/core/parse.y"
+ case 210: /* arg: arg "..." arg */
+#line 2314 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_dot3(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7369 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7709 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 211:
-#line 2307 "mrbgems/mruby-compiler/core/parse.y"
+ case 211: /* arg: arg "..." */
+#line 2318 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_dot3(p, (yyvsp-1.nd), new_nil(p));
 }
-#line 7377 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7717 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 212:
-#line 2311 "mrbgems/mruby-compiler/core/parse.y"
+ case 212: /* arg: tBDOT3 arg */
+#line 2322 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_dot3(p, new_nil(p), (yyvsp0.nd));
 }
-#line 7385 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7725 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 213:
-#line 2315 "mrbgems/mruby-compiler/core/parse.y"
+ case 213: /* arg: arg '+' arg */
+#line 2326 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "+", (yyvsp0.nd));
 }
-#line 7393 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7733 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 214:
-#line 2319 "mrbgems/mruby-compiler/core/parse.y"
+ case 214: /* arg: arg '-' arg */
+#line 2330 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "-", (yyvsp0.nd));
 }
-#line 7401 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7741 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 215:
-#line 2323 "mrbgems/mruby-compiler/core/parse.y"
+ case 215: /* arg: arg '*' arg */
+#line 2334 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "*", (yyvsp0.nd));
 }
-#line 7409 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7749 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 216:
-#line 2327 "mrbgems/mruby-compiler/core/parse.y"
+ case 216: /* arg: arg '/' arg */
+#line 2338 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "/", (yyvsp0.nd));
 }
-#line 7417 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7757 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 217:
-#line 2331 "mrbgems/mruby-compiler/core/parse.y"
+ case 217: /* arg: arg '%' arg */
+#line 2342 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "%", (yyvsp0.nd));
 }
-#line 7425 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7765 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 218:
-#line 2335 "mrbgems/mruby-compiler/core/parse.y"
+ case 218: /* arg: arg tPOW arg */
+#line 2346 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd));
 }
-#line 7433 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7773 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 219:
-#line 2339 "mrbgems/mruby-compiler/core/parse.y"
+ case 219: /* arg: tUMINUS_NUM "integer literal" tPOW arg */
+#line 2350 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd)));
 }
-#line 7441 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7781 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 220:
-#line 2343 "mrbgems/mruby-compiler/core/parse.y"
+ case 220: /* arg: tUMINUS_NUM "float literal" tPOW arg */
+#line 2354 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd)));
 }
-#line 7449 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7789 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 221:
-#line 2347 "mrbgems/mruby-compiler/core/parse.y"
+ case 221: /* arg: "unary plus" arg */
+#line 2358 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_uni_op(p, (yyvsp0.nd), "+@");
 }
-#line 7457 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7797 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 222:
-#line 2351 "mrbgems/mruby-compiler/core/parse.y"
+ case 222: /* arg: "unary minus" arg */
+#line 2362 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_negate(p, (yyvsp0.nd));
 }
-#line 7465 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7805 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 223:
-#line 2355 "mrbgems/mruby-compiler/core/parse.y"
+ case 223: /* arg: arg '|' arg */
+#line 2366 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "|", (yyvsp0.nd));
 }
-#line 7473 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7813 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 224:
-#line 2359 "mrbgems/mruby-compiler/core/parse.y"
+ case 224: /* arg: arg '^' arg */
+#line 2370 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "^", (yyvsp0.nd));
 }
-#line 7481 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7821 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 225:
-#line 2363 "mrbgems/mruby-compiler/core/parse.y"
+ case 225: /* arg: arg '&' arg */
+#line 2374 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "&", (yyvsp0.nd));
 }
-#line 7489 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7829 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 226:
-#line 2367 "mrbgems/mruby-compiler/core/parse.y"
+ case 226: /* arg: arg "<=>" arg */
+#line 2378 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<=>", (yyvsp0.nd));
 }
-#line 7497 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7837 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 227:
-#line 2371 "mrbgems/mruby-compiler/core/parse.y"
+ case 227: /* arg: arg '>' arg */
+#line 2382 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), ">", (yyvsp0.nd));
 }
-#line 7505 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7845 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 228:
-#line 2375 "mrbgems/mruby-compiler/core/parse.y"
+ case 228: /* arg: arg ">=" arg */
+#line 2386 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), ">=", (yyvsp0.nd));
 }
-#line 7513 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7853 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 229:
-#line 2379 "mrbgems/mruby-compiler/core/parse.y"
+ case 229: /* arg: arg '<' arg */
+#line 2390 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<", (yyvsp0.nd));
 }
-#line 7521 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7861 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 230:
-#line 2383 "mrbgems/mruby-compiler/core/parse.y"
+ case 230: /* arg: arg "<=" arg */
+#line 2394 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<=", (yyvsp0.nd));
 }
-#line 7529 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7869 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 231:
-#line 2387 "mrbgems/mruby-compiler/core/parse.y"
+ case 231: /* arg: arg "==" arg */
+#line 2398 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "==", (yyvsp0.nd));
 }
-#line 7537 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7877 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 232:
-#line 2391 "mrbgems/mruby-compiler/core/parse.y"
+ case 232: /* arg: arg "===" arg */
+#line 2402 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "===", (yyvsp0.nd));
 }
-#line 7545 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7885 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 233:
-#line 2395 "mrbgems/mruby-compiler/core/parse.y"
+ case 233: /* arg: arg "!=" arg */
+#line 2406 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "!=", (yyvsp0.nd));
 }
-#line 7553 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7893 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 234:
-#line 2399 "mrbgems/mruby-compiler/core/parse.y"
+ case 234: /* arg: arg "=~" arg */
+#line 2410 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "=~", (yyvsp0.nd));
 }
-#line 7561 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7901 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 235:
-#line 2403 "mrbgems/mruby-compiler/core/parse.y"
+ case 235: /* arg: arg "!~" arg */
+#line 2414 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "!~", (yyvsp0.nd));
 }
-#line 7569 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7909 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 236:
-#line 2407 "mrbgems/mruby-compiler/core/parse.y"
+ case 236: /* arg: '!' arg */
+#line 2418 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "!");
 }
-#line 7577 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7917 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 237:
-#line 2411 "mrbgems/mruby-compiler/core/parse.y"
+ case 237: /* arg: '~' arg */
+#line 2422 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "~");
 }
-#line 7585 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7925 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 238:
-#line 2415 "mrbgems/mruby-compiler/core/parse.y"
+ case 238: /* arg: arg "<<" arg */
+#line 2426 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<<", (yyvsp0.nd));
 }
-#line 7593 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7933 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 239:
-#line 2419 "mrbgems/mruby-compiler/core/parse.y"
+ case 239: /* arg: arg ">>" arg */
+#line 2430 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), ">>", (yyvsp0.nd));
 }
-#line 7601 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7941 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 240:
-#line 2423 "mrbgems/mruby-compiler/core/parse.y"
+ case 240: /* arg: arg "&&" arg */
+#line 2434 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_and(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7609 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7949 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 241:
-#line 2427 "mrbgems/mruby-compiler/core/parse.y"
+ case 241: /* arg: arg "||" arg */
+#line 2438 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_or(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7617 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7957 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 242:
-#line 2431 "mrbgems/mruby-compiler/core/parse.y"
+ case 242: /* arg: arg '?' arg opt_nl ':' arg */
+#line 2442 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_if(p, cond((yyvsp-5.nd)), (yyvsp-3.nd), (yyvsp0.nd));
 }
-#line 7625 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7965 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 243:
-#line 2435 "mrbgems/mruby-compiler/core/parse.y"
+ case 243: /* arg: arg '?' arg opt_nl "label" arg */
+#line 2446 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_if(p, cond((yyvsp-5.nd)), (yyvsp-3.nd), (yyvsp0.nd));
 }
-#line 7633 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7973 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 244:
-#line 2439 "mrbgems/mruby-compiler/core/parse.y"
+ case 244: /* arg: defn_head f_opt_arglist_paren '=' arg */
+#line 2450 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-3.nd);
 endless_method_name(p, (yyvsp-3.nd));
@@ -7642,11 +7982,11 @@
 nvars_unnest(p);
 p->in_def--;
 }
-#line 7646 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7986 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 245:
-#line 2448 "mrbgems/mruby-compiler/core/parse.y"
+ case 245: /* arg: defn_head f_opt_arglist_paren '=' arg modifier_rescue arg */
+#line 2459 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-5.nd);
 endless_method_name(p, (yyvsp-5.nd));
@@ -7655,11 +7995,11 @@
 nvars_unnest(p);
 p->in_def--;
 }
-#line 7659 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7999 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 246:
-#line 2457 "mrbgems/mruby-compiler/core/parse.y"
+ case 246: /* arg: defs_head f_opt_arglist_paren '=' arg */
+#line 2468 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-3.nd);
 void_expr_error(p, (yyvsp0.nd));
@@ -7668,11 +8008,11 @@
 p->in_def--;
 p->in_single--;
 }
-#line 7672 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8012 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 247:
-#line 2466 "mrbgems/mruby-compiler/core/parse.y"
+ case 247: /* arg: defs_head f_opt_arglist_paren '=' arg modifier_rescue arg */
+#line 2477 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-5.nd);
 void_expr_error(p, (yyvsp-2.nd));
@@ -7681,70 +8021,70 @@
 p->in_def--;
 p->in_single--;
 }
-#line 7685 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8025 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 248:
-#line 2475 "mrbgems/mruby-compiler/core/parse.y"
+ case 248: /* arg: primary */
+#line 2486 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 7693 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8033 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 250:
-#line 2482 "mrbgems/mruby-compiler/core/parse.y"
+ case 250: /* aref_args: args trailer */
+#line 2493 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 7702 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8042 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 251:
-#line 2487 "mrbgems/mruby-compiler/core/parse.y"
+ case 251: /* aref_args: args comma assocs trailer */
+#line 2498 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-3.nd), new_hash(p, (yyvsp-1.nd)));
 }
-#line 7710 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8050 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 252:
-#line 2491 "mrbgems/mruby-compiler/core/parse.y"
+ case 252: /* aref_args: assocs trailer */
+#line 2502 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = cons(new_kw_hash(p, (yyvsp-1.nd)), 0);
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 7719 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8059 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 253:
-#line 2498 "mrbgems/mruby-compiler/core/parse.y"
+ case 253: /* arg_rhs: arg */
+#line 2509 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 7727 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8067 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 254:
-#line 2502 "mrbgems/mruby-compiler/core/parse.y"
+ case 254: /* arg_rhs: arg modifier_rescue arg */
+#line 2513 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp-2.nd));
 (yyval.nd) = new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7736 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8076 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 255:
-#line 2509 "mrbgems/mruby-compiler/core/parse.y"
+ case 255: /* paren_args: '(' opt_call_args ')' */
+#line 2520 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 7744 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8084 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 256:
-#line 2513 "mrbgems/mruby-compiler/core/parse.y"
+ case 256: /* paren_args: '(' args comma tBDOT3 rparen */
+#line 2524 "mrbgems/mruby-compiler/core/parse.y"
 {
 mrb_sym r = intern_op(mul);
 mrb_sym k = intern_op(pow);
@@ -7753,11 +8093,11 @@
 new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k)))),
 new_block_arg(p, new_lvar(p, b)));
 }
-#line 7757 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8097 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 257:
-#line 2522 "mrbgems/mruby-compiler/core/parse.y"
+ case 257: /* paren_args: '(' tBDOT3 rparen */
+#line 2533 "mrbgems/mruby-compiler/core/parse.y"
 {
 mrb_sym r = intern_op(mul);
 mrb_sym k = intern_op(pow);
@@ -7772,378 +8112,394 @@
 (yyval.nd) = 0;
 }
 }
-#line 7776 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8116 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 262:
-#line 2545 "mrbgems/mruby-compiler/core/parse.y"
+ case 262: /* opt_call_args: args comma */
+#line 2556 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_callargs(p,(yyvsp-1.nd),0,0);
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 7785 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8125 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 263:
-#line 2550 "mrbgems/mruby-compiler/core/parse.y"
+ case 263: /* opt_call_args: args comma assocs comma */
+#line 2561 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_callargs(p,(yyvsp-3.nd),new_kw_hash(p,(yyvsp-1.nd)),0);
 NODE_LINENO((yyval.nd), (yyvsp-3.nd));
 }
-#line 7794 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8134 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 264:
-#line 2555 "mrbgems/mruby-compiler/core/parse.y"
+ case 264: /* opt_call_args: assocs comma */
+#line 2566 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_callargs(p,0,new_kw_hash(p,(yyvsp-1.nd)),0);
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 7803 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8143 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 265:
-#line 2562 "mrbgems/mruby-compiler/core/parse.y"
+ case 265: /* call_args: command */
+#line 2573 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = new_callargs(p, list1((yyvsp0.nd)), 0, 0);
 NODE_LINENO((yyval.nd), (yyvsp0.nd));
 }
-#line 7813 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8153 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 266:
-#line 2568 "mrbgems/mruby-compiler/core/parse.y"
+ case 266: /* call_args: args opt_block_arg */
+#line 2579 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_callargs(p, (yyvsp-1.nd), 0, (yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 7822 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8162 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 267:
-#line 2573 "mrbgems/mruby-compiler/core/parse.y"
+ case 267: /* call_args: assocs opt_block_arg */
+#line 2584 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_callargs(p, 0, new_kw_hash(p, (yyvsp-1.nd)), (yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 7831 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8171 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 268:
-#line 2578 "mrbgems/mruby-compiler/core/parse.y"
+ case 268: /* call_args: args comma assocs opt_block_arg */
+#line 2589 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_callargs(p, (yyvsp-3.nd), new_kw_hash(p, (yyvsp-1.nd)), (yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp-3.nd));
 }
-#line 7840 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8180 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 269:
-#line 2583 "mrbgems/mruby-compiler/core/parse.y"
+ case 269: /* call_args: block_arg */
+#line 2594 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_callargs(p, 0, 0, (yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp0.nd));
 }
-#line 7849 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8189 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 270:
-#line 2589 "mrbgems/mruby-compiler/core/parse.y"
+ case 270: /* @7: %empty */
+#line 2600 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.stack) = p->cmdarg_stack;
 CMDARG_PUSH(1);
 }
-#line 7858 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8198 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 271:
-#line 2594 "mrbgems/mruby-compiler/core/parse.y"
+ case 271: /* command_args: @7 call_args */
+#line 2605 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->cmdarg_stack = (yyvsp-1.stack);
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 7867 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8207 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 272:
-#line 2601 "mrbgems/mruby-compiler/core/parse.y"
+ case 272: /* block_arg: "&" arg */
+#line 2612 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_block_arg(p, (yyvsp0.nd));
 }
-#line 7875 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8215 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 273:
-#line 2605 "mrbgems/mruby-compiler/core/parse.y"
+ case 273: /* block_arg: "&" */
+#line 2616 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_block_arg(p, 0);
 }
-#line 7883 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8223 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 274:
-#line 2611 "mrbgems/mruby-compiler/core/parse.y"
+ case 274: /* opt_block_arg: comma block_arg */
+#line 2622 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 7891 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8231 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 275:
-#line 2615 "mrbgems/mruby-compiler/core/parse.y"
+ case 275: /* opt_block_arg: none */
+#line 2626 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = 0;
 }
-#line 7899 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8239 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 277:
-#line 2624 "mrbgems/mruby-compiler/core/parse.y"
+ case 277: /* args: arg */
+#line 2635 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = list1((yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp0.nd));
 }
-#line 7909 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8249 "mrbgems/mruby-compiler/core/y.tab.c"
+ break;
+
+ case 278: /* args: "*" */
+#line 2641 "mrbgems/mruby-compiler/core/parse.y"
+ {
+ (yyval.nd) = list1(new_splat(p, new_lvar(p, intern_op(mul))));
+ }
+#line 8257 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 278:
-#line 2630 "mrbgems/mruby-compiler/core/parse.y"
+ case 279: /* args: "*" arg */
+#line 2645 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1(new_splat(p, (yyvsp0.nd)));
 NODE_LINENO((yyval.nd), (yyvsp0.nd));
 }
-#line 7918 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8266 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 279:
-#line 2635 "mrbgems/mruby-compiler/core/parse.y"
+ case 280: /* args: args comma arg */
+#line 2650 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7927 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8275 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 280:
-#line 2640 "mrbgems/mruby-compiler/core/parse.y"
+ case 281: /* args: args comma "*" */
+#line 2655 "mrbgems/mruby-compiler/core/parse.y"
+ {
+ (yyval.nd) = push((yyvsp-2.nd), new_splat(p, new_lvar(p, intern_op(mul))));
+ }
+#line 8283 "mrbgems/mruby-compiler/core/y.tab.c"
+ break;
+
+ case 282: /* args: args comma "*" arg */
+#line 2659 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-3.nd), new_splat(p, (yyvsp0.nd)));
 }
-#line 7935 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8291 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 281:
-#line 2646 "mrbgems/mruby-compiler/core/parse.y"
+ case 283: /* mrhs: args comma arg */
+#line 2665 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 7944 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8300 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 282:
-#line 2651 "mrbgems/mruby-compiler/core/parse.y"
+ case 284: /* mrhs: args comma "*" arg */
+#line 2670 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-3.nd), new_splat(p, (yyvsp0.nd)));
 }
-#line 7952 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8308 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 283:
-#line 2655 "mrbgems/mruby-compiler/core/parse.y"
+ case 285: /* mrhs: "*" arg */
+#line 2674 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1(new_splat(p, (yyvsp0.nd)));
 }
-#line 7960 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8316 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 291:
-#line 2668 "mrbgems/mruby-compiler/core/parse.y"
+ case 293: /* primary: "numbered parameter" */
+#line 2687 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_nvar(p, (yyvsp0.num));
 }
-#line 7968 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8324 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 292:
-#line 2672 "mrbgems/mruby-compiler/core/parse.y"
+ case 294: /* primary: "method" */
+#line 2691 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_fcall(p, (yyvsp0.id), 0);
 }
-#line 7976 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8332 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 293:
-#line 2676 "mrbgems/mruby-compiler/core/parse.y"
+ case 295: /* @8: %empty */
+#line 2695 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.stack) = p->cmdarg_stack;
 p->cmdarg_stack = 0;
 }
-#line 7985 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8341 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 294:
-#line 2682 "mrbgems/mruby-compiler/core/parse.y"
+ case 296: /* primary: keyword_begin @8 bodystmt keyword_end */
+#line 2701 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->cmdarg_stack = (yyvsp-2.stack);
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 7994 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8350 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 295:
-#line 2687 "mrbgems/mruby-compiler/core/parse.y"
+ case 297: /* @9: %empty */
+#line 2706 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.stack) = p->cmdarg_stack;
 p->cmdarg_stack = 0;
 }
-#line 8003 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8359 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 296:
-#line 2691 "mrbgems/mruby-compiler/core/parse.y"
+ case 298: /* $@10: %empty */
+#line 2710 "mrbgems/mruby-compiler/core/parse.y"
 {p->lstate = EXPR_ENDARG;}
-#line 8009 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8365 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 297:
-#line 2692 "mrbgems/mruby-compiler/core/parse.y"
+ case 299: /* primary: "(" @9 stmt $@10 rparen */
+#line 2711 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->cmdarg_stack = (yyvsp-3.stack);
 (yyval.nd) = (yyvsp-2.nd);
 }
-#line 8018 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8374 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 298:
-#line 2696 "mrbgems/mruby-compiler/core/parse.y"
+ case 300: /* $@11: %empty */
+#line 2715 "mrbgems/mruby-compiler/core/parse.y"
 {p->lstate = EXPR_ENDARG;}
-#line 8024 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8380 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 299:
-#line 2697 "mrbgems/mruby-compiler/core/parse.y"
+ case 301: /* primary: "(" $@11 rparen */
+#line 2716 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_nil(p);
 }
-#line 8032 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8388 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 300:
-#line 2701 "mrbgems/mruby-compiler/core/parse.y"
+ case 302: /* primary: tLPAREN compstmt ')' */
+#line 2720 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 8040 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8396 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 301:
-#line 2705 "mrbgems/mruby-compiler/core/parse.y"
+ case 303: /* primary: primary_value "::" "constant" */
+#line 2724 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_colon2(p, (yyvsp-2.nd), (yyvsp0.id));
 }
-#line 8048 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8404 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 302:
-#line 2709 "mrbgems/mruby-compiler/core/parse.y"
+ case 304: /* primary: tCOLON3 "constant" */
+#line 2728 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_colon3(p, (yyvsp0.id));
 }
-#line 8056 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8412 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 303:
-#line 2713 "mrbgems/mruby-compiler/core/parse.y"
+ case 305: /* primary: "" aref_args '' */
+#line 2732 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_array(p, (yyvsp-1.nd));
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 8065 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8421 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 304:
-#line 2718 "mrbgems/mruby-compiler/core/parse.y"
+ case 306: /* primary: tLBRACE assoc_list '}' */
+#line 2737 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_hash(p, (yyvsp-1.nd));
 NODE_LINENO((yyval.nd), (yyvsp-1.nd));
 }
-#line 8074 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8430 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 305:
-#line 2723 "mrbgems/mruby-compiler/core/parse.y"
+ case 307: /* primary: keyword_return */
+#line 2742 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_return(p, 0);
 }
-#line 8082 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8438 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 306:
-#line 2727 "mrbgems/mruby-compiler/core/parse.y"
+ case 308: /* primary: keyword_yield opt_paren_args */
+#line 2746 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_yield(p, (yyvsp0.nd));
 }
-#line 8090 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8446 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 307:
-#line 2731 "mrbgems/mruby-compiler/core/parse.y"
+ case 309: /* primary: keyword_not '(' expr rparen */
+#line 2750 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_uni_op(p, cond((yyvsp-1.nd)), "!");
 }
-#line 8098 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8454 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 308:
-#line 2735 "mrbgems/mruby-compiler/core/parse.y"
+ case 310: /* primary: keyword_not '(' rparen */
+#line 2754 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = call_uni_op(p, new_nil(p), "!");
 }
-#line 8106 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8462 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 309:
-#line 2739 "mrbgems/mruby-compiler/core/parse.y"
+ case 311: /* primary: operation brace_block */
+#line 2758 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_fcall(p, (yyvsp-1.id), new_callargs(p, 0, 0, (yyvsp0.nd)));
 }
-#line 8114 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8470 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 311:
-#line 2744 "mrbgems/mruby-compiler/core/parse.y"
+ case 313: /* primary: method_call brace_block */
+#line 2763 "mrbgems/mruby-compiler/core/parse.y"
 {
 call_with_block(p, (yyvsp-1.nd), (yyvsp0.nd));
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 8123 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8479 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 312:
-#line 2749 "mrbgems/mruby-compiler/core/parse.y"
+ case 314: /* @12: %empty */
+#line 2768 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_nest(p);
 nvars_nest(p);
 (yyval.num) = p->lpar_beg;
 p->lpar_beg = ++p->paren_nest;
 }
-#line 8134 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8490 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 313:
-#line 2756 "mrbgems/mruby-compiler/core/parse.y"
+ case 315: /* @13: %empty */
+#line 2775 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.stack) = p->cmdarg_stack;
 p->cmdarg_stack = 0;
 }
-#line 8143 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8499 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 314:
-#line 2761 "mrbgems/mruby-compiler/core/parse.y"
+ case 316: /* primary: "->" @12 f_larglist @13 lambda_body */
+#line 2780 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lpar_beg = (yyvsp-3.num);
 (yyval.nd) = new_lambda(p, (yyvsp-2.nd), (yyvsp0.nd));
@@ -8152,149 +8508,149 @@
 p->cmdarg_stack = (yyvsp-1.stack);
 CMDARG_LEXPOP();
 }
-#line 8156 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8512 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 315:
-#line 2773 "mrbgems/mruby-compiler/core/parse.y"
+ case 317: /* primary: keyword_if expr_value then compstmt if_tail keyword_end */
+#line 2792 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_if(p, cond((yyvsp-4.nd)), (yyvsp-2.nd), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-5.num));
 }
-#line 8165 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8521 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 316:
-#line 2781 "mrbgems/mruby-compiler/core/parse.y"
+ case 318: /* primary: keyword_unless expr_value then compstmt opt_else keyword_end */
+#line 2800 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_unless(p, cond((yyvsp-4.nd)), (yyvsp-2.nd), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-5.num));
 }
-#line 8174 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8530 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 317:
-#line 2785 "mrbgems/mruby-compiler/core/parse.y"
+ case 319: /* $@14: %empty */
+#line 2804 "mrbgems/mruby-compiler/core/parse.y"
 {COND_PUSH(1);}
-#line 8180 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8536 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 318:
-#line 2785 "mrbgems/mruby-compiler/core/parse.y"
+ case 320: /* $@15: %empty */
+#line 2804 "mrbgems/mruby-compiler/core/parse.y"
 {COND_POP();}
-#line 8186 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8542 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 319:
-#line 2788 "mrbgems/mruby-compiler/core/parse.y"
+ case 321: /* primary: keyword_while $@14 expr_value do $@15 compstmt keyword_end */
+#line 2807 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_while(p, cond((yyvsp-4.nd)), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-6.num));
 }
-#line 8195 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8551 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 320:
-#line 2792 "mrbgems/mruby-compiler/core/parse.y"
+ case 322: /* $@16: %empty */
+#line 2811 "mrbgems/mruby-compiler/core/parse.y"
 {COND_PUSH(1);}
-#line 8201 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8557 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 321:
-#line 2792 "mrbgems/mruby-compiler/core/parse.y"
+ case 323: /* $@17: %empty */
+#line 2811 "mrbgems/mruby-compiler/core/parse.y"
 {COND_POP();}
-#line 8207 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8563 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 322:
-#line 2795 "mrbgems/mruby-compiler/core/parse.y"
+ case 324: /* primary: keyword_until $@16 expr_value do $@17 compstmt keyword_end */
+#line 2814 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_until(p, cond((yyvsp-4.nd)), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-6.num));
 }
-#line 8216 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8572 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 323:
-#line 2802 "mrbgems/mruby-compiler/core/parse.y"
+ case 325: /* primary: keyword_case expr_value opt_terms case_body keyword_end */
+#line 2821 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_case(p, (yyvsp-3.nd), (yyvsp-1.nd));
 }
-#line 8224 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8580 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 324:
-#line 2806 "mrbgems/mruby-compiler/core/parse.y"
+ case 326: /* primary: keyword_case opt_terms case_body keyword_end */
+#line 2825 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_case(p, 0, (yyvsp-1.nd));
 }
-#line 8232 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8588 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 325:
-#line 2810 "mrbgems/mruby-compiler/core/parse.y"
+ case 327: /* $@18: %empty */
+#line 2829 "mrbgems/mruby-compiler/core/parse.y"
 {COND_PUSH(1);}
-#line 8238 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8594 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 326:
-#line 2812 "mrbgems/mruby-compiler/core/parse.y"
+ case 328: /* $@19: %empty */
+#line 2831 "mrbgems/mruby-compiler/core/parse.y"
 {COND_POP();}
-#line 8244 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8600 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 327:
-#line 2815 "mrbgems/mruby-compiler/core/parse.y"
+ case 329: /* primary: keyword_for for_var keyword_in $@18 expr_value do $@19 compstmt keyword_end */
+#line 2834 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_for(p, (yyvsp-7.nd), (yyvsp-4.nd), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-8.num));
 }
-#line 8253 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8609 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 328:
-#line 2821 "mrbgems/mruby-compiler/core/parse.y"
+ case 330: /* @20: %empty */
+#line 2840 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (p->in_def || p->in_single)
 yyerror(p, "class definition in method body");
 (yyval.nd) = local_switch(p);
 nvars_block(p);
 }
-#line 8264 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8620 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 329:
-#line 2829 "mrbgems/mruby-compiler/core/parse.y"
+ case 331: /* primary: keyword_class cpath superclass @20 bodystmt keyword_end */
+#line 2848 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_class(p, (yyvsp-4.nd), (yyvsp-3.nd), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-5.num));
 local_resume(p, (yyvsp-2.nd));
 nvars_unnest(p);
 }
-#line 8275 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8631 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 330:
-#line 2837 "mrbgems/mruby-compiler/core/parse.y"
+ case 332: /* @21: %empty */
+#line 2856 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.num) = p->in_def;
 p->in_def = 0;
 }
-#line 8284 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8640 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 331:
-#line 2842 "mrbgems/mruby-compiler/core/parse.y"
+ case 333: /* @22: %empty */
+#line 2861 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = cons(local_switch(p), nint(p->in_single));
 nvars_block(p);
 p->in_single = 0;
 }
-#line 8294 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8650 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 332:
-#line 2849 "mrbgems/mruby-compiler/core/parse.y"
+ case 334: /* primary: keyword_class "<<" expr @21 term @22 bodystmt keyword_end */
+#line 2868 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_sclass(p, (yyvsp-5.nd), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-7.num));
@@ -8303,44 +8659,44 @@
 p->in_def = (yyvsp-4.num);
 p->in_single = intn((yyvsp-2.nd)->cdr);
 }
-#line 8307 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8663 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 333:
-#line 2859 "mrbgems/mruby-compiler/core/parse.y"
+ case 335: /* @23: %empty */
+#line 2878 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (p->in_def || p->in_single)
 yyerror(p, "module definition in method body");
 (yyval.nd) = local_switch(p);
 nvars_block(p);
 }
-#line 8318 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8674 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 334:
-#line 2867 "mrbgems/mruby-compiler/core/parse.y"
+ case 336: /* primary: keyword_module cpath @23 bodystmt keyword_end */
+#line 2886 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_module(p, (yyvsp-3.nd), (yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-4.num));
 local_resume(p, (yyvsp-2.nd));
 nvars_unnest(p);
 }
-#line 8329 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8685 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 335:
-#line 2877 "mrbgems/mruby-compiler/core/parse.y"
+ case 337: /* primary: defn_head f_arglist bodystmt keyword_end */
+#line 2896 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-3.nd);
 defn_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp-1.nd));
 nvars_unnest(p);
 p->in_def--;
 }
-#line 8340 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8696 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 336:
-#line 2887 "mrbgems/mruby-compiler/core/parse.y"
+ case 338: /* primary: defs_head f_arglist bodystmt keyword_end */
+#line 2906 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-3.nd);
 defs_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp-1.nd));
@@ -8348,451 +8704,451 @@
 p->in_def--;
 p->in_single--;
 }
-#line 8352 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8708 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 337:
-#line 2895 "mrbgems/mruby-compiler/core/parse.y"
+ case 339: /* primary: keyword_break */
+#line 2914 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_break(p, 0);
 }
-#line 8360 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8716 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 338:
-#line 2899 "mrbgems/mruby-compiler/core/parse.y"
+ case 340: /* primary: keyword_next */
+#line 2918 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_next(p, 0);
 }
-#line 8368 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8724 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 339:
-#line 2903 "mrbgems/mruby-compiler/core/parse.y"
+ case 341: /* primary: keyword_redo */
+#line 2922 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_redo(p);
 }
-#line 8376 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8732 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 340:
-#line 2907 "mrbgems/mruby-compiler/core/parse.y"
+ case 342: /* primary: keyword_retry */
+#line 2926 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_retry(p);
 }
-#line 8384 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8740 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 341:
-#line 2913 "mrbgems/mruby-compiler/core/parse.y"
+ case 343: /* primary_value: primary */
+#line 2932 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 if (!(yyval.nd)) (yyval.nd) = new_nil(p);
 }
-#line 8393 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8749 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 348:
-#line 2932 "mrbgems/mruby-compiler/core/parse.y"
+ case 350: /* if_tail: keyword_elsif expr_value then compstmt if_tail */
+#line 2951 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_if(p, cond((yyvsp-3.nd)), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 8401 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8757 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 350:
-#line 2939 "mrbgems/mruby-compiler/core/parse.y"
+ case 352: /* opt_else: keyword_else compstmt */
+#line 2958 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 8409 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8765 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 351:
-#line 2945 "mrbgems/mruby-compiler/core/parse.y"
+ case 353: /* for_var: lhs */
+#line 2964 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1(list1((yyvsp0.nd)));
 }
-#line 8417 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8773 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 353:
-#line 2952 "mrbgems/mruby-compiler/core/parse.y"
+ case 355: /* f_margs: f_arg */
+#line 2971 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3((yyvsp0.nd),0,0);
 }
-#line 8425 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8781 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 354:
-#line 2956 "mrbgems/mruby-compiler/core/parse.y"
+ case 356: /* f_margs: f_arg ',' "*" f_norm_arg */
+#line 2975 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3((yyvsp-3.nd), new_arg(p, (yyvsp0.id)), 0);
 }
-#line 8433 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8789 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 355:
-#line 2960 "mrbgems/mruby-compiler/core/parse.y"
+ case 357: /* f_margs: f_arg ',' "*" f_norm_arg ',' f_arg */
+#line 2979 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3((yyvsp-5.nd), new_arg(p, (yyvsp-2.id)), (yyvsp0.nd));
 }
-#line 8441 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8797 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 356:
-#line 2964 "mrbgems/mruby-compiler/core/parse.y"
+ case 358: /* f_margs: f_arg ',' "*" */
+#line 2983 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_f(p, intern_op(mul));
 (yyval.nd) = list3((yyvsp-2.nd), nint(-1), 0);
 }
-#line 8450 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8806 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 357:
-#line 2969 "mrbgems/mruby-compiler/core/parse.y"
+ case 359: /* f_margs: f_arg ',' "*" ',' f_arg */
+#line 2988 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3((yyvsp-4.nd), nint(-1), (yyvsp0.nd));
 }
-#line 8458 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8814 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 358:
-#line 2973 "mrbgems/mruby-compiler/core/parse.y"
+ case 360: /* f_margs: "*" f_norm_arg */
+#line 2992 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3(0, new_arg(p, (yyvsp0.id)), 0);
 }
-#line 8466 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8822 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 359:
-#line 2977 "mrbgems/mruby-compiler/core/parse.y"
+ case 361: /* f_margs: "*" f_norm_arg ',' f_arg */
+#line 2996 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3(0, new_arg(p, (yyvsp-2.id)), (yyvsp0.nd));
 }
-#line 8474 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8830 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 360:
-#line 2981 "mrbgems/mruby-compiler/core/parse.y"
+ case 362: /* f_margs: "*" */
+#line 3000 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_f(p, intern_op(mul));
 (yyval.nd) = list3(0, nint(-1), 0);
 }
-#line 8483 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8839 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 361:
-#line 2986 "mrbgems/mruby-compiler/core/parse.y"
+ case 363: /* $@24: %empty */
+#line 3005 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_f(p, intern_op(mul));
 }
-#line 8491 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8847 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 362:
-#line 2990 "mrbgems/mruby-compiler/core/parse.y"
+ case 364: /* f_margs: "*" ',' $@24 f_arg */
+#line 3009 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list3(0, nint(-1), (yyvsp0.nd));
 }
-#line 8499 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8855 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 363:
-#line 2996 "mrbgems/mruby-compiler/core/parse.y"
+ case 365: /* block_args_tail: f_block_kwarg ',' f_kwrest opt_f_block_arg */
+#line 3015 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, (yyvsp-3.nd), (yyvsp-1.nd), (yyvsp0.id));
 }
-#line 8507 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8863 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 364:
-#line 3000 "mrbgems/mruby-compiler/core/parse.y"
+ case 366: /* block_args_tail: f_block_kwarg opt_f_block_arg */
+#line 3019 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, (yyvsp-1.nd), 0, (yyvsp0.id));
 }
-#line 8515 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8871 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 365:
-#line 3004 "mrbgems/mruby-compiler/core/parse.y"
+ case 367: /* block_args_tail: f_kwrest opt_f_block_arg */
+#line 3023 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, 0, (yyvsp-1.nd), (yyvsp0.id));
 }
-#line 8523 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8879 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 366:
-#line 3008 "mrbgems/mruby-compiler/core/parse.y"
+ case 368: /* block_args_tail: f_block_arg */
+#line 3027 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp0.id));
 }
-#line 8531 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8887 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 367:
-#line 3014 "mrbgems/mruby-compiler/core/parse.y"
+ case 369: /* opt_block_args_tail: ',' block_args_tail */
+#line 3033 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 8539 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8895 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 368:
-#line 3018 "mrbgems/mruby-compiler/core/parse.y"
+ case 370: /* opt_block_args_tail: %empty */
+#line 3037 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, 0, 0, 0);
 }
-#line 8547 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8903 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 369:
-#line 3024 "mrbgems/mruby-compiler/core/parse.y"
+ case 371: /* block_param: f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail */
+#line 3043 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 8555 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8911 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 370:
-#line 3028 "mrbgems/mruby-compiler/core/parse.y"
+ case 372: /* block_param: f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail */
+#line 3047 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-7.nd), (yyvsp-5.nd), (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 8563 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8919 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 371:
-#line 3032 "mrbgems/mruby-compiler/core/parse.y"
+ case 373: /* block_param: f_arg ',' f_block_optarg opt_block_args_tail */
+#line 3051 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-3.nd), (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
 }
-#line 8571 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8927 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 372:
-#line 3036 "mrbgems/mruby-compiler/core/parse.y"
+ case 374: /* block_param: f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail */
+#line 3055 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 8579 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8935 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 373:
-#line 3040 "mrbgems/mruby-compiler/core/parse.y"
+ case 375: /* block_param: f_arg ',' f_rest_arg opt_block_args_tail */
+#line 3059 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-3.nd), 0, (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 8587 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8943 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 374:
-#line 3044 "mrbgems/mruby-compiler/core/parse.y"
+ case 376: /* block_param: f_arg ',' opt_block_args_tail */
+#line 3063 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-2.nd), 0, 0, 0, (yyvsp0.nd));
 }
-#line 8595 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8951 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 375:
-#line 3048 "mrbgems/mruby-compiler/core/parse.y"
+ case 377: /* block_param: f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail */
+#line 3067 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-5.nd), 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 8603 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8959 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 376:
-#line 3052 "mrbgems/mruby-compiler/core/parse.y"
+ case 378: /* block_param: f_arg opt_block_args_tail */
+#line 3071 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-1.nd), 0, 0, 0, (yyvsp0.nd));
 }
-#line 8611 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8967 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 377:
-#line 3056 "mrbgems/mruby-compiler/core/parse.y"
+ case 379: /* block_param: f_block_optarg ',' f_rest_arg opt_block_args_tail */
+#line 3075 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 8619 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8975 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 378:
-#line 3060 "mrbgems/mruby-compiler/core/parse.y"
+ case 380: /* block_param: f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail */
+#line 3079 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-5.nd), (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 8627 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8983 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 379:
-#line 3064 "mrbgems/mruby-compiler/core/parse.y"
+ case 381: /* block_param: f_block_optarg opt_block_args_tail */
+#line 3083 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
 }
-#line 8635 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8991 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 380:
-#line 3068 "mrbgems/mruby-compiler/core/parse.y"
+ case 382: /* block_param: f_block_optarg ',' f_arg opt_block_args_tail */
+#line 3087 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 8643 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8999 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 381:
-#line 3072 "mrbgems/mruby-compiler/core/parse.y"
+ case 383: /* block_param: f_rest_arg opt_block_args_tail */
+#line 3091 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, 0, (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 8651 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9007 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 382:
-#line 3076 "mrbgems/mruby-compiler/core/parse.y"
+ case 384: /* block_param: f_rest_arg ',' f_arg opt_block_args_tail */
+#line 3095 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 8659 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9015 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 383:
-#line 3080 "mrbgems/mruby-compiler/core/parse.y"
+ case 385: /* block_param: block_args_tail */
+#line 3099 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp0.nd));
 }
-#line 8667 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9023 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 384:
-#line 3086 "mrbgems/mruby-compiler/core/parse.y"
+ case 386: /* opt_block_param: none */
+#line 3105 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_blk(p, 0);
 (yyval.nd) = 0;
 }
-#line 8676 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9032 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 385:
-#line 3091 "mrbgems/mruby-compiler/core/parse.y"
+ case 387: /* opt_block_param: block_param_def */
+#line 3110 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->cmd_start = TRUE;
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 8685 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9041 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 386:
-#line 3097 "mrbgems/mruby-compiler/core/parse.y"
+ case 388: /* $@25: %empty */
+#line 3116 "mrbgems/mruby-compiler/core/parse.y"
 {local_add_blk(p, 0);}
-#line 8691 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9047 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 387:
-#line 3098 "mrbgems/mruby-compiler/core/parse.y"
+ case 389: /* block_param_def: '|' $@25 opt_bv_decl '|' */
+#line 3117 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = 0;
 }
-#line 8699 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9055 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 388:
-#line 3102 "mrbgems/mruby-compiler/core/parse.y"
+ case 390: /* block_param_def: "||" */
+#line 3121 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_blk(p, 0);
 (yyval.nd) = 0;
 }
-#line 8708 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9064 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 389:
-#line 3107 "mrbgems/mruby-compiler/core/parse.y"
+ case 391: /* block_param_def: '|' block_param opt_bv_decl '|' */
+#line 3126 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-2.nd);
 }
-#line 8716 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9072 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 390:
-#line 3114 "mrbgems/mruby-compiler/core/parse.y"
+ case 392: /* opt_bv_decl: opt_nl */
+#line 3133 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = 0;
 }
-#line 8724 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9080 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 391:
-#line 3118 "mrbgems/mruby-compiler/core/parse.y"
+ case 393: /* opt_bv_decl: opt_nl ';' bv_decls opt_nl */
+#line 3137 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = 0;
 }
-#line 8732 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9088 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 394:
-#line 3128 "mrbgems/mruby-compiler/core/parse.y"
+ case 396: /* bvar: "local variable or method" */
+#line 3147 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_f(p, (yyvsp0.id));
 new_bv(p, (yyvsp0.id));
 }
-#line 8741 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9097 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 396:
-#line 3136 "mrbgems/mruby-compiler/core/parse.y"
+ case 398: /* f_larglist: '(' f_args opt_bv_decl ')' */
+#line 3155 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-2.nd);
 }
-#line 8749 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9105 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 397:
-#line 3140 "mrbgems/mruby-compiler/core/parse.y"
+ case 399: /* f_larglist: f_args */
+#line 3159 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 8757 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9113 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 398:
-#line 3146 "mrbgems/mruby-compiler/core/parse.y"
+ case 400: /* lambda_body: tLAMBEG compstmt '}' */
+#line 3165 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 8765 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9121 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 399:
-#line 3150 "mrbgems/mruby-compiler/core/parse.y"
+ case 401: /* lambda_body: keyword_do_LAMBDA bodystmt keyword_end */
+#line 3169 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 8773 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9129 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 400:
-#line 3156 "mrbgems/mruby-compiler/core/parse.y"
+ case 402: /* $@26: %empty */
+#line 3175 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_nest(p);
 nvars_nest(p);
 }
-#line 8782 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9138 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 401:
-#line 3163 "mrbgems/mruby-compiler/core/parse.y"
+ case 403: /* do_block: keyword_do_block $@26 opt_block_param bodystmt keyword_end */
+#line 3182 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_block(p,(yyvsp-2.nd),(yyvsp-1.nd));
 local_unnest(p);
 nvars_unnest(p);
 }
-#line 8792 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9148 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 402:
-#line 3171 "mrbgems/mruby-compiler/core/parse.y"
+ case 404: /* block_call: command do_block */
+#line 3190 "mrbgems/mruby-compiler/core/parse.y"
 {
 if (typen((yyvsp-1.nd)->car) == NODE_YIELD) {
 yyerror(p, "block given to yield");
@@ -8802,159 +9158,159 @@
 }
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 8806 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9162 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 403:
-#line 3181 "mrbgems/mruby-compiler/core/parse.y"
+ case 405: /* block_call: block_call call_op2 operation2 opt_paren_args */
+#line 3200 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
 }
-#line 8814 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9170 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 404:
-#line 3185 "mrbgems/mruby-compiler/core/parse.y"
+ case 406: /* block_call: block_call call_op2 operation2 opt_paren_args brace_block */
+#line 3204 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-4.nd), (yyvsp-2.id), (yyvsp-1.nd), (yyvsp-3.num));
 call_with_block(p, (yyval.nd), (yyvsp0.nd));
 }
-#line 8823 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9179 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 405:
-#line 3190 "mrbgems/mruby-compiler/core/parse.y"
+ case 407: /* block_call: block_call call_op2 operation2 command_args do_block */
+#line 3209 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-4.nd), (yyvsp-2.id), (yyvsp-1.nd), (yyvsp-3.num));
 call_with_block(p, (yyval.nd), (yyvsp0.nd));
 }
-#line 8832 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9188 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 406:
-#line 3197 "mrbgems/mruby-compiler/core/parse.y"
+ case 408: /* method_call: operation paren_args */
+#line 3216 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_fcall(p, (yyvsp-1.id), (yyvsp0.nd));
 }
-#line 8840 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9196 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 407:
-#line 3201 "mrbgems/mruby-compiler/core/parse.y"
+ case 409: /* method_call: primary_value call_op operation2 opt_paren_args */
+#line 3220 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
 }
-#line 8848 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9204 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 408:
-#line 3205 "mrbgems/mruby-compiler/core/parse.y"
+ case 410: /* method_call: primary_value "::" operation2 paren_args */
+#line 3224 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), tCOLON2);
 }
-#line 8856 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9212 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 409:
-#line 3209 "mrbgems/mruby-compiler/core/parse.y"
+ case 411: /* method_call: primary_value "::" operation3 */
+#line 3228 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, tCOLON2);
 }
-#line 8864 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9220 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 410:
-#line 3213 "mrbgems/mruby-compiler/core/parse.y"
+ case 412: /* method_call: primary_value call_op paren_args */
+#line 3232 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), MRB_SYM_2(p->mrb, call), (yyvsp0.nd), (yyvsp-1.num));
 }
-#line 8872 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9228 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 411:
-#line 3217 "mrbgems/mruby-compiler/core/parse.y"
+ case 413: /* method_call: primary_value "::" paren_args */
+#line 3236 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-2.nd), MRB_SYM_2(p->mrb, call), (yyvsp0.nd), tCOLON2);
 }
-#line 8880 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9236 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 412:
-#line 3221 "mrbgems/mruby-compiler/core/parse.y"
+ case 414: /* method_call: keyword_super paren_args */
+#line 3240 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_super(p, (yyvsp0.nd));
 }
-#line 8888 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9244 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 413:
-#line 3225 "mrbgems/mruby-compiler/core/parse.y"
+ case 415: /* method_call: keyword_super */
+#line 3244 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_zsuper(p);
 }
-#line 8896 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9252 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 414:
-#line 3229 "mrbgems/mruby-compiler/core/parse.y"
+ case 416: /* method_call: primary_value '' opt_call_args '' */
+#line 3248 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_op(aref), (yyvsp-1.nd), '.');
 }
-#line 8904 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9260 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 415:
-#line 3235 "mrbgems/mruby-compiler/core/parse.y"
+ case 417: /* @27: %empty */
+#line 3254 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_nest(p);
 nvars_nest(p);
 (yyval.num) = p->lineno;
 }
-#line 8914 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9270 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 416:
-#line 3242 "mrbgems/mruby-compiler/core/parse.y"
+ case 418: /* brace_block: '{' @27 opt_block_param compstmt '}' */
+#line 3261 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_block(p,(yyvsp-2.nd),(yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-3.num));
 local_unnest(p);
 nvars_unnest(p);
 }
-#line 8925 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9281 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 417:
-#line 3249 "mrbgems/mruby-compiler/core/parse.y"
+ case 419: /* @28: %empty */
+#line 3268 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_nest(p);
 nvars_nest(p);
 (yyval.num) = p->lineno;
 }
-#line 8935 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9291 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 418:
-#line 3256 "mrbgems/mruby-compiler/core/parse.y"
+ case 420: /* brace_block: keyword_do @28 opt_block_param bodystmt keyword_end */
+#line 3275 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_block(p,(yyvsp-2.nd),(yyvsp-1.nd));
 SET_LINENO((yyval.nd), (yyvsp-3.num));
 local_unnest(p);
 nvars_unnest(p);
 }
-#line 8946 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9302 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 419:
-#line 3267 "mrbgems/mruby-compiler/core/parse.y"
+ case 421: /* case_body: keyword_when args then compstmt cases */
+#line 3286 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = cons(cons((yyvsp-3.nd), (yyvsp-1.nd)), (yyvsp0.nd));
 }
-#line 8954 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9310 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 420:
-#line 3273 "mrbgems/mruby-compiler/core/parse.y"
+ case 422: /* cases: opt_else */
+#line 3292 "mrbgems/mruby-compiler/core/parse.y"
 {
 if ((yyvsp0.nd)) {
 (yyval.nd) = cons(cons(0, (yyvsp0.nd)), 0);
@@ -8963,60 +9319,60 @@
 (yyval.nd) = 0;
 }
 }
-#line 8967 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9323 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 422:
-#line 3287 "mrbgems/mruby-compiler/core/parse.y"
+ case 424: /* opt_rescue: keyword_rescue exc_list exc_var then compstmt opt_rescue */
+#line 3306 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1(list3((yyvsp-4.nd), (yyvsp-3.nd), (yyvsp-1.nd)));
 if ((yyvsp0.nd)) (yyval.nd) = append((yyval.nd), (yyvsp0.nd));
 }
-#line 8976 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9332 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 424:
-#line 3295 "mrbgems/mruby-compiler/core/parse.y"
+ case 426: /* exc_list: arg */
+#line 3314 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 8984 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9340 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 427:
-#line 3303 "mrbgems/mruby-compiler/core/parse.y"
+ case 429: /* exc_var: "=>" lhs */
+#line 3322 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 8992 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9348 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 429:
-#line 3310 "mrbgems/mruby-compiler/core/parse.y"
+ case 431: /* opt_ensure: keyword_ensure compstmt */
+#line 3329 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 9000 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9356 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 436:
-#line 3324 "mrbgems/mruby-compiler/core/parse.y"
+ case 438: /* string: string string_fragment */
+#line 3343 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = concat_string(p, (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9008 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9364 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 439:
-#line 3332 "mrbgems/mruby-compiler/core/parse.y"
+ case 441: /* string_fragment: "string literal" tSTRING */
+#line 3351 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 9016 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9372 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 440:
-#line 3336 "mrbgems/mruby-compiler/core/parse.y"
+ case 442: /* string_fragment: "string literal" string_rep tSTRING */
+#line 3355 "mrbgems/mruby-compiler/core/parse.y"
 {
 node *n = (yyvsp-1.nd);
 if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
@@ -9027,69 +9383,68 @@
 }
 (yyval.nd) = new_dstr(p, n);
 }
-#line 9031 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9387 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 442:
-#line 3350 "mrbgems/mruby-compiler/core/parse.y"
+ case 444: /* string_rep: string_rep string_interp */
+#line 3369 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = append((yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9039 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9395 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 443:
-#line 3356 "mrbgems/mruby-compiler/core/parse.y"
+ case 445: /* string_interp: tSTRING_MID */
+#line 3375 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 9047 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9403 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 444:
-#line 3360 "mrbgems/mruby-compiler/core/parse.y"
+ case 446: /* @29: %empty */
+#line 3379 "mrbgems/mruby-compiler/core/parse.y"
 {
- (yyval.nd) = p->lex_strterm;
- p->lex_strterm = NULL;
+ (yyval.nd) = push_strterm(p);
 }
-#line 9056 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9411 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 445:
-#line 3366 "mrbgems/mruby-compiler/core/parse.y"
+ case 447: /* string_interp: tSTRING_PART @29 compstmt '}' */
+#line 3384 "mrbgems/mruby-compiler/core/parse.y"
 {
- p->lex_strterm = (yyvsp-2.nd);
+ pop_strterm(p,(yyvsp-2.nd));
 (yyval.nd) = list2((yyvsp-3.nd), (yyvsp-1.nd));
 }
-#line 9065 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9420 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 446:
-#line 3371 "mrbgems/mruby-compiler/core/parse.y"
+ case 448: /* string_interp: tLITERAL_DELIM */
+#line 3389 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1(new_literal_delim(p));
 }
-#line 9073 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9428 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 447:
-#line 3375 "mrbgems/mruby-compiler/core/parse.y"
+ case 449: /* string_interp: tHD_LITERAL_DELIM heredoc_bodies */
+#line 3393 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1(new_literal_delim(p));
 }
-#line 9081 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9436 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 448:
-#line 3381 "mrbgems/mruby-compiler/core/parse.y"
+ case 450: /* xstring: tXSTRING_BEG tXSTRING */
+#line 3399 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 9089 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9444 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 449:
-#line 3385 "mrbgems/mruby-compiler/core/parse.y"
+ case 451: /* xstring: tXSTRING_BEG string_rep tXSTRING */
+#line 3403 "mrbgems/mruby-compiler/core/parse.y"
 {
 node *n = (yyvsp-1.nd);
 if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
@@ -9100,82 +9455,81 @@
 }
 (yyval.nd) = new_dxstr(p, n);
 }
-#line 9104 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9459 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 450:
-#line 3398 "mrbgems/mruby-compiler/core/parse.y"
+ case 452: /* regexp: tREGEXP_BEG tREGEXP */
+#line 3416 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 9112 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9467 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 451:
-#line 3402 "mrbgems/mruby-compiler/core/parse.y"
+ case 453: /* regexp: tREGEXP_BEG string_rep tREGEXP */
+#line 3420 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_dregx(p, (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9120 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9475 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 455:
-#line 3415 "mrbgems/mruby-compiler/core/parse.y"
+ case 457: /* heredoc_body: tHEREDOC_END */
+#line 3433 "mrbgems/mruby-compiler/core/parse.y"
 {
- parser_heredoc_info * inf = parsing_heredoc_inf(p);
- inf->doc = push(inf->doc, new_str(p, "", 0));
+ parser_heredoc_info *info = parsing_heredoc_info(p);
+ info->doc = push(info->doc, new_str(p, "", 0));
 heredoc_end(p);
 }
-#line 9130 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9485 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 456:
-#line 3421 "mrbgems/mruby-compiler/core/parse.y"
+ case 458: /* heredoc_body: heredoc_string_rep tHEREDOC_END */
+#line 3439 "mrbgems/mruby-compiler/core/parse.y"
 {
 heredoc_end(p);
 }
-#line 9138 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9493 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 459:
-#line 3431 "mrbgems/mruby-compiler/core/parse.y"
+ case 461: /* heredoc_string_interp: tHD_STRING_MID */
+#line 3449 "mrbgems/mruby-compiler/core/parse.y"
 {
- parser_heredoc_info * inf = parsing_heredoc_inf(p);
- inf->doc = push(inf->doc, (yyvsp0.nd));
+ parser_heredoc_info *info = parsing_heredoc_info(p);
+ info->doc = push(info->doc, (yyvsp0.nd));
 heredoc_treat_nextline(p);
 }
-#line 9148 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9503 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 460:
-#line 3437 "mrbgems/mruby-compiler/core/parse.y"
+ case 462: /* @30: %empty */
+#line 3455 "mrbgems/mruby-compiler/core/parse.y"
 {
- (yyval.nd) = p->lex_strterm;
- p->lex_strterm = NULL;
+ (yyval.nd) = push_strterm(p);
 }
-#line 9157 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9511 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 461:
-#line 3443 "mrbgems/mruby-compiler/core/parse.y"
+ case 463: /* heredoc_string_interp: tHD_STRING_PART @30 compstmt '}' */
+#line 3460 "mrbgems/mruby-compiler/core/parse.y"
 {
- parser_heredoc_info * inf = parsing_heredoc_inf(p);
- p->lex_strterm = (yyvsp-2.nd);
- inf->doc = push(push(inf->doc, (yyvsp-3.nd)), (yyvsp-1.nd));
+ pop_strterm(p, (yyvsp-2.nd));
+ parser_heredoc_info *info = parsing_heredoc_info(p);
+ info->doc = push(push(info->doc, (yyvsp-3.nd)), (yyvsp-1.nd));
 }
-#line 9167 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9521 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 462:
-#line 3451 "mrbgems/mruby-compiler/core/parse.y"
+ case 464: /* words: tWORDS_BEG tSTRING */
+#line 3468 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_words(p, list1((yyvsp0.nd)));
 }
-#line 9175 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9529 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 463:
-#line 3455 "mrbgems/mruby-compiler/core/parse.y"
+ case 465: /* words: tWORDS_BEG string_rep tSTRING */
+#line 3472 "mrbgems/mruby-compiler/core/parse.y"
 {
 node *n = (yyvsp-1.nd);
 if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
@@ -9186,20 +9540,20 @@
 }
 (yyval.nd) = new_words(p, n);
 }
-#line 9190 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9544 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 464:
-#line 3469 "mrbgems/mruby-compiler/core/parse.y"
+ case 466: /* symbol: basic_symbol */
+#line 3486 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lstate = EXPR_ENDARG;
 (yyval.nd) = new_sym(p, (yyvsp0.id));
 }
-#line 9199 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9553 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 465:
-#line 3474 "mrbgems/mruby-compiler/core/parse.y"
+ case 467: /* symbol: "symbol" "string literal" string_rep tSTRING */
+#line 3491 "mrbgems/mruby-compiler/core/parse.y"
 {
 node *n = (yyvsp-1.nd);
 p->lstate = EXPR_ENDARG;
@@ -9211,43 +9565,43 @@
 }
 (yyval.nd) = new_dsym(p, new_dstr(p, n));
 }
-#line 9215 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9569 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 466:
-#line 3488 "mrbgems/mruby-compiler/core/parse.y"
+ case 468: /* basic_symbol: "symbol" sym */
+#line 3505 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = (yyvsp0.id);
 }
-#line 9223 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9577 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 471:
-#line 3498 "mrbgems/mruby-compiler/core/parse.y"
+ case 473: /* sym: tSTRING */
+#line 3515 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = new_strsym(p, (yyvsp0.nd));
 }
-#line 9231 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9585 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 472:
-#line 3502 "mrbgems/mruby-compiler/core/parse.y"
+ case 474: /* sym: "string literal" tSTRING */
+#line 3519 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = new_strsym(p, (yyvsp0.nd));
 }
-#line 9239 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9593 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 473:
-#line 3508 "mrbgems/mruby-compiler/core/parse.y"
+ case 475: /* symbols: tSYMBOLS_BEG tSTRING */
+#line 3525 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_symbols(p, list1((yyvsp0.nd)));
 }
-#line 9247 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9601 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 474:
-#line 3512 "mrbgems/mruby-compiler/core/parse.y"
+ case 476: /* symbols: tSYMBOLS_BEG string_rep tSTRING */
+#line 3529 "mrbgems/mruby-compiler/core/parse.y"
 {
 node *n = (yyvsp-1.nd);
 if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
@@ -9255,123 +9609,123 @@
 }
 (yyval.nd) = new_symbols(p, n);
 }
-#line 9259 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9613 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 477:
-#line 3524 "mrbgems/mruby-compiler/core/parse.y"
+ case 479: /* numeric: tUMINUS_NUM "integer literal" */
+#line 3541 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_negate(p, (yyvsp0.nd));
 }
-#line 9267 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9621 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 478:
-#line 3528 "mrbgems/mruby-compiler/core/parse.y"
+ case 480: /* numeric: tUMINUS_NUM "float literal" */
+#line 3545 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_negate(p, (yyvsp0.nd));
 }
-#line 9275 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9629 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 479:
-#line 3534 "mrbgems/mruby-compiler/core/parse.y"
+ case 481: /* variable: "local variable or method" */
+#line 3551 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_lvar(p, (yyvsp0.id));
 }
-#line 9283 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9637 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 480:
-#line 3538 "mrbgems/mruby-compiler/core/parse.y"
+ case 482: /* variable: "instance variable" */
+#line 3555 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_ivar(p, (yyvsp0.id));
 }
-#line 9291 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9645 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 481:
-#line 3542 "mrbgems/mruby-compiler/core/parse.y"
+ case 483: /* variable: "global variable" */
+#line 3559 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_gvar(p, (yyvsp0.id));
 }
-#line 9299 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9653 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 482:
-#line 3546 "mrbgems/mruby-compiler/core/parse.y"
+ case 484: /* variable: "class variable" */
+#line 3563 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_cvar(p, (yyvsp0.id));
 }
-#line 9307 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9661 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 483:
-#line 3550 "mrbgems/mruby-compiler/core/parse.y"
+ case 485: /* variable: "constant" */
+#line 3567 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_const(p, (yyvsp0.id));
 }
-#line 9315 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9669 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 484:
-#line 3556 "mrbgems/mruby-compiler/core/parse.y"
+ case 486: /* var_lhs: variable */
+#line 3573 "mrbgems/mruby-compiler/core/parse.y"
 {
 assignable(p, (yyvsp0.nd));
 }
-#line 9323 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9677 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 485:
-#line 3560 "mrbgems/mruby-compiler/core/parse.y"
+ case 487: /* var_lhs: "numbered parameter" */
+#line 3577 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "can't assign to numbered parameter");
 }
-#line 9331 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9685 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 486:
-#line 3566 "mrbgems/mruby-compiler/core/parse.y"
+ case 488: /* var_ref: variable */
+#line 3583 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = var_reference(p, (yyvsp0.nd));
 }
-#line 9339 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9693 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 487:
-#line 3570 "mrbgems/mruby-compiler/core/parse.y"
+ case 489: /* var_ref: keyword_nil */
+#line 3587 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_nil(p);
 }
-#line 9347 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9701 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 488:
-#line 3574 "mrbgems/mruby-compiler/core/parse.y"
+ case 490: /* var_ref: keyword_self */
+#line 3591 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_self(p);
 }
-#line 9355 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9709 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 489:
-#line 3578 "mrbgems/mruby-compiler/core/parse.y"
+ case 491: /* var_ref: keyword_true */
+#line 3595 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_true(p);
 }
-#line 9363 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9717 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 490:
-#line 3582 "mrbgems/mruby-compiler/core/parse.y"
+ case 492: /* var_ref: keyword_false */
+#line 3599 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_false(p);
 }
-#line 9371 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9725 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 491:
-#line 3586 "mrbgems/mruby-compiler/core/parse.y"
+ case 493: /* var_ref: keyword__FILE__ */
+#line 3603 "mrbgems/mruby-compiler/core/parse.y"
 {
 const char *fn = mrb_sym_name_len(p->mrb, p->filename_sym, NULL);
 if (!fn) {
@@ -9379,599 +9733,607 @@
 }
 (yyval.nd) = new_str(p, fn, strlen(fn));
 }
-#line 9383 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9737 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 492:
-#line 3594 "mrbgems/mruby-compiler/core/parse.y"
+ case 494: /* var_ref: keyword__LINE__ */
+#line 3611 "mrbgems/mruby-compiler/core/parse.y"
 {
 char buf16;
 
 dump_int(p->lineno, buf);
 (yyval.nd) = new_int(p, buf, 10, 0);
 }
-#line 9394 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9748 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 493:
-#line 3601 "mrbgems/mruby-compiler/core/parse.y"
+ case 495: /* var_ref: keyword__ENCODING__ */
+#line 3618 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0);
 }
-#line 9402 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9756 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 496:
-#line 3611 "mrbgems/mruby-compiler/core/parse.y"
+ case 498: /* superclass: %empty */
+#line 3628 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = 0;
 }
-#line 9410 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9764 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 497:
-#line 3615 "mrbgems/mruby-compiler/core/parse.y"
+ case 499: /* $@31: %empty */
+#line 3632 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lstate = EXPR_BEG;
 p->cmd_start = TRUE;
 }
-#line 9419 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9773 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 498:
-#line 3620 "mrbgems/mruby-compiler/core/parse.y"
+ case 500: /* superclass: '<' $@31 expr_value term */
+#line 3637 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 9427 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9781 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 501:
-#line 3636 "mrbgems/mruby-compiler/core/parse.y"
+ case 503: /* f_arglist_paren: '(' f_args rparen */
+#line 3653 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 p->lstate = EXPR_BEG;
 p->cmd_start = TRUE;
 }
-#line 9437 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9791 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 502:
-#line 3642 "mrbgems/mruby-compiler/core/parse.y"
+ case 504: /* f_arglist_paren: '(' f_arg ',' tBDOT3 rparen */
+#line 3659 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_dots(p, (yyvsp-3.nd));
 }
-#line 9445 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9799 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 503:
-#line 3646 "mrbgems/mruby-compiler/core/parse.y"
+ case 505: /* f_arglist_paren: '(' tBDOT3 rparen */
+#line 3663 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_dots(p, 0);
 }
-#line 9453 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9807 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 505:
-#line 3653 "mrbgems/mruby-compiler/core/parse.y"
+ case 507: /* f_arglist: f_args term */
+#line 3670 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 9461 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9815 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 506:
-#line 3657 "mrbgems/mruby-compiler/core/parse.y"
+ case 508: /* f_arglist: f_arg ',' tBDOT3 term */
+#line 3674 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_dots(p, (yyvsp-3.nd));
 }
-#line 9469 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9823 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 507:
-#line 3661 "mrbgems/mruby-compiler/core/parse.y"
+ case 509: /* f_arglist: "..." term */
+#line 3678 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_dots(p, 0);
 }
-#line 9477 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9831 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 508:
-#line 3667 "mrbgems/mruby-compiler/core/parse.y"
+ case 510: /* f_label: "local variable or method" "label" */
+#line 3684 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_nest(p);
 }
-#line 9485 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9839 "mrbgems/mruby-compiler/core/y.tab.c"
+ break;
+
+ case 511: /* f_label: "numbered parameter" "label" */
+#line 3688 "mrbgems/mruby-compiler/core/parse.y"
+ {
+ local_nest(p);
+ }
+#line 9847 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 509:
-#line 3673 "mrbgems/mruby-compiler/core/parse.y"
+ case 512: /* f_kw: f_label arg */
+#line 3694 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = new_kw_arg(p, (yyvsp-1.id), cons((yyvsp0.nd), locals_node(p)));
 local_unnest(p);
 }
-#line 9495 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9857 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 510:
-#line 3679 "mrbgems/mruby-compiler/core/parse.y"
+ case 513: /* f_kw: f_label */
+#line 3700 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_kw_arg(p, (yyvsp0.id), 0);
 local_unnest(p);
 }
-#line 9504 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9866 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 511:
-#line 3686 "mrbgems/mruby-compiler/core/parse.y"
+ case 514: /* f_block_kw: f_label primary_value */
+#line 3707 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = new_kw_arg(p, (yyvsp-1.id), cons((yyvsp0.nd), locals_node(p)));
 local_unnest(p);
 }
-#line 9514 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9876 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 512:
-#line 3692 "mrbgems/mruby-compiler/core/parse.y"
+ case 515: /* f_block_kw: f_label */
+#line 3713 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_kw_arg(p, (yyvsp0.id), 0);
 local_unnest(p);
 }
-#line 9523 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9885 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 513:
-#line 3699 "mrbgems/mruby-compiler/core/parse.y"
+ case 516: /* f_block_kwarg: f_block_kw */
+#line 3720 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 9531 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9893 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 514:
-#line 3703 "mrbgems/mruby-compiler/core/parse.y"
+ case 517: /* f_block_kwarg: f_block_kwarg ',' f_block_kw */
+#line 3724 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 9539 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9901 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 515:
-#line 3709 "mrbgems/mruby-compiler/core/parse.y"
+ case 518: /* f_kwarg: f_kw */
+#line 3730 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 9547 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9909 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 516:
-#line 3713 "mrbgems/mruby-compiler/core/parse.y"
+ case 519: /* f_kwarg: f_kwarg ',' f_kw */
+#line 3734 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 9555 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9917 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 519:
-#line 3723 "mrbgems/mruby-compiler/core/parse.y"
+ case 522: /* f_kwrest: kwrest_mark "local variable or method" */
+#line 3744 "mrbgems/mruby-compiler/core/parse.y"
 {
- (yyval.nd) = new_kw_rest_args(p, nsym((yyvsp0.id)));
+ (yyval.nd) = new_kw_rest_args(p, (yyvsp0.id));
 }
-#line 9563 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9925 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 520:
-#line 3727 "mrbgems/mruby-compiler/core/parse.y"
+ case 523: /* f_kwrest: kwrest_mark */
+#line 3748 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_kw_rest_args(p, 0);
 }
-#line 9571 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9933 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 521:
-#line 3733 "mrbgems/mruby-compiler/core/parse.y"
+ case 524: /* args_tail: f_kwarg ',' f_kwrest opt_f_block_arg */
+#line 3754 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, (yyvsp-3.nd), (yyvsp-1.nd), (yyvsp0.id));
 }
-#line 9579 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9941 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 522:
-#line 3737 "mrbgems/mruby-compiler/core/parse.y"
+ case 525: /* args_tail: f_kwarg opt_f_block_arg */
+#line 3758 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, (yyvsp-1.nd), 0, (yyvsp0.id));
 }
-#line 9587 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9949 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 523:
-#line 3741 "mrbgems/mruby-compiler/core/parse.y"
+ case 526: /* args_tail: f_kwrest opt_f_block_arg */
+#line 3762 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, 0, (yyvsp-1.nd), (yyvsp0.id));
 }
-#line 9595 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9957 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 524:
-#line 3745 "mrbgems/mruby-compiler/core/parse.y"
+ case 527: /* args_tail: f_block_arg */
+#line 3766 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp0.id));
 }
-#line 9603 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9965 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 525:
-#line 3751 "mrbgems/mruby-compiler/core/parse.y"
+ case 528: /* opt_args_tail: ',' args_tail */
+#line 3772 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 }
-#line 9611 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9973 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 526:
-#line 3755 "mrbgems/mruby-compiler/core/parse.y"
+ case 529: /* opt_args_tail: %empty */
+#line 3776 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args_tail(p, 0, 0, 0);
 }
-#line 9619 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9981 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 527:
-#line 3761 "mrbgems/mruby-compiler/core/parse.y"
+ case 530: /* f_args: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail */
+#line 3782 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 9627 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9989 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 528:
-#line 3765 "mrbgems/mruby-compiler/core/parse.y"
+ case 531: /* f_args: f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */
+#line 3786 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-7.nd), (yyvsp-5.nd), (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9635 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9997 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 529:
-#line 3769 "mrbgems/mruby-compiler/core/parse.y"
+ case 532: /* f_args: f_arg ',' f_optarg opt_args_tail */
+#line 3790 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-3.nd), (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
 }
-#line 9643 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10005 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 530:
-#line 3773 "mrbgems/mruby-compiler/core/parse.y"
+ case 533: /* f_args: f_arg ',' f_optarg ',' f_arg opt_args_tail */
+#line 3794 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9651 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10013 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 531:
-#line 3777 "mrbgems/mruby-compiler/core/parse.y"
+ case 534: /* f_args: f_arg ',' f_rest_arg opt_args_tail */
+#line 3798 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-3.nd), 0, (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 9659 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10021 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 532:
-#line 3781 "mrbgems/mruby-compiler/core/parse.y"
+ case 535: /* f_args: f_arg ',' f_rest_arg ',' f_arg opt_args_tail */
+#line 3802 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-5.nd), 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9667 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10029 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 533:
-#line 3785 "mrbgems/mruby-compiler/core/parse.y"
+ case 536: /* f_args: f_arg opt_args_tail */
+#line 3806 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, (yyvsp-1.nd), 0, 0, 0, (yyvsp0.nd));
 }
-#line 9675 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10037 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 534:
-#line 3789 "mrbgems/mruby-compiler/core/parse.y"
+ case 537: /* f_args: f_optarg ',' f_rest_arg opt_args_tail */
+#line 3810 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 9683 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10045 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 535:
-#line 3793 "mrbgems/mruby-compiler/core/parse.y"
+ case 538: /* f_args: f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */
+#line 3814 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-5.nd), (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9691 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10053 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 536:
-#line 3797 "mrbgems/mruby-compiler/core/parse.y"
+ case 539: /* f_args: f_optarg opt_args_tail */
+#line 3818 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
 }
-#line 9699 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10061 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 537:
-#line 3801 "mrbgems/mruby-compiler/core/parse.y"
+ case 540: /* f_args: f_optarg ',' f_arg opt_args_tail */
+#line 3822 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9707 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10069 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 538:
-#line 3805 "mrbgems/mruby-compiler/core/parse.y"
+ case 541: /* f_args: f_rest_arg opt_args_tail */
+#line 3826 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, 0, (yyvsp-1.id), 0, (yyvsp0.nd));
 }
-#line 9715 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10077 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 539:
-#line 3809 "mrbgems/mruby-compiler/core/parse.y"
+ case 542: /* f_args: f_rest_arg ',' f_arg opt_args_tail */
+#line 3830 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
 }
-#line 9723 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10085 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 540:
-#line 3813 "mrbgems/mruby-compiler/core/parse.y"
+ case 543: /* f_args: args_tail */
+#line 3834 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp0.nd));
 }
-#line 9731 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10093 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 541:
-#line 3817 "mrbgems/mruby-compiler/core/parse.y"
+ case 544: /* f_args: %empty */
+#line 3838 "mrbgems/mruby-compiler/core/parse.y"
 {
- local_add_f(p, intern_op(and));
+ local_add_f(p, 0);
 (yyval.nd) = new_args(p, 0, 0, 0, 0, 0);
 }
-#line 9740 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10102 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 542:
-#line 3824 "mrbgems/mruby-compiler/core/parse.y"
+ case 545: /* f_bad_arg: "constant" */
+#line 3845 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "formal argument cannot be a constant");
 (yyval.nd) = 0;
 }
-#line 9749 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10111 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 543:
-#line 3829 "mrbgems/mruby-compiler/core/parse.y"
+ case 546: /* f_bad_arg: "instance variable" */
+#line 3850 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "formal argument cannot be an instance variable");
 (yyval.nd) = 0;
 }
-#line 9758 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10120 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 544:
-#line 3834 "mrbgems/mruby-compiler/core/parse.y"
+ case 547: /* f_bad_arg: "global variable" */
+#line 3855 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "formal argument cannot be a global variable");
 (yyval.nd) = 0;
 }
-#line 9767 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10129 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 545:
-#line 3839 "mrbgems/mruby-compiler/core/parse.y"
+ case 548: /* f_bad_arg: "class variable" */
+#line 3860 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "formal argument cannot be a class variable");
 (yyval.nd) = 0;
 }
-#line 9776 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10138 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 546:
-#line 3844 "mrbgems/mruby-compiler/core/parse.y"
+ case 549: /* f_bad_arg: "numbered parameter" */
+#line 3865 "mrbgems/mruby-compiler/core/parse.y"
 {
 yyerror(p, "formal argument cannot be a numbered parameter");
 (yyval.nd) = 0;
 }
-#line 9785 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10147 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 547:
-#line 3851 "mrbgems/mruby-compiler/core/parse.y"
+ case 550: /* f_norm_arg: f_bad_arg */
+#line 3872 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = 0;
 }
-#line 9793 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10155 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 548:
-#line 3855 "mrbgems/mruby-compiler/core/parse.y"
+ case 551: /* f_norm_arg: "local variable or method" */
+#line 3876 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_f(p, (yyvsp0.id));
 (yyval.id) = (yyvsp0.id);
 }
-#line 9802 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10164 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 549:
-#line 3862 "mrbgems/mruby-compiler/core/parse.y"
+ case 552: /* f_arg_item: f_norm_arg */
+#line 3883 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_arg(p, (yyvsp0.id));
 }
-#line 9810 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10172 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 550:
-#line 3866 "mrbgems/mruby-compiler/core/parse.y"
+ case 553: /* @32: %empty */
+#line 3887 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = local_switch(p);
 }
-#line 9818 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10180 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 551:
-#line 3870 "mrbgems/mruby-compiler/core/parse.y"
+ case 554: /* f_arg_item: tLPAREN @32 f_margs rparen */
+#line 3891 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = new_masgn_param(p, (yyvsp-1.nd), p->locals->car);
 local_resume(p, (yyvsp-2.nd));
 local_add_f(p, 0);
 }
-#line 9828 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10190 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 552:
-#line 3878 "mrbgems/mruby-compiler/core/parse.y"
+ case 555: /* f_arg: f_arg_item */
+#line 3899 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 9836 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10198 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 553:
-#line 3882 "mrbgems/mruby-compiler/core/parse.y"
+ case 556: /* f_arg: f_arg ',' f_arg_item */
+#line 3903 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 9844 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10206 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 554:
-#line 3888 "mrbgems/mruby-compiler/core/parse.y"
+ case 557: /* f_opt_asgn: "local variable or method" '=' */
+#line 3909 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_f(p, (yyvsp-1.id));
 local_nest(p);
 (yyval.id) = (yyvsp-1.id);
 }
-#line 9854 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10216 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 555:
-#line 3896 "mrbgems/mruby-compiler/core/parse.y"
+ case 558: /* f_opt: f_opt_asgn arg */
+#line 3917 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = cons(nsym((yyvsp-1.id)), cons((yyvsp0.nd), locals_node(p)));
 local_unnest(p);
 }
-#line 9864 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10226 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 556:
-#line 3904 "mrbgems/mruby-compiler/core/parse.y"
+ case 559: /* f_block_opt: f_opt_asgn primary_value */
+#line 3925 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = cons(nsym((yyvsp-1.id)), cons((yyvsp0.nd), locals_node(p)));
 local_unnest(p);
 }
-#line 9874 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10236 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 557:
-#line 3912 "mrbgems/mruby-compiler/core/parse.y"
+ case 560: /* f_block_optarg: f_block_opt */
+#line 3933 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 9882 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10244 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 558:
-#line 3916 "mrbgems/mruby-compiler/core/parse.y"
+ case 561: /* f_block_optarg: f_block_optarg ',' f_block_opt */
+#line 3937 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 9890 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10252 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 559:
-#line 3922 "mrbgems/mruby-compiler/core/parse.y"
+ case 562: /* f_optarg: f_opt */
+#line 3943 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 }
-#line 9898 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10260 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 560:
-#line 3926 "mrbgems/mruby-compiler/core/parse.y"
+ case 563: /* f_optarg: f_optarg ',' f_opt */
+#line 3947 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 9906 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10268 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 563:
-#line 3936 "mrbgems/mruby-compiler/core/parse.y"
+ case 566: /* f_rest_arg: restarg_mark "local variable or method" */
+#line 3957 "mrbgems/mruby-compiler/core/parse.y"
 {
 local_add_f(p, (yyvsp0.id));
 (yyval.id) = (yyvsp0.id);
 }
-#line 9915 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10277 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 564:
-#line 3941 "mrbgems/mruby-compiler/core/parse.y"
+ case 567: /* f_rest_arg: restarg_mark */
+#line 3962 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = intern_op(mul);
 local_add_f(p, (yyval.id));
 }
-#line 9924 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10286 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 567:
-#line 3952 "mrbgems/mruby-compiler/core/parse.y"
+ case 570: /* f_block_arg: blkarg_mark "local variable or method" */
+#line 3973 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = (yyvsp0.id);
 }
-#line 9932 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10294 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 568:
-#line 3956 "mrbgems/mruby-compiler/core/parse.y"
+ case 571: /* f_block_arg: blkarg_mark */
+#line 3977 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = intern_op(and);
 }
-#line 9940 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10302 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 569:
-#line 3962 "mrbgems/mruby-compiler/core/parse.y"
+ case 572: /* opt_f_block_arg: ',' f_block_arg */
+#line 3983 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = (yyvsp0.id);
 }
-#line 9948 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10310 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 570:
-#line 3966 "mrbgems/mruby-compiler/core/parse.y"
+ case 573: /* opt_f_block_arg: none */
+#line 3987 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.id) = 0;
 }
-#line 9956 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10318 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 571:
-#line 3972 "mrbgems/mruby-compiler/core/parse.y"
+ case 574: /* singleton: var_ref */
+#line 3993 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp0.nd);
 if (!(yyval.nd)) (yyval.nd) = new_nil(p);
 }
-#line 9965 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10327 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 572:
-#line 3976 "mrbgems/mruby-compiler/core/parse.y"
+ case 575: /* $@33: %empty */
+#line 3997 "mrbgems/mruby-compiler/core/parse.y"
 {p->lstate = EXPR_BEG;}
-#line 9971 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10333 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 573:
-#line 3977 "mrbgems/mruby-compiler/core/parse.y"
+ case 576: /* singleton: '(' $@33 expr rparen */
+#line 3998 "mrbgems/mruby-compiler/core/parse.y"
 {
 if ((yyvsp-1.nd) == 0) {
 yyerror(p, "can't define singleton method for ().");
@@ -9994,63 +10356,81 @@
 }
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 9998 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10360 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 575:
-#line 4003 "mrbgems/mruby-compiler/core/parse.y"
+ case 578: /* assoc_list: assocs trailer */
+#line 4024 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = (yyvsp-1.nd);
 }
-#line 10006 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10368 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 576:
-#line 4009 "mrbgems/mruby-compiler/core/parse.y"
+ case 579: /* assocs: assoc */
+#line 4030 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = list1((yyvsp0.nd));
 NODE_LINENO((yyval.nd), (yyvsp0.nd));
 }
-#line 10015 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10377 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 577:
-#line 4014 "mrbgems/mruby-compiler/core/parse.y"
+ case 580: /* assocs: assocs comma assoc */
+#line 4035 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 10023 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10385 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 578:
-#line 4020 "mrbgems/mruby-compiler/core/parse.y"
+ case 581: /* assoc: arg "=>" arg */
+#line 4041 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp-2.nd));
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = cons((yyvsp-2.nd), (yyvsp0.nd));
 }
-#line 10033 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10395 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 579:
-#line 4026 "mrbgems/mruby-compiler/core/parse.y"
+ case 582: /* assoc: "local variable or method" "label" arg */
+#line 4047 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = cons(new_sym(p, (yyvsp-2.id)), (yyvsp0.nd));
 }
-#line 10042 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10404 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 580:
-#line 4031 "mrbgems/mruby-compiler/core/parse.y"
+ case 583: /* assoc: "local variable or method" "label" */
+#line 4052 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = cons(new_sym(p, (yyvsp-1.id)), label_reference(p, (yyvsp-1.id)));
 }
-#line 10050 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10412 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 581:
-#line 4035 "mrbgems/mruby-compiler/core/parse.y"
+ case 584: /* assoc: "numbered parameter" "label" */
+#line 4056 "mrbgems/mruby-compiler/core/parse.y"
+ {
+ mrb_sym sym = intern_numparam((yyvsp-1.num));
+ (yyval.nd) = cons(new_sym(p, sym), label_reference(p, sym));
+ }
+#line 10421 "mrbgems/mruby-compiler/core/y.tab.c"
+ break;
+
+ case 585: /* assoc: "numbered parameter" "label" arg */
+#line 4061 "mrbgems/mruby-compiler/core/parse.y"
+ {
+ void_expr_error(p, (yyvsp0.nd));
+ (yyval.nd) = cons(new_sym(p, intern_numparam((yyvsp-2.num))), (yyvsp0.nd));
+ }
+#line 10430 "mrbgems/mruby-compiler/core/y.tab.c"
+ break;
+
+ case 586: /* assoc: string_fragment "label" arg */
+#line 4066 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 if (typen((yyvsp-2.nd)->car) == NODE_DSTR) {
@@ -10060,67 +10440,75 @@
 (yyval.nd) = cons(new_sym(p, new_strsym(p, (yyvsp-2.nd))), (yyvsp0.nd));
 }
 }
-#line 10064 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10444 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 582:
-#line 4045 "mrbgems/mruby-compiler/core/parse.y"
+ case 587: /* assoc: "**" arg */
+#line 4076 "mrbgems/mruby-compiler/core/parse.y"
 {
 void_expr_error(p, (yyvsp0.nd));
 (yyval.nd) = cons(new_kw_rest_args(p, 0), (yyvsp0.nd));
 }
-#line 10073 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10453 "mrbgems/mruby-compiler/core/y.tab.c"
+ break;
+
+ case 588: /* assoc: "**" */
+#line 4081 "mrbgems/mruby-compiler/core/parse.y"
+ {
+ (yyval.nd) = cons(new_kw_rest_args(p, 0), new_lvar(p, intern_op(pow)));
+ }
+#line 10461 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 595:
-#line 4072 "mrbgems/mruby-compiler/core/parse.y"
+ case 601: /* call_op: '.' */
+#line 4107 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.num) = '.';
 }
-#line 10081 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10469 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 596:
-#line 4076 "mrbgems/mruby-compiler/core/parse.y"
+ case 602: /* call_op: "&." */
+#line 4111 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.num) = 0;
 }
-#line 10089 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10477 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 598:
-#line 4083 "mrbgems/mruby-compiler/core/parse.y"
+ case 604: /* call_op2: "::" */
+#line 4118 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.num) = tCOLON2;
 }
-#line 10097 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10485 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 607:
-#line 4104 "mrbgems/mruby-compiler/core/parse.y"
+ case 613: /* term: ';' */
+#line 4139 "mrbgems/mruby-compiler/core/parse.y"
 {yyerrok;}
-#line 10103 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10491 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 609:
-#line 4109 "mrbgems/mruby-compiler/core/parse.y"
+ case 615: /* nl: '\n' */
+#line 4144 "mrbgems/mruby-compiler/core/parse.y"
 {
 p->lineno += (yyvsp0.num);
 p->column = 0;
 }
-#line 10112 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10500 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
- case 613:
-#line 4121 "mrbgems/mruby-compiler/core/parse.y"
+ case 619: /* none: %empty */
+#line 4156 "mrbgems/mruby-compiler/core/parse.y"
 {
 (yyval.nd) = 0;
 }
-#line 10120 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10508 "mrbgems/mruby-compiler/core/y.tab.c"
 break;
 
 
-#line 10124 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10512 "mrbgems/mruby-compiler/core/y.tab.c"
 
 default: break;
 }
@@ -10135,11 +10523,10 @@
 case of YYERROR or YYBACKUP, subsequent parser actions might lead
 to an incorrect destructor call or verbose syntax error message
 before the lookahead is translated. */
- YY_SYMBOL_PRINT ("-> $$ =", yyr1yyn, &yyval, &yyloc);
+ YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1yyn), &yyval, &yyloc);
 
 YYPOPSTACK (yylen);
 yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
 
 *++yyvsp = yyval;
 
@@ -10163,50 +10550,44 @@
 yyerrlab:
 /* Make sure we have latest lookahead translation. See comments at
 user semantic actions for why this is necessary. */
- yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
+ yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
 /* If not already recovering from an error, report this error. */
 if (!yyerrstatus)
 {
 ++yynerrs;
-#if ! YYERROR_VERBOSE
- yyerror (p, YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
- yyssp, yytoken)
 {
+ yypcontext_t yyctx
+ = {yyssp, yytoken};
 char const *yymsgp = YY_("syntax error");
 int yysyntax_error_status;
- yysyntax_error_status = YYSYNTAX_ERROR;
+ yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
 if (yysyntax_error_status == 0)
 yymsgp = yymsg;
- else if (yysyntax_error_status == 1)
+ else if (yysyntax_error_status == -1)
 {
 if (yymsg != yymsgbuf)
 YYSTACK_FREE (yymsg);
- yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
- if (!yymsg)
+ yymsg = YY_CAST (char *,
+ YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
+ if (yymsg)
 {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- yysyntax_error_status = 2;
+ yysyntax_error_status
+ = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
+ yymsgp = yymsg;
 }
 else
 {
- yysyntax_error_status = YYSYNTAX_ERROR;
- yymsgp = yymsg;
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ yysyntax_error_status = YYENOMEM;
 }
 }
 yyerror (p, yymsgp);
- if (yysyntax_error_status == 2)
- goto yyexhaustedlab;
+ if (yysyntax_error_status == YYENOMEM)
+ YYNOMEM;
 }
-# undef YYSYNTAX_ERROR
-#endif
 }
 
-
-
 if (yyerrstatus == 3)
 {
 /* If just tried and failed to reuse lookahead token after an
@@ -10239,6 +10620,7 @@
 label yyerrorlab therefore never appears in user code. */
 if (0)
 YYERROR;
+ ++yynerrs;
 
 /* Do not reclaim the symbols of the rule whose action triggered
 this YYERROR. */
@@ -10255,13 +10637,14 @@
 yyerrlab1:
 yyerrstatus = 3; /* Each real token shifted decrements this. */
 
+ /* Pop stack until we find a state that shifts the error token. */
 for (;;)
 {
 yyn = yypactyystate;
 if (!yypact_value_is_default (yyn))
 {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
+ yyn += YYSYMBOL_YYerror;
+ if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYSYMBOL_YYerror)
 {
 yyn = yytableyyn;
 if (0 < yyn)
@@ -10275,7 +10658,7 @@
 
 
 yydestruct ("Error: popping",
- yystosyystate, yyvsp, p);
+ YY_ACCESSING_SYMBOL (yystate), yyvsp, p);
 YYPOPSTACK (1);
 yystate = *yyssp;
 YY_STACK_PRINT (yyss, yyssp);
@@ -10287,7 +10670,7 @@
 
 
 /* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystosyyn, yyvsp, yylsp);
+ YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
 
 yystate = yyn;
 goto yynewstate;
@@ -10298,7 +10681,7 @@
 `-------------------------------------*/
 yyacceptlab:
 yyresult = 0;
- goto yyreturn;
+ goto yyreturnlab;
 
 
 /*-----------------------------------.
@@ -10306,24 +10689,22 @@
 `-----------------------------------*/
 yyabortlab:
 yyresult = 1;
- goto yyreturn;
+ goto yyreturnlab;
 
 
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here. |
-`-------------------------------------------------*/
+/*-----------------------------------------------------------.
+| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. |
+`-----------------------------------------------------------*/
 yyexhaustedlab:
 yyerror (p, YY_("memory exhausted"));
 yyresult = 2;
- /* Fall through. */
-#endif
+ goto yyreturnlab;
 
 
-/*-----------------------------------------------------.
-| yyreturn -- parsing is finished, return the result. |
-`-----------------------------------------------------*/
-yyreturn:
+/*----------------------------------------------------------.
+| yyreturnlab -- parsing is finished, clean up and return. |
+`----------------------------------------------------------*/
+yyreturnlab:
 if (yychar != YYEMPTY)
 {
 /* Make sure we have latest lookahead translation. See comments at
@@ -10339,20 +10720,19 @@
 while (yyssp != yyss)
 {
 yydestruct ("Cleanup: popping",
- yystos+*yyssp, yyvsp, p);
+ YY_ACCESSING_SYMBOL (+*yyssp), yyvsp, p);
 YYPOPSTACK (1);
 }
 #ifndef yyoverflow
 if (yyss != yyssa)
 YYSTACK_FREE (yyss);
 #endif
-#if YYERROR_VERBOSE
 if (yymsg != yymsgbuf)
 YYSTACK_FREE (yymsg);
-#endif
 return yyresult;
 }
-#line 4125 "mrbgems/mruby-compiler/core/parse.y"
+
+#line 4160 "mrbgems/mruby-compiler/core/parse.y"
 
 #define pylval (*((YYSTYPE*)(p->ylval)))
 
@@ -10375,7 +10755,7 @@
 }
 else if (p->nerr < sizeof(p->error_buffer) / sizeof(p->error_buffer0)) {
 n = strlen(s);
- c = (char *)parser_palloc(p, n + 1);
+ c = (char*)parser_palloc(p, n + 1);
 memcpy(c, s, n + 1);
 p->error_bufferp->nerr.message = c;
 p->error_bufferp->nerr.lineno = p->lineno;
@@ -10414,7 +10794,7 @@
 }
 else if (p->nwarn < sizeof(p->warn_buffer) / sizeof(p->warn_buffer0)) {
 n = strlen(s);
- c = (char *)parser_palloc(p, n + 1);
+ c = (char*)parser_palloc(p, n + 1);
 memcpy(c, s, n + 1);
 p->warn_bufferp->nwarn.message = c;
 p->warn_bufferp->nwarn.lineno = p->lineno;
@@ -10449,7 +10829,7 @@
 yyerror_c(p, "can't set variable $", (char)intn(n->cdr));
 }
 else {
- mrb_bug(p->mrb, "Internal error in backref_error() : n=>car == %d", c);
+ yyerror(p, "Internal error in backref_error()");
 }
 }
 
@@ -10495,22 +10875,20 @@
 static inline int
 nextc0(parser_state *p)
 {
- int c;
-
 if (p->s && p->s < p->send) {
- c = (unsigned char)*p->s++;
+ return (unsigned char)*p->s++;
 }
 else {
 #ifndef MRB_NO_STDIO
+ int c;
+
 if (p->f) {
 c = fgetc(p->f);
- if (feof(p->f)) return -1;
+ if (!feof(p->f)) return c;
 }
- else
 #endif
- return -1;
+ return -1;
 }
- return c;
 }
 
 static inline int
@@ -10915,7 +11293,7 @@
 c = read_escape_unicode(p, 4);
 if (c < 0) return 0;
 }
- return -c;
+ return -c;
 
 case 'b':/* backspace */
 return '\010';
@@ -10964,7 +11342,7 @@
 }
 
 static void
-heredoc_count_indent(parser_heredoc_info *hinf, const char *str, size_t len, size_t spaces, size_t *offset)
+heredoc_count_indent(parser_heredoc_info *hinfo, const char *str, size_t len, size_t spaces, size_t *offset)
 {
 size_t indent = 0;
 *offset = 0;
@@ -10979,7 +11357,7 @@
 else
 break;
 size_t nindent = indent + size;
- if (nindent > spaces || nindent > hinf->indent)
+ if (nindent > spaces || nindent > hinfo->indent)
 break;
 indent = nindent;
 *offset += 1;
@@ -10987,14 +11365,14 @@
 }
 
 static void
-heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinf)
+heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinfo)
 {
- if (!hinf->remove_indent || hinf->indent == 0)
+ if (!hinfo->remove_indent || hinfo->indent == 0)
 return;
 node *indented, *n, *pair, *escaped, *nspaces;
 const char *str;
 size_t len, spaces, offset, start, end;
- indented = hinf->indented;
+ indented = hinfo->indented;
 while (indented) {
 n = indented->car;
 pair = n->car;
@@ -11011,7 +11389,7 @@
 if (end > len) end = len;
 spaces = (size_t)nspaces->car;
 size_t esclen = end - start;
- heredoc_count_indent(hinf, str + start, esclen, spaces, &offset);
+ heredoc_count_indent(hinfo, str + start, esclen, spaces, &offset);
 esclen -= offset;
 memcpy(newstr + newlen, str + start + offset, esclen);
 newlen += esclen;
@@ -11026,7 +11404,7 @@
 pair->cdr = (node*)newlen;
 } else {
 spaces = (size_t)nspaces->car;
- heredoc_count_indent(hinf, str, len, spaces, &offset);
+ heredoc_count_indent(hinfo, str, len, spaces, &offset);
 pair->car = (node*)(str + offset);
 pair->cdr = (node*)(len - offset);
 }
@@ -11035,13 +11413,13 @@
 }
 
 static void
-heredoc_push_indented(parser_state *p, parser_heredoc_info *hinf, node *pair, node *escaped, node *nspaces, mrb_bool empty_line)
+heredoc_push_indented(parser_state *p, parser_heredoc_info *hinfo, node *pair, node *escaped, node *nspaces, mrb_bool empty_line)
 {
- hinf->indented = push(hinf->indented, cons(pair, cons(escaped, nspaces)));
+ hinfo->indented = push(hinfo->indented, cons(pair, cons(escaped, nspaces)));
 while (nspaces) {
 size_t tspaces = (size_t)nspaces->car;
- if ((hinf->indent == ~0U || tspaces < hinf->indent) && !empty_line)
- hinf->indent = tspaces;
+ if ((hinfo->indent == ~0U || tspaces < hinfo->indent) && !empty_line)
+ hinfo->indent = tspaces;
 nspaces = nspaces->cdr;
 }
 }
@@ -11050,14 +11428,14 @@
 parse_string(parser_state *p)
 {
 int c;
- string_type type = (string_type)(intptr_t)p->lex_strterm->car;
- int nest_level = intn(p->lex_strterm->cdr->car);
- int beg = intn(p->lex_strterm->cdr->cdr->car);
- int end = intn(p->lex_strterm->cdr->cdr->cdr);
- parser_heredoc_info *hinf = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_inf(p) : NULL;
+ string_type type = (string_type)p->lex_strterm->type;
+ int nest_level = p->lex_strterm->level;
+ int beg = p->lex_strterm->paren;
+ int end = p->lex_strterm->term;
+ parser_heredoc_info *hinfo = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_info(p) : NULL;
 
- mrb_bool unindent = hinf && hinf->remove_indent;
- mrb_bool head = hinf && hinf->line_head;
+ mrb_bool unindent = hinfo && hinfo->remove_indent;
+ mrb_bool head = hinfo && hinfo->line_head;
 mrb_bool empty = TRUE;
 size_t spaces = 0;
 size_t pos = -1;
@@ -11069,26 +11447,26 @@
 newtok(p);
 while ((c = nextc(p)) != end || nest_level != 0) {
 pos++;
- if (hinf && (c == '\n' || c < 0)) {
+ if (hinfo && (c == '\n' || c < 0)) {
 mrb_bool line_head;
 tokadd(p, '\n');
 tokfix(p);
 p->lineno++;
 p->column = 0;
- line_head = hinf->line_head;
- hinf->line_head = TRUE;
+ line_head = hinfo->line_head;
+ hinfo->line_head = TRUE;
 if (line_head) {
 /* check whether end of heredoc */
 const char *s = tok(p);
 int len = toklen(p);
- if (hinf->allow_indent) {
+ if (hinfo->allow_indent) {
 while (ISSPACE(*s) && len > 0) {
- ++s;
- --len;
+ s++;
+ len--;
 }
 }
- if (hinf->term_len > 0 && len-1 == hinf->term_len && strncmp(s, hinf->term, len-1) == 0) {
- heredoc_remove_indent(p, hinf);
+ if (hinfo->term_len > 0 && len-1 == hinfo->term_len && strncmp(s, hinfo->term, len-1) == 0) {
+ heredoc_remove_indent(p, hinfo);
 return tHEREDOC_END;
 }
 }
@@ -11097,11 +11475,11 @@
 const char s1 = "can't find heredoc delimiter \"";
 const char s2 = "\" anywhere before EOF";
 
- if (sizeof(s1)+sizeof(s2)+strlen(hinf->term)+1 >= sizeof(buf)) {
+ if (sizeof(s1)+sizeof(s2)+strlen(hinfo->term)+1 >= sizeof(buf)) {
 yyerror(p, "can't find heredoc delimiter anywhere before EOF");
 } else {
 strcpy(buf, s1);
- strcat(buf, hinf->term);
+ strcat(buf, hinfo->term);
 strcat(buf, s2);
 yyerror(p, buf);
 }
@@ -11111,7 +11489,7 @@
 pylval.nd = nd;
 if (unindent && head) {
 nspaces = push(nspaces, nint(spaces));
- heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, empty && line_head);
+ heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, empty && line_head);
 }
 return tHD_STRING_MID;
 }
@@ -11119,7 +11497,7 @@
 if (c == '\t')
 spaces += 8;
 else if (ISSPACE(c))
- ++spaces;
+ spaces++;
 else
 empty = FALSE;
 }
@@ -11129,11 +11507,11 @@
 }
 else if (c == beg) {
 nest_level++;
- p->lex_strterm->cdr->car = nint(nest_level);
+ p->lex_strterm->level = nest_level;
 }
 else if (c == end) {
 nest_level--;
- p->lex_strterm->cdr->car = nint(nest_level);
+ p->lex_strterm->level = nest_level;
 }
 else if (c == '\\') {
 c = nextc(p);
@@ -11170,14 +11548,14 @@
 if (c < 0) break;
 tokadd(p, -c);
 }
- if (hinf)
- hinf->line_head = FALSE;
+ if (hinfo)
+ hinfo->line_head = FALSE;
 }
 else {
 pushback(p, c);
 tokadd(p, read_escape(p));
- if (hinf)
- hinf->line_head = FALSE;
+ if (hinfo)
+ hinfo->line_head = FALSE;
 }
 }
 else {
@@ -11202,12 +11580,12 @@
 p->cmd_start = TRUE;
 node *nd = new_str(p, tok(p), toklen(p));
 pylval.nd = nd;
- if (hinf) {
+ if (hinfo) {
 if (unindent && head) {
 nspaces = push(nspaces, nint(spaces));
- heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, FALSE);
+ heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, FALSE);
 }
- hinf->line_head = FALSE;
+ hinfo->line_head = FALSE;
 return tHD_STRING_PART;
 }
 return tSTRING_PART;
@@ -12174,17 +12552,10 @@
 return tINTEGER;
 #else
 double d;
- char *endp;
 
- errno = 0;
- d = mrb_float_read(tok(p), &endp);
- if (d == 0 && endp == tok(p)) {
+ if (!mrb_read_float(tok(p), NULL, &d)) {
 yywarning_s(p, "corrupted float value", tok(p));
 }
- else if (errno == ERANGE) {
- yywarning_s(p, "float out of range", tok(p));
- errno = 0;
- }
 suffix = number_literal_suffix(p);
 if (seen_e && (suffix & NUM_SUFFIX_R)) {
 pushback(p, 'r');
@@ -12529,8 +12900,8 @@
 if (last_state == EXPR_FNAME) goto gvar;
 tokfix(p);
 {
- mrb_int n = mrb_int_read(tok(p), NULL, NULL);
- if (n > INT32_MAX) {
+ mrb_int n;
+ if (!mrb_read_int(tok(p), NULL, NULL, &n)) {
 yywarning(p, "capture group index too big; always nil");
 return keyword_nil;
 }
@@ -12660,16 +13031,17 @@
 nvars = nvars->cdr;
 }
 nvar = intn(p->nvars->car);
- if (nvar == -1) {
- yywarning(p, "numbered parameter used in inner block");
- }
- else {
- int nvars = intn(p->nvars->car);
- p->nvars->car = nint(nvars > n ? nvars : n);
+ if (nvar != -2) { /* numbered parameters never appear on toplevel */
+ if (nvar == -1) {
+ yywarning(p, "numbered parameter used in inner block");
+ }
+ else {
+ p->nvars->car = nint(nvar > n ? nvar : n);
+ }
+ pylval.num = n;
+ p->lstate = EXPR_END;
+ return tNUMPARAM;
 }
- pylval.num = n;
- p->lstate = EXPR_END;
- return tNUMPARAM;
 }
 }
 /* fall through */
@@ -12743,7 +13115,7 @@
 return keyword_do_block;
 return keyword_do;
 }
- if (state == EXPR_BEG || state == EXPR_VALUE)
+ if (state == EXPR_BEG || state == EXPR_VALUE || state == EXPR_CLASS)
 return kw->id0;
 else {
 if (kw->id0 != kw->id1)
@@ -12824,14 +13196,13 @@
 i++;
 n = n->cdr;
 }
- cxt->syms = (mrb_sym *)mrb_realloc(p->mrb, cxt->syms, i*sizeof(mrb_sym));
+ cxt->syms = (mrb_sym*)mrb_realloc(p->mrb, cxt->syms, i*sizeof(mrb_sym));
 cxt->slen = i;
 for (i=0, n=n0; n; i++,n=n->cdr) {
 cxt->symsi = sym(n->car);
 }
 }
 
-void mrb_codedump_all(mrb_state*, struct RProc*);
 void mrb_parser_dump(mrb_state *mrb, node *tree, int offset);
 
 MRB_API void
@@ -12882,7 +13253,7 @@
 
 pool = mrb_pool_open(mrb);
 if (!pool) return NULL;
- p = (parser_state *)mrb_pool_alloc(pool, sizeof(parser_state));
+ p = (parser_state*)mrb_pool_alloc(pool, sizeof(parser_state));
 if (!p) return NULL;
 
 *p = parser_state_zero;
@@ -12907,8 +13278,6 @@
 p->tokbuf = p->buf;
 
 p->lex_strterm = NULL;
- p->all_heredocs = p->parsing_heredoc = NULL;
- p->lex_strterm_before_heredoc = NULL;
 
 p->current_filename_index = -1;
 p->filename_table = NULL;
@@ -12928,7 +13297,7 @@
 MRB_API mrbc_context*
 mrbc_context_new(mrb_state *mrb)
 {
- return (mrbc_context *)mrb_calloc(mrb, 1, sizeof(mrbc_context));
+ return (mrbc_context*)mrb_calloc(mrb, 1, sizeof(mrbc_context));
 }
 
 MRB_API void
@@ -12944,7 +13313,7 @@
 {
 if (s) {
 size_t len = strlen(s);
- char *p = (char *)mrb_malloc(mrb, len + 1);
+ char *p = (char*)mrb_malloc(mrb, len + 1);
 
 memcpy(p, s, len + 1);
 if (c->filename) {
@@ -12970,6 +13339,7 @@
 c->syms = NULL;
 c->slen = 0;
 }
+ c->keep_lv = FALSE;
 }
 
 MRB_API void
@@ -12983,7 +13353,7 @@
 p->filename_sym = sym;
 p->lineno = (p->filename_table_length > 0)? 0 : 1;
 
- for (i = 0; i < p->filename_table_length; ++i) {
+ for (i = 0; i < p->filename_table_length; i++) {
 if (p->filename_tablei == sym) {
 p->current_filename_index = i;
 return;
@@ -13021,8 +13391,8 @@
 p = mrb_parser_new(mrb);
 if (!p) return NULL;
 if (prebuf) {
- p->s = (const char *)prebuf;
- p->send = (const char *)prebuf + prebufsize;
+ p->s = (const char*)prebuf;
+ p->send = (const char*)prebuf + prebufsize;
 }
 else {
 p->s = p->send = NULL;
@@ -13163,19 +13533,20 @@
 return mrb_load_exec(mrb, mrb_parse_file_continue(mrb, fp, leading.b, bufsize, c), c);
 }
 else {
- size_t binsize;
+ mrb_int binsize;
 uint8_t *bin;
 mrb_value bin_obj = mrb_nil_value(); /* temporary string object */
 mrb_value result;
 
 binsize = bin_to_uint32(leading.h.binary_size);
 bin_obj = mrb_str_new(mrb, NULL, binsize);
- bin = (uint8_t *)RSTRING_PTR(bin_obj);
- memcpy(bin, leading.b, bufsize);
- if (binsize > bufsize &&
- fread(bin + bufsize, binsize - bufsize, 1, fp) == 0) {
- binsize = bufsize;
- /* The error is reported by mrb_load_irep_buf_cxt() */
+ bin = (uint8_t*)RSTRING_PTR(bin_obj);
+ if ((size_t)binsize > bufsize) {
+ memcpy(bin, leading.b, bufsize);
+ if (fread(bin + bufsize, binsize - bufsize, 1, fp) == 0) {
+ binsize = bufsize;
+ /* The error is reported by mrb_load_irep_buf_cxt() */
+ }
 }
 
 result = mrb_load_irep_buf_cxt(mrb, bin, binsize, c);
@@ -13647,12 +14018,10 @@
 }
 }
 n2 = n2->cdr;
- if (n2) {
- if (n2->car) {
- dump_prefix(n2, offset+2);
- printf("post:\n");
- dump_recur(mrb, n2->car, offset+3);
- }
+ if (n2 && n2->car) {
+ dump_prefix(n2, offset+2);
+ printf("post:\n");
+ dump_recur(mrb, n2->car, offset+3);
 }
 }
 }
@@ -13812,20 +14181,28 @@
 break;
 
 case NODE_REGX:
- printf("NODE_REGX /%s/%s\n", (char*)tree->car, (char*)tree->cdr);
+ printf("NODE_REGX /%s/\n", (char*)tree->car);
+ if (tree->cdr->car) {
+ dump_prefix(tree, offset+1);
+ printf("opt: %s\n", (char*)tree->cdr->car);
+ }
+ if (tree->cdr->cdr) {
+ dump_prefix(tree, offset+1);
+ printf("enc: %s\n", (char*)tree->cdr->cdr);
+ }
 break;
 
 case NODE_DREGX:
 printf("NODE_DREGX:\n");
 dump_recur(mrb, tree->car, offset+1);
- dump_prefix(tree, offset);
+ dump_prefix(tree, offset+1);
 printf("tail: %s\n", (char*)tree->cdr->cdr->car);
 if (tree->cdr->cdr->cdr->car) {
- dump_prefix(tree, offset);
+ dump_prefix(tree, offset+1);
 printf("opt: %s\n", (char*)tree->cdr->cdr->cdr->car);
 }
 if (tree->cdr->cdr->cdr->cdr) {
- dump_prefix(tree, offset);
+ dump_prefix(tree, offset+1);
 printf("enc: %s\n", (char*)tree->cdr->cdr->cdr->cdr);
 }
 break;

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-complex/mrblib/complex.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-complex/mrblib/complex.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-complex/src/complex.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-complex/src/complex.c Changed

@@ -1,6 +1,7 @@
 #include <mruby.h>
 #include <mruby/class.h>
 #include <mruby/numeric.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 #ifdef MRB_NO_FLOAT
@@ -45,6 +46,8 @@
 #define complex_ptr(mrb, v) (&((struct RComplex*)mrb_obj_ptr(v))->r)
 #endif
 
+mrb_static_assert_object_size(struct RComplex);
+
 static struct RBasic*
 complex_alloc(mrb_state *mrb, struct RClass *c, struct mrb_complex **p)
 {
@@ -82,6 +85,15 @@
 
 #define complex_new(mrb, real, imag) mrb_complex_new(mrb, real, imag)
 
+void
+mrb_complex_copy(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct mrb_complex *p1 = complex_ptr(mrb, x);
+ struct mrb_complex *p2 = complex_ptr(mrb, y);
+ p1->real = p2->real;
+ p1->imaginary = p2->imaginary;
+}
+
 static mrb_value
 complex_real(mrb_state *mrb, mrb_value self)
 {
@@ -122,9 +134,18 @@
 {
 struct mrb_complex *p = complex_ptr(mrb, self);
 
+#ifdef MRB_USE_BIGINT
 if (p->imaginary != 0) {
 mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Integer", self);
 }
+ if (!FIXABLE_FLOAT(p->real)) {
+ return mrb_bint_new_float(mrb, p->real);
+ }
+#else
+ if (p->imaginary != 0 || !FIXABLE_FLOAT(p->real)) {
+ mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Integer", self);
+ }
+#endif
 return mrb_int_value(mrb, (mrb_int)p->real);
 }
 
@@ -168,10 +189,9 @@
 return mrb_bool_value(mrb_complex_eq(mrb, x, y));
 }
 
-static mrb_value
-complex_add(mrb_state *mrb, mrb_value x)
+mrb_value
+mrb_complex_add(mrb_state *mrb, mrb_value x, mrb_value y)
 {
- mrb_value y = mrb_get_arg1(mrb);
 struct mrb_complex *p1 = complex_ptr(mrb, x);
 
 switch (mrb_type(y)) {
@@ -190,9 +210,15 @@
 }
 
 static mrb_value
-complex_sub(mrb_state *mrb, mrb_value x)
+complex_add(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
+ return mrb_complex_add(mrb, x, y);
+}
+
+mrb_value
+mrb_complex_sub(mrb_state *mrb, mrb_value x, mrb_value y)
+{
 struct mrb_complex *p1 = complex_ptr(mrb, x);
 
 switch (mrb_type(y)) {
@@ -211,9 +237,15 @@
 }
 
 static mrb_value
-complex_mul(mrb_state *mrb, mrb_value x)
+complex_sub(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
+ return mrb_complex_sub(mrb, x, y);
+}
+
+mrb_value
+mrb_complex_mul(mrb_state *mrb, mrb_value x, mrb_value y)
+{
 struct mrb_complex *p1 = complex_ptr(mrb, x);
 
 switch (mrb_type(y)) {
@@ -232,6 +264,13 @@
 }
 }
 
+static mrb_value
+complex_mul(mrb_state *mrb, mrb_value x)
+{
+ mrb_value y = mrb_get_arg1(mrb);
+ return mrb_complex_mul(mrb, x, y);
+}
+
 /* Arithmetic on (significand, exponent) pairs avoids premature overflow in
 complex division */
 struct float_pair {
@@ -272,14 +311,16 @@
 q->x = a->x - b->x;
 }
 
-static mrb_value
-complex_div(mrb_state *mrb, mrb_value self)
+mrb_value
+mrb_complex_div(mrb_state *mrb, mrb_value self, mrb_value rhs)
 {
 struct mrb_complex *a, *b;
- mrb_value rhs = mrb_get_arg1(mrb);
 
 a = complex_ptr(mrb, self);
 if (mrb_type(rhs) != MRB_TT_COMPLEX) {
+ if (mrb_integer_p(rhs) && mrb_integer(rhs) == 0) {
+ mrb_int_zerodiv(mrb);
+ }
 mrb_float f = mrb_as_float(mrb, rhs);
 return complex_new(mrb, mrb_div_float(a->real, f), mrb_div_float(a->imaginary, f));
 }
@@ -324,88 +365,32 @@
 return complex_new(mrb, F(ldexp)(zr.s, zr.x), F(ldexp)(zi.s, zi.x));
 }
 
-mrb_int mrb_div_int(mrb_state *mrb, mrb_int x, mrb_int y);
-mrb_value mrb_rational_new(mrb_state *mrb, mrb_int n, mrb_int d);
-mrb_value mrb_rational_div(mrb_state *mrb, mrb_value x);
-
-/* 15.2.8.3.4 */
-/*
- * redefine Integer#/
- */
 static mrb_value
-cpx_int_div(mrb_state *mrb, mrb_value x)
+complex_div(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
- mrb_int a = mrb_integer(x);
-
- if (mrb_integer_p(y)) {
- mrb_int div = mrb_div_int(mrb, a, mrb_integer(y));
- return mrb_int_value(mrb, div);
- }
- switch (mrb_type(y)) {
-#ifdef MRB_USE_RATIONAL
- case MRB_TT_RATIONAL:
- return mrb_rational_div(mrb, mrb_rational_new(mrb, a, 1));
-#endif
- case MRB_TT_COMPLEX:
- x = complex_new(mrb, (mrb_float)a, 0);
- return complex_div(mrb, x);
- default:
- return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
- }
+ return mrb_complex_div(mrb, x, y);
 }
 
-/* 15.2.9.3.19(x) */
-/*
- * redefine Integer#quo
- */
-
 static mrb_value
-cpx_int_quo(mrb_state *mrb, mrb_value x)
+complex_hash(mrb_state *mrb, mrb_value cpx)
 {
- mrb_value y = mrb_get_arg1(mrb);
- mrb_int a = mrb_integer(x);
-
- switch (mrb_type(y)) {
-#ifdef MRB_USE_RATIONAL
- case MRB_TT_RATIONAL:
- x = mrb_rational_new(mrb, a, 1);
- return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
-#endif
- case MRB_TT_COMPLEX:
- x = complex_new(mrb, (mrb_float)a, 0);
- return complex_div(mrb, x);
- default:
- return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
- }
+ struct mrb_complex *c = complex_ptr(mrb, cpx);
+ uint32_t hash = mrb_byte_hash((uint8_t*)&c->real, sizeof(mrb_float));
+ hash = mrb_byte_hash_step((uint8_t*)&c->imaginary, sizeof(mrb_float), hash);
+ return mrb_int_value(mrb, hash);
 }
 
 static mrb_value
-cpx_flo_div(mrb_state *mrb, mrb_value x)
+nil_to_c(mrb_state *mrb, mrb_value self)
 {
- mrb_float a = mrb_float(x);
- mrb_value y = mrb_get_arg1(mrb);
-
- switch(mrb_type(y)) {
- case MRB_TT_COMPLEX:
- return complex_div(mrb, complex_new(mrb, a, 0));
- case MRB_TT_FLOAT:
- a = mrb_div_float(a, mrb_float(y));
- return mrb_float_value(mrb, a);
- default:
- a = mrb_div_float(a, mrb_as_float(mrb, y));
- return mrb_float_value(mrb, a);
- }
+ return complex_new(mrb, 0, 0);
 }
 
 void mrb_mruby_complex_gem_init(mrb_state *mrb)
 {
 struct RClass *comp;
 
-#ifdef COMPLEX_INLINE
- mrb_assert(sizeof(struct mrb_complex) < sizeof(void*)*3);
-#endif
-
 comp = mrb_define_class_id(mrb, MRB_SYM(Complex), mrb_class_get_id(mrb, MRB_SYM(Numeric)));
 MRB_SET_INSTANCE_TT(comp, MRB_TT_COMPLEX);
 
@@ -424,10 +409,8 @@
 mrb_define_method(mrb, comp, "/", complex_div, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, comp, "quo", complex_div, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, comp, "==", complex_eq, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, mrb->integer_class, "/", cpx_int_div, MRB_ARGS_REQ(1)); /* override */
- mrb_define_method(mrb, mrb->integer_class, "quo", cpx_int_quo, MRB_ARGS_REQ(1)); /* override */
- mrb_define_method(mrb, mrb->float_class, "/", cpx_flo_div, MRB_ARGS_REQ(1)); /* override */
- mrb_define_method(mrb, mrb->float_class, "quo", cpx_flo_div, MRB_ARGS_REQ(1)); /* override */
+ mrb_define_method(mrb, comp, "hash", complex_hash, MRB_ARGS_NONE());
+ mrb_define_method(mrb, mrb->nil_class, "to_c", nil_to_c, MRB_ARGS_NONE());
 }
 
 void

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-data Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-data/mrbgem.rake Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-data/src Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-data/src/data.c Added

@@ -0,0 +1,462 @@
+/*
+** data.c - Data class
+**
+** See Copyright Notice in mruby.h
+*/
+
+#include <string.h>
+#include <mruby.h>
+#include <mruby/array.h>
+#include <mruby/string.h>
+#include <mruby/class.h>
+#include <mruby/variable.h>
+#include <mruby/hash.h>
+#include <mruby/proc.h>
+#include <mruby/internal.h>
+#include <mruby/presym.h>
+
+#define RDATA_LEN(st) RARRAY_LEN(st)
+#define RDATA_PTR(st) RARRAY_PTR(st)
+
+#define data_p(o) (mrb_type(o) == MRB_TT_STRUCT)
+
+static struct RClass *
+data_class(mrb_state *mrb)
+{
+ return mrb_class_get_id(mrb, MRB_SYM(Data));
+}
+
+static void
+data_corrupted(mrb_state *mrb)
+{
+ mrb_raise(mrb, E_TYPE_ERROR, "corrupted data");
+}
+
+static mrb_value
+data_s_members(mrb_state *mrb, struct RClass *c)
+{
+ struct RClass* sclass = data_class(mrb);
+ mrb_value mem;
+
+ for (;;) {
+ mem = mrb_iv_get(mrb, mrb_obj_value(c), MRB_SYM(__members__));
+ if (!mrb_nil_p(mem)) {
+ if (!mrb_array_p(mem)) {
+ data_corrupted(mrb);
+ }
+ return mem;
+ }
+ c = c->super;
+ if (c == sclass || c == 0) {
+ mrb_raise(mrb, E_TYPE_ERROR, "uninitialized data");
+ }
+ }
+}
+
+static mrb_value
+data_members(mrb_state *mrb, mrb_value obj)
+{
+ if (!data_p(obj) || RDATA_LEN(obj) == 0) {
+ data_corrupted(mrb);
+ }
+ mrb_value members = data_s_members(mrb, mrb_obj_class(mrb, obj));
+ if (RDATA_LEN(obj) != RARRAY_LEN(members)) {
+ mrb_raisef(mrb, E_TYPE_ERROR,
+ "data size differs (%i required %i given)",
+ RARRAY_LEN(members), RDATA_LEN(obj));
+ }
+ return members;
+}
+
+static mrb_value
+mrb_data_s_members(mrb_state *mrb, mrb_value klass)
+{
+ mrb_value members = data_s_members(mrb, mrb_class_ptr(klass));
+ return mrb_ary_new_from_values(mrb, RARRAY_LEN(members), RARRAY_PTR(members));
+}
+
+/*
+ * call-seq:
+ * data.members -> array
+ *
+ * Returns an array of strings representing the names of the instance
+ * variables.
+ *
+ * Customer = Data.define(:name, :address, :zip)
+ * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ * joe.members #=> :name, :address, :zip
+ */
+
+static mrb_value
+mrb_data_members(mrb_state *mrb, mrb_value obj)
+{
+ return mrb_data_s_members(mrb, mrb_obj_value(mrb_obj_class(mrb, obj)));
+}
+
+static mrb_value
+mrb_data_ref(mrb_state *mrb, mrb_value obj)
+{
+ mrb_int i = mrb_integer(mrb_proc_cfunc_env_get(mrb, 0));
+ mrb_value *ptr = RDATA_PTR(obj);
+
+ if (!ptr) return mrb_nil_value();
+ return ptri;
+}
+
+static void
+make_data_define_accessors(mrb_state *mrb, mrb_value members, struct RClass *c)
+{
+ const mrb_value *ptr_members = RARRAY_PTR(members);
+ mrb_int len = RARRAY_LEN(members);
+ int ai = mrb_gc_arena_save(mrb);
+
+ for (mrb_int i=0; i<len; i++) {
+ mrb_sym id = mrb_symbol(ptr_membersi);
+ mrb_method_t m;
+ mrb_value at = mrb_fixnum_value(i);
+ struct RProc *aref = mrb_proc_new_cfunc_with_env(mrb, mrb_data_ref, 1, &at);
+ MRB_METHOD_FROM_PROC(m, aref);
+ mrb_define_method_raw(mrb, c, id, m);
+ mrb_gc_arena_restore(mrb, ai);
+ }
+}
+
+static mrb_value mrb_data_initialize(mrb_state *mrb, mrb_value self);
+
+static mrb_value
+mrb_data_new(mrb_state *mrb, mrb_value self)
+{
+ struct RClass *c = mrb_class_ptr(self);
+ mrb_value members = data_s_members(mrb, c);
+ mrb_value *vals;
+
+ mrb_int n = RARRAY_LEN(members);
+ mrb_value *mems = RARRAY_PTR(members);
+ if (mrb->c->ci->nk > 0) {
+ mrb_value tmp = mrb_str_new(mrb, NULL, sizeof(mrb_sym)*n);
+ mrb_sym *knames = (mrb_sym*)RSTRING_PTR(tmp);
+ mrb_value m = mrb_ary_new_capa(mrb, n);
+ vals = RARRAY_PTR(m);
+ for (mrb_int i=0; i<n; i++) {
+ knamesi = mrb_symbol(memsi);
+ }
+ const mrb_kwargs kw = {n, n, knames, vals, NULL};
+ mrb_get_args(mrb, ":", &kw);
+ }
+ else {
+ mrb_int argc;
+ mrb_get_args(mrb, "*!", &vals, &argc);
+ if (n != argc) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+ }
+ }
+
+ struct RArray* p = MRB_OBJ_ALLOC(mrb, MRB_TT_STRUCT, c);
+ mrb_value data = mrb_obj_value(p);
+ if (!mrb_func_basic_p(mrb, data, MRB_SYM(initialize), mrb_data_initialize)) {
+ /* overridden initialize - create hash and call initialize explicitly */
+ mrb_value hash = mrb_hash_new_capa(mrb, n);
+ for (mrb_int i=0; i<n; i++) {
+ mrb_hash_set(mrb, hash, memsi, valsi);
+ }
+ mrb_funcall_argv(mrb, data, MRB_SYM(initialize), 1, &hash);
+ }
+ else {
+ /* default initialize - skip calling initialize */
+ mrb_ary_resize(mrb, data, n);
+ for (mrb_int i = 0; i < n; i++) {
+ mrb_ary_set(mrb, data, i, valsi);
+ }
+ mrb_obj_freeze(mrb, data);
+ }
+ return data;
+}
+
+static mrb_value
+make_data_class(mrb_state *mrb, mrb_value members, struct RClass *klass)
+{
+ struct RClass *c = mrb_class_new(mrb, klass);
+ MRB_SET_INSTANCE_TT(c, MRB_TT_STRUCT);
+ mrb_value data = mrb_obj_value(c);
+ mrb_iv_set(mrb, data, MRB_SYM(__members__), members);
+
+ mrb_undef_class_method(mrb, c, "define");
+ mrb_define_class_method_id(mrb, c, MRB_SYM(new), mrb_data_new, MRB_ARGS_ANY());
+ mrb_define_class_method_id(mrb, c, MRB_SYM(members), mrb_data_s_members, MRB_ARGS_NONE());
+ /* RSTRUCT(data)->basic.c->super = c->c; */
+ make_data_define_accessors(mrb, members, c);
+ return data;
+}
+
+/*
+ * call-seq:
+ * DataClass.new(arg, ...) -> obj
+ *
+ * <code>Data::define</code> returns a new <code>Class</code> object,
+ * which can then be used to create specific instances of the new
+ * data structure. The number of actual parameters must be
+ * equal to the number of attributes defined for this class.
+ * Passing too many or too less parameters will raise an
+ * <code>ArgumentError</code>.
+ *
+ * The remaining methods listed in this section (class and instance)
+ * are defined for this generated class.
+ *
+ * # Create a structure named by its constant
+ * Customer = Data.define(:name, :address) #=> Customer
+ * Customer.new("Dave", "123 Main") #=> #<data name="Dave", address="123 Main">
+ */
+static mrb_value
+mrb_data_s_def(mrb_state *mrb, mrb_value klass)
+{
+ mrb_value rest;
+ mrb_value b, data;
+ mrb_sym id;
+ const mrb_value *argv;
+ mrb_int argc;
+
+ mrb_get_args(mrb, "*&", &argv, &argc, &b);
+ if (argc == 0) { /* special case to avoid crash */
+ mrb_argnum_error(mrb, argc, 1, -1);
+ }
+ else {
+ rest = mrb_ary_new_from_values(mrb, argc, argv);
+ for (mrb_int i=0; i<argc; i++) {
+ id = mrb_obj_to_sym(mrb, RARRAY_PTR(rest)i);
+ mrb_ary_set(mrb, rest, i, mrb_symbol_value(id));
+ }
+ data = make_data_class(mrb, rest, mrb_class_ptr(klass));
+ if (!mrb_nil_p(b)) {
+ mrb_yield_with_class(mrb, b, 1, &data, data, mrb_class_ptr(data));
+ }
+ return data;
+ }
+ /* not reached */
+ return mrb_nil_value();
+}
+
+static mrb_value
+mrb_data_initialize(mrb_state *mrb, mrb_value self)
+{
+ struct RClass *klass = mrb_obj_class(mrb, self);
+ mrb_value members = data_s_members(mrb, klass);
+
+ mrb_int n = RARRAY_LEN(members);
+ mrb_value hash;
+ mrb_get_args(mrb, "H", &hash);
+ if (mrb_hash_size(mrb, hash) != n) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+ }
+ mrb_ary_resize(mrb, self, n);
+
+ mrb_value *mems = RARRAY_PTR(members);
+ for (mrb_int i = 0; i < n; i++) {
+ if (!mrb_hash_key_p(mrb, hash, memsi)) {
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "undefined data member %v", memsi);
+ }
+ mrb_ary_set(mrb, self, i, mrb_hash_get(mrb, hash, memsi));
+ }
+ mrb_obj_freeze(mrb, self);
+ return self;
+}
+
+static mrb_value
+mrb_data_init_copy(mrb_state *mrb, mrb_value copy)
+{
+ mrb_value s = mrb_get_arg1(mrb);
+
+ if (mrb_obj_equal(mrb, copy, s)) return copy;
+ if (!mrb_obj_is_instance_of(mrb, s, mrb_obj_class(mrb, copy))) {
+ mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
+ }
+ if (!data_p(s)) {
+ data_corrupted(mrb);
+ }
+ mrb_ary_replace(mrb, copy, s);
+ mrb_obj_freeze(mrb, copy);
+ return copy;
+}
+
+/*
+ * call-seq:
+ * data == other_data -> true or false
+ *
+ * Equality---Returns <code>true</code> if other_data is
+ * equal to this one: they must be of the same class as generated by
+ * <code>Data::define</code>, and all values of must be equal
+ * (according to <code>Object#==</code>).
+ *
+ * Customer = Data.define(:name, :address, :zip)
+ * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ * joe2 = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ * jane = Customer.new("Jane Doe", "456 Elm, Anytown NC", 12345)
+ * joe == joe2 #=> true
+ * joe == jane #=> false
+ */
+
+static mrb_value
+mrb_data_equal(mrb_state *mrb, mrb_value s)
+{
+ mrb_value s2 = mrb_get_arg1(mrb);
+ mrb_value *ptr, *ptr2;
+ mrb_int len;
+
+ if (mrb_obj_equal(mrb, s, s2)) {
+ return mrb_true_value();
+ }
+ if (mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) {
+ return mrb_false_value();
+ }
+ if (RDATA_LEN(s) != RDATA_LEN(s2)) {
+ return mrb_false_value();
+ }
+ ptr = RDATA_PTR(s);
+ ptr2 = RDATA_PTR(s2);
+ len = RDATA_LEN(s);
+ for (mrb_int i=0; i<len; i++) {
+ if (!mrb_equal(mrb, ptri, ptr2i)) {
+ return mrb_false_value();
+ }
+ }
+
+ return mrb_true_value();
+}
+
+/*
+ * call-seq:
+ * data.eql?(other) -> true or false
+ *
+ * Two structures are equal if they are the same object, or if all their
+ * fields are equal (using <code>Object#eql?</code>).
+ */
+static mrb_value
+mrb_data_eql(mrb_state *mrb, mrb_value s)
+{
+ mrb_value s2 = mrb_get_arg1(mrb);
+ mrb_value *ptr, *ptr2;
+ mrb_int len;
+
+ if (mrb_obj_equal(mrb, s, s2)) {
+ return mrb_true_value();
+ }
+ if (mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) {
+ return mrb_false_value();
+ }
+ if (RDATA_LEN(s) != RDATA_LEN(s2)) {
+ return mrb_false_value();
+ }
+ ptr = RDATA_PTR(s);
+ ptr2 = RDATA_PTR(s2);
+ len = RDATA_LEN(s);
+ for (mrb_int i=0; i<len; i++) {
+ if (!mrb_eql(mrb, ptri, ptr2i)) {
+ return mrb_false_value();
+ }
+ }
+
+ return mrb_true_value();
+}
+
+/*
+ * call-seq:
+ * data.to_h -> hash
+ *
+ * Create a hash from member names and values.
+ */
+static mrb_value
+mrb_data_to_h(mrb_state *mrb, mrb_value self)
+{
+ mrb_value members, ret;
+ mrb_value *mems, *vals;
+
+ members = data_members(mrb, self);
+ mems = RARRAY_PTR(members);
+ vals = RDATA_PTR(self);
+
+ ret = mrb_hash_new_capa(mrb, RARRAY_LEN(members));
+ mrb_int len = RARRAY_LEN(members);
+ for (mrb_int i=0; i<len; i++) {
+ mrb_hash_set(mrb, ret, memsi, valsi);
+ }
+
+ return ret;
+}
+
+/*
+ * call-seq:
+ * data.to_s -> string
+ * data.inspect -> string
+ *
+ * Returns a string representation of Data
+ */
+static mrb_value
+mrb_data_to_s(mrb_state *mrb, mrb_value self)
+{
+ mrb_value members, ret, cname;
+ mrb_value *mems, *vals;
+ mrb_int mlen;
+
+ members = data_members(mrb, self);
+ mlen = RARRAY_LEN(members);
+ mems = RARRAY_PTR(members);
+ vals = RDATA_PTR(self);
+ ret = mrb_str_new_lit(mrb, "#<data ");
+ int ai = mrb_gc_arena_save(mrb);
+ cname = mrb_class_path(mrb, mrb_class_real(mrb_class(mrb, self)));
+ if (!mrb_nil_p(cname)) {
+ mrb_str_cat_str(mrb, ret, cname);
+ mrb_str_cat_lit(mrb, ret, " ");
+ }
+ for (mrb_int i=0; i<mlen; i++) {
+ mrb_int len;
+ const char *name = mrb_sym_name_len(mrb, mrb_symbol(memsi), &len);
+ if (i>0) mrb_str_cat_lit(mrb, ret, ", ");
+ mrb_str_cat(mrb, ret, name, len);
+ mrb_str_cat_lit(mrb, ret, "=");
+ mrb_str_cat_str(mrb, ret, mrb_inspect(mrb, valsi));
+ mrb_gc_arena_restore(mrb, ai);
+ }
+ mrb_str_cat_lit(mrb, ret, ">");
+
+ return ret;
+}
+
+/*
+ * A <code>Data</code> is a convenient way to bundle a number of
+ * attributes together, using accessor methods, without having to write
+ * an explicit class.
+ *
+ * The <code>Data</code> class is a generator of specific classes,
+ * each one of which is defined to hold a set of variables and their
+ * accessors. In these examples, we'll call the generated class
+ * "CustomerClass," and we'll show an example instance of that
+ * class as "CustomerInst."
+ *
+ * In the descriptions that follow, the parameter symbol refers
+ * to a symbol (such as <code>:name</code>).
+ */
+void
+mrb_mruby_data_gem_init(mrb_state* mrb)
+{
+ struct RClass *d;
+ d = mrb_define_class(mrb, "Data", mrb->object_class);
+ MRB_SET_INSTANCE_TT(d, MRB_TT_STRUCT);
+
+ mrb_undef_class_method(mrb, d, "new");
+ mrb_define_class_method(mrb, d, "define", mrb_data_s_def, MRB_ARGS_ANY());
+
+ mrb_define_method(mrb, d, "==", mrb_data_equal, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, d, "members", mrb_data_members, MRB_ARGS_NONE());
+ mrb_define_method(mrb, d, "initialize", mrb_data_initialize, MRB_ARGS_ANY());
+ mrb_define_method(mrb, d, "initialize_copy", mrb_data_init_copy, MRB_ARGS_ANY());
+ mrb_define_method(mrb, d, "eql?", mrb_data_eql, MRB_ARGS_REQ(1));
+
+ mrb_define_method(mrb, d, "to_h", mrb_data_to_h, MRB_ARGS_NONE());
+ mrb_define_method(mrb, d, "to_s", mrb_data_to_s, MRB_ARGS_NONE());
+ mrb_define_method(mrb, d, "inspect", mrb_data_to_s, MRB_ARGS_NONE());
+}
+
+void
+mrb_mruby_data_gem_final(mrb_state* mrb)
+{
+}

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-data/test Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-data/test/data.rb Added

@@ -0,0 +1,76 @@
+##
+# Struct ISO Test
+
+assert('Data') do
+ assert_equal Class, Data.class
+end
+
+assert('Data.define') do
+ c = Data.define(:m1, :m2)
+ assert_equal Data, c.superclass
+ assert_equal :m1, :m2, c.members
+end
+
+assert('Data#==') do
+ c = Data.define(:m1, :m2)
+ cc1 = c.new(1,2)
+ cc2 = c.new(1,2)
+ assert_true cc1 == cc2
+end
+
+assert('Data#members') do
+ c = Data.define(:m1, :m2)
+ assert_equal :m1, :m2, c.new(1,2).members
+end
+
+assert('wrong struct arg count') do
+ c = Data.define(:m1)
+ assert_raise ArgumentError do
+ cc = c.new(1,2,3)
+ end
+end
+
+assert('data dup') do
+ c = Data.define(:m1, :m2, :m3, :m4, :m5)
+ cc = c.new(1,2,3,4,5)
+ assert_nothing_raised {
+ assert_equal(cc, cc.dup)
+ }
+end
+
+assert('Data inspect') do
+ c = Data.define(:m1, :m2, :m3, :m4, :m5)
+ cc = c.new(1,2,3,4,5)
+ assert_equal "#<data m1=1, m2=2, m3=3, m4=4, m5=5>", cc.inspect
+end
+
+assert('Data#to_h') do
+ s = Data.define(:white, :red, :green).new('ruuko', 'yuzuki', 'hitoe')
+ assert_equal({:white => 'ruuko', :red => 'yuzuki', :green => 'hitoe'}) { s.to_h }
+end
+
+assert("Data.define does not allow array") do
+ assert_raise(TypeError) do
+ Data.define("Test", :a)
+ end
+end
+
+assert("Data.define generates subclass of Data") do
+ begin
+ original_struct = Data
+ Data = String
+ assert_equal original_struct, original_struct.define(:foo).superclass
+ ensure
+ Data = original_struct
+ end
+end
+
+assert 'Data#freeze' do
+ c = Data.define(:m)
+
+ o = c.new(:test)
+ assert_equal :test, o.m
+ assert_nothing_raised {
+ o.freeze
+ }
+end

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/README.md Added

@@ -0,0 +1,53 @@
+# mruby-dir
+
+Dir class for mruby.  Supported methods are:
+
+`.chdir`
+`.delete`
+`.entries`
+`.exist?`
+`.foreach`
+`.getwd`
+`.mkdir`
+`.open`
+`#close`
+`#each`
+`#read`
+`#rewind`
+`#seek`
+`#tell`
+
+## License
+
+Copyright (c) 2012 Internet Initiative Japan Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+### On Windows platforms, you must agree on additional license too:
+
+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.

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/mrbgem.rake Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/mrblib Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/mrblib/dir.rb Added

@@ -0,0 +1,68 @@
+class Dir
+ include Enumerable
+
+ def each(&block)
+ while s = self.read
+ block.call(s)
+ end
+ self
+ end
+
+ alias each_child each
+ alias pos tell
+ alias pos= seek
+
+ class << self
+ def entries(path)
+ a = 
+ self.open(path) do |d|
+ while s = d.read
+ a << s
+ end
+ end
+ a
+ end
+ alias children entries
+
+ def foreach(path, &block)
+ self.open(path) do |d|
+ d.each(&block)
+ end
+ end
+
+ def open(path, &block)
+ if block
+ d = self.new(path)
+ begin
+ block.call(d)
+ ensure
+ begin
+ d.close
+ rescue IOError
+ end
+ end
+ else
+ self.new(path)
+ end
+ end
+
+ def chdir(path, &block)
+ if block
+ wd = self.getwd
+ begin
+ self._chdir(path)
+ block.call(path)
+ ensure
+ self._chdir(wd)
+ end
+ else
+ self._chdir(path)
+ end
+ end
+
+ alias exists? exist?
+ alias pwd getwd
+ alias rmdir delete
+ alias unlink delete
+ end
+end

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/src Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/src/Win Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/src/Win/dirent.c Added

@@ -0,0 +1,154 @@
+/*
+
+ Implementation of POSIX directory browsing functions and types for Win32.
+
+ Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com)
+ History: Created March 1997. Updated June 2003 and July 2012.
+ Rights: See end of file.
+
+*/
+
+#include <errno.h>
+#include <io.h> /* _findfirst and _findnext set errno iff they return -1 */
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef ptrdiff_t handle_type; /* C99's intptr_t not sufficiently portable */
+
+struct dirent
+{
+ char *d_name;
+};
+
+struct DIR
+{
+ handle_type handle; /* -1 for failed rewind */
+ struct _finddata_t info;
+ struct dirent result; /* d_name null iff first time */
+ char *name; /* null-terminated char string */
+};
+
+typedef struct DIR DIR;
+
+DIR *opendir(const char *name)
+{
+ DIR *dir = 0;
+
+ if(name && name0)
+ {
+ size_t base_length = strlen(name);
+ const char *all = /* search pattern must end with suitable wildcard */
+ strchr("/\\", namebase_length - 1) ? "*" : "/*";
+
+ if((dir = (DIR *) malloc(sizeof *dir)) != 0 &&
+ (dir->name = (char *) malloc(base_length + strlen(all) + 1)) != 0)
+ {
+ strcat(strcpy(dir->name, name), all);
+
+ if((dir->handle =
+ (handle_type) _findfirst(dir->name, &dir->info)) != -1)
+ {
+ dir->result.d_name = 0;
+ }
+ else /* rollback */
+ {
+ free(dir->name);
+ free(dir);
+ dir = 0;
+ }
+ }
+ else /* rollback */
+ {
+ free(dir);
+ dir = 0;
+ errno = ENOMEM;
+ }
+ }
+ else
+ {
+ errno = EINVAL;
+ }
+
+ return dir;
+}
+
+int closedir(DIR *dir)
+{
+ int result = -1;
+
+ if(dir)
+ {
+ if(dir->handle != -1)
+ {
+ result = _findclose(dir->handle);
+ }
+
+ free(dir->name);
+ free(dir);
+ }
+
+ if(result == -1) /* map all errors to EBADF */
+ {
+ errno = EBADF;
+ }
+
+ return result;
+}
+
+struct dirent *readdir(DIR *dir)
+{
+ struct dirent *result = 0;
+
+ if(dir && dir->handle != -1)
+ {
+ if(!dir->result.d_name || _findnext(dir->handle, &dir->info) != -1)
+ {
+ result = &dir->result;
+ result->d_name = dir->info.name;
+ }
+ }
+ else
+ {
+ errno = EBADF;
+ }
+
+ return result;
+}
+
+void rewinddir(DIR *dir)
+{
+ if(dir && dir->handle != -1)
+ {
+ _findclose(dir->handle);
+ dir->handle = (handle_type) _findfirst(dir->name, &dir->info);
+ dir->result.d_name = 0;
+ }
+ else
+ {
+ errno = EBADF;
+ }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/*
+
+ 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.
+
+*/

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/src/dir.c Added

@@ -0,0 +1,321 @@
+/*
+** dir.c - Dir
+**
+** See Copyright Notice in mruby.h
+*/
+
+#include "mruby.h"
+#include "mruby/class.h"
+#include "mruby/data.h"
+#include "mruby/error.h"
+#include "mruby/string.h"
+#include "mruby/presym.h"
+#include <sys/types.h>
+#if defined(_WIN32) || defined(_WIN64)
+ #define MAXPATHLEN 1024
+ #if !defined(PATH_MAX)
+ #define PATH_MAX MAX_PATH
+ #endif
+ #define S_ISDIR(B) ((B)&_S_IFDIR)
+ #include "Win/dirent.c"
+ #include <direct.h>
+ #define rmdir(path) _rmdir(path)
+ #define getcwd(path,len) _getcwd(path,len)
+ #define mkdir(path,mode) _mkdir(path)
+ #define chdir(path) _chdir(path)
+#else
+ #include <sys/param.h>
+ #include <dirent.h>
+ #include <unistd.h>
+#endif
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+
+#define E_IO_ERROR mrb_exc_get_id(mrb, MRB_SYM(IOError))
+
+struct mrb_dir {
+ DIR *dir;
+};
+
+static void
+mrb_dir_free(mrb_state *mrb, void *ptr)
+{
+ struct mrb_dir *mdir = (struct mrb_dir*)ptr;
+
+ if (mdir->dir) {
+ closedir(mdir->dir);
+ mdir->dir = NULL;
+ }
+ mrb_free(mrb, mdir);
+}
+
+static struct mrb_data_type mrb_dir_type = { "DIR", mrb_dir_free };
+
+static mrb_value
+mrb_dir_close(mrb_state *mrb, mrb_value self)
+{
+ struct mrb_dir *mdir;
+ mdir = (struct mrb_dir*)mrb_get_datatype(mrb, self, &mrb_dir_type);
+ if (!mdir) return mrb_nil_value();
+ if (!mdir->dir) {
+ mrb_raise(mrb, E_IO_ERROR, "closed directory");
+ }
+ if (closedir(mdir->dir) == -1) {
+ mrb_sys_fail(mrb, "closedir");
+ }
+ mdir->dir = NULL;
+ return mrb_nil_value();
+}
+
+static mrb_value
+mrb_dir_init(mrb_state *mrb, mrb_value self)
+{
+ DIR *dir;
+ struct mrb_dir *mdir;
+ const char *path;
+
+ mdir = (struct mrb_dir*)DATA_PTR(self);
+ if (mdir) {
+ mrb_dir_free(mrb, mdir);
+ }
+ DATA_TYPE(self) = &mrb_dir_type;
+ DATA_PTR(self) = NULL;
+
+ mdir = (struct mrb_dir*)mrb_malloc(mrb, sizeof(*mdir));
+ mdir->dir = NULL;
+ DATA_PTR(self) = mdir;
+
+ mrb_get_args(mrb, "z", &path);
+ if ((dir = opendir(path)) == NULL) {
+ mrb_sys_fail(mrb, path);
+ }
+ mdir->dir = dir;
+ return self;
+}
+
+static mrb_value
+mrb_dir_delete(mrb_state *mrb, mrb_value klass)
+{
+ const char *path;
+
+ mrb_get_args(mrb, "z", &path);
+ if (rmdir(path) == -1) {
+ mrb_sys_fail(mrb, path);
+ }
+ return mrb_fixnum_value(0);
+}
+
+static mrb_value
+mrb_dir_existp(mrb_state *mrb, mrb_value klass)
+{
+ struct stat sb;
+ const char *path;
+
+ mrb_get_args(mrb, "z", &path);
+ if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
+ return mrb_true_value();
+ }
+ else {
+ return mrb_false_value();
+ }
+}
+
+static mrb_value
+mrb_dir_getwd(mrb_state *mrb, mrb_value klass)
+{
+ mrb_value path;
+
+ path = mrb_str_buf_new(mrb, MAXPATHLEN);
+ if (getcwd(RSTRING_PTR(path), MAXPATHLEN) == NULL) {
+ mrb_sys_fail(mrb, "getcwd(2)");
+ }
+ mrb_str_resize(mrb, path, strlen(RSTRING_PTR(path)));
+ return path;
+}
+
+static mrb_value
+mrb_dir_mkdir(mrb_state *mrb, mrb_value klass)
+{
+ mrb_int mode;
+ const char *path;
+
+ mode = 0777;
+ mrb_get_args(mrb, "z|i", &path, &mode);
+ if (mkdir(path, mode) == -1) {
+ mrb_sys_fail(mrb, path);
+ }
+ return mrb_fixnum_value(0);
+}
+
+static mrb_value
+mrb_dir_chdir(mrb_state *mrb, mrb_value klass)
+{
+ const char *path;
+
+ mrb_get_args(mrb, "z", &path);
+ if (chdir(path) == -1) {
+ mrb_sys_fail(mrb, path);
+ }
+ return mrb_fixnum_value(0);
+}
+
+static mrb_value
+mrb_dir_chroot(mrb_state *mrb, mrb_value self)
+{
+#if defined(_WIN32) || defined(_WIN64) || defined(__ANDROID__)
+ mrb_raise(mrb, E_NOTIMP_ERROR, "chroot() unreliable on your system");
+ return mrb_fixnum_value(0);
+#else
+ const char *path;
+ int res;
+
+ mrb_get_args(mrb, "z", &path);
+ res = chroot(path);
+ if (res == -1) {
+ mrb_sys_fail(mrb, path);
+ }
+
+ return mrb_fixnum_value(res);
+#endif
+}
+
+static mrb_bool
+skip_name_p(const char *name)
+{
+ if (name0 != '.') return FALSE;
+ if (name1 == '\0') return TRUE;
+ if (name1 != '.') return FALSE;
+ if (name2 == '\0') return TRUE;
+ return FALSE;
+}
+
+static mrb_value
+mrb_dir_empty(mrb_state *mrb, mrb_value self)
+{
+ DIR *dir;
+ struct dirent *dp;
+ const char *path;
+ mrb_value result = mrb_true_value();
+
+ mrb_get_args(mrb, "z", &path);
+ if ((dir = opendir(path)) == NULL) {
+ mrb_sys_fail(mrb, path);
+ }
+ while ((dp = readdir(dir))) {
+ if (!skip_name_p(dp->d_name)) {
+ result = mrb_false_value();
+ break;
+ }
+ }
+ closedir(dir);
+ return result;
+}
+
+static mrb_value
+mrb_dir_read(mrb_state *mrb, mrb_value self)
+{
+ struct mrb_dir *mdir;
+ struct dirent *dp;
+
+ mdir = (struct mrb_dir*)mrb_get_datatype(mrb, self, &mrb_dir_type);
+ if (!mdir) return mrb_nil_value();
+ if (!mdir->dir) {
+ mrb_raise(mrb, E_IO_ERROR, "closed directory");
+ }
+ dp = readdir(mdir->dir);
+ if (dp != NULL) {
+ return mrb_str_new_cstr(mrb, dp->d_name);
+ }
+ else {
+ return mrb_nil_value();
+ }
+}
+
+static mrb_value
+mrb_dir_rewind(mrb_state *mrb, mrb_value self)
+{
+ struct mrb_dir *mdir;
+
+ mdir = (struct mrb_dir*)mrb_get_datatype(mrb, self, &mrb_dir_type);
+ if (!mdir) return mrb_nil_value();
+ if (!mdir->dir) {
+ mrb_raise(mrb, E_IO_ERROR, "closed directory");
+ }
+ rewinddir(mdir->dir);
+ return self;
+}
+
+static mrb_value
+mrb_dir_seek(mrb_state *mrb, mrb_value self)
+{
+ #if defined(_WIN32) || defined(_WIN64) || defined(__ANDROID__)
+ mrb_raise(mrb, E_NOTIMP_ERROR, "dirseek() unreliable on your system");
+ return self;
+ #else
+ struct mrb_dir *mdir;
+ mrb_int pos;
+
+ mdir = (struct mrb_dir*)mrb_get_datatype(mrb, self, &mrb_dir_type);
+ if (!mdir) return mrb_nil_value();
+ if (!mdir->dir) {
+ mrb_raise(mrb, E_IO_ERROR, "closed directory");
+ }
+ mrb_get_args(mrb, "i", &pos);
+ seekdir(mdir->dir, (long)pos);
+ return self;
+ #endif
+}
+
+static mrb_value
+mrb_dir_tell(mrb_state *mrb, mrb_value self)
+{
+#if defined(_WIN32) || defined(_WIN64) || defined(__ANDROID__)
+ mrb_raise(mrb, E_NOTIMP_ERROR, "dirtell() unreliable on your system");
+ return mrb_fixnum_value(0);
+#else
+ struct mrb_dir *mdir;
+ mrb_int pos;
+
+ mdir = (struct mrb_dir*)mrb_get_datatype(mrb, self, &mrb_dir_type);
+ if (!mdir) return mrb_nil_value();
+ if (!mdir->dir) {
+ mrb_raise(mrb, E_IO_ERROR, "closed directory");
+ }
+ pos = (mrb_int)telldir(mdir->dir);
+ return mrb_fixnum_value(pos);
+#endif
+}
+
+void
+mrb_mruby_dir_gem_init(mrb_state *mrb)
+{
+ struct RClass *d;
+
+ d = mrb_define_class(mrb, "Dir", mrb->object_class);
+ MRB_SET_INSTANCE_TT(d, MRB_TT_DATA);
+ mrb_define_class_method(mrb, d, "delete", mrb_dir_delete, MRB_ARGS_REQ(1));
+ mrb_define_class_method(mrb, d, "exist?", mrb_dir_existp, MRB_ARGS_REQ(1));
+ mrb_define_class_method(mrb, d, "getwd", mrb_dir_getwd, MRB_ARGS_NONE());
+ mrb_define_class_method(mrb, d, "mkdir", mrb_dir_mkdir, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
+ mrb_define_class_method(mrb, d, "_chdir", mrb_dir_chdir, MRB_ARGS_REQ(1));
+ mrb_define_class_method(mrb, d, "chroot", mrb_dir_chroot, MRB_ARGS_REQ(1));
+ mrb_define_class_method(mrb, d, "empty?", mrb_dir_empty, MRB_ARGS_REQ(1));
+
+ mrb_define_method(mrb, d, "close", mrb_dir_close, MRB_ARGS_NONE());
+ mrb_define_method(mrb, d, "initialize", mrb_dir_init, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, d, "read", mrb_dir_read, MRB_ARGS_NONE());
+ mrb_define_method(mrb, d, "rewind", mrb_dir_rewind, MRB_ARGS_NONE());
+ mrb_define_method(mrb, d, "seek", mrb_dir_seek, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, d, "tell", mrb_dir_tell, MRB_ARGS_NONE());
+
+ mrb_define_class(mrb, "IOError", mrb->eStandardError_class);
+}
+
+void
+mrb_mruby_dir_gem_final(mrb_state *mrb)
+{
+}

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/test Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/test/dir.rb Added

@@ -0,0 +1,137 @@
+assert('Dir') do
+ assert_equal(Class, Dir.class)
+end
+
+assert('DirTest.setup') do
+ assert_nothing_raised{DirTest.setup}
+end
+
+assert('Dir.chdir') do
+ assert_equal 0, Dir.chdir(DirTest.sandbox)
+end
+
+assert('Dir.entries') do
+ a = Dir.entries(DirTest.sandbox)
+ assert_true a.include?("a")
+ assert_true a.include?("b")
+end
+
+assert('Dir.exist?') do
+ assert_true Dir.exist?(DirTest.sandbox)
+ assert_false Dir.exist?(DirTest.sandbox + "/nosuchdir")
+end
+
+assert('Dir.foreach') do
+ a = 
+ Dir.foreach(DirTest.sandbox) { |s| a << s }
+ assert_true a.include?("a")
+ assert_true a.include?("b")
+end
+
+assert('Dir.getwd') do
+ s = Dir.getwd
+ assert_true s.kind_of? String
+end
+
+assert('Dir.mkdir') do
+ m1 = DirTest.sandbox + "/mkdir1"
+ m2 = DirTest.sandbox + "/mkdir2"
+ assert_equal 0, Dir.mkdir(m1)
+ assert_equal 0, Dir.mkdir(m2, 0765)
+end
+
+assert('Dir.delete') do
+ s = DirTest.sandbox + "/delete"
+ Dir.mkdir(s)
+ assert_true Dir.exist?(s)
+
+ Dir.delete(s)
+ assert_false Dir.exist?(s)
+end
+
+assert('Dir.open') do
+ a = 
+ Dir.open(DirTest.sandbox) { |d|
+ d.each_child { |s| a << s }
+ }
+ assert_true a.include?("a")
+ assert_true a.include?("b")
+end
+
+assert('Dir#initialize and Dir#close') do
+ d = Dir.new(".")
+ assert_true d.instance_of?(Dir)
+ assert_nil d.close
+end
+
+assert('Dir#close') do
+ d = Dir.new(".")
+ assert_nothing_raised{d.close}
+end
+
+assert('Dir#each_child') do
+ a = 
+ d = Dir.open(DirTest.sandbox)
+ d.each_child { |s| a << s }
+ d.close
+ assert_true a.include?("a")
+ assert_true a.include?("b")
+end
+
+assert('Dir#read') do
+ a = 
+ d = Dir.open(DirTest.sandbox)
+ while s = d.read
+ a << s
+ end
+ d.close
+ assert_true a.include?("a")
+ assert_true a.include?("b")
+end
+
+assert('Dir#rewind') do
+ d = Dir.open(DirTest.sandbox)
+ while d.read; end
+
+ assert_equal d, d.rewind
+
+ a = 
+ while s = d.read
+ a << s
+ end
+ d.close
+ assert_true a.include? "a"
+ assert_true a.include? "b"
+end
+
+# Note: behaviors of seekdir(3) and telldir(3) are so platform-dependent
+# that we cannot write portable tests here.
+
+assert('Dir#tell') do
+ n = nil
+ begin
+ Dir.open(DirTest.sandbox) { |d|
+ n = d.tell
+ }
+ assert_true n.is_a? Integer
+ rescue NotImplementedError => e
+ skip e.message
+ end
+end
+
+assert('Dir#seek') do
+ d1 = Dir.open(DirTest.sandbox)
+ d1.read
+ begin
+ n = d1.tell
+ d1.read
+ d2 = d1.seek(n)
+ assert_equal d1, d2
+ rescue NotImplementedError => e
+ skip e.message
+ end
+end
+
+assert('DirTest.teardown') do
+ assert_nothing_raised{DirTest.teardown}
+end

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-dir/test/dirtest.c Added

@@ -0,0 +1,142 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(_WIN32) || defined(_WIN64)
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef struct DIR DIR;
+struct dirent
+{
+ char *d_name;
+};
+DIR *opendir(const char *name);
+struct dirent *readdir(DIR *dir);
+int closedir(DIR *dir);
+#ifdef __cplusplus
+}
+#endif
+#include <io.h>
+#include <direct.h>
+#define rmdir(path) _rmdir(path)
+#define getcwd(path,len) _getcwd(path,len)
+#define mkdir(path,mode) _mkdir(path)
+#define chdir(path) _chdir(path)
+#else
+#include <unistd.h>
+#include <dirent.h>
+#endif
+
+#include "mruby.h"
+#include "mruby/string.h"
+#include "mruby/variable.h"
+
+static void
+make_dir(mrb_state *mrb, const char *name, const char *up)
+{
+ if (mkdir(name, 0) == -1) {
+ if (chdir("..") == 0) {
+ rmdir(up);
+ }
+ mrb_raisef(mrb, E_RUNTIME_ERROR, "mkdir(%s) failed", mrb_str_new_cstr(mrb, name));
+ }
+}
+
+mrb_value
+mrb_dirtest_setup(mrb_state *mrb, mrb_value klass)
+{
+ char buf1024;
+ const char *aname = "a";
+ const char *bname = "b";
+
+ /* save current working directory */
+ if (getcwd(buf, sizeof(buf)) == NULL) {
+ mrb_raise(mrb, E_RUNTIME_ERROR, "getcwd() failed");
+ }
+ mrb_cv_set(mrb, klass, mrb_intern_cstr(mrb, "pwd"), mrb_str_new_cstr(mrb, buf));
+
+ /* create sandbox */
+#if defined(_WIN32) || defined(_WIN64)
+ snprintf(buf, sizeof(buf), "%s\\mruby-dir-test.XXXXXX", _getcwd(NULL,0));
+ if ((_mktemp(buf) == NULL) || mkdir(buf,0) != 0) {
+ mrb_raisef(mrb, E_RUNTIME_ERROR, "mkdtemp(%s) failed", buf);
+ }
+#else
+ snprintf(buf, sizeof(buf), "%s/mruby-dir-test.XXXXXX", P_tmpdir);
+ if (mkdtemp(buf) == NULL) {
+ mrb_raisef(mrb, E_RUNTIME_ERROR, "mkdtemp(%s) failed", buf);
+ }
+#endif
+ mrb_cv_set(mrb, klass, mrb_intern_cstr(mrb, "sandbox"), mrb_str_new_cstr(mrb, buf));
+
+ /* go to sandbox */
+ if (chdir(buf) == -1) {
+ rmdir(buf);
+ mrb_raisef(mrb, E_RUNTIME_ERROR, "chdir(%s) failed", buf);
+ }
+
+ /* make some directories in the sandbox */
+ make_dir(mrb, aname, buf);
+ make_dir(mrb, bname, buf);
+
+ return mrb_true_value();
+}
+
+mrb_value
+mrb_dirtest_teardown(mrb_state *mrb, mrb_value klass)
+{
+ mrb_value d, sandbox;
+ DIR *dirp;
+ struct dirent *dp;
+ const char *path;
+
+ /* cleanup sandbox */
+ sandbox = mrb_cv_get(mrb, klass, mrb_intern_cstr(mrb, "sandbox"));
+ path = mrb_str_to_cstr(mrb, sandbox);
+
+ dirp = opendir(path);
+ while ((dp = readdir(dirp)) != NULL) {
+ if (strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0)
+ continue;
+ if (rmdir(dp->d_name) == -1) {
+ mrb_raisef(mrb, E_RUNTIME_ERROR, "rmdir(%s) failed", dp->d_name);
+ }
+ }
+ closedir(dirp);
+
+ /* back to original pwd */
+ d = mrb_cv_get(mrb, klass, mrb_intern_cstr(mrb, "pwd"));
+ path = mrb_str_to_cstr(mrb, d);
+ if (chdir(path) == -1) {
+ mrb_raisef(mrb, E_RUNTIME_ERROR, "chdir(%s) failed", path);
+ }
+
+ /* remove sandbox directory */
+ sandbox = mrb_cv_get(mrb, klass, mrb_intern_cstr(mrb, "sandbox"));
+ path = mrb_str_to_cstr(mrb, sandbox);
+ if (rmdir(path) == -1) {
+ mrb_raisef(mrb, E_RUNTIME_ERROR, "rmdir(%s) failed", path);
+ }
+
+ return mrb_true_value();
+}
+
+mrb_value
+mrb_dirtest_sandbox(mrb_state *mrb, mrb_value klass)
+{
+ return mrb_cv_get(mrb, klass, mrb_intern_cstr(mrb, "sandbox"));
+}
+
+void
+mrb_mruby_dir_gem_test(mrb_state *mrb)
+{
+ struct RClass *c = mrb_define_module(mrb, "DirTest");
+
+ mrb_define_class_method(mrb, c, "sandbox", mrb_dirtest_sandbox, MRB_ARGS_NONE());
+ mrb_define_class_method(mrb, c, "setup", mrb_dirtest_setup, MRB_ARGS_NONE());
+ mrb_define_class_method(mrb, c, "teardown", mrb_dirtest_teardown, MRB_ARGS_NONE());
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb Changed

@@ -244,7 +244,7 @@
 #
 # Returns the number of items in +enum+ through enumeration.
 # If an argument is given, the number of items in +enum+ that
- # are equal to +item+ are counted. If a block is given, it
+ # are equal to +item+ are counted. If a block is given, it
 # counts the number of elements yielding a true value.
 def count(v=NONE, &block)
 count = 0
@@ -368,7 +368,7 @@
 # enum.minmax { |a, b| block } -> min, max
 #
 # Returns two elements array which contains the minimum and the
- # maximum value in the enumerable. The first form assumes all
+ # maximum value in the enumerable. The first form assumes all
 # objects implement <code>Comparable</code>; the second uses the
 # block to return a <=> b.
 #
@@ -647,8 +647,8 @@
 # enum.cycle(n=nil) -> an_enumerator
 #
 # Calls block for each element of enum repeatedly _n_
- # times or forever if none or +nil+ is given. If a non-positive
- # number is given or the collection is empty, does nothing. Returns
+ # times or forever if none or +nil+ is given. If a non-positive
+ # number is given or the collection is empty, does nothing. Returns
 # +nil+ if the loop has finished without getting interrupted.
 #
 # Enumerable#cycle saves elements in an internal array so changes
@@ -696,7 +696,7 @@
 # enum.find_index -> an_enumerator
 #
 # Compares each entry in enum with value or passes
- # to block. Returns the index for the first for which the
+ # to block. Returns the index for the first for which the
 # evaluated value is non-false. If no object matches, returns
 # <code>nil</code>
 #
@@ -731,10 +731,10 @@
 # enum.zip(arg, ...) { |arr| block } -> nil
 #
 # Takes one element from enum and merges corresponding
- # elements from each args. This generates a sequence of
+ # elements from each args. This generates a sequence of
 # n-element arrays, where n is one more than the
- # count of arguments. The length of the resulting sequence will be
- # <code>enum#size</code>. If the size of any argument is less than
+ # count of arguments. The length of the resulting sequence will be
+ # <code>enum#size</code>. If the size of any argument is less than
 # <code>enum#size</code>, <code>nil</code> values are supplied. If
 # a block is given, it is invoked for each output array, otherwise
 # an array of arrays is returned.
@@ -844,7 +844,7 @@
 # call-seq:
 # enum.tally -> a_hash
 #
- # Tallys the collection. Returns a hash where the keys are the
+ # Tallys the collection. Returns a hash where the keys are the
 # elements and the values are numbers of elements in the collection
 # that correspond to the key.
 #
@@ -856,4 +856,28 @@
 end
 hash
 end
+
+ ##
+ # call-seq:
+ # enum.sum(count=1) -> numeric
+ # enum.sum(count=1){...} -> numeric
+ #
+ # Returns the sum of elements. For example, e1, e2, e3.sum
+ # returns e1 + e2 + e3. If a block is given, each element is
+ # processed by the block, e.g e1, e2, e3.sum{_1.m} gives
+ # e1.m + e2.m + e3.m.
+ #
+ def sum(init=0,&block)
+ result=init
+ if block
+ self.each do |e|
+ result += block.call(e)
+ end
+ else
+ self.each do |e|
+ result += e
+ end
+ end
+ result
+ end
 end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb Changed

@@ -36,7 +36,7 @@
 # # foo: two
 # # foo: three
 #
-# This allows you to chain Enumerators together. For example, you
+# This allows you to chain Enumerators together. For example, you
 # can map a list's elements to strings containing the index
 # and the element as a string via:
 #
@@ -112,7 +112,7 @@
 # given object using the given method with the given arguments passed. This
 # form is left only for internal use.
 #
- # Use of this form is discouraged. Use Kernel#enum_for or Kernel#to_enum
+ # Use of this form is discouraged. Use Kernel#enum_for or Kernel#to_enum
 # instead.
 def initialize(obj=NONE, meth=:each, *args, **kwd, &block)
 if block
@@ -154,7 +154,7 @@
 # e.with_index(offset = 0)
 #
 # Iterates the given block for each element with an index, which
- # starts from +offset+. If no block is given, returns a new Enumerator
+ # starts from +offset+. If no block is given, returns a new Enumerator
 # that includes the index, starting from +offset+
 #
 # +offset+:: the starting index to use
@@ -297,7 +297,7 @@
 # e.next -> object
 #
 # Returns the next object in the enumerator, and move the internal position
- # forward. When the position reached at the end, StopIteration is raised.
+ # forward. When the position reached at the end, StopIteration is raised.
 #
 # === Example
 #
@@ -321,7 +321,7 @@
 # e.next_values -> array
 #
 # Returns the next object as an array in the enumerator, and move the
- # internal position forward. When the position reached at the end,
+ # internal position forward. When the position reached at the end,
 # StopIteration is raised.
 #
 # This method can be used to distinguish <code>yield</code> and <code>yield
@@ -405,7 +405,7 @@
 # e.peek -> object
 #
 # Returns the next object in the enumerator, but doesn't move the internal
- # position forward. If the position is already at the end, StopIteration
+ # position forward. If the position is already at the end, StopIteration
 # is raised.
 #
 # === Example
@@ -429,7 +429,7 @@
 # e.peek_values -> array
 #
 # Returns the next object as an array, similar to Enumerator#next_values, but
- # doesn't move the internal position forward. If the position is already at
+ # doesn't move the internal position forward. If the position is already at
 # the end, StopIteration is raised.
 #
 # === Example
@@ -564,7 +564,7 @@
 # Enumerator.produce(initial = nil) { |val| } -> enumerator
 #
 # Creates an infinite enumerator from any block, just called over and
- # over. Result of the previous iteration is passed to the next one.
+ # over. Result of the previous iteration is passed to the next one.
 # If +initial+ is provided, it is passed to the first iteration, and
 # becomes the first element of the enumerator; if it is not provided,
 # first iteration receives +nil+, and its result becomes first

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/README.md Added

@@ -0,0 +1,25 @@
+# mruby-errno
+
+Errno module for mruby
+
+## License
+
+Copyright (c) 2013 Internet Initiative Japan Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/mrbgem.rake Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/mrblib Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/mrblib/errno.rb Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/src Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/src/errno.c Added

@@ -0,0 +1,324 @@
+#include "mruby.h"
+#include "mruby/array.h"
+#include "mruby/class.h"
+#include "mruby/error.h"
+#include "mruby/hash.h"
+#include "mruby/numeric.h"
+#include "mruby/string.h"
+#include "mruby/variable.h"
+#include "mruby/internal.h"
+#include <mruby/presym.h>
+#include <errno.h>
+#include <string.h>
+
+static const struct {
+#ifdef MRB_NO_PRESYM
+#define itsdefined(name, sym) { #name, name },
+ const char *name;
+#else
+#define itsdefined(name, sym) { sym, name },
+ mrb_sym sym;
+#endif
+ int eno;
+} e2c = {
+#define itsnotdefined(name, sym)
+#include "known_errors_def.cstub"
+#undef itsdefined
+#undef itsnotdefined
+};
+
+static const struct {
+#ifdef MRB_NO_PRESYM
+#define itsnotdefined(name, sym) { #name },
+ const char *name;
+#else
+#define itsnotdefined(name, sym) { sym },
+ mrb_sym sym;
+#endif
+} noe2c = {
+#define itsdefined(name, sym)
+#include "known_errors_def.cstub"
+#undef itsdefined
+#undef itsnotdefined
+};
+
+#ifdef MRB_NO_PRESYM
+#define ENTRY_SYM(e) mrb_intern_static(mrb, (e).name, strlen((e).name))
+#else
+#define ENTRY_SYM(e) (e).sym
+#endif
+
+#define E2C_LEN (sizeof(e2c) / sizeof(e2c0))
+#define NOE2C_LEN (sizeof(noe2c) / sizeof(noe2c0))
+
+static struct RClass*
+mrb_errno_define_exxx(mrb_state *mrb, mrb_sym name, int eno)
+{
+ struct RClass *errno_module = mrb_module_get_id(mrb, MRB_SYM(Errno));
+
+ if (mrb_const_defined_at(mrb, mrb_obj_value(errno_module), name)) {
+ mrb_value v = mrb_const_get(mrb, mrb_obj_value(errno_module), name);
+
+ if (mrb_class_p(v)) {
+ return mrb_class_ptr(v);
+ }
+ }
+
+ struct RClass *sce_class = mrb_exc_get_id(mrb, MRB_SYM(SystemCallError));
+ struct RClass *e = mrb_define_class_under_id(mrb, errno_module, name, sce_class);
+ mrb_define_const_id(mrb, e, MRB_SYM(Errno), mrb_fixnum_value(eno));
+
+ return e;
+}
+
+#ifndef MRB_NO_PRESYM
+typedef mrb_sym sym_ref;
+#define sym_ref_init(mrb, id) (id)
+#define errno_name_matched_p(errentry, ref) ((errentry).sym == *(ref))
+
+#else
+typedef struct {
+ const char *name;
+ size_t len;
+} sym_ref;
+
+static sym_ref
+sym_ref_init(mrb_state *mrb, mrb_sym id)
+{
+ mrb_int len = 0;
+ const char *name = mrb_sym_name_len(mrb, id, &len);
+ sym_ref ename = { name, (size_t)len };
+ return ename;
+}
+
+#define errno_name_matched_p(errentry, ref) errno_name_matched_p_0((errentry).name, (ref))
+static mrb_bool
+errno_name_matched_p_0(const char *name, const sym_ref *ref)
+{
+ if (ref->len == strlen(name) && memcmp(ref->name, name, ref->len) == 0) {
+ return TRUE;
+ }
+ else {
+ return FALSE;
+ }
+}
+#endif // MRB_NO_PRESYM
+
+static mrb_bool
+ary_included_in_head(mrb_state *mrb, mrb_value ary, mrb_value obj, mrb_ssize head)
+{
+ const mrb_value *p = RARRAY_PTR(ary);
+
+ for (; head > 0; head--, p++) {
+ if (mrb_obj_eq(mrb, obj, *p)) {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+static mrb_value
+mrb_errno_defined_p(mrb_state *mrb, mrb_value self)
+{
+ mrb_sym name;
+ mrb_get_args(mrb, "n", &name);
+ const sym_ref ref = sym_ref_init(mrb, name);
+
+ for (size_t i = 0; i < E2C_LEN; i++) {
+ if (errno_name_matched_p(e2ci, &ref)) {
+ return mrb_true_value();
+ }
+ }
+
+ for (size_t i = 0; i < NOE2C_LEN; i++) {
+ if (errno_name_matched_p(noe2ci, &ref)) {
+ return mrb_true_value();
+ }
+ }
+
+ return mrb_false_value();
+}
+
+static mrb_value
+mrb_errno_define(mrb_state *mrb, mrb_value self)
+{
+ mrb_sym name;
+ mrb_get_args(mrb, "n", &name);
+ const sym_ref ref = sym_ref_init(mrb, name);
+
+ for (size_t i = 0; i < E2C_LEN; i++) {
+ if (errno_name_matched_p(e2ci, &ref)) {
+ return mrb_obj_value(mrb_errno_define_exxx(mrb, name, e2ci.eno));
+ }
+ }
+
+ for (size_t i = 0; i < NOE2C_LEN; i++) {
+ if (errno_name_matched_p(noe2ci, &ref)) {
+ struct RClass *errno_module = mrb_module_get_id(mrb, MRB_SYM(Errno));
+ return mrb_obj_value(mrb_class_get_under_id(mrb, errno_module, MRB_SYM(NOERROR)));
+ }
+ }
+
+ return mrb_nil_value();
+}
+
+static mrb_value
+mrb_errno_list(mrb_state *mrb, mrb_value self)
+{
+ mrb_value list;
+ mrb_get_args(mrb, "A", &list);
+
+ mrb_ary_modify(mrb, mrb_ary_ptr(list));
+ mrb_ssize head = RARRAY_LEN(list);
+
+ for (size_t i = 0; i < E2C_LEN; i++) {
+ mrb_value id = mrb_symbol_value(ENTRY_SYM(e2ci));
+ if (!ary_included_in_head(mrb, list, id, head)) {
+ mrb_ary_push(mrb, list, id);
+ }
+ }
+
+ for (size_t i = 0; i < NOE2C_LEN; i++) {
+ mrb_value id = mrb_symbol_value(ENTRY_SYM(noe2ci));
+ if (!ary_included_in_head(mrb, list, id, head)) {
+ mrb_ary_push(mrb, list, id);
+ }
+ }
+
+ return list;
+}
+
+static void
+mrb_sce_init(mrb_state *mrb, mrb_value self, mrb_value m, mrb_value no)
+{
+ mrb_value str;
+ char buf20;
+
+ if (!mrb_nil_p(no)) {
+ size_t i;
+ int n = (int)mrb_as_int(mrb, no);
+
+ for (i=0; i < E2C_LEN; i++) {
+ if (e2ci.eno == n) {
+ mrb_basic_ptr(self)->c = mrb_errno_define_exxx(mrb, ENTRY_SYM(e2ci), e2ci.eno);
+ str = mrb_str_new_cstr(mrb, strerror(n));
+ break;
+ }
+ }
+ if (i == E2C_LEN) {
+ mrb_iv_set(mrb, self, MRB_SYM(errno), mrb_fixnum_value(n));
+ str = mrb_str_new_cstr(mrb, "Unknown error: ");
+ char *bp = mrb_int_to_cstr(buf, sizeof(buf), n, 10);
+ mrb_str_cat2(mrb, str, bp);
+ }
+ }
+ else {
+ str = mrb_str_new_cstr(mrb, "unknown error");
+ }
+ if (!mrb_nil_p(m)) {
+ mrb_str_cat2(mrb, str, " - ");
+ mrb_str_append(mrb, str, m);
+ }
+ mrb_exc_mesg_set(mrb, mrb_exc_ptr(self), str);
+}
+
+static mrb_value
+mrb_exxx_init(mrb_state *mrb, mrb_value self)
+{
+ mrb_value m = mrb_nil_value();
+
+ mrb_get_args(mrb, "|S", &m);
+ mrb_sce_init(mrb, self, m, mrb_nil_value());
+ return self;
+}
+
+static mrb_value
+mrb_sce_init_m(mrb_state *mrb, mrb_value self)
+{
+ if (mrb_class(mrb, self) != mrb_exc_get_id(mrb, MRB_SYM(SystemCallError))) {
+ return mrb_exxx_init(mrb, self);
+ }
+
+ mrb_value m, n;
+
+ if (mrb_get_args(mrb, "o|o", &m, &n) == 1) {
+ if (mrb_fixnum_p(m)) {
+ n = m;
+ m = mrb_nil_value();
+ }
+ else {
+ n = mrb_nil_value();
+ }
+ }
+ mrb_sce_init(mrb, self, m, n);
+ return self;
+}
+
+static mrb_value
+mrb_sce_errno(mrb_state *mrb, mrb_value self)
+{
+ struct RClass *c;
+ mrb_sym sym;
+
+ c = mrb_class(mrb, self);
+ sym = MRB_SYM(Errno);
+ if (mrb_const_defined_at(mrb, mrb_obj_value(c), sym)) {
+ return mrb_const_get(mrb, mrb_obj_value(c), sym);
+ } else {
+ sym = MRB_SYM(errno);
+ return mrb_attr_get(mrb, self, sym);
+ }
+}
+
+static mrb_value
+mrb_sce_sys_fail(mrb_state *mrb, mrb_value cls)
+{
+ struct RClass *sce;
+ mrb_value msg, no;
+ mrb_int argc;
+
+ mrb->c->ci->mid = 0;
+ sce = mrb_class_ptr(cls);
+ argc = mrb_get_args(mrb, "o|S", &no, &msg);
+
+ struct RBasic* e = mrb_obj_alloc(mrb, MRB_TT_EXCEPTION, sce);
+ mrb_value exc = mrb_obj_value(e);
+ if (argc == 1) {
+ msg = mrb_nil_value();
+ }
+ exc = mrb_obj_value(e);
+ mrb_sce_init(mrb, exc, msg, no);
+ mrb_exc_raise(mrb, exc);
+ return mrb_nil_value(); /* NOTREACHED */
+}
+
+void
+mrb_mruby_errno_gem_init(mrb_state *mrb)
+{
+ struct RClass *e, *eno, *sce, *ste;
+
+ ste = mrb->eStandardError_class;
+
+ sce = mrb_define_class(mrb, "SystemCallError", ste);
+ mrb_define_class_method(mrb, sce, "_sys_fail", mrb_sce_sys_fail, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, sce, "errno", mrb_sce_errno, MRB_ARGS_NONE());
+ mrb_define_method(mrb, sce, "initialize", mrb_sce_init_m, MRB_ARGS_ARG(1, 1));
+
+ eno = mrb_define_module_id(mrb, MRB_SYM(Errno));
+ mrb_define_class_method(mrb, eno, "__errno_defined?", mrb_errno_defined_p, MRB_ARGS_REQ(1));
+ mrb_define_class_method(mrb, eno, "__errno_define", mrb_errno_define, MRB_ARGS_REQ(1));
+ mrb_define_class_method(mrb, eno, "__errno_list", mrb_errno_list, MRB_ARGS_REQ(1));
+
+ e = mrb_define_class_under_id(mrb, eno, MRB_SYM(NOERROR), sce);
+ mrb_define_const_id(mrb, e, MRB_SYM(Errno), mrb_fixnum_value(0));
+ //mrb_define_method(mrb, e, "===", mrb_exxx_cmp, MRB_ARGS_REQ(1));
+
+ // Pre-allocation for Errno::ENOMEM only
+ mrb_errno_define_exxx(mrb, MRB_SYM(ENOMEM), ENOMEM);
+}
+
+void
+mrb_mruby_errno_gem_final(mrb_state *mrb)
+{
+}

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/src/gen.rb Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/src/known_errors.def Added

@@ -0,0 +1,156 @@
+EPERM
+ENOENT
+ESRCH
+EINTR
+EIO
+ENXIO
+E2BIG
+ENOEXEC
+EBADF
+ECHILD
+EAGAIN
+ENOMEM
+EACCES
+EFAULT
+ENOTBLK
+EBUSY
+EEXIST
+EXDEV
+ENODEV
+ENOTDIR
+EISDIR
+EINVAL
+ENFILE
+EMFILE
+ENOTTY
+ETXTBSY
+EFBIG
+ENOSPC
+ESPIPE
+EROFS
+EMLINK
+EPIPE
+EDOM
+ERANGE
+EDEADLK
+ENAMETOOLONG
+ENOLCK
+ENOSYS
+ENOTEMPTY
+ELOOP
+EWOULDBLOCK
+ENOMSG
+EIDRM
+ECHRNG
+EL2NSYNC
+EL3HLT
+EL3RST
+ELNRNG
+EUNATCH
+ENOCSI
+EL2HLT
+EBADE
+EBADR
+EXFULL
+ENOANO
+EBADRQC
+EBADSLT
+EDEADLOCK
+EBFONT
+ENOSTR
+ENODATA
+ETIME
+ENOSR
+ENONET
+ENOPKG
+EREMOTE
+ENOLINK
+EADV
+ESRMNT
+ECOMM
+EPROTO
+ENOTCAPABLE
+ECAPMODE
+EMULTIHOP
+EDOTDOT
+EBADMSG
+EPWROFF
+EDEVERR
+EOVERFLOW
+EBADEXEC
+EBADARCH
+EBADMACHO
+ESHLIBVERS
+ENOTUNIQ
+EBADFD
+EREMCHG
+ELIBACC
+ELIBBAD
+ELIBSCN
+ELIBMAX
+ELIBEXEC
+EILSEQ
+ERESTART
+ESTRPIPE
+EUSERS
+ENOTSOCK
+EDESTADDRREQ
+EMSGSIZE
+EPROTOTYPE
+ENOPROTOOPT
+EPROTONOSUPPORT
+ESOCKTNOSUPPORT
+EOPNOTSUPP
+EPFNOSUPPORT
+EAFNOSUPPORT
+EADDRINUSE
+EADDRNOTAVAIL
+ENETDOWN
+ENETUNREACH
+ENETRESET
+ECONNABORTED
+ECONNRESET
+ENOBUFS
+EISCONN
+ENOTCONN
+ESHUTDOWN
+ETOOMANYREFS
+ETIMEDOUT
+ECONNREFUSED
+EHOSTDOWN
+EHOSTUNREACH
+EALREADY
+EINPROGRESS
+ESTALE
+EUCLEAN
+ENOTNAM
+ENAVAIL
+EISNAM
+EREMOTEIO
+EDQUOT
+ECANCELED
+EKEYEXPIRED
+EKEYREJECTED
+EKEYREVOKED
+EMEDIUMTYPE
+ENOKEY
+ENOMEDIUM
+ENOTRECOVERABLE
+EOWNERDEAD
+EINTEGRITY
+ERFKILL
+EAUTH
+EBADRPC
+EDOOFUS
+EFTYPE
+ENEEDAUTH
+ENOATTR
+ENOTSUP
+EPROCLIM
+EPROCUNAVAIL
+EPROGMISMATCH
+EPROGUNAVAIL
+ERPCMISMATCH
+EIPSEC
+ENOPOLICY
+EQFULL

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/src/known_errors_def.cstub Added

@@ -0,0 +1,780 @@
+#ifdef EPERM
+  itsdefined(EPERM, MRB_SYM(EPERM))
+#else
+  itsnotdefined(EPERM, MRB_SYM(EPERM))
+#endif
+#ifdef ENOENT
+  itsdefined(ENOENT, MRB_SYM(ENOENT))
+#else
+  itsnotdefined(ENOENT, MRB_SYM(ENOENT))
+#endif
+#ifdef ESRCH
+  itsdefined(ESRCH, MRB_SYM(ESRCH))
+#else
+  itsnotdefined(ESRCH, MRB_SYM(ESRCH))
+#endif
+#ifdef EINTR
+  itsdefined(EINTR, MRB_SYM(EINTR))
+#else
+  itsnotdefined(EINTR, MRB_SYM(EINTR))
+#endif
+#ifdef EIO
+  itsdefined(EIO, MRB_SYM(EIO))
+#else
+  itsnotdefined(EIO, MRB_SYM(EIO))
+#endif
+#ifdef ENXIO
+  itsdefined(ENXIO, MRB_SYM(ENXIO))
+#else
+  itsnotdefined(ENXIO, MRB_SYM(ENXIO))
+#endif
+#ifdef E2BIG
+  itsdefined(E2BIG, MRB_SYM(E2BIG))
+#else
+  itsnotdefined(E2BIG, MRB_SYM(E2BIG))
+#endif
+#ifdef ENOEXEC
+  itsdefined(ENOEXEC, MRB_SYM(ENOEXEC))
+#else
+  itsnotdefined(ENOEXEC, MRB_SYM(ENOEXEC))
+#endif
+#ifdef EBADF
+  itsdefined(EBADF, MRB_SYM(EBADF))
+#else
+  itsnotdefined(EBADF, MRB_SYM(EBADF))
+#endif
+#ifdef ECHILD
+  itsdefined(ECHILD, MRB_SYM(ECHILD))
+#else
+  itsnotdefined(ECHILD, MRB_SYM(ECHILD))
+#endif
+#ifdef EAGAIN
+  itsdefined(EAGAIN, MRB_SYM(EAGAIN))
+#else
+  itsnotdefined(EAGAIN, MRB_SYM(EAGAIN))
+#endif
+#ifdef ENOMEM
+  itsdefined(ENOMEM, MRB_SYM(ENOMEM))
+#else
+  itsnotdefined(ENOMEM, MRB_SYM(ENOMEM))
+#endif
+#ifdef EACCES
+  itsdefined(EACCES, MRB_SYM(EACCES))
+#else
+  itsnotdefined(EACCES, MRB_SYM(EACCES))
+#endif
+#ifdef EFAULT
+  itsdefined(EFAULT, MRB_SYM(EFAULT))
+#else
+  itsnotdefined(EFAULT, MRB_SYM(EFAULT))
+#endif
+#ifdef ENOTBLK
+  itsdefined(ENOTBLK, MRB_SYM(ENOTBLK))
+#else
+  itsnotdefined(ENOTBLK, MRB_SYM(ENOTBLK))
+#endif
+#ifdef EBUSY
+  itsdefined(EBUSY, MRB_SYM(EBUSY))
+#else
+  itsnotdefined(EBUSY, MRB_SYM(EBUSY))
+#endif
+#ifdef EEXIST
+  itsdefined(EEXIST, MRB_SYM(EEXIST))
+#else
+  itsnotdefined(EEXIST, MRB_SYM(EEXIST))
+#endif
+#ifdef EXDEV
+  itsdefined(EXDEV, MRB_SYM(EXDEV))
+#else
+  itsnotdefined(EXDEV, MRB_SYM(EXDEV))
+#endif
+#ifdef ENODEV
+  itsdefined(ENODEV, MRB_SYM(ENODEV))
+#else
+  itsnotdefined(ENODEV, MRB_SYM(ENODEV))
+#endif
+#ifdef ENOTDIR
+  itsdefined(ENOTDIR, MRB_SYM(ENOTDIR))
+#else
+  itsnotdefined(ENOTDIR, MRB_SYM(ENOTDIR))
+#endif
+#ifdef EISDIR
+  itsdefined(EISDIR, MRB_SYM(EISDIR))
+#else
+  itsnotdefined(EISDIR, MRB_SYM(EISDIR))
+#endif
+#ifdef EINVAL
+  itsdefined(EINVAL, MRB_SYM(EINVAL))
+#else
+  itsnotdefined(EINVAL, MRB_SYM(EINVAL))
+#endif
+#ifdef ENFILE
+  itsdefined(ENFILE, MRB_SYM(ENFILE))
+#else
+  itsnotdefined(ENFILE, MRB_SYM(ENFILE))
+#endif
+#ifdef EMFILE
+  itsdefined(EMFILE, MRB_SYM(EMFILE))
+#else
+  itsnotdefined(EMFILE, MRB_SYM(EMFILE))
+#endif
+#ifdef ENOTTY
+  itsdefined(ENOTTY, MRB_SYM(ENOTTY))
+#else
+  itsnotdefined(ENOTTY, MRB_SYM(ENOTTY))
+#endif
+#ifdef ETXTBSY
+  itsdefined(ETXTBSY, MRB_SYM(ETXTBSY))
+#else
+  itsnotdefined(ETXTBSY, MRB_SYM(ETXTBSY))
+#endif
+#ifdef EFBIG
+  itsdefined(EFBIG, MRB_SYM(EFBIG))
+#else
+  itsnotdefined(EFBIG, MRB_SYM(EFBIG))
+#endif
+#ifdef ENOSPC
+  itsdefined(ENOSPC, MRB_SYM(ENOSPC))
+#else
+  itsnotdefined(ENOSPC, MRB_SYM(ENOSPC))
+#endif
+#ifdef ESPIPE
+  itsdefined(ESPIPE, MRB_SYM(ESPIPE))
+#else
+  itsnotdefined(ESPIPE, MRB_SYM(ESPIPE))
+#endif
+#ifdef EROFS
+  itsdefined(EROFS, MRB_SYM(EROFS))
+#else
+  itsnotdefined(EROFS, MRB_SYM(EROFS))
+#endif
+#ifdef EMLINK
+  itsdefined(EMLINK, MRB_SYM(EMLINK))
+#else
+  itsnotdefined(EMLINK, MRB_SYM(EMLINK))
+#endif
+#ifdef EPIPE
+  itsdefined(EPIPE, MRB_SYM(EPIPE))
+#else
+  itsnotdefined(EPIPE, MRB_SYM(EPIPE))
+#endif
+#ifdef EDOM
+  itsdefined(EDOM, MRB_SYM(EDOM))
+#else
+  itsnotdefined(EDOM, MRB_SYM(EDOM))
+#endif
+#ifdef ERANGE
+  itsdefined(ERANGE, MRB_SYM(ERANGE))
+#else
+  itsnotdefined(ERANGE, MRB_SYM(ERANGE))
+#endif
+#ifdef EDEADLK
+  itsdefined(EDEADLK, MRB_SYM(EDEADLK))
+#else
+  itsnotdefined(EDEADLK, MRB_SYM(EDEADLK))
+#endif
+#ifdef ENAMETOOLONG
+  itsdefined(ENAMETOOLONG, MRB_SYM(ENAMETOOLONG))
+#else
+  itsnotdefined(ENAMETOOLONG, MRB_SYM(ENAMETOOLONG))
+#endif
+#ifdef ENOLCK
+  itsdefined(ENOLCK, MRB_SYM(ENOLCK))
+#else
+  itsnotdefined(ENOLCK, MRB_SYM(ENOLCK))
+#endif
+#ifdef ENOSYS
+  itsdefined(ENOSYS, MRB_SYM(ENOSYS))
+#else
+  itsnotdefined(ENOSYS, MRB_SYM(ENOSYS))
+#endif
+#ifdef ENOTEMPTY
+  itsdefined(ENOTEMPTY, MRB_SYM(ENOTEMPTY))
+#else
+  itsnotdefined(ENOTEMPTY, MRB_SYM(ENOTEMPTY))
+#endif
+#ifdef ELOOP
+  itsdefined(ELOOP, MRB_SYM(ELOOP))
+#else
+  itsnotdefined(ELOOP, MRB_SYM(ELOOP))
+#endif
+#ifdef EWOULDBLOCK
+  itsdefined(EWOULDBLOCK, MRB_SYM(EWOULDBLOCK))
+#else
+  itsnotdefined(EWOULDBLOCK, MRB_SYM(EWOULDBLOCK))
+#endif
+#ifdef ENOMSG
+  itsdefined(ENOMSG, MRB_SYM(ENOMSG))
+#else
+  itsnotdefined(ENOMSG, MRB_SYM(ENOMSG))
+#endif
+#ifdef EIDRM
+  itsdefined(EIDRM, MRB_SYM(EIDRM))
+#else
+  itsnotdefined(EIDRM, MRB_SYM(EIDRM))
+#endif
+#ifdef ECHRNG
+  itsdefined(ECHRNG, MRB_SYM(ECHRNG))
+#else
+  itsnotdefined(ECHRNG, MRB_SYM(ECHRNG))
+#endif
+#ifdef EL2NSYNC
+  itsdefined(EL2NSYNC, MRB_SYM(EL2NSYNC))
+#else
+  itsnotdefined(EL2NSYNC, MRB_SYM(EL2NSYNC))
+#endif
+#ifdef EL3HLT
+  itsdefined(EL3HLT, MRB_SYM(EL3HLT))
+#else
+  itsnotdefined(EL3HLT, MRB_SYM(EL3HLT))
+#endif
+#ifdef EL3RST
+  itsdefined(EL3RST, MRB_SYM(EL3RST))
+#else
+  itsnotdefined(EL3RST, MRB_SYM(EL3RST))
+#endif
+#ifdef ELNRNG
+  itsdefined(ELNRNG, MRB_SYM(ELNRNG))
+#else
+  itsnotdefined(ELNRNG, MRB_SYM(ELNRNG))
+#endif
+#ifdef EUNATCH
+  itsdefined(EUNATCH, MRB_SYM(EUNATCH))
+#else
+  itsnotdefined(EUNATCH, MRB_SYM(EUNATCH))
+#endif
+#ifdef ENOCSI
+  itsdefined(ENOCSI, MRB_SYM(ENOCSI))
+#else
+  itsnotdefined(ENOCSI, MRB_SYM(ENOCSI))
+#endif
+#ifdef EL2HLT
+  itsdefined(EL2HLT, MRB_SYM(EL2HLT))
+#else
+  itsnotdefined(EL2HLT, MRB_SYM(EL2HLT))
+#endif
+#ifdef EBADE
+  itsdefined(EBADE, MRB_SYM(EBADE))
+#else
+  itsnotdefined(EBADE, MRB_SYM(EBADE))
+#endif
+#ifdef EBADR
+  itsdefined(EBADR, MRB_SYM(EBADR))
+#else
+  itsnotdefined(EBADR, MRB_SYM(EBADR))
+#endif
+#ifdef EXFULL
+  itsdefined(EXFULL, MRB_SYM(EXFULL))
+#else
+  itsnotdefined(EXFULL, MRB_SYM(EXFULL))
+#endif
+#ifdef ENOANO
+  itsdefined(ENOANO, MRB_SYM(ENOANO))
+#else
+  itsnotdefined(ENOANO, MRB_SYM(ENOANO))
+#endif
+#ifdef EBADRQC
+  itsdefined(EBADRQC, MRB_SYM(EBADRQC))
+#else
+  itsnotdefined(EBADRQC, MRB_SYM(EBADRQC))
+#endif
+#ifdef EBADSLT
+  itsdefined(EBADSLT, MRB_SYM(EBADSLT))
+#else
+  itsnotdefined(EBADSLT, MRB_SYM(EBADSLT))
+#endif
+#ifdef EDEADLOCK
+  itsdefined(EDEADLOCK, MRB_SYM(EDEADLOCK))
+#else
+  itsnotdefined(EDEADLOCK, MRB_SYM(EDEADLOCK))
+#endif
+#ifdef EBFONT
+  itsdefined(EBFONT, MRB_SYM(EBFONT))
+#else
+  itsnotdefined(EBFONT, MRB_SYM(EBFONT))
+#endif
+#ifdef ENOSTR
+  itsdefined(ENOSTR, MRB_SYM(ENOSTR))
+#else
+  itsnotdefined(ENOSTR, MRB_SYM(ENOSTR))
+#endif
+#ifdef ENODATA
+  itsdefined(ENODATA, MRB_SYM(ENODATA))
+#else
+  itsnotdefined(ENODATA, MRB_SYM(ENODATA))
+#endif
+#ifdef ETIME
+  itsdefined(ETIME, MRB_SYM(ETIME))
+#else
+  itsnotdefined(ETIME, MRB_SYM(ETIME))
+#endif
+#ifdef ENOSR
+  itsdefined(ENOSR, MRB_SYM(ENOSR))
+#else
+  itsnotdefined(ENOSR, MRB_SYM(ENOSR))
+#endif
+#ifdef ENONET
+  itsdefined(ENONET, MRB_SYM(ENONET))
+#else
+  itsnotdefined(ENONET, MRB_SYM(ENONET))
+#endif
+#ifdef ENOPKG
+  itsdefined(ENOPKG, MRB_SYM(ENOPKG))
+#else
+  itsnotdefined(ENOPKG, MRB_SYM(ENOPKG))
+#endif
+#ifdef EREMOTE
+  itsdefined(EREMOTE, MRB_SYM(EREMOTE))
+#else
+  itsnotdefined(EREMOTE, MRB_SYM(EREMOTE))
+#endif
+#ifdef ENOLINK
+  itsdefined(ENOLINK, MRB_SYM(ENOLINK))
+#else
+  itsnotdefined(ENOLINK, MRB_SYM(ENOLINK))
+#endif
+#ifdef EADV
+  itsdefined(EADV, MRB_SYM(EADV))
+#else
+  itsnotdefined(EADV, MRB_SYM(EADV))
+#endif
+#ifdef ESRMNT
+  itsdefined(ESRMNT, MRB_SYM(ESRMNT))
+#else
+  itsnotdefined(ESRMNT, MRB_SYM(ESRMNT))
+#endif
+#ifdef ECOMM
+  itsdefined(ECOMM, MRB_SYM(ECOMM))
+#else
+  itsnotdefined(ECOMM, MRB_SYM(ECOMM))
+#endif
+#ifdef EPROTO
+  itsdefined(EPROTO, MRB_SYM(EPROTO))
+#else
+  itsnotdefined(EPROTO, MRB_SYM(EPROTO))
+#endif
+#ifdef ENOTCAPABLE
+  itsdefined(ENOTCAPABLE, MRB_SYM(ENOTCAPABLE))
+#else
+  itsnotdefined(ENOTCAPABLE, MRB_SYM(ENOTCAPABLE))
+#endif
+#ifdef ECAPMODE
+  itsdefined(ECAPMODE, MRB_SYM(ECAPMODE))
+#else
+  itsnotdefined(ECAPMODE, MRB_SYM(ECAPMODE))
+#endif
+#ifdef EMULTIHOP
+  itsdefined(EMULTIHOP, MRB_SYM(EMULTIHOP))
+#else
+  itsnotdefined(EMULTIHOP, MRB_SYM(EMULTIHOP))
+#endif
+#ifdef EDOTDOT
+  itsdefined(EDOTDOT, MRB_SYM(EDOTDOT))
+#else
+  itsnotdefined(EDOTDOT, MRB_SYM(EDOTDOT))
+#endif
+#ifdef EBADMSG
+  itsdefined(EBADMSG, MRB_SYM(EBADMSG))
+#else
+  itsnotdefined(EBADMSG, MRB_SYM(EBADMSG))
+#endif
+#ifdef EPWROFF
+  itsdefined(EPWROFF, MRB_SYM(EPWROFF))
+#else
+  itsnotdefined(EPWROFF, MRB_SYM(EPWROFF))
+#endif
+#ifdef EDEVERR
+  itsdefined(EDEVERR, MRB_SYM(EDEVERR))
+#else
+  itsnotdefined(EDEVERR, MRB_SYM(EDEVERR))
+#endif
+#ifdef EOVERFLOW
+  itsdefined(EOVERFLOW, MRB_SYM(EOVERFLOW))
+#else
+  itsnotdefined(EOVERFLOW, MRB_SYM(EOVERFLOW))
+#endif
+#ifdef EBADEXEC
+  itsdefined(EBADEXEC, MRB_SYM(EBADEXEC))
+#else
+  itsnotdefined(EBADEXEC, MRB_SYM(EBADEXEC))
+#endif
+#ifdef EBADARCH
+  itsdefined(EBADARCH, MRB_SYM(EBADARCH))
+#else
+  itsnotdefined(EBADARCH, MRB_SYM(EBADARCH))
+#endif
+#ifdef EBADMACHO
+  itsdefined(EBADMACHO, MRB_SYM(EBADMACHO))
+#else
+  itsnotdefined(EBADMACHO, MRB_SYM(EBADMACHO))
+#endif
+#ifdef ESHLIBVERS
+  itsdefined(ESHLIBVERS, MRB_SYM(ESHLIBVERS))
+#else
+  itsnotdefined(ESHLIBVERS, MRB_SYM(ESHLIBVERS))
+#endif
+#ifdef ENOTUNIQ
+  itsdefined(ENOTUNIQ, MRB_SYM(ENOTUNIQ))
+#else
+  itsnotdefined(ENOTUNIQ, MRB_SYM(ENOTUNIQ))
+#endif
+#ifdef EBADFD
+  itsdefined(EBADFD, MRB_SYM(EBADFD))
+#else
+  itsnotdefined(EBADFD, MRB_SYM(EBADFD))
+#endif
+#ifdef EREMCHG
+  itsdefined(EREMCHG, MRB_SYM(EREMCHG))
+#else
+  itsnotdefined(EREMCHG, MRB_SYM(EREMCHG))
+#endif
+#ifdef ELIBACC
+  itsdefined(ELIBACC, MRB_SYM(ELIBACC))
+#else
+  itsnotdefined(ELIBACC, MRB_SYM(ELIBACC))
+#endif
+#ifdef ELIBBAD
+  itsdefined(ELIBBAD, MRB_SYM(ELIBBAD))
+#else
+  itsnotdefined(ELIBBAD, MRB_SYM(ELIBBAD))
+#endif
+#ifdef ELIBSCN
+  itsdefined(ELIBSCN, MRB_SYM(ELIBSCN))
+#else
+  itsnotdefined(ELIBSCN, MRB_SYM(ELIBSCN))
+#endif
+#ifdef ELIBMAX
+  itsdefined(ELIBMAX, MRB_SYM(ELIBMAX))
+#else
+  itsnotdefined(ELIBMAX, MRB_SYM(ELIBMAX))
+#endif
+#ifdef ELIBEXEC
+  itsdefined(ELIBEXEC, MRB_SYM(ELIBEXEC))
+#else
+  itsnotdefined(ELIBEXEC, MRB_SYM(ELIBEXEC))
+#endif
+#ifdef EILSEQ
+  itsdefined(EILSEQ, MRB_SYM(EILSEQ))
+#else
+  itsnotdefined(EILSEQ, MRB_SYM(EILSEQ))
+#endif
+#ifdef ERESTART
+  itsdefined(ERESTART, MRB_SYM(ERESTART))
+#else
+  itsnotdefined(ERESTART, MRB_SYM(ERESTART))
+#endif
+#ifdef ESTRPIPE
+  itsdefined(ESTRPIPE, MRB_SYM(ESTRPIPE))
+#else
+  itsnotdefined(ESTRPIPE, MRB_SYM(ESTRPIPE))
+#endif
+#ifdef EUSERS
+  itsdefined(EUSERS, MRB_SYM(EUSERS))
+#else
+  itsnotdefined(EUSERS, MRB_SYM(EUSERS))
+#endif
+#ifdef ENOTSOCK
+  itsdefined(ENOTSOCK, MRB_SYM(ENOTSOCK))
+#else
+  itsnotdefined(ENOTSOCK, MRB_SYM(ENOTSOCK))
+#endif
+#ifdef EDESTADDRREQ
+  itsdefined(EDESTADDRREQ, MRB_SYM(EDESTADDRREQ))
+#else
+  itsnotdefined(EDESTADDRREQ, MRB_SYM(EDESTADDRREQ))
+#endif
+#ifdef EMSGSIZE
+  itsdefined(EMSGSIZE, MRB_SYM(EMSGSIZE))
+#else
+  itsnotdefined(EMSGSIZE, MRB_SYM(EMSGSIZE))
+#endif
+#ifdef EPROTOTYPE
+  itsdefined(EPROTOTYPE, MRB_SYM(EPROTOTYPE))
+#else
+  itsnotdefined(EPROTOTYPE, MRB_SYM(EPROTOTYPE))
+#endif
+#ifdef ENOPROTOOPT
+  itsdefined(ENOPROTOOPT, MRB_SYM(ENOPROTOOPT))
+#else
+  itsnotdefined(ENOPROTOOPT, MRB_SYM(ENOPROTOOPT))
+#endif
+#ifdef EPROTONOSUPPORT
+  itsdefined(EPROTONOSUPPORT, MRB_SYM(EPROTONOSUPPORT))
+#else
+  itsnotdefined(EPROTONOSUPPORT, MRB_SYM(EPROTONOSUPPORT))
+#endif
+#ifdef ESOCKTNOSUPPORT
+  itsdefined(ESOCKTNOSUPPORT, MRB_SYM(ESOCKTNOSUPPORT))
+#else
+  itsnotdefined(ESOCKTNOSUPPORT, MRB_SYM(ESOCKTNOSUPPORT))
+#endif
+#ifdef EOPNOTSUPP
+  itsdefined(EOPNOTSUPP, MRB_SYM(EOPNOTSUPP))
+#else
+  itsnotdefined(EOPNOTSUPP, MRB_SYM(EOPNOTSUPP))
+#endif
+#ifdef EPFNOSUPPORT
+  itsdefined(EPFNOSUPPORT, MRB_SYM(EPFNOSUPPORT))
+#else
+  itsnotdefined(EPFNOSUPPORT, MRB_SYM(EPFNOSUPPORT))
+#endif
+#ifdef EAFNOSUPPORT
+  itsdefined(EAFNOSUPPORT, MRB_SYM(EAFNOSUPPORT))
+#else
+  itsnotdefined(EAFNOSUPPORT, MRB_SYM(EAFNOSUPPORT))
+#endif
+#ifdef EADDRINUSE
+  itsdefined(EADDRINUSE, MRB_SYM(EADDRINUSE))
+#else
+  itsnotdefined(EADDRINUSE, MRB_SYM(EADDRINUSE))
+#endif
+#ifdef EADDRNOTAVAIL
+  itsdefined(EADDRNOTAVAIL, MRB_SYM(EADDRNOTAVAIL))
+#else
+  itsnotdefined(EADDRNOTAVAIL, MRB_SYM(EADDRNOTAVAIL))
+#endif
+#ifdef ENETDOWN
+  itsdefined(ENETDOWN, MRB_SYM(ENETDOWN))
+#else
+  itsnotdefined(ENETDOWN, MRB_SYM(ENETDOWN))
+#endif
+#ifdef ENETUNREACH
+  itsdefined(ENETUNREACH, MRB_SYM(ENETUNREACH))
+#else
+  itsnotdefined(ENETUNREACH, MRB_SYM(ENETUNREACH))
+#endif
+#ifdef ENETRESET
+  itsdefined(ENETRESET, MRB_SYM(ENETRESET))
+#else
+  itsnotdefined(ENETRESET, MRB_SYM(ENETRESET))
+#endif
+#ifdef ECONNABORTED
+  itsdefined(ECONNABORTED, MRB_SYM(ECONNABORTED))
+#else
+  itsnotdefined(ECONNABORTED, MRB_SYM(ECONNABORTED))
+#endif
+#ifdef ECONNRESET
+  itsdefined(ECONNRESET, MRB_SYM(ECONNRESET))
+#else
+  itsnotdefined(ECONNRESET, MRB_SYM(ECONNRESET))
+#endif
+#ifdef ENOBUFS
+  itsdefined(ENOBUFS, MRB_SYM(ENOBUFS))
+#else
+  itsnotdefined(ENOBUFS, MRB_SYM(ENOBUFS))
+#endif
+#ifdef EISCONN
+  itsdefined(EISCONN, MRB_SYM(EISCONN))
+#else
+  itsnotdefined(EISCONN, MRB_SYM(EISCONN))
+#endif
+#ifdef ENOTCONN
+  itsdefined(ENOTCONN, MRB_SYM(ENOTCONN))
+#else
+  itsnotdefined(ENOTCONN, MRB_SYM(ENOTCONN))
+#endif
+#ifdef ESHUTDOWN
+  itsdefined(ESHUTDOWN, MRB_SYM(ESHUTDOWN))
+#else
+  itsnotdefined(ESHUTDOWN, MRB_SYM(ESHUTDOWN))
+#endif
+#ifdef ETOOMANYREFS
+  itsdefined(ETOOMANYREFS, MRB_SYM(ETOOMANYREFS))
+#else
+  itsnotdefined(ETOOMANYREFS, MRB_SYM(ETOOMANYREFS))
+#endif
+#ifdef ETIMEDOUT
+  itsdefined(ETIMEDOUT, MRB_SYM(ETIMEDOUT))
+#else
+  itsnotdefined(ETIMEDOUT, MRB_SYM(ETIMEDOUT))
+#endif
+#ifdef ECONNREFUSED
+  itsdefined(ECONNREFUSED, MRB_SYM(ECONNREFUSED))
+#else
+  itsnotdefined(ECONNREFUSED, MRB_SYM(ECONNREFUSED))
+#endif
+#ifdef EHOSTDOWN
+  itsdefined(EHOSTDOWN, MRB_SYM(EHOSTDOWN))
+#else
+  itsnotdefined(EHOSTDOWN, MRB_SYM(EHOSTDOWN))
+#endif
+#ifdef EHOSTUNREACH
+  itsdefined(EHOSTUNREACH, MRB_SYM(EHOSTUNREACH))
+#else
+  itsnotdefined(EHOSTUNREACH, MRB_SYM(EHOSTUNREACH))
+#endif
+#ifdef EALREADY
+  itsdefined(EALREADY, MRB_SYM(EALREADY))
+#else
+  itsnotdefined(EALREADY, MRB_SYM(EALREADY))
+#endif
+#ifdef EINPROGRESS
+  itsdefined(EINPROGRESS, MRB_SYM(EINPROGRESS))
+#else
+  itsnotdefined(EINPROGRESS, MRB_SYM(EINPROGRESS))
+#endif
+#ifdef ESTALE
+  itsdefined(ESTALE, MRB_SYM(ESTALE))
+#else
+  itsnotdefined(ESTALE, MRB_SYM(ESTALE))
+#endif
+#ifdef EUCLEAN
+  itsdefined(EUCLEAN, MRB_SYM(EUCLEAN))
+#else
+  itsnotdefined(EUCLEAN, MRB_SYM(EUCLEAN))
+#endif
+#ifdef ENOTNAM
+  itsdefined(ENOTNAM, MRB_SYM(ENOTNAM))
+#else
+  itsnotdefined(ENOTNAM, MRB_SYM(ENOTNAM))
+#endif
+#ifdef ENAVAIL
+  itsdefined(ENAVAIL, MRB_SYM(ENAVAIL))
+#else
+  itsnotdefined(ENAVAIL, MRB_SYM(ENAVAIL))
+#endif
+#ifdef EISNAM
+  itsdefined(EISNAM, MRB_SYM(EISNAM))
+#else
+  itsnotdefined(EISNAM, MRB_SYM(EISNAM))
+#endif
+#ifdef EREMOTEIO
+  itsdefined(EREMOTEIO, MRB_SYM(EREMOTEIO))
+#else
+  itsnotdefined(EREMOTEIO, MRB_SYM(EREMOTEIO))
+#endif
+#ifdef EDQUOT
+  itsdefined(EDQUOT, MRB_SYM(EDQUOT))
+#else
+  itsnotdefined(EDQUOT, MRB_SYM(EDQUOT))
+#endif
+#ifdef ECANCELED
+  itsdefined(ECANCELED, MRB_SYM(ECANCELED))
+#else
+  itsnotdefined(ECANCELED, MRB_SYM(ECANCELED))
+#endif
+#ifdef EKEYEXPIRED
+  itsdefined(EKEYEXPIRED, MRB_SYM(EKEYEXPIRED))
+#else
+  itsnotdefined(EKEYEXPIRED, MRB_SYM(EKEYEXPIRED))
+#endif
+#ifdef EKEYREJECTED
+  itsdefined(EKEYREJECTED, MRB_SYM(EKEYREJECTED))
+#else
+  itsnotdefined(EKEYREJECTED, MRB_SYM(EKEYREJECTED))
+#endif
+#ifdef EKEYREVOKED
+  itsdefined(EKEYREVOKED, MRB_SYM(EKEYREVOKED))
+#else
+  itsnotdefined(EKEYREVOKED, MRB_SYM(EKEYREVOKED))
+#endif
+#ifdef EMEDIUMTYPE
+  itsdefined(EMEDIUMTYPE, MRB_SYM(EMEDIUMTYPE))
+#else
+  itsnotdefined(EMEDIUMTYPE, MRB_SYM(EMEDIUMTYPE))
+#endif
+#ifdef ENOKEY
+  itsdefined(ENOKEY, MRB_SYM(ENOKEY))
+#else
+  itsnotdefined(ENOKEY, MRB_SYM(ENOKEY))
+#endif
+#ifdef ENOMEDIUM
+  itsdefined(ENOMEDIUM, MRB_SYM(ENOMEDIUM))
+#else
+  itsnotdefined(ENOMEDIUM, MRB_SYM(ENOMEDIUM))
+#endif
+#ifdef ENOTRECOVERABLE
+  itsdefined(ENOTRECOVERABLE, MRB_SYM(ENOTRECOVERABLE))
+#else
+  itsnotdefined(ENOTRECOVERABLE, MRB_SYM(ENOTRECOVERABLE))
+#endif
+#ifdef EOWNERDEAD
+  itsdefined(EOWNERDEAD, MRB_SYM(EOWNERDEAD))
+#else
+  itsnotdefined(EOWNERDEAD, MRB_SYM(EOWNERDEAD))
+#endif
+#ifdef EINTEGRITY
+  itsdefined(EINTEGRITY, MRB_SYM(EINTEGRITY))
+#else
+  itsnotdefined(EINTEGRITY, MRB_SYM(EINTEGRITY))
+#endif
+#ifdef ERFKILL
+  itsdefined(ERFKILL, MRB_SYM(ERFKILL))
+#else
+  itsnotdefined(ERFKILL, MRB_SYM(ERFKILL))
+#endif
+#ifdef EAUTH
+  itsdefined(EAUTH, MRB_SYM(EAUTH))
+#else
+  itsnotdefined(EAUTH, MRB_SYM(EAUTH))
+#endif
+#ifdef EBADRPC
+  itsdefined(EBADRPC, MRB_SYM(EBADRPC))
+#else
+  itsnotdefined(EBADRPC, MRB_SYM(EBADRPC))
+#endif
+#ifdef EDOOFUS
+  itsdefined(EDOOFUS, MRB_SYM(EDOOFUS))
+#else
+  itsnotdefined(EDOOFUS, MRB_SYM(EDOOFUS))
+#endif
+#ifdef EFTYPE
+  itsdefined(EFTYPE, MRB_SYM(EFTYPE))
+#else
+  itsnotdefined(EFTYPE, MRB_SYM(EFTYPE))
+#endif
+#ifdef ENEEDAUTH
+  itsdefined(ENEEDAUTH, MRB_SYM(ENEEDAUTH))
+#else
+  itsnotdefined(ENEEDAUTH, MRB_SYM(ENEEDAUTH))
+#endif
+#ifdef ENOATTR
+  itsdefined(ENOATTR, MRB_SYM(ENOATTR))
+#else
+  itsnotdefined(ENOATTR, MRB_SYM(ENOATTR))
+#endif
+#ifdef ENOTSUP
+  itsdefined(ENOTSUP, MRB_SYM(ENOTSUP))
+#else
+  itsnotdefined(ENOTSUP, MRB_SYM(ENOTSUP))
+#endif
+#ifdef EPROCLIM
+  itsdefined(EPROCLIM, MRB_SYM(EPROCLIM))
+#else
+  itsnotdefined(EPROCLIM, MRB_SYM(EPROCLIM))
+#endif
+#ifdef EPROCUNAVAIL
+  itsdefined(EPROCUNAVAIL, MRB_SYM(EPROCUNAVAIL))
+#else
+  itsnotdefined(EPROCUNAVAIL, MRB_SYM(EPROCUNAVAIL))
+#endif
+#ifdef EPROGMISMATCH
+  itsdefined(EPROGMISMATCH, MRB_SYM(EPROGMISMATCH))
+#else
+  itsnotdefined(EPROGMISMATCH, MRB_SYM(EPROGMISMATCH))
+#endif
+#ifdef EPROGUNAVAIL
+  itsdefined(EPROGUNAVAIL, MRB_SYM(EPROGUNAVAIL))
+#else
+  itsnotdefined(EPROGUNAVAIL, MRB_SYM(EPROGUNAVAIL))
+#endif
+#ifdef ERPCMISMATCH
+  itsdefined(ERPCMISMATCH, MRB_SYM(ERPCMISMATCH))
+#else
+  itsnotdefined(ERPCMISMATCH, MRB_SYM(ERPCMISMATCH))
+#endif
+#ifdef EIPSEC
+  itsdefined(EIPSEC, MRB_SYM(EIPSEC))
+#else
+  itsnotdefined(EIPSEC, MRB_SYM(EIPSEC))
+#endif
+#ifdef ENOPOLICY
+  itsdefined(ENOPOLICY, MRB_SYM(ENOPOLICY))
+#else
+  itsnotdefined(ENOPOLICY, MRB_SYM(ENOPOLICY))
+#endif
+#ifdef EQFULL
+  itsdefined(EQFULL, MRB_SYM(EQFULL))
+#else
+  itsnotdefined(EQFULL, MRB_SYM(EQFULL))
+#endif

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/test Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-errno/test/errno.rb Added

@@ -0,0 +1,58 @@
+assert('Errno') do
+  assert_equal(Module, Errno.class)
+end
+
+assert('SystemCallError') do
+  assert_equal(Class, SystemCallError.class)
+end
+
+assert('SystemCallError superclass') do
+  assert_equal(StandardError, SystemCallError.superclass)
+end
+
+assert('SystemCallError#initialize') do
+  assert_equal("unknown error - a", SystemCallError.new("a").message)
+  assert_equal("Unknown error: 12345 - a", SystemCallError.new("a", 12345).message)
+  assert_equal("Unknown error: 12345", SystemCallError.new(12345).message)
+end
+
+assert('SystemCallError#errno') do
+  assert_equal 1, SystemCallError.new("a", 1).errno
+  assert_equal 1, SystemCallError.new(1).errno
+  assert_equal 12345, SystemCallError.new("a", 12345).errno
+  assert_equal 23456, SystemCallError.new(23456).errno
+end
+
+assert('SystemCallError#inspect') do
+  assert_equal("unknown error - a (SystemCallError)", SystemCallError.new("a").inspect)
+end
+
+assert('Errno::NOERROR') do
+  assert_equal(Class, Errno::NOERROR.class)
+end
+
+# Is there any platform does not have EPERM?
+assert('Errno::EPERM') do
+  assert_equal(Class, Errno::EPERM.class)
+end
+
+assert('Errno::EPERM superclass') do
+  assert_equal(SystemCallError, Errno::EPERM.superclass)
+end
+
+assert('Errno::EPERM::Errno') do
+  assert_true(Errno::EPERM::Errno.is_a?(Fixnum))
+end
+
+assert('Errno::EPERM#message') do
+  msg = Errno::EPERM.new.message
+  assert_equal("#{msg} - a", Errno::EPERM.new("a").message)
+end
+
+assert('Errno::EPERM#inspect') do
+  msg = Errno::EPERM.new.message
+  assert_equal("#{msg} (Errno::EPERM)", Errno::EPERM.new.inspect)
+
+  msg = Errno::EPERM.new.message
+  assert_equal("#{msg} - a (Errno::EPERM)", Errno::EPERM.new("a").inspect)
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-error/src/exception.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-error/src/exception.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-eval/src/eval.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-eval/src/eval.c Changed

@@ -7,12 +7,7 @@
 #include <mruby/error.h>
 #include <mruby/presym.h>
 #include <mruby/variable.h>
-
-struct REnv *mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc);
-mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);
-mrb_value mrb_obj_instance_eval(mrb_state *mrb, mrb_value self);
-mrb_value mrb_mod_module_eval(mrb_state*, mrb_value);
-void mrb_codedump_all(mrb_state*, struct RProc*);
+#include <mruby/internal.h>
 
 static struct RProc*
 create_proc_from_string(mrb_state *mrb, const char *s, mrb_int len, mrb_value binding, const char *file, mrb_int line)
@@ -34,14 +29,14 @@
 mrb_obj_class(mrb, binding));
 }
 scope_obj = mrb_iv_get(mrb, binding, MRB_SYM(proc));
- mrb_assert(mrb_proc_p(scope_obj));
+ mrb_check_type(mrb, scope_obj, MRB_TT_PROC);
 scope = mrb_proc_ptr(scope_obj);
 if (MRB_PROC_CFUNC_P(scope)) {
 e = NULL;
 }
 else {
 mrb_value env = mrb_iv_get(mrb, binding, MRB_SYM(env));
- mrb_assert(mrb_env_p(env));
+ mrb_check_type(mrb, env, MRB_TT_ENV);
 e = (struct REnv *)mrb_obj_ptr(env);
 mrb_assert(e != NULL);
 }
@@ -179,15 +174,15 @@
 mrb_int len;
 const char *file = NULL;
 mrb_int line = 1;
- mrb_value cv;
+ struct RClass *c;
 struct RProc *proc;
 
 mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
- cv = mrb_singleton_class(mrb, self);
+ c = mrb_singleton_class_ptr(mrb, self);
 proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
- MRB_PROC_SET_TARGET_CLASS(proc, mrb_class_ptr(cv));
+ MRB_PROC_SET_TARGET_CLASS(proc, c);
 mrb_assert(!MRB_PROC_CFUNC_P(proc));
- mrb_vm_ci_target_class_set(mrb->c->ci, mrb_class_ptr(cv));
+ mrb_vm_ci_target_class_set(mrb->c->ci, c);
 return exec_irep(mrb, self, proc);
 }
 else {

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-exit/src/mruby-exit.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-exit/src/mruby-exit.c Changed

@@ -1,26 +1,80 @@
 #include <stdlib.h>
 #include <mruby.h>
+#include <mruby/error.h>
+#include <mruby/variable.h>
+#include <mruby/presym.h>
 
-static mrb_value
-f_exit(mrb_state *mrb, mrb_value self)
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+static int
+get_status(mrb_state *mrb)
 {
 mrb_value status = mrb_true_value();
- int istatus;
 
 mrb_get_args(mrb, "|o", &status);
- istatus = mrb_true_p(status) ? EXIT_SUCCESS :
- mrb_false_p(status) ? EXIT_FAILURE :
- (int)mrb_int(mrb, status);
- exit(istatus);
+ if (mrb_true_p(status)) return EXIT_SUCCESS;
+ if (mrb_false_p(status)) return EXIT_FAILURE;
+ return (int)mrb_as_int(mrb, status);
+}
 
+/*
+ * call-seq:
+ * exit(status=true)
+ *
+ * Initiates the termination of the Ruby script by raising the
+ * SystemExit exception. This exception may be caught. The
+ * optional parameter is used to return a status code to the invoking
+ * environment.
+ *
+ * +true+ and +false+ of _status_ means success and failure
+ * respectively. The interpretation of other integer values are
+ * system dependent.
+ *
+ * exit(0)
+ */
+static mrb_value
+f_exit(mrb_state *mrb, mrb_value self)
+{
+ int status = get_status(mrb);
+ mrb_value exc = mrb_obj_new(mrb, mrb_exc_get_id(mrb, MRB_SYM(SystemExit)), 0, NULL);
+ struct RException *e = mrb_exc_ptr(exc);
+ e->flags |= MRB_EXC_EXIT;
+ mrb_iv_set(mrb, exc, MRB_SYM(status), mrb_int_value(mrb, (mrb_int)status));
+ mrb_exc_raise(mrb, exc);
+ /* not reached */
+ return mrb_nil_value();
+}
+
+/*
+ * call-seq:
+ * exit!(status=true)
+ *
+ * Exits the process immediately. No exit handlers are run.
+ * status is returned to the underlying system as the
+ * exit status.
+ *
+ * exit!(0)
+ */
+static mrb_value
+f_exit_bang(mrb_state *mrb, mrb_value self)
+{
+ exit(get_status(mrb));
 /* not reached */
- return status;
+ return mrb_nil_value();
 }
 
 void
 mrb_mruby_exit_gem_init(mrb_state* mrb)
 {
- mrb_define_method(mrb, mrb->kernel_module, "exit", f_exit, MRB_ARGS_OPT(1));
+ mrb_define_class_id(mrb, MRB_SYM(SystemExit), mrb->eException_class);
+ mrb_define_method_id(mrb, mrb->kernel_module, MRB_SYM(exit), f_exit, MRB_ARGS_OPT(1));
+ mrb_define_method_id(mrb, mrb->kernel_module, MRB_SYM_B(exit), f_exit_bang, MRB_ARGS_OPT(1));
 }
 
 void

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-fiber/src/fiber.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-fiber/src/fiber.c Changed

@@ -1,6 +1,7 @@
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/class.h>
+#include <mruby/error.h>
 #include <mruby/proc.h>
 
 #define fiber_ptr(o) ((struct RFiber*)mrb_ptr(o))
@@ -14,7 +15,7 @@
 * call-seq:
 * Fiber.new{...} -> obj
 *
- * Creates a fiber, whose execution is suspend until it is explicitly
+ * Creates a fiber, whose execution is suspended until it is explicitly
 * resumed using <code>Fiber#resume</code> method.
 * The code running inside the fiber can give up control by calling
 * <code>Fiber.yield</code> in which case it yields control back to caller
@@ -173,6 +174,26 @@
 mrb->c = c;
 }
 
+/*
+ * Argument mesg is limited to a string literal or "static const" string.
+ * Also, it must be called as `return fiber_error(...)`.
+ */
+static mrb_value
+fiber_error(mrb_state *mrb, const char *mesg)
+{
+ mrb_value str = mrb_str_new_static(mrb, mesg, strlen(mesg));
+ mrb_value exc = mrb_exc_new_str(mrb, E_FIBER_ERROR, str);
+
+ if (mrb->jmp) {
+ mrb_exc_raise(mrb, exc);
+ }
+
+ mrb->exc = mrb_obj_ptr(exc);
+
+ return exc;
+}
+
+/* This function must be called as `return fiber_switch(...)` */
 static mrb_value
 fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mrb_bool resume, mrb_bool vmexec)
 {
@@ -181,32 +202,43 @@
 enum mrb_fiber_state status;
 mrb_value value;
 
+ if (resume && c == mrb->c) {
+ return fiber_error(mrb, "attempt to resume the current fiber");
+ }
+
 fiber_check_cfunc(mrb, c);
 status = c->status;
 switch (status) {
 case MRB_FIBER_TRANSFERRED:
 if (resume) {
- mrb_raise(mrb, E_FIBER_ERROR, "resuming transferred fiber");
+ return fiber_error(mrb, "resuming transferred fiber");
 }
 break;
 case MRB_FIBER_RUNNING:
 case MRB_FIBER_RESUMED:
- mrb_raise(mrb, E_FIBER_ERROR, "double resume");
+ return fiber_error(mrb, "double resume");
 break;
 case MRB_FIBER_TERMINATED:
- mrb_raise(mrb, E_FIBER_ERROR, "resuming dead fiber");
+ return fiber_error(mrb, "resuming dead fiber");
 break;
 default:
 break;
 }
- old_c->status = resume ? MRB_FIBER_RESUMED : MRB_FIBER_TRANSFERRED;
- c->prev = resume ? mrb->c : (c->prev ? c->prev : mrb->root_c);
+ if (resume) {
+ old_c->status = MRB_FIBER_RESUMED;
+ c->prev = mrb->c;
+ }
+ else {
+ old_c->status = MRB_FIBER_TRANSFERRED;
+ // c->prev = mrb->root_c;
+ c->prev = NULL;
+ }
 fiber_switch_context(mrb, c);
 if (status == MRB_FIBER_CREATED) {
 mrb_value *b, *e;
 
 if (!c->ci->proc) {
- mrb_raise(mrb, E_FIBER_ERROR, "double resume (current)");
+ return fiber_error(mrb, "double resume (current)");
 }
 if (vmexec) {
 c->ci--; /* pop dummy callinfo */
@@ -224,7 +256,7 @@
 *b++ = *a++;
 }
 }
- c->cibase->n = len;
+ c->cibase->n = (uint8_t)len;
 value = c->stbase0 = MRB_PROC_ENV(c->cibase->proc)->stack0;
 }
 else {
@@ -259,6 +291,9 @@
 * to the next <code>Fiber.yield</code> statement inside the fiber's block
 * or to the block value if it runs to completion without any
 * <code>Fiber.yield</code>
+ *
+ * This method cannot be called from C using <code>mrb_funcall()</code>.
+ * Use <code>mrb_fiber_resume()</code> function instead.
 */
 static mrb_value
 fiber_resume(mrb_state *mrb, mrb_value self)
@@ -267,6 +302,7 @@
 mrb_int len;
 mrb_bool vmexec = FALSE;
 
+ fiber_check_cfunc(mrb, mrb->c);
 mrb_get_args(mrb, "*!", &a, &len);
 if (mrb->c->ci->cci > 0) {
 vmexec = TRUE;
@@ -274,7 +310,6 @@
 return fiber_switch(mrb, self, len, a, TRUE, vmexec);
 }
 
-/* resume thread with given arguments */
 MRB_API mrb_value
 mrb_fiber_resume(mrb_state *mrb, mrb_value fib, mrb_int len, const mrb_value *a)
 {
@@ -329,6 +364,10 @@
 fiber_check_cfunc(mrb, mrb->c);
 mrb_get_args(mrb, "*!", &a, &len);
 
+ if (c->status == MRB_FIBER_RESUMED) {
+ mrb_raise(mrb, E_FIBER_ERROR, "attempt to transfer to a resuming fiber");
+ }
+
 if (c == mrb->root_c) {
 mrb->c->status = MRB_FIBER_TRANSFERRED;
 fiber_switch_context(mrb, c);
@@ -343,19 +382,22 @@
 return fiber_switch(mrb, self, len, a, FALSE, FALSE);
 }
 
-/* yield values to the caller fiber */
-/* mrb_fiber_yield() must be called as `return mrb_fiber_yield(...)` */
 MRB_API mrb_value
 mrb_fiber_yield(mrb_state *mrb, mrb_int len, const mrb_value *a)
 {
 struct mrb_context *c = mrb->c;
 
 if (!c->prev) {
- mrb_raise(mrb, E_FIBER_ERROR, "can't yield from root fiber");
+ return fiber_error(mrb, "attempt to yield on a not resumed fiber");
+ }
+ if (c == mrb->root_c) {
+ return fiber_error(mrb, "can't yield from root fiber");
+ }
+ if (c->prev->status == MRB_FIBER_TRANSFERRED) {
+ return fiber_error(mrb, "attempt to yield on a not resumed fiber");
 }
 
 fiber_check_cfunc(mrb, c);
- c->prev->status = MRB_FIBER_RUNNING;
 c->status = MRB_FIBER_SUSPENDED;
 fiber_switch_context(mrb, c->prev);
 c->prev = NULL;
@@ -379,6 +421,9 @@
 *
 * mruby limitation: Fiber resume/yield cannot cross C function boundary.
 * thus you cannot yield from #initialize which is called by mrb_funcall().
+ *
+ * This method cannot be called from C using <code>mrb_funcall()</code>.
+ * Use <code>mrb_fiber_yield()</code> function instead.
 */
 static mrb_value
 fiber_yield(mrb_state *mrb, mrb_value self)

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-fiber/test/fiber.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-fiber/test/fiber.rb Changed

@@ -9,24 +9,19 @@
 end
 
 assert('Fiber#transfer') do
+ ary = 
 f2 = nil
- f1 = Fiber.new do |v|
- Fiber.yield v
- f2.transfer
- end
- f2 = Fiber.new do
- f1.transfer(1)
- f1.transfer(1)
- Fiber.yield 2
- end
- assert_equal 1, f2.resume
- assert_raise(FiberError) { f2.resume }
- assert_equal 2, f2.transfer
- assert_raise(FiberError) { f1.resume }
- f1.transfer
- f2.resume
+ f1 = Fiber.new{
+ ary << f2.transfer(:foo)
+ :ok
+ }
+ f2 = Fiber.new{
+ ary << f1.transfer(:baz)
+ :ng
+ }
+ assert_equal(:ok, f1.transfer)
+ assert_equal(:baz, ary)
 assert_false f1.alive?
- assert_false f2.alive?
 end
 
 assert('Fiber#alive?') do
@@ -139,12 +134,12 @@
 
 assert('Transfer to self.') do
 result = 
- f = Fiber.new { result << :start; f.transfer; result << :end }
+ f = Fiber.new { result << :start; f.transfer; result << :end }
 f.transfer
 assert_equal :start, :end, result
 
 result = 
- f = Fiber.new { result << :start; f.transfer; result << :end }
+ f = Fiber.new { result << :start; f.transfer; result << :end }
 f.resume
 assert_equal :start, :end, result
 end
@@ -163,7 +158,7 @@
 result = :ok
 root.transfer
 }
- f.resume
+ f.transfer
 assert_true f.alive?
 assert_equal :ok, result
 end
@@ -174,7 +169,7 @@
 result = nil
 f2 = nil
 f1 = Fiber.new {
- Fiber.yield f2.resume
+ root.transfer(f2.transfer)
 result = :f1
 }
 f2 = Fiber.new {
@@ -182,12 +177,13 @@
 root.transfer :from_f2
 result = :f2
 }
- assert_equal :from_f2, f1.resume
+ assert_equal :from_f2, f1.transfer
 assert_equal :to_root, result
 assert_equal :f2, f2.transfer
 assert_equal :f2, result
 assert_false f2.alive?
- assert_equal :f1, f1.resume
+ assert_equal nil, f1.transfer
+ assert_equal :f1, f1.transfer
 assert_equal :f1, result
 assert_false f1.alive?
 end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb Changed

@@ -1,6 +1,6 @@
 class Hash
 
- # ISO does not define Hash#each_pair, so each_pair is defined in gem.
+ # ISO does not define Hash#each_pair, so each_pair is defined in gem.
 alias each_pair each
 
 ##
@@ -62,10 +62,10 @@
 
 ##
 # call-seq:
- # hsh.merge!(other_hash) -> hsh
- # hsh.merge!(other_hash){|key, oldval, newval| block} -> hsh
+ # hsh.merge!(other_hash..) -> hsh
+ # hsh.merge!(other_hash..){|key, oldval, newval| block} -> hsh
 #
- # Adds the contents of _other_hash_ to _hsh_. If no block is specified,
+ # Adds the contents of _other_hash_ to _hsh_. If no block is specified,
 # entries with duplicate keys are overwritten with the values from
 # _other_hash_, otherwise the value of each duplicate key is determined by
 # calling the block with the key, its value in _hsh_ and its value in
@@ -81,14 +81,20 @@
 # #=> {"a"=>100, "b"=>200, "c"=>300}
 #
 
- def merge!(other, &block)
- raise TypeError, "Hash required (#{other.class} given)" unless Hash === other
- if block
- other.each_key{|k|
- selfk = (self.has_key?(k))? block.call(k, selfk, otherk): otherk
- }
- else
- other.each_key{|k| selfk = otherk}
+ def merge!(*others, &block)
+ i = 0; len=others.size
+ return self.__merge(*others) unless block
+ while i<len
+ other = othersi
+ i += 1
+ raise TypeError, "Hash required (#{other.class} given)" unless Hash === other
+ if block
+ other.each_key{|k|
+ selfk = (self.has_key?(k))? block.call(k, selfk, otherk): otherk
+ }
+ else
+ other.each_key{|k| selfk = otherk}
+ end
 end
 self
 end
@@ -211,8 +217,8 @@
 #
 # Returns a new array that is a one-dimensional flattening of this
 # hash. That is, for every key or value that is an array, extract
- # its elements into the new array. Unlike Array#flatten, this
- # method does not flatten recursively by default. The optional
+ # its elements into the new array. Unlike Array#flatten, this
+ # method does not flatten recursively by default. The optional
 # level argument determines the level of recursion to flatten.
 #
 # a = {1=> "one", 2 => 2,"two", 3 => "three"}
@@ -422,12 +428,8 @@
 #
 def transform_keys!(&block)
 return to_enum :transform_keys! unless block
- self.keys.each do |k|
- value = selfk
- self.__delete(k)
- k = block.call(k) if block
- selfk = value
- end
+ hash = self.transform_keys(&block)
+ self.replace(hash)
 self
 end
 ##

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-hash-ext/src/hash-ext.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-hash-ext/src/hash-ext.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-hash-ext/test/hash.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-hash-ext/test/hash.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/README.md Changed

@@ -14,160 +14,160 @@
 
 ### IO
 
-* <https://doc.ruby-lang.org/ja/1.9.3/class/IO.html>
-
-| method | mruby-io | memo |
-| ------------------------- | -------- | ---- |
-| IO.binread | | |
-| IO.binwrite | | |
-| IO.copy_stream | | |
-| IO.new, IO.for_fd, IO.open | o | |
-| IO.foreach | | |
-| IO.pipe | o | |
-| IO.popen | o | |
-| IO.read | o | |
-| IO.readlines | | |
-| IO.select | o | |
-| IO.sysopen | o | |
-| IO.try_convert | | |
-| IO.write | | |
-| IO#<< | | |
-| IO#advise | | |
-| IO#autoclose= | | |
-| IO#autoclose? | | |
-| IO#binmode | | |
-| IO#binmode? | | |
+- <https://doc.ruby-lang.org/ja/1.9.3/class/IO.html>
+
+| method | mruby-io | memo |
+|----------------------------|----------|----------|
+| IO.binread | | |
+| IO.binwrite | | |
+| IO.copy_stream | | |
+| IO.new, IO.for_fd, IO.open | o | |
+| IO.foreach | | |
+| IO.pipe | o | |
+| IO.popen | o | |
+| IO.read | o | |
+| IO.readlines | | |
+| IO.select | o | |
+| IO.sysopen | o | |
+| IO.try_convert | | |
+| IO.write | | |
+| IO#<< | | |
+| IO#advise | | |
+| IO#autoclose= | | |
+| IO#autoclose? | | |
+| IO#binmode | | |
+| IO#binmode? | | |
 | IO#bytes | | obsolete |
 | IO#chars | | obsolete |
-| IO#clone, IO#dup | o | |
-| IO#close | o | |
-| IO#close_on_exec= | o | |
-| IO#close_on_exec? | o | |
-| IO#close_read | | |
-| IO#close_write | | |
-| IO#closed? | o | |
+| IO#clone, IO#dup | o | |
+| IO#close | o | |
+| IO#close_on_exec= | o | |
+| IO#close_on_exec? | o | |
+| IO#close_read | | |
+| IO#close_write | | |
+| IO#closed? | o | |
 | IO#codepoints | | obsolete |
-| IO#each_byte | o | |
-| IO#each_char | o | |
-| IO#each_codepoint | | |
-| IO#each_line | o | |
-| IO#eof, IO#eof? | o | |
-| IO#external_encoding | | |
-| IO#fcntl | | |
-| IO#fdatasync | | |
-| IO#fileno, IO#to_i | o | |
-| IO#flush | o | |
-| IO#fsync | | |
-| IO#getbyte | o | |
-| IO#getc | o | |
-| IO#gets | o | |
-| IO#internal_encoding | | |
-| IO#ioctl | | |
-| IO#isatty, IO#tty? | o | |
-| IO#lineno | | |
-| IO#lineno= | | |
+| IO#each_byte | o | |
+| IO#each_char | o | |
+| IO#each_codepoint | | |
+| IO#each_line | o | |
+| IO#eof, IO#eof? | o | |
+| IO#external_encoding | | |
+| IO#fcntl | | |
+| IO#fdatasync | | |
+| IO#fileno, IO#to_i | o | |
+| IO#flush | o | |
+| IO#fsync | | |
+| IO#getbyte | o | |
+| IO#getc | o | |
+| IO#gets | o | |
+| IO#internal_encoding | | |
+| IO#ioctl | | |
+| IO#isatty, IO#tty? | o | |
+| IO#lineno | | |
+| IO#lineno= | | |
 | IO#lines | | obsolete |
-| IO#pid | o | |
-| IO#pos, IO#tell | o | |
-| IO#pos= | o | |
-| IO#print | o | |
-| IO#printf | o | |
-| IO#putc | | |
-| IO#puts | o | |
-| IO#read | o | |
-| IO#read_nonblock | | |
-| IO#readbyte | o | |
-| IO#readchar | o | |
-| IO#readline | o | |
-| IO#readlines | o | |
-| IO#readpartial | | |
-| IO#reopen | | |
-| IO#rewind | | |
-| IO#seek | o | |
-| IO#set_encoding | | |
-| IO#stat | | |
-| IO#sync | o | |
-| IO#sync= | o | |
-| IO#sysread | o | |
-| IO#sysseek | o | |
-| IO#syswrite | o | |
-| IO#to_io | | |
-| IO#ungetbyte | o | |
-| IO#ungetc | o | |
-| IO#write | o | |
-| IO#write_nonblock | | |
+| IO#pid | o | |
+| IO#pos, IO#tell | o | |
+| IO#pos= | o | |
+| IO#print | o | |
+| IO#printf | o | |
+| IO#putc | | |
+| IO#puts | o | |
+| IO#read | o | |
+| IO#read_nonblock | | |
+| IO#readbyte | o | |
+| IO#readchar | o | |
+| IO#readline | o | |
+| IO#readlines | o | |
+| IO#readpartial | | |
+| IO#reopen | | |
+| IO#rewind | | |
+| IO#seek | o | |
+| IO#set_encoding | | |
+| IO#stat | | |
+| IO#sync | o | |
+| IO#sync= | o | |
+| IO#sysread | o | |
+| IO#sysseek | o | |
+| IO#syswrite | o | |
+| IO#to_io | | |
+| IO#ungetbyte | o | |
+| IO#ungetc | o | |
+| IO#write | o | |
+| IO#write_nonblock | | |
 
 ### File
 
-* <https://doc.ruby-lang.org/ja/1.9.3/class/File.html>
+- <https://doc.ruby-lang.org/ja/1.9.3/class/File.html>
 
-| method | mruby-io | memo |
-| --------------------------- | -------- | ---- |
-| File.absolute_path | | |
-| File.atime | | |
-| File.basename | o | |
+| method | mruby-io | memo |
+|-----------------------------|----------|----------|
+| File.absolute_path | | |
+| File.atime | | |
+| File.basename | o | |
 | File.blockdev? | | FileTest |
 | File.chardev? | | FileTest |
-| File.chmod | o | |
-| File.chown | | |
-| File.ctime | | |
-| File.delete, File.unlink | o | |
-| File.directory? | o | FileTest |
-| File.dirname | o | |
+| File.chmod | o | |
+| File.chown | | |
+| File.ctime | | |
+| File.delete, File.unlink | o | |
+| File.directory? | o | FileTest |
+| File.dirname | o | |
 | File.executable? | | FileTest |
 | File.executable_real? | | FileTest |
-| File.exist?, exists? | o | FileTest |
-| File.expand_path | o | |
-| File.extname | o | |
-| File.file? | o | FileTest |
-| File.fnmatch, File.fnmatch? | | |
-| File.ftype | | |
+| File.exist?, exists? | o | FileTest |
+| File.expand_path | o | |
+| File.extname | o | |
+| File.file? | o | FileTest |
+| File.fnmatch, File.fnmatch? | | |
+| File.ftype | | |
 | File.grpowned? | | FileTest |
 | File.identical? | | FileTest |
-| File.join | o | |
-| File.lchmod | | |
-| File.lchown | | |
-| File.link | | |
-| File.lstat | | |
-| File.mtime | | |
-| File.new, File.open | o | |
+| File.join | o | |
+| File.lchmod | | |
+| File.lchown | | |
+| File.link | | |
+| File.lstat | | |
+| File.mtime | | |
+| File.new, File.open | o | |
 | File.owned? | | FileTest |
-| File.path | | |
-| File.pipe? | o | FileTest |
+| File.path | | |
+| File.pipe? | o | FileTest |
 | File.readable? | | FileTest |
 | File.readable_real? | | FileTest |
-| File.readlink | o | |
-| File.realdirpath | | |
-| File.realpath | o | |
-| File.rename | o | |
+| File.readlink | o | |
+| File.realdirpath | | |
+| File.realpath | o | |
+| File.rename | o | |
 | File.setgid? | | FileTest |
 | File.setuid? | | FileTest |
-| File.size | o | |
-| File.size? | o | FileTest |
-| File.socket? | o | FileTest |
-| File.split | | |
-| File.stat | | |
+| File.size | o | |
+| File.size? | o | FileTest |
+| File.socket? | o | FileTest |
+| File.split | | |
+| File.stat | | |
 | File.sticky? | | FileTest |
-| File.symlink | | |
-| File.symlink? | o | FileTest |
-| File.truncate | | |
-| File.umask | o | |
-| File.utime | | |
-| File.world_readable? | | |
-| File.world_writable? | | |
+| File.symlink | | |
+| File.symlink? | o | FileTest |
+| File.truncate | | |
+| File.umask | o | |
+| File.utime | | |
+| File.world_readable? | | |
+| File.world_writable? | | |
 | File.writable? | | FileTest |
 | File.writable_real? | | FileTest |
-| File.zero? | o | FileTest |
-| File#atime | | |
-| File#chmod | | |
-| File#chown | | |
-| File#ctime | | |
-| File#flock | o | |
-| File#lstat | | |
-| File#mtime | | |
-| File#path, File#to_path | o | |
-| File#size | | |
-| File#truncate | | |
+| File.zero? | o | FileTest |
+| File#atime | | |
+| File#chmod | | |
+| File#chown | | |
+| File#ctime | | |
+| File#flock | o | |
+| File#lstat | | |
+| File#mtime | | |
+| File#path, File#to_path | o | |
+| File#size | | |
+| File#truncate | | |
 
 ## License

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/include/mruby/ext/io.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/include/mruby/ext/io.h Changed

@@ -23,12 +23,22 @@
 # endif
 #endif
 
+#define MRB_IO_BUF_SIZE 4096
+
+struct mrb_io_buf {
+  short start;
+  short len;
+  char memMRB_IO_BUF_SIZE;
+};
+
 struct mrb_io {
   int fd;   /* file descriptor, or -1 */
   int fd2;  /* file descriptor to write if it's different from fd, or -1 */
   int pid;  /* child's pid (for pipes)  */
+  struct mrb_io_buf *buf;
   unsigned int readable:1,
                writable:1,
+               eof:1,
                sync:1,
                is_socket:1;
 };
@@ -53,12 +63,6 @@
 #define MRB_O_DSYNC             0x00008000
 #define MRB_O_RSYNC             0x00010000
 
-#define MRB_O_RDONLY_P(f)       ((mrb_bool)(((f) & MRB_O_ACCMODE) == MRB_O_RDONLY))
-#define MRB_O_WRONLY_P(f)       ((mrb_bool)(((f) & MRB_O_ACCMODE) == MRB_O_WRONLY))
-#define MRB_O_RDWR_P(f)         ((mrb_bool)(((f) & MRB_O_ACCMODE) == MRB_O_RDWR))
-#define MRB_O_READABLE_P(f)     ((mrb_bool)((((f) & MRB_O_ACCMODE) | 2) == 2))
-#define MRB_O_WRITABLE_P(f)     ((mrb_bool)(((((f) & MRB_O_ACCMODE) + 1) & 2) == 2))
-
 #define E_IO_ERROR              (mrb_exc_get(mrb, "IOError"))
 #define E_EOF_ERROR             (mrb_exc_get(mrb, "EOFError"))

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/mrbgem.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/mrbgem.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/mrblib/io.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/mrblib/io.rb Changed

@@ -1,16 +1,12 @@
 ##
 # IO
+#
+# ISO 15.2.20
 
 class IOError < StandardError; end
 class EOFError < IOError; end
 
 class IO
- SEEK_SET = 0
- SEEK_CUR = 1
- SEEK_END = 2
-
- BUF_SIZE = 4096
-
 def self.open(*args, &block)
 io = self.new(*args)
 
@@ -66,12 +62,8 @@
 fd = -1
 io = nil
 begin
- if path0 == "|"
- io = IO.popen(path1..-1, mode)
- else
- fd = IO.sysopen(path, mode)
- io = IO.open(fd, mode)
- end
+ fd = IO.sysopen(path, mode)
+ io = IO.open(fd, mode)
 io.seek(offset) if offset > 0
 str = io.read(length)
 ensure
@@ -84,49 +76,18 @@
 str
 end
 
- def flush
- # mruby-io always writes immediately (no output buffer).
- raise IOError, "closed stream" if self.closed?
- self
- end
-
 def hash
 # We must define IO#hash here because IO includes Enumerable and
- # Enumerable#hash will call IO#read...
+ # Enumerable#hash will call IO#read() otherwise
 self.__id__
 end
 
- def write(string)
- str = string.is_a?(String) ? string : string.to_s
- return 0 if str.empty?
- unless @buf.empty?
- # reset real pos ignore buf
- seek(pos, SEEK_SET)
- end
- len = syswrite(str)
- len
- end
-
 def <<(str)
 write(str)
 self
 end
 
- def eof?
- _check_readable
- begin
- _read_buf
- return @buf.empty?
- rescue EOFError
- return true
- end
- end
 alias_method :eof, :eof?
-
- def pos
- raise IOError if closed?
- sysseek(0, SEEK_CUR) - @buf.bytesize
- end
 alias_method :tell, :pos
 
 def pos=(i)
@@ -137,28 +98,6 @@
 seek(0, SEEK_SET)
 end
 
- def seek(i, whence = SEEK_SET)
- raise IOError if closed?
- sysseek(i, whence)
- @buf = ''
- 0
- end
-
- def _read_buf
- return @buf if @buf && @buf.bytesize > 0
- sysread(BUF_SIZE, @buf)
- end
-
- def ungetc(substr)
- raise TypeError.new "expect String, got #{substr.class}" unless substr.is_a?(String)
- if @buf.empty?
- @buf.replace(substr)
- else
- @buf0,0 = substr
- end
- nil
- end
-
 def ungetbyte(c)
 if c.is_a? String
 c = c.getbyte(0)
@@ -170,127 +109,6 @@
 ungetc s
 end
 
- def read(length = nil, outbuf = "")
- unless length.nil?
- unless length.is_a? Integer
- raise TypeError.new "can't convert #{length.class} into Integer"
- end
- if length < 0
- raise ArgumentError.new "negative length: #{length} given"
- end
- if length == 0
- return "" # easy case
- end
- end
-
- array = 
- while true
- begin
- _read_buf
- rescue EOFError
- array = nil if array.empty? and (not length.nil?) and length != 0
- break
- end
-
- if length
- consume = (length <= @buf.bytesize) ? length : @buf.bytesize
- array.push IO._bufread(@buf, consume)
- length -= consume
- break if length == 0
- else
- array.push @buf
- @buf = ''
- end
- end
-
- if array.nil?
- outbuf.replace("")
- nil
- else
- outbuf.replace(array.join)
- end
- end
-
- def readline(arg = "\n", limit = nil)
- case arg
- when String
- rs = arg
- when Integer
- rs = "\n"
- limit = arg
- else
- raise ArgumentError
- end
-
- if rs.nil?
- return read
- end
-
- if rs == ""
- rs = "\n\n"
- end
-
- array = 
- while true
- begin
- _read_buf
- rescue EOFError
- array = nil if array.empty?
- break
- end
-
- if limit && limit <= @buf.size
- array.push @buf0, limit
- @buf0, limit = ""
- break
- elsif idx = @buf.index(rs)
- len = idx + rs.size
- array.push @buf0, len
- @buf0, len = ""
- break
- else
- array.push @buf
- @buf = ''
- end
- end
-
- raise EOFError.new "end of file reached" if array.nil?
-
- array.join
- end
-
- def gets(*args)
- begin
- readline(*args)
- rescue EOFError
- nil
- end
- end
-
- def readchar
- _read_buf
- _readchar(@buf)
- end
-
- def getc
- begin
- readchar
- rescue EOFError
- nil
- end
- end
-
- def readbyte
- _read_buf
- IO._bufread(@buf, 1).getbyte(0)
- end
-
- def getbyte
- readbyte
- rescue EOFError
- nil
- end
-
 # 15.2.20.5.3
 def each(&block)
 return to_enum unless block
@@ -323,14 +141,6 @@
 self
 end
 
- def readlines
- ary = 
- while (line = gets)
- ary << line
- end
- ary
- end
-
 def puts(*args)
 i = 0
 len = args.size

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/src/file.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/src/file.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/src/io.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/src/io.c Changed

@@ -11,6 +11,7 @@
 #include "mruby/variable.h"
 #include "mruby/ext/io.h"
 #include "mruby/error.h"
+#include "mruby/internal.h"
 #include "mruby/presym.h"
 
 #include <sys/types.h>
@@ -33,7 +34,7 @@
 typedef long ftime_t;
 typedef long fsuseconds_t;
 typedef int fmode_t;
- typedef int mrb_io_read_write_size;
+ typedef int fssize_t;
 
 #ifndef O_TMPFILE
 #define O_TMPFILE O_TEMPORARY
@@ -47,7 +48,7 @@
 typedef time_t ftime_t;
 typedef suseconds_t fsuseconds_t;
 typedef mode_t fmode_t;
- typedef ssize_t mrb_io_read_write_size;
+ typedef ssize_t fssize_t;
 #endif
 
 #ifdef _MSC_VER
@@ -66,21 +67,20 @@
 #define OPEN_READABLE_P(f) ((mrb_bool)(OPEN_RDONLY_P(f) || OPEN_RDWR_P(f)))
 #define OPEN_WRITABLE_P(f) ((mrb_bool)(OPEN_WRONLY_P(f) || OPEN_RDWR_P(f)))
 
-static void mrb_io_free(mrb_state *mrb, void *ptr);
-struct mrb_data_type mrb_io_type = { "IO", mrb_io_free };
+static void io_free(mrb_state *mrb, void *ptr);
+struct mrb_data_type mrb_io_type = { "IO", io_free };
 
 
-static struct mrb_io *io_get_open_fptr(mrb_state *mrb, mrb_value self);
-static int mrb_io_modestr_to_flags(mrb_state *mrb, const char *modestr);
-static int mrb_io_mode_to_flags(mrb_state *mrb, mrb_value mode);
+static int io_modestr_to_flags(mrb_state *mrb, const char *modestr);
+static int io_mode_to_flags(mrb_state *mrb, mrb_value mode);
 static void fptr_finalize(mrb_state *mrb, struct mrb_io *fptr, int quiet);
 
-static struct mrb_io *
-io_get_open_fptr(mrb_state *mrb, mrb_value self)
+static struct mrb_io*
+io_get_open_fptr(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 
- fptr = (struct mrb_io *)mrb_data_get_ptr(mrb, self, &mrb_io_type);
+ fptr = (struct mrb_io*)mrb_data_get_ptr(mrb, io, &mrb_io_type);
 if (fptr == NULL) {
 mrb_raise(mrb, E_IO_ERROR, "uninitialized stream");
 }
@@ -90,6 +90,11 @@
 return fptr;
 }
 
+#if !defined(MRB_NO_IO_POPEN) && defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+# define MRB_NO_IO_POPEN 1
+#endif
+
+#ifndef MRB_NO_IO_POEPN
 static void
 io_set_process_status(mrb_state *mrb, pid_t pid, int status)
 {
@@ -110,9 +115,10 @@
 }
 mrb_gv_set(mrb, mrb_intern_lit(mrb, "$?"), v);
 }
+#endif
 
 static int
-mrb_io_modestr_to_flags(mrb_state *mrb, const char *mode)
+io_modestr_to_flags(mrb_state *mrb, const char *mode)
 {
 int flags;
 const char *m = mode;
@@ -153,13 +159,13 @@
 }
 
 static int
-mrb_io_mode_to_flags(mrb_state *mrb, mrb_value mode)
+io_mode_to_flags(mrb_state *mrb, mrb_value mode)
 {
 if (mrb_nil_p(mode)) {
- return mrb_io_modestr_to_flags(mrb, "r");
+ return O_RDONLY;
 }
 else if (mrb_string_p(mode)) {
- return mrb_io_modestr_to_flags(mrb, RSTRING_CSTR(mrb, mode));
+ return io_modestr_to_flags(mrb, RSTRING_CSTR(mrb, mode));
 }
 else {
 int flags = 0;
@@ -222,14 +228,14 @@
 }
 
 static void
-mrb_fd_cloexec(mrb_state *mrb, int fd)
+io_fd_cloexec(mrb_state *mrb, int fd)
 {
 #if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
 int flags, flags2;
 
 flags = fcntl(fd, F_GETFD);
- if (flags == -1) {
- mrb_bug(mrb, "mrb_fd_cloexec: fcntl(%d, F_GETFD) failed: %d", fd, errno);
+ if (flags < 0) {
+ mrb_sys_fail(mrb, "cloexec GETFD");
 }
 if (fd <= 2) {
 flags2 = flags & ~FD_CLOEXEC; /* Clear CLOEXEC for standard file descriptors: 0, 1, 2. */
@@ -238,8 +244,8 @@
 flags2 = flags | FD_CLOEXEC; /* Set CLOEXEC for non-standard file descriptors: 3, 4, 5, ... */
 }
 if (flags != flags2) {
- if (fcntl(fd, F_SETFD, flags2) == -1) {
- mrb_bug(mrb, "mrb_fd_cloexec: fcntl(%d, F_SETFD, %d) failed: %d", fd, flags2, errno);
+ if (fcntl(fd, F_SETFD, flags2) < 0) {
+ mrb_sys_fail(mrb, "cloexec SETFD");
 }
 }
 #endif
@@ -247,33 +253,33 @@
 
 #if !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
 static int
-mrb_cloexec_pipe(mrb_state *mrb, int fildes2)
+io_cloexec_pipe(mrb_state *mrb, int fildes2)
 {
 int ret;
 ret = pipe(fildes);
 if (ret == -1)
 return -1;
- mrb_fd_cloexec(mrb, fildes0);
- mrb_fd_cloexec(mrb, fildes1);
+ io_fd_cloexec(mrb, fildes0);
+ io_fd_cloexec(mrb, fildes1);
 return ret;
 }
 
 static int
-mrb_pipe(mrb_state *mrb, int pipes2)
+io_pipe(mrb_state *mrb, int pipes2)
 {
 int ret;
- ret = mrb_cloexec_pipe(mrb, pipes);
+ ret = io_cloexec_pipe(mrb, pipes);
 if (ret == -1) {
 if (errno == EMFILE || errno == ENFILE) {
 mrb_garbage_collect(mrb);
- ret = mrb_cloexec_pipe(mrb, pipes);
+ ret = io_cloexec_pipe(mrb, pipes);
 }
 }
 return ret;
 }
 
 static int
-mrb_proc_exec(const char *pname)
+io_process_exec(const char *pname)
 {
 const char *s;
 s = pname;
@@ -286,33 +292,45 @@
 return -1;
 }
 
- execl("/bin/sh", "sh", "-c", pname, (char *)NULL);
+ execl("/bin/sh", "sh", "-c", pname, (char*)NULL);
 return -1;
 }
 #endif
 
 static void
-mrb_io_free(mrb_state *mrb, void *ptr)
+io_free(mrb_state *mrb, void *ptr)
 {
- struct mrb_io *io = (struct mrb_io *)ptr;
+ struct mrb_io *io = (struct mrb_io*)ptr;
 if (io != NULL) {
 fptr_finalize(mrb, io, TRUE);
 mrb_free(mrb, io);
 }
 }
 
+static void
+io_buf_init(mrb_state *mrb, struct mrb_io *fptr)
+{
+ if (fptr->readable) {
+ fptr->buf = (struct mrb_io_buf*)mrb_malloc(mrb, sizeof(struct mrb_io_buf));
+ fptr->buf->start = 0;
+ fptr->buf->len = 0;
+ }
+}
+
 static struct mrb_io *
-mrb_io_alloc(mrb_state *mrb)
+io_alloc(mrb_state *mrb)
 {
 struct mrb_io *fptr;
 
- fptr = (struct mrb_io *)mrb_malloc(mrb, sizeof(struct mrb_io));
+ fptr = (struct mrb_io*)mrb_malloc(mrb, sizeof(struct mrb_io));
 fptr->fd = -1;
 fptr->fd2 = -1;
 fptr->pid = 0;
+ fptr->buf = 0;
 fptr->readable = 0;
 fptr->writable = 0;
 fptr->sync = 0;
+ fptr->eof = 0;
 fptr->is_socket = 0;
 return fptr;
 }
@@ -321,8 +339,8 @@
 #define NOFILE 64
 #endif
 
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-# define mrb_io_s_popen mrb_notimplement_m
+#ifdef MRB_NO_IO_POPEN
+# define io_s_popen mrb_notimplement_m
 #else
 static int
 option_to_fd(mrb_state *mrb, mrb_value v)
@@ -331,7 +349,7 @@
 if (mrb_nil_p(v)) return -1;
 
 switch (mrb_type(v)) {
- case MRB_TT_DATA: /* IO */
+ case MRB_TT_CDATA: /* IO */
 return mrb_io_fileno(mrb, v);
 case MRB_TT_INTEGER:
 return (int)mrb_integer(v);
@@ -343,7 +361,7 @@
 }
 
 static mrb_value
-mrb_io_s_popen_args(mrb_state *mrb, mrb_value klass,
+io_s_popen_args(mrb_state *mrb, mrb_value klass,
 const char **cmd, int *flags, int *doexec,
 int *opt_in, int *opt_out, int *opt_err)
 {
@@ -359,7 +377,7 @@
 
 mrb_get_args(mrb, "zo:", cmd, &mode, &kw);
 
- *flags = mrb_io_mode_to_flags(mrb, mode);
+ *flags = io_mode_to_flags(mrb, mode);
 *doexec = (strcmp("-", *cmd) != 0);
 *opt_in = option_to_fd(mrb, kv.opt_in);
 *opt_out = option_to_fd(mrb, kv.opt_out);
@@ -370,7 +388,7 @@
 
 #ifdef _WIN32
 static mrb_value
-mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
+io_s_popen(mrb_state *mrb, mrb_value klass)
 {
 mrb_value io;
 int doexec;
@@ -392,8 +410,8 @@
 ofd1 = INVALID_HANDLE_VALUE;
 
 mrb->c->ci->mid = 0;
- io = mrb_io_s_popen_args(mrb, klass, &cmd, &flags, &doexec,
- &opt_in, &opt_out, &opt_err);
+ io = io_s_popen_args(mrb, klass, &cmd, &flags, &doexec,
+ &opt_in, &opt_out, &opt_err);
 
 saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
 saAttr.bInheritHandle = TRUE;
@@ -442,15 +460,13 @@
 pid = pi.dwProcessId;
 }
 
- mrb_iv_set(mrb, io, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-
- fptr = mrb_io_alloc(mrb);
+ fptr = io_alloc(mrb);
 fptr->fd = _open_osfhandle((intptr_t)ofd0, 0);
 fptr->fd2 = _open_osfhandle((intptr_t)ifd1, 0);
 fptr->pid = pid;
 fptr->readable = OPEN_READABLE_P(flags);
 fptr->writable = OPEN_WRITABLE_P(flags);
- fptr->sync = 0;
+ io_buf_init(mrb, fptr);
 
 DATA_TYPE(io) = &mrb_io_type;
 DATA_PTR(io) = fptr;
@@ -458,7 +474,7 @@
 }
 #else
 static mrb_value
-mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
+io_s_popen(mrb_state *mrb, mrb_value klass)
 {
 mrb_value io, result;
 int doexec;
@@ -472,15 +488,15 @@
 int saved_errno;
 
 mrb->c->ci->mid = 0;
- io = mrb_io_s_popen_args(mrb, klass, &cmd, &flags, &doexec,
- &opt_in, &opt_out, &opt_err);
+ io = io_s_popen_args(mrb, klass, &cmd, &flags, &doexec,
+ &opt_in, &opt_out, &opt_err);
 
 if (OPEN_READABLE_P(flags)) {
 if (pipe(pr) == -1) {
 mrb_sys_fail(mrb, "pipe");
 }
- mrb_fd_cloexec(mrb, pr0);
- mrb_fd_cloexec(mrb, pr1);
+ io_fd_cloexec(mrb, pr0);
+ io_fd_cloexec(mrb, pr1);
 }
 
 if (OPEN_WRITABLE_P(flags)) {
@@ -489,8 +505,8 @@
 if (pr1 != -1) close(pr1);
 mrb_sys_fail(mrb, "pipe");
 }
- mrb_fd_cloexec(mrb, pw0);
- mrb_fd_cloexec(mrb, pw1);
+ io_fd_cloexec(mrb, pw0);
+ io_fd_cloexec(mrb, pw1);
 }
 
 if (!doexec) {
@@ -530,7 +546,7 @@
 for (fd = 3; fd < NOFILE; fd++) {
 close(fd);
 }
- mrb_proc_exec(cmd);
+ io_process_exec(cmd);
 mrb_raisef(mrb, E_IO_ERROR, "command not found: %s", cmd);
 _exit(127);
 }
@@ -551,15 +567,13 @@
 fd = pw1;
 }
 
- mrb_iv_set(mrb, io, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-
- fptr = mrb_io_alloc(mrb);
+ fptr = io_alloc(mrb);
 fptr->fd = fd;
 fptr->fd2 = write_fd;
 fptr->pid = pid;
 fptr->readable = OPEN_READABLE_P(flags);
 fptr->writable = OPEN_WRITABLE_P(flags);
- fptr->sync = 0;
+ io_buf_init(mrb, fptr);
 
 DATA_TYPE(io) = &mrb_io_type;
 DATA_PTR(io) = fptr;
@@ -586,7 +600,7 @@
 #endif /* TARGET_OS_IPHONE */
 
 static int
-mrb_dup(mrb_state *mrb, int fd, mrb_bool *failed)
+symdup(mrb_state *mrb, int fd, mrb_bool *failed)
 {
 int new_fd;
 
@@ -600,42 +614,39 @@
 }
 
 static mrb_value
-mrb_io_initialize_copy(mrb_state *mrb, mrb_value copy)
+io_init_copy(mrb_state *mrb, mrb_value copy)
 {
 mrb_value orig = mrb_get_arg1(mrb);
- mrb_value buf;
 struct mrb_io *fptr_copy;
 struct mrb_io *fptr_orig;
 mrb_bool failed = TRUE;
 
 fptr_orig = io_get_open_fptr(mrb, orig);
- fptr_copy = (struct mrb_io *)DATA_PTR(copy);
+ fptr_copy = (struct mrb_io*)DATA_PTR(copy);
 if (fptr_orig == fptr_copy) return copy;
 if (fptr_copy != NULL) {
 fptr_finalize(mrb, fptr_copy, FALSE);
 mrb_free(mrb, fptr_copy);
 }
- fptr_copy = (struct mrb_io *)mrb_io_alloc(mrb);
+ fptr_copy = (struct mrb_io*)io_alloc(mrb);
 
 DATA_TYPE(copy) = &mrb_io_type;
 DATA_PTR(copy) = fptr_copy;
+ io_buf_init(mrb, fptr_copy);
 
- buf = mrb_iv_get(mrb, orig, mrb_intern_lit(mrb, "@buf"));
- mrb_iv_set(mrb, copy, mrb_intern_lit(mrb, "@buf"), buf);
-
- fptr_copy->fd = mrb_dup(mrb, fptr_orig->fd, &failed);
+ fptr_copy->fd = symdup(mrb, fptr_orig->fd, &failed);
 if (failed) {
 mrb_sys_fail(mrb, 0);
 }
- mrb_fd_cloexec(mrb, fptr_copy->fd);
+ io_fd_cloexec(mrb, fptr_copy->fd);
 
 if (fptr_orig->fd2 != -1) {
- fptr_copy->fd2 = mrb_dup(mrb, fptr_orig->fd2, &failed);
+ fptr_copy->fd2 = symdup(mrb, fptr_orig->fd2, &failed);
 if (failed) {
 close(fptr_copy->fd);
 mrb_sys_fail(mrb, 0);
 }
- mrb_fd_cloexec(mrb, fptr_copy->fd2);
+ io_fd_cloexec(mrb, fptr_copy->fd2);
 }
 
 fptr_copy->pid = fptr_orig->pid;
@@ -685,16 +696,16 @@
 }
 
 static mrb_value
-mrb_io_initialize(mrb_state *mrb, mrb_value io)
+io_init(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 mrb_int fd;
- mrb_value mode, opt;
+ mrb_value mode, opt; /* opt (Hash) will be ignored */
 int flags;
 
 mode = opt = mrb_nil_value();
 
- mrb_get_args(mrb, "i|oo", &fd, &mode, &opt);
+ mrb_get_args(mrb, "i|oH", &fd, &mode, &opt);
 switch (fd) {
 case 0: /* STDIN_FILENO */
 case 1: /* STDOUT_FILENO */
@@ -704,23 +715,14 @@
 check_file_descriptor(mrb, fd);
 break;
 }
- if (mrb_nil_p(mode)) {
- mode = mrb_str_new_cstr(mrb, "r");
- }
- if (mrb_nil_p(opt)) {
- opt = mrb_hash_new(mrb);
- }
-
- flags = mrb_io_mode_to_flags(mrb, mode);
+ flags = io_mode_to_flags(mrb, mode);
 
- mrb_iv_set(mrb, io, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-
- fptr = (struct mrb_io *)DATA_PTR(io);
+ fptr = (struct mrb_io*)DATA_PTR(io);
 if (fptr != NULL) {
 fptr_finalize(mrb, fptr, TRUE);
 mrb_free(mrb, fptr);
 }
- fptr = mrb_io_alloc(mrb);
+ fptr = io_alloc(mrb);
 
 DATA_TYPE(io) = &mrb_io_type;
 DATA_PTR(io) = fptr;
@@ -728,7 +730,7 @@
 fptr->fd = (int)fd;
 fptr->readable = OPEN_READABLE_P(flags);
 fptr->writable = OPEN_WRITABLE_P(flags);
- fptr->sync = 0;
+ io_buf_init(mrb, fptr);
 return io;
 }
 
@@ -736,12 +738,13 @@
 fptr_finalize(mrb_state *mrb, struct mrb_io *fptr, int quiet)
 {
 int saved_errno = 0;
+ int limit = quiet ? 3 : 0;
 
 if (fptr == NULL) {
 return;
 }
 
- if (fptr->fd > 2) {
+ if (fptr->fd >= limit) {
 #ifdef _WIN32
 if (fptr->is_socket) {
 if (closesocket(fptr->fd) != 0) {
@@ -758,7 +761,7 @@
 fptr->fd = -1;
 }
 
- if (fptr->fd2 > 2) {
+ if (fptr->fd2 >= limit) {
 if (close(fptr->fd2) == -1) {
 if (saved_errno == 0) {
 saved_errno = errno;
@@ -767,6 +770,7 @@
 fptr->fd2 = -1;
 }
 
+#ifndef MRB_NO_IO_POPEN
 if (fptr->pid != 0) {
 #if !defined(_WIN32) && !defined(_WIN64)
 pid_t pid;
@@ -788,6 +792,12 @@
 fptr->pid = 0;
 /* Note: we don't raise an exception when waitpid(3) fails */
 }
+#endif
+
+ if (fptr->buf) {
+ mrb_free(mrb, fptr->buf);
+ fptr->buf = NULL;
+ }
 
 if (!quiet && saved_errno != 0) {
 errno = saved_errno;
@@ -795,29 +805,50 @@
 }
 }
 
-static mrb_value
-mrb_io_check_readable(mrb_state *mrb, mrb_value self)
+static struct mrb_io*
+io_get_read_fptr(mrb_state *mrb, mrb_value io)
 {
- struct mrb_io *fptr = io_get_open_fptr(mrb, self);
- if (! fptr->readable) {
+ struct mrb_io *fptr = io_get_open_fptr(mrb, io);
+ if (!fptr->readable) {
 mrb_raise(mrb, E_IO_ERROR, "not opened for reading");
 }
- return mrb_nil_value();
+ return fptr;
+}
+
+static struct mrb_io*
+io_get_write_fptr(mrb_state *mrb, mrb_value io)
+{
+ struct mrb_io *fptr = io_get_open_fptr(mrb, io);
+ if (!fptr->writable) {
+ mrb_raise(mrb, E_IO_ERROR, "not opened for writing");
+ }
+ return fptr;
+}
+
+static int
+io_get_write_fd(struct mrb_io *fptr)
+{
+ if (fptr->fd2 == -1) {
+ return fptr->fd;
+ }
+ else {
+ return fptr->fd2;
+ }
 }
 
 static mrb_value
-mrb_io_isatty(mrb_state *mrb, mrb_value self)
+io_isatty(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 
- fptr = io_get_open_fptr(mrb, self);
+ fptr = io_get_open_fptr(mrb, io);
 if (isatty(fptr->fd) == 0)
 return mrb_false_value();
 return mrb_true_value();
 }
 
 static mrb_value
-mrb_io_s_for_fd(mrb_state *mrb, mrb_value klass)
+io_s_for_fd(mrb_state *mrb, mrb_value klass)
 {
 struct RClass *c = mrb_class_ptr(klass);
 enum mrb_vtype ttype = MRB_INSTANCE_TT(c);
@@ -826,11 +857,11 @@
 /* copied from mrb_instance_alloc() */
 if (ttype == 0) ttype = MRB_TT_OBJECT;
 obj = mrb_obj_value((struct RObject*)mrb_obj_alloc(mrb, ttype, c));
- return mrb_io_initialize(mrb, obj);
+ return io_init(mrb, obj);
 }
 
 static mrb_value
-mrb_io_s_sysclose(mrb_state *mrb, mrb_value klass)
+io_s_sysclose(mrb_state *mrb, mrb_value klass)
 {
 mrb_int fd;
 mrb->c->ci->mid = 0;
@@ -842,7 +873,7 @@
 }
 
 static int
-mrb_cloexec_open(mrb_state *mrb, const char *pathname, mrb_int flags, mrb_int mode)
+io_cloexec_open(mrb_state *mrb, const char *pathname, int flags, fmode_t mode)
 {
 int fd, retry = FALSE;
 char* fname = mrb_locale_from_utf8(pathname, -1);
@@ -854,7 +885,7 @@
 flags |= O_NOINHERIT;
 #endif
 reopen:
- fd = open(fname, (int)flags, (fmode_t)mode);
+ fd = open(fname, flags, mode);
 if (fd == -1) {
 if (!retry) {
 switch (errno) {
@@ -871,13 +902,13 @@
 mrb_locale_free(fname);
 
 if (fd <= 2) {
- mrb_fd_cloexec(mrb, fd);
+ io_fd_cloexec(mrb, fd);
 }
 return fd;
 }
 
 static mrb_value
-mrb_io_s_sysopen(mrb_state *mrb, mrb_value klass)
+io_s_sysopen(mrb_state *mrb, mrb_value klass)
 {
 mrb_value path = mrb_nil_value();
 mrb_value mode = mrb_nil_value();
@@ -891,38 +922,22 @@
 }
 
 pat = RSTRING_CSTR(mrb, path);
- flags = mrb_io_mode_to_flags(mrb, mode);
- fd = mrb_cloexec_open(mrb, pat, flags, perm);
+ flags = io_mode_to_flags(mrb, mode);
+ fd = io_cloexec_open(mrb, pat, flags, (fmode_t)perm);
 return mrb_fixnum_value(fd);
 }
 
-static mrb_value mrb_io_sysread_common(mrb_state *mrb,
- mrb_io_read_write_size (*readfunc)(int, void *, fsize_t, off_t),
- mrb_value io, mrb_value buf, mrb_int maxlen, off_t offset);
-
-static mrb_io_read_write_size
-mrb_sysread_dummy(int fd, void *buf, fsize_t nbytes, off_t offset)
-{
- return (mrb_io_read_write_size)read(fd, buf, nbytes);
-}
-
-static mrb_value
-mrb_io_sysread(mrb_state *mrb, mrb_value io)
+static void
+eof_error(mrb_state *mrb)
 {
- mrb_value buf = mrb_nil_value();
- mrb_int maxlen;
-
- mrb_get_args(mrb, "i|S", &maxlen, &buf);
-
- return mrb_io_sysread_common(mrb, mrb_sysread_dummy, io, buf, maxlen, 0);
+ mrb_raise(mrb, E_EOF_ERROR, "end of file reached");
 }
 
 static mrb_value
-mrb_io_sysread_common(mrb_state *mrb,
- mrb_io_read_write_size (*readfunc)(int, void *, fsize_t, off_t),
+io_read_common(mrb_state *mrb,
+ fssize_t (*readfunc)(int, void*, fsize_t, off_t),
 mrb_value io, mrb_value buf, mrb_int maxlen, off_t offset)
 {
- struct mrb_io *fptr;
 int ret;
 
 if (maxlen < 0) {
@@ -943,10 +958,7 @@
 mrb_str_modify(mrb, RSTRING(buf));
 }
 
- fptr = (struct mrb_io *)io_get_open_fptr(mrb, io);
- if (!fptr->readable) {
- mrb_raise(mrb, E_IO_ERROR, "not opened for reading");
- }
+ struct mrb_io *fptr = io_get_read_fptr(mrb, io);
 ret = readfunc(fptr->fd, RSTRING_PTR(buf), (fsize_t)maxlen, offset);
 if (ret < 0) {
 mrb_sys_fail(mrb, "sysread failed");
@@ -955,13 +967,31 @@
 buf = mrb_str_resize(mrb, buf, ret);
 }
 if (ret == 0 && maxlen > 0) {
- mrb_raise(mrb, E_EOF_ERROR, "sysread failed: End of File");
+ fptr->eof = 1;
+ eof_error(mrb);
 }
 return buf;
 }
 
+static fssize_t
+sysread(int fd, void *buf, fsize_t nbytes, off_t offset)
+{
+ return (fssize_t)read(fd, buf, nbytes);
+}
+
+static mrb_value
+io_sysread(mrb_state *mrb, mrb_value io)
+{
+ mrb_value buf = mrb_nil_value();
+ mrb_int maxlen;
+
+ mrb_get_args(mrb, "i|S", &maxlen, &buf);
+
+ return io_read_common(mrb, sysread, io, buf, maxlen, 0);
+}
+
 static mrb_value
-mrb_io_sysseek(mrb_state *mrb, mrb_value io)
+io_sysseek(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 off_t pos;
@@ -977,73 +1007,130 @@
 if (pos == -1) {
 mrb_sys_fail(mrb, "sysseek");
 }
- if (pos > MRB_INT_MAX) {
-#ifndef MRB_NO_FLOAT
- return mrb_float_value(mrb, (mrb_float)pos);
-#else
- mrb_raise(mrb, E_IO_ERROR, "sysseek reached too far for MRB_NO_FLOAT");
-#endif
- } else {
- return mrb_int_value(mrb, pos);
+ fptr->eof = 0;
+ if (sizeof(off_t) > sizeof(mrb_int) && pos > (off_t)MRB_INT_MAX) {
+ mrb_raise(mrb, E_IO_ERROR, "sysseek reached too far for mrb_int");
 }
+ return mrb_int_value(mrb, (mrb_int)pos);
 }
 
 static mrb_value
-mrb_io_syswrite_common(mrb_state *mrb,
- mrb_io_read_write_size (*writefunc)(int, const void *, fsize_t, off_t),
- mrb_value io, mrb_value buf, off_t offset)
+io_seek(mrb_state *mrb, mrb_value io)
 {
- struct mrb_io *fptr;
- int fd, length;
-
- fptr = io_get_open_fptr(mrb, io);
- if (! fptr->writable) {
- mrb_raise(mrb, E_IO_ERROR, "not opened for writing");
+ mrb_value pos = io_sysseek(mrb, io);
+ struct mrb_io *fptr = io_get_open_fptr(mrb, io);
+ if (fptr->buf) {
+ fptr->buf->start = 0;
+ fptr->buf->len = 0;
 }
+ return pos;
+}
 
- if (fptr->fd2 == -1) {
- fd = fptr->fd;
- } else {
- fd = fptr->fd2;
- }
- length = writefunc(fd, RSTRING_PTR(buf), (fsize_t)RSTRING_LEN(buf), offset);
+static mrb_value
+io_write_common(mrb_state *mrb,
+ fssize_t (*writefunc)(int, const void*, fsize_t, off_t),
+ struct mrb_io *fptr, const void *buf, fsize_t blen, off_t offset)
+{
+ int fd;
+ fssize_t length;
+
+ fd = io_get_write_fd(fptr);
+ length = writefunc(fd, buf, blen, offset);
 if (length == -1) {
- mrb_sys_fail(mrb, 0);
+ mrb_sys_fail(mrb, "syswrite");
 }
-
 return mrb_int_value(mrb, (mrb_int)length);
 }
 
-static mrb_io_read_write_size
-mrb_syswrite_dummy(int fd, const void *buf, fsize_t nbytes, off_t offset)
+static fssize_t
+syswrite(int fd, const void *buf, fsize_t nbytes, off_t offset)
 {
- return (mrb_io_read_write_size)write(fd, buf, nbytes);
+ return (fssize_t)write(fd, buf, nbytes);
 }
 
 static mrb_value
-mrb_io_syswrite(mrb_state *mrb, mrb_value io)
+io_syswrite(mrb_state *mrb, mrb_value io)
 {
 mrb_value buf;
 
 mrb_get_args(mrb, "S", &buf);
 
- return mrb_io_syswrite_common(mrb, mrb_syswrite_dummy, io, buf, 0);
+ return io_write_common(mrb, syswrite, io_get_write_fptr(mrb, io), RSTRING_PTR(buf), RSTRING_LEN(buf), 0);
+}
+
+ /* def write(string) */
+ /* str = string.is_a?(String) ? string : string.to_s */
+ /* return 0 if str.empty? */
+ /* len = syswrite(str) */
+ /* len */
+ /* end */
+
+static mrb_int
+fd_write(mrb_state *mrb, int fd, mrb_value str)
+{
+ fssize_t len, sum, n;
+
+ str = mrb_obj_as_string(mrb, str);
+ len = (fssize_t)RSTRING_LEN(str);
+ if (len == 0)return 0;
+
+ for (sum=0; sum<len; sum+=n) {
+ n = write(fd, RSTRING_PTR(str), (fsize_t)len);
+ if (n == -1) {
+ mrb_sys_fail(mrb, "syswrite");
+ }
+ }
+ return len;
 }
 
 static mrb_value
-mrb_io_close(mrb_state *mrb, mrb_value self)
+io_write(mrb_state *mrb, mrb_value io)
+{
+ struct mrb_io *fptr = io_get_write_fptr(mrb, io);
+ int fd = io_get_write_fd(fptr);
+ mrb_int len = 0;
+
+ if (fptr->buf && fptr->buf->len > 0) {
+ off_t n;
+
+ /* get current position */
+ n = lseek(fd, 0, SEEK_CUR);
+ if (n == -1) mrb_sys_fail(mrb, "lseek");
+ /* move cursor */
+ n = lseek(fd, n - fptr->buf->len, SEEK_SET);
+ if (n == -1) mrb_sys_fail(mrb, "lseek(2)");
+ fptr->buf->start = fptr->buf->len = 0;
+ }
+
+ if (mrb_get_argc(mrb) == 1) {
+ len = fd_write(mrb, fd, mrb_get_arg1(mrb));
+ }
+ else {
+ mrb_value *argv;
+ mrb_int argc;
+
+ mrb_get_args(mrb, "*", &argv, &argc);
+ while (argc--) {
+ len += fd_write(mrb, fd, *argv++);
+ }
+ }
+ return mrb_int_value(mrb, len);
+}
+
+static mrb_value
+io_close(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
- fptr = io_get_open_fptr(mrb, self);
+ fptr = io_get_open_fptr(mrb, io);
 fptr_finalize(mrb, fptr, FALSE);
 return mrb_nil_value();
 }
 
 static mrb_value
-mrb_io_close_write(mrb_state *mrb, mrb_value self)
+io_close_write(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
- fptr = io_get_open_fptr(mrb, self);
+ fptr = io_get_open_fptr(mrb, io);
 if (close((int)fptr->fd2) == -1) {
 mrb_sys_fail(mrb, "close");
 }
@@ -1051,10 +1138,10 @@
 }
 
 static mrb_value
-mrb_io_closed(mrb_state *mrb, mrb_value io)
+io_closed(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
- fptr = (struct mrb_io *)mrb_data_get_ptr(mrb, io, &mrb_io_type);
+ fptr = (struct mrb_io*)mrb_data_get_ptr(mrb, io, &mrb_io_type);
 if (fptr == NULL || fptr->fd >= 0) {
 return mrb_false_value();
 }
@@ -1063,7 +1150,22 @@
 }
 
 static mrb_value
-mrb_io_pid(mrb_state *mrb, mrb_value io)
+io_pos(mrb_state *mrb, mrb_value io)
+{
+ struct mrb_io *fptr = io_get_open_fptr(mrb, io);
+ off_t pos = lseek(fptr->fd, 0, SEEK_CUR);
+ if (pos == -1) mrb_sys_fail(mrb, 0);
+
+ if (fptr->buf) {
+ return mrb_int_value(mrb, pos - fptr->buf->len);
+ }
+ else {
+ return mrb_int_value(mrb, pos);
+ }
+}
+
+static mrb_value
+io_pid(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 fptr = io_get_open_fptr(mrb, io);
@@ -1100,19 +1202,9 @@
 return t;
 }
 
-static int
-mrb_io_read_data_pending(mrb_state *mrb, mrb_value io)
-{
- mrb_value buf = mrb_iv_get(mrb, io, mrb_intern_lit(mrb, "@buf"));
- if (mrb_string_p(buf) && RSTRING_LEN(buf) > 0) {
- return 1;
- }
- return 0;
-}
-
 #if !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
 static mrb_value
-mrb_io_s_pipe(mrb_state *mrb, mrb_value klass)
+io_s_pipe(mrb_state *mrb, mrb_value klass)
 {
 mrb_value r = mrb_nil_value();
 mrb_value w = mrb_nil_value();
@@ -1120,25 +1212,21 @@
 struct mrb_io *fptr_w;
 int pipes2;
 
- if (mrb_pipe(mrb, pipes) == -1) {
+ if (io_pipe(mrb, pipes) == -1) {
 mrb_sys_fail(mrb, "pipe");
 }
 
 r = mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
- mrb_iv_set(mrb, r, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
- fptr_r = mrb_io_alloc(mrb);
+ fptr_r = io_alloc(mrb);
 fptr_r->fd = pipes0;
 fptr_r->readable = 1;
- fptr_r->writable = 0;
- fptr_r->sync = 0;
 DATA_TYPE(r) = &mrb_io_type;
 DATA_PTR(r) = fptr_r;
+ io_buf_init(mrb, fptr_r);
 
 w = mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
- mrb_iv_set(mrb, w, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
- fptr_w = mrb_io_alloc(mrb);
+ fptr_w = io_alloc(mrb);
 fptr_w->fd = pipes1;
- fptr_w->readable = 0;
 fptr_w->writable = 1;
 fptr_w->sync = 1;
 DATA_TYPE(w) = &mrb_io_type;
@@ -1148,8 +1236,15 @@
 }
 #endif
 
+static int
+mrb_io_read_data_pending(mrb_state *mrb, struct mrb_io *fptr)
+{
+ if (fptr->buf && fptr->buf->len > 0) return 1;
+ return 0;
+}
+
 static mrb_value
-mrb_io_s_select(mrb_state *mrb, mrb_value klass)
+io_s_select(mrb_state *mrb, mrb_value klass)
 {
 const mrb_value *argv;
 mrb_int argc;
@@ -1198,7 +1293,7 @@
 fptr = io_get_open_fptr(mrb, read_io);
 if (fptr->fd >= FD_SETSIZE) continue;
 FD_SET(fptr->fd, rp);
- if (mrb_io_read_data_pending(mrb, read_io)) {
+ if (mrb_io_read_data_pending(mrb, fptr)) {
 pending++;
 FD_SET(fptr->fd, &pset);
 }
@@ -1258,8 +1353,14 @@
 retry:
 n = select(max, rp, wp, ep, tp);
 if (n < 0) {
+#ifdef _WIN32
+ errno = WSAGetLastError();
+ if (errno != WSAEINTR)
+ mrb_sys_fail(mrb, "select failed");
+#else
 if (errno != EINTR)
 mrb_sys_fail(mrb, "select failed");
+#endif
 if (tp == NULL)
 goto retry;
 interrupt_flag = 1;
@@ -1322,7 +1423,7 @@
 }
 
 static mrb_value
-mrb_io_fileno_m(mrb_state *mrb, mrb_value io)
+io_fileno(mrb_state *mrb, mrb_value io)
 {
 int fd = mrb_io_fileno(mrb, io);
 return mrb_fixnum_value(fd);
@@ -1330,12 +1431,12 @@
 
 #if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
 static mrb_value
-mrb_io_close_on_exec_p(mrb_state *mrb, mrb_value self)
+io_close_on_exec_p(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 int ret;
 
- fptr = io_get_open_fptr(mrb, self);
+ fptr = io_get_open_fptr(mrb, io);
 
 if (fptr->fd2 >= 0) {
 if ((ret = fcntl(fptr->fd2, F_GETFD)) == -1) mrb_sys_fail(mrb, "F_GETFD failed");
@@ -1347,18 +1448,18 @@
 return mrb_true_value();
 }
 #else
-# define mrb_io_close_on_exec_p mrb_notimplement_m
+# define io_close_on_exec_p mrb_notimplement_m
 #endif
 
 #if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
 static mrb_value
-mrb_io_set_close_on_exec(mrb_state *mrb, mrb_value self)
+io_set_close_on_exec(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 int flag, ret;
 mrb_bool b;
 
- fptr = io_get_open_fptr(mrb, self);
+ fptr = io_get_open_fptr(mrb, io);
 mrb_get_args(mrb, "b", &b);
 flag = b ? FD_CLOEXEC : 0;
 
@@ -1382,32 +1483,32 @@
 return mrb_bool_value(b);
 }
 #else
-# define mrb_io_set_close_on_exec mrb_notimplement_m
+# define io_set_close_on_exec mrb_notimplement_m
 #endif
 
 static mrb_value
-mrb_io_set_sync(mrb_state *mrb, mrb_value self)
+io_set_sync(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
 mrb_bool b;
 
- fptr = io_get_open_fptr(mrb, self);
+ fptr = io_get_open_fptr(mrb, io);
 mrb_get_args(mrb, "b", &b);
 fptr->sync = b;
 return mrb_bool_value(b);
 }
 
 static mrb_value
-mrb_io_sync(mrb_state *mrb, mrb_value self)
+io_sync(mrb_state *mrb, mrb_value io)
 {
 struct mrb_io *fptr;
- fptr = io_get_open_fptr(mrb, self);
+ fptr = io_get_open_fptr(mrb, io);
 return mrb_bool_value(fptr->sync);
 }
 
 #ifndef MRB_WITH_IO_PREAD_PWRITE
-# define mrb_io_pread mrb_notimplement_m
-# define mrb_io_pwrite mrb_notimplement_m
+# define io_pread mrb_notimplement_m
+# define io_pwrite mrb_notimplement_m
 #else
 static off_t
 value2off(mrb_state *mrb, mrb_value offv)
@@ -1420,7 +1521,7 @@
 * pread(maxlen, offset, outbuf = "") -> outbuf
 */
 static mrb_value
-mrb_io_pread(mrb_state *mrb, mrb_value io)
+io_pread(mrb_state *mrb, mrb_value io)
 {
 mrb_value buf = mrb_nil_value();
 mrb_value off;
@@ -1428,7 +1529,7 @@
 
 mrb_get_args(mrb, "io|S!", &maxlen, &off, &buf);
 
- return mrb_io_sysread_common(mrb, pread, io, buf, maxlen, value2off(mrb, off));
+ return io_read_common(mrb, pread, io, buf, maxlen, value2off(mrb, off));
 }
 
 /*
@@ -1436,87 +1537,366 @@
 * pwrite(buffer, offset) -> wrote_bytes
 */
 static mrb_value
-mrb_io_pwrite(mrb_state *mrb, mrb_value io)
+io_pwrite(mrb_state *mrb, mrb_value io)
 {
 mrb_value buf, off;
 
 mrb_get_args(mrb, "So", &buf, &off);
 
- return mrb_io_syswrite_common(mrb, pwrite, io, buf, value2off(mrb, off));
+ return io_write_common(mrb, pwrite, io_get_write_fptr(mrb, io), RSTRING_PTR(buf), RSTRING_LEN(buf), value2off(mrb, off));
 }
 #endif /* MRB_WITH_IO_PREAD_PWRITE */
 
 static mrb_value
-io_bufread(mrb_state *mrb, mrb_value str, mrb_int len)
+io_ungetc(mrb_state *mrb, mrb_value io)
 {
- mrb_value str2;
- mrb_int newlen;
- struct RString *s;
- char *p;
+ struct mrb_io *fptr = io_get_read_fptr(mrb, io);
+ struct mrb_io_buf *buf = fptr->buf;
+ mrb_value str;
+ mrb_int len;
+
+ mrb_get_args(mrb, "S", &str);
+ len = RSTRING_LEN(str);
+ if (len > MRB_IO_BUF_SIZE - buf->len) {
+ fptr->buf = (struct mrb_io_buf*)mrb_realloc(mrb, buf, sizeof(struct mrb_io_buf)+buf->len+len-MRB_IO_BUF_SIZE);
+ buf = fptr->buf;
+ }
+ memmove(buf->mem+len, buf->mem+buf->start, buf->len);
+ memcpy(buf->mem, RSTRING_PTR(str), len);
+ buf->start = 0;
+ buf->len += len;
+ return mrb_nil_value();
+}
+
+static void
+io_buf_reset(struct mrb_io *fptr)
+{
+ struct mrb_io_buf *buf = fptr->buf;
 
- s = RSTRING(str);
- mrb_str_modify(mrb, s);
- p = RSTR_PTR(s);
- str2 = mrb_str_new(mrb, p, len);
- newlen = RSTR_LEN(s)-len;
- memmove(p, p+len, newlen);
- pnewlen = '\0';
- RSTR_SET_LEN(s, newlen);
+ buf->start = 0;
+ buf->len = 0;
+}
 
- return str2;
+static void
+io_buf_shift(struct mrb_io *fptr, mrb_int n)
+{
+ struct mrb_io_buf *buf = fptr->buf;
+
+ buf->start += n;
+ buf->len -= n;
+}
+
+#ifdef MRB_UTF8_STRING
+static void
+io_buf_fill_comp(mrb_state *mrb, struct mrb_io *fptr)
+{
+ struct mrb_io_buf *buf = fptr->buf;
+ int keep = buf->len;
+
+ memmove(buf->mem, buf->mem+buf->start, keep);
+ int n = read(fptr->fd, buf->mem+keep, MRB_IO_BUF_SIZE-keep);
+ if (n < 0) mrb_sys_fail(mrb, 0);
+ if (n == 0) fptr->eof = 1;
+ buf->start = 0;
+ buf->len += (short)n;
+}
+#endif
+
+static void
+io_buf_fill(mrb_state *mrb, struct mrb_io *fptr)
+{
+ struct mrb_io_buf *buf = fptr->buf;
+
+ if (buf->len > 0) return;
+
+ int n = read(fptr->fd, buf->mem, MRB_IO_BUF_SIZE);
+ if (n < 0) mrb_sys_fail(mrb, 0);
+ if (n == 0) fptr->eof = 1;
+ buf->start = 0;
+ buf->len = (short)n;
 }
 
 static mrb_value
-mrb_io_bufread(mrb_state *mrb, mrb_value self)
+io_eof(mrb_state *mrb, mrb_value io)
 {
- mrb_value str;
- mrb_int len;
+ struct mrb_io *fptr = io_get_read_fptr(mrb, io);
 
- mrb->c->ci->mid = 0;
- mrb_get_args(mrb, "Si", &str, &len);
- mrb_assert(RSTRING_LEN(str) > 0);
- mrb_assert(RSTRING_PTR(str) != NULL);
- mrb_str_modify(mrb, RSTRING(str));
- return io_bufread(mrb, str, len);
+ io_buf_fill(mrb, fptr);
+ if (fptr->buf->len > 0) return mrb_false_value();
+ return mrb_bool_value(fptr->eof);
+}
+
+static void
+io_buf_cat(mrb_state *mrb, mrb_value outbuf, struct mrb_io *fptr, mrb_int n)
+{
+ struct mrb_io_buf *buf = fptr->buf;
+
+ mrb_assert(n <= buf->len);
+ mrb_str_cat(mrb, outbuf, buf->mem+buf->start, n);
+ io_buf_shift(fptr, n);
+}
+
+static void
+io_buf_cat_all(mrb_state *mrb, mrb_value outbuf, struct mrb_io *fptr)
+{
+ struct mrb_io_buf *buf = fptr->buf;
+
+ mrb_str_cat(mrb, outbuf, buf->mem+buf->start, buf->len);
+ io_buf_reset(fptr);
 }
 
 static mrb_value
-mrb_io_readchar(mrb_state *mrb, mrb_value self)
+io_read_all(mrb_state *mrb, struct mrb_io *fptr, mrb_value outbuf)
 {
- mrb_value buf;
- mrb_int len = 1;
-#ifdef MRB_UTF8_STRING
- unsigned char c;
-#endif
+ for (;;) {
+ io_buf_fill(mrb, fptr);
+ if (fptr->eof) {
+ return outbuf;
+ }
+ io_buf_cat_all(mrb, outbuf, fptr);
+ }
+}
 
- mrb->c->ci->mid = 0;
- mrb_get_args(mrb, "S", &buf);
- mrb_assert(RSTRING_LEN(buf) > 0);
- mrb_assert(RSTRING_PTR(buf) != NULL);
- mrb_str_modify(mrb, RSTRING(buf));
-#ifdef MRB_UTF8_STRING
- c = RSTRING_PTR(buf)0;
- if (c & 0x80) {
- len = mrb_utf8len(RSTRING_PTR(buf), RSTRING_END(buf));
- if (len == 1 && RSTRING_LEN(buf) < 4) { /* partial UTF-8 */
- mrb_int blen = RSTRING_LEN(buf);
- ssize_t n;
+static mrb_value
+io_read(mrb_state *mrb, mrb_value io)
+{
+ mrb_value outbuf = mrb_nil_value();
+ mrb_value len;
+ mrb_int length = 0;
+ mrb_bool length_given;
+ struct mrb_io *fptr = io_get_read_fptr(mrb, io);
+
+ mrb_get_args(mrb, "|o?S", &len, &length_given, &outbuf);
+ if (length_given) {
+ if (mrb_nil_p(len)) {
+ length_given = FALSE;
+ }
+ else {
+ length = mrb_as_int(mrb, len);
+ if (length < 0) {
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative length %d given", length);
+ }
+ if (length == 0) {
+ return mrb_str_new(mrb, NULL, 0);
+ }
+ }
+ }
 
- struct mrb_io *fptr = (struct mrb_io*)io_get_open_fptr(mrb, self);
+ if (mrb_nil_p(outbuf)) {
+ outbuf = mrb_str_new_capa(mrb, MRB_IO_BUF_SIZE);
+ }
+ if (!length_given) { /* read as much as possible */
+ return io_read_all(mrb, fptr, outbuf);
+ }
+ for (;;) {
+ io_buf_fill(mrb, fptr);
+ if (fptr->eof || length == 0) {
+ if (RSTRING_LEN(outbuf) == 0)
+ return mrb_nil_value();
+ return outbuf;
+ }
+ if (fptr->buf->len < length) {
+ length -= fptr->buf->len;
+ io_buf_cat_all(mrb, outbuf, fptr);
+ }
+ else {
+ io_buf_cat(mrb, outbuf, fptr, length);
+ return outbuf;
+ }
+ }
+}
+
+static mrb_int
+io_find_index(struct mrb_io *fptr, const char *rs, mrb_int rslen)
+{
+ struct mrb_io_buf *buf = fptr->buf;
+
+ mrb_assert(rslen > 0);
+ const char c = rs0;
+ const mrb_int limit = buf->len - rslen;
+ const char *p = buf->mem+buf->start;
+ for (mrb_int i=0; i<limit; i++) {
+ if (pi == c && (rslen == 1 || memcmp(p+i, rs, rslen) == 0)) {
+ return i;
+ }
+ }
+ return -1;
+}
 
- if (!fptr->readable) {
- mrb_raise(mrb, E_IO_ERROR, "not opened for reading");
+static mrb_value
+io_gets(mrb_state *mrb, mrb_value io)
+{
+ mrb_value rs = mrb_nil_value();
+ mrb_int limit;
+ mrb_bool rs_given = FALSE; /* newline break */
+ mrb_bool limit_given = FALSE; /* no limit */
+ mrb_value outbuf;
+ struct mrb_io *fptr = io_get_read_fptr(mrb, io);
+ struct mrb_io_buf *buf = fptr->buf;
+
+ mrb_get_args(mrb, "|o?i?", &rs, &rs_given, &limit, &limit_given);
+
+ if (limit_given == FALSE) {
+ if (rs_given) {
+ if (mrb_nil_p(rs)) {
+ rs_given = FALSE;
+ }
+ else if (mrb_integer_p(rs)) {
+ limit = mrb_integer(rs);
+ limit_given = TRUE;
+ rs = mrb_nil_value();
+ }
+ else if (!mrb_string_p(rs)) {
+ mrb_ensure_int_type(mrb, rs);
+ }
+ }
+ }
+ if (rs_given) {
+ if (mrb_nil_p(rs)) {
+ rs_given = FALSE;
+ }
+ else {
+ mrb_ensure_string_type(mrb, rs);
+ if (RSTRING_LEN(rs) == 0) { /* paragraph mode */
+ rs = mrb_str_new_lit(mrb, "\n\n");
+ }
+ }
+ }
+ else {
+ rs = mrb_str_new_lit(mrb, "\n");
+ rs_given = TRUE;
+ }
+
+ /* from now on rs_given==FALSE means no RS */
+ if (mrb_nil_p(rs) && !limit_given) {
+ return io_read_all(mrb, fptr, mrb_str_new_capa(mrb, MRB_IO_BUF_SIZE));
+ }
+
+ io_buf_fill(mrb, fptr);
+ if (fptr->eof) return mrb_nil_value();
+
+ if (limit_given) {
+ if (limit == 0) return mrb_str_new(mrb, NULL, 0);
+ outbuf = mrb_str_new_capa(mrb, limit);
+ }
+ else {
+ outbuf = mrb_str_new(mrb, NULL, 0);
+ }
+
+ for (;;) {
+ if (rs_given) { /* with RS */
+ int rslen = RSTRING_LEN(rs);
+ mrb_int idx = io_find_index(fptr, RSTRING_PTR(rs), rslen);
+ if (idx >= 0) { /* found */
+ mrb_int n = idx+rslen;
+ if (limit_given && limit < n) {
+ n = limit;
+ }
+ io_buf_cat(mrb, outbuf, fptr, n);
+ return outbuf;
 }
- /* refill the buffer */
- mrb_str_resize(mrb, buf, 4096);
- n = read(fptr->fd, RSTRING_PTR(buf)+blen, 4096-blen);
- if (n < 0) mrb_sys_fail(mrb, "sysread failed");
- mrb_str_resize(mrb, buf, blen+n);
 }
- len = mrb_utf8len(RSTRING_PTR(buf), RSTRING_END(buf));
+ if (limit_given) {
+ if (limit <= buf->len) {
+ io_buf_cat(mrb, outbuf, fptr, limit);
+ return outbuf;
+ }
+ limit -= buf->len;
+ }
+ io_buf_cat_all(mrb, outbuf, fptr);
+ io_buf_fill(mrb, fptr);
+ if (fptr->eof) {
+ if (RSTRING_LEN(outbuf) == 0) return mrb_nil_value();
+ return outbuf;
+ }
+ }
+}
+
+static mrb_value
+io_readline(mrb_state *mrb, mrb_value io)
+{
+ mrb_value result = io_gets(mrb, io);
+ if (mrb_nil_p(result)) {
+ eof_error(mrb);
+ }
+ return result;
+}
+
+static mrb_value
+io_readlines(mrb_state *mrb, mrb_value io)
+{
+ mrb_value ary = mrb_ary_new(mrb);
+ for (;;) {
+ mrb_value line = io_gets(mrb, io);
+
+ if (mrb_nil_p(line)) return ary;
+ mrb_ary_push(mrb, ary, line);
+ }
+}
+
+static mrb_value
+io_getc(mrb_state *mrb, mrb_value io)
+{
+ mrb_int len = 1;
+ struct mrb_io *fptr = io_get_read_fptr(mrb, io);
+
+ io_buf_fill(mrb, fptr);
+ if (fptr->eof) return mrb_nil_value();
+#ifdef MRB_UTF8_STRING
+ struct mrb_io_buf *buf = fptr->buf;
+ const char *p = &buf->membuf->start;
+ if ((*p) & 0x80) {
+ len = mrb_utf8len(p, p+buf->len);
+ if (len == 1 && buf->len < 4) { /* partial UTF-8 */
+ io_buf_fill_comp(mrb, fptr);
+ p = &buf->membuf->start;
+ len = mrb_utf8len(p, p+buf->len);
+ }
 }
 #endif
- return io_bufread(mrb, buf, len);
+ mrb_value str = mrb_str_new(mrb, fptr->buf->mem+fptr->buf->start, len);
+ io_buf_shift(fptr, len);
+ return str;
+}
+
+static mrb_value
+io_readchar(mrb_state *mrb, mrb_value io)
+{
+ mrb_value result = io_getc(mrb, io);
+ if (mrb_nil_p(result)) {
+ eof_error(mrb);
+ }
+ return result;
+}
+
+static mrb_value
+io_getbyte(mrb_state *mrb, mrb_value io)
+{
+ struct mrb_io *fptr = io_get_read_fptr(mrb, io);
+
+ io_buf_fill(mrb, fptr);
+ if (fptr->eof) return mrb_nil_value();
+
+ unsigned char c = fptr->buf->memfptr->buf->start;
+ io_buf_shift(fptr, 1);
+ return mrb_int_value(mrb, (mrb_int)c);
+}
+
+static mrb_value
+io_readbyte(mrb_state *mrb, mrb_value io)
+{
+ mrb_value result = io_getbyte(mrb, io);
+ if (mrb_nil_p(result)) {
+ eof_error(mrb);
+ }
+ return result;
+}
+
+static mrb_value
+io_flush(mrb_state *mrb, mrb_value io)
+{
+ io_get_open_fptr(mrb, io);
+ return io;
 }
 
 void
@@ -1525,37 +1905,51 @@
 struct RClass *io;
 
 io = mrb_define_class(mrb, "IO", mrb->object_class);
- MRB_SET_INSTANCE_TT(io, MRB_TT_DATA);
+ MRB_SET_INSTANCE_TT(io, MRB_TT_CDATA);
 
 mrb_include_module(mrb, io, mrb_module_get(mrb, "Enumerable")); /* 15.2.20.3 */
- mrb_define_class_method(mrb, io, "_popen", mrb_io_s_popen, MRB_ARGS_ARG(1,2));
- mrb_define_class_method(mrb, io, "_sysclose", mrb_io_s_sysclose, MRB_ARGS_REQ(1));
- mrb_define_class_method(mrb, io, "for_fd", mrb_io_s_for_fd, MRB_ARGS_ARG(1,2));
- mrb_define_class_method(mrb, io, "select", mrb_io_s_select, MRB_ARGS_ARG(1,3));
- mrb_define_class_method(mrb, io, "sysopen", mrb_io_s_sysopen, MRB_ARGS_ARG(1,2));
+ mrb_define_class_method(mrb, io, "_popen", io_s_popen, MRB_ARGS_ARG(1,2));
+ mrb_define_class_method(mrb, io, "_sysclose", io_s_sysclose, MRB_ARGS_REQ(1));
+ mrb_define_class_method(mrb, io, "for_fd", io_s_for_fd, MRB_ARGS_ARG(1,2));
+ mrb_define_class_method(mrb, io, "select", io_s_select, MRB_ARGS_ARG(1,3));
+ mrb_define_class_method(mrb, io, "sysopen", io_s_sysopen, MRB_ARGS_ARG(1,2));
 #if !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
- mrb_define_class_method(mrb, io, "_pipe", mrb_io_s_pipe, MRB_ARGS_NONE());
+ mrb_define_class_method(mrb, io, "_pipe", io_s_pipe, MRB_ARGS_NONE());
 #endif
 
- mrb_define_method(mrb, io, "initialize", mrb_io_initialize, MRB_ARGS_ARG(1,2)); /* 15.2.20.5.21 (x)*/
- mrb_define_method(mrb, io, "initialize_copy", mrb_io_initialize_copy, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, io, "_check_readable", mrb_io_check_readable, MRB_ARGS_NONE());
- mrb_define_method(mrb, io, "isatty", mrb_io_isatty, MRB_ARGS_NONE());
- mrb_define_method(mrb, io, "sync", mrb_io_sync, MRB_ARGS_NONE());
- mrb_define_method(mrb, io, "sync=", mrb_io_set_sync, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, io, "sysread", mrb_io_sysread, MRB_ARGS_ARG(1,1));
- mrb_define_method(mrb, io, "sysseek", mrb_io_sysseek, MRB_ARGS_ARG(1,1));
- mrb_define_method(mrb, io, "syswrite", mrb_io_syswrite, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, io, "close", mrb_io_close, MRB_ARGS_NONE()); /* 15.2.20.5.1 */
- mrb_define_method(mrb, io, "close_write", mrb_io_close_write, MRB_ARGS_NONE());
- mrb_define_method(mrb, io, "close_on_exec=", mrb_io_set_close_on_exec, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, io, "close_on_exec?", mrb_io_close_on_exec_p, MRB_ARGS_NONE());
- mrb_define_method(mrb, io, "closed?", mrb_io_closed, MRB_ARGS_NONE()); /* 15.2.20.5.2 */
- mrb_define_method(mrb, io, "pid", mrb_io_pid, MRB_ARGS_NONE()); /* 15.2.20.5.2 */
- mrb_define_method(mrb, io, "fileno", mrb_io_fileno_m, MRB_ARGS_NONE());
- mrb_define_method(mrb, io, "pread", mrb_io_pread, MRB_ARGS_ANY()); /* ruby 2.5 feature */
- mrb_define_method(mrb, io, "pwrite", mrb_io_pwrite, MRB_ARGS_ANY()); /* ruby 2.5 feature */
-
- mrb_define_method(mrb, io, "_readchar", mrb_io_readchar, MRB_ARGS_REQ(1));
- mrb_define_class_method(mrb, io, "_bufread", mrb_io_bufread, MRB_ARGS_REQ(2));
+ mrb_define_method(mrb, io, "initialize", io_init, MRB_ARGS_ARG(1,2));
+ mrb_define_method(mrb, io, "initialize_copy", io_init_copy, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, io, "isatty", io_isatty, MRB_ARGS_NONE());
+ mrb_define_method(mrb, io, "eof?", io_eof, MRB_ARGS_NONE()); /* 15.2.20.5.6 */
+ mrb_define_method(mrb, io, "getc", io_getc, MRB_ARGS_NONE()); /* 15.2.20.5.8 */
+ mrb_define_method(mrb, io, "gets", io_gets, MRB_ARGS_OPT(2)); /* 15.2.20.5.9 */
+ mrb_define_method(mrb, io, "read", io_read, MRB_ARGS_OPT(2)); /* 15.2.20.5.14 */
+ mrb_define_method(mrb, io, "readchar", io_readchar, MRB_ARGS_NONE()); /* 15.2.20.5.15 */
+ mrb_define_method(mrb, io, "readline", io_readline, MRB_ARGS_OPT(2)); /* 15.2.20.5.16 */
+ mrb_define_method(mrb, io, "readlines", io_readlines, MRB_ARGS_OPT(2)); /* 15.2.20.5.17 */
+ mrb_define_method(mrb, io, "sync", io_sync, MRB_ARGS_NONE()); /* 15.2.20.5.18 */
+ mrb_define_method(mrb, io, "sync=", io_set_sync, MRB_ARGS_REQ(1)); /* 15.2.20.5.19 */
+ mrb_define_method(mrb, io, "sysread", io_sysread, MRB_ARGS_ARG(1,1));
+ mrb_define_method(mrb, io, "sysseek", io_sysseek, MRB_ARGS_ARG(1,1));
+ mrb_define_method(mrb, io, "syswrite", io_syswrite, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, io, "seek", io_seek, MRB_ARGS_ARG(1,1));
+ mrb_define_method(mrb, io, "close", io_close, MRB_ARGS_NONE()); /* 15.2.20.5.1 */
+ mrb_define_method(mrb, io, "close_write", io_close_write, MRB_ARGS_NONE());
+ mrb_define_method(mrb, io, "close_on_exec=", io_set_close_on_exec, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, io, "close_on_exec?", io_close_on_exec_p, MRB_ARGS_NONE());
+ mrb_define_method(mrb, io, "closed?", io_closed, MRB_ARGS_NONE()); /* 15.2.20.5.2 */
+ mrb_define_method(mrb, io, "flush", io_flush, MRB_ARGS_NONE()); /* 15.2.20.5.7 */
+ mrb_define_method(mrb, io, "ungetc", io_ungetc, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, io, "pos", io_pos, MRB_ARGS_NONE());
+ mrb_define_method(mrb, io, "pid", io_pid, MRB_ARGS_NONE());
+ mrb_define_method(mrb, io, "fileno", io_fileno, MRB_ARGS_NONE());
+ mrb_define_method(mrb, io, "write", io_write, MRB_ARGS_ANY()); /* 15.2.20.5.20 */
+ mrb_define_method(mrb, io, "pread", io_pread, MRB_ARGS_ANY()); /* ruby 2.5 feature */
+ mrb_define_method(mrb, io, "pwrite", io_pwrite, MRB_ARGS_ANY()); /* ruby 2.5 feature */
+ mrb_define_method(mrb, io, "getbyte", io_getbyte, MRB_ARGS_NONE());
+ mrb_define_method(mrb, io, "readbyte", io_readbyte, MRB_ARGS_NONE());
+
+ mrb_define_const_id(mrb, io, MRB_SYM(SEEK_SET), mrb_fixnum_value(SEEK_SET));
+ mrb_define_const_id(mrb, io, MRB_SYM(SEEK_CUR), mrb_fixnum_value(SEEK_CUR));
+ mrb_define_const_id(mrb, io, MRB_SYM(SEEK_END), mrb_fixnum_value(SEEK_END));
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/test/file.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/test/file.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/test/io.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-io/test/io.rb Changed

@@ -140,9 +140,10 @@
 end
 
 assert "IO#read(n) with n > IO::BUF_SIZE" do
+ buf_size = 4096 # copied from io.c
 skip "pipe is not supported on this platform" if MRubyIOTestUtil.win?
 IO.pipe do |r,w|
- n = IO::BUF_SIZE+1
+ n = buf_size+1
 w.write 'a'*n
 assert_equal 'a'*n, r.read(n)
 end
@@ -186,8 +187,8 @@
 end
 
 assert('IO#write', '15.2.20.5.20') do
- io = IO.open(IO.sysopen($mrbtest_io_wfname))
- assert_equal 0, io.write("")
+ io = IO.open(IO.sysopen($mrbtest_io_wfname, "w"), "w")
+ assert_equal 1, io.write("a")
 io.close
 
 io = IO.open(IO.sysopen($mrbtest_io_wfname, "r+"), "r+")
@@ -201,9 +202,9 @@
 end
 
 assert('IO#<<') do
- io = IO.open(IO.sysopen($mrbtest_io_wfname))
- io << "" << ""
- assert_equal 0, io.pos
+ io = IO.open(IO.sysopen($mrbtest_io_wfname, "w"), "w")
+ io << "a" << "b"
+ assert_equal 2, io.pos
 io.close
 end
 
@@ -303,26 +304,11 @@
 io.close
 end
 
-assert('IO#_read_buf') do
- fd = IO.sysopen $mrbtest_io_rfname
- io = IO.new fd
- def io._buf
- @buf
- end
- msg_len = $mrbtest_io_msg.size
- assert_equal '', io._buf
- assert_equal $mrbtest_io_msg, io._read_buf
- assert_equal $mrbtest_io_msg, io._buf
- assert_equal 'mruby', io.read(5)
- assert_equal 5, io.pos
- assert_equal msg_len - 5, io._buf.size
- assert_equal $mrbtest_io_msg5,100, io.read
- assert_equal 0, io._buf.size
- assert_raise EOFError do
- io._read_buf
- end
- assert_equal true, io.eof
- assert_equal true, io.eof?
+assert('IO#ungetc') do
+ io = IO.new(IO.sysopen($mrbtest_io_rfname))
+ assert_equal 'm', io.getc
+ assert_nothing_raised{io.ungetc("M")}
+ assert_equal 'M', io.getc
 io.close
 end
 
@@ -383,6 +369,7 @@
 # gets with rs
 io.pos = 0
 assert_equal $mrbtest_io_msg0, 6, io.gets(' '), "gets with rs"
+ assert_equal $mrbtest_io_msg6, 3, io.gets(' '), "gets with rs(2)"
 
 # gets with rs, limit
 io.pos = 0

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-kernel-ext/src/kernel.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-kernel-ext/src/kernel.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-math/src/math.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-math/src/math.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-metaprog/src/metaprog.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-metaprog/src/metaprog.c Changed

@@ -5,6 +5,7 @@
 #include "mruby/proc.h"
 #include "mruby/class.h"
 #include "mruby/string.h"
+#include <mruby/internal.h>
 #include "mruby/presym.h"
 
 typedef enum {
@@ -575,6 +576,39 @@
 return mrb_class_instance_method_list(mrb, recur, c);
 }
 
+static int
+undefined_method_i(mrb_state *mrb, mrb_sym mid, mrb_method_t m, void *p)
+{
+ mrb_value ary = *(mrb_value*)p;
+
+ if (MRB_METHOD_UNDEF_P(m)) {
+ mrb_ary_push(mrb, ary, mrb_symbol_value(mid));
+ }
+ return 0;
+}
+
+/*
+ * call-seq:
+ * mod.undefined_methods() -> array
+ *
+ * Returns an array containing the names of the undefined methods of the module/class.
+ */
+static mrb_value
+mrb_mod_undefined_methods(mrb_state *mrb, mrb_value mod)
+{
+ struct RClass *m = mrb_class_ptr(mod);
+ mrb_get_args(mrb, ""); /* no argument */
+
+ mrb_value ary = mrb_ary_new(mrb);
+
+ if (m->flags & MRB_FL_CLASS_IS_PREPENDED) {
+ MRB_CLASS_ORIGIN(m);
+ }
+ mrb_mt_foreach(mrb, m, undefined_method_i, (void*)&ary);
+
+ return ary;
+}
+
 /* 15.2.2.4.41 */
 /*
 * call-seq:
@@ -631,9 +665,6 @@
 return ary;
 }
 
-/* implementation of #send method */
-mrb_value mrb_f_send(mrb_state *mrb, mrb_value self);
-
 void
 mrb_mruby_metaprog_gem_init(mrb_state* mrb)
 {
@@ -663,6 +694,7 @@
 mrb_define_method(mrb, mod, "class_variable_set", mrb_mod_cvar_set, MRB_ARGS_REQ(2)); /* 15.2.2.4.18 */
 mrb_define_method(mrb, mod, "included_modules", mrb_mod_included_modules, MRB_ARGS_NONE()); /* 15.2.2.4.30 */
 mrb_define_method(mrb, mod, "instance_methods", mrb_mod_instance_methods, MRB_ARGS_ANY()); /* 15.2.2.4.33 */
+ mrb_define_method(mrb, mod, "undefined_instance_methods", mrb_mod_undefined_methods, MRB_ARGS_NONE());
 mrb_define_method(mrb, mod, "remove_method", mrb_mod_remove_method, MRB_ARGS_ANY()); /* 15.2.2.4.41 */
 mrb_define_method(mrb, mod, "method_removed", mrb_f_nil, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, mod, "constants", mrb_mod_constants, MRB_ARGS_OPT(1)); /* 15.2.2.4.24 */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-metaprog/test/metaprog.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-metaprog/test/metaprog.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-method/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-method/README.md Changed

@@ -22,38 +22,38 @@
 
 ## Kernel
 
-* `Kernel#method`
-* `Kernel#singleton_method`
+- `Kernel#method`
+- `Kernel#singleton_method`
 
 ## Module
 
-* `Module#instance_method`
+- `Module#instance_method`
 
 ## Method class
 
-* `Method#name`
-* `Method#call`
-* `Method#super_method`
-* `Method#arity`
-* `Method#unbind`
-* `Method#`
-* `Method#owner`
-* `Method#receiver`
-* `Method#parameters`
-* `Method#source_location`
-* `Method#to_proc`
+- `Method#name`
+- `Method#call`
+- `Method#super_method`
+- `Method#arity`
+- `Method#unbind`
+- `Method#`
+- `Method#owner`
+- `Method#receiver`
+- `Method#parameters`
+- `Method#source_location`
+- `Method#to_proc`
 
 ## UnboundMethod class
 
-* `UnboundMethod#name`
-* `UnboundMethod#bind`
-* `UnboundMethod#super_method`
-* `UnboundMethod#arity`
-* `UnboundMethod#owner`
-* `UnboundMethod#parameters`
-* `UnboundMethod#source_location`
+- `UnboundMethod#name`
+- `UnboundMethod#bind`
+- `UnboundMethod#super_method`
+- `UnboundMethod#arity`
+- `UnboundMethod#owner`
+- `UnboundMethod#parameters`
+- `UnboundMethod#source_location`
 
 # See also
 
-* <https://ruby-doc.org/core-2.3.3/Method.html>
-* <https://ruby-doc.org/core-2.3.3/UnboundMethod.html>
+- <https://ruby-doc.org/core-2.3.3/Method.html>
+- <https://ruby-doc.org/core-2.3.3/UnboundMethod.html>

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-method/src/method.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-method/src/method.c Changed

@@ -4,11 +4,9 @@
 #include "mruby/variable.h"
 #include "mruby/proc.h"
 #include "mruby/string.h"
+#include "mruby/internal.h"
 #include "mruby/presym.h"
 
-mrb_noreturn void mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args);
-mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);
-
 // Defined by mruby-proc-ext on which mruby-method depends
 mrb_value mrb_proc_parameters(mrb_state *mrb, mrb_value proc);
 mrb_value mrb_proc_source_location(mrb_state *mrb, struct RProc *p);
@@ -189,7 +187,7 @@
 {
   mrb_value other = mrb_get_arg1(mrb);
   mrb_value receiver, orig_proc, other_proc;
-  struct RClass *owner, *klass;
+  struct RClass *owner;
   struct RProc *orig_rproc, *other_rproc;
 
   if (!mrb_obj_is_instance_of(mrb, other, mrb_class(mrb, self)))
@@ -198,10 +196,6 @@
   if (mrb_class(mrb, self) != mrb_class(mrb, other))
     return mrb_false_value();
 
-  klass = mrb_class_ptr(IV_GET(self, MRB_SYM(_klass)));
-  if (klass != mrb_class_ptr(IV_GET(other, MRB_SYM(_klass))))
-    return mrb_false_value();
-
   owner = mrb_class_ptr(IV_GET(self, MRB_SYM(_owner)));
   if (owner != mrb_class_ptr(IV_GET(other, MRB_SYM(_owner))))
     return mrb_false_value();
@@ -219,10 +213,8 @@
       return mrb_false_value();
   }
 
-  if (mrb_nil_p(orig_proc))
-    return mrb_false_value();
-  if (mrb_nil_p(other_proc))
-    return mrb_false_value();
+  if (mrb_nil_p(orig_proc)) return mrb_false_value();
+  if (mrb_nil_p(other_proc)) return mrb_false_value();
 
   orig_rproc = mrb_proc_ptr(orig_proc);
   other_rproc = mrb_proc_ptr(other_proc);
@@ -327,25 +319,25 @@
   struct RProc *proc;
   struct RObject *me;
 
-  switch (mrb_type(klass)) {
-    case MRB_TT_SCLASS:
-      super = mrb_class_ptr(klass)->super->super;
-      break;
-    case MRB_TT_ICLASS:
-      super = mrb_class_ptr(klass)->super;
-      break;
-    default:
-      super = mrb_class_ptr(owner)->super;
-      break;
+  if (mrb_type(owner) == MRB_TT_MODULE) {
+    struct RClass *m = mrb_class_ptr(owner);
+    rklass = mrb_class_ptr(klass)->super;
+    while (rklass && rklass->c != m) {
+      rklass = rklass->super;
+    }
+    if (!rklass) return mrb_nil_value();
+    super = rklass->super;
+  }
+  else {
+    super = mrb_class_ptr(owner)->super;
   }
 
   proc = method_search_vm(mrb, &super, mrb_symbol(name));
-  if (!proc)
-    return mrb_nil_value();
+  if (!proc) return mrb_nil_value();
 
   rklass = super;
-  while (super->tt == MRB_TT_ICLASS)
-    super = super->c;
+  super = mrb_class_real(super);
+  if (!super) return mrb_nil_value();
 
   me = method_object_alloc(mrb, mrb_obj_class(mrb, self));
   mrb_obj_iv_set(mrb, me, MRB_SYM(_owner), mrb_obj_value(super));
@@ -401,6 +393,16 @@
 
   mrb_str_cat_cstr(mrb, str, mrb_obj_classname(mrb, self));
   mrb_str_cat_lit(mrb, str, ": ");
+  if (mrb_type(owner) == MRB_TT_SCLASS) {
+    mrb_value recv = mrb_iv_get(mrb, self, MRB_SYM(_recv));
+    if (!mrb_nil_p(recv)) {
+      mrb_str_concat(mrb, str, recv);
+      mrb_str_cat_lit(mrb, str, ".");
+      mrb_str_concat(mrb, str, name);
+      goto finish;
+    }
+  }
+
   rklass = mrb_class_ptr(klass);
   if (mrb_class_ptr(owner) == rklass) {
     mrb_str_concat(mrb, str, owner);
@@ -408,12 +410,21 @@
     mrb_str_concat(mrb, str, name);
   }
   else {
-    mrb_str_cat_cstr(mrb, str, mrb_class_name(mrb, rklass));
+    rklass = mrb_class_real(rklass); /* skip internal class */
+    mrb_str_concat(mrb, str, mrb_obj_value(rklass));
     mrb_str_cat_lit(mrb, str, "(");
     mrb_str_concat(mrb, str, owner);
     mrb_str_cat_lit(mrb, str, ")#");
     mrb_str_concat(mrb, str, name);
   }
+ finish:;
+  mrb_value loc = method_source_location(mrb, self);
+  if (mrb_array_p(loc) && RARRAY_LEN(loc) == 2) {
+    mrb_str_cat_lit(mrb, str, " ");
+    mrb_str_concat(mrb, str, RARRAY_PTR(loc)0);
+    mrb_str_cat_lit(mrb, str, ":");
+    mrb_str_concat(mrb, str, RARRAY_PTR(loc)1);
+  }
   mrb_str_cat_lit(mrb, str, ">");
   return str;
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-method/test/method.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-method/test/method.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb Changed

@@ -1,8 +1,24 @@
 class Numeric
+ ##
+ # call-seq:
+ # zero? -> true or false
+ #
+ # Returns +true+ if +zero+ has a zero value, +false+ otherwise.
+ #
+ # Of the Core and Standard Library classes,
+ # only Rational and Complex use this implementation.
+ #
 def zero?
 self == 0
 end
 
+ ##
+ # call-seq:
+ # nonzero? -> self or nil
+ #
+ # Returns +self+ if +self+ is not a zero value, +nil+ otherwise;
+ # uses method <tt>zero?</tt> for the evaluation.
+ #
 def nonzero?
 if self == 0
 nil
@@ -11,11 +27,73 @@
 end
 end
 
+ ##
+ # call-seq:
+ # positive? -> true or false
+ #
+ # Returns +true+ if +self+ is greater than 0, +false+ otherwise.
+ #
 def positive?
 self > 0
 end
 
+ ##
+ # call-seq:
+ # negative? -> true or false
+ #
+ # Returns +true+ if +self+ is less than 0, +false+ otherwise.
+ #
 def negative?
 self < 0
 end
+
+ ##
+ # call-seq:
+ # int.allbits?(mask) -> true or false
+ #
+ # Returns +true+ if all bits of <code>+int+ & +mask+</code> are 1.
+ #
+ def allbits?(mask)
+ (self & mask) == mask
+ end
+
+ ##
+ # call-seq:
+ # int.anybits?(mask) -> true or false
+ #
+ # Returns +true+ if any bits of <code>+int+ & +mask+</code> are 1.
+ #
+ def anybits?(mask)
+ (self & mask) != 0
+ end
+
+ ##
+ # call-seq:
+ # int.nobits?(mask) -> true or false
+ #
+ # Returns +true+ if no bits of <code>+int+ & +mask+</code> are 1.
+ #
+ def nobits?(mask)
+ (self & mask) == 0
+ end
+end
+
+class Integer
+ # call-seq:
+ # ceildiv(other) -> integer
+ #
+ # Returns the result of division +self+ by +other+. The
+ # result is rounded up to the nearest integer.
+ #
+ # 3.ceildiv(3) # => 1
+ # 4.ceildiv(3) # => 2
+ #
+ # 4.ceildiv(-3) # => -1
+ # -4.ceildiv(3) # => -1
+ # -4.ceildiv(-3) # => 2
+ #
+ # 3.ceildiv(1.2) # => 3
+ def ceildiv(other)
+ -div(-other)
+ end
 end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c Changed

@@ -1,91 +1,197 @@
 #include <mruby.h>
 #include <mruby/numeric.h>
+#include <mruby/array.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
-/*
- * call-seq:
- * int.allbits?(mask) -> true or false
- *
- * Returns +true+ if all bits of <code>+int+ & +mask+</code> are 1.
- */
-static mrb_value
-int_allbits(mrb_state *mrb, mrb_value self)
-{
- mrb_int n, m;
-
- mrb_get_args(mrb, "i", &m);
- n = mrb_integer(self);
- return mrb_bool_value((n & m) == m);
-}
+#ifndef MRB_NO_FLOAT
+static mrb_value flo_remainder(mrb_state *mrb, mrb_value self);
+#endif
 
 /*
 * call-seq:
- * int.anybits?(mask) -> true or false
+ * num.remainder(numeric) -> real
 *
- * Returns +true+ if any bits of <code>+int+ & +mask+</code> are 1.
+ * <code>x.remainder(y)</code> means <code>x-y*(x/y).truncate</code>.
+ *
+ * See Numeric#divmod.
 */
 static mrb_value
-int_anybits(mrb_state *mrb, mrb_value self)
+int_remainder(mrb_state *mrb, mrb_value x)
 {
- mrb_int n, m;
+ mrb_value y = mrb_get_arg1(mrb);
+ mrb_int a, b;
 
- mrb_get_args(mrb, "i", &m);
- n = mrb_integer(self);
- return mrb_bool_value((n & m) != 0);
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ if (mrb_integer_p(y) || mrb_bigint_p(y)) {
+ return mrb_bint_rem(mrb, x, y);
+ }
+ return flo_remainder(mrb, mrb_float_value(mrb, mrb_as_float(mrb, x)));
+ }
+#endif
+ a = mrb_integer(x);
+ if (mrb_integer_p(y)) {
+ b = mrb_integer(y);
+ if (b == 0) mrb_int_zerodiv(mrb);
+ if (a == MRB_INT_MIN && b == -1) return mrb_fixnum_value(0);
+ return mrb_int_value(mrb, a % b);
+ }
+#ifdef MRB_NO_FLOAT
+ mrb_raise(mrb, E_TYPE_ERROR, "non integer remainder");
+#else
+ return flo_remainder(mrb, mrb_float_value(mrb, mrb_as_float(mrb, x)));
+#endif
 }
 
+mrb_value mrb_int_pow(mrb_state *mrb, mrb_value x, mrb_value y);
+
 /*
- * call-seq:
- * int.nobits?(mask) -> true or false
+ * call-seq:
+ * integer.pow(numeric) -> numeric
+ * integer.pow(integer, integer) -> integer
+ *
+ * Returns (modular) exponentiation as:
 *
- * Returns +true+ if no bits of <code>+int+ & +mask+</code> are 1.
+ * a.pow(b) #=> same as a**b
+ * a.pow(b, m) #=> same as (a**b) % m, but avoids huge temporary values
 */
 static mrb_value
-int_nobits(mrb_state *mrb, mrb_value self)
+int_powm(mrb_state *mrb, mrb_value x)
 {
- mrb_int n, m;
+ mrb_value m;
+ mrb_int e, exp, mod, result = 1;
 
- mrb_get_args(mrb, "i", &m);
- n = mrb_integer(self);
- return mrb_bool_value((n & m) == 0);
-}
-
-static void
-zerodiv(mrb_state *mrb)
-{
- mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0");
+ if (mrb_get_argc(mrb) == 1) {
+ return mrb_int_pow(mrb, x, mrb_get_arg1(mrb));
+ }
+ mrb_get_args(mrb, "io", &e, &m);
+ if (e < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "int.pow(n,m): n must be positive");
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_powm(mrb, x, e, m);
+ }
+ if (mrb_bigint_p(m)) {
+ return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), e, m);
+ }
+#endif
+ if (!mrb_integer_p(m)) mrb_raise(mrb, E_TYPE_ERROR, "int.pow(n,m): m must be integer");
+ mod = mrb_integer(m);
+ if (mod < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "int.pow(n,m): m must be positive when 2nd argument specified");
+ if (mod == 0) mrb_int_zerodiv(mrb);
+ if (mod == 1) return mrb_fixnum_value(0);
+ mrb_int base = mrb_integer(x);
+ exp = e;
+ for (;;) {
+ mrb_int tmp;
+ if (exp & 1) {
+ if (mrb_int_mul_overflow(result, base, &tmp)) {
+ result %= mod; base %= mod;
+ if (mrb_int_mul_overflow(result, base, &tmp)) {
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), e, m);
+#else
+ mrb_int_overflow(mrb, "pow");
+#endif
+ }
+ }
+ result = tmp % mod;
+ }
+ exp >>= 1;
+ if (exp == 0) break;
+ if (mrb_int_mul_overflow(base, base, &tmp)) {
+ base %= mod;
+ if (mrb_int_mul_overflow(base, base, &tmp)) {
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), e, m);
+#else
+ mrb_int_overflow(mrb, "pow");
+#endif
+ }
+ }
+ base = tmp % mod;
+ }
+ return mrb_int_value(mrb, result);
 }
 
 /*
 * call-seq:
- * num.remainder(numeric) -> real
+ * digits(base = 10) -> array_of_integers
 *
- * <code>x.remainder(y)</code> means <code>x-y*(x/y).truncate</code>.
+ * Returns an array of integers representing the +base+-radix
+ * digits of +self+;
+ * the first element of the array represents the least significant digit:
+ *
+ * 12345.digits # => 5, 4, 3, 2, 1
+ * 12345.digits(7) # => 4, 6, 6, 0, 5
+ * 12345.digits(100) # => 45, 23, 1
+ *
+ * Raises an exception if +self+ is negative or +base+ is less than 2.
 *
- * See Numeric#divmod.
 */
+
 static mrb_value
-int_remainder(mrb_state *mrb, mrb_value x)
+int_digits(mrb_state *mrb, mrb_value self)
 {
- mrb_value y = mrb_get_arg1(mrb);
- mrb_int a, b;
+ mrb_int base = 10;
 
- a = mrb_integer(x);
- if (mrb_integer_p(y)) {
- b = mrb_integer(y);
- if (b == 0) zerodiv(mrb);
- if (a == MRB_INT_MIN && b == -1) return mrb_fixnum_value(0);
- return mrb_int_value(mrb, a % b);
+ mrb_get_args(mrb, "|i", &base);
+ if (base < 0) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "negative radix");
+ }
+ else if (base < 2) {
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid radix %i", base);
+ }
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(self)) {
+ mrb_value x = self;
+ mrb_value zero = mrb_fixnum_value(0);
+ mrb_value bv = mrb_int_value(mrb, base);
+ if (mrb_bint_cmp(mrb, x, zero) < 0) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "number should be positive");
+ }
+ mrb_value digits = mrb_ary_new(mrb);
+
+ while (mrb_bint_cmp(mrb, x, zero) == 0) {
+ mrb_ary_push(mrb, digits, zero);
+ return digits;
+ }
+
+ while (mrb_bint_cmp(mrb, x, zero) > 0) {
+ mrb_value q = mrb_bint_mod(mrb, x, bv);
+ mrb_ary_push(mrb, digits, q);
+ x = mrb_bint_div(mrb, x, bv);
+ if (!mrb_bigint_p(x)) {
+ mrb_int n = mrb_integer(x);
+ while (n > 0) {
+ mrb_int q = n % base;
+ mrb_ary_push(mrb, digits, mrb_int_value(mrb, q));
+ n /= base;
+ }
+ break;
+ }
+ }
+ return digits;
 }
-#ifdef MRB_NO_FLOAT
- mrb_raise(mrb, E_TYPE_ERROR, "non integer remainder");
-#else
- mrb_float n = (mrb_float)a;
- mrb_float m = mrb_as_float(mrb, y);
-
- if (isinf(m)) return mrb_float_value(mrb, n);
- return mrb_float_value(mrb, n-m*trunc(n/m));
 #endif
+ mrb_int n = mrb_integer(self);
+ if (n < 0) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "number should be positive");
+ }
+
+ mrb_value digits = mrb_ary_new(mrb);
+
+ if (n == 0) {
+ mrb_ary_push(mrb, digits, mrb_fixnum_value(0));
+ return digits;
+ }
+
+ while (n > 0) {
+ mrb_int q = n % base;
+ mrb_ary_push(mrb, digits, mrb_int_value(mrb, q));
+ n /= base;
+ }
+ return digits;
 }
 
 #ifndef MRB_NO_FLOAT
@@ -96,7 +202,7 @@
 
 a = mrb_float(self);
 mrb_get_args(mrb, "f", &b);
- if (b == 0) zerodiv(mrb);
+ if (b == 0) mrb_int_zerodiv(mrb);
 if (isinf(b)) return mrb_float_value(mrb, a);
 return mrb_float_value(mrb, a-b*trunc(a/b));
 }
@@ -105,17 +211,16 @@
 void
 mrb_mruby_numeric_ext_gem_init(mrb_state* mrb)
 {
- struct RClass *i = mrb_class_get(mrb, "Integer");
-
- mrb_define_method(mrb, i, "allbits?", int_allbits, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, i, "anybits?", int_anybits, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, i, "nobits?", int_nobits, MRB_ARGS_REQ(1));
+ struct RClass *i = mrb->integer_class;
 
 mrb_define_alias(mrb, i, "modulo", "%");
 mrb_define_method(mrb, i, "remainder", int_remainder, MRB_ARGS_REQ(1));
 
+ mrb_define_method_id(mrb, i, MRB_SYM(pow), int_powm, MRB_ARGS_ARG(1,1));
+ mrb_define_method_id(mrb, i, MRB_SYM(digits), int_digits, MRB_ARGS_OPT(1));
+
 #ifndef MRB_NO_FLOAT
- struct RClass *f = mrb_class_get(mrb, "Float");
+ struct RClass *f = mrb->float_class;
 
 mrb_define_alias(mrb, f, "modulo", "%");
 mrb_define_method(mrb, f, "remainder", flo_remainder, MRB_ARGS_REQ(1));

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-numeric-ext/test/numeric.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-numeric-ext/test/numeric.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize/mrbgem.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize/mrbgem.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize/src/memsize.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize/src/memsize.c Changed

@@ -10,6 +10,7 @@
 #include <mruby/proc.h>
 #include <mruby/value.h>
 #include <mruby/range.h>
+#include <mruby/internal.h>
 
 static size_t
 os_memsize_of_irep(mrb_state* state, const struct mrb_irep *irep)
@@ -127,24 +128,29 @@
 case MRB_TT_INTEGER:
 if (mrb_immediate_p(obj))
 break;
- case MRB_TT_RATIONAL:
+ case MRB_TT_RATIONAL:
 #if defined(MRB_USE_RATIONAL)
 #if defined(MRB_INT64) && defined(MRB_32BIT)
- size += sizeof(mrb_int)*2;
+ size += sizeof(mrb_int)*2;
 #endif
- size += mrb_objspace_page_slot_size();
+ size += mrb_objspace_page_slot_size();
 #endif
- break;
+ break;
 
- case MRB_TT_COMPLEX:
+ case MRB_TT_COMPLEX:
 #if defined(MRB_USE_COMPLEX)
 #if defined(MRB_32BIT) && !defined(MRB_USE_FLOAT32)
- size += sizeof(mrb_float)*2;
+ size += sizeof(mrb_float)*2;
+#endif
+ size += mrb_objspace_page_slot_size();
 #endif
- size += mrb_objspace_page_slot_size();
+ break;
+ case MRB_TT_BIGINT:
+#if defined(MRB_USE_BIGINT)
+ size += mrb_bint_memsize(obj);
+ /* fall through */
 #endif
- break;
- case MRB_TT_DATA:
+ case MRB_TT_CDATA:
 case MRB_TT_ISTRUCT:
 size += mrb_objspace_page_slot_size();
 break;

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-pack/mrbgem.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-pack/mrbgem.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-pack/src/pack.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-pack/src/pack.c Changed

@@ -12,7 +12,6 @@
 #include "mruby/endian.h"
 
 #include <ctype.h>
-#include <errno.h>
 #include <string.h>
 
 #define INT_OVERFLOW_P(n) ((n) < MRB_INT_MIN || (n) > MRB_INT_MAX)
@@ -72,9 +71,17 @@
 
 const static unsigned char base64chars =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static unsigned char base64_dec_tab128;
+const static unsigned char base64_dec_tab =
+ "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+ "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
+ "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x3e\xff\xff\xff\x3f"
+ "\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\xff\xff\xff\xfe\xff\xff"
+ "\xff\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e"
+ "\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\xff\xff\xff\xff\xff"
+ "\xff\x1a\x1b\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28"
+ "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\xff\xff\xff\xff\xff";
 
-static unsigned int
+static int
 hex2int(unsigned char ch)
 {
 if (ch >= '0' && ch <= '9')
@@ -87,22 +94,6 @@
 return -1;
 }
 
-static void
-make_base64_dec_tab(void)
-{
- int i;
- memset(base64_dec_tab, PACK_BASE64_IGNORE, sizeof(base64_dec_tab));
- for (i = 0; i < 26; i++)
- base64_dec_tab'A' + i = i;
- for (i = 0; i < 26; i++)
- base64_dec_tab'a' + i = i + 26;
- for (i = 0; i < 10; i++)
- base64_dec_tab'0' + i = i + 52;
- base64_dec_tab'+'+0 = 62;
- base64_dec_tab'/'+0 = 63;
- base64_dec_tab'='+0 = PACK_BASE64_PADDING;
-}
-
 static mrb_value
 str_len_ensure(mrb_state *mrb, mrb_value str, mrb_int len)
 {
@@ -205,18 +196,18 @@
 return;
 }
 
- *p -- = '\0';
- len --;
+ *p-- = '\0';
+ len--;
 
 if (n > 0) {
 for (; len > 0 && n > 0; len --, n /= 10) {
 *p -- = '0' + (n % 10);
 }
- p ++;
+ p++;
 }
 else if (len > 0) {
 *p = '0';
- len --;
+ len--;
 }
 
 memmove(buf, p, bufend - p);
@@ -301,18 +292,18 @@
 return;
 }
 
- *p -- = '\0';
- len --;
+ *p-- = '\0';
+ len--;
 
 if (n > 0) {
- for (; len > 0 && n > 0; len --, n /= 10) {
- *p -- = '0' + (n % 10);
+ for (; len > 0 && n > 0; len--, n /= 10) {
+ *p-- = '0' + (n % 10);
 }
- p ++;
+ p++;
 }
 else if (len > 0) {
 *p = '0';
- len --;
+ len--;
 }
 
 memmove(buf, p, bufend - p);
@@ -331,8 +322,8 @@
 }
 
 if (n < 0) {
- *buf ++ = '-';
- len --;
+ *buf++ = '-';
+ len--;
 n = -n;
 }
 
@@ -387,13 +378,13 @@
 pack_BER(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
 {
 mrb_int n = mrb_integer(o);
- size_t i;
+ int i;
 char *p;
 
 if (n < 0) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "can't compress negative numbers");
 }
- for (i=1; i<sizeof(mrb_int)+1; i++) {
+ for (i=1; i<(int)sizeof(mrb_int)+1; i++) {
 mrb_int mask = ~((1L<<(7*i))-1);
 if ((n & mask) == 0) break;
 }
@@ -410,10 +401,12 @@
 static int
 unpack_BER(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
 {
- mrb_int i, n = 0;
+ int i;
+ mrb_int n = 0;
 const unsigned char *p = src;
 const unsigned char *e = p + srclen;
 
+ if (srclen == 0) return 0;
 for (i=1; p<e; p++,i++) {
 if (n > (MRB_INT_MAX>>7)) {
 mrb_raise(mrb, E_RANGE_ERROR, "BER unpacking 'w' overflow");
@@ -441,13 +434,13 @@
 memcpy(RSTRING_PTR(str) + sidx, buffer, 8);
 }
 else {
- for (i = 0; i < 8; ++i) {
+ for (i = 0; i < 8; i++) {
 RSTRING_PTR(str)sidx + i = buffer8 - i - 1;
 }
 }
 } else {
 if (littleendian) {
- for (i = 0; i < 8; ++i) {
+ for (i = 0; i < 8; i++) {
 RSTRING_PTR(str)sidx + i = buffer8 - i - 1;
 }
 }
@@ -471,13 +464,13 @@
 memcpy(buffer, src, 8);
 }
 else {
- for (i = 0; i < 8; ++i) {
+ for (i = 0; i < 8; i++) {
 buffer8 - i - 1 = srci;
 }
 }
 } else {
 if (littleendian) {
- for (i = 0; i < 8; ++i) {
+ for (i = 0; i < 8; i++) {
 buffer8 - i - 1 = srci;
 }
 }
@@ -504,13 +497,13 @@
 memcpy(RSTRING_PTR(str) + sidx, buffer, 4);
 }
 else {
- for (i = 0; i < 4; ++i) {
+ for (i = 0; i < 4; i++) {
 RSTRING_PTR(str)sidx + i = buffer4 - i - 1;
 }
 }
 } else {
 if (littleendian) {
- for (i = 0; i < 4; ++i) {
+ for (i = 0; i < 4; i++) {
 RSTRING_PTR(str)sidx + i = buffer4 - i - 1;
 }
 }
@@ -534,13 +527,13 @@
 memcpy(buffer, src, 4);
 }
 else {
- for (i = 0; i < 4; ++i) {
+ for (i = 0; i < 4; i++) {
 buffer4 - i - 1 = srci;
 }
 }
 } else {
 if (littleendian) {
- for (i = 0; i < 4; ++i) {
+ for (i = 0; i < 4; i++) {
 buffer4 - i - 1 = srci;
 }
 }
@@ -620,6 +613,7 @@
 }
 if (!(uv & 0x40)) {
 *lenp = 1;
+ malformed:
 mrb_raise(mrb, E_ARGUMENT_ERROR, "malformed UTF-8 character");
 }
 
@@ -630,7 +624,7 @@
 else if (!(uv & 0x02)) { n = 6; uv &= 0x01; }
 else {
 *lenp = 1;
- mrb_raise(mrb, E_ARGUMENT_ERROR, "malformed UTF-8 character");
+ goto malformed;
 }
 if (n > *lenp) {
 mrb_raisef(mrb, E_ARGUMENT_ERROR, "malformed UTF-8 character (expected %d bytes, given %d bytes)",
@@ -642,7 +636,7 @@
 c = *p++ & 0xff;
 if ((c & 0xc0) != 0x80) {
 *lenp -= n + 1;
- mrb_raise(mrb, E_ARGUMENT_ERROR, "malformed UTF-8 character");
+ goto malformed;
 }
 else {
 c &= 0x3f;
@@ -709,9 +703,18 @@
 return (int)(dptr - dptr0);
 }
 
+#define CHECK_UNPACK_LEN(mrb, slen, ary) do {\
+ if ((slen) <= 0) {\
+ mrb_ary_push(mrb, ary, mrb_str_new(mrb, 0, 0));\
+ return 0;\
+ }\
+} while (0)
+
 static int
 unpack_str(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, unsigned int flags)
 {
+ CHECK_UNPACK_LEN(mrb, slen, ary);
+
 mrb_value dst;
 const char *cp, *sptr;
 int copylen;
@@ -746,7 +749,8 @@
 static int
 pack_hex(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int count, unsigned int flags)
 {
- unsigned int a, ashift, b, bshift;
+ int a, b;
+ unsigned int ashift, bshift;
 long slen;
 char *dptr, *dptr0, *sptr;
 
@@ -792,6 +796,8 @@
 static int
 unpack_hex(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, unsigned int flags)
 {
+ CHECK_UNPACK_LEN(mrb, slen, ary);
+
 mrb_value dst;
 int a, ashift, b, bshift;
 const char *sptr, *sptr0;
@@ -905,6 +911,8 @@
 static int
 unpack_base64(mrb_state *mrb, const void *src, int slen, mrb_value ary)
 {
+ CHECK_UNPACK_LEN(mrb, slen, ary);
+
 mrb_value dst;
 int dlen;
 unsigned long l;
@@ -1022,6 +1030,8 @@
 static int
 unpack_qenc(mrb_state *mrb, const void *src, int slen, mrb_value ary)
 {
+ CHECK_UNPACK_LEN(mrb, slen, ary);
+
 mrb_value buf = mrb_str_new(mrb, 0, slen);
 const char *s = (const char*)src, *ss = s;
 const char *send = s + slen;
@@ -1295,12 +1305,12 @@
 ch = tptrtmpl->idx;
 if (ISDIGIT(ch)) {
 char *e;
- mrb_int n = mrb_int_read(tptr+tmpl->idx, tptr+tlen, &e);
- if (e == NULL || n > INT_MAX) {
+ mrb_int n;
+ if (!mrb_read_int(tptr+tmpl->idx, tptr+tlen, &e, &n) || INT_MAX < n) {
 mrb_raise(mrb, E_RUNTIME_ERROR, "too big template length");
 }
 count = (int)n;
- tmpl->idx = e - tptr;
+ tmpl->idx = (int)(e - tptr);
 continue;
 } else if (ch == '*') {
 if (type == PACK_TYPE_NONE)
@@ -1387,13 +1397,12 @@
 
 o = mrb_ary_ref(mrb, ary, aidx);
 if (type == PACK_TYPE_INTEGER) {
- o = mrb_to_integer(mrb, o);
+ o = mrb_ensure_int_type(mrb, o);
 }
 #ifndef MRB_NO_FLOAT
 else if (type == PACK_TYPE_FLOAT) {
 if (!mrb_float_p(o)) {
- mrb_float f = mrb_as_float(mrb, o);
- o = mrb_float_value(mrb, f);
+ o = mrb_ensure_float_type(mrb, o);
 }
 }
 #endif
@@ -1516,7 +1525,6 @@
 case PACK_DIR_BASE64:
 srcidx += unpack_base64(mrb, sptr, srclen - srcidx, result);
 continue;
- break;
 case PACK_DIR_QENC:
 srcidx += unpack_qenc(mrb, sptr, srclen - srcidx, result);
 continue;
@@ -1524,7 +1532,7 @@
 break;
 }
 
- while (count != 0) {
+ while (count != 0 && srcidx < srclen) {
 if (srclen - srcidx < size) {
 while (count-- > 0) {
 mrb_ary_push(mrb, result, mrb_nil_value());
@@ -1567,14 +1575,12 @@
 count--;
 }
 }
- if (single) break;
- }
-
- if (single) {
- if (RARRAY_LEN(result) > 0) {
- return RARRAY_PTR(result)0;
+ if (single) {
+ if (RARRAY_LEN(result) > 0) {
+ return RARRAY_PTR(result)0;
+ }
+ return mrb_nil_value();
 }
- return mrb_nil_value();
 }
 return result;
 }
@@ -1594,8 +1600,6 @@
 void
 mrb_mruby_pack_gem_init(mrb_state *mrb)
 {
- make_base64_dec_tab();
-
 mrb_define_method(mrb, mrb->array_class, "pack", mrb_pack_pack, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, mrb->string_class, "unpack", mrb_pack_unpack, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, mrb->string_class, "unpack1", mrb_pack_unpack1, MRB_ARGS_REQ(1));

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-pack/test/pack.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-pack/test/pack.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-print/mrblib/print.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-print/mrblib/print.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-print/src/print.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-print/src/print.c Changed

@@ -15,43 +15,41 @@
 #endif
 #endif
 
-static void
-printstr(mrb_state *mrb, const char *p, mrb_int len)
-{
-#if defined(_WIN32)
-  if (isatty(fileno(stdout))) {
-    DWORD written;
-    int wlen = MultiByteToWideChar(CP_UTF8, 0, p, (int)len, NULL, 0);
-    wchar_t* utf16 = (wchar_t*)mrb_malloc(mrb, (wlen+1) * sizeof(wchar_t));
-    if (MultiByteToWideChar(CP_UTF8, 0, p, (int)len, utf16, wlen) > 0) {
-      utf16wlen = 0;
-      WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
-                    utf16, (DWORD)wlen, &written, NULL);
-    }
-    mrb_free(mrb, utf16);
-  } else
-#endif
-    fwrite(p, (size_t)len, 1, stdout);
-  fflush(stdout);
-}
-
 static mrb_value
 mrb_printstr(mrb_state *mrb, mrb_value self)
 {
   mrb_value s = mrb_get_arg1(mrb);
 
   if (mrb_string_p(s)) {
-    printstr(mrb, RSTRING_PTR(s), RSTRING_LEN(s));
+    const char *p = RSTRING_PTR(s);
+    mrb_int len = RSTRING_LEN(s);
+
+#if defined(_WIN32)
+    if (isatty(fileno(stdout))) {
+      DWORD written;
+      int wlen = MultiByteToWideChar(CP_UTF8, 0, p, (int)len, NULL, 0);
+      wchar_t* utf16 = (wchar_t*)mrb_malloc(mrb, (wlen+1) * sizeof(wchar_t));
+      if (MultiByteToWideChar(CP_UTF8, 0, p, (int)len, utf16, wlen) > 0) {
+        utf16wlen = 0;
+        WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
+                      utf16, (DWORD)wlen, &written, NULL);
+      }
+      mrb_free(mrb, utf16);
+    }
+    else
+#endif
+    {
+      fwrite(p, (size_t)len, 1, stdout);
+    }
+    fflush(stdout);
   }
-  return s;
+  return mrb_nil_value();
 }
 
 void
 mrb_mruby_print_gem_init(mrb_state* mrb)
 {
-  struct RClass *krn;
-  krn = mrb->kernel_module;
-  mrb_define_method(mrb, krn, "__printstr__", mrb_printstr, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, mrb->kernel_module, "__printstr__", mrb_printstr, MRB_ARGS_REQ(1));
 }
 
 void

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding/mrbgem.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding/mrbgem.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-ext/src/proc.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-proc-ext/src/proc.c Changed

@@ -49,7 +49,7 @@
 const mrb_irep *irep = p->body.irep;
 const char *filename;
 int32_t line;
- mrb_str_cat_lit(mrb, str, "@");
+ mrb_str_cat_lit(mrb, str, " ");
 
 filename = mrb_debug_get_filename(mrb, irep, 0);
 mrb_str_cat_cstr(mrb, str, filename ? filename : "-");
@@ -99,13 +99,13 @@
 mrb_sym name;
 int size;
 } *p, parameters_list = {
- {MRB_SYM(req), 0},
- {MRB_SYM(opt), 0},
- {MRB_SYM(rest), 0},
- {MRB_SYM(req), 0},
- {MRB_SYM(keyrest), 0},
- {MRB_SYM(block), 0},
- {MRB_SYM(key), 0},
+ {MRB_SYM(req), 0},
+ {MRB_SYM(opt), 0},
+ {MRB_SYM(rest), 0},
+ {MRB_SYM(req), 0},
+ {MRB_SYM(keyrest),0},
+ {MRB_SYM(block), 0},
+ {MRB_SYM(key), 0},
 {0, 0}
 };
 const struct RProc *proc = mrb_proc_ptr(self);
@@ -115,20 +115,14 @@
 mrb_value krest = mrb_nil_value();
 mrb_value block = mrb_nil_value();
 int i, j;
- int max = -1;
+ int max = 0;
 
 if (MRB_PROC_CFUNC_P(proc)) {
 // TODO cfunc aspec is not implemented yet
 return mrb_ary_new(mrb);
 }
 irep = proc->body.irep;
- if (!irep) {
- return mrb_ary_new(mrb);
- }
- if (!irep->lv) {
- return mrb_ary_new(mrb);
- }
- if (*irep->iseq != OP_ENTER) {
+ if (!irep || !irep->lv || *irep->iseq != OP_ENTER) {
 return mrb_ary_new(mrb);
 }
 
@@ -146,9 +140,11 @@
 parameters_list5.size = MRB_ASPEC_BLOCK(aspec);
 parameters_list6.size = MRB_ASPEC_KEY(aspec);
 
- parameters = mrb_ary_new_capa(mrb, irep->nlocals-1);
+ for (i = 0; parameters_listi.name; i++) {
+ max += parameters_listi.size;
+ }
+ parameters = mrb_ary_new_capa(mrb, max);
 
- max = irep->nlocals-1;
 for (i = 0, p = parameters_list; p->name; p++) {
 mrb_value sname = mrb_symbol_value(p->name);
 
@@ -158,15 +154,7 @@
 a = mrb_ary_new(mrb);
 mrb_ary_push(mrb, a, sname);
 if (i < max && irep->lvi) {
- mrb_sym sym = irep->lvi;
- const char *name = mrb_sym_name(mrb, sym);
- switch (name0) {
- case '*': case '&':
- break;
- default:
- mrb_ary_push(mrb, a, mrb_symbol_value(sym));
- break;
- }
+ mrb_ary_push(mrb, a, mrb_symbol_value(irep->lvi));
 }
 if (p->name == MRB_SYM(block)) {
 block = a; continue;
@@ -176,6 +164,8 @@
 }
 mrb_ary_push(mrb, parameters, a);
 }
+ /* need to skip empty block slot */
+ if (p->size == 0 && p->name == MRB_SYM(block)) i++;
 }
 if (!mrb_nil_p(krest)) mrb_ary_push(mrb, parameters, krest);
 if (!mrb_nil_p(block)) mrb_ary_push(mrb, parameters, block);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-random/src/random.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-random/src/random.c Changed

@@ -137,7 +137,7 @@
 }
 
 static mrb_int
-random_rand_i(mrb_state *mrb, rand_state *t, mrb_int max)
+rand_i(rand_state *t, mrb_int max)
 {
 return rand_uint32(t) % max;
 }
@@ -155,12 +155,15 @@
 return arg;
 }
 
+#define ID_RANDOM MRB_SYM(mruby_Random)
+
 static mrb_value
-random_default(mrb_state *mrb) {
- struct RClass *c = mrb_class_get_id(mrb, MRB_SYM(Random));
- mrb_value d = mrb_const_get(mrb, mrb_obj_value(c), MRB_SYM(DEFAULT));
+random_default(mrb_state *mrb)
+{
+ struct RClass *c = mrb_class_get_id(mrb, ID_RANDOM);
+ mrb_value d = mrb_iv_get(mrb, mrb_obj_value(c), ID_RANDOM);
 if (!mrb_obj_is_kind_of(mrb, d, c)) {
- mrb_raise(mrb, E_TYPE_ERROR, "Random::DEFAULT replaced");
+ mrb_raise(mrb, E_RUNTIME_ERROR, "BUG default Random replaced");
 }
 return d;
 }
@@ -204,7 +207,7 @@
 rand_state *t = random_ptr(self);
 
 if (mrb_get_args(mrb, "|i", &i) == 0) {
- seed = (uint32_t)time(NULL) + rand_uint32(t);
+ seed = (uint32_t)time(NULL) ^ rand_uint32(t) ^ (uint32_t)(uintptr_t)t;
 }
 else {
 seed = (uint32_t)i;
@@ -231,6 +234,23 @@
 return bytes;
 }
 
+static rand_state*
+check_random_arg(mrb_state *mrb, mrb_value r)
+{
+ struct RClass *c = mrb_class_get_id(mrb, ID_RANDOM);
+ rand_state *random;
+
+ if (mrb_undef_p(r)) {
+ random = random_default_state(mrb);
+ }
+ else if (mrb_istruct_p(r) && mrb_obj_is_kind_of(mrb, r, c)){
+ random = (rand_state*)mrb_istruct_ptr(r);
+ }
+ else {
+ mrb_raise(mrb, E_TYPE_ERROR, "Random object required");
+ }
+ return random;
+}
 /*
 * call-seq:
 * ary.shuffle! -> ary
@@ -241,14 +261,15 @@
 static mrb_value
 mrb_ary_shuffle_bang(mrb_state *mrb, mrb_value ary)
 {
- mrb_int i, max;
- rand_state *random;
-
 if (RARRAY_LEN(ary) > 1) {
- struct RClass *c = mrb_class_get_id(mrb, MRB_SYM(Random));
- if (mrb_get_args(mrb, "|I", &random, c) == 0) {
- random = random_default_state(mrb);
- }
+ mrb_int i, max;
+ rand_state *random;
+ mrb_sym kname = MRB_SYM(random);
+ mrb_value r;
+ const mrb_kwargs kw = {1, 0, &kname, &r, NULL};
+
+ mrb_get_args(mrb, ":", &kw);
+ random = check_random_arg(mrb, r);
 mrb_ary_modify(mrb, mrb_ary_ptr(ary));
 max = RARRAY_LEN(ary);
 for (i = RARRAY_LEN(ary) - 1; i > 0; i--) {
@@ -256,7 +277,7 @@
 mrb_value *ptr = RARRAY_PTR(ary);
 mrb_value tmp;
 
- j = random_rand_i(mrb, random, max);
+ j = rand_i(random, max);
 
 tmp = ptri;
 ptri = ptrj;
@@ -305,11 +326,12 @@
 mrb_bool given;
 rand_state *random;
 mrb_int len;
- struct RClass *c = mrb_class_get_id(mrb, MRB_SYM(Random));
+ mrb_sym kname = MRB_SYM(random);
+ mrb_value r;
+ const mrb_kwargs kw = {1, 0, &kname, &r, NULL};
 
- if (mrb_get_args(mrb, "|i?I", &n, &given, &random, c) < 2) {
- random = random_default_state(mrb);
- }
+ mrb_get_args(mrb, "|i?:", &n, &given, &kw);
+ random = check_random_arg(mrb, r);
 len = RARRAY_LEN(ary);
 if (!given) { /* pick one element */
 switch (len) {
@@ -318,7 +340,7 @@
 case 1:
 return RARRAY_PTR(ary)0;
 default:
- return RARRAY_PTR(ary)rand_uint32(random) % len;
+ return RARRAY_PTR(ary)rand_i(random, len);
 }
 }
 else {
@@ -333,7 +355,7 @@
 
 for (;;) {
 retry:
- r = (mrb_int)(rand_uint32(random) % len);
+ r = rand_i(random, len);
 
 for (j=0; j<i; j++) {
 if (mrb_integer(RARRAY_PTR(result)j) == r) {
@@ -386,6 +408,7 @@
 mrb_define_method(mrb, mrb->kernel_module, "srand", random_f_srand, MRB_ARGS_OPT(1));
 
 random = mrb_define_class(mrb, "Random", mrb->object_class);
+ mrb_const_set(mrb, mrb_obj_value(mrb->object_class), ID_RANDOM, mrb_obj_value(random)); // for class check
 MRB_SET_INSTANCE_TT(random, MRB_TT_ISTRUCT);
 mrb_define_class_method(mrb, random, "rand", random_f_rand, MRB_ARGS_OPT(1));
 mrb_define_class_method(mrb, random, "srand", random_f_srand, MRB_ARGS_OPT(1));
@@ -400,8 +423,12 @@
 mrb_define_method(mrb, array, "shuffle!", mrb_ary_shuffle_bang, MRB_ARGS_OPT(1));
 mrb_define_method(mrb, array, "sample", mrb_ary_sample, MRB_ARGS_OPT(2));
 
- mrb_const_set(mrb, mrb_obj_value(random), MRB_SYM(DEFAULT),
- mrb_obj_new(mrb, random, 0, NULL));
+ mrb_value d = mrb_obj_new(mrb, random, 0, NULL);
+ rand_state *t = random_ptr(d);
+ mrb_iv_set(mrb, mrb_obj_value(random), ID_RANDOM, d);
+
+ uint32_t seed = (uint32_t)time(NULL);
+ rand_seed(t, seed ^ (uint32_t)(uintptr_t)t);
 }
 
 void mrb_mruby_random_gem_final(mrb_state *mrb)

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-random/test/random.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-random/test/random.rb Changed

@@ -73,14 +73,14 @@
 assert("Array#shuffle(random)") do
   assert_raise(TypeError) do
     # this will cause an exception due to the wrong argument
-    1, 2.shuffle "Not a Random instance"
+    1, 2.shuffle(random: "Not a Random instance")
   end
 
   # verify that the same seed causes the same results
   ary = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-  shuffled1 = ary.shuffle Random.new 345
-  shuffled2 = ary.shuffle Random.new 345
-  shuffled3 = ary.shuffle Random.new 346
+  shuffled1 = ary.shuffle(random: Random.new(345))
+  shuffled2 = ary.shuffle(random: Random.new(345))
+  shuffled3 = ary.shuffle(random: Random.new(346))
   assert_equal(shuffled1, shuffled2)
   assert_not_equal(shuffled1, shuffled3)
 end
@@ -88,16 +88,16 @@
 assert('Array#shuffle!(random)') do
   assert_raise(TypeError) do
     # this will cause an exception due to the wrong argument
-    1, 2.shuffle! "Not a Random instance"
+    1, 2.shuffle!(random: "Not a Random instance")
   end
 
   # verify that the same seed causes the same results
   ary1 = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-  ary1.shuffle! Random.new 345
+  ary1.shuffle!(random: Random.new(345))
   ary2 = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-  ary2.shuffle! Random.new 345
+  ary2.shuffle!(random: Random.new(345))
   ary3 = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-  ary3.shuffle! Random.new 346
+  ary3.shuffle!(random: Random.new(346))
   assert_equal(ary1, ary2)
   assert_not_equal(ary1, ary3)
 end
@@ -123,15 +123,15 @@
 assert('Array#sample(random)') do
   assert_raise(TypeError) do
     # this will cause an exception due to the wrong argument
-    1, 2.sample(2, "Not a Random instance")
+    1, 2.sample(2, random: "Not a Random instance")
   end
 
   # verify that the same seed causes the same results
   ary = (1..10).to_a
   srand(15)
   samples1 = ary.sample(4)
-  samples2 = ary.sample(4, Random.new(15))
-  samples3 = ary.sample(4, Random.new(16))
+  samples2 = ary.sample(4, random: Random.new(15))
+  samples3 = ary.sample(4, random: Random.new(16))
   assert_equal(samples1, samples2)
   assert_not_equal(samples1, samples3)
 end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-range-ext/src/range.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-range-ext/src/range.c Changed

@@ -2,29 +2,33 @@
 #include <mruby/range.h>
 
 static mrb_bool
-r_le(mrb_state *mrb, mrb_value a, mrb_value b)
+r_less(mrb_state *mrb, mrb_value a, mrb_value b, mrb_bool excl)
 {
- mrb_int n = mrb_cmp(mrb, a, b);
-
- if (n == 0 || n == -1) return TRUE;
- return FALSE;
-}
-
-static mrb_bool
-r_lt(mrb_state *mrb, mrb_value a, mrb_value b)
-{
- return mrb_cmp(mrb, a, b) == -1;
+ switch (mrb_cmp(mrb, a, b)) {
+ case -2: /* failure */
+ case 1:
+ return FALSE;
+ case 0:
+ return !excl;
+ case -1:
+ default: /* just in case */
+ return TRUE;
+ }
 }
 
 /*
 * call-seq:
 * rng.cover?(obj) -> true or false
+ * rng.cover?(range) -> true or false
+ *
+ * Returns +true+ if the given argument is within +self+, +false+ otherwise.
+ *
+ * With non-range argument +object+, evaluates with <tt><=</tt> and <tt><</tt>.
 *
- * Returns <code>true</code> if +obj+ is between the begin and end of
- * the range.
+ * For range +self+ with included end value (<tt>#exclude_end? == false</tt>),
+ * evaluates thus:
 *
- * This tests <code>begin <= obj <= end</code> when #exclude_end? is +false+
- * and <code>begin <= obj < end</code> when #exclude_end? is +true+.
+ * self.begin <= object <= self.end
 *
 * ("a".."z").cover?("c") #=> true
 * ("a".."z").cover?("5") #=> false
@@ -40,20 +44,53 @@
 beg = RANGE_BEG(r);
 end = RANGE_END(r);
 
- if (r_le(mrb, beg, val)) {
- if (mrb_nil_p(end)) {
+ if (mrb_nil_p(beg) && mrb_nil_p(end)) return mrb_true_value();
+
+ if (mrb_range_p(val)) {
+ struct RRange *r2 = mrb_range_ptr(mrb, val);
+ mrb_value beg2 = RANGE_BEG(r2);
+ mrb_value end2 = RANGE_END(r2);
+
+ /* range.cover?(nil..nil) => true */
+ if (mrb_nil_p(beg2) && mrb_nil_p(end2)) return mrb_true_value();
+
+ /* (a..b).cover?(c..d) */
+ if (mrb_nil_p(end)) { /* a.. */
+ /* (a..).cover?(c..) => true */
+ if (mrb_nil_p(end2)) return mrb_bool_value(mrb_cmp(mrb, beg, beg2) != -2);
+ /* (a..).cover?(c..d) where d<a => false */
+ if (r_less(mrb, end2, beg, RANGE_EXCL(r2))) return mrb_false_value();
 return mrb_true_value();
 }
- if (RANGE_EXCL(r)) {
- if (r_lt(mrb, val, end))
- return mrb_true_value();
+ else if (mrb_nil_p(beg)) { /* ..b */
+ /* (..b).cover?(..d) => true */
+ if (mrb_nil_p(beg2)) return mrb_bool_value(mrb_cmp(mrb, end, end2) != -2);
+ /* (..b).cover?(c..d) where b<c => false */
+ if (r_less(mrb, end, beg2, RANGE_EXCL(r))) return mrb_false_value();
+ return mrb_true_value();
 }
- else {
- if (r_le(mrb, val, end))
- return mrb_true_value();
+ else { /* a..b */
+ /* (a..b).cover?(c..) => (c<b) */
+ if (mrb_nil_p(end2))
+ return mrb_bool_value(r_less(mrb, beg2, end, RANGE_EXCL(r)));
+ /* (a..b).cover?(..d) => (a<d) */
+ if (mrb_nil_p(beg2))
+ return mrb_bool_value(r_less(mrb, beg, end2, RANGE_EXCL(r2)));
+ /* (a..b).cover?(c..d) where (b<c) => false */
+ if (r_less(mrb, end, beg2, RANGE_EXCL(r))) return mrb_false_value();
+ /* (a..b).cover?(c..d) where (d<a) => false */
+ if (r_less(mrb, end2, beg, RANGE_EXCL(r2))) return mrb_false_value();
+ return mrb_true_value();
 }
 }
 
+ if (mrb_nil_p(beg) || r_less(mrb, beg, val, FALSE)) {
+ if (mrb_nil_p(end)) {
+ return mrb_true_value();
+ }
+ if (r_less(mrb, val, end, RANGE_EXCL(r)))
+ return mrb_true_value();
+ }
 return mrb_false_value();
 }
 
@@ -155,7 +192,7 @@
 void
 mrb_mruby_range_ext_gem_init(mrb_state* mrb)
 {
- struct RClass * s = mrb_class_get(mrb, "Range");
+ struct RClass * s = mrb->range_class;
 
 mrb_define_method(mrb, s, "cover?", range_cover, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, s, "size", range_size, MRB_ARGS_NONE());

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-range-ext/test/range.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-range-ext/test/range.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-rational/mrbgem.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-rational/mrbgem.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-rational/src/rational.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-rational/src/rational.c Changed

@@ -1,8 +1,19 @@
 #include <mruby.h>
 #include <mruby/class.h>
 #include <mruby/numeric.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
+#ifndef MRB_NO_FLOAT
+#include <math.h>
+mrb_value mrb_complex_new(mrb_state *, mrb_float, mrb_float);
+#endif
+mrb_bool mrb_complex_eq(mrb_state *mrb, mrb_value, mrb_value);
+mrb_value mrb_complex_add(mrb_state *mrb, mrb_value, mrb_value);
+mrb_value mrb_complex_sub(mrb_state *mrb, mrb_value, mrb_value);
+mrb_value mrb_complex_mul(mrb_state *mrb, mrb_value, mrb_value);
+mrb_value mrb_complex_div(mrb_state *mrb, mrb_value, mrb_value);
+
 struct mrb_rational {
 mrb_int numerator;
 mrb_int denominator;
@@ -33,6 +44,8 @@
 #define rational_ptr(mrb, v) (&((struct RRational*)mrb_obj_ptr(v))->r)
 #endif
 
+mrb_static_assert_object_size(struct RRational);
+
 static struct RBasic*
 rational_alloc(mrb_state *mrb, struct RClass *c, struct mrb_rational **p)
 {
@@ -98,6 +111,15 @@
 
 #define rational_new(mrb,n,d) mrb_rational_new(mrb, n, d)
 
+void
+mrb_rational_copy(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct mrb_rational *p1 = rational_ptr(mrb, x);
+ struct mrb_rational *p2 = rational_ptr(mrb, y);
+ p1->numerator = p2->numerator;
+ p1->denominator = p2->denominator;
+}
+
 inline static mrb_int
 i_gcd(mrb_int x, mrb_int y)
 {
@@ -116,7 +138,7 @@
 
 u = (mrb_uint)x;
 v = (mrb_uint)y;
- for (shift = 0; ((u | v) & 1) == 0; ++shift) {
+ for (shift = 0; ((u | v) & 1) == 0; shift++) {
 u >>= 1;
 v >>= 1;
 }
@@ -325,6 +347,14 @@
 return mrb_false_value();
 }
 
+#ifndef MRB_NO_FLOAT
+static mrb_value
+float_to_r(mrb_state *mrb, mrb_value self)
+{
+ return rational_new_f(mrb, mrb_float(self));
+}
+#endif
+
 static mrb_value
 fix_to_r(mrb_state *mrb, mrb_value self)
 {
@@ -332,6 +362,12 @@
 }
 
 static mrb_value
+nil_to_r(mrb_state *mrb, mrb_value self)
+{
+ return rational_new(mrb, 0, 1);
+}
+
+static mrb_value
 rational_m(mrb_state *mrb, mrb_value self)
 {
 #ifdef MRB_NO_FLOAT
@@ -393,7 +429,6 @@
 #ifdef MRB_USE_COMPLEX
 case MRB_TT_COMPLEX:
 {
- mrb_bool mrb_complex_eq(mrb_state *mrb, mrb_value, mrb_value);
 result = mrb_complex_eq(mrb, y, mrb_rational_to_f(mrb, x));
 break;
 }
@@ -405,10 +440,6 @@
 return mrb_bool_value(result);
 }
 
-#ifndef MRB_NO_FLOAT
-mrb_value mrb_complex_new(mrb_state *, mrb_float, mrb_float);
-#endif
-
 static mrb_value
 rational_cmp(mrb_state *mrb, mrb_value x)
 {
@@ -455,11 +486,6 @@
 return mrb_fixnum_value(0);
 }
 #endif
-#ifdef MRB_USE_COMPLEX
- case MRB_TT_COMPLEX:
- x = mrb_complex_new(mrb, rat_float(p1), 0);
- return mrb_funcall_id(mrb, x, MRB_OPSYM(cmp), 1, y);
-#endif
 default:
 x = mrb_funcall_id(mrb, y, MRB_OPSYM(cmp), 1, x);
 if (mrb_integer_p(x)) {
@@ -479,11 +505,10 @@
 return rational_new(mrb, -n, p->denominator);
 }
 
-static mrb_value
-rational_add(mrb_state *mrb, mrb_value x)
+mrb_value
+mrb_rational_add(mrb_state *mrb, mrb_value x, mrb_value y)
 {
 struct mrb_rational *p1 = rational_ptr(mrb, x);
- mrb_value y = mrb_get_arg1(mrb);
 
 switch (mrb_type(y)) {
 case MRB_TT_INTEGER:
@@ -513,16 +538,27 @@
 }
 #endif
 
+#if defined(MRB_USE_COMPLEX)
+ case MRB_TT_COMPLEX:
+ return mrb_complex_add(mrb, mrb_complex_new(mrb, rat_float(p1), 0), y);
+#endif
+
 default:
 return mrb_funcall_id(mrb, y, MRB_OPSYM(add), 1, x);
 }
 }
 
 static mrb_value
-rational_sub(mrb_state *mrb, mrb_value x)
+rational_add(mrb_state *mrb, mrb_value x)
 {
- struct mrb_rational *p1 = rational_ptr(mrb, x);
 mrb_value y = mrb_get_arg1(mrb);
+ return mrb_rational_add(mrb, x, y);
+}
+
+mrb_value
+mrb_rational_sub(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct mrb_rational *p1 = rational_ptr(mrb, x);
 
 switch (mrb_type(y)) {
 case MRB_TT_INTEGER:
@@ -546,8 +582,7 @@
 
 #if defined(MRB_USE_COMPLEX)
 case MRB_TT_COMPLEX:
- x = mrb_complex_new(mrb, rat_float(p1), 0);
- return mrb_funcall_id(mrb, x, MRB_OPSYM(sub), 1, y);
+ return mrb_complex_sub(mrb, mrb_complex_new(mrb, rat_float(p1), 0), y);
 #endif
 
 #ifndef MRB_NO_FLOAT
@@ -565,10 +600,16 @@
 }
 
 static mrb_value
-rational_mul(mrb_state *mrb, mrb_value x)
+rational_sub(mrb_state *mrb, mrb_value x)
 {
- struct mrb_rational *p1 = rational_ptr(mrb, x);
 mrb_value y = mrb_get_arg1(mrb);
+ return mrb_rational_sub(mrb, x, y);
+}
+
+mrb_value
+mrb_rational_mul(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+ struct mrb_rational *p1 = rational_ptr(mrb, x);
 
 switch (mrb_type(y)) {
 case MRB_TT_INTEGER:
@@ -595,21 +636,33 @@
 }
 #endif
 
+#if defined(MRB_USE_COMPLEX)
+ case MRB_TT_COMPLEX:
+ return mrb_complex_mul(mrb, mrb_complex_new(mrb, rat_float(p1), 0), y);
+#endif
+
 default:
 return mrb_funcall_id(mrb, y, MRB_OPSYM(mul), 1, x);
 }
 }
 
+static mrb_value
+rational_mul(mrb_state *mrb, mrb_value x)
+{
+ mrb_value y = mrb_get_arg1(mrb);
+ return mrb_rational_mul(mrb, x, y);
+}
+
 mrb_value
-mrb_rational_div(mrb_state *mrb, mrb_value x)
+mrb_rational_div(mrb_state *mrb, mrb_value x, mrb_value y)
 {
 struct mrb_rational *p1 = rational_ptr(mrb, x);
- mrb_value y = mrb_get_arg1(mrb);
 
 switch (mrb_type(y)) {
 case MRB_TT_INTEGER:
 {
 mrb_int z = mrb_integer(y);
+ if (z == 0) mrb_int_zerodiv(mrb);
 if (mrb_int_mul_overflow(p1->denominator, z, &z)) rat_overflow(mrb);
 return rational_new_i(mrb, p1->numerator, z);
 }
@@ -625,8 +678,7 @@
 
 #if defined(MRB_USE_COMPLEX)
 case MRB_TT_COMPLEX:
- x = mrb_complex_new(mrb, rat_float(p1), 0);
- return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
+ return mrb_complex_div(mrb, mrb_complex_new(mrb, rat_float(p1), 0), y);
 #endif
 
 default:
@@ -642,64 +694,75 @@
 }
 }
 
-#define rational_div mrb_rational_div
-mrb_int mrb_div_int(mrb_state *, mrb_int, mrb_int);
-
-#ifndef MRB_USE_COMPLEX
-/* 15.2.8.3.4 */
-/*
- * redefine Integer#/
- */
 static mrb_value
-rational_int_div(mrb_state *mrb, mrb_value x)
+rational_div(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
- mrb_int a = mrb_integer(x);
-
- if (mrb_integer_p(y)) {
- mrb_int div = mrb_div_int(mrb, a, mrb_integer(y));
- return mrb_int_value(mrb, div);
- }
- switch (mrb_type(y)) {
- case MRB_TT_RATIONAL:
- return rational_div(mrb, rational_new(mrb, a, 1));
- default:
-#ifdef MRB_NO_FLOAT
- case MRB_TT_FLOAT:
- mrb_raise(mrb, E_TYPE_ERROR, "non integer multiplication");
-#else
- return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
-#endif
- }
+ return mrb_rational_div(mrb, x, y);
 }
 
-/* 15.2.9.3.19(x) */
-/*
- * redefine Integer#quo
- */
-
 static mrb_value
-rational_int_quo(mrb_state *mrb, mrb_value x)
+rational_pow(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
- mrb_int a = mrb_integer(x);
+ struct mrb_rational *p1 = rational_ptr(mrb, x);
+#ifndef MRB_NO_FLOAT
+ double d1, d2;
 
- if (mrb_integer_p(y)) {
- return rational_new(mrb, a, mrb_integer(y));
- }
 switch (mrb_type(y)) {
 case MRB_TT_RATIONAL:
- x = rational_new(mrb, a, 1);
- return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
+ {
+ struct mrb_rational *p2 = rational_ptr(mrb, y);
+ if (p2->numerator == 0) {
+ return mrb_rational_new(mrb, 1, 1);
+ }
+ if (p2->numerator == p2->denominator) {
+ return x;
+ }
+ if (p2->denominator == 1) {
+ return rational_new_i(mrb, (mrb_int)pow((mrb_float)p1->numerator, (mrb_float)p2->numerator),
+ (mrb_int)pow((mrb_float)p1->denominator, (mrb_float)p2->numerator));
+ }
+ d1 = rat_float(p1);
+ d2 = rat_float(p2);
+ }
+ break;
+ case MRB_TT_FLOAT:
+ {
+ d1 = rat_float(p1);
+ d2 = mrb_float(y);
+ }
+ break;
+ case MRB_TT_INTEGER:
+ {
+ mrb_int i = mrb_integer(y);
+ if (i == 0) {
+ return mrb_rational_new(mrb, 1, 1);
+ }
+ if (i == 1) {
+ return x;
+ }
+ return rational_new_i(mrb, (mrb_int)pow((mrb_float)p1->numerator, (mrb_float)i),
+ (mrb_int)pow((mrb_float)p1->denominator, (mrb_float)i));
+ }
+ break;
 default:
-#ifdef MRB_NO_FLOAT
- mrb_raise(mrb, E_TYPE_ERROR, "non integer multiplication");
+ mrb_raisef(mrb, E_TYPE_ERROR, "%T cannot be converted to Rational", y);
+ }
+ return mrb_float_value(mrb, pow(d1, d2));
 #else
- return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
+ mrb_raisef(mrb, E_NOTIMP_ERROR, "Rational#** not implemented with MRB_NO_FLOAT");
 #endif
- }
 }
-#endif /* !MRB_USE_COMPLEX */
+
+static mrb_value
+rational_hash(mrb_state *mrb, mrb_value rat)
+{
+ struct mrb_rational *r = rational_ptr(mrb, rat);
+ uint32_t hash = mrb_byte_hash((uint8_t*)&r->numerator, sizeof(mrb_int));
+ hash = mrb_byte_hash_step((uint8_t*)&r->denominator, sizeof(mrb_int), hash);
+ return mrb_int_value(mrb, hash);
+}
 
 void mrb_mruby_rational_gem_init(mrb_state *mrb)
 {
@@ -725,11 +788,13 @@
 mrb_define_method(mrb, rat, "*", rational_mul, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, rat, "/", rational_div, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, rat, "quo", rational_div, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, mrb->integer_class, "to_r", fix_to_r, MRB_ARGS_NONE());
-#ifndef MRB_USE_COMPLEX
- mrb_define_method(mrb, mrb->integer_class, "/", rational_int_div, MRB_ARGS_REQ(1)); /* override */
- mrb_define_method(mrb, mrb->integer_class, "quo", rational_int_quo, MRB_ARGS_REQ(1)); /* override */
+ mrb_define_method(mrb, rat, "**", rational_pow, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, rat, "hash", rational_hash, MRB_ARGS_NONE());
+#ifndef MRB_NO_FLOAT
+ mrb_define_method(mrb, mrb->float_class, "to_r", float_to_r, MRB_ARGS_NONE());
 #endif
+ mrb_define_method(mrb, mrb->integer_class, "to_r", fix_to_r, MRB_ARGS_NONE());
+ mrb_define_method(mrb, mrb->nil_class, "to_r", nil_to_r, MRB_ARGS_NONE());
 mrb_define_method(mrb, mrb->kernel_module, "Rational", rational_m, MRB_ARGS_ARG(1,1));
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-rational/test/rational.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-rational/test/rational.rb Changed

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/LICENSE Added

@@ -0,0 +1,24 @@
+mruby-set
+
+Copyright (c) yui-knk 2016
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ MIT license: http://www.opensource.org/licenses/mit-license.php

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/README.md Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/mrbgem.rake Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/mrblib Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/mrblib/set.rb Added

@@ -0,0 +1,329 @@
+class Set
+ include Enumerable
+
+ # internal method
+ def __do_with_enum(enum, &block)
+ if enum.respond_to?(:each)
+ enum.each(&block)
+ else
+ raise ArgumentError, "value must be enumerable"
+ end
+ end
+
+ # internal method to get internal hash
+ def __get_hash
+ @hash
+ end
+
+ def self.(*ary)
+ new(ary)
+ end
+
+ def initialize(enum = nil, &block)
+ @hash ||= Hash.new
+
+ enum.nil? and return
+
+ if block_given?
+ __do_with_enum(enum) { |o| add(block.call(o)) }
+ else
+ merge(enum)
+ end
+ end
+
+ def initialize_copy(orig)
+ super
+ @hash = orig.__get_hash.dup
+ end
+
+ # def freeze
+ # @hash.freeze
+ # super
+ # end
+
+ def size
+ @hash.size
+ end
+ alias length size
+
+ def empty?
+ @hash.empty?
+ end
+
+ def clear
+ @hash.clear
+ self
+ end
+
+ def replace(enum)
+ clear
+ merge(enum)
+ end
+
+ def to_a
+ @hash.keys
+ end
+
+# def to_set
+# end
+#
+ def flatten_merge(set, seen = Set.new)
+ seen.add(set.object_id)
+ set.each { |e|
+ if e.is_a?(Set)
+ if seen.include?(e_id = e.object_id)
+ raise ArgumentError, "tried to flatten recursive Set"
+ end
+
+ flatten_merge(e, seen)
+ else
+ add(e)
+ end
+ }
+ seen.delete(set.object_id)
+
+ self
+ end
+
+ def flatten
+ self.class.new.flatten_merge(self)
+ end
+
+ def flatten!
+ if detect { |e| e.is_a?(Set) }
+ replace(flatten())
+ else
+ nil
+ end
+ end
+
+ def include?(o)
+ @hash.include?(o)
+ end
+ alias member? include?
+ alias === include?
+
+ def superset?(set)
+ raise ArgumentError, "value must be a set" unless set.is_a?(Set)
+ return false if size < set.size
+ set.all? { |o| include?(o) }
+ end
+ alias >= superset?
+
+ def proper_superset?(set)
+ raise ArgumentError, "value must be a set" unless set.is_a?(Set)
+ return false if size <= set.size
+ set.all? { |o| include?(o) }
+ end
+ alias > proper_superset?
+
+ def subset?(set)
+ raise ArgumentError, "value must be a set" unless set.is_a?(Set)
+ return false if set.size < size
+ all? { |o| set.include?(o) }
+ end
+ alias <= subset?
+
+ def proper_subset?(set)
+ raise ArgumentError, "value must be a set" unless set.is_a?(Set)
+ return false if set.size <= size
+ all? { |o| set.include?(o) }
+ end
+ alias < proper_subset?
+
+ def intersect?(set)
+ raise ArgumentError, "value must be a set" unless set.is_a?(Set)
+ if size < set.size
+ any? { |o| set.include?(o) }
+ else
+ set.any? { |o| include?(o) }
+ end
+ end
+
+ def disjoint?(set)
+ !intersect?(set)
+ end
+
+ def each(&block)
+ return to_enum :each unless block_given?
+ @hash.each_key(&block)
+ self
+ end
+
+ def add(o)
+ @hasho = true
+ self
+ end
+ alias << add
+
+ def add?(o)
+ if include?(o)
+ nil
+ else
+ add(o)
+ end
+ end
+
+ def delete(o)
+ @hash.delete(o)
+ self
+ end
+
+ def delete?(o)
+ if include?(o)
+ delete(o)
+ else
+ nil
+ end
+ end
+
+ def delete_if
+ return to_enum :delete_if unless block_given?
+ select { |o| yield o }.each { |o| @hash.delete(o) }
+ self
+ end
+
+ def keep_if
+ return to_enum :keep_if unless block_given?
+ reject { |o| yield o }.each { |o| @hash.delete(o) }
+ self
+ end
+
+ def collect!
+ return to_enum :collect! unless block_given?
+ set = self.class.new
+ each { |o| set << yield(o) }
+ replace(set)
+ end
+ alias map! collect!
+
+ def reject!(&block)
+ return to_enum :reject! unless block_given?
+ n = size
+ delete_if(&block)
+ size == n ? nil : self
+ end
+
+ def select!(&block)
+ return to_enum :select! unless block_given?
+ n = size
+ keep_if(&block)
+ size == n ? nil : self
+ end
+ alias filter! select!
+
+ def merge(enum)
+ if enum.instance_of?(self.class)
+ @hash.merge!(enum.__get_hash)
+ else
+ __do_with_enum(enum) { |o| add(o) }
+ end
+
+ self
+ end
+
+ def subtract(enum)
+ __do_with_enum(enum) { |o| delete(o) }
+ self
+ end
+
+ def |(enum)
+ dup.merge(enum)
+ end
+ alias + |
+ alias union |
+
+ def -(enum)
+ dup.subtract(enum)
+ end
+ alias difference -
+
+ def &(enum)
+ n = Set.new
+ __do_with_enum(enum) { |o| n.add(o) if include?(o) }
+ n
+ end
+ alias intersection &
+
+ def ^(enum)
+ (self | Set.new(enum)) - (self & Set.new(enum))
+ end
+
+ def ==(other)
+ if self.equal?(other)
+ true
+ elsif other.instance_of?(self.class) && self.size == other.size
+ @hash == other.__get_hash
+ elsif other.is_a?(self.class) && self.size == other.size
+ other.all? { |o| include?(o) }
+ else
+ false
+ end
+ end
+
+ def <=>(set)
+ return unless set.is_a?(Set)
+
+ case size <=> set.size
+ when -1 then -1 if proper_subset?(set)
+ when +1 then +1 if proper_superset?(set)
+ else 0 if self.==(set)
+ end
+ end
+
+ def hash
+ @hash.hash
+ end
+
+ def eql?(o)
+ return false unless o.is_a?(Set)
+ @hash.eql?(o.__get_hash)
+ end
+
+ def classify
+ return to_enum :classify unless block_given?
+ h = {}
+
+ each { |i|
+ x = yield(i)
+ (hx ||= self.class.new).add(i)
+ }
+
+ h
+ end
+
+ def divide(&func)
+ return to_enum :divide unless block_given?
+
+ if func.arity == 2
+ raise NotImplementedError, "Set#divide with 2 arity block is not implemented."
+ end
+
+ Set.new(classify(&func).values)
+ end
+
+ def join(separator = nil)
+ to_a.join(separator)
+ end
+
+ def _inspect(recur_list)
+ return "#<#{self.class}: {}>" if empty?
+ return "#<#{self.class}: {...}>" if recur_listself.object_id
+ recur_listself.object_id = true
+ ary = map { |o| o._inspect(recur_list) }
+ "#<#{self.class}: {#{ary.join(", ")}}>"
+ end
+
+ def inspect
+ _inspect({})
+ end
+ alias to_s inspect
+
+ def reset
+ if frozen?
+ raise FrozenError, "can't modify frozen Set"
+ else
+ @hash.rehash
+ end
+ end
+end

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/mruby-set.gem Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/test Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-set/test/set.rb Added

@@ -0,0 +1,632 @@
+##
+## Set Test
+##
+
+assert("Set.new") do
+ assert_nothing_raised {
+ Set.new()
+ Set.new(nil)
+ Set.new()
+ Set.new(1,2)
+ Set.new(1..3)
+ }
+ assert_raise(ArgumentError) { Set.new(false) }
+ assert_raise(ArgumentError) { Set.new(1) }
+ assert_raise(ArgumentError) { Set.new(1,2) }
+
+ ary = 2,4,6,4
+ set = Set.new(ary)
+ ary.clear
+ assert_false set.empty?
+ assert_equal(3, set.size)
+
+ ary = 1,2,3
+
+ s = Set.new(ary) { |o| o * 2 }
+ assert_equal(2,4,6, s.sort)
+end
+
+assert("Set.") do
+ assert_nothing_raised {
+ Set
+ Setnil
+ Set
+ Set1,2
+ Set'a'..'c'
+ Setfalse
+ Set1
+ Set1,2
+ }
+
+ ary = 2,4,6,4
+ set = Setary
+ ary.clear
+ assert_false set.empty?
+ assert_equal(, set.to_a)
+end
+
+assert("Set#clone") do
+ set1 = Set.new
+ set2 = set1.clone
+
+ assert_false set1.equal?(set2) # assert_not_same
+
+ assert_equal(set1, set2)
+
+ set1 << 'abc'
+
+ assert_equal(Set.new, set2)
+end
+
+assert("Set#dup") do
+ set1 = Set1,2
+ set2 = set1.dup
+
+ assert_false set1.equal?(set2) # assert_not_same
+
+ assert_equal(set1, set2)
+
+ set1 << 'abc'
+
+ assert_equal(Set1,2, set2)
+end
+
+assert("Set#size") do
+ assert_equal(0, Set.size)
+ assert_equal(1, Setnil.size)
+ assert_equal(1, Set.size)
+ assert_equal(1, Setnil.size)
+end
+
+assert("Set#empty?") do
+ assert_true Set.empty?
+ assert_false Set1,2.empty?
+end
+
+assert("Set#clear") do
+ set = Set1,2
+ ret = set.clear
+
+ assert_true set.equal?(ret) # assert_same
+ assert_true set.empty?
+end
+
+assert("Set#replace") do
+ set = Set1,2
+ ret = set.replace('a','b','c')
+
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set'a','b','c', set)
+
+
+ set = Set1,2
+ ret = set.replace(Set'a','b','c')
+
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set'a','b','c', set)
+end
+
+assert("Set#to_a") do
+ set = Set1,2,3,2
+ ary = set.to_a
+
+ assert_equal(1,2,3, ary.sort)
+end
+
+assert("Set#flatten") do
+ # test1
+ set1 = Set
+ 1,
+ Set
+ 5,
+ Set7,
+ Set0
+ ,
+ Set6,2,
+ 1
+ ,
+ 3,
+ Set3,4
+ 
+
+ set2 = set1.flatten
+ set3 = Set.new(0..7)
+
+ assert_false set1.equal?(set2) # assert_not_same
+ assert_equal(set3, set2)
+
+
+ # test2; multiple occurrences of a set in an set
+ set1 = Set1, 2
+ set2 = Setset1, Setset1, 4, 3
+
+ assert_nothing_raised {
+ set3 = set2.flatten
+ }
+
+ assert_equal(Set.new(1..4), set3)
+
+
+ # test3; recursion
+ set2 = Set
+ set1 = Set1, set2
+ set2.add(set1)
+
+ assert_raise(ArgumentError) {
+ set1.flatten
+ }
+
+ # test4; miscellaneous
+ empty = Set
+ set = SetSetempty, "a", Setempty, "b"
+
+ assert_nothing_raised {
+ set.flatten
+ }
+end
+
+assert("Set#flatten!") do
+ # test1
+ set1 = Set
+ 1,
+ Set
+ 5,
+ Set7,
+ Set0
+ ,
+ Set6,2,
+ 1
+ ,
+ 3,
+ Set3,4
+ 
+
+ set3 = Set.new(0..7)
+ orig_set1 = set1
+ set1.flatten!
+
+ assert_true orig_set1.equal?(set1) # assert_same
+ assert_equal(set3, set1)
+
+
+ # test2; multiple occurrences of a set in an set
+ set1 = Set1, 2
+ set2 = Setset1, Setset1, 4, 3
+
+ assert_nothing_raised {
+ set2.flatten!
+ }
+
+ assert_equal(Set.new(1..4), set2)
+
+
+ # test3; recursion
+ set2 = Set
+ set1 = Set1, set2
+ set2.add(set1)
+
+ assert_raise(ArgumentError) {
+ set1.flatten!
+ }
+
+ # test4; miscellaneous
+ assert_nil(Set.new(0..31).flatten!)
+
+ x = SetSet,Set1,2.flatten!
+ y = Set1,2
+
+ assert_equal(x, y)
+end
+
+assert("Set#include?") do
+ set = Set1,2,3
+
+ assert_true set.include?(1)
+ assert_true set.include?(2)
+ assert_true set.include?(3)
+ assert_false set.include?(0)
+ assert_false set.include?(nil)
+
+ set = Set"1",nil,"2",nil,"0","1",false
+ assert_true set.include?(nil)
+ assert_true set.include?(false)
+ assert_true set.include?("1")
+ assert_false set.include?(0)
+ assert_false set.include?(true)
+ assert_false set.include?(2)
+end
+
+assert("Set#superset?") do
+ set = Set1,2,3
+
+ assert_raise(ArgumentError) { set.superset?(nil) }
+ assert_raise(ArgumentError) { set.superset?(2) }
+ assert_raise(ArgumentError) { set.superset?(2) }
+
+ assert_true set.superset?(Set)
+ assert_true set.superset?(Set1,2)
+ assert_true set.superset?(Set1,2,3)
+ assert_false set.superset?(Set1,2,3,4)
+ assert_false set.superset?(Set1,4)
+
+ assert_true set >= Set1,2
+ assert_true set >= Set1,2,3
+
+ assert_true Set.superset?(Set)
+end
+
+assert("Set#proper_superset?") do
+ set = Set1,2,3
+
+ assert_raise(ArgumentError) { set.proper_superset?(nil) }
+ assert_raise(ArgumentError) { set.proper_superset?(2) }
+ assert_raise(ArgumentError) { set.proper_superset?(2) }
+
+ assert_true set.proper_superset?(Set)
+ assert_true set.proper_superset?(Set1,2)
+ assert_false set.proper_superset?(Set1,2,3)
+ assert_false set.proper_superset?(Set1,2,3,4)
+ assert_false set.proper_superset?(Set1,4)
+
+ assert_true set > Set1,2
+ assert_false set > Set1,2,3
+
+ assert_false Set.proper_superset?(Set)
+end
+
+assert("Set#subset?") do
+ set = Set1,2,3
+
+ assert_raise(ArgumentError) { set.subset?(nil) }
+ assert_raise(ArgumentError) { set.subset?(2) }
+ assert_raise(ArgumentError) { set.subset?(2) }
+
+ assert_true set.subset?(Set1,2,3,4)
+ assert_true set.subset?(Set1,2,3)
+ assert_false set.subset?(Set1,2)
+ assert_false set.subset?(Set)
+
+ assert_true set <= Set1,2,3
+ assert_false set <= Set1,2
+
+ assert_true Set.subset?(Set1)
+ assert_true Set.subset?(Set)
+end
+
+assert("Set#proper_subset?") do
+ set = Set1,2,3
+
+ assert_raise(ArgumentError) { set.proper_subset?(nil) }
+ assert_raise(ArgumentError) { set.proper_subset?(2) }
+ assert_raise(ArgumentError) { set.proper_subset?(2) }
+
+ assert_true set.proper_subset?(Set1,2,3,4)
+ assert_false set.proper_subset?(Set1,2,3)
+ assert_false set.proper_subset?(Set1,2)
+ assert_false set.proper_subset?(Set)
+
+ assert_true set < Set1,2,3,4
+ assert_false set < Set1,2,3
+
+ assert_true Set.proper_subset?(Set1)
+ assert_false Set.proper_subset?(Set)
+end
+
+assert("Set#intersect?") do
+ set = Set3,4,5
+
+ assert_raise(ArgumentError) { set.intersect?(3) }
+ assert_raise(ArgumentError) { set.intersect?(2,4,6) }
+
+ assert_true set.intersect?(set)
+ assert_true set.intersect?(Set2,4)
+ assert_true set.intersect?(Set5,6,7)
+ assert_true set.intersect?(Set1,2,6,8,4)
+
+ assert_false(set.intersect?(Set))
+ assert_false(set.intersect?(Set0,2))
+ assert_false(set.intersect?(Set0,2,6))
+ assert_false(set.intersect?(Set0,2,6,8,10))
+
+ # Make sure set hasn't changed
+ assert_equal(Set3,4,5, set)
+end
+
+assert("Set#disjoint?") do
+ set = Set3,4,5
+
+ assert_raise(ArgumentError) { set.disjoint?(3) }
+ assert_raise(ArgumentError) { set.disjoint?(2,4,6) }
+
+ assert_true(set.disjoint?(Set))
+ assert_true(set.disjoint?(Set0,2))
+ assert_true(set.disjoint?(Set0,2,6))
+ assert_true(set.disjoint?(Set0,2,6,8,10))
+
+ assert_false set.disjoint?(set)
+ assert_false set.disjoint?(Set2,4)
+ assert_false set.disjoint?(Set5,6,7)
+ assert_false set.disjoint?(Set1,2,6,8,4)
+
+ # Make sure set hasn't changed
+ assert_equal(Set3,4,5, set)
+end
+
+assert("Set#each") do
+ ary = 1,3,5,7,10,20
+ set = Set.new(ary)
+
+ ret = set.each { |o| }
+ assert_true set.equal?(ret) # assert_same
+
+ e = set.each
+ assert_true e.instance_of?(Enumerator)
+
+ assert_nothing_raised {
+ set.each { |o|
+ ary.delete(o) or raise "unexpected element: #{o}"
+ }
+ ary.empty? or raise "forgotten elements: #{ary.join(', ')}"
+ }
+end
+
+assert("Set#add") do
+ set = Set1,2,3
+
+ ret = set.add(2)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,3, set)
+
+ ret = set.add(4)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,3,4, set)
+end
+
+assert("Set#add?") do
+ set = Set1,2,3
+
+ ret = set.add?(2)
+ assert_nil ret
+ assert_equal(Set1,2,3, set)
+
+ ret = set.add?(4)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,3,4, set)
+end
+
+assert("Set#delete") do
+ set = Set1,2,3
+
+ ret = set.delete(4)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,3, set)
+
+ ret = set.delete(2)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,3, set)
+end
+
+assert("Set#delete?") do
+ set = Set1,2,3
+
+ ret = set.delete?(4)
+ assert_nil ret
+ assert_equal(Set1,2,3, set)
+
+ ret = set.delete?(1)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set2,3, set)
+end
+
+assert("Set#delete_if") do
+ set = Set.new(1..10)
+ ret = set.delete_if { |i| i > 10 }
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set.new(1..10), set)
+
+ set = Set.new(1..10)
+ ret = set.delete_if { |i| i % 3 == 0 }
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,4,5,7,8,10, set)
+end
+
+assert("Set#keep_if") do
+ set = Set.new(1..10)
+ ret = set.keep_if { |i| i <= 10 }
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set.new(1..10), set)
+
+ set = Set.new(1..10)
+ ret = set.keep_if { |i| i % 3 != 0 }
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,4,5,7,8,10, set)
+end
+
+assert("Set#collect!") do
+ set = Set1,2,3,'a','b','c',-1..1,2..4
+
+ ret = set.collect! { |i|
+ case i
+ when Numeric
+ i * 2
+ when String
+ i.upcase
+ else
+ nil
+ end
+ }
+
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set2,4,6,"A","B","C",nil, set)
+end
+
+assert("Set#reject!") do
+ set = Set.new(1..10)
+
+ ret = set.reject! { |i| i > 10 }
+ assert_nil(ret)
+ assert_equal(Set.new(1..10), set)
+
+ ret = set.reject! { |i| i % 3 == 0 }
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,4,5,7,8,10, set)
+end
+
+# this test is not in CRuby
+assert("Set#select!") do
+ set = Set.new(1..10)
+
+ ret = set.select! { |i| i <= 10 }
+ assert_nil(ret)
+ assert_equal(Set.new(1..10), set)
+
+ ret = set.select! { |i| i % 3 != 0 }
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,4,5,7,8,10, set)
+end
+
+assert("Set#merge") do
+ set = Set1,2,3
+
+ ret = set.merge(2,4,6)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,2,3,4,6, set)
+end
+
+assert("Set#subtract") do
+ set = Set1,2,3
+
+ ret = set.subtract(2,4,6)
+ assert_true set.equal?(ret) # assert_same
+ assert_equal(Set1,3, set)
+end
+
+assert("Set#+") do
+ set = Set1,2,3
+
+ ret = set + 2,4,6
+ assert_false set.equal?(ret) # assert_not_same
+ assert_equal(Set1,2,3,4,6, ret)
+end
+
+assert("Set#-") do
+ set = Set1,2,3
+
+ ret = set - 2,4,6
+ assert_false set.equal?(ret) # assert_not_same
+ assert_equal(Set1,3, ret)
+end
+
+assert("Set#&") do
+ set = Set1,2,3,4
+
+ ret = set & 2,4,6
+ assert_false set.equal?(ret) # assert_not_same
+ assert_equal(Set2,4, ret)
+end
+
+assert("Set#^") do
+ set = Set1,2,3,4
+
+ ret = set ^ 2,4,5,5
+ assert_false set.equal?(ret) # assert_not_same
+ assert_equal(Set1,3,5, ret)
+end
+
+assert("Set#==") do
+ set1 = Set2,3,1
+ set2 = Set1,2,3
+
+ assert_equal(set1, set1)
+ assert_equal(set1, set2)
+ assert_not_equal(Set1, 1)
+
+ set1 = Class.new(Set)"a", "b"
+ set2 = Set"a", "b", set1
+ set1 = set1.add(set1.clone)
+
+ assert_equal(set2, set2.clone)
+ assert_equal(set1.clone, set1)
+end
+
+assert("Set#classify") do
+ set = Set.new(1..10)
+ ret = set.classify { |i| i % 3 }
+
+ assert_equal(3, ret.size)
+ assert_equal(Hash, ret.class)
+ ret.each_value { |v| assert_equal(Set, v.class) }
+ assert_equal(Set3,6,9, ret0)
+ assert_equal(Set1,4,7,10, ret1)
+ assert_equal(Set2,5,8, ret2)
+end
+
+assert("Set#divide") do
+ # arity is 1
+ set = Set.new(1..10)
+ ret = set.divide { |i| i % 3 }
+
+ assert_equal(3, ret.size)
+ n = 0
+ ret.each { |s| n += s.size }
+ assert_equal(set.size, n)
+ assert_equal(set, ret.flatten)
+
+ assert_equal(Set, ret.class)
+ assert_true(ret.include?(Set3,6,9))
+ assert_true(ret.include?(Set1,4,7,10))
+ assert_true(ret.include?(Set2,5,8))
+
+
+ # arity is 2
+ set = Set7,10,5,11,1,3,4,9,0
+ assert_raise(NotImplementedError) {
+ ret = set.divide { |a, b| (a - b).abs == 1 }
+ }
+
+ # assert_equal(4, ret.size)
+ # n = 0
+ # ret.each { |s| n += s.size }
+ # assert_equal(set.size, n)
+ # assert_equal(set, ret.flatten)
+
+ # assert_equal(Set, ret.class)
+end
+
+# freeze is not implemented yet
+#assert("freeze") do
+# orig = set = Set1,2,3
+# assert_equal false, set.frozen?
+# set << 4
+# assert_same orig, set.freeze
+# assert_equal true, set.frozen?
+# assert_raise(RuntimeError) {
+# set << 5
+# }
+# assert_equal 4, set.size
+#end
+# assert("freeze_dup") do
+# set1 = Set1,2,3
+# set1.freeze
+# set2 = set1.dup
+#
+# assert_not_predicate set2, :frozen?
+# assert_nothing_raised {
+# set2.add 4
+# }
+# end
+# assert("reeze_clone") do
+# set1 = Set1,2,3
+# set1.freeze
+# set2 = set1.clone
+#
+# assert_predicate set2, :frozen?
+# assert_raise(RuntimeError) {
+# set2.add 5
+# }
+# end
+#
+assert("Set#inspect") do
+ set = Set1,2,3
+ assert_equal("#<Set: {1, 2, 3}>", set.inspect)
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-sleep/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-sleep/README.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-sleep/src/sleep.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-sleep/src/sleep.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-socket/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-socket/README.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-socket/mrbgem.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-socket/mrbgem.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-socket/src/const.cstub -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-socket/src/const.cstub Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-socket/src/const.def -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-socket/src/const.def Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-socket/src/socket.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-socket/src/socket.c Changed

@@ -38,6 +38,7 @@
 #include "mruby/string.h"
 #include "mruby/variable.h"
 #include "mruby/error.h"
+#include "mruby/internal.h"
 #include "mruby/presym.h"
 
 #include "mruby/ext/io.h"
@@ -52,12 +53,6 @@
 
 #define E_SOCKET_ERROR             mrb_class_get_id(mrb, MRB_SYM(SocketError))
 
-#if !defined(mrb_cptr)
-#define mrb_cptr_value(m,p) mrb_voidp_value((m),(p))
-#define mrb_cptr(o) mrb_voidp(o)
-#define mrb_cptr_p(o) mrb_voidp_p(o)
-#endif
-
 #ifdef _WIN32
 static const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
 {
@@ -262,10 +257,12 @@
   return ary;
 }
 
+int mrb_io_fileno(mrb_state *mrb, mrb_value io);
+
 static int
 socket_fd(mrb_state *mrb, mrb_value sock)
 {
-  return (int)mrb_integer(mrb_funcall_id(mrb, sock, MRB_SYM(fileno), 0));
+  return mrb_io_fileno(mrb, sock);
 }
 
 static int
@@ -468,9 +465,10 @@
   } else if (argc == 1) {
     if (strcmp(mrb_obj_classname(mrb, so), "Socket::Option") != 0)
       mrb_raise(mrb, E_ARGUMENT_ERROR, "not an instance of Socket::Option");
-    level = mrb_integer(mrb_funcall_id(mrb, so, MRB_SYM(level), 0));
-    optname = mrb_integer(mrb_funcall_id(mrb, so, MRB_SYM(optname), 0));
+    level = mrb_as_int(mrb, mrb_funcall_id(mrb, so, MRB_SYM(level), 0));
+    optname = mrb_as_int(mrb, mrb_funcall_id(mrb, so, MRB_SYM(optname), 0));
     optval = mrb_funcall_id(mrb, so, MRB_SYM(data), 0);
+    mrb_ensure_string_type(mrb, optval);
   } else {
     mrb_argnum_error(mrb, argc, 3, 3);
   }
@@ -515,9 +513,8 @@
   char buf50;
 
   mrb_get_args(mrb, "is", &af, &addr, &n);
-  if ((af == AF_INET && n != 4) || (af == AF_INET6 && n != 16))
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid address");
-  if (inet_ntop((int)af, addr, buf, sizeof(buf)) == NULL)
+  if ((af == AF_INET && n != 4) || (af == AF_INET6 && n != 16) ||
+      inet_ntop((int)af, addr, buf, sizeof(buf)) == NULL)
     mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid address");
   return mrb_str_new_cstr(mrb, buf);
 }
@@ -530,8 +527,7 @@
   char buf50;
 
   mrb_get_args(mrb, "is", &af, &bp, &n);
-  if ((size_t)n > sizeof(buf) - 1)
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid address");
+  if ((size_t)n > sizeof(buf) - 1) goto invalid;
   memcpy(buf, bp, n);
   bufn = '\0';
 
@@ -623,7 +619,7 @@
 
   mrb_get_args(mrb, "i", &s0);
   socklen = sizeof(struct sockaddr_storage);
-  sastr = mrb_str_new_capa(mrb, socklen);
+  sastr = mrb_str_new_capa(mrb, (mrb_int)socklen);
   s1 = (int)accept(s0, (struct sockaddr *)RSTRING_PTR(sastr), &socklen);
   if (s1 == -1) {
     mrb_sys_fail(mrb, "accept");

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-sprintf/src/sprintf.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-sprintf/src/sprintf.c Changed

@@ -110,7 +110,7 @@
 
 #ifndef MRB_NO_FLOAT
 static int
-fmt_float(char *buf, size_t buf_size, char fmt, int flags, mrb_int width, int prec, mrb_float f)
+fmt_float(char *buf, size_t buf_size, char fmt, int flags, int width, int prec, mrb_float f)
 {
 char sign = '\0';
 int left_align = 0;
@@ -153,12 +153,14 @@
 }
 #endif
 
-#define CHECK(l) do { \
- while ((l) >= bsiz - blen) {\
- if (bsiz > MRB_INT_MAX/2) mrb_raise(mrb, E_ARGUMENT_ERROR, "too big specifier"); \
- bsiz*=2;\
+#define CHECK(l) do { \
+ if (blen+(l) >= bsiz) {\
+ while (blen+(l) >= bsiz) {\
+ if (bsiz > MRB_INT_MAX/2) mrb_raise(mrb, E_ARGUMENT_ERROR, "too big specifier");\
+ bsiz*=2;\
+ }\
+ mrb_str_resize(mrb, result, bsiz);\
 }\
- mrb_str_resize(mrb, result, bsiz);\
 buf = RSTRING_PTR(result);\
 } while (0)
 
@@ -235,7 +237,7 @@
 
 #define GETNUM(n, val) do { \
 if (!(p = get_num(mrb, p, end, &(n)))) \
- mrb_raise(mrb, E_ARGUMENT_ERROR, #val " too big 1"); \
+ mrb_raise(mrb, E_ARGUMENT_ERROR, #val " too big"); \
 } while(0)
 
 #define GETASTER(num) do { \
@@ -249,15 +251,17 @@
 tmp_v = GETNEXTARG(); \
 p = t; \
 } \
- num = mrb_as_int(mrb, tmp_v); \
+ num = (int)mrb_as_int(mrb, tmp_v); \
 } while (0)
 
-static const char *
+static const char*
 get_num(mrb_state *mrb, const char *p, const char *end, int *valp)
 {
 char *e;
- mrb_int n = mrb_int_read(p, end, &e);
- if (e == NULL || n > INT_MAX) return NULL;
+ mrb_int n;
+ if (!mrb_read_int(p, end, &e, &n) || INT_MAX < n) {
+ return NULL;
+ }
 *valp = (int)n;
 return e;
 }
@@ -584,8 +588,8 @@
 mrb_raise(mrb, E_ARGUMENT_ERROR, "flag after precision"); \
 }
 
- ++argc;
- --argv;
+ argc++;
+ argv--;
 mrb_ensure_string_type(mrb, fmt);
 p = RSTRING_PTR(fmt);
 end = p + RSTRING_LEN(fmt);
@@ -601,7 +605,7 @@
 int flags = FNONE;
 
 for (t = p; t < end && *t != '%'; t++) ;
- if (t + 1 == end) ++t;
+ if (t + 1 == end) t++;
 PUSH(p, t - p);
 if (t >= end)
 goto sprint_exit; /* end of fmt string */
@@ -766,7 +770,7 @@
 mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid character");
 }
 c = RSTRING_PTR(tmp);
- n = RSTRING_LEN(tmp);
+ n = (int)RSTRING_LEN(tmp);
 if (!(flags & FWIDTH)) {
 PUSH(c, n);
 }
@@ -842,7 +846,7 @@
 char sc = 0;
 mrb_int v = 0;
 int base;
- mrb_int len;
+ int len;
 
 if (flags & FSHARP) {
 switch (*p) {
@@ -920,7 +924,7 @@
 size_t size;
 size = strlen(s);
 /* PARANOID: assert(size <= MRB_INT_MAX) */
- len = (mrb_int)size;
+ len = (int)size;
 }
 
 if (*p == 'X') {
@@ -953,7 +957,7 @@
 size = strlen(prefix);
 /* PARANOID: assert(size <= MRB_INT_MAX).
 * this check is absolutely paranoid. */
- width -= (mrb_int)size;
+ width -= (int)size;
 }
 
 if ((flags & (FZERO|FMINUS|FPREC)) == FZERO) {
@@ -1002,12 +1006,14 @@
 }
 break;
 
-#ifndef MRB_NO_FLOAT
 case 'f':
 case 'g':
 case 'G':
 case 'e':
 case 'E': {
+#ifdef MRB_NO_FLOAT
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "%%%c not supported with MRB_NO_FLOAT defined", *p);
+#else
 mrb_value val = GETARG();
 double fval;
 mrb_int need = 6;
@@ -1015,7 +1021,7 @@
 fval = mrb_as_float(mrb, val);
 if (!isfinite(fval)) {
 const char *expr;
- const mrb_int elen = 3;
+ const int elen = 3;
 char sign = '\0';
 
 if (isnan(fval)) {
@@ -1030,7 +1036,7 @@
 else if (flags & (FPLUS|FSPACE))
 sign = (flags & FPLUS) ? '+' : ' ';
 if (sign)
- ++need;
+ need++;
 if ((flags & FWIDTH) && need < width)
 need = width;
 
@@ -1046,7 +1052,7 @@
 else {
 if (sign)
 bufblen - elen - 1 = sign;
- memcpy(&bufblen - elen, expr, elen);
+ memcpy(&bufblen - elen, expr, (size_t)elen);
 }
 break;
 }
@@ -1066,7 +1072,7 @@
 need += (flags&FPREC) ? prec : 6;
 if ((flags&FWIDTH) && need < width)
 need = width;
- if (need > MRB_INT_MAX - 20) {
+ if ((mrb_int)need > MRB_INT_MAX - 20) {
 goto too_big_width_prec;
 }
 need += 20;
@@ -1077,9 +1083,9 @@
 mrb_raise(mrb, E_RUNTIME_ERROR, "formatting error");
 }
 blen += n;
+#endif
 }
 break;
-#endif
 }
 flags = FNONE;
 }
@@ -1091,7 +1097,7 @@
 if (posarg >= 0 && nextarg < argc) {
 const char *mesg = "too many arguments for format string";
 if (mrb_test(ruby_debug)) mrb_raise(mrb, E_ARGUMENT_ERROR, mesg);
- if (mrb_test(ruby_verbose)) mrb_warn(mrb, "%s", mesg);
+ if (mrb_test(ruby_verbose)) mrb_warn(mrb, mesg);
 }
 #endif
 mrb_str_resize(mrb, result, blen);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/mrblib/string.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/mrblib/string.rb Changed

@@ -273,7 +273,7 @@
 # call-seq:
 # str.center(width, padstr=' ') -> new_str
 #
- # Centers +str+ in +width+. If +width+ is greater than the length of +str+,
+ # Centers +str+ in +width+. If +width+ is greater than the length of +str+,
 # returns a new String of length +width+ with +str+ centered and padded with
 # +padstr+; otherwise, returns +str+.
 #
@@ -334,8 +334,12 @@
 # a = "world"
 # a.prepend("hello ") #=> "hello world"
 # a #=> "hello world"
- def prepend(arg)
- self0, 0 = arg
+ def prepend(*args)
+ len = args.size
+ while len > 0
+ len -= 1
+ self0, 0 = argslen
+ end
 self
 end
 
@@ -368,7 +372,7 @@
 # Iterates through successive values, starting at str and
 # ending at other_str inclusive, passing each value in turn to
 # the block. The <code>String#succ</code> method is used to generate
- # each value. If optional second argument exclusive is omitted or is false,
+ # each value. If optional second argument exclusive is omitted or is false,
 # the last value will be included; otherwise it will be excluded.
 #
 # If no block is given, an enumerator is returned instead.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/src/string.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/src/string.c Changed

@@ -4,6 +4,7 @@
 #include <mruby/class.h>
 #include <mruby/string.h>
 #include <mruby/range.h>
+#include <mruby/internal.h>
 
 #define ENC_ASCII_8BIT "ASCII-8BIT"
 #define ENC_BINARY "BINARY"
@@ -12,10 +13,6 @@
 #define ENC_COMP_P(enc, enc_lit) \
 str_casecmp_p(RSTRING_PTR(enc), RSTRING_LEN(enc), enc_lit, sizeof(enc_lit"")-1)
 
-#ifdef MRB_NO_FLOAT
-# define mrb_float_p(o) FALSE
-#endif
-
 static mrb_bool
 str_casecmp_p(const char *s1, mrb_int len1, const char *s2, mrb_int len2)
 {
@@ -26,8 +23,8 @@
 e2 = s2 + len2;
 while (s1 < e1 && s2 < e2) {
 if (*s1 != *s2 && TOUPPER(*s1) != TOUPPER(*s2)) return FALSE;
- ++s1;
- ++s2;
+ s1++;
+ s2++;
 }
 return TRUE;
 }
@@ -145,27 +142,9 @@
 return str;
 }
 
-/*
- * call-seq:
- * str << integer -> str
- * str.concat(integer) -> str
- * str << obj -> str
- * str.concat(obj) -> str
- *
- * Append---Concatenates the given object to str. If the object is a
- * <code>Integer</code>, it is considered as a codepoint, and is converted
- * to a character before concatenation
- * (equivalent to <code>str.concat(integer.chr(__ENCODING__))</code>).
- *
- * a = "hello "
- * a << "world" #=> "hello world"
- * a.concat(33) #=> "hello world!"
- */
-static mrb_value
-mrb_str_concat_m(mrb_state *mrb, mrb_value self)
+static void
+str_concat(mrb_state *mrb, mrb_value self, mrb_value str)
 {
- mrb_value str = mrb_get_arg1(mrb);
-
 if (mrb_integer_p(str) || mrb_float_p(str))
 #ifdef MRB_UTF8_STRING
 str = int_chr_utf8(mrb, str);
@@ -175,6 +154,39 @@
 else
 mrb_ensure_string_type(mrb, str);
 mrb_str_cat_str(mrb, self, str);
+}
+
+/*
+ * call-seq:
+ * str << obj -> str
+ * str.concat(*obj) -> str
+ *
+ * s = 'foo'
+ * s.concat('bar', 'baz') # => "foobarbaz"
+ * s # => "foobarbaz"
+ *
+ * For each given object +object+ that is an \Integer,
+ * the value is considered a codepoint and converted to a character before concatenation:
+ *
+ * s = 'foo'
+ * s.concat(32, 'bar', 32, 'baz') # => "foo bar baz"
+ *
+ */
+static mrb_value
+mrb_str_concat_m(mrb_state *mrb, mrb_value self)
+{
+ if (mrb_get_argc(mrb) == 1) {
+ str_concat(mrb, self, mrb_get_arg1(mrb));
+ return self;
+ }
+
+ mrb_value *args;
+ mrb_int alen;
+
+ mrb_get_args(mrb, "*", &args, &alen);
+ for (mrb_int i=0; i<alen; i++) {
+ str_concat(mrb, self, argsi);
+ }
 return self;
 }
 
@@ -445,7 +457,7 @@
 return FALSE;
 }
 
-/* compile patter to bitmap */
+/* compile pattern to bitmap */
 static void
 tr_compile_pattern(const struct tr_pattern *pat, mrb_value pstr, uint8_t bitmap32)
 {
@@ -988,28 +1000,18 @@
 }
 
 #ifdef MRB_UTF8_STRING
-static const char utf8len_codepage_zero256 =
-{
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,
-};
+extern const char mrb_utf8len_table;
 
 static mrb_int
-utf8code(unsigned char* p)
+utf8code(unsigned char* p, mrb_int limit)
 {
 mrb_int len;
 
 if (p0 < 0x80)
 return p0;
 
- len = utf8len_codepage_zerop0;
- if (len > 1 && (p1 & 0xc0) == 0x80) {
+ len = mrb_utf8len_tablep0>>3;
+ if (len <= limit && len > 1 && (p1 & 0xc0) == 0x80) {
 if (len == 2)
 return ((p0 & 0x1f) << 6) + (p1 & 0x3f);
 if ((p2 & 0xc0) == 0x80) {
@@ -1020,20 +1022,10 @@
 if (len == 4)
 return ((p0 & 0x07) << 18) + ((p1 & 0x3f) << 12)
 + ((p2 & 0x3f) << 6) + (p3 & 0x3f);
- if ((p4 & 0xc0) == 0x80) {
- if (len == 5)
- return ((p0 & 0x03) << 24) + ((p1 & 0x3f) << 18)
- + ((p2 & 0x3f) << 12) + ((p3 & 0x3f) << 6)
- + (p4 & 0x3f);
- if ((p5 & 0xc0) == 0x80 && len == 6)
- return ((p0 & 0x01) << 30) + ((p1 & 0x3f) << 24)
- + ((p2 & 0x3f) << 18) + ((p3 & 0x3f) << 12)
- + ((p4 & 0x3f) << 6) + (p5 & 0x3f);
- }
 }
 }
 }
- return p0;
+ return -1;
 }
 
 static mrb_value
@@ -1041,7 +1033,9 @@
 {
 if (RSTRING_LEN(str) == 0)
 mrb_raise(mrb, E_ARGUMENT_ERROR, "empty string");
- return mrb_fixnum_value(utf8code((unsigned char*) RSTRING_PTR(str)));
+ mrb_int c = utf8code((unsigned char*)RSTRING_PTR(str), RSTRING_LEN(str));
+ if (c < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid UTF-8 byte sequence");
+ return mrb_fixnum_value(c);
 }
 #else
 static mrb_value
@@ -1245,6 +1239,45 @@
 return result;
 }
 
+/*
+ * call-seq:
+ * +string -> new_string or self
+ *
+ * Returns +self+ if +self+ is not frozen.
+ *
+ * Otherwise returns <tt>self.dup</tt>, which is not frozen.
+ */
+static mrb_value
+mrb_str_uplus(mrb_state *mrb, mrb_value str)
+{
+ if (mrb_frozen_p(mrb_obj_ptr(str))) {
+ return mrb_str_dup(mrb, str);
+ }
+ else {
+ return str;
+ }
+}
+
+/*
+ * call-seq:
+ * -string -> frozen_string
+ *
+ * Returns a frozen, possibly pre-existing copy of the string.
+ *
+ * The returned \String will be deduplicated as long as it does not have
+ * any instance variables set on it and is not a String subclass.
+ *
+ * String#dedup is an alias for String#-@.
+ */
+static mrb_value
+mrb_str_uminus(mrb_state *mrb, mrb_value str)
+{
+ if (mrb_frozen_p(mrb_obj_ptr(str))) {
+ return str;
+ }
+ return mrb_obj_freeze(mrb, mrb_str_dup(mrb, str));
+}
+
 void
 mrb_mruby_string_ext_gem_init(mrb_state* mrb)
 {
@@ -1280,10 +1313,12 @@
 mrb_define_method(mrb, s, "delete_suffix", mrb_str_del_suffix, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, s, "casecmp", mrb_str_casecmp, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, s, "casecmp?", mrb_str_casecmp_p, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, s, "+@", mrb_str_uplus, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, s, "-@", mrb_str_uminus, MRB_ARGS_REQ(1));
 
 mrb_define_method(mrb, s, "__lines", mrb_str_lines, MRB_ARGS_NONE());
 
- mrb_define_method(mrb, mrb_class_get(mrb, "Integer"), "chr", mrb_int_chr, MRB_ARGS_OPT(1));
+ mrb_define_method(mrb, mrb->integer_class, "chr", mrb_int_chr, MRB_ARGS_OPT(1));
 }
 
 void

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/test/numeric.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/test/numeric.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/test/string.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-string-ext/test/string.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-struct/mrblib/struct.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-struct/mrblib/struct.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-struct/src/struct.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-struct/src/struct.c Changed

@@ -13,6 +13,7 @@
 #include <mruby/hash.h>
 #include <mruby/range.h>
 #include <mruby/proc.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 #define RSTRUCT_LEN(st) RARRAY_LEN(st)
@@ -26,32 +27,30 @@
 return mrb_class_get_id(mrb, MRB_SYM(Struct));
 }
 
-static inline mrb_value
-struct_ivar_get(mrb_state *mrb, mrb_value cls, mrb_sym id)
+static void
+struct_corrupted(mrb_state *mrb)
 {
- struct RClass* c = mrb_class_ptr(cls);
- struct RClass* sclass = struct_class(mrb);
- mrb_value ans;
-
- for (;;) {
- ans = mrb_iv_get(mrb, mrb_obj_value(c), id);
- if (!mrb_nil_p(ans)) return ans;
- c = c->super;
- if (c == sclass || c == 0)
- return mrb_nil_value();
- }
+ mrb_raise(mrb, E_TYPE_ERROR, "corrupted data");
 }
 
 static mrb_value
-struct_s_members(mrb_state *mrb, struct RClass *klass)
+struct_s_members(mrb_state *mrb, struct RClass *c)
 {
- mrb_value members = struct_ivar_get(mrb, mrb_obj_value(klass), MRB_SYM(__members__));
+ struct RClass* sclass = struct_class(mrb);
+ mrb_value members;
 
- if (mrb_nil_p(members)) {
- mrb_raise(mrb, E_TYPE_ERROR, "uninitialized struct");
- }
- if (!mrb_array_p(members)) {
- mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
+ for (;;) {
+ members = mrb_iv_get(mrb, mrb_obj_value(c), MRB_SYM(__members__));
+ if (!mrb_nil_p(members)) {
+ if (!mrb_array_p(members)) {
+ struct_corrupted(mrb);
+ }
+ break;
+ }
+ c = c->super;
+ if (c == sclass || c == 0) {
+ mrb_raise(mrb, E_TYPE_ERROR, "uninitialized struct");
+ }
 }
 return members;
 }
@@ -59,10 +58,10 @@
 static mrb_value
 struct_members(mrb_state *mrb, mrb_value s)
 {
- mrb_value members = struct_s_members(mrb, mrb_obj_class(mrb, s));
 if (!mrb_struct_p(s) || RSTRUCT_LEN(s) == 0) {
- mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
+ struct_corrupted(mrb);
 }
+ mrb_value members = struct_s_members(mrb, mrb_obj_class(mrb, s));
 if (RSTRUCT_LEN(s) != RARRAY_LEN(members)) {
 mrb_raisef(mrb, E_TYPE_ERROR,
 "struct size differs (%i required %i given)",
@@ -82,12 +81,7 @@
 return ary;
 }
 
-static void
-mrb_struct_modify(mrb_state *mrb, mrb_value strct)
-{
- mrb_check_frozen(mrb, mrb_basic_ptr(strct));
- mrb_write_barrier(mrb, mrb_basic_ptr(strct));
-}
+#define mrb_struct_modify(mrb,s) mrb_check_frozen((mrb), mrb_basic_ptr(s))
 
 /* 15.2.18.4.6 */
 /*
@@ -161,6 +155,7 @@
 }
 else {
 ptri = val;
+ mrb_field_write_barrier_value(mrb, mrb_basic_ptr(obj), val);
 }
 return val;
 }
@@ -208,15 +203,14 @@
 mrb_warn(mrb, "redefining constant Struct::%v", name);
 mrb_const_remove(mrb, mrb_obj_value(klass), id);
 }
- c = mrb_define_class_under(mrb, klass, RSTRING_PTR(name), klass);
+ c = mrb_define_class_under_id(mrb, klass, id, klass);
 }
- MRB_SET_INSTANCE_TT(c, MRB_TT_STRUCT);
 nstr = mrb_obj_value(c);
 mrb_iv_set(mrb, nstr, MRB_SYM(__members__), members);
 
- mrb_define_class_method(mrb, c, "new", mrb_instance_new, MRB_ARGS_ANY());
- mrb_define_class_method(mrb, c, "", mrb_instance_new, MRB_ARGS_ANY());
- mrb_define_class_method(mrb, c, "members", mrb_struct_s_members_m, MRB_ARGS_NONE());
+ mrb_define_class_method_id(mrb, c, MRB_SYM(new), mrb_instance_new, MRB_ARGS_ANY());
+ mrb_define_class_method_id(mrb, c, MRB_OPSYM(aref), mrb_instance_new, MRB_ARGS_ANY());
+ mrb_define_class_method_id(mrb, c, MRB_SYM(members), mrb_struct_s_members_m, MRB_ARGS_NONE());
 /* RSTRUCT(nstr)->basic.c->super = c->c; */
 make_struct_define_accessors(mrb, members, c);
 return nstr;
@@ -306,12 +300,7 @@
 static mrb_int
 num_members(mrb_state *mrb, struct RClass *klass)
 {
- mrb_value members;
-
- members = struct_ivar_get(mrb, mrb_obj_value(klass), MRB_SYM(__members__));
- if (!mrb_array_p(members)) {
- mrb_raise(mrb, E_TYPE_ERROR, "broken members");
- }
+ mrb_value members = struct_s_members(mrb, klass);
 return RARRAY_LEN(members);
 }
 
@@ -360,7 +349,7 @@
 mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
 }
 if (!mrb_struct_p(s)) {
- mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
+ struct_corrupted(mrb);
 }
 mrb_ary_replace(mrb, copy, s);
 return copy;
@@ -387,17 +376,24 @@
 return mrb_nil_value(); /* not reached */
 }
 
-static mrb_value
-struct_aref_int(mrb_state *mrb, mrb_value s, mrb_int i)
+static mrb_int
+struct_index(mrb_state *mrb, mrb_int i, mrb_int len)
 {
- mrb_int idx = i < 0 ? RSTRUCT_LEN(s) + i : i;
+ mrb_int idx = i < 0 ? len + i : i;
 
 if (idx < 0)
 mrb_raisef(mrb, E_INDEX_ERROR,
- "offset %i too small for struct(size:%i)", i, RSTRUCT_LEN(s));
- if (RSTRUCT_LEN(s) <= idx)
+ "offset %i too small for struct(size:%i)", i, len);
+ if (len <= idx)
 mrb_raisef(mrb, E_INDEX_ERROR,
- "offset %i too large for struct(size:%i)", i, RSTRUCT_LEN(s));
+ "offset %i too large for struct(size:%i)", i, len);
+ return idx;
+}
+
+static mrb_value
+struct_aref_int(mrb_state *mrb, mrb_value s, mrb_int i)
+{
+ mrb_int idx = struct_index(mrb, i, RSTRUCT_LEN(s));
 return RSTRUCT_PTR(s)idx;
 }
 
@@ -450,6 +446,7 @@
 if (mrb_symbol(ptr_membersi) == id) {
 mrb_struct_modify(mrb, s);
 ptri = val;
+ mrb_field_write_barrier_value(mrb, mrb_basic_ptr(s), val);
 return val;
 }
 }
@@ -496,17 +493,9 @@
 return mrb_struct_aset_sym(mrb, s, mrb_symbol(idx), val);
 }
 
- i = mrb_as_int(mrb, idx);
- if (i < 0) i = RSTRUCT_LEN(s) + i;
- if (i < 0) {
- mrb_raisef(mrb, E_INDEX_ERROR,
- "offset %i too small for struct(size:%i)", i, RSTRUCT_LEN(s));
- }
- if (RSTRUCT_LEN(s) <= i) {
- mrb_raisef(mrb, E_INDEX_ERROR,
- "offset %i too large for struct(size:%i)", i, RSTRUCT_LEN(s));
- }
+ i = struct_index(mrb, mrb_as_int(mrb, idx), RSTRUCT_LEN(s));
 mrb_struct_modify(mrb, s);
+ mrb_field_write_barrier_value(mrb, mrb_basic_ptr(s), val);
 return RSTRUCT_PTR(s)i = val;
 }
 
@@ -541,9 +530,7 @@
 if (mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) {
 return mrb_false_value();
 }
- if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
- mrb_bug(mrb, "inconsistent struct"); /* should never happen */
- }
+ mrb_assert(RSTRUCT_LEN(s) == RSTRUCT_LEN(s2));
 ptr = RSTRUCT_PTR(s);
 ptr2 = RSTRUCT_PTR(s2);
 len = RSTRUCT_LEN(s);
@@ -558,7 +545,7 @@
 
 /* 15.2.18.4.12(x) */
 /*
- * code-seq:
+ * call-seq:
 * struct.eql?(other) -> true or false
 *
 * Two structures are equal if they are the same object, or if all their
@@ -577,9 +564,7 @@
 if (mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) {
 return mrb_false_value();
 }
- if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
- mrb_bug(mrb, "inconsistent struct"); /* should never happen */
- }
+ mrb_assert(RSTRUCT_LEN(s) == RSTRUCT_LEN(s2));
 ptr = RSTRUCT_PTR(s);
 ptr2 = RSTRUCT_PTR(s2);
 len = RSTRUCT_LEN(s);
@@ -633,7 +618,7 @@
 members = struct_members(mrb, self);
 ret = mrb_hash_new_capa(mrb, RARRAY_LEN(members));
 
- for (i = 0; i < RARRAY_LEN(members); ++i) {
+ for (i = 0; i < RARRAY_LEN(members); i++) {
 mrb_hash_set(mrb, ret, RARRAY_PTR(members)i, RSTRUCT_PTR(self)i);
 }
 
@@ -671,7 +656,7 @@
 {
 struct RClass *st;
 st = mrb_define_class(mrb, "Struct", mrb->object_class);
- MRB_SET_INSTANCE_TT(st, MRB_TT_ARRAY);
+ MRB_SET_INSTANCE_TT(st, MRB_TT_STRUCT);
 
 mrb_define_class_method(mrb, st, "new", mrb_struct_s_def, MRB_ARGS_ANY()); /* 15.2.18.3.1 */
 
@@ -683,12 +668,12 @@
 mrb_define_method(mrb, st, "initialize_copy", mrb_struct_init_copy, MRB_ARGS_REQ(1)); /* 15.2.18.4.9 */
 mrb_define_method(mrb, st, "eql?", mrb_struct_eql, MRB_ARGS_REQ(1)); /* 15.2.18.4.12(x) */
 
- mrb_define_method(mrb, st, "size", mrb_struct_len, MRB_ARGS_NONE());
- mrb_define_method(mrb, st, "length", mrb_struct_len, MRB_ARGS_NONE());
- mrb_define_method(mrb, st, "to_a", mrb_struct_to_a, MRB_ARGS_NONE());
- mrb_define_method(mrb, st, "values", mrb_struct_to_a, MRB_ARGS_NONE());
- mrb_define_method(mrb, st, "to_h", mrb_struct_to_h, MRB_ARGS_NONE());
- mrb_define_method(mrb, st, "values_at", mrb_struct_values_at, MRB_ARGS_ANY());
+ mrb_define_method(mrb, st, "size", mrb_struct_len, MRB_ARGS_NONE());
+ mrb_define_method(mrb, st, "length", mrb_struct_len, MRB_ARGS_NONE());
+ mrb_define_method(mrb, st, "to_a", mrb_struct_to_a, MRB_ARGS_NONE());
+ mrb_define_method(mrb, st, "values", mrb_struct_to_a, MRB_ARGS_NONE());
+ mrb_define_method(mrb, st, "to_h", mrb_struct_to_h, MRB_ARGS_NONE());
+ mrb_define_method(mrb, st, "values_at", mrb_struct_values_at, MRB_ARGS_ANY());
 }
 
 void

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-symbol-ext/src/symbol.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-symbol-ext/src/symbol.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-test-inline-struct/test/inline.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-test-inline-struct/test/inline.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-test/README.md -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-test/README.md Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-test/driver.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-test/driver.c Changed

@@ -55,7 +55,7 @@
 mrb_int i;
 
 mrb_get_args(mrb, "*!", &argv, &argc);
- for (i = 0; i < argc; ++i) {
+ for (i = 0; i < argc; i++) {
 mrb_value s = mrb_obj_as_string(mrb, argvi);
 fwrite(RSTRING_PTR(s), RSTRING_LEN(s), 1, stdout);
 }
@@ -76,7 +76,7 @@
 if (p == pat_end) return NULL;
 if (*p == '!' || *p == '^') {
 negated = TRUE;
- ++p;
+ p++;
 }
 
 while (*p != '') {
@@ -109,7 +109,7 @@
 if (p == pat_end) return s == str_end;
 switch (*p) {
 case '*':
- do { ++p; } while (p != pat_end && *p == '*');
+ do { p++; } while (p != pat_end && *p == '*');
 if (UNESCAPE(p, pat_end) == pat_end) return TRUE;
 if (s == str_end) return FALSE;
 p_tmp = p;
@@ -117,15 +117,15 @@
 continue;
 case '?':
 if (s == str_end) return FALSE;
- ++p;
- ++s;
+ p++;
+ s++;
 continue;
 case '': {
 const char *t;
 if (s == str_end) return FALSE;
 if ((t = str_match_bracket(p+1, pat_end, s, str_end))) {
 p = t;
- ++s;
+ s++;
 continue;
 }
 goto L_failed;
@@ -164,7 +164,7 @@
 int nest = 0;
 mrb_bool ret = FALSE;
 
- for (; p != pat_end; ++p) {
+ for (; p != pat_end; p++) {
 if (*p == '{' && nest++ == 0) lbrace = p;
 else if (*p == '}' && lbrace && --nest == 0) { rbrace = p; break; }
 else if (*p == '\\' && ++p == pat_end) break;
@@ -180,9 +180,9 @@
 while (p < rbrace) {
 char *orig_ex_p = ex_p;
 const char *t = ++p;
- for (nest = 0; p < rbrace && !(*p == ',' && nest == 0); ++p) {
- if (*p == '{') ++nest;
- else if (*p == '}') --nest;
+ for (nest = 0; p < rbrace && !(*p == ',' && nest == 0); p++) {
+ if (*p == '{') nest++;
+ else if (*p == '}') nest--;
 else if (*p == '\\' && ++p == rbrace) break;
 }
 COPY_AND_INC(ex_p, t, p-t);
@@ -271,8 +271,9 @@
 if (mrb_array_p(res_src)) {
 mrb_int i;
 mrb_value res_dst = mrb_gv_get(mrb_dst, mrb_intern_lit(mrb_dst, "$asserts"));
- for (i = 0; i < RARRAY_LEN(res_src); ++i) {
+ for (i = 0; i < RARRAY_LEN(res_src); i++) {
 mrb_value val_src = RARRAY_PTR(res_src)i;
+ mrb_ensure_string_type(mrb_dst, val_src);
 mrb_ary_push(mrb_dst, res_dst, mrb_str_new(mrb_dst, RSTRING_PTR(val_src), RSTRING_LEN(val_src)));
 }
 }
@@ -290,7 +291,7 @@
 /* new interpreter instance */
 mrb = mrb_open();
 if (mrb == NULL) {
- fprintf(stderr, "Invalid mrb_state, exiting test driver");
+ fputs("Invalid mrb_state, exiting test driver", stderr);
 return EXIT_FAILURE;
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-time/src/time.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-time/src/time.c Changed

@@ -10,6 +10,7 @@
 #include <mruby/numeric.h>
 #include <mruby/time.h>
 #include <mruby/string.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 #ifdef MRB_NO_STDIO
@@ -459,7 +460,7 @@
 #define OUTINT(x) 0
 #endif
 
- if (OUTINT(ayear-1900) ||
+ if (ayear < 1900 || OUTINT(ayear-1900) ||
 amonth < 1 || amonth > 12 ||
 aday < 1 || aday > 31 ||
 ahour < 0 || ahour > 24 ||
@@ -476,14 +477,21 @@
 nowtime.tm_sec = (int)asec;
 nowtime.tm_isdst = -1;
 
+ time_t (*mk)(struct tm*);
 if (timezone == MRB_TIMEZONE_UTC) {
- nowsecs = timegm(&nowtime);
+ mk = timegm;
 }
 else {
- nowsecs = mktime(&nowtime);
+ mk = mktime;
 }
+ nowsecs = (*mk)(&nowtime);
 if (nowsecs == (time_t)-1) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time");
+ nowtime.tm_sec += 1; /* maybe Epoch-1 sec */
+ nowsecs = (*mk)(&nowtime);
+ if (nowsecs != 0) { /* check if Epoch */
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time");
+ }
+ nowsecs = (time_t)-1; /* valid Epoch-1 */
 }
 
 return time_alloc_time(mrb, nowsecs, ausec, timezone);
@@ -997,13 +1005,23 @@
 return str;
 }
 
+static mrb_value
+mrb_time_hash(mrb_state *mrb, mrb_value self)
+{
+ struct mrb_time *tm = time_get_ptr(mrb, self);
+ uint32_t hash = mrb_byte_hash((uint8_t*)&tm->sec, sizeof(time_t));
+ hash = mrb_byte_hash_step((uint8_t*)&tm->usec, sizeof(time_t), hash);
+ hash = mrb_byte_hash_step((uint8_t*)&tm->timezone, sizeof(tm->timezone), hash);
+ return mrb_int_value(mrb, hash);
+}
+
 void
 mrb_mruby_time_gem_init(mrb_state* mrb)
 {
 struct RClass *tc;
 /* ISO 15.2.19.2 */
 tc = mrb_define_class(mrb, "Time", mrb->object_class);
- MRB_SET_INSTANCE_TT(tc, MRB_TT_DATA);
+ MRB_SET_INSTANCE_TT(tc, MRB_TT_CDATA);
 mrb_include_module(mrb, tc, mrb_module_get(mrb, "Comparable"));
 mrb_define_class_method(mrb, tc, "at", mrb_time_at_m, MRB_ARGS_ARG(1, 1)); /* 15.2.19.6.1 */
 mrb_define_class_method(mrb, tc, "gm", mrb_time_gm, MRB_ARGS_ARG(1,6)); /* 15.2.19.6.2 */
@@ -1012,6 +1030,8 @@
 mrb_define_class_method(mrb, tc, "now", mrb_time_now, MRB_ARGS_NONE()); /* 15.2.19.6.5 */
 mrb_define_class_method(mrb, tc, "utc", mrb_time_gm, MRB_ARGS_ARG(1,6)); /* 15.2.19.6.6 */
 
+ mrb_define_method(mrb, tc, "hash" , mrb_time_hash , MRB_ARGS_NONE());
+ mrb_define_method(mrb, tc, "eql?" , mrb_time_eq , MRB_ARGS_REQ(1));
 mrb_define_method(mrb, tc, "==" , mrb_time_eq , MRB_ARGS_REQ(1));
 mrb_define_method(mrb, tc, "<=>" , mrb_time_cmp , MRB_ARGS_REQ(1)); /* 15.2.19.7.1 */
 mrb_define_method(mrb, tc, "+" , mrb_time_plus , MRB_ARGS_REQ(1)); /* 15.2.19.7.2 */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-time/test/time.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-time/test/time.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/stdlib-ext.gembox -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/stdlib-ext.gembox Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/stdlib-io.gembox -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/stdlib-io.gembox Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/stdlib.gembox -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrbgems/stdlib.gembox Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrblib/00class.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/00class.rb Changed

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/00kernel.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrblib/10error.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/10error.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrblib/array.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/array.rb Changed

@@ -1,10 +1,13 @@
-# coding: utf-8
 ##
 # Array
 #
 # ISO 15.2.12
 class Array
 ##
+ # call-seq:
+ # array.each {|element| ... } -> self
+ # array.each -> Enumerator
+ #
 # Calls the given block for each element of +self+
 # and pass the respective element.
 #
@@ -21,6 +24,10 @@
 end
 
 ##
+ # call-seq:
+ # array.each_index {|index| ... } -> self
+ # array.each_index -> Enumerator
+ #
 # Calls the given block for each element of +self+
 # and pass the index of the respective element.
 #
@@ -37,6 +44,10 @@
 end
 
 ##
+ # call-seq:
+ # array.collect! {|element| ... } -> self
+ # array.collect! -> new_enumerator
+ #
 # Calls the given block for each element of +self+
 # and pass the respective element. Each element will
 # be replaced by the resulting values.
@@ -55,6 +66,10 @@
 end
 
 ##
+ # call-seq:
+ # array.map! {|element| ... } -> self
+ # array.map! -> new_enumerator
+ #
 # Alias for collect!
 #
 # ISO 15.2.12.5.20
@@ -102,19 +117,19 @@
 ##
 # Return the contents of this array as a string.
 #
- # ISO 15.2.12.5.31 (x)
 def inspect
 self._inspect({})
 end
- # ISO 15.2.12.5.32 (x)
 alias to_s inspect
 
 ##
+ # call-seq:
+ # array == other -> true or false
+ #
 # Equality---Two arrays are equal if they contain the same number
 # of elements and if each element is equal to (according to
 # Object.==) the corresponding element in the other array.
 #
- # ISO 15.2.12.5.33 (x)
 def ==(other)
 other = self.__ary_eq(other)
 return false if other == false
@@ -129,10 +144,12 @@
 end
 
 ##
+ # call-seq:
+ # array.eql? other_array -> true or false
+ #
 # Returns <code>true</code> if +self+ and _other_ are the same object,
 # or are both arrays with the same content.
 #
- # ISO 15.2.12.5.34 (x)
 def eql?(other)
 other = self.__ary_eq(other)
 return false if other == false
@@ -147,17 +164,19 @@
 end
 
 ##
+ # call-seq:
+ # array <=> other_array -> -1, 0, or 1
+ #
 # Comparison---Returns an integer (-1, 0, or +1)
 # if this array is less than, equal to, or greater than other_ary.
 # Each object in each array is compared (using <=>). If any value isn't
 # equal, then that inequality is the return value. If all the
 # values found are equal, then the return is based on a
- # comparison of the array lengths. Thus, two arrays are
+ # comparison of the array lengths. Thus, two arrays are
 # "equal" according to <code>Array#<=></code> if and only if they have
 # the same length and the value of each element is equal to the
 # value of the corresponding element in the other array.
 #
- # ISO 15.2.12.5.36 (x)
 def <=>(other)
 other = self.__ary_cmp(other)
 return 0 if 0 == other
@@ -167,10 +186,14 @@
 n = other.size
 len = n if len > n
 i = 0
- while i < len
- n = (selfi <=> otheri)
- return n if n.nil? || n != 0
- i += 1
+ begin
+ while i < len
+ n = (selfi <=> otheri)
+ return n if n.nil? || n != 0
+ i += 1
+ end
+ rescue NoMethodError
+ return nil
 end
 len = self.size - other.size
 if len == 0
@@ -183,6 +206,10 @@
 end
 
 ##
+ # call-seq:
+ # array.delete(obj) -> deleted_object
+ # array.delete(obj) {|nosuch| ... } -> deleted_object or block_return
+ #
 # Delete element with index +key+
 def delete(key, &block)
 while i = self.index(key)
@@ -194,6 +221,10 @@
 end
 
 ##
+ # call-seq:
+ # array.sort! -> self
+ # array.sort! {|a, b| ... } -> self
+ #
 # Sort all elements and replace +self+ with these
 # elements.
 def sort!(&block)
@@ -227,7 +258,7 @@
 lsize = lary.size
 
 # The entity sharing between lary and self may cause a large memory
- # copy operation in the merge loop below. This harmless operation
+ # copy operation in the merge loop below. This harmless operation
 # cancels the sharing and provides a huge performance gain.
 lary0 = lary0
 
@@ -261,10 +292,21 @@
 self
 end
 
+ ##
+ # call-seq:
+ # array.sort -> new_array
+ # array.sort {|a, b| ... } -> new_array
+ #
+ # Returns a new Array whose elements are those from +self+, sorted.
 def sort(&block)
 self.dup.sort!(&block)
 end
 
+ ##
+ # call-seq:
+ # array.to_a -> self
+ #
+ # Returns self, no need to convert.
 def to_a
 self
 end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrblib/compar.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/compar.rb Changed

@@ -5,6 +5,9 @@
 module Comparable
 
 ##
+ # call-seq:
+ # obj < other -> true or false
+ #
 # Return true if +self+ is less
 # than +other+. Otherwise return
 # false.
@@ -19,6 +22,9 @@
 end
 
 ##
+ # call-seq:
+ # obj <= other -> true or false
+ #
 # Return true if +self+ is less
 # than or equal to +other+.
 # Otherwise return false.
@@ -33,6 +39,9 @@
 end
 
 ##
+ # call-seq:
+ # obj == other -> true or false
+ #
 # Return true if +self+ is equal
 # to +other+. Otherwise return
 # false.
@@ -44,6 +53,9 @@
 end
 
 ##
+ # call-seq:
+ # obj > other -> true or false
+ #
 # Return true if +self+ is greater
 # than +other+. Otherwise return
 # false.
@@ -58,6 +70,9 @@
 end
 
 ##
+ # call-seq:
+ # obj >= other -> true or false
+ #
 # Return true if +self+ is greater
 # than or equal to +other+.
 # Otherwise return false.
@@ -72,6 +87,9 @@
 end
 
 ##
+ # call-seq:
+ # obj.between?(min,max) -> true or false
+ #
 # Return true if +self+ is greater
 # than or equal to +min+ and
 # less than or equal to +max+.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrblib/hash.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/hash.rb Changed

@@ -10,6 +10,9 @@
 include Enumerable
 
 ##
+ # call-seq:
+ # hash == object -> true or false
+ #
 # Equality---Two hashes are equal if they each contain the same number
 # of keys and if each key-value pair is equal to (according to
 # <code>Object#==</code>) the corresponding elements in the other
@@ -30,10 +33,12 @@
 end
 
 ##
+ # call-seq:
+ # hash.eql? object -> true or false
+ #
 # Returns <code>true</code> if hash and other are
 # both hashes with the same content compared by eql?.
 #
- # ISO 15.2.13.4.32 (x)
 def eql?(hash)
 return true if self.equal?(hash)
 unless Hash === hash
@@ -48,6 +53,10 @@
 end
 
 ##
+ # call-seq:
+ # hash.delete(key) -> value or nil
+ # hash.delete(key) {|key| ... } -> object
+ #
 # Delete the element with the key +key+.
 # Return the value of the element if +key+
 # was found. Return nil if nothing was
@@ -63,15 +72,14 @@
 end
 
 ##
- # Calls the given block for each element of +self+
- # and pass the key and value of each element.
- #
 # call-seq:
 # hsh.each {| key, value | block } -> hsh
 # hsh.each_pair {| key, value | block } -> hsh
 # hsh.each -> an_enumerator
 # hsh.each_pair -> an_enumerator
 #
+ # Calls the given block for each element of +self+
+ # and pass the key and value of each element.
 #
 # If no block is given, an enumerator is returned instead.
 #
@@ -99,13 +107,13 @@
 end
 
 ##
- # Calls the given block for each element of +self+
- # and pass the key of each element.
- #
 # call-seq:
 # hsh.each_key {| key | block } -> hsh
 # hsh.each_key -> an_enumerator
 #
+ # Calls the given block for each element of +self+
+ # and pass the key of each element.
+ #
 # If no block is given, an enumerator is returned instead.
 #
 # h = { "a" => 100, "b" => 200 }
@@ -125,13 +133,12 @@
 end
 
 ##
- # Calls the given block for each element of +self+
- # and pass the value of each element.
- #
 # call-seq:
- # hsh.each_value {| value | block } -> hsh
+ # hsh.each_value {| value | block } -> self
 # hsh.each_value -> an_enumerator
 #
+ # Calls the given block with each value; returns +self+:
+ #
 # If no block is given, an enumerator is returned instead.
 #
 # h = { "a" => 100, "b" => 200 }
@@ -151,22 +158,39 @@
 end
 
 ##
- # Return a hash which contains the content of
- # +self+ and +other+. If a block is given
- # it will be called for each element with
- # a duplicate key. The value of the block
- # will be the final value of this element.
+ # call-seq:
+ # hsh.merge(other_hash..) -> hsh
+ # hsh.merge(other_hash..){|key, oldval, newval| block} -> hsh
+ #
+ # Returns the new \Hash formed by merging each of +other_hashes+
+ # into a copy of +self+.
+ #
+ # Each argument in +other_hashes+ must be a \Hash.
+ # Adds the contents of _other_hash_ to _hsh_. If no block is specified,
+ # entries with duplicate keys are overwritten with the values from
+ # _other_hash_, otherwise the value of each duplicate key is determined by
+ # calling the block with the key, its value in _hsh_ and its value in
+ # _other_hash_.
+ #
+ # Example:
+ # h = {foo: 0, bar: 1, baz: 2}
+ # h1 = {bat: 3, bar: 4}
+ # h2 = {bam: 5, bat:6}
+ # h3 = h.merge(h1, h2) { |key, old_value, new_value| old_value + new_value }
+ # h3 # => {:foo=>0, :bar=>5, :baz=>2, :bat=>9, :bam=>5}
 #
 # ISO 15.2.13.4.22
- def merge(other, &block)
- raise TypeError, "Hash required (#{other.class} given)" unless Hash === other
+ def merge(*others, &block)
+ i=0; len=others.size
 h = self.dup
- if block
+ return h.__merge(*others) unless block
+ while i<len
+ other = othersi
+ i += 1
+ raise TypeError, "Hash required (#{other.class} given)" unless Hash === other
 other.each_key{|k|
 hk = (self.has_key?(k))? block.call(k, selfk, otherk): otherk
 }
- else
- other.each_key{|k| hk = otherk}
 end
 h
 end
@@ -190,11 +214,9 @@
 ##
 # Return the contents of this hash as a string.
 #
- # ISO 15.2.13.4.30 (x)
 def inspect
 self._inspect({})
 end
- # ISO 15.2.13.4.31 (x)
 alias to_s inspect
 
 ##

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrblib/numeric.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/numeric.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrblib/string.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mrblib/string.rb Changed

@@ -27,18 +27,18 @@
 end
 start = 0
 string = dup
- self_len = length
- sep_len = separator.length
+ self_len = self.bytesize
+ sep_len = separator.bytesize
 
- while (pointer = string.index(separator, start))
+ while (pointer = string.byteindex(separator, start))
 pointer += sep_len
- pointer += 1 while paragraph_mode && stringpointer == "\n"
- block.call(stringstart, pointer - start)
+ pointer += 1 while paragraph_mode && string.getbyte(pointer) == 10 # 10 == \n
+ block.call(string.byteslice(start, pointer - start))
 start = pointer
 end
 return self if start == self_len
 
- block.call(stringstart, self_len - start)
+ block.call(string.byteslice(start, self_len - start))
 self
 end
 
@@ -60,8 +60,8 @@
 end
 offset = 0
 result = 
- while found = index(pattern, offset)
- result << selfoffset, found - offset
+ while found = self.byteindex(pattern, offset)
+ result << self.byteslice(offset, found - offset)
 offset = found + plen
 result << if block
 block.call(pattern).to_s
@@ -69,11 +69,11 @@
 self.__sub_replace(replace, pattern, found)
 end
 if plen == 0
- result << selfoffset, 1
+ result << self.byteslice(offset, 1)
 offset += 1
 end
 end
- result << selfoffset..-1 if offset < length
+ result << self.byteslice(offset..-1) if offset < length
 result.join
 end
 
@@ -119,16 +119,16 @@
 block = nil
 end
 result = 
- found = index(pattern)
+ found = self.index(pattern)
 return self.dup unless found
- result << self0, found
+ result << self.byteslice(0, found)
 offset = found + pattern.length
 result << if block
 block.call(pattern).to_s
 else
 self.__sub_replace(replace, pattern, found)
 end
- result << selfoffset..-1 if offset < length
+ result << self.byteslice(offset..-1) if offset < length
 result.join
 end
 
@@ -150,10 +150,9 @@
 # Call the given block for each byte of +self+.
 def each_byte(&block)
 return to_enum(:each_byte, &block) unless block
- bytes = self.bytes
 pos = 0
- while pos < bytes.size
- block.call(bytespos)
+ while pos < bytesize
+ block.call(getbyte(pos))
 pos += 1
 end
 self

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mruby-source.gemspec -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/mruby-source.gemspec Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/oss-fuzz/mruby_proto_fuzzer.cpp -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/oss-fuzz/mruby_proto_fuzzer.cpp Changed

@@ -13,32 +13,33 @@
 using namespace std;
 
 int FuzzRB(const uint8_t *Data, size_t size) {
-	mrb_value v;
-	mrb_state *mrb = mrb_open();
-	if (!mrb)
-		return 0;
-
-	char *code = (char *)malloc(size+1);
-	if (!code)
-		return 0;
-	memcpy(code, Data, size);
-	codesize = '\0';
-
-	if (const char *dump_path = getenv("PROTO_FUZZER_DUMP_PATH")) {
-		// With libFuzzer binary run this to generate an RB file x.rb:
-		// PROTO_FUZZER_DUMP_PATH=x.rb ./a.out proto-input
-		std::ofstream of(dump_path);
-		of.write(code, size);
-	}
-	v = mrb_load_string(mrb, code);
-	mrb_close(mrb);
-
-	free(code);
-	return 0;
+ mrb_value v;
+ mrb_state *mrb = mrb_open();
+ if (!mrb)
+ return 0;
+
+ char *code = (char *)malloc(size+1);
+ if (!code)
+ return 0;
+ memcpy(code, Data, size);
+ codesize = '\0';
+
+ if (const char *dump_path = getenv("PROTO_FUZZER_DUMP_PATH")) {
+ // With libFuzzer binary run this to generate an RB file x.rb:
+ // PROTO_FUZZER_DUMP_PATH=x.rb ./a.out proto-input
+ std::ofstream of(dump_path);
+ of.write(code, size);
+ }
+ std::cout << "\n\n############\n" << code << "\n############\n\n";
+ v = mrb_load_string(mrb, code);
+ mrb_close(mrb);
+
+ free(code);
+ return 0;
 }
 
 DEFINE_PROTO_FUZZER(const Function &function) {
-	protoConverter converter;
-	auto s = converter.FunctionToString(function);
-	(void)FuzzRB((const uint8_t*)s.data(), s.size());
+ protoConverter converter;
+ auto s = converter.FunctionToString(function);
+ (void)FuzzRB((const uint8_t*)s.data(), s.size());
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/oss-fuzz/proto_to_ruby.cpp -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/oss-fuzz/proto_to_ruby.cpp Changed

@@ -4,452 +4,452 @@
 
 std::string protoConverter::removeSpecial(const std::string &x)
 {
-	std::string tmp(x);
-	if (!tmp.empty())
-		tmp.erase(std::remove_if(tmp.begin(), tmp.end(),
-		 (char c) { return !(std::isalpha(c) || std::isdigit(c)); } ), tmp.end());
-	return tmp;
+ std::string tmp(x);
+ if (!tmp.empty())
+ tmp.erase(std::remove_if(tmp.begin(), tmp.end(),
+ (char c) { return !(std::isalpha(c) || std::isdigit(c)); } ), tmp.end());
+ return tmp;
 }
 
 void protoConverter::visit(ArrType const& x)
 {
-	if (x.elements_size() > 0) {
-		int i = x.elements_size();
-		m_output << "";
-		for (auto &e : x.elements()) {
-			i--;
-			if (i == 0) {
-				visit(e);
-			} else {
-				visit(e);
-				m_output << ", ";
-			}
-		}
-		m_output << "";
-	} else {
-		m_output << "1";
-	}
+ if (x.elements_size() > 0) {
+ int i = x.elements_size();
+ m_output << "";
+ for (auto &e : x.elements()) {
+ i--;
+ if (i == 0) {
+ visit(e);
+ } else {
+ visit(e);
+ m_output << ", ";
+ }
+ }
+ m_output << "";
+ } else {
+ m_output << "1";
+ }
 }
 
 void protoConverter::visit(Array const& x)
 {
-	switch (x.arr_func()) {
-		case Array::FLATTEN:
-			visit(x.arr_arg());
-			m_output << ".flatten";
-			break;
-		case Array::COMPACT:
-			visit(x.arr_arg());
-			m_output << ".compact";
-			break;
-		case Array::FETCH:
-			visit(x.arr_arg());
-			m_output << ".fetch";
-			break;
-		case Array::FILL:
-			visit(x.arr_arg());
-			m_output << ".fill";
-			break;
-		case Array::ROTATE:
-			visit(x.arr_arg());
-			m_output << ".rotate";
-			break;
-		case Array::ROTATE_E:
-			visit(x.arr_arg());
-			m_output << ".rotate!";
-			break;
-		case Array::DELETEIF:
-			visit(x.arr_arg());
-			m_output << ".delete_if";
-			break;
-		case Array::INSERT:
-			visit(x.arr_arg());
-			m_output << ".insert";
-			break;
-		case Array::BSEARCH:
-			visit(x.arr_arg());
-			m_output << ".bsearch";
-			break;
-		case Array::KEEPIF:
-			visit(x.arr_arg());
-			m_output << ".keep_if";
-			break;
-		case Array::SELECT:
-			visit(x.arr_arg());
-			m_output << ".select";
-			break;
-		case Array::VALUES_AT:
-			visit(x.arr_arg());
-			m_output << ".values_at";
-			break;
-		case Array::BLOCK:
-			visit(x.arr_arg());
-			m_output << ".index";
-			break;
-		case Array::DIG:
-			visit(x.arr_arg());
-			m_output << ".dig";
-			break;
-		case Array::SLICE:
-			visit(x.arr_arg());
-			m_output << ".slice";
-			break;
-		case Array::PERM:
-			visit(x.arr_arg());
-			m_output << ".permutation";
-			break;
-		case Array::COMB:
-			visit(x.arr_arg());
-			m_output << ".combination";
-			break;
-		case Array::ASSOC:
-			visit(x.arr_arg());
-			m_output << ".assoc";
-			break;
-		case Array::RASSOC:
-			visit(x.arr_arg());
-			m_output << ".rassoc";
-			break;
-	}
-	m_output << "(";
-	visit(x.val_arg());
-	m_output << ")";
+ switch (x.arr_func()) {
+ case Array::FLATTEN:
+ visit(x.arr_arg());
+ m_output << ".flatten";
+ break;
+ case Array::COMPACT:
+ visit(x.arr_arg());
+ m_output << ".compact";
+ break;
+ case Array::FETCH:
+ visit(x.arr_arg());
+ m_output << ".fetch";
+ break;
+ case Array::FILL:
+ visit(x.arr_arg());
+ m_output << ".fill";
+ break;
+ case Array::ROTATE:
+ visit(x.arr_arg());
+ m_output << ".rotate";
+ break;
+ case Array::ROTATE_E:
+ visit(x.arr_arg());
+ m_output << ".rotate!";
+ break;
+ case Array::DELETEIF:
+ visit(x.arr_arg());
+ m_output << ".delete_if";
+ break;
+ case Array::INSERT:
+ visit(x.arr_arg());
+ m_output << ".insert";
+ break;
+ case Array::BSEARCH:
+ visit(x.arr_arg());
+ m_output << ".bsearch";
+ break;
+ case Array::KEEPIF:
+ visit(x.arr_arg());
+ m_output << ".keep_if";
+ break;
+ case Array::SELECT:
+ visit(x.arr_arg());
+ m_output << ".select";
+ break;
+ case Array::VALUES_AT:
+ visit(x.arr_arg());
+ m_output << ".values_at";
+ break;
+ case Array::BLOCK:
+ visit(x.arr_arg());
+ m_output << ".index";
+ break;
+ case Array::DIG:
+ visit(x.arr_arg());
+ m_output << ".dig";
+ break;
+ case Array::SLICE:
+ visit(x.arr_arg());
+ m_output << ".slice";
+ break;
+ case Array::PERM:
+ visit(x.arr_arg());
+ m_output << ".permutation";
+ break;
+ case Array::COMB:
+ visit(x.arr_arg());
+ m_output << ".combination";
+ break;
+ case Array::ASSOC:
+ visit(x.arr_arg());
+ m_output << ".assoc";
+ break;
+ case Array::RASSOC:
+ visit(x.arr_arg());
+ m_output << ".rassoc";
+ break;
+ }
+ m_output << "(";
+ visit(x.val_arg());
+ m_output << ")";
 }
 
 void protoConverter::visit(AssignmentStatement const& x)
 {
-	m_output << "var_" << m_numLiveVars << " = ";
-	visit(x.rvalue());
-	m_numVarsPerScope.top()++;
-	m_numLiveVars++;
-	m_output << "\n";
+ m_output << "var_" << m_numLiveVars << " = ";
+ visit(x.rvalue());
+ m_numVarsPerScope.top()++;
+ m_numLiveVars++;
+ m_output << "\n";
 }
 
 void protoConverter::visit(BinaryOp const& x)
 {
-	m_output << "(";
-	visit(x.left());
-	switch (x.op()) {
-		case BinaryOp::ADD: m_output << " + "; break;
-		case BinaryOp::SUB: m_output << " - "; break;
-		case BinaryOp::MUL: m_output << " * "; break;
-		case BinaryOp::DIV: m_output << " / "; break;
-		case BinaryOp::MOD: m_output << " % "; break;
-		case BinaryOp::XOR: m_output << " ^ "; break;
-		case BinaryOp::AND: m_output << " and "; break;
-		case BinaryOp::OR: m_output << " or "; break;
-		case BinaryOp::EQ: m_output << " == "; break;
-		case BinaryOp::NE: m_output << " != "; break;
-		case BinaryOp::LE: m_output << " <= "; break;
-		case BinaryOp::GE: m_output << " >= "; break;
-		case BinaryOp::LT: m_output << " < "; break;
-		case BinaryOp::GT: m_output << " > "; break;
-		case BinaryOp::RS: m_output << " >> "; break;
-	}
-	visit(x.right());
-	m_output << ")";
+ m_output << "(";
+ visit(x.left());
+ switch (x.op()) {
+ case BinaryOp::ADD: m_output << " + "; break;
+ case BinaryOp::SUB: m_output << " - "; break;
+ case BinaryOp::MUL: m_output << " * "; break;
+ case BinaryOp::DIV: m_output << " / "; break;
+ case BinaryOp::MOD: m_output << " % "; break;
+ case BinaryOp::XOR: m_output << " ^ "; break;
+ case BinaryOp::AND: m_output << " and "; break;
+ case BinaryOp::OR: m_output << " or "; break;
+ case BinaryOp::EQ: m_output << " == "; break;
+ case BinaryOp::NE: m_output << " != "; break;
+ case BinaryOp::LE: m_output << " <= "; break;
+ case BinaryOp::GE: m_output << " >= "; break;
+ case BinaryOp::LT: m_output << " < "; break;
+ case BinaryOp::GT: m_output << " > "; break;
+ case BinaryOp::RS: m_output << " >> "; break;
+ }
+ visit(x.right());
+ m_output << ")";
 }
 
 void protoConverter::visit(BuiltinFuncs const& x)
 {
-	switch (x.bifunc_oneof_case()) {
-		case BuiltinFuncs::kOs:
-			visit(x.os());
-			break;
-		case BuiltinFuncs::kTime:
-			visit(x.time());
-			break;
-		case BuiltinFuncs::kArr:
-			visit(x.arr());
-			break;
-		case BuiltinFuncs::kMops:
-			visit(x.mops());
-			break;
-		case BuiltinFuncs::BIFUNC_ONEOF_NOT_SET:
-			m_output << "1";
-			break;
-	}
-	m_output << "\n";
+ switch (x.bifunc_oneof_case()) {
+ case BuiltinFuncs::kOs:
+ visit(x.os());
+ break;
+ case BuiltinFuncs::kTime:
+ visit(x.time());
+ break;
+ case BuiltinFuncs::kArr:
+ visit(x.arr());
+ break;
+ case BuiltinFuncs::kMops:
+ visit(x.mops());
+ break;
+ case BuiltinFuncs::BIFUNC_ONEOF_NOT_SET:
+ m_output << "1";
+ break;
+ }
+ m_output << "\n";
 }
 
 void protoConverter::visit(Const const& x)
 {
-	switch (x.const_oneof_case()) {
-		case Const::kIntLit:
-			m_output << "(" << (x.int_lit() % 13) << ")";
-			break;
-		case Const::kBoolVal:
-			m_output << "(" << x.bool_val() << ")";
-			break;
-		case Const::CONST_ONEOF_NOT_SET:
-			m_output << "1";
-			break;
-	}
+ switch (x.const_oneof_case()) {
+ case Const::kIntLit:
+ m_output << "(" << (x.int_lit() % 13) << ")";
+ break;
+ case Const::kBoolVal:
+ m_output << "(" << x.bool_val() << ")";
+ break;
+ case Const::CONST_ONEOF_NOT_SET:
+ m_output << "1";
+ break;
+ }
 }
 
 void protoConverter::visit(Function const& x)
 {
-	m_output << "def foo()\nvar_0 = 1\n";
-	visit(x.statements());
-	m_output << "end\n";
-	m_output << "foo\n";
+ m_output << "def foo()\nvar_0 = 1\n";
+ visit(x.statements());
+ m_output << "end\n";
+ m_output << "foo\n";
 }
 
 void protoConverter::visit(HashType const& x)
 {
-	if (x.keyval_size() > 0) {
-		int i = x.keyval_size();
-		m_output << "{";
-		for (auto &e : x.keyval()) {
-			i--;
-			if (i == 0) {
-				visit(e);
-			}
-			else {
-				visit(e);
-				m_output << ", ";
-			}
-		}
-		m_output << "}";
-	}
+ if (x.keyval_size() > 0) {
+ int i = x.keyval_size();
+ m_output << "{";
+ for (auto &e : x.keyval()) {
+ i--;
+ if (i == 0) {
+ visit(e);
+ }
+ else {
+ visit(e);
+ m_output << ", ";
+ }
+ }
+ m_output << "}";
+ }
 }
 
 void protoConverter::visit(IfElse const& x)
 {
-	m_output << "if ";
-	visit(x.cond());
-	m_output << "\n";
-	visit(x.if_body());
-	m_output << "\nelse\n";
-	visit(x.else_body());
-	m_output << "\nend\n";
+ m_output << "if ";
+ visit(x.cond());
+ m_output << "\n";
+ visit(x.if_body());
+ m_output << "\nelse\n";
+ visit(x.else_body());
+ m_output << "\nend\n";
 }
 
 void protoConverter::visit(KVPair const& x)
 {
-	m_output << "\"" << removeSpecial(x.key()) << "\"";
-	m_output << " => ";
-	m_output << "\"" << removeSpecial(x.val()) << "\"";
+ m_output << "\"" << removeSpecial(x.key()) << "\"";
+ m_output << " => ";
+ m_output << "\"" << removeSpecial(x.val()) << "\"";
 }
 
 void protoConverter::visit(MathConst const& x)
 {
-	switch (x.math_const()) {
-		case MathConst::PI:
-			m_output << "Math::PI";
-			break;
-		case MathConst::E:
-			m_output << "Math::E";
-			break;
-	}
+ switch (x.math_const()) {
+ case MathConst::PI:
+ m_output << "Math::PI";
+ break;
+ case MathConst::E:
+ m_output << "Math::E";
+ break;
+ }
 }
 
 void protoConverter::visit(MathOps const& x)
 {
-	switch (x.math_op()) {
-		case MathOps::CBRT:
-			m_output << "Math.cbrt(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::COS:
-			m_output << "Math.cos(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::ERF:
-			m_output << "Math.erf(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::ERFC:
-			m_output << "Math.erfc(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::LOG:
-			m_output << "Math.log(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::LOG10:
-			m_output << "Math.log10(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::LOG2:
-			m_output << "Math.log2(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::SIN:
-			m_output << "Math.sin(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::SQRT:
-			m_output << "Math.sqrt(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-		case MathOps::TAN:
-			m_output << "Math.tan(";
-			visit(x.math_arg());
-			m_output << ")";
-			break;
-	}
+ switch (x.math_op()) {
+ case MathOps::CBRT:
+ m_output << "Math.cbrt(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::COS:
+ m_output << "Math.cos(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::ERF:
+ m_output << "Math.erf(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::ERFC:
+ m_output << "Math.erfc(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::LOG:
+ m_output << "Math.log(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::LOG10:
+ m_output << "Math.log10(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::LOG2:
+ m_output << "Math.log2(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::SIN:
+ m_output << "Math.sin(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::SQRT:
+ m_output << "Math.sqrt(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ case MathOps::TAN:
+ m_output << "Math.tan(";
+ visit(x.math_arg());
+ m_output << ")";
+ break;
+ }
 }
 
 void protoConverter::visit(MathType const& x)
 {
-	switch (x.math_arg_oneof_case()) {
-		case MathType::kMathRval:
-			visit(x.math_rval());
-			break;
-		case MathType::kMathConst:
-			visit(x.math_const());
-			break;
-		case MathType::MATH_ARG_ONEOF_NOT_SET:
-			m_output << "1";
-			break;
-	}
+ switch (x.math_arg_oneof_case()) {
+ case MathType::kMathRval:
+ visit(x.math_rval());
+ break;
+ case MathType::kMathConst:
+ visit(x.math_const());
+ break;
+ case MathType::MATH_ARG_ONEOF_NOT_SET:
+ m_output << "1";
+ break;
+ }
 }
 
 void protoConverter::visit(ObjectSpace const& x)
 {
-	switch (x.os_func()) {
-		case ObjectSpace::COUNT:
-			m_output << "ObjectSpace.count_objects";
-			break;
-	}
-	m_output << "(";
-	visit(x.os_arg());
-	m_output << ")" << "\n";
+ switch (x.os_func()) {
+ case ObjectSpace::COUNT:
+ m_output << "ObjectSpace.count_objects";
+ break;
+ }
+ m_output << "(";
+ visit(x.os_arg());
+ m_output << ")" << "\n";
 }
 
 void protoConverter::visit(Rvalue const& x)
 {
-	switch (x.rvalue_oneof_case()) {
-		case Rvalue::kVarref:
-			visit(x.varref());
-			break;
-		case Rvalue::kCons:
-			visit(x.cons());
-			break;
-		case Rvalue::kBinop:
-			visit(x.binop());
-			break;
-		case Rvalue::RVALUE_ONEOF_NOT_SET:
-			m_output << "1";
-			break;
-	}
+ switch (x.rvalue_oneof_case()) {
+ case Rvalue::kVarref:
+ visit(x.varref());
+ break;
+ case Rvalue::kCons:
+ visit(x.cons());
+ break;
+ case Rvalue::kBinop:
+ visit(x.binop());
+ break;
+ case Rvalue::RVALUE_ONEOF_NOT_SET:
+ m_output << "1";
+ break;
+ }
 }
 
 void protoConverter::visit(Statement const& x)
 {
-	switch (x.stmt_oneof_case()) {
-		case Statement::kAssignment:
-			visit(x.assignment());
-			break;
-		case Statement::kIfelse:
-			visit(x.ifelse());
-			break;
-		case Statement::kTernaryStmt:
-			visit(x.ternary_stmt());
-			break;
-		case Statement::kBuiltins:
-			visit(x.builtins());
-			break;
-		case Statement::kBlockstmt:
-			visit(x.blockstmt());
-			break;
-		case Statement::STMT_ONEOF_NOT_SET:
-			break;
-	}
-	m_output << "\n";
+ switch (x.stmt_oneof_case()) {
+ case Statement::kAssignment:
+ visit(x.assignment());
+ break;
+ case Statement::kIfelse:
+ visit(x.ifelse());
+ break;
+ case Statement::kTernaryStmt:
+ visit(x.ternary_stmt());
+ break;
+ case Statement::kBuiltins:
+ visit(x.builtins());
+ break;
+ case Statement::kBlockstmt:
+ visit(x.blockstmt());
+ break;
+ case Statement::STMT_ONEOF_NOT_SET:
+ break;
+ }
+ m_output << "\n";
 }
 
 void protoConverter::visit(StatementSeq const& x)
 {
-	if (x.statements_size() > 0) {
-		m_numVarsPerScope.push(0);
-		m_output << "@scope ||= begin\n";
-		for (auto &st : x.statements())
-			visit(st);
-		m_output << "end\n";
-		m_numLiveVars -= m_numVarsPerScope.top();
-		m_numVarsPerScope.pop();
-	}
+ if (x.statements_size() > 0) {
+ m_numVarsPerScope.push(0);
+ m_output << "@scope ||= begin\n";
+ for (auto &st : x.statements())
+ visit(st);
+ m_output << "end\n";
+ m_numLiveVars -= m_numVarsPerScope.top();
+ m_numVarsPerScope.pop();
+ }
 }
 
 void protoConverter::visit(StringExtNoArg const& x)
 {
-	m_output << "\"" << removeSpecial(x.str_arg()) << "\"";
-	switch (x.str_op()) {
-		case StringExtNoArg::DUMP:
-			m_output << ".dump";
-			break;
-		case StringExtNoArg::STRIP:
-			m_output << ".strip";
-			break;
-		case StringExtNoArg::LSTRIP:
-			m_output << ".lstrip";
-			break;
-		case StringExtNoArg::RSTRIP:
-			m_output << ".rstrip";
-			break;
-		case StringExtNoArg::STRIPE:
-			m_output << ".strip!";
-			break;
-		case StringExtNoArg::LSTRIPE:
-			m_output << ".lstrip!";
-			break;
-		case StringExtNoArg::RSTRIPE:
-			m_output << ".rstrip!";
-			break;
-		case StringExtNoArg::SWAPCASE:
-			m_output << ".swapcase";
-			break;
-		case StringExtNoArg::SWAPCASEE:
-			m_output << ".swapcase!";
-			break;
-		case StringExtNoArg::SQUEEZE:
-			m_output << ".squeeze";
-			break;
-	}
+ m_output << "\"" << removeSpecial(x.str_arg()) << "\"";
+ switch (x.str_op()) {
+ case StringExtNoArg::DUMP:
+ m_output << ".dump";
+ break;
+ case StringExtNoArg::STRIP:
+ m_output << ".strip";
+ break;
+ case StringExtNoArg::LSTRIP:
+ m_output << ".lstrip";
+ break;
+ case StringExtNoArg::RSTRIP:
+ m_output << ".rstrip";
+ break;
+ case StringExtNoArg::STRIPE:
+ m_output << ".strip!";
+ break;
+ case StringExtNoArg::LSTRIPE:
+ m_output << ".lstrip!";
+ break;
+ case StringExtNoArg::RSTRIPE:
+ m_output << ".rstrip!";
+ break;
+ case StringExtNoArg::SWAPCASE:
+ m_output << ".swapcase";
+ break;
+ case StringExtNoArg::SWAPCASEE:
+ m_output << ".swapcase!";
+ break;
+ case StringExtNoArg::SQUEEZE:
+ m_output << ".squeeze";
+ break;
+ }
 }
 
 void protoConverter::visit(Ternary const& x)
 {
-	m_output << "(";
-	visit(x.tern_cond());
-	m_output << " ? ";
-	visit(x.t_branch());
-	m_output << " : ";
-	visit(x.f_branch());
-	m_output << ")\n";
+ m_output << "(";
+ visit(x.tern_cond());
+ m_output << " ? ";
+ visit(x.t_branch());
+ m_output << " : ";
+ visit(x.f_branch());
+ m_output << ")\n";
 }
 
 void protoConverter::visit(Time const& x)
 {
-	switch (x.t_func()) {
-		case Time::AT:
-			m_output << "Time.at";
-			break;
-		case Time::GM:
-			m_output << "Time.gm";
-			break;
-	}
-	m_output << "(" << (x.t_arg()% 13) << ")" << "\n";
+ switch (x.t_func()) {
+ case Time::AT:
+ m_output << "Time.at";
+ break;
+ case Time::GM:
+ m_output << "Time.gm";
+ break;
+ }
+ m_output << "(" << (x.t_arg()% 13) << ")" << "\n";
 }
 
 void protoConverter::visit(VarRef const& x)
 {
-	m_output << "var_" << (static_cast<uint32_t>(x.varnum()) % m_numLiveVars);
+ m_output << "var_" << (static_cast<uint32_t>(x.varnum()) % m_numLiveVars);
 }
 
 std::string protoConverter::FunctionToString(Function const& input)
 {
-	visit(input);
-	return m_output.str();
+ visit(input);
+ return m_output.str();
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/oss-fuzz/proto_to_ruby.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/oss-fuzz/proto_to_ruby.h Changed

@@ -7,49 +7,49 @@
 #include <ruby.pb.h>
 
 namespace ruby_fuzzer {
-	class protoConverter
-	{
-	public:
-		protoConverter() {
-			m_numLiveVars = 1;
-			m_numVarsPerScope.push(m_numLiveVars);
-		}
-		protoConverter(protoConverter const& x) {
-			m_numLiveVars = x.m_numLiveVars;
-			m_numVarsPerScope = x.m_numVarsPerScope;
-		}
-		~protoConverter() {}
-		std::string FunctionToString(Function const& _input);
+ class protoConverter
+ {
+ public:
+ protoConverter() {
+ m_numLiveVars = 1;
+ m_numVarsPerScope.push(m_numLiveVars);
+ }
+ protoConverter(protoConverter const& x) {
+ m_numLiveVars = x.m_numLiveVars;
+ m_numVarsPerScope = x.m_numVarsPerScope;
+ }
+ ~protoConverter() {}
+ std::string FunctionToString(Function const& _input);
 
-	private:
-		void visit(ArrType const&);
-		void visit(Array const&);
-		void visit(AssignmentStatement const&);
-		void visit(BinaryOp const&);
-		void visit(BuiltinFuncs const&);
-		void visit(Const const&);
-		void visit(Function const&);
-		void visit(HashType const&);
-		void visit(IfElse const&);
-		void visit(KVPair const&);
-		void visit(MathConst const&);
-		void visit(MathOps const&);
-		void visit(MathType const&);
-		void visit(ObjectSpace const&);
-		void visit(Rvalue const&);
-		void visit(Statement const&);
-		void visit(StatementSeq const&);
-		void visit(StringExtNoArg const&);
-		void visit(Ternary const&);
-		void visit(Time const&);
-		void visit(VarRef const&);
-		template <class T>
-		void visit(google::protobuf::RepeatedPtrField<T> const& _repeated_field);
+ private:
+ void visit(ArrType const&);
+ void visit(Array const&);
+ void visit(AssignmentStatement const&);
+ void visit(BinaryOp const&);
+ void visit(BuiltinFuncs const&);
+ void visit(Const const&);
+ void visit(Function const&);
+ void visit(HashType const&);
+ void visit(IfElse const&);
+ void visit(KVPair const&);
+ void visit(MathConst const&);
+ void visit(MathOps const&);
+ void visit(MathType const&);
+ void visit(ObjectSpace const&);
+ void visit(Rvalue const&);
+ void visit(Statement const&);
+ void visit(StatementSeq const&);
+ void visit(StringExtNoArg const&);
+ void visit(Ternary const&);
+ void visit(Time const&);
+ void visit(VarRef const&);
+ template <class T>
+ void visit(google::protobuf::RepeatedPtrField<T> const& _repeated_field);
 
-		std::string removeSpecial(const std::string &x);
+ std::string removeSpecial(const std::string &x);
 
-		std::ostringstream m_output;
-		std::stack<uint8_t> m_numVarsPerScope;
-		int32_t m_numLiveVars;
-	};
+ std::ostringstream m_output;
+ std::stack<uint8_t> m_numVarsPerScope;
+ int32_t m_numLiveVars;
+ };
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/array.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/array.c Changed

@@ -10,23 +10,42 @@
 #include <mruby/string.h>
 #include <mruby/range.h>
 #include <mruby/proc.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 #include "value_array.h"
 
 #define ARY_DEFAULT_LEN 4
 #define ARY_SHRINK_RATIO 5 /* must be larger than 2 */
 #define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value))
+#ifndef MRB_ARY_LENGTH_MAX
+#define MRB_ARY_LENGTH_MAX 131072
+#endif
 #define ARY_MAX_SIZE ((mrb_int)((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? ARY_C_MAX_SIZE : MRB_INT_MAX-1))
 
+static void
+ary_too_big(mrb_state *mrb)
+{
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
+}
+
+static inline void
+ary_check_too_big(mrb_state *mrb, mrb_int a, mrb_int b)
+{
+ if (a > ARY_MAX_SIZE - b || a < 0)
+ ary_too_big(mrb);
+#if MRB_ARY_LENGTH_MAX != 0
+ if (a > MRB_ARY_LENGTH_MAX - b || a < 0)
+ ary_too_big(mrb);
+#endif
+}
+
 static struct RArray*
 ary_new_capa(mrb_state *mrb, mrb_int capa)
 {
 struct RArray *a;
 size_t blen;
 
- if (capa > ARY_MAX_SIZE) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
- }
+ ary_check_too_big(mrb, capa, 0);
 blen = capa * sizeof(mrb_value);
 
 a = MRB_OBJ_ALLOC(mrb, MRB_TT_ARRAY, mrb->array_class);
@@ -100,10 +119,12 @@
 mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr)
 {
 struct RArray *a;
+ mrb_value *p;
 
 a = ary_new_capa(mrb, 2);
- ARY_PTR(a)0 = car;
- ARY_PTR(a)1 = cdr;
+ p = ARY_PTR(a);
+ p0 = car;
+ p1 = cdr;
 ARY_SET_LEN(a, 2);
 return mrb_obj_value(a);
 }
@@ -118,11 +139,7 @@
 }
 }
 
-static void
-ary_modify_check(mrb_state *mrb, struct RArray *a)
-{
- mrb_check_frozen(mrb, a);
-}
+#define ary_modify_check(mrb, a) mrb_check_frozen((mrb), (a))
 
 static void
 ary_modify(mrb_state *mrb, struct RArray *a)
@@ -188,11 +205,7 @@
 {
 mrb_int capa = ARY_CAPA(a);
 
- if (len > ARY_MAX_SIZE || len < 0) {
- size_error:
- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
- }
-
+ ary_check_too_big(mrb, len, 0);
 if (capa < ARY_DEFAULT_LEN) {
 capa = ARY_DEFAULT_LEN;
 }
@@ -205,7 +218,7 @@
 }
 }
 if (capa < len || capa > ARY_MAX_SIZE) {
- goto size_error;
+ ary_too_big(mrb);
 }
 
 if (ARY_EMBED_P(a)) {
@@ -302,9 +315,7 @@
 ary_replace(mrb, a, a2);
 return;
 }
- if (ARY_LEN(a2) > ARY_MAX_SIZE - ARY_LEN(a)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
- }
+ ary_check_too_big(mrb, ARY_LEN(a2), ARY_LEN(a));
 len = ARY_LEN(a) + ARY_LEN(a2);
 
 ary_modify(mrb, a);
@@ -324,13 +335,29 @@
 ary_concat(mrb, mrb_ary_ptr(self), a2);
 }
 
+/*
+ * call-seq:
+ * array.concat(*other_arrays) -> self
+ *
+ * Adds to +array+ all elements from each \Array in +other_arrays+; returns +self+:
+ *
+ * a = 0, 1
+ * a.concat(2, 3, 4, 5) # => 0, 1, 2, 3, 4, 5
+ */
+
 static mrb_value
 mrb_ary_concat_m(mrb_state *mrb, mrb_value self)
 {
- mrb_value ary;
+ mrb_value *args;
+ mrb_int len;
 
- mrb_get_args(mrb, "A", &ary);
- mrb_ary_concat(mrb, self, ary);
+ mrb_get_args(mrb, "*!", &args, &len);
+ for (int i=0; i<len; i++) {
+ mrb_ensure_array_type(mrb, argsi);
+ }
+ for (int i=0; i<len; i++) {
+ mrb_ary_concat(mrb, self, argsi);
+ }
 return self;
 }
 
@@ -343,9 +370,7 @@
 mrb_int blen, len1;
 
 mrb_get_args(mrb, "a", &ptr, &blen);
- if (ARY_MAX_SIZE - blen < ARY_LEN(a1)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
- }
+ ary_check_too_big(mrb, ARY_LEN(a1), blen);
 len1 = ARY_LEN(a1);
 a2 = ary_new_capa(mrb, len1 + blen);
 array_copy(ARY_PTR(a2), ARY_PTR(a1), len1);
@@ -425,16 +450,22 @@
 {
 struct RArray *a1 = mrb_ary_ptr(self);
 struct RArray *a2;
- mrb_value *ptr;
+ mrb_value *ptr, sep, tmp;
 mrb_int times, len1;
 
+ mrb_get_args(mrb, "o", &sep);
+ tmp = mrb_check_string_type(mrb, sep);
+ if (!mrb_nil_p(tmp)) {
+ return mrb_ary_join(mrb, self, tmp);
+ }
+
 mrb_get_args(mrb, "i", &times);
 if (times < 0) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "negative argument");
 }
 if (times == 0) return mrb_ary_new(mrb);
 if (ARY_MAX_SIZE / times < ARY_LEN(a1)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
+ ary_too_big(mrb);
 }
 len1 = ARY_LEN(a1);
 a2 = ary_new_capa(mrb, len1 * times);
@@ -512,15 +543,15 @@
 mrb_int len, len2;
 struct RArray *a;
 
- argc = mrb_get_argc(mrb);
- argv = mrb_get_argv(mrb);
 a = mrb_ary_ptr(self);
 ary_modify(mrb, a);
+ argc = mrb_get_argc(mrb);
 len = ARY_LEN(a);
 len2 = len + argc;
 if (ARY_CAPA(a) < len2) {
 ary_expand_capa(mrb, a, len2);
 }
+ argv = mrb_get_argv(mrb);
 array_copy(ARY_PTR(a)+len, argv, argc);
 ARY_SET_LEN(a, len2);
 while (argc--) {
@@ -571,7 +602,7 @@
 val = *ptr;
 while (--size) {
 *ptr = *(ptr+1);
- ++ptr;
+ ptr++;
 }
 ARY_SET_LEN(a, len-1);
 }
@@ -615,7 +646,7 @@
 
 while (size--) {
 *ptr = *(ptr+n);
- ++ptr;
+ ptr++;
 }
 ARY_SET_LEN(a, len-n);
 }
@@ -654,6 +685,20 @@
 return self;
 }
 
+/*
+ * call-seq:
+ * array.unshift(*objects) -> self
+ *
+ * Prepends the given +objects+ to +self+:
+ *
+ * a = :foo, 'bar', 2
+ * a.unshift(:bam, :bat) # => :bam, :bat, :foo, "bar", 2
+ *
+ * Array#prepend is an alias for Array#unshift.
+ *
+ * Related: #push, #pop, #shift.
+ */
+
 static mrb_value
 mrb_ary_unshift_m(mrb_state *mrb, mrb_value self)
 {
@@ -662,14 +707,15 @@
 mrb_value *ptr;
 mrb_int alen, len;
 
- mrb_get_args(mrb, "*!", &vals, &alen);
+ alen = mrb_get_argc(mrb);
+ vals = mrb_get_argv(mrb);
 if (alen == 0) {
 ary_modify_check(mrb, a);
 return self;
 }
 len = ARY_LEN(a);
 if (alen > ARY_MAX_SIZE - len) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
+ ary_too_big(mrb);
 }
 if (ARY_SHARED_P(a)
 && a->as.heap.aux.shared->refcnt == 1 /* shared only referenced from this array */
@@ -710,6 +756,9 @@
 mrb_raisef(mrb, E_INDEX_ERROR, "index %i out of array", n - len);
 }
 }
+ if (n >= ARY_MAX_SIZE) {
+ mrb_raise(mrb, E_INDEX_ERROR, "index too big");
+ }
 if (len <= n) {
 if (ARY_CAPA(a) <= n)
 ary_expand_capa(mrb, a, n + 1);
@@ -834,7 +883,7 @@
 return mrb_ary_new_from_values(mrb, len, ARY_PTR(a)+beg);
 }
 ary_make_shared(mrb, a);
- b = MRB_OBJ_ALLOC(mrb, MRB_TT_ARRAY, mrb->array_class);
+ b = MRB_OBJ_ALLOC(mrb, MRB_TT_ARRAY, mrb->array_class);
 b->as.heap.ptr = a->as.heap.ptr + beg;
 b->as.heap.len = len;
 b->as.heap.aux.shared = a->as.heap.aux.shared;
@@ -1003,7 +1052,7 @@
 return v3;
 }
 
-static mrb_value
+mrb_value
 mrb_ary_delete_at(mrb_state *mrb, mrb_value self)
 {
 struct RArray *a = mrb_ary_ptr(self);
@@ -1025,7 +1074,7 @@
 len = alen - index;
 while (--len) {
 *ptr = *(ptr+1);
- ++ptr;
+ ptr++;
 }
 ARY_SET_LEN(a, alen-1);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/backtrace.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/backtrace.c Changed

@@ -14,6 +14,7 @@
 #include <mruby/error.h>
 #include <mruby/numeric.h>
 #include <mruby/data.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 struct backtrace_location {
@@ -26,8 +27,7 @@
 
 static const mrb_data_type bt_type = { "Backtrace", mrb_free };
 
-mrb_value mrb_exc_inspect(mrb_state *mrb, mrb_value exc);
-mrb_value mrb_unpack_backtrace(mrb_state *mrb, mrb_value backtrace);
+struct RObject *mrb_unpack_backtrace(mrb_state *mrb, struct RObject *backtrace);
 
 static void
 each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, each_backtrace_func func, void *data)
@@ -97,29 +97,41 @@
 #ifndef MRB_NO_STDIO
 
 static void
-print_backtrace(mrb_state *mrb, struct RObject *exc, mrb_value backtrace)
+print_backtrace(mrb_state *mrb, struct RObject *exc, struct RArray *backtrace)
 {
 mrb_int i;
- mrb_int n = RARRAY_LEN(backtrace);
+ mrb_int n = (backtrace ? ARY_LEN(backtrace) : 0);
 mrb_value *loc, mesg;
 
 if (n != 0) {
 if (n > 1) {
- fprintf(stderr, "trace (most recent call last):\n");
+ fputs("trace (most recent call last):\n", stderr);
 }
- for (i=n-1,loc=&RARRAY_PTR(backtrace)i; i>0; i--,loc--) {
+ for (i=n-1,loc=&ARY_PTR(backtrace)i; i>0; i--,loc--) {
 if (mrb_string_p(*loc)) {
- fprintf(stderr, "\t%d %.*s\n",
- (int)i, (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc));
+ fprintf(stderr, "\t%d ", (int)i);
+ fwrite(RSTRING_PTR(*loc), (int)RSTRING_LEN(*loc), 1, stderr);
+ fputc('\n', stderr);
 }
 }
 if (mrb_string_p(*loc)) {
- fprintf(stderr, "%.*s: ", (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc));
+ fwrite(RSTRING_PTR(*loc), (int)RSTRING_LEN(*loc), 1, stderr);
+ fputs(": ", stderr);
 }
 }
- mesg = mrb_exc_inspect(mrb, mrb_obj_value(exc));
- fwrite(RSTRING_PTR(mesg), RSTRING_LEN(mesg), 1, stderr);
- fputc('\n', stderr);
+ else {
+ fputs("(unknown):0: ", stderr);
+ }
+
+ if (exc == mrb->nomem_err) {
+ static const char nomem = "Out of memory (NoMemoryError)\n";
+ fwrite(nomem, sizeof(nomem)-1, 1, stderr);
+ }
+ else {
+ mesg = mrb_exc_inspect(mrb, mrb_obj_value(exc));
+ fwrite(RSTRING_PTR(mesg), RSTRING_LEN(mesg), 1, stderr);
+ fputc('\n', stderr);
+ }
 }
 
 /* mrb_print_backtrace
@@ -130,16 +142,13 @@
 MRB_API void
 mrb_print_backtrace(mrb_state *mrb)
 {
- mrb_value backtrace;
-
- if (!mrb->exc) {
+ if (!mrb->exc || mrb->exc->tt != MRB_TT_EXCEPTION) {
 return;
 }
 
- backtrace = mrb_obj_iv_get(mrb, mrb->exc, MRB_SYM(backtrace));
- if (mrb_nil_p(backtrace)) return;
- if (!mrb_array_p(backtrace)) backtrace = mrb_unpack_backtrace(mrb, backtrace);
- print_backtrace(mrb, mrb->exc, backtrace);
+ struct RObject *backtrace = ((struct RException*)mrb->exc)->backtrace;
+ if (backtrace && backtrace->tt != MRB_TT_ARRAY) backtrace = mrb_unpack_backtrace(mrb, backtrace);
+ print_backtrace(mrb, mrb->exc, (struct RArray*)backtrace);
 }
 #else
 
@@ -172,7 +181,7 @@
 *pptr = ptr+1;
 }
 
-static mrb_value
+static struct RObject*
 packed_backtrace(mrb_state *mrb)
 {
 struct RData *backtrace;
@@ -183,44 +192,51 @@
 
 each_backtrace(mrb, ciidx, count_backtrace_i, &len);
 size = len * sizeof(struct backtrace_location);
+ backtrace = mrb_data_object_alloc(mrb, NULL, NULL, &bt_type);
 ptr = mrb_malloc(mrb, size);
- backtrace = mrb_data_object_alloc(mrb, NULL, ptr, &bt_type);
+ backtrace->data = ptr;
 backtrace->flags = (uint32_t)len;
 each_backtrace(mrb, ciidx, pack_backtrace_i, &ptr);
- return mrb_obj_value(backtrace);
+ return (struct RObject*)backtrace;
+}
+
+static void
+store_backtrace(mrb_state *mrb, mrb_value exc, struct RObject *backtrace)
+{
+ struct RException *e = mrb_exc_ptr(exc);
+ e->backtrace = backtrace;
+ mrb_field_write_barrier(mrb, (struct RBasic*)e, (struct RBasic*)backtrace);
 }
 
 void
 mrb_keep_backtrace(mrb_state *mrb, mrb_value exc)
 {
- mrb_sym sym = MRB_SYM(backtrace);
- mrb_value backtrace;
 int ai;
 
- if (mrb_iv_defined(mrb, exc, sym)) return;
+ if (mrb_exc_ptr(exc)->backtrace) return;
 ai = mrb_gc_arena_save(mrb);
- backtrace = packed_backtrace(mrb);
- mrb_iv_set(mrb, exc, sym, backtrace);
+ struct RObject *backtrace = packed_backtrace(mrb);
+ store_backtrace(mrb, exc, backtrace);
 mrb_gc_arena_restore(mrb, ai);
 }
 
-mrb_value
-mrb_unpack_backtrace(mrb_state *mrb, mrb_value backtrace)
+struct RObject*
+mrb_unpack_backtrace(mrb_state *mrb, struct RObject *backtrace)
 {
 const struct backtrace_location *bt;
 mrb_int n, i;
 int ai;
 
- if (mrb_nil_p(backtrace)) {
+ if (backtrace == NULL) {
 empty_backtrace:
- return mrb_ary_new_capa(mrb, 0);
+ return mrb_obj_ptr(mrb_ary_new_capa(mrb, 0));
 }
- if (mrb_array_p(backtrace)) return backtrace;
- bt = (struct backtrace_location*)mrb_data_check_get_ptr(mrb, backtrace, &bt_type);
+ if (backtrace->tt == MRB_TT_ARRAY) return backtrace;
+ bt = (struct backtrace_location*)mrb_data_check_get_ptr(mrb, mrb_obj_value(backtrace), &bt_type);
 if (bt == NULL) goto empty_backtrace;
- n = (mrb_int)RDATA(backtrace)->flags;
+ n = (mrb_int)backtrace->flags;
 if (n == 0) goto empty_backtrace;
- backtrace = mrb_ary_new_capa(mrb, n);
+ backtrace = mrb_obj_ptr(mrb_ary_new_capa(mrb, n));
 ai = mrb_gc_arena_save(mrb);
 for (i = 0; i < n; i++) {
 const struct backtrace_location *entry = &bti;
@@ -236,7 +252,7 @@
 mrb_str_cat_lit(mrb, btline, ":in ");
 mrb_str_cat_cstr(mrb, btline, mrb_sym_name(mrb, entry->method_id));
 }
- mrb_ary_push(mrb, backtrace, btline);
+ mrb_ary_push(mrb, mrb_obj_value(backtrace), btline);
 mrb_gc_arena_restore(mrb, ai);
 }
 
@@ -246,20 +262,21 @@
 mrb_value
 mrb_exc_backtrace(mrb_state *mrb, mrb_value exc)
 {
- mrb_value backtrace;
-
- backtrace = mrb_iv_get(mrb, exc, MRB_SYM(backtrace));
- if (mrb_nil_p(backtrace) || mrb_array_p(backtrace)) {
- return backtrace;
+ struct RObject *backtrace = mrb_exc_ptr(exc)->backtrace;
+ if (backtrace == NULL) {
+ return mrb_nil_value();
+ }
+ if (backtrace->tt == MRB_TT_ARRAY) {
+ return mrb_obj_value(backtrace);
 }
 /* unpack packed-backtrace */
 backtrace = mrb_unpack_backtrace(mrb, backtrace);
- mrb_iv_set(mrb, exc, MRB_SYM(backtrace), backtrace);
- return backtrace;
+ store_backtrace(mrb, exc, backtrace);
+ return mrb_obj_value(backtrace);
 }
 
 mrb_value
 mrb_get_backtrace(mrb_state *mrb)
 {
- return mrb_unpack_backtrace(mrb, packed_backtrace(mrb));
+ return mrb_obj_value(mrb_unpack_backtrace(mrb, packed_backtrace(mrb)));
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/cdump.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/cdump.c Changed

@@ -9,6 +9,7 @@
 #include <mruby/dump.h>
 #include <mruby/irep.h>
 #include <mruby/debug.h>
+#include <mruby/internal.h>
 
 #include <string.h>
 
@@ -39,12 +40,7 @@
 break;
 case IREP_TT_FLOAT:
 #ifndef MRB_NO_FLOAT
- if (p->u.f == 0) {
- fprintf(fp, "{IREP_TT_FLOAT, {.f=%#.1f}},\n", p->u.f);
- }
- else {
- fprintf(fp, "{IREP_TT_FLOAT, {.f=" MRB_FLOAT_FMT "}},\n", p->u.f);
- }
+ fprintf(fp, "{IREP_TT_FLOAT, {.f=" MRB_FLOAT_FMT "}},\n", p->u.f);
 #endif
 break;
 case IREP_TT_BIGINT:
@@ -171,7 +167,7 @@
 }
 if (0 < cmp) {
 start = ++idx;
- --table_size;
+ table_size--;
 }
 }
 return NULL;
@@ -193,7 +189,10 @@
 static int
 cdump_sym(mrb_state *mrb, mrb_sym sym, const char *var_name, int idx, mrb_value init_syms_code, FILE *fp)
 {
- if (sym == 0) return MRB_DUMP_INVALID_ARGUMENT;
+ if (sym == 0) {
+ fputs("0,", fp);
+ return MRB_DUMP_OK;
+ }
 
 mrb_int len;
 const char *name = mrb_sym_name_len(mrb, sym, &len), *op_name;
@@ -302,7 +301,7 @@
 line_type = "mrb_debug_line_flat_map";
 fprintf(fp, "static struct mrb_irep_debug_info_line %s_debug_lines_%d%d = {", name, n, len);
 for (i=0; i<len; i++) {
- mrb_irep_debug_info_line *fmap = &info->files0->lines.flat_mapi;
+ const mrb_irep_debug_info_line *fmap = &info->files0->lines.flat_mapi;
 fprintf(fp, "\t{.start_pos=0x%04x,.line=%d},\n", fmap->start_pos, fmap->line);
 }
 fputs("};\n", fp);
@@ -310,8 +309,8 @@
 
 case mrb_debug_line_packed_map:
 line_type = "mrb_debug_line_packed_map";
- fprintf(fp, "static char %s_debug_lines_%d = \"", name, n);
- uint8_t *pmap = info->files0->lines.packed_map;
+ fprintf(fp, "static const char %s_debug_lines_%d = \"", name, n);
+ const uint8_t *pmap = info->files0->lines.packed_map;
 for (i=0; i<len; i++) {
 fprintf(fp, "\\x%02x", pmapi&0xff);
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/class.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/class.c Changed

@@ -16,6 +16,7 @@
 #include <mruby/data.h>
 #include <mruby/istruct.h>
 #include <mruby/opcode.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 union mt_ptr {
@@ -42,8 +43,8 @@
 } mt_tbl;
 
 #ifdef MRB_USE_INLINE_METHOD_CACHE
-#define MT_CACHE_SIZE 256
-static uint8_t mt_cacheMT_CACHE_SIZE;
+#define MT_INLINE_CACHE_SIZE 256
+static uint8_t mt_cacheMT_INLINE_CACHE_SIZE;
 #endif
 
 /* Creates the method table. */
@@ -72,9 +73,9 @@
 khash_power2(new_alloc);
 if (old_alloc == new_alloc) return;
 
+ t->ptr = (union mt_ptr*)mrb_calloc(mrb, sizeof(union mt_ptr)+sizeof(mrb_sym), new_alloc);
 t->alloc = new_alloc;
 t->size = 0;
- t->ptr = (union mt_ptr*)mrb_calloc(mrb, sizeof(union mt_ptr)+sizeof(mrb_sym), new_alloc);
 if (old_alloc == 0) return;
 
 mrb_sym *keys = (mrb_sym*)&old_ptrold_alloc;
@@ -149,10 +150,16 @@
 union mt_ptr *vals = t->ptr;
 hash = kh_int_hash_func(mrb, sym);
 #ifdef MRB_USE_INLINE_METHOD_CACHE
- int cpos = (hash^(uintptr_t)t) % MT_CACHE_SIZE;
+ int cpos = (hash^(uintptr_t)t) % MT_INLINE_CACHE_SIZE;
 pos = mt_cachecpos;
- if (cpos < t->alloc && t->tablecpos.key == sym) {
- return &t->tablecpos;
+ if (pos < t->alloc) {
+ mrb_sym key = keyspos;
+ if (key) {
+ if (MT_KEY_SYM(key) == sym) {
+ *pp = valspos;
+ return key;
+ }
+ }
 }
 #endif
 start = pos = hash & (t->alloc-1);
@@ -161,7 +168,7 @@
 if (MT_KEY_SYM(key) == sym) {
 *pp = valspos;
 #ifdef MRB_USE_INLINE_METHOD_CACHE
- if (pos < 0xff) {
+ if (pos < 0x100) {
 mt_cachecpos = pos;
 }
 #endif
@@ -237,6 +244,23 @@
 mrb_free(mrb, t);
 }
 
+static inline mrb_method_t
+create_method_value(mrb_state *mrb, mrb_sym key, union mt_ptr val)
+{
+ mrb_method_t m;
+
+ if (key & MT_FUNC_P) {
+ MRB_METHOD_FROM_FUNC(m, val.func);
+ }
+ else {
+ MRB_METHOD_FROM_PROC(m, val.proc);
+ }
+ if (key & MT_NOARG_P) {
+ MRB_METHOD_NOARG_SET(m);
+ }
+ return m;
+}
+
 MRB_API void
 mrb_mt_foreach(mrb_state *mrb, struct RClass *c, mrb_mt_foreach_func *fn, void *p)
 {
@@ -252,19 +276,7 @@
 for (i=0; i<t->alloc; i++) {
 mrb_sym key = keysi;
 if (MT_KEY_SYM(key)) {
- mrb_method_t m;
-
- if (key & MT_FUNC_P) {
- MRB_METHOD_FROM_FUNC(m, valsi.func);
- }
- else {
- MRB_METHOD_FROM_PROC(m, valsi.proc);
- }
- if (key & MT_NOARG_P) {
- MRB_METHOD_NOARG_SET(m);
- }
-
- if (fn(mrb, MT_KEY_SYM(key), m, p) != 0)
+ if (fn(mrb, MT_KEY_SYM(key), create_method_value(mrb, key, valsi), p) != 0)
 return;
 }
 }
@@ -385,7 +397,6 @@
 }
 o->c = sc;
 mrb_field_write_barrier(mrb, (struct RBasic*)o, (struct RBasic*)sc);
- mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)o);
 mrb_obj_iv_set(mrb, (struct RObject*)sc, MRB_SYM(__attached__), mrb_obj_value(o));
 sc->flags |= o->flags & MRB_FL_OBJ_IS_FROZEN;
 }
@@ -545,11 +556,13 @@
 return mrb_define_class_id(mrb, mrb_intern_cstr(mrb, name), super);
 }
 
-static mrb_value mrb_bob_init(mrb_state *mrb, mrb_value);
+static mrb_value mrb_do_nothing(mrb_state *mrb, mrb_value);
 #ifndef MRB_NO_METHOD_CACHE
 static void mc_clear(mrb_state *mrb);
+static void mc_clear_by_id(mrb_state *mrb, mrb_sym mid);
 #else
 #define mc_clear(mrb)
+#define mc_clear_by_id(mrb,mid)
 #endif
 
 static void
@@ -562,9 +575,8 @@
 super = mrb->object_class;
 super->flags |= MRB_FL_CLASS_IS_INHERITED;
 s = mrb_obj_value(super);
- mrb_mc_clear_by_class(mrb, klass);
 mid = MRB_SYM(inherited);
- if (!mrb_func_basic_p(mrb, s, mid, mrb_bob_init)) {
+ if (!mrb_func_basic_p(mrb, s, mid, mrb_do_nothing)) {
 mrb_value c = mrb_obj_value(klass);
 mrb_funcall_argv(mrb, s, mid, 1, &c);
 }
@@ -772,7 +784,7 @@
 ptr.func = MRB_METHOD_FUNC(m);
 }
 mt_put(mrb, h, mid, MT_FLAGS(MRB_METHOD_FUNC_P(m), MRB_METHOD_NOARG_P(m)), ptr);
- mc_clear(mrb);
+ mc_clear_by_id(mrb, mid);
 }
 
 MRB_API void
@@ -877,8 +889,6 @@
 return array_argv0;
 }
 
-mrb_int mrb_ci_bidx(mrb_callinfo *ci);
-
 MRB_API mrb_bool
 mrb_block_given_p(mrb_state *mrb)
 {
@@ -888,54 +898,16 @@
 return !mrb_nil_p(b);
 }
 
-/*
- retrieve arguments from mrb_state.
-
- mrb_get_args(mrb, format, ...)
-
- returns number of arguments parsed.
-
- format specifiers:
-
- string mruby type C type note
- ----------------------------------------------------------------------------------------------
- o: Object 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* NUL 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*,struct RClass I! gives NULL for nil
- &: block mrb_value &! raises exception if no block given
- *: rest argument const mrb_value*,mrb_int The rest of the arguments as an array; *! avoid copy of the stack
- |: optional Following arguments are optional
- ?: optional given mrb_bool true if preceding argument (optional) is given
- ':': keyword args mrb_kwargs const Get keyword arguments
-
- format modifiers:
+#define GET_ARG(_type) (ptr ? ((_type)(*ptr++)) : va_arg((*ap), _type))
 
- string note
- ----------------------------------------------------------------------------------------------
- !: Switch to the alternate mode; The behaviour changes depending on the specifier
- +: Request a not frozen object; However, except nil value
- */
-MRB_API mrb_int
-mrb_get_args(mrb_state *mrb, const char *format, ...)
+static mrb_int
+get_args_v(mrb_state *mrb, mrb_args_format format, void** ptr, va_list *ap)
 {
 const char *fmt = format;
 char c;
- int i = 0;
- va_list ap;
+ mrb_int i = 0;
 mrb_callinfo *ci = mrb->c->ci;
- int argc = ci->n;
+ mrb_int argc = ci->n;
 const mrb_value *argv = ci->stack+1;
 mrb_bool argv_on_stack;
 mrb_bool opt = FALSE;
@@ -945,8 +917,6 @@
 mrb_bool reqkarg = FALSE;
 int argc_min = 0, argc_max = 0;
 
- va_start(ap, format);
-
 while ((c = *fmt++)) {
 switch (c) {
 case '|':
@@ -1070,7 +1040,7 @@
 {
 mrb_value *p;
 
- p = va_arg(ap, mrb_value*);
+ p = GET_ARG(mrb_value*);
 if (pickarg) {
 if (!(altmode && mrb_nil_p(*pickarg))) {
 switch (c) {
@@ -1088,7 +1058,7 @@
 {
 struct RClass **p;
 
- p = va_arg(ap, struct RClass**);
+ p = GET_ARG(struct RClass**);
 if (pickarg) {
 if (altmode && mrb_nil_p(*pickarg)) {
 *p = NULL;
@@ -1105,8 +1075,8 @@
 const char **ps = 0;
 mrb_int *pl = 0;
 
- ps = va_arg(ap, const char**);
- pl = va_arg(ap, mrb_int*);
+ ps = GET_ARG(const char**);
+ pl = GET_ARG(mrb_int*);
 if (needmodify) goto bad_needmodify;
 if (pickarg) {
 if (altmode && mrb_nil_p(*pickarg)) {
@@ -1125,7 +1095,7 @@
 {
 const char **ps;
 
- ps = va_arg(ap, const char**);
+ ps = GET_ARG(const char**);
 if (needmodify) goto bad_needmodify;
 if (pickarg) {
 if (altmode && mrb_nil_p(*pickarg)) {
@@ -1144,8 +1114,8 @@
 const mrb_value **pb;
 mrb_int *pl;
 
- pb = va_arg(ap, const mrb_value**);
- pl = va_arg(ap, mrb_int*);
+ pb = GET_ARG(const mrb_value**);
+ pl = GET_ARG(mrb_int*);
 if (needmodify) goto bad_needmodify;
 if (pickarg) {
 if (altmode && mrb_nil_p(*pickarg)) {
@@ -1161,35 +1131,12 @@
 }
 }
 break;
- case 'I':
- {
- void* *p;
- struct RClass *klass;
-
- p = va_arg(ap, void**);
- klass = va_arg(ap, struct RClass*);
- if (pickarg) {
- if (altmode && mrb_nil_p(*pickarg)) {
- *p = NULL;
- }
- else {
- if (!mrb_obj_is_kind_of(mrb, *pickarg, klass)) {
- mrb_raisef(mrb, E_TYPE_ERROR, "%v is not a %C", *pickarg, klass);
- }
- if (!mrb_istruct_p(*pickarg)) {
- mrb_raisef(mrb, E_TYPE_ERROR, "%v is not inline struct", *pickarg);
- }
- *p = mrb_istruct_ptr(*pickarg);
- }
- }
- }
- break;
 #ifndef MRB_NO_FLOAT
 case 'f':
 {
 mrb_float *p;
 
- p = va_arg(ap, mrb_float*);
+ p = GET_ARG(mrb_float*);
 if (pickarg) {
 *p = mrb_as_float(mrb, *pickarg);
 }
@@ -1200,7 +1147,7 @@
 {
 mrb_int *p;
 
- p = va_arg(ap, mrb_int*);
+ p = GET_ARG(mrb_int*);
 if (pickarg) {
 *p = mrb_as_int(mrb, *pickarg);
 }
@@ -1208,7 +1155,7 @@
 break;
 case 'b':
 {
- mrb_bool *boolp = va_arg(ap, mrb_bool*);
+ mrb_bool *boolp = GET_ARG(mrb_bool*);
 
 if (pickarg) {
 *boolp = mrb_test(*pickarg);
@@ -1219,7 +1166,7 @@
 {
 mrb_sym *symp;
 
- symp = va_arg(ap, mrb_sym*);
+ symp = GET_ARG(mrb_sym*);
 if (pickarg) {
 *symp = to_sym(mrb, *pickarg);
 }
@@ -1230,8 +1177,8 @@
 void** datap;
 struct mrb_data_type const* type;
 
- datap = va_arg(ap, void**);
- type = va_arg(ap, struct mrb_data_type const*);
+ datap = GET_ARG(void**);
+ type = GET_ARG(struct mrb_data_type const*);
 if (pickarg) {
 if (altmode && mrb_nil_p(*pickarg)) {
 *datap = 0;
@@ -1247,7 +1194,7 @@
 {
 mrb_value *p, *bp;
 
- p = va_arg(ap, mrb_value*);
+ p = GET_ARG(mrb_value*);
 bp = ci->stack + mrb_ci_bidx(ci);
 if (altmode && mrb_nil_p(*bp)) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
@@ -1263,7 +1210,7 @@
 {
 mrb_bool *p;
 
- p = va_arg(ap, mrb_bool*);
+ p = GET_ARG(mrb_bool*);
 *p = pickarg ? TRUE : FALSE;
 }
 break;
@@ -1274,8 +1221,8 @@
 mrb_int *pl;
 mrb_bool nocopy = (altmode || !argv_on_stack) ? TRUE : FALSE;
 
- var = va_arg(ap, const mrb_value**);
- pl = va_arg(ap, mrb_int*);
+ var = GET_ARG(const mrb_value**);
+ pl = GET_ARG(mrb_int*);
 if (argc > i) {
 *pl = argc-i;
 if (*pl > 0) {
@@ -1300,20 +1247,22 @@
 case ':':
 {
 mrb_value ksrc = mrb_hash_p(kdict) ? mrb_hash_dup(mrb, kdict) : mrb_hash_new(mrb);
- const mrb_kwargs *kwargs = va_arg(ap, const mrb_kwargs*);
+ const mrb_kwargs *kwargs = GET_ARG(const mrb_kwargs*);
 mrb_value *rest;
 
 if (kwargs == NULL) {
 rest = NULL;
 }
 else {
- uint32_t kwnum = kwargs->num;
- uint32_t required = kwargs->required;
+ mrb_int kwnum = kwargs->num;
+ mrb_int required = kwargs->required;
 const mrb_sym *kname = kwargs->table;
 mrb_value *values = kwargs->values;
- uint32_t j;
+ mrb_int j;
 const uint32_t keyword_max = 40;
 
+ mrb_assert(kwnum >= 0);
+ mrb_assert(required >= 0);
 if (kwnum > keyword_max || required > kwnum) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "keyword number is too large");
 }
@@ -1363,10 +1312,63 @@
 }
 
 finish:
- va_end(ap);
 return i;
 }
 
+/*
+ retrieve arguments from mrb_state.
+
+ mrb_get_args(mrb, format, ...)
+
+ returns number of arguments parsed.
+
+ format specifiers:
+
+ string mruby type C type note
+ ----------------------------------------------------------------------------------------------
+ o: Object 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* NUL 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
+ &: block mrb_value &! raises exception if no block given
+ *: rest argument const mrb_value*,mrb_int The rest of the arguments as an array; *! avoid copy of the stack
+ |: optional Following arguments are optional
+ ?: optional given mrb_bool true if preceding argument (optional) is given
+ ':': keyword args mrb_kwargs const Get keyword arguments
+
+ format modifiers:
+
+ string note
+ ----------------------------------------------------------------------------------------------
+ !: Switch to the alternate mode; The behaviour changes depending on the specifier
+ +: Request a not frozen object; However, except nil value
+ */
+MRB_API mrb_int
+mrb_get_args(mrb_state *mrb, mrb_args_format format, ...)
+{
+ va_list ap;
+ va_start(ap, format);
+ mrb_int rc = get_args_v(mrb, format, NULL, &ap);
+ va_end(ap);
+ return rc;
+}
+
+MRB_API mrb_int
+mrb_get_args_a(mrb_state *mrb, mrb_args_format format, void **args)
+{
+ return get_args_v(mrb, format, args, NULL);
+}
+
 static struct RClass*
 boot_defclass(mrb_state *mrb, struct RClass *super)
 {
@@ -1376,6 +1378,7 @@
 if (super) {
 c->super = super;
 mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)super);
+ c->flags |= MRB_FL_CLASS_IS_INHERITED;
 }
 else {
 c->super = mrb->object_class;
@@ -1649,17 +1652,12 @@
 return mod;
 }
 
-/* implementation of module_eval/class_eval */
-mrb_value mrb_mod_module_eval(mrb_state*, mrb_value);
-
 static mrb_value
 mrb_mod_dummy_visibility(mrb_state *mrb, mrb_value mod)
 {
 return mod;
 }
 
-/* returns mrb_class_ptr(mrb_singleton_class()) */
-/* except that it return NULL for immediate values */
 MRB_API struct RClass*
 mrb_singleton_class_ptr(mrb_state *mrb, mrb_value v)
 {
@@ -1739,6 +1737,7 @@
 }
 
 #ifndef MRB_NO_METHOD_CACHE
+/* clear whole method cache table */
 static void
 mc_clear(mrb_state *mrb)
 {
@@ -1749,27 +1748,32 @@
 }
 }
 
+/* clear method cache for a class */
 void
 mrb_mc_clear_by_class(mrb_state *mrb, struct RClass *c)
 {
 struct mrb_cache_entry *mc = mrb->cache;
- int i;
 
- if (c->flags & MRB_FL_CLASS_IS_INHERITED) {
- mc_clear(mrb);
- return;
+ for (int i=0; i<MRB_METHOD_CACHE_SIZE; mc++,i++) {
+ if (mc->c == c || mc->c0 == c) mc->c = 0;
 }
- for (i=0; i<MRB_METHOD_CACHE_SIZE; i++) {
- if (mci.c == c) mci.c = 0;
+}
+
+static void
+mc_clear_by_id(mrb_state *mrb, mrb_sym id)
+{
+ struct mrb_cache_entry *mc = mrb->cache;
+
+ for (int i=0; i<MRB_METHOD_CACHE_SIZE; mc++,i++) {
+ if (mc->mid == id) mc->c = 0;
 }
 }
 #endif
 
-MRB_API mrb_method_t
-mrb_method_search_vm(mrb_state *mrb, struct RClass **cp, mrb_sym mid)
+mrb_method_t
+mrb_vm_find_method(mrb_state *mrb, struct RClass *c, struct RClass **cp, mrb_sym mid)
 {
 mrb_method_t m;
- struct RClass *c = *cp;
 #ifndef MRB_NO_METHOD_CACHE
 struct RClass *oc = c;
 int h = kh_int_hash_func(mrb, ((intptr_t)oc) ^ mid) & (MRB_METHOD_CACHE_SIZE-1);
@@ -1790,15 +1794,7 @@
 if (ret) {
 if (ptr.proc == 0) break;
 *cp = c;
- if (ret & MT_FUNC_P) {
- MRB_METHOD_FROM_FUNC(m, ptr.func);
- }
- else {
- MRB_METHOD_FROM_PROC(m, ptr.proc);
- }
- if (ret & MT_NOARG_P) {
- MRB_METHOD_NOARG_SET(m);
- }
+ m = create_method_value(mrb, ret, ptr);
 #ifndef MRB_NO_METHOD_CACHE
 mc->c = oc;
 mc->c0 = c;
@@ -1815,6 +1811,12 @@
 }
 
 MRB_API mrb_method_t
+mrb_method_search_vm(mrb_state *mrb, struct RClass **cp, mrb_sym mid)
+{
+ return mrb_vm_find_method(mrb, *cp, cp, mid);
+}
+
+MRB_API mrb_method_t
 mrb_method_search(mrb_state *mrb, struct RClass* c, mrb_sym mid)
 {
 mrb_method_t m;
@@ -1939,7 +1941,12 @@
 if (c->tt == MRB_TT_SCLASS)
 mrb_raise(mrb, E_TYPE_ERROR, "can't create instance of singleton class");
 
- if (ttype == 0) ttype = MRB_TT_OBJECT;
+ if (c == mrb->nil_class || c == mrb->false_class) {
+ mrb_assert(ttype == 0);
+ }
+ else if (ttype == 0) {
+ ttype = MRB_TT_OBJECT;
+ }
 if (ttype <= MRB_TT_CPTR) {
 mrb_raisef(mrb, E_TYPE_ERROR, "can't create instance of %v", cv);
 }
@@ -1970,7 +1977,7 @@
 mrb_get_args(mrb, "*!&", &argv, &argc, &blk);
 obj = mrb_instance_alloc(mrb, cv);
 init = MRB_SYM(initialize);
- if (!mrb_func_basic_p(mrb, obj, init, mrb_bob_init)) {
+ if (!mrb_func_basic_p(mrb, obj, init, mrb_do_nothing)) {
 mrb_funcall_with_block(mrb, obj, init, argc, argv, blk);
 }
 return obj;
@@ -1984,7 +1991,7 @@
 
 obj = mrb_instance_alloc(mrb, mrb_obj_value(c));
 mid = MRB_SYM(initialize);
- if (!mrb_func_basic_p(mrb, obj, mid, mrb_bob_init)) {
+ if (!mrb_func_basic_p(mrb, obj, mid, mrb_do_nothing)) {
 mrb_funcall_argv(mrb, obj, mid, argc, argv);
 }
 return obj;
@@ -2041,7 +2048,7 @@
 }
 
 static mrb_value
-mrb_bob_init(mrb_state *mrb, mrb_value cv)
+mrb_do_nothing(mrb_state *mrb, mrb_value cv)
 {
 return mrb_nil_value();
 }
@@ -2305,8 +2312,6 @@
 }
 }
 
-void mrb_method_added(mrb_state *mrb, struct RClass *c, mrb_sym mid);
-
 static mrb_value
 mrb_mod_alias(mrb_state *mrb, mrb_value mod)
 {
@@ -2363,7 +2368,10 @@
 MRB_CLASS_ORIGIN(c);
 h = c->mt;
 
- if (h && mt_del(mrb, h, mid)) return;
+ if (h && mt_del(mrb, h, mid)) {
+ mc_clear_by_id(mrb, mid);
+ return;
+ }
 mrb_name_error(mrb, mid, "method '%n' not defined in %C", mid, c);
 }
 
@@ -2743,13 +2751,28 @@
 case MRB_TT_OBJECT:
 case MRB_TT_SCLASS:
 case MRB_TT_HASH:
- case MRB_TT_DATA:
+ case MRB_TT_CDATA:
 case MRB_TT_EXCEPTION:
 mrb_iv_copy(mrb, dest, obj);
 break;
 case MRB_TT_ISTRUCT:
 mrb_istruct_copy(dest, obj);
 break;
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ mrb_bint_copy(mrb, dest, obj);
+ break;
+#endif
+#ifdef MRB_USE_RATIONAL
+ case MRB_TT_RATIONAL:
+ mrb_rational_copy(mrb, dest, obj);
+ break;
+#endif
+#ifdef MRB_USE_COMPLEX
+ case MRB_TT_COMPLEX:
+ mrb_complex_copy(mrb, dest, obj);
+ break;
+#endif
 
 default:
 break;
@@ -2847,8 +2870,59 @@
 
 /* implementation of __id__ */
 mrb_value mrb_obj_id_m(mrb_state *mrb, mrb_value self);
-/* implementation of instance_eval */
-mrb_value mrb_obj_instance_eval(mrb_state*, mrb_value);
+
+mrb_noreturn void
+mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args)
+{
+ mrb_no_method_error(mrb, name, args, "undefined method '%n'", name);
+}
+
+/* 15.3.1.3.30 */
+/*
+ * call-seq:
+ * obj.method_missing(symbol , *args ) -> result
+ *
+ * Invoked by Ruby when obj is sent a message it cannot handle.
+ * symbol is the symbol for the method called, and args
+ * are any arguments that were passed to it. By default, the interpreter
+ * raises an error when this method is called. However, it is possible
+ * to override the method to provide more dynamic behavior.
+ * If it is decided that a particular method should not be handled, then
+ * super should be called, so that ancestors can pick up the
+ * missing method.
+ * The example below creates
+ * a class <code>Roman</code>, which responds to methods with names
+ * consisting of roman numerals, returning the corresponding integer
+ * values.
+ *
+ * class Roman
+ * def romanToInt(str)
+ * # ...
+ * end
+ * def method_missing(methId)
+ * str = methId.to_s
+ * romanToInt(str)
+ * end
+ * end
+ *
+ * r = Roman.new
+ * r.iv #=> 4
+ * r.xxiii #=> 23
+ * r.mm #=> 2000
+ */
+mrb_value
+mrb_obj_missing(mrb_state *mrb, mrb_value mod)
+{
+ mrb_sym name;
+ const mrb_value *a;
+ mrb_int alen;
+
+ mrb->c->ci->mid = 0;
+ mrb_get_args(mrb, "n*!", &name, &a, &alen);
+ mrb_method_missing(mrb, name, mod, mrb_ary_new_from_values(mrb, alen, a));
+ /* not reached */
+ return mrb_nil_value();
+}
 
 static mrb_value
 inspect_main(mrb_state *mrb, mrb_value mod)
@@ -2871,7 +2945,7 @@
 MRB_PRESYM_DEFINE_VAR_AND_INITER(new_syms, 2, MRB_SYM(allocate), MRB_SYM(initialize))
 
 static const mrb_irep new_irep = {
- 4, 5, 0, MRB_IREP_STATIC,
+ 4, 6, 0, MRB_IREP_STATIC,
 new_iseq, NULL, new_syms, NULL, NULL, NULL,
 sizeof(new_iseq), 0, 2, 0, 0,
 };
@@ -2891,9 +2965,6 @@
 mrb_define_method_raw(mrb, cls, MRB_SYM(new), m);
 }
 
-/* implementation of #send method */
-mrb_value mrb_f_send(mrb_state *mrb, mrb_value self);
-
 void
 mrb_init_class(mrb_state *mrb)
 {
@@ -2930,32 +3001,33 @@
 MRB_SET_INSTANCE_TT(mrb->proc_class, MRB_TT_PROC);
 
 MRB_SET_INSTANCE_TT(cls, MRB_TT_CLASS);
- mrb_define_method(mrb, bob, "initialize", mrb_bob_init, MRB_ARGS_NONE());
+ mrb_define_method(mrb, bob, "initialize", mrb_do_nothing, MRB_ARGS_NONE());
 mrb_define_method(mrb, bob, "!", mrb_bob_not, MRB_ARGS_NONE());
 mrb_define_method(mrb, bob, "==", mrb_obj_equal_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.1 */
 mrb_define_method(mrb, bob, "__id__", mrb_obj_id_m, MRB_ARGS_NONE()); /* 15.3.1.3.4 */
 mrb_define_method(mrb, bob, "__send__", mrb_f_send, MRB_ARGS_REQ(1)|MRB_ARGS_REST()|MRB_ARGS_BLOCK()); /* 15.3.1.3.5 */
 mrb_define_method(mrb, bob, "equal?", mrb_obj_equal_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.11 */
 mrb_define_method(mrb, bob, "instance_eval", mrb_obj_instance_eval, MRB_ARGS_OPT(1)|MRB_ARGS_BLOCK()); /* 15.3.1.3.18 */
- mrb_define_method(mrb, bob, "singleton_method_added", mrb_bob_init, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, bob, "singleton_method_added", mrb_do_nothing, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, bob, "method_missing", mrb_obj_missing, MRB_ARGS_ANY()); /* 15.3.1.3.30 */
 
 mrb_define_class_method(mrb, cls, "new", mrb_class_new_class, MRB_ARGS_OPT(1)|MRB_ARGS_BLOCK());
 mrb_define_method(mrb, cls, "allocate", mrb_instance_alloc, MRB_ARGS_NONE());
 mrb_define_method(mrb, cls, "superclass", mrb_class_superclass, MRB_ARGS_NONE()); /* 15.2.3.3.4 */
 mrb_define_method(mrb, cls, "initialize", mrb_class_initialize, MRB_ARGS_OPT(1)); /* 15.2.3.3.1 */
- mrb_define_method(mrb, cls, "inherited", mrb_bob_init, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, cls, "inherited", mrb_do_nothing, MRB_ARGS_REQ(1));
 
 init_class_new(mrb, cls);
 
 MRB_SET_INSTANCE_TT(mod, MRB_TT_MODULE);
 mrb_define_method(mrb, mod, "extend_object", mrb_mod_extend_object, MRB_ARGS_REQ(1)); /* 15.2.2.4.25 */
- mrb_define_method(mrb, mod, "extended", mrb_bob_init, MRB_ARGS_REQ(1)); /* 15.2.2.4.26 */
- mrb_define_method(mrb, mod, "prepended", mrb_bob_init, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, mod, "extended", mrb_do_nothing, MRB_ARGS_REQ(1)); /* 15.2.2.4.26 */
+ mrb_define_method(mrb, mod, "prepended", mrb_do_nothing, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, mod, "prepend_features", mrb_mod_prepend_features, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, mod, "include?", mrb_mod_include_p, MRB_ARGS_REQ(1)); /* 15.2.2.4.28 */
 mrb_define_method(mrb, mod, "append_features", mrb_mod_append_features, MRB_ARGS_REQ(1)); /* 15.2.2.4.10 */
 mrb_define_method(mrb, mod, "class_eval", mrb_mod_module_eval, MRB_ARGS_ANY()); /* 15.2.2.4.15 */
- mrb_define_method(mrb, mod, "included", mrb_bob_init, MRB_ARGS_REQ(1)); /* 15.2.2.4.29 */
+ mrb_define_method(mrb, mod, "included", mrb_do_nothing, MRB_ARGS_REQ(1)); /* 15.2.2.4.29 */
 mrb_define_method(mrb, mod, "initialize", mrb_mod_initialize, MRB_ARGS_NONE()); /* 15.2.2.4.31 */
 mrb_define_method(mrb, mod, "module_eval", mrb_mod_module_eval, MRB_ARGS_ANY()); /* 15.2.2.4.35 */
 mrb_define_method(mrb, mod, "module_function", mrb_mod_module_function, MRB_ARGS_ANY());
@@ -2978,7 +3050,7 @@
 mrb_define_method(mrb, mod, "define_method", mod_define_method, MRB_ARGS_ARG(1,1));
 mrb_define_method(mrb, mod, "===", mrb_mod_eqq, MRB_ARGS_REQ(1)); /* 15.2.2.4.7 */
 mrb_define_method(mrb, mod, "dup", mrb_mod_dup, MRB_ARGS_NONE());
- mrb_define_method(mrb, bob, "method_added", mrb_bob_init, MRB_ARGS_REQ(1));
+ mrb_define_method(mrb, mod, "method_added", mrb_do_nothing, MRB_ARGS_REQ(1));
 
 mrb_undef_method(mrb, cls, "append_features");
 mrb_undef_method(mrb, cls, "prepend_features");

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/codedump.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/codedump.c Changed

@@ -5,86 +5,89 @@
 #include <mruby/string.h>
 #include <mruby/proc.h>
 #include <mruby/dump.h>
+#include <mruby/internal.h>
 
 #ifndef MRB_NO_STDIO
 static void
-print_r(mrb_state *mrb, const mrb_irep *irep, size_t n)
+print_r(mrb_state *mrb, const mrb_irep *irep, size_t n, FILE *out)
 {
 if (n == 0) return;
 if (n >= irep->nlocals) return;
 if (!irep->lvn-1) return;
- printf(" R%d:%s", (int)n, mrb_sym_dump(mrb, irep->lvn-1));
+ fprintf(out, " R%d:%s", (int)n, mrb_sym_dump(mrb, irep->lvn-1));
 }
 
 static void
-print_lv_a(mrb_state *mrb, const mrb_irep *irep, uint16_t a)
+print_lv_a(mrb_state *mrb, const mrb_irep *irep, uint16_t a, FILE *out)
 {
 if (!irep->lv || a >= irep->nlocals || a == 0) {
- printf("\n");
+ fprintf(out, "\n");
 return;
 }
- printf("\t;");
- print_r(mrb, irep, a);
- printf("\n");
+ fprintf(out, "\t;");
+ print_r(mrb, irep, a, out);
+ fprintf(out, "\n");
 }
 
 static void
-print_lv_ab(mrb_state *mrb, const mrb_irep *irep, uint16_t a, uint16_t b)
+print_lv_ab(mrb_state *mrb, const mrb_irep *irep, uint16_t a, uint16_t b, FILE *out)
 {
 if (!irep->lv || (a >= irep->nlocals && b >= irep->nlocals) || a+b == 0) {
- printf("\n");
+ fprintf(out, "\n");
 return;
 }
- printf("\t;");
- if (a > 0) print_r(mrb, irep, a);
- if (b > 0) print_r(mrb, irep, b);
- printf("\n");
+ fprintf(out, "\t;");
+ if (a > 0) print_r(mrb, irep, a, out);
+ if (b > 0) print_r(mrb, irep, b, out);
+ fprintf(out, "\n");
 }
 
 static void
-print_header(mrb_state *mrb, const mrb_irep *irep, uint32_t i)
+print_header(mrb_state *mrb, const mrb_irep *irep, ptrdiff_t i, FILE *out)
 {
 int32_t line;
 
- line = mrb_debug_get_line(mrb, irep, i);
+ mrb_assert(i <= UINT32_MAX);
+ line = mrb_debug_get_line(mrb, irep, (uint32_t)i);
 if (line < 0) {
- printf(" ");
+ fprintf(out, " ");
 }
 else {
- printf("%5d ", line);
+ fprintf(out, "%5d ", line);
 }
 
- printf("%03d ", (int)i);
+ fprintf(out, "%03d ", (int)i);
 }
 
 static void
-print_args(uint8_t i)
+print_args(uint16_t i, FILE *out)
 {
+ mrb_assert(i <= 255);
 uint8_t n = i&0xf;
 uint8_t nk = (i>>4)&0xf;
 
 if (n == 15) {
- printf("n=*");
+ fprintf(out, "n=*");
 }
 else {
- printf("n=%d", n);
+ fprintf(out, "n=%d", n);
 }
 if (nk > 0) {
- printf("|");
+ fprintf(out, "|");
 if (nk == 15) {
- printf("nk=*");
+ fprintf(out, "nk=*");
 }
 else {
- printf("nk=%d", nk);
+ fprintf(out, "nk=%d", nk);
 }
 }
- printf(" (0x%02x)\n", i);
+ fprintf(out, "\n");
 }
 
 #define CASE(insn,ops) case insn: FETCH_ ## ops (); L_ ## insn
 
 static void
-codedump(mrb_state *mrb, const mrb_irep *irep)
+codedump(mrb_state *mrb, const mrb_irep *irep, FILE *out)
 {
 int ai;
 const mrb_code *pc, *pcend;
@@ -92,16 +95,22 @@
 const char *file = NULL, *next_file;
 
 if (!irep) return;
- printf("irep %p nregs=%d nlocals=%d pools=%d syms=%d reps=%d ilen=%d\n", (void*)irep,
- irep->nregs, irep->nlocals, (int)irep->plen, (int)irep->slen, (int)irep->rlen, (int)irep->ilen);
+ fprintf(out, "irep %p nregs=%d nlocals=%d pools=%d syms=%d reps=%d ilen=%d\n", (void*)irep,
+ irep->nregs, irep->nlocals, (int)irep->plen, (int)irep->slen, (int)irep->rlen, (int)irep->ilen);
 
 if (irep->lv) {
 int i;
+ int head = FALSE;
 
- printf("local variable names:\n");
- for (i = 1; i < irep->nlocals; ++i) {
+ for (i = 1; i < irep->nlocals; i++) {
 char const *s = mrb_sym_dump(mrb, irep->lvi - 1);
- printf(" R%d:%s\n", i, s ? s : "");
+ if (s) {
+ if (!head) {
+ head = TRUE;
+ fprintf(out, "local variable names:\n");
+ }
+ fprintf(out, " R%d:%s\n", i, s);
+ }
 }
 }
 
@@ -109,7 +118,7 @@
 int i = irep->clen;
 const struct mrb_irep_catch_handler *e = mrb_irep_catch_handler_table(irep);
 
- for (; i > 0; i --, e ++) {
+ for (; i > 0; i--,e++) {
 uint32_t begin = mrb_irep_catch_handler_unpack(e->begin);
 uint32_t end = mrb_irep_catch_handler_unpack(e->end);
 uint32_t target = mrb_irep_catch_handler_unpack(e->target);
@@ -129,7 +138,7 @@
 type = buf;
 break;
 }
- printf("catch type: %-8s begin: %04" PRIu32 " end: %04" PRIu32 " target: %04" PRIu32 "\n", type, begin, end, target);
+ fprintf(out, "catch type: %-8s begin: %04" PRIu32 " end: %04" PRIu32 " target: %04" PRIu32 "\n", type, begin, end, target);
 }
 }
 
@@ -146,60 +155,60 @@
 i = pc - irep->iseq;
 next_file = mrb_debug_get_filename(mrb, irep, (uint32_t)i);
 if (next_file && file != next_file) {
- printf("file: %s\n", next_file);
+ fprintf(out, "file: %s\n", next_file);
 file = next_file;
 }
- print_header(mrb, irep, (uint32_t)i);
+ print_header(mrb, irep, i, out);
 ins = READ_B();
 switch (ins) {
 CASE(OP_NOP, Z):
- printf("NOP\n");
+ fprintf(out, "NOP\n");
 break;
 CASE(OP_MOVE, BB):
- printf("MOVE\t\tR%d\tR%d\t", a, b);
- print_lv_ab(mrb, irep, a, b);
+ fprintf(out, "MOVE\t\tR%d\tR%d\t", a, b);
+ print_lv_ab(mrb, irep, a, b, out);
 break;
 
 CASE(OP_LOADL, BB):
 switch (irep->poolb.tt) {
 #ifndef MRB_NO_FLOAT
 case IREP_TT_FLOAT:
- printf("LOADL\t\tR%d\tL(%d)\t; %f", a, b, (double)irep->poolb.u.f);
+ fprintf(out, "LOADL\t\tR%d\tL(%d)\t; %f", a, b, (double)irep->poolb.u.f);
 break;
 #endif
 case IREP_TT_INT32:
- printf("LOADL\t\tR%d\tL(%d)\t; %" PRId32, a, b, irep->poolb.u.i32);
+ fprintf(out, "LOADL\t\tR%d\tL(%d)\t; %" PRId32, a, b, irep->poolb.u.i32);
 break;
 #ifdef MRB_64BIT
 case IREP_TT_INT64:
- printf("LOADL\t\tR%d\tL(%d)\t; %" PRId64, a, b, irep->poolb.u.i64);
+ fprintf(out, "LOADL\t\tR%d\tL(%d)\t; %" PRId64, a, b, irep->poolb.u.i64);
 break;
 #endif
 default:
- printf("LOADL\t\tR%d\tL(%d)\t", a, b);
+ fprintf(out, "LOADL\t\tR%d\tL(%d)\t", a, b);
 break;
 }
- print_lv_a(mrb, irep, a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADI, BB):
- printf("LOADI\t\tR%d\t%d\t", a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADI\t\tR%d\t%d\t", a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADINEG, BB):
- printf("LOADI\tR%d\t-%d\t", a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADINEG\tR%d\t-%d\t", a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADI16, BS):
- printf("LOADI16\tR%d\t%d\t", a, (int)(int16_t)b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADI16\tR%d\t%d\t", a, (int)(int16_t)b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADI32, BSS):
- printf("LOADI32\tR%d\t%d\t", a, (int32_t)(((uint32_t)b<<16)+c));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADI32\tR%d\t%d\t", a, (int32_t)(((uint32_t)b<<16)+c));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADI__1, B):
- printf("LOADI__1\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADI__1\tR%d\t(-1)\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADI_0, B): goto L_LOADI;
 CASE(OP_LOADI_1, B): goto L_LOADI;
@@ -210,371 +219,367 @@
 CASE(OP_LOADI_6, B): goto L_LOADI;
 CASE(OP_LOADI_7, B):
 L_LOADI:
- printf("LOADI_%d\tR%d\t\t", ins-(int)OP_LOADI_0, a);
- print_lv_a(mrb, irep, a);
+ b = ins-(int)OP_LOADI_0;
+ fprintf(out, "LOADI_%d\tR%d\t(%d)\t", b, a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADSYM, BB):
- printf("LOADSYM\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADSYM\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADNIL, B):
- printf("LOADNIL\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADNIL\tR%d\t(nil)\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADSELF, B):
- printf("LOADSELF\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADSELF\tR%d\t(R0)\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADT, B):
- printf("LOADT\t\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADT\t\tR%d\t(true)\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LOADF, B):
- printf("LOADF\t\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "LOADF\t\tR%d\t(false)\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETGV, BB):
- printf("GETGV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "GETGV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SETGV, BB):
- printf("SETGV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SETGV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETSV, BB):
- printf("GETSV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "GETSV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SETSV, BB):
- printf("SETSV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SETSV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETCONST, BB):
- printf("GETCONST\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "GETCONST\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SETCONST, BB):
- printf("SETCONST\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SETCONST\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETMCNST, BB):
- printf("GETMCNST\tR%d\tR%d::%s\t", a, a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "GETMCNST\tR%d\tR%d::%s\t", a, a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SETMCNST, BB):
- printf("SETMCNST\tR%d::%s\tR%d\t", a+1, mrb_sym_dump(mrb, irep->symsb), a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SETMCNST\tR%d::%s\tR%d\t", a+1, mrb_sym_dump(mrb, irep->symsb), a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETIV, BB):
- printf("GETIV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "GETIV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SETIV, BB):
- printf("SETIV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SETIV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETUPVAR, BBB):
- printf("GETUPVAR\tR%d\t%d\t%d\t", a, b, c);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "GETUPVAR\tR%d\t%d\t%d\t", a, b, c);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SETUPVAR, BBB):
- printf("SETUPVAR\tR%d\t%d\t%d\t", a, b, c);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SETUPVAR\tR%d\t%d\t%d\t", a, b, c);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETCV, BB):
- printf("GETCV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "GETCV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SETCV, BB):
- printf("SETCV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SETCV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_GETIDX, B):
- printf("GETIDX\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "GETIDX\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_SETIDX, B):
- printf("SETIDX\tR%d\tR%d\tR%d\n", a, a+1, a+2);
+ fprintf(out, "SETIDX\tR%d\tR%d\tR%d\n", a, a+1, a+2);
 break;
 CASE(OP_JMP, S):
 i = pc - irep->iseq;
- printf("JMP\t\t%03d\n", (int)i+(int16_t)a);
+ fprintf(out, "JMP\t\t%03d\n", (int)i+(int16_t)a);
 break;
 CASE(OP_JMPUW, S):
 i = pc - irep->iseq;
- printf("JMPUW\t\t%03d\n", (int)i+(int16_t)a);
+ fprintf(out, "JMPUW\t\t%03d\n", (int)i+(int16_t)a);
 break;
 CASE(OP_JMPIF, BS):
 i = pc - irep->iseq;
- printf("JMPIF\t\tR%d\t%03d\t", a, (int)i+(int16_t)b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "JMPIF\t\tR%d\t%03d\t", a, (int)i+(int16_t)b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_JMPNOT, BS):
 i = pc - irep->iseq;
- printf("JMPNOT\tR%d\t%03d\t", a, (int)i+(int16_t)b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "JMPNOT\tR%d\t%03d\t", a, (int)i+(int16_t)b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_JMPNIL, BS):
 i = pc - irep->iseq;
- printf("JMPNIL\tR%d\t%03d\t", a, (int)i+(int16_t)b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "JMPNIL\tR%d\t%03d\t", a, (int)i+(int16_t)b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SSEND, BBB):
- printf("SSEND\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_args(c);
+ fprintf(out, "SSEND\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_args(c, out);
 break;
 CASE(OP_SSENDB, BBB):
- printf("SSENDB\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_args(c);
+ fprintf(out, "SSENDB\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_args(c, out);
 break;
 CASE(OP_SEND, BBB):
- printf("SEND\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_args(c);
+ fprintf(out, "SEND\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_args(c, out);
 break;
 CASE(OP_SENDB, BBB):
- printf("SENDB\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_args(c);
+ fprintf(out, "SENDB\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_args(c, out);
 break;
 CASE(OP_CALL, Z):
- printf("CALL\n");
+ fprintf(out, "CALL\n");
 break;
 CASE(OP_SUPER, BB):
- printf("SUPER\t\tR%d\t", a);
- print_args(b);
+ fprintf(out, "SUPER\t\tR%d\t", a);
+ print_args(b, out);
 break;
 CASE(OP_ARGARY, BS):
- printf("ARGARY\tR%d\t%d:%d:%d:%d (%d)\t", a,
+ fprintf(out, "ARGARY\tR%d\t%d:%d:%d:%d (%d)\t", a,
 (b>>11)&0x3f,
 (b>>10)&0x1,
 (b>>5)&0x1f,
 (b>>4)&0x1,
 (b>>0)&0xf);
- print_lv_a(mrb, irep, a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_ENTER, W):
- printf("ENTER\t\t%d:%d:%d:%d:%d:%d:%d (0x%x)\n",
- MRB_ASPEC_REQ(a),
- MRB_ASPEC_OPT(a),
- MRB_ASPEC_REST(a),
- MRB_ASPEC_POST(a),
- MRB_ASPEC_KEY(a),
- MRB_ASPEC_KDICT(a),
- MRB_ASPEC_BLOCK(a), a);
+ fprintf(out, "ENTER\t\t%d:%d:%d:%d:%d:%d:%d (0x%x)\n",
+ MRB_ASPEC_REQ(a),
+ MRB_ASPEC_OPT(a),
+ MRB_ASPEC_REST(a),
+ MRB_ASPEC_POST(a),
+ MRB_ASPEC_KEY(a),
+ MRB_ASPEC_KDICT(a),
+ MRB_ASPEC_BLOCK(a), a);
 break;
 CASE(OP_KEY_P, BB):
- printf("KEY_P\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "KEY_P\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_KEYEND, Z):
- printf("KEYEND\n");
+ fprintf(out, "KEYEND\n");
 break;
 CASE(OP_KARG, BB):
- printf("KARG\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "KARG\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_RETURN, B):
- printf("RETURN\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "RETURN\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_RETURN_BLK, B):
- printf("RETURN_BLK\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "RETURN_BLK\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_BREAK, B):
- printf("BREAK\t\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "BREAK\t\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_BLKPUSH, BS):
- printf("BLKPUSH\tR%d\t%d:%d:%d:%d (%d)\t", a,
+ fprintf(out, "BLKPUSH\tR%d\t%d:%d:%d:%d (%d)\t", a,
 (b>>11)&0x3f,
 (b>>10)&0x1,
 (b>>5)&0x1f,
 (b>>4)&0x1,
 (b>>0)&0xf);
- print_lv_a(mrb, irep, a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_LAMBDA, BB):
- printf("LAMBDA\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
+ fprintf(out, "LAMBDA\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
 break;
 CASE(OP_BLOCK, BB):
- printf("BLOCK\t\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
+ fprintf(out, "BLOCK\t\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
 break;
 CASE(OP_METHOD, BB):
- printf("METHOD\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
+ fprintf(out, "METHOD\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
 break;
 CASE(OP_RANGE_INC, B):
- printf("RANGE_INC\tR%d\n", a);
+ fprintf(out, "RANGE_INC\tR%d\n", a);
 break;
 CASE(OP_RANGE_EXC, B):
- printf("RANGE_EXC\tR%d\n", a);
+ fprintf(out, "RANGE_EXC\tR%d\n", a);
 break;
 CASE(OP_DEF, BB):
- printf("DEF\t\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->symsb));
+ fprintf(out, "DEF\t\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->symsb));
 break;
 CASE(OP_UNDEF, B):
- printf("UNDEF\t\t:%s\n", mrb_sym_dump(mrb, irep->symsa));
+ fprintf(out, "UNDEF\t\t:%s\n", mrb_sym_dump(mrb, irep->symsa));
 break;
 CASE(OP_ALIAS, BB):
- printf("ALIAS\t\t:%s\t%s\n", mrb_sym_dump(mrb, irep->symsa), mrb_sym_dump(mrb, irep->symsb));
+ fprintf(out, "ALIAS\t\t:%s\t%s\n", mrb_sym_dump(mrb, irep->symsa), mrb_sym_dump(mrb, irep->symsb));
 break;
 CASE(OP_ADD, B):
- printf("ADD\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "ADD\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_ADDI, BB):
- printf("ADDI\t\tR%d\t%d\t", a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "ADDI\t\tR%d\t%d\t", a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SUB, B):
- printf("SUB\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "SUB\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_SUBI, BB):
- printf("SUBI\t\tR%d\t%d\t", a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SUBI\t\tR%d\t%d\t", a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_MUL, B):
- printf("MUL\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "MUL\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_DIV, B):
- printf("DIV\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "DIV\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_LT, B):
- printf("LT\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "LT\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_LE, B):
- printf("LE\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "LE\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_GT, B):
- printf("GT\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "GT\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_GE, B):
- printf("GE\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "GE\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_EQ, B):
- printf("EQ\t\tR%d\tR%d\n", a, a+1);
+ fprintf(out, "EQ\t\tR%d\tR%d\n", a, a+1);
 break;
 CASE(OP_ARRAY, BB):
- printf("ARRAY\t\tR%d\tR%d\t%d", a, a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "ARRAY\t\tR%d\tR%d\t%d", a, a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_ARRAY2, BBB):
- printf("ARRAY\t\tR%d\tR%d\t%d", a, b, c);
- print_lv_ab(mrb, irep, a, b);
+ fprintf(out, "ARRAY\t\tR%d\tR%d\t%d", a, b, c);
+ print_lv_ab(mrb, irep, a, b, out);
 break;
 CASE(OP_ARYCAT, B):
- printf("ARYCAT\tR%d\tR%d\t", a, a+1);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "ARYCAT\tR%d\tR%d\t", a, a+1);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_ARYPUSH, BB):
- printf("ARYPUSH\tR%d\t%d\t", a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "ARYPUSH\tR%d\t%d\t", a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
- CASE(OP_ARYDUP, B):
- printf("ARYDUP\tR%d\t", a);
- print_lv_a(mrb, irep, a);
+ CASE(OP_ARYSPLAT, B):
+ fprintf(out, "ARYSPLAT\tR%d\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_AREF, BBB):
- printf("AREF\t\tR%d\tR%d\t%d", a, b, c);
- print_lv_ab(mrb, irep, a, b);
+ fprintf(out, "AREF\t\tR%d\tR%d\t%d", a, b, c);
+ print_lv_ab(mrb, irep, a, b, out);
 break;
 CASE(OP_ASET, BBB):
- printf("ASET\t\tR%d\tR%d\t%d", a, b, c);
- print_lv_ab(mrb, irep, a, b);
+ fprintf(out, "ASET\t\tR%d\tR%d\t%d", a, b, c);
+ print_lv_ab(mrb, irep, a, b, out);
 break;
 CASE(OP_APOST, BBB):
- printf("APOST\t\tR%d\t%d\t%d", a, b, c);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "APOST\t\tR%d\t%d\t%d", a, b, c);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_INTERN, B):
- printf("INTERN\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "INTERN\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SYMBOL, BB):
 mrb_assert((irep->poolb.tt&IREP_TT_NFLAG)==0);
- printf("SYMBOL\tR%d\tL(%d)\t; %s", a, b, irep->poolb.u.str);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SYMBOL\tR%d\tL(%d)\t; %s", a, b, irep->poolb.u.str);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_STRING, BB):
 mrb_assert((irep->poolb.tt&IREP_TT_NFLAG)==0);
- if ((irep->poolb.tt & IREP_TT_NFLAG) == 0) {
- printf("STRING\tR%d\tL(%d)\t; %s", a, b, irep->poolb.u.str);
- }
- else {
- printf("STRING\tR%d\tL(%d)\t", a, b);
- }
- print_lv_a(mrb, irep, a);
+ fprintf(out, "STRING\tR%d\tL(%d)\t; %s", a, b, irep->poolb.u.str);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_STRCAT, B):
- printf("STRCAT\tR%d\tR%d", a, a+1);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "STRCAT\tR%d\tR%d\t", a, a+1);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_HASH, BB):
- printf("HASH\t\tR%d\t%d\t", a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "HASH\t\tR%d\t%d\t", a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_HASHADD, BB):
- printf("HASHADD\tR%d\t%d\t", a, b);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "HASHADD\tR%d\t%d\t", a, b);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_HASHCAT, B):
- printf("HASHCAT\tR%d\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "HASHCAT\tR%d\tR%d\t", a, a+1);
+ print_lv_a(mrb, irep, a, out);
 break;
 
 CASE(OP_OCLASS, B):
- printf("OCLASS\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "OCLASS\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_CLASS, BB):
- printf("CLASS\t\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "CLASS\t\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_MODULE, BB):
- printf("MODULE\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
- print_lv_a(mrb, irep, a);
+ fprintf(out, "MODULE\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_EXEC, BB):
- printf("EXEC\t\tR%d\tI(%d:%p)", a, b, (void*)irep->repsb);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "EXEC\t\tR%d\tI(%d:%p)", a, b, (void*)irep->repsb);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_SCLASS, B):
- printf("SCLASS\t\tR%d\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "SCLASS\t\tR%d\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_TCLASS, B):
- printf("TCLASS\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "TCLASS\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_ERR, B):
 if ((irep->poola.tt & IREP_TT_NFLAG) == 0) {
- printf("ERR\t\t%s\n", irep->poola.u.str);
+ fprintf(out, "ERR\t\t%s\n", irep->poola.u.str);
 }
 else {
- printf("ERR\tL(%d)\n", a);
+ fprintf(out, "ERR\tL(%d)\n", a);
 }
 break;
 CASE(OP_EXCEPT, B):
- printf("EXCEPT\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "EXCEPT\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 CASE(OP_RESCUE, BB):
- printf("RESCUE\tR%d\tR%d", a, b);
- print_lv_ab(mrb, irep, a, b);
+ fprintf(out, "RESCUE\tR%d\tR%d", a, b);
+ print_lv_ab(mrb, irep, a, b, out);
 break;
 CASE(OP_RAISEIF, B):
- printf("RAISEIF\tR%d\t\t", a);
- print_lv_a(mrb, irep, a);
+ fprintf(out, "RAISEIF\tR%d\t\t", a);
+ print_lv_a(mrb, irep, a, out);
 break;
 
 CASE(OP_DEBUG, BBB):
- printf("DEBUG\t\t%d\t%d\t%d\n", a, b, c);
+ fprintf(out, "DEBUG\t\t%d\t%d\t%d\n", a, b, c);
 break;
 
 CASE(OP_STOP, Z):
- printf("STOP\n");
+ fprintf(out, "STOP\n");
 break;
 
 CASE(OP_EXT1, Z):
- printf("EXT1\n");
- print_header(mrb, irep, pc-irep->iseq);
+ fprintf(out, "EXT1\n");
+ print_header(mrb, irep, pc-irep->iseq, out);
 ins = READ_B();
 switch (ins) {
 #define OPCODE(i,x) case OP_ ## i: FETCH_ ## x ## _1 (); goto L_OP_ ## i;
@@ -583,8 +588,8 @@
 }
 break;
 CASE(OP_EXT2, Z):
- printf("EXT2\n");
- print_header(mrb, irep, pc-irep->iseq);
+ fprintf(out, "EXT2\n");
+ print_header(mrb, irep, pc-irep->iseq, out);
 ins = READ_B();
 switch (ins) {
 #define OPCODE(i,x) case OP_ ## i: FETCH_ ## x ## _2 (); goto L_OP_ ## i;
@@ -593,8 +598,8 @@
 }
 break;
 CASE(OP_EXT3, Z):
- printf("EXT3\n");
- print_header(mrb, irep, pc-irep->iseq);
+ fprintf(out, "EXT3\n");
+ print_header(mrb, irep, pc-irep->iseq, out);
 ins = READ_B();
 switch (ins) {
 #define OPCODE(i,x) case OP_ ## i: FETCH_ ## x ## _3 (); goto L_OP_ ## i;
@@ -604,32 +609,39 @@
 break;
 
 default:
- printf("unknown_op (0x%x)\n", ins);
+ fprintf(out, "unknown_op (0x%x)\n", ins);
 break;
 }
 mrb_gc_arena_restore(mrb, ai);
 }
- printf("\n");
+ fprintf(out, "\n");
 }
 
 static void
-codedump_recur(mrb_state *mrb, const mrb_irep *irep)
+codedump_recur(mrb_state *mrb, const mrb_irep *irep, FILE *out)
 {
 int i;
 
- codedump(mrb, irep);
+ codedump(mrb, irep, out);
 if (irep->reps) {
 for (i=0; i<irep->rlen; i++) {
- codedump_recur(mrb, irep->repsi);
+ codedump_recur(mrb, irep->repsi, out);
 }
 }
 }
+
+void
+mrb_codedump_all_file(mrb_state *mrb, struct RProc *proc, FILE *out)
+{
+ codedump_recur(mrb, proc->body.irep, out);
+}
+
 #endif
 
 void
 mrb_codedump_all(mrb_state *mrb, struct RProc *proc)
 {
 #ifndef MRB_NO_STDIO
- codedump_recur(mrb, proc->body.irep);
+ mrb_codedump_all_file(mrb, proc, stdout);
 #endif
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/debug.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/debug.c Changed

@@ -63,7 +63,7 @@
 }
 
 uint32_t
-mrb_packed_int_decode(uint8_t *p, uint8_t **newpos)
+mrb_packed_int_decode(const uint8_t *p, const uint8_t **newpos)
 {
 size_t i = 0, shift = 0;
 uint32_t n = 0;
@@ -106,11 +106,11 @@
 
 case mrb_debug_line_flat_map: {
 /* get upper bound */
- mrb_irep_debug_info_line *ret = f->lines.flat_map;
+ const mrb_irep_debug_info_line *ret = f->lines.flat_map;
 uint32_t count = f->line_entry_count;
 while (count > 0) {
 int32_t step = count / 2;
- mrb_irep_debug_info_line *it = ret + step;
+ const mrb_irep_debug_info_line *it = ret + step;
 if (!(pc < it->start_pos)) {
 ret = it + 1;
 count -= step + 1;
@@ -131,8 +131,8 @@
 }
 
 case mrb_debug_line_packed_map: {
- uint8_t *p = f->lines.packed_map;
- uint8_t *pend = p + f->line_entry_count;
+ const uint8_t *p = f->lines.packed_map;
+ const uint8_t *pend = p + f->line_entry_count;
 uint32_t pos = 0, line = 0, line_diff;
 while (p < pend) {
 pos += mrb_packed_int_decode(p, &p);
@@ -202,17 +202,17 @@
 size_t packed_size = 0;
 uint8_t *p, *pend;
 
- for (i = 0; i < file_pc_count; ++i) {
+ for (i = 0; i < file_pc_count; i++) {
 if (linesstart_pos + i == prev_line) continue;
 packed_size += mrb_packed_int_len(start_pos+i-prev_pc);
 prev_pc = start_pos+i;
 packed_size += mrb_packed_int_len(linesstart_pos+i-prev_line);
 prev_line = linesstart_pos + i;
 }
- p = f->lines.packed_map = (uint8_t*)mrb_malloc(mrb, packed_size);
+ f->lines.packed_map = p = (uint8_t*)mrb_malloc(mrb, packed_size);
 pend = p + packed_size;
 prev_line = 0; prev_pc = 0;
- for (i = 0; i < file_pc_count; ++i) {
+ for (i = 0; i < file_pc_count; i++) {
 if (linesstart_pos + i == prev_line) continue;
 p += mrb_packed_int_encode(start_pos+i-prev_pc, p, pend);
 prev_pc = start_pos + i;
@@ -232,7 +232,7 @@
 if (!d) { return; }
 
 if (d->files) {
- for (i = 0; i < d->flen; ++i) {
+ for (i = 0; i < d->flen; i++) {
 if (d->filesi) {
 mrb_free(mrb, d->filesi->lines.ptr);
 mrb_free(mrb, d->filesi);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/dump.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/dump.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/error.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/error.c Changed

@@ -15,36 +15,24 @@
 #include <mruby/error.h>
 #include <mruby/class.h>
 #include <mruby/throw.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
-static void
-exc_mesg_set(mrb_state *mrb, struct RException *exc, mrb_value mesg)
+void
+mrb_exc_mesg_set(mrb_state *mrb, struct RException *exc, mrb_value mesg)
 {
- if (mrb_string_p(mesg)) {
- exc->flags |= MRB_EXC_MESG_STRING_FLAG;
- exc->mesg = RSTRING(mesg);
- mrb_field_write_barrier_value(mrb, (struct RBasic*)exc, mesg);
- }
- else {
- exc->flags &= ~MRB_EXC_MESG_STRING_FLAG;
- if (mrb_nil_p(mesg)) {
- exc->mesg = 0;
- }
- else {
- mrb_obj_iv_set(mrb, (struct RObject*)exc, MRB_SYM(mesg), mesg);
- }
+ if (!mrb_string_p(mesg)) {
+ mesg = mrb_obj_as_string(mrb, mesg);
 }
+ exc->mesg = mrb_obj_ptr(mesg);
+ mrb_field_write_barrier_value(mrb, (struct RBasic*)exc, mesg);
 }
 
-static mrb_value
-exc_mesg_get(mrb_state *mrb, struct RException *exc)
+mrb_value
+mrb_exc_mesg_get(mrb_state *mrb, struct RException *exc)
 {
- if ((exc->flags & MRB_EXC_MESG_STRING_FLAG) != 0) {
- return mrb_obj_value(exc->mesg);
- }
- else {
- return mrb_obj_iv_get(mrb, (struct RObject*)exc, MRB_SYM(mesg));
- }
+ if (exc->mesg == NULL) return mrb_nil_value();
+ return mrb_obj_value(exc->mesg);
 }
 
 MRB_API mrb_value
@@ -52,14 +40,14 @@
 {
 mrb_ensure_string_type(mrb, str);
 
- struct RBasic* e = mrb_obj_alloc(mrb, MRB_TT_EXCEPTION, c);
+ struct RException *e = MRB_OBJ_ALLOC(mrb, MRB_TT_EXCEPTION, c);
 mrb_value exc = mrb_obj_value(e);
- mrb_iv_set(mrb, exc, MRB_SYM(mesg), str);
+ mrb_exc_mesg_set(mrb, e, str);
 return exc;
 }
 
 MRB_API mrb_value
-mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len)
+mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, mrb_int len)
 {
 return mrb_exc_new_str(mrb, c, mrb_str_new(mrb, ptr, len));
 }
@@ -78,7 +66,7 @@
 mrb_value mesg;
 
 if (mrb_get_args(mrb, "|o", &mesg) == 1) {
- exc_mesg_set(mrb, mrb_exc_ptr(exc), mesg);
+ mrb_exc_mesg_set(mrb, mrb_exc_ptr(exc), mesg);
 }
 return exc;
 }
@@ -107,7 +95,7 @@
 if (argc == 0) return self;
 if (mrb_obj_equal(mrb, self, a)) return self;
 exc = mrb_obj_clone(mrb, self);
- exc_mesg_set(mrb, mrb_exc_ptr(exc), a);
+ mrb_exc_mesg_set(mrb, mrb_exc_ptr(exc), a);
 
 return exc;
 }
@@ -123,7 +111,7 @@
 static mrb_value
 exc_to_s(mrb_state *mrb, mrb_value exc)
 {
- mrb_value mesg = exc_mesg_get(mrb, mrb_exc_ptr(exc));
+ mrb_value mesg = mrb_exc_mesg_get(mrb, mrb_exc_ptr(exc));
 struct RObject *p;
 
 if (!mrb_string_p(mesg)) {
@@ -138,20 +126,6 @@
 
 /*
 * call-seq:
- * exception.message -> string
- *
- * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name.
- */
-
-static mrb_value
-exc_message(mrb_state *mrb, mrb_value exc)
-{
- return mrb_funcall_id(mrb, exc, MRB_SYM(to_s), 0);
-}
-
-/*
- * call-seq:
 * exception.inspect -> string
 *
 * Returns this exception's file name, line number,
@@ -163,10 +137,9 @@
 mrb_value
 mrb_exc_inspect(mrb_state *mrb, mrb_value exc)
 {
- mrb_value mesg = exc_mesg_get(mrb, mrb_exc_ptr(exc));
 mrb_value cname = mrb_mod_to_s(mrb, mrb_obj_value(mrb_obj_class(mrb, exc)));
- mesg = mrb_obj_as_string(mrb, mesg);
- return RSTRING_LEN(mesg) == 0 ? cname : mrb_format(mrb, "%v (%v)", mesg, cname);
+ mrb_value mesg = mrb_exc_mesg_get(mrb, mrb_exc_ptr(exc)); /* string or nil */
+ return (mrb_nil_p(mesg)||RSTRING_LEN(mesg)==0) ? cname : mrb_format(mrb, "%v (%v)", mesg, cname);
 }
 
 void mrb_keep_backtrace(mrb_state *mrb, mrb_value exc);
@@ -187,7 +160,8 @@
 p++;
 }
 }
- mrb_iv_set(mrb, exc, MRB_SYM(backtrace), backtrace);
+ mrb_exc_ptr(exc)->backtrace = mrb_obj_ptr(backtrace);
+ mrb_field_write_barrier_value(mrb, mrb_basic_ptr(exc), backtrace);
 }
 
 static mrb_value
@@ -221,7 +195,7 @@
 exc_throw(mrb_state *mrb, mrb_value exc)
 {
 if (!mrb->jmp) {
- mrb_p(mrb, exc);
+ mrb_print_error(mrb);
 abort();
 }
 MRB_THROW(mrb->jmp);
@@ -304,7 +278,7 @@
 if (c == '%') {
 if (*p == '!') {
 inspect = TRUE;
- ++p;
+ p++;
 }
 if (!*p) break;
 switch (*p) {
@@ -534,25 +508,24 @@
 return mesg;
 }
 
-MRB_API void
+MRB_API mrb_noreturn void
 mrb_sys_fail(mrb_state *mrb, const char *mesg)
 {
 struct RClass *sce;
 mrb_int no;
 
 no = (mrb_int)errno;
- if (mrb_class_defined(mrb, "SystemCallError")) {
- sce = mrb_class_get(mrb, "SystemCallError");
+ if (mrb_class_defined_id(mrb, MRB_SYM(SystemCallError))) {
+ sce = mrb_class_get_id(mrb, MRB_SYM(SystemCallError));
 if (mesg != NULL) {
- mrb_funcall(mrb, mrb_obj_value(sce), "_sys_fail", 2, mrb_fixnum_value(no), mrb_str_new_cstr(mrb, mesg));
+ mrb_funcall_id(mrb, mrb_obj_value(sce), MRB_SYM(_sys_fail), 2, mrb_fixnum_value(no), mrb_str_new_cstr(mrb, mesg));
 }
 else {
- mrb_funcall(mrb, mrb_obj_value(sce), "_sys_fail", 1, mrb_fixnum_value(no));
+ mrb_funcall_id(mrb, mrb_obj_value(sce), MRB_SYM(_sys_fail), 1, mrb_fixnum_value(no));
 }
 }
- else {
- mrb_raise(mrb, E_RUNTIME_ERROR, mesg);
- }
+
+ mrb_raise(mrb, E_RUNTIME_ERROR, mesg);
 }
 
 MRB_API mrb_noreturn void
@@ -603,7 +576,7 @@
 err = 0;
 } MRB_CATCH(&c_jmp) {
 if (mrb->exc) {
- mrb_p(mrb, mrb_obj_value(mrb->exc));
+ mrb_print_error(mrb);
 mrb->exc = NULL;
 }
 else {
@@ -656,6 +629,26 @@
 }
 }
 
+MRB_API void
+mrb_print_error(mrb_state *mrb)
+{
+#ifndef MRB_NO_STDIO
+ if (mrb->jmp == NULL) {
+ struct mrb_jmpbuf c_jmp;
+ MRB_TRY(&c_jmp) {
+ mrb->jmp = &c_jmp;
+ mrb_print_backtrace(mrb);
+ } MRB_CATCH(&c_jmp) {
+ /* ignore exception during print_backtrace() */
+ } MRB_END_EXC(&c_jmp);
+ mrb->jmp = NULL;
+ }
+ else {
+ mrb_print_backtrace(mrb);
+ }
+#endif
+}
+
 void
 mrb_init_exception(mrb_state *mrb)
 {
@@ -667,7 +660,6 @@
 mrb_define_method(mrb, exception, "exception", exc_exception, MRB_ARGS_OPT(1));
 mrb_define_method(mrb, exception, "initialize", exc_initialize, MRB_ARGS_OPT(1));
 mrb_define_method(mrb, exception, "to_s", exc_to_s, MRB_ARGS_NONE());
- mrb_define_method(mrb, exception, "message", exc_message, MRB_ARGS_NONE());
 mrb_define_method(mrb, exception, "inspect", mrb_exc_inspect, MRB_ARGS_NONE());
 mrb_define_method(mrb, exception, "backtrace", mrb_exc_backtrace, MRB_ARGS_NONE());
 mrb_define_method(mrb, exception, "set_backtrace", exc_set_backtrace, MRB_ARGS_REQ(1));

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/etc.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/etc.c Changed

@@ -9,13 +9,14 @@
 #include <mruby/data.h>
 #include <mruby/class.h>
 #include <mruby/numeric.h>
+#include <mruby/internal.h>
 
 MRB_API struct RData*
 mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const mrb_data_type *type)
 {
 struct RData *data;
 
- data = MRB_OBJ_ALLOC(mrb, MRB_TT_DATA, klass);
+ data = MRB_OBJ_ALLOC(mrb, MRB_TT_CDATA, klass);
 data->data = ptr;
 data->type = type;
 
@@ -26,7 +27,7 @@
 mrb_data_check_type(mrb_state *mrb, mrb_value obj, const mrb_data_type *type)
 {
 if (!mrb_data_p(obj)) {
- mrb_check_type(mrb, obj, MRB_TT_DATA);
+ mrb_check_type(mrb, obj, MRB_TT_CDATA);
 }
 if (DATA_TYPE(obj) != type) {
 const mrb_data_type *t2 = DATA_TYPE(obj);
@@ -70,33 +71,13 @@
 return 0; /* not reached */
 }
 
-static mrb_int
-make_num_id(const char *p, size_t len)
-{
- uint32_t id = 0;
-
- while (len--) {
- id = id*65599 + *p;
- p++;
- }
- id = id + (id>>5);
-
- return (mrb_int)id;
-}
-
-MRB_API mrb_int
-mrb_int_id(mrb_int n)
-{
- return make_num_id((const char*)&n, sizeof(n));
-}
-
 #ifndef MRB_NO_FLOAT
-MRB_API mrb_int
+static mrb_int
 mrb_float_id(mrb_float f)
 {
 /* normalize -0.0 to 0.0 */
 if (f == 0) f = 0.0;
- return make_num_id((const char*)&f, sizeof(f));
+ return (mrb_int)mrb_byte_hash((uint8_t*)&f, sizeof(f));
 }
 #endif
 
@@ -140,7 +121,7 @@
 case MRB_TT_SYMBOL:
 return MakeID(mrb_symbol(obj), tt);
 case MRB_TT_INTEGER:
- return MakeID(mrb_int_id(mrb_integer(obj)), tt);
+ return MakeID(mrb_integer(obj), tt);
 #ifndef MRB_NO_FLOAT
 case MRB_TT_FLOAT:
 return MakeID(mrb_float_id(mrb_float(obj)), tt);
@@ -156,7 +137,7 @@
 case MRB_TT_HASH:
 case MRB_TT_RANGE:
 case MRB_TT_EXCEPTION:
- case MRB_TT_DATA:
+ case MRB_TT_CDATA:
 case MRB_TT_ISTRUCT:
 default:
 return MakeID(mrb_ptr(obj), tt);
@@ -178,7 +159,7 @@
 #elif defined(MRB_64BIT) && defined(MRB_USE_FLOAT32)
 v.w = 0;
 v.f = f;
- v.w = ((v.w<<2) & ~3) | 2;
+ v.w = (v.w<<2) | 2;
 #else
 v.f = f;
 v.w = (v.w & ~3) | 2;
@@ -193,9 +174,10 @@
 {
 union mrb_value_ u;
 u.value = v;
- u.w = u.w & ~3;
 #if defined(MRB_64BIT) && defined(MRB_USE_FLOAT32)
 u.w >>= 2;
+#else
+ u.w &= ~3;
 #endif
 return u.f;
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/fmt_fp.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/fmt_fp.c Changed

@@ -5,7 +5,7 @@
 /***********************************************************************
 
 Routine for converting a single-precision
- floating point number into a string.
+ floating-point number into a string.
 
 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
@@ -78,7 +78,7 @@
 int
 mrb_format_float(mrb_float f, char *buf, size_t buf_size, char fmt, int prec, char sign) {
 char *s = buf;
- int buf_remaining = buf_size - 1;
+ int buf_remaining = (int)buf_size - 1;
 int alt_form = 0;
 
 if ((uint8_t)fmt & 0x80) {
@@ -103,7 +103,7 @@
 } else if (sign) {
 *s++ = sign;
 }
- buf_remaining -= (s - buf); // Adjust for sign
+ buf_remaining -= (int)(s - buf); // Adjust for sign
 
 {
 char uc = fmt & 0x20;
@@ -118,7 +118,7 @@
 *s++ = 'N' ^ uc;
 ret:
 *s = '\0';
- return s - buf;
+ return (int)(s - buf);
 }
 }
 
@@ -254,7 +254,7 @@
 prec = 0;
 }
 
- // We now have f as a floating point number between >= 1 and < 10
+ // We now have f as a floating-point number between >= 1 and < 10
 // (or equal to zero), and e contains the absolute value of the power of
 // 10 exponent. and (dec + 1) == the number of dgits before the decimal.
 
@@ -275,7 +275,7 @@
 }
 
 // Print the digits of the mantissa
- for (int i = 0; i < num_digits; ++i, --dec) {
+ for (int i = 0; i < num_digits; i++,dec--) {
 int8_t d = (int8_t)((int)f)%10;
 *s++ = '0' + d;
 if (dec == 0 && (prec > 0 || alt_form)) {
@@ -358,6 +358,6 @@
 }
 *s = '\0';
 
- return s - buf;
+ return (int)(s - buf);
 }
 #endif

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/gc.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/gc.c Changed

@@ -21,6 +21,7 @@
 #include <mruby/gc.h>
 #include <mruby/error.h>
 #include <mruby/throw.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 #ifdef MRB_GC_STRESS
@@ -192,7 +193,7 @@
 
 #define GC_STEP_SIZE 1024
 
-/* white: 001 or 010, black: 100, gray: 000 */
+/* white: 001 or 010, black: 100, gray: 000, red:111 */
 #define GC_GRAY 0
 #define GC_WHITE_A 1
 #define GC_WHITE_B (1 << 1)
@@ -214,7 +215,11 @@
 #define other_white_part(s) ((s)->current_white_part ^ GC_WHITES)
 #define is_dead(s, o) (((o)->color & other_white_part(s) & GC_WHITES) || (o)->tt == MRB_TT_FREE)
 
-#define objects(p) ((RVALUE *)p->objects)
+/* We have removed `objects` from `mrb_heap_page` since it was not C++
+ * compatible. Using array index to get pointer after structure instead. */
+
+/* #define objects(p) ((RVALUE *)p->objects) */
+#define objects(p) ((RVALUE *)&p1)
 
 mrb_noreturn void mrb_raise_nomemory(mrb_state *mrb);
 
@@ -223,6 +228,9 @@
 {
 void *p2;
 
+#if defined(MRB_GC_STRESS) && defined(MRB_DEBUG)
+ mrb_full_gc(mrb);
+#endif
 p2 = (mrb->allocf)(mrb, p, len, mrb->allocf_ud);
 if (!p2 && len > 0 && mrb->gc.heaps) {
 mrb_full_gc(mrb);
@@ -292,7 +300,7 @@
 mrb_alloca(mrb_state *mrb, size_t size)
 {
 struct RString *s;
- s = MRB_OBJ_ALLOC(mrb, MRB_TT_STRING, mrb->string_class);
+ s = MRB_OBJ_ALLOC(mrb, MRB_TT_STRING, NULL);
 return s->as.heap.ptr = (char*)mrb_malloc(mrb, size);
 }
 
@@ -306,7 +314,7 @@
 RVALUE *p;
 
 p = objects(page);
- if (&p0.as.basic <= object && object <= &pMRB_HEAP_PAGE_SIZE.as.basic) {
+ if (&p0.as.basic <= object && object <= &pMRB_HEAP_PAGE_SIZE - 1.as.basic) {
 return TRUE;
 }
 page = page->next;
@@ -315,7 +323,8 @@
 }
 
 MRB_API mrb_bool
-mrb_object_dead_p(mrb_state *mrb, struct RBasic *object) {
+mrb_object_dead_p(mrb_state *mrb, struct RBasic *object)
+{
 mrb_gc *gc = &mrb->gc;
 if (!heap_p(gc, object)) return TRUE;
 return is_dead(gc, object);
@@ -457,8 +466,9 @@
 #else
 if (gc->arena_idx >= gc->arena_capa) {
 /* extend arena */
- gc->arena_capa = (int)(gc->arena_capa * 3 / 2);
- gc->arena = (struct RBasic**)mrb_realloc(mrb, gc->arena, sizeof(struct RBasic*)*gc->arena_capa);
+ int newcapa = gc->arena_capa * 3 / 2;
+ gc->arena = (struct RBasic**)mrb_realloc(mrb, gc->arena, sizeof(struct RBasic*)*newcapa);
+ gc->arena_capa = newcapa;
 }
 #endif
 gc->arenagc->arena_idx++ = p;
@@ -469,7 +479,9 @@
 mrb_gc_protect(mrb_state *mrb, mrb_value obj)
 {
 if (mrb_immediate_p(obj)) return;
- gc_protect(mrb, &mrb->gc, mrb_basic_ptr(obj));
+ struct RBasic *p = mrb_basic_ptr(obj);
+ if (is_red(p)) return;
+ gc_protect(mrb, &mrb->gc, p);
 }
 
 #define GC_ROOT_SYM MRB_SYM(_gc_root_)
@@ -553,6 +565,7 @@
 ttype != MRB_TT_SCLASS &&
 ttype != MRB_TT_ICLASS &&
 ttype != MRB_TT_ENV &&
+ ttype != MRB_TT_BIGINT &&
 ttype != tt) {
 mrb_raisef(mrb, E_TYPE_ERROR, "allocation failure of %C", cls);
 }
@@ -599,8 +612,6 @@
 gc->gray_list = obj;
 }
 
-mrb_int mrb_ci_nregs(mrb_callinfo *ci);
-
 static void
 mark_context_stack(mrb_state *mrb, struct mrb_context *c)
 {
@@ -685,7 +696,7 @@
 /* fall through */
 
 case MRB_TT_OBJECT:
- case MRB_TT_DATA:
+ case MRB_TT_CDATA:
 mrb_gc_mark_iv(mrb, (struct RObject*)obj);
 break;
 
@@ -760,9 +771,10 @@
 
 case MRB_TT_EXCEPTION:
 mrb_gc_mark_iv(mrb, (struct RObject*)obj);
- if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) {
+ if (((struct RException*)obj)->mesg) {
 mrb_gc_mark(mrb, (struct RBasic*)((struct RException*)obj)->mesg);
 }
+ mrb_gc_mark(mrb, (struct RBasic*)((struct RException*)obj)->backtrace);
 break;
 
 default:
@@ -834,7 +846,7 @@
 struct REnv *e = ci->u.env;
 if (e && !mrb_object_dead_p(mrb, (struct RBasic*)e) &&
 e->tt == MRB_TT_ENV && MRB_ENV_ONSTACK_P(e)) {
- mrb_env_unshare(mrb, e);
+ mrb_env_unshare(mrb, e, TRUE);
 }
 ci--;
 }
@@ -879,7 +891,7 @@
 mrb_gc_free_range(mrb, ((struct RRange*)obj));
 break;
 
- case MRB_TT_DATA:
+ case MRB_TT_CDATA:
 {
 struct RData *d = (struct RData*)obj;
 if (d->type && d->type->dfree) {
@@ -907,9 +919,19 @@
 break;
 #endif
 
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ mrb_gc_free_bint(mrb, obj);
+ break;
+#endif
+
 default:
 break;
 }
+#if defined(MRB_GC_STRESS) && defined(MRB_DEBUG)
+ memset(obj, -1, sizeof(RVALUE));
+ paint_white(obj);
+#endif
 obj->tt = MRB_TT_FREE;
 }
 
@@ -957,12 +979,6 @@
 mrb_gc_mark(mrb, (struct RBasic*)mrb->top_self);
 /* mark exception */
 mrb_gc_mark(mrb, (struct RBasic*)mrb->exc);
- /* mark pre-allocated exception */
- mrb_gc_mark(mrb, (struct RBasic*)mrb->nomem_err);
- mrb_gc_mark(mrb, (struct RBasic*)mrb->stack_err);
-#ifdef MRB_GC_FIXED_ARENA
- mrb_gc_mark(mrb, (struct RBasic*)mrb->arena_err);
-#endif
 
 mark_context(mrb, mrb->c);
 if (mrb->root_c != mrb->c) {
@@ -994,7 +1010,7 @@
 break;
 
 case MRB_TT_OBJECT:
- case MRB_TT_DATA:
+ case MRB_TT_CDATA:
 children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
 break;
 
@@ -1009,13 +1025,11 @@
 mrb_callinfo *ci;
 
 if (!c || c->status == MRB_FIBER_TERMINATED) break;
+ if (!c->ci) break;
 
 /* mark stack */
 i = c->ci->stack - c->stbase;
-
- if (c->ci) {
- i += mrb_ci_nregs(c->ci);
- }
+ i += mrb_ci_nregs(c->ci);
 if (c->stbase + i > c->stend) i = c->stend - c->stbase;
 children += i;
 
@@ -1049,7 +1063,10 @@
 
 case MRB_TT_EXCEPTION:
 children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
- if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) {
+ if (((struct RException*)obj)->mesg) {
+ children++;
+ }
+ if (((struct RException*)obj)->backtrace) {
 children++;
 }
 break;
@@ -1060,7 +1077,6 @@
 return children;
 }
 
-
 static void
 gc_mark_gray_list(mrb_state *mrb, mrb_gc *gc) {
 while (gc->gray_list) {
@@ -1070,7 +1086,6 @@
 }
 }
 
-
 static size_t
 incremental_marking_phase(mrb_state *mrb, mrb_gc *gc, size_t limit)
 {
@@ -1087,6 +1102,20 @@
 }
 
 static void
+clear_error_object(mrb_state *mrb, struct RObject *obj)
+{
+ if (obj == 0) return;
+ if (!is_white(obj)) return;
+ paint_black(obj);
+ mrb_gc_mark(mrb, (struct RBasic*)obj->c);
+ mrb_gc_free_iv(mrb, obj);
+ struct RException *err = (struct RException*)obj;
+ err->iv = NULL;
+ err->mesg = NULL;
+ err->backtrace = NULL;
+}
+
+static void
 final_marking_phase(mrb_state *mrb, mrb_gc *gc)
 {
 int i, e;
@@ -1101,6 +1130,14 @@
 mark_context(mrb, mrb->root_c);
 }
 mrb_gc_mark(mrb, (struct RBasic*)mrb->exc);
+
+ /* mark pre-allocated exception */
+ clear_error_object(mrb, mrb->nomem_err);
+ clear_error_object(mrb, mrb->stack_err);
+#ifdef MRB_GC_FIXED_ARENA
+ clear_error_object(mrb, mrb->arena_err);
+#endif
+
 gc_mark_gray_list(mrb, gc);
 mrb_assert(gc->gray_list == NULL);
 gc->gray_list = gc->atomic_gray_list;
@@ -1112,6 +1149,8 @@
 static void
 prepare_incremental_sweep(mrb_state *mrb, mrb_gc *gc)
 {
+ // mrb_assert(gc->atomic_gray_list == NULL);
+ // mrb_assert(gc->gray_list == NULL);
 gc->state = MRB_GC_STATE_SWEEP;
 gc->sweeps = gc->heaps;
 gc->live_after_mark = gc->live;
@@ -1217,11 +1256,11 @@
 }
 
 static void
-incremental_gc_until(mrb_state *mrb, mrb_gc *gc, mrb_gc_state to_state)
+incremental_gc_finish(mrb_state *mrb, mrb_gc *gc)
 {
 do {
 incremental_gc(mrb, gc, SIZE_MAX);
- } while (gc->state != to_state);
+ } while (gc->state != MRB_GC_STATE_ROOT);
 }
 
 static void
@@ -1246,14 +1285,15 @@
 mrb_assert(is_generational(gc));
 if (is_major_gc(gc)) {
 /* finish the half baked GC */
- incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
+ incremental_gc_finish(mrb, gc);
+ }
+ else {
+ /* Sweep the dead objects, then reset all the live objects
+ * (including all the old objects, of course) to white. */
+ gc->generational = FALSE;
+ prepare_incremental_sweep(mrb, gc);
+ incremental_gc_finish(mrb, gc);
 }
-
- /* Sweep the dead objects, then reset all the live objects
- * (including all the old objects, of course) to white. */
- gc->generational = FALSE;
- prepare_incremental_sweep(mrb, gc);
- incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
 gc->generational = origin_mode;
 
 /* The gray objects have already been painted as white */
@@ -1271,7 +1311,7 @@
 GC_TIME_START;
 
 if (is_minor_gc(gc)) {
- incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
+ incremental_gc_finish(mrb, gc);
 }
 else {
 incremental_gc_step(mrb, gc);
@@ -1327,10 +1367,10 @@
 }
 else if (gc->state != MRB_GC_STATE_ROOT) {
 /* finish half baked GC cycle */
- incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
+ incremental_gc_finish(mrb, gc);
 }
 
- incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
+ incremental_gc_finish(mrb, gc);
 gc->threshold = (gc->live_after_mark/100) * gc->interval_ratio;
 
 if (is_generational(gc)) {
@@ -1360,8 +1400,10 @@
 {
 mrb_gc *gc = &mrb->gc;
 
+ if (!value) return;
 if (!is_black(obj)) return;
 if (!is_white(value)) return;
+ if (is_red(value)) return;
 
 mrb_assert(gc->state == MRB_GC_STATE_MARK || (!is_dead(gc, value) && !is_dead(gc, obj)));
 mrb_assert(is_generational(gc) || gc->state != MRB_GC_STATE_ROOT);
@@ -1537,7 +1579,7 @@
 gc->full = FALSE;
 }
 else if (!is_generational(gc) && enable) {
- incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
+ incremental_gc_finish(mrb, gc);
 gc->majorgc_old_threshold = gc->live_after_mark/100 * MAJOR_GC_INC_RATIO;
 gc->full = FALSE;
 }
@@ -1637,8 +1679,7 @@
 {
 struct RClass *gc;
 
- mrb_static_assert(sizeof(RVALUE) <= sizeof(void*) * 6,
- "RVALUE size must be within 6 words");
+ mrb_static_assert_object_size(RVALUE);
 
 gc = mrb_define_module(mrb, "GC");

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/hash.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/hash.c Changed

@@ -11,6 +11,7 @@
 #include <mruby/hash.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 /*
@@ -169,7 +170,7 @@
 
 #define ea_each_used(ea, n_used, entry_var, code) do { \
 hash_entry *entry_var = ea, *ea_end__ = entry_var + (n_used); \
- for (; entry_var < ea_end__; ++entry_var) { \
+ for (; entry_var < ea_end__; entry_var++) { \
 code; \
 } \
 } while (0)
@@ -177,7 +178,7 @@
 #define ea_each(ea, size, entry_var, code) do { \
 hash_entry *entry_var = ea; \
 uint32_t size__ = size; \
- for (; 0 < size__; ++entry_var) { \
+ for (; 0 < size__; entry_var++) { \
 if (entry_deleted_p(entry_var)) continue; \
 --size__; \
 code; \
@@ -293,6 +294,7 @@
 static void ht_init(
 mrb_state *mrb, struct RHash *h, uint32_t size,
 hash_entry *ea, uint32_t ea_capa, hash_table *ht, uint32_t ib_bit);
+static void ht_set(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value val);
 static void ht_set_without_ib_adjustment(
 mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value val);
 
@@ -308,7 +310,7 @@
 v |= v >> 4;
 v |= v >> 8;
 v |= v >> 16;
- ++v;
+ v++;
 return v;
 #endif
 }
@@ -424,7 +426,7 @@
 ea_each_used(ea, n_used, r_entry, {
 if (entry_deleted_p(r_entry)) continue;
 if (r_entry != w_entry) *w_entry = *r_entry;
- ++w_entry;
+ w_entry++;
 });
 }
 
@@ -530,9 +532,8 @@
 if (ea_capa == ea_n_used) {
 if (size == ea_n_used) {
 if (size == AR_MAX_SIZE) {
- hash_entry *ea = ea_adjust(mrb, ar_ea(h), &ea_capa, EA_MAX_CAPA);
- ea_set(ea, ea_n_used, key, val);
- ht_init(mrb, h, ++size, ea, ea_capa, NULL, IB_INIT_BIT);
+ ht_init(mrb, h, size, ar_ea(h), ea_capa, NULL, IB_INIT_BIT);
+ ht_set(mrb, h, key, val);
 return;
 }
 else {
@@ -591,7 +592,7 @@
 ea_set(ea, w_size, r_entry->key, r_entry->val);
 entry_delete(r_entry);
 }
- ++w_size;
+ w_size++;
 }
 });
 mrb_assert(size == w_size);
@@ -783,8 +784,9 @@
 {
 size_t ib_byte_size = ib_byte_size_for(ib_bit);
 size_t ht_byte_size = sizeof(hash_table) + ib_byte_size;
+ ht = (hash_table*)mrb_realloc(mrb, ht, ht_byte_size);
 h_ht_on(h);
- h_set_ht(h, (hash_table*)mrb_realloc(mrb, ht, ht_byte_size));
+ h_set_ht(h, ht);
 ht_set_size(h, size);
 ht_set_ea(h, ea);
 ht_set_ea_capa(h, ea_capa);
@@ -1745,6 +1747,19 @@
 });
 }
 
+static mrb_value
+mrb_hash_merge_m(mrb_state *mrb, mrb_value hash)
+{
+ mrb_int argc;
+ mrb_value *argv;
+
+ mrb_get_args(mrb, "*", &argv, &argc);
+ while (argc--) {
+ mrb_hash_merge(mrb, hash, *argv++);
+ }
+ return hash;
+}
+
 /*
 * call-seq:
 * hsh.rehash -> hsh
@@ -1805,4 +1820,5 @@
 mrb_define_method(mrb, h, "value?", mrb_hash_has_value, MRB_ARGS_REQ(1)); /* 15.2.13.4.27 */
 mrb_define_method(mrb, h, "values", mrb_hash_values, MRB_ARGS_NONE()); /* 15.2.13.4.28 */
 mrb_define_method(mrb, h, "rehash", mrb_hash_rehash, MRB_ARGS_NONE());
+ mrb_define_method(mrb, h, "__merge", mrb_hash_merge_m, MRB_ARGS_REQ(1));
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/kernel.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/kernel.c Changed

@@ -13,6 +13,7 @@
 #include <mruby/variable.h>
 #include <mruby/error.h>
 #include <mruby/istruct.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 MRB_API mrb_bool
@@ -77,6 +78,16 @@
 return mrb_bool_value(mrb_equal(mrb, self, arg));
 }
 
+static mrb_value
+mrb_cmp_m(mrb_state *mrb, mrb_value self)
+{
+ mrb_value arg = mrb_get_arg1(mrb);
+
+ if (mrb_equal(mrb, self, arg))
+ return mrb_fixnum_value(0);
+ return mrb_nil_value();
+}
+
 /* 15.3.1.3.3 */
 /* 15.3.1.3.33 */
 /*
@@ -215,59 +226,6 @@
 return mrb_obj_value(mrb_obj_class(mrb, self));
 }
 
-static mrb_value
-mrb_obj_extend(mrb_state *mrb, mrb_int argc, const mrb_value *argv, mrb_value obj)
-{
- mrb_int i;
-
- if (argc == 0) {
- mrb_argnum_error(mrb, argc, 1, -1);
- }
- for (i = 0; i < argc; i++) {
- mrb_check_type(mrb, argvi, MRB_TT_MODULE);
- }
- while (argc--) {
- mrb_funcall_id(mrb, argvargc, MRB_SYM(extend_object), 1, obj);
- mrb_funcall_id(mrb, argvargc, MRB_SYM(extended), 1, obj);
- }
- return obj;
-}
-
-/* 15.3.1.3.13 */
-/*
- * call-seq:
- * obj.extend(module, ...) -> obj
- *
- * Adds to _obj_ the instance methods from each module given as a
- * parameter.
- *
- * module Mod
- * def hello
- * "Hello from Mod.\n"
- * end
- * end
- *
- * class Klass
- * def hello
- * "Hello from Klass.\n"
- * end
- * end
- *
- * k = Klass.new
- * k.hello #=> "Hello from Klass.\n"
- * k.extend(Mod) #=> #<Klass:0x401b3bc8>
- * k.hello #=> "Hello from Mod.\n"
- */
-static mrb_value
-mrb_obj_extend_m(mrb_state *mrb, mrb_value self)
-{
- const mrb_value *argv;
- mrb_int argc;
-
- mrb_get_args(mrb, "*", &argv, &argc);
- return mrb_obj_extend(mrb, argc, argv, self);
-}
-
 MRB_API mrb_value
 mrb_obj_freeze(mrb_state *mrb, mrb_value self)
 {
@@ -301,6 +259,11 @@
 static mrb_value
 mrb_obj_hash(mrb_state *mrb, mrb_value self)
 {
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(self)) {
+ return mrb_bint_hash(mrb, self);
+ }
+#endif
 return mrb_int_value(mrb, mrb_obj_id(self));
 }
 
@@ -478,59 +441,6 @@
 return val;
 }
 
-void
-mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args)
-{
- mrb_no_method_error(mrb, name, args, "undefined method '%n'", name);
-}
-
-/* 15.3.1.3.30 */
-/*
- * call-seq:
- * obj.method_missing(symbol , *args ) -> result
- *
- * Invoked by Ruby when obj is sent a message it cannot handle.
- * symbol is the symbol for the method called, and args
- * are any arguments that were passed to it. By default, the interpreter
- * raises an error when this method is called. However, it is possible
- * to override the method to provide more dynamic behavior.
- * If it is decided that a particular method should not be handled, then
- * super should be called, so that ancestors can pick up the
- * missing method.
- * The example below creates
- * a class <code>Roman</code>, which responds to methods with names
- * consisting of roman numerals, returning the corresponding integer
- * values.
- *
- * class Roman
- * def romanToInt(str)
- * # ...
- * end
- * def method_missing(methId)
- * str = methId.to_s
- * romanToInt(str)
- * end
- * end
- *
- * r = Roman.new
- * r.iv #=> 4
- * r.xxiii #=> 23
- * r.mm #=> 2000
- */
-mrb_value
-mrb_obj_missing(mrb_state *mrb, mrb_value mod)
-{
- mrb_sym name;
- const mrb_value *a;
- mrb_int alen;
-
- mrb->c->ci->mid = 0;
- mrb_get_args(mrb, "n*!", &name, &a, &alen);
- mrb_method_missing(mrb, name, mod, mrb_ary_new_from_values(mrb, alen, a));
- /* not reached */
- return mrb_nil_value();
-}
-
 static inline mrb_bool
 basic_obj_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym id, int pub)
 {
@@ -589,13 +499,13 @@
 else if (mrb_nil_p(self)) {
 return mrb_false_value();
 }
- else if (!mrb_respond_to(mrb, self, mrb_intern_lit(mrb, "to_a"))) {
+ else if (!mrb_respond_to(mrb, self, MRB_SYM(to_a))) {
 mrb_value c = mrb_funcall_argv(mrb, self, eqq, 1, &v);
 if (mrb_test(c)) return mrb_true_value();
 return mrb_false_value();
 }
 else {
- ary = mrb_funcall(mrb, self, "to_a", 0);
+ ary = mrb_funcall_id(mrb, self, MRB_SYM(to_a), 0);
 if (mrb_nil_p(ary)) {
 return mrb_funcall_argv(mrb, self, eqq, 1, &v);
 }
@@ -630,17 +540,16 @@
 mrb->kernel_module = krn = mrb_define_module(mrb, "Kernel"); /* 15.3.1 */
 mrb_define_class_method(mrb, krn, "block_given?", mrb_f_block_given_p_m, MRB_ARGS_NONE()); /* 15.3.1.2.2 */
 mrb_define_class_method(mrb, krn, "iterator?", mrb_f_block_given_p_m, MRB_ARGS_NONE()); /* 15.3.1.2.5 */
-; /* 15.3.1.2.11 */
 mrb_define_class_method(mrb, krn, "raise", mrb_f_raise, MRB_ARGS_OPT(2)); /* 15.3.1.2.12 */
 
 
 mrb_define_method(mrb, krn, "===", mrb_equal_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.2 */
+ mrb_define_method(mrb, krn, "<=>", mrb_cmp_m, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, krn, "block_given?", mrb_f_block_given_p_m, MRB_ARGS_NONE()); /* 15.3.1.3.6 */
 mrb_define_method(mrb, krn, "class", mrb_obj_class_m, MRB_ARGS_NONE()); /* 15.3.1.3.7 */
 mrb_define_method(mrb, krn, "clone", mrb_obj_clone, MRB_ARGS_NONE()); /* 15.3.1.3.8 */
 mrb_define_method(mrb, krn, "dup", mrb_obj_dup, MRB_ARGS_NONE()); /* 15.3.1.3.9 */
 mrb_define_method(mrb, krn, "eql?", mrb_obj_equal_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.10 */
- mrb_define_method(mrb, krn, "extend", mrb_obj_extend_m, MRB_ARGS_ANY()); /* 15.3.1.3.13 */
 mrb_define_method(mrb, krn, "freeze", mrb_obj_freeze, MRB_ARGS_NONE());
 mrb_define_method(mrb, krn, "frozen?", mrb_obj_frozen, MRB_ARGS_NONE());
 mrb_define_method(mrb, krn, "hash", mrb_obj_hash, MRB_ARGS_NONE()); /* 15.3.1.3.15 */
@@ -651,7 +560,6 @@
 mrb_define_method(mrb, krn, "is_a?", mrb_obj_is_kind_of_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.24 */
 mrb_define_method(mrb, krn, "iterator?", mrb_f_block_given_p_m, MRB_ARGS_NONE()); /* 15.3.1.3.25 */
 mrb_define_method(mrb, krn, "kind_of?", mrb_obj_is_kind_of_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.26 */
- mrb_define_method(mrb, krn, "method_missing", mrb_obj_missing, MRB_ARGS_ANY()); /* 15.3.1.3.30 */
 mrb_define_method(mrb, krn, "nil?", mrb_false, MRB_ARGS_NONE()); /* 15.3.1.3.32 */
 mrb_define_method(mrb, krn, "object_id", mrb_obj_id_m, MRB_ARGS_NONE()); /* 15.3.1.3.33 */
 mrb_define_method(mrb, krn, "raise", mrb_f_raise, MRB_ARGS_ANY()); /* 15.3.1.3.40 */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/load.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/load.c Changed

@@ -13,6 +13,7 @@
 #include <mruby/error.h>
 #include <mruby/data.h>
 #include <mruby/endian.h>
+#include <mruby/internal.h>
 #include <string.h>
 
 #if SIZE_MAX < UINT32_MAX
@@ -162,17 +163,16 @@
 #endif
 
 case IREP_TT_BIGINT:
- pool_data_len = bin_to_uint8(src); /* pool data length */
- src += sizeof(uint8_t);
+ pool_data_len = bin_to_uint8(src) + 2; /* pool data length */
 if (src + pool_data_len > end) return FALSE;
- {
+ else {
 char *p;
 pooli.tt = IREP_TT_BIGINT;
- p = (char*)mrb_malloc(mrb, pool_data_len+2);
- memcpy(p, src, pool_data_len+2);
+ p = (char*)mrb_malloc(mrb, pool_data_len);
+ memcpy(p, src, pool_data_len);
 pooli.u.str = (const char*)p;
 }
- src += pool_data_len + 2;
+ src += pool_data_len;
 break;
 
 case IREP_TT_FLOAT:
@@ -326,7 +326,7 @@
 if (bin > end) return MRB_DUMP_GENERAL_FAILURE;
 debug->files = (mrb_irep_debug_info_file**)mrb_calloc(mrb, irep->debug_info->flen, sizeof(mrb_irep_debug_info*));
 
- for (f_idx = 0; f_idx < debug->flen; ++f_idx) {
+ for (f_idx = 0; f_idx < debug->flen; f_idx++) {
 mrb_irep_debug_info_file *file;
 uint16_t filename_idx;
 
@@ -352,11 +352,12 @@
 size_t l = sizeof(uint16_t) * (size_t)file->line_entry_count;
 
 if (bin + l > end) return MRB_DUMP_GENERAL_FAILURE;
- file->lines.ary = (uint16_t *)mrb_malloc(mrb, l);
- for (l = 0; l < file->line_entry_count; ++l) {
- file->lines.aryl = bin_to_uint16(bin);
+ uint16_t *ary = (uint16_t *)mrb_malloc(mrb, l);
+ for (l = 0; l < file->line_entry_count; l++) {
+ aryl = bin_to_uint16(bin);
 bin += sizeof(uint16_t);
 }
+ file->lines.ary = ary;
 } break;
 
 case mrb_debug_line_flat_map: {
@@ -364,21 +365,23 @@
 size_t n = sizeof(mrb_irep_debug_info_line);
 
 if (bin + c*n > end) return MRB_DUMP_GENERAL_FAILURE;
- file->lines.flat_map = (mrb_irep_debug_info_line*)mrb_calloc(mrb, c, n);
- for (size_t l = 0; l < file->line_entry_count; ++l) {
- file->lines.flat_mapl.start_pos = bin_to_uint32(bin);
+ mrb_irep_debug_info_line *flat_map = (mrb_irep_debug_info_line*)mrb_calloc(mrb, c, n);
+ for (size_t l = 0; l < file->line_entry_count; l++) {
+ flat_mapl.start_pos = bin_to_uint32(bin);
 bin += sizeof(uint32_t);
- file->lines.flat_mapl.line = bin_to_uint16(bin);
+ flat_mapl.line = bin_to_uint16(bin);
 bin += sizeof(uint16_t);
 }
+ file->lines.flat_map = flat_map;
 } break;
 
 case mrb_debug_line_packed_map: {
 size_t l = (size_t)file->line_entry_count;
 
 if (bin + l > end) return MRB_DUMP_GENERAL_FAILURE;
- file->lines.packed_map = (uint8_t*)mrb_calloc(mrb, 1, l);
- memcpy(file->lines.packed_map, bin, file->line_entry_count);
+ uint8_t *packed_map = (uint8_t*)mrb_malloc(mrb, l);
+ memcpy(packed_map, bin, file->line_entry_count);
+ file->lines.packed_map = packed_map;
 bin += file->line_entry_count;
 } break;
 
@@ -432,7 +435,7 @@
 if (bin > end) return MRB_DUMP_GENERAL_FAILURE;
 filenames_obj = mrb_str_new(mrb, NULL, sizeof(mrb_sym) * (size_t)filenames_len);
 filenames = (mrb_sym*)RSTRING_PTR(filenames_obj);
- for (i = 0; i < filenames_len; ++i) {
+ for (i = 0; i < filenames_len; i++) {
 uint16_t f_len = bin_to_uint16(bin);
 bin += sizeof(uint16_t);
 if (bin + f_len > end) {
@@ -474,7 +477,7 @@
 if (irep->nlocals == 0) return MRB_DUMP_GENERAL_FAILURE;
 irep->lv = lv = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * (irep->nlocals - 1));
 
- for (i = 0; i + 1 < irep->nlocals; ++i) {
+ for (i = 0; i + 1 < irep->nlocals; i++) {
 uint16_t const sym_idx = bin_to_uint16(bin);
 bin += sizeof(uint16_t);
 if (sym_idx == RITE_LV_NULL_MARK) {
@@ -488,7 +491,7 @@
 }
 }
 
- for (i = 0; i < irep->rlen; ++i) {
+ for (i = 0; i < irep->rlen; i++) {
 size_t len;
 int ret;
 
@@ -529,7 +532,7 @@
 if (bin > end) return MRB_DUMP_READ_FAULT;
 syms_obj = mrb_str_new(mrb, NULL, sizeof(mrb_sym) * (size_t)syms_len);
 syms = (mrb_sym*)RSTRING_PTR(syms_obj);
- for (i = 0; i < syms_len; ++i) {
+ for (i = 0; i < syms_len; i++) {
 uint16_t const str_len = bin_to_uint16(bin);
 bin += sizeof(uint16_t);
 if (bin > end) return MRB_DUMP_READ_FAULT;
@@ -666,8 +669,6 @@
 mrb_exc_set(mrb, mrb_exc_new_lit(mrb, E_SCRIPT_ERROR, "irep load error"));
 }
 
-void mrb_codedump_all(mrb_state*, struct RProc*);
-
 static mrb_value
 load_irep(mrb_state *mrb, struct RProc *proc, mrbc_context *c)
 {

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/numeric.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/numeric.c Changed

@@ -9,6 +9,7 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 #include <string.h>
 
@@ -20,37 +21,42 @@
 #endif
 #endif
 
-static void
-int_overflow(mrb_state *mrb, const char *reason)
+mrb_noreturn void
+mrb_int_overflow(mrb_state *mrb, const char *reason)
 {
 mrb_raisef(mrb, E_RANGE_ERROR, "integer overflow in %s", reason);
 }
 
-static void
-int_zerodiv(mrb_state *mrb)
+mrb_noreturn void
+mrb_int_zerodiv(mrb_state *mrb)
 {
 mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0");
 }
 
-/*
- * call-seq:
- *
- * num ** other -> num
- *
- * Raises <code>num</code> the <code>other</code> power.
- *
- * 2.0**3 #=> 8.0
- */
-static mrb_value
-int_pow(mrb_state *mrb, mrb_value x)
+static mrb_noreturn void
+mrb_int_noconv(mrb_state *mrb, mrb_value y)
+{
+ mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %Y into Integer", y);
+}
+
+mrb_value
+mrb_int_pow(mrb_state *mrb, mrb_value x, mrb_value y)
 {
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ return mrb_float_value(mrb, pow(mrb_bint_as_float(mrb, x), mrb_float(y)));
+ }
+#endif
+ return mrb_bint_pow(mrb, x, y);
+ }
+#endif
 mrb_int base = mrb_integer(x);
 mrb_int result = 1;
 mrb_int exp;
 
 #ifndef MRB_NO_FLOAT
- mrb_value y = mrb_get_arg1(mrb);
-
 if (mrb_float_p(y)) {
 return mrb_float_value(mrb, pow((double)base, mrb_float(y)));
 }
@@ -66,50 +72,78 @@
 #ifndef MRB_NO_FLOAT
 return mrb_float_value(mrb, pow((double)base, (double)exp));
 #else
- int_overflow(mrb, "negative power");
+ mrb_int_overflow(mrb, "negative power");
 #endif
 }
 for (;;) {
 if (exp & 1) {
 if (mrb_int_mul_overflow(result, base, &result)) {
- int_overflow(mrb, "power");
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_pow(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), y);
+#else
+ mrb_int_overflow(mrb, "power");
+#endif
 }
 }
 exp >>= 1;
 if (exp == 0) break;
 if (mrb_int_mul_overflow(base, base, &base)) {
- int_overflow(mrb, "power");
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_pow(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), y);
+#else
+ mrb_int_overflow(mrb, "power");
+#endif
 }
 }
 return mrb_int_value(mrb, result);
 }
 
+/*
+ * call-seq:
+ *
+ * num ** other -> num
+ *
+ * Raises <code>num</code> the <code>other</code> power.
+ *
+ * 2.0**3 #=> 8.0
+ */
+static mrb_value
+int_pow(mrb_state *mrb, mrb_value x)
+{
+ return mrb_int_pow(mrb, x, mrb_get_arg1(mrb));
+}
+
 mrb_int
-mrb_div_int(mrb_state *mrb, mrb_int x, mrb_int y)
+mrb_div_int(mrb_int x, mrb_int y)
+{
+ mrb_int div = x / y;
+
+ if ((x ^ y) < 0 && x != div * y) {
+ div -= 1;
+ }
+ return div;
+}
+
+mrb_value
+mrb_div_int_value(mrb_state *mrb, mrb_int x, mrb_int y)
 {
 if (y == 0) {
- int_zerodiv(mrb);
+ mrb_int_zerodiv(mrb);
 }
 else if(x == MRB_INT_MIN && y == -1) {
- int_overflow(mrb, "division");
- }
- else {
- mrb_int div = x / y;
-
- if ((x ^ y) < 0 && x != div * y) {
- div -= 1;
- }
- return div;
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_mul_ii(mrb, x, y);
+#else
+ mrb_int_overflow(mrb, "division");
+#endif
 }
- /* not reached */
- return 0;
+ return mrb_int_value(mrb, mrb_div_int(x, y));
 }
 
-/* 15.2.8.3.4 */
-/* 15.2.9.3.4 */
+/* 15.2.8.3.6 */
 /*
 * call-seq:
- * int / other -> num
+ * int / num -> num
 *
 * Performs division: the class of the resulting object depends on
 * the class of <code>num</code> and on the magnitude of the
@@ -119,17 +153,37 @@
 int_div(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
- mrb_int a = mrb_integer(x);
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_div(mrb, x, y);
+ }
+#endif
+ mrb_int a = mrb_integer(x);
 
 if (mrb_integer_p(y)) {
- mrb_int div = mrb_div_int(mrb, a, mrb_integer(y));
- return mrb_int_value(mrb, div);
+ return mrb_div_int_value(mrb, a, mrb_integer(y));
 }
-#ifdef MRB_NO_FLOAT
- mrb_raise(mrb, E_TYPE_ERROR, "non integer division");
-#else
- return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
+ switch (mrb_type(y)) {
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ return mrb_bint_div(mrb, mrb_bint_new_int(mrb, a), y);
+#endif
+#ifdef MRB_USE_RATIONAL
+ case MRB_TT_RATIONAL:
+ return mrb_rational_div(mrb, mrb_rational_new(mrb, a, 1), y);
+#endif
+#ifdef MRB_USE_COMPLEX
+ case MRB_TT_COMPLEX:
+ x = mrb_complex_new(mrb, (mrb_float)a, 0);
+ return mrb_complex_div(mrb, x, y);
 #endif
+#ifndef MRB_NO_FLOAT
+ case MRB_TT_FLOAT:
+ return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
+#endif
+ default:
+ mrb_int_noconv(mrb, y);
+ }
 }
 
 /* 15.2.9.3.19(x) */
@@ -149,28 +203,55 @@
 static mrb_value
 int_idiv(mrb_state *mrb, mrb_value x)
 {
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_div(mrb, x, mrb_get_arg1(mrb));
+ }
+#endif
 mrb_int y;
 
 mrb_get_args(mrb, "i", &y);
- if (y == 0) {
- int_zerodiv(mrb);
- }
- return mrb_int_value(mrb, mrb_integer(x) / y);
+ return mrb_div_int_value(mrb, mrb_integer(x), y);
 }
 
 static mrb_value
-int_quo(mrb_state *mrb, mrb_value xv)
+int_quo(mrb_state *mrb, mrb_value x)
 {
+#ifndef MRB_USE_RATIONAL
 #ifdef MRB_NO_FLOAT
- return int_idiv(mrb, xv);
+ return int_idiv(mrb, x);
 #else
 mrb_float y;
 
 mrb_get_args(mrb, "f", &y);
 if (y == 0) {
- int_zerodiv(mrb);
+ mrb_int_zerodiv(mrb);
+ }
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_float_value(mrb, mrb_bint_as_float(mrb, x) / y);
+ }
+#endif
+ return mrb_float_value(mrb, mrb_integer(x) / y);
+#endif
+#else
+ mrb_int a = mrb_integer(x);
+ mrb_value y = mrb_get_arg1(mrb);
+ if (mrb_integer_p(y) && mrb_class_defined_id(mrb, MRB_SYM(Rational))) {
+ return mrb_rational_new(mrb, a, mrb_integer(y));
+ }
+ switch (mrb_type(y)) {
+ case MRB_TT_RATIONAL:
+ x = mrb_rational_new(mrb, a, 1);
+ return mrb_rational_div(mrb, x, y);
+ default:
+#ifndef MRB_NO_FLOAT
+ return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
+#else
+ mrb_int_noconv(mrb, y);
+ break;
+#endif
 }
- return mrb_float_value(mrb, mrb_integer(xv) / y);
 #endif
 }
 
@@ -184,7 +265,7 @@
 #ifndef MRB_NO_FLOAT
 mrb->c->ci->mid = 0;
 if (mrb_float_p(num) || mrb_float_p(step)) {
- return mrb_to_float(mrb, self);
+ return mrb_ensure_float_type(mrb, self);
 }
 #endif
 
@@ -212,11 +293,10 @@
 static mrb_value
 flo_idiv(mrb_state *mrb, mrb_value xv)
 {
- mrb_int y, div;
+ mrb_int y;
 
 mrb_get_args(mrb, "i", &y);
- div = mrb_div_int(mrb, (mrb_int)mrb_float(xv), y);
- return mrb_int_value(mrb, (mrb_int)div);
+ return mrb_div_int_value(mrb, (mrb_int)mrb_float(xv), y);
 }
 
 mrb_float
@@ -233,17 +313,30 @@
 }
 }
 
+/* 15.2.9.3.6 */
+/*
+ * call-seq:
+ * float / num -> float
+ *
+ * Returns a new Float which is the result of dividing float by num.
+ */
 static mrb_value
 flo_div(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
 mrb_float a = mrb_float(x);
 
- if (mrb_float_p(y)) {
+ switch(mrb_type(y)) {
+#ifdef MRB_USE_COMPLEX
+ case MRB_TT_COMPLEX:
+ return mrb_complex_div(mrb, mrb_complex_new(mrb, a, 0), y);
+#endif
+ case MRB_TT_FLOAT:
 a = mrb_div_float(a, mrb_float(y));
- }
- else {
+ return mrb_float_value(mrb, a);
+ default:
 a = mrb_div_float(a, mrb_as_float(mrb, y));
+ return mrb_float_value(mrb, a);
 }
 return mrb_float_value(mrb, a);
 }
@@ -309,7 +402,7 @@
 return str;
 }
 
-/* 15.2.9.3.1 */
+/* 15.2.9.3.3 */
 /*
 * call-seq:
 * float + other -> float
@@ -328,14 +421,14 @@
 return mrb_float_value(mrb, a + mrb_float(y));
 #if defined(MRB_USE_COMPLEX)
 case MRB_TT_COMPLEX:
- return mrb_funcall_id(mrb, y, MRB_OPSYM(add), 1, x);
+ return mrb_complex_add(mrb, y, x);
 #endif
 default:
 return mrb_float_value(mrb, a + mrb_as_float(mrb, y));
 }
 }
 
-/* 15.2.9.3.2 */
+/* 15.2.9.3.4 */
 /*
 * call-seq:
 * float - other -> float
@@ -355,15 +448,14 @@
 return mrb_float_value(mrb, a - mrb_float(y));
 #if defined(MRB_USE_COMPLEX)
 case MRB_TT_COMPLEX:
- x = mrb_funcall_id(mrb, y, MRB_OPSYM(sub), 1, x);
- return mrb_funcall_id(mrb, x, MRB_OPSYM(minus), 0);
+ return mrb_complex_sub(mrb, mrb_complex_new(mrb, a, 0), y);
 #endif
 default:
 return mrb_float_value(mrb, a - mrb_as_float(mrb, y));
 }
 }
 
-/* 15.2.9.3.3 */
+/* 15.2.9.3.5 */
 /*
 * call-seq:
 * float * other -> float
@@ -383,7 +475,7 @@
 return mrb_float_value(mrb, a * mrb_float(y));
 #if defined(MRB_USE_COMPLEX)
 case MRB_TT_COMPLEX:
- return mrb_funcall_id(mrb, y, MRB_OPSYM(mul), 1, x);
+ return mrb_complex_mul(mrb, y, x);
 #endif
 default:
 return mrb_float_value(mrb, a * mrb_as_float(mrb, y));
@@ -401,7 +493,7 @@
 goto exit;
 }
 if (y == 0.0) {
- int_zerodiv(mrb);
+ mrb_int_zerodiv(mrb);
 }
 if (isinf(y) && !isinf(x)) {
 mod = x;
@@ -427,7 +519,7 @@
 if (divp) *divp = div;
 }
 
-/* 15.2.9.3.5 */
+/* 15.2.9.3.5 */
 /*
 * call-seq:
 * flt % other -> float
@@ -463,25 +555,30 @@
 * (1.0).eql?(1.0) #=> true
 */
 static mrb_value
-int_eql(mrb_state *mrb, mrb_value x)
+num_eql(mrb_state *mrb, mrb_value x)
 {
 mrb_value y = mrb_get_arg1(mrb);
 
- if (!mrb_integer_p(y)) return mrb_false_value();
- return mrb_bool_value(mrb_integer(x) == mrb_integer(y));
-}
-
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bool_value(mrb_bint_cmp(mrb, x, y) == 0);
+ }
+#endif
 #ifndef MRB_NO_FLOAT
-static mrb_value
-flo_eql(mrb_state *mrb, mrb_value x)
-{
- mrb_value y = mrb_get_arg1(mrb);
-
- if (!mrb_float_p(y)) return mrb_false_value();
- return mrb_bool_value(mrb_float(x) == mrb_float(y));
+ if (mrb_float_p(x)) {
+ if (!mrb_float_p(y)) return mrb_false_value();
+ return mrb_bool_value(mrb_float(x) == mrb_float(y));
+ }
+#endif
+ if (mrb_integer_p(x)) {
+ if (!mrb_integer_p(y)) return mrb_false_value();
+ return mrb_bool_value(mrb_integer(x) == mrb_integer(y));
+ }
+ return mrb_bool_value(mrb_equal(mrb, x, y));
 }
 
-/* 15.2.9.3.7 */
+#ifndef MRB_NO_FLOAT
+/* 15.2.9.3.7 */
 /*
 * call-seq:
 * flt == obj -> true or false
@@ -542,7 +639,7 @@
 int64_value(mrb_state *mrb, int64_t v)
 {
 if (!TYPED_FIXABLE(v,int64_t)) {
- int_overflow(mrb, "bit operation");
+ mrb_int_overflow(mrb, "bit operation");
 }
 return mrb_fixnum_value((mrb_int)v);
 }
@@ -688,7 +785,7 @@
 return mrb_nil_value();
 }
 
-/* 15.2.9.3.9 */
+/* 15.2.9.3.9 */
 /*
 * call-seq:
 * flt.finite? -> true or false
@@ -705,6 +802,20 @@
 return mrb_bool_value(isfinite(mrb_float(num)));
 }
 
+/*
+ * Document-class: FloatDomainError
+ *
+ * Raised when attempting to convert special float values
+ * (in particular infinite or NaN)
+ * to numerical classes which don't support them.
+ *
+ * Float::INFINITY.to_i
+ *
+ * raises the exception:
+ *
+ * FloatDomainError: Infinity
+ */
+/* ------------------------------------------------------------------------*/
 void
 mrb_check_num_exact(mrb_state *mrb, mrb_float num)
 {
@@ -717,7 +828,20 @@
 }
 
 static mrb_value
-flo_ceil_floor(mrb_state *mrb, mrb_value num, double (*func)(double))
+flo_rounding_int(mrb_state *mrb, mrb_float f)
+{
+ if (!FIXABLE_FLOAT(f)) {
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_new_float(mrb, f);
+#else
+ mrb_int_overflow(mrb, "rounding");
+#endif
+ }
+ return mrb_int_value(mrb, (mrb_int)f);
+}
+
+static mrb_value
+flo_rounding(mrb_state *mrb, mrb_value num, double (*func)(double))
 {
 mrb_float f = mrb_float(num);
 mrb_int ndigits = 0;
@@ -733,19 +857,20 @@
 }
 if (ndigits > 0) {
 if (ndigits > fprec) return num;
- mrb_float d = pow(10, ndigits);
+ mrb_float d = pow(10, (double)ndigits);
 f = func(f * d) / d;
+ mrb_check_num_exact(mrb, f);
 return mrb_float_value(mrb, f);
 }
 if (ndigits < 0) {
- mrb_float d = pow(10, -ndigits);
+ mrb_float d = pow(10, -(double)ndigits);
 f = func(f / d) * d;
 }
 else { /* ndigits == 0 */
 f = func(f);
 }
 mrb_check_num_exact(mrb, f);
- return mrb_int_value(mrb, (mrb_int)f);
+ return flo_rounding_int(mrb, f);
 }
 
 /* 15.2.9.3.10 */
@@ -759,7 +884,7 @@
 * When the precision is negative, the returned value is an integer
 * with at least <code>ndigits.abs</code> trailing zeros.
 *
- * Returns a floating point number when +ndigits+ is positive,
+ * Returns a floating-point number when +ndigits+ is positive,
 * otherwise returns an integer.
 *
 * 1.2.floor #=> 1
@@ -782,7 +907,7 @@
 * 34567.89.floor(2) #=> 34567.89
 * 34567.89.floor(3) #=> 34567.89
 *
- * Note that the limited precision of floating point arithmetic
+ * Note that the limited precision of floating-point arithmetic
 * might lead to surprising results:
 *
 * (0.3 / 0.1).floor #=> 2 (!)
@@ -790,10 +915,10 @@
 static mrb_value
 flo_floor(mrb_state *mrb, mrb_value num)
 {
- return flo_ceil_floor(mrb, num, floor);
+ return flo_rounding(mrb, num, floor);
 }
 
-/* 15.2.9.3.8 */
+/* 15.2.9.3.8 */
 /*
 * call-seq:
 * float.ceil(ndigits) -> integer or float
@@ -804,7 +929,7 @@
 * When the precision is negative, the returned value is an integer
 * with at least <code>ndigits.abs</code> trailing zeros.
 *
- * Returns a floating point number when +ndigits+ is positive,
+ * Returns a floating-point number when +ndigits+ is positive,
 * otherwise returns an integer.
 *
 * 1.2.ceil #=> 2
@@ -827,7 +952,7 @@
 * 34567.89.ceil(2) #=> 34567.89
 * 34567.89.ceil(3) #=> 34567.89
 *
- * Note that the limited precision of floating point arithmetic
+ * Note that the limited precision of floating-point arithmetic
 * might lead to surprising results:
 *
 * (2.1 / 0.7).ceil #=> 4 (!)
@@ -836,7 +961,7 @@
 static mrb_value
 flo_ceil(mrb_state *mrb, mrb_value num)
 {
- return flo_ceil_floor(mrb, num, ceil);
+ return flo_rounding(mrb, num, ceil);
 }
 
 /* 15.2.9.3.12 */
@@ -930,10 +1055,17 @@
 {
 mrb_float f = mrb_float(num);
 
+ mrb_check_num_exact(mrb, f);
+ if (!FIXABLE_FLOAT(f)) {
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_new_float(mrb, f);
+#else
+ mrb_int_overflow(mrb, "to_f");
+#endif
+ }
 if (f > 0.0) f = floor(f);
 if (f < 0.0) f = ceil(f);
 
- mrb_check_num_exact(mrb, f);
 return mrb_int_value(mrb, (mrb_int)f);
 }
 
@@ -976,7 +1108,7 @@
 *
 */
 
-
+/* 15.2.9.3.24 */
 /*
 * call-seq:
 * int.to_i -> integer
@@ -991,8 +1123,8 @@
 return num;
 }
 
-static mrb_value
-fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y)
+mrb_value
+mrb_int_mul(mrb_state *mrb, mrb_value x, mrb_value y)
 {
 mrb_int a;
 
@@ -1001,52 +1133,49 @@
 mrb_int b, c;
 
 if (a == 0) return x;
+ if (a == 1) return y;
 b = mrb_integer(y);
+ if (b == 0) return y;
+ if (b == 1) return x;
 if (mrb_int_mul_overflow(a, b, &c)) {
- int_overflow(mrb, "multiplication");
+#ifdef MRB_USE_BIGINT
+ x = mrb_bint_new_int(mrb, a);
+ return mrb_bint_mul(mrb, x, y);
+#else
+ mrb_int_overflow(mrb, "multiplication");
+#endif
 }
 return mrb_int_value(mrb, c);
 }
 switch (mrb_type(y)) {
-#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ if (a == 0) return x;
+ if (a == 1) return y;
+ return mrb_bint_mul(mrb, y, x);
+#endif
+#ifdef MRB_USE_RATIONAL
 case MRB_TT_RATIONAL:
- case MRB_TT_COMPLEX:
- return mrb_funcall_id(mrb, y, MRB_OPSYM(mul), 1, x);
+ if (a == 0) return x;
+ if (a == 1) return y;
+ return mrb_rational_mul(mrb, y, x);
 #endif
- default:
-#ifdef MRB_NO_FLOAT
- mrb_raise(mrb, E_TYPE_ERROR, "non integer multiplication");
-#else
- return mrb_float_value(mrb, (mrb_float)a * mrb_as_float(mrb, y));
+#ifdef MRB_USE_COMPLEX
+ case MRB_TT_COMPLEX:
+ if (a == 0) return x;
+ if (a == 1) return y;
+ return mrb_complex_mul(mrb, y, x);
 #endif
- }
-}
-
-MRB_API mrb_value
-mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y)
-{
- if (mrb_integer_p(x)) {
- return fixnum_mul(mrb, x, y);
- }
 #ifndef MRB_NO_FLOAT
- if (mrb_float_p(x)) {
- return mrb_float_value(mrb, mrb_float(x) * mrb_as_float(mrb, y));
- }
+ case MRB_TT_FLOAT:
+ return mrb_float_value(mrb, (mrb_float)a * mrb_as_float(mrb, y));
 #endif
-#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
- switch (mrb_type(x)) {
- case MRB_TT_RATIONAL:
- case MRB_TT_COMPLEX:
- return mrb_funcall_id(mrb, x, MRB_OPSYM(mul), 1, y);
 default:
- break;
+ mrb_int_noconv(mrb, y);
 }
-#endif
- mrb_raise(mrb, E_TYPE_ERROR, "no number multiply");
- return mrb_nil_value(); /* not reached */
 }
 
-/* 15.2.8.3.3 */
+/* 15.2.8.3.5 */
 /*
 * call-seq:
 * int * numeric -> numeric_result
@@ -1061,17 +1190,22 @@
 {
 mrb_value y = mrb_get_arg1(mrb);
 
- return fixnum_mul(mrb, x, y);
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_mul(mrb, x, y);
+ }
+#endif
+ return mrb_int_mul(mrb, x, y);
 }
 
 static void
 intdivmod(mrb_state *mrb, mrb_int x, mrb_int y, mrb_int *divp, mrb_int *modp)
 {
 if (y == 0) {
- int_zerodiv(mrb);
+ mrb_int_zerodiv(mrb);
 }
 else if(x == MRB_INT_MIN && y == -1) {
- int_overflow(mrb, "division");
+ mrb_int_overflow(mrb, "division");
 }
 else {
 mrb_int div = x / y;
@@ -1086,10 +1220,10 @@
 }
 }
 
-/* 15.2.8.3.5 */
+/* 15.2.8.3.7 */
 /*
 * call-seq:
- * int % other -> real
+ * int % num -> num
 *
 * Returns <code>int</code> modulo <code>other</code>.
 * See <code>numeric.divmod</code> for more information.
@@ -1101,10 +1235,16 @@
 mrb_value y = mrb_get_arg1(mrb);
 mrb_int a, b;
 
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_mod(mrb, x, y);
+ }
+#endif
 a = mrb_integer(x);
+ if (a == 0) return x;
 if (mrb_integer_p(y)) {
 b = mrb_integer(y);
- if (b == 0) int_zerodiv(mrb);
+ if (b == 0) mrb_int_zerodiv(mrb);
 if (a == MRB_INT_MIN && b == -1) return mrb_fixnum_value(0);
 mrb_int mod = a % b;
 if ((a < 0) != (b < 0) && mod != 0) {
@@ -1122,6 +1262,10 @@
 #endif
 }
 
+#ifndef MRB_NO_FLOAT
+static mrb_value flo_divmod(mrb_state *mrb, mrb_value x);
+#endif
+
 /*
 * call-seq:
 * int.divmod(numeric) -> array
@@ -1133,6 +1277,17 @@
 {
 mrb_value y = mrb_get_arg1(mrb);
 
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(y)) {
+ mrb_float f = mrb_bint_as_float(mrb, x);
+ return flo_divmod(mrb, mrb_float_value(mrb, f));
+ }
+#endif
+ return mrb_bint_divmod(mrb, x, y);
+ }
+#endif
 if (mrb_integer_p(y)) {
 mrb_int div, mod;
 
@@ -1142,15 +1297,7 @@
 #ifdef MRB_NO_FLOAT
 mrb_raise(mrb, E_TYPE_ERROR, "non integer divmod");
 #else
- else {
- mrb_float div, mod;
- mrb_value a, b;
-
- flodivmod(mrb, (mrb_float)mrb_integer(x), mrb_as_float(mrb, y), &div, &mod);
- a = mrb_int_value(mrb, (mrb_int)div);
- b = mrb_float_value(mrb, mod);
- return mrb_assoc_new(mrb, a, b);
- }
+ return flo_divmod(mrb, x);
 #endif
 }
 
@@ -1172,7 +1319,7 @@
 }
 #endif
 
-/* 15.2.8.3.7 */
+/* 15.2.8.3.2 */
 /*
 * call-seq:
 * int == other -> true or false
@@ -1196,6 +1343,10 @@
 case MRB_TT_FLOAT:
 return mrb_bool_value((mrb_float)mrb_integer(x) == mrb_float(y));
 #endif
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ return mrb_bool_value(mrb_bint_cmp(mrb, y, x) == 0);
+#endif
 #ifdef MRB_USE_RATIONAL
 case MRB_TT_RATIONAL:
 return mrb_bool_value(mrb_equal(mrb, y, x));
@@ -1209,7 +1360,7 @@
 }
 }
 
-/* 15.2.8.3.8 */
+/* 15.2.8.3.8 */
 /*
 * call-seq:
 * ~int -> integer
@@ -1225,6 +1376,11 @@
 {
 mrb_int val = mrb_integer(num);
 
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(num)) {
+ mrb_bint_rev(mrb, num);
+ }
+#endif
 return mrb_int_value(mrb, ~val);
 }
 
@@ -1242,7 +1398,7 @@
 } while(0)
 #endif
 
-/* 15.2.8.3.9 */
+/* 15.2.8.3.9 */
 /*
 * call-seq:
 * int & integer -> integer_result
@@ -1255,6 +1411,14 @@
 {
 mrb_value y = mrb_get_arg1(mrb);
 
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_and(mrb, x, y);
+ }
+ if (mrb_bigint_p(y)) {
+ return mrb_bint_and(mrb, mrb_as_bint(mrb, x), y);
+ }
+#endif
 bit_op(x, y, and, &);
 }
 
@@ -1271,6 +1435,14 @@
 {
 mrb_value y = mrb_get_arg1(mrb);
 
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_or(mrb, x, y);
+ }
+ if (mrb_bigint_p(y)) {
+ return mrb_bint_or(mrb, mrb_as_bint(mrb, x), y);
+ }
+#endif
 bit_op(x, y, or, |);
 }
 
@@ -1287,6 +1459,14 @@
 {
 mrb_value y = mrb_get_arg1(mrb);
 
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_xor(mrb, x, y);
+ }
+ if (mrb_bigint_p(y)) {
+ return mrb_bint_xor(mrb, mrb_as_bint(mrb, x), y);
+ }
+#endif
 bit_op(x, y, or, ^);
 }
 
@@ -1345,10 +1525,20 @@
 if (width == 0) {
 return x;
 }
+ if (width == MRB_INT_MIN) mrb_int_overflow(mrb, "bit shift");
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_lshift(mrb, x, width);
+ }
+#endif
 val = mrb_integer(x);
 if (val == 0) return x;
 if (!mrb_num_shift(mrb, val, width, &val)) {
- int_overflow(mrb, "bit shift");
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_lshift(mrb, mrb_bint_new_int(mrb, val), width);
+#else
+ mrb_int_overflow(mrb, "bit shift");
+#endif
 }
 return mrb_int_value(mrb, val);
 }
@@ -1370,70 +1560,223 @@
 if (width == 0) {
 return x;
 }
+ if (width == MRB_INT_MIN) mrb_int_overflow(mrb, "bit shift");
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_rshift(mrb, x, width);
+ }
+#endif
 val = mrb_integer(x);
 if (val == 0) return x;
- if (width == MRB_INT_MIN) int_overflow(mrb, "bit shift");
 if (!mrb_num_shift(mrb, val, -width, &val)) {
- int_overflow(mrb, "bit shift");
+#ifdef MRB_USE_BIGINT
+ return mrb_bint_rshift(mrb, mrb_bint_new_int(mrb, val), width);
+#else
+ mrb_int_overflow(mrb, "bit shift");
+#endif
 }
 return mrb_int_value(mrb, val);
 }
 
-/* 15.2.8.3.23 */
+static mrb_value
+prepare_int_rounding(mrb_state *mrb, mrb_value x)
+{
+ mrb_int nd = 0;
+ size_t bytes;
+
+ mrb_get_args(mrb, "|i", &nd);
+ if (nd >= 0) {
+ return mrb_nil_value();
+ }
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ bytes = mrb_bint_memsize(x);
+ }
+ else
+#endif
+ bytes = sizeof(mrb_int);
+ if (-0.415241 * nd - 0.125 > bytes) {
+ return mrb_undef_value();
+ }
+ return mrb_int_pow(mrb, mrb_fixnum_value(10), mrb_fixnum_value(-nd));
+}
+
+/* 15.2.8.3.14 Integer#ceil */
 /*
 * call-seq:
- * int.to_f -> float
+ * int.ceil -> int
+ * int.ceil(ndigits) -> int
 *
- * Converts int to a <code>Float</code>.
+ * Returns self.
 *
+ * When the precision (ndigits) is negative, the returned value is an integer
+ * with at least <code>ndigits.abs</code> trailing zeros.
 */
+static mrb_value
+int_ceil(mrb_state *mrb, mrb_value x)
+{
+ mrb_value f = prepare_int_rounding(mrb, x);
+ if (mrb_undef_p(f)) return mrb_fixnum_value(0);
+ if (mrb_nil_p(f)) return x;
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_add(mrb, x, mrb_bint_sub(mrb, x, mrb_bint_mod(mrb, x, f)));
+ }
+#endif
+ mrb_int a = mrb_integer(x);
+ mrb_int b = mrb_integer(f);
+ int neg = a < 0;
+ if (neg) a = -a;
+ else a += b - 1;
+ a = a / b * b;
+ if (neg) a = -a;
+ return mrb_int_value(mrb, a);
+}
 
-#ifndef MRB_NO_FLOAT
+/* 15.2.8.3.17 Integer#floor */
+/*
+ * call-seq:
+ * int.floor -> int
+ * int.floor(ndigits) -> int
+ *
+ * Returns self.
+ *
+ * When the precision (ndigits) is negative, the returned value is an integer
+ * with at least <code>ndigits.abs</code> trailing zeros.
+ */
 static mrb_value
-int_to_f(mrb_state *mrb, mrb_value num)
+int_floor(mrb_state *mrb, mrb_value x)
 {
- return mrb_float_value(mrb, (mrb_float)mrb_integer(num));
+ mrb_value f = prepare_int_rounding(mrb, x);
+ if (mrb_undef_p(f)) return mrb_fixnum_value(0);
+ if (mrb_nil_p(f)) return x;
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_sub(mrb, x, mrb_bint_mod(mrb, x, f));
+ }
+#endif
+ mrb_int a = mrb_integer(x);
+ mrb_int b = mrb_integer(f);
+ int neg = a < 0;
+ if (neg) a = -a + b - 1;
+ a = a / b * b;
+ if (neg) a = -a;
+ return mrb_int_value(mrb, a);
 }
 
+/* 15.2.8.3.20 Integer#round */
 /*
- * Document-class: FloatDomainError
+ * call-seq:
+ * int.round -> int
+ * int.round(ndigits) -> int
 *
- * Raised when attempting to convert special float values
- * (in particular infinite or NaN)
- * to numerical classes which don't support them.
+ * Returns self.
 *
- * Float::INFINITY.to_i
+ * When the precision (ndigits) is negative, the returned value is an integer
+ * with at least <code>ndigits.abs</code> trailing zeros.
+ */
+static mrb_value
+int_round(mrb_state *mrb, mrb_value x)
+{
+ mrb_value f = prepare_int_rounding(mrb, x);
+ if (mrb_undef_p(f)) return mrb_fixnum_value(0);
+ if (mrb_nil_p(f)) return x;
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ mrb_value r = mrb_bint_mod(mrb, x, f);
+ mrb_value n = mrb_bint_sub(mrb, x, r);
+ mrb_value h = mrb_bigint_p(f) ? mrb_bint_rshift(mrb, f, 1) : mrb_int_value(mrb, mrb_integer(f)>>1);
+ mrb_int cmp = mrb_bigint_p(r) ? mrb_bint_cmp(mrb, r, h) : (mrb_integer(r) - mrb_integer(h));
+ if ((cmp > 0) || (cmp == 0 && mrb_bint_cmp(mrb, x, mrb_fixnum_value(0)) > 0)) {
+ n = mrb_as_bint(mrb, n);
+ n = mrb_bint_add(mrb, n, f);
+ }
+ return n;
+ }
+#endif
+ mrb_int a = mrb_integer(x);
+ mrb_int b = mrb_integer(f);
+ int neg = a < 0;
+ if (neg) a = -a;
+ a = (a + b / 2) / b * b;
+ if (neg) a = -a;
+ return mrb_int_value(mrb, a);
+}
+
+/* 15.2.8.3.26 Integer#truncate */
+/*
+ * call-seq:
+ * int.truncate -> int
+ * int.truncate(ndigits) -> int
 *
- * raises the exception:
+ * Returns self.
 *
- * FloatDomainError: Infinity
+ * When the precision (ndigits) is negative, the returned value is an integer
+ * with at least <code>ndigits.abs</code> trailing zeros.
 */
-/* ------------------------------------------------------------------------*/
+static mrb_value
+int_truncate(mrb_state *mrb, mrb_value x)
+{
+ mrb_value f = prepare_int_rounding(mrb, x);
+ if (mrb_undef_p(f)) return mrb_fixnum_value(0);
+ if (mrb_nil_p(f)) return x;
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ mrb_value m = mrb_bint_mod(mrb, x, f);
+ if (mrb_bint_cmp(mrb, x, mrb_fixnum_value(0)) < 0) {
+ return mrb_bint_add(mrb, x, mrb_bint_sub(mrb, x, m));
+ }
+ else {
+ return mrb_bint_sub(mrb, x, m);
+ }
+ }
+#endif
+ mrb_int a = mrb_integer(x);
+ mrb_int b = mrb_integer(f);
+ int neg = a < 0;
+ if (neg) a = -a;
+ a = a / b * b;
+ if (neg) a = -a;
+ return mrb_int_value(mrb, a);
+}
+
+/* 15.2.8.3.23 */
+/*
+ * call-seq:
+ * int.to_f -> float
+ *
+ * Converts int to a <code>Float</code>.
+ *
+ */
+
+#ifndef MRB_NO_FLOAT
+static mrb_value
+int_to_f(mrb_state *mrb, mrb_value num)
+{
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(num)) {
+ return mrb_float_value(mrb, mrb_bint_as_float(mrb, num));
+ }
+#endif
+ return mrb_float_value(mrb, (mrb_float)mrb_integer(num));
+}
+
 MRB_API mrb_value
 mrb_float_to_integer(mrb_state *mrb, mrb_value x)
 {
- mrb_int z = 0;
-
 if (!mrb_float_p(x)) {
 mrb_raise(mrb, E_TYPE_ERROR, "non float value");
 }
- else {
- mrb_float d = mrb_float(x);
-
- mrb_check_num_exact(mrb, d);
- if (FIXABLE_FLOAT(d)) {
- z = (mrb_int)d;
- }
- else {
- mrb_raisef(mrb, E_RANGE_ERROR, "number (%v) too big for integer", x);
- }
+ mrb_float f = mrb_float(x);
+ if (isinf(f) || isnan(f)) {
+ mrb_raisef(mrb, E_RANGE_ERROR, "float %f out of range", f);
 }
- return mrb_int_value(mrb, z);
+ return flo_to_i(mrb, x);
 }
 #endif
 
-static mrb_value
-int_plus(mrb_state *mrb, mrb_value x, mrb_value y)
+mrb_value
+mrb_int_add(mrb_state *mrb, mrb_value x, mrb_value y)
 {
 mrb_int a;
 
@@ -1443,16 +1786,29 @@
 
 if (a == 0) return y;
 b = mrb_integer(y);
+ if (b == 0) return x;
 if (mrb_int_add_overflow(a, b, &c)) {
- int_overflow(mrb, "addition");
+#ifdef MRB_USE_BIGINT
+ x = mrb_bint_new_int(mrb, a);
+ return mrb_bint_add(mrb, x, y);
+#else
+ mrb_int_overflow(mrb, "addition");
+#endif
 }
 return mrb_int_value(mrb, c);
 }
 switch (mrb_type(y)) {
-#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ return mrb_bint_add(mrb, y, x);
+#endif
+#ifdef MRB_USE_RATIONAL
 case MRB_TT_RATIONAL:
+ return mrb_rational_add(mrb, y, x);
+#endif
+#ifdef MRB_USE_COMPLEX
 case MRB_TT_COMPLEX:
- return mrb_funcall_id(mrb, y, MRB_OPSYM(add), 1, x);
+ return mrb_complex_add(mrb, y, x);
 #endif
 default:
 #ifdef MRB_NO_FLOAT
@@ -1463,31 +1819,7 @@
 }
 }
 
-MRB_API mrb_value
-mrb_num_plus(mrb_state *mrb, mrb_value x, mrb_value y)
-{
- if (mrb_integer_p(x)) {
- return int_plus(mrb, x, y);
- }
-#ifndef MRB_NO_FLOAT
- if (mrb_float_p(x)) {
- return mrb_float_value(mrb, mrb_float(x) + mrb_as_float(mrb, y));
- }
-#endif
-#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
- switch (mrb_type(x)) {
- case MRB_TT_RATIONAL:
- case MRB_TT_COMPLEX:
- return mrb_funcall_id(mrb, x, MRB_OPSYM(add), 1, y);
- default:
- break;
- }
-#endif
- mrb_raise(mrb, E_TYPE_ERROR, "no number addition");
- return mrb_nil_value(); /* not reached */
-}
-
-/* 15.2.8.3.1 */
+/* 15.2.8.3.3 */
 /*
 * call-seq:
 * int + numeric -> numeric_result
@@ -1501,11 +1833,16 @@
 {
 mrb_value other = mrb_get_arg1(mrb);
 
- return int_plus(mrb, self, other);
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(self)) {
+ return mrb_bint_add(mrb, self, other);
+ }
+#endif
+ return mrb_int_add(mrb, self, other);
 }
 
-static mrb_value
-int_minus(mrb_state *mrb, mrb_value x, mrb_value y)
+mrb_value
+mrb_int_sub(mrb_state *mrb, mrb_value x, mrb_value y)
 {
 mrb_int a;
 
@@ -1515,16 +1852,27 @@
 
 b = mrb_integer(y);
 if (mrb_int_sub_overflow(a, b, &c)) {
- int_overflow(mrb, "subtraction");
+#ifdef MRB_USE_BIGINT
+ x = mrb_bint_new_int(mrb, a);
+ return mrb_bint_sub(mrb, x, y);
+#else
+ mrb_int_overflow(mrb, "subtraction");
+#endif
 }
 return mrb_int_value(mrb, c);
 }
 switch (mrb_type(y)) {
-#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ return mrb_bint_sub(mrb, mrb_bint_new_int(mrb, a), y);
+#endif
+#ifdef MRB_USE_RATIONAL
 case MRB_TT_RATIONAL:
+ return mrb_rational_sub(mrb, mrb_rational_new(mrb, a, 1), y);
+#endif
+#ifdef MRB_USE_COMPLEX
 case MRB_TT_COMPLEX:
- x = mrb_funcall_id(mrb, y, MRB_OPSYM(sub), 1, x);
- return mrb_funcall_id(mrb, x, MRB_OPSYM(minus), 0);
+ return mrb_complex_sub(mrb, mrb_complex_new(mrb, (mrb_float)a, 0), y);
 #endif
 default:
 #ifdef MRB_NO_FLOAT
@@ -1535,35 +1883,10 @@
 }
 }
 
-MRB_API mrb_value
-mrb_num_minus(mrb_state *mrb, mrb_value x, mrb_value y)
-{
- if (mrb_integer_p(x)) {
- return int_minus(mrb, x, y);
- }
-#ifndef MRB_NO_FLOAT
- if (mrb_float_p(x)) {
- return mrb_float_value(mrb, mrb_float(x) - mrb_as_float(mrb, y));
- }
-#endif
-#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
- switch (mrb_type(x)) {
- case MRB_TT_RATIONAL:
- case MRB_TT_COMPLEX:
- return mrb_funcall_id(mrb, x, MRB_OPSYM(sub), 1, y);
- default:
- break;
- }
-#endif
- mrb_raise(mrb, E_TYPE_ERROR, "no number subtraction");
- return mrb_nil_value(); /* not reached */
-}
-
-/* 15.2.8.3.2 */
-/* 15.2.8.3.16 */
+/* 15.2.8.3.4 */
 /*
 * call-seq:
- * int - numeric -> numeric_result
+ * int - numeric -> numeric
 *
 * Performs subtraction: the class of the resulting object depends on
 * the class of <code>numeric</code> and on the magnitude of the
@@ -1574,7 +1897,12 @@
 {
 mrb_value other = mrb_get_arg1(mrb);
 
- return int_minus(mrb, self, other);
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(self)) {
+ return mrb_bint_sub(mrb, self, other);
+ }
+#endif
+ return mrb_int_sub(mrb, self, other);
 }
 
 MRB_API char*
@@ -1619,6 +1947,11 @@
 if (base < 2 || 36 < base) {
 mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid radix %i", base);
 }
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_to_s(mrb, x, base);
+ }
+#endif
 const char *p = mrb_int_to_cstr(buf, sizeof(buf), val, base);
 mrb_assert(p != NULL);
 mrb_value str = mrb_str_new_cstr(mrb, p);
@@ -1655,6 +1988,12 @@
 static mrb_int
 cmpnum(mrb_state *mrb, mrb_value v1, mrb_value v2)
 {
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(v1)) {
+ return mrb_bint_cmp(mrb, v1, v2);
+ }
+#endif
+
 #ifdef MRB_NO_FLOAT
 mrb_int x, y;
 #else
@@ -1696,7 +2035,20 @@
 }
 }
 
-/* 15.2.9.3.6 */
+static mrb_value
+int_hash(mrb_state *mrb, mrb_value self)
+{
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(self)) {
+ return mrb_bint_hash(mrb, self);
+ }
+#endif
+ mrb_int n = mrb_integer(self);
+ return mrb_int_value(mrb, mrb_byte_hash((uint8_t*)&n, sizeof(n)));
+}
+
+/* 15.2.8.3.1 */
+/* 15.2.9.3.1 */
 /*
 * call-seq:
 * self.f <=> other.f => -1, 0, +1, or nil
@@ -1781,12 +2133,14 @@
 switch (mrb_type(obj1)) {
 case MRB_TT_INTEGER:
 case MRB_TT_FLOAT:
+ case MRB_TT_BIGINT:
 return cmpnum(mrb, obj1, obj2);
 case MRB_TT_STRING:
 if (!mrb_string_p(obj2))
 return -2;
 return mrb_str_cmp(mrb, obj1, obj2);
 default:
+ if (!mrb_respond_to(mrb, obj1, MRB_OPSYM(cmp))) return -2;
 v = mrb_funcall_id(mrb, obj1, MRB_OPSYM(cmp), 1, obj2);
 if (mrb_nil_p(v) || !mrb_integer_p(v))
 return -2;
@@ -1806,6 +2160,17 @@
 return mrb_false_value();
 }
 
+#ifndef MRB_NO_FLOAT
+static mrb_value
+flo_hash(mrb_state *mrb, mrb_value flo)
+{
+ mrb_float f = mrb_float(flo);
+ /* normalize -0.0 to 0.0 */
+ if (f == 0) f = 0.0;
+ return mrb_int_value(mrb, (mrb_int)mrb_byte_hash((uint8_t*)&f, sizeof(f)));
+}
+#endif
+
 /* ------------------------------------------------------------------------*/
 void
 mrb_init_numeric(mrb_state *mrb)
@@ -1819,6 +2184,7 @@
 numeric = mrb_define_class(mrb, "Numeric", mrb->object_class); /* 15.2.7 */
 mrb_define_method(mrb, numeric, "finite?", num_finite_p, MRB_ARGS_NONE());
 mrb_define_method(mrb, numeric, "infinite?",num_infinite_p, MRB_ARGS_NONE());
+ mrb_define_method(mrb, numeric, "eql?", num_eql, MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
 
 /* Integer Class */
 mrb->integer_class = integer = mrb_define_class(mrb, "Integer", numeric); /* 15.2.8 */
@@ -1838,8 +2204,8 @@
 mrb_define_method(mrb, integer, "-", int_sub, MRB_ARGS_REQ(1)); /* 15.2.8.3.2 */
 mrb_define_method(mrb, integer, "*", int_mul, MRB_ARGS_REQ(1)); /* 15.2.8.3.3 */
 mrb_define_method(mrb, integer, "%", int_mod, MRB_ARGS_REQ(1)); /* 15.2.8.3.5 */
- mrb_define_method(mrb, integer, "/", int_div, MRB_ARGS_REQ(1)); /* 15.2.8.3.6 */
- mrb_define_method(mrb, integer, "quo", int_quo, MRB_ARGS_REQ(1)); /* 15.2.7.4.5 (x) */
+ mrb_define_method(mrb, integer, "/", int_div, MRB_ARGS_REQ(1)); /* 15.2.8.3.6 */
+ mrb_define_method(mrb, integer, "quo", int_quo, MRB_ARGS_REQ(1)); /* 15.2.7.4.5(x) */
 mrb_define_method(mrb, integer, "div", int_idiv, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, integer, "==", int_equal, MRB_ARGS_REQ(1)); /* 15.2.8.3.7 */
 mrb_define_method(mrb, integer, "~", int_rev, MRB_ARGS_NONE()); /* 15.2.8.3.8 */
@@ -1848,13 +2214,17 @@
 mrb_define_method(mrb, integer, "^", int_xor, MRB_ARGS_REQ(1)); /* 15.2.8.3.11 */
 mrb_define_method(mrb, integer, "<<", int_lshift, MRB_ARGS_REQ(1)); /* 15.2.8.3.12 */
 mrb_define_method(mrb, integer, ">>", int_rshift, MRB_ARGS_REQ(1)); /* 15.2.8.3.13 */
- mrb_define_method(mrb, integer, "eql?", int_eql, MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
+ mrb_define_method(mrb, integer, "ceil", int_ceil, MRB_ARGS_OPT(1)); /* 15.2.8.3.14 */
+ mrb_define_method(mrb, integer, "floor", int_floor, MRB_ARGS_OPT(1)); /* 15.2.8.3.17 */
+ mrb_define_method(mrb, integer, "round", int_round, MRB_ARGS_OPT(1)); /* 15.2.8.3.20 */
+ mrb_define_method(mrb, integer, "truncate", int_truncate, MRB_ARGS_OPT(1)); /* 15.2.8.3.26 */
+ mrb_define_method(mrb, integer, "hash", int_hash, MRB_ARGS_NONE()); /* 15.2.8.3.18 */
 #ifndef MRB_NO_FLOAT
 mrb_define_method(mrb, integer, "to_f", int_to_f, MRB_ARGS_NONE()); /* 15.2.8.3.23 */
 #endif
 mrb_define_method(mrb, integer, "to_s", int_to_s, MRB_ARGS_OPT(1)); /* 15.2.8.3.25 */
 mrb_define_method(mrb, integer, "inspect", int_to_s, MRB_ARGS_OPT(1));
- mrb_define_method(mrb, integer, "divmod", int_divmod, MRB_ARGS_REQ(1)); /* 15.2.8.3.30 (x) */
+ mrb_define_method(mrb, integer, "divmod", int_divmod, MRB_ARGS_REQ(1)); /* 15.2.8.3.30(x) */
 mrb_define_method(mrb, integer, "__coerce_step_counter", coerce_step_counter, MRB_ARGS_REQ(2));
 
 /* Fixnum Class for compatibility */
@@ -1866,19 +2236,19 @@
 MRB_SET_INSTANCE_TT(fl, MRB_TT_FLOAT);
 mrb_undef_class_method(mrb, fl, "new");
 mrb_define_method(mrb, fl, "**", flo_pow, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, fl, "/", flo_div, MRB_ARGS_REQ(1)); /* 15.2.9.3.6 */
- mrb_define_method(mrb, fl, "quo", flo_div, MRB_ARGS_REQ(1)); /* 15.2.7.4.5 (x) */
+ mrb_define_method(mrb, fl, "/", flo_div, MRB_ARGS_REQ(1)); /* 15.2.9.3.6 */
+ mrb_define_method(mrb, fl, "quo", flo_div, MRB_ARGS_REQ(1)); /* 15.2.7.4.5(x) */
 mrb_define_method(mrb, fl, "div", flo_idiv, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, fl, "+", flo_add, MRB_ARGS_REQ(1)); /* 15.2.9.3.3 */
- mrb_define_method(mrb, fl, "-", flo_sub, MRB_ARGS_REQ(1)); /* 15.2.9.3.4 */
- mrb_define_method(mrb, fl, "*", flo_mul, MRB_ARGS_REQ(1)); /* 15.2.9.3.5 */
- mrb_define_method(mrb, fl, "%", flo_mod, MRB_ARGS_REQ(1)); /* 15.2.9.3.7 */
- mrb_define_method(mrb, fl, "<=>", num_cmp, MRB_ARGS_REQ(1)); /* 15.2.9.3.1 */
+ mrb_define_method(mrb, fl, "+", flo_add, MRB_ARGS_REQ(1)); /* 15.2.9.3.3 */
+ mrb_define_method(mrb, fl, "-", flo_sub, MRB_ARGS_REQ(1)); /* 15.2.9.3.4 */
+ mrb_define_method(mrb, fl, "*", flo_mul, MRB_ARGS_REQ(1)); /* 15.2.9.3.5 */
+ mrb_define_method(mrb, fl, "%", flo_mod, MRB_ARGS_REQ(1)); /* 15.2.9.3.7 */
+ mrb_define_method(mrb, fl, "<=>", num_cmp, MRB_ARGS_REQ(1)); /* 15.2.9.3.1 */
 mrb_define_method(mrb, fl, "<", num_lt, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, fl, "<=", num_le, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, fl, ">", num_gt, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, fl, ">=", num_ge, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, fl, "==", flo_eq, MRB_ARGS_REQ(1)); /* 15.2.9.3.2 */
+ mrb_define_method(mrb, fl, "==", flo_eq, MRB_ARGS_REQ(1)); /* 15.2.9.3.2 */
 mrb_define_method(mrb, fl, "~", flo_rev, MRB_ARGS_NONE());
 mrb_define_method(mrb, fl, "&", flo_and, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, fl, "|", flo_or, MRB_ARGS_REQ(1));
@@ -1894,12 +2264,12 @@
 mrb_define_method(mrb, fl, "to_i", flo_to_i, MRB_ARGS_NONE()); /* 15.2.9.3.14 */
 mrb_define_method(mrb, fl, "truncate", flo_truncate, MRB_ARGS_OPT(1)); /* 15.2.9.3.15 */
 mrb_define_method(mrb, fl, "divmod", flo_divmod, MRB_ARGS_REQ(1));
- mrb_define_method(mrb, fl, "eql?", flo_eql, MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
 
 mrb_define_method(mrb, fl, "to_s", flo_to_s, MRB_ARGS_NONE()); /* 15.2.9.3.16(x) */
 mrb_define_method(mrb, fl, "inspect", flo_to_s, MRB_ARGS_NONE());
 mrb_define_method(mrb, fl, "nan?", flo_nan_p, MRB_ARGS_NONE());
 mrb_define_method(mrb, fl, "abs", flo_abs, MRB_ARGS_NONE()); /* 15.2.7.4.3 */
+ mrb_define_method(mrb, fl, "hash", flo_hash, MRB_ARGS_NONE());
 
 #ifdef INFINITY
 mrb_define_const_id(mrb, fl, MRB_SYM(INFINITY), mrb_float_value(mrb, INFINITY));

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/numops.c Added

@@ -0,0 +1,112 @@
+/*
+** numeric.c - Numeric, Integer, Float class
+**
+** See Copyright Notice in mruby.h
+*/
+
+#include <mruby.h>
+#include <mruby/numeric.h>
+#include <mruby/internal.h>
+#include <mruby/presym.h>
+
+MRB_API mrb_value
+mrb_num_add(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_add(mrb, x, y);
+ }
+#endif
+ if (mrb_integer_p(x)) {
+ return mrb_int_add(mrb, x, y);
+ }
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(x)) {
+ return mrb_float_value(mrb, mrb_float(x) + mrb_as_float(mrb, y));
+ }
+#endif
+#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+ switch (mrb_type(x)) {
+#if defined(MRB_USE_RATIONAL)
+ case MRB_TT_RATIONAL:
+ return mrb_rational_add(mrb, x, y);
+#endif
+#if defined(MRB_USE_COMPLEX)
+ case MRB_TT_COMPLEX:
+ return mrb_complex_add(mrb, x, y);
+#endif
+ default:
+ break;
+ }
+#endif
+ mrb_raise(mrb, E_TYPE_ERROR, "no number addition");
+ return mrb_nil_value(); /* not reached */
+}
+
+MRB_API mrb_value
+mrb_num_sub(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_sub(mrb, x, y);
+ }
+#endif
+ if (mrb_integer_p(x)) {
+ return mrb_int_sub(mrb, x, y);
+ }
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(x)) {
+ return mrb_float_value(mrb, mrb_float(x) - mrb_as_float(mrb, y));
+ }
+#endif
+#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+ switch (mrb_type(x)) {
+#if defined(MRB_USE_RATIONAL)
+ case MRB_TT_RATIONAL:
+ return mrb_rational_sub(mrb, x, y);
+#endif
+#if defined(MRB_USE_COMPLEX)
+ case MRB_TT_COMPLEX:
+ return mrb_complex_sub(mrb, x, y);
+#endif
+ default:
+ break;
+ }
+#endif
+ mrb_raise(mrb, E_TYPE_ERROR, "no number subtraction");
+ return mrb_nil_value(); /* not reached */
+}
+
+MRB_API mrb_value
+mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(x)) {
+ return mrb_bint_mul(mrb, x, y);
+ }
+#endif
+ if (mrb_integer_p(x)) {
+ return mrb_int_mul(mrb, x, y);
+ }
+#ifndef MRB_NO_FLOAT
+ if (mrb_float_p(x)) {
+ return mrb_float_value(mrb, mrb_float(x) * mrb_as_float(mrb, y));
+ }
+#endif
+#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+ switch (mrb_type(x)) {
+#if defined(MRB_USE_RATIONAL)
+ case MRB_TT_RATIONAL:
+ return mrb_rational_mul(mrb, x, y);
+#endif
+#if defined(MRB_USE_COMPLEX)
+ case MRB_TT_COMPLEX:
+ return mrb_complex_mul(mrb, x, y);
+#endif
+ default:
+ break;
+ }
+#endif
+ mrb_raise(mrb, E_TYPE_ERROR, "no number multiply");
+ return mrb_nil_value(); /* not reached */
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/object.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/object.c Changed

@@ -9,6 +9,7 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 MRB_API mrb_bool
@@ -57,13 +58,23 @@
 if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE;
 #ifndef MRB_NO_FLOAT
 /* value mixing with integer and float */
- if (mrb_integer_p(obj1)) {
- if (mrb_float_p(obj2) && (mrb_float)mrb_integer(obj1) == mrb_float(obj2))
+ if (mrb_integer_p(obj1) && mrb_float_p(obj2)) {
+ if ((mrb_float)mrb_integer(obj1) == mrb_float(obj2))
 return TRUE;
+ return FALSE;
 }
- else if (mrb_float_p(obj1)) {
- if (mrb_integer_p(obj2) && mrb_float(obj1) == (mrb_float)mrb_integer(obj2))
+ else if (mrb_float_p(obj1) && mrb_integer_p(obj2)) {
+ if (mrb_float(obj1) == (mrb_float)mrb_integer(obj2))
 return TRUE;
+ return FALSE;
+ }
+#endif
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(obj1) &&
+ (mrb_integer_p(obj2) || mrb_bigint_p(obj2) || mrb_float_p(obj2))) {
+ if (mrb_bint_cmp(mrb, obj1, obj2) == 0)
+ return TRUE;
+ return FALSE;
 }
 #endif
 result = mrb_funcall_id(mrb, obj1, MRB_OPSYM(eq), 1, obj2);
@@ -368,7 +379,7 @@
 {
 mrb_value v;
 
- if (mrb_type(val) == type && type != MRB_TT_DATA && type != MRB_TT_ISTRUCT) return val;
+ if (mrb_type(val) == type && type != MRB_TT_CDATA && type != MRB_TT_ISTRUCT) return val;
 v = convert_type(mrb, val, type_name(type), method, FALSE);
 if (mrb_nil_p(v) || mrb_type(v) != type) return mrb_nil_value();
 return v;
@@ -496,7 +507,7 @@
 #endif
 
 MRB_API mrb_value
-mrb_ensure_int_type(mrb_state *mrb, mrb_value val)
+mrb_ensure_integer_type(mrb_state *mrb, mrb_value val)
 {
 if (!mrb_integer_p(val)) {
 #ifndef MRB_NO_FLOAT
@@ -505,6 +516,10 @@
 }
 else {
 switch (mrb_type(val)) {
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ return val;
+#endif
 #ifdef MRB_USE_RATIONAL
 case MRB_TT_RATIONAL:
 return mrb_rational_to_i(mrb, val);
@@ -523,6 +538,18 @@
 return val;
 }
 
+MRB_API mrb_value
+mrb_ensure_int_type(mrb_state *mrb, mrb_value val)
+{
+ val = mrb_ensure_integer_type(mrb, val);
+#ifdef MRB_USE_BIGINT
+ if (mrb_bigint_p(val)) {
+ return mrb_int_value(mrb, mrb_bint_as_int(mrb, val));
+ }
+#endif
+ return val;
+}
+
 #ifndef MRB_NO_FLOAT
 MRB_API mrb_value
 mrb_ensure_float_type(mrb_state *mrb, mrb_value val)
@@ -547,6 +574,11 @@
 return mrb_complex_to_f(mrb, val);
 #endif
 
+#ifdef MRB_USE_BIGINT
+ case MRB_TT_BIGINT:
+ return mrb_float_value(mrb, mrb_bint_as_float(mrb, val));
+#endif
+
 default:
 mrb_raisef(mrb, E_TYPE_ERROR, "%Y cannot be converted to Float", val);
 /* not reached */
@@ -606,7 +638,11 @@
 MRB_API mrb_value
 mrb_inspect(mrb_state *mrb, mrb_value obj)
 {
- return mrb_obj_as_string(mrb, mrb_funcall_id(mrb, obj, MRB_SYM(inspect), 0));
+ mrb_value v = mrb_funcall_id(mrb, obj, MRB_SYM(inspect), 0);
+ if (!mrb_string_p(v)) {
+ v = mrb_obj_as_string(mrb, obj);
+ }
+ return v;
 }
 
 MRB_API mrb_bool

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/print.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/print.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/proc.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/proc.c Changed

@@ -9,9 +9,10 @@
 #include <mruby/proc.h>
 #include <mruby/opcode.h>
 #include <mruby/data.h>
-#include <mruby/presym.h>
 #include <mruby/array.h>
 #include <mruby/hash.h>
+#include <mruby/internal.h>
+#include <mruby/presym.h>
 
 static const mrb_code call_iseq = {
 OP_CALL,
@@ -51,15 +52,7 @@
 struct RClass *tc = NULL;
 
 if (ci->proc) {
- if (ci->proc->color != MRB_GC_RED) {
- tc = MRB_PROC_TARGET_CLASS(ci->proc);
- }
- else {
- tc = mrb_vm_ci_target_class(ci);
- if (tc && tc->tt == MRB_TT_ICLASS) {
- tc = tc->c;
- }
- }
+ tc = MRB_PROC_TARGET_CLASS(ci->proc);
 }
 if (tc == NULL) {
 tc = mrb_vm_ci_target_class(ci);
@@ -161,12 +154,12 @@
 MRB_ENV_SET_LEN(e, argc);
 
 if (argv) {
- for (i = 0; i < argc; ++i) {
+ for (i = 0; i < argc; i++) {
 e->stacki = argvi;
 }
 }
 else {
- for (i = 0; i < argc; ++i) {
+ for (i = 0; i < argc; i++) {
 SET_NIL_VALUE(e->stacki);
 }
 }
@@ -237,14 +230,20 @@
 return proc;
 }
 
+static void
+check_proc(mrb_state *mrb, mrb_value proc)
+{
+ if (!mrb_proc_p(proc)) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
+ }
+}
+
 static mrb_value
 mrb_proc_init_copy(mrb_state *mrb, mrb_value self)
 {
 mrb_value proc = mrb_get_arg1(mrb);
 
- if (!mrb_proc_p(proc)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
- }
+ check_proc(mrb, proc);
 mrb_proc_copy(mrb, mrb_proc_ptr(self), mrb_proc_ptr(proc));
 return self;
 }
@@ -275,9 +274,7 @@
 if (mrb_nil_p(blk)) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Proc object without a block");
 }
- if (!mrb_proc_p(blk)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
- }
+ check_proc(mrb, blk);
 p = mrb_proc_ptr(blk);
 if (!MRB_PROC_STRICT_P(p)) {
 struct RProc *p2 = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, p->c);
@@ -337,7 +334,7 @@
 if (MRB_PROC_CFUNC_P(proc)) break;
 irep = proc->body.irep;
 if (irep->lv) {
- for (i = 0; i + 1 < irep->nlocals; ++i) {
+ for (i = 0; i + 1 < irep->nlocals; i++) {
 if (irep->lvi) {
 mrb_sym sym = irep->lvi;
 const char *name = mrb_sym_name(mrb, sym);

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/range.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/range.c Changed

@@ -362,9 +362,13 @@
 mrb_int len;
 
 if (mrb_int_sub_overflow(b, a, &len)) {
+ too_long:
 mrb_raise(mrb, E_RANGE_ERROR, "integer range too long");
 }
- if (!RANGE_EXCL(r)) len++;
+ if (!RANGE_EXCL(r)) {
+ if (len == MRB_INT_MAX) goto too_long;
+ len++;
+ }
 ary = mrb_ary_new_capa(mrb, len);
 for (mrb_int i=0; i<len; i++) {
 mrb_ary_push(mrb, ary, mrb_int_value(mrb, a+i));
@@ -403,17 +407,17 @@
 mrb_value result;
 result = mrb_ary_new(mrb);
 
- for (i = 0; i < argc; ++i) {
+ for (i = 0; i < argc; i++) {
 if (mrb_integer_p(argvi)) {
 mrb_ary_push(mrb, result, func(mrb, obj, mrb_integer(argvi)));
 }
 else if (mrb_range_beg_len(mrb, argvi, &beg, &len, olen, FALSE) == MRB_RANGE_OK) {
 mrb_int const end = olen < beg + len ? olen : beg + len;
- for (j = beg; j < end; ++j) {
+ for (j = beg; j < end; j++) {
 mrb_ary_push(mrb, result, func(mrb, obj, j));
 }
 
- for (; j < beg + len; ++j) {
+ for (; j < beg + len; j++) {
 mrb_ary_push(mrb, result, mrb_nil_value());
 }
 }

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/readfloat.c Added

@@ -0,0 +1,120 @@
+#include <mruby.h>
+
+#ifndef MRB_NO_FLOAT
+/*
+ * strtod implementation.
+ * author: Yasuhiro Matsumoto (@mattn)
+ * license: public domain
+ */
+
+/*
+The original code can be found in https://github.com/mattn/strtod
+
+I modified the routine for mruby:
+
+ * renamed the function `vim_strtod` -> `mrb_read_float`
+ * simplified the code
+ * changed the API
+
+My modifications in this file are also placed in the public domain.
+
+Matz (Yukihiro Matsumoto)
+*/
+
+#include <string.h>
+#include <math.h>
+
+MRB_API mrb_bool
+mrb_read_float(const char *str, char **endp, double *fp)
+{
+ double d = 0.0;
+ int sign;
+ int n = 0;
+ const char *p, *a;
+
+ a = p = str;
+ while (ISSPACE(*p))
+ p++;
+
+ /* decimal part */
+ sign = 1;
+ if (*p == '-') {
+ sign = -1;
+ p++;
+ }
+ else if (*p == '+')
+ p++;
+ if (ISDIGIT(*p)) {
+ d = (double)(*p++ - '0');
+ while (*p && ISDIGIT(*p)) {
+ d = d * 10.0 + (double)(*p - '0');
+ p++;
+ n++;
+ }
+ a = p;
+ }
+ else if (*p != '.')
+ goto done;
+ d *= sign;
+
+ /* fraction part */
+ if (*p == '.') {
+ double f = 0.0;
+ double base = 0.1;
+ p++;
+
+ if (ISDIGIT(*p)) {
+ while (*p && ISDIGIT(*p)) {
+ f += base * (*p - '0') ;
+ base /= 10.0;
+ p++;
+ n++;
+ }
+ }
+ d += f * sign;
+ a = p;
+ }
+
+ /* exponential part */
+ if ((*p == 'E') || (*p == 'e')) {
+ int e = 0;
+
+ p++;
+ sign = 1;
+ if (*p == '-') {
+ sign = -1;
+ p++;
+ }
+ else if (*p == '+')
+ p++;
+
+ if (ISDIGIT(*p)) {
+ while (*p == '0')
+ p++;
+ if (*p == '\0') --p;
+ e = (int)(*p++ - '0');
+ for (; *p && ISDIGIT(*p); p++) {
+ if (e < 10000)
+ e = e * 10 + (*p - '0');
+ }
+ e *= sign;
+ }
+ else if (!ISDIGIT(*(a-1))) {
+ return FALSE;
+ }
+ else if (*p == 0)
+ goto done;
+ d *= pow(10.0, (double)e);
+ a = p;
+ }
+ else if (p > str && !ISDIGIT(*(p-1))) {
+ goto done;
+ }
+
+done:
+ *fp = d;
+ if (endp) *endp = (char*)a;
+ if (str == a) return FALSE;
+ return TRUE;
+}
+#endif

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/readint.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/readint.c Changed

@@ -1,16 +1,15 @@
 #include <mruby.h>
 #include <mruby/numeric.h>
-#include <errno.h>
 
-/* mrb_int_read(): read mrb_int from a string (base 10 only) */
+/* mrb_read_int(): read mrb_int from a string (base 10 only) */
 /* const char *p - string to read */
 /* const char *e - end of string */
 /* char **endp - end of parsed integer */
-
-/* if integer overflows, errno will be set to ERANGE */
-/* also endp will be set to NULL on overflow */
-MRB_API mrb_int
-mrb_int_read(const char *p, const char *e, char **endp)
+/* mrb_int *np - variable to save the result */
+/* returns TRUE if read succeeded */
+/* if integer overflows, returns FALSE */
+MRB_API mrb_bool
+mrb_read_int(const char *p, const char *e, char **endp, mrb_int *np)
 {
 mrb_int n = 0;
 int ch;
@@ -19,12 +18,11 @@
 ch = *p - '0';
 if (mrb_int_mul_overflow(n, 10, &n) ||
 mrb_int_add_overflow(n, ch, &n)) {
- if (endp) *endp = NULL;
- errno = ERANGE;
- return MRB_INT_MAX;
+ return FALSE;
 }
 p++;
 }
 if (endp) *endp = (char*)p;
- return n;
+ *np = n;
+ return TRUE;
 }

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/readnum.c Added

@@ -0,0 +1,43 @@
+/* this file defines obsolete functions: mrb_int_read() and mrb_float_read() */
+/* use mrb_read_int() and mrb_read_float() instead */
+
+#include <mruby.h>
+#include <mruby/numeric.h>
+#include <errno.h>
+
+/* mrb_int_read(): read mrb_int from a string (base 10 only) */
+/* const char *p - string to read */
+/* const char *e - end of string */
+/* char **endp - end of parsed integer */
+
+/* if integer overflows, errno will be set to ERANGE */
+/* also endp will be set to NULL on overflow */
+MRB_API mrb_int
+mrb_int_read(const char *p, const char *e, char **endp)
+{
+ mrb_int n;
+
+ if (!mrb_read_int(p, e, endp, &n)) {
+ if (endp) *endp = NULL;
+ errno = ERANGE;
+ return MRB_INT_MAX;
+ }
+ if (endp) *endp = (char*)p;
+ return n;
+}
+
+#ifndef MRB_NO_FLOAT
+//#include <string.h>
+//#include <math.h>
+
+MRB_API double
+mrb_float_read(const char *str, char **endp)
+{
+ double d;
+
+ if (!mrb_read_float(str, endp, &d)) {
+ errno = ERANGE;
+ }
+ return d;
+}
+#endif

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/state.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/state.c Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/string.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/string.c Changed

@@ -14,12 +14,13 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/numeric.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 #include <string.h>
 
 typedef struct mrb_shared_string {
 int refcnt;
- mrb_ssize capa;
+ mrb_int capa;
 char *ptr;
 } mrb_shared_string;
 
@@ -27,29 +28,48 @@
 
 #define mrb_obj_alloc_string(mrb) MRB_OBJ_ALLOC((mrb), MRB_TT_STRING, (mrb)->string_class)
 
+#ifndef MRB_STR_LENGTH_MAX
+#define MRB_STR_LENGTH_MAX 1048576
+#endif
+
+static void
+str_check_too_big(mrb_state *mrb, mrb_int len)
+{
+ if (len < 0) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "BUG negative string length");
+ }
+#if MRB_STR_LENGTH_MAX != 0
+ if (len > MRB_STR_LENGTH_MAX-1) {
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "string too long (len=%i max=" MRB_STRINGIZE(MRB_STR_LENGTH_MAX) ")", len);
+ }
+#endif
+}
+
 static struct RString*
 str_init_normal_capa(mrb_state *mrb, struct RString *s,
- const char *p, size_t len, size_t capa)
+ const char *p, mrb_int len, mrb_int capa)
 {
+ str_check_too_big(mrb, capa);
 char *dst = (char *)mrb_malloc(mrb, capa + 1);
 if (p) memcpy(dst, p, len);
 dstlen = '\0';
 s->as.heap.ptr = dst;
- s->as.heap.len = (mrb_ssize)len;
- s->as.heap.aux.capa = (mrb_ssize)capa;
+ s->as.heap.len = len;
+ s->as.heap.aux.capa = capa;
 RSTR_UNSET_TYPE_FLAG(s);
 return s;
 }
 
 static struct RString*
-str_init_normal(mrb_state *mrb, struct RString *s, const char *p, size_t len)
+str_init_normal(mrb_state *mrb, struct RString *s, const char *p, mrb_int len)
 {
 return str_init_normal_capa(mrb, s, p, len, len);
 }
 
 static struct RString*
-str_init_embed(struct RString *s, const char *p, size_t len)
+str_init_embed(struct RString *s, const char *p, mrb_int len)
 {
+ mrb_assert(len >= 0);
 if (p) memcpy(RSTR_EMBED_PTR(s), p, len);
 RSTR_EMBED_PTR(s)len = '\0';
 RSTR_SET_TYPE_FLAG(s, EMBED);
@@ -58,10 +78,10 @@
 }
 
 static struct RString*
-str_init_nofree(struct RString *s, const char *p, size_t len)
+str_init_nofree(struct RString *s, const char *p, mrb_int len)
 {
 s->as.heap.ptr = (char *)p;
- s->as.heap.len = (mrb_ssize)len;
+ s->as.heap.len = len;
 s->as.heap.aux.capa = 0; /* nofree */
 RSTR_SET_TYPE_FLAG(s, NOFREE);
 return s;
@@ -97,37 +117,29 @@
 }
 
 static struct RString*
-str_init_modifiable(mrb_state *mrb, struct RString *s, const char *p, size_t len)
+str_init_modifiable(mrb_state *mrb, struct RString *s, const char *p, mrb_int len)
 {
 if (RSTR_EMBEDDABLE_P(len)) {
 return str_init_embed(s, p, len);
 }
- else {
- return str_init_normal(mrb, s, p, len);
- }
+ return str_init_normal(mrb, s, p, len);
 }
 
 static struct RString*
-str_new_static(mrb_state *mrb, const char *p, size_t len)
+str_new_static(mrb_state *mrb, const char *p, mrb_int len)
 {
 if (RSTR_EMBEDDABLE_P(len)) {
 return str_init_embed(mrb_obj_alloc_string(mrb), p, len);
 }
- if (len >= MRB_SSIZE_MAX) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
- }
 return str_init_nofree(mrb_obj_alloc_string(mrb), p, len);
 }
 
 static struct RString*
-str_new(mrb_state *mrb, const char *p, size_t len)
+str_new(mrb_state *mrb, const char *p, mrb_int len)
 {
 if (RSTR_EMBEDDABLE_P(len)) {
 return str_init_embed(mrb_obj_alloc_string(mrb), p, len);
 }
- if (len >= MRB_SSIZE_MAX) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
- }
 if (p && mrb_ro_data_p(p)) {
 return str_init_nofree(mrb_obj_alloc_string(mrb), p, len);
 }
@@ -135,44 +147,36 @@
 }
 
 MRB_API mrb_value
-mrb_str_new_capa(mrb_state *mrb, size_t capa)
+mrb_str_new_capa(mrb_state *mrb, mrb_int capa)
 {
- struct RString *s;
+ struct RString *s = mrb_obj_alloc_string(mrb);
 
 if (RSTR_EMBEDDABLE_P(capa)) {
- s = str_init_embed(mrb_obj_alloc_string(mrb), NULL, 0);
- }
- else if (capa >= MRB_SSIZE_MAX) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "string capacity size too big");
- /* not reached */
- s = NULL;
+ s = str_init_embed(s, NULL, 0);
 }
 else {
- s = str_init_normal_capa(mrb, mrb_obj_alloc_string(mrb), NULL, 0, capa);
+ s = str_init_normal_capa(mrb, s, NULL, 0, capa);
 }
-
 return mrb_obj_value(s);
 }
 
 static void
-resize_capa(mrb_state *mrb, struct RString *s, size_t capacity)
+resize_capa(mrb_state *mrb, struct RString *s, mrb_int capacity)
 {
-#if SIZE_MAX > MRB_SSIZE_MAX
- mrb_assert(capacity < MRB_SSIZE_MAX);
-#endif
 if (RSTR_EMBED_P(s)) {
 if (!RSTR_EMBEDDABLE_P(capacity)) {
 str_init_normal_capa(mrb, s, RSTR_EMBED_PTR(s), RSTR_EMBED_LEN(s), capacity);
 }
 }
 else {
+ str_check_too_big(mrb, capacity);
 s->as.heap.ptr = (char*)mrb_realloc(mrb, RSTR_PTR(s), capacity+1);
 s->as.heap.aux.capa = (mrb_ssize)capacity;
 }
 }
 
 MRB_API mrb_value
-mrb_str_new(mrb_state *mrb, const char *p, size_t len)
+mrb_str_new(mrb_state *mrb, const char *p, mrb_int len)
 {
 return mrb_obj_value(str_new(mrb, p, len));
 }
@@ -181,7 +185,7 @@
 mrb_str_new_cstr(mrb_state *mrb, const char *p)
 {
 struct RString *s;
- size_t len;
+ mrb_int len;
 
 if (p) {
 len = strlen(p);
@@ -196,7 +200,7 @@
 }
 
 MRB_API mrb_value
-mrb_str_new_static(mrb_state *mrb, const char *p, size_t len)
+mrb_str_new_static(mrb_state *mrb, const char *p, mrb_int len)
 {
 struct RString *s = str_new_static(mrb, p, len);
 return mrb_obj_value(s);
@@ -225,20 +229,19 @@
 mrb_free(mrb, shared);
 }
 else {
- str_init_modifiable(mrb, s, s->as.heap.ptr, (size_t)s->as.heap.len);
+ str_init_modifiable(mrb, s, s->as.heap.ptr, s->as.heap.len);
 str_decref(mrb, shared);
 }
 }
 else if (RSTR_NOFREE_P(s) || RSTR_FSHARED_P(s)) {
- str_init_modifiable(mrb, s, s->as.heap.ptr, (size_t)s->as.heap.len);
+ str_init_modifiable(mrb, s, s->as.heap.ptr, s->as.heap.len);
 }
 }
 
 static void
-check_null_byte(mrb_state *mrb, mrb_value str)
+check_null_byte(mrb_state *mrb, struct RString *str)
 {
- mrb_ensure_string_type(mrb, str);
- if (memchr(RSTRING_PTR(str), '\0', RSTRING_LEN(str))) {
+ if (memchr(RSTR_PTR(str), '\0', RSTR_LEN(str))) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
 }
 }
@@ -255,33 +258,29 @@
 }
 
 #ifdef MRB_UTF8_STRING
-static const char utf8len_codepage256 =
-{
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,
-};
-
 #define utf8_islead(c) ((unsigned char)((c)&0xc0) != 0x80)
 
+extern const char mrb_utf8len_table;
+const char mrb_utf8len_table = {
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 3, 3, 4, 0
+};
+
 mrb_int
 mrb_utf8len(const char* p, const char* e)
 {
- mrb_int len;
- mrb_int i;
-
- if ((unsigned char)*p < 0x80) return 1;
- len = utf8len_codepage(unsigned char)*p;
- if (len == 1) return 1;
+ mrb_int len = mrb_utf8len_table(unsigned char)p0 >> 3;
 if (len > e - p) return 1;
- for (i = 1; i < len; ++i)
- if (utf8_islead(pi))
- return 1;
+ switch (len) {
+ case 1:
+ return 1;
+ case 4:
+ if (utf8_islead(p3)) return 1;
+ case 3:
+ if (utf8_islead(p2)) return 1;
+ case 2:
+ if (utf8_islead(p1)) return 1;
+ }
 return len;
 }
 
@@ -291,10 +290,9 @@
 mrb_int len = 0;
 const char *p = str;
 const char *e = p + byte_len;
-
 while (p < e) {
- p += mrb_utf8len(p, e);
- len++;
+ if (utf8_islead(*p)) len++;
+ p++;
 }
 return len;
 }
@@ -346,60 +344,32 @@
 const char *pivot = p + bi;
 mrb_int i;
 
- for (i = 0; p < pivot; i ++) {
+ for (i = 0; p < pivot; i++) {
 p += mrb_utf8len(p, e);
 }
 if (p != pivot) return -1;
 return i;
 }
 
-static const char *
+static const char*
 char_adjust(const char *beg, const char *end, const char *ptr)
 {
- if ((ptr > beg || ptr < end) && (*ptr & 0xc0) == 0x80) {
- const int utf8_adjust_max = 3;
- const char *p;
-
- if (ptr - beg > utf8_adjust_max) {
- beg = ptr - utf8_adjust_max;
- }
-
- p = ptr;
- while (p > beg) {
- p --;
- if ((*p & 0xc0) != 0x80) {
- int clen = mrb_utf8len(p, end);
- if (clen > ptr - p) return p;
- break;
- }
- }
- }
-
+ ptrdiff_t len = end - ptr;
+ if (len < 1 || utf8_islead(ptr0)) return ptr;
+ if (len > 1 && utf8_islead(ptr1)) return ptr+1;
+ if (len > 2 && utf8_islead(ptr2)) return ptr+2;
+ if (len > 3 && utf8_islead(ptr3)) return ptr+3;
 return ptr;
 }
 
-static const char *
+static const char*
 char_backtrack(const char *ptr, const char *end)
 {
- if (ptr < end) {
- const int utf8_bytelen_max = 4;
- const char *p;
-
- if (end - ptr > utf8_bytelen_max) {
- ptr = end - utf8_bytelen_max;
- }
-
- p = end;
- while (p > ptr) {
- p --;
- if ((*p & 0xc0) != 0x80) {
- int clen = utf8len_codepage(unsigned char)*p;
- if (clen == end - p) { return p; }
- break;
- }
- }
- }
-
+ ptrdiff_t len = end - ptr;
+ if (len < 1 || utf8_islead(end-1)) return end-1;
+ if (len > 1 && utf8_islead(end-2)) return end-2;
+ if (len > 2 && utf8_islead(end-3)) return end-3;
+ if (len > 3 && utf8_islead(end-4)) return end-4;
 return end - 1;
 }
 
@@ -414,10 +384,10 @@
 {
 mrb_int i;
 
- for (i = 0; i < 1 << CHAR_BIT; i ++) {
+ for (i = 0; i < 1 << CHAR_BIT; i++) {
 qstablei = slen;
 }
- for (i = 0; i < slen; i ++) {
+ for (i = 0; i < slen; i++) {
 qstable(unsigned char)si = slen - (i + 1);
 }
 }
@@ -435,7 +405,7 @@
 
 do {
 p += mrb_utf8len(p, pend);
- off ++;
+ off++;
 } while (p < pivot);
 }
 
@@ -500,9 +470,9 @@
 ptrdiff_t qstable256;
 
 /* Preprocessing */
- for (i = 0; i < 256; ++i)
+ for (i = 0; i < 256; i++)
 qstablei = m + 1;
- for (; x < xe; ++x)
+ for (; x < xe; x++)
 qstable*x = xe - x;
 /* Searching */
 for (; y + m <= ys + n; y += *(qstable + ym)) {
@@ -687,23 +657,25 @@
 static mrb_int
 str_rindex(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int pos)
 {
- const char *s, *sbeg, *t;
+ const char *s, *sbeg, *send, *t;
 struct RString *ps = mrb_str_ptr(str);
 mrb_int len = RSTRING_LEN(sub);
+ mrb_int slen = RSTR_LEN(ps);
 
 /* substring longer than string */
- if (RSTR_LEN(ps) < len) return -1;
- if (RSTR_LEN(ps) - pos < len) {
- pos = RSTR_LEN(ps) - len;
+ if (slen < len) return -1;
+ if (slen - pos < len) {
+ pos = slen - len;
 }
 sbeg = RSTR_PTR(ps);
- s = RSTR_PTR(ps) + pos;
+ send = sbeg + slen;
+ s = sbeg + pos;
 t = RSTRING_PTR(sub);
 if (len) {
- s = char_adjust(sbeg, sbeg + RSTR_LEN(ps), s);
+ s = char_adjust(sbeg, send, s);
 while (sbeg <= s) {
- if (memcmp(s, t, len) == 0) {
- return (mrb_int)(s - RSTR_PTR(ps));
+ if ((mrb_int)(send - s) >= len && memcmp(s, t, len) == 0) {
+ return (mrb_int)(s - sbeg);
 }
 s = char_backtrack(sbeg, s);
 }
@@ -714,21 +686,6 @@
 }
 }
 
-MRB_API mrb_int
-mrb_str_strlen(mrb_state *mrb, struct RString *s)
-{
- mrb_int i, max = RSTR_LEN(s);
- char *p = RSTR_PTR(s);
-
- if (!p) return 0;
- for (i=0; i<max; i++) {
- if (pi == '\0') {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
- }
- }
- return max;
-}
-
 #ifdef _WIN32
 #include <windows.h>
 
@@ -833,14 +790,9 @@
 struct RString *s;
 
 const char *p = RSTRING_PTR(str0);
- size_t len = RSTRING_LEN(str0);
- check_null_byte(mrb, str0);
- if (RSTR_EMBEDDABLE_P(len)) {
- s = str_init_embed(mrb_obj_alloc_string(mrb), p, len);
- }
- else {
- s = str_init_normal(mrb, mrb_obj_alloc_string(mrb), p, len);
- }
+ mrb_int len = RSTRING_LEN(str0);
+ check_null_byte(mrb, RSTRING(str0));
+ s = str_init_modifiable(mrb, mrb_obj_alloc_string(mrb), p, len);
 return RSTR_PTR(s);
 }
 
@@ -857,10 +809,15 @@
 struct RString *s = mrb_str_ptr(a);
 struct RString *s2 = mrb_str_ptr(b);
 struct RString *t;
+ mrb_int slen = RSTR_LEN(s);
+ mrb_int s2len = RSTR_LEN(s2);
+ const char *p = RSTR_PTR(s);
+ const char *p2 = RSTR_PTR(s2);
 
- t = str_new(mrb, 0, RSTR_LEN(s) + RSTR_LEN(s2));
- memcpy(RSTR_PTR(t), RSTR_PTR(s), RSTR_LEN(s));
- memcpy(RSTR_PTR(t) + RSTR_LEN(s), RSTR_PTR(s2), RSTR_LEN(s2));
+ t = str_new(mrb, 0, slen + s2len);
+ char *pt = RSTR_PTR(t);
+ memcpy(pt, p, slen);
+ memcpy(pt + slen, p2, s2len);
 
 return mrb_obj_value(t);
 }
@@ -920,7 +877,7 @@
 static mrb_value
 mrb_str_times(mrb_state *mrb, mrb_value self)
 {
- mrb_int n,len,times;
+ mrb_int n, len, times;
 struct RString *str2;
 char *p;
 
@@ -928,11 +885,9 @@
 if (times < 0) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "negative argument");
 }
- if (times && MRB_SSIZE_MAX / times < RSTRING_LEN(self)) {
+ if (mrb_int_mul_overflow(RSTRING_LEN(self), times, &len)) {
 mrb_raise(mrb, E_ARGUMENT_ERROR, "argument too big");
 }
-
- len = RSTRING_LEN(self)*times;
 str2 = str_new(mrb, 0, len);
 p = RSTR_PTR(str2);
 if (len > 0) {
@@ -964,16 +919,18 @@
 MRB_API int
 mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2)
 {
- mrb_int len;
+ mrb_int len, len1, len2;
 mrb_int retval;
 struct RString *s1 = mrb_str_ptr(str1);
 struct RString *s2 = mrb_str_ptr(str2);
 
- len = lesser(RSTR_LEN(s1), RSTR_LEN(s2));
+ len1 = RSTR_LEN(s1);
+ len2 = RSTR_LEN(s2);
+ len = lesser(len1, len2);
 retval = memcmp(RSTR_PTR(s1), RSTR_PTR(s2), len);
 if (retval == 0) {
- if (RSTR_LEN(s1) == RSTR_LEN(s2)) return 0;
- if (RSTR_LEN(s1) > RSTR_LEN(s2)) return 1;
+ if (len1 == len2) return 0;
+ if (len1 > len2) return 1;
 return -1;
 }
 if (retval > 0) return 1;
@@ -1059,22 +1016,6 @@
 }
 /* ---------------------------------- */
 
-/* obslete: use RSTRING_PTR() */
-MRB_API const char*
-mrb_string_value_ptr(mrb_state *mrb, mrb_value str)
-{
- str = mrb_obj_as_string(mrb, str);
- return RSTRING_PTR(str);
-}
-
-/* obslete: use RSTRING_LEN() */
-MRB_API mrb_int
-mrb_string_value_len(mrb_state *mrb, mrb_value ptr)
-{
- mrb_ensure_string_type(mrb, ptr);
- return RSTRING_LEN(ptr);
-}
-
 MRB_API mrb_value
 mrb_str_dup(mrb_state *mrb, mrb_value str)
 {
@@ -1234,7 +1175,7 @@
 }
 
 replen = (mrb_nil_p(rep) ? 0 : RSTRING_LEN(rep));
- if (mrb_int_add_overflow(replen, len - (end - pos), &newlen) || newlen >= MRB_SSIZE_MAX) {
+ if (mrb_int_add_overflow(replen, len - (end - pos), &newlen)) {
 mrb_raise(mrb, E_RUNTIME_ERROR, "string size too big");
 }
 
@@ -1279,12 +1220,7 @@
 if (inspect) {
 mrb_int clen = mrb_utf8len(p, pend);
 if (clen > 1) {
- mrb_int i;
-
- for (i=0; i<clen; i++) {
- bufi = pi;
- }
- mrb_str_cat(mrb, result, buf, clen);
+ mrb_str_cat(mrb, result, p, clen);
 p += clen-1;
 ascii_flag = 0;
 continue;
@@ -1414,13 +1350,14 @@
 static mrb_value
 mrb_str_capitalize_bang(mrb_state *mrb, mrb_value str)
 {
- char *p, *pend;
 mrb_bool modify = FALSE;
 struct RString *s = mrb_str_ptr(str);
+ mrb_int len = RSTR_LEN(s);
 
 mrb_str_modify_keep_ascii(mrb, s);
- if (RSTR_LEN(s) == 0 || !RSTR_PTR(s)) return mrb_nil_value();
- p = RSTR_PTR(s); pend = RSTR_PTR(s) + RSTR_LEN(s);
+ char *p = RSTR_PTR(s);
+ char *pend = RSTR_PTR(s) + len;
+ if (len == 0 || p == NULL) return mrb_nil_value();
 if (ISLOWER(*p)) {
 *p = TOUPPER(*p);
 modify = TRUE;
@@ -1724,22 +1661,19 @@
 
 /*
 * 32 bit magic FNV-0 and FNV-1 prime
- */
+b */
 #define FNV_32_PRIME ((uint32_t)0x01000193)
 #define FNV1_32_INIT ((uint32_t)0x811c9dc5)
 
 uint32_t
-mrb_str_hash(mrb_state *mrb, mrb_value str)
+mrb_byte_hash_step(const uint8_t *s, mrb_int len, uint32_t hval)
 {
- struct RString *s = mrb_str_ptr(str);
- const unsigned char *bp = (unsigned char*)RSTR_PTR(s); /* start of buffer */
- const unsigned char *be = bp + RSTR_LEN(s); /* beyond end of buffer */
- uint32_t hval = FNV1_32_INIT;
+ const uint8_t *send = s + len;
 
 /*
 * FNV-1 hash each octet in the buffer
 */
- while (bp < be) {
+ while (s < send) {
 /* multiply by the 32 bit FNV magic prime mod 2^32 */
 #if defined(NO_FNV_GCC_OPTIMIZATION)
 hval *= FNV_32_PRIME;
@@ -1748,13 +1682,26 @@
 #endif
 
 /* xor the bottom with the current octet */
- hval ^= (uint32_t)*bp++;
+ hval ^= (uint32_t)*s++;
 }
 
 /* return our new hash value */
 return hval;
 }
 
+uint32_t
+mrb_byte_hash(const uint8_t *s, mrb_int len)
+{
+ return mrb_byte_hash_step(s, len, FNV1_32_INIT);
+}
+
+uint32_t
+mrb_str_hash(mrb_state *mrb, mrb_value str)
+{
+ struct RString *s = mrb_str_ptr(str);
+ return mrb_byte_hash((uint8_t*)RSTR_PTR(s), RSTR_LEN(s));
+}
+
 /* 15.2.10.5.20 */
 /*
 * call-seq:
@@ -1793,6 +1740,38 @@
 return mrb_bool_value(TRUE);
 }
 
+/*
+ * call-seq:
+ * str.byteindex(substring, offset = 0) -> integer or nil
+ *
+ * Returns the \Integer byte-based index of the first occurrence of the given +substring+,
+ * or +nil+ if none found:
+ *
+ * 'foo'.byteindex('f') # => 0
+ * 'foo'.byteindex('oo') # => 1
+ * 'foo'.byteindex('ooo') # => nil
+ */
+static mrb_value
+mrb_str_byteindex_m(mrb_state *mrb, mrb_value str)
+{
+ mrb_value sub;
+ mrb_int pos;
+
+ if (mrb_get_args(mrb, "S|i", &sub, &pos) == 1) {
+ pos = 0;
+ }
+ else if (pos < 0) {
+ pos += RSTRING_LEN(str);
+ if (pos < 0) {
+ return mrb_nil_value();
+ }
+ }
+ pos = str_index_str(mrb, str, sub, pos);
+
+ if (pos == -1) return mrb_nil_value();
+ return mrb_int_value(mrb, pos);
+}
+
 /* 15.2.10.5.22 */
 /*
 * call-seq:
@@ -1808,9 +1787,14 @@
 * "hello".index('a') #=> nil
 * "hello".index('l', -2) #=> 3
 */
+#ifdef MRB_UTF8_STRING
 static mrb_value
 mrb_str_index_m(mrb_state *mrb, mrb_value str)
 {
+ if (RSTR_ASCII_P(mrb_str_ptr(str))) {
+ return mrb_str_byteindex_m(mrb, str);
+ }
+
 mrb_value sub;
 mrb_int pos;
 
@@ -1827,9 +1811,11 @@
 pos = str_index_str_by_char(mrb, str, sub, pos);
 
 if (pos == -1) return mrb_nil_value();
- BYTES_ALIGN_CHECK(pos);
 return mrb_int_value(mrb, pos);
 }
+#else
+#define mrb_str_index_m mrb_str_byteindex_m
+#endif
 
 /* 15.2.10.5.24 */
 /* 15.2.10.5.28 */
@@ -2019,6 +2005,44 @@
 return str2;
 }
 
+/*
+ * call-seq:
+ * byterindex(substring, offset = self.bytesize) -> integer or nil
+ *
+ * Returns the \Integer byte-based index of the _last_ occurrence of the given +substring+,
+ * or +nil+ if none found:
+ *
+ * 'foo'.byterindex('f') # => 0
+ * 'foo'.byterindex('o') # => 2
+ * 'foo'.byterindex('oo') # => 1
+ * 'foo'.byterindex('ooo') # => nil
+ */
+static mrb_value
+mrb_str_byterindex_m(mrb_state *mrb, mrb_value str)
+{
+ mrb_value sub;
+ mrb_int pos;
+ mrb_int len = RSTRING_LEN(str);
+
+ if (mrb_get_args(mrb, "S|i", &sub, &pos) == 1) {
+ pos = len;
+ }
+ else {
+ if (pos < 0) {
+ pos += len;
+ if (pos < 0) {
+ return mrb_nil_value();
+ }
+ }
+ if (pos > len) pos = len;
+ }
+ pos = str_rindex(mrb, str, sub, pos);
+ if (pos < 0) {
+ return mrb_nil_value();
+ }
+ return mrb_int_value(mrb, pos);
+}
+
 /* 15.2.10.5.31 */
 /*
 * call-seq:
@@ -2034,27 +2058,33 @@
 * "hello".rindex('a') #=> nil
 * "hello".rindex('l', 2) #=> 2
 */
+#ifdef MRB_UTF8_STRING
 static mrb_value
-mrb_str_rindex(mrb_state *mrb, mrb_value str)
+mrb_str_rindex_m(mrb_state *mrb, mrb_value str)
 {
+ if (RSTR_ASCII_P(mrb_str_ptr(str))) {
+ return mrb_str_byterindex_m(mrb, str);
+ }
+
 mrb_value sub;
 mrb_int pos;
- int argc = mrb_get_args(mrb, "S|i", &sub, &pos);
- mrb_int len = RSTRING_CHAR_LEN(str);
 
- if (argc == 1) {
- pos = len;
+ if (mrb_get_args(mrb, "S|i", &sub, &pos) == 1) {
+ pos = RSTRING_CHAR_LEN(str);
+ pos = chars2bytes(str, 0, pos);
+ }
+ else if (pos >= 0) {
+ pos = chars2bytes(str, 0, pos);
 }
 else {
- if (pos < 0) {
- pos += len;
- if (pos < 0) {
- return mrb_nil_value();
- }
+ const char *p = RSTRING_PTR(str);
+ const char *e = RSTRING_END(str);
+ while (pos++ < 0 && p < e) {
+ e = char_backtrack(p, e);
 }
- if (pos > len) pos = len;
+ if (p == e) return mrb_nil_value();
+ pos = (mrb_int)(e - p);
 }
- pos = chars2bytes(str, 0, pos);
 pos = str_rindex(mrb, str, sub, pos);
 if (pos >= 0) {
 pos = bytes2chars(RSTRING_PTR(str), RSTRING_LEN(str), pos);
@@ -2063,6 +2093,9 @@
 }
 return mrb_nil_value();
 }
+#else
+#define mrb_str_rindex_m mrb_str_byterindex_m
+#endif
 
 /* 15.2.10.5.35 */
 
@@ -2158,7 +2191,7 @@
 mrb_gc_arena_restore(mrb, ai);
 skip = TRUE;
 beg = idx;
- if (lim_p) ++i;
+ if (lim_p) i++;
 }
 else {
 end = idx;
@@ -2205,11 +2238,24 @@
 return result;
 }
 
+static mrb_bool
+trailingbad(const char *str, const char *p, const char *pend)
+{
+ if (p == str) return TRUE; /* no number */
+ if (*(p - 1) == '_') return TRUE; /* trailing '_' */
+ while (p<pend && ISSPACE(*p)) p++;
+ if (p<pend) return TRUE; /* trailing garbage */
+ return FALSE;
+}
+
 static mrb_value
 mrb_str_len_to_integer(mrb_state *mrb, const char *str, size_t len, mrb_int base, int badcheck)
 {
 const char *p = str;
 const char *pend = str + len;
+#ifdef MRB_USE_BIGINT
+ const char *p2 = NULL;
+#endif
 char sign = 1;
 int c;
 mrb_int n = 0;
@@ -2320,6 +2366,9 @@
 if (badcheck) goto bad;
 return mrb_fixnum_value(0);
 }
+#ifdef MRB_USE_BIGINT
+ p2 = p;
+#endif
 for ( ;p<pend;p++) {
 if (*p == '_') {
 p++;
@@ -2333,7 +2382,7 @@
 }
 }
 if (badcheck && *p == '\0') {
- goto nullbyte;
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
 }
 c = conv_digit(*p);
 if (c < 0 || c >= base) {
@@ -2347,22 +2396,27 @@
 break;
 }
 overflow:
+#ifdef MRB_USE_BIGINT
+ ;
+ const char *p3 = p2;
+ while (p3 < pend) {
+ char c = TOLOWER(*p3);
+ const char *p4 = strchr(mrb_digitmap, c);
+ if (p4 == NULL && c != '_') break;
+ if (p4 - mrb_digitmap >= base) break;
+ p3++;
+ }
+ if (badcheck && trailingbad(str, p, pend)) goto bad;
+ return mrb_bint_new_str(mrb, p2, (mrb_int)(p3-p2), sign ? base : -base);
+#else
 mrb_raisef(mrb, E_RANGE_ERROR, "string (%l) too big for integer", str, pend-str);
+#endif
 }
 n += c;
 }
 val = (mrb_int)n;
- if (badcheck) {
- if (p == str) goto bad; /* no number */
- if (*(p - 1) == '_') goto bad; /* trailing '_' */
- while (p<pend && ISSPACE(*p)) p++;
- if (p<pend) goto bad; /* trailing garbage */
- }
-
+ if (badcheck && trailingbad(str, p, pend)) goto bad;
 return mrb_int_value(mrb, sign ? val : -val);
- nullbyte:
- mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
- /* not reached */
 bad:
 mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for number(%!l)", str, pend-str);
 /* not reached */
@@ -2377,8 +2431,9 @@
 const char *p;
 mrb_int len;
 
- check_null_byte(mrb, *ptr);
+ mrb_ensure_string_type(mrb, *ptr);
 ps = mrb_str_ptr(*ptr);
+ check_null_byte(mrb, ps);
 p = RSTR_PTR(ps);
 len = RSTR_LEN(ps);
 if (plen == '\0') {
@@ -2518,8 +2573,7 @@
 p = buf;
 pend = n;
 nocopy:
- d = mrb_float_read(p, &end);
- if (p == end) {
+ if (mrb_read_float(p, &end, &d) == FALSE) {
 if (badcheck) {
 bad:
 mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for float(%!s)", s);
@@ -2646,8 +2700,8 @@
 mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len)
 {
 struct RString *s = mrb_str_ptr(str);
- size_t capa;
- size_t total;
+ mrb_int capa;
+ mrb_int total;
 ptrdiff_t off = -1;
 
 if (len == 0) return str;
@@ -2657,23 +2711,14 @@
 }
 
 capa = RSTR_CAPA(s);
- total = RSTR_LEN(s)+len;
- if (total >= MRB_SSIZE_MAX) {
+ if (mrb_int_add_overflow(RSTR_LEN(s), len, &total)) {
 size_error:
 mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
 }
 if (capa <= total) {
 if (capa == 0) capa = 1;
 while (capa <= total) {
- if (capa <= MRB_SSIZE_MAX / 2) {
- capa *= 2;
- }
- else {
- capa = total+1;
- }
- }
- if (capa <= total || capa > MRB_SSIZE_MAX) {
- goto size_error;
+ if (mrb_int_mul_overflow(capa, 2, &capa)) goto size_error;
 }
 resize_capa(mrb, s, capa);
 }
@@ -2681,7 +2726,6 @@
 ptr = RSTR_PTR(s) + off;
 }
 memcpy(RSTR_PTR(s) + RSTR_LEN(s), ptr, len);
- mrb_assert_int_fit(size_t, total, mrb_ssize, MRB_SSIZE_MAX);
 RSTR_SET_LEN(s, total);
 RSTR_PTR(s)total = '\0'; /* sentinel */
 return str;
@@ -2798,8 +2842,8 @@
 /*
 * call-seq:
 * str.byteslice(integer) -> new_str or nil
- * str.byteslice(integer, integer) -> new_str or nil
- * str.byteslice(range) -> new_str or nil
+ * str.byteslice(integer, integer) -> new_str or nil
+ * str.byteslice(range) -> new_str or nil
 *
 * Byte Reference---If passed a single Integer, returns a
 * substring of one byte at that position. If passed two Integer
@@ -2877,13 +2921,13 @@
 mrb_str_cat(mrb, result, "\\", 1);
 break;
 case '`':
- mrb_str_cat(mrb, result, RSTRING_PTR(self), chars2bytes(self, 0, found));
+ mrb_str_cat(mrb, result, RSTRING_PTR(self), found);
 break;
 case '&': case '0':
 mrb_str_cat(mrb, result, match, mlen);
 break;
 case '\'':
- offset = chars2bytes(self, 0, found) + mlen;
+ offset = found + mlen;
 if (RSTRING_LEN(self) > offset) {
 mrb_str_cat(mrb, result, RSTRING_PTR(self)+offset, RSTRING_LEN(self)-offset);
 }
@@ -2942,7 +2986,7 @@
 mrb_define_method(mrb, s, "replace", mrb_str_replace, MRB_ARGS_REQ(1)); /* 15.2.10.5.28 */
 mrb_define_method(mrb, s, "reverse", mrb_str_reverse, MRB_ARGS_NONE()); /* 15.2.10.5.29 */
 mrb_define_method(mrb, s, "reverse!", mrb_str_reverse_bang, MRB_ARGS_NONE()); /* 15.2.10.5.30 */
- mrb_define_method(mrb, s, "rindex", mrb_str_rindex, MRB_ARGS_ANY()); /* 15.2.10.5.31 */
+ mrb_define_method(mrb, s, "rindex", mrb_str_rindex_m, MRB_ARGS_ANY()); /* 15.2.10.5.31 */
 mrb_define_method(mrb, s, "size", mrb_str_size, MRB_ARGS_NONE()); /* 15.2.10.5.33 */
 mrb_define_method(mrb, s, "slice", mrb_str_aref_m, MRB_ARGS_ANY()); /* 15.2.10.5.34 */
 mrb_define_method(mrb, s, "split", mrb_str_split_m, MRB_ARGS_ANY()); /* 15.2.10.5.35 */
@@ -2961,6 +3005,8 @@
 
 mrb_define_method(mrb, s, "getbyte", mrb_str_getbyte, MRB_ARGS_REQ(1));
 mrb_define_method(mrb, s, "setbyte", mrb_str_setbyte, MRB_ARGS_REQ(2));
+ mrb_define_method(mrb, s, "byteindex", mrb_str_byteindex_m, MRB_ARGS_ARG(1,1));
+ mrb_define_method(mrb, s, "byterindex", mrb_str_byterindex_m, MRB_ARGS_ARG(1,1));
 mrb_define_method(mrb, s, "byteslice", mrb_str_byteslice, MRB_ARGS_ARG(1,1));
 
 mrb_define_method(mrb, s, "__sub_replace", sub_replace, MRB_ARGS_REQ(3)); /* internal */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/symbol.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/symbol.c Changed

@@ -10,6 +10,7 @@
 #include <mruby/string.h>
 #include <mruby/dump.h>
 #include <mruby/class.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 #ifndef MRB_NO_PRESYM
@@ -110,7 +111,7 @@
 for (i=0; i<5; i++) {
 uint32_t bits = sym>>(24-i*6) & 0x3f;
 if (bits == 0) break;
- bufi = pack_tablebits-1;;
+ bufi = pack_tablebits-1;
 }
 bufi = '\0';
 if (lenp) *lenp = i;
@@ -118,26 +119,6 @@
 }
 #endif
 
-static uint8_t
-symhash(const char *key, size_t len)
-{
- uint32_t hash, i;
-
- for(hash = i = 0; i < len; ++i) {
- hash += keyi;
- hash += (hash << 10);
- hash ^= (hash >> 6);
- }
- hash += (hash << 3);
- hash ^= (hash >> 11);
- hash += (hash << 15);
- return hash & 0xff;
-}
-
-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(uint8_t *p, uint8_t **newpos);
-
 #define sym_lit_p(mrb, i) (mrb->symflagsi>>3&(1<<(i&7)))
 #define sym_lit_set(mrb, i) mrb->symflagsi>>3|=(1<<(i&7))
 #define sym_flags_clear(mrb, i) mrb->symflagsi>>3&=~(1<<(i&7))
@@ -154,7 +135,7 @@
 }
 else {
 /* length in BER */
- symlen = mrb_packed_int_decode((uint8_t*)symname, (uint8_t**)&symname);
+ symlen = mrb_packed_int_decode((const uint8_t*)symname, (const uint8_t**)&symname);
 }
 if (len == symlen && memcmp(symname, name, len) == 0) {
 return TRUE;
@@ -178,7 +159,7 @@
 i = sym_inline_pack(name, len);
 if (i > 0) return i;
 
- hash = symhash(name, len);
+ hash = mrb_byte_hash((const uint8_t*)name, len);
 if (hashp) *hashp = hash;
 
 i = mrb->symhashhash;
@@ -220,7 +201,7 @@
 size_t symcapa = mrb->symcapa;
 if (symcapa == 0) symcapa = 100;
 else symcapa = (size_t)(symcapa * 6 / 5);
- mrb->symtbl = (const char**)mrb_realloc(mrb, mrb->symtbl, sizeof(char*)*symcapa);
+ mrb->symtbl = (const char**)mrb_realloc(mrb, (void*)mrb->symtbl, sizeof(char*)*symcapa);
 mrb->symflags = (uint8_t*)mrb_realloc(mrb, mrb->symflags, symcapa/8+1);
 memset(mrb->symflags+mrb->symcapa/8+1, 0, (symcapa-mrb->symcapa)/8);
 mrb->symlink = (uint8_t*)mrb_realloc(mrb, mrb->symlink, symcapa);
@@ -232,9 +213,10 @@
 mrb->symtblsym = name;
 }
 else {
- int ilen = mrb_packed_int_len(len);
+ uint32_t ulen = (uint32_t)len;
+ size_t ilen = mrb_packed_int_len(ulen);
 char *p = (char *)mrb_malloc(mrb, len+ilen+1);
- mrb_packed_int_encode(len, (uint8_t*)p, (uint8_t*)p+ilen);
+ mrb_packed_int_encode(ulen, (uint8_t*)p, (uint8_t*)p+ilen);
 memcpy(p+ilen, name, len);
 pilen+len = 0;
 mrb->symtblsym = p;
@@ -347,7 +329,7 @@
 
 const char *symname = mrb->symtblsym;
 if (!sym_lit_p(mrb, sym)) {
- size_t len = mrb_packed_int_decode((uint8_t*)symname, (uint8_t**)&symname);
+ uint32_t len = mrb_packed_int_decode((const uint8_t*)symname, (const uint8_t**)&symname);
 if (lenp) *lenp = (mrb_int)len;
 }
 else if (lenp) {
@@ -376,9 +358,9 @@
 mrb_free(mrb, (char*)mrb->symtbli);
 }
 }
- mrb_free(mrb, mrb->symtbl);
- mrb_free(mrb, mrb->symlink);
- mrb_free(mrb, mrb->symflags);
+ mrb_free(mrb, (void*)mrb->symtbl);
+ mrb_free(mrb, (void*)mrb->symlink);
+ mrb_free(mrb, (void*)mrb->symflags);
 }
 
 void

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/variable.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/variable.c Changed

@@ -10,6 +10,7 @@
 #include <mruby/proc.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 /* Instance variable table structure */
@@ -48,9 +49,9 @@
 khash_power2(new_alloc);
 if (old_alloc == new_alloc) return;
 
+ t->ptr = (mrb_value*)mrb_calloc(mrb, sizeof(mrb_value)+sizeof(mrb_sym), new_alloc);
 t->size = 0;
 t->alloc = new_alloc;
- t->ptr = (mrb_value*)mrb_calloc(mrb, sizeof(mrb_value)+sizeof(mrb_sym), new_alloc);
 if (old_alloc == 0) return;
 
 mrb_sym *keys = (mrb_sym*)&old_ptrold_alloc;
@@ -299,7 +300,7 @@
 case MRB_TT_MODULE:
 case MRB_TT_SCLASS:
 case MRB_TT_HASH:
- case MRB_TT_DATA:
+ case MRB_TT_CDATA:
 case MRB_TT_EXCEPTION:
 return TRUE;
 default:
@@ -485,7 +486,7 @@
 mrb_obj_iv_inspect(mrb_state *mrb, struct RObject *obj)
 {
 iv_tbl *t = obj->iv;
- int len = iv_size(mrb, t);
+ size_t len = iv_size(mrb, t);
 
 if (len > 0) {
 const char *cn = mrb_obj_classname(mrb, mrb_obj_value(obj));
@@ -773,6 +774,7 @@
 mrb_bool retry = FALSE;
 mrb_value name;
 
+ /* if skip then skip the current class (already searched) */
 if (skip) c = c->super;
 L_RETRY:
 while (c) {
@@ -781,6 +783,7 @@
 return v;
 }
 c = c->super;
+ if (!skip && c == mrb->object_class) break;
 }
 if (!retry && base->tt == MRB_TT_MODULE) {
 c = mrb->object_class;
@@ -825,6 +828,7 @@
 proc = proc->upper;
 while (proc) {
 c2 = MRB_PROC_TARGET_CLASS(proc);
+ if (!c2) c2 = mrb->object_class;
 if (c2 && iv_get(mrb, c2->iv, sym, &v)) {
 return v;
 }
@@ -985,7 +989,7 @@
 }
 
 static mrb_bool
-mrb_const_defined_0(mrb_state *mrb, mrb_value mod, mrb_sym id, mrb_bool exclude, mrb_bool recurse)
+const_defined_0(mrb_state *mrb, mrb_value mod, mrb_sym id, mrb_bool exclude, mrb_bool recurse)
 {
 struct RClass *klass = mrb_class_ptr(mod);
 struct RClass *tmp;
@@ -1011,13 +1015,13 @@
 MRB_API mrb_bool
 mrb_const_defined(mrb_state *mrb, mrb_value mod, mrb_sym id)
 {
- return mrb_const_defined_0(mrb, mod, id, TRUE, TRUE);
+ return const_defined_0(mrb, mod, id, TRUE, TRUE);
 }
 
 MRB_API mrb_bool
 mrb_const_defined_at(mrb_state *mrb, mrb_value mod, mrb_sym id)
 {
- return mrb_const_defined_0(mrb, mod, id, TRUE, FALSE);
+ return const_defined_0(mrb, mod, id, TRUE, FALSE);
 }
 
 MRB_API mrb_value
@@ -1104,8 +1108,8 @@
 if (outer == NULL) return mrb_nil_value();
 name = find_class_sym(mrb, outer, c);
 if (name == 0) return mrb_nil_value();
- str = mrb_class_name(mrb, outer);
 path = mrb_str_new_capa(mrb, 40);
+ str = mrb_class_name(mrb, outer);
 mrb_str_cat_cstr(mrb, path, str);
 mrb_str_cat_cstr(mrb, path, "::");

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/vm.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/src/vm.c Changed

@@ -19,6 +19,7 @@
 #include "value_array.h"
 #include <mruby/throw.h>
 #include <mruby/dump.h>
+#include <mruby/internal.h>
 #include <mruby/presym.h>
 
 #ifdef MRB_NO_STDIO
@@ -27,7 +28,7 @@
 #endif
 void abort(void);
 #if defined(__cplusplus)
-} /* extern "C" { */
+} /* extern "C" */
 #endif
 #endif
 
@@ -83,8 +84,6 @@
 #define CALL_MAXARGS 15
 #define CALL_VARARGS (CALL_MAXARGS<<4 | CALL_MAXARGS)
 
-void mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args);
-
 static inline void
 stack_clear(mrb_value *from, size_t count)
 {
@@ -97,6 +96,7 @@
 static inline void
 stack_copy(mrb_value *dst, const mrb_value *src, size_t size)
 {
+ if (!src) return;
 memcpy(dst, src, sizeof(mrb_value)*size);
 }
 
@@ -177,10 +177,7 @@
 size += room;
 #endif
 
- newstack = (mrb_value *)mrb_realloc_simple(mrb, mrb->c->stbase, sizeof(mrb_value) * size);
- if (newstack == NULL) {
- mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
- }
+ newstack = (mrb_value *)mrb_realloc(mrb, mrb->c->stbase, sizeof(mrb_value) * size);
 stack_clear(&(newstackoldsize), size - oldsize);
 envadjust(mrb, oldbase, newstack, oldsize);
 mrb->c->stbase = newstack;
@@ -201,6 +198,21 @@
 }
 }
 
+static void
+stack_extend_adjust(mrb_state *mrb, mrb_int room, const mrb_value **argp)
+{
+ const struct mrb_context *c = mrb->c;
+ ptrdiff_t voff = *argp - c->stbase;
+
+ if (voff < 0 || voff >= c->stend - c->stbase) {
+ mrb_stack_extend(mrb, room);
+ }
+ else {
+ mrb_stack_extend(mrb, room);
+ *argp = c->stbase + voff;
+ }
+}
+
 static inline struct REnv*
 uvenv(mrb_state *mrb, mrb_int up)
 {
@@ -238,14 +250,80 @@
 return proc;
 }
 
+#define CI_PROC_SET(ci, p) do {\
+ ci->proc = p;\
+ ci->pc = (p && !MRB_PROC_CFUNC_P(p)) ? p->body.irep->iseq : NULL;\
+} while (0)
+
+void
+mrb_vm_ci_proc_set(mrb_callinfo *ci, const struct RProc *p)
+{
+ CI_PROC_SET(ci, p);
+}
+
+#define CI_TARGET_CLASS(ci) (((ci)->u.env && (ci)->u.env->tt == MRB_TT_ENV)? (ci)->u.env->c : (ci)->u.target_class)
+
+struct RClass*
+mrb_vm_ci_target_class(const mrb_callinfo *ci)
+{
+ return CI_TARGET_CLASS(ci);
+}
+
+void
+mrb_vm_ci_target_class_set(mrb_callinfo *ci, struct RClass *tc)
+{
+ struct REnv *e = ci->u.env;
+ if (e && e->tt == MRB_TT_ENV) {
+ e->c = tc;
+ }
+ else {
+ ci->u.target_class = tc;
+ }
+}
+
+#define CI_ENV(ci) (((ci)->u.env && (ci)->u.env->tt == MRB_TT_ENV)? (ci)->u.env : NULL)
+
+struct REnv*
+mrb_vm_ci_env(const mrb_callinfo *ci)
+{
+ return CI_ENV(ci);
+}
+
+void
+mrb_vm_ci_env_set(mrb_callinfo *ci, struct REnv *e)
+{
+ if (ci->u.env) {
+ if (ci->u.env->tt == MRB_TT_ENV) {
+ if (e) {
+ e->c = ci->u.env->c;
+ ci->u.env = e;
+ }
+ else {
+ ci->u.target_class = ci->u.env->c;
+ }
+ }
+ else {
+ if (e) {
+ e->c = ci->u.target_class;
+ ci->u.env = e;
+ }
+ }
+ }
+ else {
+ ci->u.env = e;
+ }
+}
+
 #define CINFO_NONE 0
 #define CINFO_SKIP 1
 #define CINFO_DIRECT 2
 #define CINFO_RESUMED 3
 
+#define BLK_PTR(b) ((mrb_proc_p(b)) ? mrb_proc_ptr(b) : NULL)
+
 static inline mrb_callinfo*
-cipush(mrb_state *mrb, mrb_int push_stacks, uint8_t cci,
- struct RClass *target_class, const struct RProc *proc, mrb_sym mid, uint8_t argc)
+cipush(mrb_state *mrb, mrb_int push_stacks, uint8_t cci, struct RClass *target_class,
+ const struct RProc *proc, struct RProc *blk, mrb_sym mid, uint16_t argc)
 {
 struct mrb_context *c = mrb->c;
 mrb_callinfo *ci = c->ci;
@@ -262,7 +340,8 @@
 }
 ci = ++c->ci;
 ci->mid = mid;
- mrb_vm_ci_proc_set(ci, proc);
+ CI_PROC_SET(ci, proc);
+ ci->blk = blk;
 ci->stack = ci-1.stack + push_stacks;
 ci->n = argc & 0xf;
 ci->nk = (argc>>4) & 0xf;
@@ -272,24 +351,45 @@
 return ci;
 }
 
-void
-mrb_env_unshare(mrb_state *mrb, struct REnv *e)
+mrb_bool
+mrb_env_unshare(mrb_state *mrb, struct REnv *e, mrb_bool noraise)
 {
- if (e == NULL) return;
- else {
- size_t len = (size_t)MRB_ENV_LEN(e);
- mrb_value *p;
+ if (e == NULL) return TRUE;
+ if (!MRB_ENV_ONSTACK_P(e)) return TRUE;
+ if (e->cxt != mrb->c) return TRUE;
+ if (e == CI_ENV(mrb->c->cibase)) return TRUE; /* for mirb */
+
+ size_t len = (size_t)MRB_ENV_LEN(e);
+ if (len == 0) {
+ e->stack = NULL;
+ MRB_ENV_CLOSE(e);
+ return TRUE;
+ }
 
- if (!MRB_ENV_ONSTACK_P(e)) return;
- if (e->cxt != mrb->c) return;
- if (e == mrb_vm_ci_env(mrb->c->cibase)) return; /* for mirb */
- p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len);
- if (len > 0) {
- stack_copy(p, e->stack, len);
- }
+ size_t live = mrb->gc.live;
+ mrb_value *p = (mrb_value *)mrb_malloc_simple(mrb, sizeof(mrb_value)*len);
+ if (live != mrb->gc.live && mrb_object_dead_p(mrb, (struct RBasic *)e)) {
+ // The e object is now subject to GC inside mrb_malloc_simple().
+ // Moreover, if NULL is returned due to mrb_malloc_simple() failure, simply ignore it.
+ mrb_free(mrb, p);
+ return TRUE;
+ }
+ else if (p) {
+ stack_copy(p, e->stack, len);
 e->stack = p;
 MRB_ENV_CLOSE(e);
 mrb_write_barrier(mrb, (struct RBasic *)e);
+ return TRUE;
+ }
+ else {
+ e->stack = NULL;
+ MRB_ENV_CLOSE(e);
+ MRB_ENV_SET_LEN(e, 0);
+ MRB_ENV_SET_BIDX(e, 0);
+ if (!noraise) {
+ mrb_exc_raise(mrb, mrb_obj_value(mrb->nomem_err));
+ }
+ return FALSE;
 }
 }
 
@@ -297,10 +397,20 @@
 cipop(mrb_state *mrb)
 {
 struct mrb_context *c = mrb->c;
- struct REnv *env = mrb_vm_ci_env(c->ci);
+ mrb_callinfo *ci = c->ci;
+ struct REnv *env = CI_ENV(ci);
 
+ mrb_vm_ci_env_set(ci, NULL); // make possible to free by GC if env is not needed
+ struct RProc *b = ci->blk;
+ if (b && !mrb_object_dead_p(mrb, (struct RBasic*)b) && b->tt == MRB_TT_PROC &&
+ !MRB_PROC_STRICT_P(b) && MRB_PROC_ENV(b) == CI_ENV(&ci-1)) {
+ b->flags |= MRB_PROC_ORPHAN;
+ }
+ if (env && !mrb_env_unshare(mrb, env, TRUE)) {
+ c->ci--; // exceptions are handled at the method caller; see #3087
+ mrb_exc_raise(mrb, mrb_obj_value(mrb->nomem_err));
+ }
 c->ci--;
- if (env) mrb_env_unshare(mrb, env);
 return c->ci;
 }
 
@@ -396,14 +506,13 @@
 static mrb_int
 mrb_ci_kidx(const mrb_callinfo *ci)
 {
+ if (ci->nk == 0) return -1;
 return (ci->n == CALL_MAXARGS) ? 2 : ci->n + 1;
 }
 
-static mrb_int
-mrb_bidx(uint16_t c)
+static inline mrb_int
+mrb_bidx(uint8_t n, uint8_t k)
 {
- uint8_t n = c & 0xf;
- uint8_t k = (c>>4) & 0xf;
 if (n == 15) n = 1;
 if (k == 15) n += 1;
 else n += k*2;
@@ -413,7 +522,7 @@
 mrb_int
 mrb_ci_bidx(mrb_callinfo *ci)
 {
- return mrb_bidx(ci->n|(ci->nk<<4));
+ return mrb_bidx(ci->n, ci->nk);
 }
 
 mrb_int
@@ -422,7 +531,7 @@
 const struct RProc *p;
 
 if (!ci) return 4;
- uint8_t nregs = mrb_ci_bidx(ci) + 1; /* self + args + kargs + blk */
+ mrb_int nregs = mrb_ci_bidx(ci) + 1; /* self + args + kargs + blk */
 p = ci->proc;
 if (p && !MRB_PROC_CFUNC_P(p) && p->body.irep && p->body.irep->nregs > nregs) {
 return p->body.irep->nregs;
@@ -433,20 +542,16 @@
 mrb_value mrb_obj_missing(mrb_state *mrb, mrb_value mod);
 
 static mrb_method_t
-prepare_missing(mrb_state *mrb, mrb_value recv, mrb_sym mid, struct RClass **clsp, uint32_t a, uint16_t *c, mrb_value blk, int super)
+prepare_missing(mrb_state *mrb, mrb_callinfo *ci, mrb_value recv, mrb_sym mid, mrb_value blk, mrb_bool super)
 {
 mrb_sym missing = MRB_SYM(method_missing);
- mrb_callinfo *ci = mrb->c->ci;
- uint16_t b = *c;
- mrb_int n = b & 0xf;
- mrb_int nk = (b>>4) & 0xf;
- mrb_value *argv = &ci->stacka+1;
+ mrb_value *argv = &ci->stack1;
 mrb_value args;
 mrb_method_t m;
 
 /* pack positional arguments */
- if (n == 15) args = argv0;
- else args = mrb_ary_new_from_values(mrb, n, argv);
+ if (ci->n == 15) args = argv0;
+ else args = mrb_ary_new_from_values(mrb, ci->n, argv);
 
 if (mrb_func_basic_p(mrb, recv, missing, mrb_obj_missing)) {
 method_missing:
@@ -455,27 +560,67 @@
 /* not reached */
 }
 if (mid != missing) {
- *clsp = mrb_class(mrb, recv);
+ ci->u.target_class = mrb_class(mrb, recv);
 }
- m = mrb_method_search_vm(mrb, clsp, missing);
+ m = mrb_vm_find_method(mrb, ci->u.target_class, &ci->u.target_class, missing);
 if (MRB_METHOD_UNDEF_P(m)) goto method_missing; /* just in case */
- mrb_stack_extend(mrb, a+4);
+ mrb_stack_extend(mrb, 4);
 
- argv = &ci->stacka+1; /* maybe reallocated */
+ argv = &ci->stack1; /* maybe reallocated */
 argv0 = args;
- if (nk == 0) {
+ if (ci->nk == 0) {
 argv1 = blk;
 }
 else {
- mrb_assert(nk == 15);
- argv1 = argvn;
+ mrb_assert(ci->nk == 15);
+ argv1 = argvci->n;
 argv2 = blk;
 }
- *c = 15 | (nk<<4);
+ ci->n = CALL_MAXARGS;
+ /* ci->nk is already set to zero or CALL_MAXARGS */
 mrb_ary_unshift(mrb, args, mrb_symbol_value(mid));
+ ci->mid = missing;
 return m;
 }
 
+static void
+funcall_args_capture(mrb_state *mrb, int stoff, mrb_int argc, const mrb_value *argv, mrb_value block, mrb_callinfo *ci)
+{
+ if (argc < 0 || argc > INT32_MAX) {
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative or too big argc for funcall (%i)", argc);
+ }
+
+ ci->nk = 0; /* funcall does not support keyword arguments */
+ if (argc < CALL_MAXARGS) {
+ mrb_int extends = stoff + argc + 2 /* self + block */;
+ stack_extend_adjust(mrb, extends, &argv);
+
+ mrb_value *args = mrb->c->ci->stack + stoff + 1 /* self */;
+ stack_copy(args, argv, argc);
+ argsargc = block;
+ ci->n = (uint8_t)argc;
+ }
+ else {
+ int extends = stoff + 3 /* self + splat + block */;
+ stack_extend_adjust(mrb, extends, &argv);
+
+ mrb_value *args = mrb->c->ci->stack + stoff + 1 /* self */;
+ args0 = mrb_ary_new_from_values(mrb, argc, argv);
+ args1 = block;
+ ci->n = CALL_MAXARGS;
+ }
+}
+
+static mrb_value
+ensure_block(mrb_state *mrb, mrb_value blk)
+{
+ if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
+ blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
+ /* The stack might have been reallocated during mrb_type_convert(), see #3622 */
+ }
+ return blk;
+}
+
 MRB_API mrb_value
 mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, const mrb_value *argv, mrb_value blk)
 {
@@ -504,10 +649,8 @@
 }
 else {
 mrb_method_t m;
- struct RClass *c;
 mrb_callinfo *ci = mrb->c->ci;
 mrb_int n = mrb_ci_nregs(ci);
- ptrdiff_t voff = -1;
 
 if (!mrb->c->stbase) {
 stack_init(mrb);
@@ -515,55 +658,27 @@
 if (ci - mrb->c->cibase > MRB_CALL_LEVEL_MAX) {
 mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
 }
- if (mrb->c->stbase <= argv && argv < mrb->c->stend) {
- voff = argv - mrb->c->stbase;
- }
- if (argc < 0) {
- mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative argc for funcall (%i)", argc);
- }
- c = mrb_class(mrb, self);
- m = mrb_method_search_vm(mrb, &c, mid);
- mrb_stack_extend(mrb, n + argc + 3);
- if (argc >= 15) {
- ci->stackn+1 = mrb_ary_new_from_values(mrb, argc, argv);
- argc = 15;
- }
+ blk = ensure_block(mrb, blk);
+ ci = cipush(mrb, n, CINFO_DIRECT, NULL, NULL, BLK_PTR(blk), 0, 0);
+ funcall_args_capture(mrb, 0, argc, argv, blk, ci);
+ ci->u.target_class = mrb_class(mrb, self);
+ m = mrb_vm_find_method(mrb, ci->u.target_class, &ci->u.target_class, mid);
 if (MRB_METHOD_UNDEF_P(m)) {
- uint16_t ac = (uint16_t)argc;
- m = prepare_missing(mrb, self, mid, &c, n, &ac, mrb_nil_value(), 0);
- argc = (mrb_int)ac;
- mid = MRB_SYM(method_missing);
- }
- ci = cipush(mrb, n, 0, c, NULL, mid, argc);
- if (MRB_METHOD_PROC_P(m)) {
- struct RProc *p = MRB_METHOD_PROC(m);
-
- mrb_vm_ci_proc_set(ci, p);
- if (!MRB_PROC_CFUNC_P(p)) {
- mrb_stack_extend(mrb, p->body.irep->nregs + argc);
- }
- }
- if (voff >= 0) {
- argv = mrb->c->stbase + voff;
- }
- ci->stack0 = self;
- if (argc < 15) {
- if (argc > 0)
- stack_copy(ci->stack+1, argv, argc);
- ci->stackargc+1 = blk;
+ m = prepare_missing(mrb, ci, self, mid, mrb_nil_value(), FALSE);
 }
 else {
- ci->stack2 = blk;
+ ci->mid = mid;
 }
+ ci->proc = MRB_METHOD_PROC_P(m) ? MRB_METHOD_PROC(m) : NULL;
 
 if (MRB_METHOD_CFUNC_P(m)) {
- ci->cci = CINFO_DIRECT;
+ ci->stack0 = self;
 val = MRB_METHOD_CFUNC(m)(mrb, self);
 cipop(mrb);
 }
 else {
 ci->cci = CINFO_SKIP;
- val = mrb_run(mrb, MRB_METHOD_PROC(m), self);
+ val = mrb_run(mrb, ci->proc, self);
 }
 }
 mrb_gc_arena_restore(mrb, ai);
@@ -580,7 +695,7 @@
 static void
 check_method_noarg(mrb_state *mrb, const mrb_callinfo *ci)
 {
- int argc = ci->n == CALL_MAXARGS ? RARRAY_LEN(ci->stack1) : ci->n;
+ mrb_int argc = ci->n == CALL_MAXARGS ? RARRAY_LEN(ci->stack1) : ci->n;
 if (ci->nk > 0) {
 mrb_value kdict = ci->stackmrb_ci_kidx(ci);
 if (!(mrb_hash_p(kdict) && mrb_hash_empty_p(mrb, kdict))) {
@@ -596,10 +711,10 @@
 exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p)
 {
 mrb_callinfo *ci = mrb->c->ci;
- int keep, nregs;
+ mrb_int keep, nregs;
 
 ci->stack0 = self;
- mrb_vm_ci_proc_set(ci, p);
+ CI_PROC_SET(ci, p);
 if (MRB_PROC_CFUNC_P(p)) {
 if (MRB_PROC_NOARG_P(p)) {
 check_method_noarg(mrb, ci);
@@ -616,7 +731,7 @@
 stack_clear(ci->stack+keep, nregs-keep);
 }
 
- cipush(mrb, 0, 0, NULL, NULL, 0, 0);
+ cipush(mrb, 0, 0, NULL, NULL, NULL, 0, 0);
 
 return self;
 }
@@ -634,12 +749,12 @@
 if (MRB_PROC_NOARG_P(p)) {
 check_method_noarg(mrb, ci);
 }
- cipush(mrb, 0, CINFO_DIRECT, mrb_vm_ci_target_class(ci), p, ci->mid, ci->n|(ci->nk<<4));
+ cipush(mrb, 0, CINFO_DIRECT, CI_TARGET_CLASS(ci), p, NULL, ci->mid, ci->n|(ci->nk<<4));
 ret = MRB_PROC_CFUNC(p)(mrb, self);
 cipop(mrb);
 }
 else {
- int keep = mrb_ci_bidx(ci) + 1; /* receiver + block */
+ mrb_int keep = mrb_ci_bidx(ci) + 1; /* receiver + block */
 ret = mrb_top_run(mrb, p, self, keep);
 }
 if (mrb->exc && mrb->jmp) {
@@ -701,7 +816,7 @@
 }
 
 c = mrb_class(mrb, self);
- m = mrb_method_search_vm(mrb, &c, name);
+ m = mrb_vm_find_method(mrb, c, &c, name);
 if (MRB_METHOD_UNDEF_P(m)) { /* call method_mising */
 goto funcall;
 }
@@ -729,13 +844,25 @@
 }
 
 if (MRB_METHOD_PROC_P(m)) {
- mrb_vm_ci_proc_set(ci, MRB_METHOD_PROC(m));
+ const struct RProc *p = MRB_METHOD_PROC(m);
+ CI_PROC_SET(ci, p);
 }
 return MRB_METHOD_CFUNC(m)(mrb, self);
 }
 return exec_irep(mrb, self, MRB_METHOD_PROC(m));
 }
 
+static void
+check_block(mrb_state *mrb, mrb_value blk)
+{
+ if (mrb_nil_p(blk)) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
+ }
+ if (!mrb_proc_p(blk)) {
+ mrb_raise(mrb, E_TYPE_ERROR, "not a block");
+ }
+}
+
 static mrb_value
 eval_under(mrb_state *mrb, mrb_value self, mrb_value blk, struct RClass *c)
 {
@@ -743,16 +870,14 @@
 mrb_callinfo *ci;
 int nregs;
 
- if (mrb_nil_p(blk)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
- }
+ check_block(mrb, blk);
 ci = mrb->c->ci;
 if (ci->cci == CINFO_DIRECT) {
 return mrb_yield_with_class(mrb, blk, 1, &self, self, c);
 }
 ci->u.target_class = c;
 p = mrb_proc_ptr(blk);
- mrb_vm_ci_proc_set(ci, p);
+ CI_PROC_SET(ci, p);
 ci->n = 1;
 ci->nk = 0;
 ci->mid = ci-1.mid;
@@ -769,7 +894,7 @@
 mrb->c->ci->stack0 = self;
 mrb->c->ci->stack1 = self;
 stack_clear(mrb->c->ci->stack+2, nregs-2);
- ci = cipush(mrb, 0, 0, NULL, NULL, 0, 0);
+ ci = cipush(mrb, 0, 0, NULL, NULL, NULL, 0, 0);
 
 return self;
 }
@@ -836,39 +961,23 @@
 mrb_value val;
 mrb_int n;
 
- if (mrb_nil_p(b)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
- }
+ check_block(mrb, b);
 ci = mrb->c->ci;
 n = mrb_ci_nregs(ci);
 p = mrb_proc_ptr(b);
- ci = cipush(mrb, n, CINFO_SKIP, c, p, mid, 0 /* dummy */);
- ci->nk = 0;
- if (argc >= CALL_MAXARGS) {
- ci->n = 15;
- n = 3;
- }
- else {
- ci->n = argc;
- n = argc + 2;
- }
- mrb_stack_extend(mrb, n);
- mrb->c->ci->stack0 = self;
- if (ci->n == 15) {
- mrb->c->ci->stack1 = mrb_ary_new_from_values(mrb, argc, argv);
- argc = 1;
- }
- else if (argc > 0) {
- stack_copy(mrb->c->ci->stack+1, argv, argc);
- }
- mrb->c->ci->stackargc+1 = mrb_nil_value(); /* clear blk */
+ ci = cipush(mrb, n, CINFO_DIRECT, NULL, NULL, NULL, 0, 0);
+ funcall_args_capture(mrb, 0, argc, argv, mrb_nil_value(), ci);
+ ci->u.target_class = c;
+ ci->mid = mid;
+ ci->proc = p;
 
 if (MRB_PROC_CFUNC_P(p)) {
- ci->cci = CINFO_DIRECT;
+ ci->stack0 = self;
 val = MRB_PROC_CFUNC(p)(mrb, self);
 cipop(mrb);
 }
 else {
+ ci->cci = CINFO_SKIP;
 val = mrb_run(mrb, p, self);
 }
 return val;
@@ -896,17 +1005,11 @@
 struct RProc *p;
 mrb_callinfo *ci;
 
- if (mrb_nil_p(b)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
- }
- if (!mrb_proc_p(b)) {
- mrb_raise(mrb, E_TYPE_ERROR, "not a block");
- }
-
+ check_block(mrb, b);
 p = mrb_proc_ptr(b);
 ci = mrb->c->ci;
 
- mrb_stack_extend(mrb, 4);
+ stack_extend_adjust(mrb, 4, &argv);
 mrb->c->ci->stack1 = mrb_ary_new_from_values(mrb, argc, argv);
 mrb->c->ci->stack2 = mrb_nil_value();
 mrb->c->ci->stack3 = mrb_nil_value();
@@ -915,6 +1018,39 @@
 return exec_irep(mrb, self, 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;
+}
+
 static struct RBreak*
 break_new(mrb_state *mrb, uint32_t tag, const struct RProc *p, mrb_value val)
 {
@@ -988,6 +1124,15 @@
 mrb_exc_set(mrb, exc);
 }
 
+#define RAISE_EXC(mrb, exc) do { \
+ mrb_value exc_value = (exc); \
+ mrb_exc_set(mrb, exc_value); \
+ goto L_RAISE; \
+} while (0)
+
+#define RAISE_LIT(mrb, c, str) RAISE_EXC(mrb, mrb_exc_new_lit(mrb, c, str))
+#define RAISE_FORMAT(mrb, c, fmt, ...) RAISE_EXC(mrb, mrb_exc_new_str(mrb, c, mrb_format(mrb, fmt, __VA_ARGS__)))
+
 static void
 argnum_error(mrb_state *mrb, mrb_int num)
 {
@@ -1124,6 +1269,13 @@
 }
 if (stack_keep > nregs)
 nregs = stack_keep;
+ else {
+ struct REnv *e = CI_ENV(mrb->c->ci);
+ if (stack_keep == 0 || (e && irep->nlocals < MRB_ENV_LEN(e))) {
+ mrb_vm_ci_env_set(mrb->c->ci, NULL);
+ mrb_env_unshare(mrb, e, FALSE);
+ }
+ }
 mrb_stack_extend(mrb, nregs);
 stack_clear(c->ci->stack + stack_keep, nregs - stack_keep);
 c->ci->stack0 = self;
@@ -1143,27 +1295,36 @@
 static struct RClass*
 check_target_class(mrb_state *mrb)
 {
- struct RClass *target = mrb_vm_ci_target_class(mrb->c->ci);
+ struct RClass *target = CI_TARGET_CLASS(mrb->c->ci);
 if (!target) {
- mrb_value exc = mrb_exc_new_lit(mrb, E_TYPE_ERROR, "no target class or module");
- mrb_exc_set(mrb, exc);
+ mrb_raise(mrb, E_TYPE_ERROR, "no class/module to add method");
 }
 return target;
 }
 
+#define regs (mrb->c->ci->stack)
+
 static mrb_value
-hash_new_from_values(mrb_state *mrb, mrb_int argc, mrb_value *regs)
+hash_new_from_regs(mrb_state *mrb, mrb_int argc, mrb_int idx)
 {
 mrb_value hash = mrb_hash_new_capa(mrb, argc);
 while (argc--) {
- mrb_hash_set(mrb, hash, regs0, regs1);
- regs += 2;
+ mrb_hash_set(mrb, hash, regsidx+0, regsidx+1);
+ idx += 2;
 }
 return hash;
 }
 
-void mrb_method_added(mrb_state *mrb, struct RClass *c, mrb_sym mid);
-mrb_value mrb_str_aref(mrb_state *mrb, mrb_value str, mrb_value idx, mrb_value len);
+static mrb_value
+ary_new_from_regs(mrb_state *mrb, mrb_int argc, mrb_int idx)
+{
+ mrb_value ary = mrb_ary_new_capa(mrb, argc);
+ while (argc--) {
+ mrb_ary_push(mrb, ary, regsidx);
+ idx++;
+ }
+ return ary;
+}
 
 MRB_API mrb_value
 mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *pc)
@@ -1203,9 +1364,8 @@
 goto L_RAISE;
 }
 mrb->jmp = &c_jmp;
- mrb_vm_ci_proc_set(mrb->c->ci, proc);
+ CI_PROC_SET(mrb->c->ci, proc);
 
-#define regs (mrb->c->ci->stack)
 INIT_DISPATCH {
 CASE(OP_NOP, Z) {
 /* do nothing */
@@ -1236,7 +1396,15 @@
 goto L_INT_OVERFLOW;
 #endif
 case IREP_TT_BIGINT:
+#ifdef MRB_USE_BIGINT
+ {
+ const char *s = poolb.u.str;
+ regsa = mrb_bint_new_str(mrb, s+2, (uint8_t)s0, s1);
+ }
+ break;
+#else
 goto L_INT_OVERFLOW;
+#endif
 #ifndef MRB_NO_FLOAT
 case IREP_TT_FLOAT:
 regsa = mrb_float_value(mrb, poolb.u.f);
@@ -1523,14 +1691,7 @@
 case MRB_TT_MODULE:
 break;
 default:
- {
- mrb_value exc;
-
- exc = mrb_exc_new_lit(mrb, E_TYPE_ERROR,
- "class or module required for rescue clause");
- mrb_exc_set(mrb, exc);
- goto L_RAISE;
- }
+ RAISE_LIT(mrb, E_TYPE_ERROR, "class or module required for rescue clause");
 }
 ec = mrb_class_ptr(e);
 regsb = mrb_bool_value(mrb_obj_is_kind_of(mrb, exc, ec));
@@ -1575,56 +1736,53 @@
 mid = symsb;
 L_SENDB_SYM:
 {
+ mrb_callinfo *ci;
+ mrb_method_t m;
+ mrb_value recv, blk;
 int n = c&0xf;
 int nk = (c>>4)&0xf;
- mrb_callinfo *ci = mrb->c->ci;
- mrb_int bidx = a + mrb_bidx(c);
- mrb_method_t m;
- struct RClass *cls;
- mrb_value recv;
+ mrb_int bidx = a + mrb_bidx(n,nk);
 
- if (0 < nk && nk < 15) { /* pack keyword arguments */
- mrb_int kidx = a+(n==15?1:n)+1;
- mrb_value kdict = hash_new_from_values(mrb, nk, regs+kidx);
+ if (nk == CALL_MAXARGS) {
+ mrb_ensure_hash_type(mrb, regsa+(n==CALL_MAXARGS?1:n)+1);
+ }
+ else if (nk > 0) { /* pack keyword arguments */
+ mrb_int kidx = a+(n==CALL_MAXARGS?1:n)+1;
+ mrb_value kdict = hash_new_from_regs(mrb, nk, kidx);
 regskidx = kdict;
- nk = 15;
+ nk = CALL_MAXARGS;
 c = n | (nk<<4);
 }
 
- mrb_assert(bidx < irep->nregs+a);
- mrb_value blk;
- mrb_int new_bidx = a+mrb_bidx(c);
+ mrb_assert(bidx < irep->nregs);
+ mrb_int new_bidx = a+mrb_bidx(n, nk);
 if (insn == OP_SEND) {
 /* clear block argument */
 SET_NIL_VALUE(regsnew_bidx);
 SET_NIL_VALUE(blk);
 }
 else {
- blk = regsbidx;
- if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
- blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
- /* The stack might have been reallocated during mrb_type_convert(),
- see #3622 */
- }
+ blk = ensure_block(mrb, regsbidx);
 regsnew_bidx = blk;
 }
 
- recv = regsa;
- cls = mrb_class(mrb, recv);
- m = mrb_method_search_vm(mrb, &cls, mid);
+ ci = cipush(mrb, a, CINFO_DIRECT, NULL, NULL, BLK_PTR(blk), 0, c);
+ recv = regs0;
+ ci->u.target_class = (insn == OP_SUPER) ? CI_TARGET_CLASS(ci - 1)->super : mrb_class(mrb, recv);
+ m = mrb_vm_find_method(mrb, ci->u.target_class, &ci->u.target_class, mid);
 if (MRB_METHOD_UNDEF_P(m)) {
- m = prepare_missing(mrb, recv, mid, &cls, a, &c, blk, 0);
- mid = MRB_SYM(method_missing);
+ m = prepare_missing(mrb, ci, recv, mid, blk, (insn == OP_SUPER));
 }
-
- /* push callinfo */
- ci = cipush(mrb, a, 0, cls, NULL, mid, c);
+ else {
+ ci->mid = mid;
+ }
+ ci->cci = CINFO_NONE;
+ if (!mrb_nil_p(blk)) ci->blk = mrb_proc_ptr(blk);
 
 if (MRB_METHOD_CFUNC_P(m)) {
 if (MRB_METHOD_PROC_P(m)) {
 struct RProc *p = MRB_METHOD_PROC(m);
-
- mrb_vm_ci_proc_set(ci, p);
+ CI_PROC_SET(ci, p);
 recv = p->body.func(mrb, recv);
 }
 else {
@@ -1636,12 +1794,6 @@
 mrb_gc_arena_shrink(mrb, ai);
 if (mrb->exc) goto L_RAISE;
 ci = mrb->c->ci;
- if (mrb_proc_p(blk)) {
- struct RProc *p = mrb_proc_ptr(blk);
- if (p && !MRB_PROC_STRICT_P(p) && MRB_PROC_ENV(p) == mrb_vm_ci_env(&ci-1)) {
- p->flags |= MRB_PROC_ORPHAN;
- }
- }
 if (!ci->u.target_class) { /* return from context modifying method (resume/yield) */
 if (ci->cci == CINFO_RESUMED) {
 mrb->jmp = prev_jmp;
@@ -1662,7 +1814,8 @@
 }
 else {
 /* setup environment for calling method */
- mrb_vm_ci_proc_set(ci, (proc = MRB_METHOD_PROC(m)));
+ proc = MRB_METHOD_PROC(m);
+ CI_PROC_SET(ci, proc);
 irep = proc->body.irep;
 pool = irep->pool;
 syms = irep->syms;
@@ -1679,7 +1832,7 @@
 
 /* replace callinfo */
 ci->u.target_class = MRB_PROC_TARGET_CLASS(m);
- mrb_vm_ci_proc_set(ci, m);
+ CI_PROC_SET(ci, m);
 if (MRB_PROC_ENV_P(m)) {
 ci->mid = MRB_PROC_ENV(m)->mid;
 }
@@ -1721,110 +1874,31 @@
 }
 
 CASE(OP_SUPER, BB) {
- mrb_method_t m;
- struct RClass *cls;
 mrb_callinfo *ci = mrb->c->ci;
- mrb_int bidx = mrb_bidx(b)+a;
- mrb_value recv, blk;
+ mrb_value recv;
 const struct RProc *p = ci->proc;
- mrb_sym mid = ci->mid;
- struct RClass* target_class = MRB_PROC_TARGET_CLASS(p);
+ struct RClass* target_class = CI_TARGET_CLASS(ci);
 
+ mid = ci->mid;
 if (MRB_PROC_ENV_P(p) && p->e.env->mid && p->e.env->mid != mid) { /* alias support */
 mid = p->e.env->mid; /* restore old mid */
 }
- mrb_assert(bidx < irep->nregs);
-
- blk = regsbidx;
- uint8_t nk = (b >> 4) & 0x0f;
- if (nk > 0 && nk < CALL_MAXARGS) { /* pack keyword arguments */
- uint8_t n = b & 0x0f;
- mrb_int kidx = a+(n==15?1:n)+1;
- mrb_value kdict = hash_new_from_values(mrb, nk, regs+kidx);
- regskidx = kdict;
- nk = 15;
- b = n | (nk<<4);
- bidx = kidx + 1;
- regsbidx = blk;
- }
 
 if (mid == 0 || !target_class) {
- mrb_value exc = mrb_exc_new_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
- mrb_exc_set(mrb, exc);
- goto L_RAISE;
+ RAISE_LIT(mrb, E_NOMETHOD_ERROR, "super called outside of method");
 }
 if ((target_class->flags & MRB_FL_CLASS_IS_PREPENDED) || target_class->tt == MRB_TT_MODULE) {
- target_class = mrb_vm_ci_target_class(ci);
- if (!target_class || target_class->tt != MRB_TT_ICLASS) {
- goto super_typeerror;
- }
+ goto super_typeerror;
 }
 recv = regs0;
 if (!mrb_obj_is_kind_of(mrb, recv, target_class)) {
- super_typeerror: ;
- mrb_value exc = mrb_exc_new_lit(mrb, E_TYPE_ERROR,
- "self has wrong type to call super in this context");
- mrb_exc_set(mrb, exc);
- goto L_RAISE;
- }
- if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
- blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
- /* The stack or ci stack might have been reallocated during
- mrb_type_convert(), see #3622 and #3784 */
- regsbidx = blk;
- ci = mrb->c->ci;
- }
- cls = target_class->super;
- m = mrb_method_search_vm(mrb, &cls, mid);
- if (MRB_METHOD_UNDEF_P(m)) {
- m = prepare_missing(mrb, recv, mid, &cls, a, &b, blk, 1);
- mid = MRB_SYM(method_missing);
+ super_typeerror:
+ RAISE_LIT(mrb, E_TYPE_ERROR, "self has wrong type to call super in this context");
 }
 
- /* push callinfo */
- ci = cipush(mrb, a, 0, cls, NULL, mid, b);
-
- /* prepare stack */
- ci->stack0 = recv;
-
- if (MRB_METHOD_CFUNC_P(m)) {
- mrb_value v;
-
- if (MRB_METHOD_PROC_P(m)) {
- mrb_vm_ci_proc_set(ci, MRB_METHOD_PROC(m));
- }
- v = MRB_METHOD_CFUNC(m)(mrb, recv);
- mrb_gc_arena_restore(mrb, ai);
- if (mrb->exc) goto L_RAISE;
- ci = mrb->c->ci;
- mrb_assert(!mrb_break_p(v));
- if (!mrb_vm_ci_target_class(ci)) { /* return from context modifying method (resume/yield) */
- if (ci->cci == CINFO_RESUMED) {
- mrb->jmp = prev_jmp;
- return v;
- }
- else {
- mrb_assert(!MRB_PROC_CFUNC_P(ci-1.proc));
- proc = ci-1.proc;
- irep = proc->body.irep;
- pool = irep->pool;
- syms = irep->syms;
- }
- }
- mrb->c->ci->stack0 = v;
- ci = cipop(mrb);
- pc = ci->pc;
- }
- else {
- /* setup environment for calling method */
- mrb_vm_ci_proc_set(ci, (proc = MRB_METHOD_PROC(m)));
- irep = proc->body.irep;
- pool = irep->pool;
- syms = irep->syms;
- mrb_stack_extend(mrb, (irep->nregs < 4) ? 4 : irep->nregs);
- pc = irep->iseq;
- }
- JUMP;
+ c = b; // arg info
+ regsa = recv;
+ goto L_SENDB_SYM;
 }
 
 CASE(OP_ARGARY, BS) {
@@ -1835,13 +1909,9 @@
 mrb_int lv = (b>>0)&0xf;
 mrb_value *stack;
 
- if (mrb->c->ci->mid == 0 || mrb_vm_ci_target_class(mrb->c->ci) == NULL) {
- mrb_value exc;
-
+ if (mrb->c->ci->mid == 0 || CI_TARGET_CLASS(mrb->c->ci) == NULL) {
 L_NOSUPER:
- exc = mrb_exc_new_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
- mrb_exc_set(mrb, exc);
- goto L_RAISE;
+ RAISE_LIT(mrb, E_NOMETHOD_ERROR, "super called outside of method");
 }
 if (lv == 0) stack = regs + 1;
 else {
@@ -1890,7 +1960,26 @@
 }
 
 CASE(OP_ENTER, W) {
+ mrb_callinfo *ci = mrb->c->ci;
+ mrb_int argc = ci->n;
+ mrb_value *argv = regs+1;
+
 mrb_int m1 = MRB_ASPEC_REQ(a);
+
+ /* no other args */
+ if ((a & ~0x7c0001) == 0 && argc < 15 && MRB_PROC_STRICT_P(proc)) {
+ if (argc != m1) {
+ argnum_error(mrb, m1);
+ goto L_RAISE;
+ }
+ /* clear local (but non-argument) variables */
+ mrb_int pos = m1+2; /* self+m1+blk */
+ if (irep->nlocals-pos > 0) {
+ stack_clear(&regspos, irep->nlocals-pos);
+ }
+ NEXT;
+ }
+
 mrb_int o = MRB_ASPEC_OPT(a);
 mrb_int r = MRB_ASPEC_REST(a);
 mrb_int m2 = MRB_ASPEC_POST(a);
@@ -1900,41 +1989,34 @@
 */
 mrb_int const len = m1 + o + r + m2;
 
- mrb_callinfo *ci = mrb->c->ci;
- mrb_int argc = ci->n;
- mrb_value *argv = regs+1;
 mrb_value * const argv0 = argv;
- mrb_int const kw_pos = len + kd; /* where kwhash should be */
- mrb_int const blk_pos = kw_pos + 1; /* where block should be */
 mrb_value blk = regsmrb_ci_bidx(ci);
 mrb_value kdict = mrb_nil_value();
 
 /* keyword arguments */
- if (ci->nk > 0) {
- mrb_int kidx = mrb_ci_kidx(ci);
- kdict = regskidx;
- if (!mrb_hash_p(kdict) || mrb_hash_size(mrb, kdict) == 0) {
- kdict = mrb_nil_value();
- ci->nk = 0;
- }
- }
- if (!kd && !mrb_nil_p(kdict)) {
- if (argc < 14) {
- ci->n++;
- argc++; /* include kdict in normal arguments */
- }
- else if (argc == 14) {
- /* pack arguments and kdict */
- regs1 = mrb_ary_new_from_values(mrb, argc+1, &regs1);
- argc = ci->n = 15;
- }
- else {/* argc == 15 */
- /* push kdict to packed arguments */
- mrb_ary_push(mrb, regs1, regs2);
+ if (ci->nk == 15) {
+ kdict = regsmrb_ci_kidx(ci);
+ }
+ if (!kd) {
+ if (!mrb_nil_p(kdict) && mrb_hash_size(mrb, kdict) > 0) {
+ if (argc < 14) {
+ ci->n++;
+ argc++; /* include kdict in normal arguments */
+ }
+ else if (argc == 14) {
+ /* pack arguments and kdict */
+ regs1 = ary_new_from_regs(mrb, argc+1, 1);
+ argc = ci->n = 15;
+ }
+ else {/* argc == 15 */
+ /* push kdict to packed arguments */
+ mrb_ary_push(mrb, regs1, kdict);
+ }
 }
+ kdict = mrb_nil_value();
 ci->nk = 0;
 }
- if (kd && MRB_ASPEC_KEY(a) > 0 && mrb_hash_p(kdict)) {
+ else if (MRB_ASPEC_KEY(a) > 0 && !mrb_nil_p(kdict)) {
 kdict = mrb_hash_dup(mrb, kdict);
 }
 
@@ -1944,6 +2026,7 @@
 argv = ARY_PTR(ary);
 argc = (int)ARY_LEN(ary);
 mrb_gc_protect(mrb, regs1);
+ if (kd && !mrb_nil_p(kdict)) mrb_gc_protect(mrb, kdict);
 }
 
 /* strict argument check */
@@ -2008,15 +2091,18 @@
 }
 
 /* need to be update blk first to protect blk from GC */
+ mrb_int const kw_pos = len + kd; /* where kwhash should be */
+ mrb_int const blk_pos = kw_pos + 1; /* where block should be */
 regsblk_pos = blk; /* move block */
 if (kd) {
 if (mrb_nil_p(kdict))
 kdict = mrb_hash_new_capa(mrb, 0);
 regskw_pos = kdict; /* set kwhash */
+ ci->nk = 15;
 }
 
 /* format arguments for generated code */
- mrb->c->ci->n = len;
+ mrb->c->ci->n = (uint8_t)len;
 
 /* clear local (but non-argument) variables */
 if (irep->nlocals-blk_pos-1 > 0) {
@@ -2031,9 +2117,7 @@
 mrb_value kdict, v;
 
 if (kidx < 0 || !mrb_hash_p(kdict=regskidx) || !mrb_hash_key_p(mrb, kdict, k)) {
- mrb_value str = mrb_format(mrb, "missing keyword: %v", k);
- mrb_exc_set(mrb, mrb_exc_new_str(mrb, E_ARGUMENT_ERROR, str));
- goto L_RAISE;
+ RAISE_FORMAT(mrb, E_ARGUMENT_ERROR, "missing keyword: %v", k);
 }
 v = mrb_hash_get(mrb, kdict, k);
 regsa = v;
@@ -2061,9 +2145,7 @@
 if (kidx >= 0 && mrb_hash_p(kdict=regskidx) && !mrb_hash_empty_p(mrb, kdict)) {
 mrb_value keys = mrb_hash_keys(mrb, kdict);
 mrb_value key1 = RARRAY_PTR(keys)0;
- mrb_value str = mrb_format(mrb, "unknown keyword: %v", key1);
- mrb_exc_set(mrb, mrb_exc_new_str(mrb, E_ARGUMENT_ERROR, str));
- goto L_RAISE;
+ RAISE_FORMAT(mrb, E_ARGUMENT_ERROR, "unknown keyword: %v", key1);
 }
 NEXT;
 }
@@ -2083,55 +2165,33 @@
 mrb_callinfo *ci;
 
 ci = mrb->c->ci;
- if (ci->mid) {
- mrb_value blk = regsmrb_ci_bidx(ci);
-
- if (mrb_proc_p(blk)) {
- struct RProc *p = mrb_proc_ptr(blk);
-
- if (!MRB_PROC_STRICT_P(p) &&
- ci > mrb->c->cibase && MRB_PROC_ENV(p) == mrb_vm_ci_env(&ci-1)) {
- p->flags |= MRB_PROC_ORPHAN;
- }
- }
- }
-
 if (mrb->exc) {
 L_RAISE:
 ci = mrb->c->ci;
- if (ci == mrb->c->cibase) {
- ch = catch_handler_find(mrb, ci, pc, MRB_CATCH_FILTER_ALL);
- if (ch == NULL) goto L_FTOP;
- goto L_CATCH;
- }
 while ((ch = catch_handler_find(mrb, ci, pc, MRB_CATCH_FILTER_ALL)) == NULL) {
- ci = cipop(mrb);
- if (ci1.cci == CINFO_SKIP && prev_jmp) {
- mrb->jmp = prev_jmp;
- MRB_THROW(prev_jmp);
+ if (ci != mrb->c->cibase) {
+ ci = cipop(mrb);
+ if (ci1.cci == CINFO_SKIP && prev_jmp) {
+ mrb->jmp = prev_jmp;
+ MRB_THROW(prev_jmp);
+ }
+ pc = ci0.pc;
 }
- pc = ci0.pc;
- if (ci == mrb->c->cibase) {
- ch = catch_handler_find(mrb, ci, pc, MRB_CATCH_FILTER_ALL);
- if (ch == NULL) {
- L_FTOP: /* fiber top */
- if (mrb->c == mrb->root_c) {
- mrb->c->ci->stack = mrb->c->stbase;
- goto L_STOP;
- }
- else {
- struct mrb_context *c = mrb->c;
+ else if (mrb->c == mrb->root_c) {
+ mrb->c->ci->stack = mrb->c->stbase;
+ goto L_STOP;
+ }
+ else {
+ struct mrb_context *c = mrb->c;
 
- c->status = MRB_FIBER_TERMINATED;
- mrb->c = c->prev;
- c->prev = NULL;
- goto L_RAISE;
- }
- }
- break;
+ c->status = MRB_FIBER_TERMINATED;
+ mrb->c = c->prev;
+ if (!mrb->c) mrb->c = mrb->root_c;
+ else c->prev = NULL;
+ goto L_RAISE;
 }
 }
- L_CATCH:
+
 if (ch == NULL) goto L_STOP;
 if (FALSE) {
 L_CATCH_TAGGED_BREAK: /* from THROW_TAGGED_BREAK() or UNWIND_ENSURE() */
@@ -2204,14 +2264,18 @@
 struct mrb_context *c;
 c = mrb->c;
 
- if (!c->prev) { /* toplevel return */
- regsirep->nlocals = v;
- goto CHECKPOINT_LABEL_MAKE(RBREAK_TAG_STOP);
+ if (!c->prev) {
+ if (c != mrb->root_c) {
+ /* fiber termination should transfer to root */
+ c->prev = mrb->root_c;
+ }
+ else { /* toplevel return */
+ regsirep->nlocals = v;
+ goto CHECKPOINT_LABEL_MAKE(RBREAK_TAG_STOP);
+ }
 }
- if (!c->vmexec && c->prev->ci == c->prev->cibase) {
- mrb_value exc = mrb_exc_new_lit(mrb, E_FIBER_ERROR, "double resume");
- mrb_exc_set(mrb, exc);
- goto L_RAISE;
+ else if (!c->vmexec && c->prev->ci == c->prev->cibase) {
+ RAISE_LIT(mrb, E_FIBER_ERROR, "double resume");
 }
 CHECKPOINT_RESTORE(RBREAK_TAG_RETURN_TOPLEVEL) {
 c = mrb->c;
@@ -2245,13 +2309,8 @@
 case OP_R_BREAK:
 if (MRB_PROC_STRICT_P(proc)) goto NORMAL_RETURN;
 if (MRB_PROC_ORPHAN_P(proc)) {
- mrb_value exc;
-
 L_BREAK_ERROR:
- exc = mrb_exc_new_lit(mrb, E_LOCALJUMP_ERROR,
- "break from proc-closure");
- mrb_exc_set(mrb, exc);
- goto L_RAISE;
+ RAISE_LIT(mrb, E_LOCALJUMP_ERROR, "break from proc-closure");
 }
 if (!MRB_PROC_ENV_P(proc) || !MRB_ENV_ONSTACK_P(MRB_PROC_ENV(proc))) {
 goto L_BREAK_ERROR;
@@ -2280,9 +2339,9 @@
 }
 if (ci->cci > CINFO_NONE) {
 ci = cipop(mrb);
+ mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, proc, v);
 mrb_gc_arena_restore(mrb, ai);
 mrb->c->vmexec = FALSE;
- mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, proc, v);
 mrb->jmp = prev_jmp;
 MRB_THROW(prev_jmp);
 }
@@ -2336,7 +2395,7 @@
 mrb_assert(ci == mrb->c->ci);
 mrb_assert(mrb->exc == NULL);
 
- if (mrb->c->vmexec && !mrb_vm_ci_target_class(ci)) {
+ if (mrb->c->vmexec && !CI_TARGET_CLASS(ci)) {
 mrb_gc_arena_restore(mrb, ai);
 mrb->c->vmexec = FALSE;
 mrb->jmp = prev_jmp;
@@ -2388,12 +2447,10 @@
 NEXT;
 }
 
+#if !defined(MRB_USE_BIGINT) || defined(MRB_INT32)
 L_INT_OVERFLOW:
- {
- mrb_value exc = mrb_exc_new_lit(mrb, E_RANGE_ERROR, "integer overflow");
- mrb_exc_set(mrb, exc);
- }
- goto L_RAISE;
+ RAISE_LIT(mrb, E_RANGE_ERROR, "integer overflow");
+#endif
 
 #define TYPES2(a,b) ((((uint16_t)(a))<<8)|(((uint16_t)(b))&0xff))
 #define OP_MATH(op_name) \
@@ -2413,8 +2470,9 @@
 case TYPES2(MRB_TT_INTEGER, MRB_TT_INTEGER): \
 { \
 mrb_int x = mrb_integer(regsa), y = mrb_integer(regsa+1), z; \
- if (mrb_int_##op_name##_overflow(x, y, &z)) \
- OP_MATH_OVERFLOW_INT(); \
+ if (mrb_int_##op_name##_overflow(x, y, &z)) { \
+ OP_MATH_OVERFLOW_INT(op_name,x,y); \
+ } \
 else \
 SET_INT_VALUE(mrb,regsa, z); \
 } \
@@ -2430,7 +2488,11 @@
 } \
 break
 #endif
-#define OP_MATH_OVERFLOW_INT() goto L_INT_OVERFLOW
+#ifdef MRB_USE_BIGINT
+#define OP_MATH_OVERFLOW_INT(op,x,y) regsa = mrb_bint_##op##_ii(mrb,x,y)
+#else
+#define OP_MATH_OVERFLOW_INT(op,x,y) goto L_INT_OVERFLOW
+#endif
 #define OP_MATH_CASE_STRING_add() \
 case TYPES2(MRB_TT_STRING, MRB_TT_STRING): \
 regsa = mrb_str_plus(mrb, regsa, regsa+1); \
@@ -2467,8 +2529,7 @@
 {
 mrb_int x = mrb_integer(regsa);
 mrb_int y = mrb_integer(regsa+1);
- mrb_int div = mrb_div_int(mrb, x, y);
- SET_INT_VALUE(mrb, regsa, div);
+ regsa = mrb_div_int_value(mrb, x, y);
 }
 NEXT;
 #ifndef MRB_NO_FLOAT
@@ -2512,8 +2573,9 @@
 case MRB_TT_INTEGER: \
 { \
 mrb_int x = mrb_integer(regsa), y = (mrb_int)b, z; \
- if (mrb_int_##op_name##_overflow(x, y, &z)) \
- OP_MATH_OVERFLOW_INT(); \
+ if (mrb_int_##op_name##_overflow(x, y, &z)) { \
+ OP_MATH_OVERFLOW_INT(op_name,x,y); \
+ } \
 else \
 SET_INT_VALUE(mrb,regsa, z); \
 } \
@@ -2620,12 +2682,12 @@
 }
 
 CASE(OP_ARRAY, BB) {
- regsa = mrb_ary_new_from_values(mrb, b, &regsa);
+ regsa = ary_new_from_regs(mrb, b, a);
 mrb_gc_arena_restore(mrb, ai);
 NEXT;
 }
 CASE(OP_ARRAY2, BBB) {
- regsa = mrb_ary_new_from_values(mrb, c, &regsb);
+ regsa = ary_new_from_regs(mrb, c, b);
 mrb_gc_arena_restore(mrb, ai);
 NEXT;
 }
@@ -2636,7 +2698,7 @@
 regsa = splat;
 }
 else {
- mrb_assert(mrb_type(regsa) == MRB_TT_ARRAY);
+ mrb_assert(mrb_array_p(regsa));
 mrb_ary_concat(mrb, regsa, splat);
 }
 mrb_gc_arena_restore(mrb, ai);
@@ -2644,22 +2706,17 @@
 }
 
 CASE(OP_ARYPUSH, BB) {
- mrb_assert(mrb_type(regsa) == MRB_TT_ARRAY);
+ mrb_assert(mrb_array_p(regsa));
 for (mrb_int i=0; i<b; i++) {
 mrb_ary_push(mrb, regsa, regsa+i+1);
 }
 NEXT;
 }
 
- CASE(OP_ARYDUP, B) {
- mrb_value ary = regsa;
- if (mrb_array_p(ary)) {
- ary = mrb_ary_new_from_values(mrb, RARRAY_LEN(ary), RARRAY_PTR(ary));
- }
- else {
- ary = mrb_ary_new_from_values(mrb, 1, &ary);
- }
+ CASE(OP_ARYSPLAT, B) {
+ mrb_value ary = mrb_ary_splat(mrb, regsa);
 regsa = ary;
+ mrb_gc_arena_restore(mrb, ai);
 NEXT;
 }
 
@@ -2682,7 +2739,7 @@
 }
 
 CASE(OP_ASET, BBB) {
- mrb_assert(mrb_type(regsb) == MRB_TT_ARRAY);
+ mrb_assert(mrb_array_p(regsa));
 mrb_ary_set(mrb, regsb, c, regsa);
 NEXT;
 }
@@ -2695,7 +2752,7 @@
 int len, idx;
 
 if (!mrb_array_p(v)) {
- v = mrb_ary_new_from_values(mrb, 1, &regsa);
+ v = ary_new_from_regs(mrb, 1, a);
 }
 ary = mrb_ary_ptr(v);
 len = (int)ARY_LEN(ary);
@@ -2722,8 +2779,8 @@
 }
 
 CASE(OP_INTERN, B) {
+ mrb_assert(mrb_string_p(regsa));
 mrb_sym sym = mrb_intern_str(mrb, regsa);
-
 regsa = mrb_symbol_value(sym);
 NEXT;
 }
@@ -2745,7 +2802,7 @@
 }
 
 CASE(OP_STRING, BB) {
- size_t len;
+ mrb_int len;
 
 mrb_assert((poolb.tt&IREP_TT_NFLAG)==0);
 len = poolb.tt >> 2;
@@ -2760,6 +2817,7 @@
 }
 
 CASE(OP_STRCAT, B) {
+ mrb_assert(mrb_string_p(regsa));
 mrb_str_concat(mrb, regsa, regsa+1);
 NEXT;
 }
@@ -2793,7 +2851,7 @@
 CASE(OP_HASHCAT, B) {
 mrb_value hash = regsa;
 
- mrb_ensure_hash_type(mrb, hash);
+ mrb_assert(mrb_hash_p(hash));
 mrb_hash_merge(mrb, hash, regsa+1);
 mrb_gc_arena_restore(mrb, ai);
 NEXT;
@@ -2895,7 +2953,7 @@
 p->flags |= MRB_PROC_SCOPE;
 
 /* prepare call stack */
- cipush(mrb, a, 0, mrb_class_ptr(recv), p, 0, 0);
+ cipush(mrb, a, 0, mrb_class_ptr(recv), p, NULL, 0, 0);
 
 irep = p->body.irep;
 pool = irep->pool;
@@ -2969,8 +3027,7 @@
 
 mrb_assert((poola.tt&IREP_TT_NFLAG)==0);
 exc = mrb_exc_new(mrb, E_LOCALJUMP_ERROR, poola.u.str, len);
- mrb_exc_set(mrb, exc);
- goto L_RAISE;
+ RAISE_EXC(mrb, exc);
 }
 
 CASE(OP_EXT1, Z) {
@@ -2994,7 +3051,7 @@
 NEXT;
 }
 CASE(OP_EXT3, Z) {
- uint8_t insn = READ_B();
+ insn = READ_B();
 switch (insn) {
 #define OPCODE(insn,ops) case OP_ ## insn: FETCH_ ## ops ## _3(); mrb->c->ci->pc = pc; goto L_OP_ ## insn ## _BODY;
 #include "mruby/ops.h"
@@ -3052,21 +3109,14 @@
 return mrb_vm_run(mrb, proc, self, stack_keep);
 }
 if (mrb->c->ci == mrb->c->cibase) {
- mrb_vm_ci_env_set(mrb->c->ci, NULL);
 return mrb_vm_run(mrb, proc, self, stack_keep);
 }
- cipush(mrb, 0, CINFO_SKIP, mrb->object_class, NULL, 0, 0);
+ cipush(mrb, 0, CINFO_SKIP, mrb->object_class, NULL, NULL, 0, 0);
 v = mrb_vm_run(mrb, proc, self, stack_keep);
 
 return v;
 }
 
 #if defined(MRB_USE_CXX_EXCEPTION) && defined(__cplusplus)
-# if !defined(MRB_USE_CXX_ABI)
-} /* end of extern "C" */
-# endif
-mrb_int mrb_jmpbuf::jmpbuf_id = 0;
-# if !defined(MRB_USE_CXX_ABI)
-extern "C" {
-# endif
+mrb_int mrb_jmpbuf_id = 0;
 #endif

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/super-linter.report Added

_service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/super-linter.report/.keep Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/benchmark.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/tasks/benchmark.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/doc.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/tasks/doc.rake Changed

@@ -1,3 +1,5 @@
+MRuby.autoload :Documentation, 'mruby/doc'
+
 desc 'generate document'
 task :doc => %wdoc:api doc:capi
 
@@ -9,6 +11,9 @@
 rescue
 puts "ERROR: To generate yard documentation, you should install yard-mruby gem."
 puts " $ gem install yard-mruby yard-coderay"
+ puts "https://yardoc.org/"
+ puts "https://rubygems.org/gems/yard-mruby"
+ puts "https://rubygems.org/gems/yard-coderay"
 end
 end
 
@@ -17,11 +22,15 @@
 begin
 sh "doxygen Doxyfile"
 rescue
- puts "ERROR: To generate C API documents, you need Doxygen."
+ puts "ERROR: To generate C API documents, you need Doxygen and Graphviz."
 puts "On Debian-based systems:"
- puts " $ sudo apt-get install doxygen"
+ puts " $ sudo apt-get install doxygen graphviz"
 puts "On RHEL-based systems:"
- puts " $ sudo dnf install doxygen"
+ puts " $ sudo dnf install doxygen graphviz"
+ puts "On macOS-based systems:"
+ puts " $ brew install doxygen graphviz"
+ puts "https://www.doxygen.nl/"
+ puts "https://graphviz.org/"
 end
 end
 
@@ -43,14 +52,34 @@
 namespace :view do
 desc 'open yard docs'
 task :api do
- sh 'xdg-open doc/api/index.html'
+ if RUBY_PLATFORM.include?('darwin')
+ sh 'open doc/api/index.html'
+ else
+ sh 'xdg-open doc/api/index.html'
+ end
 end
 
 desc 'open doxygen docs'
 task :capi do
- sh 'xdg-open doc/capi/html/index.html'
+ if RUBY_PLATFORM.include?('darwin')
+ sh 'open doc/capi/html/index.html'
+ else
+ sh 'xdg-open doc/capi/html/index.html'
+ end
 end
 end
+
+ desc 'update doc/internal/opcode.md'
+ task 'update-opcode.md' do
+ unless system(*%W(git --git-dir #{MRUBY_ROOT}/.git --work-tree #{MRUBY_ROOT} diff --quiet @ -- doc/internal/opcode.md))
+ abort <<~'ERRMESG'
+ The file "doc/internal/opcode.md" has been modified but not committed.
+ To avoid loss of your edits, the automatic update process has been aborted.
+ ERRMESG
+ end
+
+ MRuby::Documentation.update_opcode_md
+ end
 end
 
 # deprecated

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/mrbgems.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/tasks/mrbgems.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/toolchains/android.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/tasks/toolchains/android.rake Changed

@@ -1,3 +1,5 @@
+require "json"
+
 class MRuby::Toolchain::Android
 
 DEFAULT_ARCH = 'armeabi' # TODO : Revise if arch should have a default
@@ -32,28 +34,6 @@
 end
 end
 
- class PlatformDirNotFound < StandardError
- def message
- <<-EOM
-Couldn't find Android NDK platform directories.
-Set ANDROID_PLATFORM environment variable or set :platform parameter
- EOM
- end
- end
-
- class SysrootNotReady < StandardError
- def message
- <<-EOM
-Couldn't find standard header files
-Please Move/Copy important file inside
- <NDK_HOME>/sysroot/usr/include/
-to
- <NDK_HOME>/platforms/<ANDROID_VERSION>/<ARCH>/usr/include/
-Higher NDK version will be use.
- EOM
- end
- end
-
 attr_reader :params
 
 def initialize(params)
@@ -92,7 +72,7 @@
 next nil unless path-1 == "*"
 dirs = Dir.glob(path).collect do |d|
 m = d.match(/(\d+)\.(\d+)\.(\d+)$/)
- m ? m1, m2, m3.collect { |v| v.to_i } : nil
+ m ? m1, m2, m3.collect(&:to_i) : nil
 end
 dirs.compact!
 dirs.sort! do |before, after|
@@ -178,54 +158,6 @@
 @arch ||= (params:arch || ENV'ANDROID_ARCH' || DEFAULT_ARCH).to_s
 end
 
- def sysroot
- return @sysroot if @sysroot
- sysroot_path = home_path.join('platforms', platform,
- case arch
- when /armeabi/ then 'arch-arm'
- when /arm64-v8a/ then 'arch-arm64'
- when /x86_64/ then 'arch-x86_64'
- when /x86/ then 'arch-x86'
- when /mips64/ then 'arch-mips64'
- when /mips/ then 'arch-mips'
- end
- ).to_s
- if Dir.exist?(File.join(sysroot_path, "usr", "include"))
- return @sysroot = sysroot_path
- else
- raise(SysrootNotReady)
- end
- end
-
- def platform
- if @platform === nil then
- @platform = params:platform || ENV'ANDROID_PLATFORM' || nil
- if @platform === nil
- Dir.glob(home_path.join('platforms/android-*').to_s){ |item|
- next if File.file?(item)
- if @platform === nil
- @platform = Integer(item.rpartition('-')2)
- else
- platform = Integer(item.rpartition('-')2)
- @platform = platform > @platform ? platform : @platform
- end
- }
- if @platform === nil
- raise(PlatformDirNotFound)
- else
- @platform = "android-#{@platform}"
- end
- end
- end
- if Integer(@platform.rpartition('-')2) < 21
- case arch
- when /arm64-v8a/, /x86_64/, /mips64/
- raise NotImplementedError, "Platform (#{@platform}) has no implementation for architecture (#{arch})"
- end
- end
- @platform
- end
-
 def armeabi_v7a_mfpu
 @armeabi_v7a_mfpu ||= (params:mfpu || 'vfpv3-d16').to_s
 end
@@ -234,6 +166,19 @@
 @armeabi_v7a_mfloat_abi ||= (params:mfloat_abi || 'softfp').to_s
 end
 
+ def sdk_version
+ @sdk_version ||= params:sdk_version
+ if !@sdk_version then
+ # Higher SDK version will be used.
+ json = nil
+ File.open(home_path + "meta/platforms.json") do |f|
+ json = JSON.load(f)
+ end
+ @sdk_version = json"max"
+ end
+ @sdk_version
+ end
+
 def no_warn_mismatch
 if %W(soft softfp).include? armeabi_v7a_mfloat_abi
 ''
@@ -259,6 +204,7 @@
 def ctarget
 flags = 
 
+ v = sdk_version
 case toolchain
 when :gcc
 case arch
@@ -272,13 +218,13 @@
 end
 when :clang
 case arch
- when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi)
- when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi)
- when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android)
- when /x86_64/ then flags += %W(-target x86_64-none-linux-android)
- when /x86/ then flags += %W(-target i686-none-linux-android)
- when /mips64/ then flags += %W(-target mips64el-none-linux-android)
- when /mips/ then flags += %W(-target mipsel-none-linux-android)
+ when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v})
+ when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v})
+ when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v})
+ when /x86_64/ then flags += %W(-target x86_64-none-linux-android#{v})
+ when /x86/ then flags += %W(-target i686-none-linux-android#{v})
+ when /mips64/ then flags += %W(-target mips64el-none-linux-android#{v})
+ when /mips/ then flags += %W(-target mipsel-none-linux-android#{v})
 end
 end
 
@@ -304,7 +250,7 @@
 flags += %W(-U_WIN32 -U_WIN64)
 end
 
- flags += %W(-MMD -MP -D__android__ -DANDROID --sysroot="#{sysroot}")
+ flags += %W(-MMD -MP -D__android__ -DANDROID)
 flags += ctarget
 case toolchain
 when :gcc
@@ -319,14 +265,13 @@
 def ldflags
 flags = 
 
- flags += %W(--sysroot="#{sysroot}")
-
 flags
 end
 
 def ldflags_before_libraries
 flags = 
 
+ v = sdk_version
 case toolchain
 when :gcc
 case arch
@@ -335,13 +280,13 @@
 when :clang
 flags += %W(-gcc-toolchain "#{gcc_toolchain_path.to_s}")
 case arch
- when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi -Wl,--fix-cortex-a8#{no_warn_mismatch})
- when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi)
- when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android)
- when /x86_64/ then flags += %W(-target x86_64-none-linux-android)
- when /x86/ then flags += %W(-target i686-none-linux-android)
- when /mips64/ then flags += %W(-target mips64el-none-linux-android)
- when /mips/ then flags += %W(-target mipsel-none-linux-android)
+ when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v} -Wl,--fix-cortex-a8#{no_warn_mismatch})
+ when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v})
+ when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v})
+ when /x86_64/ then flags += %W(-target x86_64-none-linux-android#{v})
+ when /x86/ then flags += %W(-target i686-none-linux-android#{v})
+ when /mips64/ then flags += %W(-target mips64el-none-linux-android#{v})
+ when /mips/ then flags += %W(-target mipsel-none-linux-android#{v})
 end
 end
 flags += %W(-no-canonical-prefixes)

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/toolchains/gcc.rake -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/tasks/toolchains/gcc.rake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/assert.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/assert.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/bintest.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/bintest.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/array.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/array.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/bs_block.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/bs_block.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/comparable.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/comparable.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/hash.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/hash.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/integer.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/integer.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/lang.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/lang.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/module.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/module.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/string.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/string.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/test/t/syntax.rb -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/mruby/test/t/syntax.rb Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/neverbleed/neverbleed.c -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/neverbleed/neverbleed.c Changed

@@ -38,8 +38,9 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #if defined(__linux__)
-#include <sys/syscall.h>
+#include <sys/epoll.h>
 #include <sys/prctl.h>
+#include <sys/syscall.h>
 #elif defined(__APPLE__)
 #include <sys/ptrace.h>
 #elif defined(__FreeBSD__)
@@ -51,13 +52,13 @@
 #include <openssl/opensslconf.h>
 #include <openssl/opensslv.h>
 
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER) ? LIBRESSL_VERSION_NUMBER >= 0x3050000fL : OPENSSL_VERSION_NUMBER >= 0x1010000fL
 /* RSA_METHOD is opaque, so RSA_meth* are used. */
 #define NEVERBLEED_OPAQUE_RSA_METHOD
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(OPENSSL_NO_EC) \
- && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2090100fL)
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(OPENSSL_NO_EC) && \
+ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2090100fL)
 /* EC_KEY_METHOD and related APIs are avaliable, so ECDSA is enabled. */
 #define NEVERBLEED_ECDSA
 #endif
@@ -70,8 +71,22 @@
 #include <openssl/rsa.h>
 #include <openssl/ssl.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL \
- || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+#ifdef __linux
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_IS_BORINGSSL)
+#define USE_OFFLOAD 1
+#endif
+#if defined(OPENSSL_IS_BORINGSSL) && defined(NEVERBLEED_BORINGSSL_USE_QAT)
+#include "qat_bssl.h"
+/* the mapping seems to be missing */
+#ifndef ASYNC_WAIT_CTX_get_all_fds
+extern int bssl_async_wait_ctx_get_all_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *fd, size_t *numfds);
+#define ASYNC_WAIT_CTX_get_all_fds bssl_async_wait_ctx_get_all_fds
+#endif
+#define USE_OFFLOAD 1
+#endif
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
 
 static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
 {
@@ -204,12 +219,19 @@
 return 0;
 }
 
+/**
+ * This function disposes of the memory allocated for `neverbleed_iobuf_t`, but retains the value of `next` and `processing` so that
+ * the buffer can be "cleared" while in use by worker threads.
+ */
 static void iobuf_dispose(neverbleed_iobuf_t *buf)
 {
 if (buf->capacity != 0)
 OPENSSL_cleanse(buf->buf, buf->capacity);
 free(buf->buf);
- memset(buf, 0, sizeof(*buf));
+ buf->buf = NULL;
+ buf->start = NULL;
+ buf->end = NULL;
+ buf->capacity = 0;
 }
 
 static void iobuf_reserve(neverbleed_iobuf_t *buf, size_t extra)
@@ -327,6 +349,11 @@
 return 0;
 }
 
+void neverbleed_iobuf_dispose(neverbleed_iobuf_t *buf)
+{
+ iobuf_dispose(buf);
+}
+
 static void iobuf_transaction_write(neverbleed_iobuf_t *buf, struct st_neverbleed_thread_data_t *thdata)
 {
 if (iobuf_write(buf, thdata->fd) == -1) {
@@ -351,12 +378,25 @@
 }
 
 /**
+ * Only sends a request, does not read a response
+ */
+static void iobuf_transaction_no_response(neverbleed_iobuf_t *buf, struct st_neverbleed_thread_data_t *thdata)
+{
+ if (neverbleed_transaction_cb != NULL) {
+ neverbleed_transaction_cb(buf, 1);
+ } else {
+ iobuf_transaction_write(buf, thdata);
+ iobuf_dispose(buf);
+ }
+}
+
+/**
 * Sends a request and reads a response.
 */
 static void iobuf_transaction(neverbleed_iobuf_t *buf, struct st_neverbleed_thread_data_t *thdata)
 {
 if (neverbleed_transaction_cb != NULL) {
- neverbleed_transaction_cb(buf);
+ neverbleed_transaction_cb(buf, 0);
 } else {
 iobuf_transaction_write(buf, thdata);
 iobuf_transaction_read(buf, thdata);
@@ -490,6 +530,105 @@
 neverbleed_t *nb;
 } daemon_vars = {{.lock = PTHREAD_MUTEX_INITIALIZER, .first_empty = SIZE_MAX}};
 
+static __thread struct {
+ int sockfd;
+#ifdef __linux
+ int epollfd;
+#endif
+ struct {
+ neverbleed_iobuf_t *first, **next;
+ } responses;
+} conn_ctx;
+
+static int use_offload = 0;
+
+#if USE_OFFLOAD
+
+struct engine_request {
+ neverbleed_iobuf_t *buf;
+ int async_fd;
+#ifdef OPENSSL_IS_BORINGSSL
+ struct {
+ RSA *rsa;
+ uint8_t output512;
+ union {
+ struct {
+ uint8_t padded512;
+ } digestsign;
+ };
+ } data;
+ async_ctx *async_ctx;
+#else
+ int (*stub)(neverbleed_iobuf_t *);
+ struct {
+ ASYNC_WAIT_CTX *ctx;
+ ASYNC_JOB *job;
+ } async;
+#endif
+};
+
+static void free_req(struct engine_request *req)
+{
+#ifdef OPENSSL_IS_BORINGSSL
+ bssl_qat_async_finish_job(req->async_ctx);
+#else
+ ASYNC_WAIT_CTX_free(req->async.ctx);
+#endif
+ OPENSSL_cleanse(req, sizeof(*req));
+ free(req);
+}
+
+static int do_epoll_ctl(int epollfd, int op, int fd, struct epoll_event *event)
+{
+ int ret;
+ while ((ret = epoll_ctl(epollfd, op, fd, event) != 0) && errno == EINTR)
+ ;
+ return ret;
+}
+
+static void register_wait_fd(struct engine_request *req)
+{
+#ifdef OPENSSL_IS_BORINGSSL
+ ASYNC_WAIT_CTX *ctx = req->async_ctx->currjob->waitctx;
+#else
+ ASYNC_WAIT_CTX *ctx = req->async.ctx;
+#endif
+ size_t numfds;
+
+ if (!ASYNC_WAIT_CTX_get_all_fds(ctx, NULL, &numfds) || numfds != 1)
+ dief("unexpected number of fds (%zu) requested in async mode\n", numfds);
+ if (!ASYNC_WAIT_CTX_get_all_fds(ctx, &req->async_fd, &numfds))
+ dief("ASYNC_WAIT_CTX_get_all_fds failed\n");
+ struct epoll_event ev = {.events = EPOLLIN, .data.ptr = req};
+ if (do_epoll_ctl(conn_ctx.epollfd, EPOLL_CTL_ADD, req->async_fd, &ev) != 0)
+ dief("epoll_ctl failed:%d\n", errno);
+}
+
+#endif
+
+static int send_responses(int cleanup)
+{
+ neverbleed_iobuf_t *buf;
+ int result = 0;
+
+ /* Send all buffers that have data being filled. The lock is held until everything is being done, as this function can be called
+ * from multiple threads simultaneously. */
+ while ((buf = conn_ctx.responses.first) != NULL && !buf->processing) {
+ if ((conn_ctx.responses.first = buf->next) == NULL)
+ conn_ctx.responses.next = &conn_ctx.responses.first;
+ if (!cleanup && iobuf_write(buf, conn_ctx.sockfd) != 0) {
+ warnf(errno != 0 ? "write error" : "connection closed by client");
+ result = -1;
+ }
+ iobuf_dispose(buf);
+ free(buf);
+ if (result != 0)
+ break;
+ }
+
+ return result;
+}
+
 static RSA *daemon_get_rsa(size_t key_index)
 {
 RSA *rsa = NULL;
@@ -541,7 +680,6 @@
 return index;
 }
 
-
 static int priv_encdec_proxy(const char *cmd, int flen, const unsigned char *from, unsigned char *_to, RSA *rsa, int padding)
 {
 struct st_neverbleed_rsa_exdata_t *exdata;
@@ -601,6 +739,8 @@
 return 0;
 }
 
+#if !defined(OPENSSL_IS_BORINGSSL)
+
 static int priv_enc_proxy(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)
 {
 return priv_encdec_proxy("priv_enc", flen, from, to, rsa, padding);
@@ -657,8 +797,7 @@
 unsigned siglen = 0;
 int ret;
 
- if (iobuf_shift_num(buf, &type) != 0 || (m = iobuf_shift_bytes(buf, &m_len)) == NULL ||
- iobuf_shift_num(buf, &key_index) != 0) {
+ if (iobuf_shift_num(buf, &type) != 0 || (m = iobuf_shift_bytes(buf, &m_len)) == NULL || iobuf_shift_num(buf, &key_index) != 0) {
 errno = 0;
 warnf("%s: failed to parse request", __FUNCTION__);
 return -1;
@@ -678,6 +817,8 @@
 return 0;
 }
 
+#endif
+
 static EVP_PKEY *create_pkey(neverbleed_t *nb, size_t key_index, const char *ebuf, const char *nbuf)
 {
 struct st_neverbleed_rsa_exdata_t *exdata;
@@ -703,7 +844,9 @@
 abort();
 }
 RSA_set0_key(rsa, n, e, NULL);
+#if !defined(OPENSSL_IS_BORINGSSL)
 RSA_set_flags(rsa, RSA_FLAG_EXT_PKEY);
+#endif
 
 pkey = EVP_PKEY_new();
 EVP_PKEY_set1_RSA(pkey, rsa);
@@ -734,8 +877,7 @@
 unsigned siglen = 0;
 int ret;
 
- if (iobuf_shift_num(buf, &type) != 0 || (m = iobuf_shift_bytes(buf, &m_len)) == NULL ||
- iobuf_shift_num(buf, &key_index) != 0) {
+ if (iobuf_shift_num(buf, &type) != 0 || (m = iobuf_shift_bytes(buf, &m_len)) == NULL || iobuf_shift_num(buf, &key_index) != 0) {
 errno = 0;
 warnf("%s: failed to parse request", __FUNCTION__);
 return -1;
@@ -802,12 +944,11 @@
 return (int)ret;
 }
 
-static EVP_PKEY *ecdsa_create_pkey(neverbleed_t *nb, size_t key_index, int curve_name, const char *ec_pubkeybuf)
+static EVP_PKEY *ecdsa_create_pkey(neverbleed_t *nb, size_t key_index, int curve_name, const void *pubkey, size_t pubkey_len)
 {
 struct st_neverbleed_rsa_exdata_t *exdata;
 EC_KEY *ec_key;
 EC_GROUP *ec_group;
- BIGNUM *ec_pubkeybn = NULL;
 EC_POINT *ec_pubkey;
 EVP_PKEY *pkey;
 
@@ -829,23 +970,18 @@
 
 EC_KEY_set_group(ec_key, ec_group);
 
- if (BN_hex2bn(&ec_pubkeybn, ec_pubkeybuf) == 0) {
- fprintf(stderr, "failed to parse ECDSA ephemeral public key:%s\n", ec_pubkeybuf);
- abort();
- }
-
- if ((ec_pubkey = EC_POINT_bn2point(ec_group, ec_pubkeybn, NULL, NULL)) == NULL) {
+ ec_pubkey = EC_POINT_new(ec_group);
+ assert(ec_pubkey != NULL);
+ if (!EC_POINT_oct2point(ec_group, ec_pubkey, pubkey, pubkey_len, NULL)) {
 fprintf(stderr, "failed to get ECDSA ephemeral public key from BIGNUM\n");
 abort();
 }
-
 EC_KEY_set_public_key(ec_key, ec_pubkey);
 
 pkey = EVP_PKEY_new();
 EVP_PKEY_set1_EC_KEY(pkey, ec_key);
 
 EC_POINT_free(ec_pubkey);
- BN_free(ec_pubkeybn);
 EC_GROUP_free(ec_group);
 EC_KEY_free(ec_key);
 
@@ -862,17 +998,11 @@
 return;
 
 neverbleed_iobuf_t buf = {NULL};
- size_t ret;
-
 iobuf_push_str(&buf, "del_pkey");
 iobuf_push_num(&buf, exdata->key_index);
- iobuf_transaction(&buf, thdata);
-
- if (iobuf_shift_num(&buf, &ret) != 0) {
- errno = 0;
- dief("failed to parse response");
- }
- iobuf_dispose(&buf);
+ // "del_pkey" command is fire-and-forget, it cannot fail, so doesn't have a response
+ iobuf_transaction_no_response(&buf, thdata);
+ free(exdata);
 }
 
 #endif
@@ -891,16 +1021,112 @@
 return pkey;
 }
 
+#if USE_OFFLOAD && defined(OPENSSL_IS_BORINGSSL)
+
+static struct engine_request *bssl_offload_create_request(neverbleed_iobuf_t *buf, EVP_PKEY *pkey)
+{
+ RSA *_rsa = EVP_PKEY_get1_RSA(pkey);
+
+ struct engine_request *req = malloc(sizeof(*req));
+ if (req == NULL)
+ dief("no memory\n");
+ *req = (struct engine_request){.buf = buf, .async_fd = -1, .async_ctx = bssl_qat_async_start_job(), .data.rsa = _rsa};
+
+ if (req->async_ctx == NULL)
+ dief("failed to initialize async job\n");
+ if (RSA_size(req->data.rsa) > sizeof(req->data.output))
+ dief("RSA key too large\n");
+
+ return req;
+}
+
+static void bssl_offload_digestsign(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const EVP_MD *md, const void *signdata, size_t signlen,
+ int rsa_pss)
+{
+ uint8_t digestEVP_MAX_MD_SIZE;
+ unsigned digestlen;
+
+ { /* generate digest of signdata */
+ EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
+ if (mdctx == NULL)
+ dief("no memory\n");
+ if (!EVP_DigestInit_ex(mdctx, md, NULL) || !EVP_DigestUpdate(mdctx, signdata, signlen) ||
+ !EVP_DigestFinal_ex(mdctx, digest, &digestlen))
+ dief("digest calculation failed\n");
+ EVP_MD_CTX_free(mdctx);
+ }
+
+ struct engine_request *req = bssl_offload_create_request(buf, pkey);
+ size_t rsa_size = RSA_size(req->data.rsa), padded_len;
+ int padding;
+
+ /* generate padded octets to be signed */
+ if (rsa_pss) {
+ if (!RSA_padding_add_PKCS1_PSS_mgf1(req->data.rsa, req->data.digestsign.padded, digest, md, md, -1))
+ dief("RSA_paddding_add_PKCS1_PSS_mgf1 failed\n");
+ padded_len = rsa_size;
+ padding = RSA_NO_PADDING;
+ } else {
+ /* PKCS1 padding */
+ int hash_nid = EVP_MD_type(md), is_alloced;
+ uint8_t *tbs;
+ if (!RSA_add_pkcs1_prefix(&tbs, &padded_len, &is_alloced, hash_nid, digest, digestlen))
+ dief("RSA_add_pkcs1_prefix failed\n");
+ if (padded_len > rsa_size)
+ dief("output of RSA_add_pkcs1_prefix is unexpectedly large\n");
+ memcpy(req->data.digestsign.padded, tbs, padded_len);
+ if (is_alloced)
+ OPENSSL_free(tbs);
+ padding = RSA_PKCS1_PADDING;
+ }
+
+ OPENSSL_cleanse(digest, sizeof(digest));
+
+ /* dispatch RSA calculation */
+ RSA_METHOD *meth = bssl_engine_get_rsa_method();
+ if (meth == NULL)
+ dief("failed to obtain QAT RSA method table\n");
+ size_t siglen;
+ if (!meth->sign_raw(req->data.rsa, &siglen, req->data.output, rsa_size, req->data.digestsign.padded, padded_len, padding))
+ dief("sign_raw failure\n");
+ if (siglen != 0)
+ dief("sign_raw completed synchronously unexpectedly\n");
+
+ buf->processing = 1;
+ register_wait_fd(req);
+}
+
+static void bssl_offload_decrypt(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const void *src, size_t len)
+{
+ struct engine_request *req = bssl_offload_create_request(buf, pkey);
+
+ /* dispatch RSA calculation */
+ RSA_METHOD *meth = bssl_engine_get_rsa_method();
+ if (meth == NULL)
+ dief("failed to obtain QAT RSA method table\n");
+ size_t outlen;
+ if (!meth->decrypt(req->data.rsa, &outlen, req->data.output, len, src, len, RSA_NO_PADDING))
+ dief("RSA decrypt failure\n");
+ if (outlen != 0)
+ dief("RSA decrypt completed synchronously unexppctedly\n");
+
+ buf->processing = 1;
+ register_wait_fd(req);
+}
+
+#endif
+
 static int digestsign_stub(neverbleed_iobuf_t *buf)
 {
 size_t key_index, md_nid, signlen;
 void *signdata;
+ size_t rsa_pss;
 EVP_PKEY *pkey;
 const EVP_MD *md;
 
 /* parse input */
 if (iobuf_shift_num(buf, &key_index) != 0 || iobuf_shift_num(buf, &md_nid) != 0 ||
- (signdata = iobuf_shift_bytes(buf, &signlen)) == NULL) {
+ (signdata = iobuf_shift_bytes(buf, &signlen)) == NULL || iobuf_shift_num(buf, &rsa_pss) != 0) {
 errno = 0;
 warnf("%s: failed to parse request", __FUNCTION__);
 return -1;
@@ -920,6 +1146,13 @@
 md = NULL;
 }
 
+#if USE_OFFLOAD && defined(OPENSSL_IS_BORINGSSL)
+ if (use_offload && EVP_PKEY_id(pkey) == EVP_PKEY_RSA) {
+ bssl_offload_digestsign(buf, pkey, md, signdata, signlen, rsa_pss);
+ return 0;
+ }
+#endif
+
 /* generate signature */
 EVP_MD_CTX *mdctx = NULL;
 EVP_PKEY_CTX *pkey_ctx = NULL;
@@ -930,7 +1163,7 @@
 goto Softfail;
 if (EVP_DigestSignInit(mdctx, &pkey_ctx, md, NULL, pkey) != 1)
 goto Softfail;
- if (EVP_PKEY_id(pkey) == EVP_PKEY_RSA) {
+ if (EVP_PKEY_id(pkey) == EVP_PKEY_RSA && rsa_pss) {
 if (EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING) != 1 ||
 EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, -1) != 1)
 goto Softfail;
@@ -963,10 +1196,12 @@
 goto Respond;
 }
 
-void neverbleed_start_digestsign(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const EVP_MD *md, const void *input, size_t len)
+void neverbleed_start_digestsign(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const EVP_MD *md, const void *input, size_t len,
+ int rsa_pss)
 {
 struct st_neverbleed_rsa_exdata_t *exdata;
 struct st_neverbleed_thread_data_t *thdata;
+ const char *cmd = "digestsign";
 
 /* obtain reference */
 switch (EVP_PKEY_base_id(pkey)) {
@@ -974,6 +1209,7 @@
 RSA *rsa = EVP_PKEY_get1_RSA(pkey); /* get0 is available not available in OpenSSL 1.0.2 */
 get_privsep_data(rsa, &exdata, &thdata);
 RSA_free(rsa);
+ cmd = "digestsign-rsa";
 } break;
 #ifdef NEVERBLEED_ECDSA
 case EVP_PKEY_EC:
@@ -986,10 +1222,11 @@
 }
 
 *buf = (neverbleed_iobuf_t){NULL};
- iobuf_push_str(buf, "digestsign");
+ iobuf_push_str(buf, cmd);
 iobuf_push_num(buf, exdata->key_index);
 iobuf_push_num(buf, md != NULL ? (size_t)EVP_MD_nid(md) : SIZE_MAX);
 iobuf_push_bytes(buf, input, len);
+ iobuf_push_num(buf, rsa_pss);
 }
 
 void neverbleed_finish_digestsign(neverbleed_iobuf_t *buf, void **digest, size_t *digest_len)
@@ -1007,6 +1244,74 @@
 iobuf_dispose(buf);
 }
 
+static int decrypt_stub(neverbleed_iobuf_t *buf)
+{
+ size_t key_index, srclen;
+ void *src;
+ EVP_PKEY *pkey;
+ RSA *rsa;
+ uint8_t decryptbuf1024;
+ int decryptlen;
+
+ /* parse input */
+ if (iobuf_shift_num(buf, &key_index) != 0 || (src = iobuf_shift_bytes(buf, &srclen)) == NULL) {
+ errno = 0;
+ warnf("%s: failed to parse request", __FUNCTION__);
+ return -1;
+ }
+ if ((pkey = daemon_get_pkey(key_index)) == NULL) {
+ errno = 0;
+ warnf("%s: invalid key index:%zu", __FUNCTION__, key_index);
+ return -1;
+ }
+
+ rsa = EVP_PKEY_get1_RSA(pkey); /* get0 is available not available in OpenSSL 1.0.2 */
+ assert(rsa != NULL);
+ assert(sizeof(decryptbuf) >= RSA_size(rsa));
+
+#if USE_OFFLOAD && defined(OPENSSL_IS_BORINGSSL)
+ if (use_offload) {
+ bssl_offload_decrypt(buf, pkey, src, srclen);
+ return 0;
+ }
+#endif
+
+ if ((decryptlen = RSA_private_decrypt(srclen, src, decryptbuf, rsa, RSA_NO_PADDING)) == -1) {
+ errno = 0;
+ warnf("RSA decryption error");
+ decryptlen = 0; /* soft failure */
+ }
+
+ iobuf_dispose(buf);
+ iobuf_push_bytes(buf, decryptbuf, decryptlen);
+ RSA_free(rsa);
+ EVP_PKEY_free(pkey);
+ return 0;
+}
+
+void neverbleed_start_decrypt(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const void *input, size_t len)
+{
+ struct st_neverbleed_rsa_exdata_t *exdata;
+ struct st_neverbleed_thread_data_t *thdata;
+
+ {
+ RSA *rsa = EVP_PKEY_get1_RSA(pkey); /* get0 is available not available in OpenSSL 1.0.2 */
+ assert(rsa != NULL);
+ get_privsep_data(rsa, &exdata, &thdata);
+ RSA_free(rsa);
+ }
+
+ *buf = (neverbleed_iobuf_t){NULL};
+ iobuf_push_str(buf, "decrypt");
+ iobuf_push_num(buf, exdata->key_index);
+ iobuf_push_bytes(buf, input, len);
+}
+
+void neverbleed_finish_decrypt(neverbleed_iobuf_t *buf, void **digest, size_t *digest_len)
+{
+ neverbleed_finish_digestsign(buf, digest, digest_len);
+}
+
 int neverbleed_load_private_key_file(neverbleed_t *nb, SSL_CTX *ctx, const char *fn, char *errbuf)
 {
 struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
@@ -1037,14 +1342,14 @@
 }
 #ifdef NEVERBLEED_ECDSA
 case NEVERBLEED_TYPE_ECDSA: {
- char *ec_pubkeystr;
- size_t curve_name;
+ size_t curve_name, pubkey_len;
+ void *pubkey_bytes;
 
- if (iobuf_shift_num(&buf, &curve_name) != 0 || (ec_pubkeystr = iobuf_shift_str(&buf)) == NULL) {
+ if (iobuf_shift_num(&buf, &curve_name) != 0 || (pubkey_bytes = iobuf_shift_bytes(&buf, &pubkey_len)) == NULL) {
 errno = 0;
 dief("failed to parse response");
 }
- pkey = ecdsa_create_pkey(nb, index, (int)curve_name, ec_pubkeystr);
+ pkey = ecdsa_create_pkey(nb, index, (int)curve_name, pubkey_bytes, pubkey_len);
 break;
 }
 #endif
@@ -1084,8 +1389,8 @@
 EVP_PKEY *pkey = NULL;
 #ifdef NEVERBLEED_ECDSA
 const EC_GROUP *ec_group;
- BIGNUM *ec_pubkeybn = NULL;
- char *ec_pubkeystr = NULL;
+ void *ec_pubkeybytes = NULL;
+ size_t ec_pubkeylen;
 #endif
 
 if ((fn = iobuf_shift_str(buf)) == NULL) {
@@ -1123,16 +1428,14 @@
 type = NEVERBLEED_TYPE_ECDSA;
 ec_group = EC_KEY_get0_group(ec_key);
 ec_pubkey = EC_KEY_get0_public_key(ec_key);
- ec_pubkeybn = BN_new();
- if (!EC_POINT_point2bn(ec_group, ec_pubkey, POINT_CONVERSION_COMPRESSED, ec_pubkeybn, NULL)) {
- type = NEVERBLEED_TYPE_ERROR;
- snprintf(errbuf, sizeof(errbuf), "failed to convert ECDSA public key to BIGNUM");
- goto Respond;
- }
- ec_pubkeystr = BN_bn2hex(ec_pubkeybn);
+ ec_pubkeylen = EC_POINT_point2oct(ec_group, ec_pubkey, POINT_CONVERSION_UNCOMPRESSED, NULL, 0, NULL);
+ if (!(ec_pubkeylen > 0 && (ec_pubkeybytes = malloc(ec_pubkeylen)) != NULL &&
+ EC_POINT_point2oct(ec_group, ec_pubkey, POINT_CONVERSION_UNCOMPRESSED, ec_pubkeybytes, ec_pubkeylen, NULL) ==
+ ec_pubkeylen))
+ dief("failed to serialize EC public key");
 break;
 #else
- snprintf(errbuf, sizeof(errbuf), "ECDSA support requires OpenSSL >= 1.1.0 or LibreSSL >= 2.9.1");
+ snprintf(errbuf, sizeof(errbuf), "ECDSA support requires OpenSSL >= 1.1.0, LibreSSL >= 2.9.1, or BoringSSL");
 goto Respond;
 #endif
 }
@@ -1156,7 +1459,7 @@
 #ifdef NEVERBLEED_ECDSA
 case NEVERBLEED_TYPE_ECDSA:
 iobuf_push_num(buf, EC_GROUP_get_curve_name(ec_group));
- iobuf_push_str(buf, ec_pubkeystr);
+ iobuf_push_bytes(buf, ec_pubkeybytes, ec_pubkeylen);
 break;
 #endif
 default:
@@ -1171,10 +1474,8 @@
 if (nstr != NULL)
 OPENSSL_free(nstr);
 #ifdef NEVERBLEED_ECDSA
- if (ec_pubkeystr != NULL)
- OPENSSL_free(ec_pubkeystr);
- if (ec_pubkeybn != NULL)
- BN_free(ec_pubkeybn);
+ if (ec_pubkeybytes != NULL)
+ free(ec_pubkeybytes);
 #endif
 if (fp != NULL)
 fclose(fp);
@@ -1347,27 +1648,19 @@
 return 1;
 
 neverbleed_iobuf_t buf = {NULL};
- size_t ret;
-
 iobuf_push_str(&buf, "del_pkey");
 iobuf_push_num(&buf, exdata->key_index);
- iobuf_transaction(&buf, thdata);
-
- if (iobuf_shift_num(&buf, &ret) != 0) {
- errno = 0;
- dief("failed to parse response");
- }
- iobuf_dispose(&buf);
+ // "del_pkey" command is fire-and-forget, it cannot fail, so doesn't have a response
+ iobuf_transaction_no_response(&buf, thdata);
 
- return (int)ret;
+ free(exdata);
+ return 1;
 }
 
 static int del_pkey_stub(neverbleed_iobuf_t *buf)
 {
 size_t key_index;
 
- int ret = 0;
-
 if (iobuf_shift_num(buf, &key_index) != 0) {
 errno = 0;
 warnf("%s: failed to parse request", __FUNCTION__);
@@ -1382,117 +1675,279 @@
 daemon_vars.keys.first_empty = key_index;
 } else {
 warnf("%s: invalid key index %zu", __FUNCTION__, key_index);
- goto respond;
 }
 pthread_mutex_unlock(&daemon_vars.keys.lock);
 
- ret = 1;
+ return 0;
+}
+
+#define offload_start(stub, buf) ((stub)(buf))
+
+#if USE_OFFLOAD
+#ifdef OPENSSL_IS_BORINGSSL
+
+static int offload_resume(struct engine_request *req)
+{
+ size_t outlen;
+
+ if (do_epoll_ctl(conn_ctx.epollfd, EPOLL_CTL_DEL, req->async_fd, NULL) != 0)
+ dief("epoll_ctl failed:%d\n", errno);
+
+ /* get result */
+ if (bssl_qat_async_ctx_copy_result(req->async_ctx, req->data.output, &outlen, sizeof(req->data.output)) != 0)
+ dief("failed to obtain offload result\n");
+ if (outlen > sizeof(req->data.output))
+ dief("RSA output is unexpectedly large\n");
+ /* save the result */
+ iobuf_dispose(req->buf);
+ iobuf_push_bytes(req->buf, req->data.output, outlen);
+ /* cleanup */
+ RSA_free(req->data.rsa);
+
+ req->buf->processing = 0;
+ free_req(req);
 
-respond:
- iobuf_dispose(buf);
- iobuf_push_num(buf, ret);
 return 0;
 }
 
+#else
+
+static int offload_jobfunc(void *_req)
+{
+ struct engine_request *req = *(void **)_req;
+ return req->stub(req->buf);
+}
+
+#undef offload_start
+static int offload_start(int (*stub)(neverbleed_iobuf_t *), neverbleed_iobuf_t *buf)
+{
+ /* if engine is not used, run the stub synchronously */
+ if (!use_offload)
+ return stub(buf);
+
+ buf->processing = 1;
+
+ struct engine_request *req = malloc(sizeof(*req));
+ if (req == NULL)
+ dief("no memory");
+ *req = (struct engine_request){.buf = buf, .async_fd = -1, .stub = stub};
+
+ if ((req->async.ctx = ASYNC_WAIT_CTX_new()) == NULL)
+ dief("failed to create ASYNC_WAIT_CTX\n");
+
+ int ret;
+ switch (ASYNC_start_job(&req->async.job, req->async.ctx, &ret, offload_jobfunc, &req, sizeof(req))) {
+ case ASYNC_PAUSE: /* operation running async; register fd and bail out */
+ register_wait_fd(req);
+ return 0;
+ case ASYNC_FINISH: /* completed synchronously */
+ break;
+ default:
+ dief("ASYNC_start_job errored\n");
+ break;
+ }
+
+ free_req(req);
+
+ return ret;
+}
+
+static int offload_resume(struct engine_request *req)
+{
+ int ret;
+
+ switch (ASYNC_start_job(&req->async.job, req->async.ctx, &ret, offload_jobfunc, &req, sizeof(req))) {
+ case ASYNC_PAUSE:
+ /* assume that wait fd is unchanged */
+ return 0;
+ case ASYNC_FINISH:
+ if (do_epoll_ctl(conn_ctx.epollfd, EPOLL_CTL_DEL, req->async_fd, NULL) != 0)
+ dief("epoll_ctl failed:%d\n", errno);
+ break;
+ default:
+ dief("ASYNC_start_job failed\n");
+ break;
+ }
+
+ /* job done */
+ req->buf->processing = 0;
+ free_req(req);
+
+ return ret;
+}
+
+#endif
+#endif
+
 /**
 * This function waits for the provided socket to become readable, then calls `nanosleep(1)` before returning.
 * The intention behind sleep is to provide the application to complete its event loop before the neverbleed process starts
 * spending CPU cycles on the time-consuming RSA operation.
+ * In addition, when QAT is used, this function processes completion notifications from QAT and sends the responses.
 */
-static void yield_on_data(int fd)
+static int wait_for_data(int cleanup)
 {
+#if USE_OFFLOAD
+
+ struct epoll_event events20;
+ int has_read = 0, num_events;
+
+ do {
+ while ((num_events = epoll_wait(conn_ctx.epollfd, events, sizeof(events) / sizeof(events0), -1)) == -1 &&
+ (errno == EAGAIN || errno == EINTR))
+ ;
+ if (num_events == -1)
+ dief("epoll_wait(2):%d\n", errno);
+ for (int i = 0; i < num_events; ++i) {
+ if (eventsi.data.ptr == NULL) {
+ has_read = 1;
+ } else {
+ struct engine_request *req = eventsi.data.ptr;
+ int ret;
+ if ((ret = offload_resume(req)) != 0)
+ return ret;
+ if ((ret = send_responses(0)) != 0)
+ return ret;
+ }
+ }
+ } while (!has_read);
+
+#else
+
 fd_set rfds;
 int ret;
 FD_ZERO(&rfds);
- FD_SET(fd, &rfds);
+ if (!cleanup)
+ FD_SET(conn_ctx.sockfd, &rfds);
 
- while ((ret = select(fd + 1, &rfds, NULL, NULL, NULL)) == -1 && (errno == EAGAIN || errno == EINTR))
+ while ((ret = select(conn_ctx.sockfd + 1, &rfds, NULL, NULL, NULL)) == -1 && (errno == EAGAIN || errno == EINTR))
 ;
- if (ret == -1) {
- dief("select(2)\n");
- } else if (ret > 0) {
- // yield when data is available
- struct timespec tv = {.tv_nsec = 1};
- (void)nanosleep(&tv, NULL);
- } else {
- dief("unreachable, no timeout configured");
- }
+ if (ret == -1)
+ dief("select(2):%d\n", errno);
+
+#endif
+
+ // yield when data is available
+ struct timespec tv = {.tv_nsec = 1};
+ (void)nanosleep(&tv, NULL);
+
+ return 0;
 }
 
 static void *daemon_conn_thread(void *_sock_fd)
 {
- int sock_fd = (int)((char *)_sock_fd - (char *)NULL);
- neverbleed_iobuf_t buf = {NULL};
- unsigned char auth_tokenNEVERBLEED_AUTH_TOKEN_SIZE;
+ conn_ctx.sockfd = (int)((char *)_sock_fd - (char *)NULL);
+ conn_ctx.responses.next = &conn_ctx.responses.first;
+ neverbleed_iobuf_t *buf = NULL;
 
- /* authenticate */
- if (read_nbytes(sock_fd, &auth_token, sizeof(auth_token)) != 0) {
- warnf("failed to receive authencication token from client");
- goto Exit;
+#if USE_OFFLOAD
+ if ((conn_ctx.epollfd = epoll_create1(EPOLL_CLOEXEC)) == -1)
+ dief("epoll_create1 failed:%d\n", errno);
+ {
+ struct epoll_event ev = {.events = EPOLLIN};
+ if (do_epoll_ctl(conn_ctx.epollfd, EPOLL_CTL_ADD, conn_ctx.sockfd, &ev) != 0)
+ dief("epoll_ctl failed:%d\n", errno);
 }
- if (memcmp(auth_token, daemon_vars.nb->auth_token, NEVERBLEED_AUTH_TOKEN_SIZE) != 0) {
- warnf("client authentication failed");
- goto Exit;
+#endif
+
+ { /* authenticate */
+ unsigned char auth_tokenNEVERBLEED_AUTH_TOKEN_SIZE;
+ if (read_nbytes(conn_ctx.sockfd, &auth_token, sizeof(auth_token)) != 0) {
+ warnf("failed to receive authencication token from client");
+ goto Exit;
+ }
+ if (memcmp(auth_token, daemon_vars.nb->auth_token, NEVERBLEED_AUTH_TOKEN_SIZE) != 0) {
+ warnf("client authentication failed");
+ goto Exit;
+ }
 }
 
 while (1) {
+ if (wait_for_data(0) != 0)
+ break;
+ free(buf);
+ buf = malloc(sizeof(*buf));
+ if (buf == NULL)
+ dief("no memory");
+ *buf = (neverbleed_iobuf_t){};
 char *cmd;
- yield_on_data(sock_fd);
- if (iobuf_read(&buf, sock_fd) != 0) {
+ if (iobuf_read(buf, conn_ctx.sockfd) != 0) {
 if (errno != 0)
 warnf("read error");
 break;
 }
- if ((cmd = iobuf_shift_str(&buf)) == NULL) {
+ if ((cmd = iobuf_shift_str(buf)) == NULL) {
 errno = 0;
 warnf("failed to parse request");
 break;
 }
+#if !defined(OPENSSL_IS_BORINGSSL)
 if (strcmp(cmd, "priv_enc") == 0) {
- if (priv_enc_stub(&buf) != 0)
+ if (offload_start(priv_enc_stub, buf) != 0)
 break;
 } else if (strcmp(cmd, "priv_dec") == 0) {
- if (priv_dec_stub(&buf) != 0)
+ if (offload_start(priv_dec_stub, buf) != 0)
 break;
 } else if (strcmp(cmd, "sign") == 0) {
- if (sign_stub(&buf) != 0)
+ if (offload_start(sign_stub, buf) != 0)
 break;
 #ifdef NEVERBLEED_ECDSA
 } else if (strcmp(cmd, "ecdsa_sign") == 0) {
- if (ecdsa_sign_stub(&buf) != 0)
+ if (ecdsa_sign_stub(buf) != 0)
 break;
 #endif
- } else if (strcmp(cmd, "digestsign") == 0) {
- if (digestsign_stub(&buf) != 0)
+ } else
+#endif
+ if (strcmp(cmd, "digestsign") == 0) {
+ if (digestsign_stub(buf) != 0)
+ break;
+ } else if (strcmp(cmd, "digestsign-rsa") == 0) {
+ if (offload_start(digestsign_stub, buf) != 0)
+ break;
+ } else if (strcmp(cmd, "decrypt") == 0) {
+ if (offload_start(decrypt_stub, buf) != 0)
 break;
 } else if (strcmp(cmd, "load_key") == 0) {
- if (load_key_stub(&buf) != 0)
+ if (load_key_stub(buf) != 0)
 break;
 } else if (strcmp(cmd, "del_pkey") == 0) {
- if (del_pkey_stub(&buf) != 0)
+ if (del_pkey_stub(buf) != 0)
 break;
+ iobuf_dispose(buf);
+ // "del_pkey" command is fire-and-forget, it cannot fail, so doesn't have a response
+ continue;
 } else if (strcmp(cmd, "setuidgid") == 0) {
- if (setuidgid_stub(&buf) != 0)
+ if (setuidgid_stub(buf) != 0)
 break;
 #if NEVERBLEED_HAS_PTHREAD_SETAFFINITY_NP
 } else if (strcmp(cmd, "setaffinity") == 0) {
- if (setaffinity_stub(&buf) != 0)
+ if (setaffinity_stub(buf) != 0)
 break;
 #endif
 } else {
 warnf("unknown command:%s", cmd);
 break;
 }
- if (iobuf_write(&buf, sock_fd) != 0) {
- warnf(errno != 0 ? "write error" : "connection closed by client");
+ /* add response to chain */
+ *conn_ctx.responses.next = buf;
+ conn_ctx.responses.next = &buf->next;
+ buf = NULL; /* do not free */
+
+ /* send responses if possible */
+ if (send_responses(0) != 0)
 break;
- }
- iobuf_dispose(&buf);
 }
 
 Exit:
- iobuf_dispose(&buf);
- close(sock_fd);
+ free(buf);
+ /* run the loop while async ops are running */
+ while (conn_ctx.responses.first != NULL)
+ wait_for_data(1);
+
+ close(conn_ctx.sockfd);
+#ifdef __linux
+ close(conn_ctx.epollfd);
+#endif
 
 return NULL;
 }
@@ -1525,7 +1980,7 @@
 }
 for (k = 0; k < maxfd; k++) {
 if (k == listen_fd || k == close_notify_fd)
- continue;
+ continue;
 switch (k) {
 case STDOUT_FILENO:
 case STDERR_FILENO:
@@ -1548,6 +2003,28 @@
 pthread_attr_init(&thattr);
 pthread_attr_setdetachstate(&thattr, 1);
 
+ switch (neverbleed_offload) {
+ case NEVERBLEED_OFFLOAD_QAT_ON:
+ case NEVERBLEED_OFFLOAD_QAT_AUTO: {
+#if USE_OFFLOAD && defined(OPENSSL_IS_BORINGSSL)
+ ENGINE_load_qat();
+ bssl_qat_set_default_string("RSA");
+ use_offload = ENGINE_QAT_PTR_GET() != NULL;
+#elif USE_OFFLOAD && !defined(OPENSSL_IS_BORINGSSL)
+ ENGINE *qat = ENGINE_by_id("qatengine");
+ if (qat != NULL && ENGINE_init(qat)) {
+ if (!ENGINE_set_default_RSA(qat))
+ dief("failed to assign RSA operations to QAT\n");
+ use_offload = 1;
+ }
+#endif
+ if (!use_offload && neverbleed_offload == NEVERBLEED_OFFLOAD_QAT_ON)
+ dief("use of QAT is forced but unavailable\n");
+ } break;
+ default:
+ break;
+ }
+
 if (pthread_create(&tid, &thattr, daemon_close_notify_thread, (char *)NULL + close_notify_fd) != 0)
 dief("pthread_create failed");
 
@@ -1584,44 +2061,6 @@
 {
 int pipe_fds2 = {-1, -1}, listen_fd = -1;
 char *tempdir = NULL;
- const RSA_METHOD *rsa_default_method;
- RSA_METHOD *rsa_method;
-#ifdef NEVERBLEED_ECDSA
- const EC_KEY_METHOD *ecdsa_default_method;
- EC_KEY_METHOD *ecdsa_method;
-#endif
-
-#ifdef NEVERBLEED_OPAQUE_RSA_METHOD
- rsa_default_method = RSA_PKCS1_OpenSSL();
- rsa_method = RSA_meth_dup(rsa_default_method);
-
- rsa_finish = RSA_meth_get_finish(rsa_method);
-
- RSA_meth_set1_name(rsa_method, "privsep RSA method");
- RSA_meth_set_priv_enc(rsa_method, priv_enc_proxy);
- RSA_meth_set_priv_dec(rsa_method, priv_dec_proxy);
- RSA_meth_set_sign(rsa_method, sign_proxy);
- RSA_meth_set_finish(rsa_method, priv_rsa_finish);
-#else
- rsa_default_method = RSA_PKCS1_SSLeay();
- rsa_method = &static_rsa_method;
-
- rsa_finish = rsa_default_method->finish;
-
- rsa_method->rsa_pub_enc = rsa_default_method->rsa_pub_enc;
- rsa_method->rsa_pub_dec = rsa_default_method->rsa_pub_dec;
- rsa_method->rsa_verify = rsa_default_method->rsa_verify;
- rsa_method->bn_mod_exp = rsa_default_method->bn_mod_exp;
-#endif
-
-#ifdef NEVERBLEED_ECDSA
- ecdsa_default_method = EC_KEY_get_default_method();
- ecdsa_method = EC_KEY_METHOD_new(ecdsa_default_method);
-
- /* it seems sign_sig and sign_setup is not used in TLS ECDSA. */
- EC_KEY_METHOD_set_sign(ecdsa_method, ecdsa_sign_proxy, NULL, NULL);
- EC_KEY_METHOD_set_init(ecdsa_method, NULL, priv_ecdsa_finish, NULL, NULL, NULL, NULL);
-#endif
 
 /* setup the daemon */
 if (pipe(pipe_fds) != 0) {
@@ -1683,17 +2122,61 @@
 close(pipe_fds0);
 pipe_fds0 = -1;
 
- /* setup engine */
- if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") ||
- !ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method)
+#if defined(OPENSSL_IS_BORINGSSL)
+ nb->engine = NULL;
+#else
+ { /* setup engine */
+ const RSA_METHOD *rsa_default_method;
+ RSA_METHOD *rsa_method;
+#ifdef NEVERBLEED_ECDSA
+ const EC_KEY_METHOD *ecdsa_default_method;
+ EC_KEY_METHOD *ecdsa_method;
+#endif
+
+#ifdef NEVERBLEED_OPAQUE_RSA_METHOD
+ rsa_default_method = RSA_PKCS1_OpenSSL();
+ rsa_method = RSA_meth_dup(rsa_default_method);
+
+ rsa_finish = RSA_meth_get_finish(rsa_method);
+
+ RSA_meth_set1_name(rsa_method, "privsep RSA method");
+ RSA_meth_set_priv_enc(rsa_method, priv_enc_proxy);
+ RSA_meth_set_priv_dec(rsa_method, priv_dec_proxy);
+ RSA_meth_set_sign(rsa_method, sign_proxy);
+ RSA_meth_set_finish(rsa_method, priv_rsa_finish);
+#else
+ rsa_default_method = RSA_PKCS1_SSLeay();
+ rsa_method = &static_rsa_method;
+
+ rsa_finish = rsa_default_method->finish;
+
+ rsa_method->rsa_pub_enc = rsa_default_method->rsa_pub_enc;
+ rsa_method->rsa_pub_dec = rsa_default_method->rsa_pub_dec;
+ rsa_method->rsa_verify = rsa_default_method->rsa_verify;
+ rsa_method->bn_mod_exp = rsa_default_method->bn_mod_exp;
+#endif
+
 #ifdef NEVERBLEED_ECDSA
- || !ENGINE_set_EC(nb->engine, ecdsa_method)
+ ecdsa_default_method = EC_KEY_get_default_method();
+ ecdsa_method = EC_KEY_METHOD_new(ecdsa_default_method);
+
+ /* it seems sign_sig and sign_setup is not used in TLS ECDSA. */
+ EC_KEY_METHOD_set_sign(ecdsa_method, ecdsa_sign_proxy, NULL, NULL);
+ EC_KEY_METHOD_set_init(ecdsa_method, NULL, priv_ecdsa_finish, NULL, NULL, NULL, NULL);
 #endif
- ) {
- snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "failed to initialize the OpenSSL engine");
- goto Fail;
+
+ if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") ||
+ !ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method)
+#ifdef NEVERBLEED_ECDSA
+ || !ENGINE_set_EC(nb->engine, ecdsa_method)
+#endif
+ ) {
+ snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "failed to initialize the OpenSSL engine");
+ goto Fail;
+ }
+ ENGINE_add(nb->engine);
 }
- ENGINE_add(nb->engine);
+#endif
 
 /* setup thread key */
 pthread_key_create(&nb->thread_key, dispose_thread_data);
@@ -1719,4 +2202,5 @@
 }
 
 void (*neverbleed_post_fork_cb)(void) = NULL;
-void (*neverbleed_transaction_cb)(neverbleed_iobuf_t *) = NULL;
+void (*neverbleed_transaction_cb)(neverbleed_iobuf_t *, int) = NULL;
+enum neverbleed_offload_type neverbleed_offload = NEVERBLEED_OFFLOAD_OFF;

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/neverbleed/neverbleed.h -> _service:tar_scm:nghttp2-1.55.1.tar.xz/third-party/neverbleed/neverbleed.h Changed

@@ -26,6 +26,10 @@
 #include <sys/un.h>
 #include <openssl/engine.h>
 
+#ifdef __FreeBSD__
+#include <pthread_np.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -54,6 +58,8 @@
 char *start;
 char *end;
 size_t capacity;
+ struct st_neverbleed_iobuf_t *next;
+ unsigned processing : 1;
 } neverbleed_iobuf_t;
 
 /**
@@ -72,11 +78,20 @@
 /**
 * builds a digestsign request
 */
-void neverbleed_start_digestsign(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const EVP_MD *md, const void *input, size_t len);
+void neverbleed_start_digestsign(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const EVP_MD *md, const void *input, size_t len,
+ int rsa_pss);
 /**
 * parses a digestsign response
 */
 void neverbleed_finish_digestsign(neverbleed_iobuf_t *buf, void **digest, size_t *digest_len);
+/**
+ * builds a RSA decrypt request
+ */
+void neverbleed_start_decrypt(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const void *input, size_t len);
+/**
+ * parses a decrypt response
+ */
+void neverbleed_finish_decrypt(neverbleed_iobuf_t *buf, void **digest, size_t *digest_len);
 
 #if NEVERBLEED_HAS_PTHREAD_SETAFFINITY_NP
 /**
@@ -91,18 +106,29 @@
 */
 extern void (*neverbleed_post_fork_cb)(void);
 /**
- * An optional callback used for replacing `iobuf_transaction`; i.e., the logic that sends the request and receives the response. The
- * callback returns a boolean indicating if it handled the task. It may return false to delagate the task back to the default logic.
+ * An optional callback used for replacing `iobuf_transaction`; i.e., the logic that sends the request and receives the response.
+ *
+ * If `responseless` equals `1`, the ownership of stack-allocated `req` is given to the callback. In this case, `req` must be free'd using `neverbleed_iobuf_dispose`
 */
-extern void (*neverbleed_transaction_cb)(neverbleed_iobuf_t *);
+extern void (*neverbleed_transaction_cb)(neverbleed_iobuf_t *req, int responseless);
 
 typedef void (*neverbleed_cb)(int);
 
 int neverbleed_get_fd(neverbleed_t *nb);
 static size_t neverbleed_iobuf_size(neverbleed_iobuf_t *buf);
+void neverbleed_iobuf_dispose(neverbleed_iobuf_t *buf);
 void neverbleed_transaction_read(neverbleed_t *nb, neverbleed_iobuf_t *buf);
 void neverbleed_transaction_write(neverbleed_t *nb, neverbleed_iobuf_t *buf);
 
+/**
+ * if set to a non-zero value, RSA operations are offloaded
+ */
+extern enum neverbleed_offload_type {
+ NEVERBLEED_OFFLOAD_OFF = 0,
+ NEVERBLEED_OFFLOAD_QAT_ON,
+ NEVERBLEED_OFFLOAD_QAT_AUTO,
+} neverbleed_offload;
+
 /* inline function definitions */
 
 inline size_t neverbleed_iobuf_size(neverbleed_iobuf_t *buf)