开源软件构建与测试

Changes of Revision 2

_service:tar_scm:nghttp2.spec Changed

@@ -1,13 +1,13 @@
 Name:           nghttp2
-Version:        1.46.0
+Version:        1.52.0
 Release:        1
 Summary:        Contains the HTTP/2 client, server and proxy programs.
 License:        MIT
 URL:            https://nghttp2.org/
 Source0:        https://github.com/nghttp2/nghttp2/releases/download/v%{version}/%{name}-%{version}.tar.xz
 
-BuildRequires:  CUnit-devel c-ares-devel gcc-c++ libev-devel openssl-devel
-BuildRequires:  python3-devel systemd-devel zlib-devel
+BuildRequires:  CUnit-devel c-ares-devel gcc-c++ libev-devel openssl-devel automake
+BuildRequires:  python3-devel systemd-devel zlib-devel make libxml2-devel
 
 Requires:       libnghttp2 = %{version}-%{release}
 %{?systemd_requires}
@@ -38,8 +38,9 @@
 sed -e '1 s|^#!/.*python|&3|' -i script/fetch-ocsp-response
 
 %build
+autoreconf
 %configure PYTHON=%{__python3} --disable-hpack-tools --disable-python-bindings\
-    --without-libxml2 --without-spdylay
+    --with-libxml2 --disable-static
 %disable_rpath
 %make_build  V=1
 
@@ -59,7 +60,7 @@
 
 %check
 export "LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH"
-make %{?_smp_mflags}  check
+%make_build check
 
 %files
 %defattr(-,root,root)
@@ -81,7 +82,6 @@
 %doc README.rst
 %{_includedir}/nghttp2
 %{_libdir}/libnghttp2.so
-%{_libdir}/libnghttp2.a
 %{_libdir}/pkgconfig/libnghttp2.pc
 
 %files help
@@ -89,6 +89,27 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Mar 06 2023 xinghe <xinghe2@h-partners.com> - 1.52.0-1
+- Type:requirements
+- Id:NA
+- SUG:NA
+- DESC:update nghttp2 to 1.52.0
+
+* Tue Feb 28 2023 gaihuiying <eaglegai@163.com> - 1.47.0-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:delete *.a file
+
+* Wed Aug 31 2022 xingwei <xingwei14@h-partners.com> - 1.47.0-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:replace the use of strtoul and strol with parse_uint
+
+* Sat Jul 30 2022 tianlijing <tianlijing@kylinos.cn> - 1.47.0-1
+- update to 1.47.0
+
 * Sat Mar 19 2022 xihaochen <xihaochen@h-partners.com> - 1.46.0-1
 - Type:requirements
 - Id:NA

_service Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/android-make Deleted

@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# nghttp2 - HTTP/2 C Library
-#
-# Copyright (c) 2013 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.
-
-if  -z "$ANDROID_HOME" ; then
-    echo 'No $ANDROID_HOME specified.'
-    exit 1
-fi
-TOOLCHAIN=$ANDROID_HOME/toolchain
-PATH=$TOOLCHAIN/bin:$PATH
-
-make "$@"

_service:tar_scm:nghttp2-1.46.0.tar.xz/cmake/FindCython.cmake Deleted

@@ -1,44 +0,0 @@
-# Find the Cython compiler.
-#
-# This code sets the following variables:
-#
-#  CYTHON_EXECUTABLE
-#
-# See also UseCython.cmake
-
-#=============================================================================
-# Copyright 2011 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Use the Cython executable that lives next to the Python executable
-# if it is a local installation.
-find_package( PythonInterp )
-if( PYTHONINTERP_FOUND )
-  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    HINTS ${_python_path}
-    )
-else()
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    )
-endif()
-
-
-include( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
-
-mark_as_advanced( CYTHON_EXECUTABLE )

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/__init__.py Deleted

@@ -1,34 +0,0 @@
-"""
-Sphinx Read the Docs theme.
-
-From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
-"""
-
-from os import path
-
-import sphinx
-
-
-__version__ = '0.5.0'
-__version_full__ = __version__
-
-
-def get_html_theme_path():
-    """Return list of HTML theme paths."""
-    cur_dir = path.abspath(path.dirname(path.dirname(__file__)))
-    return cur_dir
-
-
-# See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package
-def setup(app):
-    if sphinx.version_info >= (1, 6, 0):
-        # Register the theme that can be referenced without adding a theme path
-        app.add_html_theme('sphinx_rtd_theme', path.abspath(path.dirname(__file__)))
-
-    if sphinx.version_info >= (1, 8, 0):
-        # Add Sphinx message catalog for newer versions of Sphinx
-        # See http://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_message_catalog
-        rtd_locale_path = path.join(path.abspath(path.dirname(__file__)), 'locale')
-        app.add_message_catalog('sphinx', rtd_locale_path)
-
-    return {'parallel_read_safe': True, 'parallel_write_safe': True}

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/breadcrumbs.html Deleted

@@ -1,84 +0,0 @@
-{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
-
-{% if page_source_suffix %}
-{% set suffix = page_source_suffix %}
-{% else %}
-{% set suffix = source_suffix %}
-{% endif %}
-
-{% if meta is defined and meta is not none %}
-{% set check_meta = True %}
-{% else %}
-{% set check_meta = False %}
-{% endif %}
-
-{% if check_meta and 'github_url' in meta %}
-{% set display_github = True %}
-{% endif %}
-
-{% if check_meta and 'bitbucket_url' in meta %}
-{% set display_bitbucket = True %}
-{% endif %}
-
-{% if check_meta and 'gitlab_url' in meta %}
-{% set display_gitlab = True %}
-{% endif %}
-
-{% set display_vcs_links = display_vcs_links if display_vcs_links is defined else True %}
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-
-  <ul class="wy-breadcrumbs">
-    {% block breadcrumbs %}
-      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
-        {% for doc in parents %}
-          <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-        {% endfor %}
-      <li>{{ title }}</li>
-    {% endblock %}
-    {% block breadcrumbs_aside %}
-      <li class="wy-breadcrumbs-aside">
-        {% if hasdoc(pagename) and display_vcs_links %}
-          {% if display_github %}
-            {% if check_meta and 'github_url' in meta %}
-              
-              <a href="{{ meta'github_url' }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
-            {% else %}
-              <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
-            {% endif %}
-          {% elif display_bitbucket %}
-            {% if check_meta and 'bitbucket_url' in meta %}
-              
-              <a href="{{ meta'bitbucket_url' }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
-            {% else %}
-              <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}?mode={{ theme_vcs_pageview_mode|default("view") }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
-            {% endif %}
-          {% elif display_gitlab %}
-            {% if check_meta and 'gitlab_url' in meta %}
-              
-              <a href="{{ meta'gitlab_url' }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
-            {% else %}
-              <a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
-            {% endif %}
-          {% elif show_source and source_url_prefix %}
-            <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">{{ _('View page source') }}</a>
-          {% elif show_source and has_source and sourcename %}
-            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
-          {% endif %}
-        {% endif %}
-      </li>
-    {% endblock %}
-  </ul>
-
-  {% if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
-  <div class="rst-breadcrumbs-buttons" role="navigation" aria-label="breadcrumb navigation">
-      {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
-      {% endif %}
-      {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
-      {% endif %}
-  </div>
-  {% endif %}
-  <hr/>
-</div>

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/footer.html Deleted

@@ -1,63 +0,0 @@
-<footer>
-  {% if (theme_prev_next_buttons_location == 'bottom' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
-      {% endif %}
-      {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
-      {% endif %}
-    </div>
-  {% endif %}
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% set path = pathto('copyright') %}
-        {% set copyright = copyright|e %}
-        &copy; <a href="{{ path }}">{% trans %}Copyright{% endtrans %}</a> {{ copyright }}
-      {%- else %}
-        {% set copyright = copyright|e %}
-        &copy; {% trans %}Copyright{% endtrans %} {{ copyright }}
-      {%- endif %}
-    {%- endif %}
-
-    {%- if build_id and build_url %}
-      <span class="build">
-        {# Translators: Build is a noun, not a verb #}
-        {% trans %}Build{% endtrans %}
-        <a href="{{ build_url }}">{{ build_id }}</a>.
-      </span>
-    {%- elif commit %}
-      <span class="commit">
-        {# Translators: the phrase "revision" comes from Git, referring to a commit #}
-        {% trans %}Revision{% endtrans %} <code>{{ commit }}</code>.
-      </span>
-    {%- endif %}
-    {%- if last_updated %}
-      <span class="lastupdated">
-        {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-      </span>
-    {%- endif %}
-
-    </p>
-  </div>
-
-  {%- if show_sphinx %}
-    {% set sphinx_web = '<a href="https://www.sphinx-doc.org/">Sphinx</a>' %}
-    {% set readthedocs_web = '<a href="https://readthedocs.org">Read the Docs</a>'  %}
-    {# Translators: the variable "sphinx_web" is a link to the Sphinx project documentation with the text "Sphinx" #}
-    {% trans sphinx_web=sphinx_web, readthedocs_web=readthedocs_web %}Built with {{ sphinx_web }} using a{% endtrans %}
-    {# Translators: "theme" refers to a theme for Sphinx, which alters the appearance of the generated documenation #}
-    <a href="https://github.com/readthedocs/sphinx_rtd_theme">{% trans %}theme{% endtrans %}</a>
-    {# Translators: this is always used as "provided by Read the Docs", and should not imply Read the Docs is an author of the generated documentation. #}
-    {% trans %}provided by {{ readthedocs_web }}{% endtrans %}.
-  {%- endif %}
-
-  {%- block extrafooter %} {% endblock %}
-
-</footer>
-

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/layout.html Deleted

@@ -1,241 +0,0 @@
-{# TEMPLATE VAR SETTINGS #}
-{%- set url_root = pathto('', 1) %}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
-{%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' %}
-
-<!DOCTYPE html>
-<html class="{{ sphinx_writer }}" lang="{{ lang_attr }}" >
-<head>
-  <meta charset="utf-8">
-  {{ metatags }}
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  {% block htmltitle %}
-  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {% endblock %}
-
-  {# CSS #}
-  <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-  <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-  {%- for css in css_files %}
-    {%- if css|attr("rel") %}
-  <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
-    {%- else %}
-  <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
-    {%- endif %}
-  {%- endfor %}
-
-  {%- for cssfile in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {%- endfor %}
-
-  {# FAVICON #}
-  {% if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-  {% endif %}
-  {# CANONICAL URL #}
-  {% if theme_canonical_url %}
-    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
-  {% endif %}
-
-  {# JAVASCRIPTS #}
-  {%- block scripts %}
-  
-  {%- if not embedded %}
-  {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
-    {% if sphinx_version >= "1.8.0" %}
-      <script type="text/javascript" id="documentation_options" data-url_root="{{ pathto('', 1) }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script>
-      {%- for scriptfile in script_files %}
-        {{ js_tag(scriptfile) }}
-      {%- endfor %}
-    {% else %}
-      <script type="text/javascript">
-          var DOCUMENTATION_OPTIONS = {
-              URL_ROOT:'{{ url_root }}',
-              VERSION:'{{ release|e }}',
-              LANGUAGE:'{{ language }}',
-              COLLAPSE_INDEX:false,
-              FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-              HAS_SOURCE:  {{ has_source|lower }},
-              SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
-          };
-      </script>
-      {%- for scriptfile in script_files %}
-        <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-      {%- endfor %}
-    {% endif %}
-    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
-
-    {# OPENSEARCH #}
-    {%- if use_opensearch %}
-    <link rel="search" type="application/opensearchdescription+xml"
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {%- endif %}
-  {%- endif %}
-  {%- endblock %}
-
-  {%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
-    {%- endif %}
-  {%- endblock %}
-  {%- block extrahead %} {% endblock %}
-</head>
-
-<body class="wy-body-for-nav">
-
-  {% block extrabody %} {% endblock %}
-  <div class="wy-grid-for-nav">
-    {# SIDE NAV, TOGGLES ON MOBILE #}
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
-          {% block sidebartitle %}
-
-          {% if logo and theme_logo_only %}
-            <a href="{{ pathto(master_doc) }}">
-          {% else %}
-            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
-          {% endif %}
-
-          {% if logo %}
-            {# Not strictly valid HTML, but it's the only way to display/scale
-               it properly, without weird scripting or heaps of work
-            #}
-            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" alt="{{ _('Logo') }}"/>
-          {% endif %}
-          </a>
-
-          {% if theme_display_version %}
-            {%- set nav_version = version %}
-            {% if READTHEDOCS and current_version %}
-              {%- set nav_version = current_version %}
-            {% endif %}
-            {% if nav_version %}
-              <div class="version">
-                {{ nav_version }}
-              </div>
-            {% endif %}
-          {% endif %}
-
-          {% include "searchbox.html" %}
-
-          {% endblock %}
-        </div>
-
-        {% block navigation %}
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          {% block menu %}
-            {#
-              The singlehtml builder doesn't handle this toctree call when the
-              toctree is empty. Skip building this for now.
-            #}
-            {% if 'singlehtml' not in builder %}
-              {% set global_toc = toctree(maxdepth=theme_navigation_depth|int,
-                                          collapse=theme_collapse_navigation|tobool,
-                                          includehidden=theme_includehidden|tobool,
-                                          titles_only=theme_titles_only|tobool) %}
-            {% endif %}
-            {% if global_toc %}
-              {{ global_toc }}
-            {% else %}
-              
-              <div class="local-toc">{{ toc }}</div>
-            {% endif %}
-          {% endblock %}
-        </div>
-        {% endblock %}
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" aria-label="top navigation">
-        {% block mobile_nav %}
-          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="{{ pathto(master_doc) }}">{{ project }}</a>
-        {% endblock %}
-      </nav>
-
-
-      <div class="wy-nav-content">
-      {%- block content %}
-        {% if theme_style_external_links|tobool %}
-        <div class="rst-content style-external-links">
-        {% else %}
-        <div class="rst-content">
-        {% endif %}
-          {% include "breadcrumbs.html" %}
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-          {%- block document %}
-           <div itemprop="articleBody">
-            {% block body %}{% endblock %}
-           </div>
-           {% if self.comments()|trim %}
-           <div class="articleComments">
-            {% block comments %}{% endblock %}
-           </div>
-           {% endif%}
-          </div>
-          {%- endblock %}
-          {% include "footer.html" %}
-        </div>
-      {%- endblock %}
-      </div>
-
-    </section>
-
-  </div>
-  {% include "versions.html" %}
-
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
-      });
-  </script>
-
-  {# Do not conflict with RTD insertion of analytics script #}
-  {% if not READTHEDOCS %}
-    {% if theme_analytics_id %}
-    
-    <script>
-    (function(i,s,o,g,r,a,m){i'GoogleAnalyticsObject'=r;ir=ir||function(){
-      (ir.q=ir.q||).push(arguments)},ir.l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)0;a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '{{ theme_analytics_id }}', 'auto');
-    ga('send', 'pageview');
-    </script>
-
-    {% endif %}
-  {% endif %}
-
-  {%- block footer %} {% endblock %}
-
-</body>
-</html>

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/de Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po Deleted

@@ -1,143 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Tom Kunze <transifex.com@tomabrafix.de>, 2019
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Tom Kunze <transifex.com@tomabrafix.de>, 2019\n"
-"Language-Team: German (https://www.transifex.com/readthedocs/teams/101354/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Auf GitHub bearbeiten"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Auf Bitbucket bearbeiten"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Auf GitLab bearbeiten"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Quelltext anzeigen"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Weiter"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Zurück"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Copyright"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Build"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Zuletzt aktualisiert am %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Erstellt mit %(sphinx_web)s mit einem"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "bereitgestellt von %(readthedocs_web)s"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "%(docstitle)s durchsuchen"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Über diese Dokumentation"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Index"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Suche"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr "Bitte aktiviere JavaScript, um die Suchfunktion zu nutzen."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"Es wurden keine mit deiner Suchanfrage übereinstimmenden Dokumente gefunden."
-" Achte darauf, dass alle Wörter richtig geschrieben sind und dass genug "
-"Kategorien ausgewählt sind."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Dokumentation durchsuchen"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Versionen"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "Auf Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Projektübersicht"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Builds"
-
-#~ msgid "Docs"
-#~ msgstr "Dokumentation"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Kostenloses Dokumentationen-Hosting zur Verfügung gestellt von"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/en Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po Deleted

@@ -1,156 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 15:43-0600\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: en\n"
-"Language-Team: en <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr ""
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr ""
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr ""
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr ""
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr ""
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr ""
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr ""
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:121
-msgid "Documentation Home"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr ""
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr ""
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr ""
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words "
-"are spelled correctly and that you've selected enough categories."
-msgstr ""
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr ""
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr ""
-
-#~ msgid "Docs"
-#~ msgstr ""
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr ""
-

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/es Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po Deleted

@@ -1,164 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Anthony <aj@ohess.org>, 2019
-# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2020
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2020\n"
-"Language-Team: Spanish (https://www.transifex.com/readthedocs/teams/101354/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Editar en GitHub"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Editar en Bitbucket"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Editar en GitLab"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Ver código fuente de la página"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Siguiente"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Anterior"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Derechos de autor"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Construido"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Revisión"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Actualizado por última vez en %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Construido con %(sphinx_web)s usando un"
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "tema"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "proporcionado por %(readthedocs_web)s"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "Buscar en %(docstitle)s"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Sobre esta documentación"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Índice"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Búsqueda"
-
-#: sphinx_rtd_theme/layout.html:121
-msgid "Documentation Home"
-msgstr "Inicio de Documentación"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logotipo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr ""
-"Por favor, active JavaScript para habilitar la funcionalidad de búsqueda."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Resultados de la búsqueda"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"Su búsqueda no coincide con ningún documento. Por favor, asegúrese de que "
-"todas las palabras estén correctamente escritas y que usted haya "
-"seleccionado las suficientes categorías."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Buscar documentos"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Versiones"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "Descargas"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "En Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Página de Proyecto"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Construcciones"
-
-#~ msgid "Docs"
-#~ msgstr "Documentos"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Alojamiento gratuito de documentos proporcionado por"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/et Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po Deleted

@@ -1,155 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Anthony <aj@ohess.org>, 2020
-# Ivar Smolin <okul@linux.ee>, 2020
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Ivar Smolin <okul@linux.ee>, 2020\n"
-"Language-Team: Estonian (https://www.transifex.com/readthedocs/teams/101354/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Muuda GitHubis"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Muuda Bitbucketis"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Muuda GitLabis"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Vaata lehe lähtekoodi"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Järgmine"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Eelmine"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Autoriõigus"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Ehitus"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Redaktsioon"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Viimati uuendatud  %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Ehitatud %(sphinx_web)s'iga,"
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "kujundusteema"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "Otsi dokumendist %(docstitle)s"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Nende dokumentide kirjeldused"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Indeks"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Otsing"
-
-#: sphinx_rtd_theme/layout.html:121
-msgid "Documentation Home"
-msgstr "Dokumentatsiooni kodu"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr "Otsimisfunktsiooni lubamiseks aktiveeri palun JavaScript"
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Otsingu tulemused"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"Sinu otsingule ei vastanud ükski dokument. Palun veendu, et kõik sisestatud "
-"sõnad on õigesti kirjutatud ja sa oled valikud piisaval hulgal kategooriaid."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Otsi dokumente"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Versioonid"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "Allalaadimised"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "Saidil Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Projekti kodu"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Ehitused"
-
-#~ msgid "Docs"
-#~ msgstr "Dokumendid"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Dokumentatsiooni majutab tasuta"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/fr Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po Deleted

@@ -1,154 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Radina Matic <radina.matic@gmail.com>, 2020
-# Anthony <aj@ohess.org>, 2020
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Anthony <aj@ohess.org>, 2020\n"
-"Language-Team: French (https://www.transifex.com/readthedocs/teams/101354/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Éditer sur GitHub"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Éditer sur Bitbucket"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Éditer sur GitLab"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Afficher la source de la page"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Suivant"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Précédent"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Droits d'auteur"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Compilation"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Révision"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Dernière mise à jour le %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Compilé avec %(sphinx_web)s en utilisant un"
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "thème"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "fourni par %(readthedocs_web)s"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "Rechercher dans %(docstitle)s"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "À propos de cette documentation"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Index"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Rechercher"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr "Activez JavaScript pour accéder à la fonction de recherche."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Résultats de la recherche"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"Votre recherche ne correspond à aucun document. Assurez-vous que tous les "
-"mots sont correctement orthographiés et que vous avez sélectionné "
-"suffisamment de catégories."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Rechercher docs"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Versions"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "Téléchargements"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Accueil du projet"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Compilations"
-
-#~ msgid "Docs"
-#~ msgstr "Docs"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Hébergement gratuit de documents fourni par"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/nl Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po Deleted

@@ -1,157 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Jesse Tan, 2019
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Jesse Tan, 2019\n"
-"Language-Team: Dutch (https://www.transifex.com/readthedocs/teams/101354/nl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Bewerk op GitHub"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Bewerk op BitBucket"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Bewerk op GitLab"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Bekijk paginabron"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Volgende"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Vorige"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Copyright"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Bouwresultaat"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Revisie"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Laatste update op %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Gebouwd met %(sphinx_web)s met een"
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "thema"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "geleverd door %(readthedocs_web)s"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "Zoek binnen %(docstitle)s"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Over deze documenten"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Index"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Zoek"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr "Zet JavaScript aan om de zoekfunctie mogelijk te maken."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Zoekresultaten"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"Zoekpoging vond geen documenten. Zorg ervoor dat alle woorden correct zijn "
-"gespeld en dat voldoende categorieën zijn geselecteerd."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Zoek in documentatie"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Versies"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "Downloads"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "Op Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Project Home"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Bouwresultaten"
-
-#~ msgid "Docs"
-#~ msgstr "Documentatie"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Gratis hosting voor documentatie verzorgd door"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/pt_BR Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po Deleted

@@ -1,159 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2020
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>, 2020\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/readthedocs/teams/101354/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Editar no GitHub"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Editar no Bitbucket"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Editar no GitLab"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Ver código-fonte da página"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Próximo"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Anterior"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Copyright"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Compilação"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Revisão"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Última atualização em %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Compilado com %(sphinx_web)s usando um"
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "tema"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "fornecido por %(readthedocs_web)s"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "Pesquisar em %(docstitle)s"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Sobre esses documentos"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Índice"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Pesquisar"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr ""
-"Por favor, ative JavaScript para habilitar a funcionalidade de pesquisa."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Resultados da pesquisa"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"A sua pesquisa não encontrou nenhum documento correspondente. Verifique se "
-"todas as palavras estão escritas corretamente e se você selecionou "
-"categorias suficientes."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Pesquisar documentos"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Versões"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "Downloads"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "No Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Página inicial"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Compilações"
-
-#~ msgid "Docs"
-#~ msgstr "Docs"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Hospedagem de documentos livres fornecida por"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/ru Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po Deleted

@@ -1,158 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Dmitry Shachnev <mitya57@gmail.com>, 2019
-# lvv83 <vlozhkin83@gmail.com>, 2019
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: lvv83 <vlozhkin83@gmail.com>, 2019\n"
-"Language-Team: Russian (https://www.transifex.com/readthedocs/teams/101354/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Редактировать на GitHub"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Редактировать на BitBucket"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Редактировать на GitLab"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Просмотреть исходный код страницы"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Следующая"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Предыдущая"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Авторские права"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Сборка"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Ревизия"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Последний раз обновлено %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Собрано при помощи %(sphinx_web)s с использованием"
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "темы,"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "предоставленной %(readthedocs_web)s"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "Поиск в %(docstitle)s"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Об этих документах"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Алфавитный указатель"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Поиск"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Логотип"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr "Активируйте JavaScript, чтобы использовать функционал поиска."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Результаты поиска"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"По Вашему запросу не найдено результатов. Пожалуйста, проверьте, что все "
-"слова написаны правильно, и Вы выбрали нужные категории."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Поиск в документации"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Версии"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "Загрузки"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "На Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Домашняя страница проекта"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Сборки"
-
-#~ msgid "Docs"
-#~ msgstr "Документация"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Бесплатный хостинг документов, предоставленный"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/sphinx.pot Deleted

@@ -1,149 +0,0 @@
-# Translations template for sphinx_rtd_theme.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr ""
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr ""
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr ""
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr ""
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr ""
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr ""
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr ""
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr ""
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:121
-msgid "Documentation Home"
-msgstr ""
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr ""
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr ""
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr ""
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words "
-"are spelled correctly and that you've selected enough categories."
-msgstr ""
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr ""
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr ""
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr ""
-

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/sv Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po Deleted

@@ -1,158 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020\n"
-"Language-Team: Swedish (https://www.transifex.com/readthedocs/teams/101354/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "Editera på GitHub"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Editera på Bitbucket"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "Editera på GitLab"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Visa sidkälla"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Nästa"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Tillbaka"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Upphovsrätt"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Bygg"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Ändra"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Senast uppdaterad %(last_updated)s."
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "Gjord med %(sphinx_web)s med hjälp av"
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "tema"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "erhållet av %(readthedocs_web)s"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "Sök i %(docstitle)s"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Om dessa dokument"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Index"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Sök"
-
-#: sphinx_rtd_theme/layout.html:121
-msgid "Documentation Home"
-msgstr "Dokumentation Hem"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr ""
-"Var vänlig och aktivera JavaScript för att möjliggöra sökfunktionaliteten."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Sökresultat"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"Din sökning gav inga träffar. Var vänlig och se till att alla ord är rätt "
-"stavade och att du har valt tillräckligt många kategorier."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Sök i dokumentationen"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Versioner"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "Nerladdningar"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "På Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Projekt Hem"
-
-#~ msgid "Docs"
-#~ msgstr "Dokumentation"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Gratis dokumentations hysning erhållen av"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/tr Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po Deleted

@@ -1,147 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# BouRock, 2020
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: BouRock, 2020\n"
-"Language-Team: Turkish (https://www.transifex.com/readthedocs/teams/101354/tr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: tr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "GitHub'da Düzenle"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "Bitbucket'ta Düzenle"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "GitLab'ta Düzenle"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "Sayfa kaynağını görüntüle"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "Sonraki"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "Önceki"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "Telif hakkı"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "Oluşturma"
-
-#. the phrase "revision" comes from Git, referring to a commit
-#: sphinx_rtd_theme/footer.html:37
-msgid "Revision"
-msgstr "Gözden geçirme"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "Son olarak %(last_updated)s tarihinde güncellendi."
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "tema"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "kullanılarak %(readthedocs_web)s tarafından sağlanmasıyla oluşturuldu"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "%(docstitle)s içinde ara"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "Bu belgeler hakkında"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "Dizin"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "Arama"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr ""
-"Arama işlevselliğini etkinleştirmek için lütfen JavaScript'i etkinleştirin."
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "Arama Sonuçları"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr ""
-"Aramanız hiçbir belgeyle eşleşmedi. Lütfen tüm kelimelerin doğru "
-"yazıldığından ve yeterli kategori seçtiğinizden emin olun."
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "Belgeleri arayın"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "Sürümler"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "İndirmeler"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "Read the Docs Üzerinde"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "Proje Ana Sayfa"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "Oluşturmalar"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "Ücretsiz belge barındırmayı sağlayan"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/zh_CN Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po Deleted

@@ -1,151 +0,0 @@
-# English translations for sphinx_rtd_theme.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the sphinx_rtd_theme
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
-# Translators:
-# 王赛 <wangsai@bootcss.com>, 2019
-# Anthony <aj@ohess.org>, 2020
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-05-06 13:38-0600\n"
-"PO-Revision-Date: 2019-07-16 21:44+0000\n"
-"Last-Translator: Anthony <aj@ohess.org>, 2020\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/readthedocs/teams/101354/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
-msgid "Edit on GitHub"
-msgstr "在 GitHub 上修改"
-
-#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
-msgid "Edit on Bitbucket"
-msgstr "在 Bitbucket 上修改"
-
-#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
-msgid "Edit on GitLab"
-msgstr "在 GitLab 上修改"
-
-#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
-msgid "View page source"
-msgstr "查看页面源码"
-
-#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
-msgid "Next"
-msgstr "下一页"
-
-#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
-msgid "Previous"
-msgstr "上一页"
-
-#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
-#: sphinx_rtd_theme/layout.html:96
-msgid "Copyright"
-msgstr "版权所有"
-
-#. Build is a noun, not a verb
-#: sphinx_rtd_theme/footer.html:31
-msgid "Build"
-msgstr "构建"
-
-#: sphinx_rtd_theme/footer.html:41
-#, python-format
-msgid "Last updated on %(last_updated)s."
-msgstr "最后更新时间 %(last_updated)s。"
-
-#. the variable "sphinx_web" is a link to the Sphinx project documentation
-#. with
-#. the text "Sphinx"
-#: sphinx_rtd_theme/footer.html:52
-#, python-format
-msgid "Built with %(sphinx_web)s using a"
-msgstr "利用 %(sphinx_web)s 构建，使用了 "
-
-#. "theme" refers to a theme for Sphinx, which alters the appearance of the
-#. generated documenation
-#: sphinx_rtd_theme/footer.html:54
-msgid "theme"
-msgstr "主题"
-
-#. this is always used as "provided by Read the Docs", and should not imply
-#. Read the Docs is an author of the generated documentation.
-#: sphinx_rtd_theme/footer.html:56
-#, python-format
-msgid "provided by %(readthedocs_web)s"
-msgstr "由 %(readthedocs_web)s开发"
-
-#: sphinx_rtd_theme/layout.html:79
-#, python-format
-msgid "Search within %(docstitle)s"
-msgstr "在 %(docstitle)s中搜索"
-
-#: sphinx_rtd_theme/layout.html:87
-msgid "About these documents"
-msgstr "关于此文档"
-
-#: sphinx_rtd_theme/layout.html:90
-msgid "Index"
-msgstr "索引"
-
-#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
-msgid "Search"
-msgstr "搜索"
-
-#: sphinx_rtd_theme/layout.html:128
-msgid "Logo"
-msgstr "Logo"
-
-#: sphinx_rtd_theme/search.html:29
-msgid "Please activate JavaScript to enable the search functionality."
-msgstr "请启用 JavaScript 以便使用搜索功能"
-
-#. Search is a noun, not a verb
-#: sphinx_rtd_theme/search.html:37
-msgid "Search Results"
-msgstr "搜索结果"
-
-#: sphinx_rtd_theme/search.html:39
-msgid ""
-"Your search did not match any documents. Please make sure that all words are"
-" spelled correctly and that you've selected enough categories."
-msgstr "您的搜索没有匹配到任何文档。请确保所有单词拼写正确，并选择了足够多的类别。"
-
-#: sphinx_rtd_theme/searchbox.html:4
-msgid "Search docs"
-msgstr "在文档中搜索"
-
-#: sphinx_rtd_theme/versions.html:11
-msgid "Versions"
-msgstr "版本列表"
-
-#: sphinx_rtd_theme/versions.html:17
-msgid "Downloads"
-msgstr "下载链接"
-
-#. The phrase "Read the Docs" is not translated
-#: sphinx_rtd_theme/versions.html:24
-msgid "On Read the Docs"
-msgstr "托管于 Read the Docs"
-
-#: sphinx_rtd_theme/versions.html:26
-msgid "Project Home"
-msgstr "项目首页"
-
-#: sphinx_rtd_theme/versions.html:29
-msgid "Builds"
-msgstr "构建"
-
-#~ msgid "Docs"
-#~ msgstr "文档"
-
-#~ msgid "Free document hosting provided by"
-#~ msgstr "此文档免费托管于"

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/search.html Deleted

@@ -1,55 +0,0 @@
-{#
-    basic/search.html
-    ~~~~~~~~~~~~~~~~~
-
-    Template for the search page.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- extends "layout.html" %}
-{% set title = _('Search') %}
-{% set display_vcs_links = False %}
-{%- block scripts %}
-    {{ super() }}
-    <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}"></script>
-{%- endblock %}
-{% block footer %}
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
-  </script>
-  {# this is used when loading the search index using $.ajax fails,
-     such as on Chrome for documents on localhost #}
-  <script type="text/javascript" id="searchindexloader"></script>
-  {{ super() }}
-{% endblock %}
-{% block body %}
-  <noscript>
-  <div id="fallback" class="admonition warning">
-    <p class="last">
-      {% trans trimmed %}Please activate JavaScript to enable the search
-      functionality.{% endtrans %}
-    </p>
-  </div>
-  </noscript>
-
-  {% if search_performed %}
-    {# Translators: Search is a noun, not a verb #}
-    <h2>{{ _('Search Results') }}</h2>
-    {% if not search_results %}
-      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
-    {% endif %}
-  {% endif %}
-  <div id="search-results">
-  {% if search_results %}
-    <ul>
-    {% for href, caption, context in search_results %}
-      <li>
-        <a href="{{ pathto(item.href) }}">{{ caption }}</a>
-        <p class="context">{{ context|e }}</p>
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  </div>
-{% endblock %}

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/searchbox.html Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css Deleted

@@ -1,1 +0,0 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#FontAwesome) format("svg")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}
\ No newline at end of file

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg Deleted

@@ -1,2671 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg>
-<metadata>
-Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
- By ,,,
-Copyright Dave Gandy 2016. All rights reserved.
-</metadata>
-<defs>
-<font id="FontAwesome" horiz-adv-x="1536" >
-  <font-face 
-    font-family="FontAwesome"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="1792"
-    panose-1="0 0 0 0 0 0 0 0 0 0"
-    ascent="1536"
-    descent="-256"
-    bbox="-1.02083 -256.962 2304.6 1537.02"
-    underline-thickness="0"
-    underline-position="0"
-    unicode-range="U+0020-F500"
-  />
-<missing-glyph horiz-adv-x="896" 
-d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
-    <glyph glyph-name=".notdef" horiz-adv-x="896" 
-d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
-    <glyph glyph-name=".null" horiz-adv-x="0" 
- />
-    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
- />
-    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
- />
-    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
-d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-    <glyph glyph-name="music" unicode="&#xf001;" 
-d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
-t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
-d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
-t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
-d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
-t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
-M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
-d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
-q-18 -18 -44 -18z" />
-    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
-d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
-l502 -73q56 -9 56 -46z" />
-    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
-d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
-l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
-d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
-t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
-d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
-q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
-t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
-q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
-t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
-d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
-h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
-d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
-h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
-q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
-d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
-h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
-d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
-d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
-t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
-d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
-q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
-t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
-d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
-M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
-" />
-    <glyph glyph-name="off" unicode="&#xf011;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
-t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
-d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
-v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="cog" unicode="&#xf013;" 
-d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
-q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
-l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
-q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
-d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
-q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
-q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
-d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
-l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-    <glyph glyph-name="file_alt" unicode="&#xf016;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-" />
-    <glyph glyph-name="time" unicode="&#xf017;" 
-d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
-d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
-q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
-d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
-q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-    <glyph glyph-name="download" unicode="&#xf01a;" 
-d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
-t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="upload" unicode="&#xf01b;" 
-d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
-t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="inbox" unicode="&#xf01c;" 
-d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
-q25 -61 25 -123z" />
-    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
-d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="repeat" unicode="&#xf01e;" 
-d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
-l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-    <glyph glyph-name="refresh" unicode="&#xf021;" 
-d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
-q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
-q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
-d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
-M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
-t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
-t47 -113z" />
-    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
-d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
-d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
-t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
-d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
-t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
-t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
-t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
-t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
-t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
-t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
-d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
-M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
-d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
-M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-    <glyph glyph-name="tag" unicode="&#xf02b;" 
-d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
-l715 -714q37 -39 37 -91z" />
-    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
-d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
-l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
-d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
-q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
-q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
-t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
-d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
-d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
-v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
-d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
-q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
-d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
-q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
-q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
-d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
-q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
-t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
-t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
-d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
-q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
-d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
-t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
-q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
-q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-    <glyph glyph-name="text_width" unicode="&#xf035;" 
-d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
-t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
-q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
-t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
-t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
-t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
-h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
-t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
-t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
-d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
-t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
-q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
-t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
-q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
-d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
-t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
-q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
-d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
-t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
-q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
-d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
-q39 -17 39 -59z" />
-    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
-d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
-q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="pencil" unicode="&#xf040;" 
-d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
-q53 0 91 -38l235 -234q37 -39 37 -91z" />
-    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
-d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-    <glyph glyph-name="adjust" unicode="&#xf042;" 
-d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
-d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
-q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
-d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
-q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
-l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
-d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
-q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
-t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
-d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
-q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
-q24 -24 24 -57t-24 -57z" />
-    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
-d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
-t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
-d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
-    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
-d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
-q19 19 32 13t13 -32v-710q4 10 13 19z" />
-    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
-d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
-    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
-d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-    <glyph glyph-name="pause" unicode="&#xf04c;" 
-d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="stop" unicode="&#xf04d;" 
-d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
-    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
-q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
-    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
-    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
-d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
-d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
-d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
-d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
-t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
-d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
-d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
-q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
-d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="question_sign" unicode="&#xf059;" 
-d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
-q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
-d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
-t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
-d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
-q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
-q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
-d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
-l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
-t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
-d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
-t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
-d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
-t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
-d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
-t32.5 -90.5z" />
-    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
-d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
-d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
-q37 -39 37 -91z" />
-    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
-d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
-d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
-t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-    <glyph glyph-name="resize_full" unicode="&#xf065;" 
-d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
-q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="resize_small" unicode="&#xf066;" 
-d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
-t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
-d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
-d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
-d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
-q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
-q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-    <glyph glyph-name="gift" unicode="&#xf06b;" 
-d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
-q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
-t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
-d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
-q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
-t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
-d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
-q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
-d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
-t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
-d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
-q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
-q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
-" />
-    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
-d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
-q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
-d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
-q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
-d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
-M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
-q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
-h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
-d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
-t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
-v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
-t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
-d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
-q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="magnet" unicode="&#xf076;" 
-d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
-q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
-d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
-d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
-d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
-zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
-" />
-    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
-d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
-t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
-d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
-d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
-t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
-d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
-d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
-d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
-d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
-q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
-t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960z" />
-    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
-d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
-t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
-q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
-d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
-l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
-t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
-d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
-t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
-l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
-l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
-q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
-t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
-q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
-q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
-d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
-q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
-q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
-d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
-t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
-q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
-q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
-d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
-t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
-M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
-h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
-    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
-d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
-d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
-q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
-q224 0 351 -124t127 -344z" />
-    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
-d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
-q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
-d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
-q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
-d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
-t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
-d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
-q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="signin" unicode="&#xf090;" 
-d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
-q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
-d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
-t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
-q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="github_sign" unicode="&#xf092;" 
-d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
-q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
-t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
-q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
-d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
-t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-    <glyph glyph-name="lemon" unicode="&#xf094;" 
-d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
-q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
-q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
-q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
-    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
-d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
-q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
-t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
-d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
-q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
-d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
-q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
-d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
-t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
-t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
-" />
-    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
-d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
-q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
-d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-    <glyph glyph-name="github" unicode="&#xf09b;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
-q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
-t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
-q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
-M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
-    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
-d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
-t316.5 -131.5t131.5 -316.5z" />
-    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
-d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
-q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
-d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
-t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
-q187 -186 294 -425.5t120 -501.5z" />
-    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
-d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
-h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
-l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
-d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
-t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
-d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
-M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
-t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
-d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
-l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
-l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
-d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
-q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
-q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
-t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
-d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
-t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
-M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
-q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
-d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
-q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
-t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
-q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
-d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
-t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
-q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
-q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
-d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
-d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
-d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="globe" unicode="&#xf0ac;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
-q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
-q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
-q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
-t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
-q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
-q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
-t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
-t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
-q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
-q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
-q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
-t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
-q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
-q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
-d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
-t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
-d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
-t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
-d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
-d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
-t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
-d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
-l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
-" />
-    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
-d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
-t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
-t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
-t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
-d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
-l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
-t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
-q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
-d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
-" />
-    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
-d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
-d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
-q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
-q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
-q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
-q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
-d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
-h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
-d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
-l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
-z" />
-    <glyph glyph-name="save" unicode="&#xf0c7;" 
-d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
-h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
-d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
-d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
-t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
-d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
-t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
-M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
-d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
-q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
-t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
-q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
-d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
-l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
-l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-    <glyph glyph-name="underline" unicode="&#xf0cd;" 
-d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
-q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
-q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
-q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
-d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
-v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
-q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
-q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
-z" />
-    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
-d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
-l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
-d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
-t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
-t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
-d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
-q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
-q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
-t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
-t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
-d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
-h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
-d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
-q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
-    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
-d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
-v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
-d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
-d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
-d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
-d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
-d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
-d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
-d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
-d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
-d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
-q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
-d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
-q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-    <glyph glyph-name="undo" unicode="&#xf0e2;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
-t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
-d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
-t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
-q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
-q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
-d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
-t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
-t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
-q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
-d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
-q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
-t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
-d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
-t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
-t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
-q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
-d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
-d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
-q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
-z" />
-    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
-d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
-q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
-q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
-d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
-h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
-d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
-q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
-q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
-t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
-d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
-q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
-d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
-q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
-d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
-q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
-d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
-t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
-t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
-t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
-d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
-t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
-t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
-d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
-t66 -158z" />
-    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
-d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
-t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
-d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
-t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
-d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
-t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
-q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
-d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
-d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
-t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
-v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
-d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
-t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
-q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
-d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
-q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
-d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
-q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
-    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
-d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
-d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
-d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
-t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
-d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
-l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
-d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
-q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
-d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
-t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
-d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
-d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
-d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
-d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
-d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
-t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
-d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
-M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
-d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
-q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
-d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
-q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
-d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
-t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
-d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
-M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
-d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
-v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
-d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
-t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
-M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
-q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="circle" unicode="&#xf111;" 
-d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
-d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
-l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
-d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
-q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
-t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
-q0 -87 -27 -168q136 -160 136 -398z" />
-    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
-d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
-q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
-d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
-v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
-" />
-    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="smile" unicode="&#xf118;" 
-d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
-t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
-t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="frown" unicode="&#xf119;" 
-d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
-t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
-t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="meh" unicode="&#xf11a;" 
-d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
-t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
-d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
-t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
-t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
-d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
-h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
-h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
-q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
-h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
-d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
-h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
-q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
-d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
-q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
-q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
-q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
-d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
-t9 -23z" />
-    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
-d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
-l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
-d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
-q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
-d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
-l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
-d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
-d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
-v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
-d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
-q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
-q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
-d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
-q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
-l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
-t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
-d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
-t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
-d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
-q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
-d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-    <glyph glyph-name="superscript" unicode="&#xf12b;" 
-d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
-M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
-t-65.5 -51.5t-30.5 -63h232v80h126z" />
-    <glyph glyph-name="subscript" unicode="&#xf12c;" 
-d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
-M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
-h232v80h126z" />
-    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
-d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
-d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
-t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
-q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
-q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
-d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
-t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
-d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
-q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
-t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
-d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
-t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
-d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
-q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
-d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
-q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
-q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
-d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
-q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
-d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
-d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
-d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
-d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
-d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
-d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
-d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
-d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
-q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
-t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
-d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
-v-320h736z" />
-    <glyph glyph-name="bullseye" unicode="&#xf140;" 
-d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
-t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
-d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
-d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="_303" unicode="&#xf143;" 
-d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
-q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="play_sign" unicode="&#xf144;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
-q16 -8 32 -8q17 0 32 9z" />
-    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
-d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
-t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
-d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
-t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
-d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
-d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
-d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
-t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
-d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_312" unicode="&#xf14c;" 
-d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
-q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
-d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
-t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="compass" unicode="&#xf14e;" 
-d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="collapse" unicode="&#xf150;" 
-d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
-d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_317" unicode="&#xf152;" 
-d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
-t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
-d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
-t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
-l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
-d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
-q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
-d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
-t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
-t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
-t53 -63.5t31.5 -76.5t13 -94z" />
-    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
-d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
-q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
-d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
-l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
-d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
-q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
-d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
-t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
-q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
-d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
-l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
-t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-    <glyph glyph-name="file" unicode="&#xf15b;" 
-d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-    <glyph glyph-name="file_text" unicode="&#xf15c;" 
-d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
-q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
-d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
-v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
-l230 -662h70z" />
-    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
-d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
-v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
-v119h121z" />
-    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
-d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
-q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
-d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
-q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
-d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
-zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
-t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
-d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
-t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
-q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
-d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
-q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
-t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
-d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
-t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
-t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
-d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
-q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
-q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
-q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
-q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
-h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="youtube" unicode="&#xf167;" 
-d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
-q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
-q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
-q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
-q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
-d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
-q25 45 64 45h241q22 0 31 -15z" />
-    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
-d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
-l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
-d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
-l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
-q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
-    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
-d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
-d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
-    <glyph glyph-name="instagram" unicode="&#xf16d;" 
-d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
-q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
-t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
-q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
-    <glyph glyph-name="flickr" unicode="&#xf16e;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
-t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-    <glyph glyph-name="adn" unicode="&#xf170;" 
-d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
-d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
-t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
-t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
-t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
-d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
-t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
-M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
-d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
-q78 2 134 29z" />
-    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
-d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
-M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
-d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
-d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
-d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
-d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
-d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
-q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
-d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
-d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
-t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
-h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-    <glyph glyph-name="linux" unicode="&#xf17c;" 
-d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
-M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
-q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
-q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
-t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
-q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
-q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
-q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
-q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
-t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
-t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
-q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
-t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
-q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
-t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
-t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-    <glyph glyph-name="dribble" unicode="&#xf17d;" 
-d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
-t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
-q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
-t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="skype" unicode="&#xf17e;" 
-d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
-t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
-q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
-q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
-d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
-M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
-l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-    <glyph glyph-name="trello" unicode="&#xf181;" 
-d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
-q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
-d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
-q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
-d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
-M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="gittip" unicode="&#xf184;" 
-d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
-d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
-l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
-q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-    <glyph glyph-name="_366" unicode="&#xf186;" 
-d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
-t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
-d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
-q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
-d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
-q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
-t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
-d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
-t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
-q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
-q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
-q39 5 64 -2.5t31 -16.5z" />
-    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
-d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
-q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
-q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
-q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
-M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-    <glyph glyph-name="renren" unicode="&#xf18b;" 
-d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
-q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
-d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
-t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
-t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
-t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
-d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
-" />
-    <glyph glyph-name="_374" unicode="&#xf18e;" 
-d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
-t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
-d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
-t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_376" unicode="&#xf191;" 
-d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
-M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
-d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
-t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
-d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
-q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
-d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
-q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
-d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
-q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
-d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
-q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
-d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
-t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
-q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
-d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
-q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
-t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-    <glyph glyph-name="_384" unicode="&#xf199;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
-q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
-t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
-d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
-t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
-t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
-t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
-t273 -182.5t331.5 -68z" />
-    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
-d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
-d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
-q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
-d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
-q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-    <glyph glyph-name="_389" unicode="&#xf19e;" 
-d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
-q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
-d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
-t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
-    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
-d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
-t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
-q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
-t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_392" unicode="&#xf1a2;" 
-d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
-q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
-q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_393" unicode="&#xf1a3;" 
-d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
-v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
-t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
-d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
-v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-    <glyph glyph-name="_395" unicode="&#xf1a5;" 
-d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
-d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
-v-369h123z" />
-    <glyph glyph-name="_397" unicode="&#xf1a7;" 
-d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
-v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
-d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
-q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
-q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
-q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
-t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
-q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
-t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
-t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-    <glyph glyph-name="_399" unicode="&#xf1a9;" 
-d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
-q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
-q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
-t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
-q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-    <glyph glyph-name="_400" unicode="&#xf1aa;" 
-d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
-M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
-t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
-q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
-t135.5 51q85 0 145 -60.5t60 -145.5z" />
-    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
-d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
-q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
-q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
-M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
-q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
-q20 0 20 -21v-418z" />
-    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
-d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
-l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
-t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
-q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
-q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-    <glyph glyph-name="_403" unicode="&#xf1ad;" 
-d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
-t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
-q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
-q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
-t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
-q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
-q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
-t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
-d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
-q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
-d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
-q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
-q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
-t100.5 134t141.5 55.5z" />
-    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
-d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
-d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
-" />
-    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
-d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
-t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
-v-400l434 -186q36 -16 57 -48t21 -70z" />
-    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
-d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
-q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
-q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-    <glyph glyph-name="_410" unicode="&#xf1b5;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
-t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
-t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
-d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
-q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
-q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-    <glyph glyph-name="_412" unicode="&#xf1b7;" 
-d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
-q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
-q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
-" />
-    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
-d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
-l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
-t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
-q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
-d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
-q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
-l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
-d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
-t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
-M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-    <glyph glyph-name="_416" unicode="&#xf1bb;" 
-d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
-q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-    <glyph glyph-name="_417" unicode="&#xf1bc;" 
-d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
-q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
-q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
-d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
-    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
-d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
-q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
-q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
-l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
-q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
-q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
-q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
-d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
-t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
-t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
-q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
-q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-    <glyph glyph-name="_422" unicode="&#xf1c2;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
-t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
-    <glyph glyph-name="_423" unicode="&#xf1c3;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
-h-290v-107h68l189 -272l-194 -283h-68z" />
-    <glyph glyph-name="_424" unicode="&#xf1c4;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-    <glyph glyph-name="_425" unicode="&#xf1c5;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-    <glyph glyph-name="_426" unicode="&#xf1c6;" 
-d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
-v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
-q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-    <glyph glyph-name="_427" unicode="&#xf1c7;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
-q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-    <glyph glyph-name="_428" unicode="&#xf1c8;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-    <glyph glyph-name="_429" unicode="&#xf1c9;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
-l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-    <glyph glyph-name="_430" unicode="&#xf1ca;" 
-d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
-q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
-d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
-q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
-d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
-q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
-t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
-    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
-d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
-q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
-t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
-d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
-t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
-    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
-d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
-t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
-t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
-q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
-d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
-l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
-q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
-q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
-t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
-t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
-d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
-q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
-q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
-q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
-d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
-q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
-q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
-v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-    <glyph glyph-name="_439" unicode="&#xf1d4;" 
-d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
-d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
-t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
-t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
-d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
-q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
-t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
-t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
-d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
-q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
-q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
-q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
-d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
-d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
-l863 639l-478 -797z" />
-    <glyph glyph-name="_445" unicode="&#xf1da;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
-t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
-t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_446" unicode="&#xf1db;" 
-d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
-d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
-t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
-t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
-q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
-q0 -26 -12 -48t-36 -22z" />
-    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
-d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
-q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-    <glyph glyph-name="_449" unicode="&#xf1de;" 
-d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
-q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
-d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
-t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-    <glyph glyph-name="_451" unicode="&#xf1e1;" 
-d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
-t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
-d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
-t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
-q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
-t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
-d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
-l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
-d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
-v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
-zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
-t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
-d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
-M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
-d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
-l401 400q38 37 91 37t90 -37z" />
-    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
-d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
-t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
-M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
-t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
-d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-    <glyph glyph-name="_459" unicode="&#xf1e9;" 
-d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
-q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
-t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
-q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
-d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
-t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
-d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
-q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
-M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
-d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
-t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
-t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
-t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
-M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
-h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_463" unicode="&#xf1ed;" 
-d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
-q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
-q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
-    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
-d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
-q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
-    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
-d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
-q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
-q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
-d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
-q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
-M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
-h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
-q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
-q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
-q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
-q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
-q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
-h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
-t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
-d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
-q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
-v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
-q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
-t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
-d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
-M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
-l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
-v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
-q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
-q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
-t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
-h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
-t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
-d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
-t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
-q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
-t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
-l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
-q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
-d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
-q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
-q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
-q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
-q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
-d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
-l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
-l418 363q10 8 23.5 7t21.5 -11z" />
-    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
-d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
-q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
-q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
-d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
-q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
-q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_474" unicode="&#xf1f9;" 
-d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
-t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
-t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_475" unicode="&#xf1fa;" 
-d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
-q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
-t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
-t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
-d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
-t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
-d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
-t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
-d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
-t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
-t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
-h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
-q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
-d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
-d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
-d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
-t9 -23z" />
-    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
-d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
-q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
-t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
-q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-    <glyph glyph-name="_483" unicode="&#xf203;" 
-d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
-q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
-q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
-d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
-t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
-t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
-d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
-t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
-d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
-q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
-q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
-q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-    <glyph glyph-name="_487" unicode="&#xf207;" 
-d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
-h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
-t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
-d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
-q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
-q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
-d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
-t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
-t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
-q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
-q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
-t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
-d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
-q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
-t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
-t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-    <glyph glyph-name="_491" unicode="&#xf20b;" 
-d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
-t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_492" unicode="&#xf20c;" 
-d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
-q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
-q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-    <glyph glyph-name="_493" unicode="&#xf20d;" 
-d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
-    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
-d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
-q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
-q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
-h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
-l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
-l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
-zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
-    <glyph glyph-name="f210" unicode="&#xf210;" 
-d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
-    <glyph glyph-name="_496" unicode="&#xf211;" 
-d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
-q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
-    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
-d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
-q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
-q209 0 374 -102q172 107 374 102z" />
-    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
-d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
-q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
-q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
-    <glyph glyph-name="_499" unicode="&#xf214;" 
-d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
-l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
-v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
-M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
-v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
-h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
-t-43 -34t-16.5 -53.5z" />
-    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
-d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
-q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
-    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
-d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
-t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
-t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
-q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
-    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
-d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
-t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
-q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
-d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
-t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
-q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
-d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
-l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
-    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
-d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
-q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
-q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
-v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
-q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
-    <glyph glyph-name="_506" unicode="&#xf21b;" 
-d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
-t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
-q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
-t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
-    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
-d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
-t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
-l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
-t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
-    <glyph glyph-name="_508" unicode="&#xf21d;" 
-d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
-q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
-q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
-t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
-d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
-q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
-t127 -344z" />
-    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
-d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
-q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
-    <glyph glyph-name="_511" unicode="&#xf222;" 
-d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
-q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
-d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
-t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_513" unicode="&#xf224;" 
-d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
-q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
-d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
-q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
-t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
-t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
-d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
-t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
-q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
-q0 -226 -154 -391q103 -57 218 -57z" />
-    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
-d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
-q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
-t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
-q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
-    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
-d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
-t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
-t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
-t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
-    <glyph glyph-name="_518" unicode="&#xf229;" 
-d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
-t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
-d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
-t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
-t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
-d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
-t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
-t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
-d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
-t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
-d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
-t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
-    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_525" unicode="&#xf230;" 
-d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
-    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
-d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
-l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
-q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
-    <glyph glyph-name="_527" unicode="&#xf232;" 
-d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
-t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
-l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
-    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
-d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
-q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
-    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
-d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
-t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
-t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
-    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
-d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
-q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
-t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
-    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
-d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
-q-26 0 -45 -19t-19 -45v-384h1152z" />
-    <glyph glyph-name="_532" unicode="&#xf237;" 
-d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
-    <glyph glyph-name="_533" unicode="&#xf238;" 
-d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
-t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
-    <glyph glyph-name="_534" unicode="&#xf239;" 
-d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
-t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
-    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
-d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
-q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
-    <glyph glyph-name="_536" unicode="&#xf23b;" 
-d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
-    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
-d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
-q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
-q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
-q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
-q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
-q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
-q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
-t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
-q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
-q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
-M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
-t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
-q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
-l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
-t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
-q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
-q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
-    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
-d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
-t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
-t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
-    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
-d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
-t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
-t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
-q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
-q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
-    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
-d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
-v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
-d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
-d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
-d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
-d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
-v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
-d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
-    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
-d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
-    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
-d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
-h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
-    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
-d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
-v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
-    <glyph glyph-name="_549" unicode="&#xf249;" 
-d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
-    <glyph glyph-name="_550" unicode="&#xf24a;" 
-d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
-z" />
-    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
-d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
-t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
-t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
-t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
-d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
-t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
-M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
-d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
-zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
-d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
-q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
-t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
-t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
-    <glyph glyph-name="_555" unicode="&#xf250;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
-t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
-    <glyph glyph-name="_556" unicode="&#xf251;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
-    <glyph glyph-name="_557" unicode="&#xf252;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
-    <glyph glyph-name="_558" unicode="&#xf253;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
-h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
-    <glyph glyph-name="_559" unicode="&#xf254;" 
-d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
-t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
-h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
-    <glyph glyph-name="_560" unicode="&#xf255;" 
-d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
-q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
-t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
-q72 69 174 69z" />
-    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
-d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
-t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
-h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
-    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
-d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
-q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
-t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
-t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
-q0 -42 -23 -78t-61 -53l-310 -141h91z" />
-    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
-d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
-q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
-q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
-    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
-d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
-t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
-q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
-l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
-    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
-d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
-q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
-v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
-v-384h32z" />
-    <glyph glyph-name="_566" unicode="&#xf25b;" 
-d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
-v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
-q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
-q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
-q0 -53 37.5 -90.5t90.5 -37.5h668z" />
-    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
-d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
-t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
-q13 0 22 -8.5t10 -20.5z" />
-    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
-d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
-t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
-q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
-d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
-q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
-t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
-q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
-t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
-    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
-d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
-    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
-d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
-t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
-d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
-t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
-t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
-t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
-t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
-q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
-    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
-d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
-t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
-q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
-    <glyph glyph-name="_574" unicode="&#xf264;" 
-d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
-q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
-zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
-d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
-l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
-    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
-d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
-q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
-l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
-    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
-d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
-q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
-t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
-t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
-t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
-t191 -286t71 -348z" />
-    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
-d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
-q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
-    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
-d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
-q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
-q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
-    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
-d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
-q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
-" />
-    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
-d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
-q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
-M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
-    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
-d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
-v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
-d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
-h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
-q-68 175 -180 287z" />
-    <glyph glyph-name="_584" unicode="&#xf26e;" 
-d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
-q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
-q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
-q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
-q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
-t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
-    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
-d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
-M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
-q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
-t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
-q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
-    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
-d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
-h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
-v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
-    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
-d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
-t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
-t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
-d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
-M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
-q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
-d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
-t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
-t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
-d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
-    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
-d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
-q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
-    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
-d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
-q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
-    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
-d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
-v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
-    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
-d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
-q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
-    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
-d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
-t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
-t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
-d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
-t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
-t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
-t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
-    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
-d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
-    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
-d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
-q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
-    <glyph glyph-name="f27e" unicode="&#xf27e;" 
-d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
-    <glyph glyph-name="uniF280" unicode="&#xf280;" 
-d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
-h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
-l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
-    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
-d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
-l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
-t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
-q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
-    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
-d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
-q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
-    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
-d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
-    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
-d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
-t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
-t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
-    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
-d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
-    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
-d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
-q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
-q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
-q16 0 16 -16z" />
-    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
-d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
-q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
-t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
-    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
-d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
-t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
-d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
-q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
-q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
-q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
-    <glyph glyph-name="_610" unicode="&#xf28a;" 
-d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
-t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
-q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
-t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
-    <glyph glyph-name="_611" unicode="&#xf28b;" 
-d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
-t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_612" unicode="&#xf28c;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
-t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
-    <glyph glyph-name="_613" unicode="&#xf28d;" 
-d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="_614" unicode="&#xf28e;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
-t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
-    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
-d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
-t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
-d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
-t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
-q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
-h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
-    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
-d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
-q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
-q15 0 25 -12q9 -12 6 -28z" />
-    <glyph glyph-name="_618" unicode="&#xf293;" 
-d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
-t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
-    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
-d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
-    <glyph glyph-name="_620" unicode="&#xf295;" 
-d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
-t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
-t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
-d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
-    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
-d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
-q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
-    <glyph glyph-name="_623" unicode="&#xf298;" 
-d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
-t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
-    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
-d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
-q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
-q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
-    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
-d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
-q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
-M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
-t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_626" unicode="&#xf29b;" 
-d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
-l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
-M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
-    <glyph glyph-name="_627" unicode="&#xf29c;" 
-d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
-t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
-t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
-t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
-d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
-q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
-q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
-q3 -1 7 1t7 4l3 2q11 9 11 17z" />
-    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
-d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
-t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
-t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
-h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
-t9.5 -70.5z" />
-    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
-d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
-q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
-l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
-t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
-q-18 -19 -45 -19z" />
-    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
-d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
-q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
-q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
-t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
-t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
-t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
-t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
-d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
-M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
-t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
-t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
-q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
-    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
-d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
-q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
-q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
-q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
-q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
-q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
-    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
-d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
-t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
-t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
-l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
-    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
-d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
-q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
-q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
-t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
-d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
-l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
-q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
-q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
-    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
-d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
-t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
-l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
-q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
-l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
-    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
-d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
-q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
-q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
-q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
-    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
-d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
-q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
-M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
-    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
-d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
-M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
-q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
-d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
-q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
-t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
-d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
-q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
-t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
-    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
-d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
-q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
-t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
-q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
-d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
-q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
-q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
-    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
-d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
-q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
-l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
-M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
-    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
-d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
-t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
-    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
-d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
-t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
-q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
-q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
-t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
-q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
-q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
-t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
-    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
-d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
-h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
-d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
-q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
-d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
-l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
-q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
-M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
-q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
-d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
-t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
-q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
-    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
-d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
-l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
-h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
-q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
-    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
-d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
-l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
-q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
-q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
-    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
-d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
-q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
-q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
-d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
-t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
-q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
-q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
-    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
-d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
-M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
-q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
-h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
-d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
-q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
-q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
-t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
-t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
-d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
-t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
-d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
-t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
-    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
-d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
-t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
-q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
-    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
-d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
-t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
-q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
-d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
-t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
-v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
-q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
-d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
-M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
-q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
-h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
-d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
-q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
-t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
-    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
-d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
-t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
-t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
-t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
-q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
-t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
-q2 -42 2 -64z" />
-    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
-d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
-t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
-t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
-M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
-    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
-d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
-t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
-t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
-q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
-t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
-q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
-    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
-d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
-t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
-t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
-q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
-t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
-t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
-    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
-d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
-t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
-q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
-q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
-t72.5 -263.5z" />
-    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
-d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
-d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
-d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
-t47 -113z" />
-    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
-d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
-l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
-d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
-l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
-d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
-d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
-t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
-t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
-q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
-q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
-q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
-t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
-d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
-q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
-t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
-    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
-d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
-t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
-h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
-v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
-d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
-q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
-q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
-q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
-q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
-t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
-    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
-d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
-q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
-t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
-t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
-t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
-    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
-d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
-q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
-t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
-q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
-h48q16 0 16 -16z" />
-    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
-d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
-t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
-q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
-l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
-q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
-    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
-d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
-q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
-    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
-d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
-t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
-t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
-d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
-t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
-q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
-q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
-t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
-q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
-M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
-q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
-q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
-    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
- />
-  </font>
-</defs></svg>

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/css/theme.css Deleted

@@ -1,4 +0,0 @@
-html{box-sizing:border-box}*,:after,:before{box-sizing:inherit}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}hidden,audio:not(controls){display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:active,a:hover{outline:0}abbrtitle{border-bottom:1px dotted}b,strong{font-weight:700}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;text-decoration:none}ins,mark{color:#000}mark{background:#ff0;font-style:italic;font-weight:700}.rst-content code,.rst-content tt,code,kbd,pre,samp{font-family:monospace,serif;_font-family:courier new,monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:after,q:before{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,ol,ul{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure,form{margin:0}label{cursor:pointer}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,inputtype=button,inputtype=reset,inputtype=submit{cursor:pointer;-webkit-appearance:button;*overflow:visible}buttondisabled,inputdisabled{cursor:default}inputtype=search{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}textarea{resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none!important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{body,html,section{background:none!important}*{box-shadow:none!important;text-shadow:none!important;filter:none!important;-ms-filter:none!important}a,a:visited{text-decoration:underline}.ir a:after,ahref^="#":after,ahref^="javascript:":after{content:""}blockquote,pre{page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}.rst-content .toctree-wrapper>p.caption,h2,h3,p{orphans:3;widows:3}.rst-content .toctree-wrapper>p.caption,h2,h3{page-break-after:avoid}}.btn,.fa:before,.icon:before,.rst-content .admonition,.rst-content .admonition-title:before,.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .code-block-caption .headerlink:before,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .note,.rst-content .seealso,.rst-content .tip,.rst-content .warning,.rst-content code.download span:first-child:before,.rst-content dl dt .headerlink:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content table>caption .headerlink:before,.rst-content tt.download span:first-child:before,.wy-alert,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-menu-vertical li.current>a,.wy-menu-vertical li.current>a span.toctree-expand:before,.wy-menu-vertical li.on a,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li span.toctree-expand:before,.wy-nav-top a,.wy-side-nav-search .wy-dropdown>a,.wy-side-nav-search>a,inputtype=color,inputtype=date,inputtype=datetime-local,inputtype=datetime,inputtype=email,inputtype=month,inputtype=number,inputtype=password,inputtype=search,inputtype=tel,inputtype=text,inputtype=time,inputtype=url,inputtype=week,select,textarea{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}/*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:FontAwesome;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713);src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix&v=4.7.0) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#fontawesomeregular) format("svg");font-weight:400;font-style:normal}.fa,.icon,.rst-content .admonition-title,.rst-content .code-block-caption .headerlink,.rst-content code.download span:first-child,.rst-content dl dt .headerlink,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink,.rst-content tt.download span:first-child,.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li span.toctree-expand{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:.08em solid #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa-pull-left.icon,.fa.fa-pull-left,.rst-content .code-block-caption .fa-pull-left.headerlink,.rst-content .fa-pull-left.admonition-title,.rst-content code.download span.fa-pull-left:first-child,.rst-content dl dt .fa-pull-left.headerlink,.rst-content h1 .fa-pull-left.headerlink,.rst-content h2 .fa-pull-left.headerlink,.rst-content h3 .fa-pull-left.headerlink,.rst-content h4 .fa-pull-left.headerlink,.rst-content h5 .fa-pull-left.headerlink,.rst-content h6 .fa-pull-left.headerlink,.rst-content p.caption .fa-pull-left.headerlink,.rst-content table>caption .fa-pull-left.headerlink,.rst-content tt.download span.fa-pull-left:first-child,.wy-menu-vertical li.current>a span.fa-pull-left.toctree-expand,.wy-menu-vertical li.on a span.fa-pull-left.toctree-expand,.wy-menu-vertical li span.fa-pull-left.toctree-expand{margin-right:.3em}.fa-pull-right.icon,.fa.fa-pull-right,.rst-content .code-block-caption .fa-pull-right.headerlink,.rst-content .fa-pull-right.admonition-title,.rst-content code.download span.fa-pull-right:first-child,.rst-content dl dt .fa-pull-right.headerlink,.rst-content h1 .fa-pull-right.headerlink,.rst-content h2 .fa-pull-right.headerlink,.rst-content h3 .fa-pull-right.headerlink,.rst-content h4 .fa-pull-right.headerlink,.rst-content h5 .fa-pull-right.headerlink,.rst-content h6 .fa-pull-right.headerlink,.rst-content p.caption .fa-pull-right.headerlink,.rst-content table>caption .fa-pull-right.headerlink,.rst-content tt.download span.fa-pull-right:first-child,.wy-menu-vertical li.current>a span.fa-pull-right.toctree-expand,.wy-menu-vertical li.on a span.fa-pull-right.toctree-expand,.wy-menu-vertical li span.fa-pull-right.toctree-expand{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.pull-left.icon,.rst-content .code-block-caption .pull-left.headerlink,.rst-content .pull-left.admonition-title,.rst-content code.download span.pull-left:first-child,.rst-content dl dt .pull-left.headerlink,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content p.caption .pull-left.headerlink,.rst-content table>caption .pull-left.headerlink,.rst-content tt.download span.pull-left:first-child,.wy-menu-vertical li.current>a span.pull-left.toctree-expand,.wy-menu-vertical li.on a span.pull-left.toctree-expand,.wy-menu-vertical li span.pull-left.toctree-expand{margin-right:.3em}.fa.pull-right,.pull-right.icon,.rst-content .code-block-caption .pull-right.headerlink,.rst-content .pull-right.admonition-title,.rst-content code.download span.pull-right:first-child,.rst-content dl dt .pull-right.headerlink,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content p.caption .pull-right.headerlink,.rst-content table>caption .pull-right.headerlink,.rst-content tt.download span.pull-right:first-child,.wy-menu-vertical li.current>a span.pull-right.toctree-expand,.wy-menu-vertical li.on a span.pull-right.toctree-expand,.wy-menu-vertical li span.pull-right.toctree-expand{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s linear infinite;animation:fa-spin 2s linear infinite}.fa-pulse{-webkit-animation:fa-spin 1s steps(8) infinite;animation:fa-spin 1s steps(8) infinite}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scaleX(-1);-ms-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scaleY(-1);-ms-transform:scaleY(-1);transform:scaleY(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-close:before,.fa-remove:before,.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-cog:before,.fa-gear:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before,.rst-content code.download span:first-child:before,.rst-content tt.download span:first-child:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-repeat:before,.fa-rotate-right:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-image:before,.fa-photo:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.rst-content .admonition-title:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-exclamation-triangle:before,.fa-warning:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before,.fa-bar-chart:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-cogs:before,.fa-gears:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook-f:before,.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-feed:before,.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-floppy-o:before,.fa-save:before{content:""}.fa-square:before{content:""}.fa-bars:before,.fa-navicon:before,.fa-reorder:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.icon-caret-down:before,.wy-dropdown .caret:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-sort:before,.fa-unsorted:before{content:""}.fa-sort-desc:before,.fa-sort-down:before{content:""}.fa-sort-asc:before,.fa-sort-up:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-gavel:before,.fa-legal:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-bolt:before,.fa-flash:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-clipboard:before,.fa-paste:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-chain-broken:before,.fa-unlink:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-caret-square-o-down:before,.fa-toggle-down:before{content:""}.fa-caret-square-o-up:before,.fa-toggle-up:before{content:""}.fa-caret-square-o-right:before,.fa-toggle-right:before{content:""}.fa-eur:before,.fa-euro:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-inr:before,.fa-rupee:before{content:""}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen:before{content:""}.fa-rouble:before,.fa-rub:before,.fa-ruble:before{content:""}.fa-krw:before,.fa-won:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before,.fa-gratipay:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-caret-square-o-left:before,.fa-toggle-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-try:before,.fa-turkish-lira:before{content:""}.fa-plus-square-o:before,.wy-menu-vertical li span.toctree-expand:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-bank:before,.fa-institution:before,.fa-university:before{content:""}.fa-graduation-cap:before,.fa-mortar-board:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper-pp:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-image-o:before,.fa-file-photo-o:before,.fa-file-picture-o:before{content:""}.fa-file-archive-o:before,.fa-file-zip-o:before{content:""}.fa-file-audio-o:before,.fa-file-sound-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-ring:before,.fa-life-saver:before,.fa-support:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before,.fa-resistance:before{content:""}.fa-empire:before,.fa-ge:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before,.fa-y-combinator-square:before,.fa-yc-square:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-paper-plane:before,.fa-send:before{content:""}.fa-paper-plane-o:before,.fa-send-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa-futbol-o:before,.fa-soccer-ball-o:before{content:""}.fa-tty:before{content:""}.fa-binoculars:before{content:""}.fa-plug:before{content:""}.fa-slideshare:before{content:""}.fa-twitch:before{content:""}.fa-yelp:before{content:""}.fa-newspaper-o:before{content:""}.fa-wifi:before{content:""}.fa-calculator:before{content:""}.fa-paypal:before{content:""}.fa-google-wallet:before{content:""}.fa-cc-visa:before{content:""}.fa-cc-mastercard:before{content:""}.fa-cc-discover:before{content:""}.fa-cc-amex:before{content:""}.fa-cc-paypal:before{content:""}.fa-cc-stripe:before{content:""}.fa-bell-slash:before{content:""}.fa-bell-slash-o:before{content:""}.fa-trash:before{content:""}.fa-copyright:before{content:""}.fa-at:before{content:""}.fa-eyedropper:before{content:""}.fa-paint-brush:before{content:""}.fa-birthday-cake:before{content:""}.fa-area-chart:before{content:""}.fa-pie-chart:before{content:""}.fa-line-chart:before{content:""}.fa-lastfm:before{content:""}.fa-lastfm-square:before{content:""}.fa-toggle-off:before{content:""}.fa-toggle-on:before{content:""}.fa-bicycle:before{content:""}.fa-bus:before{content:""}.fa-ioxhost:before{content:""}.fa-angellist:before{content:""}.fa-cc:before{content:""}.fa-ils:before,.fa-shekel:before,.fa-sheqel:before{content:""}.fa-meanpath:before{content:""}.fa-buysellads:before{content:""}.fa-connectdevelop:before{content:""}.fa-dashcube:before{content:""}.fa-forumbee:before{content:""}.fa-leanpub:before{content:""}.fa-sellsy:before{content:""}.fa-shirtsinbulk:before{content:""}.fa-simplybuilt:before{content:""}.fa-skyatlas:before{content:""}.fa-cart-plus:before{content:""}.fa-cart-arrow-down:before{content:""}.fa-diamond:before{content:""}.fa-ship:before{content:""}.fa-user-secret:before{content:""}.fa-motorcycle:before{content:""}.fa-street-view:before{content:""}.fa-heartbeat:before{content:""}.fa-venus:before{content:""}.fa-mars:before{content:""}.fa-mercury:before{content:""}.fa-intersex:before,.fa-transgender:before{content:""}.fa-transgender-alt:before{content:""}.fa-venus-double:before{content:""}.fa-mars-double:before{content:""}.fa-venus-mars:before{content:""}.fa-mars-stroke:before{content:""}.fa-mars-stroke-v:before{content:""}.fa-mars-stroke-h:before{content:""}.fa-neuter:before{content:""}.fa-genderless:before{content:""}.fa-facebook-official:before{content:""}.fa-pinterest-p:before{content:""}.fa-whatsapp:before{content:""}.fa-server:before{content:""}.fa-user-plus:before{content:""}.fa-user-times:before{content:""}.fa-bed:before,.fa-hotel:before{content:""}.fa-viacoin:before{content:""}.fa-train:before{content:""}.fa-subway:before{content:""}.fa-medium:before{content:""}.fa-y-combinator:before,.fa-yc:before{content:""}.fa-optin-monster:before{content:""}.fa-opencart:before{content:""}.fa-expeditedssl:before{content:""}.fa-battery-4:before,.fa-battery-full:before,.fa-battery:before{content:""}.fa-battery-3:before,.fa-battery-three-quarters:before{content:""}.fa-battery-2:before,.fa-battery-half:before{content:""}.fa-battery-1:before,.fa-battery-quarter:before{content:""}.fa-battery-0:before,.fa-battery-empty:before{content:""}.fa-mouse-pointer:before{content:""}.fa-i-cursor:before{content:""}.fa-object-group:before{content:""}.fa-object-ungroup:before{content:""}.fa-sticky-note:before{content:""}.fa-sticky-note-o:before{content:""}.fa-cc-jcb:before{content:""}.fa-cc-diners-club:before{content:""}.fa-clone:before{content:""}.fa-balance-scale:before{content:""}.fa-hourglass-o:before{content:""}.fa-hourglass-1:before,.fa-hourglass-start:before{content:""}.fa-hourglass-2:before,.fa-hourglass-half:before{content:""}.fa-hourglass-3:before,.fa-hourglass-end:before{content:""}.fa-hourglass:before{content:""}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:""}.fa-hand-paper-o:before,.fa-hand-stop-o:before{content:""}.fa-hand-scissors-o:before{content:""}.fa-hand-lizard-o:before{content:""}.fa-hand-spock-o:before{content:""}.fa-hand-pointer-o:before{content:""}.fa-hand-peace-o:before{content:""}.fa-trademark:before{content:""}.fa-registered:before{content:""}.fa-creative-commons:before{content:""}.fa-gg:before{content:""}.fa-gg-circle:before{content:""}.fa-tripadvisor:before{content:""}.fa-odnoklassniki:before{content:""}.fa-odnoklassniki-square:before{content:""}.fa-get-pocket:before{content:""}.fa-wikipedia-w:before{content:""}.fa-safari:before{content:""}.fa-chrome:before{content:""}.fa-firefox:before{content:""}.fa-opera:before{content:""}.fa-internet-explorer:before{content:""}.fa-television:before,.fa-tv:before{content:""}.fa-contao:before{content:""}.fa-500px:before{content:""}.fa-amazon:before{content:""}.fa-calendar-plus-o:before{content:""}.fa-calendar-minus-o:before{content:""}.fa-calendar-times-o:before{content:""}.fa-calendar-check-o:before{content:""}.fa-industry:before{content:""}.fa-map-pin:before{content:""}.fa-map-signs:before{content:""}.fa-map-o:before{content:""}.fa-map:before{content:""}.fa-commenting:before{content:""}.fa-commenting-o:before{content:""}.fa-houzz:before{content:""}.fa-vimeo:before{content:""}.fa-black-tie:before{content:""}.fa-fonticons:before{content:""}.fa-reddit-alien:before{content:""}.fa-edge:before{content:""}.fa-credit-card-alt:before{content:""}.fa-codiepie:before{content:""}.fa-modx:before{content:""}.fa-fort-awesome:before{content:""}.fa-usb:before{content:""}.fa-product-hunt:before{content:""}.fa-mixcloud:before{content:""}.fa-scribd:before{content:""}.fa-pause-circle:before{content:""}.fa-pause-circle-o:before{content:""}.fa-stop-circle:before{content:""}.fa-stop-circle-o:before{content:""}.fa-shopping-bag:before{content:""}.fa-shopping-basket:before{content:""}.fa-hashtag:before{content:""}.fa-bluetooth:before{content:""}.fa-bluetooth-b:before{content:""}.fa-percent:before{content:""}.fa-gitlab:before,.icon-gitlab:before{content:""}.fa-wpbeginner:before{content:""}.fa-wpforms:before{content:""}.fa-envira:before{content:""}.fa-universal-access:before{content:""}.fa-wheelchair-alt:before{content:""}.fa-question-circle-o:before{content:""}.fa-blind:before{content:""}.fa-audio-description:before{content:""}.fa-volume-control-phone:before{content:""}.fa-braille:before{content:""}.fa-assistive-listening-systems:before{content:""}.fa-american-sign-language-interpreting:before,.fa-asl-interpreting:before{content:""}.fa-deaf:before,.fa-deafness:before,.fa-hard-of-hearing:before{content:""}.fa-glide:before{content:""}.fa-glide-g:before{content:""}.fa-sign-language:before,.fa-signing:before{content:""}.fa-low-vision:before{content:""}.fa-viadeo:before{content:""}.fa-viadeo-square:before{content:""}.fa-snapchat:before{content:""}.fa-snapchat-ghost:before{content:""}.fa-snapchat-square:before{content:""}.fa-pied-piper:before{content:""}.fa-first-order:before{content:""}.fa-yoast:before{content:""}.fa-themeisle:before{content:""}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:""}.fa-fa:before,.fa-font-awesome:before{content:""}.fa-handshake-o:before{content:""}.fa-envelope-open:before{content:""}.fa-envelope-open-o:before{content:""}.fa-linode:before{content:""}.fa-address-book:before{content:""}.fa-address-book-o:before{content:""}.fa-address-card:before,.fa-vcard:before{content:""}.fa-address-card-o:before,.fa-vcard-o:before{content:""}.fa-user-circle:before{content:""}.fa-user-circle-o:before{content:""}.fa-user-o:before{content:""}.fa-id-badge:before{content:""}.fa-drivers-license:before,.fa-id-card:before{content:""}.fa-drivers-license-o:before,.fa-id-card-o:before{content:""}.fa-quora:before{content:""}.fa-free-code-camp:before{content:""}.fa-telegram:before{content:""}.fa-thermometer-4:before,.fa-thermometer-full:before,.fa-thermometer:before{content:""}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:""}.fa-thermometer-2:before,.fa-thermometer-half:before{content:""}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:""}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:""}.fa-shower:before{content:""}.fa-bath:before,.fa-bathtub:before,.fa-s15:before{content:""}.fa-podcast:before{content:""}.fa-window-maximize:before{content:""}.fa-window-minimize:before{content:""}.fa-window-restore:before{content:""}.fa-times-rectangle:before,.fa-window-close:before{content:""}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:""}.fa-bandcamp:before{content:""}.fa-grav:before{content:""}.fa-etsy:before{content:""}.fa-imdb:before{content:""}.fa-ravelry:before{content:""}.fa-eercast:before{content:""}.fa-microchip:before{content:""}.fa-snowflake-o:before{content:""}.fa-superpowers:before{content:""}.fa-wpexplorer:before{content:""}.fa-meetup:before{content:""}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.fa,.icon,.rst-content .admonition-title,.rst-content .code-block-caption .headerlink,.rst-content code.download span:first-child,.rst-content dl dt .headerlink,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink,.rst-content tt.download span:first-child,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li span.toctree-expand{font-family:inherit}.fa:before,.icon:before,.rst-content .admonition-title:before,.rst-content .code-block-caption .headerlink:before,.rst-content code.download span:first-child:before,.rst-content dl dt .headerlink:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content table>caption .headerlink:before,.rst-content tt.download span:first-child:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li span.toctree-expand:before{font-family:FontAwesome;display:inline-block;font-style:normal;font-weight:400;line-height:1;text-decoration:inherit}.rst-content .code-block-caption a .headerlink,.rst-content a .admonition-title,.rst-content code.download a span:first-child,.rst-content dl dt a .headerlink,.rst-content h1 a .headerlink,.rst-content h2 a .headerlink,.rst-content h3 a .headerlink,.rst-content h4 a .headerlink,.rst-content h5 a .headerlink,.rst-content h6 a .headerlink,.rst-content p.caption a .headerlink,.rst-content table>caption a .headerlink,.rst-content tt.download a span:first-child,.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li a span.toctree-expand,a .fa,a .icon,a .rst-content .admonition-title,a .rst-content .code-block-caption .headerlink,a .rst-content code.download span:first-child,a .rst-content dl dt .headerlink,a .rst-content h1 .headerlink,a .rst-content h2 .headerlink,a .rst-content h3 .headerlink,a .rst-content h4 .headerlink,a .rst-content h5 .headerlink,a .rst-content h6 .headerlink,a .rst-content p.caption .headerlink,a .rst-content table>caption .headerlink,a .rst-content tt.download span:first-child,a .wy-menu-vertical li span.toctree-expand{display:inline-block;text-decoration:inherit}.btn .fa,.btn .icon,.btn .rst-content .admonition-title,.btn .rst-content .code-block-caption .headerlink,.btn .rst-content code.download span:first-child,.btn .rst-content dl dt .headerlink,.btn .rst-content h1 .headerlink,.btn .rst-content h2 .headerlink,.btn .rst-content h3 .headerlink,.btn .rst-content h4 .headerlink,.btn .rst-content h5 .headerlink,.btn .rst-content h6 .headerlink,.btn .rst-content p.caption .headerlink,.btn .rst-content table>caption .headerlink,.btn .rst-content tt.download span:first-child,.btn .wy-menu-vertical li.current>a span.toctree-expand,.btn .wy-menu-vertical li.on a span.toctree-expand,.btn .wy-menu-vertical li span.toctree-expand,.nav .fa,.nav .icon,.nav .rst-content .admonition-title,.nav .rst-content .code-block-caption .headerlink,.nav .rst-content code.download span:first-child,.nav .rst-content dl dt .headerlink,.nav .rst-content h1 .headerlink,.nav .rst-content h2 .headerlink,.nav .rst-content h3 .headerlink,.nav .rst-content h4 .headerlink,.nav .rst-content h5 .headerlink,.nav .rst-content h6 .headerlink,.nav .rst-content p.caption .headerlink,.nav .rst-content table>caption .headerlink,.nav .rst-content tt.download span:first-child,.nav .wy-menu-vertical li.current>a span.toctree-expand,.nav .wy-menu-vertical li.on a span.toctree-expand,.nav .wy-menu-vertical li span.toctree-expand,.rst-content .btn .admonition-title,.rst-content .code-block-caption .btn .headerlink,.rst-content .code-block-caption .nav .headerlink,.rst-content .nav .admonition-title,.rst-content code.download .btn span:first-child,.rst-content code.download .nav span:first-child,.rst-content dl dt .btn .headerlink,.rst-content dl dt .nav .headerlink,.rst-content h1 .btn .headerlink,.rst-content h1 .nav .headerlink,.rst-content h2 .btn .headerlink,.rst-content h2 .nav .headerlink,.rst-content h3 .btn .headerlink,.rst-content h3 .nav .headerlink,.rst-content h4 .btn .headerlink,.rst-content h4 .nav .headerlink,.rst-content h5 .btn .headerlink,.rst-content h5 .nav .headerlink,.rst-content h6 .btn .headerlink,.rst-content h6 .nav .headerlink,.rst-content p.caption .btn .headerlink,.rst-content p.caption .nav .headerlink,.rst-content table>caption .btn .headerlink,.rst-content table>caption .nav .headerlink,.rst-content tt.download .btn span:first-child,.rst-content tt.download .nav span:first-child,.wy-menu-vertical li .btn span.toctree-expand,.wy-menu-vertical li.current>a .btn span.toctree-expand,.wy-menu-vertical li.current>a .nav span.toctree-expand,.wy-menu-vertical li .nav span.toctree-expand,.wy-menu-vertical li.on a .btn span.toctree-expand,.wy-menu-vertical li.on a .nav span.toctree-expand{display:inline}.btn .fa-large.icon,.btn .fa.fa-large,.btn .rst-content .code-block-caption .fa-large.headerlink,.btn .rst-content .fa-large.admonition-title,.btn .rst-content code.download span.fa-large:first-child,.btn .rst-content dl dt .fa-large.headerlink,.btn .rst-content h1 .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.btn .rst-content p.caption .fa-large.headerlink,.btn .rst-content table>caption .fa-large.headerlink,.btn .rst-content tt.download span.fa-large:first-child,.btn .wy-menu-vertical li span.fa-large.toctree-expand,.nav .fa-large.icon,.nav .fa.fa-large,.nav .rst-content .code-block-caption .fa-large.headerlink,.nav .rst-content .fa-large.admonition-title,.nav .rst-content code.download span.fa-large:first-child,.nav .rst-content dl dt .fa-large.headerlink,.nav .rst-content h1 .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.nav .rst-content p.caption .fa-large.headerlink,.nav .rst-content table>caption .fa-large.headerlink,.nav .rst-content tt.download span.fa-large:first-child,.nav .wy-menu-vertical li span.fa-large.toctree-expand,.rst-content .btn .fa-large.admonition-title,.rst-content .code-block-caption .btn .fa-large.headerlink,.rst-content .code-block-caption .nav .fa-large.headerlink,.rst-content .nav .fa-large.admonition-title,.rst-content code.download .btn span.fa-large:first-child,.rst-content code.download .nav span.fa-large:first-child,.rst-content dl dt .btn .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.rst-content p.caption .btn .fa-large.headerlink,.rst-content p.caption .nav .fa-large.headerlink,.rst-content table>caption .btn .fa-large.headerlink,.rst-content table>caption .nav .fa-large.headerlink,.rst-content tt.download .btn span.fa-large:first-child,.rst-content tt.download .nav span.fa-large:first-child,.wy-menu-vertical li .btn span.fa-large.toctree-expand,.wy-menu-vertical li .nav span.fa-large.toctree-expand{line-height:.9em}.btn .fa-spin.icon,.btn .fa.fa-spin,.btn .rst-content .code-block-caption .fa-spin.headerlink,.btn .rst-content .fa-spin.admonition-title,.btn .rst-content code.download span.fa-spin:first-child,.btn .rst-content dl dt .fa-spin.headerlink,.btn .rst-content h1 .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.btn .rst-content p.caption .fa-spin.headerlink,.btn .rst-content table>caption .fa-spin.headerlink,.btn .rst-content tt.download span.fa-spin:first-child,.btn .wy-menu-vertical li span.fa-spin.toctree-expand,.nav .fa-spin.icon,.nav .fa.fa-spin,.nav .rst-content .code-block-caption .fa-spin.headerlink,.nav .rst-content .fa-spin.admonition-title,.nav .rst-content code.download span.fa-spin:first-child,.nav .rst-content dl dt .fa-spin.headerlink,.nav .rst-content h1 .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.nav .rst-content p.caption .fa-spin.headerlink,.nav .rst-content table>caption .fa-spin.headerlink,.nav .rst-content tt.download span.fa-spin:first-child,.nav .wy-menu-vertical li span.fa-spin.toctree-expand,.rst-content .btn .fa-spin.admonition-title,.rst-content .code-block-caption .btn .fa-spin.headerlink,.rst-content .code-block-caption .nav .fa-spin.headerlink,.rst-content .nav .fa-spin.admonition-title,.rst-content code.download .btn span.fa-spin:first-child,.rst-content code.download .nav span.fa-spin:first-child,.rst-content dl dt .btn .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.rst-content p.caption .btn .fa-spin.headerlink,.rst-content p.caption .nav .fa-spin.headerlink,.rst-content table>caption .btn .fa-spin.headerlink,.rst-content table>caption .nav .fa-spin.headerlink,.rst-content tt.download .btn span.fa-spin:first-child,.rst-content tt.download .nav span.fa-spin:first-child,.wy-menu-vertical li .btn span.fa-spin.toctree-expand,.wy-menu-vertical li .nav span.fa-spin.toctree-expand{display:inline-block}.btn.fa:before,.btn.icon:before,.rst-content .btn.admonition-title:before,.rst-content .code-block-caption .btn.headerlink:before,.rst-content code.download span.btn:first-child:before,.rst-content dl dt .btn.headerlink:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content p.caption .btn.headerlink:before,.rst-content table>caption .btn.headerlink:before,.rst-content tt.download span.btn:first-child:before,.wy-menu-vertical li span.btn.toctree-expand:before{opacity:.5;-webkit-transition:opacity .05s ease-in;-moz-transition:opacity .05s ease-in;transition:opacity .05s ease-in}.btn.fa:hover:before,.btn.icon:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content .code-block-caption .btn.headerlink:hover:before,.rst-content code.download span.btn:first-child:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content p.caption .btn.headerlink:hover:before,.rst-content table>caption .btn.headerlink:hover:before,.rst-content tt.download span.btn:first-child:hover:before,.wy-menu-vertical li span.btn.toctree-expand:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .icon:before,.btn-mini .rst-content .admonition-title:before,.btn-mini .rst-content .code-block-caption .headerlink:before,.btn-mini .rst-content code.download span:first-child:before,.btn-mini .rst-content dl dt .headerlink:before,.btn-mini .rst-content h1 .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.btn-mini .rst-content p.caption .headerlink:before,.btn-mini .rst-content table>caption .headerlink:before,.btn-mini .rst-content tt.download span:first-child:before,.btn-mini .wy-menu-vertical li span.toctree-expand:before,.rst-content .btn-mini .admonition-title:before,.rst-content .code-block-caption .btn-mini .headerlink:before,.rst-content code.download .btn-mini span:first-child:before,.rst-content dl dt .btn-mini .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.rst-content p.caption .btn-mini .headerlink:before,.rst-content table>caption .btn-mini .headerlink:before,.rst-content tt.download .btn-mini span:first-child:before,.wy-menu-vertical li .btn-mini span.toctree-expand:before{font-size:14px;vertical-align:-15%}.rst-content .admonition,.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .note,.rst-content .seealso,.rst-content .tip,.rst-content .warning,.wy-alert{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.rst-content .admonition-title,.wy-alert-title{font-weight:700;display:block;color:#fff;background:#6ab0de;padding:6px 12px;margin:-12px -12px 12px}.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.admonition,.rst-content .wy-alert-danger.admonition-todo,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.wy-alert.wy-alert-danger{background:#fdf3f2}.rst-content .danger .admonition-title,.rst-content .danger .wy-alert-title,.rst-content .error .admonition-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.rst-content .wy-alert-danger.admonition .admonition-title,.rst-content .wy-alert-danger.admonition .wy-alert-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.wy-alert.wy-alert-danger .wy-alert-title{background:#f29f97}.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .warning,.rst-content .wy-alert-warning.admonition,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.note,.rst-content .wy-alert-warning.seealso,.rst-content .wy-alert-warning.tip,.wy-alert.wy-alert-warning{background:#ffedcc}.rst-content .admonition-todo .admonition-title,.rst-content .admonition-todo .wy-alert-title,.rst-content .attention .admonition-title,.rst-content .attention .wy-alert-title,.rst-content .caution .admonition-title,.rst-content .caution .wy-alert-title,.rst-content .warning .admonition-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.admonition .admonition-title,.rst-content .wy-alert-warning.admonition .wy-alert-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.wy-alert.wy-alert-warning .wy-alert-title{background:#f0b37e}.rst-content .note,.rst-content .seealso,.rst-content .wy-alert-info.admonition,.rst-content .wy-alert-info.admonition-todo,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.wy-alert.wy-alert-info{background:#e7f2fa}.rst-content .note .admonition-title,.rst-content .note .wy-alert-title,.rst-content .seealso .admonition-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .admonition-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.rst-content .wy-alert-info.admonition .admonition-title,.rst-content .wy-alert-info.admonition .wy-alert-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.wy-alert.wy-alert-info .wy-alert-title{background:#6ab0de}.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.admonition,.rst-content .wy-alert-success.admonition-todo,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.warning,.wy-alert.wy-alert-success{background:#dbfaf4}.rst-content .hint .admonition-title,.rst-content .hint .wy-alert-title,.rst-content .important .admonition-title,.rst-content .important .wy-alert-title,.rst-content .tip .admonition-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .admonition-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.rst-content .wy-alert-success.admonition .admonition-title,.rst-content .wy-alert-success.admonition .wy-alert-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.wy-alert.wy-alert-success .wy-alert-title{background:#1abc9c}.rst-content .wy-alert-neutral.admonition,.rst-content .wy-alert-neutral.admonition-todo,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.wy-alert.wy-alert-neutral{background:#f3f6f6}.rst-content .wy-alert-neutral.admonition-todo .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.rst-content .wy-alert-neutral.admonition .admonition-title,.rst-content .wy-alert-neutral.admonition .wy-alert-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.wy-alert.wy-alert-neutral .wy-alert-title{color:#404040;background:#e1e4e5}.rst-content .wy-alert-neutral.admonition-todo a,.rst-content .wy-alert-neutral.admonition a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.wy-alert.wy-alert-neutral a{color:#2980b9}.rst-content .admonition-todo p:last-child,.rst-content .admonition p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .note p:last-child,.rst-content .seealso p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.wy-alert p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all .3s ease-in;-moz-transition:all .3s ease-in;transition:all .3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27ae60}.wy-tray-container li.wy-tray-item-info{background:#2980b9}.wy-tray-container li.wy-tray-item-warning{background:#e67e22}.wy-tray-container li.wy-tray-item-danger{background:#e74c3c}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width:768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}buttondisabled{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px;color:#fff;border:1px solid rgba(0,0,0,.1);background-color:#27ae60;text-decoration:none;font-weight:400;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;box-shadow:inset 0 1px 2px -1px hsla(0,0%,100%,.5),inset 0 -2px 0 0 rgba(0,0,0,.1);outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all .1s linear;-moz-transition:all .1s linear;transition:all .1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:inset 0 -1px 0 0 rgba(0,0,0,.05),inset 0 2px 0 0 rgba(0,0,0,.1);padding:8px 12px 6px}.btn:visited{color:#fff}.btn-disabled,.btn-disabled:active,.btn-disabled:focus,.btn-disabled:hover,.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980b9!important}.btn-info:hover{background-color:#2e8ece!important}.btn-neutral{background-color:#f3f6f6!important;color:#404040!important}.btn-neutral:hover{background-color:#e5ebeb!important;color:#404040}.btn-neutral:visited{color:#404040!important}.btn-success{background-color:#27ae60!important}.btn-success:hover{background-color:#295!important}.btn-danger{background-color:#e74c3c!important}.btn-danger:hover{background-color:#ea6153!important}.btn-warning{background-color:#e67e22!important}.btn-warning:hover{background-color:#e98b39!important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f!important}.btn-link{background-color:transparent!important;color:#2980b9;box-shadow:none;border-color:transparent!important}.btn-link:active,.btn-link:hover{background-color:transparent!important;color:#409ad5!important;box-shadow:none}.btn-link:visited{color:#9b59b6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:after,.wy-btn-group:before{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-active .wy-dropdown-menu{display:block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:1px solid #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980b9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:1px solid #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search inputtype=search{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980b9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;left:auto;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned .wy-help-inline,.wy-form-aligned input,.wy-form-aligned label,.wy-form-aligned select,.wy-form-aligned textarea{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{margin:0}fieldset,legend{border:0;padding:0}legend{width:100%;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label,legend{display:block}label{margin:0 0 .3125em;color:#333;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;max-width:1200px;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:after,.wy-control-group:before{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#e74c3c}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full inputtype=color,.wy-control-group .wy-form-full inputtype=date,.wy-control-group .wy-form-full inputtype=datetime-local,.wy-control-group .wy-form-full inputtype=datetime,.wy-control-group .wy-form-full inputtype=email,.wy-control-group .wy-form-full inputtype=month,.wy-control-group .wy-form-full inputtype=number,.wy-control-group .wy-form-full inputtype=password,.wy-control-group .wy-form-full inputtype=search,.wy-control-group .wy-form-full inputtype=tel,.wy-control-group .wy-form-full inputtype=text,.wy-control-group .wy-form-full inputtype=time,.wy-control-group .wy-form-full inputtype=url,.wy-control-group .wy-form-full inputtype=week,.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves inputtype=color,.wy-control-group .wy-form-halves inputtype=date,.wy-control-group .wy-form-halves inputtype=datetime-local,.wy-control-group .wy-form-halves inputtype=datetime,.wy-control-group .wy-form-halves inputtype=email,.wy-control-group .wy-form-halves inputtype=month,.wy-control-group .wy-form-halves inputtype=number,.wy-control-group .wy-form-halves inputtype=password,.wy-control-group .wy-form-halves inputtype=search,.wy-control-group .wy-form-halves inputtype=tel,.wy-control-group .wy-form-halves inputtype=text,.wy-control-group .wy-form-halves inputtype=time,.wy-control-group .wy-form-halves inputtype=url,.wy-control-group .wy-form-halves inputtype=week,.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds inputtype=color,.wy-control-group .wy-form-thirds inputtype=date,.wy-control-group .wy-form-thirds inputtype=datetime-local,.wy-control-group .wy-form-thirds inputtype=datetime,.wy-control-group .wy-form-thirds inputtype=email,.wy-control-group .wy-form-thirds inputtype=month,.wy-control-group .wy-form-thirds inputtype=number,.wy-control-group .wy-form-thirds inputtype=password,.wy-control-group .wy-form-thirds inputtype=search,.wy-control-group .wy-form-thirds inputtype=tel,.wy-control-group .wy-form-thirds inputtype=text,.wy-control-group .wy-form-thirds inputtype=time,.wy-control-group .wy-form-thirds inputtype=url,.wy-control-group .wy-form-thirds inputtype=week,.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full{float:left;display:block;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.35765%;width:48.82117%}.wy-control-group .wy-form-halves:last-child,.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(odd){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.35765%;width:31.76157%}.wy-control-group .wy-form-thirds:last-child,.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control,.wy-control-no-input{margin:6px 0 0;font-size:90%}.wy-control-no-input{display:inline-block}.wy-control-group.fluid-input inputtype=color,.wy-control-group.fluid-input inputtype=date,.wy-control-group.fluid-input inputtype=datetime-local,.wy-control-group.fluid-input inputtype=datetime,.wy-control-group.fluid-input inputtype=email,.wy-control-group.fluid-input inputtype=month,.wy-control-group.fluid-input inputtype=number,.wy-control-group.fluid-input inputtype=password,.wy-control-group.fluid-input inputtype=search,.wy-control-group.fluid-input inputtype=tel,.wy-control-group.fluid-input inputtype=text,.wy-control-group.fluid-input inputtype=time,.wy-control-group.fluid-input inputtype=url,.wy-control-group.fluid-input inputtype=week{width:100%}.wy-form-message-inline{padding-left:.3em;color:#666;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:.3125em;font-style:italic}.wy-form-message p{font-size:inherit;font-style:italic;margin-bottom:6px}.wy-form-message p:last-child{margin-bottom:0}input{line-height:normal}inputtype=button,inputtype=reset,inputtype=submit{-webkit-appearance:button;cursor:pointer;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;*overflow:visible}inputtype=color,inputtype=date,inputtype=datetime-local,inputtype=datetime,inputtype=email,inputtype=month,inputtype=number,inputtype=password,inputtype=search,inputtype=tel,inputtype=text,inputtype=time,inputtype=url,inputtype=week{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border .3s linear;-moz-transition:border .3s linear;transition:border .3s linear}inputtype=datetime-local{padding:.34375em .625em}inputdisabled{cursor:default}inputtype=checkbox,inputtype=radio{padding:0;margin-right:.3125em;*height:13px;*width:13px}inputtype=checkbox,inputtype=radio,inputtype=search{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}inputtype=search::-webkit-search-cancel-button,inputtype=search::-webkit-search-decoration{-webkit-appearance:none}inputtype=color:focus,inputtype=date:focus,inputtype=datetime-local:focus,inputtype=datetime:focus,inputtype=email:focus,inputtype=month:focus,inputtype=number:focus,inputtype=password:focus,inputtype=search:focus,inputtype=tel:focus,inputtype=text:focus,inputtype=time:focus,inputtype=url:focus,inputtype=week:focus{outline:0;outline:thin dotted\9;border-color:#333}input.no-focus:focus{border-color:#ccc!important}inputtype=checkbox:focus,inputtype=file:focus,inputtype=radio:focus{outline:thin dotted #333;outline:1px auto #129fea}inputtype=colordisabled,inputtype=datedisabled,inputtype=datetime-localdisabled,inputtype=datetimedisabled,inputtype=emaildisabled,inputtype=monthdisabled,inputtype=numberdisabled,inputtype=passworddisabled,inputtype=searchdisabled,inputtype=teldisabled,inputtype=textdisabled,inputtype=timedisabled,inputtype=urldisabled,inputtype=weekdisabled{cursor:not-allowed;background-color:#fafafa}input:focus:invalid,select:focus:invalid,textarea:focus:invalid{color:#e74c3c;border:1px solid #e74c3c}input:focus:invalid:focus,select:focus:invalid:focus,textarea:focus:invalid:focus{border-color:#e74c3c}inputtype=checkbox:focus:invalid:focus,inputtype=file:focus:invalid:focus,inputtype=radio:focus:invalid:focus{outline-color:#e74c3c}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif}select,textarea{padding:.5em .625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border .3s linear;-moz-transition:border .3s linear;transition:border .3s linear}select{border:1px solid #ccc;background-color:#fff}selectmultiple{height:auto}select:focus,textarea:focus{outline:0}inputreadonly,selectdisabled,selectreadonly,textareadisabled,textareareadonly{cursor:not-allowed;background-color:#fafafa}inputtype=checkboxdisabled,inputtype=radiodisabled{cursor:not-allowed}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap;padding:6px}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{line-height:27px;padding:0 8px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:1px solid #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-switch{position:relative;display:block;height:24px;margin-top:12px;cursor:pointer}.wy-switch:before{left:0;top:0;width:36px;height:12px;background:#ccc}.wy-switch:after,.wy-switch:before{position:absolute;content:"";display:block;border-radius:4px;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.wy-switch:after{width:18px;height:18px;background:#999;left:-3px;top:-3px}.wy-switch span{position:absolute;left:48px;display:block;font-size:12px;color:#ccc;line-height:1}.wy-switch.active:before{background:#1e8449}.wy-switch.active:after{left:24px;background:#27ae60}.wy-switch.disabled{cursor:not-allowed;opacity:.8}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#e74c3c}.wy-control-group.wy-control-group-error inputtype=color,.wy-control-group.wy-control-group-error inputtype=date,.wy-control-group.wy-control-group-error inputtype=datetime-local,.wy-control-group.wy-control-group-error inputtype=datetime,.wy-control-group.wy-control-group-error inputtype=email,.wy-control-group.wy-control-group-error inputtype=month,.wy-control-group.wy-control-group-error inputtype=number,.wy-control-group.wy-control-group-error inputtype=password,.wy-control-group.wy-control-group-error inputtype=search,.wy-control-group.wy-control-group-error inputtype=tel,.wy-control-group.wy-control-group-error inputtype=text,.wy-control-group.wy-control-group-error inputtype=time,.wy-control-group.wy-control-group-error inputtype=url,.wy-control-group.wy-control-group-error inputtype=week,.wy-control-group.wy-control-group-error textarea{border:1px solid #e74c3c}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:.5em .625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27ae60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#e74c3c}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#e67e22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980b9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width:480px){.wy-form buttontype=submit{margin:.7em 0 0}.wy-form inputtype=color,.wy-form inputtype=date,.wy-form inputtype=datetime-local,.wy-form inputtype=datetime,.wy-form inputtype=email,.wy-form inputtype=month,.wy-form inputtype=number,.wy-form inputtype=password,.wy-form inputtype=search,.wy-form inputtype=tel,.wy-form inputtype=text,.wy-form inputtype=time,.wy-form inputtype=url,.wy-form inputtype=week,.wy-form label{margin-bottom:.3em;display:block}.wy-form inputtype=color,.wy-form inputtype=date,.wy-form inputtype=datetime-local,.wy-form inputtype=datetime,.wy-form inputtype=email,.wy-form inputtype=month,.wy-form inputtype=number,.wy-form inputtype=password,.wy-form inputtype=search,.wy-form inputtype=tel,.wy-form inputtype=time,.wy-form inputtype=url,.wy-form inputtype=week{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0}.wy-form-message,.wy-form-message-inline,.wy-form .wy-help-inline{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width:768px){.tablet-hide{display:none}}@media screen and (max-width:480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.rst-content table.docutils,.rst-content table.field-list,.wy-table{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.rst-content table.docutils caption,.rst-content table.field-list caption,.wy-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.rst-content table.docutils td,.rst-content table.docutils th,.rst-content table.field-list td,.rst-content table.field-list th,.wy-table td,.wy-table th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.rst-content table.docutils td:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list td:first-child,.rst-content table.field-list th:first-child,.wy-table td:first-child,.wy-table th:first-child{border-left-width:0}.rst-content table.docutils thead,.rst-content table.field-list thead,.wy-table thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.rst-content table.docutils thead th,.rst-content table.field-list thead th,.wy-table thead th{font-weight:700;border-bottom:2px solid #e1e4e5}.rst-content table.docutils td,.rst-content table.field-list td,.wy-table td{background-color:transparent;vertical-align:middle}.rst-content table.docutils td p,.rst-content table.field-list td p,.wy-table td p{line-height:18px}.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child,.wy-table td p:last-child{margin-bottom:0}.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min,.wy-table .wy-table-cell-min{width:1%;padding-right:0}.rst-content table.docutils .wy-table-cell-min inputtype=checkbox,.rst-content table.field-list .wy-table-cell-min inputtype=checkbox,.wy-table .wy-table-cell-min inputtype=checkbox{margin:0}.wy-table-secondary{color:grey;font-size:90%}.wy-table-tertiary{color:grey;font-size:80%}.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td,.wy-table-backed,.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td{background-color:#f3f6f6}.rst-content table.docutils,.wy-table-bordered-all{border:1px solid #e1e4e5}.rst-content table.docutils td,.wy-table-bordered-all td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.rst-content table.docutils tbody>tr:last-child td,.wy-table-bordered-all tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0!important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980b9;text-decoration:none;cursor:pointer}a:hover{color:#3091d1}a:visited{color:#9b59b6}html{height:100%}body,html{overflow-x:hidden}body{font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;font-weight:400;color:#404040;min-height:100%;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#e67e22!important}a.wy-text-warning:hover{color:#eb9950!important}.wy-text-info{color:#2980b9!important}a.wy-text-info:hover{color:#409ad5!important}.wy-text-success{color:#27ae60!important}a.wy-text-success:hover{color:#36d278!important}.wy-text-danger{color:#e74c3c!important}a.wy-text-danger:hover{color:#ed7669!important}.wy-text-neutral{color:#404040!important}a.wy-text-neutral:hover{color:#595959!important}.rst-content .toctree-wrapper>p.caption,h1,h2,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:Roboto Slab,ff-tisa-web-pro,Georgia,Arial,sans-serif}p{line-height:24px;font-size:16px;margin:0 0 24px}h1{font-size:175%}.rst-content .toctree-wrapper>p.caption,h2{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}.rst-content code,.rst-content tt,code{white-space:nowrap;max-width:100%;background:#fff;border:1px solid #e1e4e5;font-size:75%;padding:0 5px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;color:#e74c3c;overflow-x:auto}.rst-content tt.code-large,code.code-large{font-size:90%}.rst-content .section ul,.rst-content .toctree-wrapper ul,.wy-plain-list-disc,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.rst-content .section ul li,.rst-content .toctree-wrapper ul li,.wy-plain-list-disc li,article ul li{list-style:disc;margin-left:24px}.rst-content .section ul li p:last-child,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li p:last-child,.rst-content .toctree-wrapper ul li ul,.wy-plain-list-disc li p:last-child,.wy-plain-list-disc li ul,article ul li p:last-child,article ul li ul{margin-bottom:0}.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,.wy-plain-list-disc li li,article ul li li{list-style:circle}.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,.wy-plain-list-disc li li li,article ul li li li{list-style:square}.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,.wy-plain-list-disc li ol li,article ul li ol li{list-style:decimal}.rst-content .section ol,.rst-content ol.arabic,.wy-plain-list-decimal,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.rst-content .section ol li,.rst-content ol.arabic li,.wy-plain-list-decimal li,article ol li{list-style:decimal;margin-left:24px}.rst-content .section ol li p:last-child,.rst-content .section ol li ul,.rst-content ol.arabic li p:last-child,.rst-content ol.arabic li ul,.wy-plain-list-decimal li p:last-child,.wy-plain-list-decimal li ul,article ol li p:last-child,article ol li ul{margin-bottom:0}.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,.wy-plain-list-decimal li ul li,article ol li ul li{list-style:disc}.wy-breadcrumbs{*zoom:1}.wy-breadcrumbs:after,.wy-breadcrumbs:before{display:table;content:""}.wy-breadcrumbs:after{clear:both}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.rst-content .wy-breadcrumbs li tt,.wy-breadcrumbs li .rst-content tt,.wy-breadcrumbs li code{padding:5px;border:none;background:none}.rst-content .wy-breadcrumbs li tt.literal,.wy-breadcrumbs li .rst-content tt.literal,.wy-breadcrumbs li code.literal{color:#404040}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width:480px){.wy-breadcrumbs-extra,.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}html{font-size:16px}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:after,.wy-menu-horiz:before{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz li,.wy-menu-horiz ul{display:inline-block}.wy-menu-horiz li:hover{background:hsla(0,0%,100%,.1)}.wy-menu-horiz li.divide-left{border-left:1px solid #404040}.wy-menu-horiz li.divide-right{border-right:1px solid #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical{width:300px}.wy-menu-vertical header,.wy-menu-vertical p.caption{color:#55a5d9;height:32px;line-height:32px;padding:0 1.618em;margin:12px 0 0;display:block;font-weight:700;text-transform:uppercase;font-size:85%;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:1px solid #404040}.wy-menu-vertical li.divide-bottom{border-bottom:1px solid #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:grey;border-right:1px solid #c9c9c9;padding:.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.rst-content .wy-menu-vertical li tt,.wy-menu-vertical li .rst-content tt,.wy-menu-vertical li code{border:none;background:inherit;color:inherit;padding-left:0;padding-right:0}.wy-menu-vertical li span.toctree-expand{display:block;float:left;margin-left:-1.2em;font-size:.8em;line-height:1.6em;color:#4d4d4d}.wy-menu-vertical li.current>a,.wy-menu-vertical li.on a{color:#404040;font-weight:700;position:relative;background:#fcfcfc;border:none;padding:.4045em 1.618em}.wy-menu-vertical li.current>a:hover,.wy-menu-vertical li.on a:hover{background:#fcfcfc}.wy-menu-vertical li.current>a:hover span.toctree-expand,.wy-menu-vertical li.on a:hover span.toctree-expand{color:grey}.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand{display:block;font-size:.8em;line-height:1.6em;color:#333}.wy-menu-vertical li.toctree-l1.current>a{border-bottom:1px solid #c9c9c9;border-top:1px solid #c9c9c9}.wy-menu-vertical .toctree-l1.current .toctree-l2>ul,.wy-menu-vertical .toctree-l2.current .toctree-l3>ul,.wy-menu-vertical .toctree-l3.current .toctree-l4>ul,.wy-menu-vertical .toctree-l4.current .toctree-l5>ul,.wy-menu-vertical .toctree-l5.current .toctree-l6>ul,.wy-menu-vertical .toctree-l6.current .toctree-l7>ul,.wy-menu-vertical .toctree-l7.current .toctree-l8>ul,.wy-menu-vertical .toctree-l8.current .toctree-l9>ul,.wy-menu-vertical .toctree-l9.current .toctree-l10>ul,.wy-menu-vertical .toctree-l10.current .toctree-l11>ul{display:none}.wy-menu-vertical .toctree-l1.current .current.toctree-l2>ul,.wy-menu-vertical .toctree-l2.current .current.toctree-l3>ul,.wy-menu-vertical .toctree-l3.current .current.toctree-l4>ul,.wy-menu-vertical .toctree-l4.current .current.toctree-l5>ul,.wy-menu-vertical .toctree-l5.current .current.toctree-l6>ul,.wy-menu-vertical .toctree-l6.current .current.toctree-l7>ul,.wy-menu-vertical .toctree-l7.current .current.toctree-l8>ul,.wy-menu-vertical .toctree-l8.current .current.toctree-l9>ul,.wy-menu-vertical .toctree-l9.current .current.toctree-l10>ul,.wy-menu-vertical .toctree-l10.current .current.toctree-l11>ul{display:block}.wy-menu-vertical li.toctree-l3,.wy-menu-vertical li.toctree-l4{font-size:.9em}.wy-menu-vertical li.toctree-l2 a,.wy-menu-vertical li.toctree-l3 a,.wy-menu-vertical li.toctree-l4 a,.wy-menu-vertical li.toctree-l5 a,.wy-menu-vertical li.toctree-l6 a,.wy-menu-vertical li.toctree-l7 a,.wy-menu-vertical li.toctree-l8 a,.wy-menu-vertical li.toctree-l9 a,.wy-menu-vertical li.toctree-l10 a{color:#404040}.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l4 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l5 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l6 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l7 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l8 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l9 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l10 a:hover span.toctree-expand{color:grey}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a,.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a,.wy-menu-vertical li.toctree-l4.current li.toctree-l5>a,.wy-menu-vertical li.toctree-l5.current li.toctree-l6>a,.wy-menu-vertical li.toctree-l6.current li.toctree-l7>a,.wy-menu-vertical li.toctree-l7.current li.toctree-l8>a,.wy-menu-vertical li.toctree-l8.current li.toctree-l9>a,.wy-menu-vertical li.toctree-l9.current li.toctree-l10>a,.wy-menu-vertical li.toctree-l10.current li.toctree-l11>a{display:block}.wy-menu-vertical li.toctree-l2.current>a{padding:.4045em 2.427em}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a,.wy-menu-vertical li.toctree-l3.current>a{padding:.4045em 4.045em}.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a,.wy-menu-vertical li.toctree-l4.current>a{padding:.4045em 5.663em}.wy-menu-vertical li.toctree-l4.current li.toctree-l5>a,.wy-menu-vertical li.toctree-l5.current>a{padding:.4045em 7.281em}.wy-menu-vertical li.toctree-l5.current li.toctree-l6>a,.wy-menu-vertical li.toctree-l6.current>a{padding:.4045em 8.899em}.wy-menu-vertical li.toctree-l6.current li.toctree-l7>a,.wy-menu-vertical li.toctree-l7.current>a{padding:.4045em 10.517em}.wy-menu-vertical li.toctree-l7.current li.toctree-l8>a,.wy-menu-vertical li.toctree-l8.current>a{padding:.4045em 12.135em}.wy-menu-vertical li.toctree-l8.current li.toctree-l9>a,.wy-menu-vertical li.toctree-l9.current>a{padding:.4045em 13.753em}.wy-menu-vertical li.toctree-l9.current li.toctree-l10>a,.wy-menu-vertical li.toctree-l10.current>a{padding:.4045em 15.371em}.wy-menu-vertical li.toctree-l10.current li.toctree-l11>a{padding:.4045em 16.989em}.wy-menu-vertical li.toctree-l2.current>a,.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a{background:#c9c9c9}.wy-menu-vertical li.toctree-l2 span.toctree-expand{color:#a3a3a3}.wy-menu-vertical li.toctree-l3.current>a,.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a{background:#bdbdbd}.wy-menu-vertical li.toctree-l3 span.toctree-expand{color:#969696}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical li ul li a{margin-bottom:0;color:#d9d9d9;font-weight:400}.wy-menu-vertical a{line-height:18px;padding:.4045em 1.618em;display:block;position:relative;font-size:90%;color:#d9d9d9}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:hover span.toctree-expand{color:#d9d9d9}.wy-menu-vertical a:active{background-color:#2980b9;cursor:pointer;color:#fff}.wy-menu-vertical a:active span.toctree-expand{color:#fff}.wy-side-nav-search{display:block;width:300px;padding:.809em;margin-bottom:.809em;z-index:200;background-color:#2980b9;text-align:center;color:#fcfcfc}.wy-side-nav-search inputtype=text{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto .809em;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-side-nav-search .wy-dropdown>a,.wy-side-nav-search>a{color:#fcfcfc;font-size:100%;font-weight:700;display:inline-block;padding:4px 6px;margin-bottom:.809em}.wy-side-nav-search .wy-dropdown>a:hover,.wy-side-nav-search>a:hover{background:hsla(0,0%,100%,.1)}.wy-side-nav-search .wy-dropdown>a img.logo,.wy-side-nav-search>a img.logo{display:block;margin:0 auto;height:auto;width:auto;border-radius:0;max-width:100%;background:transparent}.wy-side-nav-search .wy-dropdown>a.icon img.logo,.wy-side-nav-search>a.icon img.logo{margin-top:.85em}.wy-side-nav-search>div.version{margin-top:-.4045em;margin-bottom:.809em;font-weight:400;color:hsla(0,0%,100%,.3)}.wy-nav .wy-menu-vertical header{color:#2980b9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980b9;color:#fff}data-menu-wrap{-webkit-transition:all .2s ease-in;-moz-transition:all .2s ease-in;transition:all .2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}data-menu-wrap.move-center{left:0;right:auto;opacity:1}data-menu-wrap.move-left{right:auto;left:-100%;opacity:0}data-menu-wrap.move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:#fcfcfc}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:fixed;top:0;bottom:0;left:0;padding-bottom:2em;width:300px;overflow-x:hidden;overflow-y:hidden;min-height:100%;color:#9b9b9b;background:#343131;z-index:200}.wy-side-scroll{width:320px;position:relative;overflow-x:hidden;overflow-y:scroll;height:100%}.wy-nav-top{display:none;background:#2980b9;color:#fff;padding:.4045em .809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:after,.wy-nav-top:before{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:700}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer;padding-top:inherit}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:grey}footer p{margin-bottom:12px}.rst-content footer span.commit tt,footer span.commit .rst-content tt,footer span.commit code{padding:0;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;font-size:1em;background:none;border:none;color:grey}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:after,.rst-footer-buttons:before{width:100%;display:table;content:""}.rst-footer-buttons:after{clear:both}.rst-breadcrumbs-buttons{margin-top:12px;*zoom:1}.rst-breadcrumbs-buttons:after,.rst-breadcrumbs-buttons:before{display:table;content:""}.rst-breadcrumbs-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:1px solid #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:1px solid #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:grey;font-size:90%}.genindextable li>ul{margin-left:24px}@media screen and (max-width:768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-menu.wy-menu-vertical,.wy-side-nav-search,.wy-side-scroll{width:auto}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width:1100px){.wy-nav-content-wrap{background:rgba(0,0,0,.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,.wy-nav-side,footer{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;*zoom:1}.rst-versions .rst-current-version:after,.rst-versions .rst-current-version:before{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-content .code-block-caption .rst-versions .rst-current-version .headerlink,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-content code.download .rst-versions .rst-current-version span:first-child,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-content p.caption .rst-versions .rst-current-version .headerlink,.rst-content table>caption .rst-versions .rst-current-version .headerlink,.rst-content tt.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .icon,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-versions .rst-current-version .rst-content .code-block-caption .headerlink,.rst-versions .rst-current-version .rst-content code.download span:first-child,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-versions .rst-current-version .rst-content p.caption .headerlink,.rst-versions .rst-current-version .rst-content table>caption .headerlink,.rst-versions .rst-current-version .rst-content tt.download span:first-child,.rst-versions .rst-current-version .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .rst-versions .rst-current-version span.toctree-expand{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}.rst-content img{max-width:100%;height:auto}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure p.caption{font-style:italic}.rst-content div.figure p:last-child.caption{margin-bottom:0}.rst-content div.figure.align-center{text-align:center}.rst-content .section>a>img,.rst-content .section>img{margin-bottom:24px}.rst-content abbrtitle{text-decoration:none}.rst-content.style-external-links a.reference.external:after{font-family:FontAwesome;content:"\f08e";color:#b3b3b3;vertical-align:super;font-size:60%;margin:0 .2em}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content pre.literal-block{white-space:pre;margin:0;padding:12px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;display:block;overflow:auto}.rst-content divclass^=highlight,.rst-content pre.literal-block{border:1px solid #e1e4e5;overflow-x:auto;margin:1px 0 24px}.rst-content divclass^=highlight divclass^=highlight,.rst-content pre.literal-block divclass^=highlight{padding:0;border:none;margin:0}.rst-content divclass^=highlight td.code{width:100%}.rst-content .linenodiv pre{border-right:1px solid #e6e9ea;margin:0;padding:12px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;user-select:none;pointer-events:none}.rst-content divclass^=highlight pre{white-space:pre;margin:0;padding:12px;display:block;overflow:auto}.rst-content divclass^=highlight pre .hll{display:block;margin:0 -12px;padding:0 12px}.rst-content .linenodiv pre,.rst-content divclass^=highlight pre,.rst-content pre.literal-block{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;font-size:12px;line-height:1.4}.rst-content div.highlight .gp{user-select:none;pointer-events:none}.rst-content .code-block-caption{font-style:italic;font-size:85%;line-height:1;padding:1em 0;text-align:center}@media print{.rst-content .codeblock,.rst-content divclass^=highlight,.rst-content divclass^=highlight pre{white-space:pre-wrap}}.rst-content .admonition,.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .note,.rst-content .seealso,.rst-content .tip,.rst-content .warning{clear:both}.rst-content .admonition-todo .last,.rst-content .admonition-todo>:last-child,.rst-content .admonition .last,.rst-content .admonition>:last-child,.rst-content .attention .last,.rst-content .attention>:last-child,.rst-content .caution .last,.rst-content .caution>:last-child,.rst-content .danger .last,.rst-content .danger>:last-child,.rst-content .error .last,.rst-content .error>:last-child,.rst-content .hint .last,.rst-content .hint>:last-child,.rst-content .important .last,.rst-content .important>:last-child,.rst-content .note .last,.rst-content .note>:last-child,.rst-content .seealso .last,.rst-content .seealso>:last-child,.rst-content .tip .last,.rst-content .tip>:last-child,.rst-content .warning .last,.rst-content .warning>:last-child{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent!important;border-color:rgba(0,0,0,.1)!important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha>li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha>li{list-style:upper-alpha}.rst-content .section ol li>*,.rst-content .section ul li>*{margin-top:12px;margin-bottom:12px}.rst-content .section ol li>:first-child,.rst-content .section ul li>:first-child{margin-top:0}.rst-content .section ol li>p,.rst-content .section ol li>p:last-child,.rst-content .section ul li>p,.rst-content .section ul li>p:last-child{margin-bottom:12px}.rst-content .section ol li>p:only-child,.rst-content .section ol li>p:only-child:last-child,.rst-content .section ul li>p:only-child,.rst-content .section ul li>p:only-child:last-child{margin-bottom:0}.rst-content .section ol li>ol,.rst-content .section ol li>ul,.rst-content .section ul li>ol,.rst-content .section ul li>ul{margin-bottom:12px}.rst-content .section ol.simple li>*,.rst-content .section ol.simple li ol,.rst-content .section ol.simple li ul,.rst-content .section ul.simple li>*,.rst-content .section ul.simple li ol,.rst-content .section ul.simple li ul{margin-top:0;margin-bottom:0}.rst-content .line-block{margin-left:0;margin-bottom:24px;line-height:24px}.rst-content .line-block .line-block{margin-left:24px;margin-bottom:0}.rst-content .topic-title{font-weight:700;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0 0 24px 24px}.rst-content .align-left{float:left;margin:0 24px 24px 0}.rst-content .align-center{margin:auto}.rst-content .align-center:not(table){display:block}.rst-content .code-block-caption .headerlink,.rst-content .toctree-wrapper>p.caption .headerlink,.rst-content dl dt .headerlink,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink{visibility:hidden;font-size:14px}.rst-content .code-block-caption .headerlink:after,.rst-content .toctree-wrapper>p.caption .headerlink:after,.rst-content dl dt .headerlink:after,.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content p.caption .headerlink:after,.rst-content table>caption .headerlink:after{content:"\f0c1";font-family:FontAwesome}.rst-content .code-block-caption:hover .headerlink:after,.rst-content .toctree-wrapper>p.caption:hover .headerlink:after,.rst-content dl dt:hover .headerlink:after,.rst-content h1:hover .headerlink:after,.rst-content h2:hover .headerlink:after,.rst-content h3:hover .headerlink:after,.rst-content h4:hover .headerlink:after,.rst-content h5:hover .headerlink:after,.rst-content h6:hover .headerlink:after,.rst-content p.caption:hover .headerlink:after,.rst-content table>caption:hover .headerlink:after{visibility:visible}.rst-content table>caption .headerlink:after{font-size:12px}.rst-content .centered{text-align:center}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:1px solid #e1e4e5}.rst-content .sidebar dl,.rst-content .sidebar p,.rst-content .sidebar ul{font-size:90%}.rst-content .sidebar .last,.rst-content .sidebar>:last-child{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:Roboto Slab,ff-tisa-web-pro,Georgia,Arial,sans-serif;font-weight:700;background:#e1e4e5;padding:6px 12px;margin:-24px -24px 24px;font-size:100%}.rst-content .highlighted{background:#f1c40f;box-shadow:0 0 0 2px #f1c40f;display:inline;font-weight:700}.rst-content .citation-reference,.rst-content .footnote-reference{vertical-align:baseline;position:relative;top:-.4em;line-height:0;font-size:90%}.rst-content .hlist{width:100%}html.writer-html4 .rst-content table.docutils.citation,html.writer-html4 .rst-content table.docutils.footnote{background:none;border:none}html.writer-html4 .rst-content table.docutils.citation td,html.writer-html4 .rst-content table.docutils.citation tr,html.writer-html4 .rst-content table.docutils.footnote td,html.writer-html4 .rst-content table.docutils.footnote tr{border:none;background-color:transparent!important;white-space:normal}html.writer-html4 .rst-content table.docutils.citation td.label,html.writer-html4 .rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}html.writer-html5 .rst-content dl dt span.classifier:before{content:" : "}html.writer-html5 .rst-content dl.field-list,html.writer-html5 .rst-content dl.footnote{display:grid;grid-template-columns:max-content auto}html.writer-html5 .rst-content dl.field-list>dt,html.writer-html5 .rst-content dl.footnote>dt{padding-left:1rem}html.writer-html5 .rst-content dl.field-list>dt:after,html.writer-html5 .rst-content dl.footnote>dt:after{content:":"}html.writer-html5 .rst-content dl.field-list>dd,html.writer-html5 .rst-content dl.field-list>dt,html.writer-html5 .rst-content dl.footnote>dd,html.writer-html5 .rst-content dl.footnote>dt{margin-bottom:0}html.writer-html5 .rst-content dl.footnote{font-size:.9rem}html.writer-html5 .rst-content dl.footnote>dt{margin:0 .5rem .5rem 0;line-height:1.2rem;word-break:break-all;font-weight:400}html.writer-html5 .rst-content dl.footnote>dt>span.brackets{margin-right:.5rem}html.writer-html5 .rst-content dl.footnote>dt>span.brackets:before{content:""}html.writer-html5 .rst-content dl.footnote>dt>span.brackets:after{content:""}html.writer-html5 .rst-content dl.footnote>dt>span.fn-backref{font-style:italic}html.writer-html5 .rst-content dl.footnote>dd{margin:0 0 .5rem;line-height:1.2rem}html.writer-html5 .rst-content dl.footnote>dd p,html.writer-html5 .rst-content dl.option-list kbd{font-size:.9rem}.rst-content table.docutils.footnote,html.writer-html4 .rst-content table.docutils.citation,html.writer-html5 .rst-content dl.footnote{color:grey}.rst-content table.docutils.footnote code,.rst-content table.docutils.footnote tt,html.writer-html4 .rst-content table.docutils.citation code,html.writer-html4 .rst-content table.docutils.citation tt,html.writer-html5 .rst-content dl.footnote code,html.writer-html5 .rst-content dl.footnote tt{color:#555}.rst-content .wy-table-responsive.citation,.rst-content .wy-table-responsive.footnote{margin-bottom:0}.rst-content .wy-table-responsive.citation+:not(.citation),.rst-content .wy-table-responsive.footnote+:not(.footnote){margin-top:24px}.rst-content .wy-table-responsive.citation:last-child,.rst-content .wy-table-responsive.footnote:last-child{margin-bottom:24px}.rst-content table.docutils th{border-color:#e1e4e5}html.writer-html5 .rst-content table.docutils th{border:1px solid #e1e4e5}html.writer-html5 .rst-content table.docutils td>p,html.writer-html5 .rst-content table.docutils th>p{line-height:1rem;margin-bottom:0;font-size:.9rem}.rst-content table.docutils td .last,.rst-content table.docutils td .last>:last-child{margin-bottom:0}.rst-content table.field-list,.rst-content table.field-list td{border:none}.rst-content table.field-list td p{font-size:inherit;line-height:inherit}.rst-content table.field-list td>strong{display:inline-block}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left}.rst-content code,.rst-content tt{color:#000;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;padding:2px 5px}.rst-content code big,.rst-content code em,.rst-content tt big,.rst-content tt em{font-size:100%!important;line-height:normal}.rst-content code.literal,.rst-content tt.literal{color:#e74c3c}.rst-content code.xref,.rst-content tt.xref,a .rst-content code,a .rst-content tt{font-weight:700;color:#404040}.rst-content kbd,.rst-content pre,.rst-content samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace}.rst-content a code,.rst-content a tt{color:#2980b9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:700;margin-bottom:12px}.rst-content dl ol,.rst-content dl p,.rst-content dl table,.rst-content dl ul{margin-bottom:12px}.rst-content dl dd{margin:0 0 12px 24px;line-height:24px}html.writer-html4 .rst-content dl:not(.docutils),html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple){margin-bottom:24px}html.writer-html4 .rst-content dl:not(.docutils)>dt,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt{display:table;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980b9;border-top:3px solid #6ab0de;padding:6px;position:relative}html.writer-html4 .rst-content dl:not(.docutils)>dt:before,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt:before{color:#6ab0de}html.writer-html4 .rst-content dl:not(.docutils)>dt .headerlink,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt .headerlink{color:#404040;font-size:100%!important}html.writer-html4 .rst-content dl:not(.docutils) dl:not(.field-list)>dt,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) dl:not(.field-list)>dt{margin-bottom:6px;border:none;border-left:3px solid #ccc;background:#f0f0f0;color:#555}html.writer-html4 .rst-content dl:not(.docutils) dl:not(.field-list)>dt .headerlink,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) dl:not(.field-list)>dt .headerlink{color:#404040;font-size:100%!important}html.writer-html4 .rst-content dl:not(.docutils)>dt:first-child,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt:first-child{margin-top:0}html.writer-html4 .rst-content dl:not(.docutils) code,html.writer-html4 .rst-content dl:not(.docutils) tt,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt{font-weight:700}html.writer-html4 .rst-content dl:not(.docutils) code.descclassname,html.writer-html4 .rst-content dl:not(.docutils) code.descname,html.writer-html4 .rst-content dl:not(.docutils) tt.descclassname,html.writer-html4 .rst-content dl:not(.docutils) tt.descname,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code.descclassname,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code.descname,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt.descclassname,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt.descname{background-color:transparent;border:none;padding:0;font-size:100%!important}html.writer-html4 .rst-content dl:not(.docutils) code.descname,html.writer-html4 .rst-content dl:not(.docutils) tt.descname,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code.descname,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt.descname{font-weight:700}html.writer-html4 .rst-content dl:not(.docutils) .optional,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:700}html.writer-html4 .rst-content dl:not(.docutils) .property,html.writer-html5 .rst-content dlclass:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-back,.rst-content .viewcode-link{display:inline-block;color:#27ae60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:700}.rst-content code.download,.rst-content tt.download{background:inherit;padding:inherit;font-weight:400;font-family:inherit;font-size:inherit;color:inherit;border:inherit;white-space:inherit}.rst-content code.download span:first-child,.rst-content tt.download span:first-child{-webkit-font-smoothing:subpixel-antialiased}.rst-content code.download span:first-child:before,.rst-content tt.download span:first-child:before{margin-right:4px}.rst-content .guilabel{border:1px solid #7fbbe3;background:#e7f2fa;font-size:80%;font-weight:700;border-radius:4px;padding:2.4px 6px;margin:auto 2px}.rst-content .versionmodified{font-style:italic}@media screen and (max-width:480px){.rst-content .sidebar{width:100%}}spanid*=MathJax-Span{color:#404040}.math{text-align:center}@font-face{font-family:Lato;src:url(fonts/lato-normal.woff2?bd03a2cc277bbbc338d464e679fe9942) format("woff2"),url(fonts/lato-normal.woff?27bd77b9162d388cb8d4c4217c7c5e2a) format("woff");font-weight:400;font-style:normal;font-display:block}@font-face{font-family:Lato;src:url(fonts/lato-bold.woff2?cccb897485813c7c256901dbca54ecf2) format("woff2"),url(fonts/lato-bold.woff?d878b6c29b10beca227e9eef4246111b) format("woff");font-weight:700;font-style:normal;font-display:block}@font-face{font-family:Lato;src:url(fonts/lato-bold-italic.woff2?0b6bb6725576b072c5d0b02ecdd1900d) format("woff2"),url(fonts/lato-bold-italic.woff?9c7e4e9eb485b4a121c760e61bc3707c) format("woff");font-weight:700;font-style:italic;font-display:block}@font-face{font-family:Lato;src:url(fonts/lato-normal-italic.woff2?4eb103b4d12be57cb1d040ed5e162e9d) format("woff2"),url(fonts/lato-normal-italic.woff?f28f2d6482446544ef1ea1ccc6dd5892) format("woff");font-weight:400;font-style:italic;font-display:block}@font-face{font-family:Roboto Slab;font-style:normal;font-weight:400;src:url(fonts/Roboto-Slab-Regular.woff2?7abf5b8d04d26a2cafea937019bca958) format("woff2"),url(fonts/Roboto-Slab-Regular.woff?c1be9284088d487c5e3ff0a10a92e58c) format("woff");font-display:block}@font-face{font-family:Roboto Slab;font-style:normal;font-weight:700;src:url(fonts/Roboto-Slab-Bold.woff2?9984f4a9bda09be08e83f2506954adbe) format("woff2"),url(fonts/Roboto-Slab-Bold.woff?bed5564a116b05148e3b3bea6fb1162a) format("woff");font-display:block}
\ No newline at end of file

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/js Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/js/badge_only.js Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/static/js/theme.js Deleted

@@ -1,1 +0,0 @@
-!function(n){var e={};function t(i){if(ei)return ei.exports;var o=ei={i:i,l:!1,exports:{}};return ni.call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=n,t.c=e,t.d=function(n,e,i){t.o(n,e)||Object.defineProperty(n,e,{enumerable:!0,get:i})},t.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},t.t=function(n,e){if(1&e&&(n=t(n)),8&e)return n;if(4&e&&"object"==typeof n&&n&&n.__esModule)return n;var i=Object.create(null);if(t.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:n}),2&e&&"string"!=typeof n)for(var o in n)t.d(i,o,function(e){return ne}.bind(null,o));return i},t.n=function(n){var e=n&&n.__esModule?function(){return n.default}:function(){return n};return t.d(e,"a",e),e},t.o=function(n,e){return Object.prototype.hasOwnProperty.call(n,e)},t.p="",t(t.s=0)}(function(n,e,t){t(1),n.exports=t(3)},function(n,e,t){(function(){var e="undefined"!=typeof window?window.jQuery:t(2);n.exports.ThemeNav={navBar:null,win:null,winScroll:!1,winResize:!1,linkScroll:!1,winPosition:0,winHeight:null,docHeight:null,isRunning:!1,enable:function(n){var t=this;void 0===n&&(n=!0),t.isRunning||(t.isRunning=!0,e((function(e){t.init(e),t.reset(),t.win.on("hashchange",t.reset),n&&t.win.on("scroll",(function(){t.linkScroll||t.winScroll||(t.winScroll=!0,requestAnimationFrame((function(){t.onScroll()})))})),t.win.on("resize",(function(){t.winResize||(t.winResize=!0,requestAnimationFrame((function(){t.onResize()})))})),t.onResize()})))},enableSticky:function(){this.enable(!0)},init:function(n){n(document);var e=this;this.navBar=n("div.wy-side-scroll:first"),this.win=n(window),n(document).on("click","data-toggle='wy-nav-top'",(function(){n("data-toggle='wy-nav-shift'").toggleClass("shift"),n("data-toggle='rst-versions'").toggleClass("shift")})).on("click",".wy-menu-vertical .current ul li a",(function(){var t=n(this);n("data-toggle='wy-nav-shift'").removeClass("shift"),n("data-toggle='rst-versions'").toggleClass("shift"),e.toggleCurrent(t),e.hashChange()})).on("click","data-toggle='rst-current-version'",(function(){n("data-toggle='rst-versions'").toggleClass("shift-up")})),n("table.docutils:not(.field-list,.footnote,.citation)").wrap("<div class='wy-table-responsive'></div>"),n("table.docutils.footnote").wrap("<div class='wy-table-responsive footnote'></div>"),n("table.docutils.citation").wrap("<div class='wy-table-responsive citation'></div>"),n(".wy-menu-vertical ul").not(".simple").siblings("a").each((function(){var t=n(this);expand=n('<span class="toctree-expand"></span>'),expand.on("click",(function(n){return e.toggleCurrent(t),n.stopPropagation(),!1})),t.prepend(expand)}))},reset:function(){var n=encodeURI(window.location.hash)||"#";try{var e=$(".wy-menu-vertical"),t=e.find('href="'+n+'"');if(0===t.length){var i=$('.document id="'+n.substring(1)+'"').closest("div.section");0===(t=e.find('href="#'+i.attr("id")+'"')).length&&(t=e.find('href="#"'))}t.length>0&&($(".wy-menu-vertical .current").removeClass("current"),t.addClass("current"),t.closest("li.toctree-l1").addClass("current"),t.closest("li.toctree-l1").parent().addClass("current"),t.closest("li.toctree-l1").addClass("current"),t.closest("li.toctree-l2").addClass("current"),t.closest("li.toctree-l3").addClass("current"),t.closest("li.toctree-l4").addClass("current"),t.closest("li.toctree-l5").addClass("current"),t0.scrollIntoView())}catch(n){console.log("Error expanding nav for anchor",n)}},onScroll:function(){this.winScroll=!1;var n=this.win.scrollTop(),e=n+this.winHeight,t=this.navBar.scrollTop()+(n-this.winPosition);n<0||e>this.docHeight||(this.navBar.scrollTop(t),this.winPosition=n)},onResize:function(){this.winResize=!1,this.winHeight=this.win.height(),this.docHeight=$(document).height()},hashChange:function(){this.linkScroll=!0,this.win.one("hashchange",(function(){this.linkScroll=!1}))},toggleCurrent:function(n){var e=n.closest("li");e.siblings("li.current").removeClass("current"),e.siblings().find("li.current").removeClass("current"),e.find("> ul li.current").removeClass("current"),e.toggleClass("current")}},"undefined"!=typeof window&&(window.SphinxRtdTheme={Navigation:n.exports.ThemeNav,StickyNav:n.exports.ThemeNav}),function(){for(var n=0,e="ms","moz","webkit","o",t=0;t<e.length&&!window.requestAnimationFrame;++t)window.requestAnimationFrame=windowet+"RequestAnimationFrame",window.cancelAnimationFrame=windowet+"CancelAnimationFrame"||windowet+"CancelRequestAnimationFrame";window.requestAnimationFrame||(window.requestAnimationFrame=function(e,t){var i=(new Date).getTime(),o=Math.max(0,16-(i-n)),r=window.setTimeout((function(){e(i+o)}),o);return n=i+o,r}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(n){clearTimeout(n)})}()}).call(window)},function(n,e){n.exports=jQuery},function(n,e,t){});
\ No newline at end of file

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/theme.conf Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_themes/sphinx_rtd_theme/versions.html Deleted

@@ -1,34 +0,0 @@
-{% if READTHEDOCS %}
-{# Add rst-badge after rst-versions for small badge style. #}
-  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      <span class="fa fa-book"> Read the Docs</span>
-      v: {{ current_version }}
-      <span class="fa fa-caret-down"></span>
-    </span>
-    <div class="rst-other-versions">
-      <dl>
-        <dt>{{ _('Versions') }}</dt>
-        {% for slug, url in versions %}
-          <dd><a href="{{ url }}">{{ slug }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>{{ _('Downloads') }}</dt>
-        {% for type, url in downloads %}
-          <dd><a href="{{ url }}">{{ type }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        {# Translators: The phrase "Read the Docs" is not translated #}
-        <dt>{{ _('On Read the Docs') }}</dt>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">{{ _('Project Home') }}</a>
-          </dd>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">{{ _('Builds') }}</a>
-          </dd>
-      </dl>
-    </div>
-  </div>
-{% endif %}

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/asio_http2.h.rst.in Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/asio_http2_client.h.rst.in Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/asio_http2_server.h.rst.in Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/libnghttp2_asio.rst.in Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/python-apiref.rst.in Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/sources/libnghttp2_asio.rst Deleted

@@ -1,433 +0,0 @@
-libnghttp2_asio: High level HTTP/2 C++ library
-==============================================
-
-libnghttp2_asio is C++ library built on top of libnghttp2 and provides
-high level abstraction API to build HTTP/2 applications.  It depends
-on Boost::ASIO library and OpenSSL.  Currently libnghttp2_asio
-provides server and client side API.
-
-libnghttp2_asio is not built by default.  Use ``--enable-asio-lib``
-configure flag to build libnghttp2_asio.  The required Boost libraries
-are:
-
-* Boost::Asio
-* Boost::System
-* Boost::Thread
-
-We have 3 header files for this library:
-
-* :doc:`asio_http2_server.h`
-* :doc:`asio_http2_client.h`
-* :doc:`asio_http2.h`
-
-asio_http2.h is included from the other two files.
-
-To build a program with libnghttp2_asio, link to the following
-libraries::
-
-    -lnghttp2_asio -lboost_system
-
-If ``boost::asio::ssl`` is used in application code, OpenSSL is also
-required in link line::
-
-    -lnghttp2_asio -lboost_system -lssl -lcrypto
-
-Server API
-----------
-
-To use server API, first include following header file:
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_server.h>
-
-Also take a look at that header file :doc:`asio_http2_server.h`.
-
-Server API is designed to build HTTP/2 server very easily to utilize
-C++11 anonymous function and closure.  The bare minimum example of
-HTTP/2 server looks like this:
-
-.. code-block:: cpp
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      http2 server;
-
-      server.handle("/", (const request &req, const response &res) {
-        res.write_head(200);
-        res.end("hello, world\n");
-      });
-
-      if (server.listen_and_serve(ec, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-First we instantiate ``nghttp2::asio_http2::server::http2`` object.
-``nghttp2::asio_http2::server::http2::handle`` function registers
-pattern and its handler function.  In this example, we register "/" as
-pattern, which matches all requests.  Then call
-``nghttp2::asio_http2::server::http2::listen_and_serve`` function with
-address and port to listen to.
-
-The ``req`` and ``res`` represent HTTP request and response
-respectively.  ``nghttp2::asio_http2_::server::response::write_head``
-constructs HTTP response header fields.  The first argument is HTTP
-status code, in the above example, which is 200.  The second argument,
-which is omitted in the above example, is additional header fields to
-send.
-
-``nghttp2::asio_http2::server::response::end`` sends response body.
-In the above example, we send string "hello, world".
-
-The life time of req and res object ends after the callback set by
-``nghttp2::asio_http2::server::response::on_close`` function.
-Application must not use those objects after this call.
-
-Serving static files and enabling SSL/TLS
-+++++++++++++++++++++++++++++++++++++++++
-
-In this example, we serve a couple of static files and also enable
-SSL/TLS.
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_server.h>
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-
-      tls.use_private_key_file("server.key", boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file("server.crt");
-
-      configure_tls_context_easy(ec, tls);
-
-      http2 server;
-
-      server.handle("/index.html", (const request &req, const response &res) {
-        res.write_head(200);
-        res.end(file_generator("index.html"));
-      });
-
-      if (server.listen_and_serve(ec, tls, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-We first create ``boost::asio::ssl::context`` object and set path to
-private key file and certificate file.
-``nghttp2::asio_http2::server::configure_tls_context_easy`` function
-configures SSL/TLS context object for HTTP/2 server use, including NPN
-callbacks.
-
-In the above example, if request path is "/index.html", we serve
-index.html file in the current working directory.
-``nghttp2::asio_http2::server::response::end`` has overload to take
-function of type ``nghttp2::asio_http2::generator_cb`` and application
-pass its implementation to generate response body.  For the
-convenience, libnghttp2_asio library provides
-``nghttp2::asio_http2::file_generator`` function to generate function
-to server static file.  If other resource is requested, server
-automatically responds with 404 status code.
-
-Server push
-+++++++++++
-
-Server push is also supported.
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_server.h>
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-
-      tls.use_private_key_file("server.key", boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file("server.crt");
-
-      configure_tls_context_easy(ec, tls);
-
-      http2 server;
-
-      std::string style_css = "h1 { color: green; }";
-
-      server.handle("/", &style_css(const request &req, const response &res) {
-        boost::system::error_code ec;
-        auto push = res.push(ec, "GET", "/style.css");
-        push->write_head(200);
-        push->end(style_css);
-
-        res.write_head(200);
-        res.end(R"(
-    <!DOCTYPE html><html lang="en">
-    <title>HTTP/2 FTW</title><body>
-    <link href="/style.css" rel="stylesheet" type="text/css">
-    <h1>This should be green</h1>
-    </body></html>
-    )");
-      });
-
-      server.handle("/style.css",
-                    &style_css(const request &req, const response &res) {
-        res.write_head(200);
-        res.end(style_css);
-      });
-
-      if (server.listen_and_serve(ec, tls, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-When client requested any resource other than "/style.css", we push
-"/style.css".  To push resource, call
-``nghttp2::asio_http2::server::response::push`` function with desired
-method and path.  It returns another response object and use its
-functions to send push response.
-
-Enable multi-threading
-++++++++++++++++++++++
-
-Enabling multi-threading is very easy.  Just call
-``nghttp2::asio_http2::server::http2::num_threads`` function with the
-desired number of threads:
-
-.. code-block:: cpp
-
-    http2 server;
-
-    // Use 4 native threads
-    server.num_threads(4);
-
-Client API
-----------
-
-To use client API, first include following header file:
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_client.h>
-
-Also take a look at that header file :doc:`asio_http2_client.h`.
-
-Here is the sample client code to access HTTP/2 server and print out
-response header fields and response body to the console screen:
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      // connect to localhost:3000
-      session sess(io_service, "localhost", "3000");
-
-      sess.on_connect(&sess(tcp::resolver::iterator endpoint_it) {
-	boost::system::error_code ec;
-
-	auto req = sess.submit(ec, "GET", "http://localhost:3000/");
-
-	req->on_response((const response &res) {
-	  // print status code and response header fields.
-	  std::cerr << "HTTP/2 " << res.status_code() << std::endl;
-	  for (auto &kv : res.header()) {
-	    std::cerr << kv.first << ": " << kv.second.value << "\n";
-	  }
-	  std::cerr << std::endl;
-
-	  res.on_data((const uint8_t *data, std::size_t len) {
-	    std::cerr.write(reinterpret_cast<const char *>(data), len);
-	    std::cerr << std::endl;
-	  });
-	});
-
-	req->on_close(&sess(uint32_t error_code) {
-	  // shutdown session after first request was done.
-	  sess.shutdown();
-	});
-      });
-
-      sess.on_error((const boost::system::error_code &ec) {
-	std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-``nghttp2::asio_http2::client::session`` object takes
-``boost::asio::io_service`` object and remote server address.  When
-connection is made, the callback function passed to
-``nghttp2::asio_http2::client::on_connect`` is invoked with connected
-address as its parameter.  After this callback call, use
-``nghttp2::asio_http2::session::submit`` to send request to the
-server.  You can submit multiple requests at once without waiting for
-the completion of previous request.
-
-The life time of req and res object ends after the callback set by
-``nghttp2::asio_http2::server::request::on_close`` function.
-Application must not use those objects after this call.
-
-Normally, client does not stop even after all requests are done unless
-connection is lost.  To stop client, call
-``nghttp2::asio_http2::server::session::shutdown()``.
-
-Receive server push and enable SSL/TLS
-++++++++++++++++++++++++++++++++++++++
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-      tls.set_default_verify_paths();
-      // disabled to make development easier...
-      // tls_ctx.set_verify_mode(boost::asio::ssl::verify_peer);
-      configure_tls_context(ec, tls);
-
-      // connect to localhost:3000
-      session sess(io_service, tls, "localhost", "3000");
-
-      sess.on_connect(&sess(tcp::resolver::iterator endpoint_it) {
-	boost::system::error_code ec;
-
-	auto req = sess.submit(ec, "GET", "http://localhost:3000/");
-
-	req->on_response(&sess(const response &res) {
-	  std::cerr << "response received!" << std::endl;
-	  res.on_data(&sess(const uint8_t *data, std::size_t len) {
-	    std::cerr.write(reinterpret_cast<const char *>(data), len);
-	    std::cerr << std::endl;
-	  });
-	});
-
-	req->on_push((const request &push) {
-	  std::cerr << "push request received!" << std::endl;
-	  push.on_response((const response &res) {
-	    std::cerr << "push response received!" << std::endl;
-	    res.on_data((const uint8_t *data, std::size_t len) {
-	      std::cerr.write(reinterpret_cast<const char *>(data), len);
-	      std::cerr << std::endl;
-	    });
-	  });
-	});
-      });
-
-      sess.on_error((const boost::system::error_code &ec) {
-	std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-The above sample code demonstrates how to enable SSL/TLS and receive
-server push.  Currently,
-``nghttp2::asio_http2::client::configure_tls_context`` function setups
-NPN callbacks for SSL/TLS context for HTTP/2 use.
-
-To receive server push, use
-``nghttp2::asio_http2::client::request::on_push`` function to set
-callback function which is invoked when server push request is
-arrived.  The callback function takes
-``nghttp2::asio_http2::client::request`` object, which contains the
-pushed request.  To get server push response, set callback using
-``nghttp2::asio_http2::client::request::on_response``.
-
-As stated in the previous section, client does not stop automatically
-as long as HTTP/2 session is fine and connection is alive.  We don't
-call ``nghttp2::asio_http2::client::session::shutdown`` in this
-example, so the program does not terminate after all responses are
-received.  Hit Ctrl-C to terminate the program.
-
-Multiple concurrent requests
-++++++++++++++++++++++++++++
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      // connect to localhost:3000
-      session sess(io_service, "localhost", "3000");
-
-      sess.on_connect(&sess(tcp::resolver::iterator endpoint_it) {
-	boost::system::error_code ec;
-
-	auto printer = (const response &res) {
-	  res.on_data((const uint8_t *data, std::size_t len) {
-	    std::cerr.write(reinterpret_cast<const char *>(data), len);
-	    std::cerr << std::endl;
-	  });
-	};
-
-	std::size_t num = 3;
-	auto count = std::make_shared<int>(num);
-
-	for (std::size_t i = 0; i < num; ++i) {
-	  auto req = sess.submit(ec, "GET",
-				 "http://localhost:3000/" + std::to_string(i + 1));
-
-	  req->on_response(printer);
-	  req->on_close(&sess, count(uint32_t error_code) {
-	    if (--*count == 0) {
-	      // shutdown session after |num| requests were done.
-	      sess.shutdown();
-	    }
-	  });
-	}
-      });
-
-      sess.on_error((const boost::system::error_code &ec) {
-	std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-Here is the sample to send 3 requests at once.  Depending on the
-server settings, these requests are processed out-of-order.  In this
-example, we have a trick to shutdown session after all requests were
-done.  We made ``count`` object which is shared pointer to int and is
-initialized to 3.  On each request closure (the invocation of the
-callback set by ``nghttp2::asio_http2::client::request::on_close``),
-we decrement the count.  If count becomes 0, we are sure that all
-requests have been done and initiate shutdown.

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/sources/python-apiref.rst Deleted

@@ -1,439 +0,0 @@
-Python API Reference
-====================
-
-.. py:module:: nghttp2
-
-nghttp2 offers some high level Python API to C library.  The bindings
-currently provide HPACK compressor and decompressor classes and HTTP/2
-server class.
-
-The extension module is called ``nghttp2``.
-
-``make`` will build the bindings.  The target Python version is
-determined by configure script.  If the detected Python version is not
-what you expect, specify a path to Python executable in ``PYTHON``
-variable as an argument to configure script (e.g., ``./configure
-PYTHON=/usr/bin/python3.8``).
-
-HPACK API
----------
-
-.. py:class:: HDDeflater(hd_table_bufsize_max=DEFLATE_MAX_HEADER_TABLE_SIZE)
-
-   This class is used to perform header compression.  The
-   *hd_table_bufsize_max* limits the usage of header table in the
-   given amount of bytes.  The default value is
-   :py:data:`DEFLATE_MAX_HEADER_TABLE_SIZE`.  This is necessary
-   because the deflater and inflater share the same amount of header
-   table and the inflater decides that number.  The deflater may not
-   want to use all header table size because of limited memory
-   availability.  In that case, *hd_table_bufsize_max* can be used to
-   cap the upper limit of table size whatever the header table size is
-   chosen by the inflater.
-
-   .. py:method:: deflate(headers)
-
-      Deflates the *headers*. The *headers* must be sequence of tuple
-      of name/value pair, which are byte strings (not unicode string).
-
-      This method returns the deflated header block in byte string.
-      Raises the exception if any error occurs.
-
-   .. py:method:: set_no_refset(no_refset)
-
-      Tells the deflater not to use reference set if *no_refset* is
-      evaluated to ``True``.  If that happens, on each subsequent
-      invocation of :py:meth:`deflate()`, deflater will clear up
-      refersent set.
-
-   .. py:method:: change_table_size(hd_table_bufsize_max)
-
-      Changes header table size to *hd_table_bufsize_max* byte.  if
-      *hd_table_bufsize_max* is strictly larger than
-      ``hd_table_bufsize_max`` given in constructor,
-      ``hd_table_bufsize_max`` is used as header table size instead.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: get_hd_table()
-
-      Returns copy of current dynamic header table.
-
-The following example shows how to deflate header name/value pairs:
-
-.. code-block:: python
-
-   import binascii, nghttp2
-
-   deflater = nghttp2.HDDeflater()
-
-   res = deflater.deflate((b'foo', b'bar'),
-                           (b'baz', b'buz'))
-
-   print(binascii.b2a_hex(res))
-
-
-.. py:class:: HDInflater()
-
-   This class is used to perform header decompression.
-
-   .. py:method:: inflate(data)
-
-      Inflates the deflated header block *data*. The *data* must be
-      byte string.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: change_table_size(hd_table_bufsize_max)
-
-      Changes header table size to *hd_table_bufsize_max* byte.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: get_hd_table()
-
-      Returns copy of current dynamic header table.
-
-The following example shows how to inflate deflated header block:
-
-.. code-block:: python
-
-   deflater = nghttp2.HDDeflater()
-
-   data = deflater.deflate((b'foo', b'bar'),
-                            (b'baz', b'buz'))
-
-   inflater = nghttp2.HDInflater()
-
-   hdrs = inflater.inflate(data)
-
-   print(hdrs)
-
-
-.. py:function:: print_hd_table(hdtable)
-
-   Convenient function to print *hdtable* to the standard output.  The
-   *hdtable* is the one retrieved by
-   :py:meth:`HDDeflater.get_hd_table()` or
-   :py:meth:`HDInflater.get_hd_table()`.  This function does not work
-   if header name/value cannot be decoded using UTF-8 encoding.
-
-   In output, ``s=N`` means the entry occupies ``N`` bytes in header
-   table.  If ``r=y``, then the entry is in the reference set.
-
-.. py:data:: DEFAULT_HEADER_TABLE_SIZE
-
-   The default header table size, which is 4096 as per HTTP/2
-   specification.
-
-.. py:data:: DEFLATE_MAX_HEADER_TABLE_SIZE
-
-   The default header table size for deflater.  The initial value
-   is 4096.
-
-HTTP/2 servers
---------------
-
-.. note::
-
-   We use :py:mod:`asyncio` for HTTP/2 server classes, and ALPN.
-   Therefore, Python 3.8 or later is required to use these objects.
-   To explicitly configure nghttp2 build to use Python 3.8, specify
-   the ``PYTHON`` variable to the path to Python 3.8 executable when
-   invoking configure script like this:
-
-   .. code-block:: text
-
-       $ ./configure PYTHON=/usr/bin/python3.8
-
-.. py:class:: HTTP2Server(address, RequestHandlerClass, ssl=None)
-
-   This class builds on top of the :py:mod:`asyncio` event loop.  On
-   construction, *RequestHandlerClass* must be given, which must be a
-   subclass of :py:class:`BaseRequestHandler` class.
-
-   The *address* must be a tuple of hostname/IP address and port to
-   bind.  If hostname/IP address is ``None``, all interfaces are
-   assumed.
-
-   To enable SSL/TLS, specify instance of :py:class:`ssl.SSLContext`
-   in *ssl*.  Before passing *ssl* to
-   :py:func:`BaseEventLoop.create_server`, ALPN protocol identifiers
-   are set using :py:meth:`ssl.SSLContext.set_npn_protocols`.
-
-   To disable SSL/TLS, omit *ssl* or specify ``None``.
-
-   .. py:method:: serve_forever()
-
-      Runs server and processes incoming requests forever.
-
-.. py:class:: BaseRequestHandler(http2, stream_id)
-
-   The class is used to handle the single HTTP/2 stream.  By default,
-   it does not nothing.  It must be subclassed to handle each event
-   callback method.
-
-   The first callback method invoked is :py:meth:`on_headers()`. It is
-   called when HEADERS frame, which includes request header fields, is
-   arrived.
-
-   If request has request body, :py:meth:`on_data()` is invoked for
-   each chunk of received data chunk.
-
-   When whole request is received, :py:meth:`on_request_done()` is
-   invoked.
-
-   When stream is closed, :py:meth:`on_close()` is called.
-
-   The application can send response using :py:meth:`send_response()`
-   method.  It can be used in :py:meth:`on_headers()`,
-   :py:meth:`on_data()` or :py:meth:`on_request_done()`.
-
-   The application can push resource using :py:meth:`push()` method.
-   It must be used before :py:meth:`send_response()` call.
-
-   A :py:class:`BaseRequestHandler` has the following instance
-   variables:
-
-   .. py:attribute:: client_address
-
-      Contains a tuple of the form ``(host, port)`` referring to the
-      client's address.
-
-   .. py:attribute:: stream_id
-
-      Stream ID of this stream
-
-   .. py:attribute:: scheme
-
-      Scheme of the request URI.  This is a value of ``:scheme``
-      header field.
-
-   .. py:attribute:: method
-
-      Method of this stream.  This is a value of ``:method`` header
-      field.
-
-   .. py:attribute:: host
-
-      This is a value of ``:authority`` or ``host`` header field.
-
-   .. py:attribute:: path
-
-      This is a value of ``:path`` header field.
-
-   .. py:attribute:: headers
-
-      Request header fields.
-
-   A :py:class:`BaseRequestHandler` has the following methods:
-
-   .. py:method:: on_headers()
-
-      Called when request HEADERS is arrived.  By default, this method
-      does nothing.
-
-   .. py:method:: on_data(data)
-
-      Called when a chunk of request body *data* is arrived.  This
-      method will be called multiple times until all data are
-      received.  By default, this method does nothing.
-
-   .. py:method:: on_request_done()
-
-      Called when whole request was received.  By default, this method
-      does nothing.
-
-   .. py:method:: on_close(error_code)
-
-      Called when stream is about to close.  The *error_code*
-      indicates the reason of closure.  If it is ``0``, the stream is
-      going to close without error.
-
-   .. py:method:: send_response(status=200, headers=None, body=None)
-
-      Send response.  The *status* is HTTP status code.  The *headers*
-      is additional response headers.  The *:status* header field will
-      be appended by the library.  The *body* is the response body.
-      It could be ``None`` if response body is empty.  Or it must be
-      instance of either ``str``, ``bytes``, :py:class:`io.IOBase` or
-      callable, called body generator, which takes one parameter,
-      size.  The body generator generates response body.  It can pause
-      generation of response so that it can wait for slow backend data
-      generation.  When invoked, it should return tuple, byte string
-      at most size length and flag.  The flag is either
-      :py:data:`DATA_OK`, :py:data:`DATA_EOF` or
-      :py:data:`DATA_DEFERRED`.  For non-empty byte string and it is
-      not the last chunk of response, :py:data:`DATA_OK` must be
-      returned as flag.  If this is the last chunk of the response
-      (byte string could be ``None``), :py:data:`DATA_EOF` must be
-      returned as flag.  If there is no data available right now, but
-      additional data are anticipated, return tuple (``None``,
-      :py:data:`DATA_DEFERRED`).  When data arrived, call
-      :py:meth:`resume()` and restart response body transmission.
-
-      Only the body generator can pause response body generation;
-      instance of :py:class:`io.IOBase` must not block.
-
-      If instance of ``str`` is specified as *body*, it will be
-      encoded using UTF-8.
-
-      The *headers* is a list of tuple of the form ``(name,
-      value)``. The ``name`` and ``value`` can be either byte string
-      or unicode string.  In the latter case, they will be encoded
-      using UTF-8.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: push(path, method='GET', request_headers=None, status=200, headers=None, body=None)
-
-      Push a specified resource.  The *path* is a path portion of
-      request URI for this resource.  The *method* is a method to
-      access this resource.  The *request_headers* is additional
-      request headers to access this resource.  The ``:scheme``,
-      ``:method``, ``:authority`` and ``:path`` are appended by the
-      library.  The ``:scheme`` and ``:authority`` are inherited from
-      request header fields of the associated stream.
-
-      The *status* is HTTP status code.  The *headers* is additional
-      response headers.  The ``:status`` header field is appended by
-      the library.  The *body* is the response body.  It has the same
-      semantics of *body* parameter of :py:meth:`send_response()`.
-
-      The headers and request_headers are a list of tuple of the form
-      ``(name, value)``. The ``name`` and ``value`` can be either byte
-      string or unicode string.  In the latter case, they will be
-      encoded using UTF-8.
-
-      Returns an instance of ``RequestHandlerClass`` specified in
-      :py:class:`HTTP2Server` constructor for the pushed resource.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: resume()
-
-      Signals the restarting of response body transmission paused by
-      ``DATA_DEFERRED`` from the body generator (see
-      :py:meth:`send_response()` about the body generator).  It is not
-      an error calling this method while response body transmission is
-      not paused.
-
-.. py:data:: DATA_OK
-
-   ``DATA_OK`` indicates non empty data is generated from body generator.
-
-.. py:data:: DATA_EOF
-
-   ``DATA_EOF`` indicates the end of response body.
-
-.. py:data:: DATA_DEFERRED
-
-   ``DATA_DEFERRED`` indicates that data are not available right now
-   and response should be paused.
-
-The following example illustrates :py:class:`HTTP2Server` and
-:py:class:`BaseRequestHandler` usage:
-
-.. code-block:: python
-
-    #!/usr/bin/env python3
-
-    import io, ssl
-
-    import nghttp2
-
-    class Handler(nghttp2.BaseRequestHandler):
-
-        def on_headers(self):
-            self.push(path='/css/style.css',
-                      request_headers = ('content-type', 'text/css'),
-                      status=200,
-                      body='body{margin:0;}')
-
-            self.send_response(status=200,
-                               headers = ('content-type', 'text/plain'),
-                               body=io.BytesIO(b'nghttp2-python FTW'))
-
-    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3
-    ctx.load_cert_chain('server.crt', 'server.key')
-
-    # give None to ssl to make the server non-SSL/TLS
-    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
-    server.serve_forever()
-
-The following example illustrates HTTP/2 server using asynchronous
-response body generation.  This is simplified reverse proxy:
-
-.. code-block:: python
-
-    #!/usr/bin/env python3
-
-    import ssl
-    import os
-    import urllib
-    import asyncio
-    import io
-
-    import nghttp2
-
-    @asyncio.coroutine
-    def get_http_header(handler, url):
-        url = urllib.parse.urlsplit(url)
-        ssl = url.scheme == 'https'
-        if url.port == None:
-            if url.scheme == 'https':
-                port = 443
-            else:
-                port = 80
-        else:
-            port = url.port
-
-        connect = asyncio.open_connection(url.hostname, port, ssl=ssl)
-        reader, writer = yield from connect
-        req = 'GET {path} HTTP/1.0\r\n\r\n'.format(path=url.path or '/')
-        writer.write(req.encode('utf-8'))
-        # skip response header fields
-        while True:
-            line = yield from reader.readline()
-            line = line.rstrip()
-            if not line:
-                break
-        # read body
-        while True:
-            b = yield from reader.read(4096)
-            if not b:
-                break
-            handler.buf.write(b)
-        writer.close()
-        handler.buf.seek(0)
-        handler.eof = True
-        handler.resume()
-
-    class Body:
-        def __init__(self, handler):
-            self.handler = handler
-            self.handler.eof = False
-            self.handler.buf = io.BytesIO()
-
-        def generate(self, n):
-            buf = self.handler.buf
-            data = buf.read1(n)
-            if not data and not self.handler.eof:
-                return None, nghttp2.DATA_DEFERRED
-            return data, nghttp2.DATA_EOF if self.handler.eof else nghttp2.DATA_OK
-
-    class Handler(nghttp2.BaseRequestHandler):
-
-        def on_headers(self):
-            body = Body(self)
-            asyncio.async(get_http_header(
-                self, 'http://localhost' + self.path.decode('utf-8')))
-            self.send_response(status=200, body=body.generate)
-
-    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3
-    ctx.load_cert_chain('server.crt', 'server.key')
-
-    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
-    server.serve_forever()

_service:tar_scm:nghttp2-1.46.0.tar.xz/examples/asio-cl.cc Deleted

@@ -1,96 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-
-#include <iostream>
-
-#include <nghttp2/asio_http2_client.h>
-
-using boost::asio::ip::tcp;
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::client;
-
-int main(int argc, char *argv) {
-  try {
-    if (argc < 2) {
-      std::cerr << "Usage: asio-cl URI" << std::endl;
-      return 1;
-    }
-    boost::system::error_code ec;
-    boost::asio::io_service io_service;
-
-    std::string uri = argv1;
-    std::string scheme, host, service;
-
-    if (host_service_from_uri(ec, scheme, host, service, uri)) {
-      std::cerr << "error: bad URI: " << ec.message() << std::endl;
-      return 1;
-    }
-
-    boost::asio::ssl::context tls_ctx(boost::asio::ssl::context::sslv23);
-    tls_ctx.set_default_verify_paths();
-    // disabled to make development easier...
-    // tls_ctx.set_verify_mode(boost::asio::ssl::verify_peer);
-    configure_tls_context(ec, tls_ctx);
-
-    auto sess = scheme == "https" ? session(io_service, tls_ctx, host, service)
-                                  : session(io_service, host, service);
-
-    sess.on_connect(&sess, &uri(tcp::resolver::iterator endpoint_it) {
-      boost::system::error_code ec;
-      auto req = sess.submit(ec, "GET", uri);
-
-      if (ec) {
-        std::cerr << "error: " << ec.message() << std::endl;
-        return;
-      }
-
-      req->on_response((const response &res) {
-        std::cerr << "HTTP/2 " << res.status_code() << std::endl;
-        for (auto &kv : res.header()) {
-          std::cerr << kv.first << ": " << kv.second.value << "\n";
-        }
-        std::cerr << std::endl;
-
-        res.on_data((const uint8_t *data, std::size_t len) {
-          std::cerr.write(reinterpret_cast<const char *>(data), len);
-          std::cerr << std::endl;
-        });
-      });
-
-      req->on_close(&sess(uint32_t error_code) { sess.shutdown(); });
-    });
-
-    sess.on_error((const boost::system::error_code &ec) {
-      std::cerr << "error: " << ec.message() << std::endl;
-    });
-
-    io_service.run();
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}

_service:tar_scm:nghttp2-1.46.0.tar.xz/examples/asio-cl2.cc Deleted

@@ -1,134 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-
-#include <iostream>
-#include <string>
-
-#include <nghttp2/asio_http2_client.h>
-
-using boost::asio::ip::tcp;
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::client;
-
-void print_header(const header_map &h) {
-  for (auto &kv : h) {
-    std::cerr << kv.first << ": " << kv.second.value << "\n";
-  }
-  std::cerr << std::endl;
-}
-
-void print_header(const response &res) {
-  std::cerr << "HTTP/2 " << res.status_code() << "\n";
-  print_header(res.header());
-}
-
-void print_header(const request &req) {
-  auto &uri = req.uri();
-  std::cerr << req.method() << " " << uri.scheme << "://" << uri.host
-            << uri.path;
-  if (!uri.raw_query.empty()) {
-    std::cerr << "?" << uri.raw_query;
-  }
-  std::cerr << " HTTP/2\n";
-  print_header(req.header());
-}
-
-int main(int argc, char *argv) {
-  try {
-    if (argc < 2) {
-      std::cerr << "Usage: asio-cl URI" << std::endl;
-      return 1;
-    }
-    boost::system::error_code ec;
-    boost::asio::io_service io_service;
-
-    std::string uri = argv1;
-    std::string scheme, host, service;
-
-    if (host_service_from_uri(ec, scheme, host, service, uri)) {
-      std::cerr << "error: bad URI: " << ec.message() << std::endl;
-      return 1;
-    }
-
-    boost::asio::ssl::context tls_ctx(boost::asio::ssl::context::sslv23);
-    tls_ctx.set_default_verify_paths();
-    // disabled to make development easier...
-    // tls_ctx.set_verify_mode(boost::asio::ssl::verify_peer);
-    configure_tls_context(ec, tls_ctx);
-
-    auto sess = scheme == "https" ? session(io_service, tls_ctx, host, service)
-                                  : session(io_service, host, service);
-
-    sess.on_connect(&sess, &uri(tcp::resolver::iterator endpoint_it) {
-      std::cerr << "connected to " << (*endpoint_it).endpoint() << std::endl;
-      boost::system::error_code ec;
-      auto req = sess.submit(ec, "GET", uri, {{"cookie", {"foo=bar", true}}});
-      if (ec) {
-        std::cerr << "error: " << ec.message() << std::endl;
-        return;
-      }
-
-      req->on_response((const response &res) {
-        std::cerr << "response header was received" << std::endl;
-        print_header(res);
-
-        res.on_data((const uint8_t *data, std::size_t len) {
-          std::cerr.write(reinterpret_cast<const char *>(data), len);
-          std::cerr << std::endl;
-        });
-      });
-
-      req->on_close((uint32_t error_code) {
-        std::cerr << "request done with error_code=" << error_code << std::endl;
-      });
-
-      req->on_push((const request &push_req) {
-        std::cerr << "push request was received" << std::endl;
-
-        print_header(push_req);
-
-        push_req.on_response((const response &res) {
-          std::cerr << "push response header was received" << std::endl;
-
-          res.on_data((const uint8_t *data, std::size_t len) {
-            std::cerr.write(reinterpret_cast<const char *>(data), len);
-            std::cerr << std::endl;
-          });
-        });
-      });
-    });
-
-    sess.on_error((const boost::system::error_code &ec) {
-      std::cerr << "error: " << ec.message() << std::endl;
-    });
-
-    io_service.run();
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}

_service:tar_scm:nghttp2-1.46.0.tar.xz/examples/asio-sv.cc Deleted

@@ -1,149 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// main.cpp
-// ~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include <iostream>
-#include <string>
-
-#include <nghttp2/asio_http2_server.h>
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::server;
-
-int main(int argc, char *argv) {
-  try {
-    // Check command line arguments.
-    if (argc < 4) {
-      std::cerr
-          << "Usage: asio-sv <address> <port> <threads> <private-key-file> "
-          << "<cert-file>\n";
-      return 1;
-    }
-
-    boost::system::error_code ec;
-
-    std::string addr = argv1;
-    std::string port = argv2;
-    std::size_t num_threads = std::stoi(argv3);
-
-    http2 server;
-
-    server.num_threads(num_threads);
-
-    server.handle("/", (const request &req, const response &res) {
-      res.write_head(200, {{"foo", {"bar"}}});
-      res.end("hello, world\n");
-    });
-    server.handle("/secret/", (const request &req, const response &res) {
-      res.write_head(200);
-      res.end("under construction!\n");
-    });
-    server.handle("/push", (const request &req, const response &res) {
-      boost::system::error_code ec;
-      auto push = res.push(ec, "GET", "/push/1");
-      if (!ec) {
-        push->write_head(200);
-        push->end("server push FTW!\n");
-      }
-
-      res.write_head(200);
-      res.end("you'll receive server push!\n");
-    });
-    server.handle("/delay", (const request &req, const response &res) {
-      res.write_head(200);
-
-      auto timer = std::make_shared<boost::asio::deadline_timer>(
-          res.io_service(), boost::posix_time::seconds(3));
-      auto closed = std::make_shared<bool>();
-
-      res.on_close(timer, closed(uint32_t error_code) {
-        timer->cancel();
-        *closed = true;
-      });
-
-      timer->async_wait(&res, closed(const boost::system::error_code &ec) {
-        if (ec || *closed) {
-          return;
-        }
-
-        res.end("finally!\n");
-      });
-    });
-    server.handle("/trailer", (const request &req, const response &res) {
-      // send trailer part.
-      res.write_head(200, {{"trailers", {"digest"}}});
-
-      std::string body = "nghttp2 FTW!\n";
-      auto left = std::make_shared<size_t>(body.size());
-
-      res.end(&res, body, left(uint8_t *dst, std::size_t len,
-                                 uint32_t *data_flags) {
-        auto n = std::min(len, *left);
-        std::copy_n(body.c_str() + (body.size() - *left), n, dst);
-        *left -= n;
-        if (*left == 0) {
-          *data_flags |=
-              NGHTTP2_DATA_FLAG_EOF | NGHTTP2_DATA_FLAG_NO_END_STREAM;
-          // RFC 3230 Instance Digests in HTTP.  The digest value is
-          // SHA-256 message digest of body.
-          res.write_trailer(
-              {{"digest",
-                {"SHA-256=qqXqskW7F3ueBSvmZRCiSwl2ym4HRO0M/pvQCBlSDis="}}});
-        }
-        return n;
-      });
-    });
-
-    if (argc >= 6) {
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-      tls.use_private_key_file(argv4, boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file(argv5);
-
-      configure_tls_context_easy(ec, tls);
-
-      if (server.listen_and_serve(ec, tls, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    } else {
-      if (server.listen_and_serve(ec, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}

_service:tar_scm:nghttp2-1.46.0.tar.xz/examples/asio-sv2.cc Deleted

@@ -1,125 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// main.cpp
-// ~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#include <iostream>
-#include <string>
-
-#include <nghttp2/asio_http2_server.h>
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::server;
-
-int main(int argc, char *argv) {
-  try {
-    // Check command line arguments.
-    if (argc < 5) {
-      std::cerr << "Usage: asio-sv2 <address> <port> <threads> <doc-root> "
-                << "<private-key-file> <cert-file>\n";
-      return 1;
-    }
-
-    boost::system::error_code ec;
-
-    std::string addr = argv1;
-    std::string port = argv2;
-    std::size_t num_threads = std::stoi(argv3);
-    std::string docroot = argv4;
-
-    http2 server;
-
-    server.num_threads(num_threads);
-
-    server.handle("/", &docroot(const request &req, const response &res) {
-      auto path = percent_decode(req.uri().path);
-      if (!check_path(path)) {
-        res.write_head(404);
-        res.end();
-        return;
-      }
-
-      if (path == "/") {
-        path = "/index.html";
-      }
-
-      path = docroot + path;
-      auto fd = open(path.c_str(), O_RDONLY);
-      if (fd == -1) {
-        res.write_head(404);
-        res.end();
-        return;
-      }
-
-      auto header = header_map();
-
-      struct stat stbuf;
-      if (stat(path.c_str(), &stbuf) == 0) {
-        header.emplace("content-length",
-                       header_value{std::to_string(stbuf.st_size)});
-        header.emplace("last-modified",
-                       header_value{http_date(stbuf.st_mtime)});
-      }
-      res.write_head(200, std::move(header));
-      res.end(file_generator_from_fd(fd));
-    });
-
-    if (argc >= 7) {
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-      tls.use_private_key_file(argv5, boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file(argv6);
-
-      configure_tls_context_easy(ec, tls);
-
-      if (server.listen_and_serve(ec, tls, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    } else {
-      if (server.listen_and_serve(ec, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/ax_boost_asio.m4 Deleted

@@ -1,110 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_asio.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_ASIO
-#
-# DESCRIPTION
-#
-#   Test for Asio library from the Boost C++ libraries. The macro requires a
-#   preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_ASIO_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_ASIO
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Pete Greenwell <pete@mu.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 16
-
-AC_DEFUN(AX_BOOST_ASIO,
-
-	AC_ARG_WITH(boost-asio,
-	AS_HELP_STRING(--with-boost-asio@<:@=special-lib@:>@,
-                   use the ASIO library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-asio=boost_system-gcc41-mt-1_34 ),
-        
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_asio_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_asio_lib="$withval"
-		fi
-        ,
-        want_boost="yes"
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE(AC_PROG_CC)
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::ASIO library is available,
-					   ax_cv_boost_asio,
-        AC_LANG_PUSH(C++)
-		 AC_COMPILE_IFELSE(AC_LANG_PROGRAM( @%:@include <boost/asio.hpp>
-											,
-                                  
-
-                                    boost::asio::io_service io;
-                                    boost::system::error_code timer_result;
-                                    boost::asio::deadline_timer t(io);
-                                    t.cancel();
-                                    io.run_one();
-									return 0;
-                                   ),
-                             ax_cv_boost_asio=yes, ax_cv_boost_asio=no)
-         AC_LANG_POP(C++)
-		)
-		if test "x$ax_cv_boost_asio" = "xyes"; then
-			AC_DEFINE(HAVE_BOOST_ASIO,,define if the Boost::ASIO library is available)
-			BN=boost_system
-			BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_asio_lib" = "x"; then
-				for ax_lib in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.dylib* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib$boost_system.*$\.so.*$;\1;' -e 's;^lib$boost_system.*$\.dylib.*$;\1;' -e 's;^lib$boost_system.*$\.a.*$;\1;' ` ; do
-				    AC_CHECK_LIB($ax_lib, main, BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break,
-                                 link_thread="no")
-				done
-            else
-               for ax_lib in $ax_boost_user_asio_lib $BN-$ax_boost_user_asio_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_asio="yes" break,
-                                   link_asio="no")
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_asio" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-)

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/ax_boost_base.m4 Deleted

@@ -1,275 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE(MINIMUM-VERSION, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 25
-
-AC_DEFUN(AX_BOOST_BASE,
-
-AC_ARG_WITH(boost,
-  AS_HELP_STRING(--with-boost@<:@=ARG@:>@,
-    use Boost library from a standard location (ARG=yes),
-     from the specified location (ARG=<path>),
-     or disable it (ARG=no)
-     @<:@ARG=yes@:>@ ),
-    
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ,
-    want_boost="yes")
-
-
-AC_ARG_WITH(boost-libdir,
-        AS_HELP_STRING(--with-boost-libdir=LIB_DIR,
-        Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.),
-        
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ,
-        ac_boost_lib_path=""
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse($1, ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '$0-9*\.0-9*$'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '$0-9*$'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '0-9*\.$0-9*$'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '0-9*\.0-9*\.$0-9*$'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl On 64-bit systems check for system libraries in both lib64 and lib.
-    dnl The former is specified by FHS, but e.g. Debian does not adhere to
-    dnl this (as it rises problems for generic multi-arch support).
-    dnl The last entry in the list is chosen by default when no libraries
-    dnl are found, e.g. when only header-only libraries are installed!
-    libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64)
-        libsubdirs="lib64 libx32 lib lib64"
-        ;;
-      ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64 ppc64le"
-        ;;
-    esac
-
-    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-    dnl them priority over the other paths since, if libs are found there, they
-    dnl are almost assuredly the ones desired.
-    AC_REQUIRE(AC_CANONICAL_HOST)
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_REQUIRE(AC_PROG_CXX)
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
-    @%:@include <boost/version.hpp>
-    , 
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ),
-        AC_MSG_RESULT(yes)
-    succeeded=yes
-    found_system=yes
-        ,
-        )
-    AC_LANG_POP(C++)
-
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes"; then
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/$.*$'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '$0-9*\.0-9*$'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
-        @%:@include <boost/version.hpp>
-        , 
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ),
-            AC_MSG_RESULT(yes)
-        succeeded=yes
-        found_system=yes
-            ,
-            )
-        AC_LANG_POP(C++)
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            AC_MSG_NOTICE(We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.)
-        else
-            AC_MSG_NOTICE(Your boost libraries seems to old (version $_version).)
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        ifelse($3, , :, $3)
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,,define if the Boost library is available)
-        # execute ACTION-IF-FOUND (if present):
-        ifelse($2, , :, $2)
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-)

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/ax_boost_system.m4 Deleted

@@ -1,120 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SYSTEM
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SYSTEM
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 17
-
-AC_DEFUN(AX_BOOST_SYSTEM,
-
-	AC_ARG_WITH(boost-system,
-	AS_HELP_STRING(--with-boost-system@<:@=special-lib@:>@,
-                   use the System library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-system=boost_system-gcc-mt ),
-        
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_system_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_system_lib="$withval"
-		fi
-        ,
-        want_boost="yes"
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE(AC_PROG_CC)
-        AC_REQUIRE(AC_CANONICAL_BUILD)
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::System library is available,
-					   ax_cv_boost_system,
-        AC_LANG_PUSH(C++)
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 AC_COMPILE_IFELSE(AC_LANG_PROGRAM(@%:@include <boost/system/error_code.hpp>,
-                                   boost::system::system_category),
-                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP(C++)
-		)
-		if test "x$ax_cv_boost_system" = "xyes"; then
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_SYSTEM,,define if the Boost::System library is available)
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_system_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break,
-                                 link_system="no")
-				done
-                if test "x$link_system" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break,
-                                 link_system="no")
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break,
-                                   link_system="no")
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_system" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-)

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/ax_boost_thread.m4 Deleted

@@ -1,149 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_thread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_THREAD
-#
-# DESCRIPTION
-#
-#   Test for Thread library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_THREAD_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_THREAD
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Michael Tindal
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 27
-
-AC_DEFUN(AX_BOOST_THREAD,
-
-	AC_ARG_WITH(boost-thread,
-	AS_HELP_STRING(--with-boost-thread@<:@=special-lib@:>@,
-                   use the Thread library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-thread=boost_thread-gcc-mt ),
-        
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_thread_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_thread_lib="$withval"
-		fi
-        ,
-        want_boost="yes"
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE(AC_PROG_CC)
-        AC_REQUIRE(AC_CANONICAL_BUILD)
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::Thread library is available,
-					   ax_cv_boost_thread,
-        AC_LANG_PUSH(C++)
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 if test "x$host_os" = "xsolaris" ; then
-				 CXXFLAGS="-pthreads $CXXFLAGS"
-			 elif test "x$host_os" = "xmingw32" ; then
-				 CXXFLAGS="-mthreads $CXXFLAGS"
-			 else
-				CXXFLAGS="-pthread $CXXFLAGS"
-			 fi
-			 AC_COMPILE_IFELSE(AC_LANG_PROGRAM(@%:@include <boost/thread/thread.hpp>,
-                                   boost::thread_group thrds;
-                                   return 0;),
-                   ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP(C++)
-		)
-		if test "x$ax_cv_boost_thread" = "xyes"; then
-           if test "x$host_os" = "xsolaris" ; then
-			  BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
-		   elif test "x$host_os" = "xmingw32" ; then
-			  BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
-		   else
-			  BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
-		   fi
-
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_THREAD,,define if the Boost::Thread library is available)
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-                        case "x$host_os" in
-                          *bsd* )
-                               LDFLAGS="-pthread $LDFLAGS"
-                          break;
-                          ;;
-                        esac
-            if test "x$ax_boost_user_thread_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break,
-                                 link_thread="no")
-				done
-                if test "x$link_thread" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break,
-                                 link_thread="no")
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break,
-                                   link_thread="no")
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_thread" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-                        else
-                           case "x$host_os" in
-                              *bsd* )
-				BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
-                              break;
-                              ;;
-                           esac
-
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-)

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/ax_python_devel.m4 Deleted

@@ -1,368 +0,0 @@
-# ===========================================================================
-#     https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PYTHON_DEVEL(version)
-#
-# DESCRIPTION
-#
-#   Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
-#   in your configure.ac.
-#
-#   This macro checks for Python and tries to get the include path to
-#   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output
-#   variables. It also exports $(PYTHON_EXTRA_LIBS) and
-#   $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
-#
-#   You can search for some particular version of Python by passing a
-#   parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
-#   note that you *have* to pass also an operator along with the version to
-#   match, and pay special attention to the single quotes surrounding the
-#   version number. Don't use "PYTHON_VERSION" for this: that environment
-#   variable is declared as precious and thus reserved for the end-user.
-#
-#   This macro should work for all versions of Python >= 2.1.0. As an end
-#   user, you can disable the check for the python version by setting the
-#   PYTHON_NOVERSIONCHECK environment variable to something else than the
-#   empty string.
-#
-#   If you need to use this macro for an older Python version, please
-#   contact the authors. We're always open for feedback.
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2009 Alan W. Irwin
-#   Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2009 Andrew Collier
-#   Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
-#   Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
-#   Copyright (c) 2013 Daniel Mullner <muellner@math.stanford.edu>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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 <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 23
-
-AU_ALIAS(AC_PYTHON_DEVEL, AX_PYTHON_DEVEL)
-AC_DEFUN(AX_PYTHON_DEVEL,
-	#
-	# Allow the use of a (user set) custom python version
-	#
-	AC_ARG_VAR(PYTHON_VERSION,The installed Python
-		version to use, for example '2.3'. This string
-		will be appended to the Python interpreter
-		canonical name.)
-
-	AC_PATH_PROG(PYTHON,python$PYTHON_VERSION)
-	if test -z "$PYTHON"; then
-	   AC_MSG_ERROR(Cannot find python$PYTHON_VERSION in your system path)
-	   PYTHON_VERSION=""
-	fi
-
-	#
-	# Check for a version of Python >= 2.1.0
-	#
-	AC_MSG_CHECKING(for a version of Python >= '2.1.0')
-	ac_supports_python_ver=`$PYTHON -c "import sys; \
-		ver = sys.version.split ()0; \
-		print (ver >= '2.1.0')"`
-	if test "$ac_supports_python_ver" != "True"; then
-		if test -z "$PYTHON_NOVERSIONCHECK"; then
-			AC_MSG_RESULT(no)
-			AC_MSG_FAILURE(
-This version of the AC@&t@_PYTHON_DEVEL macro
-doesn't work properly with versions of Python before
-2.1.0. You may need to re-run configure, setting the
-variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
-PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
-Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
-to something else than an empty string.
-)
-		else
-			AC_MSG_RESULT(skip at user request)
-		fi
-	else
-		AC_MSG_RESULT(yes)
-	fi
-
-	#
-	# if the macro parameter ``version'' is set, honour it
-	#
-	if test -n "$1"; then
-		AC_MSG_CHECKING(for a version of Python $1)
-		ac_supports_python_ver=`$PYTHON -c "import sys; \
-			ver = sys.version.split ()0; \
-			print (ver $1)"`
-		if test "$ac_supports_python_ver" = "True"; then
-		   AC_MSG_RESULT(yes)
-		else
-			AC_MSG_RESULT(no)
-			AC_MSG_ERROR(this package requires Python $1.
-If you have it installed, but it isn't the default Python
-interpreter in your system path, please pass the PYTHON_VERSION
-variable to configure. See ``configure --help'' for reference.
-)
-			PYTHON_VERSION=""
-		fi
-	fi
-
-	#
-	# Check if you have distutils, else fail
-	#
-	AC_MSG_CHECKING(for the sysconfig Python package)
-	ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
-	if test $? -eq 0; then
-		AC_MSG_RESULT(yes)
-		IMPORT_SYSCONFIG="import sysconfig"
-	else
-		AC_MSG_RESULT(no)
-
-		AC_MSG_CHECKING(for the distutils Python package)
-		ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
-		if test $? -eq 0; then
-			AC_MSG_RESULT(yes)
-			IMPORT_SYSCONFIG="from distutils import sysconfig"
-		else
-			AC_MSG_ERROR(cannot import Python module "distutils".
-Please check your Python installation. The error was:
-$ac_sysconfig_result)
-			PYTHON_VERSION=""
-		fi
-	fi
-
-	#
-	# Check for Python include path
-	#
-	AC_MSG_CHECKING(for Python include path)
-	if test -z "$PYTHON_CPPFLAGS"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			# sysconfig module has different functions
-			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path ('include'));"`
-			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path ('platinclude'));"`
-		else
-			# old distutils way
-			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_inc ());"`
-			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_inc (plat_specific=1));"`
-		fi
-		if test -n "${python_path}"; then
-			if test "${plat_python_path}" != "${python_path}"; then
-				python_path="-I$python_path -I$plat_python_path"
-			else
-				python_path="-I$python_path"
-			fi
-		fi
-		PYTHON_CPPFLAGS=$python_path
-	fi
-	AC_MSG_RESULT($PYTHON_CPPFLAGS)
-	AC_SUBST(PYTHON_CPPFLAGS)
-
-	#
-	# Check for Python library path
-	#
-	AC_MSG_CHECKING(for Python library path)
-	if test -z "$PYTHON_LIBS"; then
-		# (makes two attempts to ensure we've got a version number
-		# from the interpreter)
-		ac_python_version=`cat<<EOD | $PYTHON -
-
-# join all versioning strings, on some systems
-# major/minor numbers could be in different list elements
-from sysconfig import *
-e = get_config_var('VERSION')
-if e is not None:
-	print(e)
-EOD`
-
-		if test -z "$ac_python_version"; then
-			if test -n "$PYTHON_VERSION"; then
-				ac_python_version=$PYTHON_VERSION
-			else
-				ac_python_version=`$PYTHON -c "import sys; \
-					print (sys.version:3)"`
-			fi
-		fi
-
-		# Make the versioning information available to the compiler
-		AC_DEFINE_UNQUOTED(HAVE_PYTHON, "$ac_python_version",
-                                   If available, contains the Python version number currently in use.)
-
-		# First, the library directory:
-		ac_python_libdir=`cat<<EOD | $PYTHON -
-
-# There should be only one
-$IMPORT_SYSCONFIG
-e = sysconfig.get_config_var('LIBDIR')
-if e is not None:
-	print (e)
-EOD`
-
-		# Now, for the library:
-		ac_python_library=`cat<<EOD | $PYTHON -
-
-$IMPORT_SYSCONFIG
-c = sysconfig.get_config_vars()
-if 'LDVERSION' in c:
-	print ('python'+c'LDVERSION')
-else:
-	print ('python'+c'VERSION')
-EOD`
-
-		# This small piece shamelessly adapted from PostgreSQL python macro;
-		# credits goes to momjian, I think. I'd like to put the right name
-		# in the credits, if someone can point me in the right direction... ?
-		#
-		if test -n "$ac_python_libdir" -a -n "$ac_python_library"
-		then
-			# use the official shared library
-			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
-			PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library"
-		else
-			# old way: use libpython from python_configdir
-			ac_python_libdir=`$PYTHON -c \
-			  "from sysconfig import get_python_lib as f; \
-			  import os; \
-			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
-			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
-		fi
-
-		if test -z "PYTHON_LIBS"; then
-			AC_MSG_ERROR(
-  Cannot determine location of your Python DSO. Please check it was installed with
-  dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
-			)
-		fi
-	fi
-	AC_MSG_RESULT($PYTHON_LIBS)
-	AC_SUBST(PYTHON_LIBS)
-
-	#
-	# Check for site packages
-	#
-	AC_MSG_CHECKING(for Python site-packages path)
-	if test -z "$PYTHON_SITE_PKG"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path('purelib'));"`
-		else
-			# distutils.sysconfig way
-			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_lib(0,0));"`
-		fi
-	fi
-	AC_MSG_RESULT($PYTHON_SITE_PKG)
-	AC_SUBST(PYTHON_SITE_PKG)
-
-	#
-	# Check for platform-specific site packages
-	#
-	AC_MSG_CHECKING(for Python platform specific site-packages path)
-	if test -z "$PYTHON_SITE_PKG"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path('platlib'));"`
-		else
-			# distutils.sysconfig way
-			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_lib(1,0));"`
-		fi
-	fi
-	AC_MSG_RESULT($PYTHON_PLATFORM_SITE_PKG)
-	AC_SUBST(PYTHON_PLATFORM_SITE_PKG)
-
-	#
-	# libraries which must be linked in when embedding
-	#
-	AC_MSG_CHECKING(python extra libraries)
-	if test -z "$PYTHON_EXTRA_LIBS"; then
-	   PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-                conf = sysconfig.get_config_var; \
-                print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
-	fi
-	AC_MSG_RESULT($PYTHON_EXTRA_LIBS)
-	AC_SUBST(PYTHON_EXTRA_LIBS)
-
-	#
-	# linking flags needed when embedding
-	#
-	AC_MSG_CHECKING(python extra linking flags)
-	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-			conf = sysconfig.get_config_var; \
-			print (conf('LINKFORSHARED'))"`
-	fi
-	AC_MSG_RESULT($PYTHON_EXTRA_LDFLAGS)
-	AC_SUBST(PYTHON_EXTRA_LDFLAGS)
-
-	#
-	# final check to see if everything compiles alright
-	#
-	AC_MSG_CHECKING(consistency of all components of python development environment)
-	# save current global flags
-	ac_save_LIBS="$LIBS"
-	ac_save_LDFLAGS="$LDFLAGS"
-	ac_save_CPPFLAGS="$CPPFLAGS"
-	LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS"
-	LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
-	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
-	AC_LANG_PUSH(C)
-	AC_LINK_IFELSE(
-		AC_LANG_PROGRAM(#include <Python.h>,
-				Py_Initialize();)
-		,pythonexists=yes,pythonexists=no)
-	AC_LANG_POP(C)
-	# turn back to default flags
-	CPPFLAGS="$ac_save_CPPFLAGS"
-	LIBS="$ac_save_LIBS"
-	LDFLAGS="$ac_save_LDFLAGS"
-
-	AC_MSG_RESULT($pythonexists)
-
-        if test ! "x$pythonexists" = "xyes"; then
-	   AC_MSG_FAILURE(
-  Could not link test program to Python. Maybe the main Python library has been
-  installed in some non-standard library path. If so, pass it to configure,
-  via the LIBS environment variable.
-  Example: ./configure LIBS="-L/usr/non-standard-path/python/lib"
-  ============================================================================
-   ERROR!
-   You probably have to install the development version of the Python package
-   for your distribution.  The exact name of this package varies among them.
-  ============================================================================
-	   )
-	  PYTHON_VERSION=""
-	fi
-
-	#
-	# all done!
-	#
-)

_service:tar_scm:nghttp2-1.46.0.tar.xz/python Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/python/CMakeLists.txt Deleted

@@ -1,39 +0,0 @@
-# EXTRA_DIST = cnghttp2.pxd nghttp2.pyx
-
-if(ENABLE_PYTHON_BINDINGS)
-  add_custom_target(python ALL
-    COMMAND "${PYTHON_EXECUTABLE}" setup.py build
-    VERBATIM
-    DEPENDS nghttp2.c nghttp2
-  )
-
-  configure_file(install-python.cmake.in install-python.cmake ESCAPE_QUOTES @ONLY)
-  install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-python.cmake")
-
-  add_custom_command(OUTPUT nghttp2.c
-    COMMAND "${CYTHON_EXECUTABLE}" -o nghttp2.c
-      "${CMAKE_CURRENT_SOURCE_DIR}/nghttp2.pyx"
-    VERBATIM
-    DEPENDS nghttp2.pyx
-  )
-
-  # Instead of calling "setup.py clean --all", this should do...
-  set_directory_properties(PROPERTIES
-    ADDITIONAL_MAKE_CLEAN_FILES "build;python_nghttp2.egg-info"
-  )
-
-## This works also, except that the installation target is missing...
-#  include(UseCython)
-#  cython_add_module(python_nghttp2 nghttp2.pyx)
-#  set_target_properties(python_nghttp2 PROPERTIES
-#    OUTPUT_NAME nghttp2
-#  )
-#  target_include_directories(python_nghttp2 PRIVATE
-#    "${CMAKE_SOURCE_DIR}/lib"
-#    "${CMAKE_SOURCE_DIR}/lib/includes"
-#    "${CMAKE_BINARY_DIR}/lib/includes"
-#  )
-#  target_link_libraries(python_nghttp2
-#    nghttp2
-#  )
-endif()

_service:tar_scm:nghttp2-1.46.0.tar.xz/python/Makefile.am Deleted

@@ -1,49 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 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.
-
-# This will avoid that setup.py gets deleted before it is executed in
-# clean-local in parallel build.
-.NOTPARALLEL:
-
-EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CMakeLists.txt install-python.cmake.in
-
-if ENABLE_PYTHON_BINDINGS
-
-all-local: nghttp2.c
-	$(PYTHON) setup.py build
-
-install-exec-local:
-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-
-uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
-	rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg
-
-clean-local:
-	$(PYTHON) setup.py clean --all
-	-rm -f $(builddir)/nghttp2.c
-
-.pyx.c:
-	$(CYTHON) -3 -o $@ $<
-
-endif # ENABLE_PYTHON_BINDINGS

_service:tar_scm:nghttp2-1.46.0.tar.xz/python/Makefile.in Deleted

@@ -1,580 +0,0 @@
-# Makefile.in generated by automake 1.16.4 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) 2013 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.
-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 = python
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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 = setup.py
-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 $(srcdir)/setup.py.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@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
-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@
-CYTHON = @CYTHON@
-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@
-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_OPENSSL_CFLAGS = @LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@
-LIBNGTCP2_CRYPTO_OPENSSL_LIBS = @LIBNGTCP2_CRYPTO_OPENSSL_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_CPPFLAGS = @PYTHON_CPPFLAGS@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
-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@
-EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CMakeLists.txt install-python.cmake.in
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .pyx
-$(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 python/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu python/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):
-setup.py: $(top_builddir)/config.status $(srcdir)/setup.py.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-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
-@ENABLE_PYTHON_BINDINGS_FALSE@all-local:
-all-am: Makefile all-local
-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."
-@ENABLE_PYTHON_BINDINGS_FALSE@clean-local:
-@ENABLE_PYTHON_BINDINGS_FALSE@install-exec-local:
-@ENABLE_PYTHON_BINDINGS_FALSE@uninstall-local:
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local 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-exec-local
-
-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: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local 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-exec-local 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 uninstall-local
-
-.PRECIOUS: Makefile
-
-
-# This will avoid that setup.py gets deleted before it is executed in
-# clean-local in parallel build.
-.NOTPARALLEL:
-
-@ENABLE_PYTHON_BINDINGS_TRUE@all-local: nghttp2.c
-@ENABLE_PYTHON_BINDINGS_TRUE@	$(PYTHON) setup.py build
-
-@ENABLE_PYTHON_BINDINGS_TRUE@install-exec-local:
-@ENABLE_PYTHON_BINDINGS_TRUE@	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-
-@ENABLE_PYTHON_BINDINGS_TRUE@uninstall-local:
-@ENABLE_PYTHON_BINDINGS_TRUE@	rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
-@ENABLE_PYTHON_BINDINGS_TRUE@	rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg
-
-@ENABLE_PYTHON_BINDINGS_TRUE@clean-local:
-@ENABLE_PYTHON_BINDINGS_TRUE@	$(PYTHON) setup.py clean --all
-@ENABLE_PYTHON_BINDINGS_TRUE@	-rm -f $(builddir)/nghttp2.c
-
-@ENABLE_PYTHON_BINDINGS_TRUE@.pyx.c:
-@ENABLE_PYTHON_BINDINGS_TRUE@	$(CYTHON) -3 -o $@ $<
-
-# 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.46.0.tar.xz/python/cnghttp2.pxd Deleted

@@ -1,340 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 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.
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, int32_t
-
-cdef extern from 'nghttp2/nghttp2.h':
-
-    const char NGHTTP2_PROTO_VERSION_ID
-    const char NGHTTP2_CLIENT_CONNECTION_PREFACE
-    const size_t NGHTTP2_INITIAL_WINDOW_SIZE
-    const size_t NGHTTP2_DEFAULT_HEADER_TABLE_SIZE
-
-    ctypedef struct nghttp2_session:
-        pass
-
-    ctypedef enum nghttp2_error:
-        NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE
-        NGHTTP2_ERR_DEFERRED
-
-    ctypedef enum nghttp2_flag:
-        NGHTTP2_FLAG_NONE
-        NGHTTP2_FLAG_END_STREAM
-        NGHTTP2_FLAG_ACK
-
-    ctypedef enum nghttp2_error_code:
-        NGHTTP2_NO_ERROR
-        NGHTTP2_PROTOCOL_ERROR
-        NGHTTP2_INTERNAL_ERROR
-        NGHTTP2_SETTINGS_TIMEOUT
-
-    ctypedef enum nghttp2_frame_type:
-        NGHTTP2_DATA
-        NGHTTP2_HEADERS
-        NGHTTP2_RST_STREAM
-        NGHTTP2_SETTINGS
-        NGHTTP2_PUSH_PROMISE
-        NGHTTP2_GOAWAY
-
-    ctypedef enum nghttp2_nv_flag:
-        NGHTTP2_NV_FLAG_NONE
-        NGHTTP2_NV_FLAG_NO_INDEX
-
-    ctypedef struct nghttp2_nv:
-        uint8_t *name
-        uint8_t *value
-        uint16_t namelen
-        uint16_t valuelen
-        uint8_t flags
-
-    ctypedef enum nghttp2_settings_id:
-        SETTINGS_HEADER_TABLE_SIZE
-        NGHTTP2_SETTINGS_HEADER_TABLE_SIZE
-        NGHTTP2_SETTINGS_ENABLE_PUSH
-        NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS
-        NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE
-
-    ctypedef struct nghttp2_settings_entry:
-        int32_t settings_id
-        uint32_t value
-
-    ctypedef struct nghttp2_frame_hd:
-        size_t length
-        int32_t stream_id
-        uint8_t type
-        uint8_t flags
-
-    ctypedef struct nghttp2_data:
-        nghttp2_frame_hd hd
-        size_t padlen
-
-    ctypedef enum nghttp2_headers_category:
-        NGHTTP2_HCAT_REQUEST
-        NGHTTP2_HCAT_RESPONSE
-        NGHTTP2_HCAT_PUSH_RESPONSE
-        NGHTTP2_HCAT_HEADERS
-
-    ctypedef struct nghttp2_headers:
-        nghttp2_frame_hd hd
-        size_t padlen
-        nghttp2_nv *nva
-        size_t nvlen
-        nghttp2_headers_category cat
-        int32_t pri
-
-    ctypedef struct nghttp2_rst_stream:
-        nghttp2_frame_hd hd
-        uint32_t error_code
-
-
-    ctypedef struct nghttp2_push_promise:
-        nghttp2_frame_hd hd
-        nghttp2_nv *nva
-        size_t nvlen
-        int32_t promised_stream_id
-
-    ctypedef struct nghttp2_goaway:
-        nghttp2_frame_hd hd
-        int32_t last_stream_id
-        uint32_t error_code
-        uint8_t *opaque_data
-        size_t opaque_data_len
-
-    ctypedef union nghttp2_frame:
-        nghttp2_frame_hd hd
-        nghttp2_data data
-        nghttp2_headers headers
-        nghttp2_rst_stream rst_stream
-        nghttp2_push_promise push_promise
-        nghttp2_goaway goaway
-
-    ctypedef ssize_t (*nghttp2_send_callback)\
-        (nghttp2_session *session, const uint8_t *data, size_t length,
-         int flags, void *user_data)
-
-    ctypedef int (*nghttp2_on_frame_recv_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_data_chunk_recv_callback)\
-        (nghttp2_session *session, uint8_t flags, int32_t stream_id,
-         const uint8_t *data, size_t length, void *user_data)
-
-    ctypedef int (*nghttp2_before_frame_send_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_stream_close_callback)\
-        (nghttp2_session *session, int32_t stream_id,
-         uint32_t error_code, void *user_data)
-
-    ctypedef int (*nghttp2_on_begin_headers_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_header_callback)\
-        (nghttp2_session *session,
-         const nghttp2_frame *frame,
-         const uint8_t *name, size_t namelen,
-         const uint8_t *value, size_t valuelen,
-         uint8_t flags,
-         void *user_data)
-
-    ctypedef int (*nghttp2_on_frame_send_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_frame_not_send_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame,
-         int lib_error_code, void *user_data)
-
-    ctypedef struct nghttp2_session_callbacks:
-        pass
-
-    int nghttp2_session_callbacks_new(
-        nghttp2_session_callbacks **callbacks_ptr)
-
-    void nghttp2_session_callbacks_del(nghttp2_session_callbacks *callbacks)
-
-    void nghttp2_session_callbacks_set_send_callback(
-        nghttp2_session_callbacks *cbs, nghttp2_send_callback send_callback)
-
-    void nghttp2_session_callbacks_set_on_frame_recv_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_frame_recv_callback on_frame_recv_callback)
-
-    void nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback)
-
-    void nghttp2_session_callbacks_set_before_frame_send_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_before_frame_send_callback before_frame_send_callback)
-
-    void nghttp2_session_callbacks_set_on_frame_send_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_frame_send_callback on_frame_send_callback)
-
-    void nghttp2_session_callbacks_set_on_frame_not_send_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_frame_not_send_callback on_frame_not_send_callback)
-
-    void nghttp2_session_callbacks_set_on_stream_close_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_stream_close_callback on_stream_close_callback)
-
-    void nghttp2_session_callbacks_set_on_begin_headers_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_begin_headers_callback on_begin_headers_callback)
-
-    void nghttp2_session_callbacks_set_on_header_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_header_callback on_header_callback)
-
-    int nghttp2_session_client_new(nghttp2_session **session_ptr,
-                                   const nghttp2_session_callbacks *callbacks,
-                                   void *user_data)
-
-    int nghttp2_session_server_new(nghttp2_session **session_ptr,
-                                   const nghttp2_session_callbacks *callbacks,
-                                   void *user_data)
-
-    void nghttp2_session_del(nghttp2_session *session)
-
-
-    ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
-                                     const uint8_t *data, size_t datalen)
-
-    ssize_t nghttp2_session_mem_send(nghttp2_session *session,
-                                     const uint8_t **data_ptr)
-
-    int nghttp2_session_send(nghttp2_session *session)
-
-    int nghttp2_session_want_read(nghttp2_session *session)
-
-    int nghttp2_session_want_write(nghttp2_session *session)
-
-    ctypedef union nghttp2_data_source:
-        int fd
-        void *ptr
-
-    ctypedef enum nghttp2_data_flag:
-        NGHTTP2_DATA_FLAG_NONE
-        NGHTTP2_DATA_FLAG_EOF
-
-    ctypedef ssize_t (*nghttp2_data_source_read_callback)\
-        (nghttp2_session *session, int32_t stream_id,
-         uint8_t *buf, size_t length, uint32_t *data_flags,
-         nghttp2_data_source *source, void *user_data)
-
-    ctypedef struct nghttp2_data_provider:
-        nghttp2_data_source source
-        nghttp2_data_source_read_callback read_callback
-
-    ctypedef struct nghttp2_priority_spec:
-        int32_t stream_id
-        int32_t weight
-        uint8_t exclusive
-
-    int nghttp2_submit_request(nghttp2_session *session, const nghttp2_priority_spec *pri_spec,
-                               const nghttp2_nv *nva, size_t nvlen,
-                               const nghttp2_data_provider *data_prd,
-                               void *stream_user_data)
-
-    int nghttp2_submit_response(nghttp2_session *session,
-                                int32_t stream_id,
-                                const nghttp2_nv *nva, size_t nvlen,
-                                const nghttp2_data_provider *data_prd)
-
-    int nghttp2_submit_push_promise(nghttp2_session *session, uint8_t flags,
-                                    int32_t stream_id,
-                                    const nghttp2_nv *nva, size_t nvlen,
-                                    void *stream_user_data)
-
-    int nghttp2_submit_settings(nghttp2_session *session, uint8_t flags,
-                                const nghttp2_settings_entry *iv, size_t niv)
-
-    int nghttp2_submit_rst_stream(nghttp2_session *session, uint8_t flags,
-                                  int32_t stream_id,
-                                  uint32_t error_code)
-
-    void* nghttp2_session_get_stream_user_data(nghttp2_session *session,
-                                               uint32_t stream_id)
-
-    int nghttp2_session_set_stream_user_data(nghttp2_session *session,
-                                             uint32_t stream_id,
-                                             void *stream_user_data)
-
-    int nghttp2_session_terminate_session(nghttp2_session *session,
-                                          uint32_t error_code)
-
-    int nghttp2_session_resume_data(nghttp2_session *session,
-                                    int32_t stream_id)
-
-    const char* nghttp2_strerror(int lib_error_code)
-
-    int nghttp2_session_check_server_session(nghttp2_session *session)
-
-    int nghttp2_session_get_stream_remote_close(nghttp2_session *session, int32_t stream_id)
-
-    int nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
-                               size_t deflate_hd_table_bufsize_max)
-
-    void nghttp2_hd_deflate_del(nghttp2_hd_deflater *deflater)
-
-    int nghttp2_hd_deflate_change_table_size(nghttp2_hd_deflater *deflater,
-                                             size_t hd_table_bufsize_max)
-
-    ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
-                                  uint8_t *buf, size_t buflen,
-                                  const nghttp2_nv *nva, size_t nvlen)
-
-    size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
-                                    const nghttp2_nv *nva, size_t nvlen)
-
-    int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr)
-
-    void nghttp2_hd_inflate_del(nghttp2_hd_inflater *inflater)
-
-    int nghttp2_hd_inflate_change_table_size(nghttp2_hd_inflater *inflater,
-                                             size_t hd_table_bufsize_max)
-
-    ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
-                                   nghttp2_nv *nv_out, int *inflate_flags,
-                                   const uint8_t *input, size_t inlen,
-                                   int in_final)
-
-    int nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater)
-
-    ctypedef enum nghttp2_hd_inflate_flag:
-        NGHTTP2_HD_INFLATE_EMIT
-        NGHTTP2_HD_INFLATE_FINAL
-
-    ctypedef struct nghttp2_hd_deflater:
-        pass
-
-    ctypedef struct nghttp2_hd_inflater:
-        pass
-
-    size_t nghttp2_hd_deflate_get_num_table_entries(nghttp2_hd_deflater *deflater)
-
-    const nghttp2_nv * nghttp2_hd_deflate_get_table_entry(nghttp2_hd_deflater *deflater, size_t idx)
-
-    size_t nghttp2_hd_inflate_get_num_table_entries(nghttp2_hd_inflater *inflater)
-
-    const nghttp2_nv *nghttp2_hd_inflate_get_table_entry(nghttp2_hd_inflater *inflater, size_t idx)

_service:tar_scm:nghttp2-1.46.0.tar.xz/python/install-python.cmake.in Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/python/nghttp2.pyx Deleted

@@ -1,1656 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 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.
-cimport cnghttp2
-
-from libc.stdlib cimport malloc, free
-from libc.string cimport memcpy, memset
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, int32_t
-import logging
-
-
-DEFAULT_HEADER_TABLE_SIZE = cnghttp2.NGHTTP2_DEFAULT_HEADER_TABLE_SIZE
-DEFLATE_MAX_HEADER_TABLE_SIZE = 4096
-
-HD_ENTRY_OVERHEAD = 32
-
-class HDTableEntry:
-
-    def __init__(self, name, namelen, value, valuelen):
-        self.name = name
-        self.namelen = namelen
-        self.value = value
-        self.valuelen = valuelen
-
-    def space(self):
-        return self.namelen + self.valuelen + HD_ENTRY_OVERHEAD
-
-cdef _get_pybytes(uint8_t *b, uint16_t blen):
-    return b:blen
-
-cdef class HDDeflater:
-    '''Performs header compression. The constructor takes
-    |hd_table_bufsize_max| parameter, which limits the usage of header
-    table in the given amount of bytes. This is necessary because the
-    header compressor and decompressor share the same amount of
-    header table and the decompressor decides that number. The
-    compressor may not want to use all header table size because of
-    limited memory availability. In that case, the
-    |hd_table_bufsize_max| can be used to cap the upper limit of table
-    size whatever the header table size is chosen by the decompressor.
-    The default value of |hd_table_bufsize_max| is 4096 bytes.
-
-    The following example shows how to compress request header sets:
-
-        import binascii, nghttp2
-
-        deflater = nghttp2.HDDeflater()
-        res = deflater.deflate((b'foo', b'bar'),
-                              (b'baz', b'buz'))
-        print(binascii.b2a_hex(res))
-
-    '''
-
-    cdef cnghttp2.nghttp2_hd_deflater *_deflater
-
-    def __cinit__(self, hd_table_bufsize_max = DEFLATE_MAX_HEADER_TABLE_SIZE):
-        rv = cnghttp2.nghttp2_hd_deflate_new(&self._deflater,
-                                             hd_table_bufsize_max)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def __dealloc__(self):
-        cnghttp2.nghttp2_hd_deflate_del(self._deflater)
-
-    def deflate(self, headers):
-        '''Compresses the |headers|. The |headers| must be sequence of tuple
-        of name/value pair, which are sequence of bytes (not unicode
-        string).
-
-        This function returns the encoded header block in byte string.
-        An exception will be raised on error.
-
-        '''
-        cdef cnghttp2.nghttp2_nv *nva = <cnghttp2.nghttp2_nv*>\
-                                        malloc(sizeof(cnghttp2.nghttp2_nv)*\
-                                        len(headers))
-        cdef cnghttp2.nghttp2_nv *nvap = nva
-
-        for k, v in headers:
-            nvap0.name = k
-            nvap0.namelen = len(k)
-            nvap0.value = v
-            nvap0.valuelen = len(v)
-            nvap0.flags = cnghttp2.NGHTTP2_NV_FLAG_NONE
-            nvap += 1
-
-        cdef size_t outcap = 0
-        cdef ssize_t rv
-        cdef uint8_t *out
-        cdef size_t outlen
-
-        outlen = cnghttp2.nghttp2_hd_deflate_bound(self._deflater,
-                                                   nva, len(headers))
-
-        out = <uint8_t*>malloc(outlen)
-
-        rv = cnghttp2.nghttp2_hd_deflate_hd(self._deflater, out, outlen,
-                                            nva, len(headers))
-        free(nva)
-
-        if rv < 0:
-            free(out)
-
-            raise Exception(_strerror(rv))
-
-        cdef bytes res
-
-        try:
-            res = out:rv
-        finally:
-            free(out)
-
-        return res
-
-    def change_table_size(self, hd_table_bufsize_max):
-        '''Changes header table size to |hd_table_bufsize_max| byte.
-
-        An exception will be raised on error.
-
-        '''
-        cdef int rv
-        rv = cnghttp2.nghttp2_hd_deflate_change_table_size(self._deflater,
-                                                           hd_table_bufsize_max)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def get_hd_table(self):
-        '''Returns copy of current dynamic header table.'''
-        cdef size_t length = cnghttp2.nghttp2_hd_deflate_get_num_table_entries(
-            self._deflater)
-        cdef const cnghttp2.nghttp2_nv *nv
-        res = 
-        for i in range(62, length + 1):
-            nv = cnghttp2.nghttp2_hd_deflate_get_table_entry(self._deflater, i)
-            k = _get_pybytes(nv.name, nv.namelen)
-            v = _get_pybytes(nv.value, nv.valuelen)
-            res.append(HDTableEntry(k, nv.namelen, v, nv.valuelen))
-        return res
-
-cdef class HDInflater:
-    '''Performs header decompression.
-
-    The following example shows how to compress request header sets:
-
-        data = b'0082c5ad82bd0f000362617a0362757a'
-        inflater = nghttp2.HDInflater()
-        hdrs = inflater.inflate(data)
-        print(hdrs)
-
-    '''
-
-    cdef cnghttp2.nghttp2_hd_inflater *_inflater
-
-    def __cinit__(self):
-        rv = cnghttp2.nghttp2_hd_inflate_new(&self._inflater)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def __dealloc__(self):
-        cnghttp2.nghttp2_hd_inflate_del(self._inflater)
-
-    def inflate(self, data):
-        '''Decompresses the compressed header block |data|. The |data| must be
-        byte string (not unicode string).
-
-        '''
-        cdef cnghttp2.nghttp2_nv nv
-        cdef int inflate_flags
-        cdef ssize_t rv
-        cdef uint8_t *buf = data
-        cdef size_t buflen = len(data)
-        res = 
-        while True:
-            inflate_flags = 0
-            rv = cnghttp2.nghttp2_hd_inflate_hd2(self._inflater, &nv,
-                                                 &inflate_flags,
-                                                 buf, buflen, 1)
-            if rv < 0:
-                raise Exception(_strerror(rv))
-            buf += rv
-            buflen -= rv
-            if inflate_flags & cnghttp2.NGHTTP2_HD_INFLATE_EMIT:
-                # may throw
-                res.append((nv.name:nv.namelen, nv.value:nv.valuelen))
-            if inflate_flags & cnghttp2.NGHTTP2_HD_INFLATE_FINAL:
-                break
-
-        cnghttp2.nghttp2_hd_inflate_end_headers(self._inflater)
-        return res
-
-    def change_table_size(self, hd_table_bufsize_max):
-        '''Changes header table size to |hd_table_bufsize_max| byte.
-
-        An exception will be raised on error.
-
-        '''
-        cdef int rv
-        rv = cnghttp2.nghttp2_hd_inflate_change_table_size(self._inflater,
-                                                           hd_table_bufsize_max)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def get_hd_table(self):
-        '''Returns copy of current dynamic header table.'''
-        cdef size_t length = cnghttp2.nghttp2_hd_inflate_get_num_table_entries(
-            self._inflater)
-        cdef const cnghttp2.nghttp2_nv *nv
-        res = 
-        for i in range(62, length + 1):
-            nv = cnghttp2.nghttp2_hd_inflate_get_table_entry(self._inflater, i)
-            k = _get_pybytes(nv.name, nv.namelen)
-            v = _get_pybytes(nv.value, nv.valuelen)
-            res.append(HDTableEntry(k, nv.namelen, v, nv.valuelen))
-        return res
-
-cdef _strerror(int liberror_code):
-    return cnghttp2.nghttp2_strerror(liberror_code).decode('utf-8')
-
-def print_hd_table(hdtable):
-    '''Convenient function to print |hdtable| to the standard output. This
-    function does not work if header name/value cannot be decoded using
-    UTF-8 encoding.
-
-    s=N means the entry occupies N bytes in header table.
-
-    '''
-    idx = 0
-    for entry in hdtable:
-        idx += 1
-        print('{} (s={}) {}: {}'\
-              .format(idx, entry.space(),
-                      entry.name.decode('utf-8'),
-                      entry.value.decode('utf-8')))
-
-try:
-    import socket
-    import io
-    import asyncio
-    import traceback
-    import sys
-    import email.utils
-    import datetime
-    import time
-    import ssl as tls
-    from urllib.parse import urlparse
-except ImportError:
-    asyncio = None
-
-# body generator flags
-DATA_OK = 0
-DATA_EOF = 1
-DATA_DEFERRED = 2
-
-class _ByteIOWrapper:
-
-    def __init__(self, b):
-        self.b = b
-
-    def generate(self, n):
-        data = self.b.read1(n)
-        if not data:
-            return None, DATA_EOF
-        return data, DATA_OK
-
-def wrap_body(body):
-    if body is None:
-        return body
-    elif isinstance(body, str):
-        return _ByteIOWrapper(io.BytesIO(body.encode('utf-8'))).generate
-    elif isinstance(body, bytes):
-        return _ByteIOWrapper(io.BytesIO(body)).generate
-    elif isinstance(body, io.IOBase):
-        return _ByteIOWrapper(body).generate
-    else:
-        # assume that callable in the form f(n) returning tuple byte
-        # string and flag.
-        return body
-
-def negotiated_protocol(ssl_obj):
-    protocol = ssl_obj.selected_alpn_protocol()
-    if protocol:
-        logging.info('alpn, protocol:%s', protocol)
-        return protocol
-
-    protocol = ssl_obj.selected_npn_protocol()
-    if protocol:
-        logging.info('npn, protocol:%s', protocol)
-        return protocol
-
-    return None
-
-def set_application_protocol(ssl_ctx):
-    app_protos = cnghttp2.NGHTTP2_PROTO_VERSION_ID.decode('utf-8')
-    ssl_ctx.set_npn_protocols(app_protos)
-    if tls.HAS_ALPN:
-        ssl_ctx.set_alpn_protocols(app_protos)
-
-cdef _get_stream_user_data(cnghttp2.nghttp2_session *session,
-                           int32_t stream_id):
-    cdef void *stream_user_data
-
-    stream_user_data = cnghttp2.nghttp2_session_get_stream_user_data\
-                       (session, stream_id)
-    if stream_user_data == NULL:
-        return None
-
-    return <object>stream_user_data
-
-cdef size_t _make_nva(cnghttp2.nghttp2_nv **nva_ptr, headers):
-    cdef cnghttp2.nghttp2_nv *nva
-    cdef size_t nvlen
-
-    nvlen = len(headers)
-    nva = <cnghttp2.nghttp2_nv*>malloc(sizeof(cnghttp2.nghttp2_nv) * nvlen)
-    for i, (k, v) in enumerate(headers):
-        nvai.name = k
-        nvai.namelen = len(k)
-        nvai.value = v
-        nvai.valuelen = len(v)
-        nvai.flags = cnghttp2.NGHTTP2_NV_FLAG_NONE
-
-    nva_ptr0 = nva
-
-    return nvlen
-
-cdef int server_on_header(cnghttp2.nghttp2_session *session,
-                          const cnghttp2.nghttp2_frame *frame,
-                          const uint8_t *name, size_t namelen,
-                          const uint8_t *value, size_t valuelen,
-                          uint8_t flags,
-                          void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    logging.debug('server_on_header, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    handler = _get_stream_user_data(session, frame.hd.stream_id)
-    return on_header(name, namelen, value, valuelen, flags, handler)
-
-cdef int client_on_header(cnghttp2.nghttp2_session *session,
-                          const cnghttp2.nghttp2_frame *frame,
-                          const uint8_t *name, size_t namelen,
-                          const uint8_t *value, size_t valuelen,
-                          uint8_t flags,
-                          void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    logging.debug('client_on_header, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        handler = _get_stream_user_data(session, frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        handler = _get_stream_user_data(session, frame.push_promise.promised_stream_id)
-
-    return on_header(name, namelen, value, valuelen, flags, handler)
-
-
-cdef int on_header(const uint8_t *name, size_t namelen,
-                          const uint8_t *value, size_t valuelen,
-                          uint8_t flags,
-                          object handler):
-    if not handler:
-        return 0
-
-    key = name:namelen
-    values = value:valuelen.split(b'\x00')
-    if key == b':scheme':
-        handler.scheme = values0
-    elif key == b':method':
-        handler.method = values0
-    elif key == b':authority' or key == b'host':
-        handler.host = values0
-    elif key == b':path':
-        handler.path = values0
-    elif key == b':status':
-        handler.status = values0
-
-    if key == b'cookie':
-        handler.cookies.extend(values)
-    else:
-        for v in values:
-            handler.headers.append((key, v))
-
-    return 0
-
-cdef int server_on_begin_request_headers(cnghttp2.nghttp2_session *session,
-                                         const cnghttp2.nghttp2_frame *frame,
-                                         void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-
-    handler = http2._make_handler(frame.hd.stream_id)
-    cnghttp2.nghttp2_session_set_stream_user_data(session, frame.hd.stream_id,
-                                                  <void*>handler)
-
-    return 0
-
-cdef int server_on_begin_headers(cnghttp2.nghttp2_session *session,
-                                 const cnghttp2.nghttp2_frame *frame,
-                                 void *user_data):
-    if frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if frame.headers.cat == cnghttp2.NGHTTP2_HCAT_REQUEST:
-            return server_on_begin_request_headers(session, frame, user_data)
-
-    return 0
-
-cdef int server_on_frame_recv(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-    logging.debug('server_on_frame_recv, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_DATA:
-        if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-            if not handler:
-                return 0
-            try:
-                handler.on_request_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if frame.headers.cat == cnghttp2.NGHTTP2_HCAT_REQUEST:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-            if not handler:
-                return 0
-            if handler.cookies:
-                handler.headers.append((b'cookie',
-                                        b'; '.join(handler.cookies)))
-                handler.cookies = None
-            try:
-                handler.on_headers()
-                if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-                    handler.on_request_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK):
-            http2._stop_settings_timer()
-
-    return 0
-
-cdef int on_data_chunk_recv(cnghttp2.nghttp2_session *session,
-                                   uint8_t flags,
-                                   int32_t stream_id, const uint8_t *data,
-                                   size_t length, void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-
-    handler = _get_stream_user_data(session, stream_id)
-    if not handler:
-        return 0
-
-    try:
-        handler.on_data(data:length)
-    except:
-        sys.stderr.write(traceback.format_exc())
-        return http2._rst_stream(stream_id)
-
-    return 0
-
-cdef int server_on_frame_send(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-    logging.debug('server_on_frame_send, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        # For PUSH_PROMISE, send push response immediately
-        handler = _get_stream_user_data\
-                  (session, frame.push_promise.promised_stream_id)
-        if not handler:
-            return 0
-
-        http2.send_response(handler)
-    elif frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK) != 0:
-            return 0
-        http2._start_settings_timer()
-    elif frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM) and \
-           cnghttp2.nghttp2_session_check_server_session(session):
-            # Send RST_STREAM if remote is not closed yet
-            if cnghttp2.nghttp2_session_get_stream_remote_close(
-                    session, frame.hd.stream_id) == 0:
-                http2._rst_stream(frame.hd.stream_id, cnghttp2.NGHTTP2_NO_ERROR)
-
-cdef int server_on_frame_not_send(cnghttp2.nghttp2_session *session,
-                                  const cnghttp2.nghttp2_frame *frame,
-                                  int lib_error_code,
-                                  void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-    logging.debug('server_on_frame_not_send, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        # We have to remove handler here. Without this, it is not
-        # removed until session is terminated.
-        handler = _get_stream_user_data\
-                  (session, frame.push_promise.promised_stream_id)
-        if not handler:
-            return 0
-        http2._remove_handler(handler)
-
-cdef int on_stream_close(cnghttp2.nghttp2_session *session,
-                                int32_t stream_id,
-                                uint32_t error_code,
-                                void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    logging.debug('on_stream_close, stream_id:%s', stream_id)
-
-    handler = _get_stream_user_data(session, stream_id)
-    if not handler:
-        return 0
-
-    try:
-        handler.on_close(error_code)
-    except:
-        sys.stderr.write(traceback.format_exc())
-
-    http2._remove_handler(handler)
-
-    return 0
-
-cdef ssize_t data_source_read(cnghttp2.nghttp2_session *session,
-                              int32_t stream_id,
-                              uint8_t *buf, size_t length,
-                              uint32_t *data_flags,
-                              cnghttp2.nghttp2_data_source *source,
-                              void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    generator = <object>source.ptr
-
-    http2.enter_callback()
-    try:
-        data, flag = generator(length)
-    except:
-        sys.stderr.write(traceback.format_exc())
-        return cnghttp2.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    finally:
-        http2.leave_callback()
-
-    if flag == DATA_DEFERRED:
-        return cnghttp2.NGHTTP2_ERR_DEFERRED
-
-    if data:
-        nread = len(data)
-        memcpy(buf, <uint8_t*>data, nread)
-    else:
-        nread = 0
-
-    if flag == DATA_EOF:
-        data_flags0 = cnghttp2.NGHTTP2_DATA_FLAG_EOF
-        if cnghttp2.nghttp2_session_check_server_session(session):
-            # Send RST_STREAM if remote is not closed yet
-            if cnghttp2.nghttp2_session_get_stream_remote_close(
-                    session, stream_id) == 0:
-                http2._rst_stream(stream_id, cnghttp2.NGHTTP2_NO_ERROR)
-    elif flag != DATA_OK:
-        return cnghttp2.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE
-
-    return nread
-
-cdef int client_on_begin_headers(cnghttp2.nghttp2_session *session,
-                                 const cnghttp2.nghttp2_frame *frame,
-                                 void *user_data):
-    cdef http2 = <_HTTP2ClientSessionCore>user_data
-
-    if frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        # Generate a temporary handler until the headers are all received
-        push_handler = BaseResponseHandler()
-        http2._add_handler(push_handler, frame.push_promise.promised_stream_id)
-        cnghttp2.nghttp2_session_set_stream_user_data(session, frame.push_promise.promised_stream_id,
-                                                      <void*>push_handler)
-
-    return 0
-
-cdef int client_on_frame_recv(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2ClientSessionCore>user_data
-    logging.debug('client_on_frame_recv, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_DATA:
-        if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-            if not handler:
-                return 0
-            try:
-                handler.on_response_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if frame.headers.cat == cnghttp2.NGHTTP2_HCAT_RESPONSE or frame.headers.cat == cnghttp2.NGHTTP2_HCAT_PUSH_RESPONSE:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-
-            if not handler:
-                return 0
-            # TODO handle 1xx non-final response
-            if handler.cookies:
-                handler.headers.append((b'cookie',
-                                        b'; '.join(handler.cookies)))
-                handler.cookies = None
-            try:
-                handler.on_headers()
-                if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-                    handler.on_response_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK):
-            http2._stop_settings_timer()
-    elif frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        handler = _get_stream_user_data(session, frame.hd.stream_id)
-        if not handler:
-            return 0
-        # Get the temporary push_handler which now should have all of the header data
-        push_handler = _get_stream_user_data(session, frame.push_promise.promised_stream_id)
-        if not push_handler:
-            return 0
-        # Remove the temporary handler
-        http2._remove_handler(push_handler)
-        cnghttp2.nghttp2_session_set_stream_user_data(session, frame.push_promise.promised_stream_id,
-                                                      <void*>NULL)
-
-        try:
-            handler.on_push_promise(push_handler)
-        except:
-            sys.stderr.write(traceback.format_exc())
-            return http2._rst_stream(frame.hd.stream_id)
-
-    return 0
-
-cdef int client_on_frame_send(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2ClientSessionCore>user_data
-    logging.debug('client_on_frame_send, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK) != 0:
-            return 0
-        http2._start_settings_timer()
-
-cdef class _HTTP2SessionCoreBase:
-    cdef cnghttp2.nghttp2_session *session
-    cdef transport
-    cdef handler_class
-    cdef handlers
-    cdef settings_timer
-    cdef inside_callback
-
-    def __cinit__(self, transport, handler_class=None):
-        self.session = NULL
-        self.transport = transport
-        self.handler_class = handler_class
-        self.handlers = set()
-        self.settings_timer = None
-        self.inside_callback = False
-
-    def __dealloc__(self):
-        cnghttp2.nghttp2_session_del(self.session)
-
-    def data_received(self, data):
-        cdef ssize_t rv
-
-        rv = cnghttp2.nghttp2_session_mem_recv(self.session, data, len(data))
-        if rv < 0:
-            raise Exception('nghttp2_session_mem_recv failed: {}'.format\
-                            (_strerror(rv)))
-        self.send_data()
-
-    OUTBUF_MAX = 65535
-    SETTINGS_TIMEOUT = 5.0
-
-    def send_data(self):
-        cdef ssize_t outbuflen
-        cdef const uint8_t *outbuf
-
-        while True:
-            if self.transport.get_write_buffer_size() > self.OUTBUF_MAX:
-                break
-            outbuflen = cnghttp2.nghttp2_session_mem_send(self.session, &outbuf)
-            if outbuflen == 0:
-                break
-            if outbuflen < 0:
-                raise Exception('nghttp2_session_mem_send faild: {}'.format\
-                                (_strerror(outbuflen)))
-            self.transport.write(outbuf:outbuflen)
-
-        if self.transport.get_write_buffer_size() == 0 and \
-           cnghttp2.nghttp2_session_want_read(self.session) == 0 and \
-           cnghttp2.nghttp2_session_want_write(self.session) == 0:
-            self.transport.close()
-
-    def resume(self, stream_id):
-        cnghttp2.nghttp2_session_resume_data(self.session, stream_id)
-        if not self.inside_callback:
-            self.send_data()
-
-    def enter_callback(self):
-        self.inside_callback = True
-
-    def leave_callback(self):
-        self.inside_callback = False
-
-    def _make_handler(self, stream_id):
-        logging.debug('_make_handler, stream_id:%s', stream_id)
-        handler = self.handler_class(self, stream_id)
-        self.handlers.add(handler)
-        return handler
-
-    def _remove_handler(self, handler):
-        logging.debug('_remove_handler, stream_id:%s', handler.stream_id)
-        self.handlers.remove(handler)
-
-    def _add_handler(self, handler, stream_id):
-        logging.debug('_add_handler, stream_id:%s', stream_id)
-        handler.stream_id = stream_id
-        handler.http2 = self
-        handler.remote_address = self._get_remote_address()
-        handler.client_certificate = self._get_client_certificate()
-        self.handlers.add(handler)
-
-    def _rst_stream(self, stream_id,
-                   error_code=cnghttp2.NGHTTP2_INTERNAL_ERROR):
-        cdef int rv
-
-        rv = cnghttp2.nghttp2_submit_rst_stream\
-             (self.session, cnghttp2.NGHTTP2_FLAG_NONE,
-              stream_id, error_code)
-
-        return rv
-
-    def _get_remote_address(self):
-        return self.transport.get_extra_info('peername')
-
-    def _get_client_certificate(self):
-        sock = self.transport.get_extra_info('socket')
-        try:
-            return sock.getpeercert()
-        except AttributeError:
-            return None
-
-    def _start_settings_timer(self):
-        loop = asyncio.get_event_loop()
-        self.settings_timer = loop.call_later(self.SETTINGS_TIMEOUT,
-                                              self._settings_timeout)
-
-    def _stop_settings_timer(self):
-        if self.settings_timer:
-            self.settings_timer.cancel()
-            self.settings_timer = None
-
-    def _settings_timeout(self):
-        cdef int rv
-
-        logging.debug('_settings_timeout')
-
-        self.settings_timer = None
-
-        rv = cnghttp2.nghttp2_session_terminate_session\
-             (self.session, cnghttp2.NGHTTP2_SETTINGS_TIMEOUT)
-        try:
-            self.send_data()
-        except Exception as err:
-            sys.stderr.write(traceback.format_exc())
-            self.transport.close()
-            return
-
-    def _log_request(self, handler):
-        now = datetime.datetime.now()
-        tv = time.mktime(now.timetuple())
-        datestr = email.utils.formatdate(timeval=tv, localtime=False,
-                                        usegmt=True)
-        try:
-            method = handler.method.decode('utf-8')
-        except:
-            method = handler.method
-        try:
-            path = handler.path.decode('utf-8')
-        except:
-            path = handler.path
-        logging.info('%s - - %s "%s %s HTTP/2" %s - %s', handler.remote_address0,
-                          datestr, method, path, handler.status,
-                          'P' if handler.pushed else '-')
-
-    def close(self):
-        rv = cnghttp2.nghttp2_session_terminate_session\
-             (self.session, cnghttp2.NGHTTP2_NO_ERROR)
-        try:
-            self.send_data()
-        except Exception as err:
-            sys.stderr.write(traceback.format_exc())
-            self.transport.close()
-            return
-
-cdef class _HTTP2SessionCore(_HTTP2SessionCoreBase):
-    def __cinit__(self, *args, **kwargs):
-        cdef cnghttp2.nghttp2_session_callbacks *callbacks
-        cdef cnghttp2.nghttp2_settings_entry iv2
-        cdef int rv
-
-        super(_HTTP2SessionCore, self).__init__(*args, **kwargs)
-
-        rv = cnghttp2.nghttp2_session_callbacks_new(&callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_callbacks_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        cnghttp2.nghttp2_session_callbacks_set_on_header_callback(
-            callbacks, server_on_header)
-        cnghttp2.nghttp2_session_callbacks_set_on_begin_headers_callback(
-            callbacks, server_on_begin_headers)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_recv_callback(
-            callbacks, server_on_frame_recv)
-        cnghttp2.nghttp2_session_callbacks_set_on_stream_close_callback(
-            callbacks, on_stream_close)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_send_callback(
-            callbacks, server_on_frame_send)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_not_send_callback(
-            callbacks, server_on_frame_not_send)
-        cnghttp2.nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-            callbacks, on_data_chunk_recv)
-
-        rv = cnghttp2.nghttp2_session_server_new(&self.session, callbacks,
-                                                 <void*>self)
-
-        cnghttp2.nghttp2_session_callbacks_del(callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_server_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        iv0.settings_id = cnghttp2.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS
-        iv0.value = 100
-        iv1.settings_id = cnghttp2.NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE
-        iv1.value = cnghttp2.NGHTTP2_INITIAL_WINDOW_SIZE
-
-        rv = cnghttp2.nghttp2_submit_settings(self.session,
-                                              cnghttp2.NGHTTP2_FLAG_NONE,
-                                              iv, sizeof(iv) // sizeof(iv0))
-
-        if rv != 0:
-            raise Exception('nghttp2_submit_settings failed: {}'.format\
-                            (_strerror(rv)))
-
-    def send_response(self, handler):
-        cdef cnghttp2.nghttp2_data_provider prd
-        cdef cnghttp2.nghttp2_data_provider *prd_ptr
-        cdef cnghttp2.nghttp2_nv *nva
-        cdef size_t nvlen
-        cdef int rv
-
-        logging.debug('send_response, stream_id:%s', handler.stream_id)
-
-        nva = NULL
-        nvlen = _make_nva(&nva, handler.response_headers)
-
-        if handler.response_body:
-            prd.source.ptr = <void*>handler.response_body
-            prd.read_callback = data_source_read
-            prd_ptr = &prd
-        else:
-            prd_ptr = NULL
-
-        rv = cnghttp2.nghttp2_submit_response(self.session, handler.stream_id,
-                                              nva, nvlen, prd_ptr)
-
-        free(nva)
-
-        if rv != 0:
-            # TODO Ignore return value
-            self._rst_stream(handler.stream_id)
-            raise Exception('nghttp2_submit_response failed: {}'.format\
-                            (_strerror(rv)))
-
-        self._log_request(handler)
-
-    def push(self, handler, promised_handler):
-        cdef cnghttp2.nghttp2_nv *nva
-        cdef size_t nvlen
-        cdef int32_t promised_stream_id
-
-        self.handlers.add(promised_handler)
-
-        nva = NULL
-        nvlen = _make_nva(&nva, promised_handler.headers)
-
-        promised_stream_id = cnghttp2.nghttp2_submit_push_promise\
-                             (self.session,
-                              cnghttp2.NGHTTP2_FLAG_NONE,
-                              handler.stream_id,
-                              nva, nvlen,
-                              <void*>promised_handler)
-        if promised_stream_id < 0:
-            raise Exception('nghttp2_submit_push_promise failed: {}'.format\
-                            (_strerror(promised_stream_id)))
-
-        promised_handler.stream_id = promised_stream_id
-
-        logging.debug('push, stream_id:%s', promised_stream_id)
-
-        return promised_handler
-
-    def connection_lost(self):
-        self._stop_settings_timer()
-
-        for handler in self.handlers:
-            handler.on_close(cnghttp2.NGHTTP2_INTERNAL_ERROR)
-        self.handlers = set()
-
-cdef class _HTTP2ClientSessionCore(_HTTP2SessionCoreBase):
-    def __cinit__(self, *args, **kwargs):
-        cdef cnghttp2.nghttp2_session_callbacks *callbacks
-        cdef cnghttp2.nghttp2_settings_entry iv2
-        cdef int rv
-
-        super(_HTTP2ClientSessionCore, self).__init__(*args, **kwargs)
-
-        rv = cnghttp2.nghttp2_session_callbacks_new(&callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_callbacks_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        cnghttp2.nghttp2_session_callbacks_set_on_header_callback(
-            callbacks, client_on_header)
-        cnghttp2.nghttp2_session_callbacks_set_on_begin_headers_callback(
-            callbacks, client_on_begin_headers)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_recv_callback(
-            callbacks, client_on_frame_recv)
-        cnghttp2.nghttp2_session_callbacks_set_on_stream_close_callback(
-            callbacks, on_stream_close)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_send_callback(
-            callbacks, client_on_frame_send)
-        cnghttp2.nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-            callbacks, on_data_chunk_recv)
-
-        rv = cnghttp2.nghttp2_session_client_new(&self.session, callbacks,
-                                                 <void*>self)
-
-        cnghttp2.nghttp2_session_callbacks_del(callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_client_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        iv0.settings_id = cnghttp2.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS
-        iv0.value = 100
-        iv1.settings_id = cnghttp2.NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE
-        iv1.value = cnghttp2.NGHTTP2_INITIAL_WINDOW_SIZE
-
-        rv = cnghttp2.nghttp2_submit_settings(self.session,
-                                              cnghttp2.NGHTTP2_FLAG_NONE,
-                                              iv, sizeof(iv) // sizeof(iv0))
-
-        if rv != 0:
-            raise Exception('nghttp2_submit_settings failed: {}'.format\
-                            (_strerror(rv)))
-
-    def send_request(self, method, scheme, host, path, headers, body, handler):
-        cdef cnghttp2.nghttp2_data_provider prd
-        cdef cnghttp2.nghttp2_data_provider *prd_ptr
-        cdef cnghttp2.nghttp2_priority_spec *pri_ptr
-        cdef cnghttp2.nghttp2_nv *nva
-        cdef size_t nvlen
-        cdef int32_t stream_id
-
-        body = wrap_body(body)
-
-        custom_headers = _encode_headers(headers)
-        headers = 
-            (b':method', method.encode('utf-8')),
-            (b':scheme', scheme.encode('utf-8')),
-            (b':authority', host.encode('utf-8')),
-            (b':path', path.encode('utf-8'))
-        
-        headers.extend(custom_headers)
-
-        nva = NULL
-        nvlen = _make_nva(&nva, headers)
-
-        if body:
-            prd.source.ptr = <void*>body
-            prd.read_callback = data_source_read
-            prd_ptr = &prd
-        else:
-            prd_ptr = NULL
-
-        # TODO: Enable priorities
-        pri_ptr = NULL
-
-        stream_id = cnghttp2.nghttp2_submit_request\
-                             (self.session, pri_ptr,
-                              nva, nvlen, prd_ptr,
-                              <void*>handler)
-        free(nva)
-
-        if stream_id < 0:
-            raise Exception('nghttp2_submit_request failed: {}'.format\
-                            (_strerror(stream_id)))
-
-        logging.debug('request, stream_id:%s', stream_id)
-
-        self._add_handler(handler, stream_id)
-        cnghttp2.nghttp2_session_set_stream_user_data(self.session, stream_id,
-                                                  <void*>handler)
-
-        return handler
-
-    def push(self, push_promise, handler):
-        if handler:
-            # push_promise accepted, fill in the handler with the stored
-            # headers from the push_promise
-            handler.status = push_promise.status
-            handler.scheme = push_promise.scheme
-            handler.method = push_promise.method
-            handler.host = push_promise.host
-            handler.path = push_promise.path
-            handler.cookies = push_promise.cookies
-            handler.stream_id = push_promise.stream_id
-            handler.http2 = self
-            handler.pushed = True
-
-            self._add_handler(handler, handler.stream_id)
-
-            cnghttp2.nghttp2_session_set_stream_user_data(self.session, handler.stream_id,
-                                                      <void*>handler)
-        else:
-            # push_promise rejected, reset the stream
-            self._rst_stream(push_promise.stream_id,
-                              error_code=cnghttp2.NGHTTP2_NO_ERROR)
-
-if asyncio:
-
-    class BaseRequestHandler:
-
-        """HTTP/2 request (stream) handler base class.
-
-        The class is used to handle the HTTP/2 stream. By default, it does
-        not nothing. It must be subclassed to handle each event callback
-        method.
-
-        The first callback method invoked is on_headers(). It is called
-        when HEADERS frame, which includes request header fields, is
-        arrived.
-
-        If request has request body, on_data(data) is invoked for each
-        chunk of received data.
-
-        When whole request is received, on_request_done() is invoked.
-
-        When stream is closed, on_close(error_code) is called.
-
-        The application can send response using send_response() method. It
-        can be used in on_headers(), on_data() or on_request_done().
-
-        The application can push resource using push() method. It must be
-        used before send_response() call.
-
-        The following instance variables are available:
-
-        client_address
-          Contains a tuple of the form (host, port) referring to the client's
-          address.
-
-        client_certificate
-          May contain the client certifcate in its non-binary form
-
-        stream_id
-          Stream ID of this stream
-
-        scheme
-          Scheme of the request URI. This is a value of :scheme header field.
-
-        method
-          Method of this stream. This is a value of :method header field.
-
-        host
-          This is a value of :authority or host header field.
-
-        path
-          This is a value of :path header field.
-
-        headers
-          Request header fields
-
-        """
-
-        def __init__(self, http2, stream_id):
-            self.headers = 
-            self.cookies = 
-            # Stream ID. For promised stream, it is initially -1.
-            self.stream_id = stream_id
-            self.http2 = http2
-            # address of the client
-            self.remote_address = self.http2._get_remote_address()
-            # certificate of the client
-            self._client_certificate = self.http2._get_client_certificate()
-            # :scheme header field in request
-            self.scheme = None
-            # :method header field in request
-            self.method = None
-            # :authority or host header field in request
-            self.host = None
-            # :path header field in request
-            self.path = None
-            # HTTP status
-            self.status = None
-            # True if this is a handler for pushed resource
-            self.pushed = False
-
-        @property
-        def client_address(self):
-            return self.remote_address
-
-        @property
-        def client_certificate(self):
-            return self._client_certificate
-
-        def on_headers(self):
-
-            '''Called when request HEADERS is arrived.
-
-            '''
-            pass
-
-        def on_data(self, data):
-
-            '''Called when a chunk of request body is arrived. This method
-            will be called multiple times until all data are received.
-
-            '''
-            pass
-
-        def on_request_done(self):
-
-            '''Called when whole request was received
-
-            '''
-            pass
-
-        def on_close(self, error_code):
-
-            '''Called when stream is about to close.
-
-            '''
-            pass
-
-        def send_response(self, status=200, headers=None, body=None):
-
-            '''Send response. The status is HTTP status code. The headers is
-            additional response headers. The :status header field is
-            appended by the library. The body is the response body. It
-            could be None if response body is empty. Or it must be
-            instance of either str, bytes, io.IOBase or callable,
-            called body generator, which takes one parameter,
-            size. The body generator generates response body. It can
-            pause generation of response so that it can wait for slow
-            backend data generation. When invoked, it should return
-            tuple, byte string and flag. The flag is either DATA_OK,
-            DATA_EOF and DATA_DEFERRED. For non-empty byte string and
-            it is not the last chunk of response, DATA_OK is returned
-            as flag.  If this is the last chunk of the response (byte
-            string is possibly None), DATA_EOF must be returned as
-            flag.  If there is no data available right now, but
-            additional data are anticipated, return tuple (None,
-            DATA_DEFERRD).  When data arrived, call resume() and
-            restart response body transmission.
-
-            Only the body generator can pause response body
-            generation; instance of io.IOBase must not block.
-
-            If instance of str is specified as body, it is encoded
-            using UTF-8.
-
-            The headers is a list of tuple of the form (name,
-            value). The name and value can be either unicode string or
-            byte string.
-
-            On error, exception will be thrown.
-
-            '''
-            if self.status is not None:
-                raise Exception('response has already been sent')
-
-            if not status:
-                raise Exception('status must not be empty')
-
-            body = wrap_body(body)
-
-            self._set_response_prop(status, headers, body)
-            self.http2.send_response(self)
-
-        def push(self, path, method='GET', request_headers=None,
-                 status=200, headers=None, body=None):
-
-            '''Push a resource. The path is a path portion of request URI
-            for this
-            resource. The method is a method to access this
-            resource. The request_headers is additional request
-            headers to access this resource. The :scheme, :method,
-            :authority and :path are appended by the library. The
-            :scheme and :authority are inherited from the request (not
-            request_headers parameter).
-
-            The status is HTTP status code. The headers is additional
-            response headers. The :status header field is appended by
-            the library. The body is the response body. It has the
-            same semantics of body parameter of send_response().
-
-            The headers and request_headers are a list of tuple of the
-            form (name, value). The name and value can be either
-            unicode string or byte string.
-
-            On error, exception will be thrown.
-
-            '''
-            if not status:
-                raise Exception('status must not be empty')
-
-            if not method:
-                raise Exception('method must not be empty')
-
-            if not path:
-                raise Exception('path must not be empty')
-
-            body = wrap_body(body)
-
-            promised_handler = self.http2._make_handler(-1)
-            promised_handler.pushed = True
-            promised_handler.scheme = self.scheme
-            promised_handler.method = method.encode('utf-8')
-            promised_handler.host = self.host
-            promised_handler.path = path.encode('utf-8')
-            promised_handler._set_response_prop(status, headers, body)
-
-            headers = 
-                (b':method', promised_handler.method),
-                (b':scheme', promised_handler.scheme),
-                (b':authority', promised_handler.host),
-                (b':path', promised_handler.path)
-            
-            headers.extend(_encode_headers(request_headers))
-
-            promised_handler.headers = headers
-
-            return self.http2.push(self, promised_handler)
-
-        def _set_response_prop(self, status, headers, body):
-            self.status = status
-
-            if headers is None:
-                headers = 
-
-            self.response_headers = (b':status', str(status).encode('utf-8'))
-            self.response_headers.extend(_encode_headers(headers))
-
-            self.response_body = body
-
-        def resume(self):
-            self.http2.resume(self.stream_id)
-
-    def _encode_headers(headers):
-        if not headers:
-            return 
-        return (k if isinstance(k, bytes) else k.encode('utf-8'),
-                 v if isinstance(v, bytes) else v.encode('utf-8')) \
-                for k, v in headers
-
-    class _HTTP2Session(asyncio.Protocol):
-
-        def __init__(self, RequestHandlerClass):
-            asyncio.Protocol.__init__(self)
-            self.RequestHandlerClass = RequestHandlerClass
-            self.http2 = None
-
-        def connection_made(self, transport):
-            address = transport.get_extra_info('peername')
-            logging.info('connection_made, address:%s, port:%s', address0, address1)
-
-            self.transport = transport
-            sock = self.transport.get_extra_info('socket')
-            try:
-                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-            except OSError as e:
-                logging.info('failed to set tcp-nodelay: %s', str(e))
-            ssl_ctx = self.transport.get_extra_info('sslcontext')
-            if ssl_ctx:
-                ssl_obj = self.transport.get_extra_info('ssl_object')
-                protocol = negotiated_protocol(ssl_obj)
-                if protocol is None or protocol.encode('utf-8') != \
-                   cnghttp2.NGHTTP2_PROTO_VERSION_ID:
-                    self.transport.abort()
-                    return
-            try:
-                self.http2 = _HTTP2SessionCore\
-                             (self.transport,
-                              self.RequestHandlerClass)
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.abort()
-                return
-
-
-        def connection_lost(self, exc):
-            logging.info('connection_lost')
-            if self.http2:
-                self.http2.connection_lost()
-                self.http2 = None
-
-        def data_received(self, data):
-            try:
-                self.http2.data_received(data)
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def resume_writing(self):
-            try:
-                self.http2.send_data()
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-    class HTTP2Server:
-
-        '''HTTP/2 server.
-
-        This class builds on top of the asyncio event loop. On
-        construction, RequestHandlerClass must be given, which must be a
-        subclass of BaseRequestHandler class.
-
-        '''
-        def __init__(self, address, RequestHandlerClass, ssl=None):
-
-            '''address is a tuple of the listening address and port (e.g.,
-            ('127.0.0.1', 8080)). RequestHandlerClass must be a subclass
-            of BaseRequestHandler class to handle a HTTP/2 stream.  The
-            ssl can be ssl.SSLContext instance. If it is not None, the
-            resulting server is SSL/TLS capable.
-
-            '''
-            def session_factory():
-                return _HTTP2Session(RequestHandlerClass)
-
-            self.loop = asyncio.get_event_loop()
-
-            if ssl:
-                set_application_protocol(ssl)
-
-            coro = self.loop.create_server(session_factory,
-                                           host=address0, port=address1,
-                                           ssl=ssl)
-            self.server = self.loop.run_until_complete(coro)
-            logging.info('listen, address:%s, port:%s', address0, address1)
-
-        def serve_forever(self):
-            try:
-                self.loop.run_forever()
-            finally:
-                self.server.close()
-                self.loop.close()
-
-
-
-    class BaseResponseHandler:
-
-        """HTTP/2 response (stream) handler base class.
-
-        The class is used to handle the HTTP/2 stream. By default, it does
-        not nothing. It must be subclassed to handle each event callback
-        method.
-
-        The first callback method invoked is on_headers(). It is called
-        when HEADERS frame, which includes response header fields, is
-        arrived.
-
-        If response has a body, on_data(data) is invoked for each
-        chunk of received data.
-
-        When whole response is received, on_response_done() is invoked.
-
-        When stream is closed or underlying connection is lost,
-        on_close(error_code) is called.
-
-        The application can send follow up requests using HTTP2Client.send_request() method.
-
-        The application can handle push resource using on_push_promise() method.
-
-        The following instance variables are available:
-
-        server_address
-          Contains a tuple of the form (host, port) referring to the server's
-          address.
-
-        stream_id
-          Stream ID of this stream
-
-        scheme
-          Scheme of the request URI. This is a value of :scheme header field.
-
-        method
-          Method of this stream. This is a value of :method header field.
-
-        host
-          This is a value of :authority or host header field.
-
-        path
-          This is a value of :path header field.
-
-        headers
-          Response header fields.  There is a special exception.  If this
-          object is passed to push_promise(), this instance variable contains
-          pushed request header fields.
-
-        """
-
-        def __init__(self, http2=None, stream_id=-1):
-            self.headers = 
-            self.cookies = 
-            # Stream ID. For promised stream, it is initially -1.
-            self.stream_id = stream_id
-            self.http2 = http2
-            # address of the server
-            self.remote_address = None
-            # :scheme header field in request
-            self.scheme = None
-            # :method header field in request
-            self.method = None
-            # :authority or host header field in request
-            self.host = None
-            # :path header field in request
-            self.path = None
-            # HTTP status
-            self.status = None
-            # True if this is a handler for pushed resource
-            self.pushed = False
-
-        @property
-        def server_address(self):
-            return self.remote_address
-
-        def on_headers(self):
-
-            '''Called when response HEADERS is arrived.
-
-            '''
-            pass
-
-        def on_data(self, data):
-
-            '''Called when a chunk of response body is arrived. This method
-            will be called multiple times until all data are received.
-
-            '''
-            pass
-
-        def on_response_done(self):
-
-            '''Called when whole response was received
-
-            '''
-            pass
-
-        def on_close(self, error_code):
-
-            '''Called when stream is about to close.
-
-            '''
-            pass
-
-        def on_push_promise(self, push_promise):
-
-            '''Called when a push is promised. Default behavior is to
-            cancel the push. If application overrides this method,
-            it should call either accept_push or reject_push.
-
-            '''
-            self.reject_push(push_promise)
-
-        def reject_push(self, push_promise):
-
-            '''Convenience method equivalent to calling accept_push
-            with a falsy value.
-
-            '''
-            self.http2.push(push_promise, None)
-
-        def accept_push(self, push_promise, handler=None):
-
-            '''Accept a push_promise and provider a handler for the
-            new stream. If a falsy value is supplied for the handler,
-            the push is rejected.
-
-            '''
-            self.http2.push(push_promise, handler)
-
-        def resume(self):
-            self.http2.resume(self.stream_id)
-
-    class _HTTP2ClientSession(asyncio.Protocol):
-
-        def __init__(self, client):
-            asyncio.Protocol.__init__(self)
-            self.http2 = None
-            self.pending = 
-            self.client = client
-
-        def connection_made(self, transport):
-            address = transport.get_extra_info('peername')
-            logging.info('connection_made, address:%s, port:%s', address0, address1)
-
-            self.transport = transport
-            sock = self.transport.get_extra_info('socket')
-            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-            ssl_ctx = self.transport.get_extra_info('sslcontext')
-            if ssl_ctx:
-                ssl_obj = self.transport.get_extra_info('ssl_object')
-                protocol = negotiated_protocol(ssl_obj)
-                if protocol is None or protocol.encode('utf-8') != \
-                   cnghttp2.NGHTTP2_PROTO_VERSION_ID:
-                    self.transport.abort()
-
-            self.http2 = _HTTP2ClientSessionCore(self.transport)
-
-	    # Clear pending requests
-            send_pending = self.pending
-            self.pending = 
-            for method,scheme,host,path,headers,body,handler in send_pending:
-                self.send_request(method=method, scheme=scheme, host=host, path=path,\
-                                  headers=headers, body=body, handler=handler)
-            self.http2.send_data()
-
-        def connection_lost(self, exc):
-            logging.info('connection_lost')
-            if self.http2:
-                self.http2 = None
-            self.client.close()
-
-        def data_received(self, data):
-            try:
-                self.http2.data_received(data)
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def resume_writing(self):
-            try:
-                self.http2.send_data()
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def send_request(self, method, scheme, host, path, headers, body, handler):
-            try:
-		# Waiting until connection established
-                if not self.http2:
-                    self.pending.append(method, scheme, host, path, headers, body, handler)
-                    return
-
-                self.http2.send_request(method=method, scheme=scheme, host=host, path=path,\
-                                        headers=headers, body=body, handler=handler)
-                self.http2.send_data()
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def close(self):
-            if self.http2:
-                self.http2.close()
-
-
-    class HTTP2Client:
-
-        '''HTTP/2 client.
-
-        This class builds on top of the asyncio event loop.
-
-        '''
-        def __init__(self, address, loop=None, ssl=None):
-
-            '''address is a tuple of the connect address and port (e.g.,
-            ('127.0.0.1', 8080)). The ssl can be ssl.SSLContext instance.
-            If it is not None, the resulting client is SSL/TLS capable.
-            '''
-
-            self.address = address
-            self.session = _HTTP2ClientSession(self)
-            def session_factory():
-                return self.session
-
-            if ssl:
-                set_application_protocol(ssl)
-
-            self.loop = loop
-            if not self.loop:
-                self.loop = asyncio.get_event_loop()
-
-            coro = self.loop.create_connection(session_factory,
-                                           host=address0, port=address1,
-                                           ssl=ssl)
-
-            if ssl:
-                self.scheme = 'https'
-            else:
-                self.scheme = 'http'
-
-            self.transport,_ = self.loop.run_until_complete(coro)
-            logging.info('connect, address:%s, port:%s', self.address0, self.address1)
-
-        @property
-        def io_loop(self):
-            return self.loop
-
-        def close(self):
-            self.session.close()
-
-        def send_request(self, method='GET', url='/', headers=None, body=None, handler=None):
-            url = urlparse(url)
-            scheme = url.scheme if url.scheme else self.scheme
-            host = url.netloc if url.netloc else self.address0+':'+str(self.address1)
-            path = url.path
-            if url.params:
-                path += ';'+url.params
-            if url.query:
-                path += '?'+url.query
-            if url.fragment:
-                path += '#'+url.fragment
-
-            self.session.send_request(method=method, scheme=scheme, host=host, path=path,\
-                                      headers=headers, body=body, handler=handler)

_service:tar_scm:nghttp2-1.46.0.tar.xz/python/setup.py.in Deleted

@@ -1,46 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 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.
-
-from setuptools import setup, Extension
-
-LIBS = 'nghttp2'
-
-setup(
-    name = 'python-nghttp2',
-    description = 'Python HTTP/2 library on top of nghttp2',
-    author = 'Tatsuhiro Tsujikawa',
-    version = '@PACKAGE_VERSION@',
-    author_email = 'tatsuhiro.t@gmail.com',
-    url = 'https://nghttp2.org/',
-    keywords = ,
-    ext_modules = Extension("nghttp2",
-                             "nghttp2.c",
-                             include_dirs='@top_srcdir@/lib',
-                                           '@top_srcdir@/lib/includes',
-                                           '@top_builddir@/lib/includes',
-                             library_dirs='@top_builddir@/lib/.libs',
-                                           '@top_builddir@/lib',
-                                           '@top_builddir@',
-                             libraries=LIBS),
-    long_description='TBD'
-    )

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_request.cc Deleted

@@ -1,67 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "asio_client_request_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-request::request() : impl_(std::make_unique<request_impl>()) {}
-
-request::~request() {}
-
-void request::write_trailer(header_map h) const {
-  impl_->write_trailer(std::move(h));
-}
-
-void request::cancel(uint32_t error_code) const { impl_->cancel(error_code); }
-
-void request::on_response(response_cb cb) const {
-  impl_->on_response(std::move(cb));
-}
-
-void request::on_push(request_cb cb) const { impl_->on_push(std::move(cb)); }
-
-void request::on_close(close_cb cb) const { impl_->on_close(std::move(cb)); }
-
-const uri_ref &request::uri() const { return impl_->uri(); }
-
-const std::string &request::method() const { return impl_->method(); }
-
-const header_map &request::header() const { return impl_->header(); }
-
-void request::resume() const { impl_->resume(); }
-
-request_impl &request::impl() const { return *impl_; }
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_request_impl.cc Deleted

@@ -1,116 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_client_request_impl.h"
-
-#include "asio_client_stream.h"
-#include "asio_client_session_impl.h"
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-request_impl::request_impl() : strm_(nullptr), header_buffer_size_(0) {}
-
-void request_impl::write_trailer(header_map h) {
-  auto sess = strm_->session();
-  sess->write_trailer(*strm_, std::move(h));
-}
-
-void request_impl::cancel(uint32_t error_code) {
-  auto sess = strm_->session();
-  sess->cancel(*strm_, error_code);
-}
-
-void request_impl::on_response(response_cb cb) { response_cb_ = std::move(cb); }
-
-void request_impl::call_on_response(response &res) {
-  if (response_cb_) {
-    response_cb_(res);
-  }
-}
-
-void request_impl::on_push(request_cb cb) { push_request_cb_ = std::move(cb); }
-
-void request_impl::call_on_push(request &push_req) {
-  if (push_request_cb_) {
-    push_request_cb_(push_req);
-  }
-};
-
-void request_impl::on_close(close_cb cb) { close_cb_ = std::move(cb); }
-
-void request_impl::call_on_close(uint32_t error_code) {
-  if (close_cb_) {
-    close_cb_(error_code);
-  }
-}
-
-void request_impl::on_read(generator_cb cb) { generator_cb_ = std::move(cb); }
-
-generator_cb::result_type request_impl::call_on_read(uint8_t *buf,
-                                                     std::size_t len,
-                                                     uint32_t *data_flags) {
-  if (generator_cb_) {
-    return generator_cb_(buf, len, data_flags);
-  }
-
-  *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-
-  return 0;
-}
-
-void request_impl::resume() {
-  auto sess = strm_->session();
-  sess->resume(*strm_);
-}
-
-void request_impl::header(header_map h) { header_ = std::move(h); }
-
-header_map &request_impl::header() { return header_; }
-
-const header_map &request_impl::header() const { return header_; }
-
-void request_impl::stream(class stream *strm) { strm_ = strm; }
-
-void request_impl::uri(uri_ref uri) { uri_ = std::move(uri); }
-
-const uri_ref &request_impl::uri() const { return uri_; }
-
-uri_ref &request_impl::uri() { return uri_; }
-
-void request_impl::method(std::string s) { method_ = std::move(s); }
-
-const std::string &request_impl::method() const { return method_; }
-
-size_t request_impl::header_buffer_size() const { return header_buffer_size_; }
-
-void request_impl::update_header_buffer_size(size_t len) {
-  header_buffer_size_ += len;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_request_impl.h Deleted

@@ -1,97 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_CLIENT_REQUEST_IMPL_H
-#define ASIO_CLIENT_REQUEST_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class response;
-class stream;
-
-class request_impl {
-public:
-  request_impl();
-
-  request_impl(const request_impl &) = delete;
-  request_impl &operator=(const request_impl &) = delete;
-
-  void write_trailer(header_map h);
-
-  void cancel(uint32_t error_code);
-
-  void on_response(response_cb cb);
-  void call_on_response(response &res);
-
-  void on_push(request_cb cb);
-  void call_on_push(request &push_req);
-
-  void on_close(close_cb cb);
-  void call_on_close(uint32_t error_code);
-
-  void on_read(generator_cb cb);
-  generator_cb::result_type call_on_read(uint8_t *buf, std::size_t len,
-                                         uint32_t *data_flags);
-
-  void resume();
-
-  void header(header_map h);
-  header_map &header();
-  const header_map &header() const;
-
-  void stream(class stream *strm);
-
-  void uri(uri_ref uri);
-  const uri_ref &uri() const;
-  uri_ref &uri();
-
-  void method(std::string s);
-  const std::string &method() const;
-
-  size_t header_buffer_size() const;
-  void update_header_buffer_size(size_t len);
-
-private:
-  header_map header_;
-  response_cb response_cb_;
-  request_cb push_request_cb_;
-  close_cb close_cb_;
-  generator_cb generator_cb_;
-  class stream *strm_;
-  uri_ref uri_;
-  std::string method_;
-  size_t header_buffer_size_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_REQUEST_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_response.cc Deleted

@@ -1,53 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "asio_client_response_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-response::response() : impl_(std::make_unique<response_impl>()) {}
-
-response::~response() {}
-
-void response::on_data(data_cb cb) const { impl_->on_data(std::move(cb)); }
-
-int response::status_code() const { return impl_->status_code(); }
-
-int64_t response::content_length() const { return impl_->content_length(); }
-
-const header_map &response::header() const { return impl_->header(); }
-
-response_impl &response::impl() const { return *impl_; }
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_response_impl.cc Deleted

@@ -1,64 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_client_response_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-response_impl::response_impl()
-    : content_length_(-1), header_buffer_size_(0), status_code_(0) {}
-
-void response_impl::on_data(data_cb cb) { data_cb_ = std::move(cb); }
-
-void response_impl::call_on_data(const uint8_t *data, std::size_t len) {
-  if (data_cb_) {
-    data_cb_(data, len);
-  }
-}
-
-void response_impl::status_code(int sc) { status_code_ = sc; }
-
-int response_impl::status_code() const { return status_code_; }
-
-void response_impl::content_length(int64_t n) { content_length_ = n; }
-
-int64_t response_impl::content_length() const { return content_length_; }
-
-header_map &response_impl::header() { return header_; }
-
-const header_map &response_impl::header() const { return header_; }
-
-size_t response_impl::header_buffer_size() const { return header_buffer_size_; }
-
-void response_impl::update_header_buffer_size(size_t len) {
-  header_buffer_size_ += len;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_response_impl.h Deleted

@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_CLIENT_RESPONSE_IMPL_H
-#define ASIO_CLIENT_RESPONSE_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class response_impl {
-public:
-  response_impl();
-
-  response_impl(const response_impl &) = delete;
-  response_impl &operator=(const response_impl &) = delete;
-
-  void on_data(data_cb cb);
-
-  void call_on_data(const uint8_t *data, std::size_t len);
-
-  void status_code(int sc);
-  int status_code() const;
-
-  void content_length(int64_t n);
-  int64_t content_length() const;
-
-  header_map &header();
-  const header_map &header() const;
-
-  size_t header_buffer_size() const;
-  void update_header_buffer_size(size_t len);
-
-private:
-  data_cb data_cb_;
-
-  header_map header_;
-
-  int64_t content_length_;
-  size_t header_buffer_size_;
-  int status_code_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_RESPONSE_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_session.cc Deleted

@@ -1,161 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "asio_client_session_tcp_impl.h"
-#include "asio_client_session_tls_impl.h"
-#include "asio_common.h"
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-using boost::asio::ip::tcp;
-
-session::session(boost::asio::io_service &io_service, const std::string &host,
-                 const std::string &service)
-    : impl_(std::make_shared<session_tcp_impl>(
-          io_service, host, service, boost::posix_time::seconds(60))) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 const boost::asio::ip::tcp::endpoint &local_endpoint,
-                 const std::string &host, const std::string &service)
-    : impl_(std::make_shared<session_tcp_impl>(
-          io_service, local_endpoint, host, service,
-          boost::posix_time::seconds(60))) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service, const std::string &host,
-                 const std::string &service,
-                 const boost::posix_time::time_duration &connect_timeout)
-    : impl_(std::make_shared<session_tcp_impl>(io_service, host, service,
-                                               connect_timeout)) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 const boost::asio::ip::tcp::endpoint &local_endpoint,
-                 const std::string &host, const std::string &service,
-                 const boost::posix_time::time_duration &connect_timeout)
-    : impl_(std::make_shared<session_tcp_impl>(io_service, local_endpoint, host,
-                                               service, connect_timeout)) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 boost::asio::ssl::context &tls_ctx, const std::string &host,
-                 const std::string &service)
-    : impl_(std::make_shared<session_tls_impl>(
-          io_service, tls_ctx, host, service, boost::posix_time::seconds(60))) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 boost::asio::ssl::context &tls_ctx, const std::string &host,
-                 const std::string &service,
-                 const boost::posix_time::time_duration &connect_timeout)
-    : impl_(std::make_shared<session_tls_impl>(io_service, tls_ctx, host,
-                                               service, connect_timeout)) {
-  impl_->start_resolve(host, service);
-}
-
-session::~session() {}
-
-session::session(session &&other) noexcept : impl_(std::move(other.impl_)) {}
-
-session &session::operator=(session &&other) noexcept {
-  if (this == &other) {
-    return *this;
-  }
-
-  impl_ = std::move(other.impl_);
-  return *this;
-}
-
-void session::on_connect(connect_cb cb) const {
-  impl_->on_connect(std::move(cb));
-}
-
-void session::on_error(error_cb cb) const { impl_->on_error(std::move(cb)); }
-
-void session::shutdown() const { impl_->shutdown(); }
-
-boost::asio::io_service &session::io_service() const {
-  return impl_->io_service();
-}
-
-const request *session::submit(boost::system::error_code &ec,
-                               const std::string &method,
-                               const std::string &uri, header_map h,
-                               priority_spec prio) const {
-  return impl_->submit(ec, method, uri, generator_cb(), std::move(h),
-                       std::move(prio));
-}
-
-const request *session::submit(boost::system::error_code &ec,
-                               const std::string &method,
-                               const std::string &uri, std::string data,
-                               header_map h, priority_spec prio) const {
-  return impl_->submit(ec, method, uri, string_generator(std::move(data)),
-                       std::move(h), std::move(prio));
-}
-
-const request *session::submit(boost::system::error_code &ec,
-                               const std::string &method,
-                               const std::string &uri, generator_cb cb,
-                               header_map h, priority_spec prio) const {
-  return impl_->submit(ec, method, uri, std::move(cb), std::move(h),
-                       std::move(prio));
-}
-
-void session::read_timeout(const boost::posix_time::time_duration &t) {
-  impl_->read_timeout(t);
-}
-
-priority_spec::priority_spec(const int32_t stream_id, const int32_t weight,
-                             const bool exclusive)
-    : valid_(true) {
-  nghttp2_priority_spec_init(&spec_, stream_id, weight, exclusive);
-}
-
-const nghttp2_priority_spec *priority_spec::get() const {
-  if (!valid_) {
-    return nullptr;
-  }
-
-  return &spec_;
-}
-
-bool priority_spec::valid() const { return valid_; }
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_session_impl.cc Deleted

@@ -1,759 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_client_session_impl.h"
-
-#include <iostream>
-
-#include "asio_client_stream.h"
-#include "asio_client_request_impl.h"
-#include "asio_client_response_impl.h"
-#include "asio_common.h"
-#include "template.h"
-#include "util.h"
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-session_impl::session_impl(
-    boost::asio::io_service &io_service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : wblen_(0),
-      io_service_(io_service),
-      resolver_(io_service),
-      deadline_(io_service),
-      connect_timeout_(connect_timeout),
-      read_timeout_(boost::posix_time::seconds(60)),
-      ping_(io_service),
-      session_(nullptr),
-      data_pending_(nullptr),
-      data_pendinglen_(0),
-      writing_(false),
-      inside_callback_(false),
-      stopped_(false) {}
-
-session_impl::~session_impl() {
-  // finish up all active stream
-  for (auto &p : streams_) {
-    auto &strm = p.second;
-    auto &req = strm->request().impl();
-    req.call_on_close(NGHTTP2_INTERNAL_ERROR);
-  }
-
-  nghttp2_session_del(session_);
-}
-
-void session_impl::start_resolve(const std::string &host,
-                                 const std::string &service) {
-  deadline_.expires_from_now(connect_timeout_);
-
-  auto self = shared_from_this();
-
-  resolver_.async_resolve({host, service},
-                          self(const boost::system::error_code &ec,
-                                 tcp::resolver::iterator endpoint_it) {
-                            if (ec) {
-                              self->not_connected(ec);
-                              return;
-                            }
-
-                            self->start_connect(endpoint_it);
-                          });
-
-  deadline_.async_wait(std::bind(&session_impl::handle_deadline, self));
-}
-
-void session_impl::handle_deadline() {
-  if (stopped_) {
-    return;
-  }
-
-  if (deadline_.expires_at() <=
-      boost::asio::deadline_timer::traits_type::now()) {
-    call_error_cb(boost::asio::error::timed_out);
-    stop();
-    deadline_.expires_at(boost::posix_time::pos_infin);
-    return;
-  }
-
-  deadline_.async_wait(
-      std::bind(&session_impl::handle_deadline, this->shared_from_this()));
-}
-
-void handle_ping2(const boost::system::error_code &ec, int) {}
-
-void session_impl::start_ping() {
-  ping_.expires_from_now(boost::posix_time::seconds(30));
-  ping_.async_wait(std::bind(&session_impl::handle_ping, shared_from_this(),
-                             std::placeholders::_1));
-}
-
-void session_impl::handle_ping(const boost::system::error_code &ec) {
-  if (stopped_ || ec == boost::asio::error::operation_aborted ||
-      !streams_.empty()) {
-    return;
-  }
-
-  nghttp2_submit_ping(session_, NGHTTP2_FLAG_NONE, nullptr);
-
-  signal_write();
-
-  start_ping();
-}
-
-void session_impl::connected(tcp::resolver::iterator endpoint_it) {
-  if (!setup_session()) {
-    return;
-  }
-
-  socket().set_option(boost::asio::ip::tcp::no_delay(true));
-
-  do_write();
-  do_read();
-
-  start_ping();
-
-  auto &connect_cb = on_connect();
-  if (connect_cb) {
-    connect_cb(endpoint_it);
-  }
-}
-
-void session_impl::not_connected(const boost::system::error_code &ec) {
-  call_error_cb(ec);
-  stop();
-}
-
-void session_impl::on_connect(connect_cb cb) { connect_cb_ = std::move(cb); }
-
-void session_impl::on_error(error_cb cb) { error_cb_ = std::move(cb); }
-
-const connect_cb &session_impl::on_connect() const { return connect_cb_; }
-
-const error_cb &session_impl::on_error() const { return error_cb_; }
-
-void session_impl::call_error_cb(const boost::system::error_code &ec) {
-  if (stopped_) {
-    return;
-  }
-  auto &error_cb = on_error();
-  if (!error_cb) {
-    return;
-  }
-  error_cb(ec);
-}
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  if (frame->hd.type != NGHTTP2_PUSH_PROMISE) {
-    return 0;
-  }
-
-  auto sess = static_cast<session_impl *>(user_data);
-  sess->create_push_stream(frame->push_promise.promised_stream_id);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_header_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                       const uint8_t *name, size_t namelen,
-                       const uint8_t *value, size_t valuelen, uint8_t flags,
-                       void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  stream *strm;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS: {
-    strm = sess->find_stream(frame->hd.stream_id);
-    if (!strm) {
-      return 0;
-    }
-
-    // ignore trailers
-    if (frame->headers.cat == NGHTTP2_HCAT_HEADERS &&
-        !strm->expect_final_response()) {
-      return 0;
-    }
-
-    auto token = http2::lookup_token(name, namelen);
-
-    auto &res = strm->response().impl();
-    if (token == http2::HD__STATUS) {
-      res.status_code(util::parse_uint(value, valuelen));
-    } else {
-      if (res.header_buffer_size() + namelen + valuelen > 64_k) {
-        nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                  frame->hd.stream_id, NGHTTP2_INTERNAL_ERROR);
-        break;
-      }
-      res.update_header_buffer_size(namelen + valuelen);
-
-      if (token == http2::HD_CONTENT_LENGTH) {
-        res.content_length(util::parse_uint(value, valuelen));
-      }
-
-      res.header().emplace(
-          std::string(name, name + namelen),
-          header_value{std::string(value, value + valuelen),
-                       (flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0});
-    }
-    break;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    strm = sess->find_stream(frame->push_promise.promised_stream_id);
-    if (!strm) {
-      return 0;
-    }
-
-    auto &req = strm->request().impl();
-    auto &uri = req.uri();
-
-    switch (http2::lookup_token(name, namelen)) {
-    case http2::HD__METHOD:
-      req.method(std::string(value, value + valuelen));
-      break;
-    case http2::HD__SCHEME:
-      uri.scheme.assign(value, value + valuelen);
-      break;
-    case http2::HD__PATH:
-      split_path(uri, value, value + valuelen);
-      break;
-    case http2::HD__AUTHORITY:
-      uri.host.assign(value, value + valuelen);
-      break;
-    case http2::HD_HOST:
-      if (uri.host.empty()) {
-        uri.host.assign(value, value + valuelen);
-      }
-    // fall through
-    default:
-      if (req.header_buffer_size() + namelen + valuelen > 64_k) {
-        nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                  frame->hd.stream_id, NGHTTP2_INTERNAL_ERROR);
-        break;
-      }
-      req.update_header_buffer_size(namelen + valuelen);
-
-      req.header().emplace(
-          std::string(name, name + namelen),
-          header_value{std::string(value, value + valuelen),
-                       (flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0});
-    }
-
-    break;
-  }
-  default:
-    return 0;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  auto strm = sess->find_stream(frame->hd.stream_id);
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA: {
-    if (!strm) {
-      return 0;
-    }
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->response().impl().call_on_data(nullptr, 0);
-    }
-    break;
-  }
-  case NGHTTP2_HEADERS: {
-    if (!strm) {
-      return 0;
-    }
-
-    // ignore trailers
-    if (frame->headers.cat == NGHTTP2_HCAT_HEADERS &&
-        !strm->expect_final_response()) {
-      return 0;
-    }
-
-    if (strm->expect_final_response()) {
-      // wait for final response
-      return 0;
-    }
-
-    auto &req = strm->request().impl();
-    req.call_on_response(strm->response());
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->response().impl().call_on_data(nullptr, 0);
-    }
-    break;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    if (!strm) {
-      return 0;
-    }
-
-    auto push_strm = sess->find_stream(frame->push_promise.promised_stream_id);
-    if (!push_strm) {
-      return 0;
-    }
-
-    strm->request().impl().call_on_push(push_strm->request());
-
-    break;
-  }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  auto strm = sess->find_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  auto &res = strm->response().impl();
-  res.call_on_data(data, len);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  auto strm = sess->pop_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  strm->request().impl().call_on_close(error_code);
-
-  return 0;
-}
-} // namespace
-
-bool session_impl::setup_session() {
-  nghttp2_session_callbacks *callbacks;
-  nghttp2_session_callbacks_new(&callbacks);
-  auto cb_del = defer(nghttp2_session_callbacks_del, callbacks);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  auto rv = nghttp2_session_client_new(&session_, callbacks, this);
-  if (rv != 0) {
-    call_error_cb(make_error_code(static_cast<nghttp2_error>(rv)));
-    return false;
-  }
-
-  const uint32_t window_size = 256_m;
-
-  std::array<nghttp2_settings_entry, 2> iv{
-      {{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100},
-       // typically client is just a *sink* and just process data as
-       // much as possible.  Use large window size by default.
-       {NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, window_size}}};
-  nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, iv.data(), iv.size());
-  // increase connection window size up to window_size
-  nghttp2_session_set_local_window_size(session_, NGHTTP2_FLAG_NONE, 0,
-                                        window_size);
-  return true;
-}
-
-int session_impl::write_trailer(stream &strm, header_map h) {
-  int rv;
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(h.size());
-  for (auto &hd : h) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  rv = nghttp2_submit_trailer(session_, strm.stream_id(), nva.data(),
-                              nva.size());
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-void session_impl::cancel(stream &strm, uint32_t error_code) {
-  if (stopped_) {
-    return;
-  }
-
-  nghttp2_submit_rst_stream(session_, NGHTTP2_FLAG_NONE, strm.stream_id(),
-                            error_code);
-  signal_write();
-}
-
-void session_impl::resume(stream &strm) {
-  if (stopped_) {
-    return;
-  }
-
-  nghttp2_session_resume_data(session_, strm.stream_id());
-  signal_write();
-}
-
-stream *session_impl::find_stream(int32_t stream_id) {
-  auto it = streams_.find(stream_id);
-  if (it == std::end(streams_)) {
-    return nullptr;
-  }
-  return (*it).second.get();
-}
-
-std::unique_ptr<stream> session_impl::pop_stream(int32_t stream_id) {
-  auto it = streams_.find(stream_id);
-  if (it == std::end(streams_)) {
-    return nullptr;
-  }
-  auto strm = std::move((*it).second);
-  streams_.erase(it);
-  if (streams_.empty()) {
-    start_ping();
-  }
-  return strm;
-}
-
-stream *session_impl::create_push_stream(int32_t stream_id) {
-  auto strm = create_stream();
-  strm->stream_id(stream_id);
-  auto p = streams_.emplace(stream_id, std::move(strm));
-  assert(p.second);
-  ping_.cancel();
-  return (*p.first).second.get();
-}
-
-std::unique_ptr<stream> session_impl::create_stream() {
-  return std::make_unique<stream>(this);
-}
-
-const request *session_impl::submit(boost::system::error_code &ec,
-                                    const std::string &method,
-                                    const std::string &uri, generator_cb cb,
-                                    header_map h, priority_spec prio) {
-  ec.clear();
-
-  if (stopped_) {
-    ec = make_error_code(static_cast<nghttp2_error>(NGHTTP2_INTERNAL_ERROR));
-    return nullptr;
-  }
-
-  http_parser_url u{};
-  // TODO Handle CONNECT method
-  if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return nullptr;
-  }
-
-  if ((u.field_set & (1 << UF_SCHEMA)) == 0 ||
-      (u.field_set & (1 << UF_HOST)) == 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return nullptr;
-  }
-
-  auto strm = create_stream();
-  auto &req = strm->request().impl();
-  auto &uref = req.uri();
-
-  http2::copy_url_component(uref.scheme, &u, UF_SCHEMA, uri.c_str());
-  http2::copy_url_component(uref.host, &u, UF_HOST, uri.c_str());
-  http2::copy_url_component(uref.raw_path, &u, UF_PATH, uri.c_str());
-  http2::copy_url_component(uref.raw_query, &u, UF_QUERY, uri.c_str());
-
-  if (util::ipv6_numeric_addr(uref.host.c_str())) {
-    uref.host = "" + uref.host;
-    uref.host += '';
-  }
-  if (u.field_set & (1 << UF_PORT)) {
-    uref.host += ':';
-    uref.host += util::utos(u.port);
-  }
-
-  if (uref.raw_path.empty()) {
-    uref.raw_path = "/";
-  }
-
-  uref.path = percent_decode(uref.raw_path);
-
-  auto path = uref.raw_path;
-  if (u.field_set & (1 << UF_QUERY)) {
-    path += '?';
-    path += uref.raw_query;
-  }
-
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(4 + h.size());
-  nva.push_back(http2::make_nv_ls(":method", method));
-  nva.push_back(http2::make_nv_ls(":scheme", uref.scheme));
-  nva.push_back(http2::make_nv_ls(":path", path));
-  nva.push_back(http2::make_nv_ls(":authority", uref.host));
-  for (auto &kv : h) {
-    nva.push_back(
-        http2::make_nv(kv.first, kv.second.value, kv.second.sensitive));
-  }
-
-  req.header(std::move(h));
-
-  nghttp2_data_provider *prdptr = nullptr;
-  nghttp2_data_provider prd;
-
-  if (cb) {
-    strm->request().impl().on_read(std::move(cb));
-    prd.source.ptr = strm.get();
-    prd.read_callback = (nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, uint32_t *data_flags,
-                           nghttp2_data_source *source,
-                           void *user_data) -> ssize_t {
-      auto strm = static_cast<stream *>(source->ptr);
-      return strm->request().impl().call_on_read(buf, length, data_flags);
-    };
-    prdptr = &prd;
-  }
-
-  auto stream_id = nghttp2_submit_request(session_, prio.get(), nva.data(),
-                                          nva.size(), prdptr, strm.get());
-  if (stream_id < 0) {
-    ec = make_error_code(static_cast<nghttp2_error>(stream_id));
-    return nullptr;
-  }
-
-  signal_write();
-
-  strm->stream_id(stream_id);
-
-  auto p = streams_.emplace(stream_id, std::move(strm));
-  assert(p.second);
-  ping_.cancel();
-  return &(*p.first).second->request();
-}
-
-void session_impl::shutdown() {
-  if (stopped_) {
-    return;
-  }
-
-  nghttp2_session_terminate_session(session_, NGHTTP2_NO_ERROR);
-  signal_write();
-}
-
-boost::asio::io_service &session_impl::io_service() { return io_service_; }
-
-void session_impl::signal_write() {
-  if (!inside_callback_) {
-    do_write();
-  }
-}
-
-bool session_impl::should_stop() const {
-  return !writing_ && !nghttp2_session_want_read(session_) &&
-         !nghttp2_session_want_write(session_);
-}
-
-namespace {
-struct callback_guard {
-  callback_guard(session_impl &sess) : sess(sess) { sess.enter_callback(); }
-  ~callback_guard() { sess.leave_callback(); }
-
-  session_impl &sess;
-};
-} // namespace
-
-void session_impl::enter_callback() {
-  assert(!inside_callback_);
-  inside_callback_ = true;
-}
-
-void session_impl::leave_callback() {
-  assert(inside_callback_);
-  inside_callback_ = false;
-}
-
-void session_impl::do_read() {
-  if (stopped_) {
-    return;
-  }
-
-  deadline_.expires_from_now(read_timeout_);
-
-  auto self = this->shared_from_this();
-
-  read_socket(self(const boost::system::error_code &ec,
-                     std::size_t bytes_transferred) {
-    if (ec) {
-      if (!self->should_stop()) {
-        self->call_error_cb(ec);
-      }
-      self->stop();
-      return;
-    }
-
-    {
-      callback_guard cg(*self);
-
-      auto rv = nghttp2_session_mem_recv(self->session_, self->rb_.data(),
-                                         bytes_transferred);
-
-      if (rv != static_cast<ssize_t>(bytes_transferred)) {
-        self->call_error_cb(make_error_code(
-            static_cast<nghttp2_error>(rv < 0 ? rv : NGHTTP2_ERR_PROTO)));
-        self->stop();
-        return;
-      }
-    }
-
-    self->do_write();
-
-    if (self->should_stop()) {
-      self->stop();
-      return;
-    }
-
-    self->do_read();
-  });
-}
-
-void session_impl::do_write() {
-  if (stopped_) {
-    return;
-  }
-
-  if (writing_) {
-    return;
-  }
-
-  if (data_pending_) {
-    std::copy_n(data_pending_, data_pendinglen_, std::begin(wb_) + wblen_);
-
-    wblen_ += data_pendinglen_;
-
-    data_pending_ = nullptr;
-    data_pendinglen_ = 0;
-  }
-
-  {
-    callback_guard cg(*this);
-
-    for (;;) {
-      const uint8_t *data;
-      auto n = nghttp2_session_mem_send(session_, &data);
-      if (n < 0) {
-        call_error_cb(make_error_code(static_cast<nghttp2_error>(n)));
-        stop();
-        return;
-      }
-
-      if (n == 0) {
-        break;
-      }
-
-      if (wblen_ + n > wb_.size()) {
-        data_pending_ = data;
-        data_pendinglen_ = n;
-
-        break;
-      }
-
-      std::copy_n(data, n, std::begin(wb_) + wblen_);
-
-      wblen_ += n;
-    }
-  }
-
-  if (wblen_ == 0) {
-    if (should_stop()) {
-      stop();
-    }
-    return;
-  }
-
-  writing_ = true;
-
-  // Reset read deadline here, because normally client is sending
-  // something, it does not expect timeout while doing it.
-  deadline_.expires_from_now(read_timeout_);
-
-  auto self = this->shared_from_this();
-
-  write_socket(self(const boost::system::error_code &ec, std::size_t n) {
-    if (ec) {
-      self->call_error_cb(ec);
-      self->stop();
-      return;
-    }
-
-    self->wblen_ = 0;
-    self->writing_ = false;
-
-    self->do_write();
-  });
-}
-
-void session_impl::stop() {
-  if (stopped_) {
-    return;
-  }
-
-  shutdown_socket();
-  deadline_.cancel();
-  ping_.cancel();
-  stopped_ = true;
-}
-
-bool session_impl::stopped() const { return stopped_; }
-
-void session_impl::read_timeout(const boost::posix_time::time_duration &t) {
-  read_timeout_ = t;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_session_impl.h Deleted

@@ -1,143 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_CLIENT_SESSION_IMPL_H
-#define ASIO_CLIENT_SESSION_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <boost/array.hpp>
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class stream;
-
-using boost::asio::ip::tcp;
-
-class session_impl : public std::enable_shared_from_this<session_impl> {
-public:
-  session_impl(boost::asio::io_service &io_service,
-               const boost::posix_time::time_duration &connect_timeout);
-  virtual ~session_impl();
-
-  void start_resolve(const std::string &host, const std::string &service);
-
-  void connected(tcp::resolver::iterator endpoint_it);
-  void not_connected(const boost::system::error_code &ec);
-
-  void on_connect(connect_cb cb);
-  void on_error(error_cb cb);
-
-  const connect_cb &on_connect() const;
-  const error_cb &on_error() const;
-
-  int write_trailer(stream &strm, header_map h);
-
-  void cancel(stream &strm, uint32_t error_code);
-  void resume(stream &strm);
-
-  std::unique_ptr<stream> create_stream();
-  std::unique_ptr<stream> pop_stream(int32_t stream_id);
-  stream *create_push_stream(int32_t stream_id);
-  stream *find_stream(int32_t stream_id);
-
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        generator_cb cb, header_map h, priority_spec spec);
-
-  virtual void start_connect(tcp::resolver::iterator endpoint_it) = 0;
-  virtual tcp::socket &socket() = 0;
-  virtual void read_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h) = 0;
-  virtual void write_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h) = 0;
-  virtual void shutdown_socket() = 0;
-
-  void shutdown();
-
-  boost::asio::io_service &io_service();
-
-  void signal_write();
-
-  void enter_callback();
-  void leave_callback();
-
-  void do_read();
-  void do_write();
-
-  void read_timeout(const boost::posix_time::time_duration &t);
-
-  void stop();
-  bool stopped() const;
-
-protected:
-  boost::array<uint8_t, 8_k> rb_;
-  boost::array<uint8_t, 64_k> wb_;
-  std::size_t wblen_;
-
-private:
-  bool should_stop() const;
-  bool setup_session();
-  void call_error_cb(const boost::system::error_code &ec);
-  void handle_deadline();
-  void start_ping();
-  void handle_ping(const boost::system::error_code &ec);
-
-  boost::asio::io_service &io_service_;
-  tcp::resolver resolver_;
-
-  std::map<int32_t, std::unique_ptr<stream>> streams_;
-
-  connect_cb connect_cb_;
-  error_cb error_cb_;
-
-  boost::asio::deadline_timer deadline_;
-  boost::posix_time::time_duration connect_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-
-  boost::asio::deadline_timer ping_;
-
-  nghttp2_session *session_;
-
-  const uint8_t *data_pending_;
-  std::size_t data_pendinglen_;
-
-  bool writing_;
-  bool inside_callback_;
-  bool stopped_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_SESSION_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_session_tcp_impl.cc Deleted

@@ -1,87 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_client_session_tcp_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-session_tcp_impl::session_tcp_impl(
-    boost::asio::io_service &io_service, const std::string &host,
-    const std::string &service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : session_impl(io_service, connect_timeout), socket_(io_service) {}
-
-session_tcp_impl::session_tcp_impl(
-    boost::asio::io_service &io_service,
-    const boost::asio::ip::tcp::endpoint &local_endpoint,
-    const std::string &host, const std::string &service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : session_impl(io_service, connect_timeout), socket_(io_service) {
-  socket_.open(local_endpoint.protocol());
-  boost::asio::socket_base::reuse_address option(true);
-  socket_.set_option(option);
-  socket_.bind(local_endpoint);
-}
-
-session_tcp_impl::~session_tcp_impl() {}
-
-void session_tcp_impl::start_connect(tcp::resolver::iterator endpoint_it) {
-  auto self = shared_from_this();
-  socket_.async_connect(
-      *endpoint_it, self, endpoint_it(const boost::system::error_code &ec) {
-        if (self->stopped()) {
-          return;
-        }
-
-        if (ec) {
-          self->not_connected(ec);
-          return;
-        }
-
-        self->connected(endpoint_it);
-      });
-}
-
-tcp::socket &session_tcp_impl::socket() { return socket_; }
-
-void session_tcp_impl::read_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  socket_.async_read_some(boost::asio::buffer(rb_), h);
-}
-
-void session_tcp_impl::write_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  boost::asio::async_write(socket_, boost::asio::buffer(wb_, wblen_), h);
-}
-
-void session_tcp_impl::shutdown_socket() {
-  boost::system::error_code ignored_ec;
-  socket_.close(ignored_ec);
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_session_tcp_impl.h Deleted

@@ -1,67 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_CLIENT_SESSION_TCP_IMPL_H
-#define ASIO_CLIENT_SESSION_TCP_IMPL_H
-
-#include "asio_client_session_impl.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-using boost::asio::ip::tcp;
-
-class session_tcp_impl : public session_impl {
-public:
-  session_tcp_impl(boost::asio::io_service &io_service, const std::string &host,
-                   const std::string &service,
-                   const boost::posix_time::time_duration &connect_timeout);
-  session_tcp_impl(boost::asio::io_service &io_service,
-                   const boost::asio::ip::tcp::endpoint &local_endpoint,
-                   const std::string &host, const std::string &service,
-                   const boost::posix_time::time_duration &connect_timeout);
-  virtual ~session_tcp_impl();
-
-  virtual void start_connect(tcp::resolver::iterator endpoint_it);
-  virtual tcp::socket &socket();
-  virtual void read_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void write_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void shutdown_socket();
-
-private:
-  tcp::socket socket_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_SESSION_TCP_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_session_tls_impl.cc Deleted

@@ -1,106 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_client_session_tls_impl.h"
-#include "asio_common.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-session_tls_impl::session_tls_impl(
-    boost::asio::io_service &io_service, boost::asio::ssl::context &tls_ctx,
-    const std::string &host, const std::string &service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : session_impl(io_service, connect_timeout), socket_(io_service, tls_ctx) {
-  // this callback setting is no effect is
-  // ssl::context::set_verify_mode(boost::asio::ssl::verify_peer) is
-  // not used, which is what we want.
-  socket_.set_verify_callback(boost::asio::ssl::rfc2818_verification(host));
-  auto ssl = socket_.native_handle();
-  if (!util::numeric_host(host.c_str())) {
-    SSL_set_tlsext_host_name(ssl, host.c_str());
-  }
-}
-
-session_tls_impl::~session_tls_impl() {}
-
-void session_tls_impl::start_connect(tcp::resolver::iterator endpoint_it) {
-  auto self = std::static_pointer_cast<session_tls_impl>(shared_from_this());
-  boost::asio::async_connect(
-      socket(), endpoint_it,
-      self(const boost::system::error_code &ec,
-             tcp::resolver::iterator endpoint_it) {
-        if (self->stopped()) {
-          return;
-        }
-
-        if (ec) {
-          self->not_connected(ec);
-          return;
-        }
-
-        self->socket_.async_handshake(
-            boost::asio::ssl::stream_base::client,
-            self, endpoint_it(const boost::system::error_code &ec) {
-              if (self->stopped()) {
-                return;
-              }
-
-              if (ec) {
-                self->not_connected(ec);
-                return;
-              }
-
-              if (!tls_h2_negotiated(self->socket_)) {
-                self->not_connected(make_error_code(
-                    NGHTTP2_ASIO_ERR_TLS_NO_APP_PROTO_NEGOTIATED));
-                return;
-              }
-
-              self->connected(endpoint_it);
-            });
-      });
-}
-
-tcp::socket &session_tls_impl::socket() { return socket_.next_layer(); }
-
-void session_tls_impl::read_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  socket_.async_read_some(boost::asio::buffer(rb_), h);
-}
-
-void session_tls_impl::write_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  boost::asio::async_write(socket_, boost::asio::buffer(wb_, wblen_), h);
-}
-
-void session_tls_impl::shutdown_socket() {
-  boost::system::error_code ignored_ec;
-  socket_.lowest_layer().close(ignored_ec);
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_session_tls_impl.h Deleted

@@ -1,66 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_CLIENT_SESSION_TLS_IMPL_H
-#define ASIO_CLIENT_SESSION_TLS_IMPL_H
-
-#include "asio_client_session_impl.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-using boost::asio::ip::tcp;
-
-using ssl_socket = boost::asio::ssl::stream<tcp::socket>;
-
-class session_tls_impl : public session_impl {
-public:
-  session_tls_impl(boost::asio::io_service &io_service,
-                   boost::asio::ssl::context &tls_ctx, const std::string &host,
-                   const std::string &service,
-                   const boost::posix_time::time_duration &connect_timeout);
-  virtual ~session_tls_impl();
-
-  virtual void start_connect(tcp::resolver::iterator endpoint_it);
-  virtual tcp::socket &socket();
-  virtual void read_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void write_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void shutdown_socket();
-
-private:
-  ssl_socket socket_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_SESSION_TLS_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_stream.cc Deleted

@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_client_stream.h"
-
-#include "asio_client_request_impl.h"
-#include "asio_client_response_impl.h"
-#include "asio_client_session_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-stream::stream(session_impl *sess) : sess_(sess), stream_id_(0) {
-  request_.impl().stream(this);
-}
-
-void stream::stream_id(int32_t stream_id) { stream_id_ = stream_id; }
-
-int32_t stream::stream_id() const { return stream_id_; }
-
-class request &stream::request() {
-  return request_;
-}
-
-class response &stream::response() {
-  return response_;
-}
-
-session_impl *stream::session() const { return sess_; }
-
-bool stream::expect_final_response() const {
-  return response_.status_code() / 100 == 1;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_stream.h Deleted

@@ -1,68 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_CLIENT_STREAM_H
-#define ASIO_CLIENT_STREAM_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class request;
-class response;
-class session_impl;
-
-class stream {
-public:
-  stream(session_impl *sess);
-
-  stream(const stream &) = delete;
-  stream &operator=(const stream &) = delete;
-
-  void stream_id(int32_t stream_id);
-  int32_t stream_id() const;
-
-  class request &request();
-  class response &response();
-
-  session_impl *session() const;
-
-  bool expect_final_response() const;
-
-private:
-  nghttp2::asio_http2::client::request request_;
-  nghttp2::asio_http2::client::response response_;
-  session_impl *sess_;
-  uint32_t stream_id_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_STREAM_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_tls_context.cc Deleted

@@ -1,74 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_client_tls_context.h"
-
-#include <openssl/ssl.h>
-
-#include <boost/asio/ssl.hpp>
-
-#include "tls.h"
-#include "util.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-int client_select_next_proto_cb(SSL *ssl, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg) {
-  if (!util::select_h2(const_cast<const unsigned char **>(out), outlen, in,
-                       inlen)) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-boost::system::error_code
-configure_tls_context(boost::system::error_code &ec,
-                      boost::asio::ssl::context &tls_ctx) {
-  ec.clear();
-
-  auto ctx = tls_ctx.native_handle();
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_proto_select_cb(ctx, client_select_next_proto_cb, nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  auto proto_list = util::get_default_alpn();
-
-  SSL_CTX_set_alpn_protos(ctx, proto_list.data(), proto_list.size());
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  return ec;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_client_tls_context.h Deleted

@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_CLIENT_TLS_CONTEXT_H
-#define ASIO_CLIENT_TLS_CONTEXT_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#endif // ASIO_CLIENT_TLS_CONTEXT_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_common.cc Deleted

@@ -1,197 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_common.h"
-
-#include <fcntl.h>
-#include <memory>
-
-#include "util.h"
-#include "template.h"
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-
-class nghttp2_category_impl : public boost::system::error_category {
-public:
-  const char *name() const noexcept { return "nghttp2"; }
-  std::string message(int ev) const { return nghttp2_strerror(ev); }
-};
-
-const boost::system::error_category &nghttp2_category() noexcept {
-  static nghttp2_category_impl cat;
-  return cat;
-}
-
-boost::system::error_code make_error_code(nghttp2_error ev) {
-  return boost::system::error_code(static_cast<int>(ev), nghttp2_category());
-}
-
-class nghttp2_asio_category_impl : public boost::system::error_category {
-public:
-  const char *name() const noexcept { return "nghttp2_asio"; }
-  std::string message(int ev) const {
-    switch (ev) {
-    case NGHTTP2_ASIO_ERR_NO_ERROR:
-      return "no error";
-    case NGHTTP2_ASIO_ERR_TLS_NO_APP_PROTO_NEGOTIATED:
-      return "tls: no application protocol negotiated";
-    default:
-      return "unknown";
-    }
-  }
-};
-
-const boost::system::error_category &nghttp2_asio_category() noexcept {
-  static nghttp2_asio_category_impl cat;
-  return cat;
-}
-
-boost::system::error_code make_error_code(nghttp2_asio_error ev) {
-  return boost::system::error_code(static_cast<int>(ev),
-                                   nghttp2_asio_category());
-}
-
-generator_cb string_generator(std::string data) {
-  auto strio = std::make_shared<std::pair<std::string, size_t>>(std::move(data),
-                                                                data.size());
-  return strio(uint8_t *buf, size_t len, uint32_t *data_flags) {
-    auto &data = strio->first;
-    auto &left = strio->second;
-    auto n = std::min(len, left);
-    std::copy_n(data.c_str() + data.size() - left, n, buf);
-    left -= n;
-    if (left == 0) {
-      *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-    }
-    return n;
-  };
-}
-
-generator_cb deferred_generator() {
-  return (uint8_t *buf, size_t len, uint32_t *data_flags) {
-    return NGHTTP2_ERR_DEFERRED;
-  };
-}
-
-template <typename F, typename... T>
-std::shared_ptr<Defer<F, T...>> defer_shared(F &&f, T &&...t) {
-  return std::make_shared<Defer<F, T...>>(std::forward<F>(f),
-                                          std::forward<T>(t)...);
-}
-
-generator_cb file_generator(const std::string &path) {
-  auto fd = open(path.c_str(), O_RDONLY);
-  if (fd == -1) {
-    return generator_cb();
-  }
-
-  return file_generator_from_fd(fd);
-}
-
-generator_cb file_generator_from_fd(int fd) {
-  auto d = defer_shared(close, fd);
-
-  return fd, d(uint8_t *buf, size_t len,
-                 uint32_t *data_flags) -> generator_cb::result_type {
-    ssize_t n;
-    while ((n = read(fd, buf, len)) == -1 && errno == EINTR)
-      ;
-
-    if (n == -1) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    if (n == 0) {
-      *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-    }
-
-    return n;
-  };
-}
-
-bool check_path(const std::string &path) { return util::check_path(path); }
-
-std::string percent_decode(const std::string &s) {
-  return util::percent_decode(std::begin(s), std::end(s));
-}
-
-std::string http_date(int64_t t) { return util::http_date(t); }
-
-boost::system::error_code host_service_from_uri(boost::system::error_code &ec,
-                                                std::string &scheme,
-                                                std::string &host,
-                                                std::string &service,
-                                                const std::string &uri) {
-  ec.clear();
-
-  http_parser_url u{};
-  if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return ec;
-  }
-
-  if ((u.field_set & (1 << UF_SCHEMA)) == 0 ||
-      (u.field_set & (1 << UF_HOST)) == 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return ec;
-  }
-
-  http2::copy_url_component(scheme, &u, UF_SCHEMA, uri.c_str());
-  http2::copy_url_component(host, &u, UF_HOST, uri.c_str());
-
-  if (u.field_set & (1 << UF_PORT)) {
-    http2::copy_url_component(service, &u, UF_PORT, uri.c_str());
-  } else {
-    service = scheme;
-  }
-
-  return ec;
-}
-
-bool tls_h2_negotiated(ssl_socket &socket) {
-  auto ssl = socket.native_handle();
-
-  const unsigned char *next_proto = nullptr;
-  unsigned int next_proto_len = 0;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_get0_next_proto_negotiated(ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  if (next_proto == nullptr) {
-    SSL_get0_alpn_selected(ssl, &next_proto, &next_proto_len);
-  }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  if (next_proto == nullptr) {
-    return false;
-  }
-
-  return util::check_h2_is_selected(StringRef{next_proto, next_proto_len});
-}
-
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_common.h Deleted

@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_COMMON_H
-#define ASIO_COMMON_H
-
-#include "nghttp2_config.h"
-
-#include <string>
-
-#include <nghttp2/asio_http2.h>
-
-#include "util.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-boost::system::error_code make_error_code(nghttp2_error ev);
-
-boost::system::error_code make_error_code(nghttp2_asio_error ev);
-
-generator_cb string_generator(std::string data);
-
-// Returns generator_cb, which just returns NGHTTP2_ERR_DEFERRED
-generator_cb deferred_generator();
-
-template <typename InputIt>
-void split_path(uri_ref &dst, InputIt first, InputIt last) {
-  auto path_last = std::find(first, last, '?');
-  InputIt query_first;
-  if (path_last == last) {
-    query_first = path_last = last;
-  } else {
-    query_first = path_last + 1;
-  }
-  dst.path = util::percent_decode(first, path_last);
-  dst.raw_path.assign(first, path_last);
-  dst.raw_query.assign(query_first, last);
-}
-
-using boost::asio::ip::tcp;
-
-using ssl_socket = boost::asio::ssl::stream<tcp::socket>;
-
-bool tls_h2_negotiated(ssl_socket &socket);
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_COMMON_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_io_service_pool.cc Deleted

@@ -1,107 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// io_service_pool.cpp
-// ~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-#include "asio_io_service_pool.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-io_service_pool::io_service_pool(std::size_t pool_size) : next_io_service_(0) {
-  if (pool_size == 0) {
-    throw std::runtime_error("io_service_pool size is 0");
-  }
-
-  // Give all the io_services work to do so that their run() functions will not
-  // exit until they are explicitly stopped.
-  for (std::size_t i = 0; i < pool_size; ++i) {
-    auto io_service = std::make_shared<boost::asio::io_service>();
-    auto work = std::make_shared<boost::asio::io_service::work>(*io_service);
-    io_services_.push_back(io_service);
-    work_.push_back(work);
-  }
-}
-
-void io_service_pool::run(bool asynchronous) {
-  // Create a pool of threads to run all of the io_services.
-  for (std::size_t i = 0; i < io_services_.size(); ++i) {
-    futures_.push_back(std::async(std::launch::async,
-                                  (size_t(boost::asio::io_service::*)(void)) &
-                                      boost::asio::io_service::run,
-                                  io_services_i));
-  }
-
-  if (!asynchronous) {
-    join();
-  }
-}
-
-void io_service_pool::join() {
-  // Wait for all threads in the pool to exit.
-  for (auto &fut : futures_) {
-    fut.get();
-  }
-}
-
-void io_service_pool::force_stop() {
-  // Explicitly stop all io_services.
-  for (auto &iosv : io_services_) {
-    iosv->stop();
-  }
-}
-
-void io_service_pool::stop() {
-  // Destroy all work objects to signals end of work
-  work_.clear();
-}
-
-boost::asio::io_service &io_service_pool::get_io_service() {
-  // Use a round-robin scheme to choose the next io_service to use.
-  auto &io_service = *io_services_next_io_service_;
-  ++next_io_service_;
-  if (next_io_service_ == io_services_.size()) {
-    next_io_service_ = 0;
-  }
-  return io_service;
-}
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-io_service_pool::io_services() const {
-  return io_services_;
-}
-
-} // namespace asio_http2
-
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_io_service_pool.h Deleted

@@ -1,98 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// io_service_pool.hpp
-// ~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef ASIO_IO_SERVICE_POOL_H
-#define ASIO_IO_SERVICE_POOL_H
-
-#include "nghttp2_config.h"
-
-#include <vector>
-#include <memory>
-#include <future>
-
-#include <boost/noncopyable.hpp>
-#include <boost/thread.hpp>
-
-#include <nghttp2/asio_http2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-/// A pool of io_service objects.
-class io_service_pool : private boost::noncopyable {
-public:
-  /// Construct the io_service pool.
-  explicit io_service_pool(std::size_t pool_size);
-
-  /// Run all io_service objects in the pool.
-  void run(bool asynchronous = false);
-
-  /// Stop all io_service objects in the pool.
-  void force_stop();
-
-  /// Destroy all work objects to signals end of work
-  void stop();
-
-  /// Join on all io_service objects in the pool.
-  void join();
-
-  /// Get an io_service to use.
-  boost::asio::io_service &get_io_service();
-
-  /// Get access to all io_service objects.
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-
-private:
-  /// The pool of io_services.
-  std::vector<std::shared_ptr<boost::asio::io_service>> io_services_;
-
-  /// The work that keeps the io_services running.
-  std::vector<std::shared_ptr<boost::asio::io_service::work>> work_;
-
-  /// The next io_service to use for a connection.
-  std::size_t next_io_service_;
-
-  /// Futures to all the io_service objects
-  std::vector<std::future<std::size_t>> futures_;
-};
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_IO_SERVICE_POOL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server.cc Deleted

@@ -1,214 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// server.cpp
-// ~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include "asio_server.h"
-
-#include "asio_server_connection.h"
-#include "asio_common.h"
-#include "util.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-server::server(std::size_t io_service_pool_size,
-               const boost::posix_time::time_duration &tls_handshake_timeout,
-               const boost::posix_time::time_duration &read_timeout)
-    : io_service_pool_(io_service_pool_size),
-      tls_handshake_timeout_(tls_handshake_timeout),
-      read_timeout_(read_timeout) {}
-
-boost::system::error_code
-server::listen_and_serve(boost::system::error_code &ec,
-                         boost::asio::ssl::context *tls_context,
-                         const std::string &address, const std::string &port,
-                         int backlog, serve_mux &mux, bool asynchronous) {
-  ec.clear();
-
-  if (bind_and_listen(ec, address, port, backlog)) {
-    return ec;
-  }
-
-  for (auto &acceptor : acceptors_) {
-    if (tls_context) {
-      start_accept(*tls_context, acceptor, mux);
-    } else {
-      start_accept(acceptor, mux);
-    }
-  }
-
-  io_service_pool_.run(asynchronous);
-
-  return ec;
-}
-
-boost::system::error_code server::bind_and_listen(boost::system::error_code &ec,
-                                                  const std::string &address,
-                                                  const std::string &port,
-                                                  int backlog) {
-  // Open the acceptor with the option to reuse the address (i.e.
-  // SO_REUSEADDR).
-  tcp::resolver resolver(io_service_pool_.get_io_service());
-  tcp::resolver::query query(address, port);
-  auto it = resolver.resolve(query, ec);
-  if (ec) {
-    return ec;
-  }
-
-  for (; it != tcp::resolver::iterator(); ++it) {
-    tcp::endpoint endpoint = *it;
-    auto acceptor = tcp::acceptor(io_service_pool_.get_io_service());
-
-    if (acceptor.open(endpoint.protocol(), ec)) {
-      continue;
-    }
-
-    acceptor.set_option(tcp::acceptor::reuse_address(true));
-
-    if (acceptor.bind(endpoint, ec)) {
-      continue;
-    }
-
-    if (acceptor.listen(
-            backlog == -1 ? boost::asio::socket_base::max_connections : backlog,
-            ec)) {
-      continue;
-    }
-
-    acceptors_.push_back(std::move(acceptor));
-  }
-
-  if (acceptors_.empty()) {
-    return ec;
-  }
-
-  // ec could have some errors since we may have failed to bind some
-  // interfaces.
-  ec.clear();
-
-  return ec;
-}
-
-void server::start_accept(boost::asio::ssl::context &tls_context,
-                          tcp::acceptor &acceptor, serve_mux &mux) {
-
-  if (!acceptor.is_open()) {
-    return;
-  }
-
-  auto new_connection = std::make_shared<connection<ssl_socket>>(
-      mux, tls_handshake_timeout_, read_timeout_,
-      io_service_pool_.get_io_service(), tls_context);
-
-  acceptor.async_accept(
-      new_connection->socket().lowest_layer(),
-      this, &tls_context, &acceptor, &mux,
-       new_connection(const boost::system::error_code &e) {
-        if (!e) {
-          new_connection->socket().lowest_layer().set_option(
-              tcp::no_delay(true));
-          new_connection->start_tls_handshake_deadline();
-          new_connection->socket().async_handshake(
-              boost::asio::ssl::stream_base::server,
-              new_connection(const boost::system::error_code &e) {
-                if (e) {
-                  new_connection->stop();
-                  return;
-                }
-
-                if (!tls_h2_negotiated(new_connection->socket())) {
-                  new_connection->stop();
-                  return;
-                }
-
-                new_connection->start();
-              });
-        }
-
-        start_accept(tls_context, acceptor, mux);
-      });
-}
-
-void server::start_accept(tcp::acceptor &acceptor, serve_mux &mux) {
-
-  if (!acceptor.is_open()) {
-    return;
-  }
-
-  auto new_connection = std::make_shared<connection<tcp::socket>>(
-      mux, tls_handshake_timeout_, read_timeout_,
-      io_service_pool_.get_io_service());
-
-  acceptor.async_accept(
-      new_connection->socket(), this, &acceptor, &mux, new_connection(
-                                    const boost::system::error_code &e) {
-        if (!e) {
-          new_connection->socket().set_option(tcp::no_delay(true));
-          new_connection->start_read_deadline();
-          new_connection->start();
-        }
-        if (acceptor.is_open()) {
-          start_accept(acceptor, mux);
-        }
-      });
-}
-
-void server::stop() {
-  for (auto &acceptor : acceptors_) {
-    acceptor.close();
-  }
-  io_service_pool_.stop();
-}
-
-void server::join() { io_service_pool_.join(); }
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-server::io_services() const {
-  return io_service_pool_.io_services();
-}
-
-const std::vector<int> server::ports() const {
-  auto ports = std::vector<int>(acceptors_.size());
-  auto index = 0;
-  for (const auto &acceptor : acceptors_) {
-    portsindex++ = acceptor.local_endpoint().port();
-  }
-  return ports;
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server.h Deleted

@@ -1,117 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// server.hpp
-// ~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef ASIO_SERVER_H
-#define ASIO_SERVER_H
-
-#include "nghttp2_config.h"
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#include <boost/noncopyable.hpp>
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_io_service_pool.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class serve_mux;
-
-using boost::asio::ip::tcp;
-
-using ssl_socket = boost::asio::ssl::stream<tcp::socket>;
-
-class server : private boost::noncopyable {
-public:
-  explicit server(std::size_t io_service_pool_size,
-                  const boost::posix_time::time_duration &tls_handshake_timeout,
-                  const boost::posix_time::time_duration &read_timeout);
-
-  boost::system::error_code
-  listen_and_serve(boost::system::error_code &ec,
-                   boost::asio::ssl::context *tls_context,
-                   const std::string &address, const std::string &port,
-                   int backlog, serve_mux &mux, bool asynchronous = false);
-  void join();
-  void stop();
-
-  /// Get access to all io_service objects.
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-
-  /// Returns a vector with all the acceptors ports in use.
-  const std::vector<int> ports() const;
-
-private:
-  /// Initiate an asynchronous accept operation.
-  void start_accept(tcp::acceptor &acceptor, serve_mux &mux);
-  /// Same as above but with tls_context
-  void start_accept(boost::asio::ssl::context &tls_context,
-                    tcp::acceptor &acceptor, serve_mux &mux);
-
-  /// Resolves address and bind socket to the resolved addresses.
-  boost::system::error_code bind_and_listen(boost::system::error_code &ec,
-                                            const std::string &address,
-                                            const std::string &port,
-                                            int backlog);
-
-  /// The pool of io_service objects used to perform asynchronous
-  /// operations.
-  io_service_pool io_service_pool_;
-
-  /// Acceptor used to listen for incoming connections.
-  std::vector<tcp::acceptor> acceptors_;
-
-  std::unique_ptr<boost::asio::ssl::context> ssl_ctx_;
-
-  boost::posix_time::time_duration tls_handshake_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_connection.h Deleted

@@ -1,253 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// connection.hpp
-// ~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef ASIO_SERVER_CONNECTION_H
-#define ASIO_SERVER_CONNECTION_H
-
-#include "nghttp2_config.h"
-
-#include <memory>
-
-#include <boost/noncopyable.hpp>
-#include <boost/array.hpp>
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_http2_handler.h"
-#include "asio_server_serve_mux.h"
-#include "util.h"
-#include "template.h"
-
-#if BOOST_VERSION >= 107000
-#  define GET_IO_SERVICE(s)                                                    \
-    ((boost::asio::io_context &)(s).get_executor().context())
-#else
-#  define GET_IO_SERVICE(s) ((s).get_io_service())
-#endif
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-/// Represents a single connection from a client.
-template <typename socket_type>
-class connection : public std::enable_shared_from_this<connection<socket_type>>,
-                   private boost::noncopyable {
-public:
-  /// Construct a connection with the given io_service.
-  template <typename... SocketArgs>
-  explicit connection(
-      serve_mux &mux,
-      const boost::posix_time::time_duration &tls_handshake_timeout,
-      const boost::posix_time::time_duration &read_timeout,
-      SocketArgs &&...args)
-      : socket_(std::forward<SocketArgs>(args)...),
-        mux_(mux),
-        deadline_(GET_IO_SERVICE(socket_)),
-        tls_handshake_timeout_(tls_handshake_timeout),
-        read_timeout_(read_timeout),
-        writing_(false),
-        stopped_(false) {}
-
-  /// Start the first asynchronous operation for the connection.
-  void start() {
-    boost::system::error_code ec;
-
-    handler_ = std::make_shared<http2_handler>(
-        GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec),
-        this() { do_write(); }, mux_);
-    if (handler_->start() != 0) {
-      stop();
-      return;
-    }
-    do_read();
-  }
-
-  socket_type &socket() { return socket_; }
-
-  void start_tls_handshake_deadline() {
-    deadline_.expires_from_now(tls_handshake_timeout_);
-    deadline_.async_wait(
-        std::bind(&connection::handle_deadline, this->shared_from_this()));
-  }
-
-  void start_read_deadline() {
-    deadline_.expires_from_now(read_timeout_);
-    deadline_.async_wait(
-        std::bind(&connection::handle_deadline, this->shared_from_this()));
-  }
-
-  void handle_deadline() {
-    if (stopped_) {
-      return;
-    }
-
-    if (deadline_.expires_at() <=
-        boost::asio::deadline_timer::traits_type::now()) {
-      stop();
-      deadline_.expires_at(boost::posix_time::pos_infin);
-      return;
-    }
-
-    deadline_.async_wait(
-        std::bind(&connection::handle_deadline, this->shared_from_this()));
-  }
-
-  void do_read() {
-    auto self = this->shared_from_this();
-
-    deadline_.expires_from_now(read_timeout_);
-
-    socket_.async_read_some(
-        boost::asio::buffer(buffer_),
-        this, self(const boost::system::error_code &e,
-                     std::size_t bytes_transferred) {
-          if (e) {
-            stop();
-            return;
-          }
-
-          if (handler_->on_read(buffer_, bytes_transferred) != 0) {
-            stop();
-            return;
-          }
-
-          do_write();
-
-          if (!writing_ && handler_->should_stop()) {
-            stop();
-            return;
-          }
-
-          do_read();
-
-          // If an error occurs then no new asynchronous operations are
-          // started. This means that all shared_ptr references to the
-          // connection object will disappear and the object will be
-          // destroyed automatically after this handler returns. The
-          // connection class's destructor closes the socket.
-        });
-  }
-
-  void do_write() {
-    auto self = this->shared_from_this();
-
-    if (writing_) {
-      return;
-    }
-
-    int rv;
-    std::size_t nwrite;
-
-    rv = handler_->on_write(outbuf_, nwrite);
-
-    if (rv != 0) {
-      stop();
-      return;
-    }
-
-    if (nwrite == 0) {
-      if (handler_->should_stop()) {
-        stop();
-      }
-      return;
-    }
-
-    writing_ = true;
-
-    // Reset read deadline here, because normally client is sending
-    // something, it does not expect timeout while doing it.
-    deadline_.expires_from_now(read_timeout_);
-
-    boost::asio::async_write(
-        socket_, boost::asio::buffer(outbuf_, nwrite),
-        this, self(const boost::system::error_code &e, std::size_t) {
-          if (e) {
-            stop();
-            return;
-          }
-
-          writing_ = false;
-
-          do_write();
-        });
-
-    // No new asynchronous operations are started. This means that all
-    // shared_ptr references to the connection object will disappear and
-    // the object will be destroyed automatically after this handler
-    // returns. The connection class's destructor closes the socket.
-  }
-
-  void stop() {
-    if (stopped_) {
-      return;
-    }
-
-    stopped_ = true;
-    boost::system::error_code ignored_ec;
-    socket_.lowest_layer().close(ignored_ec);
-    deadline_.cancel();
-  }
-
-private:
-  socket_type socket_;
-
-  serve_mux &mux_;
-
-  std::shared_ptr<http2_handler> handler_;
-
-  /// Buffer for incoming data.
-  boost::array<uint8_t, 8_k> buffer_;
-
-  boost::array<uint8_t, 64_k> outbuf_;
-
-  boost::asio::deadline_timer deadline_;
-  boost::posix_time::time_duration tls_handshake_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-
-  bool writing_;
-  bool stopped_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_CONNECTION_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_http2.cc Deleted

@@ -1,99 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_http2_impl.h"
-#include "asio_server.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-http2::http2() : impl_(std::make_unique<http2_impl>()) {}
-
-http2::~http2() {}
-
-http2::http2(http2 &&other) noexcept : impl_(std::move(other.impl_)) {}
-
-http2 &http2::operator=(http2 &&other) noexcept {
-  if (this == &other) {
-    return *this;
-  }
-
-  impl_ = std::move(other.impl_);
-
-  return *this;
-}
-
-boost::system::error_code http2::listen_and_serve(boost::system::error_code &ec,
-                                                  const std::string &address,
-                                                  const std::string &port,
-                                                  bool asynchronous) {
-  return impl_->listen_and_serve(ec, nullptr, address, port, asynchronous);
-}
-
-boost::system::error_code http2::listen_and_serve(
-    boost::system::error_code &ec, boost::asio::ssl::context &tls_context,
-    const std::string &address, const std::string &port, bool asynchronous) {
-  return impl_->listen_and_serve(ec, &tls_context, address, port, asynchronous);
-}
-
-void http2::num_threads(size_t num_threads) { impl_->num_threads(num_threads); }
-
-void http2::backlog(int backlog) { impl_->backlog(backlog); }
-
-void http2::tls_handshake_timeout(const boost::posix_time::time_duration &t) {
-  impl_->tls_handshake_timeout(t);
-}
-
-void http2::read_timeout(const boost::posix_time::time_duration &t) {
-  impl_->read_timeout(t);
-}
-
-bool http2::handle(std::string pattern, request_cb cb) {
-  return impl_->handle(std::move(pattern), std::move(cb));
-}
-
-void http2::stop() { impl_->stop(); }
-
-void http2::join() { return impl_->join(); }
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-http2::io_services() const {
-  return impl_->io_services();
-}
-
-std::vector<int> http2::ports() const { return impl_->ports(); }
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_http2_handler.cc Deleted

@@ -1,497 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-#include "asio_server_http2_handler.h"
-
-#include <iostream>
-
-#include "asio_common.h"
-#include "asio_server_serve_mux.h"
-#include "asio_server_stream.h"
-#include "asio_server_request_impl.h"
-#include "asio_server_response_impl.h"
-#include "http2.h"
-#include "util.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-namespace {
-int stream_error(nghttp2_session *session, int32_t stream_id,
-                 uint32_t error_code) {
-  return nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, stream_id,
-                                   error_code);
-}
-} // namespace
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  handler->create_stream(frame->hd.stream_id);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_header_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                       const uint8_t *name, size_t namelen,
-                       const uint8_t *value, size_t valuelen, uint8_t flags,
-                       void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-  auto stream_id = frame->hd.stream_id;
-
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  auto strm = handler->find_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  auto &req = strm->request().impl();
-  auto &uref = req.uri();
-
-  switch (nghttp2::http2::lookup_token(name, namelen)) {
-  case nghttp2::http2::HD__METHOD:
-    req.method(std::string(value, value + valuelen));
-    break;
-  case nghttp2::http2::HD__SCHEME:
-    uref.scheme.assign(value, value + valuelen);
-    break;
-  case nghttp2::http2::HD__AUTHORITY:
-    uref.host.assign(value, value + valuelen);
-    break;
-  case nghttp2::http2::HD__PATH:
-    split_path(uref, value, value + valuelen);
-    break;
-  case nghttp2::http2::HD_HOST:
-    if (uref.host.empty()) {
-      uref.host.assign(value, value + valuelen);
-    }
-  // fall through
-  default:
-    if (req.header_buffer_size() + namelen + valuelen > 64_k) {
-      nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, frame->hd.stream_id,
-                                NGHTTP2_INTERNAL_ERROR);
-      break;
-    }
-    req.update_header_buffer_size(namelen + valuelen);
-
-    req.header().emplace(std::string(name, name + namelen),
-                         header_value{std::string(value, value + valuelen),
-                                      (flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0});
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-  auto strm = handler->find_stream(frame->hd.stream_id);
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-    if (!strm) {
-      break;
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->request().impl().call_on_data(nullptr, 0);
-    }
-
-    break;
-  case NGHTTP2_HEADERS: {
-    if (!strm || frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-      break;
-    }
-
-    auto &req = strm->request().impl();
-    req.remote_endpoint(handler->remote_endpoint());
-
-    handler->call_on_request(*strm);
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->request().impl().call_on_data(nullptr, 0);
-    }
-
-    break;
-  }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-  auto strm = handler->find_stream(stream_id);
-
-  if (!strm) {
-    return 0;
-  }
-
-  strm->request().impl().call_on_data(data, len);
-
-  return 0;
-}
-
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-
-  auto strm = handler->find_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  strm->response().impl().call_on_close(error_code);
-
-  handler->close_stream(stream_id);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-
-  if (frame->hd.type != NGHTTP2_PUSH_PROMISE) {
-    return 0;
-  }
-
-  auto strm = handler->find_stream(frame->push_promise.promised_stream_id);
-
-  if (!strm) {
-    return 0;
-  }
-
-  auto &res = strm->response().impl();
-  res.push_promise_sent();
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_not_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, int lib_error_code,
-                               void *user_data) {
-  if (frame->hd.type != NGHTTP2_HEADERS) {
-    return 0;
-  }
-
-  // Issue RST_STREAM so that stream does not hang around.
-  nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, frame->hd.stream_id,
-                            NGHTTP2_INTERNAL_ERROR);
-
-  return 0;
-}
-} // namespace
-
-http2_handler::http2_handler(boost::asio::io_service &io_service,
-                             boost::asio::ip::tcp::endpoint ep,
-                             connection_write writefun, serve_mux &mux)
-    : writefun_(writefun),
-      mux_(mux),
-      io_service_(io_service),
-      remote_ep_(ep),
-      session_(nullptr),
-      buf_(nullptr),
-      buflen_(0),
-      inside_callback_(false),
-      write_signaled_(false),
-      tstamp_cached_(time(nullptr)),
-      formatted_date_(util::http_date(tstamp_cached_)) {}
-
-http2_handler::~http2_handler() {
-  for (auto &p : streams_) {
-    auto &strm = p.second;
-    strm->response().impl().call_on_close(NGHTTP2_INTERNAL_ERROR);
-  }
-
-  nghttp2_session_del(session_);
-}
-
-const std::string &http2_handler::http_date() {
-  auto t = time(nullptr);
-  if (t != tstamp_cached_) {
-    tstamp_cached_ = t;
-    formatted_date_ = util::http_date(t);
-  }
-  return formatted_date_;
-}
-
-int http2_handler::start() {
-  int rv;
-
-  nghttp2_session_callbacks *callbacks;
-  rv = nghttp2_session_callbacks_new(&callbacks);
-  if (rv != 0) {
-    return -1;
-  }
-
-  auto cb_del = defer(nghttp2_session_callbacks_del, callbacks);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-  nghttp2_session_callbacks_set_on_frame_not_send_callback(
-      callbacks, on_frame_not_send_callback);
-
-  rv = nghttp2_session_server_new(&session_, callbacks, this);
-  if (rv != 0) {
-    return -1;
-  }
-
-  nghttp2_settings_entry ent{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100};
-  nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, &ent, 1);
-
-  return 0;
-}
-
-stream *http2_handler::create_stream(int32_t stream_id) {
-  auto p =
-      streams_.emplace(stream_id, std::make_unique<stream>(this, stream_id));
-  assert(p.second);
-  return (*p.first).second.get();
-}
-
-void http2_handler::close_stream(int32_t stream_id) {
-  streams_.erase(stream_id);
-}
-
-stream *http2_handler::find_stream(int32_t stream_id) {
-  auto i = streams_.find(stream_id);
-  if (i == std::end(streams_)) {
-    return nullptr;
-  }
-
-  return (*i).second.get();
-}
-
-void http2_handler::call_on_request(stream &strm) {
-  auto cb = mux_.handler(strm.request().impl());
-  cb(strm.request(), strm.response());
-}
-
-bool http2_handler::should_stop() const {
-  return !nghttp2_session_want_read(session_) &&
-         !nghttp2_session_want_write(session_);
-}
-
-int http2_handler::start_response(stream &strm) {
-  int rv;
-
-  auto &res = strm.response().impl();
-  auto &header = res.header();
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(2 + header.size());
-  auto status = util::utos(res.status_code());
-  auto date = http_date();
-  nva.push_back(nghttp2::http2::make_nv_ls(":status", status));
-  nva.push_back(nghttp2::http2::make_nv_ls("date", date));
-  for (auto &hd : header) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  nghttp2_data_provider *prd_ptr = nullptr, prd;
-  auto &req = strm.request().impl();
-  if (::nghttp2::http2::expect_response_body(req.method(), res.status_code())) {
-    prd.source.ptr = &strm;
-    prd.read_callback = (nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, uint32_t *data_flags,
-                           nghttp2_data_source *source,
-                           void *user_data) -> ssize_t {
-      auto &strm = *static_cast<stream *>(source->ptr);
-      return strm.response().impl().call_read(buf, length, data_flags);
-    };
-    prd_ptr = &prd;
-  }
-  rv = nghttp2_submit_response(session_, strm.get_stream_id(), nva.data(),
-                               nva.size(), prd_ptr);
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-int http2_handler::submit_trailer(stream &strm, header_map h) {
-  int rv;
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(h.size());
-  for (auto &hd : h) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  rv = nghttp2_submit_trailer(session_, strm.get_stream_id(), nva.data(),
-                              nva.size());
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-void http2_handler::enter_callback() {
-  assert(!inside_callback_);
-  inside_callback_ = true;
-}
-
-void http2_handler::leave_callback() {
-  assert(inside_callback_);
-  inside_callback_ = false;
-}
-
-void http2_handler::stream_error(int32_t stream_id, uint32_t error_code) {
-  ::nghttp2::asio_http2::server::stream_error(session_, stream_id, error_code);
-  signal_write();
-}
-
-void http2_handler::signal_write() {
-  if (!inside_callback_ && !write_signaled_) {
-    write_signaled_ = true;
-    auto self = shared_from_this();
-    io_service_.post(self() { self->initiate_write(); });
-  }
-}
-
-void http2_handler::initiate_write() {
-  write_signaled_ = false;
-  writefun_();
-}
-
-void http2_handler::resume(stream &strm) {
-  nghttp2_session_resume_data(session_, strm.get_stream_id());
-  signal_write();
-}
-
-response *http2_handler::push_promise(boost::system::error_code &ec,
-                                      stream &strm, std::string method,
-                                      std::string raw_path_query,
-                                      header_map h) {
-  int rv;
-
-  ec.clear();
-
-  auto &req = strm.request().impl();
-
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(4 + h.size());
-  nva.push_back(nghttp2::http2::make_nv_ls(":method", method));
-  nva.push_back(nghttp2::http2::make_nv_ls(":scheme", req.uri().scheme));
-  nva.push_back(nghttp2::http2::make_nv_ls(":authority", req.uri().host));
-  nva.push_back(nghttp2::http2::make_nv_ls(":path", raw_path_query));
-
-  for (auto &hd : h) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  rv = nghttp2_submit_push_promise(session_, NGHTTP2_FLAG_NONE,
-                                   strm.get_stream_id(), nva.data(), nva.size(),
-                                   nullptr);
-
-  if (rv < 0) {
-    ec = make_error_code(static_cast<nghttp2_error>(rv));
-    return nullptr;
-  }
-
-  auto promised_strm = create_stream(rv);
-  auto &promised_req = promised_strm->request().impl();
-  promised_req.header(std::move(h));
-  promised_req.method(std::move(method));
-
-  auto &uref = promised_req.uri();
-  uref.scheme = req.uri().scheme;
-  uref.host = req.uri().host;
-  split_path(uref, std::begin(raw_path_query), std::end(raw_path_query));
-
-  auto &promised_res = promised_strm->response().impl();
-  promised_res.pushed(true);
-
-  signal_write();
-
-  return &promised_strm->response();
-}
-
-boost::asio::io_service &http2_handler::io_service() { return io_service_; }
-
-const boost::asio::ip::tcp::endpoint &http2_handler::remote_endpoint() {
-  return remote_ep_;
-}
-
-callback_guard::callback_guard(http2_handler &h) : handler(h) {
-  handler.enter_callback();
-}
-
-callback_guard::~callback_guard() { handler.leave_callback(); }
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_http2_handler.h Deleted

@@ -1,174 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-#ifndef ASIO_SERVER_HTTP2_HANDLER_H
-#define ASIO_SERVER_HTTP2_HANDLER_H
-
-#include "nghttp2_config.h"
-
-#include <map>
-#include <functional>
-#include <string>
-
-#include <boost/array.hpp>
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class http2_handler;
-class stream;
-class serve_mux;
-
-struct callback_guard {
-  callback_guard(http2_handler &h);
-  ~callback_guard();
-  http2_handler &handler;
-};
-
-using connection_write = std::function<void(void)>;
-
-class http2_handler : public std::enable_shared_from_this<http2_handler> {
-public:
-  http2_handler(boost::asio::io_service &io_service,
-                boost::asio::ip::tcp::endpoint ep, connection_write writefun,
-                serve_mux &mux);
-
-  ~http2_handler();
-
-  int start();
-
-  stream *create_stream(int32_t stream_id);
-  void close_stream(int32_t stream_id);
-  stream *find_stream(int32_t stream_id);
-
-  void call_on_request(stream &s);
-
-  bool should_stop() const;
-
-  int start_response(stream &s);
-
-  int submit_trailer(stream &s, header_map h);
-
-  void stream_error(int32_t stream_id, uint32_t error_code);
-
-  void initiate_write();
-
-  void enter_callback();
-  void leave_callback();
-
-  void resume(stream &s);
-
-  response *push_promise(boost::system::error_code &ec, stream &s,
-                         std::string method, std::string raw_path_query,
-                         header_map h);
-
-  void signal_write();
-
-  boost::asio::io_service &io_service();
-
-  const boost::asio::ip::tcp::endpoint &remote_endpoint();
-
-  const std::string &http_date();
-
-  template <size_t N>
-  int on_read(const boost::array<uint8_t, N> &buffer, std::size_t len) {
-    callback_guard cg(*this);
-
-    int rv;
-
-    rv = nghttp2_session_mem_recv(session_, buffer.data(), len);
-
-    if (rv < 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-
-  template <size_t N>
-  int on_write(boost::array<uint8_t, N> &buffer, std::size_t &len) {
-    callback_guard cg(*this);
-
-    len = 0;
-
-    if (buf_) {
-      std::copy_n(buf_, buflen_, std::begin(buffer));
-
-      len += buflen_;
-
-      buf_ = nullptr;
-      buflen_ = 0;
-    }
-
-    for (;;) {
-      const uint8_t *data;
-      auto nread = nghttp2_session_mem_send(session_, &data);
-      if (nread < 0) {
-        return -1;
-      }
-
-      if (nread == 0) {
-        break;
-      }
-
-      if (len + nread > buffer.size()) {
-        buf_ = data;
-        buflen_ = nread;
-
-        break;
-      }
-
-      std::copy_n(data, nread, std::begin(buffer) + len);
-
-      len += nread;
-    }
-
-    return 0;
-  }
-
-private:
-  std::map<int32_t, std::shared_ptr<stream>> streams_;
-  connection_write writefun_;
-  serve_mux &mux_;
-  boost::asio::io_service &io_service_;
-  boost::asio::ip::tcp::endpoint remote_ep_;
-  nghttp2_session *session_;
-  const uint8_t *buf_;
-  std::size_t buflen_;
-  bool inside_callback_;
-  // true if we have pending on_write call.  This avoids repeated call
-  // of io_service::post.
-  bool write_signaled_;
-  time_t tstamp_cached_;
-  std::string formatted_date_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_HTTP2_HANDLER_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_http2_impl.cc Deleted

@@ -1,87 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-#include "asio_server_http2_impl.h"
-
-#include <openssl/ssl.h>
-
-#include "asio_server.h"
-#include "util.h"
-#include "tls.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-http2_impl::http2_impl()
-    : num_threads_(1),
-      backlog_(-1),
-      tls_handshake_timeout_(boost::posix_time::seconds(60)),
-      read_timeout_(boost::posix_time::seconds(60)) {}
-
-boost::system::error_code http2_impl::listen_and_serve(
-    boost::system::error_code &ec, boost::asio::ssl::context *tls_context,
-    const std::string &address, const std::string &port, bool asynchronous) {
-  server_.reset(
-      new server(num_threads_, tls_handshake_timeout_, read_timeout_));
-  return server_->listen_and_serve(ec, tls_context, address, port, backlog_,
-                                   mux_, asynchronous);
-}
-
-void http2_impl::num_threads(size_t num_threads) { num_threads_ = num_threads; }
-
-void http2_impl::backlog(int backlog) { backlog_ = backlog; }
-
-void http2_impl::tls_handshake_timeout(
-    const boost::posix_time::time_duration &t) {
-  tls_handshake_timeout_ = t;
-}
-
-void http2_impl::read_timeout(const boost::posix_time::time_duration &t) {
-  read_timeout_ = t;
-}
-
-bool http2_impl::handle(std::string pattern, request_cb cb) {
-  return mux_.handle(std::move(pattern), std::move(cb));
-}
-
-void http2_impl::stop() { return server_->stop(); }
-
-void http2_impl::join() { return server_->join(); }
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-http2_impl::io_services() const {
-  return server_->io_services();
-}
-
-std::vector<int> http2_impl::ports() const { return server_->ports(); }
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_http2_impl.h Deleted

@@ -1,74 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-#ifndef ASIO_SERVER_HTTP2_IMPL_H
-#define ASIO_SERVER_HTTP2_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_serve_mux.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class server;
-
-class http2_impl {
-public:
-  http2_impl();
-  boost::system::error_code listen_and_serve(
-      boost::system::error_code &ec, boost::asio::ssl::context *tls_context,
-      const std::string &address, const std::string &port, bool asynchronous);
-  void num_threads(size_t num_threads);
-  void backlog(int backlog);
-  void tls_handshake_timeout(const boost::posix_time::time_duration &t);
-  void read_timeout(const boost::posix_time::time_duration &t);
-  bool handle(std::string pattern, request_cb cb);
-  void stop();
-  void join();
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-  std::vector<int> ports() const;
-
-private:
-  std::unique_ptr<server> server_;
-  std::size_t num_threads_;
-  int backlog_;
-  serve_mux mux_;
-  boost::posix_time::time_duration tls_handshake_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_HTTP2_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_request.cc Deleted

@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_request_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-request::request() : impl_(std::make_unique<request_impl>()) {}
-
-request::~request() {}
-
-const header_map &request::header() const { return impl_->header(); }
-
-const std::string &request::method() const { return impl_->method(); }
-
-const uri_ref &request::uri() const { return impl_->uri(); }
-
-void request::on_data(data_cb cb) const {
-  return impl_->on_data(std::move(cb));
-}
-
-request_impl &request::impl() const { return *impl_; }
-
-const boost::asio::ip::tcp::endpoint &request::remote_endpoint() const {
-  return impl_->remote_endpoint();
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_request_handler.cc Deleted

@@ -1,90 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_server_request_handler.h"
-
-#include "util.h"
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-namespace {
-std::string create_html(int status_code) {
-  BlockAllocator balloc(1024, 1024);
-  std::string res;
-  res.reserve(512);
-  auto status_string = ::nghttp2::http2::stringify_status(balloc, status_code);
-  auto reason_phrase = ::nghttp2::http2::get_reason_phrase(status_code);
-  res += R"(<!DOCTYPE html><html lang="en"><title>)";
-  res += status_string;
-  res += ' ';
-  res += reason_phrase;
-  res += "</title><body><h1>";
-  res += status_string;
-  res += ' ';
-  res += reason_phrase;
-  res += "</h1></body></html>";
-  return res;
-}
-} // namespace
-
-request_cb redirect_handler(int status_code, std::string uri) {
-  return status_code, uri(const request &req, const response &res) {
-    header_map h;
-    h.emplace("location", header_value{std::move(uri)});
-    std::string html;
-    if (req.method() == "GET") {
-      html = create_html(status_code);
-    }
-    h.emplace("content-length", header_value{util::utos(html.size())});
-
-    res.write_head(status_code, std::move(h));
-    res.end(std::move(html));
-  };
-}
-
-request_cb status_handler(int status_code) {
-  return status_code(const request &req, const response &res) {
-    if (!::nghttp2::http2::expect_response_body(status_code)) {
-      res.write_head(status_code);
-      res.end();
-      return;
-    }
-    // we supply content-length for HEAD request, but body will not be
-    // sent.
-    auto html = create_html(status_code);
-    header_map h;
-    h.emplace("content-length", header_value{util::utos(html.size())});
-    h.emplace("content-type", header_value{"text/html; charset=utf-8"});
-
-    res.write_head(status_code, std::move(h));
-    res.end(std::move(html));
-  };
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_request_handler.h Deleted

@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_SERVER_REQUEST_HANDLER_H
-#define ASIO_SERVER_REQUEST_HANDLER_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#endif // ASIO_SERVER_REQUEST_HANDLER_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_request_impl.cc Deleted

@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_server_request_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-request_impl::request_impl() : strm_(nullptr), header_buffer_size_(0) {}
-
-const header_map &request_impl::header() const { return header_; }
-
-const std::string &request_impl::method() const { return method_; }
-
-const uri_ref &request_impl::uri() const { return uri_; }
-
-uri_ref &request_impl::uri() { return uri_; }
-
-void request_impl::header(header_map h) { header_ = std::move(h); }
-
-header_map &request_impl::header() { return header_; }
-
-void request_impl::method(std::string arg) { method_ = std::move(arg); }
-
-void request_impl::on_data(data_cb cb) { on_data_cb_ = std::move(cb); }
-
-void request_impl::stream(class stream *s) { strm_ = s; }
-
-void request_impl::call_on_data(const uint8_t *data, std::size_t len) {
-  if (on_data_cb_) {
-    on_data_cb_(data, len);
-  }
-}
-
-const boost::asio::ip::tcp::endpoint &request_impl::remote_endpoint() const {
-  return remote_ep_;
-}
-
-void request_impl::remote_endpoint(boost::asio::ip::tcp::endpoint ep) {
-  remote_ep_ = std::move(ep);
-}
-
-size_t request_impl::header_buffer_size() const { return header_buffer_size_; }
-
-void request_impl::update_header_buffer_size(size_t len) {
-  header_buffer_size_ += len;
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_request_impl.h Deleted

@@ -1,78 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_SERVER_REQUEST_IMPL_H
-#define ASIO_SERVER_REQUEST_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-#include <boost/asio/ip/tcp.hpp>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class stream;
-
-class request_impl {
-public:
-  request_impl();
-
-  void header(header_map h);
-  const header_map &header() const;
-  header_map &header();
-
-  void method(std::string method);
-  const std::string &method() const;
-
-  const uri_ref &uri() const;
-  uri_ref &uri();
-
-  void on_data(data_cb cb);
-
-  void stream(class stream *s);
-  void call_on_data(const uint8_t *data, std::size_t len);
-
-  const boost::asio::ip::tcp::endpoint &remote_endpoint() const;
-  void remote_endpoint(boost::asio::ip::tcp::endpoint ep);
-
-  size_t header_buffer_size() const;
-  void update_header_buffer_size(size_t len);
-
-private:
-  class stream *strm_;
-  header_map header_;
-  std::string method_;
-  uri_ref uri_;
-  data_cb on_data_cb_;
-  boost::asio::ip::tcp::endpoint remote_ep_;
-  size_t header_buffer_size_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_REQUEST_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_response.cc Deleted

@@ -1,75 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_response_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-response::response() : impl_(std::make_unique<response_impl>()) {}
-
-response::~response() {}
-
-void response::write_head(unsigned int status_code, header_map h) const {
-  impl_->write_head(status_code, std::move(h));
-}
-
-void response::end(std::string data) const { impl_->end(std::move(data)); }
-
-void response::end(generator_cb cb) const { impl_->end(std::move(cb)); }
-
-void response::write_trailer(header_map h) const {
-  impl_->write_trailer(std::move(h));
-}
-
-void response::on_close(close_cb cb) const { impl_->on_close(std::move(cb)); }
-
-void response::cancel(uint32_t error_code) const { impl_->cancel(error_code); }
-
-const response *response::push(boost::system::error_code &ec,
-                               std::string method, std::string path,
-                               header_map h) const {
-  return impl_->push(ec, std::move(method), std::move(path), std::move(h));
-}
-
-void response::resume() const { impl_->resume(); }
-
-unsigned int response::status_code() const { return impl_->status_code(); }
-
-boost::asio::io_service &response::io_service() const {
-  return impl_->io_service();
-}
-
-response_impl &response::impl() const { return *impl_; }
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_response_impl.cc Deleted

@@ -1,166 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_server_response_impl.h"
-
-#include "asio_server_stream.h"
-#include "asio_server_request_impl.h"
-#include "asio_server_http2_handler.h"
-#include "asio_common.h"
-
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-response_impl::response_impl()
-    : strm_(nullptr),
-      generator_cb_(deferred_generator()),
-      status_code_(200),
-      state_(response_state::INITIAL),
-      pushed_(false),
-      push_promise_sent_(false) {}
-
-unsigned int response_impl::status_code() const { return status_code_; }
-
-void response_impl::write_head(unsigned int status_code, header_map h) {
-  if (state_ != response_state::INITIAL) {
-    return;
-  }
-
-  status_code_ = status_code;
-  header_ = std::move(h);
-
-  state_ = response_state::HEADER_DONE;
-
-  if (pushed_ && !push_promise_sent_) {
-    return;
-  }
-
-  start_response();
-}
-
-void response_impl::end(std::string data) {
-  end(string_generator(std::move(data)));
-}
-
-void response_impl::end(generator_cb cb) {
-  if (state_ == response_state::BODY_STARTED) {
-    return;
-  }
-
-  generator_cb_ = std::move(cb);
-
-  if (state_ == response_state::INITIAL) {
-    write_head(status_code_);
-  } else {
-    // generator_cb is changed, start writing in case it is deferred.
-    auto handler = strm_->handler();
-    handler->resume(*strm_);
-  }
-
-  state_ = response_state::BODY_STARTED;
-}
-
-void response_impl::write_trailer(header_map h) {
-  auto handler = strm_->handler();
-  handler->submit_trailer(*strm_, std::move(h));
-}
-
-void response_impl::start_response() {
-  auto handler = strm_->handler();
-
-  auto &req = strm_->request().impl();
-
-  if (!::nghttp2::http2::expect_response_body(req.method(), status_code_)) {
-    state_ = response_state::BODY_STARTED;
-  }
-
-  if (handler->start_response(*strm_) != 0) {
-    handler->stream_error(strm_->get_stream_id(), NGHTTP2_INTERNAL_ERROR);
-    return;
-  }
-}
-
-void response_impl::on_close(close_cb cb) { close_cb_ = std::move(cb); }
-
-void response_impl::call_on_close(uint32_t error_code) {
-  if (close_cb_) {
-    close_cb_(error_code);
-  }
-}
-
-void response_impl::cancel(uint32_t error_code) {
-  auto handler = strm_->handler();
-  handler->stream_error(strm_->get_stream_id(), error_code);
-}
-
-response *response_impl::push(boost::system::error_code &ec, std::string method,
-                              std::string raw_path_query, header_map h) const {
-  auto handler = strm_->handler();
-  return handler->push_promise(ec, *strm_, std::move(method),
-                               std::move(raw_path_query), std::move(h));
-}
-
-void response_impl::resume() {
-  auto handler = strm_->handler();
-  handler->resume(*strm_);
-}
-
-boost::asio::io_service &response_impl::io_service() {
-  return strm_->handler()->io_service();
-}
-
-void response_impl::pushed(bool f) { pushed_ = f; }
-
-void response_impl::push_promise_sent() {
-  if (push_promise_sent_) {
-    return;
-  }
-  push_promise_sent_ = true;
-  if (state_ == response_state::INITIAL) {
-    return;
-  }
-  start_response();
-}
-
-const header_map &response_impl::header() const { return header_; }
-
-void response_impl::stream(class stream *s) { strm_ = s; }
-
-generator_cb::result_type
-response_impl::call_read(uint8_t *data, std::size_t len, uint32_t *data_flags) {
-  if (generator_cb_) {
-    return generator_cb_(data, len, data_flags);
-  }
-
-  *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-
-  return 0;
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_response_impl.h Deleted

@@ -1,92 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_SERVER_RESPONSE_IMPL_H
-#define ASIO_SERVER_RESPONSE_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class stream;
-
-enum class response_state {
-  INITIAL,
-  // response_impl::write_head() was called
-  HEADER_DONE,
-  // response_impl::end() was called
-  BODY_STARTED,
-};
-
-class response_impl {
-public:
-  response_impl();
-  void write_head(unsigned int status_code, header_map h = header_map{});
-  void end(std::string data = "");
-  void end(generator_cb cb);
-  void write_trailer(header_map h);
-  void on_close(close_cb cb);
-  void resume();
-
-  void cancel(uint32_t error_code);
-
-  response *push(boost::system::error_code &ec, std::string method,
-                 std::string raw_path_query, header_map) const;
-
-  boost::asio::io_service &io_service();
-
-  void start_response();
-
-  unsigned int status_code() const;
-  const header_map &header() const;
-  void pushed(bool f);
-  void push_promise_sent();
-  void stream(class stream *s);
-  generator_cb::result_type call_read(uint8_t *data, std::size_t len,
-                                      uint32_t *data_flags);
-  void call_on_close(uint32_t error_code);
-
-private:
-  class stream *strm_;
-  header_map header_;
-  generator_cb generator_cb_;
-  close_cb close_cb_;
-  unsigned int status_code_;
-  response_state state_;
-  // true if this is pushed stream's response
-  bool pushed_;
-  // true if PUSH_PROMISE is sent if this is response of a pushed
-  // stream
-  bool push_promise_sent_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_RESPONSE_IMPL_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_serve_mux.cc Deleted

@@ -1,138 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_server_serve_mux.h"
-
-#include "asio_server_request_impl.h"
-#include "asio_server_request_handler.h"
-#include "util.h"
-#include "http2.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-bool serve_mux::handle(std::string pattern, request_cb cb) {
-  if (pattern.empty() || !cb) {
-    return false;
-  }
-
-  auto it = mux_.find(pattern);
-  if (it != std::end(mux_) && (*it).second.user_defined) {
-    return false;
-  }
-
-  // if pattern ends with '/' (e.g., /foo/), add implicit permanent
-  // redirect for '/foo'.
-  if (pattern.size() >= 2 && pattern.back() == '/') {
-    auto redirect_pattern = pattern.substr(0, pattern.size() - 1);
-    auto it = mux_.find(redirect_pattern);
-    if (it == std::end(mux_) || !(*it).second.user_defined) {
-      std::string path;
-      if (pattern0 == '/') {
-        path = pattern;
-      } else {
-        // skip host part
-        path = pattern.substr(pattern.find('/'));
-      }
-      if (it == std::end(mux_)) {
-        mux_.emplace(std::move(redirect_pattern),
-                     handler_entry{false,
-                                   redirect_handler(301, std::move(path)),
-                                   pattern});
-      } else {
-        (*it).second = handler_entry{
-            false, redirect_handler(301, std::move(path)), pattern};
-      }
-    }
-  }
-  mux_.emplace(pattern, handler_entry{true, std::move(cb), pattern});
-
-  return true;
-}
-
-request_cb serve_mux::handler(request_impl &req) const {
-  auto &path = req.uri().path;
-  if (req.method() != "CONNECT") {
-    auto clean_path = ::nghttp2::http2::path_join(StringRef{}, StringRef{},
-                                                  StringRef{path}, StringRef{});
-    if (clean_path != path) {
-      auto new_uri = util::percent_encode_path(clean_path);
-      auto &uref = req.uri();
-      if (!uref.raw_query.empty()) {
-        new_uri += '?';
-        new_uri += uref.raw_query;
-      }
-
-      return redirect_handler(301, std::move(new_uri));
-    }
-  }
-  auto &host = req.uri().host;
-
-  auto cb = match(host + path);
-  if (cb) {
-    return cb;
-  }
-  cb = match(path);
-  if (cb) {
-    return cb;
-  }
-  return status_handler(404);
-}
-
-namespace {
-bool path_match(const std::string &pattern, const std::string &path) {
-  if (pattern.back() != '/') {
-    return pattern == path;
-  }
-  return util::starts_with(path, pattern);
-}
-} // namespace
-
-request_cb serve_mux::match(const std::string &path) const {
-  const handler_entry *ent = nullptr;
-  size_t best = 0;
-  for (auto &kv : mux_) {
-    auto &pattern = kv.first;
-    if (!path_match(pattern, path)) {
-      continue;
-    }
-    if (!ent || best < pattern.size()) {
-      best = pattern.size();
-      ent = &kv.second;
-    }
-  }
-  if (ent) {
-    return ent->cb;
-  }
-  return request_cb();
-}
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_serve_mux.h Deleted

@@ -1,64 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_SERVER_SERVE_MUX_H
-#define ASIO_SERVER_SERVE_MUX_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class request_impl;
-
-// port from go's ServeMux
-
-struct handler_entry {
-  bool user_defined;
-  request_cb cb;
-  std::string pattern;
-};
-
-class serve_mux {
-public:
-  bool handle(std::string pattern, request_cb cb);
-  request_cb handler(request_impl &req) const;
-  request_cb match(const std::string &path) const;
-
-private:
-  std::map<std::string, handler_entry> mux_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_SERVE_MUX_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_stream.cc Deleted

@@ -1,55 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_server_stream.h"
-
-#include "asio_server_http2_handler.h"
-#include "asio_server_request_impl.h"
-#include "asio_server_response_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-stream::stream(http2_handler *h, int32_t stream_id)
-    : handler_(h), stream_id_(stream_id) {
-  request_.impl().stream(this);
-  response_.impl().stream(this);
-}
-
-int32_t stream::get_stream_id() const { return stream_id_; }
-
-class request &stream::request() {
-  return request_;
-}
-
-class response &stream::response() {
-  return response_;
-}
-
-http2_handler *stream::handler() const { return handler_; }
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_stream.h Deleted

@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_SERVER_STREAM_H
-#define ASIO_SERVER_STREAM_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class http2_handler;
-
-class stream {
-public:
-  stream(http2_handler *h, int32_t stream_id);
-
-  int32_t get_stream_id() const;
-  class request &request();
-  class response &response();
-
-  http2_handler *handler() const;
-
-private:
-  http2_handler *handler_;
-  class request request_;
-  class response response_;
-  int32_t stream_id_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_STREAM_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_tls_context.cc Deleted

@@ -1,111 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#include "asio_server_tls_context.h"
-
-#include <openssl/ssl.h>
-
-#include <boost/asio/ssl.hpp>
-
-#include "tls.h"
-#include "util.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-std::vector<unsigned char> &get_alpn_token() {
-  static auto alpn_token = util::get_default_alpn();
-  return alpn_token;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-namespace {
-int alpn_select_proto_cb(SSL *ssl, const unsigned char **out,
-                         unsigned char *outlen, const unsigned char *in,
-                         unsigned int inlen, void *arg) {
-  if (!util::select_h2(out, outlen, in, inlen)) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-boost::system::error_code
-configure_tls_context_easy(boost::system::error_code &ec,
-                           boost::asio::ssl::context &tls_context) {
-  ec.clear();
-
-  auto ctx = tls_context.native_handle();
-
-  auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
-                  SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
-                  SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION |
-                  SSL_OP_SINGLE_ECDH_USE | SSL_OP_NO_TICKET |
-                  SSL_OP_CIPHER_SERVER_PREFERENCE;
-
-  SSL_CTX_set_options(ctx, ssl_opts);
-  SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
-  SSL_CTX_set_mode(ctx, SSL_MODE_RELEASE_BUFFERS);
-
-  SSL_CTX_set_cipher_list(ctx, tls::DEFAULT_CIPHER_LIST);
-
-#ifndef OPENSSL_NO_EC
-  auto ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-  if (ecdh) {
-    SSL_CTX_set_tmp_ecdh(ctx, ecdh);
-    EC_KEY_free(ecdh);
-  }
-#endif /* OPENSSL_NO_EC */
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_protos_advertised_cb(
-      ctx,
-      (SSL *s, const unsigned char **data, unsigned int *len, void *arg) {
-        auto &token = get_alpn_token();
-
-        *data = token.data();
-        *len = token.size();
-
-        return SSL_TLSEXT_ERR_OK;
-      },
-      nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  // ALPN selection callback
-  SSL_CTX_set_alpn_select_cb(ctx, alpn_select_proto_cb, nullptr);
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  return ec;
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/asio_server_tls_context.h Deleted

@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_SERVER_TLS_CONTEXT_H
-#define ASIO_SERVER_TLS_CONTEXT_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#endif // ASIO_SERVER_TLS_CONTEXT_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/includes Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/includes/CMakeLists.txt Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/includes/Makefile.am Deleted

@@ -1,29 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2014 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 = CMakeLists.txt
-
-if ENABLE_ASIO_LIB
-nobase_include_HEADERS = nghttp2/asio_http2.h nghttp2/asio_http2_client.h \
-	nghttp2/asio_http2_server.h
-endif # ENABLE_ASIO_LIB

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/includes/Makefile.in Deleted

@@ -1,678 +0,0 @@
-# Makefile.in generated by automake 1.16.4 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) 2014 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.
-
-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/includes
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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__nobase_include_HEADERS_DIST) \
-	$(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__nobase_include_HEADERS_DIST = nghttp2/asio_http2.h \
-	nghttp2/asio_http2_client.h nghttp2/asio_http2_server.h
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includedir)"
-HEADERS = $(nobase_include_HEADERS)
-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
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-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@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
-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@
-CYTHON = @CYTHON@
-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@
-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_OPENSSL_CFLAGS = @LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@
-LIBNGTCP2_CRYPTO_OPENSSL_LIBS = @LIBNGTCP2_CRYPTO_OPENSSL_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_CPPFLAGS = @PYTHON_CPPFLAGS@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
-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@
-EXTRA_DIST = CMakeLists.txt
-@ENABLE_ASIO_LIB_TRUE@nobase_include_HEADERS = nghttp2/asio_http2.h nghttp2/asio_http2_client.h \
-@ENABLE_ASIO_LIB_TRUE@	nghttp2/asio_http2_server.h
-
-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/includes/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/includes/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
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	$(am__nobase_list) | while read dir files; do \
-	  xfiles=; for file in $$files; do \
-	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-	  test -z "$$xfiles" || { \
-	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
-	      $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
-	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
-	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
-	done
-
-uninstall-nobase_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-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 $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(includedir)"; 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-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 distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nobase_includeHEADERS
-
-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: uninstall-nobase_includeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-generic distclean-libtool distclean-tags 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-nobase_includeHEADERS 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 tags-am uninstall \
-	uninstall-am uninstall-nobase_includeHEADERS
-
-.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.46.0.tar.xz/src/includes/nghttp2 Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/includes/nghttp2/asio_http2.h Deleted

@@ -1,151 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 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.
- */
-#ifndef ASIO_HTTP2_H
-#define ASIO_HTTP2_H
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
-#include <functional>
-#include <map>
-
-#include <boost/system/error_code.hpp>
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-
-#include <nghttp2/nghttp2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-struct header_value {
-  // header field value
-  std::string value;
-  // true if the header field value is sensitive information, such as
-  // authorization information or short length secret cookies.  If
-  // true, those header fields are not indexed by HPACK (but still
-  // huffman-encoded), which results in lesser compression.
-  bool sensitive;
-};
-
-// header fields.  The header field name must be lower-cased.
-using header_map = std::multimap<std::string, header_value>;
-
-const boost::system::error_category &nghttp2_category() noexcept;
-
-struct uri_ref {
-  std::string scheme;
-  std::string host;
-  // form after percent-encoding decoded
-  std::string path;
-  // original path, percent-encoded
-  std::string raw_path;
-  // original query, percent-encoded
-  std::string raw_query;
-  std::string fragment;
-};
-
-// Callback function when data is arrived.  EOF is indicated by
-// passing 0 to the second parameter.
-typedef std::function<void(const uint8_t *, std::size_t)> data_cb;
-typedef std::function<void(void)> void_cb;
-typedef std::function<void(const boost::system::error_code &ec)> error_cb;
-// Callback function when request and response are finished.  The
-// parameter indicates the cause of closure.
-typedef std::function<void(uint32_t)> close_cb;
-
-// Callback function to generate response body.  This function has the
-// same semantics with nghttp2_data_source_read_callback.  Just source
-// and user_data parameters are removed.
-//
-// Basically, write at most |len| bytes to |data| and returns the
-// number of bytes written.  If there is no data left to send, set
-// NGHTTP2_DATA_FLAG_EOF to *data_flags (e.g., *data_flags |=
-// NGHTTP2_DATA_FLAG_EOF).  If there is still data to send but they
-// are not available right now, return NGHTTP2_ERR_DEFERRED.  In case
-// of the error and request/response must be closed, return
-// NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE.
-typedef std::function<ssize_t(uint8_t *buf, std::size_t len,
-                              uint32_t *data_flags)>
-    generator_cb;
-
-// Convenient function to create function to read file denoted by
-// |path|.  This can be passed to response::end().
-generator_cb file_generator(const std::string &path);
-
-// Like file_generator(const std::string&), but it takes opened file
-// descriptor.  The passed descriptor will be closed when returned
-// function object is destroyed.
-generator_cb file_generator_from_fd(int fd);
-
-// Validates path so that it does not contain directory traversal
-// vector.  Returns true if path is safe.  The |path| must start with
-// "/" otherwise returns false.  This function should be called after
-// percent-decode was performed.
-bool check_path(const std::string &path);
-
-// Performs percent-decode against string |s|.
-std::string percent_decode(const std::string &s);
-
-// Returns HTTP date representation of current posix time |t|.
-std::string http_date(int64_t t);
-
-// Parses |uri| and extract scheme, host and service.  The service is
-// port component of URI (e.g., "8443") if available, otherwise it is
-// scheme (e.g., "https").
-boost::system::error_code host_service_from_uri(boost::system::error_code &ec,
-                                                std::string &scheme,
-                                                std::string &host,
-                                                std::string &service,
-                                                const std::string &uri);
-
-enum nghttp2_asio_error {
-  NGHTTP2_ASIO_ERR_NO_ERROR = 0,
-  NGHTTP2_ASIO_ERR_TLS_NO_APP_PROTO_NEGOTIATED = 1,
-};
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-namespace boost {
-
-namespace system {
-
-template <> struct is_error_code_enum<nghttp2_error> {
-  BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-template <> struct is_error_code_enum<nghttp2::asio_http2::nghttp2_asio_error> {
-  BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-} // namespace system
-
-} // namespace boost
-
-#endif // ASIO_HTTP2_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/includes/nghttp2/asio_http2_client.h Deleted

@@ -1,252 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_HTTP2_CLIENT_H
-#define ASIO_HTTP2_CLIENT_H
-
-#include <nghttp2/asio_http2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace client {
-
-class response_impl;
-
-class response {
-public:
-  // Application must not call this directly.
-  response();
-  ~response();
-
-  // Sets callback which is invoked when chunk of response body is
-  // received.
-  void on_data(data_cb cb) const;
-
-  // Returns status code.
-  int status_code() const;
-
-  // Returns content-length.  -1 if it is unknown.
-  int64_t content_length() const;
-
-  // Returns the response header fields.  The pseudo header fields,
-  // which start with colon (:), are excluded from this list.
-  const header_map &header() const;
-
-  // Application must not call this directly.
-  response_impl &impl() const;
-
-private:
-  std::unique_ptr<response_impl> impl_;
-};
-
-class request;
-
-using response_cb = std::function<void(const response &)>;
-using request_cb = std::function<void(const request &)>;
-using connect_cb =
-    std::function<void(boost::asio::ip::tcp::resolver::iterator)>;
-
-class request_impl;
-
-class request {
-public:
-  // Application must not call this directly.
-  request();
-  ~request();
-
-  // Sets callback which is invoked when response header is received.
-  void on_response(response_cb cb) const;
-
-  // Sets callback which is invoked when push request header is
-  // received.
-  void on_push(request_cb cb) const;
-
-  // Sets callback which is invoked when this request and response are
-  // finished.  After the invocation of this callback, the application
-  // must not access request and response object.
-  void on_close(close_cb cb) const;
-
-  // Write trailer part.  This must be called after setting both
-  // NGHTTP2_DATA_FLAG_EOF and NGHTTP2_DATA_FLAG_NO_END_STREAM set in
-  // *data_flag parameter in generator_cb passed to session::submit()
-  // function.
-  void write_trailer(header_map h) const;
-
-  // Cancels this request and response with given error code.
-  void cancel(uint32_t error_code = NGHTTP2_INTERNAL_ERROR) const;
-
-  // Resumes deferred uploading.
-  void resume() const;
-
-  // Returns method (e.g., GET).
-  const std::string &method() const;
-
-  // Returns request URI, split into components.
-  const uri_ref &uri() const;
-
-  // Returns request header fields.  The pseudo header fields, which
-  // start with colon (:), are excluded from this list.
-  const header_map &header() const;
-
-  // Application must not call this directly.
-  request_impl &impl() const;
-
-private:
-  std::unique_ptr<request_impl> impl_;
-};
-
-// Wrapper around an nghttp2_priority_spec.
-class priority_spec {
-public:
-  // The default ctor is used only by sentinel values.
-  priority_spec() = default;
-
-  // Create a priority spec with the given priority settings.
-  explicit priority_spec(const int32_t stream_id, const int32_t weight,
-                         const bool exclusive = false);
-
-  // Return a pointer to a valid nghttp2 priority spec, or null.
-  const nghttp2_priority_spec *get() const;
-
-  // Indicates whether or not this spec is valid (i.e. was constructed with
-  // values).
-  bool valid() const;
-
-private:
-  nghttp2_priority_spec spec_;
-  bool valid_ = false;
-};
-
-class session_impl;
-
-class session {
-public:
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "80") using clear text TCP connection with connect timeout
-  // 60 seconds.
-  session(boost::asio::io_service &io_service, const std::string &host,
-          const std::string &service);
-
-  // Same as previous but with pegged local endpoint
-  session(boost::asio::io_service &io_service,
-          const boost::asio::ip::tcp::endpoint &local_endpoint,
-          const std::string &host, const std::string &service);
-
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "80") using clear text TCP connection with given connect
-  // timeout.
-  session(boost::asio::io_service &io_service, const std::string &host,
-          const std::string &service,
-          const boost::posix_time::time_duration &connect_timeout);
-
-  // Same as previous but with pegged local endpoint
-  session(boost::asio::io_service &io_service,
-          const boost::asio::ip::tcp::endpoint &local_endpoint,
-          const std::string &host, const std::string &service,
-          const boost::posix_time::time_duration &connect_timeout);
-
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "443") using encrypted SSL/TLS connection with connect
-  // timeout 60 seconds.
-  session(boost::asio::io_service &io_service,
-          boost::asio::ssl::context &tls_context, const std::string &host,
-          const std::string &service);
-
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "443") using encrypted SSL/TLS connection with given
-  // connect timeout.
-  session(boost::asio::io_service &io_service,
-          boost::asio::ssl::context &tls_context, const std::string &host,
-          const std::string &service,
-          const boost::posix_time::time_duration &connect_timeout);
-
-  ~session();
-
-  session(session &&other) noexcept;
-  session &operator=(session &&other) noexcept;
-
-  // Sets callback which is invoked after connection is established.
-  void on_connect(connect_cb cb) const;
-
-  // Sets callback which is invoked there is connection level error
-  // and session is terminated.
-  void on_error(error_cb cb) const;
-
-  // Sets read timeout, which defaults to 60 seconds.
-  void read_timeout(const boost::posix_time::time_duration &t);
-
-  // Shutdowns connection.
-  void shutdown() const;
-
-  // Returns underlying io_service object.
-  boost::asio::io_service &io_service() const;
-
-  // Submits request to server using |method| (e.g., "GET"), |uri|
-  // (e.g., "http://localhost/") and optionally additional header
-  // fields.  This function returns pointer to request object if it
-  // succeeds, or nullptr and |ec| contains error message.
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        header_map h = header_map{},
-                        priority_spec prio = priority_spec()) const;
-
-  // Submits request to server using |method| (e.g., "GET"), |uri|
-  // (e.g., "http://localhost/") and optionally additional header
-  // fields.  The |data| is request body.  This function returns
-  // pointer to request object if it succeeds, or nullptr and |ec|
-  // contains error message.
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        std::string data, header_map h = header_map{},
-                        priority_spec prio = priority_spec()) const;
-
-  // Submits request to server using |method| (e.g., "GET"), |uri|
-  // (e.g., "http://localhost/") and optionally additional header
-  // fields.  The |cb| is used to generate request body.  This
-  // function returns pointer to request object if it succeeds, or
-  // nullptr and |ec| contains error message.
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        generator_cb cb, header_map h = header_map{},
-                        priority_spec prio = priority_spec()) const;
-
-private:
-  std::shared_ptr<session_impl> impl_;
-};
-
-// configure |tls_ctx| for client use.  Currently, we just set NPN
-// callback for HTTP/2.
-boost::system::error_code
-configure_tls_context(boost::system::error_code &ec,
-                      boost::asio::ssl::context &tls_ctx);
-
-} // namespace client
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_HTTP2_CLIENT_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/includes/nghttp2/asio_http2_server.h Deleted

@@ -1,245 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 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.
- */
-#ifndef ASIO_HTTP2_SERVER_H
-#define ASIO_HTTP2_SERVER_H
-
-#include <nghttp2/asio_http2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class request_impl;
-class response_impl;
-
-class request {
-public:
-  // Application must not call this directly.
-  request();
-  ~request();
-
-  // Returns request header fields.  The pseudo header fields, which
-  // start with colon (:), are excluded from this list.
-  const header_map &header() const;
-
-  // Returns method (e.g., GET).
-  const std::string &method() const;
-
-  // Returns request URI, split into components.
-  const uri_ref &uri() const;
-
-  // Sets callback which is invoked when chunk of request body is
-  // received.
-  void on_data(data_cb cb) const;
-
-  // Application must not call this directly.
-  request_impl &impl() const;
-
-  // Returns the remote endpoint of the request
-  const boost::asio::ip::tcp::endpoint &remote_endpoint() const;
-
-private:
-  std::unique_ptr<request_impl> impl_;
-};
-
-class response {
-public:
-  // Application must not call this directly.
-  response();
-  ~response();
-
-  // Write response header using |status_code| (e.g., 200) and
-  // additional header fields in |h|.
-  void write_head(unsigned int status_code, header_map h = header_map{}) const;
-
-  // Sends |data| as request body.  No further call of end() is
-  // allowed.
-  void end(std::string data = "") const;
-
-  // Sets callback as a generator of the response body.  No further
-  // call of end() is allowed.
-  void end(generator_cb cb) const;
-
-  // Write trailer part.  This must be called after setting both
-  // NGHTTP2_DATA_FLAG_EOF and NGHTTP2_DATA_FLAG_NO_END_STREAM set in
-  // *data_flag parameter in generator_cb passed to end() function.
-  void write_trailer(header_map h) const;
-
-  // Sets callback which is invoked when this request and response are
-  // finished.  After the invocation of this callback, the application
-  // must not access request and response object.
-  void on_close(close_cb cb) const;
-
-  // Cancels this request and response with given error code.
-  void cancel(uint32_t error_code = NGHTTP2_INTERNAL_ERROR) const;
-
-  // Resumes deferred response.
-  void resume() const;
-
-  // Pushes resource denoted by |raw_path_query| using |method|.  The
-  // additional header fields can be given in |h|.  This function
-  // returns pointer to response object for promised stream, otherwise
-  // nullptr and error code is filled in |ec|.  Be aware that the
-  // header field name given in |h| must be lower-cased.
-  const response *push(boost::system::error_code &ec, std::string method,
-                       std::string raw_path_query,
-                       header_map h = header_map{}) const;
-
-  // Returns status code.
-  unsigned int status_code() const;
-
-  // Returns boost::asio::io_service this response is running on.
-  boost::asio::io_service &io_service() const;
-
-  // Application must not call this directly.
-  response_impl &impl() const;
-
-private:
-  std::unique_ptr<response_impl> impl_;
-};
-
-// This is so called request callback.  Called every time request is
-// received.  The life time of |request| and |response| objects end
-// when callback set by response::on_close() is called.  After that,
-// the application must not access to those objects.
-typedef std::function<void(const request &, const response &)> request_cb;
-
-class http2_impl;
-
-class http2 {
-public:
-  http2();
-  ~http2();
-
-  http2(http2 &&other) noexcept;
-  http2 &operator=(http2 &&other) noexcept;
-
-  // Starts listening connection on given address and port and serves
-  // incoming requests in cleartext TCP connection.  If |asynchronous|
-  // is false, this function blocks forever unless there is an error.
-  // If it is true, after server has started, this function returns
-  // immediately, and the caller should call stop() and join() to
-  // shutdown server gracefully.
-  boost::system::error_code listen_and_serve(boost::system::error_code &ec,
-                                             const std::string &address,
-                                             const std::string &port,
-                                             bool asynchronous = false);
-
-  // Starts listening connection on given address and port and serves
-  // incoming requests in SSL/TLS encrypted connection.  For
-  // |asynchronous| parameter, see cleartext version
-  // |listen_and_serve|.
-  boost::system::error_code
-  listen_and_serve(boost::system::error_code &ec,
-                   boost::asio::ssl::context &tls_context,
-                   const std::string &address, const std::string &port,
-                   bool asynchronous = false);
-
-  // Registers request handler |cb| with path pattern |pattern|.  This
-  // function will fail and returns false if same pattern has been
-  // already registered or |pattern| is empty string.  Otherwise
-  // returns true.  The pattern match rule is the same as
-  // net/http/ServeMux in golang.  Quoted from golang manual
-  // (http://golang.org/pkg/net/http/#ServeMux):
-  //
-  //   Patterns name fixed, rooted paths, like "/favicon.ico", or
-  //   rooted subtrees, like "/images/" (note the trailing
-  //   slash). Longer patterns take precedence over shorter ones, so
-  //   that if there are handlers registered for both "/images/" and
-  //   "/images/thumbnails/", the latter handler will be called for
-  //   paths beginning "/images/thumbnails/" and the former will
-  //   receive requests for any other paths in the "/images/" subtree.
-  //
-  //   Note that since a pattern ending in a slash names a rooted
-  //   subtree, the pattern "/" matches all paths not matched by other
-  //   registered patterns, not just the URL with Path == "/".
-  //
-  //   Patterns may optionally begin with a host name, restricting
-  //   matches to URLs on that host only. Host-specific patterns take
-  //   precedence over general patterns, so that a handler might
-  //   register for the two patterns "/codesearch" and
-  //   "codesearch.google.com/" without also taking over requests for
-  //   "http://www.google.com/".
-  //
-  // Just like ServeMux in golang, URL request path is sanitized and
-  // if they contains . or .. elements, they are redirected to an
-  // equivalent .- and ..-free URL.
-  bool handle(std::string pattern, request_cb cb);
-
-  // Sets number of native threads to handle incoming HTTP request.
-  // It defaults to 1.
-  void num_threads(size_t num_threads);
-
-  // Sets the maximum length to which the queue of pending
-  // connections.
-  void backlog(int backlog);
-
-  // Sets TLS handshake timeout, which defaults to 60 seconds.
-  void tls_handshake_timeout(const boost::posix_time::time_duration &t);
-
-  // Sets read timeout, which defaults to 60 seconds.
-  void read_timeout(const boost::posix_time::time_duration &t);
-
-  // Gracefully stop http2 server
-  void stop();
-
-  // Join on http2 server and wait for it to fully stop
-  void join();
-
-  // Get access to the io_service objects.
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-
-  // Returns a vector with the ports in use
-  std::vector<int> ports() const;
-
-private:
-  std::unique_ptr<http2_impl> impl_;
-};
-
-// Configures |tls_context| for server use.  This function sets couple
-// of OpenSSL options (disables SSLv2 and SSLv3 and compression) and
-// enables ECDHE ciphers.  NPN callback is also configured.
-boost::system::error_code
-configure_tls_context_easy(boost::system::error_code &ec,
-                           boost::asio::ssl::context &tls_context);
-
-// Returns request handler to do redirect to |uri| using
-// |status_code|.  The |uri| appears in "location" header field as is.
-request_cb redirect_handler(int status_code, std::string uri);
-
-// Returns request handler to reply with given |status_code| and HTML
-// including message about status code.
-request_cb status_handler(int status_code);
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_HTTP2_SERVER_H

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/libnghttp2_asio.pc.in Deleted

@@ -1,33 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2014 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.
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libnghttp2_asio
-Description: HTTP/2 C++ library
-URL: https://github.com/tatsuhiro-t/nghttp2
-Version: @VERSION@
-Libs: -L${libdir} -lnghttp2_asio
-Cflags: -I${includedir}

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/TODO Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/appveyor_config.rb Deleted

@@ -1,46 +0,0 @@
-def setup_option(conf)
-  conf.cc.flags0.delete("/Zi") unless ENV'CFLAGS'
-  conf.cxx.flags0.delete("/Zi") unless ENV'CFLAGS' || ENV'CXXFLAGS'
-  conf.linker.flags << "/DEBUG:NONE" unless ENV'LDFLAGS'
-end
-
-MRuby::Build.new('full-debug') do |conf|
-  toolchain :visualcpp
-  enable_debug
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.cc.defines += %w(MRB_GC_STRESS MRB_METHOD_CACHE MRB_ENABLE_DEBUG_HOOK)
-  setup_option(conf)
-
-  conf.enable_test
-end
-
-MRuby::Build.new do |conf|
-  toolchain :visualcpp
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
-  end
-  setup_option(conf)
-  conf.enable_bintest
-  conf.enable_test
-end
-
-MRuby::Build.new('cxx_abi') do |conf|
-  toolchain :visualcpp
-
-  conf.gembox 'full-core'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
-  end
-  setup_option(conf)
-  conf.enable_bintest
-  conf.enable_test
-
-  enable_cxx_abi
-
-  build_mrbc_exec
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/benchmark/build_config_boxing.rb Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/benchmark/build_config_cc.rb Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/doc/opcode.md Deleted

@@ -1,140 +0,0 @@
-# The new bytecode
-
-We will reimplement VM to use 8bit instruction code. By
-bytecode, we mean real byte code. The whole purpose is
-reducing the memory consumption of mruby VM.
-
-# Instructions
-
-Instructions are bytes. There can be 256 instructions. Currently we
-have 94 instructions. Instructions can take 0 to 3 operands.
-
-## operands
-
-The size of operands can be either 8bits, 16bits or 24bits.
-In the table.1 below, the second field describes the size (and
-sign) of operands.
-
-* B: 8bit
-* S: 16bit
-* sS: signed 16bit
-* W: 24bit
-
-First two byte operands may be extended to 16bit. When those byte
-operands are bigger than 256, the instruction will be prefixed by
-`OP_EXT1` (means 1st operand is 16bit) or `OP_EXT2` (means 2nd operand
-is 16bit) or `OP_EXT3` (means 1st and 2nd operands are 16bit).
-
-For instructions marked by `'`, `OP_EXT1` can be prefixed. For those
-with `"`, either `OP_EXT1` or `OP_EXT2` or `OP_EXT2` can be prefixed.
-
-## table.1 Instruction Table
-
-| Instruction Name | Operand type | Semantics                                              |
-|------------------|--------------|--------------------------------------------------------|
-| OP_NOP           | -            | no operation                                           |
-| OP_MOVE"         | BB           | R(a) = R(b)                                            |
-| OP_LOADL"        | BB           | R(a) = Pool(b)                                         |
-| OP_LOADI"        | BB           | R(a) = mrb_int(b)                                      |
-| OP_LOADINEG"     | BB           | R(a) = mrb_int(-b)                                     |
-| OP_LOADI__1'     | B            | R(a) = mrb_int(-1)                                     |
-| OP_LOADI_0'      | B            | R(a) = mrb_int(0)                                      |
-| OP_LOADI_1'      | B            | R(a) = mrb_int(1)                                      |
-| OP_LOADI_2'      | B            | R(a) = mrb_int(2)                                      |
-| OP_LOADI_3'      | B            | R(a) = mrb_int(3)                                      |
-| OP_LOADI_4'      | B            | R(a) = mrb_int(4)                                      |
-| OP_LOADI_5'      | B            | R(a) = mrb_int(5)                                      |
-| OP_LOADI_6'      | B            | R(a) = mrb_int(6)                                      |
-| OP_LOADI_7'      | B            | R(a) = mrb_int(7)                                      |
-| OP_LOADI16'      | BsS          | R(a) = mrb_int(b)                                      |
-| OP_LOADSYM"      | BB           | R(a) = Syms(b)                                         |
-| OP_LOADNIL'      | B            | R(a) = nil                                             |
-| OP_LOADSELF'     | B            | R(a) = self                                            |
-| OP_LOADT'        | B            | R(a) = true                                            |
-| OP_LOADF'        | B            | R(a) = false                                           |
-| OP_GETGV"        | BB           | R(a) = getglobal(Syms(b))                              |
-| OP_SETGV"        | BB           | setglobal(Syms(b), R(a))                               |
-| OP_GETSV"        | BB           | R(a) = 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_ONERR         | S            | rescue_push(a)                                         |
-| OP_EXCEPT'       | B            | R(a) = exc                                             |
-| OP_RESCUE"       | BB           | R(b) = R(a).isa?(R(b))                                 |
-| OP_POPERR'       | B            | a.times{rescue_pop()}                                  |
-| OP_RAISE'        | B            | raise(R(a))                                            |
-| OP_EPUSH'        | B            | ensure_push(SEQa)                                    |
-| OP_EPOP'         | B            | A.times{ensure_pop().call}                             |
-| OP_SENDV"        | BB           | R(a) = call(R(a),Syms(b),*R(a+1))                      |
-| OP_SENDVB"       | BB           | R(a) = call(R(a),Syms(b),*R(a+1),&R(a+2))              |
-| OP_SEND"         | BBB          | R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c))            |
-| OP_SENDB"        | BBB          | R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c),&R(a+c+1))  |
-| OP_CALL          | -            | R(0) = self.call(frame.argc, frame.argv)               |
-| OP_SUPER"        | BB           | R(a) = super(R(a+1),... ,R(a+b+1))                     |
-| OP_ARGARY'       | BS           | R(a) = argument array (16=5:1:5:1:4)                   |
-| OP_ENTER         | W            | arg setup according to flags (23=5:5:1:5:5:1:1)        |
-| OP_KEY_P"        | BB           | R(a) = kdict.key?(Syms(b))                             |
-| OP_KEYEND        | -            | raise unless kdict.empty?                              |
-| OP_KARG"         | BB           | R(a) = 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=5:1:5:1:4)                            |
-| OP_ADD'          | B            | R(a) = R(a)+R(a+1)                                     |
-| OP_ADDI"         | BB           | R(a) = R(a)+mrb_int(b)                                 |
-| OP_SUB'          | B            | R(a) = R(a)-R(a+1)                                     |
-| OP_SUBI"         | BB           | R(a) = R(a)-mrb_int(b)                                 |
-| OP_MUL'          | B            | R(a) = R(a)*R(a+1)                                     |
-| OP_DIV'          | B            | R(a) = R(a)/R(a+1)                                     |
-| OP_EQ'           | B            | R(a) = R(a)==R(a+1)                                    |
-| OP_LT'           | B            | R(a) = R(a)<R(a+1)                                     |
-| OP_LE'           | B            | R(a) = R(a)<=R(a+1)                                    |
-| OP_GT'           | B            | R(a) = R(a)>R(a+1)                                     |
-| OP_GE'           | B            | R(a) = R(a)>=R(a+1)                                    |
-| OP_ARRAY"        | BB           | R(a) = ary_new(R(a),R(a+1)..R(a+b))                    |
-| OP_ARRAY2"       | BBB          | R(a) = ary_new(R(b),R(b+1)..R(b+c))                    |
-| OP_ARYCAT'       | B            | ary_cat(R(a),R(a+1))                                   |
-| OP_ARYPUSH'      | B            | ary_push(R(a),R(a+1))                                  |
-| OP_ARYDUP'       | B            | R(a) = ary_dup(R(a))                                   |
-| OP_AREF"         | BBB          | R(a) = R(b)c                                         |
-| OP_ASET"         | BBB          | R(a)c = R(b)                                         |
-| OP_APOST"        | BBB          | *R(a),R(a+1)..R(a+c) = R(a)b..                       |
-| OP_INTERN'       | B            | R(a) = intern(R(a))                                    |
-| OP_STRING"       | BB           | R(a) = str_dup(Lit(b))                                 |
-| OP_STRCAT'       | B            | str_cat(R(a),R(a+1))                                   |
-| OP_HASH"         | BB           | R(a) = hash_new(R(a),R(a+1)..R(a+b))                   |
-| OP_HASHADD"      | BB           | R(a) = hash_push(R(a),R(a+1)..R(a+b))                  |
-| OP_HASHCAT'      | B            | R(a) = hash_cat(R(a),R(a+1))                           |
-| OP_LAMBDA"       | BB           | R(a) = lambda(SEQb,OP_L_LAMBDA)                      |
-| OP_BLOCK"        | BB           | R(a) = lambda(SEQb,OP_L_BLOCK)                       |
-| OP_METHOD"       | BB           | R(a) = lambda(SEQb,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),SEQb)                          |
-| OP_DEF"          | BB           | R(a).newmethod(Syms(b),R(a+1))                         |
-| OP_ALIAS"        | BB           | alias_method(target_class,Syms(a),Syms(b))             |
-| OP_UNDEF'        | B            | undef_method(target_class,Syms(a))                     |
-| OP_SCLASS'       | B            | R(a) = R(a).singleton_class                            |
-| OP_TCLASS'       | B            | R(a) = target_class                                    |
-| OP_DEBUG"        | BBB          | print a,b,c                                            |
-| OP_ERR'          | B            | raise(LocalJumpError, Lit(a))                          |
-| OP_EXT1          | -            | make 1st operand 16bit                                 |
-| OP_EXT2          | -            | make 2nd operand 16bit                                 |
-| OP_EXT3          | -            | make 1st and 2nd operands 16bit                        |
-| OP_STOP          | -            | stop VM                                                |
-|------------------|--------------|--------------------------------------------------------|

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_ArduinoDue.rb Deleted

@@ -1,90 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-# Cross Compiling configuration for Arduino Due
-# http://arduino.cc/en/Main/ArduinoBoardDue
-#
-# Requires Arduino IDE >= 1.5
-MRuby::CrossBuild.new("ArduinoDue") do |conf|
-  toolchain :gcc
-
-  # Mac OS X, Arduino IDE <= 1.5.6
-  # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Resources/Java'
-  # Mac OS X, Arduino IDE >= 1.5.7
-  # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Java'
-  # GNU Linux
-  ARDUINO_PATH = '/opt/arduino'
-   # Arduino IDE <= 1.5.6
-  BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/g++_arm_none_eabi/bin"
-  # Arduino IDE >= 1.5.7
-  # BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin"
-  SAM_PATH = "#{ARDUINO_PATH}/hardware/arduino/sam"
-  TARGET_PATH = "#{SAM_PATH}/variants/arduino_due_x"
-
-  conf.cc do |cc|
-    cc.command = "#{BIN_PATH}/arm-none-eabi-gcc"
-    cc.include_paths << "#{SAM_PATH}/system/libsam", "#{SAM_PATH}/system/CMSIS/CMSIS/Include/",
-                        "#{SAM_PATH}/system/CMSIS/Device/ATMEL/",
-                        "#{SAM_PATH}/cores/arduino", "#{SAM_PATH}/libraries","#{TARGET_PATH}"
-    cc.flags = %w(-g -Os -w -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500
-                -Dprintf=iprintf -mcpu=cortex-m3 -DF_CPU=84000000L -DARDUINO=156 -DARDUINO_SAM_DUE -DARDUINO_ARCH_SAM
-                -D__SAM3X8E__ -mthumb -DUSB_PID=0x003e -DUSB_VID=0x2341 -DUSBCON -DUSB_MANUFACTURER="Unknown" -DUSB_PRODUCT="Arduino Due")
-    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
-
-    #configuration for low memory environment
-    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
-    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
-    cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20)
-    cc.defines << %w(MRB_GC_STRESS)
-    #cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio.
-    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.flags << %w(-fno-rtti -fno-exceptions)
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{BIN_PATH}/arm-none-eabi-ar"
-    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
-  end
-
-  #no executables
-  conf.bins = 
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  #disable C++ exception
-  conf.disable_cxx_exception
-
-  #gems from core
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-enum-ext"
-
-  #light-weight regular expression
-  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
-
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_IntelEdison.rb Deleted

@@ -1,69 +0,0 @@
-# Cross-compiling setup for Intel Edison (poky linux) platform
-# Get SDK from here: https://software.intel.com/en-us/iot/hardware/edison/downloads
-# REMEMBER to check and update the SDK root in the constant POKY_EDISON_PATH
-
-MRuby::Build.new do |conf|
-  toolchain :gcc
-  conf.gembox 'default'
-  conf.cc.defines = %w(ENABLE_READLINE)
-  conf.gembox 'default'
-
-  #lightweight regular expression
-  conf.gem :github => "pbosetti/mruby-hs-regexp", :branch => "master"
-
-end
-
-# Define cross build settings
-MRuby::CrossBuild.new('core2-32-poky-linux') do |conf|
-  toolchain :gcc
-
-  # Mac OS X
-  #
-  POKY_EDISON_PATH = '/opt/poky-edison/1.7.2'
-
-  POKY_EDISON_SYSROOT =  "#{POKY_EDISON_PATH}/sysroots/core2-32-poky-linux"
-  POKY_EDISON_X86_PATH = "#{POKY_EDISON_PATH}/sysroots/i386-pokysdk-darwin"
-  POKY_EDISON_BIN_PATH = "#{POKY_EDISON_X86_PATH}/usr/bin/i586-poky-linux"
-
-
-  conf.cc do |cc|
-    cc.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-gcc"
-    cc.include_paths << "#{POKY_EDISON_SYSROOT}/usr/include", "#{POKY_EDISON_X86_PATH}/usr/include"
-    cc.flags = %w(-m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mstackrealign -fno-omit-frame-pointer)
-    cc.flags << %w(-O2 -pipe -g -feliminate-unused-debug-types)
-    cc.flags << "--sysroot=#{POKY_EDISON_SYSROOT}"
-    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
-    cc.defines = %w(ENABLE_READLINE)
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-g++"
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.include_paths << "#{POKY_EDISON_SYSROOT}/usr/include/c++/4.9.1"
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-ar"
-    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
-  end
-
-  conf.linker do |linker|
-    linker.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-g++"
-    linker.flags = %w(-m32 -march=i586)
-    linker.flags << "--sysroot=#{POKY_EDISON_SYSROOT}"
-    linker.flags << %w(-O1)
-    linker.libraries = %w(m pthread)
-  end
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  conf.gembox 'default'
-
-  #lightweight regular expression
-  conf.gem :github => "pbosetti/mruby-hs-regexp", :branch => "master"
-
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_IntelGalileo.rb Deleted

@@ -1,106 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-
-# Cross Compiling configuration for Intel Galileo on Arduino environment
-# http://arduino.cc/en/ArduinoCertified/IntelGalileo
-#
-# Requires Arduino IDE for Intel Galileo
-MRuby::CrossBuild.new("Galileo") do |conf|
-  toolchain :gcc
-
-  # Mac OS X
-  # Assume you renamed Arduino.app to Arduino_Galileo.app
-  GALILEO_ARDUINO_PATH = '/Applications/Arduino_Galileo.app/Contents/Resources/Java'
-  # GNU Linux
-  #ARDUINO_GALILEO_PATH = '/opt/arduino'
-
-  GALILEO_BIN_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i386-pokysdk-darwin/usr/bin/i586-poky-linux-uclibc"
-  GALILEO_SYSROOT =  "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc"
-  GALILEO_X86_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/arduino/x86"
-
-
-  conf.cc do |cc|
-    cc.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-gcc"
-    cc.include_paths << "#{GALILEO_X86_PATH}/cores/arduino", "#{GALILEO_X86_PATH}/variants/galileo_fab_d"
-    cc.flags = %w(-m32 -march=i586 -c -g -Os -w
-              -ffunction-sections -fdata-sections -MMD -DARDUINO=153)
-    cc.flags << "--sysroot=#{GALILEO_SYSROOT}"
-    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-g++"
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.include_paths << "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc/usr/include/c++"
-    cxx.include_paths << "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc/usr/include/c++/i586-poky-linux-uclibc"
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-ar"
-    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
-  end
-
-  conf.linker do |linker|
-    linker.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-g++"
-    linker.flags = %w(-m32 -march=i586)
-    linker.flags << "--sysroot=#{GALILEO_SYSROOT}"
-    linker.flags << %w(-Os -Wl,--gc-sections)
-    linker.libraries = %w(m pthread)
-  end
-
-  #no executables
-  conf.bins = 
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  #official mrbgems
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-time"
-  conf.gem :core => "mruby-struct"
-  conf.gem :core => "mruby-enum-ext"
-  conf.gem :core => "mruby-string-ext"
-  conf.gem :core => "mruby-numeric-ext"
-  conf.gem :core => "mruby-array-ext"
-  conf.gem :core => "mruby-hash-ext"
-  conf.gem :core => "mruby-range-ext"
-  conf.gem :core => "mruby-proc-ext"
-  conf.gem :core => "mruby-symbol-ext"
-  conf.gem :core => "mruby-random"
-  conf.gem :core => "mruby-object-ext"
-  conf.gem :core => "mruby-objectspace"
-  conf.gem :core => "mruby-fiber"
-  conf.gem :core => "mruby-toplevel-ext"
-
-  #lightweigh regular expression
-  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master" do |g|
-  #  g.cxx.include_paths << "#{GALILEO_X86_PATH}/libraries/Wire"
-  #  g.cxx.include_paths << "#{GALILEO_X86_PATH}/libraries/Servo"
-
-    #enable unsupported Servo class
-  #  g.cxx.defines << "MRUBY_ARDUINO_GALILEO_ENABLE_SERVO"
-  #end
-
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_RX630.rb Deleted

@@ -1,81 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-# Cross Compiling configuration for RX630
-# http://gadget.renesas.com/
-#
-# Requires gnurx_v14.03
-MRuby::CrossBuild.new("RX630") do |conf|
-  toolchain :gcc
-
-  # Linux
-  BIN_PATH = "/usr/share/gnurx_v14.03_elf-1/bin"
-
-  conf.cc do |cc|
-    cc.command = "#{BIN_PATH}/rx-elf-gcc"
-    cc.flags = "-Wall -g -O2 -flto -mcpu=rx600 -m64bit-doubles"
-    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
-
-    #configuration for low memory environment
-    cc.defines << %w(MRB_USE_FLOAT)
-    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
-    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
-    cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20)
-    cc.defines << %w(MRB_GC_STRESS)
-    cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio.
-    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.linker do |linker|
-    linker.command="#{BIN_PATH}/rx-elf-ld"
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{BIN_PATH}/rx-elf-ar"
-    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
-  end
-
-  #no executables
-  conf.bins = 
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  #disable C++ exception
-  conf.disable_cxx_exception
-
-  #gems from core
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-enum-ext"
-  conf.gem :core => "mruby-numeric-ext"
-
-  #light-weight regular expression
-  #conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
-
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_android_arm64-v8a.rb Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_android_armeabi.rb Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_android_armeabi_v7a_neon_hard.rb Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_chipKITMax32.rb Deleted

@@ -1,86 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-# Cross Compiling configuration for Digilent chipKIT Max32
-# http://www.digilentinc.com/Products/Detail.cfm?Prod=CHIPKIT-MAX32
-#
-# Requires MPIDE (https://github.com/chipKIT32/chipKIT32-MAX)
-#
-# This configuration is based on @kyab's version
-# http://d.hatena.ne.jp/kyab/20130201
-MRuby::CrossBuild.new("chipKITMax32") do |conf|
-  toolchain :gcc
-
-  # Mac OS X
-  # MPIDE_PATH = '/Applications/Mpide.app/Contents/Resources/Java'
-  # GNU Linux
-  MPIDE_PATH = '/opt/mpide-0023-linux-20120903'
-
-  PIC32_PATH = "#{MPIDE_PATH}/hardware/pic32"
-
-  conf.cc do |cc|
-    cc.command = "#{PIC32_PATH}/compiler/pic32-tools/bin/pic32-gcc"
-    cc.include_paths << "#{PIC32_PATH}/cores/pic32",
-                        "#{PIC32_PATH}/variants/Max32",
-                        "#{PIC32_PATH}/libraries"
-    cc.flags = %w(-O2 -mno-smart-io -w -ffunction-sections -fdata-sections -g -mdebugger -Wcast-align
-                -fno-short-double -mprocessor=32MX795F512L -DF_CPU=80000000L -DARDUINO=23 -D_BOARD_MEGA_
-                -DMPIDEVER=0x01000202 -DMPIDE=23)
-    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
-
-    #configuration for low memory environment
-    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
-    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
-    cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20)
-    cc.defines << %w(MRB_GC_STRESS)
-    #cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio.
-    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{PIC32_PATH}/compiler/pic32-tools/bin/pic32-ar"
-    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
-  end
-
-  #no executables
-  conf.bins = 
-
-  #do not build test executable
-  conf.build_mrbtest_lib_only
-
-  #disable C++ exception
-  conf.disable_cxx_exception
-
-  #gems from core
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-enum-ext"
-
-  #light-weight regular expression
-  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
-
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/targets/build_config_dreamcast_shelf.rb Deleted

@@ -1,108 +0,0 @@
-MRuby::Build.new do |conf|
-  # Gets set by the VS command prompts
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # Include the default GEMs
-  conf.gembox 'default'
-end
-
-# Cross Compiling configuration for the Sega Dreamcast
-# This configuration requires KallistiOS (KOS)
-# https://dreamcast.wiki
-#
-# Tested on GNU/Linux, MinGW-w64/MSYS2, Cygwin, macOS and MinGW/MSYS (see below)
-#
-MRuby::CrossBuild.new("dreamcast") do |conf|
-  toolchain :gcc
-
-  # Support for DreamSDK (based on MinGW/MSYS)
-  # To compile mruby with DreamSDK, RubyInstaller for Windows should be installed
-  DREAMSDK_HOME = ENV"DREAMSDK_HOME"
-  MSYS_ROOT = !(DREAMSDK_HOME.nil? || DREAMSDK_HOME.empty?) ? "#{DREAMSDK_HOME}/msys/1.0" : ""
- 
-  # Setting paths
-  DREAMCAST_PATH = "#{MSYS_ROOT}/opt/toolchains/dc"
-  KOS_PATH = "#{DREAMCAST_PATH}/kos"
-  BIN_PATH = "#{DREAMCAST_PATH}/sh-elf/bin"
-
-  # C compiler
-  # Flags were extracted from KallistiOS environment files
-  conf.cc do |cc|
-    cc.command = "#{BIN_PATH}/sh-elf-gcc"	
-    cc.include_paths << "#{KOS_PATH}/include", "#{KOS_PATH}/kernel/arch/dreamcast/include", "#{KOS_PATH}/addons/include", "#{KOS_PATH}/../kos-ports/include"
-    cc.flags << "-O2", "-fomit-frame-pointer", "-ml", "-m4-single-only", "-ffunction-sections", "-fdata-sections", "-Wall", "-g", "-fno-builtin", "-ml", "-m4-single-only", "-Wl,-Ttext=0x8c010000", "-Wl,--gc-sections", "-T#{KOS_PATH}/utils/ldscripts/shlelf.xc", "-nodefaultlibs"
-    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
-    cc.defines << %w(_arch_dreamcast)
-    cc.defines << %w(_arch_sub_pristine)
-  end
-
-  # C++ compiler
-  conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.flags << %w(-fno-rtti -fno-exceptions)
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
- 
-  # Linker
-  # There is an issue when making the mruby library with KallistiOS:
-  # 'newlib_kill.o' and 'newlib_getpid.o' aren't found so they are explicitly 
-  # specified here at least for now.
-  conf.linker do |linker|
-    linker.command="#{BIN_PATH}/sh-elf-gcc"
-    linker.flags << "#{MSYS_ROOT}/opt/toolchains/dc/kos/kernel/build/newlib_kill.o", "#{MSYS_ROOT}/opt/toolchains/dc/kos/kernel/build/newlib_getpid.o", "-Wl,--start-group -lkallisti -lc -lgcc -Wl,--end-group"
-    linker.library_paths << "#{KOS_PATH}/lib/dreamcast", "#{KOS_PATH}/addons/lib/dreamcast", "#{KOS_PATH}/../kos-ports/lib"
-  end  
-
-  # Archiver
-  conf.archiver do |archiver|
-    archiver.command = "#{BIN_PATH}/sh-elf-ar"
-    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
-  end
-
-  # No executables
-  conf.bins = 
-
-  # Do not build executable test
-  conf.build_mrbtest_lib_only
-
-  # Disable C++ exception
-  conf.disable_cxx_exception
-  
-  # Gems from core
-  # removing mruby-io
-  conf.gem :core => "mruby-metaprog"
-  conf.gem :core => "mruby-pack"
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-time"
-  conf.gem :core => "mruby-struct"
-  conf.gem :core => "mruby-compar-ext"
-  conf.gem :core => "mruby-enum-ext"
-  conf.gem :core => "mruby-string-ext"
-  conf.gem :core => "mruby-numeric-ext"
-  conf.gem :core => "mruby-array-ext"
-  conf.gem :core => "mruby-hash-ext"
-  conf.gem :core => "mruby-range-ext"
-  conf.gem :core => "mruby-proc-ext"
-  conf.gem :core => "mruby-symbol-ext"
-  conf.gem :core => "mruby-random"
-  conf.gem :core => "mruby-object-ext"
-  conf.gem :core => "mruby-objectspace"
-  conf.gem :core => "mruby-fiber"
-  conf.gem :core => "mruby-enumerator"
-  conf.gem :core => "mruby-enum-lazy"
-  conf.gem :core => "mruby-toplevel-ext"
-  conf.gem :core => "mruby-kernel-ext"
-  conf.gem :core => "mruby-class-ext"
-  conf.gem :core => "mruby-compiler"
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/lib/mruby-core-ext.rb Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/bintest Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/bintest/mrbc.rb Deleted

@@ -1,30 +0,0 @@
-require 'tempfile'
-
-assert('Compiling multiple files without new line in last line. #2361') do
-  a, b, out = Tempfile.new('a.rb'), Tempfile.new('b.rb'), Tempfile.new('out.mrb')
-  a.write('module A; end')
-  a.flush
-  b.write('module B; end')
-  b.flush
-  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} #{b.path} 2>&1`
-  assert_equal "#{cmd('mrbc')}:#{a.path}:Syntax OK", result.chomp
-  assert_equal 0, $?.exitstatus
-end
-
-assert('parsing function with void argument') do
-  a, out = Tempfile.new('a.rb'), Tempfile.new('out.mrb')
-  a.write('f ()')
-  a.flush
-  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} 2>&1`
-  assert_equal "#{cmd('mrbc')}:#{a.path}:Syntax OK", result.chomp
-  assert_equal 0, $?.exitstatus
-end
-
-assert('embedded document with invalid terminator') do
-  a, out = Tempfile.new('a.rb'), Tempfile.new('out.mrb')
-  a.write("=begin\n=endx\n")
-  a.flush
-  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} 2>&1`
-  assert_equal "#{a.path}:3:0: embedded document meets end of file", result.chomp
-  assert_equal 1, $?.exitstatus
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-inline-struct Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-inline-struct/mrbgem.rake Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-inline-struct/test Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.c Deleted

@@ -1,84 +0,0 @@
-#include <mruby.h>
-#include <mruby/class.h>
-#include <mruby/string.h>
-#include <mruby/istruct.h>
-
-static mrb_value
-istruct_test_initialize(mrb_state *mrb, mrb_value self)
-{
-  char *string = (char*)mrb_istruct_ptr(self);
-  mrb_int size = mrb_istruct_size();
-  mrb_value object = mrb_get_arg1(mrb);
-
-  if (mrb_fixnum_p(object)) {
-    strncpy(string, "fixnum", size-1);
-  }
-#ifndef MRB_WITHOUT_FLOAT
-  else if (mrb_float_p(object)) {
-    strncpy(string, "float", size-1);
-  }
-#endif
-  else if (mrb_string_p(object)) {
-    strncpy(string, "string", size-1);
-  }
-  else {
-    strncpy(string, "anything", size-1);
-  }
-
-  stringsize - 1 = 0; // force NULL at the end
-  return self;
-}
-
-static mrb_value
-istruct_test_to_s(mrb_state *mrb, mrb_value self)
-{
-  return mrb_str_new_cstr(mrb, (const char*)mrb_istruct_ptr(self));
-}
-
-static mrb_value
-istruct_test_length(mrb_state *mrb, mrb_value self)
-{
-  return mrb_fixnum_value(mrb_istruct_size());
-}
-
-static mrb_value
-istruct_test_test_receive(mrb_state *mrb, mrb_value self)
-{
-  mrb_value object = mrb_get_arg1(mrb);
-
-  if (mrb_obj_class(mrb, object) != mrb_class_get(mrb, "InlineStructTest"))
-  {
-    mrb_raise(mrb, E_TYPE_ERROR, "Expected InlineStructTest");
-  }
-  return mrb_bool_value(((char*)mrb_istruct_ptr(object))0 == 's');
-}
-
-static mrb_value
-istruct_test_test_receive_direct(mrb_state *mrb, mrb_value self)
-{
-  char *ptr;
-  mrb_get_args(mrb, "I", &ptr);
-  return mrb_bool_value(ptr0 == 's');
-}
-
-static mrb_value
-istruct_test_mutate(mrb_state *mrb, mrb_value self)
-{
-  char *ptr = (char*)mrb_istruct_ptr(self);
-  memcpy(ptr, "mutate", 6);
-  return mrb_nil_value();
-}
-
-void mrb_mruby_inline_struct_gem_test(mrb_state *mrb)
-{
-  struct RClass *cls;
-
-  cls = mrb_define_class(mrb, "InlineStructTest", mrb->object_class);
-  MRB_SET_INSTANCE_TT(cls, MRB_TT_ISTRUCT);
-  mrb_define_method(mrb, cls, "initialize", istruct_test_initialize, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, cls, "to_s", istruct_test_to_s, MRB_ARGS_NONE());
-  mrb_define_method(mrb, cls, "mutate", istruct_test_mutate, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, cls, "length", istruct_test_length, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, cls, "test_receive", istruct_test_test_receive, MRB_ARGS_REQ(1));
-  mrb_define_class_method(mrb, cls, "test_receive_direct", istruct_test_test_receive_direct, MRB_ARGS_REQ(1));
-}

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-sleep/src/mrb_sleep.c Deleted

@@ -1,136 +0,0 @@
-/*
-** mrb_sleep - sleep methods for mruby
-**
-** Copyright (c) mod_mruby developers 2012-
-** Copyright (c) mruby developers 2018
-**
-** 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 
-*/
-
-#include <time.h>
-#ifdef _WIN32
-    #include <windows.h>
-    #define sleep(x) Sleep(x * 1000)
-    #define usleep(x) Sleep((DWORD)(((x)<1000) ? 1 : ((x)/1000)))
-#else
-    #include <unistd.h>
-    #include <sys/time.h>
-#endif
-
-#include "mruby.h"
-
-/* not implemented forever sleep (called without an argument)*/
-static mrb_value
-mrb_f_sleep(mrb_state *mrb, mrb_value self)
-{
-    time_t beg = time(0);
-    time_t end;
-#ifndef MRB_WITHOUT_FLOAT
-    mrb_float sec;
-
-    mrb_get_args(mrb, "f", &sec);
-    if (sec >= 0) {
-        usleep(sec * 1000000);
-    }
-    else {
-        mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative");
-    }
-#else
-    mrb_int sec;
-
-    mrb_get_args(mrb, "i", &sec);
-    if (sec >= 0) {
-        sleep(sec);
-    } else {
-        mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative");
-    }
-#endif
-    end = time(0) - beg;
-
-    return mrb_fixnum_value(end);
-}
-
-/* mruby special; needed for mruby without float numbers */
-static mrb_value
-mrb_f_usleep(mrb_state *mrb, mrb_value self)
-{
-    mrb_int usec;
-#ifdef _WIN32
-    FILETIME st_ft,ed_ft;
-    unsigned __int64 st_time = 0;
-    unsigned __int64 ed_time = 0;
-#else
-    struct timeval st_tm,ed_tm;
-#endif
-    time_t slp_tm;
-
-#ifdef _WIN32
-    GetSystemTimeAsFileTime(&st_ft);
-#else
-    gettimeofday(&st_tm, NULL);
-#endif
-
-    /* not implemented forever sleep (called without an argument)*/
-    mrb_get_args(mrb, "i", &usec);
-
-    if (usec >= 0) {
-        usleep(usec);
-    } else {
-        mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative integer");
-    }
-
-#ifdef _WIN32
-    GetSystemTimeAsFileTime(&ed_ft);
-
-    st_time |= st_ft.dwHighDateTime;
-    st_time <<=32;
-    st_time |= st_ft.dwLowDateTime;
-    ed_time |= ed_ft.dwHighDateTime;
-    ed_time <<=32;
-    ed_time |= ed_ft.dwLowDateTime;
-
-    slp_tm = (ed_time - st_time) / 10;
-#else
-    gettimeofday(&ed_tm, NULL);
-
-    if (st_tm.tv_usec > ed_tm.tv_usec) {
-        slp_tm = 1000000 + ed_tm.tv_usec - st_tm.tv_usec;
-    }
-    else {
-        slp_tm = ed_tm.tv_usec - st_tm.tv_usec;
-    }
-#endif
-
-    return mrb_fixnum_value(slp_tm);
-}
-
-void
-mrb_mruby_sleep_gem_init(mrb_state *mrb)
-{
-    mrb_define_method(mrb, mrb->kernel_module, "sleep",   mrb_f_sleep,   MRB_ARGS_REQ(1));
-    mrb_define_method(mrb, mrb->kernel_module, "usleep",  mrb_f_usleep,  MRB_ARGS_REQ(1));
-}
-
-void
-mrb_mruby_sleep_gem_final(mrb_state *mrb)
-{
-}

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-sprintf/src/kernel.c Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrblib/init_mrblib.c Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrblib/mrblib.rake Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/src/crc.c Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/src/mruby_core.rake Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/tasks/gitlab.rake Deleted

@@ -1,115 +0,0 @@
-CI_VERSION = '0.7'.freeze
-CI_BASE = 'ubuntu:16.10'.freeze
-CI_COMPILERS = 'gcc-4.7',
-                'gcc-4.8',
-                'gcc-4.9',
-                'gcc-5',
-                'gcc-6',
-                'clang-3.5',
-                'clang-3.6',
-                'clang-3.7',
-                'clang-3.8',
-                'clang-3.9'.freeze
-
-def ci_image_tag(compiler)
-  compiler.tr('+', 'c').delete('-').delete('.')
-end
-
-def ci_docker_tag(compiler)
-  tag = ci_image_tag(compiler)
-  "registry.gitlab.com/dabroz/mruby:#{tag}_#{CI_VERSION}"
-end
-
-def run_cmd(cmd)
-  puts cmd
-  raise 'error' unless system cmd
-end
-
-desc 'recreate docker images for GitLab builds'
-task :gitlab_dockers do
-  CI_COMPILERS.each do |compiler|
-    tag = ci_image_tag(compiler)
-    filename = "Dockerfile.#{tag}"
-    File.open(filename, 'wb') do |f|
-      f << "# #{compiler} - #{tag}\n"
-      f << "FROM #{CI_BASE}\n"
-      f << "RUN apt-get update && apt-get install -y git ruby2.3 ruby2.3-dev bison\n"
-      f << "RUN apt-get update && apt-get install -y binutils manpages\n"
-      f << "RUN apt-get update && apt-get install -y #{compiler}\n"
-      if compiler'gcc'
-        f << "RUN apt-get update && apt-get install -y libx32#{compiler}-dev\n"
-        f << "RUN apt-get update && apt-get install --no-install-recommends -y #{compiler}-multilib\n"
-      end
-      f << "RUN dpkg --add-architecture i386\n"
-      f << "RUN apt-get update && apt-get install -y linux-libc-dev:i386\n"
-      if compiler'clang'
-        f << "RUN apt-get update && apt-get install --no-install-recommends -y libc6-dev-i386\n"
-        f << "RUN apt-get update && apt-get install -y gcc gcc-multilib\n"
-      end
-    end
-    docker_tag = ci_docker_tag(compiler)
-    cmd1 = "docker build -t #{docker_tag} -f #{filename} ."
-    cmd2 = "docker push #{docker_tag}"
-    run_cmd cmd1
-    run_cmd cmd2
-    File.delete(filename)
-  end
-end
-
-desc 'create build configurations and update .gitlab-ci.yml'
-task :gitlab_config do
-  require 'yaml'
-
-  configs = 
-  true, false.each do |mode_32|
-    '', 'MRB_USE_FLOAT'.each do |float_conf|
-      '', 'MRB_NAN_BOXING', 'MRB_WORD_BOXING'.each do |boxing_conf|
-        '', 'MRB_UTF8_STRING'.each do |utf8_conf|
-          next if (float_conf == 'MRB_USE_FLOAT') && (boxing_conf == 'MRB_NAN_BOXING')
-          next if (int_conf == 'MRB_INT64') && (boxing_conf == 'MRB_NAN_BOXING')
-          next if (int_conf == 'MRB_INT64') && (boxing_conf == 'MRB_WORD_BOXING') && mode_32
-          env = float_conf, int_conf, boxing_conf, utf8_conf.map do |conf|
-            conf == '' ? nil : "-D#{conf}=1"
-          end.compact.join(' ')
-          bit = mode_32 ? '-m32 ' : ''
-          _info = ''
-          _info += mode_32 ? '32bit ' : '64bit '
-          _info += float_conf'USE' ? 'float ' : ''
-          _info += int_conf'16' ? 'int16 ' : ''
-          _info += int_conf'64' ? 'int64 ' : ''
-          _info += boxing_conf'NAN' ? 'nan ' : ''
-          _info += boxing_conf'WORD' ? 'word ' : ''
-          _info += utf8_conf'UTF8' ? 'utf8 ' : ''
-          _info = _info.gsub(/ +/, ' ').strip.tr(' ', '_')
-          configs << { '_info' => _info, 'CFLAGS' => "#{bit}#{env}", 'LDFLAGS' => bit.strip.to_s }
-        end
-      end
-    end
-  end
-  path = './.gitlab-ci.yml'
-  data = YAML.load_file(path)
-  data.keys.select do |key|
-    key.start_with? 'Test'
-  end.each do |key|
-    data.delete(key)
-  end
-  CI_COMPILERS.each do |compiler|
-    configs.each do |config|
-      name = "Test #{compiler} #{config'_info'}"
-      hash = {
-        'CC' => compiler,
-        'CXX' => compiler.gsub('gcc', 'g++').gsub('clang', 'clang++'),
-        'LD' => compiler
-      }
-      hash = hash.merge(config)
-      hash.delete('_info')
-      dataname = {
-        'stage' => 'test',
-        'image' => ci_docker_tag(compiler),
-        'variables' => hash,
-        'script' => 'env; rake --verbose all test'
-      }
-    end
-  end
-  File.open(path, 'w') { |f| YAML.dump(data, f) }
-end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/travis_config.rb Deleted

_service:tar_scm:nghttp2-1.46.0.tar.xz/AUTHORS -> _service:tar_scm:nghttp2-1.52.0.tar.xz/AUTHORS Changed

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

@@ -24,13 +24,13 @@
 
 cmake_minimum_required(VERSION 3.0)
 # XXX using 1.8.90 instead of 1.9.0-DEV
-project(nghttp2 VERSION 1.46.0)
+project(nghttp2 VERSION 1.52.0)
 
 # See versioning rule:
 #  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-set(LT_CURRENT  35)
+set(LT_CURRENT  38)
 set(LT_REVISION 1)
-set(LT_AGE      21)
+set(LT_AGE      24)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 include(Version)
@@ -52,9 +52,8 @@
 
 include(GNUInstallDirs)
 
-# For Python bindings and documentation
-# (Must be called before PythonLibs for matching versions.)
-find_package(PythonInterp)
+# For documentation
+find_package(Python3 COMPONENTS Interpreter)
 
 # Auto-detection of features that can be toggled
 find_package(OpenSSL 1.0.1)
@@ -67,7 +66,12 @@
   set(HAVE_LIBNGTCP2_CRYPTO_OPENSSL 1)
 endif()
 find_package(Libnghttp3 0.0.0)
-find_package(Libbpf 0.4.0)
+if(WITH_LIBBPF)
+  find_package(Libbpf 0.4.0)
+  if(NOT LIBBPF_FOUND)
+    message(FATAL_ERROR "libbpf was requested (WITH_LIBBPF=1) but not found.")
+  endif()
+endif()
 if(OPENSSL_FOUND AND LIBEV_FOUND AND ZLIB_FOUND)
   set(ENABLE_APP_DEFAULT ON)
 else()
@@ -77,15 +81,8 @@
 find_package(Jansson  2.5)
 set(ENABLE_HPACK_TOOLS_DEFAULT ${JANSSON_FOUND})
 # 2.0.8 is required because we use evconnlistener_set_error_cb()
-find_package(Libevent 2.0.8 COMPONENTS libevent openssl)
+find_package(Libevent 2.0.8 COMPONENTS core extra openssl)
 set(ENABLE_EXAMPLES_DEFAULT ${LIBEVENT_OPENSSL_FOUND})
-find_package(Cython)
-find_package(PythonLibs)
-if(CYTHON_FOUND AND PYTHONLIBS_FOUND)
-  set(ENABLE_PYTHON_BINDINGS_DEFAULT ON)
-else()
-  set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
-endif()
 
 find_package(LibXml2 2.6.26)
 set(WITH_LIBXML2_DEFAULT    ${LIBXML2_FOUND})
@@ -94,8 +91,7 @@
 
 include(CMakeOptions.txt)
 
-if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES OR
-  ENABLE_PYTHON_BINDINGS))
+if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES))
   # Remember when disabled options are disabled for later diagnostics.
   set(ENABLE_LIB_ONLY_DISABLED_OTHERS 1)
 else()
@@ -105,7 +101,6 @@
   set(ENABLE_APP            OFF)
   set(ENABLE_HPACK_TOOLS    OFF)
   set(ENABLE_EXAMPLES       OFF)
-  set(ENABLE_PYTHON_BINDINGS OFF)
 endif()
 
 # Do not disable assertions based on CMAKE_BUILD_TYPE.
@@ -151,20 +146,6 @@
 # Additional libraries required for programs under src directory.
 set(APP_LIBRARIES)
 
-if(ENABLE_PYTHON_BINDINGS)
-  if(NOT (CYTHON_FOUND AND PYTHONLIBS_FOUND))
-    message(FATAL_ERROR "python bindings were requested "
-      "(ENABLE_PYTHON_BINDINGS=1) but dependencies are not met.")
-  endif()
-  if(NOT PYTHON_VERSION_STRING STREQUAL PYTHONLIBS_VERSION_STRING)
-    message(FATAL_ERROR
-      "Python executable and library must have the same version!"
-      " Found Python ${PYTHON_VERSION_STRING} and"
-      " PythonLibs ${PYTHONLIBS_VERSION_STRING}"
-    )
-  endif()
-endif()
-
 set(CMAKE_THREAD_PREFER_PTHREAD 1)
 find_package(Threads)
 if(CMAKE_USE_PTHREADS_INIT)
@@ -174,7 +155,7 @@
 # case "$host" in
 #   *android*)
 #     android_build=yes
-#     # android does not need -pthread, but needs followng 3 libs for C++
+#     # android does not need -pthread, but needs following 3 libs for C++
 #     APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
 
 # dl: openssl requires libdl when it is statically linked.
@@ -196,9 +177,12 @@
   cmake_push_check_state()
   set(CMAKE_REQUIRED_INCLUDES   "${OPENSSL_INCLUDE_DIR}")
   set(CMAKE_REQUIRED_LIBRARIES  "${OPENSSL_LIBRARIES}")
+  if(WIN32)
+    set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}" "ws2_32" "bcrypt")
+  endif()
   check_symbol_exists(SSL_is_quic "openssl/ssl.h" HAVE_SSL_IS_QUIC)
   if(NOT HAVE_SSL_IS_QUIC)
-    message(WARNING "OpenSSL in ${OPENSSL_LIBRARIES} dose not have SSL_is_quic.  HTTP/3 support cannot be enabled")
+    message(WARNING "OpenSSL in ${OPENSSL_LIBRARIES} does not have SSL_is_quic.  HTTP/3 support cannot be enabled")
   endif()
   cmake_pop_check_state()
 else()
@@ -235,10 +219,6 @@
 # jemalloc
 set(HAVE_JEMALLOC   ${JEMALLOC_FOUND})
 
-if(ENABLE_ASIO_LIB)
-  find_package(Boost 1.54.0 REQUIRED system thread)
-endif()
-
 # libbpf (for bpf)
 set(HAVE_LIBBPF ${LIBBPF_FOUND})
 if(LIBBPF_FOUND)
@@ -269,13 +249,13 @@
   message(FATAL_ERROR "HPACK tools were requested (ENABLE_HPACK_TOOLS=1) but dependencies are not met.")
 endif()
 
-# C++ library libnghttp2_asio
+# examples
 if(ENABLE_EXAMPLES AND NOT (OPENSSL_FOUND AND LIBEVENT_OPENSSL_FOUND))
   message(FATAL_ERROR "examples were requested (ENABLE_EXAMPLES=1) but dependencies are not met.")
 endif()
 
 # third-party http-parser only be built when needed
-if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_ASIO_LIB)
+if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS)
   set(ENABLE_THIRD_PARTY 1)
   # mruby (for src/nghttpx)
   set(HAVE_MRUBY      ${WITH_MRUBY})
@@ -459,8 +439,6 @@
 foreach(name
    lib/libnghttp2.pc
    lib/includes/nghttp2/nghttp2ver.h
-   src/libnghttp2_asio.pc
-   python/setup.py
    integration-tests/config.go
    integration-tests/setenv
    doc/conf.py
@@ -471,14 +449,9 @@
    doc/tutorial-hpack.rst
    doc/nghttpx-howto.rst
    doc/h2load-howto.rst
-   doc/libnghttp2_asio.rst
-   doc/python-apiref.rst
    doc/building-android-binary.rst
    doc/nghttp2.h.rst
    doc/nghttp2ver.h.rst
-   doc/asio_http2.h.rst
-   doc/asio_http2_server.h.rst
-   doc/asio_http2_client.h.rst
    doc/contribute.rst
 )
   configure_file("${name}.in" "${name}" @ONLY)
@@ -501,13 +474,13 @@
 #add_subdirectory(lib/includes)
 add_subdirectory(third-party)
 add_subdirectory(src)
-#add_subdirectory(src/includes)
 add_subdirectory(examples)
-add_subdirectory(python)
 add_subdirectory(tests)
 #add_subdirectory(tests/testdata)
 add_subdirectory(integration-tests)
-add_subdirectory(doc)
+if(ENABLE_DOC)
+  add_subdirectory(doc)
+endif()
 add_subdirectory(contrib)
 add_subdirectory(script)
 add_subdirectory(bpf)
@@ -529,10 +502,8 @@
       WARNCFLAGS:     ${WARNCFLAGS}
       CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
     Python:
-      Python:         ${PYTHON_EXECUTABLE}
-      PYTHON_VERSION: ${PYTHON_VERSION_STRING}
-      Library version:${PYTHONLIBS_VERSION_STRING}
-      Cython:         ${CYTHON_EXECUTABLE}
+      Python:          ${Python3_EXECUTABLE}
+      Python3_VERSION: ${Python3_VERSION}
     Test:
       CUnit:          ${HAVE_CUNIT} (LIBS='${CUNIT_LIBRARIES}')
       Failmalloc:     ${ENABLE_FAILMALLOC}
@@ -550,8 +521,6 @@
       Jemalloc:       ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}')
       Zlib:           ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}')
       Systemd:        ${HAVE_SYSTEMD} (LIBS='${SYSTEMD_LIBRARIES}')
-      Boost::System:  ${Boost_SYSTEM_LIBRARY}
-      Boost::Thread:  ${Boost_THREAD_LIBRARY}
     Third-party:
       http-parser:    ${ENABLE_THIRD_PARTY}
       MRuby:          ${HAVE_MRUBY}
@@ -559,9 +528,7 @@
     Features:
       Applications:   ${ENABLE_APP}
       HPACK tools:    ${ENABLE_HPACK_TOOLS}
-      Libnghttp2_asio:${ENABLE_ASIO_LIB}
       Examples:       ${ENABLE_EXAMPLES}
-      Python bindings:${ENABLE_PYTHON_BINDINGS}
       Threading:      ${ENABLE_THREADS}
       HTTP/3(EXPERIMENTAL): ${ENABLE_HTTP3}
 ")

_service:tar_scm:nghttp2-1.46.0.tar.xz/CMakeOptions.txt -> _service:tar_scm:nghttp2-1.52.0.tar.xz/CMakeOptions.txt Changed

@@ -7,25 +7,22 @@
   ${ENABLE_APP_DEFAULT})
 option(ENABLE_HPACK_TOOLS "Build HPACK tools"
   ${ENABLE_HPACK_TOOLS_DEFAULT})
-option(ENABLE_ASIO_LIB  "Build C++ libnghttp2_asio library")
 option(ENABLE_EXAMPLES  "Build examples"
   ${ENABLE_EXAMPLES_DEFAULT})
-option(ENABLE_PYTHON_BINDINGS "Build Python bindings"
-  ${ENABLE_PYTHON_BINDINGS_DEFAULT})
 option(ENABLE_FAILMALLOC "Build failmalloc test program" ON)
-option(ENABLE_LIB_ONLY  "Build libnghttp2 only.  This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0 -DENABLE_PYTHON_BINDINGS=0")
+option(ENABLE_LIB_ONLY  "Build libnghttp2 only.  This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0")
 option(ENABLE_STATIC_LIB "Build libnghttp2 in static mode also")
 option(ENABLE_SHARED_LIB "Build libnghttp2 as a shared library" ON)
 option(ENABLE_STATIC_CRT "Build libnghttp2 against the MS LIBCMTd")
 option(ENABLE_HTTP3      "Enable HTTP/3 support" OFF)
+option(ENABLE_DOC "Build documentation" ON)
 
 option(WITH_LIBXML2     "Use libxml2"
   ${WITH_LIBXML2_DEFAULT})
 option(WITH_JEMALLOC    "Use jemalloc"
   ${WITH_JEMALLOC_DEFAULT})
-option(WITH_SPDYLAY     "Use spdylay"
-  ${WITH_SPDYLAY_DEFAULT})
 option(WITH_MRUBY       "Use mruby")
 option(WITH_NEVERBLEED  "Use neverbleed")
+option(WITH_LIBBPF      "Use libbpf")
 
 # vim: ft=cmake:

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

@@ -1,486 +1,518 @@
-commit 7af0c508be9cbec407268e2f546f597d268c104e (HEAD, tag: v1.46.0, origin/master, origin/HEAD, master)
+commit be0491294a63d891bd12b6b1b7e372a45a5d0ffe (HEAD, tag: v1.52.0, origin/master, origin/HEAD, master)
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-19
+AuthorDate: 2023-02-13
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-19
+CommitDate: 2023-02-13
 
     Update manual pages
 
-commit f8474b25f02c4faa6d4250800a164227cf89b327
+commit 17d54064d88f92b3f1d107fef1cb011694d5cb81
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-18
+AuthorDate: 2023-02-10
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-18
+CommitDate: 2023-02-12
 
-    nghttpx: Reduce dgram size if sendmsg fails with EINVAL or EMSGSIZE
+    Bump package version
 
-commit 15a8d913ead5dff164ff0a4191b600b78eec1baf
+commit d8fb86a987a8259944189c57e1f3243e8543fc4c
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
+AuthorDate: 2023-02-10
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
+CommitDate: 2023-02-12
 
-    examples/client: Enable ALPN
+    Update AUTHORS
 
-commit 65d3c9047f5a254a7690178b514655d7b7d7f6f6
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
-
-    Replace TLSv23_method with TLS_method
-
-commit 8c36971ea9679f1e7b05a4a3e6db654a6d9d9019
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
-
-    Compile with OPENSSL_NO_DEPRECATED and fix memory leaks
-
-commit ba1dff187b902f2d09b184b66fc278501eb4656e
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
-
-    Update bash_completion
+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
 
-commit 8ecacc8ed290353cd4414d6a1e70757b0a0c6309
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
-
-    Update manual pages
+    Merge pull request #1862 from nghttp2/bump-quictls
+    
+    Bump quictls
 
-commit 9d418966633a07ac7339ac50569e40c9f8d17d58
+commit 7041b41afacb15a0a5013051edf88b280c9ee282
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
+AuthorDate: 2023-02-12
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
+CommitDate: 2023-02-12
 
-    nghttpx: Rename --frontend-quic-server-id to --quic-server-id
+    Bump quictls
 
-commit 18d4a9e4ff5442b1108f9f07e307539ca2fa3a85
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
+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
 
-    Update bash_completion
+    Merge pull request #1861 from nghttp2/simplify-uniform_int_distribution
+    
+    Simplify std::uniform_int_distribution call
 
-commit 1745a306442a8811e3c0baa48c9953fdeab8abf4
+commit 79f261edf024b5925ac0cb14bb3ed0197faf7a88
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
+AuthorDate: 2023-02-11
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
+CommitDate: 2023-02-11
 
-    Update manual pages
+    Simplify std::uniform_int_distribution call
 
-commit 0cc7c598ff8ac21222c4f6d7840ce441444a9056
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
+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
 
-    src: TLS_DEFAULT_CIPHERSUITES was deprecated in OpenSSL 3.0.0
+    Merge pull request #1860 from nghttp2/bump-llhttp
+    
+    Bump llhttp to f2e1914b6c59f5cd88f492abc9d8af6be246bc85
 
-commit 8c4fbb86d81d9ba8226e2e41d2e247cd1aa62c36
+commit 64b97acc334bd4ab3e26af680b1331e22ffd4977
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-17
+AuthorDate: 2023-02-10
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-17
+CommitDate: 2023-02-10
 
-    Bump version number to 1.46.0, LT revision to 35:1:21
+    Bump llhttp to f2e1914b6c59f5cd88f492abc9d8af6be246bc85
 
-commit 693431312c7b425d4aec0ae0887e331b075571f7
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+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
 
-    Fix cmake build
+    Merge pull request #1859 from nghttp2/bump-libbpf
+    
+    Bump libbpf to v1.1.0
 
-commit f3fca2a19a95d67a2cdcaec6e1b72ccdc9cfafe0
+commit 62802342aac93e876105f1c1eecdcaaaf079fb45
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
+AuthorDate: 2023-02-10
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+CommitDate: 2023-02-10
 
-    Update doc
+    Bump libbpf to v1.1.0
 
-commit 1ce9efc64479ad5854aab00ebc2e317f878a421e
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+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
 
-    nghttpx: Set SCT data when built with boringssl
+    Merge pull request #1858 from nghttp2/bump-ngtcp2
+    
+    Bump ngtcp2 to v0.13.1
 
-commit 7055501efd26a9b64d7d46206ded82af8d1ea2b8
+commit 95b2f94671ad0c64c419f52eb345ca7fef4c1b95
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
+AuthorDate: 2023-02-09
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+CommitDate: 2023-02-09
 
-    src: Enable HTTP/3 with boringssl
+    Bump ngtcp2 to v0.13.1
 
-commit c790ee64a46d6f58fc034b719c3c7808d0473a9c
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+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
 
-    src: Prefer #ifdef for a single condition
+    Merge pull request #1857 from nghttp2/nghttpx-fix-tls-write-stall
+    
+    nghttpx: Fix bug that stalls TLS write
 
-commit 9fb05d5ea258ac5707b852a856608b00193169d3
+commit cbcfdaa6555778a8c52d7d60b787dbd9d6a755ca
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
+AuthorDate: 2023-02-06
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+CommitDate: 2023-02-06
 
-    Fix compile error under mac os
+    nghttpx: Fix bug that stalls TLS write
 
-commit 3742acaf398d394a84e70f25894f17f86f8a1745
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+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
 
-    nghttpx: Fix wrong SSL_CTX object usage
+    Merge pull request #1854 from nghttp2/bump-ngtcp2-dockerfile
+    
+    Bump ngtcp2 in Dockerfile to v0.13.0
 
-commit d8282de2290a265956dee94bfe068d2cca36747d
+commit 92c7593cffa05a35823e18a054ecf761685e544a
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-15
+AuthorDate: 2023-01-31
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+CommitDate: 2023-01-31
 
-    nghttpx: Respect !tls-no-postpone-early-data with boringssl
+    Bump ngtcp2 in Dockerfile to v0.13.0
 
-commit 3a721a9dd510f607ca6f7d57efa8bfa467fa1b33
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-14
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-15
+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
 
-    nghttpx: Send session ticket after handshake with boringssl
+    Merge pull request #1853 from nghttp2/bump-ngtcp2
+    
+    Bump ngtcp2 to v0.13.0
 
-commit 0b6092446b42cff5d3311a47bdb2185c647a71ea
+commit f494e88611a99c31269264451dd7342e5fdb58ce
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-14
+AuthorDate: 2023-01-31
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-14
+CommitDate: 2023-01-31
 
-    src: Compile with boringssl for non-http3 build
+    Bump ngtcp2 to v0.13.0
 
-commit fa7a916ef3b6e518d7a65e6256a9ebab1bab83ce
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-10
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-10
+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
 
-    nghttpx: Store initial_rtt in ev_tstamp for consistency
+    Merge pull request #1852 from nghttp2/remove-sphinx-theme-bundle
+    
+    Remove sphinx theme bundle
 
-commit 69c41871002c2ab9ac3fd4b7d720b2dda1197ec6
+commit 5c5d978abe5bf14d3b3b82aa40783935b04adc57
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-10
+AuthorDate: 2023-01-30
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-10
+CommitDate: 2023-01-30
 
-    nghttpx: Add --frontend-quic-initial-rtt option
+    Remove sphinx theme bundle
+    
+    Remove sphinx theme bundle, and rely on the locally installed theme
+    (e.g., `pip install sphinx_rtd_theme`).
 
-commit 07128719c4048c0c478ea073d6a850105153ab79
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-10
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-10
+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
 
-    Workaround broken version check in AX_PYTHON_DEVEL
+    Merge pull request #1851 from nghttp2/bump-neverbleed
+    
+    Bump neverbleed
 
-commit 7471fa627d4992112910b0d6f068ea966992095f
+commit 6993e63ac486d77c5b96b22a401c836bfee655bb
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-10
+AuthorDate: 2023-01-29
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-10
+CommitDate: 2023-01-29
 
-    Update ax_python_devel.m4
+    Bump neverbleed
 
-commit d7af5924ff749df7887144f395f954338da0cbdd
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-10
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-10
+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
 
-    nghttpx: Extend QUIC server ID to 4 bytes
+    Merge pull request #1850 from nghttp2/fix-path-component-resolution
+    
+    src: Fix path component resolution
 
-commit a48e9d3d80c2c919286eac104d8df97e550bd7ca
+commit c78aebf68f90e1cd31e09e0e19b2e7e42cde1bfb
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-06
+AuthorDate: 2023-01-29
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-06
+CommitDate: 2023-01-29
 
-    Add bpf to clang-format
+    src: Fix path component resolution
+    
+    Fix path component resolution when '.' is involved.
 
-commit 474a6db00c16a68463d39910c2a65a71041da0cb
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-06
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-06
+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
 
-    Compile with gcc
+    Merge pull request #1849 from nghttp2/remove-unused-function
+    
+    Remove unused function
 
-commit cb6aea9aa932b76fd0a57d7ace711c66c5d280f5
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-06
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-06
+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
 
-    Compile with -DNDEBUG
+    Merge pull request #1848 from nghttp2/remove-src-includes
+    
+    Remove src/includes
 
-commit f4290c649761d42d17a5b09e7280d5b4c6229dd0
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-04
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-04
+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
 
-    Fix compile error
+    Merge pull request #1847 from nghttp2/bump-zlib
+    
+    Bump zlib to 1.2.13
 
-commit 086b85b8f971b372dc061ad52966a2d92804369a
+commit b52f96d38a5c32b692ecbfbd4c25c49aa684232b
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-04
+AuthorDate: 2022-12-26
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-04
+CommitDate: 2022-12-26
 
-    nghttpx: Unload BPF program after setting up all QUIC listeners
+    Remove unused function
 
-commit abee658a60806b5c96d5563ae9f5a06f90610725
+commit 2ca0bb0a2fd5faeef0a27c07216f76727981dad2
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-02
+AuthorDate: 2022-12-26
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-02
+CommitDate: 2022-12-26
 
-    nghttpx: Make sure that ngtcp2_conn_update_pkt_tx_time is called
+    Remove src/includes
 
-commit 87bdc2166768bde482644cdf0ac139d0869fc45a
+commit fa3d1bfc8f5d61d05aa85918041ebf7335e361ff
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-10-02
+AuthorDate: 2022-12-26
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-10-02
+CommitDate: 2022-12-26
 
-    nghttpx: Add --worker-process-grace-shutdown-period option
+    Bump zlib to 1.2.13
 
-commit 3e25ee818178eea37950f0825242f1c1465e55e8
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-29
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-29
+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
 
-    256k memlock is not enough when reloading happens
+    Merge pull request #1846 from nghttp2/remove-python
+    
+    Remove deprecated python bindings
 
-commit 0266c458a34d5ef7455cffe3bf34ec9b25db99c2
+commit b4cb3b0090b704f2461766c455568b311013272f
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-29
+AuthorDate: 2022-12-24
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-29
+CommitDate: 2022-12-26
 
-    nghttpx: Add --max-worker-processes option
+    Remove deprecated python bindings
 
-commit d9c7631dcbf9651f7b9d7837a7c7ea1d82658ee6
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-29
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-29
+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
 
-    Fix compile error
+    Merge pull request #1844 from nghttp2/remove-libnghttp2_asio
+    
+    Remove deprecated libnghttp2_asio
 
-commit df064fa2ba60d237b8f708eebe9ef6e762d06055
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-29
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-29
+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
 
-    nghttpx: Unload BPF objects on reload to avoid running out of memlock
+    Merge pull request #1845 from nghttp2/minor-cleanup
+    
+    Minor cleanup
 
-commit 318e0c8447e2399e7c1e95d8ae8d00118ccea5f7
+commit 8538e1ec42c5f150213ddc612d5b2268da7364e0
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-28
+AuthorDate: 2022-12-25
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-28
+CommitDate: 2022-12-25
 
-    Guard msghdr_get_local_addr with ENABLE_HTTP3 macro
+    Minor cleanup
 
-commit 17d5503bf244fe484cd0332158d6dac21c9487b5
+commit e6d608b52242c88e151c1e7e500549976e8abacc
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-28
+AuthorDate: 2022-12-24
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-28
+CommitDate: 2022-12-24
 
-    Update doc
+    Remove deprecated libnghttp2_asio
 
-commit 19b4da64016f979b38a1d8eea127b153c2d22060
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-26
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-26
+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
 
-    nghttpx: Support h3-29
+    Merge pull request #1843 from nghttp2/bump-ngtcp2
+    
+    Bump ngtcp2 dependencies
 
-commit 886dc93f182aa7ab6570c77013f35494889a2269
+commit 7c7ba0586e7b837b3c97bfd196a79e242b8c6e36
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-26
+AuthorDate: 2022-12-24
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-26
+CommitDate: 2022-12-24
 
-    nghttpx: Fail h3 connection attempt if no ALPN is negotiated
+    Bump ngtcp2 dependencies
 
-commit 407df2822e4b989c53c04b4f7902d2a9210ad506
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-26
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-26
+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
 
-    Remove check for UDP_SEGMENT
+    Merge pull request #1837 from fredizzimo/fix-libevent-component
     
-    Check for UDP_SEGMENT is for debian 10, but now that we have debian
-    11, remove the check because it breaks cross-build.
+    Don't use the unofficial libevent component
 
-commit f6da0d342acc123ce0575146c4ab17f8b7e3146e
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-24
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-24
-
-    nghttpx: Fix crash if no keying materials are specified in file
+commit 525630ae7a02cab36d94733486dcd5a52509a551
+Author:     Fred Sundvik <fsundvik@gmail.com>
+AuthorDate: 2022-12-07
+Commit:     Fred Sundvik <fsundvik@gmail.com>
+CommitDate: 2022-12-07
 
-commit 7271537a1531bad7ca0e2153b1cf188b6462dda4
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-24
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-24
+    Don't use the unofficial libevent component
 
-    nghttpx: Add --rlimit-memlock option
+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
 
-commit d0e8efac4dd0411a8dab8ede6ec5e664f73c77a2
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-24
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-24
-
-    nghttpx: Fix bug that reading QUIC secret file fails without line separator
+    Merge pull request #1835 from nghttp2/integration-lint
+    
+    integration: Fix lint errors
 
-commit 27e6d56d83f9a0669ef901d5eac145fc2d6966af
+commit 358c15e015b0ea96b459c6c93fbde789ef90471f
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-23
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-23
+CommitDate: 2022-11-20
 
-    Update doc
+    integration: Fix lint errors
 
-commit c5122c12cb760e52eb37768a39f1114e07954200
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-23
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-23
+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
 
-    Update bash_completion
+    Merge pull request #1834 from nghttp2/integration-http-status-code
+    
+    integration: Use HTTP status code constants
 
-commit 282050c596715ac6872b16fa6bdf9720647cffcd
+commit 44e4475a318007a480c5455326a7434a8df42a9d
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-23
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-23
+CommitDate: 2022-11-20
 
-    Update manual pages
+    integration: Use HTTP status code constants
 
-commit 308c73bfa2aa2e191d7a0bbbf2355ca7b2ef9b10
-Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-22
-Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-23
+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
 
-    nghttpx: Read QUIC keying materials from file
+    Merge pull request #1833 from nghttp2/integration-h3
     
-    Add --frontend-quic-secret-file to read QUIC keying materials from
-    file.  --frontend-quic-connection-id-encryption-key was removed in
-    favor of this new option.
+    Integration h3
 
-commit c40309ae8e17d8cabb0b437fbfa3a24757a0cf46
+commit babeddb6499f3baae5bf3befa5f503e615cdacf9
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-22
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-23
+CommitDate: 2022-11-20
 
-    nghttpx: optarg should be allocated per configuration
+    nghttpx: HTTPS redirect should not happen with HTTP/3 upstream
 
-commit 1c7a4ecc7f7d1b289123a0575834eb00d16bd65f
+commit 2d790edac596da5da361475c949aec3e4ffedbb1
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    nghttpx: Rename generate_encrypted_quic_connection_id to generate_quic_connection_id
+    integration: Add http3 test which verifies chunked encoding ends prematurely
 
-commit 80cc623eb2683299791b2988722ffcf0e6488d62
+commit 2bef60a6f4ae42cecc2cfe72a67284322f98c738
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    nghttpx: Allocate server id in Connection ID
+    integration: Add http3 test which verifies response ends before request
 
-commit 89457fd9915159c746e5503e5da58bee9fc2445e
+commit 17e3bb4ec5d1aaac14441b24a849b6c50590a252
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    More https
+    integration: Add http3 mruby tests
 
-commit 257043b8fbe8be9ea53f1a72350a06489b255ba9
+commit 5e1b1a088309b3475a86f632f216727374a008b2
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    Fix issue that libev cannot be found with autotools under mac osx
+    integration: Add http3 affinity cookie test
 
-commit 657d94b99283f3ec810d87b05b5f7bbc1ca50768
+commit 5b0cbb489248415a250bd4306829ad2cbc9406f5
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    Fix compile error with libressl
+    integration: Add http3 HTTPS redirect test
 
-commit 06dc7d59641a91eaa7bad7ad3995311c87ec8eed
+commit 17a5ba4969911987cc0adae834b8079033c4aaa8
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    Make sure that nghttp2 can be built from tar archive
+    integration: Add http3 response content-length test
 
-commit b50079524b869be871c70e95264c82be7f864770
+commit 20d95edc5738a0b7b6a5000b1ed39289e5e62895
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    Always include optional files to EXTRA_DIST
+    integration: Add http3 via tests
 
-commit cdf1f269ff1336025a240a5db5cb3043d7db0249
+commit 126b5f9d2b64a87b8da8c0b723bc6ffcffdad84c
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-21
+AuthorDate: 2022-11-20
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-21
+CommitDate: 2022-11-20
 
-    Add missing cmake files to EXTRA_DIST
+    Add the missing file
 
-commit 738b562f398e46e3af242150a7f2c92eaa24741f
+commit 46602a961d16d03dbddb6ecd2cd8c16cc63f3ae2
 Author:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-AuthorDate: 2021-09-20
+AuthorDate: 2022-11-13
 Commit:     Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-CommitDate: 2021-09-20
+CommitDate: 2022-11-13
 
-    Bump up version number to 1.46.0-DEV
+    Bump package version

_service:tar_scm:nghttp2-1.46.0.tar.xz/Dockerfile.android -> _service:tar_scm:nghttp2-1.52.0.tar.xz/Dockerfile.android Changed

@@ -12,59 +12,41 @@
 
 
 # Only use standalone-toolchain for reduce size
-FROM ubuntu:xenial
+FROM ubuntu:22.04
 MAINTAINER Tatsuhiro Tsujikawa
-ENV ANDROID_HOME /root
-ENV TOOLCHAIN $ANDROID_HOME/toolchain
-ENV PATH $TOOLCHAIN/bin:$PATH
 
-ENV NDK_VERSION r14b
+ENV NDK_VERSION r25b
+ENV NDK /root/android-ndk-$NDK_VERSION
+ENV TOOLCHAIN $NDK/toolchains/llvm/prebuilt/linux-x86_64
+ENV TARGET aarch64-linux-android
+ENV API 33
+ENV AR $TOOLCHAIN/bin/llvm-ar
+ENV CC $TOOLCHAIN/bin/$TARGET$API-clang
+ENV CXX $TOOLCHAIN/bin/$TARGET$API-clang++
+ENV LD $TOOLCHAIN/bin/ld
+ENV RANDLIB $TOOLCHAIN/bin/llvm-ranlib
+ENV STRIP $TOOLCHAIN/bin/llvm-strip
+ENV PREFIX /root/usr/local
 
 WORKDIR /root
 RUN apt-get update && \
     apt-get install -y unzip make binutils autoconf \
       automake autotools-dev libtool pkg-config git \
       curl dpkg-dev libxml2-dev genisoimage libc6-i386 \
-      lib32stdc++6 python&& \
-    rm -rf /var/cache/apk/*
-
-# Install toolchain
-RUN curl -L -O https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip && \
-   unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip && \
-   rm android-ndk-$NDK_VERSION-linux-x86_64.zip && \
-   mkdir -p $ANDROID_HOME/toolchain && \
-   $ANDROID_HOME/android-ndk-$NDK_VERSION/build/tools/make-standalone-toolchain.sh \
-       --install-dir=$ANDROID_HOME/toolchain \
-       --toolchain=arm-linux-androideabi-4.9 \
-       --force && \
-   rm -r android-ndk-$NDK_VERSION
+      lib32stdc++6 && \
+    rm -rf /var/cache/apt/*
 
-ENV PREFIX /root/usr/local
+# Download NDK
+RUN curl -L -O https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux.zip && \
+   unzip -q android-ndk-$NDK_VERSION-linux.zip && \
+   rm android-ndk-$NDK_VERSION-linux.zip
 
 # Setup version of libraries
-ENV OPENSSL_VERSION 1.0.2d
-ENV SPDYLAY_VERSION v1.4.0
-ENV LIBEV_VERSION 4.19
-ENV ZLIB_VERSION 1.2.8
-ENV CARES_VERSION 1.13.0
-ENV NGHTTP2_VERSION v1.24.0
-
-WORKDIR /root/build
-RUN git clone https://github.com/tatsuhiro-t/spdylay -b $SPDYLAY_VERSION --depth 1
-WORKDIR /root/build/spdylay
-RUN autoreconf -i && \
-    ./configure \
-    --disable-shared \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --prefix=$PREFIX \
-    --without-libxml2 \
-    --disable-src \
-    --disable-examples \
-    CPPFLAGS="-I$PREFIX/include" \
-    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-L$PREFIX/lib" && \
-    make install
+ENV OPENSSL_VERSION 1.1.1q
+ENV LIBEV_VERSION 4.33
+ENV ZLIB_VERSION 1.2.13
+ENV CARES_VERSION 1.18.1
+ENV NGHTTP2_VERSION master
 
 WORKDIR /root/build
 RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && \
@@ -72,20 +54,18 @@
     rm openssl-$OPENSSL_VERSION.tar.gz
 
 WORKDIR /root/build/openssl-$OPENSSL_VERSION
-RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
-    ./Configure --prefix=$PREFIX android && \
+RUN export ANDROID_NDK_HOME=$NDK PATH=$TOOLCHAIN/bin:$PATH && \
+    ./Configure no-shared --prefix=$PREFIX android-arm64 && \
     make && make install_sw
 
 WORKDIR /root/build
 RUN curl -L -O http://dist.schmorp.de/libev/Attic/libev-$LIBEV_VERSION.tar.gz && \
-    curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch && \
     tar xf libev-$LIBEV_VERSION.tar.gz && \
     rm libev-$LIBEV_VERSION.tar.gz
 
 WORKDIR /root/build/libev-$LIBEV_VERSION
-RUN patch -p1 < ../libev-4.19-android.patch && \
-    ./configure \
-    --host=arm-linux-androideabi \
+RUN ./configure \
+    --host=$TARGET \
     --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
     --prefix=$PREFIX \
     --disable-shared \
@@ -95,17 +75,12 @@
     make install
 
 WORKDIR /root/build
-RUN curl -L -O https://downloads.sourceforge.net/project/libpng/zlib/$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz && \
+RUN curl -L -O https://zlib.net/zlib-$ZLIB_VERSION.tar.gz && \
     tar xf zlib-$ZLIB_VERSION.tar.gz && \
     rm zlib-$ZLIB_VERSION.tar.gz
 
 WORKDIR /root/build/zlib-$ZLIB_VERSION
-RUN HOST=arm-linux-androideabi \
-    CC=$HOST-gcc \
-    AR=$HOST-ar \
-    LD=$HOST-ld \
-    RANLIB=$HOST-ranlib \
-    STRIP=$HOST-strip \
+RUN HOST=$TARGET \
     ./configure \
     --prefix=$PREFIX \
     --libdir=$PREFIX/lib \
@@ -121,7 +96,7 @@
 
 WORKDIR /root/build/c-ares-$CARES_VERSION
 RUN ./configure \
-      --host=arm-linux-androideabi \
+      --host=$TARGET \
       --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
       --prefix=$PREFIX \
       --disable-shared && \
@@ -134,17 +109,13 @@
     ./configure \
     --enable-app \
     --disable-shared \
-    --host=arm-linux-androideabi \
+    --host=$TARGET \
     --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --with-xml-prefix="$PREFIX" \
     --without-libxml2 \
-    --disable-python-bindings \
     --disable-examples \
     --disable-threads \
-      CC="$TOOLCHAIN"/bin/arm-linux-androideabi-clang \
-      CXX="$TOOLCHAIN"/bin/arm-linux-androideabi-clang++ \
       CPPFLAGS="-fPIE -I$PREFIX/include" \
       PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
       LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
     make && \
-    arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp
+    $STRIP src/nghttpx src/nghttpd src/nghttp

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

@@ -20,19 +20,14 @@
 # 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 = lib third-party src bpf examples python tests integration-tests \
+SUBDIRS = lib third-party src bpf examples tests integration-tests \
 	doc contrib script
 
-# Now with python setuptools, make uninstall will leave many files we
-# cannot easily remove (e.g., easy-install.pth).  Disable it for
-# distcheck rule.
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-python-bindings
-
 ACLOCAL_AMFLAGS = -I m4
 
 dist_doc_DATA = README.rst
 
-EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
+EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-env \
 	Dockerfile.android \
 	cmakeconfig.h.in \
 	CMakeLists.txt \
@@ -42,7 +37,6 @@
 	cmake/FindLibev.cmake \
 	cmake/FindCUnit.cmake \
 	cmake/Version.cmake \
-	cmake/FindCython.cmake \
 	cmake/FindLibevent.cmake \
 	cmake/FindJansson.cmake \
 	cmake/FindLibcares.cmake \
@@ -55,11 +49,11 @@
 .PHONY: clang-format
 
 # Format source files using clang-format.  Don't format source files
-# under third-party directory since we are not responsible for thier
+# under third-party directory since we are not responsible for their
 # coding style.
 clang-format:
 	CLANGFORMAT=`git config --get clangformat.binary`; \
 	test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
 	$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/nghttp2/*.h \
-	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
-	tests/*.{c,h} bpf/*.c
+	src/*.{c,cc,h} examples/*.{c,cc} \
+	tests/*.{c,h} bpf/*.c fuzz/*.cc

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -106,13 +106,8 @@
 target_triplet = @target@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -266,11 +261,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -287,7 +277,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -303,6 +292,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -371,15 +361,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -464,17 +448,12 @@
 # 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 = lib third-party src bpf examples python tests integration-tests \
+SUBDIRS = lib third-party src bpf examples tests integration-tests \
 	doc contrib script
 
-
-# Now with python setuptools, make uninstall will leave many files we
-# cannot easily remove (e.g., easy-install.pth).  Disable it for
-# distcheck rule.
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-python-bindings
 ACLOCAL_AMFLAGS = -I m4
 dist_doc_DATA = README.rst
-EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
+EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-env \
 	Dockerfile.android \
 	cmakeconfig.h.in \
 	CMakeLists.txt \
@@ -484,7 +463,6 @@
 	cmake/FindLibev.cmake \
 	cmake/FindCUnit.cmake \
 	cmake/Version.cmake \
-	cmake/FindCython.cmake \
 	cmake/FindLibevent.cmake \
 	cmake/FindJansson.cmake \
 	cmake/FindLibcares.cmake \
@@ -1015,14 +993,14 @@
 .PHONY: clang-format
 
 # Format source files using clang-format.  Don't format source files
-# under third-party directory since we are not responsible for thier
+# under third-party directory since we are not responsible for their
 # coding style.
 clang-format:
 	CLANGFORMAT=`git config --get clangformat.binary`; \
 	test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
 	$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/nghttp2/*.h \
-	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
-	tests/*.{c,h} bpf/*.c
+	src/*.{c,cc,h} examples/*.{c,cc} \
+	tests/*.{c,h} bpf/*.c fuzz/*.cc
 
 # 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.

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

@@ -11,17 +11,14 @@
 
 An HPACK encoder and decoder are available as a public API.
 
-An experimental high level C++ library is also available.
-
-We have Python bindings of this library, but we do not have full
-code coverage yet.
-
 Development Status
 ------------------
 
-We have implemented `RFC 7540 <https://tools.ietf.org/html/rfc7540>`_
-HTTP/2 and `RFC 7541 <https://tools.ietf.org/html/rfc7541>`_ HPACK -
-Header Compression for HTTP/2
+nghttp2 was originally developed based on `RFC 7540
+<https://tools.ietf.org/html/rfc7540>`_ HTTP/2 and `RFC 7541
+<https://tools.ietf.org/html/rfc7541>`_ HPACK - Header Compression for
+HTTP/2.  Now we are updating our code to implement `RFC 9113
+<https://datatracker.ietf.org/doc/html/rfc9113>`_.
 
 The nghttp2 code base was forked from the spdylay
 (https://github.com/tatsuhiro-t/spdylay) project.
@@ -106,27 +103,6 @@
      Alpine Linux currently does not support malloc replacement
      due to musl limitations. See details in issue `#762 <https://github.com/nghttp2/nghttp2/issues/762>`_.
 
-libnghttp2_asio C++ library requires the following packages:
-
-* libboost-dev >= 1.54.0
-* libboost-thread-dev >= 1.54.0
-
-The Python bindings require the following packages:
-
-* cython >= 0.19
-* python >= 3.8
-* python-setuptools
-
-If you are using Ubuntu 16.04 LTS (Xenial Xerus) or Debian 8 (jessie)
-and above, run the following to install the required packages:
-
-.. code-block:: text
-
-    sudo apt-get install g++ make binutils autoconf automake autotools-dev libtool pkg-config \
-      zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev \
-      libc-ares-dev libjemalloc-dev libsystemd-dev \
-      cython python3-dev python-setuptools
-
 To enable mruby support for nghttpx, `mruby
 <https://github.com/mruby/mruby>`_ is required.  We need to build
 mruby with C++ ABI explicitly turned on, and probably need other
@@ -151,11 +127,11 @@
 following libraries are required:
 
 * `OpenSSL with QUIC support
-  <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1k+quic>`_; or
+  <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1t+quic>`_; or
   `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
-  f6ef1c560ae5af51e2df5d8d2175bed207b28b8f)
-* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_
-* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_
+  80a243e07ef77156af66efa7d22ac35aba44c1b3)
+* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.13.0
+* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 0.7.0
 
 Use ``--enable-http3`` configure option to enable HTTP/3 feature for
 h2load and nghttpx.
@@ -164,13 +140,13 @@
 datagram to a correct socket for nghttpx, the following libraries are
 required:
 
-* libbpf-dev >= 0.4.0
+* libbpf-dev >= 0.7.0
 
 Use ``--with-libbpf`` configure option to build eBPF program.
 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/v0.4.0>`_.  nghttpx
+<https://github.com/libbpf/libbpf/releases/tag/v1.1.0>`_.  nghttpx
 requires eBPF program for reloading its configuration and hot swapping
 its executable.
 
@@ -224,6 +200,18 @@
    responsible to specify the correct values to these variables.  For
    complete list of these variables, run ``./configure -h``.
 
+If you are using Ubuntu 22.04 LTS, run the following to install the
+required packages:
+
+.. code-block:: text
+
+    sudo apt-get install g++ clang make binutils autoconf automake \
+      autotools-dev libtool pkg-config \
+      zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev \
+      libevent-dev libjansson-dev \
+      libc-ares-dev libjemalloc-dev libsystemd-dev \
+      ruby-dev bison libelf-dev
+
 Building nghttp2 from release tar archive
 -----------------------------------------
 
@@ -355,7 +343,7 @@
 
 .. code-block:: text
 
-   $ git clone --depth 1 -b OpenSSL_1_1_1l+quic https://github.com/quictls/openssl
+   $ git clone --depth 1 -b OpenSSL_1_1_1t+quic https://github.com/quictls/openssl
    $ cd openssl
    $ ./config --prefix=$PWD/build --openssldir=/etc/ssl
    $ make -j$(nproc)
@@ -366,7 +354,7 @@
 
 .. code-block:: text
 
-   $ git clone --depth 1 https://github.com/ngtcp2/nghttp3
+   $ git clone --depth 1 -b v0.8.0 https://github.com/ngtcp2/nghttp3
    $ cd nghttp3
    $ autoreconf -i
    $ ./configure --prefix=$PWD/build --enable-lib-only
@@ -378,7 +366,7 @@
 
 .. code-block:: text
 
-   $ git clone --depth 1 https://github.com/ngtcp2/ngtcp2
+   $ git clone --depth 1 -b v0.13.1 https://github.com/ngtcp2/ngtcp2
    $ cd ngtcp2
    $ autoreconf -i
    $ ./configure --prefix=$PWD/build --enable-lib-only \
@@ -387,12 +375,12 @@
    $ make install
    $ cd ..
 
-If your Linux distribution does not have libbpf-dev >= 0.4.0, build
+If your Linux distribution does not have libbpf-dev >= 0.7.0, build
 from source:
 
 .. code-block:: text
 
-   $ git clone --depth 1 -b v0.4.0 https://github.com/libbpf/libbpf
+   $ git clone --depth 1 -b v1.1.0 https://github.com/libbpf/libbpf
    $ cd libbpf
    $ PREFIX=$PWD/build make -C src install
    $ cd ..
@@ -406,8 +394,7 @@
    $ git submodule update --init
    $ autoreconf -i
    $ ./configure --with-mruby --with-neverbleed --enable-http3 --with-libbpf \
-         --disable-python-bindings \
-         CC=clang-12 CXX=clang++-12 \
+         CC=clang-14 CXX=clang++-14 \
          PKG_CONFIG_PATH="$PWD/../openssl/build/lib/pkgconfig:$PWD/../nghttp3/build/lib/pkgconfig:$PWD/../ngtcp2/build/lib/pkgconfig:$PWD/../libbpf/build/lib64/pkgconfig" \
          LDFLAGS="$LDFLAGS -Wl,-rpath,$PWD/../openssl/build/lib -Wl,-rpath,$PWD/../libbpf/build/lib64"
    $ make -j$(nproc)
@@ -1431,219 +1418,6 @@
 corresponding header set was processed.  The format is the same as
 ``deflatehd``.
 
-libnghttp2_asio: High level HTTP/2 C++ library
-----------------------------------------------
-
-libnghttp2_asio is C++ library built on top of libnghttp2 and provides
-high level abstraction API to build HTTP/2 applications.  It depends
-on the Boost::ASIO library and OpenSSL.  Currently libnghttp2_asio
-provides both client and server APIs.
-
-libnghttp2_asio is not built by default.  Use the ``--enable-asio-lib``
-configure flag to build libnghttp2_asio.  The required Boost libraries
-are:
-
-* Boost::Asio
-* Boost::System
-* Boost::Thread
-
-The server API is designed to build an HTTP/2 server very easily to utilize
-C++14 anonymous functions and closures.  The bare minimum example of
-an HTTP/2 server looks like this:
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_server.h>
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      http2 server;
-
-      server.handle("/", (const request &req, const response &res) {
-        res.write_head(200);
-        res.end("hello, world\n");
-      });
-
-      if (server.listen_and_serve(ec, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-Here is sample code to use the client API:
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      // connect to localhost:3000
-      session sess(io_service, "localhost", "3000");
-
-      sess.on_connect(&sess(tcp::resolver::iterator endpoint_it) {
-        boost::system::error_code ec;
-
-        auto req = sess.submit(ec, "GET", "http://localhost:3000/");
-
-        req->on_response((const response &res) {
-          // print status code and response header fields.
-          std::cerr << "HTTP/2 " << res.status_code() << std::endl;
-          for (auto &kv : res.header()) {
-            std::cerr << kv.first << ": " << kv.second.value << "\n";
-          }
-          std::cerr << std::endl;
-
-          res.on_data((const uint8_t *data, std::size_t len) {
-            std::cerr.write(reinterpret_cast<const char *>(data), len);
-            std::cerr << std::endl;
-          });
-        });
-
-        req->on_close(&sess(uint32_t error_code) {
-          // shutdown session after first request was done.
-          sess.shutdown();
-        });
-      });
-
-      sess.on_error((const boost::system::error_code &ec) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-For more details, see the documentation of libnghttp2_asio.
-
-Python bindings
----------------
-
-The ``python`` directory contains nghttp2 Python bindings.  The
-bindings currently provide HPACK compressor and decompressor classes
-and an HTTP/2 server.
-
-The extension module is called ``nghttp2``.
-
-``make`` will build the bindings and target Python version is
-determined by the ``configure`` script.  If the detected Python version is not
-what you expect, specify a path to Python executable in a ``PYTHON``
-variable as an argument to configure script (e.g., ``./configure
-PYTHON=/usr/bin/python3.8``).
-
-The following example code illustrates basic usage of the HPACK compressor
-and decompressor in Python:
-
-.. code-block:: python
-
-    import binascii
-    import nghttp2
-
-    deflater = nghttp2.HDDeflater()
-    inflater = nghttp2.HDInflater()
-
-    data = deflater.deflate((b'foo', b'bar'),
-                             (b'baz', b'buz'))
-    print(binascii.b2a_hex(data))
-
-    hdrs = inflater.inflate(data)
-    print(hdrs)
-
-The ``nghttp2.HTTP2Server`` class builds on top of the asyncio event
-loop.  On construction, *RequestHandlerClass* must be given, which
-must be a subclass of ``nghttp2.BaseRequestHandler`` class.
-
-The ``BaseRequestHandler`` class is used to handle the HTTP/2 stream.
-By default, it does nothing.  It must be subclassed to handle each
-event callback method.
-
-The first callback method invoked is ``on_headers()``.  It is called
-when HEADERS frame, which includes the request header fields, has arrived.
-
-If the request has a request body, ``on_data(data)`` is invoked for each
-chunk of received data.
-
-Once the entire request is received, ``on_request_done()`` is invoked.
-
-When the stream is closed, ``on_close(error_code)`` is called.
-
-The application can send a response using ``send_response()`` method.
-It can be used in ``on_headers()``, ``on_data()`` or
-``on_request_done()``.
-
-The application can push resources using the ``push()`` method.  It must be
-used before the ``send_response()`` call.
-
-The following instance variables are available:
-
-client_address
-    Contains a tuple of the form (host, port) referring to the
-    client's address.
-
-stream_id
-    Stream ID of this stream.
-
-scheme
-    Scheme of the request URI.  This is a value of :scheme header
-    field.
-
-method
-    Method of this stream.  This is a value of :method header field.
-
-host
-    This is a value of :authority or host header field.
-
-path
-    This is a value of :path header field.
-
-The following example illustrates the HTTP2Server and
-BaseRequestHandler usage:
-
-.. code-block:: python
-
-    #!/usr/bin/env python3
-
-    import io, ssl
-    import nghttp2
-
-    class Handler(nghttp2.BaseRequestHandler):
-
-        def on_headers(self):
-            self.push(path='/css/bootstrap.css',
-                      request_headers = ('content-length', '3'),
-                      status=200,
-                      body='foo')
-
-            self.push(path='/js/bootstrap.js',
-                      method='GET',
-                      request_headers = ('content-length', '10'),
-                      status=200,
-                      body='foobarbuzz')
-
-            self.send_response(status=200,
-                               headers = ('content-type', 'text/plain'),
-                               body=io.BytesIO(b'nghttp2-python FTW'))
-
-    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2
-    ctx.load_cert_chain('server.crt', 'server.key')
-
-    # give None to ssl to make the server non-SSL/TLS
-    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
-    server.serve_forever()
-
 Contribution
 ------------

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

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
@@ -311,7 +311,7 @@
 am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.16.4, ,
+m4_if($1, 1.16.5, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -327,7 +327,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.16.4)dnl
+AM_AUTOMAKE_VERSION(1.16.5)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
@@ -704,6 +704,10 @@
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
 AC_PREREQ(2.65)dnl
+m4_ifdef(_$0_ALREADY_INIT,
+  m4_fatal($0 expanded multiple times
+m4_defn(_$0_ALREADY_INIT)),
+  m4_define(_$0_ALREADY_INIT, m4_expansion_stack))dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
@@ -1117,6 +1121,7 @@
   dnl supported. (2.0 was released on October 16, 2000).
   m4_define_default(_AM_PYTHON_INTERPRETER_LIST,
 python python2 python3 dnl
+ python3.11 python3.10 dnl
  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
  python3.2 python3.1 python3.0 dnl
  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
@@ -1161,7 +1166,7 @@
   )
 
   if test "$PYTHON" = :; then
-  dnl Run any user-specified action, or abort.
+    dnl Run any user-specified action, or abort.
     m4_default($3, AC_MSG_ERROR(no suitable Python interpreter found))
   else
 
@@ -1170,38 +1175,63 @@
   dnl trailing zero was eliminated. So now we output just the major
   dnl and minor version numbers, as numbers. Apparently the tertiary
   dnl version is not of interest.
-
+  dnl
   AC_CACHE_CHECK(for $am_display_PYTHON version, am_cv_python_version,
     am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info:2)"`)
   AC_SUBST(PYTHON_VERSION, $am_cv_python_version)
 
-  dnl Use the values of sys.prefix and sys.exec_prefix for the corresponding
-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-  dnl distinct variables so they can be overridden if need be.  However,
-  dnl general consensus is that you shouldn't need this ability.
-  dnl Also allow directly setting the prefixes via configure args.
+  dnl At times, e.g., when building shared libraries, you may want
+  dnl to know which OS platform Python thinks this is.
+  dnl
+  AC_CACHE_CHECK(for $am_display_PYTHON platform, am_cv_python_platform,
+    am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`)
+  AC_SUBST(PYTHON_PLATFORM, $am_cv_python_platform)
 
-  if test "x$prefix" = xNONE
-  then
-   am__usable_prefix=$ac_default_prefix
+  dnl emacs-page
+  dnl If --with-python-sys-prefix is given, use the values of sys.prefix
+  dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX
+  dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and
+  dnl ${exec_prefix} variables.
+  dnl
+  dnl The two are made distinct variables so they can be overridden if
+  dnl need be, although general consensus is that you shouldn't need
+  dnl this separation.
+  dnl
+  dnl Also allow directly setting the prefixes via configure options,
+  dnl overriding any default.
+  dnl
+  if test "x$prefix" = xNONE; then
+    am__usable_prefix=$ac_default_prefix
   else
-   am__usable_prefix=$prefix
+    am__usable_prefix=$prefix
   fi
 
+  # Allow user to request using sys.* values from Python,
+  # instead of the GNU $prefix values.
+  AC_ARG_WITH(python-sys-prefix,
+  AS_HELP_STRING(--with-python-sys-prefix,
+                  use Python's sys.prefix and sys.exec_prefix values),
+  am_use_python_sys=:,
+  am_use_python_sys=false)
+
+  # Allow user to override whatever the default Python prefix is.
   AC_ARG_WITH(python_prefix,
   AS_HELP_STRING(--with-python_prefix,
-                 override the default PYTHON_PREFIX),
-   am_python_prefix_subst="$withval"
-   am_cv_python_prefix="$withval"
-   AC_MSG_CHECKING(for $am_display_PYTHON prefix)
+                  override the default PYTHON_PREFIX),
+  am_python_prefix_subst=$withval
+   am_cv_python_prefix=$withval
+   AC_MSG_CHECKING(for explicit $am_display_PYTHON prefix)
    AC_MSG_RESULT($am_cv_python_prefix),
   
-  AC_CACHE_CHECK(for $am_display_PYTHON prefix, am_cv_python_prefix,
-    am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`)
-
-  dnl If sys.prefix is a subdir of $prefix, replace the literal value of $prefix
-  dnl with a variable reference so it can be overridden.
-  case $am_cv_python_prefix in
+   if $am_use_python_sys; then
+     # using python sys.prefix value, not GNU
+     AC_CACHE_CHECK(for python default $am_display_PYTHON prefix,
+     am_cv_python_prefix,
+     am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`)
+
+     dnl If sys.prefix is a subdir of $prefix, replace the literal value of
+     dnl $prefix with a variable reference so it can be overridden.
+     case $am_cv_python_prefix in
      $am__usable_prefix*)
        am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'`
        am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"`
@@ -1209,55 +1239,68 @@
      *)
        am_python_prefix_subst=$am_cv_python_prefix
        ;;
-  esac
-  )
+     esac
+   else # using GNU prefix value, not python sys.prefix
+     am_python_prefix_subst='${prefix}'
+     am_python_prefix=$am_python_prefix_subst
+     AC_MSG_CHECKING(for GNU default $am_display_PYTHON prefix)
+     AC_MSG_RESULT($am_python_prefix)
+   fi)
+  # Substituting python_prefix_subst value.
   AC_SUBST(PYTHON_PREFIX, $am_python_prefix_subst)
 
+  # emacs-page Now do it all over again for Python exec_prefix, but with yet
+  # another conditional: fall back to regular prefix if that was specified.
   AC_ARG_WITH(python_exec_prefix,
   AS_HELP_STRING(--with-python_exec_prefix,
-                 override the default PYTHON_EXEC_PREFIX),
-   am_python_exec_prefix_subst="$withval"
-   am_cv_python_exec_prefix="$withval"
-   AC_MSG_CHECKING(for $am_display_PYTHON exec_prefix)
+                  override the default PYTHON_EXEC_PREFIX),
+  am_python_exec_prefix_subst=$withval
+   am_cv_python_exec_prefix=$withval
+   AC_MSG_CHECKING(for explicit $am_display_PYTHON exec_prefix)
    AC_MSG_RESULT($am_cv_python_exec_prefix),
   
-  dnl --with-python_prefix was given - use its value for python_exec_prefix too
-  AS_IF(test -n "$with_python_prefix", am_python_exec_prefix_subst="$with_python_prefix"
-  am_cv_python_exec_prefix="$with_python_prefix"
-  AC_MSG_CHECKING(for $am_display_PYTHON exec_prefix)
-  AC_MSG_RESULT($am_cv_python_exec_prefix),
-  
-  AC_CACHE_CHECK(for $am_display_PYTHON exec_prefix, am_cv_python_exec_prefix,
-    am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`)
-  dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the
-  dnl literal value of $exec_prefix with a variable reference so it can
-  dnl be overridden.
-  if test "x$exec_prefix" = xNONE
-  then
-   am__usable_exec_prefix=$am__usable_prefix
-  else
-   am__usable_exec_prefix=$exec_prefix
-  fi
-  case $am_cv_python_exec_prefix in
-     $am__usable_exec_prefix*)
-       am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
-       am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
-       ;;
-     *)
-       am_python_exec_prefix_subst=$am_cv_python_exec_prefix
-       ;;
-  esac
-  ))
+   # no explicit --with-python_exec_prefix, but if
+   # --with-python_prefix was given, use its value for python_exec_prefix too.
+   AS_IF(test -n "$with_python_prefix",
+   am_python_exec_prefix_subst=$with_python_prefix
+    am_cv_python_exec_prefix=$with_python_prefix
+    AC_MSG_CHECKING(for python_prefix-given $am_display_PYTHON exec_prefix)
+    AC_MSG_RESULT($am_cv_python_exec_prefix),
+   
+    # Set am__usable_exec_prefix whether using GNU or Python values,
+    # since we use that variable for pyexecdir.
+    if test "x$exec_prefix" = xNONE; then
+      am__usable_exec_prefix=$am__usable_prefix
+    else
+      am__usable_exec_prefix=$exec_prefix
+    fi
+    #
+    if $am_use_python_sys; then # using python sys.exec_prefix, not GNU
+      AC_CACHE_CHECK(for python default $am_display_PYTHON exec_prefix,
+      am_cv_python_exec_prefix,
+      am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`)
+      dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the
+      dnl literal value of $exec_prefix with a variable reference so it can
+      dnl be overridden.
+      case $am_cv_python_exec_prefix in
+      $am__usable_exec_prefix*)
+        am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
+        am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
+        ;;
+      *)
+        am_python_exec_prefix_subst=$am_cv_python_exec_prefix
+        ;;
+     esac
+   else # using GNU $exec_prefix, not python sys.exec_prefix
+     am_python_exec_prefix_subst='${exec_prefix}'
+     am_python_exec_prefix=$am_python_exec_prefix_subst
+     AC_MSG_CHECKING(for GNU default $am_display_PYTHON exec_prefix)
+     AC_MSG_RESULT($am_python_exec_prefix)
+   fi))
+  # Substituting python_exec_prefix_subst.
   AC_SUBST(PYTHON_EXEC_PREFIX, $am_python_exec_prefix_subst)
 
-  dnl At times (like when building shared libraries) you may want
-  dnl to know which OS platform Python thinks this is.
-
-  AC_CACHE_CHECK(for $am_display_PYTHON platform, am_cv_python_platform,
-    am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`)
-  AC_SUBST(PYTHON_PLATFORM, $am_cv_python_platform)
-
-  # Just factor out some code duplication.
+  # Factor out some code duplication into this shell variable.
   am_python_setup_sysconfig="\
 import sys
 # Prefer sysconfig over distutils.sysconfig, for better compatibility
@@ -1277,96 +1320,109 @@
 except ImportError:
     pass"
 
-  dnl Set up 4 directories:
+  dnl emacs-page Set up 4 directories:
 
-  dnl pythondir -- where to install python scripts.  This is the
-  dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behavior
-  dnl   is more consistent with lispdir.m4 for example.
+  dnl 1. pythondir: where to install python scripts.  This is the
+  dnl    site-packages directory, not the python standard library
+  dnl    directory like in previous automake betas.  This behavior
+  dnl    is more consistent with lispdir.m4 for example.
   dnl Query distutils for this directory.
-  AC_CACHE_CHECK(for $am_display_PYTHON script directory,
-    am_cv_python_pythondir,
-    if test "x$am_cv_python_prefix" = x
-     then
-       am_py_prefix=$am__usable_prefix
-     else
-       am_py_prefix=$am_cv_python_prefix
-     fi
-     am_cv_python_pythondir=`$PYTHON -c "
+  dnl
+  AC_CACHE_CHECK(for $am_display_PYTHON script directory (pythondir),
+  am_cv_python_pythondir,
+  if test "x$am_cv_python_prefix" = x; then
+     am_py_prefix=$am__usable_prefix
+   else
+     am_py_prefix=$am_cv_python_prefix
+   fi
+   am_cv_python_pythondir=`$PYTHON -c "
 $am_python_setup_sysconfig
 if can_use_sysconfig:
-    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+  if hasattr(sysconfig, 'get_default_scheme'):
+    scheme = sysconfig.get_default_scheme()
+  else:
+    scheme = sysconfig._get_default_scheme()
+  if scheme == 'posix_local':
+    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
+    scheme = 'posix_prefix'
+  sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
 else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+  from distutils import sysconfig
+  sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
 sys.stdout.write(sitedir)"`
-     case $am_cv_python_pythondir in
-     $am_py_prefix*)
-       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
-       ;;
-     *)
-       case $am_py_prefix in
-         /usr|/System*) ;;
-         *)
-	  am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
-	  ;;
-       esac
-       ;;
+   #
+   case $am_cv_python_pythondir in
+   $am_py_prefix*)
+     am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+     am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
+     ;;
+   *)
+     case $am_py_prefix in
+       /usr|/System*) ;;
+       *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
+          ;;
      esac
-    )
+     ;;
+   esac
+  )
   AC_SUBST(pythondir, $am_cv_python_pythondir)
 
-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
-  dnl   more consistent with the rest of automake.
-
+  dnl 2. pkgpythondir: $PACKAGE directory under pythondir.  Was
+  dnl    PYTHON_SITE_PACKAGE in previous betas, but this naming is
+  dnl    more consistent with the rest of automake.
+  dnl
   AC_SUBST(pkgpythondir, \${pythondir}/$PACKAGE)
 
-  dnl pyexecdir -- directory for installing python extension modules
-  dnl   (shared libraries)
+  dnl 3. pyexecdir: directory for installing python extension modules
+  dnl    (shared libraries).
   dnl Query distutils for this directory.
-  AC_CACHE_CHECK(for $am_display_PYTHON extension module directory,
-    am_cv_python_pyexecdir,
-    if test "x$am_cv_python_exec_prefix" = x
-     then
-       am_py_exec_prefix=$am__usable_exec_prefix
-     else
-       am_py_exec_prefix=$am_cv_python_exec_prefix
-     fi
-     am_cv_python_pyexecdir=`$PYTHON -c "
+  dnl
+  AC_CACHE_CHECK(for $am_display_PYTHON extension module directory (pyexecdir),
+  am_cv_python_pyexecdir,
+  if test "x$am_cv_python_exec_prefix" = x; then
+     am_py_exec_prefix=$am__usable_exec_prefix
+   else
+     am_py_exec_prefix=$am_cv_python_exec_prefix
+   fi
+   am_cv_python_pyexecdir=`$PYTHON -c "
 $am_python_setup_sysconfig
 if can_use_sysconfig:
-    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
+  if hasattr(sysconfig, 'get_default_scheme'):
+    scheme = sysconfig.get_default_scheme()
+  else:
+    scheme = sysconfig._get_default_scheme()
+  if scheme == 'posix_local':
+    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
+    scheme = 'posix_prefix'
+  sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
 else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
+  from distutils import sysconfig
+  sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
 sys.stdout.write(sitedir)"`
-     case $am_cv_python_pyexecdir in
-     $am_py_exec_prefix*)
-       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
-       ;;
-     *)
-       case $am_py_exec_prefix in
-         /usr|/System*) ;;
-         *)
-	   am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
-	   ;;
-       esac
-       ;;
+   #
+   case $am_cv_python_pyexecdir in
+   $am_py_exec_prefix*)
+     am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+     am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
+     ;;
+   *)
+     case $am_py_exec_prefix in
+       /usr|/System*) ;;
+       *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
+          ;;
      esac
-    )
+     ;;
+   esac
+  )
   AC_SUBST(pyexecdir, $am_cv_python_pyexecdir)
 
-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-
+  dnl 4. pkgpyexecdir: $(pyexecdir)/$(PACKAGE)
+  dnl
   AC_SUBST(pkgpyexecdir, \${pyexecdir}/$PACKAGE)
 
   dnl Run any user-specified action.
   $2
   fi
-
 )
 
 
@@ -1727,13 +1783,8 @@
 AC_SUBST(am__untar)
 ) # _AM_PROG_TAR
 
-m4_include(m4/ax_boost_asio.m4)
-m4_include(m4/ax_boost_base.m4)
-m4_include(m4/ax_boost_system.m4)
-m4_include(m4/ax_boost_thread.m4)
 m4_include(m4/ax_check_compile_flag.m4)
 m4_include(m4/ax_cxx_compile_stdcxx.m4)
-m4_include(m4/ax_python_devel.m4)
 m4_include(m4/libtool.m4)
 m4_include(m4/ltoptions.m4)
 m4_include(m4/ltsugar.m4)

_service:tar_scm:nghttp2-1.46.0.tar.xz/android-config -> _service:tar_scm:nghttp2-1.52.0.tar.xz/android-config Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/android-env Added

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# nghttp2 - HTTP/2 C Library
+#
+# Copyright (c) 2022 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.
+
+if  -z "$NDK" ; then
+    echo 'No $NDK specified.'
+    exit 1
+fi
+
+export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/linux-x86_64
+export TARGET=aarch64-linux-android
+export API=33
+export AR=$TOOLCHAIN/bin/llvm-ar
+export CC=$TOOLCHAIN/bin/$TARGET$API-clang
+export CXX=$TOOLCHAIN/bin/$TARGET$API-clang++
+export LD=$TOOLCHAIN/bin/ld
+export RANDLIB=$TOOLCHAIN/bin/llvm-ranlib
+export STRIP=$TOOLCHAIN/bin/llvm-strip
+export PREFIX=$NDK/usr/local

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -114,13 +114,8 @@
 target_triplet = @target@
 subdir = bpf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -191,11 +186,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -212,7 +202,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -228,6 +217,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -296,15 +286,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@

_service:tar_scm:nghttp2-1.46.0.tar.xz/bpf/reuseport_kern.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/bpf/reuseport_kern.c Changed

@@ -423,26 +423,26 @@
   return __jhash_nwords(a, b, 0, initval + JHASH_INITVAL + (2 << 2));
 }
 
-struct bpf_map_def SEC("maps") cid_prefix_map = {
-    .type = BPF_MAP_TYPE_HASH,
-    .max_entries = 255,
-    .key_size = sizeof(__u64),
-    .value_size = sizeof(__u32),
-};
-
-struct bpf_map_def SEC("maps") reuseport_array = {
-    .type = BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
-    .max_entries = 255,
-    .key_size = sizeof(__u32),
-    .value_size = sizeof(__u32),
-};
-
-struct bpf_map_def SEC("maps") sk_info = {
-    .type = BPF_MAP_TYPE_ARRAY,
-    .max_entries = 3,
-    .key_size = sizeof(__u32),
-    .value_size = sizeof(__u64),
-};
+struct {
+  __uint(type, BPF_MAP_TYPE_HASH);
+  __uint(max_entries, 255);
+  __type(key, __u64);
+  __type(value, __u32);
+} cid_prefix_map SEC(".maps");
+
+struct {
+  __uint(type, BPF_MAP_TYPE_REUSEPORT_SOCKARRAY);
+  __uint(max_entries, 255);
+  __type(key, __u32);
+  __type(value, __u32);
+} reuseport_array SEC(".maps");
+
+struct {
+  __uint(type, BPF_MAP_TYPE_ARRAY);
+  __uint(max_entries, 3);
+  __type(key, __u32);
+  __type(value, __u64);
+} sk_info SEC(".maps");
 
 typedef struct quic_hd {
   __u8 *dcid;

_service:tar_scm:nghttp2-1.46.0.tar.xz/config.guess -> _service:tar_scm:nghttp2-1.52.0.tar.xz/config.guess Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2018-02-24'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-09'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -27,11 +29,19 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -50,7 +60,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,7 +94,8 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -96,73 +107,90 @@
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > "$dummy.c" ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD=$driver
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "$UNAME_SYSTEM" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
 
-	# If ldd exists, use it to detect musl libc.
-	if command -v ldd >/dev/null && \
-		ldd --version 2>&1 | grep -q ^musl
-	then
-	    LIBC=musl
+	# Second heuristic to detect musl libc.
+	if  "$LIBC" = unknown  &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if  "$LIBC" = unknown ; then
+		LIBC=gnu
 	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -174,12 +202,12 @@
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
 	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    "/sbin/$sysctl" 2>/dev/null || \
-	    "/usr/sbin/$sysctl" 2>/dev/null || \
+	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
 	    echo unknown)`
-	case "$UNAME_MACHINE_ARCH" in
+	case $UNAME_MACHINE_ARCH in
+	    aarch64eb) machine=aarch64_be-unknown ;;
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
@@ -188,18 +216,18 @@
 	    earmv*)
 		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv0-9$.*$,\1,'`
 		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'`
-		machine="${arch}${endian}"-unknown
+		machine=${arch}${endian}-unknown
 		;;
-	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+	    *) machine=$UNAME_MACHINE_ARCH-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently (or will in the future) and ABI.
-	case "$UNAME_MACHINE_ARCH" in
+	case $UNAME_MACHINE_ARCH in
 	    earm*)
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -215,7 +243,7 @@
 		;;
 	esac
 	# Determine ABI tags.
-	case "$UNAME_MACHINE_ARCH" in
+	case $UNAME_MACHINE_ARCH in
 	    earm*)
 		expr='s/^earmv0-9/-eabi/;s/eb$//'
 		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
@@ -226,7 +254,7 @@
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case "$UNAME_VERSION" in
+	case $UNAME_VERSION in
 	    Debian*)
 		release='-gnu'
 		;;
@@ -237,45 +265,57 @@
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "$machine-${os}${release}${abi}"
-	exit ;;
+	GUESS=$machine-${os}${release}${abi-}
+	;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+	;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+	;;
+    *:SecBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+	;;
     *:LibertyBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+	;;
     *:MidnightBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+	;;
     *:ekkoBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+	;;
     *:SolidBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+	;;
+    *:OS108:*:*)
+	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+	;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
-	exit ;;
+	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+	;;
     *:MirBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+	;;
     *:Sortix:*:*)
-	echo "$UNAME_MACHINE"-unknown-sortix
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-sortix
+	;;
+    *:Twizzler:*:*)
+	GUESS=$UNAME_MACHINE-unknown-twizzler
+	;;
     *:Redox:*:*)
-	echo "$UNAME_MACHINE"-unknown-redox
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-redox
+	;;
     mips:OSF1:*.*)
-        echo mips-dec-osf1
-        exit ;;
+	GUESS=mips-dec-osf1
+	;;
     alpha:OSF1:*:*)
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	trap '' 0
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -289,7 +329,7 @@
 	# covers most systems running today.  This code pipes the CPU
 	# types through head -n 1, so we only detect the type of CPU 0.
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
+	case $ALPHA_CPU_TYPE in
 	    "EV4 (21064)")
 		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
@@ -326,117 +366,121 @@
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
+	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+	;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
+	GUESS=m68k-unknown-sysv4
+	;;
     *:AamigaOoSs:*:*)
-	echo "$UNAME_MACHINE"-unknown-amigaos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-amigaos
+	;;
     *:MmorphOoSs:*:*)
-	echo "$UNAME_MACHINE"-unknown-morphos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-morphos
+	;;
     *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
+	GUESS=i370-ibm-openedition
+	;;
     *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	GUESS=s390-ibm-zvmoe
+	;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
+	GUESS=powerpc-ibm-os400
+	;;
     arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
-	echo arm-acorn-riscix"$UNAME_RELEASE"
-	exit ;;
+	GUESS=arm-acorn-riscix$UNAME_RELEASE
+	;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	GUESS=arm-unknown-riscos
+	;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	GUESS=hppa1.1-hitachi-hiuxmpp
+	;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
+	case `(/bin/universe) 2>/dev/null` in
+	    att) GUESS=pyramid-pyramid-sysv3 ;;
+	    *)   GUESS=pyramid-pyramid-bsd   ;;
+	esac
+	;;
     NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
+	GUESS=pyramid-pyramid-svr4
+	;;
     DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
+	GUESS=sparc-icl-nx6
+	;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
+	    sparc) GUESS=sparc-icl-nx7 ;;
+	esac
+	;;
     s390x:SunOS:*:*)
-	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+	;;
     sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-hal-solaris2$SUN_REL
+	;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-sun-solaris2$SUN_REL
+	;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=i386-pc-auroraux$UNAME_RELEASE
+	;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if  "$CC_FOR_BUILD" != no_compiler_found ; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH=x86_64
 	    fi
 	fi
-	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+	;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-sun-solaris3$SUN_REL
+	;;
     sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
+	case `/usr/bin/arch -k` in
 	    Series*|S4*)
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+	GUESS=sparc-sun-sunos$SUN_REL
+	;;
     sun3*:SunOS:*:*)
-	echo m68k-sun-sunos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-sun-sunos$UNAME_RELEASE
+	;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
+	case `/bin/arch` in
 	    sun3)
-		echo m68k-sun-sunos"$UNAME_RELEASE"
+		GUESS=m68k-sun-sunos$UNAME_RELEASE
 		;;
 	    sun4)
-		echo sparc-sun-sunos"$UNAME_RELEASE"
+		GUESS=sparc-sun-sunos$UNAME_RELEASE
 		;;
 	esac
-	exit ;;
+	;;
     aushp:SunOS:*:*)
-	echo sparc-auspex-sunos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sparc-auspex-sunos$UNAME_RELEASE
+	;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -446,43 +490,43 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-milan-mint$UNAME_RELEASE
+	;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-hades-mint$UNAME_RELEASE
+	;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-unknown-mint$UNAME_RELEASE
+	;;
     m68k:machten:*:*)
-	echo m68k-apple-machten"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-apple-machten$UNAME_RELEASE
+	;;
     powerpc:machten:*:*)
-	echo powerpc-apple-machten"$UNAME_RELEASE"
-	exit ;;
+	GUESS=powerpc-apple-machten$UNAME_RELEASE
+	;;
     RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
+	GUESS=mips-dec-mach_bsd4.3
+	;;
     RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix"$UNAME_RELEASE"
-	exit ;;
+	GUESS=mips-dec-ultrix$UNAME_RELEASE
+	;;
     VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix"$UNAME_RELEASE"
-	exit ;;
+	GUESS=vax-dec-ultrix$UNAME_RELEASE
+	;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix"$UNAME_RELEASE"
-	exit ;;
+	GUESS=clipper-intergraph-clix$UNAME_RELEASE
+	;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -508,78 +552,79 @@
 	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$0-9*$.*/\1/p'` &&
 	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=mips-mips-riscos$UNAME_RELEASE
+	;;
     Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
+	GUESS=powerpc-motorola-powermax
+	;;
     Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
+	GUESS=powerpc-harris-powerunix
+	;;
     m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
+	GUESS=m88k-harris-cxux7
+	;;
     m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
+	GUESS=m88k-motorola-sysv4
+	;;
     m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if  "$UNAME_PROCESSOR" = mc88100  ||  "$UNAME_PROCESSOR" = mc88110 
+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
 	then
-	    if  "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx  || \
-	        "$TARGET_BINARY_INTERFACE"x = x 
+	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	       test "$TARGET_BINARY_INTERFACE"x = x
 	    then
-		echo m88k-dg-dgux"$UNAME_RELEASE"
+		GUESS=m88k-dg-dgux$UNAME_RELEASE
 	    else
-		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
 	    fi
 	else
-	    echo i586-dg-dgux"$UNAME_RELEASE"
+	    GUESS=i586-dg-dgux$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
+	GUESS=m88k-dolphin-sysv3
+	;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
+	GUESS=m88k-tektronix-sysv3
+	;;
     Tek430-90-9:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
+	GUESS=m68k-tektronix-bsd
+	;;
     *:IRIX*:*:*)
-	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
-	exit ;;
+	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+	GUESS=mips-sgi-irix$IRIX_REL
+	;;
     ????????:AIX?:12.1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
+	;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
+	GUESS=i386-ibm-aix
+	;;
     ia64:AIX:*:*)
-	if  -x /usr/bin/oslevel  ; then
+	if test -x /usr/bin/oslevel ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+	;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
@@ -593,16 +638,16 @@
 EOF
 		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
-			echo "$SYSTEM_NAME"
+			GUESS=$SYSTEM_NAME
 		else
-			echo rs6000-ibm-aix3.2.5
+			GUESS=rs6000-ibm-aix3.2.5
 		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
+		GUESS=rs6000-ibm-aix3.2.4
 	else
-		echo rs6000-ibm-aix3.2
+		GUESS=rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	;;
     *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
@@ -610,57 +655,57 @@
 	else
 		IBM_ARCH=powerpc
 	fi
-	if  -x /usr/bin/lslpp  ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+	if test -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
 			   awk -F: '{ print $3 }' | sed s/0-9*$/0/`
 	else
-		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
-	exit ;;
+	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+	;;
     *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
+	GUESS=rs6000-ibm-aix
+	;;
     ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
+	GUESS=romp-ibm-bsd4.4
+	;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
+	;;                                  # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
+	GUESS=rs6000-bull-bosx
+	;;
     DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
+	GUESS=m68k-bull-sysv3
+	;;
     9000/34??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
+	GUESS=m68k-hp-bsd
+	;;
     hp300:4.4BSD:*:* | 9000/34??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
+	GUESS=m68k-hp-bsd4.4
+	;;
     9000/34678??:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
-	case "$UNAME_MACHINE" in
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
+	case $UNAME_MACHINE in
 	    9000/31?)            HP_ARCH=m68000 ;;
 	    9000/34??)         HP_ARCH=m68k ;;
 	    9000/6780-90-9)
-		if  -x /usr/bin/getconf ; then
+		if test -x /usr/bin/getconf; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "$sc_cpu_version" in
+		    case $sc_cpu_version in
 		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
 		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
-			case "$sc_kernel_bits" in
+			case $sc_kernel_bits in
 			  32) HP_ARCH=hppa2.0n ;;
 			  64) HP_ARCH=hppa2.0w ;;
 			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
-		if  "$HP_ARCH" = "" ; then
-		    eval "$set_cc_for_build"
+		if test "$HP_ARCH" = ""; then
+		    set_cc_for_build
 		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
@@ -698,9 +743,9 @@
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if  "$HP_ARCH" = hppa2.0w 
+	if test "$HP_ARCH" = hppa2.0w
 	then
-	    eval "$set_cc_for_build"
+	    set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -719,14 +764,14 @@
 		HP_ARCH=hppa64
 	    fi
 	fi
-	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
-	exit ;;
+	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+	;;
     ia64:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
-	echo ia64-hp-hpux"$HPUX_REV"
-	exit ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
+	GUESS=ia64-hp-hpux$HPUX_REV
+	;;
     3050*:HI-UX:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
@@ -754,36 +799,36 @@
 EOF
 	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
+	GUESS=unknown-hitachi-hiuxwe2
+	;;
     9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:*)
-	echo hppa1.1-hp-bsd
-	exit ;;
+	GUESS=hppa1.1-hp-bsd
+	;;
     9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
+	GUESS=hppa1.0-hp-bsd
+	;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
+	GUESS=hppa1.0-hp-mpeix
+	;;
     hp7??:OSF1:*:* | hp8?79:OSF1:*:*)
-	echo hppa1.1-hp-osf
-	exit ;;
+	GUESS=hppa1.1-hp-osf
+	;;
     hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-osf
+	;;
     i*86:OSF1:*:*)
-	if  -x /usr/sbin/sysversion  ; then
-	    echo "$UNAME_MACHINE"-unknown-osf1mk
+	if test -x /usr/sbin/sysversion ; then
+	    GUESS=$UNAME_MACHINE-unknown-osf1mk
 	else
-	    echo "$UNAME_MACHINE"-unknown-osf1
+	    GUESS=$UNAME_MACHINE-unknown-osf1
 	fi
-	exit ;;
+	;;
     parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
+	GUESS=hppa1.1-hp-lites
+	;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
+	GUESS=c1-convex-bsd
+	;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
@@ -791,17 +836,18 @@
 	fi
 	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
+	GUESS=c34-convex-bsd
+	;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
+	GUESS=c38-convex-bsd
+	;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
+	GUESS=c4-convex-bsd
+	;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=ymp-cray-unicos$CRAY_REL
+	;;
     CRAY*A-Z90:*:*:*)
 	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 	| sed -e 's/CRAY.*$A-Z90$/\1/' \
@@ -809,103 +855,129 @@
 	      -e 's/\.^.*$/.X/'
 	exit ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=t90-cray-unicos$CRAY_REL
+	;;
     CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=alphaev5-cray-unicosmk$CRAY_REL
+	;;
     CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=sv1-cray-unicos$CRAY_REL
+	;;
     *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=craynv-cray-unicosmp$CRAY_REL
+	;;
     F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     5000:UNIX_System_V:4.*:*)
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+	;;
     sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+	;;
     *:BSD/OS:*:*)
-	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+	;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+	else
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+	fi
+	;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case "$UNAME_PROCESSOR" in
+	case $UNAME_PROCESSOR in
 	    amd64)
 		UNAME_PROCESSOR=x86_64 ;;
 	    i386)
 		UNAME_PROCESSOR=i586 ;;
 	esac
-	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
-	exit ;;
+	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+	;;
     i*:CYGWIN*:*)
-	echo "$UNAME_MACHINE"-pc-cygwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-cygwin
+	;;
     *:MINGW64*:*)
-	echo "$UNAME_MACHINE"-pc-mingw64
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw64
+	;;
     *:MINGW*:*)
-	echo "$UNAME_MACHINE"-pc-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw32
+	;;
     *:MSYS*:*)
-	echo "$UNAME_MACHINE"-pc-msys
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-msys
+	;;
     i*:PW*:*)
-	echo "$UNAME_MACHINE"-pc-pw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-pw32
+	;;
+    *:SerenityOS:*:*)
+        GUESS=$UNAME_MACHINE-pc-serenity
+        ;;
     *:Interix*:*)
-	case "$UNAME_MACHINE" in
+	case $UNAME_MACHINE in
 	    x86)
-		echo i586-pc-interix"$UNAME_RELEASE"
-		exit ;;
+		GUESS=i586-pc-interix$UNAME_RELEASE
+		;;
 	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix"$UNAME_RELEASE"
-		exit ;;
+		GUESS=x86_64-unknown-interix$UNAME_RELEASE
+		;;
 	    IA64)
-		echo ia64-unknown-interix"$UNAME_RELEASE"
-		exit ;;
+		GUESS=ia64-unknown-interix$UNAME_RELEASE
+		;;
 	esac ;;
     i*:UWIN*:*)
-	echo "$UNAME_MACHINE"-pc-uwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-uwin
+	;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
+	GUESS=x86_64-pc-cygwin
+	;;
     prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=powerpcle-unknown-solaris2$SUN_REL
+	;;
     *:GNU:*:*)
 	# the GNU system
-	echo "`echo "$UNAME_MACHINE"|sed -e 's,-/.*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-	exit ;;
+	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,-/.*$,,'`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+	;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"``echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`-$LIBC"
-	exit ;;
-    i*86:Minix:*:*)
-	echo "$UNAME_MACHINE"-pc-minix
-	exit ;;
+	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+	;;
+    *:Minix:*:*)
+	GUESS=$UNAME_MACHINE-unknown-minix
+	;;
     aarch64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' /proc/cpuinfo 2>/dev/null` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -916,187 +988,225 @@
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     arm*:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	    GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
 	    else
-		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
-	exit ;;
+	;;
     avr32*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     cris:Linux:*:*)
-	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
     crisv32:Linux:*:*)
-	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
     e2k:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     frv:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     hexagon:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     i*86:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+	;;
     ia64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     k1om:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     m32r*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     m68*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
+
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
+
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	MIPS_ENDIAN=el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	MIPS_ENDIAN=
 	#else
-	CPU=
+	MIPS_ENDIAN=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+	eval "$cc_set_vars"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
 	;;
     mips64el:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=or1k-unknown-linux-$LIBC
+	;;
     or32:Linux:*:* | or1k*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=sparc-unknown-linux-$LIBC
+	;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=hppa64-unknown-linux-$LIBC
+	;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
-	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-	  *)    echo hppa-unknown-linux-"$LIBC" ;;
+	  PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+	  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+	  *)    GUESS=hppa-unknown-linux-$LIBC ;;
 	esac
-	exit ;;
+	;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=powerpc64-unknown-linux-$LIBC
+	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=powerpc-unknown-linux-$LIBC
+	;;
     ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=powerpc64le-unknown-linux-$LIBC
+	;;
     ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-"$LIBC"
-	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=powerpcle-unknown-linux-$LIBC
+	;;
+    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+	;;
     sh64*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     sh*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     tile*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     vax:Linux:*:*)
-	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+	;;
     x86_64:Linux:*:*)
-	if objdump -f /bin/sh | grep -q elf32-x86-64; then
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
-	else
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	    then
+		LIBCABI=${LIBC}x32
+	    fi
 	fi
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	;;
     xtensa*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
+	GUESS=i386-sequent-sysv4
+	;;
     i*86:UNIX_SV:4.2MP:2.*)
 	# Unixware is an offshoot of SVR4, but it has its own version
 	# number series starting with 2...
 	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
 	# Use sysv4.2uw... so that sysv4* matches it.
-	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+	;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
-	echo "$UNAME_MACHINE"-pc-os2-emx
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-os2-emx
+	;;
     i*86:XTS-300:*:STOP)
-	echo "$UNAME_MACHINE"-unknown-stop
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-stop
+	;;
     i*86:atheos:*:*)
-	echo "$UNAME_MACHINE"-unknown-atheos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-atheos
+	;;
     i*86:syllable:*:*)
-	echo "$UNAME_MACHINE"-pc-syllable
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-syllable
+	;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
-	echo i386-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=i386-unknown-lynxos$UNAME_RELEASE
+	;;
     i*86:*DOS:*:*)
-	echo "$UNAME_MACHINE"-pc-msdosdjgpp
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+	;;
     i*86:*:4.*:*)
 	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
 	else
-		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
 	fi
-	exit ;;
+	;;
     i*86:*:5:678*)
 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
@@ -1104,12 +1214,12 @@
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1119,11 +1229,11 @@
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
 	else
-		echo "$UNAME_MACHINE"-pc-sysv32
+		GUESS=$UNAME_MACHINE-pc-sysv32
 	fi
-	exit ;;
+	;;
     pc:*:*:*)
 	# Left here for compatibility:
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1131,31 +1241,31 @@
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
+	GUESS=i586-pc-msdosdjgpp
+	;;
     Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
+	GUESS=i386-pc-mach3
+	;;
     paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
+	GUESS=i860-intel-osf1
+	;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+	  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
 	fi
-	exit ;;
+	;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
+	GUESS=m68010-convergent-sysv
+	;;
     mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
+	GUESS=m68k-convergent-sysv
+	;;
     M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
+	GUESS=m68k-diab-dnix
+	;;
     M68*:*:R3V5678*:*)
 	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3345??:*:4.0:3.0 | 334??A:*:4.0:3.0 | 334??,*:*:4.0:3.0 | 334??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
@@ -1180,249 +1290,404 @@
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+	;;
     mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
+	GUESS=m68k-atari-sysv4
+	;;
     TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+	;;
     rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+	;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
-	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
+	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+	;;
     SMBES:UNIX_SV:*:*)
-	echo mips-dde-sysv"$UNAME_RELEASE"
-	exit ;;
+	GUESS=mips-dde-sysv$UNAME_RELEASE
+	;;
     RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo "$UNAME_MACHINE"-sni-sysv4
+		GUESS=$UNAME_MACHINE-sni-sysv4
 	else
-		echo ns32k-sni-sysv
+		GUESS=ns32k-sni-sysv
 	fi
-	exit ;;
+	;;
     PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+	GUESS=i586-unisys-sysv4
+	;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
+	GUESS=hppa1.1-stratus-sysv4
+	;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
+	GUESS=i860-stratus-sysv4
+	;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo "$UNAME_MACHINE"-stratus-vos
-	exit ;;
+	GUESS=$UNAME_MACHINE-stratus-vos
+	;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
+	GUESS=hppa1.1-stratus-vos
+	;;
     mc68*:A/UX:*:*)
-	echo m68k-apple-aux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=m68k-apple-aux$UNAME_RELEASE
+	;;
     news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
+	GUESS=mips-sony-newsos6
+	;;
     R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if  -d /usr/nec ; then
-		echo mips-nec-sysv"$UNAME_RELEASE"
+	if test -d /usr/nec; then
+		GUESS=mips-nec-sysv$UNAME_RELEASE
 	else
-		echo mips-unknown-sysv"$UNAME_RELEASE"
+		GUESS=mips-unknown-sysv$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
+	GUESS=powerpc-be-beos
+	;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
+	GUESS=powerpc-apple-beos
+	;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
+	GUESS=i586-pc-beos
+	;;
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
+	GUESS=i586-pc-haiku
+	;;
     x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
+	GUESS=x86_64-unknown-haiku
+	;;
     SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sx4-nec-superux$UNAME_RELEASE
+	;;
     SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sx5-nec-superux$UNAME_RELEASE
+	;;
     SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sx6-nec-superux$UNAME_RELEASE
+	;;
     SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sx7-nec-superux$UNAME_RELEASE
+	;;
     SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sx8-nec-superux$UNAME_RELEASE
+	;;
     SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sx8r-nec-superux$UNAME_RELEASE
+	;;
     SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=sxace-nec-superux$UNAME_RELEASE
+	;;
     Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
-	exit ;;
+	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+	;;
     *:Rhapsody:*:*)
-	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+	;;
+    arm64:Darwin:*:*)
+	GUESS=aarch64-apple-darwin$UNAME_RELEASE
+	;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval "$set_cc_for_build"
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
+	UNAME_PROCESSOR=`uname -p`
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	if command -v xcode-select > /dev/null 2> /dev/null && \
+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
+	    # Avoid executing cc if there is no toolchain installed as
+	    # cc will be a stub that puts up a graphical alert
+	    # prompting the user to install developer tools.
+	    CC_FOR_BUILD=no_compiler_found
+	else
+	    set_cc_for_build
 	fi
-	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-	    if  "$CC_FOR_BUILD" != no_compiler_found ; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		       grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		       grep IS_PPC >/dev/null
-		then
-		    UNAME_PROCESSOR=powerpc
-		fi
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_PPC >/dev/null
+	    then
+		UNAME_PROCESSOR=powerpc
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
+	    # uname -m returns i386 or x86_64
+	    UNAME_PROCESSOR=$UNAME_MACHINE
 	fi
-	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+	;;
     *:procnto*:*:* | *:QNX:0123456789*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+	;;
     *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
+	GUESS=i386-pc-qnx
+	;;
     NEO-*:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
+	GUESS=neo-tandem-nsk$UNAME_RELEASE
+	;;
     NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
+	GUESS=nse-tandem-nsk$UNAME_RELEASE
+	;;
     NSR-*:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
+	GUESS=nsr-tandem-nsk$UNAME_RELEASE
+	;;
     NSV-*:NONSTOP_KERNEL:*:*)
-	echo nsv-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
+	GUESS=nsv-tandem-nsk$UNAME_RELEASE
+	;;
     NSX-*:NONSTOP_KERNEL:*:*)
-	echo nsx-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
+	GUESS=nsx-tandem-nsk$UNAME_RELEASE
+	;;
     *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
+	GUESS=mips-compaq-nonstopux
+	;;
     BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
+	GUESS=bs2000-siemens-sysv
+	;;
     DS/*:UNIX_System_V:*:*)
-	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
-	exit ;;
+	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+	;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = 386; then
+	if test "${cputype-}" = 386; then
 	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
+	elif test "x${cputype-}" != x; then
+	    UNAME_MACHINE=$cputype
 	fi
-	echo "$UNAME_MACHINE"-unknown-plan9
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-plan9
+	;;
     *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
+	GUESS=pdp10-unknown-tops10
+	;;
     *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
+	GUESS=pdp10-unknown-tenex
+	;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
+	GUESS=pdp10-dec-tops20
+	;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
+	GUESS=pdp10-xkl-tops20
+	;;
     *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
+	GUESS=pdp10-unknown-tops20
+	;;
     *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
+	GUESS=pdp10-unknown-its
+	;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux"$UNAME_RELEASE"
-	exit ;;
+	GUESS=mips-sei-seiux$UNAME_RELEASE
+	;;
     *:DragonFly:*:*)
-	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
-	exit ;;
+	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+	;;
     *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "$UNAME_MACHINE" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
+	case $UNAME_MACHINE in
+	    A*) GUESS=alpha-dec-vms ;;
+	    I*) GUESS=ia64-dec-vms ;;
+	    V*) GUESS=vax-dec-vms ;;
 	esac ;;
     *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
+	GUESS=i386-pc-xenix
+	;;
     i*86:skyos:*:*)
-	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
-	exit ;;
+	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+	;;
     i*86:rdos:*:*)
-	echo "$UNAME_MACHINE"-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo "$UNAME_MACHINE"-pc-aros
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-rdos
+	;;
+    i*86:Fiwix:*:*)
+	GUESS=$UNAME_MACHINE-pc-fiwix
+	;;
+    *:AROS:*:*)
+	GUESS=$UNAME_MACHINE-unknown-aros
+	;;
     x86_64:VMkernel:*:*)
-	echo "$UNAME_MACHINE"-unknown-esx
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-esx
+	;;
     amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
+	GUESS=x86_64-unknown-onefs
+	;;
+    *:Unleashed:*:*)
+	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+	;;
 esac
 
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+    echo "$GUESS"
+    exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach $0-9*$.*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
 echo "$0: unable to guess system type" >&2
 
-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+case $UNAME_MACHINE:$UNAME_SYSTEM in
     mips:Linux | mips64:Linux)
 	# If we got here on MIPS GNU/Linux, output extra information.
 	cat >&2 <<EOF
@@ -1439,9 +1704,17 @@
 operating system you are using. If your script is old, overwrite *all*
 copies of config.guess and config.sub with the latest versions from:
 
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 and
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
+
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+   cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1469,11 +1742,12 @@
 UNAME_SYSTEM  = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/config.sub -> _service:tar_scm:nghttp2-1.52.0.tar.xz/config.sub Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2018-02-22'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -33,7 +35,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -50,6 +52,13 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -67,7 +76,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,7 +98,7 @@
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
@@ -110,1223 +119,1186 @@
     exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^$.*$-$^-*-^-*$$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo "$1" | sed 's/^$.*$-$^-*-^-*$$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo "$1" | sed 's/^$.*$-$^-*-^-*$$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo "$1" | sed 's/-^-*$//'`
-    if  "$basic_machine" != "$1" 
-    then os=`echo "$1" | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun234* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c123* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.4-9*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v4-9*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
 		;;
-	-lynx*)
-		os=-lynxos
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		basic_os=$field3-$field4
 		;;
-	-ptx*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				basic_os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				basic_os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				basic_os=$field3
+				;;
+		esac
 		;;
-	-psos*)
-		os=-psos
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun234* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c123* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						basic_os=
+						;;
+					*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+				esac
+			;;
+		esac
 		;;
-	-mint | -mint0-9*)
-		basic_machine=m68k-atari
-		os=-mint
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				basic_os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				basic_os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				basic_os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				basic_os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				basic_os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				basic_os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				basic_os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				basic_os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				basic_os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				basic_os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				basic_os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				basic_os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				basic_os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				basic_os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				basic_os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				basic_os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				basic_os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				basic_os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				basic_os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				basic_os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				basic_os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				basic_os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				basic_os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				basic_os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				basic_os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				basic_os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				basic_os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				basic_os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				basic_os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				basic_os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				basic_os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				basic_os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				basic_os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				basic_os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				basic_os=sysv3
+				;;
+			hp300 | hp300hpux)
+				basic_machine=m68k-hp
+				basic_os=hpux
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				basic_os=bsd
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				basic_os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				basic_os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				basic_os=mach
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				basic_os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				basic_os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				basic_os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				basic_os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				basic_os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				basic_os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				basic_os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				basic_os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				basic_os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				basic_os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				basic_os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				basic_os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				basic_os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				basic_os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				basic_os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				basic_os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				basic_os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				basic_os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				basic_os=cxux
+				;;
+			nh45000)
+				basic_machine=m88k-harris
+				basic_os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				basic_os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				basic_os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				basic_os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				basic_os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				basic_os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				basic_os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				basic_os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				basic_os=linux
+				;;
+			psp)
+				basic_machine=mipsallegrexel-sony
+				basic_os=psp
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				basic_os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				basic_os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				basic_os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				basic_os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				basic_os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				basic_os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				basic_os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				basic_os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				basic_os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				basic_os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				basic_os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				basic_os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				basic_os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				basic_os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				basic_os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				basic_os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				basic_os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				basic_os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				basic_os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				basic_os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				basic_os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				basic_os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				basic_os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				basic_os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				basic_os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				basic_os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				basic_os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				basic_os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				basic_os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				basic_os=vsta
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				basic_os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				basic_os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				basic_os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				basic_os=unicos
+				;;
+			*)
+				basic_machine=$1
+				basic_os=
+				;;
+		esac
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
-	| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | armble | armelb | armv2-8 | armv3-8lb | armv7arm \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh1234 | sh24a | sh24aeb | sh23e | sh234eb | sheb | shbe | shle | sh1234le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| wasm32 \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon3-9)
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-	m88110 | m680123460 | m683?2 | m68360 | m5200 | v70 | w65)
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	ms1)
-		basic_machine=mt-unknown
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
 		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	orion105)
+		cpu=clipper
+		vendor=highlevel
 		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
 		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
 		;;
 
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
-	| alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
-	| alphapca567-* | alpha64pca567-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c123* | c30-* | cjt90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh1234-* | sh24a-* | sh24aeb-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
-	| shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| wasm32-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-pc
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+		cpu=m68000
+		vendor=att
 		;;
 	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo "$basic_machine" | sed 's/^^-*-//'`
-		os=-linux
+		cpu=we32k
+		vendor=att
 		;;
 	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+		cpu=powerpc
+		vendor=ibm
+		basic_os=cnk
 		;;
 	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops10
 		;;
 	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
+		cpu=m68k
+		vendor=motorola
 		;;
 	dpx2*)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v12)
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v12-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^^-*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
+		cpu=m68k
+		vendor=bull
+		basic_os=sysv3
 		;;
 	encore | umax | mmax)
-		basic_machine=ns32k-encore
+		cpu=ns32k
+		vendor=encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		basic_os=${basic_os:-bsd}
 		;;
 	fx2800)
-		basic_machine=i860-alliant
+		cpu=i860
+		vendor=alliant
 		;;
 	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
+		cpu=ns32k
+		vendor=ns
 		;;
 	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	hp3k90-90-9 | hp90-90-9)
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k20-90-9 | hp9k310-9)
-		basic_machine=m68000-hp
+		cpu=m68000
+		vendor=hp
 		;;
 	hp9k32-90-9)
-		basic_machine=m68k-hp
+		cpu=m68k
+		vendor=hp
 		;;
 	hp9k60-90-9 | hp60-90-9)
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k70-790-9 | hp70-790-9)
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k780-9 | hp780-9)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8671 | hp8671 | hp9k8024 | hp8024 | hp9k8789 | hp8789 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k80-913679 | hp80-913679)
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k80-90-9 | hp80-90-9)
-		basic_machine=hppa1.0-hp
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	i*86v32)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv4
 		;;
 	i*86v)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=solaris2
 		;;
-	vsta)
-		basic_machine=i386-unknown
-		os=-vsta
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		basic_os=${basic_os:-unicos}
 		;;
 	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
+		cpu=mips
+		vendor=sgi
+		case $basic_os in
+		    irix*)
 			;;
 		    *)
-			os=-irix4
+			basic_os=irix4
 			;;
 		esac
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon3-9-*)
-		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo "$basic_machine" | sed 's/^^-*-//'`
-		os=-linux
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint0-9* | *MiNT | *MiNT0-9*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
+		cpu=m68000
+		vendor=convergent
 		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	*mint | mint0-9* | *MiNT | *MiNT0-9*)
+		cpu=m68k
+		vendor=atari
+		basic_os=mint
 		;;
 	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
+		cpu=mips
+		vendor=sony
+		basic_os=newsos
 		;;
 	next | m*-next)
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
+		cpu=m68k
+		vendor=next
+		case $basic_os in
+		    openstep*)
+		        ;;
+		    nextstep*)
 			;;
-		    -ns2*)
-		      os=-nextstep2
+		    ns2*)
+		      basic_os=nextstep2
 			;;
 		    *)
-		      os=-nextstep3
+		      basic_os=nextstep3
 			;;
 		esac
 		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh45000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	nsv-tandem)
-		basic_machine=nsv-tandem
-		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
+		cpu=np1
+		vendor=gould
 		;;
 	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
+		cpu=hppa1.1
+		vendor=oki
+		basic_os=proelf
 		;;
 	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo "$basic_machine" | sed 's/^^-*-//'`
-		os=-linux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	pbd)
-		basic_machine=sparc-tti
+		cpu=sparc
+		vendor=tti
 		;;
 	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
+		cpu=m68k
+		vendor=tti
 		;;
-	pc98-*)
-		basic_machine=i386-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo "$basic_machine" | sed 's/^^-*-//'`
+	pc532)
+		cpu=ns32k
+		vendor=pc532
 		;;
 	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+		cpu=pn
+		vendor=gould
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^^-*-//'`
-		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
+	power)
+		cpu=power
+		vendor=ibm
 		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^^-*-//'`
+	ps2)
+		cpu=i386
+		vendor=ibm
 		;;
-	ppc64)	basic_machine=powerpc64-unknown
+	rm4600)
+		cpu=mips
+		vendor=siemens
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^^-*-//'`
+	rtpc | rtpc-*)
+		cpu=romp
+		vendor=ibm
 		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		basic_os=${basic_os:-elf}
 		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^^-*-//'`
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		basic_os=vxworks
 		;;
-	ps2)
-		basic_machine=i386-ibm
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
 		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
+	w65)
+		cpu=w65
+		vendor=wdc
 		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		basic_os=proelf
 		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
+	none)
+		cpu=none
+		vendor=none
 		;;
-	rm4600)
-		basic_machine=mips-siemens
+	leon|leon3-9)
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
+	leon-*|leon3-9-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
+
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+		IFS=$saved_IFS
 		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
 		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		basic_os=${basic_os:-unicosmp}
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
+	c90-unknown | c90-cray)
+		vendor=cray
+		basic_os=${Basic_os:-unicos}
 		;;
-	sequent)
-		basic_machine=i386-sequent
+	fx80-unknown)
+		vendor=alliant
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
+	romp-unknown)
+		vendor=ibm
 		;;
-	simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
+	mmix-unknown)
+		vendor=knuth
 		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	spur)
-		basic_machine=spur-unknown
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	st2000)
-		basic_machine=m68k-tandem
+	vax-unknown)
+		vendor=dec
 		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
+	pdp11-unknown)
+		vendor=dec
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo "$basic_machine" | sed 's/^^-*-//'`
+	we32k-unknown)
+		vendor=att
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	i370-ibm*)
+		vendor=ibm
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	orion-unknown)
+		vendor=highlevel
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+
+	# Here we normalize CPU types with a missing or matching vendor
+	armh-unknown | armh-alt)
+		cpu=armv7l
+		vendor=alt
+		basic_os=${basic_os:-linux-gnueabihf}
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		basic_os=${basic_os:-bosx}
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
+	blackfin-*)
+		cpu=bfin
+		basic_os=linux
 		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
+	c54x-*)
+		cpu=tic54x
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	c55x-*)
+		cpu=tic55x
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	c6x-*)
+		cpu=tic6x
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
+	e500v12-*)
+		cpu=powerpc
+		basic_os=${basic_os}"spe"
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	mips3*-*)
+		cpu=mips64
 		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
+	ms1-*)
+		cpu=mt
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
+	m68knommu-*)
+		cpu=m68k
+		basic_os=linux
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	tx39)
-		basic_machine=mipstx39-unknown
+	openrisc-*)
+		cpu=or32
 		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
+	parisc-*)
+		cpu=hppa
+		basic_os=linux
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
+	pentium4-*)
+		cpu=i786
 		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
+	pc98-*)
+		cpu=i386
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
+	ppc-* | ppcbe-*)
+		cpu=powerpc
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	ppc64-*)
+		cpu=powerpc64
 		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
 		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
+	sb1-*)
+		cpu=mipsisa64sb1
 		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
+	sb1el-*)
+		cpu=mipsisa64sb1el
 		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
+	sh5elb-*)
+		cpu=`echo "$cpu" | sed 's/^$sh.$e$.$$/\1\2e/'`
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
+	spur-*)
+		cpu=spur
 		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
+	strongarm-* | thumb-*)
+		cpu=arm
 		;;
-	x64)
-		basic_machine=x86_64-pc
+	tx39-*)
+		cpu=mipstx39
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	tx39el-*)
+		cpu=mipstx39el
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	x64-*)
+		cpu=x86_64
 		;;
 	xscale-* | xscaleebl-*)
-		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	none)
-		basic_machine=none-none
-		os=-none
+	arm64-* | aarch64le-*)
+		cpu=aarch64
 		;;
 
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		basic_os=${basic_os:-elf}
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
 		;;
-	vax)
-		basic_machine=vax-dec
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
+	crx-*)
+		basic_os=${basic_os:-elf}
 		;;
-	we32k)
-		basic_machine=we32k-att
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
 		;;
-	sh1234 | sh24a | sh24aeb | sh34eb | sh1234le | sh23ele)
-		basic_machine=sh-unknown
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	mipsallegrexel-sony)
+		cpu=mipsallegrexel
+		vendor=sony
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	tile*-*)
+		basic_os=${basic_os:-linux-gnu}
 		;;
+
 	*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev4-8 | alphaev56 | alphaev678 \
+			| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 \
+			| alphapca567 | alpha64pca567 \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb | arc32 | arc64 \
+			| arm | armlbe | armelb | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bpf | bs2000 \
+			| c123* | c30 | cjt90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f3001 | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| loongarch32 | loongarch64 | loongarchx32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m6800123460 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r3 | mipsisa32r3el \
+			| mipsisa32r5 | mipsisa32r5el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r3 | mipsisa64r3el \
+			| mipsisa64r5 | mipsisa64r5el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
+			| score \
+			| sh | shl \
+			| sh1234 | sh24a | sh24aelb | sh23e | shelb | shlbe \
+			| sh1234elb |  sh12345lbe | sh23ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| thumbv7* \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1334,203 +1306,215 @@
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if  x"$os" != x"" 
+if test x$basic_os != x
 then
+
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+	gnu/linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+		;;
+	os2-emx)
+		kernel=os2
+		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+		;;
+	nto-qnx*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+		;;
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+		IFS=$saved_IFS
+		;;
+	# Default OS when just kernel was specified
+	nto*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+		;;
+	linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
+		;;
+	*)
+		kernel=
+		os=$basic_os
+		;;
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
 case $os in
 	# First match some system type aliases that might get confused
 	# with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
 		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+	bluegene*)
+		os=cnk
 		;;
-	-solaris)
-		os=-solaris2
+	solaris1 | solaris1.*)
+		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
 		;;
-	-unixware*)
-		os=-sysv4.2uw
+	solaris)
+		os=solaris2
 		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+	unixware*)
+		os=sysv4.2uw
 		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
-	-es1800*)
-		os=-ose
+	es1800*)
+		os=ose
 		;;
-	# Now accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos34*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
 		;;
-	-nto-qnx*)
+	isc)
+		os=isc2.2
 		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+	sco6)
+		os=sco5v6
 		;;
-	-sim | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	sco5)
+		os=sco3.2v5
 		;;
-	-mac*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
+	sco4)
+		os=sco3.2v4
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
+	sco3.2.4-9*)
+		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+	sco*v* | scout)
+		# Don't match below
 		;;
-	-sunos5*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+	sco*)
+		os=sco3.2v2
 		;;
-	-sunos6*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+	psos*)
+		os=psos
 		;;
-	-opened*)
-		os=-openedition
+	qnx*)
+		os=qnx
 		;;
-	-os400*)
-		os=-os400
+	hiux*)
+		os=hiuxwe2
 		;;
-	-wince*)
-		os=-wince
+	lynx*178)
+		os=lynxos178
 		;;
-	-utek*)
-		os=-bsd
+	lynx*5)
+		os=lynxos5
 		;;
-	-dynix*)
-		os=-bsd
+	lynxos*)
+		# don't get caught up in next wildcard
 		;;
-	-acis*)
-		os=-aos
+	lynx*)
+		os=lynxos
 		;;
-	-atheos*)
-		os=-atheos
+	mac0-9*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	-syllable*)
-		os=-syllable
+	opened*)
+		os=openedition
 		;;
-	-386bsd)
-		os=-bsd
+	os400*)
+		os=os400
 		;;
-	-ctix* | -uts*)
-		os=-sysv
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	-nova*)
-		os=-rtmk-nova
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	-ns2)
-		os=-nextstep2
+	wince*)
+		os=wince
 		;;
-	-nsk*)
-		os=-nsk
+	utek*)
+		os=bsd
 		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
+	dynix*)
+		os=bsd
 		;;
-	-sinix*)
-		os=-sysv4
+	acis*)
+		os=aos
 		;;
-	-tpf*)
-		os=-tpf
+	atheos*)
+		os=atheos
 		;;
-	-triton*)
-		os=-sysv3
+	syllable*)
+		os=syllable
+		;;
+	386bsd)
+		os=bsd
+		;;
+	ctix* | uts*)
+		os=sysv
+		;;
+	nova*)
+		os=rtmk-nova
+		;;
+	ns2)
+		os=nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	sinix5.*)
+		os=`echo "$os" | sed -e 's|sinix|sysv|'`
 		;;
-	-oss*)
-		os=-sysv3
+	sinix*)
+		os=sysv4
 		;;
-	-svr4*)
-		os=-sysv4
+	tpf*)
+		os=tpf
 		;;
-	-svr3)
-		os=-sysv3
+	triton*)
+		os=sysv3
 		;;
-	-sysvr4)
-		os=-sysv4
+	oss*)
+		os=sysv3
 		;;
-	# This must come after -sysvr4.
-	-sysv*)
+	svr4*)
+		os=sysv4
 		;;
-	-ose*)
-		os=-ose
+	svr3)
+		os=sysv3
 		;;
-	-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
-		os=-mint
+	sysvr4)
+		os=sysv4
 		;;
-	-zvmoe)
-		os=-zvmoe
+	ose*)
+		os=ose
 		;;
-	-dicos*)
-		os=-dicos
+	*mint | mint0-9* | *MiNT | MiNT0-9*)
+		os=mint
 		;;
-	-pikeos*)
+	dicos*)
+		os=dicos
+		;;
+	pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
-		case $basic_machine in
+		case $cpu in
 		    arm*)
-			os=-eabi
+			os=eabi
 			;;
 		    *)
-			os=-elf
+			os=elf
 			;;
 		esac
 		;;
-	-nacl*)
-		;;
-	-ios)
-		;;
-	-none)
-		;;
 	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/^-*-//'`
-		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
-		exit 1
+		# No normalization, but not necessarily accepted, that comes below.
 		;;
 esac
+
 else
 
 # Here we handle the default operating systems that come with various machines.
@@ -1543,258 +1527,363 @@
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+kernel=
+case $cpu-$vendor in
 	score-*)
-		os=-elf
+		os=elf
 		;;
 	spu-*)
-		os=-elf
+		os=elf
 		;;
 	*-acorn)
-		os=-riscix1.2
+		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=-linux
+		kernel=linux
+		os=gnu
 		;;
 	arm*-semi)
-		os=-aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=-coff
+		os=coff
 		;;
 	c8051-*)
-		os=-elf
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
 		;;
 	hexagon-*)
-		os=-elf
+		os=elf
 		;;
 	tic54x-*)
-		os=-coff
+		os=coff
 		;;
 	tic55x-*)
-		os=-coff
+		os=coff
 		;;
 	tic6x-*)
-		os=-coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=-tops20
+		os=tops20
 		;;
 	pdp11-*)
-		os=-none
+		os=none
 		;;
 	*-dec | vax-*)
-		os=-ultrix4.2
+		os=ultrix4.2
 		;;
 	m68*-apollo)
-		os=-domain
+		os=domain
 		;;
 	i386-sun)
-		os=-sunos4.0.2
+		os=sunos4.0.2
 		;;
 	m68000-sun)
-		os=-sunos3
+		os=sunos3
 		;;
 	m68*-cisco)
-		os=-aout
+		os=aout
 		;;
 	mep-*)
-		os=-elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=-elf
+		os=elf
 		;;
 	mips*-*)
-		os=-elf
+		os=elf
 		;;
 	or32-*)
-		os=-coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
+		os=sysv3
 		;;
 	sparc-* | *-sun)
-		os=-sunos4.1.1
+		os=sunos4.1.1
 		;;
 	pru-*)
-		os=-elf
+		os=elf
 		;;
 	*-be)
-		os=-beos
+		os=beos
 		;;
 	*-ibm)
-		os=-aix
+		os=aix
 		;;
 	*-knuth)
-		os=-mmixware
+		os=mmixware
 		;;
 	*-wec)
-		os=-proelf
+		os=proelf
 		;;
 	*-winbond)
-		os=-proelf
+		os=proelf
 		;;
 	*-oki)
-		os=-proelf
+		os=proelf
 		;;
 	*-hp)
-		os=-hpux
+		os=hpux
 		;;
 	*-hitachi)
-		os=-hiux
+		os=hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
+		os=sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=amigaos
 		;;
 	*-dg)
-		os=-dgux
+		os=dgux
 		;;
 	*-dolphin)
-		os=-sysv3
+		os=sysv3
 		;;
 	m68k-ccur)
-		os=-rtu
+		os=rtu
 		;;
 	m88k-omron*)
-		os=-luna
+		os=luna
 		;;
 	*-next)
-		os=-nextstep
+		os=nextstep
 		;;
 	*-sequent)
-		os=-ptx
+		os=ptx
 		;;
 	*-crds)
-		os=-unos
+		os=unos
 		;;
 	*-ns)
-		os=-genix
+		os=genix
 		;;
 	i370-*)
-		os=-mvs
+		os=mvs
 		;;
 	*-gould)
-		os=-sysv
+		os=sysv
 		;;
 	*-highlevel)
-		os=-bsd
+		os=bsd
 		;;
 	*-encore)
-		os=-bsd
+		os=bsd
 		;;
 	*-sgi)
-		os=-irix
+		os=irix
 		;;
 	*-siemens)
-		os=-sysv4
+		os=sysv4
 		;;
 	*-masscomp)
-		os=-rtu
+		os=rtu
 		;;
 	f3001-fujitsu | f700-fujitsu)
-		os=-uxpv
+		os=uxpv
 		;;
 	*-rom68k)
-		os=-coff
+		os=coff
 		;;
 	*-*bug)
-		os=-coff
+		os=coff
 		;;
 	*-apple)
-		os=-macos
+		os=macos
 		;;
 	*-atari*)
-		os=-mint
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
 		;;
 	*)
-		os=-none
+		os=none
 		;;
 esac
+
 fi
 
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+	# Sometimes we do "kernel-libc", so those need to count as OSes.
+	musl* | newlib* | relibc* | uclibc*)
+		;;
+	# Likewise for "kernel-abi"
+	eabi* | gnueabi*)
+		;;
+	# VxWorks passes extra cpu info in the 4th filed.
+	simlinux | simwindows | spe)
+		;;
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos34* \
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+	     | hiux* | abug | nacl* | netware* | windows* \
+	     | os9* | macos* | osx* | ios* \
+	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* | serenity* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | mint* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+	     | fiwix* )
+		;;
+	# This one is extra strict with allowed versions
+	sco3.2v2 | sco3.2v4-9* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	none)
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+		   | linux-musl* | linux-relibc* | linux-uclibc* )
+		;;
+	uclinux-uclibc* )
+		;;
+	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+		# These are just libc implementations, not actual OSes, and thus
+		# require a kernel.
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
+		;;
+	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+		;;
+	nto-qnx*)
+		;;
+	os2-emx)
+		;;
+	*-eabi* | *-gnueabi*)
+		;;
+	-*)
+		# Blank kernel with real OS is always fine.
+		;;
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		exit 1
+		;;
+esac
+
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
+case $vendor in
+	unknown)
+		case $cpu-$os in
+			*-riscix*)
 				vendor=acorn
 				;;
-			-sunos*)
+			*-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			*-cnk* | *-aix*)
 				vendor=ibm
 				;;
-			-beos*)
+			*-beos*)
 				vendor=be
 				;;
-			-hpux*)
+			*-hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
+			*-mpeix*)
 				vendor=hp
 				;;
-			-hiux*)
+			*-hiux*)
 				vendor=hitachi
 				;;
-			-unos*)
+			*-unos*)
 				vendor=crds
 				;;
-			-dgux*)
+			*-dgux*)
 				vendor=dg
 				;;
-			-luna*)
+			*-luna*)
 				vendor=omron
 				;;
-			-genix*)
+			*-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			*-clix*)
+				vendor=intergraph
+				;;
+			*-mvs* | *-opened*)
+				vendor=ibm
+				;;
+			*-os400*)
 				vendor=ibm
 				;;
-			-os400*)
+			s390-* | s390x-*)
 				vendor=ibm
 				;;
-			-ptx*)
+			*-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
+			*-tpf*)
 				vendor=ibm
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			*-vxsim* | *-vxworks* | *-windiss*)
 				vendor=wrs
 				;;
-			-aux*)
+			*-aux*)
 				vendor=apple
 				;;
-			-hms*)
+			*-hms*)
 				vendor=hitachi
 				;;
-			-mpw* | -macos*)
+			*-mpw* | *-macos*)
 				vendor=apple
 				;;
-			-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
+			*-*mint | *-mint0-9* | *-*MiNT | *-MiNT0-9*)
 				vendor=atari
 				;;
-			-vos*)
+			*-vos*)
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo "$basic_machine$os"
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

_service:tar_scm:nghttp2-1.46.0.tar.xz/configure -> _service:tar_scm:nghttp2-1.52.0.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.46.0.
+# Generated by GNU Autoconf 2.71 for nghttp2 1.52.0.
 #
 # 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.46.0'
-PACKAGE_STRING='nghttp2 1.46.0'
+PACKAGE_VERSION='1.52.0'
+PACKAGE_STRING='nghttp2 1.52.0'
 PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net'
 PACKAGE_URL=''
 
@@ -672,10 +672,6 @@
 LIBOBJS
 ENABLE_FAILMALLOC_FALSE
 ENABLE_FAILMALLOC_TRUE
-HAVE_CYTHON_FALSE
-HAVE_CYTHON_TRUE
-ENABLE_PYTHON_BINDINGS_FALSE
-ENABLE_PYTHON_BINDINGS_TRUE
 HAVE_NEVERBLEED_FALSE
 HAVE_NEVERBLEED_TRUE
 HAVE_MRUBY_FALSE
@@ -686,19 +682,12 @@
 LIBMRUBY_LIBS
 ENABLE_EXAMPLES_FALSE
 ENABLE_EXAMPLES_TRUE
-ENABLE_ASIO_LIB_FALSE
-ENABLE_ASIO_LIB_TRUE
 ENABLE_HPACK_TOOLS_FALSE
 ENABLE_HPACK_TOOLS_TRUE
 ENABLE_HTTP3_FALSE
 ENABLE_HTTP3_TRUE
 ENABLE_APP_FALSE
 ENABLE_APP_TRUE
-BOOST_THREAD_LIB
-BOOST_SYSTEM_LIB
-BOOST_ASIO_LIB
-BOOST_LDFLAGS
-BOOST_CPPFLAGS
 HAVE_LIBXML2_FALSE
 HAVE_LIBXML2_TRUE
 LIBXML2_LIBS
@@ -735,19 +724,13 @@
 EXTRA_DEFS
 CXX1XCXXFLAGS
 HAVE_CXX14
-PYTHON_EXTRA_LDFLAGS
-PYTHON_EXTRA_LIBS
-PYTHON_PLATFORM_SITE_PKG
-PYTHON_SITE_PKG
-PYTHON_LIBS
-PYTHON_CPPFLAGS
 pkgpyexecdir
 pyexecdir
 pkgpythondir
 pythondir
-PYTHON_PLATFORM
 PYTHON_EXEC_PREFIX
 PYTHON_PREFIX
+PYTHON_PLATFORM
 PYTHON_VERSION
 PYTHON
 PKG_CONFIG_LIBDIR
@@ -767,7 +750,6 @@
 JEMALLOC_CFLAGS
 LIBEV_LIBS
 LIBEV_CFLAGS
-CYTHON
 PACKAGE_VERSION_NUM
 LT_AGE
 LT_REVISION
@@ -827,6 +809,7 @@
 AR
 DLLTOOL
 OBJDUMP
+FILECMD
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -910,9 +893,7 @@
 enable_threads
 enable_app
 enable_hpack_tools
-enable_asio_lib
 enable_examples
-enable_python_bindings
 enable_failmalloc
 enable_lib_only
 enable_http3
@@ -928,17 +909,12 @@
 with_systemd
 with_mruby
 with_neverbleed
-with_cython
 with_libngtcp2
 with_libnghttp3
 with_libbpf
+with_python_sys_prefix
 with_python_prefix
 with_python_exec_prefix
-with_boost
-with_boost_libdir
-with_boost_asio
-with_boost_system
-with_boost_thread
 enable_assert
 enable_largefile
 '
@@ -951,7 +927,6 @@
 LIBS
 CPPFLAGS
 LT_SYS_LIBRARY_PATH
-CYTHON
 LIBEV_CFLAGS
 LIBEV_LIBS
 JEMALLOC_CFLAGS
@@ -967,7 +942,6 @@
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 PYTHON
-PYTHON_VERSION
 ZLIB_CFLAGS
 ZLIB_LIBS
 CUNIT_CFLAGS
@@ -1542,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.46.0 to adapt to many kinds of systems.
+\`configure' configures nghttp2 1.52.0 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1614,7 +1588,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nghttp2 1.46.0:";;
+     short | recursive ) echo "Configuration of nghttp2 1.52.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1639,14 +1613,11 @@
   --enable-app            Build applications (nghttp, nghttpd, nghttpx and
                           h2load) default=check
   --enable-hpack-tools    Build HPACK tools default=check
-  --enable-asio-lib       Build C++ libnghttp2_asio library default=no
   --enable-examples       Build examples default=check
-  --enable-python-bindings
-                          Build Python bindings default=check
   --disable-failmalloc    Do not build failmalloc test program
   --enable-lib-only       Build libnghttp2 only. This is a short hand for
                           --disable-app --disable-examples
-                          --disable-hpack-tools --disable-python-bindings
+                          --disable-hpack-tools
   --enable-http3          (EXPERIMENTAL) Enable HTTP/3. This requires ngtcp2,
                           nghttp3, and a custom OpenSSL.
   --disable-assert        turn off assertions
@@ -1675,34 +1646,14 @@
   --with-systemd          Enable systemd support in nghttpx default=check
   --with-mruby            Use mruby default=no
   --with-neverbleed       Use neverbleed default=no
-  --with-cython=PATH      Use cython in given PATH
   --with-libngtcp2        Use libngtcp2 default=check
   --with-libnghttp3       Use libnghttp3 default=check
   --with-libbpf           Use libbpf default=no
+  --with-python-sys-prefix
+                          use Python's sys.prefix and sys.exec_prefix values
   --with-python_prefix    override the default PYTHON_PREFIX
   --with-python_exec_prefix
                           override the default PYTHON_EXEC_PREFIX
-  --with-boost=ARG      use Boost library from a standard location
-                          (ARG=yes), from the specified location (ARG=<path>),
-                          or disable it (ARG=no) ARG=yes
-  --with-boost-libdir=LIB_DIR
-                          Force given directory for boost libraries. Note that
-                          this will override library path detection, so use
-                          this parameter only if default library detection
-                          fails and you know exactly where your boost
-                          libraries are located.
-  --with-boost-asio=special-lib
-                          use the ASIO library from boost - it is possible to
-                          specify a certain library for the linker e.g.
-                          --with-boost-asio=boost_system-gcc41-mt-1_34
-  --with-boost-system=special-lib
-                          use the System library from boost - it is possible
-                          to specify a certain library for the linker e.g.
-                          --with-boost-system=boost_system-gcc-mt
-  --with-boost-thread=special-lib
-                          use the Thread library from boost - it is possible
-                          to specify a certain library for the linker e.g.
-                          --with-boost-thread=boost_thread-gcc-mt
 
 Some influential environment variables:
   CC          C compiler command
@@ -1714,7 +1665,6 @@
               you have headers in a nonstandard directory <include dir>
   LT_SYS_LIBRARY_PATH
               User-defined run-time library search path.
-  CYTHON      the Cython executable
   LIBEV_CFLAGS
               C compiler flags for libev, skipping any checks
   LIBEV_LIBS  linker flags for libev, skipping any checks
@@ -1735,10 +1685,6 @@
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
   PYTHON      the Python interpreter
-  PYTHON_VERSION
-              The installed Python version to use, for example '2.3'. This
-              string will be appended to the Python interpreter canonical
-              name.
   ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config
   ZLIB_LIBS   linker flags for ZLIB, overriding pkg-config
   CUNIT_CFLAGS
@@ -1858,7 +1804,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nghttp2 configure 1.46.0
+nghttp2 configure 1.52.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2776,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.46.0, which was
+It was created by nghttp2 $as_me 1.52.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -5627,13 +5573,13 @@
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
 	    break 2
@@ -5771,7 +5717,7 @@
   fi
 fi
 
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
     *COFF*)
       DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
@@ -5875,7 +5821,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5918,7 +5864,7 @@
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*	 //'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -6124,6 +6070,114 @@
 
 
 if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
+set dummy ${ac_tool_prefix}file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$FILECMD"; then
+  ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FILECMD="${ac_tool_prefix}file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FILECMD=$ac_cv_prog_FILECMD
+if test -n "$FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf "%s\n" "$FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_FILECMD"; then
+  ac_ct_FILECMD=$FILECMD
+  # Extract the first word of "file", so it can be a program name with args.
+set dummy file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_FILECMD"; then
+  ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_FILECMD="file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
+if test -n "$ac_ct_FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
+printf "%s\n" "$ac_ct_FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_FILECMD" = x; then
+    FILECMD=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FILECMD=$ac_ct_FILECMD
+  fi
+else
+  FILECMD="$ac_cv_prog_FILECMD"
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -6266,7 +6320,7 @@
 
 bsdi45*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_cmd='$FILECMD -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -6300,14 +6354,14 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_cmd=$FILECMD
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
@@ -6321,7 +6375,7 @@
   ;;
 
 hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
@@ -6368,7 +6422,7 @@
 
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
@@ -6741,13 +6795,29 @@
 fi
 
 : ${AR=ar}
-: ${AR_FLAGS=cr}
 
 
 
 
 
 
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+
+
+
+
+
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+
 
 
 
@@ -7211,7 +7281,7 @@
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
   lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
   lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
@@ -7229,20 +7299,20 @@
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* $.*$$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
@@ -7266,7 +7336,7 @@
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
@@ -7284,9 +7354,9 @@
 "     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -7486,7 +7556,7 @@
    fi
    ;; #(
  /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
@@ -7611,7 +7681,7 @@
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -7632,7 +7702,7 @@
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
@@ -7644,7 +7714,7 @@
 	;;
       esac
     else
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
@@ -7670,7 +7740,7 @@
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
@@ -7678,7 +7748,7 @@
 	emul="${emul}64"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -7686,7 +7756,7 @@
 	emul="${emul}ltsmip"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
@@ -7710,14 +7780,14 @@
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
+	    case `$FILECMD conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -7825,7 +7895,7 @@
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
@@ -8608,8 +8678,8 @@
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cr libconftest.a conftest.o" >&5
-      $AR cr libconftest.a conftest.o 2>&5
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
@@ -8636,17 +8706,12 @@
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin912*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*|11.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.012,*|,*powerpc*-darwin5-8*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -9005,8 +9070,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -9524,7 +9589,7 @@
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
@@ -9947,15 +10012,15 @@
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
+    # Microsoft Visual C++ or Intel C++ Compiler.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
@@ -10010,7 +10075,7 @@
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -10122,6 +10187,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
       ;;
 
     interix3-9*)
@@ -10136,7 +10202,7 @@
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -10179,7 +10245,7 @@
 	  compiler_needs_object=yes
 	  ;;
 	esac
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
@@ -10191,13 +10257,14 @@
 
         if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
             echo "local: *; };" >> $output_objdir/$libname.ver~
             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
 	tcc*)
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	  export_dynamic_flag_spec='-rdynamic'
 	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
@@ -10207,7 +10274,7 @@
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
               echo "local: *; };" >> $output_objdir/$libname.ver~
               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
@@ -10339,7 +10406,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -10610,12 +10677,12 @@
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
+      # Microsoft Visual C++ or Intel C++ Compiler.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl*)
-	# Native MSVC
+      cl* | icl*)
+	# Native MSVC or ICC
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -10656,7 +10723,7 @@
           fi'
 	;;
       *)
-	# Assume MSVC wrapper
+	# Assume MSVC and ICC wrapper
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -10697,8 +10764,8 @@
     output_verbose_link_cmd=func_echo_all
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs=no
@@ -10732,7 +10799,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -10913,6 +10980,7 @@
 	# Fabrice Bellard et al's Tiny C Compiler
 	ld_shlibs=yes
 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	;;
       esac
       ;;
@@ -10984,6 +11052,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
       ;;
 
     osf3*)
@@ -11676,7 +11745,7 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
@@ -11686,14 +11755,14 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -11712,7 +11781,7 @@
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -11749,7 +11818,7 @@
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -11782,7 +11851,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -12947,30 +13016,41 @@
 old_striplib=
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+if test -z "$STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-    else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+      else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-    fi
-    ;;
-  *)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      fi
+      ;;
+    *)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-    ;;
-  esac
+      ;;
+    esac
+  fi
 fi
 
 
@@ -13629,7 +13709,7 @@
 
 # Define the identity of the package.
  PACKAGE='nghttp2'
- VERSION='1.46.0'
+ VERSION='1.52.0'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -13904,11 +13984,11 @@
 AM_BACKSLASH='\'
 
 
-LT_CURRENT=35
+LT_CURRENT=38
 
 LT_REVISION=1
 
-LT_AGE=21
+LT_AGE=24
 
 
 major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/^0-9//g"`
@@ -13964,15 +14044,6 @@
 fi
 
 
-# Check whether --enable-asio-lib was given.
-if test ${enable_asio_lib+y}
-then :
-  enableval=$enable_asio_lib; request_asio_lib=$enableval
-else $as_nop
-  request_asio_lib=no
-fi
-
-
 # Check whether --enable-examples was given.
 if test ${enable_examples+y}
 then :
@@ -13982,15 +14053,6 @@
 fi
 
 
-# Check whether --enable-python-bindings was given.
-if test ${enable_python_bindings+y}
-then :
-  enableval=$enable_python_bindings; request_python_bindings=$enableval
-else $as_nop
-  request_python_bindings=check
-fi
-
-
 # Check whether --enable-failmalloc was given.
 if test ${enable_failmalloc+y}
 then :
@@ -14139,14 +14201,6 @@
 
 
 
-# Check whether --with-cython was given.
-if test ${with_cython+y}
-then :
-  withval=$with_cython; cython_path=$withval
-fi
-
-
-
 # Check whether --with-libngtcp2 was given.
 if test ${with_libngtcp2+y}
 then :
@@ -14186,8 +14240,6 @@
 
 
 
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16068,8 +16120,8 @@
 
       cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
+	,cl* | no,cl* | ,icl* | no,icl*)
+	  # Native MSVC or ICC
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  hardcode_libdir_flag_spec_CXX=' '
@@ -16160,11 +16212,11 @@
     output_verbose_link_cmd=func_echo_all
     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_CXX="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
        if test yes != "$lt_cv_apple_cc_single_mod"; then
       archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 
   else
@@ -16199,6 +16251,7 @@
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
+	file_list_spec_CXX='@'
 	;;
 
       dgux*)
@@ -16229,7 +16282,7 @@
         archive_cmds_need_lc_CXX=no
         ;;
 
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
         # conventions
         ld_shlibs_CXX=yes
@@ -16366,7 +16419,7 @@
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
@@ -16506,13 +16559,13 @@
 	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	    if test yes = "$supports_anon_versioning"; then
 	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+                cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
                 echo "local: *; };" >> $output_objdir/$libname.ver~
                 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      no_undefined_flag_CXX=' -zdefs'
@@ -17169,7 +17222,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -17252,7 +17305,7 @@
 	    lt_prog_compiler_static_CXX='-qstaticlink'
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      lt_prog_compiler_pic_CXX='-KPIC'
@@ -17639,7 +17692,7 @@
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
       export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
@@ -17647,7 +17700,7 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*)
+    cl* | icl*)
       exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -17998,7 +18051,7 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
       ;;
     mingw* | cegcc*)
@@ -18007,14 +18060,14 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -18033,7 +18086,7 @@
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -18070,7 +18123,7 @@
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -18102,7 +18155,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -19177,7 +19230,7 @@
   printf %s "(cached) " >&6
 else $as_nop
 
-	for am_cv_pathless_PYTHON in python python2 python3  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3  python3.2 python3.1 python3.0  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1  python2.0 none; do
+	for am_cv_pathless_PYTHON in python python2 python3  python3.11 python3.10  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3  python3.2 python3.1 python3.0  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1  python2.0 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -19255,11 +19308,10 @@
 
 
   if test "$PYTHON" = :; then
-      :
+        :
   else
 
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
 printf %s "checking for $am_display_PYTHON version... " >&6; }
 if test ${am_cv_python_version+y}
 then :
@@ -19272,28 +19324,54 @@
   PYTHON_VERSION=$am_cv_python_version
 
 
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+printf %s "checking for $am_display_PYTHON platform... " >&6; }
+if test ${am_cv_python_platform+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+printf "%s\n" "$am_cv_python_platform" >&6; }
+  PYTHON_PLATFORM=$am_cv_python_platform
+
 
-  if test "x$prefix" = xNONE
-  then
-   am__usable_prefix=$ac_default_prefix
+                            if test "x$prefix" = xNONE; then
+    am__usable_prefix=$ac_default_prefix
   else
-   am__usable_prefix=$prefix
+    am__usable_prefix=$prefix
   fi
 
+  # Allow user to request using sys.* values from Python,
+  # instead of the GNU $prefix values.
+
+# Check whether --with-python-sys-prefix was given.
+if test ${with_python_sys_prefix+y}
+then :
+  withval=$with_python_sys_prefix; am_use_python_sys=:
+else $as_nop
+  am_use_python_sys=false
+fi
+
+
+  # Allow user to override whatever the default Python prefix is.
 
 # Check whether --with-python_prefix was given.
 if test ${with_python_prefix+y}
 then :
-  withval=$with_python_prefix;  am_python_prefix_subst="$withval"
-   am_cv_python_prefix="$withval"
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON prefix" >&5
-printf %s "checking for $am_display_PYTHON prefix... " >&6; }
+  withval=$with_python_prefix; am_python_prefix_subst=$withval
+   am_cv_python_prefix=$withval
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON prefix" >&5
+printf %s "checking for explicit $am_display_PYTHON prefix... " >&6; }
    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
 printf "%s\n" "$am_cv_python_prefix" >&6; }
 else $as_nop
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON prefix" >&5
-printf %s "checking for $am_display_PYTHON prefix... " >&6; }
+   if $am_use_python_sys; then
+     # using python sys.prefix value, not GNU
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON prefix" >&5
+printf %s "checking for python default $am_display_PYTHON prefix... " >&6; }
 if test ${am_cv_python_prefix+y}
 then :
   printf %s "(cached) " >&6
@@ -19303,7 +19381,7 @@
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
 printf "%s\n" "$am_cv_python_prefix" >&6; }
 
-      case $am_cv_python_prefix in
+               case $am_cv_python_prefix in
      $am__usable_prefix*)
        am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'`
        am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"`
@@ -19311,37 +19389,58 @@
      *)
        am_python_prefix_subst=$am_cv_python_prefix
        ;;
-  esac
-
+     esac
+   else # using GNU prefix value, not python sys.prefix
+     am_python_prefix_subst='${prefix}'
+     am_python_prefix=$am_python_prefix_subst
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON prefix" >&5
+printf %s "checking for GNU default $am_display_PYTHON prefix... " >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_prefix" >&5
+printf "%s\n" "$am_python_prefix" >&6; }
+   fi
 fi
 
+  # Substituting python_prefix_subst value.
   PYTHON_PREFIX=$am_python_prefix_subst
 
 
+  # emacs-page Now do it all over again for Python exec_prefix, but with yet
+  # another conditional: fall back to regular prefix if that was specified.
 
 # Check whether --with-python_exec_prefix was given.
 if test ${with_python_exec_prefix+y}
 then :
-  withval=$with_python_exec_prefix;  am_python_exec_prefix_subst="$withval"
-   am_cv_python_exec_prefix="$withval"
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
-printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+  withval=$with_python_exec_prefix; am_python_exec_prefix_subst=$withval
+   am_cv_python_exec_prefix=$withval
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for explicit $am_display_PYTHON exec_prefix... " >&6; }
    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
 printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
 else $as_nop
 
-    if test -n "$with_python_prefix"
-then :
-  am_python_exec_prefix_subst="$with_python_prefix"
-  am_cv_python_exec_prefix="$with_python_prefix"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
-printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
+   # no explicit --with-python_exec_prefix, but if
+   # --with-python_prefix was given, use its value for python_exec_prefix too.
+   if test -n "$with_python_prefix"
+then :
+  am_python_exec_prefix_subst=$with_python_prefix
+    am_cv_python_exec_prefix=$with_python_prefix
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python_prefix-given $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for python_prefix-given $am_display_PYTHON exec_prefix... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
 printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
 else $as_nop
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
-printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+    # Set am__usable_exec_prefix whether using GNU or Python values,
+    # since we use that variable for pyexecdir.
+    if test "x$exec_prefix" = xNONE; then
+      am__usable_exec_prefix=$am__usable_prefix
+    else
+      am__usable_exec_prefix=$exec_prefix
+    fi
+    #
+    if $am_use_python_sys; then # using python sys.exec_prefix, not GNU
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for python default $am_display_PYTHON exec_prefix... " >&6; }
 if test ${am_cv_python_exec_prefix+y}
 then :
   printf %s "(cached) " >&6
@@ -19350,43 +19449,31 @@
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
 printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
-        if test "x$exec_prefix" = xNONE
-  then
-   am__usable_exec_prefix=$am__usable_prefix
-  else
-   am__usable_exec_prefix=$exec_prefix
-  fi
-  case $am_cv_python_exec_prefix in
-     $am__usable_exec_prefix*)
-       am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
-       am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
-       ;;
-     *)
-       am_python_exec_prefix_subst=$am_cv_python_exec_prefix
-       ;;
-  esac
-
+                        case $am_cv_python_exec_prefix in
+      $am__usable_exec_prefix*)
+        am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
+        am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
+        ;;
+      *)
+        am_python_exec_prefix_subst=$am_cv_python_exec_prefix
+        ;;
+     esac
+   else # using GNU $exec_prefix, not python sys.exec_prefix
+     am_python_exec_prefix_subst='${exec_prefix}'
+     am_python_exec_prefix=$am_python_exec_prefix_subst
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for GNU default $am_display_PYTHON exec_prefix... " >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_exec_prefix" >&5
+printf "%s\n" "$am_python_exec_prefix" >&6; }
+   fi
 fi
 fi
 
+  # Substituting python_exec_prefix_subst.
   PYTHON_EXEC_PREFIX=$am_python_exec_prefix_subst
 
 
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-printf %s "checking for $am_display_PYTHON platform... " >&6; }
-if test ${am_cv_python_platform+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-printf "%s\n" "$am_cv_python_platform" >&6; }
-  PYTHON_PLATFORM=$am_cv_python_platform
-
-
-  # Just factor out some code duplication.
+  # Factor out some code duplication into this shell variable.
   am_python_setup_sysconfig="\
 import sys
 # Prefer sysconfig over distutils.sysconfig, for better compatibility
@@ -19407,40 +19494,46 @@
     pass"
 
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-printf %s "checking for $am_display_PYTHON script directory... " >&6; }
+              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory (pythondir)" >&5
+printf %s "checking for $am_display_PYTHON script directory (pythondir)... " >&6; }
 if test ${am_cv_python_pythondir+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  if test "x$am_cv_python_prefix" = x
-     then
-       am_py_prefix=$am__usable_prefix
-     else
-       am_py_prefix=$am_cv_python_prefix
-     fi
-     am_cv_python_pythondir=`$PYTHON -c "
+  if test "x$am_cv_python_prefix" = x; then
+     am_py_prefix=$am__usable_prefix
+   else
+     am_py_prefix=$am_cv_python_prefix
+   fi
+   am_cv_python_pythondir=`$PYTHON -c "
 $am_python_setup_sysconfig
 if can_use_sysconfig:
-    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+  if hasattr(sysconfig, 'get_default_scheme'):
+    scheme = sysconfig.get_default_scheme()
+  else:
+    scheme = sysconfig._get_default_scheme()
+  if scheme == 'posix_local':
+    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
+    scheme = 'posix_prefix'
+  sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
 else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+  from distutils import sysconfig
+  sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
 sys.stdout.write(sitedir)"`
-     case $am_cv_python_pythondir in
-     $am_py_prefix*)
-       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
-       ;;
-     *)
-       case $am_py_prefix in
-         /usr|/System*) ;;
-         *)
-	  am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
-	  ;;
-       esac
-       ;;
+   #
+   case $am_cv_python_pythondir in
+   $am_py_prefix*)
+     am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+     am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
+     ;;
+   *)
+     case $am_py_prefix in
+       /usr|/System*) ;;
+       *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
+          ;;
      esac
+     ;;
+   esac
 
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
@@ -19448,44 +19541,49 @@
   pythondir=$am_cv_python_pythondir
 
 
-
-  pkgpythondir=\${pythondir}/$PACKAGE
+          pkgpythondir=\${pythondir}/$PACKAGE
 
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-printf %s "checking for $am_display_PYTHON extension module directory... " >&6; }
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory (pyexecdir)" >&5
+printf %s "checking for $am_display_PYTHON extension module directory (pyexecdir)... " >&6; }
 if test ${am_cv_python_pyexecdir+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  if test "x$am_cv_python_exec_prefix" = x
-     then
-       am_py_exec_prefix=$am__usable_exec_prefix
-     else
-       am_py_exec_prefix=$am_cv_python_exec_prefix
-     fi
-     am_cv_python_pyexecdir=`$PYTHON -c "
+  if test "x$am_cv_python_exec_prefix" = x; then
+     am_py_exec_prefix=$am__usable_exec_prefix
+   else
+     am_py_exec_prefix=$am_cv_python_exec_prefix
+   fi
+   am_cv_python_pyexecdir=`$PYTHON -c "
 $am_python_setup_sysconfig
 if can_use_sysconfig:
-    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
+  if hasattr(sysconfig, 'get_default_scheme'):
+    scheme = sysconfig.get_default_scheme()
+  else:
+    scheme = sysconfig._get_default_scheme()
+  if scheme == 'posix_local':
+    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
+    scheme = 'posix_prefix'
+  sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
 else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
+  from distutils import sysconfig
+  sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
 sys.stdout.write(sitedir)"`
-     case $am_cv_python_pyexecdir in
-     $am_py_exec_prefix*)
-       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
-       ;;
-     *)
-       case $am_py_exec_prefix in
-         /usr|/System*) ;;
-         *)
-	   am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
-	   ;;
-       esac
-       ;;
+   #
+   case $am_cv_python_pyexecdir in
+   $am_py_exec_prefix*)
+     am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+     am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
+     ;;
+   *)
+     case $am_py_exec_prefix in
+       /usr|/System*) ;;
+       *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
+          ;;
      esac
+     ;;
+   esac
 
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
@@ -19493,480 +19591,32 @@
   pyexecdir=$am_cv_python_pyexecdir
 
 
-
-  pkgpyexecdir=\${pyexecdir}/$PACKAGE
+      pkgpyexecdir=\${pyexecdir}/$PACKAGE
 
 
 
   fi
 
 
-
-if test "x$request_python_bindings" = "xyes" &&
-   test "x$PYTHON" = "x:"; then
-  as_fn_error $? "python was requested (enable-python-bindings) but not found" "$LINENO" 5
-fi
-
 if test "x$request_lib_only" = "xyes"; then
   request_app=no
   request_hpack_tools=no
   request_examples=no
-  request_python_bindings=no
-fi
-
-if test "x$request_python_bindings" != "xno" &&
-   test "x$PYTHON" != "x:"; then
-  # version check is broken
-
-	#
-	# Allow the use of a (user set) custom python version
-	#
-
-
-	# Extract the first word of "python$PYTHON_VERSION", so it can be a program name with args.
-set dummy python$PYTHON_VERSION; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PYTHON+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  case $PYTHON in
-  \\/* | ?:\\/*)
-  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-printf "%s\n" "$PYTHON" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-	if test -z "$PYTHON"; then
-	   as_fn_error $? "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5
-	   PYTHON_VERSION=""
-	fi
-
-	#
-	# Check for a version of Python >= 2.1.0
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.1.0'" >&5
-printf %s "checking for a version of Python >= '2.1.0'... " >&6; }
-	ac_supports_python_ver=`$PYTHON -c "import sys; \
-		ver = sys.version.split ()0; \
-		print (ver >= '2.1.0')"`
-	if test "$ac_supports_python_ver" != "True"; then
-		if test -z "$PYTHON_NOVERSIONCHECK"; then
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-			{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "
-This version of the AC_PYTHON_DEVEL macro
-doesn't work properly with versions of Python before
-2.1.0. You may need to re-run configure, setting the
-variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
-PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
-Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
-to something else than an empty string.
-
-See \`config.log' for more details" "$LINENO" 5; }
-		else
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
-printf "%s\n" "skip at user request" >&6; }
-		fi
-	else
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-	fi
-
-	#
-	# if the macro parameter ``version'' is set, honour it
-	#
-	if test -n ""; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a version of Python " >&5
-printf %s "checking for a version of Python ... " >&6; }
-		ac_supports_python_ver=`$PYTHON -c "import sys; \
-			ver = sys.version.split ()0; \
-			print (ver )"`
-		if test "$ac_supports_python_ver" = "True"; then
-		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-		else
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-			as_fn_error $? "this package requires Python .
-If you have it installed, but it isn't the default Python
-interpreter in your system path, please pass the PYTHON_VERSION
-variable to configure. See \`\`configure --help'' for reference.
-" "$LINENO" 5
-			PYTHON_VERSION=""
-		fi
-	fi
-
-	#
-	# Check if you have distutils, else fail
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the sysconfig Python package" >&5
-printf %s "checking for the sysconfig Python package... " >&6; }
-	ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
-	if test $? -eq 0; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-		IMPORT_SYSCONFIG="import sysconfig"
-	else
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
-printf %s "checking for the distutils Python package... " >&6; }
-		ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
-		if test $? -eq 0; then
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-			IMPORT_SYSCONFIG="from distutils import sysconfig"
-		else
-			as_fn_error $? "cannot import Python module \"distutils\".
-Please check your Python installation. The error was:
-$ac_sysconfig_result" "$LINENO" 5
-			PYTHON_VERSION=""
-		fi
-	fi
-
-	#
-	# Check for Python include path
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
-printf %s "checking for Python include path... " >&6; }
-	if test -z "$PYTHON_CPPFLAGS"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			# sysconfig module has different functions
-			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path ('include'));"`
-			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path ('platinclude'));"`
-		else
-			# old distutils way
-			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_inc ());"`
-			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_inc (plat_specific=1));"`
-		fi
-		if test -n "${python_path}"; then
-			if test "${plat_python_path}" != "${python_path}"; then
-				python_path="-I$python_path -I$plat_python_path"
-			else
-				python_path="-I$python_path"
-			fi
-		fi
-		PYTHON_CPPFLAGS=$python_path
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CPPFLAGS" >&5
-printf "%s\n" "$PYTHON_CPPFLAGS" >&6; }
-
-
-	#
-	# Check for Python library path
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Python library path" >&5
-printf %s "checking for Python library path... " >&6; }
-	if test -z "$PYTHON_LIBS"; then
-		# (makes two attempts to ensure we've got a version number
-		# from the interpreter)
-		ac_python_version=`cat<<EOD | $PYTHON -
-
-# join all versioning strings, on some systems
-# major/minor numbers could be in different list elements
-from sysconfig import *
-e = get_config_var('VERSION')
-if e is not None:
-	print(e)
-EOD`
-
-		if test -z "$ac_python_version"; then
-			if test -n "$PYTHON_VERSION"; then
-				ac_python_version=$PYTHON_VERSION
-			else
-				ac_python_version=`$PYTHON -c "import sys; \
-					print (sys.version:3)"`
-			fi
-		fi
-
-		# Make the versioning information available to the compiler
-
-printf "%s\n" "#define HAVE_PYTHON \"$ac_python_version\"" >>confdefs.h
-
-
-		# First, the library directory:
-		ac_python_libdir=`cat<<EOD | $PYTHON -
-
-# There should be only one
-$IMPORT_SYSCONFIG
-e = sysconfig.get_config_var('LIBDIR')
-if e is not None:
-	print (e)
-EOD`
-
-		# Now, for the library:
-		ac_python_library=`cat<<EOD | $PYTHON -
-
-$IMPORT_SYSCONFIG
-c = sysconfig.get_config_vars()
-if 'LDVERSION' in c:
-	print ('python'+c'LDVERSION')
-else:
-	print ('python'+c'VERSION')
-EOD`
-
-		# This small piece shamelessly adapted from PostgreSQL python macro;
-		# credits goes to momjian, I think. I'd like to put the right name
-		# in the credits, if someone can point me in the right direction... ?
-		#
-		if test -n "$ac_python_libdir" -a -n "$ac_python_library"
-		then
-			# use the official shared library
-			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
-			PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library"
-		else
-			# old way: use libpython from python_configdir
-			ac_python_libdir=`$PYTHON -c \
-			  "from sysconfig import get_python_lib as f; \
-			  import os; \
-			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
-			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
-		fi
-
-		if test -z "PYTHON_LIBS"; then
-			as_fn_error $? "
-  Cannot determine location of your Python DSO. Please check it was installed with
-  dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
-			" "$LINENO" 5
-		fi
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LIBS" >&5
-printf "%s\n" "$PYTHON_LIBS" >&6; }
-
-
-	#
-	# Check for site packages
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5
-printf %s "checking for Python site-packages path... " >&6; }
-	if test -z "$PYTHON_SITE_PKG"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path('purelib'));"`
-		else
-			# distutils.sysconfig way
-			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_lib(0,0));"`
-		fi
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5
-printf "%s\n" "$PYTHON_SITE_PKG" >&6; }
-
-
-	#
-	# Check for platform-specific site packages
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Python platform specific site-packages path" >&5
-printf %s "checking for Python platform specific site-packages path... " >&6; }
-	if test -z "$PYTHON_SITE_PKG"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path('platlib'));"`
-		else
-			# distutils.sysconfig way
-			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_lib(1,0));"`
-		fi
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_PLATFORM_SITE_PKG" >&5
-printf "%s\n" "$PYTHON_PLATFORM_SITE_PKG" >&6; }
-
-
-	#
-	# libraries which must be linked in when embedding
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5
-printf %s "checking python extra libraries... " >&6; }
-	if test -z "$PYTHON_EXTRA_LIBS"; then
-	   PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-                conf = sysconfig.get_config_var; \
-                print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
-printf "%s\n" "$PYTHON_EXTRA_LIBS" >&6; }
-
-
-	#
-	# linking flags needed when embedding
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
-printf %s "checking python extra linking flags... " >&6; }
-	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-			conf = sysconfig.get_config_var; \
-			print (conf('LINKFORSHARED'))"`
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
-printf "%s\n" "$PYTHON_EXTRA_LDFLAGS" >&6; }
-
-
-	#
-	# final check to see if everything compiles alright
-	#
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5
-printf %s "checking consistency of all components of python development environment... " >&6; }
-	# save current global flags
-	ac_save_LIBS="$LIBS"
-	ac_save_LDFLAGS="$LDFLAGS"
-	ac_save_CPPFLAGS="$CPPFLAGS"
-	LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS"
-	LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
-	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
-	ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-		#include <Python.h>
-int
-main (void)
-{
-Py_Initialize();
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  pythonexists=yes
-else $as_nop
-  pythonexists=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-	ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-	# turn back to default flags
-	CPPFLAGS="$ac_save_CPPFLAGS"
-	LIBS="$ac_save_LIBS"
-	LDFLAGS="$ac_save_LDFLAGS"
-
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pythonexists" >&5
-printf "%s\n" "$pythonexists" >&6; }
-
-        if test ! "x$pythonexists" = "xyes"; then
-	   { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "
-  Could not link test program to Python. Maybe the main Python library has been
-  installed in some non-standard library path. If so, pass it to configure,
-  via the LIBS environment variable.
-  Example: ./configure LIBS=\"-L/usr/non-standard-path/python/lib\"
-  ============================================================================
-   ERROR!
-   You probably have to install the development version of the Python package
-   for your distribution.  The exact name of this package varies among them.
-  ============================================================================
-
-See \`config.log' for more details" "$LINENO" 5; }
-	  PYTHON_VERSION=""
-	fi
-
-	#
-	# all done!
-	#
-
-fi
-
-if test "x${cython_path}" = "x"; then
-  for ac_prog in cython.py cython
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CYTHON+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CYTHON"; then
-  ac_cv_prog_CYTHON="$CYTHON" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CYTHON="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CYTHON=$ac_cv_prog_CYTHON
-if test -n "$CYTHON"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CYTHON" >&5
-printf "%s\n" "$CYTHON" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  test -n "$CYTHON" && break
-done
-
-else
-  CYTHON=${cython_path}
-
+  request_http3=no
+  request_libxml2=no
+  request_jansson=no
+  request_zlib=no
+  request_libevent_openssl=no
+  request_libcares=no
+  request_openssl=no
+  request_libev=no
+  request_jemalloc=no
+  request_systemd=no
+  request_mruby=no
+  request_neverbleed=no
+  request_libngtcp2=no
+  request_libnghttp3=no
+  request_libbpf=no
 fi
 
 if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
@@ -20634,8 +20284,8 @@
 case "$host_os" in
   *android*)
     android_build=yes
-    # android does not need -pthread, but needs followng 3 libs for C++
-    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
+    # android does not need -pthread, but needs following 2 libs for C++
+    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic"
     ;;
   *)
     PTHREAD_LDFLAGS="-pthread"
@@ -21285,19 +20935,19 @@
 if test "x${request_libngtcp2}" != "xno"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2 >= 0.0.0" >&5
-printf %s "checking for libngtcp2 >= 0.0.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2 >= 0.13.0" >&5
+printf %s "checking for libngtcp2 >= 0.13.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.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libngtcp2 >= 0.0.0") 2>&5
+    { { 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
   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.0.0" 2>/dev/null`
+  pkg_cv_LIBNGTCP2_CFLAGS=`$PKG_CONFIG --cflags "libngtcp2 >= 0.13.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21309,12 +20959,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.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libngtcp2 >= 0.0.0") 2>&5
+    { { 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
   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.0.0" 2>/dev/null`
+  pkg_cv_LIBNGTCP2_LIBS=`$PKG_CONFIG --libs "libngtcp2 >= 0.13.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21335,9 +20985,9 @@
         _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.0.0" 2>&1`
+	        LIBNGTCP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2 >= 0.13.0" 2>&1`
         else
-	        LIBNGTCP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2 >= 0.0.0" 2>&1`
+	        LIBNGTCP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2 >= 0.13.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNGTCP2_PKG_ERRORS" >&5
@@ -21371,19 +21021,19 @@
    test "x${request_libngtcp2}" != "xno"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_openssl >= 0.0.0" >&5
-printf %s "checking for libngtcp2_crypto_openssl >= 0.0.0... " >&6; }
+{ 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; }
 
 if test -n "$LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS"; then
     pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS="$LIBNGTCP2_CRYPTO_OPENSSL_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.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libngtcp2_crypto_openssl >= 0.0.0") 2>&5
+    { { 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
   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.0.0" 2>/dev/null`
+  pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "libngtcp2_crypto_openssl >= 0.13.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21395,12 +21045,12 @@
     pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_LIBS="$LIBNGTCP2_CRYPTO_OPENSSL_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.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libngtcp2_crypto_openssl >= 0.0.0") 2>&5
+    { { 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
   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.0.0" 2>/dev/null`
+  pkg_cv_LIBNGTCP2_CRYPTO_OPENSSL_LIBS=`$PKG_CONFIG --libs "libngtcp2_crypto_openssl >= 0.13.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21421,9 +21071,9 @@
         _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.0.0" 2>&1`
+	        LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libngtcp2_crypto_openssl >= 0.13.0" 2>&1`
         else
-	        LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2_crypto_openssl >= 0.0.0" 2>&1`
+	        LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libngtcp2_crypto_openssl >= 0.13.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS" >&5
@@ -21552,19 +21202,19 @@
 if test "x${request_libnghttp3}" != "xno"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnghttp3 >= 0.0.0" >&5
-printf %s "checking for libnghttp3 >= 0.0.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnghttp3 >= 0.7.0" >&5
+printf %s "checking for libnghttp3 >= 0.7.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.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnghttp3 >= 0.0.0") 2>&5
+    { { 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
   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.0.0" 2>/dev/null`
+  pkg_cv_LIBNGHTTP3_CFLAGS=`$PKG_CONFIG --cflags "libnghttp3 >= 0.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21576,12 +21226,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.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnghttp3 >= 0.0.0") 2>&5
+    { { 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
   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.0.0" 2>/dev/null`
+  pkg_cv_LIBNGHTTP3_LIBS=`$PKG_CONFIG --libs "libnghttp3 >= 0.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21602,9 +21252,9 @@
         _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.0.0" 2>&1`
+	        LIBNGHTTP3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnghttp3 >= 0.7.0" 2>&1`
         else
-	        LIBNGHTTP3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnghttp3 >= 0.0.0" 2>&1`
+	        LIBNGHTTP3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnghttp3 >= 0.7.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNGHTTP3_PKG_ERRORS" >&5
@@ -21637,19 +21287,19 @@
 if test "x${request_libbpf}" != "xno"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbpf >= 0.4.0" >&5
-printf %s "checking for libbpf >= 0.4.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbpf >= 0.7.0" >&5
+printf %s "checking for libbpf >= 0.7.0... " >&6; }
 
 if test -n "$LIBBPF_CFLAGS"; then
     pkg_cv_LIBBPF_CFLAGS="$LIBBPF_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 \"libbpf >= 0.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libbpf >= 0.4.0") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbpf >= 0.7.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libbpf >= 0.7.0") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBBPF_CFLAGS=`$PKG_CONFIG --cflags "libbpf >= 0.4.0" 2>/dev/null`
+  pkg_cv_LIBBPF_CFLAGS=`$PKG_CONFIG --cflags "libbpf >= 0.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21661,12 +21311,12 @@
     pkg_cv_LIBBPF_LIBS="$LIBBPF_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 \"libbpf >= 0.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libbpf >= 0.4.0") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbpf >= 0.7.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libbpf >= 0.7.0") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBBPF_LIBS=`$PKG_CONFIG --libs "libbpf >= 0.4.0" 2>/dev/null`
+  pkg_cv_LIBBPF_LIBS=`$PKG_CONFIG --libs "libbpf >= 0.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21687,9 +21337,9 @@
         _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.4.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.4.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
@@ -22285,1011 +21935,6 @@
   as_fn_error $? "jemalloc was requested (--with-jemalloc) but not found" "$LINENO" 5
 fi
 
-# Check Boost Asio library
-have_asio_lib=no
-
-if test "x${request_asio_lib}" = "xyes"; then
-
-
-# Check whether --with-boost was given.
-if test ${with_boost+y}
-then :
-  withval=$with_boost;
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-
-else $as_nop
-  want_boost="yes"
-fi
-
-
-
-
-# Check whether --with-boost-libdir was given.
-if test ${with_boost_libdir+y}
-then :
-  withval=$with_boost_libdir;
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5
-        fi
-
-else $as_nop
-  ac_boost_lib_path=""
-
-fi
-
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=1.54.0
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '$0-9*\.0-9*$'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '$0-9*$'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '0-9*\.$0-9*$'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '0-9*\.0-9*\.$0-9*$'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for boostlib >= $boost_lib_version_req" >&5
-printf %s "checking for boostlib >= $boost_lib_version_req... " >&6; }
-    succeeded=no
-
-                        libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64)
-        libsubdirs="lib64 libx32 lib lib64"
-        ;;
-      ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64 ppc64le"
-        ;;
-    esac
-
-
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-                if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-            if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-    #include <boost/version.hpp>
-
-int
-main (void)
-{
-
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
-
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-    succeeded=yes
-    found_system=yes
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-            if test "x$succeeded" != "xyes"; then
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/$.*$'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '$0-9*\.0-9*$'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5
-printf "%s\n" "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;}
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-        #include <boost/version.hpp>
-
-int
-main (void)
-{
-
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
-
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        succeeded=yes
-        found_system=yes
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-        ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
-printf "%s\n" "$as_me: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&6;}
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5
-printf "%s\n" "$as_me: Your boost libraries seems to old (version $_version)." >&6;}
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        have_boost_base=no
-    else
-
-
-
-printf "%s\n" "#define HAVE_BOOST /**/" >>confdefs.h
-
-        # execute ACTION-IF-FOUND (if present):
-        have_boost_base=yes
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-
-
-  if test "x${have_boost_base}" = "xyes"; then
-
-
-# Check whether --with-boost-asio was given.
-if test ${with_boost_asio+y}
-then :
-  withval=$with_boost_asio;
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_asio_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_asio_lib="$withval"
-		fi
-
-else $as_nop
-  want_boost="yes"
-
-fi
-
-
-	if test "x$want_boost" = "xyes"; then
-
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::ASIO library is available" >&5
-printf %s "checking whether the Boost::ASIO library is available... " >&6; }
-if test ${ax_cv_boost_asio+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-		 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
- #include <boost/asio.hpp>
-
-int
-main (void)
-{
-
-
-                                    boost::asio::io_service io;
-                                    boost::system::error_code timer_result;
-                                    boost::asio::deadline_timer t(io);
-                                    t.cancel();
-                                    io.run_one();
-									return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ax_cv_boost_asio=yes
-else $as_nop
-  ax_cv_boost_asio=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-         ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_asio" >&5
-printf "%s\n" "$ax_cv_boost_asio" >&6; }
-		if test "x$ax_cv_boost_asio" = "xyes"; then
-
-printf "%s\n" "#define HAVE_BOOST_ASIO /**/" >>confdefs.h
-
-			BN=boost_system
-			BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/^\/*//'`
-            if test "x$ax_boost_user_asio_lib" = "x"; then
-				for ax_lib in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.dylib* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib$boost_system.*$\.so.*$;\1;' -e 's;^lib$boost_system.*$\.dylib.*$;\1;' -e 's;^lib$boost_system.*$\.a.*$;\1;' ` ; do
-				    as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_main" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5
-printf %s "checking for main in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main (void)
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_ASIO_LIB="-l$ax_lib"  link_thread="yes" break
-else $as_nop
-  link_thread="no"
-fi
-
-				done
-            else
-               for ax_lib in $ax_boost_user_asio_lib $BN-$ax_boost_user_asio_lib; do
-				      as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_main" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5
-printf %s "checking for main in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main (void)
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_ASIO_LIB="-l$ax_lib"  link_asio="yes" break
-else $as_nop
-  link_asio="no"
-fi
-
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
-            fi
-			if test "x$link_asio" = "xno"; then
-				as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-
-
-
-# Check whether --with-boost-system was given.
-if test ${with_boost_system+y}
-then :
-  withval=$with_boost_system;
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_system_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_system_lib="$withval"
-		fi
-
-else $as_nop
-  want_boost="yes"
-
-fi
-
-
-	if test "x$want_boost" = "xyes"; then
-
-
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5
-printf %s "checking whether the Boost::System library is available... " >&6; }
-if test ${ax_cv_boost_system+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <boost/system/error_code.hpp>
-int
-main (void)
-{
-boost::system::system_category
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ax_cv_boost_system=yes
-else $as_nop
-  ax_cv_boost_system=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5
-printf "%s\n" "$ax_cv_boost_system" >&6; }
-		if test "x$ax_cv_boost_system" = "xyes"; then
-
-
-
-printf "%s\n" "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h
-
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/^\/*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_system_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-printf %s "checking for exit in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char exit ();
-int
-main (void)
-{
-return exit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_SYSTEM_LIB="-l$ax_lib";  link_system="yes"; break
-else $as_nop
-  link_system="no"
-fi
-
-				done
-                if test "x$link_system" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-printf %s "checking for exit in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char exit ();
-int
-main (void)
-{
-return exit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_SYSTEM_LIB="-l$ax_lib";  link_system="yes"; break
-else $as_nop
-  link_system="no"
-fi
-
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-				      as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-printf %s "checking for exit in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char exit ();
-int
-main (void)
-{
-return exit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_SYSTEM_LIB="-l$ax_lib";  link_system="yes"; break
-else $as_nop
-  link_system="no"
-fi
-
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
-            fi
-			if test "x$link_system" = "xno"; then
-				as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-
-
-
-# Check whether --with-boost-thread was given.
-if test ${with_boost_thread+y}
-then :
-  withval=$with_boost_thread;
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_thread_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_thread_lib="$withval"
-		fi
-
-else $as_nop
-  want_boost="yes"
-
-fi
-
-
-	if test "x$want_boost" = "xyes"; then
-
-
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Thread library is available" >&5
-printf %s "checking whether the Boost::Thread library is available... " >&6; }
-if test ${ax_cv_boost_thread+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 if test "x$host_os" = "xsolaris" ; then
-				 CXXFLAGS="-pthreads $CXXFLAGS"
-			 elif test "x$host_os" = "xmingw32" ; then
-				 CXXFLAGS="-mthreads $CXXFLAGS"
-			 else
-				CXXFLAGS="-pthread $CXXFLAGS"
-			 fi
-			 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <boost/thread/thread.hpp>
-int
-main (void)
-{
-boost::thread_group thrds;
-                                   return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ax_cv_boost_thread=yes
-else $as_nop
-  ax_cv_boost_thread=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_thread" >&5
-printf "%s\n" "$ax_cv_boost_thread" >&6; }
-		if test "x$ax_cv_boost_thread" = "xyes"; then
-           if test "x$host_os" = "xsolaris" ; then
-			  BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
-		   elif test "x$host_os" = "xmingw32" ; then
-			  BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
-		   else
-			  BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
-		   fi
-
-
-
-
-printf "%s\n" "#define HAVE_BOOST_THREAD /**/" >>confdefs.h
-
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/^\/*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-                        case "x$host_os" in
-                          *bsd* )
-                               LDFLAGS="-pthread $LDFLAGS"
-                          break;
-                          ;;
-                        esac
-            if test "x$ax_boost_user_thread_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-printf %s "checking for exit in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char exit ();
-int
-main (void)
-{
-return exit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_THREAD_LIB="-l$ax_lib";  link_thread="yes"; break
-else $as_nop
-  link_thread="no"
-fi
-
-				done
-                if test "x$link_thread" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-printf %s "checking for exit in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char exit ();
-int
-main (void)
-{
-return exit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_THREAD_LIB="-l$ax_lib";  link_thread="yes"; break
-else $as_nop
-  link_thread="no"
-fi
-
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
-				      as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-printf %s "checking for exit in -l$ax_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char exit ();
-int
-main (void)
-{
-return exit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$as_ac_Lib=yes"
-else $as_nop
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  BOOST_THREAD_LIB="-l$ax_lib";  link_thread="yes"; break
-else $as_nop
-  link_thread="no"
-fi
-
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
-            fi
-			if test "x$link_thread" = "xno"; then
-				as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
-                        else
-                           case "x$host_os" in
-                              *bsd* )
-				BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
-                              break;
-                              ;;
-                           esac
-
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-
-
-    if test "x${ax_cv_boost_asio}" = "xyes" &&
-       test "x${ax_cv_boost_system}" = "xyes" &&
-       test "x${ax_cv_boost_thread}" = "xyes"; then
-      have_asio_lib=yes
-    fi
-  fi
-fi
-
 # The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL,
 # libev, and libc-ares.
 enable_app=no
@@ -23365,23 +22010,6 @@
 fi
 
 
-# C++ library libnghttp2_asio
-
-enable_asio_lib=no
-if test "x${request_asio_lib}" != "xno" &&
-   test "x${have_asio_lib}" = "xyes"; then
-  enable_asio_lib=yes
-fi
-
- if  test "x${enable_asio_lib}" = "xyes" ; then
-  ENABLE_ASIO_LIB_TRUE=
-  ENABLE_ASIO_LIB_FALSE='#'
-else
-  ENABLE_ASIO_LIB_TRUE='#'
-  ENABLE_ASIO_LIB_FALSE=
-fi
-
-
 # The example programs depend on OpenSSL and libevent_openssl
 enable_examples=no
 if test "x${request_examples}" != "xno" &&
@@ -23411,8 +22039,7 @@
 have_neverbleed=no
 if test "x${enable_examples}" = "xyes" ||
    test "x${enable_app}" = "xyes" ||
-   test "x${enable_hpack_tools}" = "xyes" ||
-   test "x${enable_asio_lib}" = "xyes"; then
+   test "x${enable_hpack_tools}" = "xyes"; then
   enable_third_party=yes
 
   # mruby (for src/nghttpx)
@@ -23462,40 +22089,6 @@
 fi
 
 
-# Python bindings
-enable_python_bindings=no
-if test "x${request_python_bindings}" != "xno" &&
-   test "x${CYTHON}" != "x" &&
-   test "x${PYTHON}" != "x:" &&
-   test "x${PYTHON_VERSION}" != "x"; then
-  enable_python_bindings=yes
-fi
-
-if test "x${request_python_bindings}" = "xyes" &&
-   test "x${enable_python_bindings}" != "xyes"; then
-  as_fn_error $? "python bindings were requested (--enable-python-bindings) but dependencies are not met." "$LINENO" 5
-fi
-
- if test "x${enable_python_bindings}" = "xyes"; then
-  ENABLE_PYTHON_BINDINGS_TRUE=
-  ENABLE_PYTHON_BINDINGS_FALSE='#'
-else
-  ENABLE_PYTHON_BINDINGS_TRUE='#'
-  ENABLE_PYTHON_BINDINGS_FALSE=
-fi
-
-
-# Produce cython conditional, so that we can distribute generated C
-# source
- if test "x${CYTHON}" != "x"; then
-  HAVE_CYTHON_TRUE=
-  HAVE_CYTHON_FALSE='#'
-else
-  HAVE_CYTHON_TRUE='#'
-  HAVE_CYTHON_FALSE=
-fi
-
-
 # failmalloc tests
 enable_failmalloc=no
 if test "x${request_failmalloc}" = "xyes"; then
@@ -26973,7 +25566,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 src/includes/Makefile src/libnghttp2_asio.pc bpf/Makefile examples/Makefile python/Makefile python/setup.py 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/libnghttp2_asio.rst doc/python-apiref.rst doc/building-android-binary.rst doc/nghttp2.h.rst doc/nghttp2ver.h.rst doc/asio_http2.h.rst doc/asio_http2_server.h.rst doc/asio_http2_client.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 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
@@ -27136,10 +25729,6 @@
   as_fn_error $? "conditional \"ENABLE_HPACK_TOOLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_ASIO_LIB_TRUE}" && test -z "${ENABLE_ASIO_LIB_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_ASIO_LIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_EXAMPLES_TRUE}" && test -z "${ENABLE_EXAMPLES_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_EXAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27156,14 +25745,6 @@
   as_fn_error $? "conditional \"HAVE_NEVERBLEED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_PYTHON_BINDINGS_TRUE}" && test -z "${ENABLE_PYTHON_BINDINGS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_PYTHON_BINDINGS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_CYTHON_TRUE}" && test -z "${HAVE_CYTHON_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_CYTHON\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_FAILMALLOC_TRUE}" && test -z "${ENABLE_FAILMALLOC_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_FAILMALLOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27563,7 +26144,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.46.0, which was
+This file was extended by nghttp2 $as_me 1.52.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27631,7 +26212,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-nghttp2 config.status 1.46.0
+nghttp2 config.status 1.52.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
@@ -27793,6 +26374,7 @@
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
@@ -27801,6 +26383,7 @@
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
@@ -27975,6 +26558,7 @@
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
+FILECMD \
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
@@ -27983,7 +26567,6 @@
 DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
-AR_FLAGS \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -28153,12 +26736,8 @@
     "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/includes/Makefile") CONFIG_FILES="$CONFIG_FILES src/includes/Makefile" ;;
-    "src/libnghttp2_asio.pc") CONFIG_FILES="$CONFIG_FILES src/libnghttp2_asio.pc" ;;
     "bpf/Makefile") CONFIG_FILES="$CONFIG_FILES bpf/Makefile" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
-    "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
-    "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;;
     "integration-tests/Makefile") CONFIG_FILES="$CONFIG_FILES integration-tests/Makefile" ;;
     "integration-tests/config.go") CONFIG_FILES="$CONFIG_FILES integration-tests/config.go" ;;
     "integration-tests/setenv") CONFIG_FILES="$CONFIG_FILES integration-tests/setenv" ;;
@@ -28171,14 +26750,9 @@
     "doc/tutorial-hpack.rst") CONFIG_FILES="$CONFIG_FILES doc/tutorial-hpack.rst" ;;
     "doc/nghttpx-howto.rst") CONFIG_FILES="$CONFIG_FILES doc/nghttpx-howto.rst" ;;
     "doc/h2load-howto.rst") CONFIG_FILES="$CONFIG_FILES doc/h2load-howto.rst" ;;
-    "doc/libnghttp2_asio.rst") CONFIG_FILES="$CONFIG_FILES doc/libnghttp2_asio.rst" ;;
-    "doc/python-apiref.rst") CONFIG_FILES="$CONFIG_FILES doc/python-apiref.rst" ;;
     "doc/building-android-binary.rst") CONFIG_FILES="$CONFIG_FILES doc/building-android-binary.rst" ;;
     "doc/nghttp2.h.rst") CONFIG_FILES="$CONFIG_FILES doc/nghttp2.h.rst" ;;
     "doc/nghttp2ver.h.rst") CONFIG_FILES="$CONFIG_FILES doc/nghttp2ver.h.rst" ;;
-    "doc/asio_http2.h.rst") CONFIG_FILES="$CONFIG_FILES doc/asio_http2.h.rst" ;;
-    "doc/asio_http2_server.h.rst") CONFIG_FILES="$CONFIG_FILES doc/asio_http2_server.h.rst" ;;
-    "doc/asio_http2_client.h.rst") CONFIG_FILES="$CONFIG_FILES doc/asio_http2_client.h.rst" ;;
     "doc/contribute.rst") CONFIG_FILES="$CONFIG_FILES doc/contribute.rst" ;;
     "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
     "script/Makefile") CONFIG_FILES="$CONFIG_FILES script/Makefile" ;;
@@ -28911,6 +27485,9 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# A file(cmd) program that detects file types.
+FILECMD=$lt_FILECMD
+
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
 
@@ -28935,8 +27512,11 @@
 # The archiver.
 AR=$lt_AR
 
+# Flags to create an archive (by configure).
+lt_ar_flags=$lt_ar_flags
+
 # Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
+AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
@@ -29326,7 +27906,7 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
@@ -29657,10 +28237,6 @@
     Python:
       Python:         ${PYTHON}
       PYTHON_VERSION: ${PYTHON_VERSION}
-      pyexecdir:      ${pyexecdir}
-      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
-      PYTHON_LIBS:    ${PYTHON_LIBS}
-      Cython:         ${CYTHON}
     Test:
       CUnit:          ${have_cunit} (CFLAGS='${CUNIT_CFLAGS}' LIBS='${CUNIT_LIBS}')
       Failmalloc:     ${enable_failmalloc}
@@ -29679,11 +28255,6 @@
       Jemalloc:       ${have_jemalloc} (CFLAGS='${JEMALLOC_CFLAGS}' LIBS='${JEMALLOC_LIBS}')
       Zlib:           ${have_zlib} (CFLAGS='${ZLIB_CFLAGS}' LIBS='${ZLIB_LIBS}')
       Systemd:        ${have_libsystemd} (CFLAGS='${SYSTEMD_CFLAGS}' LIBS='${SYSTEMD_LIBS}')
-      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
-      Boost LDFLAGS:  ${BOOST_LDFLAGS}
-      Boost::ASIO:    ${BOOST_ASIO_LIB}
-      Boost::System:  ${BOOST_SYSTEM_LIB}
-      Boost::Thread:  ${BOOST_THREAD_LIB}
     Third-party:
       http-parser:    ${enable_third_party}
       MRuby:          ${have_mruby} (CFLAGS='${LIBMRUBY_CFLAGS}' LIBS='${LIBMRUBY_LIBS}')
@@ -29691,9 +28262,7 @@
     Features:
       Applications:   ${enable_app}
       HPACK tools:    ${enable_hpack_tools}
-      Libnghttp2_asio:${enable_asio_lib}
       Examples:       ${enable_examples}
-      Python bindings:${enable_python_bindings}
       Threading:      ${enable_threads}
       HTTP/3 (EXPERIMENTAL): ${enable_http3}
 " >&5
@@ -29732,10 +28301,6 @@
     Python:
       Python:         ${PYTHON}
       PYTHON_VERSION: ${PYTHON_VERSION}
-      pyexecdir:      ${pyexecdir}
-      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
-      PYTHON_LIBS:    ${PYTHON_LIBS}
-      Cython:         ${CYTHON}
     Test:
       CUnit:          ${have_cunit} (CFLAGS='${CUNIT_CFLAGS}' LIBS='${CUNIT_LIBS}')
       Failmalloc:     ${enable_failmalloc}
@@ -29754,11 +28319,6 @@
       Jemalloc:       ${have_jemalloc} (CFLAGS='${JEMALLOC_CFLAGS}' LIBS='${JEMALLOC_LIBS}')
       Zlib:           ${have_zlib} (CFLAGS='${ZLIB_CFLAGS}' LIBS='${ZLIB_LIBS}')
       Systemd:        ${have_libsystemd} (CFLAGS='${SYSTEMD_CFLAGS}' LIBS='${SYSTEMD_LIBS}')
-      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
-      Boost LDFLAGS:  ${BOOST_LDFLAGS}
-      Boost::ASIO:    ${BOOST_ASIO_LIB}
-      Boost::System:  ${BOOST_SYSTEM_LIB}
-      Boost::Thread:  ${BOOST_THREAD_LIB}
     Third-party:
       http-parser:    ${enable_third_party}
       MRuby:          ${have_mruby} (CFLAGS='${LIBMRUBY_CFLAGS}' LIBS='${LIBMRUBY_LIBS}')
@@ -29766,9 +28326,7 @@
     Features:
       Applications:   ${enable_app}
       HPACK tools:    ${enable_hpack_tools}
-      Libnghttp2_asio:${enable_asio_lib}
       Examples:       ${enable_examples}
-      Python bindings:${enable_python_bindings}
       Threading:      ${enable_threads}
       HTTP/3 (EXPERIMENTAL): ${enable_http3}
 " >&6;}

_service:tar_scm:nghttp2-1.46.0.tar.xz/configure.ac -> _service:tar_scm:nghttp2-1.52.0.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.46.0, t-tujikawa@users.sourceforge.net)
+AC_INIT(nghttp2, 1.52.0, t-tujikawa@users.sourceforge.net)
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADERS(config.h)
@@ -44,9 +44,9 @@
 
 dnl See versioning rule:
 dnl  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST(LT_CURRENT, 35)
+AC_SUBST(LT_CURRENT, 38)
 AC_SUBST(LT_REVISION, 1)
-AC_SUBST(LT_AGE, 21)
+AC_SUBST(LT_AGE, 24)
 
 major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/^0-9//g"`
 minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/^0-9//g"`
@@ -82,21 +82,11 @@
                     Build HPACK tools default=check),
     request_hpack_tools=$enableval, request_hpack_tools=check)
 
-AC_ARG_ENABLE(asio-lib,
-    AS_HELP_STRING(--enable-asio-lib,
-                    Build C++ libnghttp2_asio library default=no),
-    request_asio_lib=$enableval, request_asio_lib=no)
-
 AC_ARG_ENABLE(examples,
     AS_HELP_STRING(--enable-examples,
                     Build examples default=check),
     request_examples=$enableval, request_examples=check)
 
-AC_ARG_ENABLE(python-bindings,
-    AS_HELP_STRING(--enable-python-bindings,
-                    Build Python bindings default=check),
-    request_python_bindings=$enableval, request_python_bindings=check)
-
 AC_ARG_ENABLE(failmalloc,
     AS_HELP_STRING(--disable-failmalloc,
                     Do not build failmalloc test program),
@@ -104,7 +94,7 @@
 
 AC_ARG_ENABLE(lib-only,
     AS_HELP_STRING(--enable-lib-only,
-                    Build libnghttp2 only.  This is a short hand for --disable-app --disable-examples --disable-hpack-tools --disable-python-bindings),
+                    Build libnghttp2 only.  This is a short hand for --disable-app --disable-examples --disable-hpack-tools),
     request_lib_only=$enableval, request_lib_only=no)
 
 AC_ARG_ENABLE(http3,
@@ -172,11 +162,6 @@
                     Use neverbleed default=no),
     request_neverbleed=$withval, request_neverbleed=no)
 
-AC_ARG_WITH(cython,
-    AS_HELP_STRING(--with-cython=PATH,
-                    Use cython in given PATH),
-    cython_path=$withval, )
-
 AC_ARG_WITH(libngtcp2,
     AS_HELP_STRING(--with-libngtcp2,
                     Use libngtcp2 default=check),
@@ -193,8 +178,6 @@
     request_libbpf=$withval, request_libbpf=no)
 
 dnl Define variables
-AC_ARG_VAR(CYTHON, the Cython executable)
-
 AC_ARG_VAR(LIBEV_CFLAGS, C compiler flags for libev, skipping any checks)
 AC_ARG_VAR(LIBEV_LIBS, linker flags for libev, skipping any checks)
 
@@ -220,29 +203,25 @@
 
 AM_PATH_PYTHON(3.8,, :)
 
-if test "x$request_python_bindings" = "xyes" &&
-   test "x$PYTHON" = "x:"; then
-  AC_MSG_ERROR(python was requested (enable-python-bindings) but not found)
-fi
-
 if test "x$request_lib_only" = "xyes"; then
   request_app=no
   request_hpack_tools=no
   request_examples=no
-  request_python_bindings=no
-fi
-
-if test "x$request_python_bindings" != "xno" &&
-   test "x$PYTHON" != "x:"; then
-  # version check is broken
-  AX_PYTHON_DEVEL()
-fi
-
-if test "x${cython_path}" = "x"; then
-  AC_CHECK_PROGS(CYTHON, cython.py cython)
-else
-  CYTHON=${cython_path}
-  AC_SUBST(CYTHON)
+  request_http3=no
+  request_libxml2=no
+  request_jansson=no
+  request_zlib=no
+  request_libevent_openssl=no
+  request_libcares=no
+  request_openssl=no
+  request_libev=no
+  request_jemalloc=no
+  request_systemd=no
+  request_mruby=no
+  request_neverbleed=no
+  request_libngtcp2=no
+  request_libnghttp3=no
+  request_libbpf=no
 fi
 
 if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
@@ -349,8 +328,8 @@
 case "$host_os" in
   *android*)
     android_build=yes
-    # android does not need -pthread, but needs followng 3 libs for C++
-    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
+    # android does not need -pthread, but needs following 2 libs for C++
+    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic"
     ;;
   *)
     PTHREAD_LDFLAGS="-pthread"
@@ -525,7 +504,7 @@
 # ngtcp2 (for src)
 have_libngtcp2=no
 if test "x${request_libngtcp2}" != "xno"; then
-  PKG_CHECK_MODULES(LIBNGTCP2, libngtcp2 >= 0.0.0, have_libngtcp2=yes,
+  PKG_CHECK_MODULES(LIBNGTCP2, libngtcp2 >= 0.13.0, have_libngtcp2=yes,
                     have_libngtcp2=no)
   if test "x${have_libngtcp2}" = "xno"; then
     AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS)
@@ -542,7 +521,7 @@
 if test "x${have_ssl_is_quic}" = "xyes" &&
    test "x${request_libngtcp2}" != "xno"; then
   PKG_CHECK_MODULES(LIBNGTCP2_CRYPTO_OPENSSL,
-                    libngtcp2_crypto_openssl >= 0.0.0,
+                    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
@@ -584,7 +563,7 @@
 # nghttp3 (for src)
 have_libnghttp3=no
 if test "x${request_libnghttp3}" != "xno"; then
-  PKG_CHECK_MODULES(LIBNGHTTP3, libnghttp3 >= 0.0.0, have_libnghttp3=yes,
+  PKG_CHECK_MODULES(LIBNGHTTP3, libnghttp3 >= 0.7.0, have_libnghttp3=yes,
                     have_libnghttp3=no)
   if test "x${have_libnghttp3}" = "xno"; then
     AC_MSG_NOTICE($LIBNGHTTP3_PKG_ERRORS)
@@ -599,7 +578,7 @@
 # libbpf (for src)
 have_libbpf=no
 if test "x${request_libbpf}" != "xno"; then
-  PKG_CHECK_MODULES(LIBBPF, libbpf >= 0.4.0, have_libbpf=yes,
+  PKG_CHECK_MODULES(LIBBPF, libbpf >= 0.7.0, have_libbpf=yes,
                     have_libbpf=no)
   if test "x${have_libbpf}" = "xyes"; then
     AC_DEFINE(HAVE_LIBBPF, 1, Define to 1 if you have `libbpf` library.)
@@ -748,25 +727,6 @@
   AC_MSG_ERROR(jemalloc was requested (--with-jemalloc) but not found)
 fi
 
-# Check Boost Asio library
-have_asio_lib=no
-
-if test "x${request_asio_lib}" = "xyes"; then
-  AX_BOOST_BASE(1.54.0, have_boost_base=yes, have_boost_base=no)
-
-  if test "x${have_boost_base}" = "xyes"; then
-    AX_BOOST_ASIO()
-    AX_BOOST_SYSTEM()
-    AX_BOOST_THREAD()
-
-    if test "x${ax_cv_boost_asio}" = "xyes" &&
-       test "x${ax_cv_boost_system}" = "xyes" &&
-       test "x${ax_cv_boost_thread}" = "xyes"; then
-      have_asio_lib=yes
-    fi
-  fi
-fi
-
 # The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL,
 # libev, and libc-ares.
 enable_app=no
@@ -819,16 +779,6 @@
 
 AM_CONDITIONAL(ENABLE_HPACK_TOOLS,  test "x${enable_hpack_tools}" = "xyes" )
 
-# C++ library libnghttp2_asio
-
-enable_asio_lib=no
-if test "x${request_asio_lib}" != "xno" &&
-   test "x${have_asio_lib}" = "xyes"; then
-  enable_asio_lib=yes
-fi
-
-AM_CONDITIONAL(ENABLE_ASIO_LIB,  test "x${enable_asio_lib}" = "xyes" )
-
 # The example programs depend on OpenSSL and libevent_openssl
 enable_examples=no
 if test "x${request_examples}" != "xno" &&
@@ -851,8 +801,7 @@
 have_neverbleed=no
 if test "x${enable_examples}" = "xyes" ||
    test "x${enable_app}" = "xyes" ||
-   test "x${enable_hpack_tools}" = "xyes" ||
-   test "x${enable_asio_lib}" = "xyes"; then
+   test "x${enable_hpack_tools}" = "xyes"; then
   enable_third_party=yes
 
   # mruby (for src/nghttpx)
@@ -877,27 +826,6 @@
 AM_CONDITIONAL(HAVE_MRUBY, test "x${have_mruby}" = "xyes")
 AM_CONDITIONAL(HAVE_NEVERBLEED, test "x${have_neverbleed}" = "xyes")
 
-# Python bindings
-enable_python_bindings=no
-if test "x${request_python_bindings}" != "xno" &&
-   test "x${CYTHON}" != "x" &&
-   test "x${PYTHON}" != "x:" &&
-   test "x${PYTHON_VERSION}" != "x"; then
-  enable_python_bindings=yes
-fi
-
-if test "x${request_python_bindings}" = "xyes" &&
-   test "x${enable_python_bindings}" != "xyes"; then
-  AC_MSG_ERROR(python bindings were requested (--enable-python-bindings) but dependencies are not met.)
-fi
-
-AM_CONDITIONAL(ENABLE_PYTHON_BINDINGS,
-               test "x${enable_python_bindings}" = "xyes")
-
-# Produce cython conditional, so that we can distribute generated C
-# source
-AM_CONDITIONAL(HAVE_CYTHON, test "x${CYTHON}" != "x")
-
 # failmalloc tests
 enable_failmalloc=no
 if test "x${request_failmalloc}" = "xyes"; then
@@ -1144,12 +1072,8 @@
   tests/testdata/Makefile
   third-party/Makefile
   src/Makefile
-  src/includes/Makefile
-  src/libnghttp2_asio.pc
   bpf/Makefile
   examples/Makefile
-  python/Makefile
-  python/setup.py
   integration-tests/Makefile
   integration-tests/config.go
   integration-tests/setenv
@@ -1162,14 +1086,9 @@
   doc/tutorial-hpack.rst
   doc/nghttpx-howto.rst
   doc/h2load-howto.rst
-  doc/libnghttp2_asio.rst
-  doc/python-apiref.rst
   doc/building-android-binary.rst
   doc/nghttp2.h.rst
   doc/nghttp2ver.h.rst
-  doc/asio_http2.h.rst
-  doc/asio_http2_server.h.rst
-  doc/asio_http2_client.h.rst
   doc/contribute.rst
   contrib/Makefile
   script/Makefile
@@ -1211,10 +1130,6 @@
     Python:
       Python:         ${PYTHON}
       PYTHON_VERSION: ${PYTHON_VERSION}
-      pyexecdir:      ${pyexecdir}
-      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
-      PYTHON_LIBS:    ${PYTHON_LIBS}
-      Cython:         ${CYTHON}
     Test:
       CUnit:          ${have_cunit} (CFLAGS='${CUNIT_CFLAGS}' LIBS='${CUNIT_LIBS}')
       Failmalloc:     ${enable_failmalloc}
@@ -1233,11 +1148,6 @@
       Jemalloc:       ${have_jemalloc} (CFLAGS='${JEMALLOC_CFLAGS}' LIBS='${JEMALLOC_LIBS}')
       Zlib:           ${have_zlib} (CFLAGS='${ZLIB_CFLAGS}' LIBS='${ZLIB_LIBS}')
       Systemd:        ${have_libsystemd} (CFLAGS='${SYSTEMD_CFLAGS}' LIBS='${SYSTEMD_LIBS}')
-      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
-      Boost LDFLAGS:  ${BOOST_LDFLAGS}
-      Boost::ASIO:    ${BOOST_ASIO_LIB}
-      Boost::System:  ${BOOST_SYSTEM_LIB}
-      Boost::Thread:  ${BOOST_THREAD_LIB}
     Third-party:
       http-parser:    ${enable_third_party}
       MRuby:          ${have_mruby} (CFLAGS='${LIBMRUBY_CFLAGS}' LIBS='${LIBMRUBY_LIBS}')
@@ -1245,9 +1155,7 @@
     Features:
       Applications:   ${enable_app}
       HPACK tools:    ${enable_hpack_tools}
-      Libnghttp2_asio:${enable_asio_lib}
       Examples:       ${enable_examples}
-      Python bindings:${enable_python_bindings}
       Threading:      ${enable_threads}
       HTTP/3 (EXPERIMENTAL): ${enable_http3}
 )

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -113,13 +113,8 @@
 target_triplet = @target@
 subdir = contrib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -161,11 +156,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -182,7 +172,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -198,6 +187,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -266,15 +256,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@

_service:tar_scm:nghttp2-1.46.0.tar.xz/contrib/tlsticketupdate.go -> _service:tar_scm:nghttp2-1.52.0.tar.xz/contrib/tlsticketupdate.go Changed

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

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

@@ -30,6 +30,7 @@
 	nghttp2_check_authority.rst \
 	nghttp2_check_header_name.rst \
 	nghttp2_check_header_value.rst \
+	nghttp2_check_header_value_rfc9113.rst \
 	nghttp2_check_method.rst \
 	nghttp2_check_path.rst \
 	nghttp2_hd_deflate_bound.rst \
@@ -68,7 +69,9 @@
 	nghttp2_option_set_no_closed_streams.rst \
 	nghttp2_option_set_no_http_messaging.rst \
 	nghttp2_option_set_no_recv_client_magic.rst \
+	nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation.rst \
 	nghttp2_option_set_peer_max_concurrent_streams.rst \
+	nghttp2_option_set_server_fallback_rfc7540_priorities.rst \
 	nghttp2_option_set_user_recv_extension_type.rst \
 	nghttp2_option_set_max_outbound_ack.rst \
 	nghttp2_option_set_max_settings.rst \
@@ -106,6 +109,7 @@
 	nghttp2_session_callbacks_set_send_callback.rst \
 	nghttp2_session_callbacks_set_send_data_callback.rst \
 	nghttp2_session_callbacks_set_unpack_extension_callback.rst \
+	nghttp2_session_change_extpri_stream_priority.rst \
 	nghttp2_session_change_stream_priority.rst \
 	nghttp2_session_check_request_allowed.rst \
 	nghttp2_session_check_server_session.rst \
@@ -172,6 +176,7 @@
 	nghttp2_submit_origin.rst \
 	nghttp2_submit_ping.rst \
 	nghttp2_submit_priority.rst \
+	nghttp2_submit_priority_update.rst \
 	nghttp2_submit_push_promise.rst \
 	nghttp2_submit_request.rst \
 	nghttp2_submit_response.rst \
@@ -201,66 +206,12 @@
 	sources/tutorial-hpack.rst \
 	sources/nghttpx-howto.rst \
 	sources/h2load-howto.rst \
-	sources/libnghttp2_asio.rst \
-	sources/python-apiref.rst \
 	sources/building-android-binary.rst \
 	sources/contribute.rst \
 	sources/security.rst \
 	_exts/rubydomain/LICENSE.rubydomain \
 	_exts/rubydomain/__init__.py \
 	_exts/rubydomain/rubydomain.py \
-	_themes/sphinx_rtd_theme/__init__.py \
-	_themes/sphinx_rtd_theme/breadcrumbs.html \
-	_themes/sphinx_rtd_theme/footer.html \
-	_themes/sphinx_rtd_theme/layout.html \
-	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/sphinx.pot \
-	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/search.html \
-	_themes/sphinx_rtd_theme/searchbox.html \
-	_themes/sphinx_rtd_theme/static/css/badge_only.css \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2 \
-	_themes/sphinx_rtd_theme/static/css/theme.css \
-	_themes/sphinx_rtd_theme/static/js/badge_only.js \
-	_themes/sphinx_rtd_theme/static/js/theme.js \
-	_themes/sphinx_rtd_theme/theme.conf \
-	_themes/sphinx_rtd_theme/versions.html \
 	$(man_MANS) \
 	bash_completion/nghttp \
 	bash_completion/nghttpd \

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -113,13 +113,8 @@
 target_triplet = @target@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -130,10 +125,8 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = conf.py index.rst package_README.rst \
 	tutorial-client.rst tutorial-server.rst tutorial-hpack.rst \
-	nghttpx-howto.rst h2load-howto.rst libnghttp2_asio.rst \
-	python-apiref.rst building-android-binary.rst nghttp2.h.rst \
-	nghttp2ver.h.rst asio_http2.h.rst asio_http2_server.h.rst \
-	asio_http2_client.h.rst contribute.rst
+	nghttpx-howto.rst h2load-howto.rst building-android-binary.rst \
+	nghttp2.h.rst nghttp2ver.h.rst contribute.rst
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -186,15 +179,12 @@
 NROFF = nroff
 MANS = $(man_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/asio_http2.h.rst.in \
-	$(srcdir)/asio_http2_client.h.rst.in \
-	$(srcdir)/asio_http2_server.h.rst.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(srcdir)/building-android-binary.rst.in $(srcdir)/conf.py.in \
 	$(srcdir)/contribute.rst.in $(srcdir)/h2load-howto.rst.in \
-	$(srcdir)/index.rst.in $(srcdir)/libnghttp2_asio.rst.in \
-	$(srcdir)/nghttp2.h.rst.in $(srcdir)/nghttp2ver.h.rst.in \
-	$(srcdir)/nghttpx-howto.rst.in $(srcdir)/package_README.rst.in \
-	$(srcdir)/python-apiref.rst.in \
+	$(srcdir)/index.rst.in $(srcdir)/nghttp2.h.rst.in \
+	$(srcdir)/nghttp2ver.h.rst.in $(srcdir)/nghttpx-howto.rst.in \
+	$(srcdir)/package_README.rst.in \
 	$(srcdir)/tutorial-client.rst.in \
 	$(srcdir)/tutorial-hpack.rst.in \
 	$(srcdir)/tutorial-server.rst.in
@@ -208,11 +198,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,7 +214,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -245,6 +229,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -313,15 +298,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -406,6 +385,7 @@
 	nghttp2_check_authority.rst \
 	nghttp2_check_header_name.rst \
 	nghttp2_check_header_value.rst \
+	nghttp2_check_header_value_rfc9113.rst \
 	nghttp2_check_method.rst \
 	nghttp2_check_path.rst \
 	nghttp2_hd_deflate_bound.rst \
@@ -444,7 +424,9 @@
 	nghttp2_option_set_no_closed_streams.rst \
 	nghttp2_option_set_no_http_messaging.rst \
 	nghttp2_option_set_no_recv_client_magic.rst \
+	nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation.rst \
 	nghttp2_option_set_peer_max_concurrent_streams.rst \
+	nghttp2_option_set_server_fallback_rfc7540_priorities.rst \
 	nghttp2_option_set_user_recv_extension_type.rst \
 	nghttp2_option_set_max_outbound_ack.rst \
 	nghttp2_option_set_max_settings.rst \
@@ -482,6 +464,7 @@
 	nghttp2_session_callbacks_set_send_callback.rst \
 	nghttp2_session_callbacks_set_send_data_callback.rst \
 	nghttp2_session_callbacks_set_unpack_extension_callback.rst \
+	nghttp2_session_change_extpri_stream_priority.rst \
 	nghttp2_session_change_stream_priority.rst \
 	nghttp2_session_check_request_allowed.rst \
 	nghttp2_session_check_server_session.rst \
@@ -548,6 +531,7 @@
 	nghttp2_submit_origin.rst \
 	nghttp2_submit_ping.rst \
 	nghttp2_submit_priority.rst \
+	nghttp2_submit_priority_update.rst \
 	nghttp2_submit_push_promise.rst \
 	nghttp2_submit_request.rst \
 	nghttp2_submit_response.rst \
@@ -577,66 +561,12 @@
 	sources/tutorial-hpack.rst \
 	sources/nghttpx-howto.rst \
 	sources/h2load-howto.rst \
-	sources/libnghttp2_asio.rst \
-	sources/python-apiref.rst \
 	sources/building-android-binary.rst \
 	sources/contribute.rst \
 	sources/security.rst \
 	_exts/rubydomain/LICENSE.rubydomain \
 	_exts/rubydomain/__init__.py \
 	_exts/rubydomain/rubydomain.py \
-	_themes/sphinx_rtd_theme/__init__.py \
-	_themes/sphinx_rtd_theme/breadcrumbs.html \
-	_themes/sphinx_rtd_theme/footer.html \
-	_themes/sphinx_rtd_theme/layout.html \
-	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/sphinx.pot \
-	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo \
-	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po \
-	_themes/sphinx_rtd_theme/search.html \
-	_themes/sphinx_rtd_theme/searchbox.html \
-	_themes/sphinx_rtd_theme/static/css/badge_only.css \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2 \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff \
-	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2 \
-	_themes/sphinx_rtd_theme/static/css/theme.css \
-	_themes/sphinx_rtd_theme/static/js/badge_only.js \
-	_themes/sphinx_rtd_theme/static/js/theme.js \
-	_themes/sphinx_rtd_theme/theme.conf \
-	_themes/sphinx_rtd_theme/versions.html \
 	$(man_MANS) \
 	bash_completion/nghttp \
 	bash_completion/nghttpd \
@@ -704,22 +634,12 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 h2load-howto.rst: $(top_builddir)/config.status $(srcdir)/h2load-howto.rst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-libnghttp2_asio.rst: $(top_builddir)/config.status $(srcdir)/libnghttp2_asio.rst.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-python-apiref.rst: $(top_builddir)/config.status $(srcdir)/python-apiref.rst.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 building-android-binary.rst: $(top_builddir)/config.status $(srcdir)/building-android-binary.rst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nghttp2.h.rst: $(top_builddir)/config.status $(srcdir)/nghttp2.h.rst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nghttp2ver.h.rst: $(top_builddir)/config.status $(srcdir)/nghttp2ver.h.rst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-asio_http2.h.rst: $(top_builddir)/config.status $(srcdir)/asio_http2.h.rst.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-asio_http2_server.h.rst: $(top_builddir)/config.status $(srcdir)/asio_http2_server.h.rst.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-asio_http2_client.h.rst: $(top_builddir)/config.status $(srcdir)/asio_http2_client.h.rst.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 contribute.rst: $(top_builddir)/config.status $(srcdir)/contribute.rst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/_exts/rubydomain/rubydomain.py -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/_exts/rubydomain/rubydomain.py Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/bash_completion/h2load -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/bash_completion/h2load Changed

@@ -8,7 +8,7 @@
     _get_comp_words_by_ref cur prev
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '--requests --clients --threads --input-file --max-concurrent-streams --window-bits --connection-window-bits --header --ciphers --tls13-ciphers --no-tls-proto --data --rate --rate-period --duration --warm-up-time --connection-active-timeout --connection-inactivity-timeout --timing-script-file --base-uri --npn-list --h1 --header-table-size --encoder-header-table-size --log-file --qlog-file-base --connect-to --rps --groups --no-udp-gso --max-udp-payload-size --verbose --version --help ' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--requests --clients --threads --input-file --max-concurrent-streams --max-frame-size --window-bits --connection-window-bits --header --ciphers --tls13-ciphers --no-tls-proto --data --rate --rate-period --duration --warm-up-time --connection-active-timeout --connection-inactivity-timeout --timing-script-file --base-uri --npn-list --h1 --header-table-size --encoder-header-table-size --log-file --qlog-file-base --connect-to --rps --groups --no-udp-gso --max-udp-payload-size --ktls --verbose --version --help ' -- "$cur" ) )
             ;;
         *)
             _filedir

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/bash_completion/nghttp -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/bash_completion/nghttp Changed

@@ -8,7 +8,7 @@
     _get_comp_words_by_ref cur prev
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '--verbose --null-out --remote-name --timeout --window-bits --connection-window-bits --get-assets --stat --header --trailer --cert --key --data --multiply --upgrade --weight --peer-max-concurrent-streams --header-table-size --encoder-header-table-size --padding --har --color --continuation --no-content-length --no-dep --hexdump --no-push --max-concurrent-streams --expect-continue --no-verify-peer --version --help ' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--verbose --null-out --remote-name --timeout --window-bits --connection-window-bits --get-assets --stat --header --trailer --cert --key --data --multiply --upgrade --weight --peer-max-concurrent-streams --header-table-size --encoder-header-table-size --padding --har --color --continuation --no-content-length --no-dep --hexdump --no-push --max-concurrent-streams --expect-continue --no-verify-peer --ktls --no-rfc7540-pri --version --help ' -- "$cur" ) )
             ;;
         *)
             _filedir

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/bash_completion/nghttpd -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/bash_completion/nghttpd Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/bash_completion/nghttpx -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/bash_completion/nghttpx Changed

@@ -8,7 +8,7 @@
     _get_comp_words_by_ref cur prev
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '--backend --frontend --backlog --backend-address-family --backend-http-proxy-uri --workers --single-thread --read-rate --read-burst --write-rate --write-burst --worker-read-rate --worker-read-burst --worker-write-rate --worker-write-burst --worker-frontend-connections --backend-connections-per-host --backend-connections-per-frontend --rlimit-nofile --rlimit-memlock --backend-request-buffer --backend-response-buffer --fastopen --no-kqueue --frontend-http2-read-timeout --frontend-http3-read-timeout --frontend-read-timeout --frontend-write-timeout --frontend-keep-alive-timeout --stream-read-timeout --stream-write-timeout --backend-read-timeout --backend-write-timeout --backend-connect-timeout --backend-keep-alive-timeout --listener-disable-timeout --frontend-http2-setting-timeout --backend-http2-settings-timeout --backend-max-backoff --ciphers --tls13-ciphers --client-ciphers --tls13-client-ciphers --ecdh-curves --insecure --cacert --private-key-passwd-file --subcert --dh-param-file --npn-list --verify-client --verify-client-cacert --verify-client-tolerate-expired --client-private-key-file --client-cert-file --tls-min-proto-version --tls-max-proto-version --tls-ticket-key-file --tls-ticket-key-memcached --tls-ticket-key-memcached-address-family --tls-ticket-key-memcached-interval --tls-ticket-key-memcached-max-retry --tls-ticket-key-memcached-max-fail --tls-ticket-key-cipher --tls-ticket-key-memcached-cert-file --tls-ticket-key-memcached-private-key-file --fetch-ocsp-response-file --ocsp-update-interval --ocsp-startup --no-verify-ocsp --no-ocsp --tls-session-cache-memcached --tls-session-cache-memcached-address-family --tls-session-cache-memcached-cert-file --tls-session-cache-memcached-private-key-file --tls-dyn-rec-warmup-threshold --tls-dyn-rec-idle-timeout --no-http2-cipher-block-list --client-no-http2-cipher-block-list --tls-sct-dir --psk-secrets --client-psk-secrets --tls-no-postpone-early-data --tls-max-early-data --frontend-http2-max-concurrent-streams --backend-http2-max-concurrent-streams --frontend-http2-window-size --frontend-http2-connection-window-size --backend-http2-window-size --backend-http2-connection-window-size --http2-no-cookie-crumbling --padding --no-server-push --frontend-http2-optimize-write-buffer-size --frontend-http2-optimize-window-size --frontend-http2-encoder-dynamic-table-size --frontend-http2-decoder-dynamic-table-size --backend-http2-encoder-dynamic-table-size --backend-http2-decoder-dynamic-table-size --http2-proxy --log-level --accesslog-file --accesslog-syslog --accesslog-format --accesslog-write-early --errorlog-file --errorlog-syslog --syslog-facility --add-x-forwarded-for --strip-incoming-x-forwarded-for --no-add-x-forwarded-proto --no-strip-incoming-x-forwarded-proto --add-forwarded --strip-incoming-forwarded --forwarded-by --forwarded-for --no-via --no-strip-incoming-early-data --no-location-rewrite --host-rewrite --altsvc --http2-altsvc --add-request-header --add-response-header --request-header-field-buffer --max-request-header-fields --response-header-field-buffer --max-response-header-fields --error-page --server-name --no-server-rewrite --redirect-https-port --api-max-request-body --dns-cache-timeout --dns-lookup-timeout --dns-max-try --frontend-max-requests --frontend-http2-dump-request-header --frontend-http2-dump-response-header --frontend-frame-debug --daemon --pid-file --user --single-process --max-worker-processes --worker-process-grace-shutdown-period --mruby-file --ignore-per-pattern-mruby-error --frontend-quic-idle-timeout --frontend-quic-debug-log --quic-bpf-program-file --frontend-quic-early-data --frontend-quic-qlog-dir --frontend-quic-require-token --frontend-quic-congestion-controller --frontend-quic-secret-file --quic-server-id --frontend-quic-initial-rtt --no-quic-bpf --frontend-http3-window-size --frontend-http3-connection-window-size --frontend-http3-max-window-size --frontend-http3-max-connection-window-size --frontend-http3-max-concurrent-streams --conf --include --version --help ' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--backend --frontend --backlog --backend-address-family --backend-http-proxy-uri --workers --single-thread --read-rate --read-burst --write-rate --write-burst --worker-read-rate --worker-read-burst --worker-write-rate --worker-write-burst --worker-frontend-connections --backend-connections-per-host --backend-connections-per-frontend --rlimit-nofile --rlimit-memlock --backend-request-buffer --backend-response-buffer --fastopen --no-kqueue --frontend-http2-read-timeout --frontend-http3-read-timeout --frontend-read-timeout --frontend-write-timeout --frontend-keep-alive-timeout --stream-read-timeout --stream-write-timeout --backend-read-timeout --backend-write-timeout --backend-connect-timeout --backend-keep-alive-timeout --listener-disable-timeout --frontend-http2-setting-timeout --backend-http2-settings-timeout --backend-max-backoff --ciphers --tls13-ciphers --client-ciphers --tls13-client-ciphers --ecdh-curves --insecure --cacert --private-key-passwd-file --subcert --dh-param-file --npn-list --verify-client --verify-client-cacert --verify-client-tolerate-expired --client-private-key-file --client-cert-file --tls-min-proto-version --tls-max-proto-version --tls-ticket-key-file --tls-ticket-key-memcached --tls-ticket-key-memcached-address-family --tls-ticket-key-memcached-interval --tls-ticket-key-memcached-max-retry --tls-ticket-key-memcached-max-fail --tls-ticket-key-cipher --tls-ticket-key-memcached-cert-file --tls-ticket-key-memcached-private-key-file --fetch-ocsp-response-file --ocsp-update-interval --ocsp-startup --no-verify-ocsp --no-ocsp --tls-session-cache-memcached --tls-session-cache-memcached-address-family --tls-session-cache-memcached-cert-file --tls-session-cache-memcached-private-key-file --tls-dyn-rec-warmup-threshold --tls-dyn-rec-idle-timeout --no-http2-cipher-block-list --client-no-http2-cipher-block-list --tls-sct-dir --psk-secrets --client-psk-secrets --tls-no-postpone-early-data --tls-max-early-data --tls-ktls --frontend-http2-max-concurrent-streams --backend-http2-max-concurrent-streams --frontend-http2-window-size --frontend-http2-connection-window-size --backend-http2-window-size --backend-http2-connection-window-size --http2-no-cookie-crumbling --padding --no-server-push --frontend-http2-optimize-write-buffer-size --frontend-http2-optimize-window-size --frontend-http2-encoder-dynamic-table-size --frontend-http2-decoder-dynamic-table-size --backend-http2-encoder-dynamic-table-size --backend-http2-decoder-dynamic-table-size --http2-proxy --log-level --accesslog-file --accesslog-syslog --accesslog-format --accesslog-write-early --errorlog-file --errorlog-syslog --syslog-facility --add-x-forwarded-for --strip-incoming-x-forwarded-for --no-add-x-forwarded-proto --no-strip-incoming-x-forwarded-proto --add-forwarded --strip-incoming-forwarded --forwarded-by --forwarded-for --no-via --no-strip-incoming-early-data --no-location-rewrite --host-rewrite --altsvc --http2-altsvc --add-request-header --add-response-header --request-header-field-buffer --max-request-header-fields --response-header-field-buffer --max-response-header-fields --error-page --server-name --no-server-rewrite --redirect-https-port --require-http-scheme --api-max-request-body --dns-cache-timeout --dns-lookup-timeout --dns-max-try --frontend-max-requests --frontend-http2-dump-request-header --frontend-http2-dump-response-header --frontend-frame-debug --daemon --pid-file --user --single-process --max-worker-processes --worker-process-grace-shutdown-period --mruby-file --ignore-per-pattern-mruby-error --frontend-quic-idle-timeout --frontend-quic-debug-log --quic-bpf-program-file --frontend-quic-early-data --frontend-quic-qlog-dir --frontend-quic-require-token --frontend-quic-congestion-controller --frontend-quic-secret-file --quic-server-id --frontend-quic-initial-rtt --no-quic-bpf --frontend-http3-window-size --frontend-http3-connection-window-size --frontend-http3-max-window-size --frontend-http3-max-connection-window-size --frontend-http3-max-concurrent-streams --conf --include --version --help ' -- "$cur" ) )
             ;;
         *)
             _filedir

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/conf.py.in -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/conf.py.in Changed

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

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

@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "Oct 19, 2021" "1.46.0" "nghttp2"
-.SH NAME
-h2load \- HTTP/2 benchmarking tool
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@
 .\" new: \\nrst2man-indent\\nrst2man-indent-level
 .in \\nrst2man-indent\\nrst2man-indent-levelu
 ..
+.TH "H2LOAD" "1" "Feb 13, 2023" "1.52.0" "nghttp2"
+.SH NAME
+h2load \- HTTP/2 benchmarking tool
 .SH SYNOPSIS
 .sp
 \fBh2load\fP OPTIONS... URI...
@@ -99,6 +99,14 @@
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-f, \-\-max\-frame\-size=<SIZE>
+Maximum frame size that the local endpoint is willing to
+receive.
+.sp
+Default: \fB16K\fP
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-w, \-\-window\-bits=<N>
 Sets the stream level initial window size to (2**<N>)\-1.
 For QUIC, <N> is capped to 26 (roughly 64MiB).
@@ -121,10 +129,10 @@
 .INDENT 0.0
 .TP
 .B \-\-ciphers=<SUITE>
-Set  allowed cipher  list  for TLSv1.2  or ealier.   The
+Set  allowed cipher  list  for TLSv1.2  or earlier.   The
 format of the string is described in OpenSSL ciphers(1).
 .sp
-Default: \fBECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:ECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-SHA384:ECDHE\-RSA\-AES256\-SHA384:ECDHE\-ECDSA\-AES128\-SHA256:ECDHE\-RSA\-AES128\-SHA256\fP
+Default: \fBECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:DHE\-RSA\-AES128\-GCM\-SHA256:DHE\-RSA\-AES256\-GCM\-SHA384\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -296,11 +304,10 @@
 .TP
 .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.qlog"  where M is worker ID  and N is
-client ID (e.g. "base.0.3.qlog").
-Only effective in QUIC runs.
+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.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -333,6 +340,11 @@
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-ktls
+Enable ktls.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-v, \-\-verbose
 Output debug information.
 .UNINDENT

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

@@ -73,6 +73,13 @@
 
     Default: ``1``
 
+.. option:: -f, --max-frame-size=<SIZE>
+
+    Maximum frame size that the local endpoint is willing to
+    receive.
+
+    Default: ``16K``
+
 .. option:: -w, --window-bits=<N>
 
     Sets the stream level initial window size to (2\*\*<N>)-1.
@@ -93,10 +100,10 @@
 
 .. option:: --ciphers=<SUITE>
 
-    Set  allowed cipher  list  for TLSv1.2  or ealier.   The
+    Set  allowed cipher  list  for TLSv1.2  or earlier.   The
     format of the string is described in OpenSSL ciphers(1).
 
-    Default: ``ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256``
+    Default: ``ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384``
 
 .. option:: --tls13-ciphers=<SUITE>
 
@@ -251,11 +258,10 @@
 .. option:: --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.qlog"  where M is worker ID  and N is
-    client ID (e.g. "base.0.3.qlog").
-    Only effective in QUIC runs.
+    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.
 
 .. option:: --connect-to=<HOST>:<PORT>
 
@@ -281,6 +287,10 @@
 
     Specify the maximum outgoing UDP datagram payload size.
 
+.. option:: --ktls
+
+    Enable ktls.
+
 .. option:: -v, --verbose
 
     Output debug information.

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

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

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/nghttp2_check_header_value.rst -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_check_header_value.rst Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_check_header_value_rfc9113.rst Added

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/nghttp2_option_set_no_closed_streams.rst -> _service:tar_scm:nghttp2-1.52.0.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_rfc9113_leading_and_trailing_ws_validation.rst Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_option_set_server_fallback_rfc7540_priorities.rst Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_change_extpri_stream_priority.rst Added

@@ -0,0 +1,38 @@
+
+nghttp2_session_change_extpri_stream_priority
+=============================================
+
+Synopsis
+--------
+
+*#include <nghttp2/nghttp2.h>*
+
+.. function:: int nghttp2_session_change_extpri_stream_priority( nghttp2_session *session, int32_t stream_id, const nghttp2_extpri *extpri, int ignore_client_signal)
+
+    
+    Changes the priority of the existing stream denoted by *stream_id*.
+    The new priority is *extpri*.  This function is meant to be used by
+    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
+    `nghttp2_submit_priority_update()` instead.
+    
+    If :member:`extpri->urgency <nghttp2_extpri.urgency>` is out of
+    bound, it is set to :macro:`NGHTTP2_EXTPRI_URGENCY_LOW`.
+    
+    If *ignore_client_signal* is nonzero, server starts to ignore
+    client priority signals for this stream.
+    
+    If
+    :macro:`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`
+        Out of memory.
+    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+        The *session* is initialized as client.
+    :macro:`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.46.0.tar.xz/doc/nghttp2_session_change_stream_priority.rst -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_session_change_stream_priority.rst Changed

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

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

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/doc/nghttp2_submit_priority_update.rst Added

@@ -0,0 +1,42 @@
+
+nghttp2_submit_priority_update
+==============================
+
+Synopsis
+--------
+
+*#include <nghttp2/nghttp2.h>*
+
+.. function:: int nghttp2_submit_priority_update(nghttp2_session *session, uint8_t flags, int32_t stream_id, const uint8_t *field_value, size_t field_value_len)
+
+    
+    Submits PRIORITY_UPDATE frame.
+    
+    PRIORITY_UPDATE frame is a non-critical extension to HTTP/2, and
+    defined in :rfc:`9218#section-7.1`.
+    
+    The *flags* is currently ignored and should be
+    :macro:`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.
+    
+    If
+    :macro:`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`
+        Out of memory
+    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+        The function is called from server side session
+    :macro:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+        The *field_value_len* is larger than 16380; or *stream_id* is
+        0.

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

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

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

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

@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "Oct 19, 2021" "1.46.0" "nghttp2"
-.SH NAME
-nghttpx \- HTTP/2 proxy
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@
 .\" new: \\nrst2man-indent\\nrst2man-indent-level
 .in \\nrst2man-indent\\nrst2man-indent-levelu
 ..
+.TH "NGHTTPX" "1" "Feb 13, 2023" "1.52.0" "nghttp2"
+.SH NAME
+nghttpx \- HTTP/2 proxy
 .SH SYNOPSIS
 .sp
 \fBnghttpx\fP OPTIONS... <PRIVATE_KEY> <CERT>
@@ -209,7 +209,18 @@
 If a request scheme is "https", then Secure attribute is
 set.  Otherwise, it  is not set.  If  <SECURE> is "yes",
 the  Secure attribute  is  always set.   If <SECURE>  is
-"no", the Secure attribute is always omitted.
+"no",   the   Secure   attribute  is   always   omitted.
+"affinity\-cookie\-stickiness=<STICKINESS>"       controls
+stickiness  of   this  affinity.   If   <STICKINESS>  is
+"loose", 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",
+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".
 .sp
 By default, name resolution of backend host name is done
 at  start  up,  or reloading  configuration.   If  "dns"
@@ -672,7 +683,7 @@
 This option  sets cipher suites for  TLSv1.2 or earlier.
 Use \fI\%\-\-tls13\-ciphers\fP for TLSv1.3.
 .sp
-Default: \fBECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:ECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-SHA384:ECDHE\-RSA\-AES256\-SHA384:ECDHE\-ECDSA\-AES128\-SHA256:ECDHE\-RSA\-AES128\-SHA256\fP
+Default: \fBECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:DHE\-RSA\-AES128\-GCM\-SHA256:DHE\-RSA\-AES256\-GCM\-SHA384\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -682,7 +693,7 @@
 This  option  sets  cipher   suites  for  TLSv1.3.   Use
 \fI\%\-\-ciphers\fP for TLSv1.2 or earlier.
 .sp
-Default: \fBTLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256\fP
+Default: \fBTLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -692,7 +703,7 @@
 This option  sets cipher suites for  TLSv1.2 or earlier.
 Use \fI\%\-\-tls13\-client\-ciphers\fP for TLSv1.3.
 .sp
-Default: \fBECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:ECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-SHA384:ECDHE\-RSA\-AES256\-SHA384:ECDHE\-ECDSA\-AES128\-SHA256:ECDHE\-RSA\-AES128\-SHA256\fP
+Default: \fBECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:DHE\-RSA\-AES128\-GCM\-SHA256:DHE\-RSA\-AES256\-GCM\-SHA384\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -702,7 +713,7 @@
 This  option  sets  cipher   suites  for  TLSv1.3.   Use
 \fI\%\-\-tls13\-client\-ciphers\fP for TLSv1.2 or earlier.
 .sp
-Default: \fBTLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256\fP
+Default: \fBTLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1114,6 +1125,12 @@
 .sp
 Default: \fB16K\fP
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-tls\-ktls
+Enable   ktls.    For   server,  ktls   is   enable   if
+\fI\%\-\-tls\-session\-cache\-memcached\fP is not configured.
+.UNINDENT
 .SS HTTP/2
 .INDENT 0.0
 .TP
@@ -1517,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\(aq
+Example: \fI\%\-\-altsvc\fP="h2,443,,,ma=3600; persist=1"
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1614,6 +1631,16 @@
 .sp
 Default: \fB443\fP
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-require\-http\-scheme
+Always require http or https scheme in HTTP request.  It
+also  requires that  https scheme  must be  used for  an
+encrypted  connection.  Otherwise,  http scheme  must be
+used.   This   option  is   recommended  for   a  server
+deployment which directly faces clients and the services
+it provides only require http or https scheme.
+.UNINDENT
 .SS API
 .INDENT 0.0
 .TP
@@ -1792,7 +1819,7 @@
 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
-".qlog".
+".sqlog".
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1805,8 +1832,8 @@
 .TP
 .B \-\-frontend\-quic\-congestion\-controller=<CC>
 Specify a congestion controller algorithm for a frontend
-QUIC  connection.   <CC>  should be  either  "cubic"  or
-"bbr".
+QUIC connection.  <CC> should  be one of "cubic", "bbr",
+and "bbr2".
 .sp
 Default: \fBcubic\fP
 .UNINDENT

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

@@ -193,7 +193,18 @@
     If a request scheme is "https", then Secure attribute is
     set.  Otherwise, it  is not set.  If  <SECURE> is "yes",
     the  Secure attribute  is  always set.   If <SECURE>  is
-    "no", the Secure attribute is always omitted.
+    "no",   the   Secure   attribute  is   always   omitted.
+    "affinity-cookie-stickiness=<STICKINESS>"       controls
+    stickiness  of   this  affinity.   If   <STICKINESS>  is
+    "loose", 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",
+    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".
 
     By default, name resolution of backend host name is done
     at  start  up,  or reloading  configuration.   If  "dns"
@@ -628,7 +639,7 @@
     This option  sets cipher suites for  TLSv1.2 or earlier.
     Use :option:`--tls13-ciphers` for TLSv1.3.
 
-    Default: ``ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256``
+    Default: ``ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384``
 
 .. option:: --tls13-ciphers=<SUITE>
 
@@ -637,7 +648,7 @@
     This  option  sets  cipher   suites  for  TLSv1.3.   Use
     :option:`--ciphers` for TLSv1.2 or earlier.
 
-    Default: ``TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256``
+    Default: ``TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256``
 
 .. option:: --client-ciphers=<SUITE>
 
@@ -646,7 +657,7 @@
     This option  sets cipher suites for  TLSv1.2 or earlier.
     Use :option:`--tls13-client-ciphers` for TLSv1.3.
 
-    Default: ``ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256``
+    Default: ``ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384``
 
 .. option:: --tls13-client-ciphers=<SUITE>
 
@@ -655,7 +666,7 @@
     This  option  sets  cipher   suites  for  TLSv1.3.   Use
     :option:`--tls13-client-ciphers` for TLSv1.2 or earlier.
 
-    Default: ``TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256``
+    Default: ``TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256``
 
 .. option:: --ecdh-curves=<LIST>
 
@@ -1026,6 +1037,11 @@
 
     Default: ``16K``
 
+.. option:: --tls-ktls
+
+    Enable   ktls.    For   server,  ktls   is   enable   if
+    :option:`--tls-session-cache-memcached` is not configured.
+
 
 HTTP/2
 ~~~~~~
@@ -1376,7 +1392,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: :option:`--altsvc`\="h2,443,,,ma=3600; persist=1'
+    Example: :option:`--altsvc`\="h2,443,,,ma=3600; persist=1"
 
 .. option:: --http2-altsvc=<PROTOID,PORT,HOST,ORIGIN,PARAMS>
 
@@ -1462,6 +1478,15 @@
 
     Default: ``443``
 
+.. option:: --require-http-scheme
+
+    Always require http or https scheme in HTTP request.  It
+    also  requires that  https scheme  must be  used for  an
+    encrypted  connection.  Otherwise,  http scheme  must be
+    used.   This   option  is   recommended  for   a  server
+    deployment which directly faces clients and the services
+    it provides only require http or https scheme.
+
 
 API
 ~~~
@@ -1637,7 +1662,7 @@
     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
-    ".qlog".
+    ".sqlog".
 
 .. option:: --frontend-quic-require-token
 
@@ -1648,8 +1673,8 @@
 .. option:: --frontend-quic-congestion-controller=<CC>
 
     Specify a congestion controller algorithm for a frontend
-    QUIC  connection.   <CC>  should be  either  "cubic"  or
-    "bbr".
+    QUIC connection.  <CC> should  be one of "cubic", "bbr",
+    and "bbr2".
 
     Default: ``cubic``

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/programmers-guide.rst -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/programmers-guide.rst Changed

@@ -479,3 +479,48 @@
 When ALTSVC is received, :type:`nghttp2_on_frame_recv_callback` will
 be called as usual.
 
+Stream priorities
+-----------------
+
+By default, the stream prioritization scheme described in :rfc:`7540`
+is used.  This scheme has been formally deprecated by :rfc:`9113`.  In
+order to disable it, send
+:enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES` of
+value of 1 via `nghttp2_submit_settings()`.  This settings ID is
+defined by :rfc:`9218`.  The sender of this settings value disables
+RFC 7540 priorities, and instead it enables RFC 9218 Extensible
+Prioritization Scheme.  This new prioritization scheme has 2 methods
+to convey the stream priorities to a remote endpoint: Priority header
+field and PRIORITY_UPDATE frame.  nghttp2 supports both methods.  In
+order to receive and process PRIORITY_UPDATE frame, server has to call
+``nghttp2_option_set_builtin_recv_extension_type(option,
+NGHTTP2_PRIORITY_UPDATE)`` (see the above section), and pass the
+option to `nghttp2_session_server_new2()` or
+`nghttp2_session_server_new3()` to create a server session.  Client
+can send Priority header field via `nghttp2_submit_request()`.  It can
+also send PRIORITY_UPDATE frame via
+`nghttp2_submit_priority_update()`.  Server processes Priority header
+field in a request header field and updates the stream priority unless
+HTTP messaging rule enforcement is disabled (see
+`nghttp2_option_set_no_http_messaging()`).
+
+For the purpose of smooth migration from RFC 7540 priorities, client
+is advised to send
+:enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES` of
+value of 1.  Until it receives the first server SETTINGS frame, it can
+send both RFC 7540 and RFC 9128 priority signals.  If client receives
+SETTINGS_NO_RFC7540_PRIORITIES of value of 0, or it is omitted ,
+client stops sending PRIORITY_UPDATE frame.  Priority header field
+will be sent in anyway since it is an end-to-end signal.  If
+SETTINGS_NO_RFC7540_PRIORITIES of value of 1 is received, client stops
+sending RFC 7540 priority signals.  This is the advice described in
+:rfc:`9218#section-2.1.1`.
+
+Server has an optional mechanism to fallback to RFC 7540 priorities.
+By default, if server sends SETTINGS_NO_RFC7540_PRIORITIES of value of
+1, it completely disables RFC 7540 priorities and no fallback.  By
+setting nonzero value to
+`nghttp2_option_set_server_fallback_rfc7540_priorities()`, server
+falls back to RFC 7540 priorities if it sends
+SETTINGS_NO_RFC7540_PRIORITIES value of value of 1, and client omits
+SETTINGS_NO_RFC7540_PRIORITIES in its SETTINGS frame.

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/sources/building-android-binary.rst -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/sources/building-android-binary.rst Changed

@@ -2,49 +2,39 @@
 =======================
 
 In this article, we briefly describe how to build Android binary using
-`Android NDK <https://developer.android.com/ndk/index.html>`_
-cross-compiler on Debian Linux.
+`Android NDK <https://developer.android.com/ndk>`_ cross-compiler on
+Debian Linux.
 
 The easiest way to build android binary is use Dockerfile.android.
 See Dockerfile.android for more details.  If you cannot use
 Dockerfile.android for whatever reason, continue to read the rest of
 this article.
 
-We offer ``android-config`` and ``android-make`` scripts to make the
-build easier.  To make these script work, NDK toolchain must be
-installed in the following way.  First, let us introduce
-``ANDROID_HOME`` environment variable.  We need to install toolchain
-under ``$ANDROID_HOME/toolchain``.  An user can freely choose the path
-for ``ANDROID_HOME``.  For example, to install toolchain under
-``$ANDROID_HOME/toolchain``, do this in the the directory where NDK is
-unpacked:
+We offer ``android-config`` script to make the build easier.  To make
+the script work, NDK directory must be set to ``NDK`` environment
+variable.  NDK directory is the directory where NDK is unpacked:
 
 .. code-block:: text
 
-    $ build/tools/make_standalone_toolchain.py \
-      --arch arm --api 16 --stl gnustl \
-      --install-dir $ANDROID_HOME/toolchain
-
-The API level (``--api``) is not important here because we don't use
-Android specific C/C++ API.
+    $ unzip android-ndk-$NDK_VERSION-linux.zip
+    $ cd android-ndk-$NDK_VERSION
+    $ export NDK=$PWD
 
 The dependent libraries, such as OpenSSL, libev, and c-ares should be
-built with the toolchain and installed under
-``$ANDROID_HOME/usr/local``.  We recommend to build these libraries as
-static library to make the deployment easier.  libxml2 support is
-currently disabled.
+built with the same NDK toolchain and installed under
+``$NDK/usr/local``.  We recommend to build these libraries as static
+library to make the deployment easier.  libxml2 support is currently
+disabled.
 
 Although zlib comes with Android NDK, it seems not to be a part of
 public API, so we have to built it for our own.  That also provides us
 proper .pc file as a bonus.
 
-Before running ``android-config`` and ``android-make``,
-``ANDROID_HOME`` environment variable must be set to point to the
-correct path.  Also add ``$ANDROID_HOME/toolchain/bin`` to ``PATH``:
-
-.. code-block:: text
+Before running ``android-config``, ``NDK`` environment variable must
+be set to point to the correct path.
 
-    $ export PATH=$PATH:$ANDROID_HOME/toolchain/bin
+You need to set ``NGHTTP2`` environment variable to the absolute path
+to the source directory of nghttp2.
 
 To configure OpenSSL, use the following script:
 
@@ -52,39 +42,36 @@
 
     #!/bin/sh
 
-    if  -z "$ANDROID_HOME" ; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
+    . $NGHTTP2/android-env
 
-    export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi-
-    ./Configure --prefix=$PREFIX android
+    export ANDROID_NDK_HOME=$NDK
+    export PATH=$TOOLCHAIN/bin:$PATH
 
-And run ``make install_sw`` to build and install without
-documentation.
+    ./Configure no-shared --prefix=$PREFIX android-arm64
 
-We cannot compile libev without modification.  Apply `this patch
-<https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed>`_ before
-configuring libev.  This patch is for libev-4.19.  After applying the
-patch, to configure libev, use the following script:
+And run the following script to build and install without
+documentation:
 
 .. code-block:: sh
 
     #!/bin/sh
 
-    if  -z "$ANDROID_HOME" ; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
+    . $NGHTTP2/android-env
+
+    export PATH=$TOOLCHAIN/bin:$PATH
+
+    make install_sw
+
+To configure libev, use the following script:
+
+.. code-block:: sh
+
+    #!/bin/sh
+
+    . $NGHTTP2/android-env
 
     ./configure \
-        --host=arm-linux-androideabi \
+        --host=$TARGET \
         --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
         --prefix=$PREFIX \
         --disable-shared \
@@ -100,41 +87,26 @@
 
     #!/bin/sh -e
 
-    if  -z "$ANDROID_HOME" ; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
+    . $NGHTTP2/android-env
 
     ./configure \
-        --host=arm-linux-androideabi \
+        --host=$TARGET \
         --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
         --prefix=$PREFIX \
         --disable-shared
 
+And run ``make install`` to build and install.
+
 To configure zlib, use the following script:
 
 .. code-block:: sh
 
     #!/bin/sh -e
 
-    if  -z "$ANDROID_HOME" ; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    HOST=arm-linux-androideabi
-
-    CC=$HOST-gcc \
-    AR=$HOST-ar \
-    LD=$HOST-ld \
-    RANLIB=$HOST-ranlib \
-    STRIP=$HOST-strip \
+    . $NGHTTP2/android-env
+
+    export HOST=$TARGET
+
     ./configure \
         --prefix=$PREFIX \
         --libdir=$PREFIX/lib \
@@ -144,7 +116,7 @@
 And run ``make install`` to build and install.
 
 After prerequisite libraries are prepared, run ``android-config`` and
-then ``android-make`` to compile nghttp2 source files.
+then ``make`` to compile nghttp2 source files.
 
 If all went well, application binaries, such as nghttpx, are created
 under src directory.  Strip debugging information from the binary
@@ -152,4 +124,4 @@
 
 .. code-block:: text
 
-    $ arm-linux-androideabi-strip src/nghttpx
+    $ $NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip src/nghttpx

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/sources/contribute.rst -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/sources/contribute.rst Changed

@@ -26,7 +26,7 @@
 We use clang-format to format source code consistently.  The
 clang-format configuration file .clang-format is located at the root
 directory.  Since clang-format produces slightly different results
-between versions, we currently use clang-format-12.
+between versions, we currently use clang-format-14.
 
 To detect any violation to the coding style, we recommend to setup git
 pre-commit hook to check coding style of the changes you introduced.
@@ -34,13 +34,13 @@
 .git/hooks and make sure that it is executable.  The pre-commit script
 uses clang-format-diff.py to detect any style errors.  If it is not in
 your PATH or it exists under different name (e.g.,
-clang-format-diff-12 in debian), either add it to PATH variable or add
+clang-format-diff-14 in debian), either add it to PATH variable or add
 git option ``clangformatdiff.binary`` to point to the script.
 
 For emacs users, integrating clang-format to emacs is very easy.
 clang-format.el should come with clang distribution.  If it is not
 found, download it from `here
-<https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format/clang-format.el>`_.
+<https://github.com/llvm/llvm-project/blob/main/clang/tools/clang-format/clang-format.el>`_.
 And add these lines to your .emacs file:
 
 .. code-block:: lisp

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/sources/index.rst -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/sources/index.rst Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/doc/sources/nghttpx-howto.rst -> _service:tar_scm:nghttp2-1.52.0.tar.xz/doc/sources/nghttpx-howto.rst Changed

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

@@ -545,12 +545,6 @@
     respectively.  The header name/value pairs are emitted via
     :type:`nghttp2_on_header_callback`.
     
-    For HEADERS, PUSH_PROMISE and DATA frames, this callback may be
-    called after stream is closed (see
-    :type:`nghttp2_on_stream_close_callback`).  The application should
-    check that stream is still alive using its own stream management or
-    :func:`nghttp2_session_get_stream_user_data()`.
-    
     Only HEADERS and DATA frame can signal the end of incoming data.
     If ``frame->hd.flags & NGHTTP2_FLAG_END_STREAM`` is nonzero, the
     *frame* is the last frame from the remote peer in this stream.
@@ -1203,6 +1197,25 @@
     this structure are intentionally hidden from the public API.
 
 
+.. type:: nghttp2_extpri
+
+    
+    :type:`nghttp2_extpri` is :rfc:`9218` extensible priorities
+    specification for a stream.
+
+    .. member::   uint32_t urgency
+
+        :member:`urgency` is the urgency of a stream, it must be in
+        :macro:`NGHTTP2_EXTPRI_URGENCY_HIGH`,
+        :macro:`NGHTTP2_EXTPRI_URGENCY_LOW`, inclusive, and 0 is the
+        highest urgency.
+    .. member::   int inc
+
+        :member:`inc` indicates that a content can be processed
+        incrementally or not.  If inc is 0, it cannot be processed
+        incrementally.  If inc is 1, it can be processed incrementally.
+        Other value is not permitted.
+
 .. type:: nghttp2_ext_altsvc
 
     
@@ -1265,6 +1278,29 @@
 
         The pointer to the array of origins contained in ORIGIN frame.
 
+.. type:: nghttp2_ext_priority_update
+
+    
+    The payload of PRIORITY_UPDATE frame.  PRIORITY_UPDATE frame is a
+    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`,
+    ``nghttp2_extension.payload`` will point to this struct.
+    
+    It has the following members:
+
+    .. member::   int32_t stream_id
+
+        The stream ID of the stream whose priority is updated.
+    .. member::   uint8_t *field_value
+
+        The pointer to Priority field value.  It is not necessarily
+        NULL-terminated.
+    .. member::   size_t field_value_len
+
+        The length of the :member:`field_value`.
+
 .. type:: nghttp2_hd_deflater

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

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

@@ -30,7 +30,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes \
-	-I$(top_srcdir)/src/includes \
 	-I$(top_srcdir)/third-party \
 	@LIBEVENT_OPENSSL_CFLAGS@ \
 	@OPENSSL_CFLAGS@ \
@@ -52,40 +51,4 @@
 
 deflate_SOURCES = deflate.c
 
-if ENABLE_ASIO_LIB
-
-noinst_PROGRAMS += asio-sv asio-sv2 asio-cl asio-cl2
-
-# AM_CPPFLAGS must be placed first, so that header file (e.g.,
-# nghttp2/nghttp2.h) in this package is used rather than installed
-# one.
-ASIOCPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
-ASIOLDADD = $(top_builddir)/lib/libnghttp2.la \
-	$(top_builddir)/src/libnghttp2_asio.la @JEMALLOC_LIBS@ \
-	$(top_builddir)/third-party/liburl-parser.la \
-	@OPENSSL_LIBS@ \
-	${BOOST_LDFLAGS} \
-	${BOOST_ASIO_LIB} \
-	${BOOST_THREAD_LIB} \
-	${BOOST_SYSTEM_LIB} \
-	@APPLDFLAGS@
-
-asio_sv_SOURCES = asio-sv.cc
-asio_sv_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_sv_LDADD = ${ASIOLDADD}
-
-asio_sv2_SOURCES = asio-sv2.cc
-asio_sv2_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_sv2_LDADD = ${ASIOLDADD}
-
-asio_cl_SOURCES = asio-cl.cc
-asio_cl_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_cl_LDADD = ${ASIOLDADD}
-
-asio_cl2_SOURCES = asio-cl2.cc
-asio_cl2_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_cl2_LDADD = ${ASIOLDADD}
-
-endif # ENABLE_ASIO_LIB
-
 endif # ENABLE_EXAMPLES

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -115,17 +115,11 @@
 @ENABLE_EXAMPLES_TRUE@noinst_PROGRAMS = client$(EXEEXT) \
 @ENABLE_EXAMPLES_TRUE@	libevent-client$(EXEEXT) \
 @ENABLE_EXAMPLES_TRUE@	libevent-server$(EXEEXT) \
-@ENABLE_EXAMPLES_TRUE@	deflate$(EXEEXT) $(am__EXEEXT_1)
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__append_1 = asio-sv asio-sv2 asio-cl asio-cl2
+@ENABLE_EXAMPLES_TRUE@	deflate$(EXEEXT)
 subdir = examples
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -136,40 +130,7 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__EXEEXT_1 =  \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	asio-sv$(EXEEXT) \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	asio-sv2$(EXEEXT) \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	asio-cl$(EXEEXT) \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	asio-cl2$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
-am__asio_cl_SOURCES_DIST = asio-cl.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am_asio_cl_OBJECTS = asio_cl-asio-cl.$(OBJEXT)
-asio_cl_OBJECTS = $(am_asio_cl_OBJECTS)
-am__DEPENDENCIES_1 =
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/lib/libnghttp2.la \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(top_builddir)/src/libnghttp2_asio.la \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(top_builddir)/third-party/liburl-parser.la \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(am__DEPENDENCIES_1)
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl_DEPENDENCIES = $(am__DEPENDENCIES_2)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-am__asio_cl2_SOURCES_DIST = asio-cl2.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am_asio_cl2_OBJECTS = asio_cl2-asio-cl2.$(OBJEXT)
-asio_cl2_OBJECTS = $(am_asio_cl2_OBJECTS)
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl2_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am__asio_sv_SOURCES_DIST = asio-sv.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am_asio_sv_OBJECTS = asio_sv-asio-sv.$(OBJEXT)
-asio_sv_OBJECTS = $(am_asio_sv_OBJECTS)
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am__asio_sv2_SOURCES_DIST = asio-sv2.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am_asio_sv2_OBJECTS = asio_sv2-asio-sv2.$(OBJEXT)
-asio_sv2_OBJECTS = $(am_asio_sv2_OBJECTS)
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__client_SOURCES_DIST = client.c
 @ENABLE_EXAMPLES_TRUE@am_client_OBJECTS = client.$(OBJEXT)
 client_OBJECTS = $(am_client_OBJECTS)
@@ -177,6 +138,10 @@
 @ENABLE_EXAMPLES_TRUE@client_DEPENDENCIES =  \
 @ENABLE_EXAMPLES_TRUE@	$(top_builddir)/lib/libnghttp2.la \
 @ENABLE_EXAMPLES_TRUE@	$(top_builddir)/third-party/liburl-parser.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 am__deflate_SOURCES_DIST = deflate.c
 @ENABLE_EXAMPLES_TRUE@am_deflate_OBJECTS = deflate.$(OBJEXT)
 deflate_OBJECTS = $(am_deflate_OBJECTS)
@@ -215,12 +180,8 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/asio_cl-asio-cl.Po \
-	./$(DEPDIR)/asio_cl2-asio-cl2.Po \
-	./$(DEPDIR)/asio_sv-asio-sv.Po \
-	./$(DEPDIR)/asio_sv2-asio-sv2.Po ./$(DEPDIR)/client.Po \
-	./$(DEPDIR)/deflate.Po ./$(DEPDIR)/libevent-client.Po \
-	./$(DEPDIR)/libevent-server.Po
+am__depfiles_remade = ./$(DEPDIR)/client.Po ./$(DEPDIR)/deflate.Po \
+	./$(DEPDIR)/libevent-client.Po ./$(DEPDIR)/libevent-server.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -240,31 +201,9 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(asio_cl_SOURCES) $(asio_cl2_SOURCES) $(asio_sv_SOURCES) \
-	$(asio_sv2_SOURCES) $(client_SOURCES) $(deflate_SOURCES) \
+SOURCES = $(client_SOURCES) $(deflate_SOURCES) \
 	$(libevent_client_SOURCES) $(libevent_server_SOURCES)
-DIST_SOURCES = $(am__asio_cl_SOURCES_DIST) \
-	$(am__asio_cl2_SOURCES_DIST) $(am__asio_sv_SOURCES_DIST) \
-	$(am__asio_sv2_SOURCES_DIST) $(am__client_SOURCES_DIST) \
-	$(am__deflate_SOURCES_DIST) \
+DIST_SOURCES = $(am__client_SOURCES_DIST) $(am__deflate_SOURCES_DIST) \
 	$(am__libevent_client_SOURCES_DIST) \
 	$(am__libevent_server_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -300,11 +239,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -321,7 +255,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -337,6 +270,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -405,15 +339,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -496,7 +424,6 @@
 @ENABLE_EXAMPLES_TRUE@AM_CPPFLAGS = \
 @ENABLE_EXAMPLES_TRUE@	-I$(top_srcdir)/lib/includes \
 @ENABLE_EXAMPLES_TRUE@	-I$(top_builddir)/lib/includes \
-@ENABLE_EXAMPLES_TRUE@	-I$(top_srcdir)/src/includes \
 @ENABLE_EXAMPLES_TRUE@	-I$(top_srcdir)/third-party \
 @ENABLE_EXAMPLES_TRUE@	@LIBEVENT_OPENSSL_CFLAGS@ \
 @ENABLE_EXAMPLES_TRUE@	@OPENSSL_CFLAGS@ \
@@ -513,37 +440,10 @@
 @ENABLE_EXAMPLES_TRUE@libevent_client_SOURCES = libevent-client.c
 @ENABLE_EXAMPLES_TRUE@libevent_server_SOURCES = libevent-server.c
 @ENABLE_EXAMPLES_TRUE@deflate_SOURCES = deflate.c
-
-# AM_CPPFLAGS must be placed first, so that header file (e.g.,
-# nghttp2/nghttp2.h) in this package is used rather than installed
-# one.
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOCPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD = $(top_builddir)/lib/libnghttp2.la \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(top_builddir)/src/libnghttp2_asio.la @JEMALLOC_LIBS@ \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	$(top_builddir)/third-party/liburl-parser.la \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	@OPENSSL_LIBS@ \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	${BOOST_LDFLAGS} \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	${BOOST_ASIO_LIB} \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	${BOOST_THREAD_LIB} \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	${BOOST_SYSTEM_LIB} \
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@	@APPLDFLAGS@
-
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv_SOURCES = asio-sv.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv_CPPFLAGS = ${ASIOCPPFLAGS}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv_LDADD = ${ASIOLDADD}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv2_SOURCES = asio-sv2.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv2_CPPFLAGS = ${ASIOCPPFLAGS}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_sv2_LDADD = ${ASIOLDADD}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl_SOURCES = asio-cl.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl_CPPFLAGS = ${ASIOCPPFLAGS}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl_LDADD = ${ASIOLDADD}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl2_SOURCES = asio-cl2.cc
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl2_CPPFLAGS = ${ASIOCPPFLAGS}
-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@asio_cl2_LDADD = ${ASIOLDADD}
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .lo .o .obj
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -583,22 +483,6 @@
 	echo " rm -f" $$list; \
 	rm -f $$list
 
-asio-cl$(EXEEXT): $(asio_cl_OBJECTS) $(asio_cl_DEPENDENCIES) $(EXTRA_asio_cl_DEPENDENCIES) 
-	@rm -f asio-cl$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(asio_cl_OBJECTS) $(asio_cl_LDADD) $(LIBS)
-
-asio-cl2$(EXEEXT): $(asio_cl2_OBJECTS) $(asio_cl2_DEPENDENCIES) $(EXTRA_asio_cl2_DEPENDENCIES) 
-	@rm -f asio-cl2$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(asio_cl2_OBJECTS) $(asio_cl2_LDADD) $(LIBS)
-
-asio-sv$(EXEEXT): $(asio_sv_OBJECTS) $(asio_sv_DEPENDENCIES) $(EXTRA_asio_sv_DEPENDENCIES) 
-	@rm -f asio-sv$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(asio_sv_OBJECTS) $(asio_sv_LDADD) $(LIBS)
-
-asio-sv2$(EXEEXT): $(asio_sv2_OBJECTS) $(asio_sv2_DEPENDENCIES) $(EXTRA_asio_sv2_DEPENDENCIES) 
-	@rm -f asio-sv2$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(asio_sv2_OBJECTS) $(asio_sv2_LDADD) $(LIBS)
-
 client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES) $(EXTRA_client_DEPENDENCIES) 
 	@rm -f client$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS)
@@ -621,10 +505,6 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asio_cl-asio-cl.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asio_cl2-asio-cl2.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asio_sv-asio-sv.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asio_sv2-asio-sv2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libevent-client.Po@am__quote@ # am--include-marker
@@ -660,86 +540,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-.cc.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-asio_cl-asio-cl.o: asio-cl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_cl-asio-cl.o -MD -MP -MF $(DEPDIR)/asio_cl-asio-cl.Tpo -c -o asio_cl-asio-cl.o `test -f 'asio-cl.cc' || echo '$(srcdir)/'`asio-cl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_cl-asio-cl.Tpo $(DEPDIR)/asio_cl-asio-cl.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-cl.cc' object='asio_cl-asio-cl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_cl-asio-cl.o `test -f 'asio-cl.cc' || echo '$(srcdir)/'`asio-cl.cc
-
-asio_cl-asio-cl.obj: asio-cl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_cl-asio-cl.obj -MD -MP -MF $(DEPDIR)/asio_cl-asio-cl.Tpo -c -o asio_cl-asio-cl.obj `if test -f 'asio-cl.cc'; then $(CYGPATH_W) 'asio-cl.cc'; else $(CYGPATH_W) '$(srcdir)/asio-cl.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_cl-asio-cl.Tpo $(DEPDIR)/asio_cl-asio-cl.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-cl.cc' object='asio_cl-asio-cl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_cl-asio-cl.obj `if test -f 'asio-cl.cc'; then $(CYGPATH_W) 'asio-cl.cc'; else $(CYGPATH_W) '$(srcdir)/asio-cl.cc'; fi`
-
-asio_cl2-asio-cl2.o: asio-cl2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_cl2-asio-cl2.o -MD -MP -MF $(DEPDIR)/asio_cl2-asio-cl2.Tpo -c -o asio_cl2-asio-cl2.o `test -f 'asio-cl2.cc' || echo '$(srcdir)/'`asio-cl2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_cl2-asio-cl2.Tpo $(DEPDIR)/asio_cl2-asio-cl2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-cl2.cc' object='asio_cl2-asio-cl2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_cl2-asio-cl2.o `test -f 'asio-cl2.cc' || echo '$(srcdir)/'`asio-cl2.cc
-
-asio_cl2-asio-cl2.obj: asio-cl2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_cl2-asio-cl2.obj -MD -MP -MF $(DEPDIR)/asio_cl2-asio-cl2.Tpo -c -o asio_cl2-asio-cl2.obj `if test -f 'asio-cl2.cc'; then $(CYGPATH_W) 'asio-cl2.cc'; else $(CYGPATH_W) '$(srcdir)/asio-cl2.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_cl2-asio-cl2.Tpo $(DEPDIR)/asio_cl2-asio-cl2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-cl2.cc' object='asio_cl2-asio-cl2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_cl2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_cl2-asio-cl2.obj `if test -f 'asio-cl2.cc'; then $(CYGPATH_W) 'asio-cl2.cc'; else $(CYGPATH_W) '$(srcdir)/asio-cl2.cc'; fi`
-
-asio_sv-asio-sv.o: asio-sv.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_sv-asio-sv.o -MD -MP -MF $(DEPDIR)/asio_sv-asio-sv.Tpo -c -o asio_sv-asio-sv.o `test -f 'asio-sv.cc' || echo '$(srcdir)/'`asio-sv.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_sv-asio-sv.Tpo $(DEPDIR)/asio_sv-asio-sv.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-sv.cc' object='asio_sv-asio-sv.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_sv-asio-sv.o `test -f 'asio-sv.cc' || echo '$(srcdir)/'`asio-sv.cc
-
-asio_sv-asio-sv.obj: asio-sv.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_sv-asio-sv.obj -MD -MP -MF $(DEPDIR)/asio_sv-asio-sv.Tpo -c -o asio_sv-asio-sv.obj `if test -f 'asio-sv.cc'; then $(CYGPATH_W) 'asio-sv.cc'; else $(CYGPATH_W) '$(srcdir)/asio-sv.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_sv-asio-sv.Tpo $(DEPDIR)/asio_sv-asio-sv.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-sv.cc' object='asio_sv-asio-sv.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_sv-asio-sv.obj `if test -f 'asio-sv.cc'; then $(CYGPATH_W) 'asio-sv.cc'; else $(CYGPATH_W) '$(srcdir)/asio-sv.cc'; fi`
-
-asio_sv2-asio-sv2.o: asio-sv2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_sv2-asio-sv2.o -MD -MP -MF $(DEPDIR)/asio_sv2-asio-sv2.Tpo -c -o asio_sv2-asio-sv2.o `test -f 'asio-sv2.cc' || echo '$(srcdir)/'`asio-sv2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_sv2-asio-sv2.Tpo $(DEPDIR)/asio_sv2-asio-sv2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-sv2.cc' object='asio_sv2-asio-sv2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_sv2-asio-sv2.o `test -f 'asio-sv2.cc' || echo '$(srcdir)/'`asio-sv2.cc
-
-asio_sv2-asio-sv2.obj: asio-sv2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asio_sv2-asio-sv2.obj -MD -MP -MF $(DEPDIR)/asio_sv2-asio-sv2.Tpo -c -o asio_sv2-asio-sv2.obj `if test -f 'asio-sv2.cc'; then $(CYGPATH_W) 'asio-sv2.cc'; else $(CYGPATH_W) '$(srcdir)/asio-sv2.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asio_sv2-asio-sv2.Tpo $(DEPDIR)/asio_sv2-asio-sv2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio-sv2.cc' object='asio_sv2-asio-sv2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(asio_sv2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asio_sv2-asio-sv2.obj `if test -f 'asio-sv2.cc'; then $(CYGPATH_W) 'asio-sv2.cc'; else $(CYGPATH_W) '$(srcdir)/asio-sv2.cc'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -870,11 +670,7 @@
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/asio_cl-asio-cl.Po
-	-rm -f ./$(DEPDIR)/asio_cl2-asio-cl2.Po
-	-rm -f ./$(DEPDIR)/asio_sv-asio-sv.Po
-	-rm -f ./$(DEPDIR)/asio_sv2-asio-sv2.Po
-	-rm -f ./$(DEPDIR)/client.Po
+		-rm -f ./$(DEPDIR)/client.Po
 	-rm -f ./$(DEPDIR)/deflate.Po
 	-rm -f ./$(DEPDIR)/libevent-client.Po
 	-rm -f ./$(DEPDIR)/libevent-server.Po
@@ -923,11 +719,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/asio_cl-asio-cl.Po
-	-rm -f ./$(DEPDIR)/asio_cl2-asio-cl2.Po
-	-rm -f ./$(DEPDIR)/asio_sv-asio-sv.Po
-	-rm -f ./$(DEPDIR)/asio_sv2-asio-sv2.Po
-	-rm -f ./$(DEPDIR)/client.Po
+		-rm -f ./$(DEPDIR)/client.Po
 	-rm -f ./$(DEPDIR)/deflate.Po
 	-rm -f ./$(DEPDIR)/libevent-client.Po
 	-rm -f ./$(DEPDIR)/libevent-server.Po

_service:tar_scm:nghttp2-1.46.0.tar.xz/integration-tests/Makefile.am -> _service:tar_scm:nghttp2-1.52.0.tar.xz/integration-tests/Makefile.am Changed

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -111,15 +111,11 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+@ENABLE_HTTP3_TRUE@am__append_1 = quic
 subdir = integration-tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -162,11 +158,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -183,7 +174,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -199,6 +189,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -267,15 +258,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -355,6 +340,7 @@
 GO_FILES = \
 	nghttpx_http1_test.go \
 	nghttpx_http2_test.go \
+	nghttpx_http3_test.go \
 	server_tester.go
 
 EXTRA_DIST = \
@@ -370,6 +356,7 @@
 	req-return.rb \
 	resp-return.rb
 
+GO_TEST_TAGS = $(am__append_1)
 all: all-am
 
 .SUFFIXES:
@@ -570,7 +557,7 @@
 
 it:
 	for i in $(GO_FILES); do  -e $(builddir)/$$i  || cp $(srcdir)/$$i $(builddir); done
-	sh setenv go test -v
+	sh setenv go test -v --tags=${GO_TEST_TAGS}
 
 # 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.

_service:tar_scm:nghttp2-1.46.0.tar.xz/integration-tests/config.go.in -> _service:tar_scm:nghttp2-1.52.0.tar.xz/integration-tests/config.go.in Changed

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

@@ -5,19 +5,20 @@
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/websocket"
 	"io"
 	"net/http"
 	"regexp"
 	"syscall"
 	"testing"
 	"time"
+
+	"golang.org/x/net/http2/hpack"
+	"golang.org/x/net/websocket"
 )
 
 // TestH1H1PlainGET tests whether simple HTTP/1 GET request works.
 func TestH1H1PlainGET(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -27,16 +28,15 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	want := 200
-	if got := res.status; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
 
 // TestH1H1PlainGETClose tests whether simple HTTP/1 GET request with
-// Connetion: close request header field works.
+// Connection: close request header field works.
 func TestH1H1PlainGETClose(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -49,8 +49,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	want := 200
-	if got := res.status; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -58,9 +57,12 @@
 // TestH1H1InvalidMethod tests that server rejects invalid method with
 // 501 status code
 func TestH1H1InvalidMethod(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -71,7 +73,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 501; got != want {
+	if got, want := res.status, http.StatusNotImplemented; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -79,18 +81,16 @@
 // TestH1H1MultipleRequestCL tests that server rejects request which
 // contains multiple Content-Length header fields.
 func TestH1H1MultipleRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward bad request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	if _, err := io.WriteString(st.conn, fmt.Sprintf(`GET / HTTP/1.1
-Host: %v
-Test-Case: TestH1H1MultipleRequestCL
-Content-Length: 0
-Content-Length: 0
-
-`, st.authority)); err != nil {
+	if _, err := io.WriteString(st.conn, fmt.Sprintf("GET / HTTP/1.1\r\nHost: %v\r\nTest-Case: TestH1H1MultipleRequestCL\r\nContent-Length: 0\r\nContent-Length: 0\r\n\r\n",
+		st.authority)); err != nil {
 		t.Fatalf("Error io.WriteString() = %v", err)
 	}
 
@@ -99,8 +99,9 @@
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
 
-	want := 400
-	if got := resp.StatusCode; got != want {
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusBadRequest; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -108,7 +109,7 @@
 // // TestH1H1ConnectFailure tests that server handles the situation that
 // // connection attempt to HTTP/1 backend failed.
 // func TestH1H1ConnectFailure(t *testing.T) {
-// 	st := newServerTester(nil, t, noopHandler)
+// 	st := newServerTester(t, options{})
 // 	defer st.Close()
 
 // 	// shutdown backend server to simulate backend connect failure
@@ -129,7 +130,10 @@
 // TestH1H1AffinityCookie tests that affinity cookie is sent back in
 // cleartext http.
 func TestH1H1AffinityCookie(t *testing.T) {
-	st := newServerTester(string{"--affinity-cookie"}, t, noopHandler)
+	opts := options{
+		args: string{"--affinity-cookie"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -139,7 +143,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -153,7 +157,11 @@
 // TestH1H1AffinityCookieTLS tests that affinity cookie is sent back
 // in https.
 func TestH1H1AffinityCookieTLS(t *testing.T) {
-	st := newServerTesterTLS(string{"--alpn-h1", "--affinity-cookie"}, t, noopHandler)
+	opts := options{
+		args: string{"--alpn-h1", "--affinity-cookie"},
+		tls:  true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -163,7 +171,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -176,7 +184,7 @@
 
 // TestH1H1GracefulShutdown tests graceful shutdown.
 func TestH1H1GracefulShutdown(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -186,11 +194,14 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 
-	st.cmd.Process.Signal(syscall.SIGQUIT)
+	if err := st.cmd.Process.Signal(syscall.SIGQUIT); err != nil {
+		t.Fatalf("Error st.cmd.Process.Signal() = %v", err)
+	}
+
 	time.Sleep(150 * time.Millisecond)
 
 	res, err = st.http1(requestParam{
@@ -200,7 +211,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 
@@ -217,9 +228,13 @@
 
 // TestH1H1HostRewrite tests that server rewrites Host header field
 func TestH1H1HostRewrite(t *testing.T) {
-	st := newServerTester(string{"--host-rewrite"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		args: string{"--host-rewrite"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -228,7 +243,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("request-host"), st.backendHost; got != want {
@@ -239,9 +254,12 @@
 // TestH1H1BadHost tests that server rejects request including bad
 // characters in host header field.
 func TestH1H1BadHost(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	if _, err := io.WriteString(st.conn, "GET / HTTP/1.1\r\nTest-Case: TestH1H1HBadHost\r\nHost: foo\"bar\r\n\r\n"); err != nil {
@@ -251,7 +269,10 @@
 	if err != nil {
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
-	if got, want := resp.StatusCode, 400; got != want {
+
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusBadRequest; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -259,9 +280,12 @@
 // TestH1H1BadAuthority tests that server rejects request including
 // bad characters in authority component of requset URI.
 func TestH1H1BadAuthority(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	if _, err := io.WriteString(st.conn, "GET http://foo\"bar/ HTTP/1.1\r\nTest-Case: TestH1H1HBadAuthority\r\nHost: foobar\r\n\r\n"); err != nil {
@@ -271,7 +295,10 @@
 	if err != nil {
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
-	if got, want := resp.StatusCode, 400; got != want {
+
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusBadRequest; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -279,9 +306,12 @@
 // TestH1H1BadScheme tests that server rejects request including
 // bad characters in scheme component of requset URI.
 func TestH1H1BadScheme(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	if _, err := io.WriteString(st.conn, "GET http*://example.com/ HTTP/1.1\r\nTest-Case: TestH1H1HBadScheme\r\nHost: example.com\r\n\r\n"); err != nil {
@@ -291,7 +321,10 @@
 	if err != nil {
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
-	if got, want := resp.StatusCode, 400; got != want {
+
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusBadRequest; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -299,9 +332,12 @@
 // TestH1H1HTTP10 tests that server can accept HTTP/1.0 request
 // without Host header field
 func TestH1H1HTTP10(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H1HTTP10\r\n\r\n"); err != nil {
@@ -313,7 +349,9 @@
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
 
-	if got, want := resp.StatusCode, 200; got != want {
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
@@ -325,9 +363,12 @@
 // field using actual backend server even if --no-http-rewrite is
 // used.
 func TestH1H1HTTP10NoHostRewrite(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H1HTTP10NoHostRewrite\r\n\r\n"); err != nil {
@@ -339,7 +380,9 @@
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
 
-	if got, want := resp.StatusCode, 200; got != want {
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
@@ -350,21 +393,24 @@
 // TestH1H1RequestTrailer tests request trailer part is forwarded to
 // backend.
 func TestH1H1RequestTrailer(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		buf := make(byte, 4096)
-		for {
-			_, err := r.Body.Read(buf)
-			if err == io.EOF {
-				break
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			buf := make(byte, 4096)
+			for {
+				_, err := r.Body.Read(buf)
+				if err == io.EOF {
+					break
+				}
+				if err != nil {
+					t.Fatalf("r.Body.Read() = %v", err)
+				}
 			}
-			if err != nil {
-				t.Fatalf("r.Body.Read() = %v", err)
+			if got, want := r.Trailer.Get("foo"), "bar"; got != want {
+				t.Errorf("r.Trailer.Get(foo): %v; want %v", got, want)
 			}
-		}
-		if got, want := r.Trailer.Get("foo"), "bar"; got != want {
-			t.Errorf("r.Trailer.Get(foo): %v; want %v", got, want)
-		}
-	})
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -377,7 +423,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -388,9 +434,13 @@
 	// The value 100 is chosen so that sum of header fields bytes
 	// does not exceed it.  We use > 100 bytes URI to exceed this
 	// limit.
-	st := newServerTester(string{"--request-header-field-buffer=100"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
+	opts := options{
+		args: string{"--request-header-field-buffer=100"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("execution path should not be here")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -400,7 +450,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 431; got != want {
+	if got, want := res.status, http.StatusRequestHeaderFieldsTooLarge; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -408,9 +458,13 @@
 // TestH1H1HeaderFieldBuffer tests that request with header fields
 // larger than configured buffer size is rejected.
 func TestH1H1HeaderFieldBuffer(t *testing.T) {
-	st := newServerTester(string{"--request-header-field-buffer=10"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
+	opts := options{
+		args: string{"--request-header-field-buffer=10"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("execution path should not be here")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -419,7 +473,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 431; got != want {
+	if got, want := res.status, http.StatusRequestHeaderFieldsTooLarge; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -427,9 +481,13 @@
 // TestH1H1HeaderFields tests that request with header fields more
 // than configured number is rejected.
 func TestH1H1HeaderFields(t *testing.T) {
-	st := newServerTester(string{"--max-request-header-fields=1"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
+	opts := options{
+		args: string{"--max-request-header-fields=1"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("execution path should not be here")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -443,26 +501,28 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 431; got != want {
+	if got, want := res.status, http.StatusRequestHeaderFieldsTooLarge; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
 
 // TestH1H1Websocket tests that HTTP Upgrade to WebSocket works.
 func TestH1H1Websocket(t *testing.T) {
-	st := newServerTesterHandler(nil, t, websocket.Handler(func(ws *websocket.Conn) {
-		io.Copy(ws, ws)
-	}))
+	opts := options{
+		handler: websocket.Handler(func(ws *websocket.Conn) {
+			if _, err := io.Copy(ws, ws); err != nil {
+				t.Fatalf("Error io.Copy() = %v", err)
+			}
+		}).ServeHTTP,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	content := byte("hello world")
-	res, err := st.websocket(requestParam{
+	res := st.websocket(requestParam{
 		name: "TestH1H1Websocket",
 		body: content,
 	})
-	if err != nil {
-		t.Fatalf("Error st.websocket() = %v", err)
-	}
 	if got, want := res.body, content; !bytes.Equal(got, want) {
 		t.Errorf("echo: %q; want %q", got, want)
 	}
@@ -471,11 +531,15 @@
 // TestH1H1ReqPhaseSetHeader tests mruby request phase hook
 // modifies request header fields.
 func TestH1H1ReqPhaseSetHeader(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
-			t.Errorf("User-Agent = %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/req-set-header.rb"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
+				t.Errorf("User-Agent = %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -485,7 +549,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -493,9 +557,13 @@
 // TestH1H1ReqPhaseReturn tests mruby request phase hook returns
 // custom response.
 func TestH1H1ReqPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
+	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()
 
 	res, err := st.http1(requestParam{
@@ -505,7 +573,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -529,7 +597,10 @@
 // TestH1H1RespPhaseSetHeader tests mruby response phase hook modifies
 // response header fields.
 func TestH1H1RespPhaseSetHeader(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/resp-set-header.rb"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -539,7 +610,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -551,7 +622,10 @@
 // TestH1H1RespPhaseReturn tests mruby response phase hook returns
 // custom response.
 func TestH1H1RespPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/resp-return.rb"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -561,7 +635,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -585,7 +659,10 @@
 // TestH1H1HTTPSRedirect tests that the request to the backend which
 // requires TLS is redirected to https URI.
 func TestH1H1HTTPSRedirect(t *testing.T) {
-	st := newServerTester(string{"--redirect-if-not-tls"}, t, noopHandler)
+	opts := options{
+		args: string{"--redirect-if-not-tls"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -595,7 +672,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 308; got != want {
+	if got, want := res.status, http.StatusPermanentRedirect; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("location"), "https://127.0.0.1/"; got != want {
@@ -606,7 +683,13 @@
 // TestH1H1HTTPSRedirectPort tests that the request to the backend
 // which requires TLS is redirected to https URI with given port.
 func TestH1H1HTTPSRedirectPort(t *testing.T) {
-	st := newServerTester(string{"--redirect-if-not-tls", "--redirect-https-port=8443"}, t, noopHandler)
+	opts := options{
+		args: string{
+			"--redirect-if-not-tls",
+			"--redirect-https-port=8443",
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -617,7 +700,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 308; got != want {
+	if got, want := res.status, http.StatusPermanentRedirect; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("location"), "https://127.0.0.1:8443/foo?bar"; got != want {
@@ -628,7 +711,7 @@
 // TestH1H1POSTRequests tests that server can handle 2 requests with
 // request body.
 func TestH1H1POSTRequests(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -638,7 +721,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -649,7 +732,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -657,7 +740,10 @@
 // // TestH1H2ConnectFailure tests that server handles the situation that
 // // connection attempt to HTTP/2 backend failed.
 // func TestH1H2ConnectFailure(t *testing.T) {
-// 	st := newServerTester(string{"--http2-bridge"}, t, noopHandler)
+// 	opts := options{
+// 		args: string{"--http2-bridge"},
+// 	}
+// 	st := newServerTester(t, opts)
 // 	defer st.Close()
 
 // 	// simulate backend connect attempt failure
@@ -678,9 +764,13 @@
 // TestH1H2NoHost tests that server rejects request without Host
 // header field for HTTP/2 backend.
 func TestH1H2NoHost(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward bad request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	// without Host header field, we expect 400 response
@@ -693,8 +783,9 @@
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
 
-	want := 400
-	if got := resp.StatusCode; got != want {
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusBadRequest; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -702,9 +793,13 @@
 // TestH1H2HTTP10 tests that server can accept HTTP/1.0 request
 // without Host header field
 func TestH1H2HTTP10(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H2HTTP10\r\n\r\n"); err != nil {
@@ -716,7 +811,9 @@
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
 
-	if got, want := resp.StatusCode, 200; got != want {
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
@@ -728,9 +825,13 @@
 // field using actual backend server even if --no-http-rewrite is
 // used.
 func TestH1H2HTTP10NoHostRewrite(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H2HTTP10NoHostRewrite\r\n\r\n"); err != nil {
@@ -742,7 +843,9 @@
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
 
-	if got, want := resp.StatusCode, 200; got != want {
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
@@ -755,11 +858,15 @@
 // concatenates crumbled Cookies automatically, so this test is not
 // much effective now.
 func TestH1H2CrumbleCookie(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Cookie"), "alpha; bravo; charlie"; got != want {
-			t.Errorf("Cookie: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Cookie"), "alpha; bravo; charlie"; got != want {
+				t.Errorf("Cookie: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -771,7 +878,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -779,11 +886,15 @@
 // TestH1H2GenerateVia tests that server generates Via header field to and
 // from backend server.
 func TestH1H2GenerateVia(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "1.1 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "1.1 nghttpx"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -800,12 +911,16 @@
 // TestH1H2AppendVia tests that server adds value to existing Via
 // header field to and from backend server.
 func TestH1H2AppendVia(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo, 1.1 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "foo, 1.1 nghttpx"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+			w.Header().Add("Via", "bar")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -825,12 +940,16 @@
 // TestH1H2NoVia tests that server does not add value to existing Via
 // header field to and from backend server.
 func TestH1H2NoVia(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--no-via"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
+	opts := options{
+		args: string{"--http2-bridge", "--no-via"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "foo"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+			w.Header().Add("Via", "bar")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -850,9 +969,16 @@
 // TestH1H2ReqPhaseReturn tests mruby request phase hook returns
 // custom response.
 func TestH1H2ReqPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--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()
 
 	res, err := st.http1(requestParam{
@@ -862,7 +988,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -886,7 +1012,13 @@
 // TestH1H2RespPhaseReturn tests mruby response phase hook returns
 // custom response.
 func TestH1H2RespPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--mruby-file=" + testDir + "/resp-return.rb",
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -896,7 +1028,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -920,11 +1052,15 @@
 // TestH1H2TE tests that "te: trailers" header is forwarded to HTTP/2
 // backend server by stripping other encodings.
 func TestH1H2TE(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("te"), "trailers"; got != want {
-			t.Errorf("te: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("te"), "trailers"; got != want {
+				t.Errorf("te: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -936,7 +1072,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -944,9 +1080,14 @@
 // TestH1APIBackendconfig exercise backendconfig API endpoint routine
 // for successful case.
 func TestH1APIBackendconfig(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -961,7 +1102,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -981,9 +1122,14 @@
 // TestH1APIBackendconfigQuery exercise backendconfig API endpoint
 // routine with query.
 func TestH1APIBackendconfigQuery(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -998,7 +1144,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -1018,9 +1164,14 @@
 // TestH1APIBackendconfigBadMethod exercise backendconfig API endpoint
 // routine with bad method.
 func TestH1APIBackendconfigBadMethod(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -1035,7 +1186,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 405; got != want {
+	if got, want := res.status, http.StatusMethodNotAllowed; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -1054,9 +1205,14 @@
 
 // TestH1APIConfigrevision tests configrevision API.
 func TestH1APIConfigrevision(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -1067,7 +1223,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want = %v", got, want)
 	}
 
@@ -1092,9 +1248,14 @@
 // TestH1APINotFound exercise backendconfig API endpoint routine when
 // API endpoint is not found.
 func TestH1APINotFound(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -1109,7 +1270,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -1128,9 +1289,14 @@
 
 // TestH1Healthmon tests health monitor endpoint.
 func TestH1Healthmon(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3011;healthmon;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3011)
+	opts := options{
+		args: string{"-f127.0.0.1,3011;healthmon;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3011,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -1140,7 +1306,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http1() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1148,17 +1314,17 @@
 // TestH1ResponseBeforeRequestEnd tests the situation where response
 // ends before request body finishes.
 func TestH1ResponseBeforeRequestEnd(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("request should not be forwarded")
-	})
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/req-return.rb"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("request should not be forwarded")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	if _, err := io.WriteString(st.conn, fmt.Sprintf(`POST / HTTP/1.1
-Host: %v
-Test-Case: TestH1ResponseBeforeRequestEnd
-Content-Length: 1000000
-
-`, st.authority)); err != nil {
+	if _, err := io.WriteString(st.conn, fmt.Sprintf("POST / HTTP/1.1\r\nHost: %v\r\nTest-Case: TestH1ResponseBeforeRequestEnd\r\nContent-Length: 1000000\r\n\r\n",
+		st.authority)); err != nil {
 		t.Fatalf("Error io.WriteString() = %v", err)
 	}
 
@@ -1167,7 +1333,9 @@
 		t.Fatalf("Error http.ReadResponse() = %v", err)
 	}
 
-	if got, want := resp.StatusCode, 404; got != want {
+	defer resp.Body.Close()
+
+	if got, want := resp.StatusCode, http.StatusNotFound; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -1175,21 +1343,26 @@
 // TestH1H1ChunkedEndsPrematurely tests that an HTTP/1.1 request fails
 // if the backend chunked encoded response ends prematurely.
 func TestH1H1ChunkedEndsPrematurely(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n")
-		bufrw.Flush()
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			hj, ok := w.(http.Hijacker)
+			if !ok {
+				http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
+				return
+			}
+			conn, bufrw, err := hj.Hijack()
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+			defer conn.Close()
+			if _, err := bufrw.WriteString("HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n"); err != nil {
+				t.Fatalf("Error bufrw.WriteString() = %v", err)
+			}
+			bufrw.Flush()
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	_, err := st.http1(requestParam{

_service:tar_scm:nghttp2-1.46.0.tar.xz/integration-tests/nghttpx_http2_test.go -> _service:tar_scm:nghttp2-1.52.0.tar.xz/integration-tests/nghttpx_http2_test.go Changed

@@ -5,10 +5,7 @@
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"regexp"
@@ -16,11 +13,14 @@
 	"syscall"
 	"testing"
 	"time"
+
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
 )
 
 // TestH2H1PlainGET tests whether simple HTTP/2 GET request works.
 func TestH2H1PlainGET(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -30,21 +30,24 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	want := 200
-	if res.status != want {
-		t.Errorf("status = %v; want %v", res.status, want)
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("status = %v; want %v", got, want)
 	}
 }
 
 // TestH2H1AddXfp tests that server appends :scheme to the existing
 // x-forwarded-proto header field.
 func TestH2H1AddXfp(t *testing.T) {
-	st := newServerTester(string{"--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo, http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--no-strip-incoming-x-forwarded-proto"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xfp := r.Header.Get("X-Forwarded-Proto")
+			if got, want := xfp, "foo, http"; got != want {
+				t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -56,7 +59,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -64,12 +67,19 @@
 // TestH2H1NoAddXfp tests that server does not append :scheme to the
 // existing x-forwarded-proto header field.
 func TestH2H1NoAddXfp(t *testing.T) {
-	st := newServerTester(string{"--no-add-x-forwarded-proto", "--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--no-add-x-forwarded-proto",
+			"--no-strip-incoming-x-forwarded-proto",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xfp := r.Header.Get("X-Forwarded-Proto")
+			if got, want := xfp, "foo"; got != want {
+				t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -81,7 +91,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -89,12 +99,15 @@
 // TestH2H1StripXfp tests that server strips incoming
 // x-forwarded-proto header field.
 func TestH2H1StripXfp(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xfp := r.Header.Get("X-Forwarded-Proto")
+			if got, want := xfp, "http"; got != want {
+				t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -106,7 +119,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -114,11 +127,15 @@
 // TestH2H1StripNoAddXfp tests that server strips incoming
 // x-forwarded-proto header field, and does not add another.
 func TestH2H1StripNoAddXfp(t *testing.T) {
-	st := newServerTester(string{"--no-add-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header"X-Forwarded-Proto"; found {
-			t.Errorf("X-Forwarded-Proto = %q; want nothing", got)
-		}
-	})
+	opts := options{
+		args: string{"--no-add-x-forwarded-proto"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, found := r.Header"X-Forwarded-Proto"; found {
+				t.Errorf("X-Forwarded-Proto = %q; want nothing", got)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -130,7 +147,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -138,13 +155,17 @@
 // TestH2H1AddXff tests that server generates X-Forwarded-For header
 // field when forwarding request to backend.
 func TestH2H1AddXff(t *testing.T) {
-	st := newServerTester(string{"--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
+	opts := options{
+		args: string{"--add-x-forwarded-for"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xff := r.Header.Get("X-Forwarded-For")
+			want := "127.0.0.1"
+			if xff != want {
+				t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -153,7 +174,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -161,13 +182,17 @@
 // TestH2H1AddXff2 tests that server appends X-Forwarded-For header
 // field to existing one when forwarding request to backend.
 func TestH2H1AddXff2(t *testing.T) {
-	st := newServerTester(string{"--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "host, 127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
+	opts := options{
+		args: string{"--add-x-forwarded-for"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xff := r.Header.Get("X-Forwarded-For")
+			want := "host, 127.0.0.1"
+			if xff != want {
+				t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -179,7 +204,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -187,11 +212,15 @@
 // TestH2H1StripXff tests that --strip-incoming-x-forwarded-for
 // option.
 func TestH2H1StripXff(t *testing.T) {
-	st := newServerTester(string{"--strip-incoming-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if xff, found := r.Header"X-Forwarded-For"; found {
-			t.Errorf("X-Forwarded-For = %v; want nothing", xff)
-		}
-	})
+	opts := options{
+		args: string{"--strip-incoming-x-forwarded-for"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if xff, found := r.Header"X-Forwarded-For"; found {
+				t.Errorf("X-Forwarded-For = %v; want nothing", xff)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -203,7 +232,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -211,17 +240,20 @@
 // TestH2H1StripAddXff tests that --strip-incoming-x-forwarded-for and
 // --add-x-forwarded-for options.
 func TestH2H1StripAddXff(t *testing.T) {
-	args := string{
-		"--strip-incoming-x-forwarded-for",
-		"--add-x-forwarded-for",
-	}
-	st := newServerTester(args, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--strip-incoming-x-forwarded-for",
+			"--add-x-forwarded-for",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xff := r.Header.Get("X-Forwarded-For")
+			want := "127.0.0.1"
+			if xff != want {
+				t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -233,7 +265,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -241,15 +273,19 @@
 // TestH2H1AddForwardedObfuscated tests that server generates
 // Forwarded header field with obfuscated "by" and "for" parameters.
 func TestH2H1AddForwardedObfuscated(t *testing.T) {
-	st := newServerTester(string{"--add-forwarded=by,for,host,proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := fmt.Sprintf(`by=_^;+;for=_^;+;host="127\.0\.0\.1:%v";proto=http`, serverPort)
-		validFwd := regexp.MustCompile(pattern)
-		got := r.Header.Get("Forwarded")
+	opts := options{
+		args: string{"--add-forwarded=by,for,host,proto"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			pattern := fmt.Sprintf(`by=_^;+;for=_^;+;host="127\.0\.0\.1:%v";proto=http`, serverPort)
+			validFwd := regexp.MustCompile(pattern)
+			got := r.Header.Get("Forwarded")
 
-		if !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
+			if !validFwd.MatchString(got) {
+				t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -258,7 +294,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -266,13 +302,17 @@
 // TestH2H1AddForwardedByIP tests that server generates Forwarded header
 // field with IP address in "by" parameter.
 func TestH2H1AddForwardedByIP(t *testing.T) {
-	st := newServerTester(string{"--add-forwarded=by,for", "--forwarded-by=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := fmt.Sprintf(`by="127\.0\.0\.1:%v";for=_^;+`, serverPort)
-		validFwd := regexp.MustCompile(pattern)
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
+	opts := options{
+		args: string{"--add-forwarded=by,for", "--forwarded-by=ip"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			pattern := fmt.Sprintf(`by="127\.0\.0\.1:%v";for=_^;+`, serverPort)
+			validFwd := regexp.MustCompile(pattern)
+			if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
+				t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -281,7 +321,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -289,12 +329,20 @@
 // TestH2H1AddForwardedForIP tests that server generates Forwarded header
 // field with IP address in "for" parameters.
 func TestH2H1AddForwardedForIP(t *testing.T) {
-	st := newServerTester(string{"--add-forwarded=by,for,host,proto", "--forwarded-by=_alpha", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		want := fmt.Sprintf(`by=_alpha;for=127.0.0.1;host="127.0.0.1:%v";proto=http`, serverPort)
-		if got := r.Header.Get("Forwarded"); got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--add-forwarded=by,for,host,proto",
+			"--forwarded-by=_alpha",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			want := fmt.Sprintf(`by=_alpha;for=127.0.0.1;host="127.0.0.1:%v";proto=http`, serverPort)
+			if got := r.Header.Get("Forwarded"); got != want {
+				t.Errorf("Forwarded = %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -303,7 +351,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -312,11 +360,15 @@
 // header field with IP address in "by" and "for" parameters.  The
 // generated values must be appended to the existing value.
 func TestH2H1AddForwardedMerge(t *testing.T) {
-	st := newServerTester(string{"--add-forwarded=proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Forwarded"), `host=foo, proto=http`; got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--add-forwarded=proto"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Forwarded"), `host=foo, proto=http`; got != want {
+				t.Errorf("Forwarded = %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -328,7 +380,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -337,11 +389,18 @@
 // header field with IP address in "by" and "for" parameters.  The
 // generated values must not include the existing value.
 func TestH2H1AddForwardedStrip(t *testing.T) {
-	st := newServerTester(string{"--strip-incoming-forwarded", "--add-forwarded=proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Forwarded"), `proto=http`; got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--strip-incoming-forwarded",
+			"--add-forwarded=proto",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Forwarded"), `proto=http`; got != want {
+				t.Errorf("Forwarded = %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -353,7 +412,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -361,11 +420,15 @@
 // TestH2H1StripForwarded tests that server strips incoming Forwarded
 // header field.
 func TestH2H1StripForwarded(t *testing.T) {
-	st := newServerTester(string{"--strip-incoming-forwarded"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header"Forwarded"; found {
-			t.Errorf("Forwarded = %v; want nothing", got)
-		}
-	})
+	opts := options{
+		args: string{"--strip-incoming-forwarded"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, found := r.Header"Forwarded"; found {
+				t.Errorf("Forwarded = %v; want nothing", got)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -377,7 +440,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -386,13 +449,20 @@
 // header field with the given static obfuscated string for "by"
 // parameter.
 func TestH2H1AddForwardedStatic(t *testing.T) {
-	st := newServerTester(string{"--add-forwarded=by,for", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := `by=_alpha;for=_^;+`
-		validFwd := regexp.MustCompile(pattern)
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
+	opts := options{
+		args: string{
+			"--add-forwarded=by,for",
+			"--forwarded-by=_alpha",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			pattern := `by=_alpha;for=_^;+`
+			validFwd := regexp.MustCompile(pattern)
+			if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
+				t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -401,7 +471,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -409,11 +479,14 @@
 // TestH2H1GenerateVia tests that server generates Via header field to and
 // from backend server.
 func TestH2H1GenerateVia(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "2 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "2 nghttpx"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -430,12 +503,15 @@
 // TestH2H1AppendVia tests that server adds value to existing Via
 // header field to and from backend server.
 func TestH2H1AppendVia(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo, 2 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "foo, 2 nghttpx"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+			w.Header().Add("Via", "bar")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -455,12 +531,16 @@
 // TestH2H1NoVia tests that server does not add value to existing Via
 // header field to and from backend server.
 func TestH2H1NoVia(t *testing.T) {
-	st := newServerTester(string{"--no-via"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
+	opts := options{
+		args: string{"--no-via"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "foo"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+			w.Header().Add("Via", "bar")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -479,9 +559,13 @@
 
 // TestH2H1HostRewrite tests that server rewrites host header field
 func TestH2H1HostRewrite(t *testing.T) {
-	st := newServerTester(string{"--host-rewrite"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		args: string{"--host-rewrite"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -490,7 +574,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("request-host"), st.backendHost; got != want {
@@ -501,9 +585,12 @@
 // TestH2H1NoHostRewrite tests that server does not rewrite host
 // header field
 func TestH2H1NoHostRewrite(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -512,7 +599,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("request-host"), st.frontendHost; got != want {
@@ -524,7 +611,7 @@
 // content-length header field value does not match its request body
 // size.
 func TestH2H1BadRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	// we set content-length: 1024, but the actual request body is
@@ -551,11 +638,16 @@
 // content-length response header field value does not match its
 // response body size.
 func TestH2H1BadResponseCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		// we set content-length: 1024, but only send 3 bytes.
-		w.Header().Add("Content-Length", "1024")
-		w.Write(byte("foo"))
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			// we set content-length: 1024, but only send 3 bytes.
+			w.Header().Add("Content-Length", "1024")
+			if _, err := w.Write(byte("foo")); err != nil {
+				t.Fatalf("Error w.Write() = %v", err)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -574,11 +666,15 @@
 // TestH2H1LocationRewrite tests location header field rewriting
 // works.
 func TestH2H1LocationRewrite(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		// TODO we cannot get st.ts's port number here.. 8443
-		// is just a place holder.  We ignore it on rewrite.
-		w.Header().Add("Location", "http://127.0.0.1:8443/p/q?a=b#fragment")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			// TODO we cannot get st.ts's port number
+			// here.. 8443 is just a place holder.  We
+			// ignore it on rewrite.
+			w.Header().Add("Location", "http://127.0.0.1:8443/p/q?a=b#fragment")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -596,20 +692,23 @@
 
 // TestH2H1ChunkedRequestBody tests that chunked request body works.
 func TestH2H1ChunkedRequestBody(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		want := "chunked"
-		if got := fmt.Sprint(r.TransferEncoding); got != want {
-			t.Errorf("Transfer-Encoding: %v; want %v", got, want)
-		}
-		body, err := ioutil.ReadAll(r.Body)
-		if err != nil {
-			t.Fatalf("Error reading r.body: %v", err)
-		}
-		want = "foo"
-		if got := string(body); got != want {
-			t.Errorf("body: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			want := "chunked"
+			if got := fmt.Sprint(r.TransferEncoding); got != want {
+				t.Errorf("Transfer-Encoding: %v; want %v", got, want)
+			}
+			body, err := io.ReadAll(r.Body)
+			if err != nil {
+				t.Fatalf("Error reading r.body: %v", err)
+			}
+			want = "foo"
+			if got := string(body); got != want {
+				t.Errorf("body: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -620,7 +719,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -628,9 +727,12 @@
 // TestH2H1MultipleRequestCL tests that server rejects request with
 // multiple Content-Length request header fields.
 func TestH2H1MultipleRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward bad request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -651,9 +753,12 @@
 // TestH2H1InvalidRequestCL tests that server rejects request with
 // Content-Length which cannot be parsed as a number.
 func TestH2H1InvalidRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward bad request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -673,7 +778,7 @@
 // // TestH2H1ConnectFailure tests that server handles the situation that
 // // connection attempt to HTTP/1 backend failed.
 // func TestH2H1ConnectFailure(t *testing.T) {
-// 	st := newServerTester(nil, t, noopHandler)
+// 	st := newServerTester(t, options{})
 // 	defer st.Close()
 
 // 	// shutdown backend server to simulate backend connect failure
@@ -694,9 +799,12 @@
 // TestH2H1InvalidMethod tests that server rejects invalid method with
 // 501.
 func TestH2H1InvalidMethod(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -706,7 +814,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 501; got != want {
+	if got, want := res.status, http.StatusNotImplemented; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -714,9 +822,12 @@
 // TestH2H1BadAuthority tests that server rejects request including
 // bad characters in :authority header field.
 func TestH2H1BadAuthority(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -734,9 +845,12 @@
 // TestH2H1BadScheme tests that server rejects request including
 // bad characters in :scheme header field.
 func TestH2H1BadScheme(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -754,11 +868,14 @@
 // TestH2H1AssembleCookies tests that crumbled cookies in HTTP/2
 // request is assembled into 1 when forwarding to HTTP/1 backend link.
 func TestH2H1AssembleCookies(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Cookie"), "alpha; bravo; charlie"; got != want {
-			t.Errorf("Cookie: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Cookie"), "alpha; bravo; charlie"; got != want {
+				t.Errorf("Cookie: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -772,7 +889,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -780,7 +897,7 @@
 // TestH2H1TETrailers tests that server accepts TE request header
 // field if it has trailers only.
 func TestH2H1TETrailers(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -792,7 +909,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -800,9 +917,12 @@
 // TestH2H1TEGzip tests that server resets stream if TE request header
 // field contains gzip.
 func TestH2H1TEGzip(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("server should not forward bad request")
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Error("server should not forward bad request")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -823,9 +943,14 @@
 // choose appropriate certificate depending on the indicated
 // server_name from client.
 func TestH2H1SNI(t *testing.T) {
-	st := newServerTesterTLSConfig(string{"--subcert=" + testDir + "/alt-server.key:" + testDir + "/alt-server.crt"}, t, noopHandler, &tls.Config{
-		ServerName: "alt-domain",
-	})
+	opts := options{
+		args: string{"--subcert=" + testDir + "/alt-server.key:" + testDir + "/alt-server.crt"},
+		tls:  true,
+		tlsConfig: &tls.Config{
+			ServerName: "alt-domain",
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	tlsConn := st.conn.(*tls.Conn)
@@ -841,11 +966,15 @@
 // with http value since :scheme is http, even if the frontend
 // connection is encrypted.
 func TestH2H1TLSXfp(t *testing.T) {
-	st := newServerTesterTLS(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("x-forwarded-proto"), "http"; got != want {
-			t.Errorf("x-forwarded-proto: want %v; got %v", want, got)
-		}
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("x-forwarded-proto"), "http"; got != want {
+				t.Errorf("x-forwarded-proto: want %v; got %v", want, got)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -854,7 +983,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -862,12 +991,15 @@
 // TestH2H1ServerPush tests server push using Link header field from
 // backend server.
 func TestH2H1ServerPush(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		// only resources marked as rel=preload are pushed
-		if !strings.HasPrefix(r.URL.Path, "/css/") {
-			w.Header().Add("Link", "</css/main.css>; rel=preload, </foo>, </css/theme.css>; rel=preload")
-		}
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			// only resources marked as rel=preload are pushed
+			if !strings.HasPrefix(r.URL.Path, "/css/") {
+				w.Header().Add("Link", "</css/main.css>; rel=preload, </foo>, </css/theme.css>; rel=preload")
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -876,18 +1008,18 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 	if got, want := len(res.pushResponse), 2; got != want {
 		t.Fatalf("len(res.pushResponse): %v; want %v", got, want)
 	}
 	mainCSS := res.pushResponse0
-	if got, want := mainCSS.status, 200; got != want {
+	if got, want := mainCSS.status, http.StatusOK; got != want {
 		t.Errorf("mainCSS.status: %v; want %v", got, want)
 	}
 	themeCSS := res.pushResponse1
-	if got, want := themeCSS.status, 200; got != want {
+	if got, want := themeCSS.status, http.StatusOK; got != want {
 		t.Errorf("themeCSS.status: %v; want %v", got, want)
 	}
 }
@@ -895,21 +1027,24 @@
 // TestH2H1RequestTrailer tests request trailer part is forwarded to
 // backend.
 func TestH2H1RequestTrailer(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		buf := make(byte, 4096)
-		for {
-			_, err := r.Body.Read(buf)
-			if err == io.EOF {
-				break
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			buf := make(byte, 4096)
+			for {
+				_, err := r.Body.Read(buf)
+				if err == io.EOF {
+					break
+				}
+				if err != nil {
+					t.Fatalf("r.Body.Read() = %v", err)
+				}
 			}
-			if err != nil {
-				t.Fatalf("r.Body.Read() = %v", err)
+			if got, want := r.Trailer.Get("foo"), "bar"; got != want {
+				t.Errorf("r.Trailer.Get(foo): %v; want %v", got, want)
 			}
-		}
-		if got, want := r.Trailer.Get("foo"), "bar"; got != want {
-			t.Errorf("r.Trailer.Get(foo): %v; want %v", got, want)
-		}
-	})
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -922,7 +1057,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -930,9 +1065,13 @@
 // TestH2H1HeaderFieldBuffer tests that request with header fields
 // larger than configured buffer size is rejected.
 func TestH2H1HeaderFieldBuffer(t *testing.T) {
-	st := newServerTester(string{"--request-header-field-buffer=10"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
+	opts := options{
+		args: string{"--request-header-field-buffer=10"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("execution path should not be here")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -941,7 +1080,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 431; got != want {
+	if got, want := res.status, http.StatusRequestHeaderFieldsTooLarge; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -949,9 +1088,13 @@
 // TestH2H1HeaderFields tests that request with header fields more
 // than configured number is rejected.
 func TestH2H1HeaderFields(t *testing.T) {
-	st := newServerTester(string{"--max-request-header-fields=1"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
+	opts := options{
+		args: string{"--max-request-header-fields=1"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("execution path should not be here")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -962,7 +1105,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 431; got != want {
+	if got, want := res.status, http.StatusRequestHeaderFieldsTooLarge; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -970,11 +1113,15 @@
 // TestH2H1ReqPhaseSetHeader tests mruby request phase hook
 // modifies request header fields.
 func TestH2H1ReqPhaseSetHeader(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
-			t.Errorf("User-Agent = %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/req-set-header.rb"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
+				t.Errorf("User-Agent = %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -984,7 +1131,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -992,9 +1139,13 @@
 // TestH2H1ReqPhaseReturn tests mruby request phase hook returns
 // custom response.
 func TestH2H1ReqPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
+	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()
 
 	res, err := st.http2(requestParam{
@@ -1004,7 +1155,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -1028,7 +1179,10 @@
 // TestH2H1RespPhaseSetHeader tests mruby response phase hook modifies
 // response header fields.
 func TestH2H1RespPhaseSetHeader(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/resp-set-header.rb"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1038,7 +1192,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -1050,7 +1204,10 @@
 // TestH2H1RespPhaseReturn tests mruby response phase hook returns
 // custom response.
 func TestH2H1RespPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/resp-return.rb"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1060,7 +1217,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -1083,7 +1240,7 @@
 
 // TestH2H1Upgrade tests HTTP Upgrade to HTTP/2
 func TestH2H1Upgrade(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {})
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	res, err := st.http1(requestParam{
@@ -1099,7 +1256,7 @@
 		t.Fatalf("Error st.http1() = %v", err)
 	}
 
-	if got, want := res.status, 101; got != want {
+	if got, want := res.status, http.StatusSwitchingProtocols; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -1109,7 +1266,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1118,16 +1275,27 @@
 // header field includes obfuscated address even if PROXY protocol
 // version 1 containing TCP4 entry is accepted.
 func TestH2H1ProxyProtocolV1ForwardedForObfuscated(t *testing.T) {
-	pattern := fmt.Sprintf(`^for=_^;+$`)
+	pattern := `^for=_^;+$`
 	validFwd := regexp.MustCompile(pattern)
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=obfuscated"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded: %v; want pattern %v", got, pattern)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=obfuscated",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
+				t.Errorf("Forwarded: %v; want pattern %v", got, pattern)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP4 192.168.0.2 192.168.0.100 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP4 192.168.0.2 192.168.0.100 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1ForwardedForObfuscated",
@@ -1137,7 +1305,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1146,17 +1314,28 @@
 // containing TCP4 entry is accepted and X-Forwarded-For contains
 // advertised src address.
 func TestH2H1ProxyProtocolV1TCP4(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), "for=192.168.0.2"; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), "for=192.168.0.2"; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP4 192.168.0.2 192.168.0.100 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP4 192.168.0.2 192.168.0.100 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1TCP4",
@@ -1166,7 +1345,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1175,17 +1354,28 @@
 // containing TCP6 entry is accepted and X-Forwarded-For contains
 // advertised src address.
 func TestH2H1ProxyProtocolV1TCP6(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), `for="2001:0db8:85a3:0000:0000:8a2e:0370:7334"`; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), `for="2001:0db8:85a3:0000:0000:8a2e:0370:7334"`; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 2001:0db8:85a3:0000:0000:8a2e:0370:7334 ::1 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 2001:0db8:85a3:0000:0000:8a2e:0370:7334 ::1 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1TCP6",
@@ -1195,7 +1385,83 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+}
+
+// TestH2H1ProxyProtocolV1TCP4TLS tests PROXY protocol version 1 over
+// TLS containing TCP4 entry is accepted and X-Forwarded-For contains
+// advertised src address.
+func TestH2H1ProxyProtocolV1TCP4TLS(t *testing.T) {
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), "for=192.168.0.2"; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+		tls:     true,
+		tcpData: byte("PROXY TCP4 192.168.0.2 192.168.0.100 12345 8080\r\n"),
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name: "TestH2H1ProxyProtocolV1TCP4TLS",
+	})
+
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+}
+
+// TestH2H1ProxyProtocolV1TCP6TLS tests PROXY protocol version 1 over
+// TLS containing TCP6 entry is accepted and X-Forwarded-For contains
+// advertised src address.
+func TestH2H1ProxyProtocolV1TCP6TLS(t *testing.T) {
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), `for="2001:0db8:85a3:0000:0000:8a2e:0370:7334"`; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+		tls:     true,
+		tcpData: byte("PROXY TCP6 2001:0db8:85a3:0000:0000:8a2e:0370:7334 ::1 12345 8080\r\n"),
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name: "TestH2H1ProxyProtocolV1TCP6TLS",
+	})
+
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1203,17 +1469,28 @@
 // TestH2H1ProxyProtocolV1Unknown tests PROXY protocol version 1
 // containing UNKNOWN entry is accepted.
 func TestH2H1ProxyProtocolV1Unknown(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, notWant := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got == notWant {
-			t.Errorf("X-Forwarded-For: %v; want something else", got)
-		}
-		if got, notWant := r.Header.Get("Forwarded"), "for=192.168.0.2"; got == notWant {
-			t.Errorf("Forwarded: %v; want something else", got)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, notWant := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got == notWant {
+				t.Errorf("X-Forwarded-For: %v; want something else", got)
+			}
+			if got, notWant := r.Header.Get("Forwarded"), "for=192.168.0.2"; got == notWant {
+				t.Errorf("Forwarded: %v; want something else", got)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY UNKNOWN 192.168.0.2 192.168.0.100 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY UNKNOWN 192.168.0.2 192.168.0.100 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1Unknown",
@@ -1223,7 +1500,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1231,10 +1508,18 @@
 // TestH2H1ProxyProtocolV1JustUnknown tests PROXY protocol version 1
 // containing only "PROXY UNKNOWN" is accepted.
 func TestH2H1ProxyProtocolV1JustUnknown(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for"}, t, noopHandler)
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY UNKNOWN\r\n"))
+	if _, err := st.conn.Write(byte("PROXY UNKNOWN\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1JustUnknown",
@@ -1244,7 +1529,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1252,10 +1537,18 @@
 // TestH2H1ProxyProtocolV1TooLongLine tests PROXY protocol version 1
 // line longer than 107 bytes must be rejected
 func TestH2H1ProxyProtocolV1TooLongLine(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for"}, t, noopHandler)
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY UNKNOWN ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 65535 655350\r\n"))
+	if _, err := st.conn.Write(byte("PROXY UNKNOWN ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 65535 655350\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1TooLongLine",
@@ -1269,10 +1562,15 @@
 // TestH2H1ProxyProtocolV1BadLineEnd tests that PROXY protocol version
 // 1 line ending without \r\n should be rejected.
 func TestH2H1ProxyProtocolV1BadLineEnd(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 8080\r \n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 8080\r \n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1BadLineEnd",
@@ -1286,10 +1584,15 @@
 // TestH2H1ProxyProtocolV1NoEnd tests that PROXY protocol version 1
 // line containing no \r\n should be rejected.
 func TestH2H1ProxyProtocolV1NoEnd(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 8080"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 8080")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1NoEnd",
@@ -1303,12 +1606,17 @@
 // TestH2H1ProxyProtocolV1EmbeddedNULL tests that PROXY protocol
 // version 1 line containing NULL character should be rejected.
 func TestH2H1ProxyProtocolV1EmbeddedNULL(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	b := byte("PROXY TCP6 ::1*foo ::1 12345 8080\r\n")
 	b14 = 0
-	st.conn.Write(b)
+	if _, err := st.conn.Write(b); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1EmbeddedNULL",
@@ -1322,10 +1630,15 @@
 // TestH2H1ProxyProtocolV1MissingSrcPort tests that PROXY protocol
 // version 1 line without src port should be rejected.
 func TestH2H1ProxyProtocolV1MissingSrcPort(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1  8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1  8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1MissingSrcPort",
@@ -1339,10 +1652,15 @@
 // TestH2H1ProxyProtocolV1MissingDstPort tests that PROXY protocol
 // version 1 line without dst port should be rejected.
 func TestH2H1ProxyProtocolV1MissingDstPort(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 \r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 \r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1MissingDstPort",
@@ -1356,10 +1674,15 @@
 // TestH2H1ProxyProtocolV1InvalidSrcPort tests that PROXY protocol
 // containing invalid src port should be rejected.
 func TestH2H1ProxyProtocolV1InvalidSrcPort(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 123x 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 123x 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1InvalidSrcPort",
@@ -1373,10 +1696,15 @@
 // TestH2H1ProxyProtocolV1InvalidDstPort tests that PROXY protocol
 // containing invalid dst port should be rejected.
 func TestH2H1ProxyProtocolV1InvalidDstPort(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 123456 80x\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 123456 80x\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1InvalidDstPort",
@@ -1391,10 +1719,15 @@
 // version 1 line with non zero port with leading zero should be
 // rejected.
 func TestH2H1ProxyProtocolV1LeadingZeroPort(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 03000 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 03000 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1LeadingZeroPort",
@@ -1408,10 +1741,15 @@
 // TestH2H1ProxyProtocolV1TooLargeSrcPort tests that PROXY protocol
 // containing too large src port should be rejected.
 func TestH2H1ProxyProtocolV1TooLargeSrcPort(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 65536 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 65536 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1TooLargeSrcPort",
@@ -1425,10 +1763,15 @@
 // TestH2H1ProxyProtocolV1TooLargeDstPort tests that PROXY protocol
 // containing too large dst port should be rejected.
 func TestH2H1ProxyProtocolV1TooLargeDstPort(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 65536\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 ::1 12345 65536\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1TooLargeDstPort",
@@ -1442,10 +1785,15 @@
 // TestH2H1ProxyProtocolV1InvalidSrcAddr tests that PROXY protocol
 // containing invalid src addr should be rejected.
 func TestH2H1ProxyProtocolV1InvalidSrcAddr(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 192.168.0.1 ::1 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 192.168.0.1 ::1 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1InvalidSrcAddr",
@@ -1459,10 +1807,15 @@
 // TestH2H1ProxyProtocolV1InvalidDstAddr tests that PROXY protocol
 // containing invalid dst addr should be rejected.
 func TestH2H1ProxyProtocolV1InvalidDstAddr(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY TCP6 ::1 192.168.0.1 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY TCP6 ::1 192.168.0.1 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1InvalidDstAddr",
@@ -1476,10 +1829,15 @@
 // TestH2H1ProxyProtocolV1InvalidProtoFamily tests that PROXY protocol
 // containing invalid protocol family should be rejected.
 func TestH2H1ProxyProtocolV1InvalidProtoFamily(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PROXY UNIX ::1 ::1 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PROXY UNIX ::1 ::1 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1InvalidProtoFamily",
@@ -1493,10 +1851,15 @@
 // TestH2H1ProxyProtocolV1InvalidID tests that PROXY protocol
 // containing invalid PROXY protocol version 1 ID should be rejected.
 func TestH2H1ProxyProtocolV1InvalidID(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
-	st.conn.Write(byte("PR0XY TCP6 ::1 ::1 12345 8080\r\n"))
+	if _, err := st.conn.Write(byte("PR0XY TCP6 ::1 ::1 12345 8080\r\n")); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV1InvalidID",
@@ -1511,18 +1874,27 @@
 // containing AF_INET family is accepted and X-Forwarded-For contains
 // advertised src address.
 func TestH2H1ProxyProtocolV2TCP4(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), "for=192.168.0.2"; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), "for=192.168.0.2"; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	var b bytes.Buffer
-	writeProxyProtocolV2(&b, proxyProtocolV2{
+	if err := writeProxyProtocolV2(&b, proxyProtocolV2{
 		command: proxyProtocolV2CommandProxy,
 		sourceAddress: &net.TCPAddr{
 			IP:   net.ParseIP("192.168.0.2").To4(),
@@ -1533,8 +1905,13 @@
 			Port: 8080,
 		},
 		additionalData: byte("foobar"),
-	})
-	st.conn.Write(b.Bytes())
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	if _, err := st.conn.Write(b.Bytes()); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV2TCP4",
@@ -1544,7 +1921,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1553,18 +1930,27 @@
 // containing AF_INET6 family is accepted and X-Forwarded-For contains
 // advertised src address.
 func TestH2H1ProxyProtocolV2TCP6(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "2001:db8:85a3::8a2e:370:7334"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), `for="2001:db8:85a3::8a2e:370:7334"`; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "2001:db8:85a3::8a2e:370:7334"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), `for="2001:db8:85a3::8a2e:370:7334"`; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	var b bytes.Buffer
-	writeProxyProtocolV2(&b, proxyProtocolV2{
+	if err := writeProxyProtocolV2(&b, proxyProtocolV2{
 		command: proxyProtocolV2CommandProxy,
 		sourceAddress: &net.TCPAddr{
 			IP:   net.ParseIP("2001:0db8:85a3:0000:0000:8a2e:0370:7334"),
@@ -1575,8 +1961,13 @@
 			Port: 8080,
 		},
 		additionalData: byte("foobar"),
-	})
-	st.conn.Write(b.Bytes())
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	if _, err := st.conn.Write(b.Bytes()); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV2TCP6",
@@ -1586,7 +1977,115 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+}
+
+// TestH2H1ProxyProtocolV2TCP4TLS tests PROXY protocol version 2 over
+// TLS containing AF_INET family is accepted and X-Forwarded-For
+// contains advertised src address.
+func TestH2H1ProxyProtocolV2TCP4TLS(t *testing.T) {
+	var v2Hdr bytes.Buffer
+	if err := writeProxyProtocolV2(&v2Hdr, proxyProtocolV2{
+		command: proxyProtocolV2CommandProxy,
+		sourceAddress: &net.TCPAddr{
+			IP:   net.ParseIP("192.168.0.2").To4(),
+			Port: 12345,
+		},
+		destinationAddress: &net.TCPAddr{
+			IP:   net.ParseIP("192.168.0.100").To4(),
+			Port: 8080,
+		},
+		additionalData: byte("foobar"),
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), "for=192.168.0.2"; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+		tls:     true,
+		tcpData: v2Hdr.Bytes(),
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name: "TestH2H1ProxyProtocolV2TCP4TLS",
+	})
+
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+}
+
+// TestH2H1ProxyProtocolV2TCP6TLS tests PROXY protocol version 2 over
+// TLS containing AF_INET6 family is accepted and X-Forwarded-For
+// contains advertised src address.
+func TestH2H1ProxyProtocolV2TCP6TLS(t *testing.T) {
+	var v2Hdr bytes.Buffer
+	if err := writeProxyProtocolV2(&v2Hdr, proxyProtocolV2{
+		command: proxyProtocolV2CommandProxy,
+		sourceAddress: &net.TCPAddr{
+			IP:   net.ParseIP("2001:0db8:85a3:0000:0000:8a2e:0370:7334"),
+			Port: 12345,
+		},
+		destinationAddress: &net.TCPAddr{
+			IP:   net.ParseIP("::1"),
+			Port: 8080,
+		},
+		additionalData: byte("foobar"),
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "2001:db8:85a3::8a2e:370:7334"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), `for="2001:db8:85a3::8a2e:370:7334"`; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+		tls:     true,
+		tcpData: v2Hdr.Bytes(),
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name: "TestH2H1ProxyProtocolV2TCP6TLS",
+	})
+
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1594,18 +2093,27 @@
 // TestH2H1ProxyProtocolV2Local tests PROXY protocol version 2
 // containing cmd == Local is ignored.
 func TestH2H1ProxyProtocolV2Local(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "127.0.0.1"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), "for=127.0.0.1"; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "127.0.0.1"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), "for=127.0.0.1"; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	var b bytes.Buffer
-	writeProxyProtocolV2(&b, proxyProtocolV2{
+	if err := writeProxyProtocolV2(&b, proxyProtocolV2{
 		command: proxyProtocolV2CommandLocal,
 		sourceAddress: &net.TCPAddr{
 			IP:   net.ParseIP("192.168.0.2").To4(),
@@ -1616,8 +2124,13 @@
 			Port: 8080,
 		},
 		additionalData: byte("foobar"),
-	})
-	st.conn.Write(b.Bytes())
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	if _, err := st.conn.Write(b.Bytes()); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV2Local",
@@ -1627,7 +2140,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1635,11 +2148,14 @@
 // TestH2H1ProxyProtocolV2UnknownCmd tests PROXY protocol version 2
 // containing unknown cmd should be rejected.
 func TestH2H1ProxyProtocolV2UnknownCmd(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol"}, t, noopHandler)
+	opts := options{
+		args: string{"--accept-proxy-protocol"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	var b bytes.Buffer
-	writeProxyProtocolV2(&b, proxyProtocolV2{
+	if err := writeProxyProtocolV2(&b, proxyProtocolV2{
 		command: 0xf,
 		sourceAddress: &net.TCPAddr{
 			IP:   net.ParseIP("192.168.0.2").To4(),
@@ -1650,8 +2166,13 @@
 			Port: 8080,
 		},
 		additionalData: byte("foobar"),
-	})
-	st.conn.Write(b.Bytes())
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	if _, err := st.conn.Write(b.Bytes()); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	_, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV2UnknownCmd",
@@ -1665,18 +2186,27 @@
 // TestH2H1ProxyProtocolV2Unix tests PROXY protocol version 2
 // containing AF_UNIX family is ignored.
 func TestH2H1ProxyProtocolV2Unix(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "127.0.0.1"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), "for=127.0.0.1"; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "127.0.0.1"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), "for=127.0.0.1"; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	var b bytes.Buffer
-	writeProxyProtocolV2(&b, proxyProtocolV2{
+	if err := writeProxyProtocolV2(&b, proxyProtocolV2{
 		command: proxyProtocolV2CommandProxy,
 		sourceAddress: &net.UnixAddr{
 			Name: "/foo",
@@ -1687,8 +2217,13 @@
 			Net:  "unix",
 		},
 		additionalData: byte("foobar"),
-	})
-	st.conn.Write(b.Bytes())
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	if _, err := st.conn.Write(b.Bytes()); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV2Unix",
@@ -1698,7 +2233,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1706,22 +2241,36 @@
 // TestH2H1ProxyProtocolV2Unspec tests PROXY protocol version 2
 // containing AF_UNSPEC family is ignored.
 func TestH2H1ProxyProtocolV2Unspec(t *testing.T) {
-	st := newServerTester(string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "127.0.0.1"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), "for=127.0.0.1"; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--accept-proxy-protocol",
+			"--add-x-forwarded-for",
+			"--add-forwarded=for",
+			"--forwarded-for=ip",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("X-Forwarded-For"), "127.0.0.1"; got != want {
+				t.Errorf("X-Forwarded-For: %v; want %v", got, want)
+			}
+			if got, want := r.Header.Get("Forwarded"), "for=127.0.0.1"; got != want {
+				t.Errorf("Forwarded: %v; want %v", got, want)
+			}
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	var b bytes.Buffer
-	writeProxyProtocolV2(&b, proxyProtocolV2{
+	if err := writeProxyProtocolV2(&b, proxyProtocolV2{
 		command:        proxyProtocolV2CommandProxy,
 		additionalData: byte("foobar"),
-	})
-	st.conn.Write(b.Bytes())
+	}); err != nil {
+		t.Fatalf("Error writeProxyProtocolV2() = %v", err)
+	}
+
+	if _, err := st.conn.Write(b.Bytes()); err != nil {
+		t.Fatalf("Error st.conn.Write() = %v", err)
+	}
 
 	res, err := st.http2(requestParam{
 		name: "TestH2H1ProxyProtocolV2Unspec",
@@ -1731,7 +2280,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -1739,7 +2288,10 @@
 // TestH2H1ExternalDNS tests that DNS resolution using external DNS
 // with HTTP/1 backend works.
 func TestH2H1ExternalDNS(t *testing.T) {
-	st := newServerTester(string{"--external-dns"}, t, noopHandler)
+	opts := options{
+		args: string{"--external-dns"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1749,7 +2301,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -1757,7 +2309,10 @@
 // TestH2H1DNS tests that DNS resolution without external DNS with
 // HTTP/1 backend works.
 func TestH2H1DNS(t *testing.T) {
-	st := newServerTester(string{"--dns"}, t, noopHandler)
+	opts := options{
+		args: string{"--dns"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1767,7 +2322,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -1775,7 +2330,10 @@
 // TestH2H1HTTPSRedirect tests that the request to the backend which
 // requires TLS is redirected to https URI.
 func TestH2H1HTTPSRedirect(t *testing.T) {
-	st := newServerTester(string{"--redirect-if-not-tls"}, t, noopHandler)
+	opts := options{
+		args: string{"--redirect-if-not-tls"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1785,7 +2343,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 308; got != want {
+	if got, want := res.status, http.StatusPermanentRedirect; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("location"), "https://127.0.0.1/"; got != want {
@@ -1796,7 +2354,13 @@
 // TestH2H1HTTPSRedirectPort tests that the request to the backend
 // which requires TLS is redirected to https URI with given port.
 func TestH2H1HTTPSRedirectPort(t *testing.T) {
-	st := newServerTester(string{"--redirect-if-not-tls", "--redirect-https-port=8443"}, t, noopHandler)
+	opts := options{
+		args: string{
+			"--redirect-if-not-tls",
+			"--redirect-https-port=8443",
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1807,7 +2371,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 308; got != want {
+	if got, want := res.status, http.StatusPermanentRedirect; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("location"), "https://127.0.0.1:8443/foo?bar"; got != want {
@@ -1818,9 +2382,12 @@
 // TestH2H1Code204 tests that 204 response without content-length, and
 // transfer-encoding is valid.
 func TestH2H1Code204(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusNoContent)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1830,7 +2397,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 204; got != want {
+	if got, want := res.status, http.StatusNoContent; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -1838,21 +2405,26 @@
 // TestH2H1Code204CL0 tests that 204 response with content-length: 0
 // is allowed.
 func TestH2H1Code204CL0(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 204\r\nContent-Length: 0\r\n\r\n")
-		bufrw.Flush()
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			hj, ok := w.(http.Hijacker)
+			if !ok {
+				http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
+				return
+			}
+			conn, bufrw, err := hj.Hijack()
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+			defer conn.Close()
+			if _, err := bufrw.WriteString("HTTP/1.1 204\r\nContent-Length: 0\r\n\r\n"); err != nil {
+				t.Fatalf("Error bufrw.WriteString() = %v", err)
+			}
+			bufrw.Flush()
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1862,7 +2434,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 204; got != want {
+	if got, want := res.status, http.StatusNoContent; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -1874,21 +2446,26 @@
 // TestH2H1Code204CLNonzero tests that 204 response with nonzero
 // content-length is not allowed.
 func TestH2H1Code204CLNonzero(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 204\r\nContent-Length: 1\r\n\r\n")
-		bufrw.Flush()
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			hj, ok := w.(http.Hijacker)
+			if !ok {
+				http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
+				return
+			}
+			conn, bufrw, err := hj.Hijack()
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+			defer conn.Close()
+			if _, err := bufrw.WriteString("HTTP/1.1 204\r\nContent-Length: 1\r\n\r\n"); err != nil {
+				t.Fatalf("Error bufrw.WriteString() = %v", err)
+			}
+			bufrw.Flush()
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1898,7 +2475,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 502; got != want {
+	if got, want := res.status, http.StatusBadGateway; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -1906,21 +2483,26 @@
 // TestH2H1Code204TE tests that 204 response with transfer-encoding is
 // not allowed.
 func TestH2H1Code204TE(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 204\r\nTransfer-Encoding: chunked\r\n\r\n")
-		bufrw.Flush()
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			hj, ok := w.(http.Hijacker)
+			if !ok {
+				http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
+				return
+			}
+			conn, bufrw, err := hj.Hijack()
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+			defer conn.Close()
+			if _, err := bufrw.WriteString("HTTP/1.1 204\r\nTransfer-Encoding: chunked\r\n\r\n"); err != nil {
+				t.Fatalf("Error bufrw.WriteString() = %v", err)
+			}
+			bufrw.Flush()
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1930,7 +2512,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 502; got != want {
+	if got, want := res.status, http.StatusBadGateway; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -1938,7 +2520,10 @@
 // TestH2H1AffinityCookie tests that affinity cookie is sent back in
 // cleartext http.
 func TestH2H1AffinityCookie(t *testing.T) {
-	st := newServerTester(string{"--affinity-cookie"}, t, noopHandler)
+	opts := options{
+		args: string{"--affinity-cookie"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1948,7 +2533,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -1962,7 +2547,11 @@
 // TestH2H1AffinityCookieTLS tests that affinity cookie is sent back
 // in https.
 func TestH2H1AffinityCookieTLS(t *testing.T) {
-	st := newServerTesterTLS(string{"--affinity-cookie"}, t, noopHandler)
+	opts := options{
+		args: string{"--affinity-cookie"},
+		tls:  true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -1973,7 +2562,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -1986,7 +2575,7 @@
 
 // TestH2H1GracefulShutdown tests graceful shutdown.
 func TestH2H1GracefulShutdown(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
+	st := newServerTester(t, options{})
 	defer st.Close()
 
 	fmt.Fprint(st.conn, "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n")
@@ -2015,7 +2604,10 @@
 	}
 
 	// send SIGQUIT signal to nghttpx to perform graceful shutdown
-	st.cmd.Process.Signal(syscall.SIGQUIT)
+	if err := st.cmd.Process.Signal(syscall.SIGQUIT); err != nil {
+		t.Fatalf("Error st.cmd.Process.Signal() = %v", err)
+	}
+
 	time.Sleep(150 * time.Millisecond)
 
 	// after signal, finish request body
@@ -2039,7 +2631,7 @@
 		}
 		switch f := fr.(type) {
 		case *http2.GoAwayFrame:
-			numGoAway += 1
+			numGoAway++
 			want := http2.ErrCodeNo
 			if got := f.ErrCode; got != want {
 				t.Fatalf("f.ErrCode(%v): %v; want %v", numGoAway, got, want)
@@ -2065,10 +2657,14 @@
 // TestH2H2MultipleResponseCL tests that server returns error if
 // multiple Content-Length response header fields are received.
 func TestH2H2MultipleResponseCL(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("content-length", "1")
-		w.Header().Add("content-length", "1")
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("content-length", "1")
+			w.Header().Add("content-length", "1")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2086,9 +2682,13 @@
 // Content-Length response header field value cannot be parsed as a
 // number.
 func TestH2H2InvalidResponseCL(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("content-length", "")
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("content-length", "")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2105,7 +2705,10 @@
 // // TestH2H2ConnectFailure tests that server handles the situation that
 // // connection attempt to HTTP/2 backend failed.
 // func TestH2H2ConnectFailure(t *testing.T) {
-// 	st := newServerTester(string{"--http2-bridge"}, t, noopHandler)
+// 	opts := options{
+// 		args: string{"--http2-bridge"},
+// 	}
+// 	st := newServerTester(t, opts)
 // 	defer st.Close()
 
 // 	// simulate backend connect attempt failure
@@ -2125,9 +2728,13 @@
 
 // TestH2H2HostRewrite tests that server rewrites host header field
 func TestH2H2HostRewrite(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--host-rewrite"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		args: string{"--http2-bridge", "--host-rewrite"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2136,7 +2743,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("request-host"), st.backendHost; got != want {
@@ -2147,9 +2754,13 @@
 // TestH2H2NoHostRewrite tests that server does not rewrite host
 // header field
 func TestH2H2NoHostRewrite(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add("request-host", r.Host)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2158,7 +2769,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 	if got, want := res.header.Get("request-host"), st.frontendHost; got != want {
@@ -2170,11 +2781,16 @@
 // with http value since :scheme is http, even if the frontend
 // connection is encrypted.
 func TestH2H2TLSXfp(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("x-forwarded-proto"), "http"; got != want {
-			t.Errorf("x-forwarded-proto: want %v; got %v", want, got)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("x-forwarded-proto"), "http"; got != want {
+				t.Errorf("x-forwarded-proto: want %v; got %v", want, got)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2183,7 +2799,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -2191,12 +2807,20 @@
 // TestH2H2AddXfp tests that server appends :scheme to the existing
 // x-forwarded-proto header field.
 func TestH2H2AddXfp(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo, http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--no-strip-incoming-x-forwarded-proto",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xfp := r.Header.Get("X-Forwarded-Proto")
+			if got, want := xfp, "foo, http"; got != want {
+				t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2208,7 +2832,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2216,12 +2840,21 @@
 // TestH2H2NoAddXfp tests that server does not append :scheme to the
 // existing x-forwarded-proto header field.
 func TestH2H2NoAddXfp(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--no-add-x-forwarded-proto", "--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--no-add-x-forwarded-proto",
+			"--no-strip-incoming-x-forwarded-proto",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xfp := r.Header.Get("X-Forwarded-Proto")
+			if got, want := xfp, "foo"; got != want {
+				t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2233,7 +2866,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2241,12 +2874,17 @@
 // TestH2H2StripXfp tests that server strips incoming
 // x-forwarded-proto header field.
 func TestH2H2StripXfp(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xfp := r.Header.Get("X-Forwarded-Proto")
+			if got, want := xfp, "http"; got != want {
+				t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2258,7 +2896,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2266,11 +2904,16 @@
 // TestH2H2StripNoAddXfp tests that server strips incoming
 // x-forwarded-proto header field, and does not add another.
 func TestH2H2StripNoAddXfp(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--no-add-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header"X-Forwarded-Proto"; found {
-			t.Errorf("X-Forwarded-Proto = %q; want nothing", got)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge", "--no-add-x-forwarded-proto"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, found := r.Header"X-Forwarded-Proto"; found {
+				t.Errorf("X-Forwarded-Proto = %q; want nothing", got)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2282,7 +2925,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2290,13 +2933,18 @@
 // TestH2H2AddXff tests that server generates X-Forwarded-For header
 // field when forwarding request to backend.
 func TestH2H2AddXff(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge", "--add-x-forwarded-for"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xff := r.Header.Get("X-Forwarded-For")
+			want := "127.0.0.1"
+			if xff != want {
+				t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2305,7 +2953,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2313,13 +2961,18 @@
 // TestH2H2AddXff2 tests that server appends X-Forwarded-For header
 // field to existing one when forwarding request to backend.
 func TestH2H2AddXff2(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "host, 127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge", "--add-x-forwarded-for"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xff := r.Header.Get("X-Forwarded-For")
+			want := "host, 127.0.0.1"
+			if xff != want {
+				t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2331,7 +2984,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2339,11 +2992,19 @@
 // TestH2H2StripXff tests that --strip-incoming-x-forwarded-for
 // option.
 func TestH2H2StripXff(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--strip-incoming-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if xff, found := r.Header"X-Forwarded-For"; found {
-			t.Errorf("X-Forwarded-For = %v; want nothing", xff)
-		}
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--strip-incoming-x-forwarded-for",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if xff, found := r.Header"X-Forwarded-For"; found {
+				t.Errorf("X-Forwarded-For = %v; want nothing", xff)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2355,7 +3016,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2363,13 +3024,22 @@
 // TestH2H2StripAddXff tests that --strip-incoming-x-forwarded-for and
 // --add-x-forwarded-for options.
 func TestH2H2StripAddXff(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--strip-incoming-x-forwarded-for", "--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--strip-incoming-x-forwarded-for",
+			"--add-x-forwarded-for",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			xff := r.Header.Get("X-Forwarded-For")
+			want := "127.0.0.1"
+			if xff != want {
+				t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2381,7 +3051,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2389,13 +3059,22 @@
 // TestH2H2AddForwarded tests that server generates Forwarded header
 // field using static obfuscated "by" parameter.
 func TestH2H2AddForwarded(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--add-forwarded=by,for,host,proto", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := fmt.Sprintf(`by=_alpha;for=_^;+;host="127\.0\.0\.1:%v";proto=https`, serverPort)
-		validFwd := regexp.MustCompile(pattern)
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--add-forwarded=by,for,host,proto",
+			"--forwarded-by=_alpha",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			pattern := fmt.Sprintf(`by=_alpha;for=_^;+;host="127\.0\.0\.1:%v";proto=https`, serverPort)
+			validFwd := regexp.MustCompile(pattern)
+			if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
+				t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2405,7 +3084,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -2414,12 +3093,21 @@
 // header field using static obfuscated "by" parameter, and
 // existing Forwarded header field.
 func TestH2H2AddForwardedMerge(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--add-forwarded=by,host,proto", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		want := fmt.Sprintf(`host=foo, by=_alpha;host="127.0.0.1:%v";proto=https`, serverPort)
-		if got := r.Header.Get("Forwarded"); got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--add-forwarded=by,host,proto",
+			"--forwarded-by=_alpha",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			want := fmt.Sprintf(`host=foo, by=_alpha;host="127.0.0.1:%v";proto=https`, serverPort)
+			if got := r.Header.Get("Forwarded"); got != want {
+				t.Errorf("Forwarded = %v; want %v", got, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2432,7 +3120,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -2441,12 +3129,22 @@
 // header field using static obfuscated "by" parameter, and
 // existing Forwarded header field stripped.
 func TestH2H2AddForwardedStrip(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--strip-incoming-forwarded", "--add-forwarded=by,host,proto", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		want := fmt.Sprintf(`by=_alpha;host="127.0.0.1:%v";proto=https`, serverPort)
-		if got := r.Header.Get("Forwarded"); got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--strip-incoming-forwarded",
+			"--add-forwarded=by,host,proto",
+			"--forwarded-by=_alpha",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			want := fmt.Sprintf(`by=_alpha;host="127.0.0.1:%v";proto=https`, serverPort)
+			if got := r.Header.Get("Forwarded"); got != want {
+				t.Errorf("Forwarded = %v; want %v", got, want)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2459,7 +3157,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -2467,11 +3165,16 @@
 // TestH2H2StripForwarded tests that server strips incoming Forwarded
 // header field.
 func TestH2H2StripForwarded(t *testing.T) {
-	st := newServerTesterTLS(string{"--http2-bridge", "--strip-incoming-forwarded"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header"Forwarded"; found {
-			t.Errorf("Forwarded = %v; want nothing", got)
-		}
-	})
+	opts := options{
+		args: string{"--http2-bridge", "--strip-incoming-forwarded"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, found := r.Header"Forwarded"; found {
+				t.Errorf("Forwarded = %v; want nothing", got)
+			}
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2484,7 +3187,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status: %v; want %v", got, want)
 	}
 }
@@ -2492,9 +3195,16 @@
 // TestH2H2ReqPhaseReturn tests mruby request phase hook returns
 // custom response.
 func TestH2H2ReqPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--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()
 
 	res, err := st.http2(requestParam{
@@ -2504,7 +3214,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -2528,7 +3238,13 @@
 // TestH2H2RespPhaseReturn tests mruby response phase hook returns
 // custom response.
 func TestH2H2RespPhaseReturn(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--mruby-file=" + testDir + "/resp-return.rb",
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2538,7 +3254,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 
@@ -2562,7 +3278,10 @@
 // TestH2H2ExternalDNS tests that DNS resolution using external DNS
 // with HTTP/2 backend works.
 func TestH2H2ExternalDNS(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--external-dns"}, t, noopHandler)
+	opts := options{
+		args: string{"--http2-bridge", "--external-dns"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2572,7 +3291,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2580,7 +3299,10 @@
 // TestH2H2DNS tests that DNS resolution without external DNS with
 // HTTP/2 backend works.
 func TestH2H2DNS(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge", "--dns"}, t, noopHandler)
+	opts := options{
+		args: string{"--http2-bridge", "--dns"},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2590,7 +3312,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2598,9 +3320,13 @@
 // TestH2H2Code204 tests that 204 response without content-length, and
 // transfer-encoding is valid.
 func TestH2H2Code204(t *testing.T) {
-	st := newServerTester(string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	})
+	opts := options{
+		args: string{"--http2-bridge"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusNoContent)
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2610,7 +3336,7 @@
 		t.Fatalf("Error st.http2() = %v", err)
 	}
 
-	if got, want := res.status, 204; got != want {
+	if got, want := res.status, http.StatusNoContent; got != want {
 		t.Errorf("status = %v; want %v", got, want)
 	}
 }
@@ -2618,9 +3344,14 @@
 // TestH2APIBackendconfig exercise backendconfig API endpoint routine
 // for successful case.
 func TestH2APIBackendconfig(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2635,7 +3366,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -2655,9 +3386,14 @@
 // TestH2APIBackendconfigQuery exercise backendconfig API endpoint
 // routine with query.
 func TestH2APIBackendconfigQuery(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2672,7 +3408,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -2692,9 +3428,14 @@
 // TestH2APIBackendconfigBadMethod exercise backendconfig API endpoint
 // routine with bad method.
 func TestH2APIBackendconfigBadMethod(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2709,7 +3450,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 405; got != want {
+	if got, want := res.status, http.StatusMethodNotAllowed; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -2728,9 +3469,14 @@
 
 // TestH2APIConfigrevision tests configrevision API.
 func TestH2APIConfigrevision(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2741,7 +3487,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want = %v", got, want)
 	}
 
@@ -2766,9 +3512,14 @@
 // TestH2APINotFound exercise backendconfig API endpoint routine when
 // API endpoint is not found.
 func TestH2APINotFound(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
+	opts := options{
+		args: string{"-f127.0.0.1,3010;api;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3010,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2783,7 +3534,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 
@@ -2802,9 +3553,14 @@
 
 // TestH2Healthmon tests health monitor endpoint.
 func TestH2Healthmon(t *testing.T) {
-	st := newServerTesterConnectPort(string{"-f127.0.0.1,3011;healthmon;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3011)
+	opts := options{
+		args: string{"-f127.0.0.1,3011;healthmon;no-tls"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		connectPort: 3011,
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2814,7 +3570,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 200; got != want {
+	if got, want := res.status, http.StatusOK; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -2822,9 +3578,13 @@
 // TestH2ResponseBeforeRequestEnd tests the situation where response
 // ends before request body finishes.
 func TestH2ResponseBeforeRequestEnd(t *testing.T) {
-	st := newServerTester(string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("request should not be forwarded")
-	})
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/req-return.rb"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("request should not be forwarded")
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2834,7 +3594,7 @@
 	if err != nil {
 		t.Fatalf("Error st.http2() = %v", err)
 	}
-	if got, want := res.status, 404; got != want {
+	if got, want := res.status, http.StatusNotFound; got != want {
 		t.Errorf("res.status: %v; want %v", got, want)
 	}
 }
@@ -2842,21 +3602,26 @@
 // TestH2H1ChunkedEndsPrematurely tests that a stream is reset if the
 // backend chunked encoded response ends prematurely.
 func TestH2H1ChunkedEndsPrematurely(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n")
-		bufrw.Flush()
-	})
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			hj, ok := w.(http.Hijacker)
+			if !ok {
+				http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
+				return
+			}
+			conn, bufrw, err := hj.Hijack()
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+			defer conn.Close()
+			if _, err := bufrw.WriteString("HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n"); err != nil {
+				t.Fatalf("Error bufrw.WriteString() = %v", err)
+			}
+			bufrw.Flush()
+		},
+	}
+	st := newServerTester(t, opts)
 	defer st.Close()
 
 	res, err := st.http2(requestParam{
@@ -2870,3 +3635,106 @@
 		t.Errorf("res.errCode = %v; want %v", got, want)
 	}
 }
+
+// TestH2H1RequireHTTPSchemeHTTPSWithoutEncryption verifies that https
+// scheme in non-encrypted connection is treated as error.
+func TestH2H1RequireHTTPSchemeHTTPSWithoutEncryption(t *testing.T) {
+	opts := options{
+		args: string{"--require-http-scheme"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name:   "TestH2H1RequireHTTPSchemeHTTPSWithoutEncryption",
+		scheme: "https",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusBadRequest; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+}
+
+// TestH2H1RequireHTTPSchemeHTTPWithEncryption verifies that http
+// scheme in encrypted connection is treated as error.
+func TestH2H1RequireHTTPSchemeHTTPWithEncryption(t *testing.T) {
+	opts := options{
+		args: string{"--require-http-scheme"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name:   "TestH2H1RequireHTTPSchemeHTTPWithEncryption",
+		scheme: "http",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusBadRequest; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+}
+
+// TestH2H1RequireHTTPSchemeUnknownSchemeWithoutEncryption verifies
+// that unknown scheme in non-encrypted connection is treated as
+// error.
+func TestH2H1RequireHTTPSchemeUnknownSchemeWithoutEncryption(t *testing.T) {
+	opts := options{
+		args: string{"--require-http-scheme"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name:   "TestH2H1RequireHTTPSchemeUnknownSchemeWithoutEncryption",
+		scheme: "unknown",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusBadRequest; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+}
+
+// TestH2H1RequireHTTPSchemeUnknownSchemeWithEncryption verifies that
+// unknown scheme in encrypted connection is treated as error.
+func TestH2H1RequireHTTPSchemeUnknownSchemeWithEncryption(t *testing.T) {
+	opts := options{
+		args: string{"--require-http-scheme"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Errorf("server should not forward this request")
+		},
+		tls: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name:   "TestH2H1RequireHTTPSchemeUnknownSchemeWithEncryption",
+		scheme: "unknown",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusBadRequest; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/integration-tests/nghttpx_http3_test.go Added

@@ -0,0 +1,393 @@
+//go:build quic
+
+package nghttp2
+
+import (
+	"bytes"
+	"crypto/rand"
+	"io"
+	"net/http"
+	"regexp"
+	"testing"
+
+	"golang.org/x/net/http2/hpack"
+)
+
+// TestH3H1PlainGET tests whether simple HTTP/3 GET request works.
+func TestH3H1PlainGET(t *testing.T) {
+	st := newServerTester(t, options{
+		quic: true,
+	})
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H1PlainGET",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+}
+
+// TestH3H1RequestBody tests HTTP/3 request with body works.
+func TestH3H1RequestBody(t *testing.T) {
+	body := make(byte, 3333)
+	_, err := rand.Read(body)
+	if err != nil {
+		t.Fatalf("Unable to create request body: %v", err)
+	}
+
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			buf := make(byte, 4096)
+			buflen := 0
+			p := buf
+
+			for {
+				if len(p) == 0 {
+					t.Fatal("Request body is too large")
+				}
+
+				n, err := r.Body.Read(p)
+
+				p = pn:
+				buflen += n
+
+				if err != nil {
+					if err == io.EOF {
+						break
+					}
+
+					t.Fatalf("r.Body.Read() = %v", err)
+				}
+			}
+
+			buf = buf:buflen
+
+			if got, want := buf, body; !bytes.Equal(got, want) {
+				t.Fatalf("buf = %v; want %v", got, want)
+			}
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H1RequestBody",
+		body: body,
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+}
+
+// TestH3H1GenerateVia tests that server generates Via header field to
+// and from backend server.
+func TestH3H1GenerateVia(t *testing.T) {
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "3 nghttpx"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H1GenerateVia",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+	if got, want := res.header.Get("Via"), "1.1 nghttpx"; got != want {
+		t.Errorf("Via: %v; want %v", got, want)
+	}
+}
+
+// TestH3H1AppendVia tests that server adds value to existing Via
+// header field to and from backend server.
+func TestH3H1AppendVia(t *testing.T) {
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "foo, 3 nghttpx"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+			w.Header().Add("Via", "bar")
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H1AppendVia",
+		header: hpack.HeaderField{
+			pair("via", "foo"),
+		},
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+	if got, want := res.header.Get("Via"), "bar, 1.1 nghttpx"; got != want {
+		t.Errorf("Via: %v; want %v", got, want)
+	}
+}
+
+// TestH3H1NoVia tests that server does not add value to existing Via
+// header field to and from backend server.
+func TestH3H1NoVia(t *testing.T) {
+	opts := options{
+		args: string{"--no-via"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			if got, want := r.Header.Get("Via"), "foo"; got != want {
+				t.Errorf("Via: %v; want %v", got, want)
+			}
+			w.Header().Add("Via", "bar")
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H1NoVia",
+		header: hpack.HeaderField{
+			pair("via", "foo"),
+		},
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+	if got, want := res.header.Get("Via"), "bar"; got != want {
+		t.Errorf("Via: %v; want %v", got, want)
+	}
+}
+
+// TestH3H1BadResponseCL tests that server returns error when
+// content-length response header field value does not match its
+// response body size.
+func TestH3H1BadResponseCL(t *testing.T) {
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			// we set content-length: 1024, but only send 3 bytes.
+			w.Header().Add("Content-Length", "1024")
+			if _, err := w.Write(byte("foo")); err != nil {
+				t.Fatalf("Error w.Write() = %v", err)
+			}
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	_, err := st.http3(requestParam{
+		name: "TestH3H1BadResponseCL",
+	})
+	if err == nil {
+		t.Fatal("st.http3() should fail")
+	}
+}
+
+// TestH3H1HTTPSRedirect tests that HTTPS redirect should not happen
+// with HTTP/3.
+func TestH3H1HTTPSRedirect(t *testing.T) {
+	opts := options{
+		args: string{"--redirect-if-not-tls"},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H1HTTPSRedirect",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+}
+
+// TestH3H1AffinityCookieTLS tests that affinity cookie is sent back
+// in https.
+func TestH3H1AffinityCookieTLS(t *testing.T) {
+	opts := options{
+		args: string{"--affinity-cookie"},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name:   "TestH3H1AffinityCookieTLS",
+		scheme: "https",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusOK; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+
+	const pattern = `affinity=0-9a-f{8}; Path=/foo/bar; Secure`
+	validCookie := regexp.MustCompile(pattern)
+	if got := res.header.Get("Set-Cookie"); !validCookie.MatchString(got) {
+		t.Errorf("Set-Cookie: %v; want pattern %v", got, pattern)
+	}
+}
+
+// TestH3H2ReqPhaseReturn tests mruby request phase hook returns
+// custom response.
+func TestH3H2ReqPhaseReturn(t *testing.T) {
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--mruby-file=" + testDir + "/req-return.rb",
+		},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatalf("request should not be forwarded")
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H2ReqPhaseReturn",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusNotFound; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+
+	hdtests := struct {
+		k, v string
+	}{
+		{"content-length", "20"},
+		{"from", "mruby"},
+	}
+	for _, tt := range hdtests {
+		if got, want := res.header.Get(tt.k), tt.v; got != want {
+			t.Errorf("%v = %v; want %v", tt.k, got, want)
+		}
+	}
+
+	if got, want := string(res.body), "Hello World from req"; got != want {
+		t.Errorf("body = %v; want %v", got, want)
+	}
+}
+
+// TestH3H2RespPhaseReturn tests mruby response phase hook returns
+// custom response.
+func TestH3H2RespPhaseReturn(t *testing.T) {
+	opts := options{
+		args: string{
+			"--http2-bridge",
+			"--mruby-file=" + testDir + "/resp-return.rb",
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name: "TestH3H2RespPhaseReturn",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+
+	if got, want := res.status, http.StatusNotFound; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+
+	hdtests := struct {
+		k, v string
+	}{
+		{"content-length", "21"},
+		{"from", "mruby"},
+	}
+	for _, tt := range hdtests {
+		if got, want := res.header.Get(tt.k), tt.v; got != want {
+			t.Errorf("%v = %v; want %v", tt.k, got, want)
+		}
+	}
+
+	if got, want := string(res.body), "Hello World from resp"; got != want {
+		t.Errorf("body = %v; want %v", got, want)
+	}
+}
+
+// TestH3ResponseBeforeRequestEnd tests the situation where response
+// ends before request body finishes.
+func TestH3ResponseBeforeRequestEnd(t *testing.T) {
+	opts := options{
+		args: string{"--mruby-file=" + testDir + "/req-return.rb"},
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			t.Fatal("request should not be forwarded")
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	res, err := st.http3(requestParam{
+		name:        "TestH3ResponseBeforeRequestEnd",
+		noEndStream: true,
+	})
+	if err != nil {
+		t.Fatalf("Error st.http3() = %v", err)
+	}
+	if got, want := res.status, http.StatusNotFound; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+}
+
+// TestH3H1ChunkedEndsPrematurely tests that a stream is reset if the
+// backend chunked encoded response ends prematurely.
+func TestH3H1ChunkedEndsPrematurely(t *testing.T) {
+	opts := options{
+		handler: func(w http.ResponseWriter, r *http.Request) {
+			hj, ok := w.(http.Hijacker)
+			if !ok {
+				http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
+				return
+			}
+			conn, bufrw, err := hj.Hijack()
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+			defer conn.Close()
+			if _, err := bufrw.WriteString("HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n"); err != nil {
+				t.Fatalf("Error bufrw.WriteString() = %v", err)
+			}
+			bufrw.Flush()
+		},
+		quic: true,
+	}
+	st := newServerTester(t, opts)
+	defer st.Close()
+
+	_, err := st.http3(requestParam{
+		name: "TestH3H1ChunkedEndsPrematurely",
+	})
+	if err == nil {
+		t.Fatal("st.http3() should fail")
+	}
+}

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

@@ -3,16 +3,12 @@
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"crypto/tls"
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/tatsuhiro-t/go-nghttp2"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/websocket"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -25,6 +21,12 @@
 	"syscall"
 	"testing"
 	"time"
+
+	"github.com/lucas-clemente/quic-go/http3"
+	"github.com/tatsuhiro-t/go-nghttp2"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
+	"golang.org/x/net/websocket"
 )
 
 const (
@@ -42,7 +44,6 @@
 }
 
 type serverTester struct {
-	args          string  // command-line arguments
 	cmd           *exec.Cmd // test frontend server process, which is test subject
 	url           string    // test frontend server URL
 	t             *testing.T
@@ -62,46 +63,48 @@
 	errCh         chan error
 }
 
-// newServerTester creates test context for plain TCP frontend
-// connection.
-func newServerTester(args string, t *testing.T, handler http.HandlerFunc) *serverTester {
-	return newServerTesterInternal(args, t, handler, false, serverPort, nil)
-}
-
-func newServerTesterConnectPort(args string, t *testing.T, handler http.HandlerFunc, port int) *serverTester {
-	return newServerTesterInternal(args, t, handler, false, port, nil)
-}
-
-func newServerTesterHandler(args string, t *testing.T, handler http.Handler) *serverTester {
-	return newServerTesterInternal(args, t, handler, false, serverPort, nil)
-}
-
-// newServerTester creates test context for TLS frontend connection.
-func newServerTesterTLS(args string, t *testing.T, handler http.HandlerFunc) *serverTester {
-	return newServerTesterInternal(args, t, handler, true, serverPort, nil)
-}
-
-func newServerTesterTLSConnectPort(args string, t *testing.T, handler http.HandlerFunc, port int) *serverTester {
-	return newServerTesterInternal(args, t, handler, true, port, nil)
+type options struct {
+	// args is the additional arguments to nghttpx.
+	args string
+	// handler is the handler to handle the request.  It defaults
+	// to noopHandler.
+	handler http.HandlerFunc
+	// connectPort is the server side port where client connection
+	// is made.  It defaults to serverPort.
+	connectPort int
+	// tls, if set to true, sets up TLS frontend connection.
+	tls bool
+	// tlsConfig is the client side TLS configuration that is used
+	// when tls is true.
+	tlsConfig *tls.Config
+	// tcpData is additional data that are written to connection
+	// before TLS handshake starts.  This field is ignored if tls
+	// is false.
+	tcpData byte
+	// quic, if set to true, sets up QUIC frontend connection.
+	// quic implies tls = true.
+	quic bool
 }
 
-// newServerTester creates test context for TLS frontend connection
-// with given clientConfig
-func newServerTesterTLSConfig(args string, t *testing.T, handler http.HandlerFunc, clientConfig *tls.Config) *serverTester {
-	return newServerTesterInternal(args, t, handler, true, serverPort, clientConfig)
-}
+// newServerTester creates test context.
+func newServerTester(t *testing.T, opts options) *serverTester {
+	if opts.quic {
+		opts.tls = true
+	}
 
-// newServerTesterInternal creates test context.  If frontendTLS is
-// true, set up TLS frontend connection.  connectPort is the server
-// side port where client connection is made.
-func newServerTesterInternal(src_args string, t *testing.T, handler http.Handler, frontendTLS bool, connectPort int, clientConfig *tls.Config) *serverTester {
-	ts := httptest.NewUnstartedServer(handler)
+	if opts.handler == nil {
+		opts.handler = noopHandler
+	}
+	if opts.connectPort == 0 {
+		opts.connectPort = serverPort
+	}
 
-	args := string{}
+	ts := httptest.NewUnstartedServer(opts.handler)
 
+	var args string
 	var backendTLS, dns, externalDNS, acceptProxyProtocol, redirectIfNotTLS, affinityCookie, alpnH1 bool
 
-	for _, k := range src_args {
+	for _, k := range opts.args {
 		switch k {
 		case "--http2-bridge":
 			backendTLS = true
@@ -135,7 +138,7 @@
 		ts.Start()
 	}
 	scheme := "http"
-	if frontendTLS {
+	if opts.tls {
 		scheme = "https"
 		args = append(args, testDir+"/server.key", testDir+"/server.crt")
 	}
@@ -175,7 +178,7 @@
 	}
 
 	noTLS := ";no-tls"
-	if frontendTLS {
+	if opts.tls {
 		noTLS = ""
 	}
 
@@ -187,7 +190,13 @@
 	args = append(args, fmt.Sprintf("-f127.0.0.1,%v%v%v", serverPort, noTLS, proxyProto), b,
 		"--errorlog-file="+logDir+"/log.txt", "-LINFO")
 
-	authority := fmt.Sprintf("127.0.0.1:%v", connectPort)
+	if opts.quic {
+		args = append(args,
+			fmt.Sprintf("-f127.0.0.1,%v;quic", serverPort),
+			"--no-quic-bpf")
+	}
+
+	authority := fmt.Sprintf("127.0.0.1:%v", opts.connectPort)
 
 	st := &serverTester{
 		cmd:          exec.Command(serverBin, args...),
@@ -213,14 +222,20 @@
 	for {
 		time.Sleep(50 * time.Millisecond)
 
-		var conn net.Conn
-		var err error
-		if frontendTLS {
+		conn, err := net.Dial("tcp", authority)
+		if err == nil && opts.tls {
+			if len(opts.tcpData) > 0 {
+				if _, err := conn.Write(opts.tcpData); err != nil {
+					st.Close()
+					st.t.Fatal("Error writing TCP data")
+				}
+			}
+
 			var tlsConfig *tls.Config
-			if clientConfig == nil {
+			if opts.tlsConfig == nil {
 				tlsConfig = new(tls.Config)
 			} else {
-				tlsConfig = clientConfig
+				tlsConfig = opts.tlsConfig.Clone()
 			}
 			tlsConfig.InsecureSkipVerify = true
 			if alpnH1 {
@@ -228,26 +243,20 @@
 			} else {
 				tlsConfig.NextProtos = string{"h2"}
 			}
-			conn, err = tls.Dial("tcp", authority, tlsConfig)
-		} else {
-			conn, err = net.Dial("tcp", authority)
+			tlsConn := tls.Client(conn, tlsConfig)
+			err = tlsConn.Handshake()
+			if err == nil {
+				conn = tlsConn
+			}
 		}
 		if err != nil {
-			retry += 1
+			retry++
 			if retry >= 100 {
 				st.Close()
 				st.t.Fatalf("Error server is not responding too long; server command-line arguments may be invalid")
 			}
 			continue
 		}
-		if frontendTLS {
-			tlsConn := conn.(*tls.Conn)
-			cs := tlsConn.ConnectionState()
-			if !cs.NegotiatedProtocolIsMutual {
-				st.Close()
-				st.t.Fatalf("Error negotiated next protocol is not mutual")
-			}
-		}
 		st.conn = conn
 		break
 	}
@@ -268,16 +277,22 @@
 	if st.cmd != nil {
 		done := make(chan struct{})
 		go func() {
-			st.cmd.Wait()
+			if err := st.cmd.Wait(); err != nil {
+				st.t.Errorf("Error st.cmd.Wait() = %v", err)
+			}
 			close(done)
 		}()
 
-		st.cmd.Process.Signal(syscall.SIGQUIT)
+		if err := st.cmd.Process.Signal(syscall.SIGQUIT); err != nil {
+			st.t.Errorf("Error st.cmd.Process.Signal() = %v", err)
+		}
 
 		select {
 		case <-done:
 		case <-time.After(10 * time.Second):
-			st.cmd.Process.Kill()
+			if err := st.cmd.Process.Kill(); err != nil {
+				st.t.Errorf("Error st.cmd.Process.Kill() = %v", err)
+			}
 			<-done
 		}
 	}
@@ -340,7 +355,7 @@
 	return cbr.body.Read(p)
 }
 
-func (st *serverTester) websocket(rp requestParam) (*serverResponse, error) {
+func (st *serverTester) websocket(rp requestParam) *serverResponse {
 	urlstring := st.url + "/echo"
 
 	config, err := websocket.NewConfig(urlstring, st.url)
@@ -372,6 +387,81 @@
 		body: msg:n,
 	}
 
+	return res
+}
+
+func (st *serverTester) http3(rp requestParam) (*serverResponse, error) {
+	rt := &http3.RoundTripper{
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true,
+		},
+	}
+
+	defer rt.Close()
+
+	c := &http.Client{
+		Transport: rt,
+	}
+
+	method := "GET"
+	if rp.method != "" {
+		method = rp.method
+	}
+
+	var body io.Reader
+
+	if rp.body != nil {
+		body = bytes.NewBuffer(rp.body)
+	}
+
+	reqURL := st.url
+
+	if rp.path != "" {
+		u, err := url.Parse(st.url)
+		if err != nil {
+			st.t.Fatalf("Error parsing URL from st.url %v: %v", st.url, err)
+		}
+		u.Path = ""
+		u.RawQuery = ""
+		reqURL = u.String() + rp.path
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	req, err := http.NewRequestWithContext(ctx, method, reqURL, body)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, h := range rp.header {
+		req.Header.Add(h.Name, h.Value)
+	}
+
+	req.Header.Add("Test-Case", rp.name)
+
+	// TODO http3 package does not support trailer at the time of
+	// this writing.
+
+	resp, err := c.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+
+	respBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	res := &serverResponse{
+		status:    resp.StatusCode,
+		header:    resp.Header,
+		body:      respBody,
+		connClose: resp.Close,
+	}
+
 	return res, nil
 }
 
@@ -406,7 +496,10 @@
 		reqURL = u.String() + rp.path
 	}
 
-	req, err := http.NewRequest(method, reqURL, body)
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	req, err := http.NewRequestWithContext(ctx, method, reqURL, body)
 	if err != nil {
 		return nil, err
 	}
@@ -430,7 +523,7 @@
 	if err != nil {
 		return nil, err
 	}
-	respBody, err := ioutil.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -561,7 +654,7 @@
 			var status int
 			status, err = strconv.Atoi(sr.header.Get(":status"))
 			if err != nil {
-				return res, fmt.Errorf("Error parsing status code: %v", err)
+				return res, fmt.Errorf("Error parsing status code: %w", err)
 			}
 			sr.status = status
 			if f.StreamEnded() {
@@ -664,7 +757,9 @@
 }
 
 func noopHandler(w http.ResponseWriter, r *http.Request) {
-	ioutil.ReadAll(r.Body)
+	if _, err := io.ReadAll(r.Body); err != nil {
+		http.Error(w, fmt.Sprintf("Error io.ReadAll() = %v", err), http.StatusInternalServerError)
+	}
 }
 
 type APIResponse struct {
@@ -704,9 +799,13 @@
 	proxyProtocolV2ProtocolDgram  proxyProtocolV2Protocol = 0x2
 )
 
-func writeProxyProtocolV2(w io.Writer, hdr proxyProtocolV2) {
-	w.Write(byte{0x0D, 0x0A, 0x0D, 0x0A, 0x00, 0x0D, 0x0A, 0x51, 0x55, 0x49, 0x54, 0x0A})
-	w.Write(byte{byte(0x20 | hdr.command)})
+func writeProxyProtocolV2(w io.Writer, hdr proxyProtocolV2) error {
+	if _, err := w.Write(byte{0x0D, 0x0A, 0x0D, 0x0A, 0x00, 0x0D, 0x0A, 0x51, 0x55, 0x49, 0x54, 0x0A}); err != nil {
+		return err
+	}
+	if _, err := w.Write(byte{byte(0x20 | hdr.command)}); err != nil {
+		return err
+	}
 
 	switch srcAddr := hdr.sourceAddress.(type) {
 	case *net.TCPAddr:
@@ -721,13 +820,25 @@
 			fam = byte(proxyProtocolV2FamilyInet6 << 4)
 		}
 		fam |= byte(proxyProtocolV2ProtocolStream)
-		w.Write(byte{fam})
+		if _, err := w.Write(byte{fam}); err != nil {
+			return err
+		}
 		length := uint16(len(srcAddr.IP)*2 + 4 + len(hdr.additionalData))
-		binary.Write(w, binary.BigEndian, length)
-		w.Write(srcAddr.IP)
-		w.Write(dstAddr.IP)
-		binary.Write(w, binary.BigEndian, uint16(srcAddr.Port))
-		binary.Write(w, binary.BigEndian, uint16(dstAddr.Port))
+		if err := binary.Write(w, binary.BigEndian, length); err != nil {
+			return err
+		}
+		if _, err := w.Write(srcAddr.IP); err != nil {
+			return err
+		}
+		if _, err := w.Write(dstAddr.IP); err != nil {
+			return err
+		}
+		if err := binary.Write(w, binary.BigEndian, uint16(srcAddr.Port)); err != nil {
+			return err
+		}
+		if err := binary.Write(w, binary.BigEndian, uint16(dstAddr.Port)); err != nil {
+			return err
+		}
 	case *net.UnixAddr:
 		dstAddr := hdr.destinationAddress.(*net.UnixAddr)
 		if len(srcAddr.Name) > 108 {
@@ -745,20 +856,40 @@
 		default:
 			fam |= byte(proxyProtocolV2ProtocolUnspec)
 		}
-		w.Write(byte{fam})
+		if _, err := w.Write(byte{fam}); err != nil {
+			return err
+		}
 		length := uint16(216 + len(hdr.additionalData))
-		binary.Write(w, binary.BigEndian, length)
+		if err := binary.Write(w, binary.BigEndian, length); err != nil {
+			return err
+		}
 		zeros := make(byte, 108)
-		w.Write(byte(srcAddr.Name))
-		w.Write(zeros:108-len(srcAddr.Name))
-		w.Write(byte(dstAddr.Name))
-		w.Write(zeros:108-len(dstAddr.Name))
+		if _, err := w.Write(byte(srcAddr.Name)); err != nil {
+			return err
+		}
+		if _, err := w.Write(zeros:108-len(srcAddr.Name)); err != nil {
+			return err
+		}
+		if _, err := w.Write(byte(dstAddr.Name)); err != nil {
+			return err
+		}
+		if _, err := w.Write(zeros:108-len(dstAddr.Name)); err != nil {
+			return err
+		}
 	default:
 		fam := byte(proxyProtocolV2FamilyUnspec<<4) | byte(proxyProtocolV2ProtocolUnspec)
-		w.Write(byte{fam})
+		if _, err := w.Write(byte{fam}); err != nil {
+			return err
+		}
 		length := uint16(len(hdr.additionalData))
-		binary.Write(w, binary.BigEndian, length)
+		if err := binary.Write(w, binary.BigEndian, length); err != nil {
+			return err
+		}
+	}
+
+	if _, err := w.Write(hdr.additionalData); err != nil {
+		return err
 	}
 
-	w.Write(hdr.additionalData)
+	return nil
 }

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

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

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -107,13 +107,8 @@
 target_triplet = @target@
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -162,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_debug.lo
+	nghttp2_rcbuf.lo nghttp2_extpri.lo nghttp2_debug.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@)
@@ -189,8 +184,9 @@
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/nghttp2_buf.Plo \
 	./$(DEPDIR)/nghttp2_callbacks.Plo \
-	./$(DEPDIR)/nghttp2_debug.Plo ./$(DEPDIR)/nghttp2_frame.Plo \
-	./$(DEPDIR)/nghttp2_hd.Plo ./$(DEPDIR)/nghttp2_hd_huffman.Plo \
+	./$(DEPDIR)/nghttp2_debug.Plo ./$(DEPDIR)/nghttp2_extpri.Plo \
+	./$(DEPDIR)/nghttp2_frame.Plo ./$(DEPDIR)/nghttp2_hd.Plo \
+	./$(DEPDIR)/nghttp2_hd_huffman.Plo \
 	./$(DEPDIR)/nghttp2_hd_huffman_data.Plo \
 	./$(DEPDIR)/nghttp2_helper.Plo ./$(DEPDIR)/nghttp2_http.Plo \
 	./$(DEPDIR)/nghttp2_map.Plo ./$(DEPDIR)/nghttp2_mem.Plo \
@@ -299,11 +295,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -320,7 +311,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -336,6 +326,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -404,15 +395,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -523,6 +508,7 @@
 	nghttp2_mem.c \
 	nghttp2_http.c \
 	nghttp2_rcbuf.c \
+	nghttp2_extpri.c \
 	nghttp2_debug.c
 
 HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
@@ -539,6 +525,7 @@
 	nghttp2_mem.h \
 	nghttp2_http.h \
 	nghttp2_rcbuf.h \
+	nghttp2_extpri.h \
 	nghttp2_debug.h
 
 libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
@@ -628,6 +615,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_buf.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_callbacks.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_debug.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_extpri.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_frame.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_hd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_hd_huffman.Plo@am__quote@ # am--include-marker
@@ -909,6 +897,7 @@
 		-rm -f ./$(DEPDIR)/nghttp2_buf.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_callbacks.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_debug.Plo
+	-rm -f ./$(DEPDIR)/nghttp2_extpri.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_frame.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_hd.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_hd_huffman.Plo
@@ -976,6 +965,7 @@
 		-rm -f ./$(DEPDIR)/nghttp2_buf.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_callbacks.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_debug.Plo
+	-rm -f ./$(DEPDIR)/nghttp2_extpri.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_frame.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_hd.Plo
 	-rm -f ./$(DEPDIR)/nghttp2_hd_huffman.Plo

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/Makefile.msvc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/Makefile.msvc Changed

@@ -6,15 +6,8 @@
 # The MIT License apply.
 #
 
-#
-# Choose your weapons:
-#  Set 'USE_CYTHON=1' to build and install the 'nghttp2.pyd' Python extension.
-#
 THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 
-USE_CYTHON := 0
-#USE_CYTHON := 1
-
 _VERSION	:= $(shell grep AC_INIT ../configure.ac | cut -d'' -f3 | sed -e 's/-DEV//g' -e 's/, //g')
 _VERSION   	:= $(subst ., ,$(_VERSION))
 VER_MAJOR  	:= $(word 1,$(_VERSION))
@@ -102,7 +95,7 @@
 	clean_nghttp2_pyd_0 clean_nghttp2_pyd_1
 
 
-all: intro includes/nghttp2/nghttp2ver.h $(OBJ_DIR) $(TARGETS) build_nghttp2_pyd_$(USE_CYTHON)
+all: intro includes/nghttp2/nghttp2ver.h $(OBJ_DIR) $(TARGETS)
 	@echo 'Welcome to NgHTTP2 (release + debug).'
 	@echo 'Do a "make -f Makefile.MSVC install" at own risk!'
 
@@ -121,7 +114,7 @@
 
 install: includes/nghttp2/nghttp2.h includes/nghttp2/nghttp2ver.h \
          $(TARGETS) \
-         copy_headers_and_libs install_nghttp2_pyd_$(USE_CYTHON) 
+         copy_headers_and_libs
 
 #
 # This MUST be done before using the 'install_nghttp2_pyd_1' rule.
@@ -160,31 +153,6 @@
 WIN_OBJDIR:=$(shell cygpath -w $(abspath $(OBJ_DIR)))
 WIN_OBJDIR:=$(subst \,/,$(WIN_OBJDIR))
 
-../python/setup.py: ../python/setup.py.in $(THIS_MAKEFILE)
-	cd ../python ; \
-	echo '# $(GENERATED). DO NOT EDIT.' > setup.py ; \
-	sed -e 's/@top_srcdir@/../'   \
-	    -e 's%@top_builddir@%$(WIN_OBJDIR)%' \
-	    -e 's/@PACKAGE_VERSION@/$(VERSION)/' setup.py.in >> setup.py ;
-
-build_nghttp2_pyd_0: ;
-
-build_nghttp2_pyd_1: $(addprefix ../python/, setup.py nghttp2.pyx)
-	cd ../python ; \
-	python setup.py build_ext -i -f bdist_wininst
-
-install_nghttp2_pyd_0: ;
-		
-install_nghttp2_pyd_1: $(addprefix ../python/, setup.py nghttp2.pyx)
-	cd ../python ; \
-	pip install .
-
-clean_nghttp2_pyd_0: ;
-
-clean_nghttp2_pyd_1:
-	cd ../python ; \
-	rm -fR build dist
-
 $(OBJ_DIR)/r_%.obj: %.c $(THIS_MAKEFILE)
 	$(CC) $(CFLAGS_R) $(CFLAGS) -Fo$@ -c $<
 	@echo
@@ -262,7 +230,7 @@
 	rm -f $(OBJ_DIR)/* includes/nghttp2/nghttp2ver.h
 	@echo
 
-vclean realclean: clean clean_nghttp2_pyd_$(USE_CYTHON)
+vclean realclean: clean
 	- rm -rf $(OBJ_DIR)
 	- rm -f .depend.MSVC

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -114,13 +114,8 @@
 target_triplet = @target@
 subdir = lib/includes
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -208,11 +203,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -229,7 +219,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -245,6 +234,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -313,15 +303,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@

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

@@ -634,7 +634,11 @@
    * The ORIGIN frame, which is defined by `RFC 8336
    * <https://tools.ietf.org/html/rfc8336>`_.
    */
-  NGHTTP2_ORIGIN = 0x0c
+  NGHTTP2_ORIGIN = 0x0c,
+  /**
+   * The PRIORITY_UPDATE frame, which is defined by :rfc:`9218`.
+   */
+  NGHTTP2_PRIORITY_UPDATE = 0x10
 } nghttp2_frame_type;
 
 /**
@@ -703,7 +707,11 @@
    * SETTINGS_ENABLE_CONNECT_PROTOCOL
    * (`RFC 8441 <https://tools.ietf.org/html/rfc8441>`_)
    */
-  NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL = 0x08
+  NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL = 0x08,
+  /**
+   * SETTINGS_NO_RFC7540_PRIORITIES (:rfc:`9218`)
+   */
+  NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES = 0x09
 } nghttp2_settings_id;
 /* Note: If we add SETTINGS, update the capacity of
    NGHTTP2_INBOUND_NUM_IV as well */
@@ -1422,12 +1430,6 @@
  * respectively.  The header name/value pairs are emitted via
  * :type:`nghttp2_on_header_callback`.
  *
- * For HEADERS, PUSH_PROMISE and DATA frames, this callback may be
- * called after stream is closed (see
- * :type:`nghttp2_on_stream_close_callback`).  The application should
- * check that stream is still alive using its own stream management or
- * :func:`nghttp2_session_get_stream_user_data()`.
- *
  * Only HEADERS and DATA frame can signal the end of incoming data.
  * If ``frame->hd.flags & NGHTTP2_FLAG_END_STREAM`` is nonzero, the
  * |frame| is the last frame from the remote peer in this stream.
@@ -2693,6 +2695,11 @@
  * This option prevents the library from retaining closed streams to
  * maintain the priority tree.  If this option is set to nonzero,
  * applications can discard closed stream completely to save memory.
+ *
+ * If
+ * :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+ * of value of 1 is submitted via `nghttp2_submit_settings()`, any
+ * closed streams are not retained regardless of this option.
  */
 NGHTTP2_EXTERN void nghttp2_option_set_no_closed_streams(nghttp2_option *option,
                                                          int val);
@@ -2722,6 +2729,36 @@
 /**
  * @function
  *
+ * This option, if set to nonzero, allows server to fallback to
+ * :rfc:`7540` priorities if SETTINGS_NO_RFC7540_PRIORITIES was not
+ * received from client, and server submitted
+ * :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+ * = 1 via `nghttp2_submit_settings()`.  Most of the advanced
+ * functionality for RFC 7540 priorities are still disabled.  This
+ * fallback only enables the minimal feature set of RFC 7540
+ * priorities to deal with priority signaling from client.
+ *
+ * Client session ignores this option.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_server_fallback_rfc7540_priorities(nghttp2_option *option,
+                                                      int val);
+
+/**
+ * @function
+ *
+ * This option, if set to nonzero, turns off RFC 9113 leading and
+ * trailing white spaces validation against HTTP field value.  Some
+ * important fields, such as HTTP/2 pseudo header fields, are
+ * validated more strictly and this option does not apply to them.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation(
+    nghttp2_option *option, int val);
+
+/**
+ * @function
+ *
  * Initializes |*session_ptr| for client use.  The all members of
  * |callbacks| are copied to |*session_ptr|.  Therefore |*session_ptr|
  * does not store |callbacks|.  The |user_data| is an arbitrary user
@@ -3589,6 +3626,11 @@
  * found, we use default priority instead of given |pri_spec|.  That
  * is make stream depend on root stream with weight 16.
  *
+ * If
+ * :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+ * of value of 1 is submitted via `nghttp2_submit_settings()`, this
+ * function does nothing and returns 0.
+ *
  * This function returns 0 if it succeeds, or one of the following
  * negative error codes:
  *
@@ -3632,6 +3674,11 @@
  * found, we use default priority instead of given |pri_spec|.  That
  * is make stream depend on root stream with weight 16.
  *
+ * If
+ * :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES`
+ * of value of 1 is submitted via `nghttp2_submit_settings()`, this
+ * function does nothing and returns 0.
+ *
  * This function returns 0 if it succeeds, or one of the following
  * negative error codes:
  *
@@ -3837,6 +3884,11 @@
  * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes
  * :macro:`NGHTTP2_MAX_WEIGHT`.
  *
+ * If
+ * :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.
+ *
  * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
  * |nvlen| elements.  The application is responsible to include
  * required pseudo-header fields (header field whose name starts with
@@ -4057,6 +4109,11 @@
  * :macro:`NGHTTP2_MIN_WEIGHT`.  If it is strictly greater than
  * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes :macro:`NGHTTP2_MAX_WEIGHT`.
  *
+ * If
+ * :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.
+ *
  * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
  * |nvlen| elements.  The application is responsible to include
  * required pseudo-header fields (header field whose name starts with
@@ -4184,6 +4241,11 @@
  * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes
  * :macro:`NGHTTP2_MAX_WEIGHT`.
  *
+ * If
+ * :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:
  *
@@ -4199,6 +4261,61 @@
                         const nghttp2_priority_spec *pri_spec);
 
 /**
+ * @macro
+ *
+ * :macro:`NGHTTP2_EXTPRI_DEFAULT_URGENCY` is the default urgency
+ * level for :rfc:`9218` extensible priorities.
+ */
+#define NGHTTP2_EXTPRI_DEFAULT_URGENCY 3
+
+/**
+ * @macro
+ *
+ * :macro:`NGHTTP2_EXTPRI_URGENCY_HIGH` is the highest urgency level
+ * for :rfc:`9218` extensible priorities.
+ */
+#define NGHTTP2_EXTPRI_URGENCY_HIGH 0
+
+/**
+ * @macro
+ *
+ * :macro:`NGHTTP2_EXTPRI_URGENCY_LOW` is the lowest urgency level for
+ * :rfc:`9218` extensible priorities.
+ */
+#define NGHTTP2_EXTPRI_URGENCY_LOW 7
+
+/**
+ * @macro
+ *
+ * :macro:`NGHTTP2_EXTPRI_URGENCY_LEVELS` is the number of urgency
+ * levels for :rfc:`9218` extensible priorities.
+ */
+#define NGHTTP2_EXTPRI_URGENCY_LEVELS (NGHTTP2_EXTPRI_URGENCY_LOW + 1)
+
+/**
+ * @struct
+ *
+ * :type:`nghttp2_extpri` is :rfc:`9218` extensible priorities
+ * specification for a stream.
+ */
+typedef struct nghttp2_extpri {
+  /**
+   * :member:`urgency` is the urgency of a stream, it must be in
+   * :macro:`NGHTTP2_EXTPRI_URGENCY_HIGH`,
+   * :macro:`NGHTTP2_EXTPRI_URGENCY_LOW`, inclusive, and 0 is the
+   * highest urgency.
+   */
+  uint32_t urgency;
+  /**
+   * :member:`inc` indicates that a content can be processed
+   * incrementally or not.  If inc is 0, it cannot be processed
+   * incrementally.  If inc is 1, it can be processed incrementally.
+   * Other value is not permitted.
+   */
+  int inc;
+} nghttp2_extpri;
+
+/**
  * @function
  *
  * Submits RST_STREAM frame to cancel/reject the stream |stream_id|
@@ -4723,6 +4840,108 @@
                                          size_t nov);
 
 /**
+ * @struct
+ *
+ * The payload of PRIORITY_UPDATE frame.  PRIORITY_UPDATE frame is a
+ * 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
+ * :enum:`nghttp2_frame_type.NGHTTP2_PRIORITY_UPDATE`,
+ * ``nghttp2_extension.payload`` will point to this struct.
+ *
+ * It has the following members:
+ */
+typedef struct {
+  /**
+   * The stream ID of the stream whose priority is updated.
+   */
+  int32_t stream_id;
+  /**
+   * The pointer to Priority field value.  It is not necessarily
+   * NULL-terminated.
+   */
+  uint8_t *field_value;
+  /**
+   * The length of the :member:`field_value`.
+   */
+  size_t field_value_len;
+} nghttp2_ext_priority_update;
+
+/**
+ * @function
+ *
+ * Submits PRIORITY_UPDATE frame.
+ *
+ * PRIORITY_UPDATE frame is a non-critical extension to HTTP/2, and
+ * defined in :rfc:`9218#section-7.1`.
+ *
+ * The |flags| is currently ignored and should be
+ * :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,
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE` is returned.
+ *
+ * If
+ * :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:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ *     Out of memory
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ *     The function is called from server side session
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ *     The |field_value_len| is larger than 16380; or |stream_id| is
+ *     0.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_priority_update(nghttp2_session *session,
+                                                  uint8_t flags,
+                                                  int32_t stream_id,
+                                                  const uint8_t *field_value,
+                                                  size_t field_value_len);
+
+/**
+ * @function
+ *
+ * Changes the priority of the existing stream denoted by |stream_id|.
+ * The new priority is |extpri|.  This function is meant to be used by
+ * server for :rfc:`9218` extensible prioritization scheme.
+ *
+ * If |session| is initialized as client, this function returns
+ * :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
+ * bound, it is set to :macro:`NGHTTP2_EXTPRI_URGENCY_LOW`.
+ *
+ * If |ignore_client_signal| is nonzero, server starts to ignore
+ * client priority signals for this stream.
+ *
+ * If
+ * :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.
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ *     Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ *     The |session| is initialized as client.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ *     |stream_id| is zero; or a stream denoted by |stream_id| is not
+ *     found.
+ */
+NGHTTP2_EXTERN int nghttp2_session_change_extpri_stream_priority(
+    nghttp2_session *session, int32_t stream_id, const nghttp2_extpri *extpri,
+    int ignore_client_signal);
+
+/**
  * @function
  *
  * Compares ``lhs->name`` of length ``lhs->namelen`` bytes and
@@ -4833,11 +5052,25 @@
  * Returns nonzero if HTTP header field value |value| of length |len|
  * is valid according to
  * http://tools.ietf.org/html/rfc7230#section-3.2
+ *
+ * This function is considered obsolete, and application should
+ * consider to use `nghttp2_check_header_value_rfc9113()` instead.
  */
 NGHTTP2_EXTERN int nghttp2_check_header_value(const uint8_t *value, size_t len);
 
 /**
  * @function
+ *
+ * Returns nonzero if HTTP header field value |value| of length |len|
+ * is valid according to
+ * http://tools.ietf.org/html/rfc7230#section-3.2, plus
+ * https://datatracker.ietf.org/doc/html/rfc9113#section-8.2.1
+ */
+NGHTTP2_EXTERN int nghttp2_check_header_value_rfc9113(const uint8_t *value,
+                                                      size_t len);
+
+/**
+ * @function
  *
  * Returns nonzero if the |value| which is supposed to be the value of
  * the :method header field is valid according to

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_buf.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_buf.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_extpri.c Added

@@ -0,0 +1,35 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2022 nghttp3 contributors
+ * Copyright (c) 2022 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 "nghttp2_extpri.h"
+
+uint8_t nghttp2_extpri_to_uint8(const nghttp2_extpri *extpri) {
+  return (uint8_t)((uint32_t)extpri->inc << 7 | extpri->urgency);
+}
+
+void nghttp2_extpri_from_uint8(nghttp2_extpri *extpri, uint8_t u8extpri) {
+  extpri->urgency = nghttp2_extpri_uint8_urgency(u8extpri);
+  extpri->inc = nghttp2_extpri_uint8_inc(u8extpri);
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_extpri.h Added

@@ -0,0 +1,65 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2022 nghttp3 contributors
+ * Copyright (c) 2022 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 NGHTTP2_EXTPRI_H
+#define NGHTTP2_EXTPRI_H
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <nghttp2/nghttp2.h>
+
+/*
+ * NGHTTP2_EXTPRI_INC_MASK is a bit mask to retrieve incremental bit
+ * from a value produced by nghttp2_extpri_to_uint8.
+ */
+#define NGHTTP2_EXTPRI_INC_MASK (1 << 7)
+
+/*
+ * nghttp2_extpri_to_uint8 encodes |pri| into uint8_t variable.
+ */
+uint8_t nghttp2_extpri_to_uint8(const nghttp2_extpri *extpri);
+
+/*
+ * nghttp2_extpri_from_uint8 decodes |u8extpri|, which is produced by
+ * nghttp2_extpri_to_uint8, intto |extpri|.
+ */
+void nghttp2_extpri_from_uint8(nghttp2_extpri *extpri, uint8_t u8extpri);
+
+/*
+ * nghttp2_extpri_uint8_urgency extracts urgency from |PRI| which is
+ * supposed to be constructed by nghttp2_extpri_to_uint8.
+ */
+#define nghttp2_extpri_uint8_urgency(PRI)                                      \
+  ((uint32_t)((PRI) & ~NGHTTP2_EXTPRI_INC_MASK))
+
+/*
+ * nghttp2_extpri_uint8_inc extracts inc from |PRI| which is supposed to
+ * be constructed by nghttp2_extpri_to_uint8.
+ */
+#define nghttp2_extpri_uint8_inc(PRI) (((PRI)&NGHTTP2_EXTPRI_INC_MASK) != 0)
+
+#endif /* NGHTTP2_EXTPRI_H */

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_frame.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_frame.c Changed

@@ -253,6 +253,31 @@
   nghttp2_mem_free(mem, origin->ov);
 }
 
+void nghttp2_frame_priority_update_init(nghttp2_extension *frame,
+                                        int32_t stream_id, uint8_t *field_value,
+                                        size_t field_value_len) {
+  nghttp2_ext_priority_update *priority_update;
+
+  nghttp2_frame_hd_init(&frame->hd, 4 + field_value_len,
+                        NGHTTP2_PRIORITY_UPDATE, NGHTTP2_FLAG_NONE, 0);
+
+  priority_update = frame->payload;
+  priority_update->stream_id = stream_id;
+  priority_update->field_value = field_value;
+  priority_update->field_value_len = field_value_len;
+}
+
+void nghttp2_frame_priority_update_free(nghttp2_extension *frame,
+                                        nghttp2_mem *mem) {
+  nghttp2_ext_priority_update *priority_update;
+
+  priority_update = frame->payload;
+  if (priority_update == NULL) {
+    return;
+  }
+  nghttp2_mem_free(mem, priority_update->field_value);
+}
+
 size_t nghttp2_frame_priority_len(uint8_t flags) {
   if (flags & NGHTTP2_FLAG_PRIORITY) {
     return NGHTTP2_PRIORITY_SPECLEN;
@@ -654,8 +679,6 @@
     var_gift_payloadlen = 0;
   }
 
-  payloadlen -= var_gift_payloadlen;
-
   if (!var_gift_payloadlen) {
     var_gift_payload = NULL;
   } else {
@@ -878,6 +901,57 @@
   return 0;
 }
 
+int nghttp2_frame_pack_priority_update(nghttp2_bufs *bufs,
+                                       nghttp2_extension *frame) {
+  int rv;
+  nghttp2_buf *buf;
+  nghttp2_ext_priority_update *priority_update;
+
+  /* This is required with --disable-assert. */
+  (void)rv;
+
+  priority_update = frame->payload;
+
+  buf = &bufs->head->buf;
+
+  assert(nghttp2_buf_avail(buf) >= 4 + priority_update->field_value_len);
+
+  buf->pos -= NGHTTP2_FRAME_HDLEN;
+
+  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
+
+  nghttp2_put_uint32be(buf->last, (uint32_t)priority_update->stream_id);
+  buf->last += 4;
+
+  rv = nghttp2_bufs_add(bufs, priority_update->field_value,
+                        priority_update->field_value_len);
+
+  assert(rv == 0);
+
+  return 0;
+}
+
+void nghttp2_frame_unpack_priority_update_payload(nghttp2_extension *frame,
+                                                  uint8_t *payload,
+                                                  size_t payloadlen) {
+  nghttp2_ext_priority_update *priority_update;
+
+  assert(payloadlen >= 4);
+
+  priority_update = frame->payload;
+
+  priority_update->stream_id =
+      nghttp2_get_uint32(payload) & NGHTTP2_STREAM_ID_MASK;
+
+  if (payloadlen > 4) {
+    priority_update->field_value = payload + 4;
+    priority_update->field_value_len = payloadlen - 4;
+  } else {
+    priority_update->field_value = NULL;
+    priority_update->field_value_len = 0;
+  }
+}
+
 nghttp2_settings_entry *nghttp2_frame_iv_copy(const nghttp2_settings_entry *iv,
                                               size_t niv, nghttp2_mem *mem) {
   nghttp2_settings_entry *iv_copy;
@@ -1073,6 +1147,11 @@
         return 0;
       }
       break;
+    case NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES:
+      if (ivi.value != 0 && ivi.value != 1) {
+        return 0;
+      }
+      break;
     }
   }
   return 1;

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_frame.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_frame.h Changed

@@ -46,7 +46,7 @@
 #define NGHTTP2_MAX_FRAME_SIZE_MIN (1 << 14)
 
 #define NGHTTP2_MAX_PAYLOADLEN 16384
-/* The one frame buffer length for tranmission.  We may use several of
+/* The one frame buffer length for transmission.  We may use several of
    them to support CONTINUATION.  To account for Pad Length field, we
    allocate extra 1 byte, which saves extra large memcopying. */
 #define NGHTTP2_FRAMEBUF_CHUNKLEN                                              \
@@ -73,6 +73,7 @@
 typedef union {
   nghttp2_ext_altsvc altsvc;
   nghttp2_ext_origin origin;
+  nghttp2_ext_priority_update priority_update;
 } nghttp2_ext_frame_payload;
 
 void nghttp2_frame_pack_frame_hd(uint8_t *buf, const nghttp2_frame_hd *hd);
@@ -423,6 +424,31 @@
 int nghttp2_frame_unpack_origin_payload(nghttp2_extension *frame,
                                         const uint8_t *payload,
                                         size_t payloadlen, nghttp2_mem *mem);
+
+/*
+ * Packs PRIORITY_UPDATE frame |frame| in wire frame format and store
+ * it in |bufs|.
+ *
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
+ *
+ * This function always succeeds and returns 0.
+ */
+int nghttp2_frame_pack_priority_update(nghttp2_bufs *bufs,
+                                       nghttp2_extension *ext);
+
+/*
+ * Unpacks PRIORITY_UPDATE wire format into |frame|.  The |payload| of
+ * |payloadlen| bytes contains frame payload.  This function assumes
+ * that frame->payload points to the nghttp2_ext_priority_update
+ * object.
+ *
+ * This function always succeeds and returns 0.
+ */
+void nghttp2_frame_unpack_priority_update_payload(nghttp2_extension *frame,
+                                                  uint8_t *payload,
+                                                  size_t payloadlen);
+
 /*
  * Initializes HEADERS frame |frame| with given values.  |frame| takes
  * ownership of |nva|, so caller must not free it. If |stream_id| is
@@ -539,6 +565,25 @@
 void nghttp2_frame_origin_free(nghttp2_extension *frame, nghttp2_mem *mem);
 
 /*
+ * Initializes PRIORITY_UPDATE frame |frame| with given values.  This
+ * function assumes that frame->payload points to
+ * nghttp2_ext_priority_update object.  On success, this function
+ * takes ownership of |field_value|, so caller must not free it.
+ */
+void nghttp2_frame_priority_update_init(nghttp2_extension *frame,
+                                        int32_t stream_id, uint8_t *field_value,
+                                        size_t field_value_len);
+
+/*
+ * Frees up resources under |frame|.  This function does not free
+ * nghttp2_ext_priority_update object pointed by frame->payload.  This
+ * function only frees field_value pointed by
+ * nghttp2_ext_priority_update.field_value.
+ */
+void nghttp2_frame_priority_update_free(nghttp2_extension *frame,
+                                        nghttp2_mem *mem);
+
+/*
  * Returns the number of padding bytes after payload.  The total
  * padding length is given in the |padlen|.  The returned value does
  * not include the Pad Length field.  If |padlen| is 0, this function

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_hd.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_hd.c Changed

@@ -269,6 +269,11 @@
         return NGHTTP2_TOKEN_LOCATION;
       }
       break;
+    case 'y':
+      if (memeq("priorit", name, 7)) {
+        return NGHTTP2_TOKEN_PRIORITY;
+      }
+      break;
     }
     break;
   case 9:
@@ -1263,6 +1268,8 @@
     return NGHTTP2_ERR_INVALID_STATE;
   }
 
+  inflater->settings_hd_table_bufsize_max = settings_max_dynamic_table_size;
+
   /* It seems that encoder is not required to send dynamic table size
      update if the table size is not changed after applying
      SETTINGS_HEADER_TABLE_SIZE.  RFC 7541 is ambiguous here, but this
@@ -1275,13 +1282,12 @@
     /* Remember minimum value, and validate that encoder sends the
        value less than or equal to this. */
     inflater->min_hd_table_bufsize_max = settings_max_dynamic_table_size;
-  }
 
-  inflater->settings_hd_table_bufsize_max = settings_max_dynamic_table_size;
+    inflater->ctx.hd_table_bufsize_max = settings_max_dynamic_table_size;
 
-  inflater->ctx.hd_table_bufsize_max = settings_max_dynamic_table_size;
+    hd_context_shrink_table_size(&inflater->ctx, NULL);
+  }
 
-  hd_context_shrink_table_size(&inflater->ctx, NULL);
   return 0;
 }

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_hd.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_hd.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_helper.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_helper.c Changed

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

@@ -30,6 +30,7 @@
 
 #include "nghttp2_hd.h"
 #include "nghttp2_helper.h"
+#include "nghttp2_extpri.h"
 
 static uint8_t downcase(uint8_t c) {
   return 'A' <= c && c <= 'Z' ? (uint8_t)(c - 'A' + 'a') : c;
@@ -72,25 +73,12 @@
   return n;
 }
 
-static int lws(const uint8_t *s, size_t n) {
-  size_t i;
-  for (i = 0; i < n; ++i) {
-    if (si != ' ' && si != '\t') {
-      return 0;
-    }
-  }
-  return 1;
-}
-
 static int check_pseudo_header(nghttp2_stream *stream, const nghttp2_hd_nv *nv,
-                               int flag) {
-  if (stream->http_flags & flag) {
-    return 0;
-  }
-  if (lws(nv->value->base, nv->value->len)) {
+                               uint32_t flag) {
+  if ((stream->http_flags & flag) || nv->value->len == 0) {
     return 0;
   }
-  stream->http_flags = (uint16_t)(stream->http_flags | flag);
+  stream->http_flags = stream->http_flags | flag;
   return 1;
 }
 
@@ -114,6 +102,8 @@
 
 static int http_request_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
                                   int trailer, int connect_protocol) {
+  nghttp2_extpri extpri;
+
   if (nv->name->base0 == ':') {
     if (trailer ||
         (stream->http_flags & NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED)) {
@@ -212,6 +202,23 @@
       return NGHTTP2_ERR_HTTP_HEADER;
     }
     break;
+  case NGHTTP2_TOKEN_PRIORITY:
+    if (!trailer &&
+        /* Do not parse the header field in PUSH_PROMISE. */
+        (stream->stream_id & 1) &&
+        (stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) &&
+        !(stream->http_flags & NGHTTP2_HTTP_FLAG_BAD_PRIORITY)) {
+      nghttp2_extpri_from_uint8(&extpri, stream->http_extpri);
+      if (nghttp2_http_parse_priority(&extpri, nv->value->base,
+                                      nv->value->len) == 0) {
+        stream->http_extpri = nghttp2_extpri_to_uint8(&extpri);
+        stream->http_flags |= NGHTTP2_HTTP_FLAG_PRIORITY;
+      } else {
+        stream->http_flags &= (uint32_t)~NGHTTP2_HTTP_FLAG_PRIORITY;
+        stream->http_flags |= NGHTTP2_HTTP_FLAG_BAD_PRIORITY;
+      }
+    }
+    break;
   default:
     if (nv->name->base0 == ':') {
       return NGHTTP2_ERR_HTTP_HEADER;
@@ -329,6 +336,16 @@
   return 1;
 }
 
+static int lws(const uint8_t *s, size_t n) {
+  size_t i;
+  for (i = 0; i < n; ++i) {
+    if (si != ' ' && si != '\t') {
+      return 0;
+    }
+  }
+  return 1;
+}
+
 int nghttp2_http_on_header(nghttp2_session *session, nghttp2_stream *stream,
                            nghttp2_frame *frame, nghttp2_hd_nv *nv,
                            int trailer) {
@@ -369,13 +386,37 @@
     break;
   case NGHTTP2_TOKEN__AUTHORITY:
   case NGHTTP2_TOKEN_HOST:
-    rv = nghttp2_check_authority(nv->value->base, nv->value->len);
+    if (session->server || frame->hd.type == NGHTTP2_PUSH_PROMISE) {
+      rv = nghttp2_check_authority(nv->value->base, nv->value->len);
+    } else if (
+        stream->flags &
+        NGHTTP2_STREAM_FLAG_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION) {
+      rv = nghttp2_check_header_value(nv->value->base, nv->value->len);
+    } else {
+      rv = nghttp2_check_header_value_rfc9113(nv->value->base, nv->value->len);
+    }
     break;
   case NGHTTP2_TOKEN__SCHEME:
     rv = check_scheme(nv->value->base, nv->value->len);
     break;
+  case NGHTTP2_TOKEN__PROTOCOL:
+    /* Check the value consists of just white spaces, which was done
+       in check_pseudo_header before
+       nghttp2_check_header_value_rfc9113 has been introduced. */
+    if ((stream->flags &
+         NGHTTP2_STREAM_FLAG_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION) &&
+        lws(nv->value->base, nv->value->len)) {
+      rv = 0;
+      break;
+    }
+    /* fall through */
   default:
-    rv = nghttp2_check_header_value(nv->value->base, nv->value->len);
+    if (stream->flags &
+        NGHTTP2_STREAM_FLAG_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION) {
+      rv = nghttp2_check_header_value(nv->value->base, nv->value->len);
+    } else {
+      rv = nghttp2_check_header_value_rfc9113(nv->value->base, nv->value->len);
+    }
   }
 
   if (rv == 0) {
@@ -443,16 +484,15 @@
 
   if (stream->status_code / 100 == 1) {
     /* non-final response */
-    stream->http_flags =
-        (uint16_t)((stream->http_flags & NGHTTP2_HTTP_FLAG_METH_ALL) |
-                   NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE);
+    stream->http_flags = (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_ALL) |
+                         NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE;
     stream->content_length = -1;
     stream->status_code = -1;
     return 0;
   }
 
   stream->http_flags =
-      (uint16_t)(stream->http_flags & ~NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE);
+      stream->http_flags & (uint32_t)~NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE;
 
   if (!expect_response_body(stream)) {
     stream->content_length = 0;
@@ -537,3 +577,715 @@
     return;
   }
 }
+
+/* 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;
+
+  for (; p != end && *p == ' '; ++p)
+    ;
+
+  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;
+
+      slen = sf_parse_params(p, end);
+      if (slen < 0) {
+        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;
+
+        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;
+      }
+    }
+
+    sf_discard_ows(p, end);
+
+    if (*p++ != ',') {
+      return NGHTTP2_ERR_INVALID_ARGUMENT;
+    }
+
+    sf_discard_ows_end_err(p, end, NGHTTP2_ERR_INVALID_ARGUMENT);
+  }
+
+fin:
+  *dest = pri;
+
+  return 0;
+}

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

@@ -94,4 +94,55 @@
 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);
+
 #endif /* NGHTTP2_HTTP_H */

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_net.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_net.h Changed

@@ -42,7 +42,7 @@
 #if defined(WIN32)
 /* Windows requires ws2_32 library for ntonl family functions.  We
    define inline functions for those function so that we don't have
-   dependeny on that lib. */
+   dependency on that lib. */
 
 #  ifdef _MSC_VER
 #    define STIN static __inline
@@ -53,7 +53,7 @@
 STIN uint32_t htonl(uint32_t hostlong) {
   uint32_t res;
   unsigned char *p = (unsigned char *)&res;
-  *p++ = hostlong >> 24;
+  *p++ = (unsigned char)(hostlong >> 24);
   *p++ = (hostlong >> 16) & 0xffu;
   *p++ = (hostlong >> 8) & 0xffu;
   *p = hostlong & 0xffu;
@@ -63,7 +63,7 @@
 STIN uint16_t htons(uint16_t hostshort) {
   uint16_t res;
   unsigned char *p = (unsigned char *)&res;
-  *p++ = hostshort >> 8;
+  *p++ = (unsigned char)(hostshort >> 8);
   *p = hostshort & 0xffu;
   return res;
 }
@@ -71,9 +71,9 @@
 STIN uint32_t ntohl(uint32_t netlong) {
   uint32_t res;
   unsigned char *p = (unsigned char *)&netlong;
-  res = *p++ << 24;
-  res += *p++ << 16;
-  res += *p++ << 8;
+  res = (uint32_t)(*p++ << 24);
+  res += (uint32_t)(*p++ << 16);
+  res += (uint32_t)(*p++ << 8);
   res += *p;
   return res;
 }
@@ -81,7 +81,7 @@
 STIN uint16_t ntohs(uint16_t netshort) {
   uint16_t res;
   unsigned char *p = (unsigned char *)&netshort;
-  res = *p++ << 8;
+  res = (uint16_t)(*p++ << 8);
   res += *p;
   return res;
 }

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_option.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_option.c Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_option.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_option.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_outbound_item.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_outbound_item.c Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_outbound_item.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_outbound_item.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_pq.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_pq.c Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_pq.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_pq.h Changed

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

@@ -36,6 +36,7 @@
 #include "nghttp2_option.h"
 #include "nghttp2_http.h"
 #include "nghttp2_pq.h"
+#include "nghttp2_extpri.h"
 #include "nghttp2_debug.h"
 
 /*
@@ -143,6 +144,11 @@
   return 0;
 }
 
+static int session_no_rfc7540_pri_no_fallback(nghttp2_session *session) {
+  return session->pending_no_rfc7540_priorities == 1 &&
+         !session->fallback_rfc7540_priorities;
+}
+
 static int check_ext_type_set(const uint8_t *ext_types, uint8_t type) {
   return (ext_typestype / 8 & (1 << (type & 0x7))) > 0;
 }
@@ -354,6 +360,14 @@
         }
         nghttp2_frame_origin_free(&iframe->frame.ext, mem);
         break;
+      case NGHTTP2_PRIORITY_UPDATE:
+        if ((session->builtin_recv_ext_types &
+             NGHTTP2_TYPEMASK_PRIORITY_UPDATE) == 0) {
+          break;
+        }
+        /* Do not call nghttp2_frame_priority_update_free, because all
+           fields point to sbuf. */
+        break;
       }
     }
 
@@ -385,6 +399,7 @@
   settings->initial_window_size = NGHTTP2_INITIAL_WINDOW_SIZE;
   settings->max_frame_size = NGHTTP2_MAX_FRAME_SIZE_MIN;
   settings->max_header_list_size = UINT32_MAX;
+  settings->no_rfc7540_priorities = UINT32_MAX;
 }
 
 static void active_outbound_item_reset(nghttp2_active_outbound_item *aob,
@@ -398,6 +413,21 @@
   aob->state = NGHTTP2_OB_POP_ITEM;
 }
 
+#define NGHTTP2_STREAM_MAX_CYCLE_GAP ((uint64_t)NGHTTP2_MAX_FRAME_SIZE_MAX)
+
+static int stream_less(const void *lhsx, const void *rhsx) {
+  const nghttp2_stream *lhs, *rhs;
+
+  lhs = nghttp2_struct_of(lhsx, nghttp2_stream, pq_entry);
+  rhs = nghttp2_struct_of(rhsx, nghttp2_stream, pq_entry);
+
+  if (lhs->cycle == rhs->cycle) {
+    return lhs->seq < rhs->seq;
+  }
+
+  return rhs->cycle - lhs->cycle <= NGHTTP2_STREAM_MAX_CYCLE_GAP;
+}
+
 int nghttp2_enable_strict_preface = 1;
 
 static int session_new(nghttp2_session **session_ptr,
@@ -408,6 +438,7 @@
   size_t nbuffer;
   size_t max_deflate_dynamic_table_size =
       NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE;
+  size_t i;
 
   if (mem == NULL) {
     mem = nghttp2_mem_default();
@@ -442,6 +473,7 @@
   (*session_ptr)->pending_local_max_concurrent_stream =
       NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS;
   (*session_ptr)->pending_enable_push = 1;
+  (*session_ptr)->pending_no_rfc7540_priorities = UINT8_MAX;
 
   if (server) {
     (*session_ptr)->server = 1;
@@ -527,6 +559,20 @@
         option->max_settings) {
       (*session_ptr)->max_settings = option->max_settings;
     }
+
+    if ((option->opt_set_mask &
+         NGHTTP2_OPT_SERVER_FALLBACK_RFC7540_PRIORITIES) &&
+        option->server_fallback_rfc7540_priorities) {
+      (*session_ptr)->opt_flags |=
+          NGHTTP2_OPTMASK_SERVER_FALLBACK_RFC7540_PRIORITIES;
+    }
+
+    if ((option->opt_set_mask &
+         NGHTTP2_OPT_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION) &&
+        option->no_rfc9113_leading_and_trailing_ws_validation) {
+      (*session_ptr)->opt_flags |=
+          NGHTTP2_OPTMASK_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION;
+    }
   }
 
   rv = nghttp2_hd_deflate_init2(&(*session_ptr)->hd_deflater,
@@ -584,6 +630,10 @@
     }
   }
 
+  for (i = 0; i < NGHTTP2_EXTPRI_URGENCY_LEVELS; ++i) {
+    nghttp2_pq_init(&(*session_ptr)->schedi.ob_data, stream_less, mem);
+  }
+
   return 0;
 
 fail_aob_framebuf:
@@ -735,6 +785,7 @@
 void nghttp2_session_del(nghttp2_session *session) {
   nghttp2_mem *mem;
   nghttp2_inflight_settings *settings;
+  size_t i;
 
   if (session == NULL) {
     return;
@@ -748,6 +799,9 @@
     settings = next;
   }
 
+  for (i = 0; i < NGHTTP2_EXTPRI_URGENCY_LEVELS; ++i) {
+    nghttp2_pq_free(&session->schedi.ob_data);
+  }
   nghttp2_stream_free(&session->root);
 
   /* Have to free streams first, so that we can check
@@ -775,6 +829,8 @@
   nghttp2_priority_spec pri_spec_default;
   const nghttp2_priority_spec *pri_spec = pri_spec_in;
 
+  assert((!session->server && session->pending_no_rfc7540_priorities != 1) ||
+         (session->server && !session_no_rfc7540_pri_no_fallback(session)));
   assert(pri_spec->stream_id != stream->stream_id);
 
   if (!nghttp2_stream_in_dep_tree(stream)) {
@@ -842,6 +898,214 @@
   return 0;
 }
 
+static uint64_t pq_get_first_cycle(nghttp2_pq *pq) {
+  nghttp2_stream *stream;
+
+  if (nghttp2_pq_empty(pq)) {
+    return 0;
+  }
+
+  stream = nghttp2_struct_of(nghttp2_pq_top(pq), nghttp2_stream, pq_entry);
+  return stream->cycle;
+}
+
+static int session_ob_data_push(nghttp2_session *session,
+                                nghttp2_stream *stream) {
+  int rv;
+  uint32_t urgency;
+  int inc;
+  nghttp2_pq *pq;
+
+  assert(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES);
+  assert(stream->queued == 0);
+
+  urgency = nghttp2_extpri_uint8_urgency(stream->extpri);
+  inc = nghttp2_extpri_uint8_inc(stream->extpri);
+
+  assert(urgency < NGHTTP2_EXTPRI_URGENCY_LEVELS);
+
+  pq = &session->schedurgency.ob_data;
+
+  stream->cycle = pq_get_first_cycle(pq);
+  if (inc) {
+    stream->cycle += stream->last_writelen;
+  }
+
+  rv = nghttp2_pq_push(pq, &stream->pq_entry);
+  if (rv != 0) {
+    return rv;
+  }
+
+  stream->queued = 1;
+
+  return 0;
+}
+
+static int session_ob_data_remove(nghttp2_session *session,
+                                  nghttp2_stream *stream) {
+  uint32_t urgency;
+
+  assert(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES);
+  assert(stream->queued == 1);
+
+  urgency = nghttp2_extpri_uint8_urgency(stream->extpri);
+
+  assert(urgency < NGHTTP2_EXTPRI_URGENCY_LEVELS);
+
+  nghttp2_pq_remove(&session->schedurgency.ob_data, &stream->pq_entry);
+
+  stream->queued = 0;
+
+  return 0;
+}
+
+static int session_attach_stream_item(nghttp2_session *session,
+                                      nghttp2_stream *stream,
+                                      nghttp2_outbound_item *item) {
+  int rv;
+
+  rv = nghttp2_stream_attach_item(stream, item);
+  if (rv != 0) {
+    return rv;
+  }
+
+  if (!(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES)) {
+    return 0;
+  }
+
+  return session_ob_data_push(session, stream);
+}
+
+static int session_detach_stream_item(nghttp2_session *session,
+                                      nghttp2_stream *stream) {
+  int rv;
+
+  rv = nghttp2_stream_detach_item(stream);
+  if (rv != 0) {
+    return rv;
+  }
+
+  if (!(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) ||
+      !stream->queued) {
+    return 0;
+  }
+
+  return session_ob_data_remove(session, stream);
+}
+
+static int session_defer_stream_item(nghttp2_session *session,
+                                     nghttp2_stream *stream, uint8_t flags) {
+  int rv;
+
+  rv = nghttp2_stream_defer_item(stream, flags);
+  if (rv != 0) {
+    return rv;
+  }
+
+  if (!(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) ||
+      !stream->queued) {
+    return 0;
+  }
+
+  return session_ob_data_remove(session, stream);
+}
+
+static int session_resume_deferred_stream_item(nghttp2_session *session,
+                                               nghttp2_stream *stream,
+                                               uint8_t flags) {
+  int rv;
+
+  rv = nghttp2_stream_resume_deferred_item(stream, flags);
+  if (rv != 0) {
+    return rv;
+  }
+
+  if (!(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) ||
+      (stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL)) {
+    return 0;
+  }
+
+  return session_ob_data_push(session, stream);
+}
+
+static nghttp2_outbound_item *
+session_sched_get_next_outbound_item(nghttp2_session *session) {
+  size_t i;
+  nghttp2_pq_entry *ent;
+  nghttp2_stream *stream;
+
+  for (i = 0; i < NGHTTP2_EXTPRI_URGENCY_LEVELS; ++i) {
+    ent = nghttp2_pq_top(&session->schedi.ob_data);
+    if (!ent) {
+      continue;
+    }
+
+    stream = nghttp2_struct_of(ent, nghttp2_stream, pq_entry);
+    return stream->item;
+  }
+
+  return NULL;
+}
+
+static int session_sched_empty(nghttp2_session *session) {
+  size_t i;
+
+  for (i = 0; i < NGHTTP2_EXTPRI_URGENCY_LEVELS; ++i) {
+    if (!nghttp2_pq_empty(&session->schedi.ob_data)) {
+      return 0;
+    }
+  }
+
+  return 1;
+}
+
+static void session_sched_reschedule_stream(nghttp2_session *session,
+                                            nghttp2_stream *stream) {
+  nghttp2_pq *pq;
+  uint32_t urgency = nghttp2_extpri_uint8_urgency(stream->extpri);
+  int inc = nghttp2_extpri_uint8_inc(stream->extpri);
+  uint64_t penalty = (uint64_t)stream->last_writelen;
+  int rv;
+
+  (void)rv;
+
+  assert(urgency < NGHTTP2_EXTPRI_URGENCY_LEVELS);
+
+  pq = &session->schedurgency.ob_data;
+
+  if (!inc || nghttp2_pq_size(pq) == 1) {
+    return;
+  }
+
+  nghttp2_pq_remove(pq, &stream->pq_entry);
+
+  stream->cycle += penalty;
+
+  rv = nghttp2_pq_push(pq, &stream->pq_entry);
+
+  assert(0 == rv);
+}
+
+static int session_update_stream_priority(nghttp2_session *session,
+                                          nghttp2_stream *stream,
+                                          uint8_t u8extpri) {
+  if (stream->extpri == u8extpri) {
+    return 0;
+  }
+
+  if (stream->queued) {
+    session_ob_data_remove(session, stream);
+
+    stream->extpri = u8extpri;
+
+    return session_ob_data_push(session, stream);
+  }
+
+  stream->extpri = u8extpri;
+
+  return 0;
+}
+
 int nghttp2_session_add_item(nghttp2_session *session,
                              nghttp2_outbound_item *item) {
   /* TODO Return error if stream is not found for the frame requiring
@@ -863,7 +1127,7 @@
       return NGHTTP2_ERR_DATA_EXIST;
     }
 
-    rv = nghttp2_stream_attach_item(stream, item);
+    rv = session_attach_stream_item(session, stream, item);
 
     if (rv != 0) {
       return rv;
@@ -1039,13 +1303,27 @@
   mem = &session->mem;
   stream = nghttp2_session_get_stream_raw(session, stream_id);
 
+  if (session->opt_flags &
+      NGHTTP2_OPTMASK_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION) {
+    flags |= NGHTTP2_STREAM_FLAG_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION;
+  }
+
   if (stream) {
     assert(stream->state == NGHTTP2_STREAM_IDLE);
-    assert(nghttp2_stream_in_dep_tree(stream));
-    nghttp2_session_detach_idle_stream(session, stream);
-    rv = nghttp2_stream_dep_remove(stream);
-    if (rv != 0) {
-      return NULL;
+    assert((stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) ||
+           nghttp2_stream_in_dep_tree(stream));
+
+    if (nghttp2_stream_in_dep_tree(stream)) {
+      assert(!(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES));
+      nghttp2_session_detach_idle_stream(session, stream);
+      rv = nghttp2_stream_dep_remove(stream);
+      if (rv != 0) {
+        return NULL;
+      }
+
+      if (session_no_rfc7540_pri_no_fallback(session)) {
+        stream->flags |= NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES;
+      }
     }
   } else {
     stream = nghttp2_mem_malloc(mem, sizeof(nghttp2_stream));
@@ -1056,7 +1334,21 @@
     stream_alloc = 1;
   }
 
-  if (pri_spec->stream_id != 0) {
+  if (session_no_rfc7540_pri_no_fallback(session) ||
+      session->remote_settings.no_rfc7540_priorities == 1) {
+    /* For client which has not received server
+       SETTINGS_NO_RFC7540_PRIORITIES = 1, send a priority signal
+       opportunistically. */
+    if (session->server ||
+        session->remote_settings.no_rfc7540_priorities == 1) {
+      nghttp2_priority_spec_default_init(&pri_spec_default);
+      pri_spec = &pri_spec_default;
+    }
+
+    if (session->pending_no_rfc7540_priorities == 1) {
+      flags |= NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES;
+    }
+  } else if (pri_spec->stream_id != 0) {
     dep_stream = nghttp2_session_get_stream_raw(session, pri_spec->stream_id);
 
     if (!dep_stream &&
@@ -1102,6 +1394,10 @@
                         (int32_t)session->local_settings.initial_window_size,
                         stream_user_data, mem);
 
+    if (session_no_rfc7540_pri_no_fallback(session)) {
+      stream->seq = session->stream_seq++;
+    }
+
     rv = nghttp2_map_insert(&session->streams, stream_id, stream);
     if (rv != 0) {
       nghttp2_stream_free(stream);
@@ -1141,6 +1437,10 @@
     }
   }
 
+  if (stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) {
+    return stream;
+  }
+
   if (pri_spec->stream_id == 0) {
     dep_stream = &session->root;
   }
@@ -1180,7 +1480,7 @@
 
     item = stream->item;
 
-    rv = nghttp2_stream_detach_item(stream);
+    rv = session_detach_stream_item(session, stream);
 
     if (rv != 0) {
       return rv;
@@ -1230,6 +1530,10 @@
   /* Closes both directions just in case they are not closed yet */
   stream->flags |= NGHTTP2_STREAM_FLAG_CLOSED;
 
+  if (session->pending_no_rfc7540_priorities == 1) {
+    return nghttp2_session_destroy_stream(session, stream);
+  }
+
   if ((session->opt_flags & NGHTTP2_OPTMASK_NO_CLOSED_STREAMS) == 0 &&
       session->server && !is_my_stream_id &&
       nghttp2_stream_in_dep_tree(stream)) {
@@ -1784,6 +2088,28 @@
   return 0;
 }
 
+static int session_predicate_priority_update_send(nghttp2_session *session,
+                                                  int32_t stream_id) {
+  nghttp2_stream *stream;
+
+  if (session_is_closing(session)) {
+    return NGHTTP2_ERR_SESSION_CLOSING;
+  }
+
+  stream = nghttp2_session_get_stream(session, stream_id);
+  if (stream == NULL) {
+    return 0;
+  }
+  if (stream->state == NGHTTP2_STREAM_CLOSING) {
+    return NGHTTP2_ERR_STREAM_CLOSING;
+  }
+  if (stream->shut_flags & NGHTTP2_SHUT_RD) {
+    return NGHTTP2_ERR_INVALID_STREAM_STATE;
+  }
+
+  return 0;
+}
+
 /* Take into account settings max frame size and both connection-level
    flow control here */
 static ssize_t
@@ -2013,7 +2339,7 @@
       if (stream) {
         int rv2;
 
-        rv2 = nghttp2_stream_detach_item(stream);
+        rv2 = session_detach_stream_item(session, stream);
 
         if (nghttp2_is_fatal(rv2)) {
           return rv2;
@@ -2032,7 +2358,7 @@
          queue when session->remote_window_size > 0 */
       assert(session->remote_window_size > 0);
 
-      rv = nghttp2_stream_defer_item(stream,
+      rv = session_defer_stream_item(session, stream,
                                      NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
 
       if (nghttp2_is_fatal(rv)) {
@@ -2051,7 +2377,8 @@
       return rv;
     }
     if (rv == NGHTTP2_ERR_DEFERRED) {
-      rv = nghttp2_stream_defer_item(stream, NGHTTP2_STREAM_FLAG_DEFERRED_USER);
+      rv = session_defer_stream_item(session, stream,
+                                     NGHTTP2_STREAM_FLAG_DEFERRED_USER);
 
       if (nghttp2_is_fatal(rv)) {
         return rv;
@@ -2062,7 +2389,7 @@
       return NGHTTP2_ERR_DEFERRED;
     }
     if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-      rv = nghttp2_stream_detach_item(stream);
+      rv = session_detach_stream_item(session, stream);
 
       if (nghttp2_is_fatal(rv)) {
         return rv;
@@ -2078,7 +2405,7 @@
     if (rv != 0) {
       int rv2;
 
-      rv2 = nghttp2_stream_detach_item(stream);
+      rv2 = session_detach_stream_item(session, stream);
 
       if (nghttp2_is_fatal(rv2)) {
         return rv2;
@@ -2328,6 +2655,18 @@
       }
 
       return 0;
+    case NGHTTP2_PRIORITY_UPDATE: {
+      nghttp2_ext_priority_update *priority_update = frame->ext.payload;
+      rv = session_predicate_priority_update_send(session,
+                                                  priority_update->stream_id);
+      if (rv != 0) {
+        return rv;
+      }
+
+      nghttp2_frame_pack_priority_update(&session->aob.framebufs, &frame->ext);
+
+      return 0;
+    }
     default:
       /* Unreachable here */
       assert(0);
@@ -2339,6 +2678,8 @@
 
 nghttp2_outbound_item *
 nghttp2_session_get_next_ob_item(nghttp2_session *session) {
+  nghttp2_outbound_item *item;
+
   if (nghttp2_outbound_queue_top(&session->ob_urgent)) {
     return nghttp2_outbound_queue_top(&session->ob_urgent);
   }
@@ -2354,7 +2695,12 @@
   }
 
   if (session->remote_window_size > 0) {
-    return nghttp2_stream_next_outbound_item(&session->root);
+    item = nghttp2_stream_next_outbound_item(&session->root);
+    if (item) {
+      return item;
+    }
+
+    return session_sched_get_next_outbound_item(session);
   }
 
   return NULL;
@@ -2388,7 +2734,12 @@
   }
 
   if (session->remote_window_size > 0) {
-    return nghttp2_stream_next_outbound_item(&session->root);
+    item = nghttp2_stream_next_outbound_item(&session->root);
+    if (item) {
+      return item;
+    }
+
+    return session_sched_get_next_outbound_item(session);
   }
 
   return NULL;
@@ -2498,10 +2849,20 @@
   return 0;
 }
 
-static void reschedule_stream(nghttp2_stream *stream) {
+static void session_reschedule_stream(nghttp2_session *session,
+                                      nghttp2_stream *stream) {
   stream->last_writelen = stream->item->frame.hd.length;
 
-  nghttp2_stream_reschedule(stream);
+  if (!(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES)) {
+    nghttp2_stream_reschedule(stream);
+    return;
+  }
+
+  if (!session->server) {
+    return;
+  }
+
+  session_sched_reschedule_stream(session, stream);
 }
 
 static int session_update_stream_consumed_size(nghttp2_session *session,
@@ -2550,7 +2911,7 @@
     }
 
     if (stream && aux_data->eof) {
-      rv = nghttp2_stream_detach_item(stream);
+      rv = session_detach_stream_item(session, stream);
       if (nghttp2_is_fatal(rv)) {
         return rv;
       }
@@ -2675,9 +3036,8 @@
     }
   }
   case NGHTTP2_PRIORITY:
-    if (session->server) {
+    if (session->server || session->pending_no_rfc7540_priorities == 1) {
       return 0;
-      ;
     }
 
     stream = nghttp2_session_get_stream_raw(session, frame->hd.stream_id);
@@ -2852,7 +3212,7 @@
      further data. */
   if (nghttp2_session_predicate_data_send(session, stream) != 0) {
     if (stream) {
-      rv = nghttp2_stream_detach_item(stream);
+      rv = session_detach_stream_item(session, stream);
 
       if (nghttp2_is_fatal(rv)) {
         return rv;
@@ -3150,7 +3510,7 @@
       }
 
       if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-        rv = nghttp2_stream_detach_item(stream);
+        rv = session_detach_stream_item(session, stream);
 
         if (nghttp2_is_fatal(rv)) {
           return rv;
@@ -3730,6 +4090,21 @@
                                                nghttp2_frame *frame,
                                                nghttp2_stream *stream) {
   int rv;
+
+  assert(frame->hd.type == NGHTTP2_HEADERS);
+
+  if (session->server && session_enforce_http_messaging(session) &&
+      frame->headers.cat == NGHTTP2_HCAT_REQUEST &&
+      (stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) &&
+      !(stream->flags & NGHTTP2_STREAM_FLAG_IGNORE_CLIENT_PRIORITIES) &&
+      (stream->http_flags & NGHTTP2_HTTP_FLAG_PRIORITY)) {
+    rv = session_update_stream_priority(session, stream, stream->http_extpri);
+    if (rv != 0) {
+      assert(nghttp2_is_fatal(rv));
+      return rv;
+    }
+  }
+
   if ((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0) {
     return 0;
   }
@@ -4091,6 +4466,8 @@
   int rv;
   nghttp2_stream *stream;
 
+  assert(!session_no_rfc7540_pri_no_fallback(session));
+
   if (frame->hd.stream_id == 0) {
     return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
                                              "PRIORITY: stream_id == 0");
@@ -4148,6 +4525,8 @@
   nghttp2_inbound_frame *iframe = &session->iframe;
   nghttp2_frame *frame = &iframe->frame;
 
+  assert(!session_no_rfc7540_pri_no_fallback(session));
+
   nghttp2_frame_unpack_priority_payload(&frame->priority, iframe->sbuf.pos);
 
   return nghttp2_session_on_priority_received(session, frame);
@@ -4214,8 +4593,8 @@
   if (stream->remote_window_size > 0 &&
       nghttp2_stream_check_deferred_by_flow_control(stream)) {
 
-    rv = nghttp2_stream_resume_deferred_item(
-        stream, NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
+    rv = session_resume_deferred_stream_item(
+        arg->session, stream, NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
 
     if (nghttp2_is_fatal(rv)) {
       return rv;
@@ -4259,9 +4638,16 @@
     return nghttp2_session_add_rst_stream(arg->session, stream->stream_id,
                                           NGHTTP2_FLOW_CONTROL_ERROR);
   }
-  if (!(arg->session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) &&
-      stream->window_update_queued == 0 &&
-      nghttp2_should_send_window_update(stream->local_window_size,
+
+  if (stream->window_update_queued) {
+    return 0;
+  }
+
+  if (arg->session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
+    return session_update_stream_consumed_size(arg->session, stream, 0);
+  }
+
+  if (nghttp2_should_send_window_update(stream->local_window_size,
                                         stream->recv_window_size)) {
 
     rv = nghttp2_session_add_window_update(arg->session, NGHTTP2_FLAG_NONE,
@@ -4382,6 +4768,9 @@
     case NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL:
       session->local_settings.enable_connect_protocol = ivi.value;
       break;
+    case NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES:
+      session->local_settings.no_rfc7540_priorities = ivi.value;
+      break;
     }
   }
 
@@ -4541,6 +4930,34 @@
       session->remote_settings.enable_connect_protocol = entry->value;
 
       break;
+    case NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES:
+
+      if (entry->value != 0 && entry->value != 1) {
+        return session_handle_invalid_connection(
+            session, frame, NGHTTP2_ERR_PROTO,
+            "SETTINGS: invalid SETTINGS_NO_RFC7540_PRIORITIES");
+      }
+
+      if (session->remote_settings.no_rfc7540_priorities != UINT32_MAX &&
+          session->remote_settings.no_rfc7540_priorities != entry->value) {
+        return session_handle_invalid_connection(
+            session, frame, NGHTTP2_ERR_PROTO,
+            "SETTINGS: SETTINGS_NO_RFC7540_PRIORITIES cannot be changed");
+      }
+
+      session->remote_settings.no_rfc7540_priorities = entry->value;
+
+      break;
+    }
+  }
+
+  if (session->remote_settings.no_rfc7540_priorities == UINT32_MAX) {
+    session->remote_settings.no_rfc7540_priorities = 0;
+
+    if (session->server && session->pending_no_rfc7540_priorities &&
+        (session->opt_flags &
+         NGHTTP2_OPTMASK_SERVER_FALLBACK_RFC7540_PRIORITIES)) {
+      session->fallback_rfc7540_priorities = 1;
     }
   }
 
@@ -4826,8 +5243,8 @@
   if (stream->remote_window_size > 0 &&
       nghttp2_stream_check_deferred_by_flow_control(stream)) {
 
-    rv = nghttp2_stream_resume_deferred_item(
-        stream, NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
+    rv = session_resume_deferred_stream_item(
+        session, stream, NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
 
     if (nghttp2_is_fatal(rv)) {
       return rv;
@@ -4898,6 +5315,80 @@
   return session_call_on_frame_received(session, frame);
 }
 
+int nghttp2_session_on_priority_update_received(nghttp2_session *session,
+                                                nghttp2_frame *frame) {
+  nghttp2_ext_priority_update *priority_update;
+  nghttp2_stream *stream;
+  nghttp2_priority_spec pri_spec;
+  nghttp2_extpri extpri;
+  int rv;
+
+  assert(session->server);
+
+  priority_update = frame->ext.payload;
+
+  if (frame->hd.stream_id != 0) {
+    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
+                                             "PRIORITY_UPDATE: stream_id == 0");
+  }
+
+  if (nghttp2_session_is_my_stream_id(session, priority_update->stream_id)) {
+    if (session_detect_idle_stream(session, priority_update->stream_id)) {
+      return session_handle_invalid_connection(
+          session, frame, NGHTTP2_ERR_PROTO,
+          "PRIORITY_UPDATE: prioritizing idle push is not allowed");
+    }
+
+    /* TODO Ignore priority signal to a push stream for now */
+    return session_call_on_frame_received(session, frame);
+  }
+
+  stream = nghttp2_session_get_stream_raw(session, priority_update->stream_id);
+  if (stream) {
+    /* Stream already exists. */
+    if (stream->flags & NGHTTP2_STREAM_FLAG_IGNORE_CLIENT_PRIORITIES) {
+      return session_call_on_frame_received(session, frame);
+    }
+  } else if (session_detect_idle_stream(session, priority_update->stream_id)) {
+    if (session->num_idle_streams + session->num_incoming_streams >=
+        session->local_settings.max_concurrent_streams) {
+      return session_handle_invalid_connection(
+          session, frame, NGHTTP2_ERR_PROTO,
+          "PRIORITY_UPDATE: max concurrent streams exceeded");
+    }
+
+    nghttp2_priority_spec_default_init(&pri_spec);
+    stream = nghttp2_session_open_stream(session, priority_update->stream_id,
+                                         NGHTTP2_FLAG_NONE, &pri_spec,
+                                         NGHTTP2_STREAM_IDLE, NULL);
+    if (!stream) {
+      return NGHTTP2_ERR_NOMEM;
+    }
+  } else {
+    return session_call_on_frame_received(session, frame);
+  }
+
+  extpri.urgency = NGHTTP2_EXTPRI_DEFAULT_URGENCY;
+  extpri.inc = 0;
+
+  rv = nghttp2_http_parse_priority(&extpri, priority_update->field_value,
+                                   priority_update->field_value_len);
+  if (rv != 0) {
+    /* Just ignore field_value if it cannot be parsed. */
+    return session_call_on_frame_received(session, frame);
+  }
+
+  rv = session_update_stream_priority(session, stream,
+                                      nghttp2_extpri_to_uint8(&extpri));
+  if (rv != 0) {
+    if (nghttp2_is_fatal(rv)) {
+      return rv;
+    }
+  }
+
+  return session_call_on_frame_received(session, frame);
+}
+
 static int session_process_altsvc_frame(nghttp2_session *session) {
   nghttp2_inbound_frame *iframe = &session->iframe;
   nghttp2_frame *frame = &iframe->frame;
@@ -4932,6 +5423,16 @@
   return nghttp2_session_on_origin_received(session, frame);
 }
 
+static int session_process_priority_update_frame(nghttp2_session *session) {
+  nghttp2_inbound_frame *iframe = &session->iframe;
+  nghttp2_frame *frame = &iframe->frame;
+
+  nghttp2_frame_unpack_priority_update_payload(&frame->ext, iframe->sbuf.pos,
+                                               nghttp2_buf_len(&iframe->sbuf));
+
+  return nghttp2_session_on_priority_update_received(session, frame);
+}
+
 static int session_process_extension_frame(nghttp2_session *session) {
   int rv;
   nghttp2_inbound_frame *iframe = &session->iframe;
@@ -5269,6 +5770,7 @@
   case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
   case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
   case NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL:
+  case NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES:
     break;
   default:
     DEBUGF("recv: unknown settings id=0x%02x\n", iv.settings_id);
@@ -5341,7 +5843,7 @@
 
 /*
  * This function returns the effective payload length in the data of
- * length |readlen| when the remaning payload is |payloadleft|. The
+ * length |readlen| when the remaining payload is |payloadleft|. The
  * |payloadleft| does not include |readlen|. If padding was started
  * strictly before this data chunk, this function returns -1.
  */
@@ -5883,6 +6385,49 @@
             iframe->state = NGHTTP2_IB_READ_ORIGIN_PAYLOAD;
 
             break;
+          case NGHTTP2_PRIORITY_UPDATE:
+            if ((session->builtin_recv_ext_types &
+                 NGHTTP2_TYPEMASK_PRIORITY_UPDATE) == 0) {
+              busy = 1;
+              iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
+              break;
+            }
+
+            DEBUGF("recv: PRIORITY_UPDATE\n");
+
+            iframe->frame.hd.flags = NGHTTP2_FLAG_NONE;
+            iframe->frame.ext.payload =
+                &iframe->ext_frame_payload.priority_update;
+
+            if (!session->server) {
+              rv = nghttp2_session_terminate_session_with_reason(
+                  session, NGHTTP2_PROTOCOL_ERROR,
+                  "PRIORITY_UPDATE is received from server");
+              if (nghttp2_is_fatal(rv)) {
+                return rv;
+              }
+              return (ssize_t)inlen;
+            }
+
+            if (iframe->payloadleft < 4) {
+              busy = 1;
+              iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
+              break;
+            }
+
+            if (!session_no_rfc7540_pri_no_fallback(session) ||
+                iframe->payloadleft > sizeof(iframe->raw_sbuf)) {
+              busy = 1;
+              iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
+              break;
+            }
+
+            busy = 1;
+
+            iframe->state = NGHTTP2_IB_READ_NBYTE;
+            inbound_frame_set_mark(iframe, iframe->payloadleft);
+
+            break;
           default:
             busy = 1;
 
@@ -5988,13 +6533,16 @@
 
         break;
       case NGHTTP2_PRIORITY:
-        rv = session_process_priority_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
+        if (!session_no_rfc7540_pri_no_fallback(session) &&
+            session->remote_settings.no_rfc7540_priorities != 1) {
+          rv = session_process_priority_frame(session);
+          if (nghttp2_is_fatal(rv)) {
+            return rv;
+          }
 
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
+          if (iframe->state == NGHTTP2_IB_IGN_ALL) {
+            return (ssize_t)inlen;
+          }
         }
 
         session_inbound_frame_reset(session);
@@ -6151,6 +6699,18 @@
         iframe->state = NGHTTP2_IB_READ_ALTSVC_PAYLOAD;
 
         break;
+      case NGHTTP2_PRIORITY_UPDATE:
+        DEBUGF("recv: prioritized_stream_id=%d\n",
+               nghttp2_get_uint32(iframe->sbuf.pos) & NGHTTP2_STREAM_ID_MASK);
+
+        rv = session_process_priority_update_frame(session);
+        if (nghttp2_is_fatal(rv)) {
+          return rv;
+        }
+
+        session_inbound_frame_reset(session);
+
+        break;
       }
       default:
         /* This is unknown frame */
@@ -6863,7 +7423,8 @@
    */
   return session->aob.item || nghttp2_outbound_queue_top(&session->ob_urgent) ||
          nghttp2_outbound_queue_top(&session->ob_reg) ||
-         (!nghttp2_pq_empty(&session->root.obq) &&
+         ((!nghttp2_pq_empty(&session->root.obq) ||
+           !session_sched_empty(session)) &&
           session->remote_window_size > 0) ||
          (nghttp2_outbound_queue_top(&session->ob_syn) &&
           !session_is_outgoing_concurrent_streams_max(session));
@@ -7016,6 +7577,7 @@
   int rv;
   nghttp2_mem *mem;
   nghttp2_inflight_settings *inflight_settings = NULL;
+  uint8_t no_rfc7540_pri = session->pending_no_rfc7540_priorities;
 
   mem = &session->mem;
 
@@ -7033,6 +7595,21 @@
     return NGHTTP2_ERR_INVALID_ARGUMENT;
   }
 
+  for (i = 0; i < niv; ++i) {
+    if (ivi.settings_id != NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES) {
+      continue;
+    }
+
+    if (no_rfc7540_pri == UINT8_MAX) {
+      no_rfc7540_pri = (uint8_t)ivi.value;
+      continue;
+    }
+
+    if (ivi.value != (uint32_t)no_rfc7540_pri) {
+      return NGHTTP2_ERR_INVALID_ARGUMENT;
+    }
+  }
+
   item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
   if (item == NULL) {
     return NGHTTP2_ERR_NOMEM;
@@ -7107,6 +7684,12 @@
     }
   }
 
+  if (no_rfc7540_pri == UINT8_MAX) {
+    session->pending_no_rfc7540_priorities = 0;
+  } else {
+    session->pending_no_rfc7540_priorities = no_rfc7540_pri;
+  }
+
   return 0;
 }
 
@@ -7235,7 +7818,7 @@
     return rv;
   }
 
-  reschedule_stream(stream);
+  session_reschedule_stream(session, stream);
 
   if (frame->hd.length == 0 && (data_flags & NGHTTP2_DATA_FLAG_EOF) &&
       (data_flags & NGHTTP2_DATA_FLAG_NO_END_STREAM)) {
@@ -7309,7 +7892,7 @@
     return NGHTTP2_ERR_INVALID_ARGUMENT;
   }
 
-  rv = nghttp2_stream_resume_deferred_item(stream,
+  rv = session_resume_deferred_stream_item(session, stream,
                                            NGHTTP2_STREAM_FLAG_DEFERRED_USER);
 
   if (nghttp2_is_fatal(rv)) {
@@ -7417,6 +8000,8 @@
     return session->remote_settings.max_header_list_size;
   case NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL:
     return session->remote_settings.enable_connect_protocol;
+  case NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES:
+    return session->remote_settings.no_rfc7540_priorities;
   }
 
   assert(0);
@@ -7440,6 +8025,8 @@
     return session->local_settings.max_header_list_size;
   case NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL:
     return session->local_settings.enable_connect_protocol;
+  case NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES:
+    return session->local_settings.no_rfc7540_priorities;
   }
 
   assert(0);
@@ -7723,6 +8310,10 @@
   nghttp2_stream *stream;
   nghttp2_priority_spec pri_spec_copy;
 
+  if (session->pending_no_rfc7540_priorities == 1) {
+    return 0;
+  }
+
   if (stream_id == 0 || stream_id == pri_spec->stream_id) {
     return NGHTTP2_ERR_INVALID_ARGUMENT;
   }
@@ -7755,6 +8346,10 @@
   nghttp2_stream *stream;
   nghttp2_priority_spec pri_spec_copy;
 
+  if (session->pending_no_rfc7540_priorities == 1) {
+    return 0;
+  }
+
   if (stream_id == 0 || stream_id == pri_spec->stream_id ||
       !session_detect_idle_stream(session, stream_id)) {
     return NGHTTP2_ERR_INVALID_ARGUMENT;
@@ -7796,3 +8391,38 @@
 void nghttp2_session_set_user_data(nghttp2_session *session, void *user_data) {
   session->user_data = user_data;
 }
+
+int nghttp2_session_change_extpri_stream_priority(
+    nghttp2_session *session, int32_t stream_id,
+    const nghttp2_extpri *extpri_in, int ignore_client_signal) {
+  nghttp2_stream *stream;
+  nghttp2_extpri extpri = *extpri_in;
+
+  if (!session->server) {
+    return NGHTTP2_ERR_INVALID_STATE;
+  }
+
+  if (session->pending_no_rfc7540_priorities != 1) {
+    return 0;
+  }
+
+  if (stream_id == 0) {
+    return NGHTTP2_ERR_INVALID_ARGUMENT;
+  }
+
+  stream = nghttp2_session_get_stream_raw(session, stream_id);
+  if (!stream) {
+    return NGHTTP2_ERR_INVALID_ARGUMENT;
+  }
+
+  if (extpri.urgency > NGHTTP2_EXTPRI_URGENCY_LOW) {
+    extpri.urgency = NGHTTP2_EXTPRI_URGENCY_LOW;
+  }
+
+  if (ignore_client_signal) {
+    stream->flags |= NGHTTP2_STREAM_FLAG_IGNORE_CLIENT_PRIORITIES;
+  }
+
+  return session_update_stream_priority(session, stream,
+                                        nghttp2_extpri_to_uint8(&extpri));
+}

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_session.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_session.h Changed

@@ -52,7 +52,9 @@
   NGHTTP2_OPTMASK_NO_RECV_CLIENT_MAGIC = 1 << 1,
   NGHTTP2_OPTMASK_NO_HTTP_MESSAGING = 1 << 2,
   NGHTTP2_OPTMASK_NO_AUTO_PING_ACK = 1 << 3,
-  NGHTTP2_OPTMASK_NO_CLOSED_STREAMS = 1 << 4
+  NGHTTP2_OPTMASK_NO_CLOSED_STREAMS = 1 << 4,
+  NGHTTP2_OPTMASK_SERVER_FALLBACK_RFC7540_PRIORITIES = 1 << 5,
+  NGHTTP2_OPTMASK_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION = 1 << 6,
 } nghttp2_optmask;
 
 /*
@@ -62,7 +64,8 @@
 typedef enum {
   NGHTTP2_TYPEMASK_NONE = 0,
   NGHTTP2_TYPEMASK_ALTSVC = 1 << 0,
-  NGHTTP2_TYPEMASK_ORIGIN = 1 << 1
+  NGHTTP2_TYPEMASK_ORIGIN = 1 << 1,
+  NGHTTP2_TYPEMASK_PRIORITY_UPDATE = 1 << 2
 } nghttp2_typemask;
 
 typedef enum {
@@ -151,10 +154,8 @@
   /* padding length for the current frame */
   size_t padlen;
   nghttp2_inbound_state state;
-  /* Small buffer.  Currently the largest contiguous chunk to buffer
-     is frame header.  We buffer part of payload, but they are smaller
-     than frame header. */
-  uint8_t raw_sbufNGHTTP2_FRAME_HDLEN;
+  /* Small fixed sized buffer. */
+  uint8_t raw_sbuf32;
 } nghttp2_inbound_frame;
 
 typedef struct {
@@ -165,6 +166,7 @@
   uint32_t max_frame_size;
   uint32_t max_header_list_size;
   uint32_t enable_connect_protocol;
+  uint32_t no_rfc7540_priorities;
 } nghttp2_settings_storage;
 
 typedef enum {
@@ -202,6 +204,12 @@
      response) frame, which are subject to
      SETTINGS_MAX_CONCURRENT_STREAMS limit. */
   nghttp2_outbound_queue ob_syn;
+  /* Queues for DATA frames which is used when
+     SETTINGS_NO_RFC7540_PRIORITIES is enabled.  This implements RFC
+     9218 extensible prioritization scheme. */
+  struct {
+    nghttp2_pq ob_data;
+  } schedNGHTTP2_EXTPRI_URGENCY_LEVELS;
   nghttp2_active_outbound_item aob;
   nghttp2_inbound_frame iframe;
   nghttp2_hd_deflater hd_deflater;
@@ -227,6 +235,9 @@
   /* Queue of In-flight SETTINGS values.  SETTINGS bearing ACK is not
      considered as in-flight. */
   nghttp2_inflight_settings *inflight_settings_head;
+  /* Sequential number across all streams to process streams in
+     FIFO. */
+  uint64_t stream_seq;
   /* The number of outgoing streams. This will be capped by
      remote_settings.max_concurrent_streams. */
   size_t num_outgoing_streams;
@@ -328,6 +339,11 @@
   /* Unacked local ENABLE_CONNECT_PROTOCOL value.  We use this to
      accept :protocol header field before SETTINGS_ACK is received. */
   uint8_t pending_enable_connect_protocol;
+  /* Unacked local SETTINGS_NO_RFC7540_PRIORITIES value, which is
+     effective before it is acknowledged. */
+  uint8_t pending_no_rfc7540_priorities;
+  /* Turn on fallback to RFC 7540 priorities; for server use only. */
+  uint8_t fallback_rfc7540_priorities;
   /* Nonzero if the session is server side. */
   uint8_t server;
   /* Flags indicating GOAWAY is sent and/or received. The flags are
@@ -408,7 +424,7 @@
                                    uint32_t error_code);
 
 /*
- * Adds PING frame. This is a convenient functin built on top of
+ * Adds PING frame. This is a convenient function built on top of
  * nghttp2_session_add_frame() to add PING easily.
  *
  * If the |opaque_data| is not NULL, it must point to 8 bytes memory
@@ -774,6 +790,19 @@
                                        nghttp2_frame *frame);
 
 /*
+ * Called when PRIORITY_UPDATE is received, assuming |frame| is
+ * properly initialized.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_CALLBACK_FAILURE
+ *     The callback function failed.
+ */
+int nghttp2_session_on_priority_update_received(nghttp2_session *session,
+                                                nghttp2_frame *frame);
+
+/*
  * Called when DATA is received, assuming |frame| is properly
  * initialized.
  *

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_stream.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_stream.c Changed

@@ -33,7 +33,7 @@
 #include "nghttp2_frame.h"
 
 /* Maximum distance between any two stream's cycle in the same
-   prirority queue.  Imagine stream A's cycle is A, and stream B's
+   priority queue.  Imagine stream A's cycle is A, and stream B's
    cycle is B, and A < B.  The cycle is unsigned 32 bit integer, it
    may get overflow.  Because of how we calculate the next cycle
    value, if B - A is less than or equals to
@@ -100,6 +100,8 @@
   stream->descendant_next_seq = 0;
   stream->seq = 0;
   stream->last_writelen = 0;
+
+  stream->extpri = stream->http_extpri = NGHTTP2_EXTPRI_DEFAULT_URGENCY;
 }
 
 void nghttp2_stream_free(nghttp2_stream *stream) {
@@ -484,6 +486,10 @@
 
   stream->item = item;
 
+  if (stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) {
+    return 0;
+  }
+
   rv = stream_update_dep_on_attach_item(stream);
   if (rv != 0) {
     /* This may relave stream->queued == 1, but stream->item == NULL.
@@ -503,6 +509,10 @@
   stream->item = NULL;
   stream->flags = (uint8_t)(stream->flags & ~NGHTTP2_STREAM_FLAG_DEFERRED_ALL);
 
+  if (stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) {
+    return 0;
+  }
+
   return stream_update_dep_on_detach_item(stream);
 }
 
@@ -514,6 +524,10 @@
 
   stream->flags |= flags;
 
+  if (stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) {
+    return 0;
+  }
+
   return stream_update_dep_on_detach_item(stream);
 }
 
@@ -529,6 +543,10 @@
     return 0;
   }
 
+  if (stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) {
+    return 0;
+  }
+
   return stream_update_dep_on_attach_item(stream);
 }

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_stream.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_stream.h Changed

@@ -90,8 +90,15 @@
   NGHTTP2_STREAM_FLAG_DEFERRED_USER = 0x08,
   /* bitwise OR of NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL and
      NGHTTP2_STREAM_FLAG_DEFERRED_USER. */
-  NGHTTP2_STREAM_FLAG_DEFERRED_ALL = 0x0c
-
+  NGHTTP2_STREAM_FLAG_DEFERRED_ALL = 0x0c,
+  /* Indicates that this stream is not subject to RFC7540
+     priorities scheme. */
+  NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES = 0x10,
+  /* Ignore client RFC 9218 priority signal. */
+  NGHTTP2_STREAM_FLAG_IGNORE_CLIENT_PRIORITIES = 0x20,
+  /* Indicates that RFC 9113 leading and trailing white spaces
+     validation against a field value is not performed. */
+  NGHTTP2_STREAM_FLAG_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION = 0x40,
 } nghttp2_stream_flag;
 
 /* HTTP related flags to enforce HTTP semantics */
@@ -132,6 +139,11 @@
   /* set if final response is expected */
   NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE = 1 << 14,
   NGHTTP2_HTTP_FLAG__PROTOCOL = 1 << 15,
+  /* set if priority header field is received */
+  NGHTTP2_HTTP_FLAG_PRIORITY = 1 << 16,
+  /* set if an error is encountered while parsing priority header
+     field */
+  NGHTTP2_HTTP_FLAG_BAD_PRIORITY = 1 << 17,
 } nghttp2_http_flag;
 
 struct nghttp2_stream {
@@ -204,7 +216,7 @@
   /* status code from remote server */
   int16_t status_code;
   /* Bitwise OR of zero or more nghttp2_http_flag values */
-  uint16_t http_flags;
+  uint32_t http_flags;
   /* This is bitwise-OR of 0 or more of nghttp2_stream_flag. */
   uint8_t flags;
   /* Bitwise OR of zero or more nghttp2_shut_flag values */
@@ -218,6 +230,12 @@
      this stream.  The nonzero does not necessarily mean WINDOW_UPDATE
      is not queued. */
   uint8_t window_update_queued;
+  /* extpri is a stream priority produced by nghttp2_extpri_to_uint8
+     used by RFC 9218 extensible priorities. */
+  uint8_t extpri;
+  /* http_extpri is a stream priority received in HTTP request header
+     fields and produced by nghttp2_extpri_to_uint8. */
+  uint8_t http_extpri;
 };
 
 void nghttp2_stream_init(nghttp2_stream *stream, int32_t stream_id,

_service:tar_scm:nghttp2-1.46.0.tar.xz/lib/nghttp2_submit.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/lib/nghttp2_submit.c Changed

@@ -196,7 +196,8 @@
 
   flags &= NGHTTP2_FLAG_END_STREAM;
 
-  if (pri_spec && !nghttp2_priority_spec_check_default(pri_spec)) {
+  if (pri_spec && !nghttp2_priority_spec_check_default(pri_spec) &&
+      session->remote_settings.no_rfc7540_priorities != 1) {
     rv = detect_self_dependency(session, stream_id, pri_spec);
     if (rv != 0) {
       return rv;
@@ -229,6 +230,10 @@
 
   mem = &session->mem;
 
+  if (session->remote_settings.no_rfc7540_priorities == 1) {
+    return 0;
+  }
+
   if (stream_id == 0 || pri_spec == NULL) {
     return NGHTTP2_ERR_INVALID_ARGUMENT;
   }
@@ -492,8 +497,6 @@
     return nghttp2_session_update_recv_stream_window_size(session, stream, 0,
                                                           1);
   }
-
-  return 0;
 }
 
 int nghttp2_submit_altsvc(nghttp2_session *session, uint8_t flags,
@@ -664,6 +667,78 @@
   return rv;
 }
 
+int nghttp2_submit_priority_update(nghttp2_session *session, uint8_t flags,
+                                   int32_t stream_id,
+                                   const uint8_t *field_value,
+                                   size_t field_value_len) {
+  nghttp2_mem *mem;
+  uint8_t *buf, *p;
+  nghttp2_outbound_item *item;
+  nghttp2_frame *frame;
+  nghttp2_ext_priority_update *priority_update;
+  int rv;
+  (void)flags;
+
+  mem = &session->mem;
+
+  if (session->server) {
+    return NGHTTP2_ERR_INVALID_STATE;
+  }
+
+  if (session->remote_settings.no_rfc7540_priorities == 0) {
+    return 0;
+  }
+
+  if (stream_id == 0 || 4 + field_value_len > NGHTTP2_MAX_PAYLOADLEN) {
+    return NGHTTP2_ERR_INVALID_ARGUMENT;
+  }
+
+  if (field_value_len) {
+    buf = nghttp2_mem_malloc(mem, field_value_len + 1);
+    if (buf == NULL) {
+      return NGHTTP2_ERR_NOMEM;
+    }
+
+    p = nghttp2_cpymem(buf, field_value, field_value_len);
+    *p = '\0';
+  } else {
+    buf = NULL;
+  }
+
+  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
+  if (item == NULL) {
+    rv = NGHTTP2_ERR_NOMEM;
+    goto fail_item_malloc;
+  }
+
+  nghttp2_outbound_item_init(item);
+
+  item->aux_data.ext.builtin = 1;
+
+  priority_update = &item->ext_frame_payload.priority_update;
+
+  frame = &item->frame;
+  frame->ext.payload = priority_update;
+
+  nghttp2_frame_priority_update_init(&frame->ext, stream_id, buf,
+                                     field_value_len);
+
+  rv = nghttp2_session_add_item(session, item);
+  if (rv != 0) {
+    nghttp2_frame_priority_update_free(&frame->ext, mem);
+    nghttp2_mem_free(mem, item);
+
+    return rv;
+  }
+
+  return 0;
+
+fail_item_malloc:
+  free(buf);
+
+  return rv;
+}
+
 static uint8_t set_request_flags(const nghttp2_priority_spec *pri_spec,
                                  const nghttp2_data_provider *data_prd) {
   uint8_t flags = NGHTTP2_FLAG_NONE;
@@ -690,7 +765,8 @@
     return NGHTTP2_ERR_PROTO;
   }
 
-  if (pri_spec && !nghttp2_priority_spec_check_default(pri_spec)) {
+  if (pri_spec && !nghttp2_priority_spec_check_default(pri_spec) &&
+      session->remote_settings.no_rfc7540_priorities != 1) {
     rv = detect_self_dependency(session, -1, pri_spec);
     if (rv != 0) {
       return rv;

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

@@ -1,12 +1,12 @@
-#! /bin/sh
+#! /usr/bin/env sh
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-##               by inline-source v2014-01-03.01
+##               by inline-source v2019-02-19.15
 
 # libtool (GNU libtool) 2.4.6
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-15"
+VERSION="2.4.6 Debian-2.4.7-2"
 package_revision=2.4.6
 
 
@@ -64,34 +64,25 @@
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
+scriptversion=2019-02-19.15; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-
-# As a special exception to the GNU General Public License, if you distribute
-# this file as part of a program or library that is built using GNU Libtool,
-# you may include this file under the same distribution terms that you use
-# for the rest of that program.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the 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/>.
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2004-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
 
-# Please report bugs or propose patches to gary@gnu.org.
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
 
 
 ## ------ ##
@@ -139,9 +130,12 @@
 	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# These NLS vars are set unconditionally (bootstrap issue #24).  Unset those
+# in case the environment reset is needed later and the $save_* variant is not
+# defined (see the code above).
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 # Make sure IFS has a sensible default
 sp=' '
@@ -159,6 +153,26 @@
 fi
 
 
+# func_unset VAR
+# --------------
+# Portably unset VAR.
+# In some shells, an 'unset VAR' statement leaves a non-zero return
+# status if VAR is already unset, which might be problematic if the
+# statement is used at the end of a function (thus poisoning its return
+# value) or when 'set -e' is active (causing even a spurious abort of
+# the script in this case).
+func_unset ()
+{
+    { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
+}
+
+
+# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
+func_unset CDPATH
+
+# Make sure ${,E,F}GREP behave sanely.
+func_unset GREP_OPTIONS
+
 
 ## ------------------------- ##
 ## Locate command utilities. ##
@@ -259,7 +273,7 @@
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
-  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
   rm -f conftest.sed
   SED=$func_path_progs_result
 }
@@ -295,7 +309,7 @@
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
-  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
   GREP=$func_path_progs_result
 }
 
@@ -360,6 +374,35 @@
   s/\$^$_G_bs\$$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
   s/\n//g"
 
+# require_check_ifs_backslash
+# ---------------------------
+# Check if we can use backslash as IFS='\' separator, and set
+# $check_ifs_backshlash_broken to ':' or 'false'.
+require_check_ifs_backslash=func_require_check_ifs_backslash
+func_require_check_ifs_backslash ()
+{
+  _G_save_IFS=$IFS
+  IFS='\'
+  _G_check_ifs_backshlash='a\\b'
+  for _G_i in $_G_check_ifs_backshlash
+  do
+  case $_G_i in
+  a)
+    check_ifs_backshlash_broken=false
+    ;;
+  '')
+    break
+    ;;
+  *)
+    check_ifs_backshlash_broken=:
+    break
+    ;;
+  esac
+  done
+  IFS=$_G_save_IFS
+  require_check_ifs_backslash=:
+}
+
 
 ## ----------------- ##
 ## Global variables. ##
@@ -580,16 +623,16 @@
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1+=\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1+=\\ \$func_quote_arg_result"
   }'
 else
   func_append_quoted ()
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1=\$$1\\ \$func_quote_arg_result"
   }
 fi
 
@@ -1091,85 +1134,203 @@
 }
 
 
-# func_quote_for_eval ARG...
-# --------------------------
-# Aesthetically quote ARGs to be evaled later.
-# This function returns two values:
-#   i) func_quote_for_eval_result
-#      double-quoted, suitable for a subsequent eval
-#  ii) func_quote_for_eval_unquoted_result
-#      has all characters that are still active within double
-#      quotes backslashified.
-func_quote_for_eval ()
+# func_quote_portable EVAL ARG
+# ----------------------------
+# Internal function to portably implement func_quote_arg.  Note that we still
+# keep attention to performance here so we as much as possible try to avoid
+# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
+func_quote_portable ()
 {
     $debug_cmd
 
-    func_quote_for_eval_unquoted_result=
-    func_quote_for_eval_result=
-    while test 0 -lt $#; do
-      case $1 in
-        *\\\`\"\$*)
-	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
-        *)
-          _G_unquoted_arg=$1 ;;
-      esac
-      if test -n "$func_quote_for_eval_unquoted_result"; then
-	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-      else
-        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+    $require_check_ifs_backslash
+
+    func_quote_portable_result=$2
+
+    # one-time-loop (easy break)
+    while true
+    do
+      if $1; then
+        func_quote_portable_result=`$ECHO "$2" | $SED \
+          -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
+        break
       fi
 
-      case $_G_unquoted_arg in
-        # Double-quote args containing shell metacharacters to delay
-        # word splitting, command substitution and variable expansion
-        # for a subsequent eval.
-        # Many Bourne shells cannot handle close brackets correctly
-        # in scan sets, so we specify it separately.
-        *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-          _G_quoted_arg=\"$_G_unquoted_arg\"
+      # Quote for eval.
+      case $func_quote_portable_result in
+        *\\\`\"\$*)
+          # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
+          # contains the shell wildcard characters.
+          case $check_ifs_backshlash_broken$func_quote_portable_result in
+            :*|*\\*\?*)
+              func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
+                  | $SED "$sed_quote_subst"`
+              break
+              ;;
+          esac
+
+          func_quote_portable_old_IFS=$IFS
+          for _G_char in '\' '`' '"' '$'
+          do
+            # STATE($1) PREV($2) SEPARATOR($3)
+            set start "" ""
+            func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
+            IFS=$_G_char
+            for _G_part in $func_quote_portable_result
+            do
+              case $1 in
+              quote)
+                func_append func_quote_portable_result "$3$2"
+                set quote "$_G_part" "\\$_G_char"
+                ;;
+              start)
+                set first "" ""
+                func_quote_portable_result=
+                ;;
+              first)
+                set quote "$_G_part" ""
+                ;;
+              esac
+            done
+          done
+          IFS=$func_quote_portable_old_IFS
           ;;
-        *)
-          _G_quoted_arg=$_G_unquoted_arg
-	  ;;
+        *) ;;
       esac
-
-      if test -n "$func_quote_for_eval_result"; then
-	func_append func_quote_for_eval_result " $_G_quoted_arg"
-      else
-        func_append func_quote_for_eval_result "$_G_quoted_arg"
-      fi
-      shift
+      break
     done
+
+    func_quote_portable_unquoted_result=$func_quote_portable_result
+    case $func_quote_portable_result in
+      # double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and variable expansion
+      # for a subsequent eval.
+      # many bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
+        func_quote_portable_result=\"$func_quote_portable_result\"
+        ;;
+    esac
 }
 
 
-# func_quote_for_expand ARG
-# -------------------------
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    $debug_cmd
+# func_quotefast_eval ARG
+# -----------------------
+# Quote one ARG (internal).  This is equivalent to 'func_quote_arg eval ARG',
+# but optimized for speed.  Result is stored in $func_quotefast_eval.
+if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
+  printf -v _GL_test_printf_tilde %q '~'
+  if test '\~' = "$_GL_test_printf_tilde"; then
+    func_quotefast_eval ()
+    {
+      printf -v func_quotefast_eval_result %q "$1"
+    }
+  else
+    # Broken older Bash implementations.  Make those faster too if possible.
+    func_quotefast_eval ()
+    {
+      case $1 in
+        '~'*)
+          func_quote_portable false "$1"
+          func_quotefast_eval_result=$func_quote_portable_result
+          ;;
+        *)
+          printf -v func_quotefast_eval_result %q "$1"
+          ;;
+      esac
+    }
+  fi
+else
+  func_quotefast_eval ()
+  {
+    func_quote_portable false "$1"
+    func_quotefast_eval_result=$func_quote_portable_result
+  }
+fi
 
-    case $1 in
-      *\\\`\"*)
-	_G_arg=`$ECHO "$1" | $SED \
-	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        _G_arg=$1 ;;
+
+# func_quote_arg MODEs ARG
+# ------------------------
+# Quote one ARG to be evaled later.  MODEs argument may contain zero or more
+# specifiers listed below separated by ',' character.  This function returns two
+# values:
+#   i) func_quote_arg_result
+#      double-quoted (when needed), suitable for a subsequent eval
+#  ii) func_quote_arg_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.  Available only if 'unquoted' is specified.
+#
+# Available modes:
+# ----------------
+# 'eval' (default)
+#       - escape shell special characters
+# 'expand'
+#       - the same as 'eval';  but do not quote variable references
+# 'pretty'
+#       - request aesthetic output, i.e. '"a b"' instead of 'a\ b'.  This might
+#         be used later in func_quote to get output like: 'echo "a b"' instead
+#         of 'echo a\ b'.  This is slower than default on some shells.
+# 'unquoted'
+#       - produce also $func_quote_arg_unquoted_result which does not contain
+#         wrapping double-quotes.
+#
+# Examples for 'func_quote_arg pretty,unquoted string':
+#
+#   string      | *_result              | *_unquoted_result
+#   ------------+-----------------------+-------------------
+#   "           | \"                    | \"
+#   a b         | "a b"                 | a b
+#   "a b"       | "\"a b\""             | \"a b\"
+#   *           | "*"                   | *
+#   z="${x-$y}" | "z=\"\${x-\$y}\""     | z=\"\${x-\$y}\"
+#
+# Examples for 'func_quote_arg pretty,unquoted,expand string':
+#
+#   string        |   *_result          |  *_unquoted_result
+#   --------------+---------------------+--------------------
+#   z="${x-$y}"   | "z=\"${x-$y}\""     | z=\"${x-$y}\"
+func_quote_arg ()
+{
+    _G_quote_expand=false
+    case ,$1, in
+      *,expand,*)
+        _G_quote_expand=:
+        ;;
     esac
 
-    case $_G_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-        _G_arg=\"$_G_arg\"
+    case ,$1, in
+      *,pretty,*|*,expand,*|*,unquoted,*)
+        func_quote_portable $_G_quote_expand "$2"
+        func_quote_arg_result=$func_quote_portable_result
+        func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
+        ;;
+      *)
+        # Faster quote-for-eval for some shells.
+        func_quotefast_eval "$2"
+        func_quote_arg_result=$func_quotefast_eval_result
         ;;
     esac
+}
+
 
-    func_quote_for_expand_result=$_G_arg
+# func_quote MODEs ARGs...
+# ------------------------
+# Quote all ARGs to be evaled later and join them into single command.  See
+# func_quote_arg's description for more info.
+func_quote ()
+{
+    $debug_cmd
+    _G_func_quote_mode=$1 ; shift
+    func_quote_result=
+    while test 0 -lt $#; do
+      func_quote_arg "$_G_func_quote_mode" "$1"
+      if test -n "$func_quote_result"; then
+        func_append func_quote_result " $func_quote_arg_result"
+      else
+        func_append func_quote_result "$func_quote_arg_result"
+      fi
+      shift
+    done
 }
 
 
@@ -1215,8 +1376,8 @@
     _G_cmd=$1
     _G_fail_exp=${2-':'}
 
-    func_quote_for_expand "$_G_cmd"
-    eval "func_notquiet $func_quote_for_expand_result"
+    func_quote_arg pretty,expand "$_G_cmd"
+    eval "func_notquiet $func_quote_arg_result"
 
     $opt_dry_run || {
       eval "$_G_cmd"
@@ -1241,8 +1402,8 @@
     _G_fail_exp=${2-':'}
 
     $opt_quiet || {
-      func_quote_for_expand "$_G_cmd"
-      eval "func_echo $func_quote_for_expand_result"
+      func_quote_arg expand,pretty "$_G_cmd"
+      eval "func_echo $func_quote_arg_result"
     }
 
     $opt_dry_run || {
@@ -1369,30 +1530,26 @@
 # End:
 #! /bin/sh
 
-# Set a version string for this script.
-scriptversion=2015-10-07.11; # UTC
-
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2010-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
 
-# Please report bugs or propose patches to gary@gnu.org.
+# Set a version string for this script.
+scriptversion=2019-02-19.15; # UTC
 
 
 ## ------ ##
@@ -1415,7 +1572,7 @@
 #
 # In order for the '--version' option to work, you will need to have a
 # suitably formatted comment like the one at the top of this file
-# starting with '# Written by ' and ending with '# warranty; '.
+# starting with '# Written by ' and ending with '# Copyright'.
 #
 # For '-h' and '--help' to work, you will also need a one line
 # description of your script's purpose in a comment directly above the
@@ -1427,7 +1584,7 @@
 # to display verbose messages only when your user has specified
 # '--verbose'.
 #
-# After sourcing this file, you can plug processing for additional
+# After sourcing this file, you can plug in processing for additional
 # options by amending the variables from the 'Configuration' section
 # below, and following the instructions in the 'Option parsing'
 # section further down.
@@ -1476,8 +1633,8 @@
 ## ------------------------- ##
 
 # This section contains functions for adding, removing, and running hooks
-# to the main code.  A hook is just a named list of of function, that can
-# be run in order later on.
+# in the main code.  A hook is just a list of function names that can be
+# run in order later on.
 
 # func_hookable FUNC_NAME
 # -----------------------
@@ -1510,7 +1667,8 @@
 
 # func_remove_hook FUNC_NAME HOOK_FUNC
 # ------------------------------------
-# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+# Remove HOOK_FUNC from the list of hook functions to be called by
+# FUNC_NAME.
 func_remove_hook ()
 {
     $debug_cmd
@@ -1519,10 +1677,28 @@
 }
 
 
+# func_propagate_result FUNC_NAME_A FUNC_NAME_B
+# ---------------------------------------------
+# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
+# *_result variable of FUNC_NAME_B.
+func_propagate_result ()
+{
+    $debug_cmd
+
+    func_propagate_result_result=:
+    if eval "test \"\${${1}_result+set}\" = set"
+    then
+      eval "${2}_result=\$${1}_result"
+    else
+      func_propagate_result_result=false
+    fi
+}
+
+
 # func_run_hooks FUNC_NAME ARG...
 # ---------------------------------
 # Run all hook functions registered to FUNC_NAME.
-# It is assumed that the list of hook functions contains nothing more
+# It's assumed that the list of hook functions contains nothing more
 # than a whitespace-delimited list of legal shell function names, and
 # no effort is wasted trying to catch shell meta-characters or preserve
 # whitespace.
@@ -1534,22 +1710,19 @@
 
     case " $hookable_fns " in
       *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+      *) func_fatal_error "'$1' does not support hook functions." ;;
     esac
 
     eval _G_hook_fns=\$$1_hooks; shift
 
     for _G_hook in $_G_hook_fns; do
-      if eval $_G_hook '"$@"'; then
-        # store returned options list back into positional
-        # parameters for next 'cmd' execution.
-        eval _G_hook_result=\$${_G_hook}_result
-        eval set dummy "$_G_hook_result"; shift
-        _G_rc_run_hooks=:
+      func_unset "${_G_hook}_result"
+      eval $_G_hook '${1+"$@"}'
+      func_propagate_result $_G_hook func_run_hooks
+      if $func_propagate_result_result; then
+        eval set dummy "$func_run_hooks_result"; shift
       fi
     done
-
-    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
 }
 
 
@@ -1559,14 +1732,16 @@
 ## --------------- ##
 
 # In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, you may remove/edit
-# any options that you action, and then pass back the remaining unprocessed
-# options in '<hooked_function_name>_result', escaped suitably for
-# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
-# hook's caller know that it should pay attention to
-# '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that
-# arguments are left untouched by the hook and therefore caller will ignore the
-# result variable.
+# full positional parameter list from your hook function.  You may remove
+# or edit any options that you action, and then pass back the remaining
+# unprocessed options in '<hooked_function_name>_result', escaped
+# suitably for 'eval'.
+#
+# The '<hooked_function_name>_result' variable is automatically unset
+# before your hook gets called; for best performance, only set the
+# *_result variable when necessary (i.e. don't call the 'func_quote'
+# function unnecessarily because it can be an expensive operation on some
+# machines).
 #
 # Like this:
 #
@@ -1578,11 +1753,8 @@
 #        usage_message=$usage_message'
 #      -s, --silent       don'\''t print informational messages
 #    '
-#        # No change in '$@' (ignored completely by this hook).  There is
-#        # no need to do the equivalent (but slower) action:
-#        # func_quote_for_eval ${1+"$@"}
-#        # my_options_prep_result=$func_quote_for_eval_result
-#        false
+#        # No change in '$@' (ignored completely by this hook).  Leave
+#        # my_options_prep_result variable intact.
 #    }
 #    func_add_hook func_options_prep my_options_prep
 #
@@ -1593,7 +1765,7 @@
 #
 #        args_changed=false
 #
-#        # Note that for efficiency, we parse as many options as we can
+#        # Note that, for efficiency, we parse as many options as we can
 #        # recognise in a loop before passing the remainder back to the
 #        # caller on the first unrecognised argument we encounter.
 #        while test $# -gt 0; do
@@ -1610,18 +1782,17 @@
 #                         args_changed=:
 #                         ;;
 #            *)           # Make sure the first unrecognised option "$_G_opt"
-#                         # is added back to "$@", we could need that later
-#                         # if $args_changed is true.
+#                         # is added back to "$@" in case we need it later,
+#                         # if $args_changed was set to 'true'.
 #                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
 #          esac
 #        done
 #
+#        # Only call 'func_quote' here if we processed at least one argument.
 #        if $args_changed; then
-#          func_quote_for_eval ${1+"$@"}
-#          my_silent_option_result=$func_quote_for_eval_result
+#          func_quote eval ${1+"$@"}
+#          my_silent_option_result=$func_quote_result
 #        fi
-#
-#        $args_changed
 #    }
 #    func_add_hook func_parse_options my_silent_option
 #
@@ -1632,8 +1803,6 @@
 #
 #        $opt_silent && $opt_verbose && func_fatal_help "\
 #    '--silent' and '--verbose' options are mutually exclusive."
-#
-#        false
 #    }
 #    func_add_hook func_validate_options my_option_validation
 #
@@ -1649,13 +1818,8 @@
 {
     $debug_cmd
 
-    _G_func_options_finish_exit=false
-    if func_run_hooks func_options ${1+"$@"}; then
-      func_options_finish_result=$func_run_hooks_result
-      _G_func_options_finish_exit=:
-    fi
-
-    $_G_func_options_finish_exit
+    func_run_hooks func_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_options_finish
 }
 
 
@@ -1668,28 +1832,27 @@
 {
     $debug_cmd
 
-    _G_rc_options=false
+    _G_options_quoted=false
 
     for my_func in options_prep parse_options validate_options options_finish
     do
-      if eval func_$my_func '${1+"$@"}'; then
-        eval _G_res_var='$'"func_${my_func}_result"
-        eval set dummy "$_G_res_var" ; shift
-        _G_rc_options=:
+      func_unset func_${my_func}_result
+      func_unset func_run_hooks_result
+      eval func_$my_func '${1+"$@"}'
+      func_propagate_result func_$my_func func_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_options_result"; shift
+        _G_options_quoted=:
       fi
     done
 
-    # Save modified positional parameters for caller.  As a top-level
-    # options-parser function we always need to set the 'func_options_result'
-    # variable (regardless the $_G_rc_options value).
-    if $_G_rc_options; then
-      func_options_result=$_G_res_var
-    else
-      func_quote_for_eval ${1+"$@"}
-      func_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_options
+    $_G_options_quoted || {
+      # As we (func_options) are top-level options-parser function and
+      # nobody quoted "$@" for us yet, we need to do it explicitly for
+      # caller.
+      func_quote eval ${1+"$@"}
+      func_options_result=$func_quote_result
+    }
 }
 
 
@@ -1699,8 +1862,7 @@
 # Note that when calling hook functions, we pass through the list of
 # positional parameters.  If a hook function modifies that list, and
 # needs to propagate that back to rest of this script, then the complete
-# modified list must be put in 'func_run_hooks_result' before
-# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
+# modified list must be put in 'func_run_hooks_result' before returning.
 func_hookable func_options_prep
 func_options_prep ()
 {
@@ -1710,14 +1872,8 @@
     opt_verbose=false
     opt_warning_types=
 
-    _G_rc_options_prep=false
-    if func_run_hooks func_options_prep ${1+"$@"}; then
-      _G_rc_options_prep=:
-      # save modified positional parameters for caller
-      func_options_prep_result=$func_run_hooks_result
-    fi
-
-    $_G_rc_options_prep
+    func_run_hooks func_options_prep ${1+"$@"}
+    func_propagate_result func_run_hooks func_options_prep
 }
 
 
@@ -1729,27 +1885,32 @@
 {
     $debug_cmd
 
-    func_parse_options_result=
-
-    _G_rc_parse_options=false
+    _G_parse_options_requote=false
     # this just eases exit handling
     while test $# -gt 0; do
       # Defer to hook functions for initial option parsing, so they
       # get priority in the event of reusing an option name.
-      if func_run_hooks func_parse_options ${1+"$@"}; then
-        eval set dummy "$func_run_hooks_result"; shift
-        _G_rc_parse_options=:
+      func_run_hooks func_parse_options ${1+"$@"}
+      func_propagate_result func_run_hooks func_parse_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_parse_options_result"; shift
+        # Even though we may have changed "$@", we passed the "$@" array
+        # down into the hook and it quoted it for us (because we are in
+        # this if-branch).  No need to quote it again.
+        _G_parse_options_requote=false
       fi
 
       # Break out of the loop if we already parsed every option.
       test $# -gt 0 || break
 
+      # We expect that one of the options parsed in this function matches
+      # and thus we remove _G_opt from "$@" and need to re-quote.
       _G_match_parse_options=:
       _G_opt=$1
       shift
       case $_G_opt in
         --debug|-x)   debug_cmd='set -x'
-                      func_echo "enabling shell trace mode"
+                      func_echo "enabling shell trace mode" >&2
                       $debug_cmd
                       ;;
 
@@ -1760,7 +1921,7 @@
 
         --warnings|--warning|-W)
                       if test $# = 0 && func_missing_arg $_G_opt; then
-                        _G_rc_parse_options=:
+                        _G_parse_options_requote=:
                         break
                       fi
                       case " $warning_categories $1" in
@@ -1815,7 +1976,7 @@
                       shift
                       ;;
 
-        --)           _G_rc_parse_options=: ; break ;;
+        --)           _G_parse_options_requote=: ; break ;;
         -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
         *)            set dummy "$_G_opt" ${1+"$@"}; shift
                       _G_match_parse_options=false
@@ -1823,17 +1984,16 @@
                       ;;
       esac
 
-      $_G_match_parse_options && _G_rc_parse_options=:
+      if $_G_match_parse_options; then
+        _G_parse_options_requote=:
+      fi
     done
 
-
-    if $_G_rc_parse_options; then
+    if $_G_parse_options_requote; then
       # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      func_parse_options_result=$func_quote_for_eval_result
+      func_quote eval ${1+"$@"}
+      func_parse_options_result=$func_quote_result
     fi
-
-    $_G_rc_parse_options
 }
 
 
@@ -1846,21 +2006,14 @@
 {
     $debug_cmd
 
-    _G_rc_validate_options=false
-
     # Display all warnings if -W was not given.
     test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 
-    if func_run_hooks func_validate_options ${1+"$@"}; then
-      # save modified positional parameters for caller
-      func_validate_options_result=$func_run_hooks_result
-      _G_rc_validate_options=:
-    fi
+    func_run_hooks func_validate_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_validate_options
 
     # Bail if the options were screwed!
     $exit_cmd $EXIT_FAILURE
-
-    $_G_rc_validate_options
 }
 
 
@@ -1916,8 +2069,8 @@
 
 # func_split_equals STRING
 # ------------------------
-# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
-# splitting STRING at the '=' sign.
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables
+# after splitting STRING at the '=' sign.
 test -z "$_G_HAVE_XSI_OPS" \
     && (eval 'x=a/b/c;
       test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
@@ -1932,8 +2085,9 @@
 
       func_split_equals_lhs=${1%%=*}
       func_split_equals_rhs=${1#*=}
-      test "x$func_split_equals_lhs" = "x$1" \
-        && func_split_equals_rhs=
+      if test "x$func_split_equals_lhs" = "x$1"; then
+        func_split_equals_rhs=
+      fi
   }'
 else
   # ...otherwise fall back to using expr, which is often a shell builtin.
@@ -1943,7 +2097,7 @@
 
       func_split_equals_lhs=`expr "x$1" : 'x$^=*$'`
       func_split_equals_rhs=
-      test "x$func_split_equals_lhs" = "x$1" \
+      test "x$func_split_equals_lhs=" = "x$1" \
         || func_split_equals_rhs=`expr "x$1" : 'x^=*=$.*$$'`
   }
 fi #func_split_equals
@@ -1969,7 +2123,7 @@
   {
       $debug_cmd
 
-      func_split_short_opt_name=`expr "x$1" : 'x-$.$'`
+      func_split_short_opt_name=`expr "x$1" : 'x$-.$'`
       func_split_short_opt_arg=`expr "x$1" : 'x-.$.*$$'`
   }
 fi #func_split_short_opt
@@ -2011,31 +2165,44 @@
 # func_version
 # ------------
 # Echo version message to standard output and exit.
+# The version message is extracted from the calling file's header
+# comments, with leading '# ' stripped:
+#   1. First display the progname and version
+#   2. Followed by the header comment line matching  /^# Written by /
+#   3. Then a blank line followed by the first following line matching
+#      /^# Copyright /
+#   4. Immediately followed by any lines between the previous matches,
+#      except lines preceding the intervening completely blank line.
+# For example, see the header comments of this file.
 func_version ()
 {
     $debug_cmd
 
     printf '%s\n' "$progname $scriptversion"
     $SED -n '
-        /(C)/!b go
-        :more
-        /\./!{
-          N
-          s|\n# | |
-          b more
-        }
-        :go
-        /^# Written by /,/# warranty; / {
-          s|^# ||
-          s|^# *$||
-          s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
-          p
+        /^# Written by /!b
+        s|^# ||; p; n
+
+        :fwd2blnk
+        /./ {
+          n
+          b fwd2blnk
         }
-        /^# Written by / {
-          s|^# ||
-          p
+        p; n
+
+        :holdwrnt
+        s|^# ||
+        s|^# *$||
+        /^Copyright /!{
+          /./H
+          n
+          b holdwrnt
         }
-        /^warranty; /q' < "$progpath"
+
+        s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
+        G
+        s|$\n$\n*|\1|g
+        p; q' < "$progpath"
 
     exit $?
 }
@@ -2045,7 +2212,7 @@
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 
@@ -2141,7 +2308,7 @@
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-15
+       version:        $progname $scriptversion Debian-2.4.7-2
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
@@ -2197,7 +2364,7 @@
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func__fatal_error ${1+"$@"} \
+    func_fatal_error ${1+"$@"} \
       "See the $PACKAGE documentation for more information." \
       "Fatal configuration error."
 }
@@ -2345,6 +2512,8 @@
 
     _G_rc_lt_options_prep=:
 
+    _G_rc_lt_options_prep=:
+
     # Shorthand for --mode=foo, only valid as the first argument
     case $1 in
     clean|clea|cle|cl)
@@ -2375,11 +2544,9 @@
 
     if $_G_rc_lt_options_prep; then
       # Pass back the list of options.
-      func_quote_for_eval ${1+"$@"}
-      libtool_options_prep_result=$func_quote_for_eval_result
+      func_quote eval ${1+"$@"}
+      libtool_options_prep_result=$func_quote_result
     fi
-
-    $_G_rc_lt_options_prep
 }
 func_add_hook func_options_prep libtool_options_prep
 
@@ -2482,11 +2649,9 @@
 
     if $_G_rc_lt_parse_options; then
       # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      libtool_parse_options_result=$func_quote_for_eval_result
+      func_quote eval ${1+"$@"}
+      libtool_parse_options_result=$func_quote_result
     fi
-
-    $_G_rc_lt_parse_options
 }
 func_add_hook func_parse_options libtool_parse_options
 
@@ -2543,8 +2708,8 @@
     }
 
     # Pass back the unparsed argument list
-    func_quote_for_eval ${1+"$@"}
-    libtool_validate_options_result=$func_quote_for_eval_result
+    func_quote eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_result
 }
 func_add_hook func_validate_options libtool_validate_options
 
@@ -3510,8 +3675,8 @@
       esac
     done
 
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
+    func_quote_arg pretty "$libobj"
+    test "X$libobj" != "X$func_quote_arg_result" \
       && $ECHO "X$libobj" | $GREP '~#^*{};<>?"'"'"'	 &()|`$' \
       && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
@@ -3584,8 +3749,8 @@
 
     func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
     srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
+    func_quote_arg pretty "$srcfile"
+    qsrcfile=$func_quote_arg_result
 
     # Only build a PIC object if we are building libtool libraries.
     if test yes = "$build_libtool_libs"; then
@@ -3740,7 +3905,8 @@
   -prefer-non-pic   try to build non-PIC objects only
   -shared           do not build a '.o' file suitable for static linking
   -static           only build a '.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
+  -Wc,FLAG
+  -Xcompiler FLAG   pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
@@ -3846,6 +4012,8 @@
   -weak LIBNAME     declare that the target provides the LIBNAME interface
   -Wc,FLAG
   -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wa,FLAG
+  -Xassembler FLAG  pass linker-specific FLAG directly to the assembler
   -Wl,FLAG
   -Xlinker FLAG     pass linker-specific FLAG directly to the linker
   -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
@@ -4188,8 +4356,8 @@
        case $nonopt in *shtool*) :;; *) false;; esac
     then
       # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
+      func_quote_arg pretty "$nonopt"
+      install_prog="$func_quote_arg_result "
       arg=$1
       shift
     else
@@ -4199,8 +4367,8 @@
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
+    func_quote_arg pretty "$arg"
+    func_append install_prog "$func_quote_arg_result"
     install_shared_prog=$install_prog
     case " $install_prog " in
       *\\\ /cp\ *) install_cp=: ;;
@@ -4257,12 +4425,12 @@
       esac
 
       # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
+      func_quote_arg pretty "$arg"
+      func_append install_prog " $func_quote_arg_result"
       if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
+	func_quote_arg pretty "$arg2"
       fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
+      func_append install_shared_prog " $func_quote_arg_result"
     done
 
     test -z "$install_prog" && \
@@ -4273,8 +4441,8 @@
 
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
+	func_quote_arg pretty "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_arg_result"
       fi
     fi
 
@@ -4570,8 +4738,8 @@
 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_quiet || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
+	          func_quote_arg expand,pretty "$relink_command"
+		  eval "func_echo $func_quote_arg_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
@@ -5350,7 +5518,8 @@
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
     file=\"\$0\""
 
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    func_quote_arg pretty "$ECHO"
+    qECHO=$func_quote_arg_result
     $ECHO "\
 
 # A function that is used when there is no print builtin or printf.
@@ -5360,7 +5529,7 @@
 \$1
 _LTECHO_EOF'
 }
-    ECHO=\"$qECHO\"
+    ECHO=$qECHO
   fi
 
 # Very basic option parsing. These options are (a) specific to
@@ -6703,9 +6872,9 @@
     while test "$#" -gt 0; do
       arg=$1
       shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
+      func_quote_arg pretty,unquoted "$arg"
+      qarg=$func_quote_arg_unquoted_result
+      func_append libtool_args " $func_quote_arg_result"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
@@ -6941,6 +7110,13 @@
 	  prev=
 	  continue
 	  ;;
+	xassembler)
+	  func_append compiler_flags " -Xassembler $qarg"
+	  prev=
+	  func_append compile_command " -Xassembler $qarg"
+	  func_append finalize_command " -Xassembler $qarg"
+	  continue
+	  ;;
 	xcclinker)
 	  func_append linker_flags " $qarg"
 	  func_append compiler_flags " $qarg"
@@ -7111,7 +7287,7 @@
 	    # These systems don't actually have a C library (as such)
 	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test X-lc = "X$arg" && continue
 	    ;;
@@ -7131,7 +7307,7 @@
 	  esac
 	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -7161,8 +7337,20 @@
 	prev=xcompiler
 	continue
 	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+     # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.
+     -pthread)
+	case $host in
+	  *solaris2*) ;;
+	  *)
+	    case "$new_inherited_linker_flags " in
+	        *" $arg "*) ;;
+	        * ) func_append new_inherited_linker_flags " $arg" ;;
+	    esac
+	  ;;
+	esac
+	continue
+	;;
+      -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
@@ -7303,9 +7491,9 @@
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
+          func_quote_arg pretty "$flag"
+	  func_append arg " $func_quote_arg_result"
+	  func_append compiler_flags " $func_quote_arg_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7319,16 +7507,21 @@
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
+          func_quote_arg pretty "$flag"
+	  func_append arg " $wl$func_quote_arg_result"
+	  func_append compiler_flags " $wl$func_quote_arg_result"
+	  func_append linker_flags " $func_quote_arg_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
 
+      -Xassembler)
+        prev=xassembler
+        continue
+        ;;
+
       -Xcompiler)
 	prev=xcompiler
 	continue
@@ -7346,8 +7539,8 @@
 
       # -msg_* for osf cc
       -msg_*)
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
 
       # Flags to be passed through unchanged, with rationale:
@@ -7370,12 +7563,13 @@
       # -fuse-ld=*           Linker select flags for GCC
       # -static-*            direct GCC to link specific libraries statically
       # -fcilkplus           Cilk Plus language extension features for C/C++
+      # -Wa,*                Pass flags directly to the assembler
       -64|-mips0-9|-r0-90-9*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*)
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         func_append compiler_flags " $arg"
@@ -7396,15 +7590,15 @@
 	  continue
         else
 	  # Otherwise treat like 'Some other compiler flag' below
-	  func_quote_for_eval "$arg"
-	  arg=$func_quote_for_eval_result
+	  func_quote_arg pretty "$arg"
+	  arg=$func_quote_arg_result
         fi
 	;;
 
       # Some other compiler flag.
       -* | +*)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
 
       *.$objext)
@@ -7524,8 +7718,8 @@
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
       esac # arg
 
@@ -8733,7 +8927,7 @@
       test CXX = "$tagname" && {
         case $host_os in
         linux*)
-          case `$CC -V 2>&1 | sed 5q` in
+          case `$CC -V 2>&1 | $SED 5q` in
           *Sun\ C*) # Sun C++ 5.9
             func_suncc_cstd_abi
 
@@ -8906,7 +9100,7 @@
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|freebsd-elf|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age=$number_minor
@@ -9000,7 +9194,7 @@
 	  versuffix=.$current.$revision
 	  ;;
 
-	freebsd-elf)
+	freebsd-elf | midnightbsd-elf)
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix=$major.$age.$revision
@@ -9226,7 +9420,7 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -10037,8 +10231,8 @@
 	    for cmd in $concat_cmds; do
 	      IFS=$save_ifs
 	      $opt_quiet || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
+		  func_quote_arg expand,pretty "$cmd"
+		  eval "func_echo $func_quote_arg_result"
 	      }
 	      $opt_dry_run || eval "$cmd" || {
 		lt_exit=$?
@@ -10131,8 +10325,8 @@
 	  eval cmd=\"$cmd\"
 	  IFS=$save_ifs
 	  $opt_quiet || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
+	    func_quote_arg expand,pretty "$cmd"
+	    eval "func_echo $func_quote_arg_result"
 	  }
 	  $opt_dry_run || eval "$cmd" || {
 	    lt_exit=$?
@@ -10606,12 +10800,13 @@
 	  elif eval var_value=\$$var; test -z "$var_value"; then
 	    relink_command="$var=; export $var; $relink_command"
 	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	    func_quote_arg pretty "$var_value"
+	    relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
 	  fi
 	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+	func_quote eval cd "`pwd`"
+	func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
+	relink_command=$func_quote_arg_unquoted_result
       fi
 
       # Only actually do things if not in dry run mode.
@@ -10851,13 +11046,15 @@
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	  relink_command="$var=; export $var; $relink_command"
 	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  func_quote_arg pretty,unquoted "$var_value"
+	  relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      func_quote eval cd "`pwd`"
+      relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      func_quote_arg pretty,unquoted "$relink_command"
+      relink_command=$func_quote_arg_unquoted_result
       if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/libtool.m4 -> _service:tar_scm:nghttp2-1.52.0.tar.xz/m4/libtool.m4 Changed

@@ -1,6 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +32,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
-# serial 58 LT_INIT
+# serial 59 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -181,6 +182,7 @@
 m4_require(_LT_CHECK_SHELL_FEATURES)dnl
 m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
 m4_require(_LT_CMD_RELOAD)dnl
+m4_require(_LT_DECL_FILECMD)dnl
 m4_require(_LT_CHECK_MAGIC_METHOD)dnl
 m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
 m4_require(_LT_CMD_OLD_ARCHIVE)dnl
@@ -219,8 +221,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -777,7 +779,7 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
@@ -1041,8 +1043,8 @@
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
       echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
       $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
       cat > conftest.c << _LT_EOF
@@ -1066,17 +1068,12 @@
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin912*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*|11.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.012,*|,*powerpc*-darwin5-8*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -1125,12 +1122,12 @@
     output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if($1, CXX,
    if test yes != "$lt_cv_apple_cc_single_mod"; then
       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ,)
   else
@@ -1244,7 +1241,8 @@
 # _LT_WITH_SYSROOT
 # ----------------
 AC_DEFUN(_LT_WITH_SYSROOT,
-AC_MSG_CHECKING(for sysroot)
+m4_require(_LT_DECL_SED)dnl
+AC_MSG_CHECKING(for sysroot)
 AC_ARG_WITH(sysroot,
 AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@,
   Search for dependent libraries within DIR (or the compiler's sysroot
@@ -1261,7 +1259,7 @@
    fi
    ;; #(
  /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
@@ -1291,7 +1289,7 @@
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -1308,7 +1306,7 @@
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
@@ -1320,7 +1318,7 @@
 	;;
       esac
     else
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
@@ -1342,7 +1340,7 @@
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
@@ -1350,7 +1348,7 @@
 	emul="${emul}64"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -1358,7 +1356,7 @@
 	emul="${emul}ltsmip"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
@@ -1378,14 +1376,14 @@
   # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
+	    case `$FILECMD conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -1453,7 +1451,7 @@
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
@@ -1492,9 +1490,22 @@
 m4_defun(_LT_PROG_AR,
 AC_CHECK_TOOLS(AR, ar, false)
 : ${AR=ar}
-: ${AR_FLAGS=cr}
 _LT_DECL(, AR, 1, The archiver)
-_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+_LT_DECL(, lt_ar_flags, 0, Flags to create an archive (by configure))
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+_LT_DECL(, AR_FLAGS, \@S|@{ARFLAGS-"\@S|@lt_ar_flags"},
+         Flags to create an archive)
 
 AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
   lt_cv_ar_at_file=no
@@ -1713,7 +1724,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1756,7 +1767,7 @@
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*	 //'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -2206,26 +2217,35 @@
 striplib=
 old_striplib=
 AC_MSG_CHECKING(whether stripping libraries is possible)
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT(yes)
+if test -z "$STRIP"; then
+  AC_MSG_RESULT(no)
 else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    AC_MSG_RESULT(yes)
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT(yes)
-    else
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT(no)
+      fi
+      ;;
+    *)
       AC_MSG_RESULT(no)
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac
+      ;;
+    esac
+  fi
 fi
 _LT_DECL(, old_striplib, 1, Commands to strip libraries)
 _LT_DECL(, striplib, 1)
@@ -2548,7 +2568,7 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 m4_if($1, ,
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
       ;;
@@ -2558,14 +2578,14 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -2584,7 +2604,7 @@
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -2621,7 +2641,7 @@
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -2654,7 +2674,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -3465,7 +3485,7 @@
 
 bsdi45*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_cmd='$FILECMD -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -3499,14 +3519,14 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_cmd=$FILECMD
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
@@ -3520,7 +3540,7 @@
   ;;
 
 hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
@@ -3567,7 +3587,7 @@
 
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
@@ -3694,13 +3714,13 @@
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
 	    break 2
@@ -3726,7 +3746,7 @@
     # Let the user override the test.
   else
     AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
     *COFF*)
       DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
@@ -3966,7 +3986,7 @@
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
   lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
   lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
@@ -3984,20 +4004,20 @@
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* $.*$$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
@@ -4021,7 +4041,7 @@
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
@@ -4039,9 +4059,9 @@
 "     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -4329,7 +4349,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -4412,7 +4432,7 @@
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4754,7 +4774,7 @@
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4937,7 +4957,7 @@
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
@@ -4945,7 +4965,7 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*)
+    cl* | icl*)
       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -5005,15 +5025,15 @@
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
+    # Microsoft Visual C++ or Intel C++ Compiler.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
@@ -5068,7 +5088,7 @@
       _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
     supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -5180,6 +5200,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     interix3-9*)
@@ -5194,7 +5215,7 @@
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -5237,7 +5258,7 @@
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  ;;
 	esac
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
@@ -5249,13 +5270,14 @@
 
         if test yes = "$supports_anon_versioning"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
             echo "local: *; };" >> $output_objdir/$libname.ver~
             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
 	tcc*)
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
 	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
@@ -5265,7 +5287,7 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test yes = "$supports_anon_versioning"; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
               echo "local: *; };" >> $output_objdir/$libname.ver~
               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
@@ -5397,7 +5419,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -5580,12 +5602,12 @@
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
+      # Microsoft Visual C++ or Intel C++ Compiler.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl*)
-	# Native MSVC
+      cl* | icl*)
+	# Native MSVC or ICC
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -5626,7 +5648,7 @@
           fi'
 	;;
       *)
-	# Assume MSVC wrapper
+	# Assume MSVC and ICC wrapper
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -5674,7 +5696,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -5815,6 +5837,7 @@
 	# Fabrice Bellard et al's Tiny C Compiler
 	_LT_TAGVAR(ld_shlibs, $1)=yes
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	;;
       esac
       ;;
@@ -5886,6 +5909,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     osf3*)
@@ -6656,8 +6680,8 @@
 
       cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
+	,cl* | no,cl* | ,icl* | no,icl*)
+	  # Native MSVC or ICC
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -6755,6 +6779,7 @@
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
 
       dgux*)
@@ -6785,7 +6810,7 @@
         _LT_TAGVAR(archive_cmds_need_lc, $1)=no
         ;;
 
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
         # conventions
         _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -6922,7 +6947,7 @@
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
@@ -7062,13 +7087,13 @@
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	    if test yes = "$supports_anon_versioning"; then
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+                cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
                 echo "local: *; };" >> $output_objdir/$libname.ver~
                 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -8214,6 +8239,14 @@
 AC_SUBST(DLLTOOL)
 )
 
+# _LT_DECL_FILECMD
+# ----------------
+# Check for a file(cmd) program that can be used to detect file type and magic
+m4_defun(_LT_DECL_FILECMD,
+AC_CHECK_TOOL(FILECMD, file, :)
+_LT_DECL(, FILECMD, 1, A file(cmd) program that detects file types)
+)# _LD_DECL_FILECMD
+
 # _LT_DECL_SED
 # ------------
 # Check for a fully-functional sed program, that truncates

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/ltoptions.m4 -> _service:tar_scm:nghttp2-1.52.0.tar.xz/m4/ltoptions.m4 Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/ltsugar.m4 -> _service:tar_scm:nghttp2-1.52.0.tar.xz/m4/ltsugar.m4 Changed

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/m4/lt~obsolete.m4 -> _service:tar_scm:nghttp2-1.52.0.tar.xz/m4/lt~obsolete.m4 Changed

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -114,13 +114,8 @@
 target_triplet = @target@
 subdir = script
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -192,11 +187,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -213,7 +203,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -229,6 +218,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -297,15 +287,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@

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

@@ -1,5 +1,3 @@
-add_subdirectory(includes)
-
 file(GLOB c_sources *.c)
 set_source_files_properties(${c_sources} PROPERTIES
   COMPILE_FLAGS "${WARNCFLAGS}")
@@ -235,71 +233,11 @@
   set(deflatehd_SOURCES
     deflatehd.cc
     comp_helper.c
+    util.cc
+    timegm.c
   )
   add_executable(inflatehd ${inflatehd_SOURCES})
   add_executable(deflatehd ${deflatehd_SOURCES})
   install(TARGETS inflatehd deflatehd
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 endif()
-
-if(ENABLE_ASIO_LIB)
-  set(NGHTTP2_ASIO_SOURCES
-    util.cc http2.cc
-    tls.cc
-    timegm.c
-    asio_common.cc
-    asio_io_service_pool.cc
-    asio_server_http2.cc
-    asio_server_http2_impl.cc
-    asio_server.cc
-    asio_server_http2_handler.cc
-    asio_server_request.cc
-    asio_server_request_impl.cc
-    asio_server_response.cc
-    asio_server_response_impl.cc
-    asio_server_stream.cc
-    asio_server_serve_mux.cc
-    asio_server_request_handler.cc
-    asio_server_tls_context.cc
-    asio_client_session.cc
-    asio_client_session_impl.cc
-    asio_client_session_tcp_impl.cc
-    asio_client_session_tls_impl.cc
-    asio_client_response.cc
-    asio_client_response_impl.cc
-    asio_client_request.cc
-    asio_client_request_impl.cc
-    asio_client_stream.cc
-    asio_client_tls_context.cc
-  )
-
-  add_library(nghttp2_asio SHARED
-     ${NGHTTP2_ASIO_SOURCES}
-     $<TARGET_OBJECTS:llhttp>
-     $<TARGET_OBJECTS:url-parser>
-  )
-  target_include_directories(nghttp2_asio PRIVATE
-    ${OPENSSL_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-  )
-  target_include_directories(nghttp2_asio INTERFACE
-    "${CMAKE_CURRENT_BINARY_DIR}/../lib/includes"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../lib/includes"
-    "${CMAKE_CURRENT_SOURCE_DIR}/includes"
-  )
-  target_link_libraries(nghttp2_asio
-    nghttp2
-    ${OPENSSL_LIBRARIES}
-    ${Boost_LIBRARIES}
-  )
-  set_target_properties(nghttp2_asio PROPERTIES
-    VERSION 1.0.0 SOVERSION 1)
-
-  install(TARGETS nghttp2_asio
-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2_asio.pc"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-endif()

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

@@ -113,7 +113,9 @@
       early_response(false),
       hexdump(false),
       echo_upload(false),
-      no_content_length(false) {}
+      no_content_length(false),
+      ktls(false),
+      no_rfc7540_pri(false) {}
 
 Config::~Config() {}
 
@@ -748,37 +750,37 @@
 
   ERR_clear_error();
 
-  auto rv = SSL_read(ssl_, buf.data(), buf.size());
-
-  if (rv <= 0) {
-    auto err = SSL_get_error(ssl_, rv);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      return write_(*this);
-    case SSL_ERROR_WANT_WRITE:
-      // renegotiation started
-      return -1;
-    default:
-      return -1;
+  for (;;) {
+    auto rv = SSL_read(ssl_, buf.data(), buf.size());
+
+    if (rv <= 0) {
+      auto err = SSL_get_error(ssl_, rv);
+      switch (err) {
+      case SSL_ERROR_WANT_READ:
+        return write_(*this);
+      case SSL_ERROR_WANT_WRITE:
+        // renegotiation started
+        return -1;
+      default:
+        return -1;
+      }
     }
-  }
 
-  auto nread = rv;
+    auto nread = rv;
 
-  if (get_config()->hexdump) {
-    util::hexdump(stdout, buf.data(), nread);
-  }
+    if (get_config()->hexdump) {
+      util::hexdump(stdout, buf.data(), nread);
+    }
 
-  rv = nghttp2_session_mem_recv(session_, buf.data(), nread);
-  if (rv < 0) {
-    if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
-      std::cerr << "nghttp2_session_mem_recv() returned error: "
-                << nghttp2_strerror(rv) << std::endl;
+    rv = nghttp2_session_mem_recv(session_, buf.data(), nread);
+    if (rv < 0) {
+      if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
+        std::cerr << "nghttp2_session_mem_recv() returned error: "
+                  << nghttp2_strerror(rv) << std::endl;
+      }
+      return -1;
     }
-    return -1;
   }
-
-  return write_(*this);
 }
 
 int Http2Handler::write_tls() {
@@ -863,6 +865,12 @@
     ++niv;
   }
 
+  if (config->no_rfc7540_pri) {
+    entryniv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+    entryniv.value = 1;
+    ++niv;
+  }
+
   r = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, entry.data(), niv);
   if (r != 0) {
     return r;
@@ -1797,7 +1805,7 @@
     q.swap(worker->q);
   }
 
-  for (auto c : q) {
+  for (const auto &c : q) {
     sessions->accept_connection(c.fd);
   }
 }
@@ -2122,6 +2130,12 @@
                     SSL_OP_SINGLE_ECDH_USE | SSL_OP_NO_TICKET |
                     SSL_OP_CIPHER_SERVER_PREFERENCE;
 
+#ifdef SSL_OP_ENABLE_KTLS
+    if (config_->ktls) {
+      ssl_opts |= SSL_OP_ENABLE_KTLS;
+    }
+#endif // SSL_OP_ENABLE_KTLS
+
     SSL_CTX_set_options(ssl_ctx, ssl_opts);
     SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
     SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);

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

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

@@ -20,8 +20,6 @@
 # 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 = includes
-
 EXTRA_DIST = \
 	CMakeLists.txt \
 	test.example.com.pem \
@@ -39,7 +37,6 @@
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes \
 	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/src/includes \
 	-I$(top_srcdir)/third-party \
 	-I$(top_srcdir)/third-party/llhttp/include \
 	@JEMALLOC_CFLAGS@ \
@@ -95,10 +92,10 @@
 
 nghttp_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttp.cc nghttp.h \
 	${HTML_PARSER_OBJECTS} ${HTML_PARSER_HFILES} \
-	tls.cc tls.h
+	tls.cc tls.h ssl_compat.h
 
 nghttpd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttpd.cc \
-	tls.cc tls.h \
+	tls.cc tls.h ssl_compat.h \
 	HttpServer.cc HttpServer.h
 
 bin_PROGRAMS += h2load
@@ -106,7 +103,7 @@
 h2load_SOURCES = util.cc util.h \
 	http2.cc http2.h h2load.cc h2load.h \
 	timegm.c timegm.h \
-	tls.cc tls.h \
+	tls.cc tls.h ssl_compat.h \
 	h2load_session.h \
 	h2load_http2_session.cc h2load_http2_session.h \
 	h2load_http1_session.cc h2load_http1_session.h
@@ -121,7 +118,7 @@
 NGHTTPX_SRCS = \
 	util.cc util.h http2.cc http2.h timegm.c timegm.h base64.h \
 	app_helper.cc app_helper.h \
-	tls.cc tls.h \
+	tls.cc tls.h ssl_compat.h \
 	shrpx_config.cc shrpx_config.h \
 	shrpx_error.h \
 	shrpx_accept_handler.cc shrpx_accept_handler.h \
@@ -246,63 +243,13 @@
 
 bin_PROGRAMS += inflatehd deflatehd
 
-HPACK_TOOLS_COMMON_SRCS = comp_helper.c comp_helper.h
+HPACK_TOOLS_COMMON_SRCS = \
+	comp_helper.c comp_helper.h \
+	util.cc util.h \
+	timegm.c timegm.h
 
 inflatehd_SOURCES = inflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
 
 deflatehd_SOURCES = deflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
 
 endif # ENABLE_HPACK_TOOLS
-
-if ENABLE_ASIO_LIB
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libnghttp2_asio.pc
-DISTCLEANFILES = $(pkgconfig_DATA)
-
-lib_LTLIBRARIES = libnghttp2_asio.la
-
-libnghttp2_asio_la_SOURCES = \
-	util.cc util.h http2.cc http2.h \
-	tls.cc tls.h \
-	ssl_compat.h \
-	timegm.c timegm.h \
-	asio_common.cc asio_common.h \
-	asio_io_service_pool.cc asio_io_service_pool.h \
-	asio_server_http2.cc \
-	asio_server_http2_impl.cc asio_server_http2_impl.h \
-	asio_server.cc asio_server.h \
-	asio_server_http2_handler.cc asio_server_http2_handler.h \
-	asio_server_connection.h \
-	asio_server_request.cc \
-	asio_server_request_impl.cc asio_server_request_impl.h \
-	asio_server_response.cc \
-	asio_server_response_impl.cc asio_server_response_impl.h \
-	asio_server_stream.cc asio_server_stream.h \
-	asio_server_serve_mux.cc asio_server_serve_mux.h \
-	asio_server_request_handler.cc asio_server_request_handler.h \
-	asio_server_tls_context.cc asio_server_tls_context.h \
-	asio_client_session.cc \
-	asio_client_session_impl.cc asio_client_session_impl.h \
-	asio_client_session_tcp_impl.cc asio_client_session_tcp_impl.h \
-	asio_client_session_tls_impl.cc asio_client_session_tls_impl.h \
-	asio_client_response.cc \
-	asio_client_response_impl.cc asio_client_response_impl.h \
-	asio_client_request.cc \
-	asio_client_request_impl.cc asio_client_request_impl.h \
-	asio_client_stream.cc asio_client_stream.h \
-	asio_client_tls_context.cc asio_client_tls_context.h
-
-libnghttp2_asio_la_CPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
-libnghttp2_asio_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0
-libnghttp2_asio_la_LIBADD = \
-	$(top_builddir)/lib/libnghttp2.la \
-	$(top_builddir)/third-party/liburl-parser.la \
-	$(top_builddir)/third-party/libllhttp.la \
-	@OPENSSL_LIBS@ \
-	${BOOST_LDFLAGS} \
-	${BOOST_ASIO_LIB} \
-	${BOOST_THREAD_LIB} \
-	${BOOST_SYSTEM_LIB}
-
-endif # ENABLE_ASIO_LIB

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -30,8 +30,6 @@
 # included in all copies or substantial portions of the Software.
 
 
-
-
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -151,13 +149,8 @@
 @ENABLE_HPACK_TOOLS_TRUE@am__append_16 = inflatehd deflatehd
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -166,46 +159,17 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = libnghttp2_asio.pc
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 @ENABLE_APP_TRUE@am__EXEEXT_1 = nghttp$(EXEEXT) nghttpd$(EXEEXT) \
 @ENABLE_APP_TRUE@	nghttpx$(EXEEXT) h2load$(EXEEXT)
 @ENABLE_HPACK_TOOLS_TRUE@am__EXEEXT_2 = inflatehd$(EXEEXT) \
 @ENABLE_HPACK_TOOLS_TRUE@	deflatehd$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(pkgconfigdir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@am__EXEEXT_3 =  \
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	nghttpx-unittest$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 LIBRARIES = $(noinst_LIBRARIES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-LTLIBRARIES = $(lib_LTLIBRARIES)
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -215,8 +179,8 @@
 libnghttpx_a_LIBADD =
 am__libnghttpx_a_SOURCES_DIST = util.cc util.h http2.cc http2.h \
 	timegm.c timegm.h base64.h app_helper.cc app_helper.h tls.cc \
-	tls.h shrpx_config.cc shrpx_config.h shrpx_error.h \
-	shrpx_accept_handler.cc shrpx_accept_handler.h \
+	tls.h ssl_compat.h shrpx_config.cc shrpx_config.h \
+	shrpx_error.h shrpx_accept_handler.cc shrpx_accept_handler.h \
 	shrpx_connection_handler.cc shrpx_connection_handler.h \
 	shrpx_client_handler.cc shrpx_client_handler.h \
 	shrpx_upstream.h shrpx_http2_upstream.cc \
@@ -316,78 +280,10 @@
 @ENABLE_APP_TRUE@	$(am__objects_1) $(am__objects_2)
 @ENABLE_APP_TRUE@am_libnghttpx_a_OBJECTS = $(am__objects_3)
 libnghttpx_a_OBJECTS = $(am_libnghttpx_a_OBJECTS)
-am__DEPENDENCIES_1 =
-@ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_DEPENDENCIES =  \
-@ENABLE_ASIO_LIB_TRUE@	$(top_builddir)/lib/libnghttp2.la \
-@ENABLE_ASIO_LIB_TRUE@	$(top_builddir)/third-party/liburl-parser.la \
-@ENABLE_ASIO_LIB_TRUE@	$(top_builddir)/third-party/libllhttp.la \
-@ENABLE_ASIO_LIB_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_ASIO_LIB_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_ASIO_LIB_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_ASIO_LIB_TRUE@	$(am__DEPENDENCIES_1)
-am__libnghttp2_asio_la_SOURCES_DIST = util.cc util.h http2.cc http2.h \
-	tls.cc tls.h ssl_compat.h timegm.c timegm.h asio_common.cc \
-	asio_common.h asio_io_service_pool.cc asio_io_service_pool.h \
-	asio_server_http2.cc asio_server_http2_impl.cc \
-	asio_server_http2_impl.h asio_server.cc asio_server.h \
-	asio_server_http2_handler.cc asio_server_http2_handler.h \
-	asio_server_connection.h asio_server_request.cc \
-	asio_server_request_impl.cc asio_server_request_impl.h \
-	asio_server_response.cc asio_server_response_impl.cc \
-	asio_server_response_impl.h asio_server_stream.cc \
-	asio_server_stream.h asio_server_serve_mux.cc \
-	asio_server_serve_mux.h asio_server_request_handler.cc \
-	asio_server_request_handler.h asio_server_tls_context.cc \
-	asio_server_tls_context.h asio_client_session.cc \
-	asio_client_session_impl.cc asio_client_session_impl.h \
-	asio_client_session_tcp_impl.cc asio_client_session_tcp_impl.h \
-	asio_client_session_tls_impl.cc asio_client_session_tls_impl.h \
-	asio_client_response.cc asio_client_response_impl.cc \
-	asio_client_response_impl.h asio_client_request.cc \
-	asio_client_request_impl.cc asio_client_request_impl.h \
-	asio_client_stream.cc asio_client_stream.h \
-	asio_client_tls_context.cc asio_client_tls_context.h
-@ENABLE_ASIO_LIB_TRUE@am_libnghttp2_asio_la_OBJECTS =  \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-util.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-http2.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-tls.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-timegm.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_common.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_io_service_pool.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_http2.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_http2_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_http2_handler.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_request.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_request_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_response.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_response_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_stream.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_serve_mux.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_request_handler.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_server_tls_context.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_session.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_session_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_session_tcp_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_session_tls_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_response.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_response_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_request.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_request_impl.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_stream.lo \
-@ENABLE_ASIO_LIB_TRUE@	libnghttp2_asio_la-asio_client_tls_context.lo
-libnghttp2_asio_la_OBJECTS = $(am_libnghttp2_asio_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libnghttp2_asio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(libnghttp2_asio_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@ENABLE_ASIO_LIB_TRUE@am_libnghttp2_asio_la_rpath = -rpath $(libdir)
-am__deflatehd_SOURCES_DIST = deflatehd.cc comp_helper.c comp_helper.h
-@ENABLE_HPACK_TOOLS_TRUE@am__objects_4 = comp_helper.$(OBJEXT)
+am__deflatehd_SOURCES_DIST = deflatehd.cc comp_helper.c comp_helper.h \
+	util.cc util.h timegm.c timegm.h
+@ENABLE_HPACK_TOOLS_TRUE@am__objects_4 = comp_helper.$(OBJEXT) \
+@ENABLE_HPACK_TOOLS_TRUE@	util.$(OBJEXT) timegm.$(OBJEXT)
 @ENABLE_HPACK_TOOLS_TRUE@am_deflatehd_OBJECTS = deflatehd.$(OBJEXT) \
 @ENABLE_HPACK_TOOLS_TRUE@	$(am__objects_4)
 deflatehd_OBJECTS = $(am_deflatehd_OBJECTS)
@@ -395,12 +291,17 @@
 deflatehd_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \
 	$(top_builddir)/third-party/liburl-parser.la \
 	$(top_builddir)/third-party/libllhttp.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 am__h2load_SOURCES_DIST = util.cc util.h http2.cc http2.h h2load.cc \
-	h2load.h timegm.c timegm.h tls.cc tls.h h2load_session.h \
-	h2load_http2_session.cc h2load_http2_session.h \
-	h2load_http1_session.cc h2load_http1_session.h \
-	h2load_http3_session.cc h2load_http3_session.h h2load_quic.cc \
-	h2load_quic.h quic.cc quic.h
+	h2load.h timegm.c timegm.h tls.cc tls.h ssl_compat.h \
+	h2load_session.h h2load_http2_session.cc \
+	h2load_http2_session.h h2load_http1_session.cc \
+	h2load_http1_session.h h2load_http3_session.cc \
+	h2load_http3_session.h h2load_quic.cc h2load_quic.h quic.cc \
+	quic.h
 @ENABLE_APP_TRUE@@ENABLE_HTTP3_TRUE@am__objects_5 = h2load_http3_session.$(OBJEXT) \
 @ENABLE_APP_TRUE@@ENABLE_HTTP3_TRUE@	h2load_quic.$(OBJEXT) \
 @ENABLE_APP_TRUE@@ENABLE_HTTP3_TRUE@	quic.$(OBJEXT)
@@ -414,7 +315,8 @@
 h2load_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \
 	$(top_builddir)/third-party/liburl-parser.la \
 	$(top_builddir)/third-party/libllhttp.la
-am__inflatehd_SOURCES_DIST = inflatehd.cc comp_helper.c comp_helper.h
+am__inflatehd_SOURCES_DIST = inflatehd.cc comp_helper.c comp_helper.h \
+	util.cc util.h timegm.c timegm.h
 @ENABLE_HPACK_TOOLS_TRUE@am_inflatehd_OBJECTS = inflatehd.$(OBJEXT) \
 @ENABLE_HPACK_TOOLS_TRUE@	$(am__objects_4)
 inflatehd_OBJECTS = $(am_inflatehd_OBJECTS)
@@ -425,7 +327,7 @@
 am__nghttp_SOURCES_DIST = util.cc http2.cc timegm.c app_helper.cc \
 	nghttp2_gzip.c util.h http2.h timegm.h app_helper.h \
 	nghttp2_config.h nghttp2_gzip.h network.h nghttp.cc nghttp.h \
-	HtmlParser.cc HtmlParser.h tls.cc tls.h
+	HtmlParser.cc HtmlParser.h tls.cc tls.h ssl_compat.h
 @ENABLE_APP_TRUE@am__objects_6 = util.$(OBJEXT) http2.$(OBJEXT) \
 @ENABLE_APP_TRUE@	timegm.$(OBJEXT) app_helper.$(OBJEXT) \
 @ENABLE_APP_TRUE@	nghttp2_gzip.$(OBJEXT)
@@ -444,7 +346,7 @@
 am__nghttpd_SOURCES_DIST = util.cc http2.cc timegm.c app_helper.cc \
 	nghttp2_gzip.c util.h http2.h timegm.h app_helper.h \
 	nghttp2_config.h nghttp2_gzip.h network.h nghttpd.cc tls.cc \
-	tls.h HttpServer.cc HttpServer.h
+	tls.h ssl_compat.h HttpServer.cc HttpServer.h
 @ENABLE_APP_TRUE@am_nghttpd_OBJECTS = $(am__objects_6) \
 @ENABLE_APP_TRUE@	$(am__objects_7) nghttpd.$(OBJEXT) \
 @ENABLE_APP_TRUE@	tls.$(OBJEXT) HttpServer.$(OBJEXT)
@@ -456,11 +358,12 @@
 am__nghttpx_SOURCES_DIST = shrpx.cc shrpx.h
 @ENABLE_APP_TRUE@am_nghttpx_OBJECTS = nghttpx-shrpx.$(OBJEXT)
 nghttpx_OBJECTS = $(am_nghttpx_OBJECTS)
-am__DEPENDENCIES_2 = $(top_builddir)/lib/libnghttp2.la \
+am__DEPENDENCIES_1 = $(top_builddir)/lib/libnghttp2.la \
 	$(top_builddir)/third-party/liburl-parser.la \
 	$(top_builddir)/third-party/libllhttp.la
+am__DEPENDENCIES_2 =
 @ENABLE_APP_TRUE@nghttpx_DEPENDENCIES = libnghttpx.a \
-@ENABLE_APP_TRUE@	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+@ENABLE_APP_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 @ENABLE_APP_TRUE@	$(am__append_9)
 am__nghttpx_unittest_SOURCES_DIST = shrpx-unittest.cc \
 	shrpx_tls_test.cc shrpx_tls_test.h shrpx_downstream_test.cc \
@@ -490,8 +393,8 @@
 nghttpx_unittest_OBJECTS = $(am_nghttpx_unittest_OBJECTS)
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@nghttpx_unittest_DEPENDENCIES =  \
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	libnghttpx.a \
-@ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	$(am__DEPENDENCIES_2) \
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	$(am__DEPENDENCIES_1) \
+@ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	$(am__DEPENDENCIES_2) \
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	$(am__append_14)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -515,34 +418,6 @@
 	./$(DEPDIR)/h2load_http2_session.Po \
 	./$(DEPDIR)/h2load_http3_session.Po ./$(DEPDIR)/h2load_quic.Po \
 	./$(DEPDIR)/http2.Po ./$(DEPDIR)/inflatehd.Po \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_request.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_request_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_response.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_response_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_session.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tcp_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tls_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_stream.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_client_tls_context.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_common.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_io_service_pool.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_handler.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_request.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_handler.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_response.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_response_impl.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_serve_mux.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_stream.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-asio_server_tls_context.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-http2.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-timegm.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-tls.Plo \
-	./$(DEPDIR)/libnghttp2_asio_la-util.Plo \
 	./$(DEPDIR)/libnghttpx_a-app_helper.Po \
 	./$(DEPDIR)/libnghttpx_a-http2.Po \
 	./$(DEPDIR)/libnghttpx_a-http3.Po \
@@ -650,38 +525,20 @@
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(libnghttpx_a_SOURCES) $(libnghttp2_asio_la_SOURCES) \
-	$(deflatehd_SOURCES) $(h2load_SOURCES) $(inflatehd_SOURCES) \
-	$(nghttp_SOURCES) $(nghttpd_SOURCES) $(nghttpx_SOURCES) \
+SOURCES = $(libnghttpx_a_SOURCES) $(deflatehd_SOURCES) \
+	$(h2load_SOURCES) $(inflatehd_SOURCES) $(nghttp_SOURCES) \
+	$(nghttpd_SOURCES) $(nghttpx_SOURCES) \
 	$(nghttpx_unittest_SOURCES)
 DIST_SOURCES = $(am__libnghttpx_a_SOURCES_DIST) \
-	$(am__libnghttp2_asio_la_SOURCES_DIST) \
 	$(am__deflatehd_SOURCES_DIST) $(am__h2load_SOURCES_DIST) \
 	$(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
-DATA = $(pkgconfig_DATA)
-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
@@ -721,6 +578,33 @@
     std='&#x1b;m'; \
   fi; \
 }
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__recheck_rx = ^ 	*:recheck: 	*
 am__global_test_result_rx = ^ 	*:global-test-result: 	*
 am__copy_in_global_log_rx = ^ 	*:copy-in-global-log: 	*
@@ -856,6 +740,7 @@
   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
@@ -876,36 +761,9 @@
 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 \
-	$(srcdir)/libnghttp2_asio.pc.in $(top_srcdir)/depcomp \
+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@
@@ -915,11 +773,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -936,7 +789,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -952,6 +804,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -1020,15 +873,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -1113,7 +960,6 @@
 # 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 = includes
 EXTRA_DIST = \
 	CMakeLists.txt \
 	test.example.com.pem \
@@ -1127,7 +973,6 @@
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes \
 	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/src/includes \
 	-I$(top_srcdir)/third-party \
 	-I$(top_srcdir)/third-party/llhttp/include \
 	@JEMALLOC_CFLAGS@ \
@@ -1175,23 +1020,23 @@
 @ENABLE_APP_TRUE@HTML_PARSER_HFILES = HtmlParser.h
 @ENABLE_APP_TRUE@nghttp_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttp.cc nghttp.h \
 @ENABLE_APP_TRUE@	${HTML_PARSER_OBJECTS} ${HTML_PARSER_HFILES} \
-@ENABLE_APP_TRUE@	tls.cc tls.h
+@ENABLE_APP_TRUE@	tls.cc tls.h ssl_compat.h
 
 @ENABLE_APP_TRUE@nghttpd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttpd.cc \
-@ENABLE_APP_TRUE@	tls.cc tls.h \
+@ENABLE_APP_TRUE@	tls.cc tls.h ssl_compat.h \
 @ENABLE_APP_TRUE@	HttpServer.cc HttpServer.h
 
 @ENABLE_APP_TRUE@h2load_SOURCES = util.cc util.h http2.cc http2.h \
 @ENABLE_APP_TRUE@	h2load.cc h2load.h timegm.c timegm.h tls.cc \
-@ENABLE_APP_TRUE@	tls.h h2load_session.h \
+@ENABLE_APP_TRUE@	tls.h ssl_compat.h h2load_session.h \
 @ENABLE_APP_TRUE@	h2load_http2_session.cc \
 @ENABLE_APP_TRUE@	h2load_http2_session.h \
 @ENABLE_APP_TRUE@	h2load_http1_session.cc \
 @ENABLE_APP_TRUE@	h2load_http1_session.h $(am__append_3)
 @ENABLE_APP_TRUE@NGHTTPX_SRCS = util.cc util.h http2.cc http2.h \
 @ENABLE_APP_TRUE@	timegm.c timegm.h base64.h app_helper.cc \
-@ENABLE_APP_TRUE@	app_helper.h tls.cc tls.h shrpx_config.cc \
-@ENABLE_APP_TRUE@	shrpx_config.h shrpx_error.h \
+@ENABLE_APP_TRUE@	app_helper.h tls.cc tls.h ssl_compat.h \
+@ENABLE_APP_TRUE@	shrpx_config.cc shrpx_config.h shrpx_error.h \
 @ENABLE_APP_TRUE@	shrpx_accept_handler.cc \
 @ENABLE_APP_TRUE@	shrpx_accept_handler.h \
 @ENABLE_APP_TRUE@	shrpx_connection_handler.cc \
@@ -1281,57 +1126,14 @@
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	@CUNIT_LIBS@ @TESTLDADD@ \
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	$(am__append_12) \
 @ENABLE_APP_TRUE@@HAVE_CUNIT_TRUE@	$(am__append_14)
-@ENABLE_HPACK_TOOLS_TRUE@HPACK_TOOLS_COMMON_SRCS = comp_helper.c comp_helper.h
+@ENABLE_HPACK_TOOLS_TRUE@HPACK_TOOLS_COMMON_SRCS = \
+@ENABLE_HPACK_TOOLS_TRUE@	comp_helper.c comp_helper.h \
+@ENABLE_HPACK_TOOLS_TRUE@	util.cc util.h \
+@ENABLE_HPACK_TOOLS_TRUE@	timegm.c timegm.h
+
 @ENABLE_HPACK_TOOLS_TRUE@inflatehd_SOURCES = inflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
 @ENABLE_HPACK_TOOLS_TRUE@deflatehd_SOURCES = deflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
-@ENABLE_ASIO_LIB_TRUE@pkgconfigdir = $(libdir)/pkgconfig
-@ENABLE_ASIO_LIB_TRUE@pkgconfig_DATA = libnghttp2_asio.pc
-@ENABLE_ASIO_LIB_TRUE@DISTCLEANFILES = $(pkgconfig_DATA)
-@ENABLE_ASIO_LIB_TRUE@lib_LTLIBRARIES = libnghttp2_asio.la
-@ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_SOURCES = \
-@ENABLE_ASIO_LIB_TRUE@	util.cc util.h http2.cc http2.h \
-@ENABLE_ASIO_LIB_TRUE@	tls.cc tls.h \
-@ENABLE_ASIO_LIB_TRUE@	ssl_compat.h \
-@ENABLE_ASIO_LIB_TRUE@	timegm.c timegm.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_common.cc asio_common.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_io_service_pool.cc asio_io_service_pool.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_http2.cc \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_http2_impl.cc asio_server_http2_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server.cc asio_server.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_http2_handler.cc asio_server_http2_handler.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_connection.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_request.cc \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_request_impl.cc asio_server_request_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_response.cc \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_response_impl.cc asio_server_response_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_stream.cc asio_server_stream.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_serve_mux.cc asio_server_serve_mux.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_request_handler.cc asio_server_request_handler.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_server_tls_context.cc asio_server_tls_context.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_session.cc \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_session_impl.cc asio_client_session_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_session_tcp_impl.cc asio_client_session_tcp_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_session_tls_impl.cc asio_client_session_tls_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_response.cc \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_response_impl.cc asio_client_response_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_request.cc \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_request_impl.cc asio_client_request_impl.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_stream.cc asio_client_stream.h \
-@ENABLE_ASIO_LIB_TRUE@	asio_client_tls_context.cc asio_client_tls_context.h
-
-@ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_CPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
-@ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0
-@ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LIBADD = \
-@ENABLE_ASIO_LIB_TRUE@	$(top_builddir)/lib/libnghttp2.la \
-@ENABLE_ASIO_LIB_TRUE@	$(top_builddir)/third-party/liburl-parser.la \
-@ENABLE_ASIO_LIB_TRUE@	$(top_builddir)/third-party/libllhttp.la \
-@ENABLE_ASIO_LIB_TRUE@	@OPENSSL_LIBS@ \
-@ENABLE_ASIO_LIB_TRUE@	${BOOST_LDFLAGS} \
-@ENABLE_ASIO_LIB_TRUE@	${BOOST_ASIO_LIB} \
-@ENABLE_ASIO_LIB_TRUE@	${BOOST_THREAD_LIB} \
-@ENABLE_ASIO_LIB_TRUE@	${BOOST_SYSTEM_LIB}
-
-all: all-recursive
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .lo .log .o .obj .test .test$(EXEEXT) .trs
@@ -1364,8 +1166,6 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-libnghttp2_asio.pc: $(top_builddir)/config.status $(srcdir)/libnghttp2_asio.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1428,49 +1228,11 @@
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
 libnghttpx.a: $(libnghttpx_a_OBJECTS) $(libnghttpx_a_DEPENDENCIES) $(EXTRA_libnghttpx_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libnghttpx.a
 	$(AM_V_AR)$(libnghttpx_a_AR) libnghttpx.a $(libnghttpx_a_OBJECTS) $(libnghttpx_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libnghttpx.a
 
-libnghttp2_asio.la: $(libnghttp2_asio_la_OBJECTS) $(libnghttp2_asio_la_DEPENDENCIES) $(EXTRA_libnghttp2_asio_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(libnghttp2_asio_la_LINK) $(am_libnghttp2_asio_la_rpath) $(libnghttp2_asio_la_OBJECTS) $(libnghttp2_asio_la_LIBADD) $(LIBS)
-
 deflatehd$(EXEEXT): $(deflatehd_OBJECTS) $(deflatehd_DEPENDENCIES) $(EXTRA_deflatehd_DEPENDENCIES) 
 	@rm -f deflatehd$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(deflatehd_OBJECTS) $(deflatehd_LDADD) $(LIBS)
@@ -1517,34 +1279,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h2load_quic.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflatehd.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_request.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_request_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_response.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_response_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_session.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tcp_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tls_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_stream.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_client_tls_context.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_common.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_io_service_pool.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_handler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_request.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_handler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_response.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_response_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_serve_mux.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_stream.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-asio_server_tls_context.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-http2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-timegm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-tls.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttp2_asio_la-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttpx_a-app_helper.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttpx_a-http2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnghttpx_a-http3.Po@am__quote@ # am--include-marker
@@ -1679,13 +1413,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttpx_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnghttpx_a-xsi_strerror.obj `if test -f 'xsi_strerror.c'; then $(CYGPATH_W) 'xsi_strerror.c'; else $(CYGPATH_W) '$(srcdir)/xsi_strerror.c'; fi`
 
-libnghttp2_asio_la-timegm.lo: timegm.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnghttp2_asio_la-timegm.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-timegm.Tpo -c -o libnghttp2_asio_la-timegm.lo `test -f 'timegm.c' || echo '$(srcdir)/'`timegm.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-timegm.Tpo $(DEPDIR)/libnghttp2_asio_la-timegm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timegm.c' object='libnghttp2_asio_la-timegm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnghttp2_asio_la-timegm.lo `test -f 'timegm.c' || echo '$(srcdir)/'`timegm.c
-
 nghttpx_unittest-nghttp2_gzip_test.o: nghttp2_gzip_test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nghttpx_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nghttpx_unittest-nghttp2_gzip_test.o -MD -MP -MF $(DEPDIR)/nghttpx_unittest-nghttp2_gzip_test.Tpo -c -o nghttpx_unittest-nghttp2_gzip_test.o `test -f 'nghttp2_gzip_test.c' || echo '$(srcdir)/'`nghttp2_gzip_test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nghttpx_unittest-nghttp2_gzip_test.Tpo $(DEPDIR)/nghttpx_unittest-nghttp2_gzip_test.Po
@@ -2438,195 +2165,6 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttpx_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttpx_a-quic.obj `if test -f 'quic.cc'; then $(CYGPATH_W) 'quic.cc'; else $(CYGPATH_W) '$(srcdir)/quic.cc'; fi`
 
-libnghttp2_asio_la-util.lo: util.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-util.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-util.Tpo -c -o libnghttp2_asio_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-util.Tpo $(DEPDIR)/libnghttp2_asio_la-util.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='util.cc' object='libnghttp2_asio_la-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
-
-libnghttp2_asio_la-http2.lo: http2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-http2.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-http2.Tpo -c -o libnghttp2_asio_la-http2.lo `test -f 'http2.cc' || echo '$(srcdir)/'`http2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-http2.Tpo $(DEPDIR)/libnghttp2_asio_la-http2.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='http2.cc' object='libnghttp2_asio_la-http2.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-http2.lo `test -f 'http2.cc' || echo '$(srcdir)/'`http2.cc
-
-libnghttp2_asio_la-tls.lo: tls.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-tls.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-tls.Tpo -c -o libnghttp2_asio_la-tls.lo `test -f 'tls.cc' || echo '$(srcdir)/'`tls.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-tls.Tpo $(DEPDIR)/libnghttp2_asio_la-tls.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='tls.cc' object='libnghttp2_asio_la-tls.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-tls.lo `test -f 'tls.cc' || echo '$(srcdir)/'`tls.cc
-
-libnghttp2_asio_la-asio_common.lo: asio_common.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_common.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_common.Tpo -c -o libnghttp2_asio_la-asio_common.lo `test -f 'asio_common.cc' || echo '$(srcdir)/'`asio_common.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_common.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_common.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_common.cc' object='libnghttp2_asio_la-asio_common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_common.lo `test -f 'asio_common.cc' || echo '$(srcdir)/'`asio_common.cc
-
-libnghttp2_asio_la-asio_io_service_pool.lo: asio_io_service_pool.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_io_service_pool.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_io_service_pool.Tpo -c -o libnghttp2_asio_la-asio_io_service_pool.lo `test -f 'asio_io_service_pool.cc' || echo '$(srcdir)/'`asio_io_service_pool.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_io_service_pool.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_io_service_pool.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_io_service_pool.cc' object='libnghttp2_asio_la-asio_io_service_pool.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_io_service_pool.lo `test -f 'asio_io_service_pool.cc' || echo '$(srcdir)/'`asio_io_service_pool.cc
-
-libnghttp2_asio_la-asio_server_http2.lo: asio_server_http2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_http2.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_http2.Tpo -c -o libnghttp2_asio_la-asio_server_http2.lo `test -f 'asio_server_http2.cc' || echo '$(srcdir)/'`asio_server_http2.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_http2.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_http2.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_http2.cc' object='libnghttp2_asio_la-asio_server_http2.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_http2.lo `test -f 'asio_server_http2.cc' || echo '$(srcdir)/'`asio_server_http2.cc
-
-libnghttp2_asio_la-asio_server_http2_impl.lo: asio_server_http2_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_http2_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_http2_impl.Tpo -c -o libnghttp2_asio_la-asio_server_http2_impl.lo `test -f 'asio_server_http2_impl.cc' || echo '$(srcdir)/'`asio_server_http2_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_http2_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_http2_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_http2_impl.cc' object='libnghttp2_asio_la-asio_server_http2_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_http2_impl.lo `test -f 'asio_server_http2_impl.cc' || echo '$(srcdir)/'`asio_server_http2_impl.cc
-
-libnghttp2_asio_la-asio_server.lo: asio_server.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server.Tpo -c -o libnghttp2_asio_la-asio_server.lo `test -f 'asio_server.cc' || echo '$(srcdir)/'`asio_server.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server.cc' object='libnghttp2_asio_la-asio_server.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server.lo `test -f 'asio_server.cc' || echo '$(srcdir)/'`asio_server.cc
-
-libnghttp2_asio_la-asio_server_http2_handler.lo: asio_server_http2_handler.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_http2_handler.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_http2_handler.Tpo -c -o libnghttp2_asio_la-asio_server_http2_handler.lo `test -f 'asio_server_http2_handler.cc' || echo '$(srcdir)/'`asio_server_http2_handler.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_http2_handler.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_http2_handler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_http2_handler.cc' object='libnghttp2_asio_la-asio_server_http2_handler.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_http2_handler.lo `test -f 'asio_server_http2_handler.cc' || echo '$(srcdir)/'`asio_server_http2_handler.cc
-
-libnghttp2_asio_la-asio_server_request.lo: asio_server_request.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_request.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_request.Tpo -c -o libnghttp2_asio_la-asio_server_request.lo `test -f 'asio_server_request.cc' || echo '$(srcdir)/'`asio_server_request.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_request.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_request.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_request.cc' object='libnghttp2_asio_la-asio_server_request.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_request.lo `test -f 'asio_server_request.cc' || echo '$(srcdir)/'`asio_server_request.cc
-
-libnghttp2_asio_la-asio_server_request_impl.lo: asio_server_request_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_request_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_request_impl.Tpo -c -o libnghttp2_asio_la-asio_server_request_impl.lo `test -f 'asio_server_request_impl.cc' || echo '$(srcdir)/'`asio_server_request_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_request_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_request_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_request_impl.cc' object='libnghttp2_asio_la-asio_server_request_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_request_impl.lo `test -f 'asio_server_request_impl.cc' || echo '$(srcdir)/'`asio_server_request_impl.cc
-
-libnghttp2_asio_la-asio_server_response.lo: asio_server_response.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_response.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_response.Tpo -c -o libnghttp2_asio_la-asio_server_response.lo `test -f 'asio_server_response.cc' || echo '$(srcdir)/'`asio_server_response.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_response.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_response.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_response.cc' object='libnghttp2_asio_la-asio_server_response.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_response.lo `test -f 'asio_server_response.cc' || echo '$(srcdir)/'`asio_server_response.cc
-
-libnghttp2_asio_la-asio_server_response_impl.lo: asio_server_response_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_response_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_response_impl.Tpo -c -o libnghttp2_asio_la-asio_server_response_impl.lo `test -f 'asio_server_response_impl.cc' || echo '$(srcdir)/'`asio_server_response_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_response_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_response_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_response_impl.cc' object='libnghttp2_asio_la-asio_server_response_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_response_impl.lo `test -f 'asio_server_response_impl.cc' || echo '$(srcdir)/'`asio_server_response_impl.cc
-
-libnghttp2_asio_la-asio_server_stream.lo: asio_server_stream.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_stream.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_stream.Tpo -c -o libnghttp2_asio_la-asio_server_stream.lo `test -f 'asio_server_stream.cc' || echo '$(srcdir)/'`asio_server_stream.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_stream.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_stream.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_stream.cc' object='libnghttp2_asio_la-asio_server_stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_stream.lo `test -f 'asio_server_stream.cc' || echo '$(srcdir)/'`asio_server_stream.cc
-
-libnghttp2_asio_la-asio_server_serve_mux.lo: asio_server_serve_mux.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_serve_mux.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_serve_mux.Tpo -c -o libnghttp2_asio_la-asio_server_serve_mux.lo `test -f 'asio_server_serve_mux.cc' || echo '$(srcdir)/'`asio_server_serve_mux.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_serve_mux.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_serve_mux.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_serve_mux.cc' object='libnghttp2_asio_la-asio_server_serve_mux.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_serve_mux.lo `test -f 'asio_server_serve_mux.cc' || echo '$(srcdir)/'`asio_server_serve_mux.cc
-
-libnghttp2_asio_la-asio_server_request_handler.lo: asio_server_request_handler.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_request_handler.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_request_handler.Tpo -c -o libnghttp2_asio_la-asio_server_request_handler.lo `test -f 'asio_server_request_handler.cc' || echo '$(srcdir)/'`asio_server_request_handler.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_request_handler.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_request_handler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_request_handler.cc' object='libnghttp2_asio_la-asio_server_request_handler.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_request_handler.lo `test -f 'asio_server_request_handler.cc' || echo '$(srcdir)/'`asio_server_request_handler.cc
-
-libnghttp2_asio_la-asio_server_tls_context.lo: asio_server_tls_context.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_server_tls_context.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_server_tls_context.Tpo -c -o libnghttp2_asio_la-asio_server_tls_context.lo `test -f 'asio_server_tls_context.cc' || echo '$(srcdir)/'`asio_server_tls_context.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_server_tls_context.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_server_tls_context.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_server_tls_context.cc' object='libnghttp2_asio_la-asio_server_tls_context.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_server_tls_context.lo `test -f 'asio_server_tls_context.cc' || echo '$(srcdir)/'`asio_server_tls_context.cc
-
-libnghttp2_asio_la-asio_client_session.lo: asio_client_session.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_session.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_session.Tpo -c -o libnghttp2_asio_la-asio_client_session.lo `test -f 'asio_client_session.cc' || echo '$(srcdir)/'`asio_client_session.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_session.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_session.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_session.cc' object='libnghttp2_asio_la-asio_client_session.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_session.lo `test -f 'asio_client_session.cc' || echo '$(srcdir)/'`asio_client_session.cc
-
-libnghttp2_asio_la-asio_client_session_impl.lo: asio_client_session_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_session_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_session_impl.Tpo -c -o libnghttp2_asio_la-asio_client_session_impl.lo `test -f 'asio_client_session_impl.cc' || echo '$(srcdir)/'`asio_client_session_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_session_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_session_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_session_impl.cc' object='libnghttp2_asio_la-asio_client_session_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_session_impl.lo `test -f 'asio_client_session_impl.cc' || echo '$(srcdir)/'`asio_client_session_impl.cc
-
-libnghttp2_asio_la-asio_client_session_tcp_impl.lo: asio_client_session_tcp_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_session_tcp_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_session_tcp_impl.Tpo -c -o libnghttp2_asio_la-asio_client_session_tcp_impl.lo `test -f 'asio_client_session_tcp_impl.cc' || echo '$(srcdir)/'`asio_client_session_tcp_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_session_tcp_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_session_tcp_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_session_tcp_impl.cc' object='libnghttp2_asio_la-asio_client_session_tcp_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_session_tcp_impl.lo `test -f 'asio_client_session_tcp_impl.cc' || echo '$(srcdir)/'`asio_client_session_tcp_impl.cc
-
-libnghttp2_asio_la-asio_client_session_tls_impl.lo: asio_client_session_tls_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_session_tls_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_session_tls_impl.Tpo -c -o libnghttp2_asio_la-asio_client_session_tls_impl.lo `test -f 'asio_client_session_tls_impl.cc' || echo '$(srcdir)/'`asio_client_session_tls_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_session_tls_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_session_tls_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_session_tls_impl.cc' object='libnghttp2_asio_la-asio_client_session_tls_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_session_tls_impl.lo `test -f 'asio_client_session_tls_impl.cc' || echo '$(srcdir)/'`asio_client_session_tls_impl.cc
-
-libnghttp2_asio_la-asio_client_response.lo: asio_client_response.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_response.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_response.Tpo -c -o libnghttp2_asio_la-asio_client_response.lo `test -f 'asio_client_response.cc' || echo '$(srcdir)/'`asio_client_response.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_response.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_response.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_response.cc' object='libnghttp2_asio_la-asio_client_response.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_response.lo `test -f 'asio_client_response.cc' || echo '$(srcdir)/'`asio_client_response.cc
-
-libnghttp2_asio_la-asio_client_response_impl.lo: asio_client_response_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_response_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_response_impl.Tpo -c -o libnghttp2_asio_la-asio_client_response_impl.lo `test -f 'asio_client_response_impl.cc' || echo '$(srcdir)/'`asio_client_response_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_response_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_response_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_response_impl.cc' object='libnghttp2_asio_la-asio_client_response_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_response_impl.lo `test -f 'asio_client_response_impl.cc' || echo '$(srcdir)/'`asio_client_response_impl.cc
-
-libnghttp2_asio_la-asio_client_request.lo: asio_client_request.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_request.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_request.Tpo -c -o libnghttp2_asio_la-asio_client_request.lo `test -f 'asio_client_request.cc' || echo '$(srcdir)/'`asio_client_request.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_request.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_request.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_request.cc' object='libnghttp2_asio_la-asio_client_request.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_request.lo `test -f 'asio_client_request.cc' || echo '$(srcdir)/'`asio_client_request.cc
-
-libnghttp2_asio_la-asio_client_request_impl.lo: asio_client_request_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_request_impl.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_request_impl.Tpo -c -o libnghttp2_asio_la-asio_client_request_impl.lo `test -f 'asio_client_request_impl.cc' || echo '$(srcdir)/'`asio_client_request_impl.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_request_impl.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_request_impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_request_impl.cc' object='libnghttp2_asio_la-asio_client_request_impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_request_impl.lo `test -f 'asio_client_request_impl.cc' || echo '$(srcdir)/'`asio_client_request_impl.cc
-
-libnghttp2_asio_la-asio_client_stream.lo: asio_client_stream.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_stream.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_stream.Tpo -c -o libnghttp2_asio_la-asio_client_stream.lo `test -f 'asio_client_stream.cc' || echo '$(srcdir)/'`asio_client_stream.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_stream.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_stream.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_stream.cc' object='libnghttp2_asio_la-asio_client_stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_stream.lo `test -f 'asio_client_stream.cc' || echo '$(srcdir)/'`asio_client_stream.cc
-
-libnghttp2_asio_la-asio_client_tls_context.lo: asio_client_tls_context.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnghttp2_asio_la-asio_client_tls_context.lo -MD -MP -MF $(DEPDIR)/libnghttp2_asio_la-asio_client_tls_context.Tpo -c -o libnghttp2_asio_la-asio_client_tls_context.lo `test -f 'asio_client_tls_context.cc' || echo '$(srcdir)/'`asio_client_tls_context.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnghttp2_asio_la-asio_client_tls_context.Tpo $(DEPDIR)/libnghttp2_asio_la-asio_client_tls_context.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='asio_client_tls_context.cc' object='libnghttp2_asio_la-asio_client_tls_context.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnghttp2_asio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnghttp2_asio_la-asio_client_tls_context.lo `test -f 'asio_client_tls_context.cc' || echo '$(srcdir)/'`asio_client_tls_context.cc
-
 nghttpx-shrpx.o: shrpx.cc
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nghttpx_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT nghttpx-shrpx.o -MD -MP -MF $(DEPDIR)/nghttpx-shrpx.Tpo -c -o nghttpx-shrpx.o `test -f 'shrpx.cc' || echo '$(srcdir)/'`shrpx.cc
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nghttpx-shrpx.Tpo $(DEPDIR)/nghttpx-shrpx.Po
@@ -2828,83 +2366,15 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-
-# 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-recursive
+tags: tags-am
 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 \
@@ -2917,7 +2387,7 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
+ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
@@ -2930,7 +2400,7 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
+cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
@@ -3144,52 +2614,24 @@
 	    || 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-recursive
-all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+check: check-am
+all-am: Makefile $(PROGRAMS) $(LIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+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-recursive
+installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -3210,18 +2652,16 @@
 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)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 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-recursive
+clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
+	clean-libtool clean-noinstLIBRARIES mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-am
 		-rm -f ./$(DEPDIR)/HtmlParser.Po
 	-rm -f ./$(DEPDIR)/HttpServer.Po
 	-rm -f ./$(DEPDIR)/app_helper.Po
@@ -3234,34 +2674,6 @@
 	-rm -f ./$(DEPDIR)/h2load_quic.Po
 	-rm -f ./$(DEPDIR)/http2.Po
 	-rm -f ./$(DEPDIR)/inflatehd.Po
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_request.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_request_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_response.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_response_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tcp_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tls_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_stream.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_tls_context.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_common.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_io_service_pool.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_handler.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_request.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_handler.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_response.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_response_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_serve_mux.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_stream.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_tls_context.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-http2.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-timegm.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-tls.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-util.Plo
 	-rm -f ./$(DEPDIR)/libnghttpx_a-app_helper.Po
 	-rm -f ./$(DEPDIR)/libnghttpx_a-http2.Po
 	-rm -f ./$(DEPDIR)/libnghttpx_a-http3.Po
@@ -3341,47 +2753,47 @@
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-html: html-recursive
+html: html-am
 
 html-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
-install-data-am: install-pkgconfigDATA
+install-data-am:
 
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+install-exec-am: install-binPROGRAMS
 
-install-html: install-html-recursive
+install-html: install-html-am
 
 install-html-am:
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
 
 install-pdf-am:
 
-install-ps: install-ps-recursive
+install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
 		-rm -f ./$(DEPDIR)/HtmlParser.Po
 	-rm -f ./$(DEPDIR)/HttpServer.Po
 	-rm -f ./$(DEPDIR)/app_helper.Po
@@ -3394,34 +2806,6 @@
 	-rm -f ./$(DEPDIR)/h2load_quic.Po
 	-rm -f ./$(DEPDIR)/http2.Po
 	-rm -f ./$(DEPDIR)/inflatehd.Po
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_request.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_request_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_response.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_response_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tcp_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_session_tls_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_stream.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_client_tls_context.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_common.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_io_service_pool.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_handler.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_http2_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_request.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_handler.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_request_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_response.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_response_impl.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_serve_mux.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_stream.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-asio_server_tls_context.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-http2.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-timegm.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-tls.Plo
-	-rm -f ./$(DEPDIR)/libnghttp2_asio_la-util.Plo
 	-rm -f ./$(DEPDIR)/libnghttpx_a-app_helper.Po
 	-rm -f ./$(DEPDIR)/libnghttpx_a-http2.Po
 	-rm -f ./$(DEPDIR)/libnghttpx_a-http3.Po
@@ -3500,42 +2884,38 @@
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigDATA
+uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
+.MAKE: check-am install-am install-strip
 
-.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-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
+.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-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-pkgconfigDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
+	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-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigDATA
+	uninstall-am uninstall-binPROGRAMS
 
 .PRECIOUS: Makefile

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/allocator.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/allocator.h Changed

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/deflatehd.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/deflatehd.cc Changed

@@ -45,6 +45,7 @@
 
 #include "template.h"
 #include "comp_helper.h"
+#include "util.h"
 
 namespace nghttp2 {
 
@@ -381,8 +382,6 @@
     {nullptr, 0, nullptr, 0}};
 
 int main(int argc, char **argv) {
-  char *end;
-
   config.table_size = 4_k;
   config.deflate_table_size = 4_k;
   config.http1text = 0;
@@ -401,24 +400,26 @@
       // --http1text
       config.http1text = 1;
       break;
-    case 's':
+    case 's': {
       // --table-size
-      errno = 0;
-      config.table_size = strtoul(optarg, &end, 10);
-      if (errno == ERANGE || *end != '\0') {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
         fprintf(stderr, "-s: Bad option value\n");
         exit(EXIT_FAILURE);
       }
+      config.table_size = n;
       break;
-    case 'S':
+    }
+    case 'S': {
       // --deflate-table-size
-      errno = 0;
-      config.deflate_table_size = strtoul(optarg, &end, 10);
-      if (errno == ERANGE || *end != '\0') {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
         fprintf(stderr, "-S: Bad option value\n");
         exit(EXIT_FAILURE);
       }
+      config.deflate_table_size = n;
       break;
+    }
     case 'd':
       // --dump-header-table
       config.dump_header_table = 1;

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

@@ -51,8 +51,13 @@
 #include <openssl/err.h>
 
 #ifdef ENABLE_HTTP3
-#  include <ngtcp2/ngtcp2.h>
-#endif // ENABLE_HTTP3
+#  ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+#    include <ngtcp2/ngtcp2_crypto_openssl.h>
+#  endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+#  ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
+#    include <ngtcp2/ngtcp2_crypto_boringssl.h>
+#  endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
+#endif   // ENABLE_HTTP3
 
 #include "url-parser/url_parser.h"
 
@@ -106,6 +111,7 @@
       max_concurrent_streams(1),
       window_bits(30),
       connection_window_bits(30),
+      max_frame_size(16_k),
       rate(0),
       rate_period(1.0),
       duration(0.0),
@@ -127,7 +133,8 @@
       unix_addr{},
       rps(0.),
       no_udp_gso(false),
-      max_udp_payload_size(0) {}
+      max_udp_payload_size(0),
+      ktls(false) {}
 
 Config::~Config() {
   if (addrs) {
@@ -494,6 +501,12 @@
 #ifdef ENABLE_HTTP3
   ev_timer_init(&quic.pkt_timer, quic_pkt_timeout_cb, 0., 0.);
   quic.pkt_timer.data = this;
+
+  if (config.is_quic()) {
+    quic.tx.data = std::make_unique<uint8_t>(64_k);
+  }
+
+  ngtcp2_connection_close_error_default(&quic.last_error);
 #endif // ENABLE_HTTP3
 }
 
@@ -557,7 +570,6 @@
         ssl = SSL_new(worker->ssl_ctx);
       }
 
-      SSL_set_fd(ssl, fd);
       SSL_set_connect_state(ssl);
     }
   }
@@ -717,12 +729,17 @@
   ev_io_stop(worker->loop, &wev);
   ev_io_stop(worker->loop, &rev);
   if (ssl) {
-    SSL_set_shutdown(ssl, SSL_get_shutdown(ssl) | SSL_RECEIVED_SHUTDOWN);
-    ERR_clear_error();
-
-    if (SSL_shutdown(ssl) != 1) {
+    if (config.is_quic()) {
       SSL_free(ssl);
       ssl = nullptr;
+    } else {
+      SSL_set_shutdown(ssl, SSL_get_shutdown(ssl) | SSL_RECEIVED_SHUTDOWN);
+      ERR_clear_error();
+
+      if (SSL_shutdown(ssl) != 1) {
+        SSL_free(ssl);
+        ssl = nullptr;
+      }
     }
   }
   if (fd != -1) {
@@ -1303,6 +1320,8 @@
   ev_io_stop(worker->loop, &wev);
 
   if (ssl) {
+    SSL_set_fd(ssl, fd);
+
     readfn = &Client::tls_handshake;
     writefn = &Client::tls_handshake;
 
@@ -1418,6 +1437,7 @@
 }
 
 #ifdef ENABLE_HTTP3
+// Returns 1 if sendmsg is blocked.
 int Client::write_udp(const sockaddr *addr, socklen_t addrlen,
                       const uint8_t *data, size_t datalen, size_t gso_size) {
   iovec msg_iov;
@@ -1446,7 +1466,11 @@
 
   auto nwrite = sendmsg(fd, &msg, 0);
   if (nwrite < 0) {
-    std::cerr << "sendto: errno=" << errno << std::endl;
+    if (errno == EAGAIN || errno == EWOULDBLOCK) {
+      return 1;
+    }
+
+    std::cerr << "sendmsg: errno=" << errno << std::endl;
   } else {
     ++worker->stats.udp_dgram_sent;
   }
@@ -1516,7 +1540,8 @@
 
 Worker::Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t req_todo, size_t nclients,
                size_t rate, size_t max_samples, Config *config)
-    : stats(req_todo, nclients),
+    : randgen(util::make_mt19937()),
+      stats(req_todo, nclients),
       loop(ev_loop_new(get_ev_loop_flags())),
       ssl_ctx(ssl_ctx),
       config(config),
@@ -1587,7 +1612,7 @@
       client->req_todo = client->req_done;
       stats.req_todo += client->req_todo;
       auto index = &client - &clients0;
-      clientsindex = NULL;
+      clientsindex = nullptr;
       return;
     }
   }
@@ -2108,6 +2133,11 @@
               http/1.1  is used,  this  specifies the  number of  HTTP
               pipelining requests in-flight.
               Default: 1
+  -f, --max-frame-size=<SIZE>
+              Maximum frame size that the local endpoint is willing to
+              receive.
+              Default: )"
+      << util::utos_unit(config.max_frame_size) << R"(
   -w, --window-bits=<N>
               Sets the stream level initial window size to (2**<N>)-1.
               For QUIC, <N> is capped to 26 (roughly 64MiB).
@@ -2121,7 +2151,7 @@
   -H, --header=<HEADER>
               Add/Override a header to the requests.
   --ciphers=<SUITE>
-              Set  allowed cipher  list  for TLSv1.2  or ealier.   The
+              Set  allowed cipher  list  for TLSv1.2  or earlier.   The
               format of the string is described in OpenSSL ciphers(1).
               Default: )"
       << config.ciphers << R"(
@@ -2245,11 +2275,10 @@
               to buffering.  Status code is -1 for failed streams.
   --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.qlog"  where M is worker ID  and N is
-              client ID (e.g. "base.0.3.qlog").
-              Only effective in QUIC runs.
+              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.
   --connect-to=<HOST>:<PORT>
               Host and port to connect  instead of using the authority
               in <URI>.
@@ -2263,6 +2292,7 @@
               Disable UDP GSO.
   --max-udp-payload-size=<SIZE>
               Specify the maximum outgoing UDP datagram payload size.
+  --ktls      Enable ktls.
   -v, --verbose
               Output debug information.
   --version   Display version information and exit.
@@ -2301,6 +2331,7 @@
         {"threads", required_argument, nullptr, 't'},
         {"max-concurrent-streams", required_argument, nullptr, 'm'},
         {"window-bits", required_argument, nullptr, 'w'},
+        {"max-frame-size", required_argument, nullptr, 'f'},
         {"connection-window-bits", required_argument, nullptr, 'W'},
         {"input-file", required_argument, nullptr, 'i'},
         {"header", required_argument, nullptr, 'H'},
@@ -2329,53 +2360,93 @@
         {"no-udp-gso", no_argument, &flag, 15},
         {"qlog-file-base", required_argument, &flag, 16},
         {"max-udp-payload-size", required_argument, &flag, 17},
+        {"ktls", no_argument, &flag, 18},
         {nullptr, 0, nullptr, 0}};
     int option_index = 0;
     auto c = getopt_long(argc, argv,
-                         "hvW:c:d:m:n:p:t:w:H:i:r:T:N:D:B:", long_options,
+                         "hvW:c:d:m:n:p:t:w:f:H:i:r:T:N:D:B:", long_options,
                          &option_index);
     if (c == -1) {
       break;
     }
     switch (c) {
-    case 'n':
-      config.nreqs = strtoul(optarg, nullptr, 10);
+    case 'n': {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-n: bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.nreqs = n;
       nreqs_set_manually = true;
       break;
-    case 'c':
-      config.nclients = strtoul(optarg, nullptr, 10);
+    }
+    case 'c': {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-c: bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.nclients = n;
       break;
+    }
     case 'd':
       datafile = optarg;
       break;
-    case 't':
+    case 't': {
 #ifdef NOTHREADS
       std::cerr << "-t: WARNING: Threading disabled at build time, "
                 << "no threads created." << std::endl;
 #else
-      config.nthreads = strtoul(optarg, nullptr, 10);
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-t: bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.nthreads = n;
 #endif // NOTHREADS
       break;
-    case 'm':
-      config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
+    }
+    case 'm': {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-m: bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.max_concurrent_streams = n;
       break;
+    }
     case 'w':
     case 'W': {
-      errno = 0;
-      char *endptr = nullptr;
-      auto n = strtoul(optarg, &endptr, 10);
-      if (errno == 0 && *endptr == '\0' && n < 31) {
-        if (c == 'w') {
-          config.window_bits = n;
-        } else {
-          config.connection_window_bits = n;
-        }
-      } else {
+      auto n = util::parse_uint(optarg);
+      if (n == -1 || n > 30) {
         std::cerr << "-" << static_cast<char>(c)
                   << ": specify the integer in the range 0, 30, inclusive"
                   << std::endl;
         exit(EXIT_FAILURE);
       }
+      if (c == 'w') {
+        config.window_bits = n;
+      } else {
+        config.connection_window_bits = n;
+      }
+      break;
+    }
+    case 'f': {
+      auto n = util::parse_uint_with_unit(optarg);
+      if (n == -1) {
+        std::cerr << "--max-frame-size: bad option value: " << optarg
+                  << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      if (static_cast<uint64_t>(n) < 16_k) {
+        std::cerr << "--max-frame-size: minimum 16384" << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      if (static_cast<uint64_t>(n) > 16_m - 1) {
+        std::cerr << "--max-frame-size: maximum 16777215" << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.max_frame_size = n;
       break;
     }
     case 'H': {
@@ -2420,14 +2491,20 @@
       }
       break;
     }
-    case 'r':
-      config.rate = strtoul(optarg, nullptr, 10);
-      if (config.rate == 0) {
+    case 'r': {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-r: bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      if (n == 0) {
         std::cerr << "-r: the rate at which connections are made "
                   << "must be positive." << std::endl;
         exit(EXIT_FAILURE);
       }
+      config.rate = n;
       break;
+    }
     case 'T':
       config.conn_active_timeout = util::parse_duration_with_unit(optarg);
       if (!std::isfinite(config.conn_active_timeout)) {
@@ -2611,6 +2688,10 @@
         config.max_udp_payload_size = n;
         break;
       }
+      case 18:
+        // --ktls
+        config.ktls = true;
+        break;
       }
       break;
     default:
@@ -2822,15 +2903,33 @@
                   SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
                   SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
 
+#ifdef SSL_OP_ENABLE_KTLS
+  if (config.ktls) {
+    ssl_opts |= SSL_OP_ENABLE_KTLS;
+  }
+#endif // SSL_OP_ENABLE_KTLS
+
   SSL_CTX_set_options(ssl_ctx, ssl_opts);
   SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
   SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
 
   if (config.is_quic()) {
 #ifdef ENABLE_HTTP3
-    SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_3_VERSION);
-    SSL_CTX_set_max_proto_version(ssl_ctx, TLS1_3_VERSION);
-#endif // 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"
+                << std::endl;
+      exit(EXIT_FAILURE);
+    }
+#  endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+#  ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
+    if (ngtcp2_crypto_boringssl_configure_client_context(ssl_ctx) != 0) {
+      std::cerr << "ngtcp2_crypto_boringssl_configure_client_context failed"
+                << std::endl;
+      exit(EXIT_FAILURE);
+    }
+#  endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
+#endif   // ENABLE_HTTP3
   } else if (nghttp2::tls::ssl_ctx_set_proto_versions(
                  ssl_ctx, nghttp2::tls::NGHTTP2_TLS_MIN_VERSION,
                  nghttp2::tls::NGHTTP2_TLS_MAX_VERSION) != 0) {

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

@@ -95,6 +95,7 @@
   ssize_t max_concurrent_streams;
   size_t window_bits;
   size_t connection_window_bits;
+  size_t max_frame_size;
   // rate at which connections should be made
   size_t rate;
   ev_tstamp rate_period;
@@ -135,6 +136,8 @@
   bool no_udp_gso;
   // The maximum UDP datagram payload size to send.
   size_t max_udp_payload_size;
+  // Enable ktls.
+  bool ktls;
 
   Config();
   ~Config();
@@ -269,6 +272,7 @@
 
 struct Worker {
   MemchunkPool mcpool;
+  std::mt19937 randgen;
   Stats stats;
   Sampling request_times_smp;
   Sampling client_smp;
@@ -335,11 +339,25 @@
   SSL *ssl;
 #ifdef ENABLE_HTTP3
   struct {
+    ngtcp2_crypto_conn_ref conn_ref;
     ev_timer pkt_timer;
     ngtcp2_conn *conn;
-    quic::Error last_error;
+    ngtcp2_connection_close_error last_error;
     bool close_requested;
     FILE *qlog_file;
+
+    struct {
+      bool send_blocked;
+      size_t num_blocked;
+      size_t num_blocked_sent;
+      struct {
+        Address remote_addr;
+        const uint8_t *data;
+        size_t datalen;
+        size_t gso_size;
+      } blocked2;
+      std::unique_ptr<uint8_t> data;
+    } tx;
   } quic;
 #endif // ENABLE_HTTP3
   ev_timer request_timeout_watcher;
@@ -463,6 +481,9 @@
   int write_quic();
   int write_udp(const sockaddr *addr, socklen_t addrlen, const uint8_t *data,
                 size_t datalen, size_t gso_size);
+  void on_send_blocked(const ngtcp2_addr &remote_addr, const uint8_t *data,
+                       size_t datalen, size_t gso_size);
+  int send_blocked_packet();
   void quic_close_connection();
 
   int quic_handshake_completed();
@@ -474,17 +495,12 @@
   int quic_stream_stop_sending(int64_t stream_id, uint64_t app_error_code);
   int quic_extend_max_local_streams();
 
-  int quic_on_rx_secret(ngtcp2_crypto_level level, const uint8_t *secret,
-                        size_t secretlen);
-  int quic_on_tx_secret(ngtcp2_crypto_level level, const uint8_t *secret,
-                        size_t secretlen);
-  void quic_set_tls_alert(uint8_t alert);
-
-  void quic_write_client_handshake(ngtcp2_crypto_level level,
-                                   const uint8_t *data, size_t datalen);
+  int quic_write_client_handshake(ngtcp2_crypto_level level,
+                                  const uint8_t *data, size_t datalen);
   int quic_pkt_timeout();
   void quic_restart_pkt_timer();
   void quic_write_qlog(const void *data, size_t datalen);
+  int quic_make_http3_session();
 #endif // ENABLE_HTTP3
 };

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/h2load_http1_session.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/h2load_http1_session.cc Changed

@@ -150,13 +150,26 @@
     htp_msg_begincb,     // llhttp_cb      on_message_begin;
     nullptr,             // llhttp_data_cb on_url;
     htp_statuscb,        // llhttp_data_cb on_status;
+    nullptr,             // llhttp_data_cb on_method;
+    nullptr,             // llhttp_data_cb on_version;
     htp_hdr_keycb,       // llhttp_data_cb on_header_field;
     htp_hdr_valcb,       // llhttp_data_cb on_header_value;
+    nullptr,             // llhttp_data_cb on_chunk_extension_name;
+    nullptr,             // llhttp_data_cb on_chunk_extension_value;
     htp_hdrs_completecb, // llhttp_cb      on_headers_complete;
     htp_body_cb,         // llhttp_data_cb on_body;
     htp_msg_completecb,  // llhttp_cb      on_message_complete;
-    nullptr,             // llhttp_cb      on_chunk_header
-    nullptr,             // llhttp_cb      on_chunk_complete
+    nullptr,             // llhttp_cb      on_url_complete;
+    nullptr,             // llhttp_cb      on_status_complete;
+    nullptr,             // llhttp_cb      on_method_complete;
+    nullptr,             // llhttp_cb      on_version_complete;
+    nullptr,             // llhttp_cb      on_header_field_complete;
+    nullptr,             // llhttp_cb      on_header_value_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_name_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_value_complete;
+    nullptr,             // llhttp_cb      on_chunk_header;
+    nullptr,             // llhttp_cb      on_chunk_complete;
+    nullptr,             // llhttp_cb      on_reset;
 };
 } // namespace

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/h2load_http2_session.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/h2load_http2_session.cc Changed

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

@@ -213,19 +213,17 @@
 }
 
 namespace {
-int send_stop_sending(nghttp3_conn *conn, int64_t stream_id,
-                      uint64_t app_error_code, void *user_data,
-                      void *stream_user_data) {
+int stop_sending(nghttp3_conn *conn, int64_t stream_id, uint64_t app_error_code,
+                 void *user_data, void *stream_user_data) {
   auto s = static_cast<Http3Session *>(user_data);
-  if (s->send_stop_sending(stream_id, app_error_code) != 0) {
+  if (s->stop_sending(stream_id, app_error_code) != 0) {
     return NGHTTP3_ERR_CALLBACK_FAILURE;
   }
   return 0;
 }
 } // namespace
 
-int Http3Session::send_stop_sending(int64_t stream_id,
-                                    uint64_t app_error_code) {
+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,
                                              app_error_code);
   if (rv != 0) {
@@ -236,6 +234,28 @@
   return 0;
 }
 
+namespace {
+int reset_stream(nghttp3_conn *conn, int64_t stream_id, uint64_t app_error_code,
+                 void *user_data, void *stream_user_data) {
+  auto s = static_cast<Http3Session *>(user_data);
+  if (s->reset_stream(stream_id, app_error_code) != 0) {
+    return NGHTTP3_ERR_CALLBACK_FAILURE;
+  }
+  return 0;
+}
+} // 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,
+                                              app_error_code);
+  if (rv != 0) {
+    std::cerr << "ngtcp2_conn_shutdown_stream_write: " << ngtcp2_strerror(rv)
+              << std::endl;
+    return -1;
+  }
+  return 0;
+}
+
 int Http3Session::close_stream(int64_t stream_id, uint64_t app_error_code) {
   auto rv = nghttp3_conn_close_stream(conn_, stream_id, app_error_code);
   switch (rv) {
@@ -300,14 +320,17 @@
       nullptr, // begin_trailers
       h2load::recv_header,
       nullptr, // end_trailers
-      h2load::send_stop_sending,
+      h2load::stop_sending,
+      nullptr, // end_stream
+      h2load::reset_stream,
+      nullptr, // shutdown
   };
 
   auto config = client_->worker->config;
 
   nghttp3_settings settings;
   nghttp3_settings_default(&settings);
-  settings.qpack_max_table_capacity = config->header_table_size;
+  settings.qpack_max_dtable_capacity = config->header_table_size;
   settings.qpack_blocked_streams = 100;
 
   auto mem = nghttp3_mem_default();
@@ -321,7 +344,8 @@
 
   int64_t ctrl_stream_id;
 
-  rv = ngtcp2_conn_open_uni_stream(client_->quic.conn, &ctrl_stream_id, NULL);
+  rv =
+      ngtcp2_conn_open_uni_stream(client_->quic.conn, &ctrl_stream_id, nullptr);
   if (rv != 0) {
     std::cerr << "ngtcp2_conn_open_uni_stream: " << ngtcp2_strerror(rv)
               << std::endl;
@@ -338,7 +362,7 @@
   int64_t qpack_enc_stream_id, qpack_dec_stream_id;
 
   rv = ngtcp2_conn_open_uni_stream(client_->quic.conn, &qpack_enc_stream_id,
-                                   NULL);
+                                   nullptr);
   if (rv != 0) {
     std::cerr << "ngtcp2_conn_open_uni_stream: " << ngtcp2_strerror(rv)
               << std::endl;
@@ -346,7 +370,7 @@
   }
 
   rv = ngtcp2_conn_open_uni_stream(client_->quic.conn, &qpack_dec_stream_id,
-                                   NULL);
+                                   nullptr);
   if (rv != 0) {
     std::cerr << "ngtcp2_conn_open_uni_stream: " << ngtcp2_strerror(rv)
               << std::endl;
@@ -371,7 +395,9 @@
   if (nconsumed < 0) {
     std::cerr << "nghttp3_conn_read_stream: " << nghttp3_strerror(nconsumed)
               << std::endl;
-    client_->quic.last_error = quic::err_application(nconsumed);
+    ngtcp2_connection_close_error_set_application_error(
+        &client_->quic.last_error,
+        nghttp3_err_infer_quic_app_error_code(nconsumed), nullptr, 0);
     return -1;
   }
   return nconsumed;
@@ -382,34 +408,28 @@
   auto sveccnt =
       nghttp3_conn_writev_stream(conn_, &stream_id, &fin, vec, veccnt);
   if (sveccnt < 0) {
-    client_->quic.last_error = quic::err_application(sveccnt);
+    ngtcp2_connection_close_error_set_application_error(
+        &client_->quic.last_error,
+        nghttp3_err_infer_quic_app_error_code(sveccnt), nullptr, 0);
     return -1;
   }
   return sveccnt;
 }
 
-int Http3Session::block_stream(int64_t stream_id) {
-  auto rv = nghttp3_conn_block_stream(conn_, stream_id);
-  if (rv != 0) {
-    client_->quic.last_error = quic::err_application(rv);
-    return -1;
-  }
-  return 0;
+void Http3Session::block_stream(int64_t stream_id) {
+  nghttp3_conn_block_stream(conn_, stream_id);
 }
 
-int Http3Session::shutdown_stream_write(int64_t stream_id) {
-  auto rv = nghttp3_conn_shutdown_stream_write(conn_, stream_id);
-  if (rv != 0) {
-    client_->quic.last_error = quic::err_application(rv);
-    return -1;
-  }
-  return 0;
+void Http3Session::shutdown_stream_write(int64_t stream_id) {
+  nghttp3_conn_shutdown_stream_write(conn_, stream_id);
 }
 
 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) {
-    client_->quic.last_error = quic::err_application(rv);
+    ngtcp2_connection_close_error_set_application_error(
+        &client_->quic.last_error, nghttp3_err_infer_quic_app_error_code(rv),
+        nullptr, 0);
     return -1;
   }
   return 0;
@@ -418,7 +438,9 @@
 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) {
-    client_->quic.last_error = quic::err_application(rv);
+    ngtcp2_connection_close_error_set_application_error(
+        &client_->quic.last_error, nghttp3_err_infer_quic_app_error_code(rv),
+        nullptr, 0);
     return -1;
   }
   return 0;

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

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

@@ -36,16 +36,13 @@
 #endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 
 #include <openssl/err.h>
+#include <openssl/rand.h>
 
 #include "h2load_http3_session.h"
 
 namespace h2load {
 
 namespace {
-auto randgen = util::make_mt19937();
-} // namespace
-
-namespace {
 int handshake_completed(ngtcp2_conn *conn, void *user_data) {
   auto c = static_cast<Client *>(user_data);
 
@@ -123,7 +120,7 @@
   }
 
   if (c->quic_stream_close(stream_id, app_error_code) != 0) {
-    return -1;
+    return NGTCP2_ERR_CALLBACK_FAILURE;
   }
   return 0;
 }
@@ -143,7 +140,7 @@
                  void *stream_user_data) {
   auto c = static_cast<Client *>(user_data);
   if (c->quic_stream_reset(stream_id, app_error_code) != 0) {
-    return -1;
+    return NGTCP2_ERR_CALLBACK_FAILURE;
   }
   return 0;
 }
@@ -163,7 +160,7 @@
                         void *stream_user_data) {
   auto c = static_cast<Client *>(user_data);
   if (c->quic_stream_stop_sending(stream_id, app_error_code) != 0) {
-    return -1;
+    return NGTCP2_ERR_CALLBACK_FAILURE;
   }
   return 0;
 }
@@ -202,13 +199,15 @@
 namespace {
 int get_new_connection_id(ngtcp2_conn *conn, ngtcp2_cid *cid, uint8_t *token,
                           size_t cidlen, void *user_data) {
-  auto dis = std::uniform_int_distribution<uint8_t>(
-      0, std::numeric_limits<uint8_t>::max());
-  auto f = &dis() { return dis(randgen); };
+  if (RAND_bytes(cid->data, cidlen) != 1) {
+    return NGTCP2_ERR_CALLBACK_FAILURE;
+  }
 
-  std::generate_n(cid->data, cidlen, f);
   cid->datalen = cidlen;
-  std::generate_n(token, NGTCP2_STATELESS_RESET_TOKENLEN, f);
+
+  if (RAND_bytes(token, NGTCP2_STATELESS_RESET_TOKENLEN) != 1) {
+    return NGTCP2_ERR_CALLBACK_FAILURE;
+  }
 
   return 0;
 }
@@ -227,11 +226,14 @@
 } // namespace
 
 namespace {
-void generate_cid(ngtcp2_cid &dest) {
-  auto dis = std::uniform_int_distribution<uint8_t>(
-      0, std::numeric_limits<uint8_t>::max());
+int generate_cid(ngtcp2_cid &dest) {
   dest.datalen = 8;
-  std::generate_n(dest.data, dest.datalen, &dis() { return dis(randgen); });
+
+  if (RAND_bytes(dest.data, dest.datalen) != 1) {
+    return -1;
+  }
+
+  return 0;
 }
 } // namespace
 
@@ -241,135 +243,60 @@
 }
 } // namespace
 
-#ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+// qlog write callback -- excerpted from ngtcp2/examples/client_base.cc
 namespace {
-int set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level,
-                           const uint8_t *rx_secret, const uint8_t *tx_secret,
-                           size_t secret_len) {
-  auto c = static_cast<Client *>(SSL_get_app_data(ssl));
-  auto level = ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level);
-
-  if (c->quic_on_rx_secret(level, rx_secret, secret_len) != 0) {
-    return 0;
-  }
-
-  if (c->quic_on_tx_secret(level, tx_secret, secret_len) != 0) {
-    return 0;
-  }
-
-  return 1;
+void qlog_write_cb(void *user_data, uint32_t flags, const void *data,
+                   size_t datalen) {
+  auto c = static_cast<Client *>(user_data);
+  c->quic_write_qlog(data, datalen);
 }
 } // namespace
 
-namespace {
-int add_handshake_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level,
-                       const uint8_t *data, size_t len) {
-  auto c = static_cast<Client *>(SSL_get_app_data(ssl));
-  c->quic_write_client_handshake(
-      ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level), data, len);
-  return 1;
+void Client::quic_write_qlog(const void *data, size_t datalen) {
+  assert(quic.qlog_file != nullptr);
+  fwrite(data, 1, datalen, quic.qlog_file);
 }
-} // namespace
-
-namespace {
-int flush_flight(SSL *ssl) { return 1; }
-} // namespace
 
 namespace {
-int send_alert(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert) {
-  auto c = static_cast<Client *>(SSL_get_app_data(ssl));
-  c->quic_set_tls_alert(alert);
-  return 1;
+void rand(uint8_t *dest, size_t destlen, const ngtcp2_rand_ctx *rand_ctx) {
+  util::random_bytes(dest, dest + destlen,
+                     *static_cast<std::mt19937 *>(rand_ctx->native_handle));
 }
 } // namespace
 
 namespace {
-auto quic_method = SSL_QUIC_METHOD{
-    set_encryption_secrets,
-    add_handshake_data,
-    flush_flight,
-    send_alert,
-};
-} // namespace
-#endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
-
-#ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
-namespace {
-int set_read_secret(SSL *ssl, ssl_encryption_level_t ssl_level,
-                    const SSL_CIPHER *cipher, const uint8_t *secret,
-                    size_t secretlen) {
-  auto c = static_cast<Client *>(SSL_get_app_data(ssl));
-
-  if (c->quic_on_rx_secret(
-          ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level), secret,
-          secretlen) != 0) {
+int recv_rx_key(ngtcp2_conn *conn, ngtcp2_crypto_level level, void *user_data) {
+  if (level != NGTCP2_CRYPTO_LEVEL_APPLICATION) {
     return 0;
   }
 
-  return 1;
-}
-} // namespace
+  auto c = static_cast<Client *>(user_data);
 
-namespace {
-int set_write_secret(SSL *ssl, ssl_encryption_level_t ssl_level,
-                     const SSL_CIPHER *cipher, const uint8_t *secret,
-                     size_t secretlen) {
-  auto c = static_cast<Client *>(SSL_get_app_data(ssl));
-
-  if (c->quic_on_tx_secret(
-          ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level), secret,
-          secretlen) != 0) {
-    return 0;
+  if (c->quic_make_http3_session() != 0) {
+    return NGTCP2_ERR_CALLBACK_FAILURE;
   }
 
-  return 1;
-}
-} // namespace
-
-namespace {
-int add_handshake_data(SSL *ssl, ssl_encryption_level_t ssl_level,
-                       const uint8_t *data, size_t len) {
-  auto c = static_cast<Client *>(SSL_get_app_data(ssl));
-  c->quic_write_client_handshake(
-      ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level), data, len);
-  return 1;
+  return 0;
 }
 } // namespace
 
-namespace {
-int flush_flight(SSL *ssl) { return 1; }
-} // namespace
+int Client::quic_make_http3_session() {
+  auto s = std::make_unique<Http3Session>(this);
+  if (s->init_conn() == -1) {
+    return -1;
+  }
+  session = std::move(s);
 
-namespace {
-int send_alert(SSL *ssl, ssl_encryption_level_t level, uint8_t alert) {
-  auto c = static_cast<Client *>(SSL_get_app_data(ssl));
-  c->quic_set_tls_alert(alert);
-  return 1;
+  return 0;
 }
-} // namespace
-
-namespace {
-auto quic_method = SSL_QUIC_METHOD{
-    set_read_secret, set_write_secret, add_handshake_data,
-    flush_flight,    send_alert,
-};
-} // namespace
-#endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 
-// qlog write callback -- excerpted from ngtcp2/examples/client_base.cc
 namespace {
-void qlog_write_cb(void *user_data, uint32_t flags, const void *data,
-                   size_t datalen) {
-  auto c = static_cast<Client *>(user_data);
-  c->quic_write_qlog(data, datalen);
+ngtcp2_conn *get_conn(ngtcp2_crypto_conn_ref *conn_ref) {
+  auto c = static_cast<Client *>(conn_ref->user_data);
+  return c->quic.conn;
 }
 } // namespace
 
-void Client::quic_write_qlog(const void *data, size_t datalen) {
-  assert(quic.qlog_file != nullptr);
-  fwrite(data, 1, datalen, quic.qlog_file);
-}
-
 int Client::quic_init(const sockaddr *local_addr, socklen_t local_addrlen,
                       const sockaddr *remote_addr, socklen_t remote_addrlen) {
   int rv;
@@ -377,9 +304,11 @@
   if (!ssl) {
     ssl = SSL_new(worker->ssl_ctx);
 
-    SSL_set_app_data(ssl, this);
+    quic.conn_ref.get_conn = get_conn;
+    quic.conn_ref.user_data = this;
+
+    SSL_set_app_data(ssl, &quic.conn_ref);
     SSL_set_connect_state(ssl);
-    SSL_set_quic_method(ssl, &quic_method);
     SSL_set_quic_use_legacy_codepoint(ssl, 0);
   }
 
@@ -400,7 +329,7 @@
       ngtcp2_crypto_recv_retry_cb,
       h2load::extend_max_local_streams_bidi,
       nullptr, // extend_max_local_streams_uni
-      nullptr, // rand
+      h2load::rand,
       get_new_connection_id,
       nullptr, // remove_connection_id
       ngtcp2_crypto_update_key_cb,
@@ -418,13 +347,20 @@
       nullptr, // recv_datagram
       nullptr, // ack_datagram
       nullptr, // lost_datagram
-      nullptr, // get_path_challenge_data
+      ngtcp2_crypto_get_path_challenge_data_cb,
       h2load::stream_stop_sending,
+      nullptr, // version_negotiation
+      h2load::recv_rx_key,
+      nullptr, // recv_tx_key
   };
 
   ngtcp2_cid scid, dcid;
-  generate_cid(scid);
-  generate_cid(dcid);
+  if (generate_cid(scid) != 0) {
+    return -1;
+  }
+  if (generate_cid(dcid) != 0) {
+    return -1;
+  }
 
   auto config = worker->config;
 
@@ -434,6 +370,7 @@
     settings.log_printf = debug_log_printf;
   }
   settings.initial_ts = timestamp(worker->loop);
+  settings.rand_ctx.native_handle = &worker->randgen;
   if (!config->qlog_file_base.empty()) {
     assert(quic.qlog_file == nullptr);
     auto path = config->qlog_file_base;
@@ -441,7 +378,7 @@
     path += util::utos(worker->id);
     path += '.';
     path += util::utos(id);
-    path += ".qlog";
+    path += ".sqlog";
     quic.qlog_file = fopen(path.c_str(), "w");
     if (quic.qlog_file == nullptr) {
       std::cerr << "Failed to open a qlog file: " << path << std::endl;
@@ -450,8 +387,8 @@
     settings.qlog.write = qlog_write_cb;
   }
   if (config->max_udp_payload_size) {
-    settings.max_udp_payload_size = config->max_udp_payload_size;
-    settings.no_udp_payload_size_shaping = 1;
+    settings.max_tx_udp_payload_size = config->max_udp_payload_size;
+    settings.no_tx_udp_payload_size_shaping = 1;
   }
 
   ngtcp2_transport_params params;
@@ -466,8 +403,14 @@
   params.max_idle_timeout = 30 * NGTCP2_SECONDS;
 
   auto path = ngtcp2_path{
-      {local_addrlen, const_cast<sockaddr *>(local_addr)},
-      {remote_addrlen, const_cast<sockaddr *>(remote_addr)},
+      {
+          const_cast<sockaddr *>(local_addr),
+          local_addrlen,
+      },
+      {
+          const_cast<sockaddr *>(remote_addr),
+          remote_addrlen,
+      },
   };
 
   assert(config->npn_list.size());
@@ -505,29 +448,14 @@
   }
 
   std::array<uint8_t, NGTCP2_MAX_UDP_PAYLOAD_SIZE> buf;
-  ngtcp2_ssize nwrite;
   ngtcp2_path_storage ps;
   ngtcp2_path_storage_zero(&ps);
 
-  switch (quic.last_error.type) {
-  case quic::ErrorType::TransportVersionNegotiation:
-    return;
-  case quic::ErrorType::Transport:
-    nwrite = ngtcp2_conn_write_connection_close(
-        quic.conn, &ps.path, nullptr, buf.data(), buf.size(),
-        quic.last_error.code, timestamp(worker->loop));
-    break;
-  case quic::ErrorType::Application:
-    nwrite = ngtcp2_conn_write_application_close(
-        quic.conn, &ps.path, nullptr, buf.data(), buf.size(),
-        quic.last_error.code, timestamp(worker->loop));
-    break;
-  default:
-    assert(0);
-    abort();
-  }
-
-  if (nwrite < 0) {
+  auto nwrite = ngtcp2_conn_write_connection_close(
+      quic.conn, &ps.path, nullptr, buf.data(), buf.size(), &quic.last_error,
+      timestamp(worker->loop));
+
+  if (nwrite <= 0) {
     return;
   }
 
@@ -535,33 +463,15 @@
             ps.path.remote.addrlen, buf.data(), nwrite, 0);
 }
 
-int Client::quic_on_rx_secret(ngtcp2_crypto_level level, const uint8_t *secret,
-                              size_t secretlen) {
-  if (ngtcp2_crypto_derive_and_install_rx_key(quic.conn, nullptr, nullptr,
-                                              nullptr, level, secret,
-                                              secretlen) != 0) {
-    std::cerr << "ngtcp2_crypto_derive_and_install_rx_key() failed"
-              << std::endl;
-    return -1;
-  }
-
-  if (level == NGTCP2_CRYPTO_LEVEL_APPLICATION) {
-    auto s = std::make_unique<Http3Session>(this);
-    if (s->init_conn() == -1) {
-      return -1;
-    }
-    session = std::move(s);
-  }
+int Client::quic_write_client_handshake(ngtcp2_crypto_level level,
+                                        const uint8_t *data, size_t datalen) {
+  int rv;
 
-  return 0;
-}
+  assert(level < 2);
 
-int Client::quic_on_tx_secret(ngtcp2_crypto_level level, const uint8_t *secret,
-                              size_t secretlen) {
-  if (ngtcp2_crypto_derive_and_install_tx_key(quic.conn, nullptr, nullptr,
-                                              nullptr, level, secret,
-                                              secretlen) != 0) {
-    std::cerr << "ngtcp2_crypto_derive_and_install_tx_key() failed"
+  rv = ngtcp2_conn_submit_crypto_data(quic.conn, level, data, datalen);
+  if (rv != 0) {
+    std::cerr << "ngtcp2_conn_submit_crypto_data: " << ngtcp2_strerror(rv)
               << std::endl;
     return -1;
   }
@@ -569,17 +479,6 @@
   return 0;
 }
 
-void Client::quic_set_tls_alert(uint8_t alert) {
-  quic.last_error = quic::err_transport_tls(alert);
-}
-
-void Client::quic_write_client_handshake(ngtcp2_crypto_level level,
-                                         const uint8_t *data, size_t datalen) {
-  assert(level < 2);
-
-  ngtcp2_conn_submit_crypto_data(quic.conn, level, data, datalen);
-}
-
 void quic_pkt_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
   auto c = static_cast<Client *>(w->data);
 
@@ -597,7 +496,8 @@
 
   rv = ngtcp2_conn_handle_expiry(quic.conn, now);
   if (rv != 0) {
-    quic.last_error = quic::err_transport(NGTCP2_ERR_INTERNAL);
+    ngtcp2_connection_close_error_set_transport_error_liberr(&quic.last_error,
+                                                             rv, nullptr, 0);
     return -1;
   }
 
@@ -633,14 +533,32 @@
     ++worker->stats.udp_dgram_recv;
 
     auto path = ngtcp2_path{
-        {local_addr.len, &local_addr.su.sa},
-        {addrlen, &su.sa},
+        {
+            &local_addr.su.sa,
+            static_cast<socklen_t>(local_addr.len),
+        },
+        {
+            &su.sa,
+            addrlen,
+        },
     };
 
     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);
+        }
+      }
+
       return -1;
     }
 
@@ -653,28 +571,38 @@
 }
 
 int Client::write_quic() {
+  int rv;
+
   ev_io_stop(worker->loop, &wev);
 
   if (quic.close_requested) {
     return -1;
   }
 
+  if (quic.tx.send_blocked) {
+    rv = send_blocked_packet();
+    if (rv != 0) {
+      return -1;
+    }
+
+    if (quic.tx.send_blocked) {
+      return 0;
+    }
+  }
+
   std::array<nghttp3_vec, 16> vec;
   size_t pktcnt = 0;
   auto max_udp_payload_size =
-      ngtcp2_conn_get_path_max_udp_payload_size(quic.conn);
-  size_t max_pktcnt =
+      ngtcp2_conn_get_max_tx_udp_payload_size(quic.conn);
 #ifdef UDP_SEGMENT
-      worker->config->no_udp_gso
-          ? 1
-          : std::min(static_cast<size_t>(10),
-                     static_cast<size_t>(64_k / max_udp_payload_size));
-#else  // !UDP_SEGMENT
-      1;
-#endif // !UDP_SEGMENT
-  std::array<uint8_t, 64_k> buf;
-  uint8_t *bufpos = buf.data();
+  auto path_max_udp_payload_size =
+      ngtcp2_conn_get_path_max_tx_udp_payload_size(quic.conn);
+#endif // UDP_SEGMENT
+  auto max_pktcnt =
+      ngtcp2_conn_get_send_quantum(quic.conn) / max_udp_payload_size;
+  uint8_t *bufpos = quic.tx.data.get();
   ngtcp2_path_storage ps;
+  size_t gso_size = 0;
 
   ngtcp2_path_storage_zero(&ps);
 
@@ -709,15 +637,11 @@
       switch (nwrite) {
       case NGTCP2_ERR_STREAM_DATA_BLOCKED:
         assert(ndatalen == -1);
-        if (s->block_stream(stream_id) != 0) {
-          return -1;
-        }
+        s->block_stream(stream_id);
         continue;
       case NGTCP2_ERR_STREAM_SHUT_WR:
         assert(ndatalen == -1);
-        if (s->shutdown_stream_write(stream_id) != 0) {
-          return -1;
-        }
+        s->shutdown_stream_write(stream_id);
         continue;
       case NGTCP2_ERR_WRITE_MORE:
         assert(ndatalen >= 0);
@@ -727,7 +651,8 @@
         continue;
       }
 
-      quic.last_error = quic::err_transport(nwrite);
+      ngtcp2_connection_close_error_set_transport_error_liberr(
+          &quic.last_error, nwrite, nullptr, 0);
       return -1;
     } else if (ndatalen >= 0 && s->add_write_offset(stream_id, ndatalen) != 0) {
       return -1;
@@ -736,24 +661,130 @@
     quic_restart_pkt_timer();
 
     if (nwrite == 0) {
-      if (bufpos - buf.data()) {
-        write_udp(ps.path.remote.addr, ps.path.remote.addrlen, buf.data(),
-                  bufpos - buf.data(), max_udp_payload_size);
+      if (bufpos - quic.tx.data.get()) {
+        auto data = quic.tx.data.get();
+        auto datalen = bufpos - quic.tx.data.get();
+        rv = write_udp(ps.path.remote.addr, ps.path.remote.addrlen, data,
+                       datalen, gso_size);
+        if (rv == 1) {
+          on_send_blocked(ps.path.remote, data, datalen, gso_size);
+          signal_write();
+          return 0;
+        }
       }
       return 0;
     }
 
     bufpos += nwrite;
 
+#ifdef UDP_SEGMENT
+    if (worker->config->no_udp_gso) {
+#endif // UDP_SEGMENT
+      auto data = quic.tx.data.get();
+      auto datalen = bufpos - quic.tx.data.get();
+      rv = write_udp(ps.path.remote.addr, ps.path.remote.addrlen, data, datalen,
+                     0);
+      if (rv == 1) {
+        on_send_blocked(ps.path.remote, data, datalen, 0);
+        signal_write();
+        return 0;
+      }
+
+      if (++pktcnt == max_pktcnt) {
+        signal_write();
+        return 0;
+      }
+
+      bufpos = quic.tx.data.get();
+
+#ifdef UDP_SEGMENT
+      continue;
+    }
+#endif // UDP_SEGMENT
+
+#ifdef UDP_SEGMENT
+    if (pktcnt == 0) {
+      gso_size = nwrite;
+    } else if (static_cast<size_t>(nwrite) > gso_size ||
+               (gso_size > path_max_udp_payload_size &&
+                static_cast<size_t>(nwrite) != gso_size)) {
+      auto data = quic.tx.data.get();
+      auto datalen = bufpos - quic.tx.data.get() - nwrite;
+      rv = write_udp(ps.path.remote.addr, ps.path.remote.addrlen, data, datalen,
+                     gso_size);
+      if (rv == 1) {
+        on_send_blocked(ps.path.remote, data, datalen, gso_size);
+        on_send_blocked(ps.path.remote, bufpos - nwrite, nwrite, 0);
+      } else {
+        auto data = bufpos - nwrite;
+        rv = write_udp(ps.path.remote.addr, ps.path.remote.addrlen, data,
+                       nwrite, 0);
+        if (rv == 1) {
+          on_send_blocked(ps.path.remote, data, nwrite, 0);
+        }
+      }
+
+      signal_write();
+      return 0;
+    }
+
     // Assume that the path does not change.
-    if (++pktcnt == max_pktcnt ||
-        static_cast<size_t>(nwrite) < max_udp_payload_size) {
-      write_udp(ps.path.remote.addr, ps.path.remote.addrlen, buf.data(),
-                bufpos - buf.data(), max_udp_payload_size);
+    if (++pktcnt == max_pktcnt || static_cast<size_t>(nwrite) < gso_size) {
+      auto data = quic.tx.data.get();
+      auto datalen = bufpos - quic.tx.data.get();
+      rv = write_udp(ps.path.remote.addr, ps.path.remote.addrlen, data, datalen,
+                     gso_size);
+      if (rv == 1) {
+        on_send_blocked(ps.path.remote, data, datalen, gso_size);
+      }
       signal_write();
       return 0;
     }
+#endif // UDP_SEGMENT
   }
 }
 
+void Client::on_send_blocked(const ngtcp2_addr &remote_addr,
+                             const uint8_t *data, size_t datalen,
+                             size_t gso_size) {
+  assert(quic.tx.num_blocked || !quic.tx.send_blocked);
+  assert(quic.tx.num_blocked < 2);
+
+  quic.tx.send_blocked = true;
+
+  auto &p = quic.tx.blockedquic.tx.num_blocked++;
+
+  memcpy(&p.remote_addr.su, remote_addr.addr, remote_addr.addrlen);
+
+  p.remote_addr.len = remote_addr.addrlen;
+  p.data = data;
+  p.datalen = datalen;
+  p.gso_size = gso_size;
+}
+
+int Client::send_blocked_packet() {
+  int rv;
+
+  assert(quic.tx.send_blocked);
+
+  for (; quic.tx.num_blocked_sent < quic.tx.num_blocked;
+       ++quic.tx.num_blocked_sent) {
+    auto &p = quic.tx.blockedquic.tx.num_blocked_sent;
+
+    rv = write_udp(&p.remote_addr.su.sa, p.remote_addr.len, p.data, p.datalen,
+                   p.gso_size);
+    if (rv == 1) {
+      signal_write();
+
+      return 0;
+    }
+  }
+
+  quic.tx.send_blocked = false;
+  quic.tx.num_blocked = 0;
+  quic.tx.num_blocked_sent = 0;
+
+  return 0;
+}
+
 } // namespace h2load

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/http2.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/http2.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/http2.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/http2.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/http2_test.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/http2_test.cc Changed

@@ -873,6 +873,169 @@
     CU_ASSERT("/alpha/bravo?charlie" ==
               http2::path_join(base, baseq, rel, relq));
   }
+  // Test cases from RFC 3986, section 5.4.
+  constexpr auto base = StringRef::from_lit("/b/c/d;p");
+  constexpr auto baseq = StringRef::from_lit("q");
+  {
+    auto rel = StringRef::from_lit("g");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("./g");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g/");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("/g");
+    auto relq = StringRef{};
+    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef{};
+    auto relq = StringRef::from_lit("y");
+    CU_ASSERT("/b/c/d;p?y" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g");
+    auto relq = StringRef::from_lit("y");
+    CU_ASSERT("/b/c/g?y" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit(";x");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/;x" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g;x");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g;x" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g;x");
+    auto relq = StringRef::from_lit("y");
+    CU_ASSERT("/b/c/g;x?y" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef{};
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/d;p?q" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit(".");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("./");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("..");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("../");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("../g");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("../..");
+    auto relq = StringRef{};
+    CU_ASSERT("/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("../../");
+    auto relq = StringRef{};
+    CU_ASSERT("/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("../../g");
+    auto relq = StringRef{};
+    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("../../../g");
+    auto relq = StringRef{};
+    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("../../../../g");
+    auto relq = StringRef{};
+    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("/./g");
+    auto relq = StringRef{};
+    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("/../g");
+    auto relq = StringRef{};
+    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g.");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g." == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit(".g");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/.g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g..");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g.." == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("..g");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/..g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("./../g");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/g" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("./g/.");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g/" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g/./h");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g/h" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g/../h");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/h" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g;x=1/./y");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/g;x=1/y" == http2::path_join(base, baseq, rel, relq));
+  }
+  {
+    auto rel = StringRef::from_lit("g;x=1/../y");
+    auto relq = StringRef{};
+    CU_ASSERT("/b/c/y" == http2::path_join(base, baseq, rel, relq));
+  }
 }
 
 void test_http2_normalize_path(void) {
@@ -916,7 +1079,7 @@
   CU_ASSERT("/delta%3A" == http2::rewrite_clean_path(
                                balloc, StringRef::from_lit("/delta%3a")));
 
-  // path component is normalized before mathcing
+  // path component is normalized before matching
   CU_ASSERT(
       "/alpha/bravo/" ==
       http2::rewrite_clean_path(

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/inflatehd.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/inflatehd.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/memchunk_test.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/memchunk_test.cc Changed

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

@@ -122,7 +122,9 @@
       hexdump(false),
       no_push(false),
       expect_continue(false),
-      verify_peer(true) {
+      verify_peer(true),
+      ktls(false),
+      no_rfc7540_pri(false) {
   nghttp2_option_new(&http2_option);
   nghttp2_option_set_peer_max_concurrent_streams(http2_option,
                                                  peer_max_concurrent_streams);
@@ -424,13 +426,26 @@
     htp_msg_begincb,    // llhttp_cb      on_message_begin;
     nullptr,            // llhttp_data_cb on_url;
     nullptr,            // llhttp_data_cb on_status;
+    nullptr,            // llhttp_data_cb on_method;
+    nullptr,            // llhttp_data_cb on_version;
     nullptr,            // llhttp_data_cb on_header_field;
     nullptr,            // llhttp_data_cb on_header_value;
+    nullptr,            // llhttp_data_cb on_chunk_extension_name;
+    nullptr,            // llhttp_data_cb on_chunk_extension_value;
     nullptr,            // llhttp_cb      on_headers_complete;
     nullptr,            // llhttp_data_cb on_body;
     htp_msg_completecb, // llhttp_cb      on_message_complete;
-    nullptr,            // llhttp_cb      on_chunk_header
-    nullptr,            // llhttp_cb      on_chunk_complete
+    nullptr,            // llhttp_cb      on_url_complete;
+    nullptr,            // llhttp_cb      on_status_complete;
+    nullptr,            // llhttp_cb      on_method_complete;
+    nullptr,            // llhttp_cb      on_version_complete;
+    nullptr,            // llhttp_cb      on_header_field_complete;
+    nullptr,            // llhttp_cb      on_header_value_complete;
+    nullptr,            // llhttp_cb      on_chunk_extension_name_complete;
+    nullptr,            // llhttp_cb      on_chunk_extension_value_complete;
+    nullptr,            // llhttp_cb      on_chunk_header;
+    nullptr,            // llhttp_cb      on_chunk_complete;
+    nullptr,            // llhttp_cb      on_reset;
 };
 } // namespace
 
@@ -676,7 +691,6 @@
         return -1;
       }
 
-      SSL_set_fd(ssl, fd);
       SSL_set_connect_state(ssl);
 
       // If the user overrode the :authority or host header, use that
@@ -877,6 +891,8 @@
   ev_timer_stop(loop, &wt);
 
   if (ssl) {
+    SSL_set_fd(ssl, fd);
+
     readfn = &HttpClient::tls_handshake;
     writefn = &HttpClient::tls_handshake;
 
@@ -933,6 +949,12 @@
     ++niv;
   }
 
+  if (config.no_rfc7540_pri) {
+    ivniv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+    ivniv.value = 1;
+    ++niv;
+  }
+
   return niv;
 }
 } // namespace
@@ -2280,6 +2302,12 @@
                     SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
                     SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
 
+#ifdef SSL_OP_ENABLE_KTLS
+    if (config.ktls) {
+      ssl_opts |= SSL_OP_ENABLE_KTLS;
+    }
+#endif // SSL_OP_ENABLE_KTLS
+
     SSL_CTX_set_options(ssl_ctx, ssl_opts);
     SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
     SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
@@ -2748,6 +2776,9 @@
   -y, --no-verify-peer
               Suppress  warning  on  server  certificate  verification
               failure.
+  --ktls      Enable ktls.
+  --no-rfc7540-pri
+              Disable RFC7540 priorities.
   --version   Display version information and exit.
   -h, --help  Display this help and exit.
 
@@ -2803,6 +2834,8 @@
         {"max-concurrent-streams", required_argument, &flag, 12},
         {"expect-continue", no_argument, &flag, 13},
         {"encoder-header-table-size", required_argument, &flag, 14},
+        {"ktls", no_argument, &flag, 15},
+        {"no-rfc7540-pri", no_argument, &flag, 16},
         {nullptr, 0, nullptr, 0}};
     int option_index = 0;
     int c =
@@ -2812,33 +2845,43 @@
       break;
     }
     switch (c) {
-    case 'M':
+    case 'M': {
       // peer-max-concurrent-streams option
-      config.peer_max_concurrent_streams = strtoul(optarg, nullptr, 10);
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-M: Bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.peer_max_concurrent_streams = n;
       break;
+    }
     case 'O':
       config.remote_name = true;
       break;
     case 'h':
       print_help(std::cout);
       exit(EXIT_SUCCESS);
-    case 'b':
-      config.padding = strtol(optarg, nullptr, 10);
+    case 'b': {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-b: Bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.padding = n;
       break;
+    }
     case 'n':
       config.null_out = true;
       break;
     case 'p': {
-      errno = 0;
-      auto n = strtoul(optarg, nullptr, 10);
-      if (errno == 0 && NGHTTP2_MIN_WEIGHT <= n && n <= NGHTTP2_MAX_WEIGHT) {
-        config.weight.push_back(n);
-      } else {
+      auto n = util::parse_uint(optarg);
+      if (n == -1 || NGHTTP2_MIN_WEIGHT > n || n > NGHTTP2_MAX_WEIGHT) {
         std::cerr << "-p: specify the integer in the range "
                   << NGHTTP2_MIN_WEIGHT << ", " << NGHTTP2_MAX_WEIGHT
                   << ", inclusive" << std::endl;
         exit(EXIT_FAILURE);
       }
+      config.weight.push_back(n);
       break;
     }
     case 'r':
@@ -2864,21 +2907,18 @@
       break;
     case 'w':
     case 'W': {
-      errno = 0;
-      char *endptr = nullptr;
-      unsigned long int n = strtoul(optarg, &endptr, 10);
-      if (errno == 0 && *endptr == '\0' && n < 31) {
-        if (c == 'w') {
-          config.window_bits = n;
-        } else {
-          config.connection_window_bits = n;
-        }
-      } else {
+      auto n = util::parse_uint(optarg);
+      if (n == -1 || n > 30) {
         std::cerr << "-" << static_cast<char>(c)
                   << ": specify the integer in the range 0, 30, inclusive"
                   << std::endl;
         exit(EXIT_FAILURE);
       }
+      if (c == 'w') {
+        config.window_bits = n;
+      } else {
+        config.connection_window_bits = n;
+      }
       break;
     }
     case 'H': {
@@ -2919,9 +2959,15 @@
     case 'd':
       config.datafile = optarg;
       break;
-    case 'm':
-      config.multiply = strtoul(optarg, nullptr, 10);
+    case 'm': {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-m: Bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.multiply = n;
       break;
+    }
     case 'c': {
       auto n = util::parse_uint_with_unit(optarg);
       if (n == -1) {
@@ -3005,10 +3051,17 @@
         // no-push option
         config.no_push = true;
         break;
-      case 12:
+      case 12: {
         // max-concurrent-streams option
-        config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
+        auto n = util::parse_uint(optarg);
+        if (n == -1) {
+          std::cerr << "--max-concurrent-streams: Bad option value: " << optarg
+                    << std::endl;
+          exit(EXIT_FAILURE);
+        }
+        config.max_concurrent_streams = n;
         break;
+      }
       case 13:
         // expect-continue option
         config.expect_continue = true;
@@ -3030,6 +3083,14 @@
         config.encoder_header_table_size = n;
         break;
       }
+      case 15:
+        // ktls option
+        config.ktls = true;
+        break;
+      case 16:
+        // no-rfc7540-pri option
+        config.no_rfc7540_pri = true;
+        break;
       }
       break;
     default:

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/nghttp.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/nghttp.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/nghttpd.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/nghttpd.cc Changed

@@ -55,7 +55,7 @@
 namespace {
 int parse_push_config(Config &config, const char *optarg) {
   const char *eq = strchr(optarg, '=');
-  if (eq == NULL) {
+  if (eq == nullptr) {
     return -1;
   }
   auto &paths = config.pushstd::string(optarg, eq);
@@ -63,7 +63,7 @@
   auto i = eq + 1;
   for (;;) {
     const char *j = strchr(i, ',');
-    if (j == NULL) {
+    if (j == nullptr) {
       j = optarg_end;
     }
     paths.emplace_back(i, j);
@@ -178,6 +178,9 @@
       << config.mime_types_file << R"(
   --no-content-length
               Don't send content-length header field.
+  --ktls      Enable ktls.
+  --no-rfc7540-pri
+              Disable RFC7540 priorities.
   --version   Display version information and exit.
   -h, --help  Display this help and exit.
 
@@ -228,6 +231,8 @@
         {"mime-types-file", required_argument, &flag, 9},
         {"no-content-length", no_argument, &flag, 10},
         {"encoder-header-table-size", required_argument, &flag, 11},
+        {"ktls", no_argument, &flag, 12},
+        {"no-rfc7540-pri", no_argument, &flag, 13},
         {nullptr, 0, nullptr, 0}};
     int option_index = 0;
     int c = getopt_long(argc, argv, "DVb:c:d:ehm:n:p:va:w:W:", long_options,
@@ -245,9 +250,15 @@
     case 'V':
       config.verify_client = true;
       break;
-    case 'b':
-      config.padding = strtol(optarg, nullptr, 10);
+    case 'b': {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
+        std::cerr << "-b: Bad option value: " << optarg << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      config.padding = n;
       break;
+    }
     case 'd':
       config.htdocs = optarg;
       break;
@@ -269,13 +280,12 @@
       std::cerr << "-n: WARNING: Threading disabled at build time, "
                 << "no threads created." << std::endl;
 #else
-      char *end;
-      errno = 0;
-      config.num_worker = strtoul(optarg, &end, 10);
-      if (errno == ERANGE || *end != '\0' || config.num_worker == 0) {
+      auto n = util::parse_uint(optarg);
+      if (n == -1) {
         std::cerr << "-n: Bad option value: " << optarg << std::endl;
         exit(EXIT_FAILURE);
       }
+      config.num_worker = n;
 #endif // NOTHREADS
       break;
     }
@@ -306,10 +316,8 @@
       break;
     case 'w':
     case 'W': {
-      char *endptr;
-      errno = 0;
-      auto n = strtoul(optarg, &endptr, 10);
-      if (errno != 0 || *endptr != '\0' || n >= 31) {
+      auto n = util::parse_uint(optarg);
+      if (n == -1 || n > 30) {
         std::cerr << "-" << static_cast<char>(c)
                   << ": specify the integer in the range 0, 30, inclusive"
                   << std::endl;
@@ -407,6 +415,14 @@
         config.encoder_header_table_size = n;
         break;
       }
+      case 12:
+        // tls option
+        config.ktls = true;
+        break;
+      case 13:
+        // no-rfc7540-pri option
+        config.no_rfc7540_pri = true;
+        break;
       }
       break;
     default:
@@ -419,7 +435,15 @@
     exit(EXIT_FAILURE);
   }
 
-  config.port = strtol(argvoptind++, nullptr, 10);
+  {
+    auto portStr = argvoptind++;
+    auto n = util::parse_uint(portStr);
+    if (n == -1 || n > std::numeric_limits<uint16_t>::max()) {
+      std::cerr << "<PORT>: Bad value: " << portStr << std::endl;
+      exit(EXIT_FAILURE);
+    }
+    config.port = n;
+  }
 
   if (!config.no_tls) {
     config.private_key_file = argvoptind++;

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

@@ -52,7 +52,7 @@
 static int clean_suite1(void) { return 0; }
 
 int main(int argc, char *argv) {
-  CU_pSuite pSuite = NULL;
+  CU_pSuite pSuite = nullptr;
   unsigned int num_tests_failed;
 
   nghttp2::tls::libssl_init();
@@ -65,7 +65,7 @@
 
   // add a suite to the registry
   pSuite = CU_add_suite("shrpx_TestSuite", init_suite1, clean_suite1);
-  if (NULL == pSuite) {
+  if (nullptr == pSuite) {
     CU_cleanup_registry();
     return CU_get_error();
   }
@@ -137,6 +137,8 @@
                    shrpx::test_shrpx_http_create_affinity_cookie) ||
       !CU_add_test(pSuite, "http_create_atlsvc_header_field_value",
                    shrpx::test_shrpx_http_create_altsvc_header_value) ||
+      !CU_add_test(pSuite, "http_check_http_scheme",
+                   shrpx::test_shrpx_http_check_http_scheme) ||
       !CU_add_test(pSuite, "router_match", shrpx::test_shrpx_router_match) ||
       !CU_add_test(pSuite, "router_match_wildcard",
                    shrpx::test_shrpx_router_match_wildcard) ||
@@ -150,8 +152,6 @@
       !CU_add_test(pSuite, "util_to_token68", shrpx::test_util_to_token68) ||
       !CU_add_test(pSuite, "util_percent_encode_token",
                    shrpx::test_util_percent_encode_token) ||
-      !CU_add_test(pSuite, "util_percent_encode_path",
-                   shrpx::test_util_percent_encode_path) ||
       !CU_add_test(pSuite, "util_percent_decode",
                    shrpx::test_util_percent_decode) ||
       !CU_add_test(pSuite, "util_quote_string",
@@ -200,6 +200,7 @@
       !CU_add_test(pSuite, "util_split_hostport",
                    shrpx::test_util_split_hostport) ||
       !CU_add_test(pSuite, "util_split_str", shrpx::test_util_split_str) ||
+      !CU_add_test(pSuite, "util_rstrip", shrpx::test_util_rstrip) ||
       !CU_add_test(pSuite, "gzip_inflate", test_nghttp2_gzip_inflate) ||
       !CU_add_test(pSuite, "buffer_write", nghttp2::test_buffer_write) ||
       !CU_add_test(pSuite, "pool_recycle", nghttp2::test_pool_recycle) ||

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

@@ -59,6 +59,9 @@
 #ifdef HAVE_LIBSYSTEMD
 #  include <systemd/sd-daemon.h>
 #endif // HAVE_LIBSYSTEMD
+#ifdef HAVE_LIBBPF
+#  include <bpf/libbpf.h>
+#endif // HAVE_LIBBPF
 
 #include <cinttypes>
 #include <limits>
@@ -76,6 +79,11 @@
 
 #include <nghttp2/nghttp2.h>
 
+#ifdef ENABLE_HTTP3
+#  include <ngtcp2/ngtcp2.h>
+#  include <nghttp3/nghttp3.h>
+#endif // ENABLE_HTTP3
+
 #include "shrpx_config.h"
 #include "shrpx_tls.h"
 #include "shrpx_log_config.h"
@@ -1085,7 +1093,7 @@
     auto portenv = getenv(ENV_PORT.c_str());
     if (portenv) {
       size_t i = 1;
-      for (auto env_name : {ENV_LISTENER4_FD, ENV_LISTENER6_FD}) {
+      for (const auto &env_name : {ENV_LISTENER4_FD, ENV_LISTENER6_FD}) {
         auto fdenv = getenv(env_name.c_str());
         if (fdenv) {
           auto name = ENV_ACCEPT_PREFIX.str();
@@ -1716,17 +1724,16 @@
   }
 #endif // ENABLE_HTTP3
 
-  auto pid = fork_worker_process(
-      ipc_fd
+  auto pid = fork_worker_process(ipc_fd
 #ifdef ENABLE_HTTP3
-      ,
-      quic_ipc_fd
+                                 ,
+                                 quic_ipc_fd
 #endif // ENABLE_HTTP3
-      ,
-      {}
+                                 ,
+                                 {}
 #ifdef ENABLE_HTTP3
-      ,
-      cid_prefixes, quic_lwps
+                                 ,
+                                 cid_prefixes, quic_lwps
 #endif // ENABLE_HTTP3
   );
 
@@ -1904,6 +1911,10 @@
     nghttp2_option_set_no_recv_client_magic(upstreamconf.option, 1);
     nghttp2_option_set_max_deflate_dynamic_table_size(
         upstreamconf.option, upstreamconf.encoder_dynamic_table_size);
+    nghttp2_option_set_server_fallback_rfc7540_priorities(upstreamconf.option,
+                                                          1);
+    nghttp2_option_set_builtin_recv_extension_type(upstreamconf.option,
+                                                   NGHTTP2_PRIORITY_UPDATE);
 
     // For API endpoint, we enable automatic window update.  This is
     // because we are a sink.
@@ -2053,7 +2064,11 @@
 
 namespace {
 void print_version(std::ostream &out) {
-  out << "nghttpx nghttp2/" NGHTTP2_VERSION << std::endl;
+  out << "nghttpx nghttp2/" NGHTTP2_VERSION
+#ifdef ENABLE_HTTP3
+         " ngtcp2/" NGTCP2_VERSION " nghttp3/" NGHTTP3_VERSION
+#endif // ENABLE_HTTP3
+      << std::endl;
 }
 } // namespace
 
@@ -2237,7 +2252,18 @@
               If a request scheme is "https", then Secure attribute is
               set.  Otherwise, it  is not set.  If  <SECURE> is "yes",
               the  Secure attribute  is  always set.   If <SECURE>  is
-              "no", the Secure attribute is always omitted.
+              "no",   the   Secure   attribute  is   always   omitted.
+              "affinity-cookie-stickiness=<STICKINESS>"       controls
+              stickiness  of   this  affinity.   If   <STICKINESS>  is
+              "loose", 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",
+              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".
 
               By default, name resolution of backend host name is done
               at  start  up,  or reloading  configuration.   If  "dns"
@@ -2899,6 +2925,8 @@
               accepts.
               Default: )"
       << util::utos_unit(config->tls.max_early_data) << R"(
+  --tls-ktls  Enable   ktls.    For   server,  ktls   is   enable   if
+              --tls-session-cache-memcached is not configured.
 
 HTTP/2:
   -c, --frontend-http2-max-concurrent-streams=<N>
@@ -3165,7 +3193,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: --altsvc="h2,443,,,ma=3600; persist=1'
+              Example: --altsvc="h2,443,,,ma=3600; persist=1"
   --http2-altsvc=<PROTOID,PORT,HOST,ORIGIN,PARAMS>
               Just like --altsvc option, but  this altsvc is only sent
               in HTTP/2 frontend.
@@ -3228,6 +3256,13 @@
               "redirect-if-not-tls" parameter in --backend option.
               Default: )"
       << config->http.redirect_https_port << R"(
+  --require-http-scheme
+              Always require http or https scheme in HTTP request.  It
+              also  requires that  https scheme  must be  used for  an
+              encrypted  connection.  Otherwise,  http scheme  must be
+              used.   This   option  is   recommended  for   a  server
+              deployment which directly faces clients and the services
+              it provides only require http or https scheme.
 
 API:
   --api-max-request-body=<SIZE>
@@ -3353,19 +3388,22 @@
               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
-              ".qlog".
+              ".sqlog".
   --frontend-quic-require-token
               Require an address validation  token for a frontend QUIC
               connection.   Server sends  a token  in Retry  packet or
               NEW_TOKEN frame in the previous connection.
   --frontend-quic-congestion-controller=<CC>
               Specify a congestion controller algorithm for a frontend
-              QUIC  connection.   <CC>  should be  either  "cubic"  or
-              "bbr".
+              QUIC connection.  <CC> should  be one of "cubic", "bbr",
+              and "bbr2".
               Default: )"
       << (config->quic.upstream.congestion_controller == NGTCP2_CC_ALGO_CUBIC
               ? "cubic"
-              : "bbr")
+              : (config->quic.upstream.congestion_controller ==
+                         NGTCP2_CC_ALGO_BBR
+                     ? "bbr"
+                     : "bbr2"))
       << R"(
   --frontend-quic-secret-file=<PATH>
               Path to file that contains secure random data to be used
@@ -3725,6 +3763,7 @@
     }
   }
 
+#ifdef RLIMIT_MEMLOCK
   if (config->rlimit_memlock) {
     struct rlimit lim = {static_cast<rlim_t>(config->rlimit_memlock),
                          static_cast<rlim_t>(config->rlimit_memlock)};
@@ -3734,6 +3773,7 @@
                 << xsi_strerror(error, errbuf.data(), errbuf.size());
     }
   }
+#endif // RLIMIT_MEMLOCK
 
   auto &fwdconf = config->http.forwarded;
 
@@ -3904,6 +3944,10 @@
 
   nghttp2::tls::libssl_init();
 
+#ifdef HAVE_LIBBPF
+  libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
+#endif // HAVE_LIBBPF
+
 #ifndef NOTHREADS
   nghttp2::tls::LibsslGlobalLock lock;
 #endif // NOTHREADS
@@ -4224,6 +4268,8 @@
          required_argument, &flag, 189},
         {SHRPX_OPT_FRONTEND_QUIC_INITIAL_RTT.c_str(), required_argument, &flag,
          190},
+        {SHRPX_OPT_REQUIRE_HTTP_SCHEME.c_str(), no_argument, &flag, 191},
+        {SHRPX_OPT_TLS_KTLS.c_str(), no_argument, &flag, 192},
         {nullptr, 0, nullptr, 0}};
 
     int option_index = 0;
@@ -5128,6 +5174,15 @@
         cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_QUIC_INITIAL_RTT,
                              StringRef{optarg});
         break;
+      case 191:
+        // --require-http-scheme
+        cmdcfgs.emplace_back(SHRPX_OPT_REQUIRE_HTTP_SCHEME,
+                             StringRef::from_lit("yes"));
+        break;
+      case 192:
+        // --tls-ktls
+        cmdcfgs.emplace_back(SHRPX_OPT_TLS_KTLS, StringRef::from_lit("yes"));
+        break;
       default:
         break;
       }

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_api_downstream_connection.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_api_downstream_connection.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_api_downstream_connection.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_api_downstream_connection.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_client_handler.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_client_handler.cc Changed

@@ -181,6 +181,35 @@
   return 0;
 }
 
+int ClientHandler::proxy_protocol_peek_clear() {
+  rb_.ensure_chunk();
+
+  assert(rb_.rleft() == 0);
+
+  auto nread = conn_.peek_clear(rb_.last(), rb_.wleft());
+  if (nread < 0) {
+    return -1;
+  }
+  if (nread == 0) {
+    return 0;
+  }
+
+  if (LOG_ENABLED(INFO)) {
+    CLOG(INFO, this) << "PROXY-protocol: Peek " << nread
+                     << " bytes from socket";
+  }
+
+  rb_.write(nread);
+
+  if (on_read() != 0) {
+    return -1;
+  }
+
+  rb_.reset();
+
+  return 0;
+}
+
 int ClientHandler::tls_handshake() {
   ev_timer_again(conn_.loop, &conn_.rt);
 
@@ -292,11 +321,12 @@
 #ifdef ENABLE_HTTP3
 int ClientHandler::read_quic(const UpstreamAddr *faddr,
                              const Address &remote_addr,
-                             const Address &local_addr, const uint8_t *data,
+                             const Address &local_addr,
+                             const ngtcp2_pkt_info &pi, const uint8_t *data,
                              size_t datalen) {
   auto upstream = static_cast<Http3Upstream *>(upstream_.get());
 
-  return upstream->on_read(faddr, remote_addr, local_addr, data, datalen);
+  return upstream->on_read(faddr, remote_addr, local_addr, pi, data, datalen);
 }
 
 int ClientHandler::write_quic() { return upstream_->on_write(); }
@@ -445,7 +475,7 @@
   if (!faddr->quic) {
     if (faddr_->accept_proxy_protocol ||
         config->conn.upstream.accept_proxy_protocol) {
-      read_ = &ClientHandler::read_clear;
+      read_ = &ClientHandler::proxy_protocol_peek_clear;
       write_ = &ClientHandler::noop;
       on_read_ = &ClientHandler::proxy_protocol_read;
       on_write_ = &ClientHandler::upstream_noop;
@@ -781,8 +811,7 @@
     return h;
   }
 
-  auto d = std::uniform_int_distribution<uint32_t>(
-      1, std::numeric_limits<uint32_t>::max());
+  auto d = std::uniform_int_distribution<uint32_t>(1);
   auto rh = d(worker_->get_randgen());
   h = util::hash32(StringRef{reinterpret_cast<uint8_t *>(&rh),
                              reinterpret_cast<uint8_t *>(&rh) + sizeof(rh)});
@@ -846,6 +875,12 @@
       hash = affinity_hash_;
       break;
     case SessionAffinity::COOKIE:
+      if (shared_addr->affinity.cookie.stickiness ==
+          SessionAffinityCookieStickiness::STRICT) {
+        return get_downstream_addr_strict_affinity(err, shared_addr,
+                                                   downstream);
+      }
+
       hash = get_affinity_cookie(downstream, shared_addr->affinity.cookie.name);
       break;
     default:
@@ -883,7 +918,6 @@
         err = -1;
         return nullptr;
       }
-      aff_idx = i;
     }
 
     return addr;
@@ -923,6 +957,68 @@
   }
 }
 
+DownstreamAddr *ClientHandler::get_downstream_addr_strict_affinity(
+    int &err, const std::shared_ptr<SharedDownstreamAddr> &shared_addr,
+    Downstream *downstream) {
+  const auto &affinity_hash = shared_addr->affinity_hash;
+
+  auto h = downstream->find_affinity_cookie(shared_addr->affinity.cookie.name);
+  if (h) {
+    auto it = shared_addr->affinity_hash_map.find(h);
+    if (it != std::end(shared_addr->affinity_hash_map)) {
+      auto addr = &shared_addr->addrs(*it).second;
+      if (!addr->connect_blocker->blocked()) {
+        return addr;
+      }
+    }
+  } else {
+    auto d = std::uniform_int_distribution<uint32_t>(1);
+    auto rh = d(worker_->get_randgen());
+    h = util::hash32(StringRef{reinterpret_cast<uint8_t *>(&rh),
+                               reinterpret_cast<uint8_t *>(&rh) + sizeof(rh)});
+  }
+
+  // Client is not bound to a particular backend, or the bound backend
+  // is not found, or is blocked.  Find new backend using h.  Using
+  // existing h allows us to find new server in a deterministic way.
+  // It is preferable because multiple concurrent requests with the
+  // stale cookie might be in-flight.
+  auto it = std::lower_bound(
+      std::begin(affinity_hash), std::end(affinity_hash), h,
+      (const AffinityHash &lhs, uint32_t rhs) { return lhs.hash < rhs; });
+
+  if (it == std::end(affinity_hash)) {
+    it = std::begin(affinity_hash);
+  }
+
+  auto aff_idx =
+      static_cast<size_t>(std::distance(std::begin(affinity_hash), it));
+  auto idx = (*it).idx;
+  auto addr = &shared_addr->addrsidx;
+
+  if (addr->connect_blocker->blocked()) {
+    size_t i;
+    for (i = aff_idx + 1; i != aff_idx; ++i) {
+      if (i == shared_addr->affinity_hash.size()) {
+        i = 0;
+      }
+      addr = &shared_addr->addrsshared_addr->affinity_hashi.idx;
+      if (addr->connect_blocker->blocked()) {
+        continue;
+      }
+      break;
+    }
+    if (i == aff_idx) {
+      err = -1;
+      return nullptr;
+    }
+  }
+
+  downstream->renew_affinity_cookie(addr->affinity_hash);
+
+  return addr;
+}
+
 std::unique_ptr<DownstreamConnection>
 ClientHandler::get_downstream_connection(int &err, Downstream *downstream) {
   size_t group_idx;
@@ -1188,19 +1284,25 @@
 } // namespace
 
 int ClientHandler::on_proxy_protocol_finish() {
-  if (conn_.tls.ssl) {
-    conn_.tls.rbuf.append(rb_.pos(), rb_.rleft());
-    rb_.reset();
+  auto len = rb_.pos() - rb_.begin();
+
+  assert(len);
+
+  if (LOG_ENABLED(INFO)) {
+    CLOG(INFO, this) << "PROXY-protocol: Draining " << len
+                     << " bytes from socket";
   }
 
-  setup_upstream_io_callback();
+  rb_.reset();
 
-  // Run on_read to process data left in buffer since they are not
-  // notified further
-  if (on_read() != 0) {
+  if (conn_.read_nolim_clear(rb_.pos(), len) < 0) {
     return -1;
   }
 
+  rb_.reset();
+
+  setup_upstream_io_callback();
+
   return 0;
 }

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_client_handler.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_client_handler.h Changed

@@ -52,6 +52,7 @@
 class Downstream;
 struct WorkerStat;
 struct DownstreamAddrGroup;
+struct SharedDownstreamAddr;
 struct DownstreamAddr;
 #ifdef ENABLE_HTTP3
 class Http3Upstream;
@@ -67,6 +68,8 @@
   // Performs clear text I/O
   int read_clear();
   int write_clear();
+  // Specialized for PROXY-protocol use; peek data from socket.
+  int proxy_protocol_peek_clear();
   // Performs TLS handshake
   int tls_handshake();
   // Performs TLS I/O
@@ -149,7 +152,8 @@
 #ifdef ENABLE_HTTP3
   void setup_http3_upstream(std::unique_ptr<Http3Upstream> &&upstream);
   int read_quic(const UpstreamAddr *faddr, const Address &remote_addr,
-                const Address &local_addr, const uint8_t *data, size_t datalen);
+                const Address &local_addr, const ngtcp2_pkt_info &pi,
+                const uint8_t *data, size_t datalen);
   int write_quic();
 #endif // ENABLE_HTTP3
 
@@ -169,6 +173,10 @@
   uint32_t get_affinity_cookie(Downstream *downstream,
                                const StringRef &cookie_name);
 
+  DownstreamAddr *get_downstream_addr_strict_affinity(
+      int &err, const std::shared_ptr<SharedDownstreamAddr> &shared_addr,
+      Downstream *downstream);
+
   const UpstreamAddr *get_upstream_addr() const;
 
   void repeat_read_timer();

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_config.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_config.cc Changed

@@ -379,7 +379,7 @@
                 make_string_ref(balloc, StringRef{value, std::end(optarg)}));
 
   if (!nghttp2_check_header_name(nv.name.byte(), nv.name.size()) ||
-      !nghttp2_check_header_value(nv.value.byte(), nv.value.size())) {
+      !nghttp2_check_header_value_rfc9113(nv.value.byte(), nv.value.size())) {
     return {};
   }
 
@@ -423,26 +423,6 @@
 }
 } // namespace
 
-// Parses |optarg| as signed integer.  This requires |optarg| to be
-// NULL-terminated string.
-template <typename T>
-int parse_int(T *dest, const StringRef &opt, const char *optarg) {
-  char *end = nullptr;
-
-  errno = 0;
-
-  auto val = strtol(optarg, &end, 10);
-
-  if (!optarg0 || errno != 0 || *end) {
-    LOG(ERROR) << opt << ": bad value.  Specify an integer.";
-    return -1;
-  }
-
-  *dest = val;
-
-  return 0;
-}
-
 namespace {
 int parse_altsvc(AltSvc &altsvc, const StringRef &opt,
                  const StringRef &optarg) {
@@ -1098,6 +1078,19 @@
                       "auto, yes, and no";
         return -1;
       }
+    } else if (util::istarts_with_l(param, "affinity-cookie-stickiness=")) {
+      auto valstr =
+          StringRef{first + str_size("affinity-cookie-stickiness="), end};
+      if (util::strieq_l("loose", valstr)) {
+        out.affinity.cookie.stickiness = SessionAffinityCookieStickiness::LOOSE;
+      } else if (util::strieq_l("strict", valstr)) {
+        out.affinity.cookie.stickiness =
+            SessionAffinityCookieStickiness::STRICT;
+      } else {
+        LOG(ERROR) << "backend: affinity-cookie-stickiness: value must be "
+                      "either loose or strict";
+        return -1;
+      }
     } else if (util::strieq_l("dns", param)) {
       out.dns = true;
     } else if (util::strieq_l("redirect-if-not-tls", param)) {
@@ -1272,11 +1265,14 @@
                   downstreamconf.balloc, params.affinity.cookie.path);
             }
             g.affinity.cookie.secure = params.affinity.cookie.secure;
+            g.affinity.cookie.stickiness = params.affinity.cookie.stickiness;
           }
         } else if (g.affinity.type != params.affinity.type ||
                    g.affinity.cookie.name != params.affinity.cookie.name ||
                    g.affinity.cookie.path != params.affinity.cookie.path ||
-                   g.affinity.cookie.secure != params.affinity.cookie.secure) {
+                   g.affinity.cookie.secure != params.affinity.cookie.secure ||
+                   g.affinity.cookie.stickiness !=
+                       params.affinity.cookie.stickiness) {
           LOG(ERROR) << "backend: affinity: multiple different affinity "
                         "configurations found in a single group";
           return -1;
@@ -1350,6 +1346,7 @@
             make_string_ref(downstreamconf.balloc, params.affinity.cookie.path);
       }
       g.affinity.cookie.secure = params.affinity.cookie.secure;
+      g.affinity.cookie.stickiness = params.affinity.cookie.stickiness;
     }
     g.redirect_if_not_tls = params.redirect_if_not_tls;
     g.mruby_file = make_string_ref(downstreamconf.balloc, params.mruby);
@@ -1887,6 +1884,11 @@
         return SHRPX_OPTID_FASTOPEN;
       }
       break;
+    case 's':
+      if (util::strieq_l("tls-ktl", name, 7)) {
+        return SHRPX_OPTID_TLS_KTLS;
+      }
+      break;
     case 't':
       if (util::strieq_l("npn-lis", name, 7)) {
         return SHRPX_OPTID_NPN_LIST;
@@ -2210,6 +2212,9 @@
       if (util::strieq_l("no-location-rewrit", name, 18)) {
         return SHRPX_OPTID_NO_LOCATION_REWRITE;
       }
+      if (util::strieq_l("require-http-schem", name, 18)) {
+        return SHRPX_OPTID_REQUIRE_HTTP_SCHEME;
+      }
       if (util::strieq_l("tls-ticket-key-fil", name, 18)) {
         return SHRPX_OPTID_TLS_TICKET_KEY_FILE;
       }
@@ -4111,8 +4116,10 @@
       config->quic.upstream.congestion_controller = NGTCP2_CC_ALGO_CUBIC;
     } else if (util::strieq_l("bbr", optarg)) {
       config->quic.upstream.congestion_controller = NGTCP2_CC_ALGO_BBR;
+    } else if (util::strieq_l("bbr2", optarg)) {
+      config->quic.upstream.congestion_controller = NGTCP2_CC_ALGO_BBR2;
     } else {
-      LOG(ERROR) << opt << ": must be either cubic or bbr";
+      LOG(ERROR) << opt << ": must be one of cubic, bbr, and bbr2";
       return -1;
     }
 #endif // ENABLE_HTTP3
@@ -4164,6 +4171,12 @@
 
     return 0;
   }
+  case SHRPX_OPTID_REQUIRE_HTTP_SCHEME:
+    config->http.require_http_scheme = util::strieq_l("yes", optarg);
+    return 0;
+  case SHRPX_OPTID_TLS_KTLS:
+    config->tls.ktls = util::strieq_l("yes", optarg);
+    return 0;
   case SHRPX_OPTID_CONF:
     LOG(WARN) << "conf: ignored";
 
@@ -4463,7 +4476,7 @@
     if (!g.mruby_file.empty()) {
       if (mruby::create_mruby_context(g.mruby_file) == nullptr) {
         LOG(config->ignore_per_pattern_mruby_error ? ERROR : FATAL)
-            << "backend: Could not compile mruby flie for pattern "
+            << "backend: Could not compile mruby file for pattern "
             << g.pattern;
         if (!config->ignore_per_pattern_mruby_error) {
           return -1;
@@ -4594,6 +4607,12 @@
           return -1;
         }
 
+        if (g.affinity.cookie.stickiness ==
+            SessionAffinityCookieStickiness::STRICT) {
+          addr.affinity_hash = util::hash32(key);
+          g.affinity_hash_map.emplace(addr.affinity_hash, idx);
+        }
+
         ++idx;
       }

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_config.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_config.h Changed

@@ -43,6 +43,7 @@
 #include <vector>
 #include <memory>
 #include <set>
+#include <unordered_map>
 
 #include <openssl/ssl.h>
 
@@ -401,6 +402,9 @@
     StringRef::from_lit("worker-process-grace-shutdown-period");
 constexpr auto SHRPX_OPT_FRONTEND_QUIC_INITIAL_RTT =
     StringRef::from_lit("frontend-quic-initial-rtt");
+constexpr auto SHRPX_OPT_REQUIRE_HTTP_SCHEME =
+    StringRef::from_lit("require-http-scheme");
+constexpr auto SHRPX_OPT_TLS_KTLS = StringRef::from_lit("tls-ktls");
 
 constexpr size_t SHRPX_OBFUSCATED_NODE_LENGTH = 8;
 
@@ -434,6 +438,16 @@
   NO,
 };
 
+enum class SessionAffinityCookieStickiness {
+  // Backend server might be changed when an existing backend server
+  // is removed, or new backend server is added.
+  LOOSE,
+  // Backend server might be changed when a designated backend server
+  // is removed, but adding new backend server does not cause
+  // breakage.
+  STRICT,
+};
+
 struct AffinityConfig {
   // Type of session affinity.
   SessionAffinity type;
@@ -444,6 +458,8 @@
     StringRef path;
     // Secure attribute
     SessionAffinityCookieSecure secure;
+    // Affinity Stickiness
+    SessionAffinityCookieStickiness stickiness;
   } cookie;
 };
 
@@ -526,6 +542,9 @@
   uint32_t weight;
   // weight of the weight group.  Its range is 1, 256, inclusive.
   uint32_t group_weight;
+  // affinity hash for this address.  It is assigned when strict
+  // stickiness is enabled.
+  uint32_t affinity_hash;
   // Application protocol used in this group
   Proto proto;
   // backend port.  0 if |host_unix| is true.
@@ -566,6 +585,9 @@
   // Bunch of session affinity hash.  Only used if affinity ==
   // SessionAffinity::IP.
   std::vector<AffinityHash> affinity_hash;
+  // Maps affinity hash of each DownstreamAddrConfig to its index in
+  // addrs.  It is only assigned when strict stickiness is enabled.
+  std::unordered_map<uint32_t, size_t> affinity_hash_map;
   // Cookie based session affinity configuration.
   AffinityConfig affinity;
   // true if this group requires that client connection must be TLS,
@@ -691,7 +713,7 @@
     ev_tstamp idle_timeout;
   } dyn_rec;
 
-  // OCSP realted configurations
+  // OCSP related configurations
   struct {
     ev_tstamp update_interval;
     StringRef fetch_ocsp_response_file;
@@ -762,6 +784,7 @@
   // true if forwarding requests included in TLS early data should not
   // be postponed until TLS handshake finishes.
   bool no_postpone_early_data;
+  bool ktls;
 };
 
 #ifdef ENABLE_HTTP3
@@ -857,6 +880,7 @@
   bool no_location_rewrite;
   bool no_host_rewrite;
   bool no_server_rewrite;
+  bool require_http_scheme;
 };
 
 struct Http2Config {
@@ -1295,6 +1319,7 @@
   SHRPX_OPTID_READ_RATE,
   SHRPX_OPTID_REDIRECT_HTTPS_PORT,
   SHRPX_OPTID_REQUEST_HEADER_FIELD_BUFFER,
+  SHRPX_OPTID_REQUIRE_HTTP_SCHEME,
   SHRPX_OPTID_RESPONSE_HEADER_FIELD_BUFFER,
   SHRPX_OPTID_RLIMIT_MEMLOCK,
   SHRPX_OPTID_RLIMIT_NOFILE,
@@ -1309,6 +1334,7 @@
   SHRPX_OPTID_SYSLOG_FACILITY,
   SHRPX_OPTID_TLS_DYN_REC_IDLE_TIMEOUT,
   SHRPX_OPTID_TLS_DYN_REC_WARMUP_THRESHOLD,
+  SHRPX_OPTID_TLS_KTLS,
   SHRPX_OPTID_TLS_MAX_EARLY_DATA,
   SHRPX_OPTID_TLS_MAX_PROTO_VERSION,
   SHRPX_OPTID_TLS_MIN_PROTO_VERSION,

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

@@ -44,13 +44,13 @@
 
 namespace shrpx {
 
-#if !LIBRESSL_2_7_API && !OPENSSL_1_1_API
+#if !LIBRESSL_3_5_API && !LIBRESSL_2_7_API && !OPENSSL_1_1_API
 
 void *BIO_get_data(BIO *bio) { return bio->ptr; }
 void BIO_set_data(BIO *bio, void *ptr) { bio->ptr = ptr; }
 void BIO_set_init(BIO *bio, int init) { bio->init = init; }
 
-#endif // !LIBRESSL_2_7_API && !OPENSSL_1_1_API
+#endif // !LIBRESSL_3_5_API && !LIBRESSL_2_7_API && !OPENSSL_1_1_API
 
 Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl,
                        MemchunkPool *mcpool, ev_tstamp write_timeout,
@@ -60,7 +60,11 @@
                        IOCb readcb, TimerCb timeoutcb, void *data,
                        size_t tls_dyn_rec_warmup_threshold,
                        ev_tstamp tls_dyn_rec_idle_timeout, Proto proto)
-    : tls{DefaultMemchunks(mcpool), DefaultPeekMemchunks(mcpool),
+    :
+#ifdef ENABLE_HTTP3
+      conn_ref{nullptr, this},
+#endif // ENABLE_HTTP3
+      tls{DefaultMemchunks(mcpool), DefaultPeekMemchunks(mcpool),
           DefaultMemchunks(mcpool)},
       wlimit(loop, &wev, write_limit.rate, write_limit.burst),
       rlimit(loop, &rev, read_limit.rate, read_limit.burst, this),
@@ -97,21 +101,24 @@
 
 void Connection::disconnect() {
   if (tls.ssl) {
-    SSL_set_shutdown(tls.ssl,
-                     SSL_get_shutdown(tls.ssl) | SSL_RECEIVED_SHUTDOWN);
-    ERR_clear_error();
+    if (proto != Proto::HTTP3) {
+      SSL_set_shutdown(tls.ssl,
+                       SSL_get_shutdown(tls.ssl) | SSL_RECEIVED_SHUTDOWN);
+      ERR_clear_error();
+
+      if (tls.cached_session) {
+        SSL_SESSION_free(tls.cached_session);
+        tls.cached_session = nullptr;
+      }
 
-    if (tls.cached_session) {
-      SSL_SESSION_free(tls.cached_session);
-      tls.cached_session = nullptr;
-    }
+      if (tls.cached_session_lookup_req) {
+        tls.cached_session_lookup_req->canceled = true;
+        tls.cached_session_lookup_req = nullptr;
+      }
 
-    if (tls.cached_session_lookup_req) {
-      tls.cached_session_lookup_req->canceled = true;
-      tls.cached_session_lookup_req = nullptr;
+      SSL_shutdown(tls.ssl);
     }
 
-    SSL_shutdown(tls.ssl);
     SSL_free(tls.ssl);
     tls.ssl = nullptr;
 
@@ -150,6 +157,13 @@
 }
 
 void Connection::prepare_server_handshake() {
+  auto &tlsconf = get_config()->tls;
+  if (proto != Proto::HTTP3 && !tlsconf.session_cache.memcached.host.empty()) {
+    auto bio = BIO_new(tlsconf.bio_method);
+    BIO_set_data(bio, this);
+    SSL_set_bio(tls.ssl, bio, bio);
+  }
+
   SSL_set_accept_state(tls.ssl);
   tls.server_handshake = true;
 }
@@ -252,14 +266,14 @@
 
 namespace {
 int shrpx_bio_create(BIO *b) {
-#if OPENSSL_1_1_API
+#if OPENSSL_1_1_API || LIBRESSL_3_5_API
   BIO_set_init(b, 1);
-#else  // !OPENSSL_1_1_API
+#else  // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
   b->init = 1;
   b->num = 0;
   b->ptr = nullptr;
   b->flags = 0;
-#endif // !OPENSSL_1_1_API
+#endif // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
   return 1;
 }
 } // namespace
@@ -270,17 +284,17 @@
     return 0;
   }
 
-#if !OPENSSL_1_1_API
+#if !OPENSSL_1_1_API && !LIBRESSL_3_5_API
   b->ptr = nullptr;
   b->init = 0;
   b->flags = 0;
-#endif // !OPENSSL_1_1_API
+#endif // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
 
   return 1;
 }
 } // namespace
 
-#if OPENSSL_1_1_API
+#if OPENSSL_1_1_API || LIBRESSL_3_5_API
 
 BIO_METHOD *create_bio_method() {
   auto meth = BIO_meth_new(BIO_TYPE_FD, "nghttpx-bio");
@@ -295,7 +309,7 @@
   return meth;
 }
 
-#else // !OPENSSL_1_1_API
+#else // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
 
 BIO_METHOD *create_bio_method() {
   static auto meth = new BIO_METHOD{
@@ -307,18 +321,11 @@
   return meth;
 }
 
-#endif // !OPENSSL_1_1_API
+#endif // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
 
 void Connection::set_ssl(SSL *ssl) {
   tls.ssl = ssl;
 
-  if (proto != Proto::HTTP3) {
-    auto &tlsconf = get_config()->tls;
-    auto bio = BIO_new(tlsconf.bio_method);
-    BIO_set_data(bio, this);
-    SSL_set_bio(tls.ssl, bio, bio);
-  }
-
   SSL_set_app_data(tls.ssl, this);
 }
 
@@ -336,6 +343,12 @@
   wlimit.stopw();
   ev_timer_stop(loop, &wt);
 
+  auto &tlsconf = get_config()->tls;
+
+  if (!tls.server_handshake || tlsconf.session_cache.memcached.host.empty()) {
+    return tls_handshake_simple();
+  }
+
   std::array<uint8_t, 16_k> buf;
 
   if (ev_is_active(&rev)) {
@@ -381,7 +394,7 @@
 
     set_ssl(ssl);
 
-    SSL_set_accept_state(tls.ssl);
+    prepare_server_handshake();
 
     tls.handshake_state = TLSHandshakeState::NORMAL;
     break;
@@ -397,10 +410,6 @@
 
   ERR_clear_error();
 
-#if OPENSSL_1_1_1_API || defined(OPENSSL_IS_BORINGSSL)
-  auto &tlsconf = get_config()->tls;
-#endif // OPENSSL_1_1_1_API || defined(OPENSSL_IS_BORINGSSL)
-
 #if OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
   if (!tls.server_handshake || tls.early_data_finish) {
     rv = SSL_do_handshake(tls.ssl);
@@ -592,6 +601,158 @@
   return write_tls_pending_handshake();
 }
 
+int Connection::tls_handshake_simple() {
+  wlimit.stopw();
+  ev_timer_stop(loop, &wt);
+
+  if (tls.initial_handshake_done) {
+    return write_tls_pending_handshake();
+  }
+
+  if (SSL_get_fd(tls.ssl) == -1) {
+    SSL_set_fd(tls.ssl, fd);
+  }
+
+  int rv;
+#if OPENSSL_1_1_1_API || defined(OPENSSL_IS_BORINGSSL)
+  auto &tlsconf = get_config()->tls;
+  std::array<uint8_t, 16_k> buf;
+#endif // OPENSSL_1_1_1_API || defined(OPENSSL_IS_BORINGSSL)
+
+  ERR_clear_error();
+
+#if OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
+  if (!tls.server_handshake || tls.early_data_finish) {
+    rv = SSL_do_handshake(tls.ssl);
+  } else {
+    for (;;) {
+      size_t nread;
+
+      rv = SSL_read_early_data(tls.ssl, buf.data(), buf.size(), &nread);
+      if (rv == SSL_READ_EARLY_DATA_ERROR) {
+        // If we have early data, and server sends ServerHello, assume
+        // that handshake is completed in server side, and start
+        // processing request.  If we don't exit handshake code here,
+        // server waits for EndOfEarlyData and Finished message from
+        // client, which voids the purpose of 0-RTT data.  The left
+        // over of handshake is done through write_tls or read_tls.
+        if (tlsconf.no_postpone_early_data && tls.earlybuf.rleft()) {
+          rv = 1;
+        }
+
+        break;
+      }
+
+      if (LOG_ENABLED(INFO)) {
+        LOG(INFO) << "tls: read early data " << nread << " bytes";
+      }
+
+      tls.earlybuf.append(buf.data(), nread);
+
+      if (rv == SSL_READ_EARLY_DATA_FINISH) {
+        if (LOG_ENABLED(INFO)) {
+          LOG(INFO) << "tls: read all early data; total "
+                    << tls.earlybuf.rleft() << " bytes";
+        }
+        tls.early_data_finish = true;
+        // The same reason stated above.
+        if (tlsconf.no_postpone_early_data && tls.earlybuf.rleft()) {
+          rv = 1;
+        } else {
+          ERR_clear_error();
+          rv = SSL_do_handshake(tls.ssl);
+        }
+        break;
+      }
+    }
+  }
+#else  // !(OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL))
+  rv = SSL_do_handshake(tls.ssl);
+#endif // !(OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL))
+
+  if (rv <= 0) {
+    auto err = SSL_get_error(tls.ssl, rv);
+    switch (err) {
+    case SSL_ERROR_WANT_READ:
+      if (read_buffer_full(tls.rbuf)) {
+        if (LOG_ENABLED(INFO)) {
+          LOG(INFO) << "tls: handshake message is too large";
+        }
+        return -1;
+      }
+      break;
+    case SSL_ERROR_WANT_WRITE:
+      wlimit.startw();
+      ev_timer_again(loop, &wt);
+      break;
+    case SSL_ERROR_SSL: {
+      if (LOG_ENABLED(INFO)) {
+        LOG(INFO) << "tls: handshake libssl error: "
+                  << ERR_error_string(ERR_get_error(), nullptr);
+      }
+      return SHRPX_ERR_NETWORK;
+    }
+    default:
+      if (LOG_ENABLED(INFO)) {
+        LOG(INFO) << "tls: handshake libssl error " << err;
+      }
+      return SHRPX_ERR_NETWORK;
+    }
+  }
+
+  if (rv != 1) {
+    if (LOG_ENABLED(INFO)) {
+      LOG(INFO) << "tls: handshake is still in progress";
+    }
+    return SHRPX_ERR_INPROGRESS;
+  }
+
+#ifdef OPENSSL_IS_BORINGSSL
+  if (!tlsconf.no_postpone_early_data && SSL_in_early_data(tls.ssl) &&
+      SSL_in_init(tls.ssl)) {
+    auto nread = SSL_read(tls.ssl, buf.data(), buf.size());
+    if (nread <= 0) {
+      auto err = SSL_get_error(tls.ssl, nread);
+      switch (err) {
+      case SSL_ERROR_WANT_READ:
+      case SSL_ERROR_WANT_WRITE:
+        break;
+      case SSL_ERROR_ZERO_RETURN:
+        return SHRPX_ERR_EOF;
+      case SSL_ERROR_SSL:
+        if (LOG_ENABLED(INFO)) {
+          LOG(INFO) << "SSL_read: "
+                    << ERR_error_string(ERR_get_error(), nullptr);
+        }
+        return SHRPX_ERR_NETWORK;
+      default:
+        if (LOG_ENABLED(INFO)) {
+          LOG(INFO) << "SSL_read: SSL_get_error returned " << err;
+        }
+        return SHRPX_ERR_NETWORK;
+      }
+    } else {
+      tls.earlybuf.append(buf.data(), nread);
+    }
+
+    if (SSL_in_init(tls.ssl)) {
+      return SHRPX_ERR_INPROGRESS;
+    }
+  }
+#endif // OPENSSL_IS_BORINGSSL
+
+  // Handshake was done
+
+  rv = check_http2_requirement();
+  if (rv != 0) {
+    return -1;
+  }
+
+  tls.initial_handshake_done = true;
+
+  return write_tls_pending_handshake();
+}
+
 int Connection::write_tls_pending_handshake() {
   // Send handshake data left in the buffer
   while (tls.wbuf.rleft()) {
@@ -753,7 +914,7 @@
   // length) on SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE.
   // get_write_limit() may return smaller length than previously
   // passed to SSL_write, which violates OpenSSL assumption.  To avoid
-  // this, we keep last legnth passed to SSL_write to
+  // this, we keep last length passed to SSL_write to
   // tls.last_writelen if SSL_write indicated I/O blocking.
   if (tls.last_writelen == 0) {
     len = std::min(len, wlimit.avail());
@@ -768,6 +929,10 @@
 
   tls.last_write_idle = -1.;
 
+  auto &tlsconf = get_config()->tls;
+  auto via_bio =
+      tls.server_handshake && !tlsconf.session_cache.memcached.host.empty();
+
   ERR_clear_error();
 
 #if OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
@@ -797,7 +962,12 @@
     case SSL_ERROR_WANT_WRITE:
       tls.last_writelen = len;
       // starting write watcher and timer is done in write_clear via
-      // bio.
+      // bio otherwise.
+      if (!via_bio) {
+        wlimit.startw();
+        ev_timer_again(loop, &wt);
+      }
+
       return 0;
     case SSL_ERROR_SSL:
       if (LOG_ENABLED(INFO)) {
@@ -813,6 +983,14 @@
     }
   }
 
+  if (!via_bio) {
+    wlimit.drain(rv);
+
+    if (ev_is_active(&wt)) {
+      ev_timer_again(loop, &wt);
+    }
+  }
+
   update_tls_warmup_writelen(rv);
 
   return rv;
@@ -831,7 +1009,7 @@
   // length) on SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE.
   // rlimit_.avail() or rlimit_.avail() may return different length
   // than the length previously passed to SSL_read, which violates
-  // OpenSSL assumption.  To avoid this, we keep last legnth passed
+  // OpenSSL assumption.  To avoid this, we keep last length passed
   // to SSL_read to tls_last_readlen_ if SSL_read indicated I/O
   // blocking.
   if (tls.last_readlen == 0) {
@@ -995,6 +1173,42 @@
   return nread;
 }
 
+ssize_t Connection::read_nolim_clear(void *data, size_t len) {
+  ssize_t nread;
+  while ((nread = read(fd, data, len)) == -1 && errno == EINTR)
+    ;
+  if (nread == -1) {
+    if (errno == EAGAIN || errno == EWOULDBLOCK) {
+      return 0;
+    }
+    return SHRPX_ERR_NETWORK;
+  }
+
+  if (nread == 0) {
+    return SHRPX_ERR_EOF;
+  }
+
+  return nread;
+}
+
+ssize_t Connection::peek_clear(void *data, size_t len) {
+  ssize_t nread;
+  while ((nread = recv(fd, data, len, MSG_PEEK)) == -1 && errno == EINTR)
+    ;
+  if (nread == -1) {
+    if (errno == EAGAIN || errno == EWOULDBLOCK) {
+      return 0;
+    }
+    return SHRPX_ERR_NETWORK;
+  }
+
+  if (nread == 0) {
+    return SHRPX_ERR_EOF;
+  }
+
+  return nread;
+}
+
 void Connection::handle_tls_pending_read() {
   if (!ev_is_active(&rev)) {
     return;

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

@@ -33,6 +33,10 @@
 
 #include <openssl/ssl.h>
 
+#ifdef ENABLE_HTTP3
+#  include <ngtcp2/ngtcp2_crypto.h>
+#endif // ENABLE_HTTP3
+
 #include "shrpx_rate_limit.h"
 #include "shrpx_error.h"
 #include "memchunk.h"
@@ -109,6 +113,7 @@
   void prepare_server_handshake();
 
   int tls_handshake();
+  int tls_handshake_simple();
   int write_tls_pending_handshake();
 
   int check_http2_requirement();
@@ -136,6 +141,10 @@
   ssize_t write_clear(const void *data, size_t len);
   ssize_t writev_clear(struct iovec *iov, int iovcnt);
   ssize_t read_clear(void *data, size_t len);
+  // Read at most |len| bytes of data from socket without rate limit.
+  ssize_t read_nolim_clear(void *data, size_t len);
+  // Peek at most |len| bytes of data from socket without rate limit.
+  ssize_t peek_clear(void *data, size_t len);
 
   void handle_tls_pending_read();
 
@@ -154,6 +163,10 @@
   // Returns true if read timer expired.
   bool expired_rt();
 
+#ifdef ENABLE_HTTP3
+  // This must be the first member of Connection.
+  ngtcp2_crypto_conn_ref conn_ref;
+#endif // ENABLE_HTTP3
   TLSConnection tls;
   ev_io wev;
   ev_io rev;
@@ -177,6 +190,11 @@
   ev_tstamp read_timeout;
 };
 
+#ifdef ENABLE_HTTP3
+static_assert(std::is_standard_layout<Connection>::value,
+              "Conneciton is not standard layout");
+#endif // ENABLE_HTTP3
+
 // Creates BIO_method shared by all SSL objects.
 BIO_METHOD *create_bio_method();

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_connection_handler.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_connection_handler.cc Changed

@@ -1017,12 +1017,10 @@
 }
 
 #ifdef ENABLE_HTTP3
-int ConnectionHandler::forward_quic_packet(const UpstreamAddr *faddr,
-                                           const Address &remote_addr,
-                                           const Address &local_addr,
-                                           const uint8_t *cid_prefix,
-                                           const uint8_t *data,
-                                           size_t datalen) {
+int ConnectionHandler::forward_quic_packet(
+    const UpstreamAddr *faddr, const Address &remote_addr,
+    const Address &local_addr, const ngtcp2_pkt_info &pi,
+    const uint8_t *cid_prefix, const uint8_t *data, size_t datalen) {
   assert(!get_config()->single_thread);
 
   for (auto &worker : workers_) {
@@ -1034,7 +1032,7 @@
     WorkerEvent wev{};
     wev.type = WorkerEventType::QUIC_PKT_FORWARD;
     wev.quic_pkt = std::make_unique<QUICPacket>(faddr->index, remote_addr,
-                                                local_addr, data, datalen);
+                                                local_addr, pi, data, datalen);
 
     worker->send(std::move(wev));
 
@@ -1082,8 +1080,6 @@
 }
 
 void ConnectionHandler::unload_bpf_objects() {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
   LOG(NOTICE) << "Unloading BPF objects";
 
   for (auto &ref : quic_bpf_refs_) {
@@ -1091,11 +1087,7 @@
       continue;
     }
 
-    if (bpf_object__unload(ref.obj) != 0) {
-      LOG(WARN) << "Failed to unload bpf object: "
-                << xsi_strerror(errno, errbuf.data(), errbuf.size());
-      continue;
-    }
+    bpf_object__close(ref.obj);
 
     ref.obj = nullptr;
   }
@@ -1111,10 +1103,11 @@
 
 int ConnectionHandler::forward_quic_packet_to_lingering_worker_process(
     QUICLingeringWorkerProcess *quic_lwp, const Address &remote_addr,
-    const Address &local_addr, const uint8_t *data, size_t datalen) {
+    const Address &local_addr, const ngtcp2_pkt_info &pi, const uint8_t *data,
+    size_t datalen) {
   std::array<uint8_t, 512> header;
 
-  assert(header.size() >= 1 + 1 + 1 + sizeof(sockaddr_storage) * 2);
+  assert(header.size() >= 1 + 1 + 1 + 1 + sizeof(sockaddr_storage) * 2);
   assert(remote_addr.len > 0);
   assert(local_addr.len > 0);
 
@@ -1127,6 +1120,7 @@
   *p++ = static_cast<uint8_t>(local_addr.len - 1);
   p = std::copy_n(reinterpret_cast<const uint8_t *>(&local_addr.su),
                   local_addr.len, p);
+  *p++ = pi.ecn;
 
   iovec msg_iov = {
       {
@@ -1185,14 +1179,14 @@
     return 0;
   }
 
-  size_t len = 1 + 1 + 1;
+  size_t len = 1 + 1 + 1 + 1;
 
   // Wire format:
-  // TYPE(1) REMOTE_ADDRLEN(1) REMOTE_ADDR(N) LOCAL_ADDRLEN(1) REMOTE_ADDR(N)
-  // DGRAM_PAYLAOD(N)
+  // TYPE(1) REMOTE_ADDRLEN(1) REMOTE_ADDR(N) LOCAL_ADDRLEN(1) LOCAL_ADDR(N)
+  // ECN(1) DGRAM_PAYLOAD(N)
   //
-  // When encoding, REMOTE_ADDRLEN and LOCAL_ADDRLEN is decremented by
-  // 1.
+  // When encoding, REMOTE_ADDRLEN and LOCAL_ADDRLEN are decremented
+  // by 1.
   if (static_cast<size_t>(nread) < len) {
     return 0;
   }
@@ -1249,6 +1243,8 @@
 
   p += local_addrlen;
 
+  pkt->pi.ecn = *p++;
+
   auto datalen = nread - (p - buf.data());
 
   pkt->data.assign(p, p + datalen);
@@ -1256,22 +1252,16 @@
   // At the moment, UpstreamAddr index is unknown.
   pkt->upstream_addr_index = static_cast<size_t>(-1);
 
-  uint32_t version;
-  const uint8_t *dcid;
-  size_t dcidlen;
-  const uint8_t *scid;
-  size_t scidlen;
+  ngtcp2_version_cid vc;
 
-  auto rv =
-      ngtcp2_pkt_decode_version_cid(&version, &dcid, &dcidlen, &scid, &scidlen,
-                                    p, datalen, SHRPX_QUIC_SCIDLEN);
+  auto rv = ngtcp2_pkt_decode_version_cid(&vc, p, datalen, SHRPX_QUIC_SCIDLEN);
   if (rv < 0) {
     LOG(ERROR) << "ngtcp2_pkt_decode_version_cid: " << ngtcp2_strerror(rv);
 
     return -1;
   }
 
-  if (dcidlen != SHRPX_QUIC_SCIDLEN) {
+  if (vc.dcidlen != SHRPX_QUIC_SCIDLEN) {
     LOG(ERROR) << "DCID length is invalid";
     return -1;
   }
@@ -1288,7 +1278,8 @@
 
     // Ignore return value
     quic_conn_handler->handle_packet(faddr, pkt->remote_addr, pkt->local_addr,
-                                     pkt->data.data(), pkt->data.size());
+                                     pkt->pi, pkt->data.data(),
+                                     pkt->data.size());
 
     return 0;
   }
@@ -1298,7 +1289,7 @@
   std::array<uint8_t, SHRPX_QUIC_DECRYPTED_DCIDLEN> decrypted_dcid;
 
   if (decrypt_quic_connection_id(decrypted_dcid.data(),
-                                 dcid + SHRPX_QUIC_CID_PREFIX_OFFSET,
+                                 vc.dcid + SHRPX_QUIC_CID_PREFIX_OFFSET,
                                  qkm.cid_encryption_key.data()) != 0) {
     return -1;
   }

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

@@ -163,7 +163,7 @@
 
   // Cancels ocsp update process
   void cancel_ocsp_update();
-  // Starts ocsp update for certficate |cert_file|.
+  // Starts ocsp update for certificate |cert_file|.
   int start_ocsp_update(const char *cert_file);
   // Reads incoming data from ocsp update process
   void read_ocsp_chunk();
@@ -196,8 +196,9 @@
   const std::vector<SSL_CTX *> &get_quic_indexed_ssl_ctx(size_t idx) const;
 
   int forward_quic_packet(const UpstreamAddr *faddr, const Address &remote_addr,
-                          const Address &local_addr, const uint8_t *cid_prefix,
-                          const uint8_t *data, size_t datalen);
+                          const Address &local_addr, const ngtcp2_pkt_info &pi,
+                          const uint8_t *cid_prefix, const uint8_t *data,
+                          size_t datalen);
 
   void set_quic_keying_materials(std::shared_ptr<QUICKeyingMaterials> qkms);
   const std::shared_ptr<QUICKeyingMaterials> &get_quic_keying_materials() const;
@@ -218,7 +219,8 @@
 
   int forward_quic_packet_to_lingering_worker_process(
       QUICLingeringWorkerProcess *quic_lwp, const Address &remote_addr,
-      const Address &local_addr, const uint8_t *data, size_t datalen);
+      const Address &local_addr, const ngtcp2_pkt_info &pi, const uint8_t *data,
+      size_t datalen);
 
   void set_quic_ipc_fd(int fd);

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_dns_resolver.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_dns_resolver.h Changed

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

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_downstream.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_downstream.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_downstream_connection.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_downstream_connection.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_dual_dns_resolver.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_dual_dns_resolver.cc Changed

@@ -26,8 +26,8 @@
 
 namespace shrpx {
 
-DualDNSResolver::DualDNSResolver(struct ev_loop *loop)
-    : resolv4_(loop), resolv6_(loop) {
+DualDNSResolver::DualDNSResolver(struct ev_loop *loop, int family)
+    : family_(family), resolv4_(loop), resolv6_(loop) {
   auto cb = this(DNSResolverStatus, const Address *) {
     Address result;
 
@@ -44,14 +44,22 @@
     cb(status, &result);
   };
 
-  resolv4_.set_complete_cb(cb);
-  resolv6_.set_complete_cb(cb);
+  if (family_ == AF_UNSPEC || family_ == AF_INET) {
+    resolv4_.set_complete_cb(cb);
+  }
+  if (family_ == AF_UNSPEC || family_ == AF_INET6) {
+    resolv6_.set_complete_cb(cb);
+  }
 }
 
 int DualDNSResolver::resolve(const StringRef &host) {
-  int rv4, rv6;
-  rv4 = resolv4_.resolve(host, AF_INET);
-  rv6 = resolv6_.resolve(host, AF_INET6);
+  int rv4 = 0, rv6 = 0;
+  if (family_ == AF_UNSPEC || family_ == AF_INET) {
+    rv4 = resolv4_.resolve(host, AF_INET);
+  }
+  if (family_ == AF_UNSPEC || family_ == AF_INET6) {
+    rv6 = resolv6_.resolve(host, AF_INET6);
+  }
 
   if (rv4 != 0 && rv6 != 0) {
     return -1;

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_dual_dns_resolver.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_dual_dns_resolver.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_error.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_error.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_health_monitor_downstream_connection.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_health_monitor_downstream_connection.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_health_monitor_downstream_connection.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_health_monitor_downstream_connection.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_http.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_http.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_http2_downstream_connection.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http2_downstream_connection.h Changed

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

@@ -206,13 +206,13 @@
   on_read_ = &Http2Session::read_noop;
   on_write_ = &Http2Session::write_noop;
 
-  // We will resuse this many times, so use repeat timeout value.  The
+  // We will reuse this many times, so use repeat timeout value.  The
   // timeout value is set later.
   ev_timer_init(&connchk_timer_, connchk_timeout_cb, 0., 0.);
 
   connchk_timer_.data = this;
 
-  // SETTINGS ACK timeout is 10 seconds for now.  We will resuse this
+  // SETTINGS ACK timeout is 10 seconds for now.  We will reuse this
   // many times, so use repeat timeout value.
   ev_timer_init(&settings_timer_, settings_timeout_cb, 0., 0.);
 
@@ -345,13 +345,26 @@
     nullptr,             // llhttp_cb      on_message_begin;
     nullptr,             // llhttp_data_cb on_url;
     nullptr,             // llhttp_data_cb on_status;
+    nullptr,             // llhttp_data_cb on_method;
+    nullptr,             // llhttp_data_cb on_version;
     nullptr,             // llhttp_data_cb on_header_field;
     nullptr,             // llhttp_data_cb on_header_value;
+    nullptr,             // llhttp_data_cb on_chunk_extension_name;
+    nullptr,             // llhttp_data_cb on_chunk_extension_value;
     htp_hdrs_completecb, // llhttp_cb      on_headers_complete;
     nullptr,             // llhttp_data_cb on_body;
     nullptr,             // llhttp_cb      on_message_complete;
-    nullptr,             // llhttp_cb      on_chunk_header
-    nullptr,             // llhttp_cb      on_chunk_complete
+    nullptr,             // llhttp_cb      on_url_complete;
+    nullptr,             // llhttp_cb      on_status_complete;
+    nullptr,             // llhttp_cb      on_method_complete;
+    nullptr,             // llhttp_cb      on_version_complete;
+    nullptr,             // llhttp_cb      on_header_field_complete;
+    nullptr,             // llhttp_cb      on_header_value_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_name_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_value_complete;
+    nullptr,             // llhttp_cb      on_chunk_header;
+    nullptr,             // llhttp_cb      on_chunk_complete;
+    nullptr,             // llhttp_cb      on_reset;
 };
 } // namespace
 
@@ -1693,14 +1706,17 @@
     return -1;
   }
 
-  std::array<nghttp2_settings_entry, 4> entry;
-  size_t nentry = 2;
+  std::array<nghttp2_settings_entry, 5> entry;
+  size_t nentry = 3;
   entry0.settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
   entry0.value = http2conf.downstream.max_concurrent_streams;
 
   entry1.settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
   entry1.value = http2conf.downstream.window_size;
 
+  entry2.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  entry2.value = 1;
+
   if (http2conf.no_server_push || config->http2_proxy) {
     entrynentry.settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
     entrynentry.value = 0;
@@ -1875,7 +1891,7 @@
   SSLOG(INFO, this) << "Start checking connection";
   // If connection is down, we may get error when writing data.  Issue
   // ping frame to see whether connection is alive.
-  nghttp2_submit_ping(session_, NGHTTP2_FLAG_NONE, NULL);
+  nghttp2_submit_ping(session_, NGHTTP2_FLAG_NONE, nullptr);
 
   // set ping timeout and start timer again
   reset_connection_check_timer(CONNCHK_PING_TIMEOUT);

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_http2_upstream.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http2_upstream.cc Changed

@@ -419,10 +419,16 @@
 
   downstream->set_request_state(DownstreamState::HEADER_COMPLETE);
 
+  if (config->http.require_http_scheme &&
+      !http::check_http_scheme(req.scheme, handler_->get_ssl() != nullptr)) {
+    if (error_reply(downstream, 400) != 0) {
+      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+    }
+    return 0;
+  }
+
 #ifdef HAVE_MRUBY
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto worker = handler->get_worker();
+  auto worker = handler_->get_worker();
   auto mruby_ctx = worker->get_mruby_context();
 
   if (mruby_ctx->run_on_request_proc(downstream) != 0) {
@@ -460,7 +466,9 @@
 void Http2Upstream::initiate_downstream(Downstream *downstream) {
   int rv;
 
+#ifdef HAVE_MRUBY
   DownstreamConnection *dconn_ptr;
+#endif // HAVE_MRUBY
 
   for (;;) {
     auto dconn = handler_->get_downstream_connection(rv, downstream);
@@ -1037,8 +1045,8 @@
   flow_control_ = true;
 
   // TODO Maybe call from outside?
-  std::array<nghttp2_settings_entry, 4> entry;
-  size_t nentry = 2;
+  std::array<nghttp2_settings_entry, 5> entry;
+  size_t nentry = 3;
 
   entry0.settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
   entry0.value = http2conf.upstream.max_concurrent_streams;
@@ -1050,6 +1058,9 @@
     entry1.value = http2conf.upstream.window_size;
   }
 
+  entry2.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  entry2.value = 1;
+
   if (!config->http2_proxy) {
     entrynentry.settings_id = NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL;
     entrynentry.value = 1;
@@ -1317,7 +1328,7 @@
   downstream->pop_downstream_connection();
   // dconn was deleted
   dconn = nullptr;
-  // downstream wil be deleted in on_stream_close_callback.
+  // downstream will be deleted in on_stream_close_callback.
   if (downstream->get_response_state() == DownstreamState::HEADER_COMPLETE) {
     // Server may indicate the end of the request by EOF
     if (LOG_ENABLED(INFO)) {
@@ -2183,7 +2194,7 @@
   // 4 for :method, :scheme, :path and :authority
   nva.reserve(4 + req.fs.headers().size());
 
-  // juse use "GET" for now
+  // just use "GET" for now
   nva.push_back(http2::make_nv_ll(":method", "GET"));
   nva.push_back(http2::make_nv_ls_nocopy(":scheme", scheme));
   nva.push_back(http2::make_nv_ls_nocopy(":path", path));

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

@@ -50,22 +50,6 @@
 namespace shrpx {
 
 namespace {
-void idle_timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto upstream = static_cast<Http3Upstream *>(w->data);
-
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, upstream) << "QUIC idle timeout";
-  }
-
-  upstream->idle_close();
-
-  auto handler = upstream->get_client_handler();
-
-  delete handler;
-}
-} // namespace
-
-namespace {
 void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
   auto upstream = static_cast<Http3Upstream *>(w->data);
 
@@ -116,27 +100,34 @@
 }
 } // namespace
 
+namespace {
+ngtcp2_conn *get_conn(ngtcp2_crypto_conn_ref *conn_ref) {
+  auto conn = static_cast<Connection *>(conn_ref->user_data);
+  auto handler = static_cast<ClientHandler *>(conn->data);
+  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
+  return upstream->get_conn();
+}
+} // namespace
+
 Http3Upstream::Http3Upstream(ClientHandler *handler)
     : handler_{handler},
-      max_udp_payload_size_{SHRPX_QUIC_MAX_UDP_PAYLOAD_SIZE},
       qlog_fd_{-1},
       hashed_scid_{},
       conn_{nullptr},
-      tls_alert_{0},
       httpconn_{nullptr},
       downstream_queue_{downstream_queue_size(handler->get_worker()),
                         !get_config()->http2_proxy},
-      idle_close_{false},
-      retry_close_{false} {
+      retry_close_{false},
+      tx_{
+          .data = std::unique_ptr<uint8_t>(new uint8_t64_k),
+      } {
+  auto conn = handler_->get_connection();
+  conn->conn_ref.get_conn = shrpx::get_conn;
+
   ev_timer_init(&timer_, timeoutcb, 0., 0.);
   timer_.data = this;
 
-  auto config = get_config();
-  auto &quicconf = config->quic;
-
-  ev_timer_init(&idle_timer_, idle_timeoutcb, 0.,
-                quicconf.upstream.timeout.idle);
-  idle_timer_.data = this;
+  ngtcp2_connection_close_error_default(&last_error_);
 
   ev_timer_init(&shutdown_timer_, shutdown_timeout_cb, 0., 0.);
   shutdown_timer_.data = this;
@@ -151,7 +142,6 @@
 
   ev_prepare_stop(loop, &prep_);
   ev_timer_stop(loop, &shutdown_timer_);
-  ev_timer_stop(loop, &idle_timer_);
   ev_timer_stop(loop, &timer_);
 
   nghttp3_conn_del(httpconn_);
@@ -195,9 +185,7 @@
 void Http3Upstream::qlog_write(const void *data, size_t datalen, bool fin) {
   assert(qlog_fd_ != -1);
 
-  ssize_t nwrite;
-
-  while ((nwrite = write(qlog_fd_, data, datalen)) == -1 && errno == EINTR)
+  while (write(qlog_fd_, data, datalen) == -1 && errno == EINTR)
     ;
 
   if (fin) {
@@ -299,7 +287,9 @@
   if (nconsumed < 0) {
     ULOG(ERROR, this) << "nghttp3_conn_read_stream: "
                       << nghttp3_strerror(nconsumed);
-    last_error_ = quic::err_application(nconsumed);
+    ngtcp2_connection_close_error_set_application_error(
+        &last_error_, nghttp3_err_infer_quic_app_error_code(nconsumed), nullptr,
+        0);
     return -1;
   }
 
@@ -343,7 +333,8 @@
     break;
   default:
     ULOG(ERROR, this) << "nghttp3_conn_close_stream: " << nghttp3_strerror(rv);
-    last_error_ = quic::err_application(rv);
+    ngtcp2_connection_close_error_set_application_error(
+        &last_error_, nghttp3_err_infer_quic_app_error_code(rv), nullptr, 0);
     return -1;
   }
 
@@ -488,7 +479,7 @@
     return -1;
   }
 
-  std::array<uint8_t, NGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN> token;
+  std::array<uint8_t, NGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN + 1> token;
   size_t tokenlen;
 
   auto path = ngtcp2_conn_get_path(conn_);
@@ -503,6 +494,10 @@
     return 0;
   }
 
+  assert(tokenlen == NGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN);
+
+  tokentokenlen++ = qkm.id;
+
   auto rv = ngtcp2_conn_submit_new_token(conn_, token.data(), tokenlen);
   if (rv != 0) {
     ULOG(ERROR, this) << "ngtcp2_conn_submit_new_token: "
@@ -513,6 +508,21 @@
   return 0;
 }
 
+namespace {
+int recv_tx_key(ngtcp2_conn *conn, ngtcp2_crypto_level level, void *user_data) {
+  if (level != NGTCP2_CRYPTO_LEVEL_APPLICATION) {
+    return 0;
+  }
+
+  auto upstream = static_cast<Http3Upstream *>(user_data);
+  if (upstream->setup_httpconn() != 0) {
+    return NGTCP2_ERR_CALLBACK_FAILURE;
+  }
+
+  return 0;
+}
+} // namespace
+
 int Http3Upstream::init(const UpstreamAddr *faddr, const Address &remote_addr,
                         const Address &local_addr,
                         const ngtcp2_pkt_hd &initial_hd,
@@ -560,6 +570,9 @@
       nullptr, // lost_datagram
       ngtcp2_crypto_get_path_challenge_data_cb,
       shrpx::stream_stop_sending,
+      nullptr, // version_negotiation
+      nullptr, // recv_rx_key
+      shrpx::recv_tx_key,
   };
 
   auto config = get_config();
@@ -598,10 +611,10 @@
   settings.cc_algo = quicconf.upstream.congestion_controller;
   settings.max_window = http3conf.upstream.max_connection_window_size;
   settings.max_stream_window = http3conf.upstream.max_window_size;
-  settings.max_udp_payload_size = SHRPX_QUIC_MAX_UDP_PAYLOAD_SIZE;
-  settings.assume_symmetric_path = 1;
+  settings.max_tx_udp_payload_size = SHRPX_QUIC_MAX_UDP_PAYLOAD_SIZE;
   settings.rand_ctx.native_handle = &worker->get_randgen();
-  settings.token = ngtcp2_vec{const_cast<uint8_t *>(token), tokenlen};
+  settings.token = token;
+  settings.tokenlen = tokenlen;
 
   ngtcp2_transport_params params;
   ngtcp2_transport_params_default(&params);
@@ -665,8 +678,14 @@
   params.stateless_reset_token_present = 1;
 
   auto path = ngtcp2_path{
-      {local_addr.len, const_cast<sockaddr *>(&local_addr.su.sa)},
-      {remote_addr.len, const_cast<sockaddr *>(&remote_addr.su.sa)},
+      {
+          const_cast<sockaddr *>(&local_addr.su.sa),
+          static_cast<socklen_t>(local_addr.len),
+      },
+      {
+          const_cast<sockaddr *>(&remote_addr.su.sa),
+          static_cast<socklen_t>(remote_addr.len),
+      },
       const_cast<UpstreamAddr *>(faddr),
   };
 
@@ -696,6 +715,19 @@
 int Http3Upstream::on_read() { return 0; }
 
 int Http3Upstream::on_write() {
+  int rv;
+
+  if (tx_.send_blocked) {
+    rv = send_blocked_packet();
+    if (rv != 0) {
+      return -1;
+    }
+
+    if (tx_.send_blocked) {
+      return 0;
+    }
+  }
+
   if (write_streams() != 0) {
     return -1;
   }
@@ -707,29 +739,23 @@
 
 int Http3Upstream::write_streams() {
   std::array<nghttp3_vec, 16> vec;
-  std::array<uint8_t, 64_k> buf;
-  auto max_udp_payload_size = std::min(
-      max_udp_payload_size_, ngtcp2_conn_get_path_max_udp_payload_size(conn_));
-  size_t max_pktcnt =
-      std::min(static_cast<size_t>(64_k), ngtcp2_conn_get_send_quantum(conn_)) /
-      max_udp_payload_size;
-  ngtcp2_pkt_info pi;
-  uint8_t *bufpos = buf.data();
+  auto max_udp_payload_size = ngtcp2_conn_get_max_tx_udp_payload_size(conn_);
+#ifdef UDP_SEGMENT
+  auto path_max_udp_payload_size =
+      ngtcp2_conn_get_path_max_tx_udp_payload_size(conn_);
+#endif // UDP_SEGMENT
+  auto max_pktcnt = ngtcp2_conn_get_send_quantum(conn_) / max_udp_payload_size;
+  ngtcp2_pkt_info pi, prev_pi;
+  uint8_t *bufpos = tx_.data.get();
   ngtcp2_path_storage ps, prev_ps;
   size_t pktcnt = 0;
   int rv;
+  size_t gso_size = 0;
   auto ts = quic_timestamp();
 
   ngtcp2_path_storage_zero(&ps);
   ngtcp2_path_storage_zero(&prev_ps);
 
-  auto config = get_config();
-  auto &quicconf = config->quic;
-
-  if (quicconf.upstream.congestion_controller != NGTCP2_CC_ALGO_BBR) {
-    max_pktcnt = std::min(max_pktcnt, static_cast<size_t>(10));
-  }
-
   for (;;) {
     int64_t stream_id = -1;
     int fin = 0;
@@ -741,7 +767,9 @@
       if (sveccnt < 0) {
         ULOG(ERROR, this) << "nghttp3_conn_writev_stream: "
                           << nghttp3_strerror(sveccnt);
-        last_error_ = quic::err_application(sveccnt);
+        ngtcp2_connection_close_error_set_application_error(
+            &last_error_, nghttp3_err_infer_quic_app_error_code(sveccnt),
+            nullptr, 0);
         return handle_error();
       }
     }
@@ -762,23 +790,11 @@
       switch (nwrite) {
       case NGTCP2_ERR_STREAM_DATA_BLOCKED:
         assert(ndatalen == -1);
-        rv = nghttp3_conn_block_stream(httpconn_, stream_id);
-        if (rv != 0) {
-          ULOG(ERROR, this)
-              << "nghttp3_conn_block_stream: " << nghttp3_strerror(rv);
-          last_error_ = quic::err_application(rv);
-          return handle_error();
-        }
+        nghttp3_conn_block_stream(httpconn_, stream_id);
         continue;
       case NGTCP2_ERR_STREAM_SHUT_WR:
         assert(ndatalen == -1);
-        rv = nghttp3_conn_shutdown_stream_write(httpconn_, stream_id);
-        if (rv != 0) {
-          ULOG(ERROR, this)
-              << "nghttp3_conn_shutdown_stream_write: " << nghttp3_strerror(rv);
-          last_error_ = quic::err_application(rv);
-          return handle_error();
-        }
+        nghttp3_conn_shutdown_stream_write(httpconn_, stream_id);
         continue;
       case NGTCP2_ERR_WRITE_MORE:
         assert(ndatalen >= 0);
@@ -786,7 +802,9 @@
         if (rv != 0) {
           ULOG(ERROR, this)
               << "nghttp3_conn_add_write_offset: " << nghttp3_strerror(rv);
-          last_error_ = quic::err_application(rv);
+          ngtcp2_connection_close_error_set_application_error(
+              &last_error_, nghttp3_err_infer_quic_app_error_code(rv), nullptr,
+              0);
           return handle_error();
         }
         continue;
@@ -797,9 +815,8 @@
       ULOG(ERROR, this) << "ngtcp2_conn_writev_stream: "
                         << ngtcp2_strerror(nwrite);
 
-      last_error_ = quic::err_transport(nwrite);
-
-      handler_->get_connection()->wlimit.stopw();
+      ngtcp2_connection_close_error_set_transport_error_liberr(
+          &last_error_, nwrite, nullptr, 0);
 
       return handle_error();
     } else if (ndatalen >= 0) {
@@ -807,19 +824,33 @@
       if (rv != 0) {
         ULOG(ERROR, this) << "nghttp3_conn_add_write_offset: "
                           << nghttp3_strerror(rv);
-        last_error_ = quic::err_application(rv);
+        ngtcp2_connection_close_error_set_application_error(
+            &last_error_, nghttp3_err_infer_quic_app_error_code(rv), nullptr,
+            0);
         return handle_error();
       }
     }
 
     if (nwrite == 0) {
-      if (bufpos - buf.data()) {
-        send_packet(static_cast<UpstreamAddr *>(prev_ps.path.user_data),
-                    prev_ps.path.remote.addr, prev_ps.path.remote.addrlen,
-                    prev_ps.path.local.addr, prev_ps.path.local.addrlen,
-                    buf.data(), bufpos - buf.data(), max_udp_payload_size);
+      if (bufpos - tx_.data.get()) {
+        auto faddr = static_cast<UpstreamAddr *>(prev_ps.path.user_data);
+        auto data = tx_.data.get();
+        auto datalen = bufpos - data;
+
+        rv = send_packet(faddr, prev_ps.path.remote.addr,
+                         prev_ps.path.remote.addrlen, prev_ps.path.local.addr,
+                         prev_ps.path.local.addrlen, prev_pi, data, datalen,
+                         gso_size);
+        if (rv == SHRPX_ERR_SEND_BLOCKED) {
+          on_send_blocked(faddr, prev_ps.path.remote, prev_ps.path.local,
+                          prev_pi, data, datalen, gso_size);
 
-        reset_idle_timer();
+          ngtcp2_conn_update_pkt_tx_time(conn_, ts);
+
+          signal_write_upstream_addr(faddr);
+
+          return 0;
+        }
       }
 
       ngtcp2_conn_update_pkt_tx_time(conn_, ts);
@@ -834,55 +865,101 @@
 #ifdef UDP_SEGMENT
     if (pktcnt == 0) {
       ngtcp2_path_copy(&prev_ps.path, &ps.path);
-    } else if (!ngtcp2_path_eq(&prev_ps.path, &ps.path)) {
-      send_packet(static_cast<UpstreamAddr *>(prev_ps.path.user_data),
-                  prev_ps.path.remote.addr, prev_ps.path.remote.addrlen,
-                  prev_ps.path.local.addr, prev_ps.path.local.addrlen,
-                  buf.data(), bufpos - buf.data() - nwrite,
-                  max_udp_payload_size);
-
-      send_packet(static_cast<UpstreamAddr *>(ps.path.user_data),
-                  ps.path.remote.addr, ps.path.remote.addrlen,
-                  ps.path.local.addr, ps.path.local.addrlen, bufpos - nwrite,
-                  nwrite, max_udp_payload_size);
+      prev_pi = pi;
+      gso_size = nwrite;
+    } else if (!ngtcp2_path_eq(&prev_ps.path, &ps.path) ||
+               prev_pi.ecn != pi.ecn ||
+               static_cast<size_t>(nwrite) > gso_size ||
+               (gso_size > path_max_udp_payload_size &&
+                static_cast<size_t>(nwrite) != gso_size)) {
+      auto faddr = static_cast<UpstreamAddr *>(prev_ps.path.user_data);
+      auto data = tx_.data.get();
+      auto datalen = bufpos - data - nwrite;
+
+      rv = send_packet(faddr, prev_ps.path.remote.addr,
+                       prev_ps.path.remote.addrlen, prev_ps.path.local.addr,
+                       prev_ps.path.local.addrlen, prev_pi, data, datalen,
+                       gso_size);
+      switch (rv) {
+      case SHRPX_ERR_SEND_BLOCKED:
+        on_send_blocked(faddr, prev_ps.path.remote, prev_ps.path.local, prev_pi,
+                        data, datalen, gso_size);
+
+        on_send_blocked(static_cast<UpstreamAddr *>(ps.path.user_data),
+                        ps.path.remote, ps.path.local, pi, bufpos - nwrite,
+                        nwrite, 0);
+
+        signal_write_upstream_addr(faddr);
+
+        break;
+      default: {
+        auto faddr = static_cast<UpstreamAddr *>(ps.path.user_data);
+        auto data = bufpos - nwrite;
+
+        rv = send_packet(faddr, ps.path.remote.addr, ps.path.remote.addrlen,
+                         ps.path.local.addr, ps.path.local.addrlen, pi, data,
+                         nwrite, 0);
+        if (rv == SHRPX_ERR_SEND_BLOCKED) {
+          on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data,
+                          nwrite, 0);
+        }
 
-      ngtcp2_conn_update_pkt_tx_time(conn_, ts);
-      reset_idle_timer();
+        signal_write_upstream_addr(faddr);
+      }
+      }
 
-      handler_->signal_write();
+      ngtcp2_conn_update_pkt_tx_time(conn_, ts);
 
       return 0;
     }
 
-    if (++pktcnt == max_pktcnt ||
-        static_cast<size_t>(nwrite) < max_udp_payload_size) {
-      send_packet(static_cast<UpstreamAddr *>(ps.path.user_data),
-                  ps.path.remote.addr, ps.path.remote.addrlen,
-                  ps.path.local.addr, ps.path.local.addrlen, buf.data(),
-                  bufpos - buf.data(), max_udp_payload_size);
+    if (++pktcnt == max_pktcnt || static_cast<size_t>(nwrite) < gso_size) {
+      auto faddr = static_cast<UpstreamAddr *>(ps.path.user_data);
+      auto data = tx_.data.get();
+      auto datalen = bufpos - data;
+
+      rv = send_packet(faddr, ps.path.remote.addr, ps.path.remote.addrlen,
+                       ps.path.local.addr, ps.path.local.addrlen, pi, data,
+                       datalen, gso_size);
+      if (rv == SHRPX_ERR_SEND_BLOCKED) {
+        on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data, datalen,
+                        gso_size);
+      }
 
       ngtcp2_conn_update_pkt_tx_time(conn_, ts);
-      reset_idle_timer();
 
-      handler_->signal_write();
+      signal_write_upstream_addr(faddr);
 
       return 0;
     }
 #else  // !UDP_SEGMENT
-    send_packet(static_cast<UpstreamAddr *>(ps.path.user_data),
-                ps.path.remote.addr, ps.path.remote.addrlen, ps.path.local.addr,
-                ps.path.local.addrlen, buf.data(), bufpos - buf.data(), 0);
+    auto faddr = static_cast<UpstreamAddr *>(ps.path.user_data);
+    auto data = tx_.data.get();
+    auto datalen = bufpos - data;
+
+    rv = send_packet(faddr, ps.path.remote.addr, ps.path.remote.addrlen,
+                     ps.path.local.addr, ps.path.local.addrlen, pi, data,
+                     datalen, 0);
+    if (rv == SHRPX_ERR_SEND_BLOCKED) {
+      on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data, datalen,
+                      0);
+
+      ngtcp2_conn_update_pkt_tx_time(conn_, ts);
+
+      signal_write_upstream_addr(faddr);
+
+      return 0;
+    }
 
     if (++pktcnt == max_pktcnt) {
       ngtcp2_conn_update_pkt_tx_time(conn_, ts);
-      reset_idle_timer();
 
-      handler_->signal_write();
+      signal_write_upstream_addr(faddr);
 
       return 0;
     }
 
-    bufpos = buf.data();
+    bufpos = tx_.data.get();
 #endif // !UDP_SEGMENT
   }
 
@@ -908,15 +985,8 @@
 
 int Http3Upstream::on_downstream_abort_request_with_https_redirect(
     Downstream *downstream) {
-  int rv;
-
-  rv = redirect_to_https(downstream);
-  if (rv != 0) {
-    return -1;
-  }
-
-  handler_->signal_write();
-  return 0;
+  assert(0);
+  abort();
 }
 
 namespace {
@@ -1016,7 +1086,7 @@
   downstream->pop_downstream_connection();
   // dconn was deleted
   dconn = nullptr;
-  // downstream wil be deleted in on_stream_close_callback.
+  // downstream will be deleted in on_stream_close_callback.
   if (downstream->get_response_state() == DownstreamState::HEADER_COMPLETE) {
     // Server may indicate the end of the request by EOF
     if (LOG_ENABLED(INFO)) {
@@ -1028,7 +1098,9 @@
     // downstream_read_data_callback to send RST_STREAM after pending
     // response body is sent. This is needed to ensure that RST_STREAM
     // is sent after all pending data are sent.
-    on_downstream_body_complete(downstream);
+    if (on_downstream_body_complete(downstream) != 0) {
+      return -1;
+    }
   } else if (downstream->get_response_state() !=
              DownstreamState::MSG_COMPLETE) {
     // If stream was not closed, then we set MSG_COMPLETE and let
@@ -1072,7 +1144,9 @@
   } else {
     if (downstream->get_response_state() == DownstreamState::HEADER_COMPLETE) {
       if (downstream->get_upgraded()) {
-        on_downstream_body_complete(downstream);
+        if (on_downstream_body_complete(downstream) != 0) {
+          return -1;
+        }
       } else {
         shutdown_stream(downstream, NGHTTP3_H3_INTERNAL_ERROR);
       }
@@ -1115,9 +1189,8 @@
 
   assert(body);
 
-  if (downstream->get_response_state() == DownstreamState::MSG_COMPLETE) {
-    *pflags |= NGHTTP3_DATA_FLAG_EOF;
-  } else if (body->rleft_mark() == 0) {
+  if (downstream->get_response_state() != DownstreamState::MSG_COMPLETE &&
+      body->rleft_mark() == 0) {
     downstream->disable_upstream_wtimer();
     return NGHTTP3_ERR_WOULDBLOCK;
   }
@@ -1126,6 +1199,11 @@
 
   veccnt = body->riovec_mark(reinterpret_cast<struct iovec *>(vec), veccnt);
 
+  if (downstream->get_response_state() == DownstreamState::MSG_COMPLETE &&
+      body->rleft_mark() == 0) {
+    *pflags |= NGHTTP3_DATA_FLAG_EOF;
+  }
+
   assert((*pflags & NGHTTP3_DATA_FLAG_EOF) || veccnt);
 
   downstream->response_sent_body_length += nghttp3_vec_len(vec, veccnt);
@@ -1359,6 +1437,24 @@
     return 0;
   }
 
+  if (!downstream->get_upgraded()) {
+    const auto &trailers = resp.fs.trailers();
+    if (!trailers.empty()) {
+      std::vector<nghttp3_nv> nva;
+      nva.reserve(trailers.size());
+      http3::copy_headers_to_nva_nocopy(nva, trailers, http2::HDOP_STRIP_ALL);
+      if (!nva.empty()) {
+        auto rv = nghttp3_conn_submit_trailers(
+            httpconn_, downstream->get_stream_id(), nva.data(), nva.size());
+        if (rv != 0) {
+          ULOG(FATAL, this) << "nghttp3_conn_submit_trailers() failed: "
+                            << nghttp3_strerror(rv);
+          return -1;
+        }
+      }
+    }
+  }
+
   nghttp3_conn_resume_stream(httpconn_, downstream->get_stream_id());
   downstream->ensure_upstream_wtimer();
 
@@ -1384,7 +1480,9 @@
     quic_conn_handler->remove_connection_id(cid);
   }
 
-  if (idle_close_ || retry_close_) {
+  if (retry_close_ ||
+      last_error_.type ==
+          NGTCP2_CONNECTION_CLOSE_ERROR_CODE_TYPE_TRANSPORT_IDLE_CLOSE) {
     return;
   }
 
@@ -1397,9 +1495,12 @@
 
     ngtcp2_path_storage_zero(&ps);
 
+    ngtcp2_connection_close_error ccerr;
+    ngtcp2_connection_close_error_default(&ccerr);
+
     auto nwrite = ngtcp2_conn_write_connection_close(
-        conn_, &ps.path, &pi, conn_close_.data(), conn_close_.size(),
-        NGTCP2_NO_ERROR, quic_timestamp());
+        conn_, &ps.path, &pi, conn_close_.data(), conn_close_.size(), &ccerr,
+        quic_timestamp());
     if (nwrite < 0) {
       if (nwrite != NGTCP2_ERR_INVALID_STATE) {
         ULOG(ERROR, this) << "ngtcp2_conn_write_connection_close: "
@@ -1413,7 +1514,7 @@
 
     send_packet(static_cast<UpstreamAddr *>(ps.path.user_data),
                 ps.path.remote.addr, ps.path.remote.addrlen, ps.path.local.addr,
-                ps.path.local.addrlen, conn_close_.data(), nwrite, 0);
+                ps.path.local.addrlen, pi, conn_close_.data(), nwrite, 0);
   }
 
   auto d =
@@ -1497,10 +1598,11 @@
 
 fail:
   if (rv == SHRPX_ERR_TLS_REQUIRED) {
-    rv = on_downstream_abort_request_with_https_redirect(downstream);
-  } else {
-    rv = on_downstream_abort_request(downstream, 502);
+    assert(0);
+    abort();
   }
+
+  rv = on_downstream_abort_request(downstream, 502);
   if (rv != 0) {
     shutdown_stream(downstream, NGHTTP3_H3_INTERNAL_ERROR);
   }
@@ -1632,19 +1734,18 @@
 
 int Http3Upstream::on_read(const UpstreamAddr *faddr,
                            const Address &remote_addr,
-                           const Address &local_addr, const uint8_t *data,
-                           size_t datalen) {
+                           const Address &local_addr, const ngtcp2_pkt_info &pi,
+                           const uint8_t *data, size_t datalen) {
   int rv;
-  ngtcp2_pkt_info pi{};
 
   auto path = ngtcp2_path{
       {
-          local_addr.len,
           const_cast<sockaddr *>(&local_addr.su.sa),
+          static_cast<socklen_t>(local_addr.len),
       },
       {
-          remote_addr.len,
           const_cast<sockaddr *>(&remote_addr.su.sa),
+          static_cast<socklen_t>(remote_addr.len),
       },
       const_cast<UpstreamAddr *>(faddr),
   };
@@ -1658,13 +1759,10 @@
       auto worker = handler_->get_worker();
       auto quic_conn_handler = worker->get_quic_connection_handler();
 
-      uint32_t version;
-      const uint8_t *dcid, *scid;
-      size_t dcidlen, scidlen;
+      ngtcp2_version_cid vc;
 
-      rv = ngtcp2_pkt_decode_version_cid(&version, &dcid, &dcidlen, &scid,
-                                         &scidlen, data, datalen,
-                                         SHRPX_QUIC_SCIDLEN);
+      rv =
+          ngtcp2_pkt_decode_version_cid(&vc, data, datalen, SHRPX_QUIC_SCIDLEN);
       if (rv != 0) {
         return -1;
       }
@@ -1672,37 +1770,36 @@
       if (worker->get_graceful_shutdown()) {
         ngtcp2_cid ini_dcid, ini_scid;
 
-        ngtcp2_cid_init(&ini_dcid, dcid, dcidlen);
-        ngtcp2_cid_init(&ini_scid, scid, scidlen);
+        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, version, ini_dcid, ini_scid, remote_addr, local_addr,
-            NGTCP2_CONNECTION_REFUSED);
+            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(), version,
-                                    dcid, dcidlen, scid, scidlen, remote_addr,
-                                    local_addr);
+      quic_conn_handler->send_retry(handler_->get_upstream_addr(), vc.version,
+                                    vc.dcid, vc.dcidlen, vc.scid, vc.scidlen,
+                                    remote_addr, local_addr, datalen * 3);
 
       return -1;
     }
-    case NGTCP2_ERR_REQUIRED_TRANSPORT_PARAM:
-    case NGTCP2_ERR_MALFORMED_TRANSPORT_PARAM:
-    case NGTCP2_ERR_TRANSPORT_PARAM:
-      // If rv indicates transport_parameters related error, we should
-      // send TRANSPORT_PARAMETER_ERROR even if last_error_.code is
-      // already set.  This is because OpenSSL might set Alert.
-      last_error_ = quic::err_transport(rv);
+    case NGTCP2_ERR_CRYPTO:
+      if (!last_error_.error_code) {
+        ngtcp2_connection_close_error_set_transport_error_tls_alert(
+            &last_error_, ngtcp2_conn_get_tls_alert(conn_), nullptr, 0);
+      }
       break;
     case NGTCP2_ERR_DROP_CONN:
       return -1;
     default:
-      if (!last_error_.code) {
-        last_error_ = quic::err_transport(rv);
+      if (!last_error_.error_code) {
+        ngtcp2_connection_close_error_set_transport_error_liberr(
+            &last_error_, rv, nullptr, 0);
       }
     }
 
@@ -1711,18 +1808,16 @@
     return handle_error();
   }
 
-  reset_idle_timer();
-
   return 0;
 }
 
 int Http3Upstream::send_packet(const UpstreamAddr *faddr,
                                const sockaddr *remote_sa, size_t remote_salen,
                                const sockaddr *local_sa, size_t local_salen,
-                               const uint8_t *data, size_t datalen,
-                               size_t gso_size) {
+                               const ngtcp2_pkt_info &pi, const uint8_t *data,
+                               size_t datalen, size_t gso_size) {
   auto rv = quic_send_packet(faddr, remote_sa, remote_salen, local_sa,
-                             local_salen, data, datalen, gso_size);
+                             local_salen, pi, data, datalen, gso_size);
   switch (rv) {
   case 0:
     return 0;
@@ -1730,8 +1825,13 @@
     // large.
   case -EINVAL:
   case -EMSGSIZE:
-    max_udp_payload_size_ = NGTCP2_MAX_UDP_PAYLOAD_SIZE;
+    // Let the packet lost.
     break;
+  case -EAGAIN:
+#if EAGAIN != EWOULDBLOCK
+  case -EWOULDBLOCK:
+#endif // EAGAIN != EWOULDBLOCK
+    return SHRPX_ERR_SEND_BLOCKED;
   default:
     break;
   }
@@ -1739,91 +1839,106 @@
   return -1;
 }
 
-int Http3Upstream::handle_error() {
-  if (ngtcp2_conn_is_in_closing_period(conn_)) {
-    return -1;
-  }
+void Http3Upstream::on_send_blocked(const UpstreamAddr *faddr,
+                                    const ngtcp2_addr &remote_addr,
+                                    const ngtcp2_addr &local_addr,
+                                    const ngtcp2_pkt_info &pi,
+                                    const uint8_t *data, size_t datalen,
+                                    size_t gso_size) {
+  assert(tx_.num_blocked || !tx_.send_blocked);
+  assert(tx_.num_blocked < 2);
 
-  ngtcp2_path_storage ps;
-  ngtcp2_pkt_info pi;
+  tx_.send_blocked = true;
 
-  ngtcp2_path_storage_zero(&ps);
+  auto &p = tx_.blockedtx_.num_blocked++;
 
-  auto ts = quic_timestamp();
+  memcpy(&p.local_addr.su, local_addr.addr, local_addr.addrlen);
+  memcpy(&p.remote_addr.su, remote_addr.addr, remote_addr.addrlen);
 
-  conn_close_.resize(SHRPX_QUIC_CONN_CLOSE_PKTLEN);
+  p.local_addr.len = local_addr.addrlen;
+  p.remote_addr.len = remote_addr.addrlen;
+  p.faddr = faddr;
+  p.pi = pi;
+  p.data = data;
+  p.datalen = datalen;
+  p.gso_size = gso_size;
+}
 
-  ngtcp2_ssize nwrite;
+int Http3Upstream::send_blocked_packet() {
+  int rv;
 
-  if (last_error_.type == quic::ErrorType::Transport) {
-    nwrite = ngtcp2_conn_write_connection_close(
-        conn_, &ps.path, &pi, conn_close_.data(), conn_close_.size(),
-        last_error_.code, ts);
-    if (nwrite < 0) {
-      ULOG(ERROR, this) << "ngtcp2_conn_write_connection_close: "
-                        << ngtcp2_strerror(nwrite);
-      return -1;
-    }
-  } else {
-    nwrite = ngtcp2_conn_write_application_close(
-        conn_, &ps.path, &pi, conn_close_.data(), conn_close_.size(),
-        last_error_.code, ts);
-    if (nwrite < 0) {
-      ULOG(ERROR, this) << "ngtcp2_conn_write_application_close: "
-                        << ngtcp2_strerror(nwrite);
-      return -1;
+  assert(tx_.send_blocked);
+
+  for (; tx_.num_blocked_sent < tx_.num_blocked; ++tx_.num_blocked_sent) {
+    auto &p = tx_.blockedtx_.num_blocked_sent;
+
+    rv = send_packet(p.faddr, &p.remote_addr.su.sa, p.remote_addr.len,
+                     &p.local_addr.su.sa, p.local_addr.len, p.pi, p.data,
+                     p.datalen, p.gso_size);
+    if (rv == SHRPX_ERR_SEND_BLOCKED) {
+      signal_write_upstream_addr(p.faddr);
+
+      return 0;
     }
   }
 
-  conn_close_.resize(nwrite);
-
-  send_packet(static_cast<UpstreamAddr *>(ps.path.user_data),
-              ps.path.remote.addr, ps.path.remote.addrlen, ps.path.local.addr,
-              ps.path.local.addrlen, conn_close_.data(), nwrite, 0);
+  tx_.send_blocked = false;
+  tx_.num_blocked = 0;
+  tx_.num_blocked_sent = 0;
 
-  return -1;
+  return 0;
 }
 
-int Http3Upstream::on_rx_secret(ngtcp2_crypto_level level,
-                                const uint8_t *secret, size_t secretlen) {
-  if (ngtcp2_crypto_derive_and_install_rx_key(conn_, nullptr, nullptr, nullptr,
-                                              level, secret, secretlen) != 0) {
-    ULOG(ERROR, this) << "ngtcp2_crypto_derive_and_install_rx_key failed";
-    return -1;
+void Http3Upstream::signal_write_upstream_addr(const UpstreamAddr *faddr) {
+  auto conn = handler_->get_connection();
+
+  if (faddr->fd != conn->wev.fd) {
+    if (ev_is_active(&conn->wev)) {
+      ev_io_stop(handler_->get_loop(), &conn->wev);
+    }
+
+    ev_io_set(&conn->wev, faddr->fd, EV_WRITE);
   }
 
-  return 0;
+  conn->wlimit.startw();
 }
 
-int Http3Upstream::on_tx_secret(ngtcp2_crypto_level level,
-                                const uint8_t *secret, size_t secretlen) {
-  if (ngtcp2_crypto_derive_and_install_tx_key(conn_, nullptr, nullptr, nullptr,
-                                              level, secret, secretlen) != 0) {
-    ULOG(ERROR, this) << "ngtcp2_crypto_derive_and_install_tx_key failed";
+int Http3Upstream::handle_error() {
+  if (ngtcp2_conn_is_in_closing_period(conn_) ||
+      ngtcp2_conn_is_in_draining_period(conn_)) {
     return -1;
   }
 
-  if (level == NGTCP2_CRYPTO_LEVEL_APPLICATION && setup_httpconn() != 0) {
+  ngtcp2_path_storage ps;
+  ngtcp2_pkt_info pi;
+
+  ngtcp2_path_storage_zero(&ps);
+
+  auto ts = quic_timestamp();
+
+  conn_close_.resize(SHRPX_QUIC_CONN_CLOSE_PKTLEN);
+
+  auto nwrite = ngtcp2_conn_write_connection_close(
+      conn_, &ps.path, &pi, conn_close_.data(), conn_close_.size(),
+      &last_error_, ts);
+  if (nwrite < 0) {
+    ULOG(ERROR, this) << "ngtcp2_conn_write_connection_close: "
+                      << ngtcp2_strerror(nwrite);
     return -1;
   }
 
-  return 0;
-}
-
-int Http3Upstream::add_crypto_data(ngtcp2_crypto_level level,
-                                   const uint8_t *data, size_t datalen) {
-  int rv = ngtcp2_conn_submit_crypto_data(conn_, level, data, datalen);
+  conn_close_.resize(nwrite);
 
-  if (rv != 0) {
-    ULOG(ERROR, this) << "ngtcp2_conn_submit_crypto_data: "
-                      << ngtcp2_strerror(rv);
+  if (nwrite == 0) {
     return -1;
   }
 
-  return 0;
-}
+  send_packet(static_cast<UpstreamAddr *>(ps.path.user_data),
+              ps.path.remote.addr, ps.path.remote.addrlen, ps.path.local.addr,
+              ps.path.local.addrlen, pi, conn_close_.data(), nwrite, 0);
 
-void Http3Upstream::set_tls_alert(uint8_t alert) { tls_alert_ = alert; }
+  return -1;
+}
 
 int Http3Upstream::handle_expiry() {
   int rv;
@@ -1832,34 +1947,32 @@
 
   rv = ngtcp2_conn_handle_expiry(conn_, ts);
   if (rv != 0) {
-    ULOG(ERROR, this) << "ngtcp2_conn_handle_expiry: " << ngtcp2_strerror(rv);
-    last_error_ = quic::err_transport(rv);
+    if (rv == NGTCP2_ERR_IDLE_CLOSE) {
+      ULOG(INFO, this) << "Idle connection timeout";
+    } else {
+      ULOG(ERROR, this) << "ngtcp2_conn_handle_expiry: " << ngtcp2_strerror(rv);
+    }
+    ngtcp2_connection_close_error_set_transport_error_liberr(&last_error_, rv,
+                                                             nullptr, 0);
     return handle_error();
   }
 
   return 0;
 }
 
-void Http3Upstream::reset_idle_timer() {
-  auto ts = quic_timestamp();
-  auto idle_ts = ngtcp2_conn_get_idle_expiry(conn_);
-
-  idle_timer_.repeat =
-      idle_ts > ts ? static_cast<ev_tstamp>(idle_ts - ts) / NGTCP2_SECONDS
-                   : 1e-9;
-
-  ev_timer_again(handler_->get_loop(), &idle_timer_);
-}
-
 void Http3Upstream::reset_timer() {
   auto ts = quic_timestamp();
   auto expiry_ts = ngtcp2_conn_get_expiry(conn_);
+  auto loop = handler_->get_loop();
+
+  if (expiry_ts <= ts) {
+    ev_feed_event(loop, &timer_, EV_TIMER);
+    return;
+  }
 
-  timer_.repeat = expiry_ts > ts
-                      ? static_cast<ev_tstamp>(expiry_ts - ts) / NGTCP2_SECONDS
-                      : 1e-9;
+  timer_.repeat = static_cast<ev_tstamp>(expiry_ts - ts) / NGTCP2_SECONDS;
 
-  ev_timer_again(handler_->get_loop(), &timer_);
+  ev_timer_again(loop, &timer_);
 }
 
 namespace {
@@ -1937,8 +2050,29 @@
     return 0;
   }
 
-  if (upstream->http_recv_request_header(downstream, token, name, value,
-                                         flags) != 0) {
+  if (upstream->http_recv_request_header(downstream, token, name, value, flags,
+                                         /* trailer = */ false) != 0) {
+    return NGHTTP3_ERR_CALLBACK_FAILURE;
+  }
+
+  return 0;
+}
+} // namespace
+
+namespace {
+int http_recv_request_trailer(nghttp3_conn *conn, int64_t stream_id,
+                              int32_t token, nghttp3_rcbuf *name,
+                              nghttp3_rcbuf *value, uint8_t flags,
+                              void *user_data, void *stream_user_data) {
+  auto upstream = static_cast<Http3Upstream *>(user_data);
+  auto downstream = static_cast<Downstream *>(stream_user_data);
+
+  if (!downstream || downstream->get_stop_reading()) {
+    return 0;
+  }
+
+  if (upstream->http_recv_request_header(downstream, token, name, value, flags,
+                                         /* trailer = */ true) != 0) {
     return NGHTTP3_ERR_CALLBACK_FAILURE;
   }
 
@@ -1949,8 +2083,8 @@
 int Http3Upstream::http_recv_request_header(Downstream *downstream,
                                             int32_t h3token,
                                             nghttp3_rcbuf *name,
-                                            nghttp3_rcbuf *value,
-                                            uint8_t flags) {
+                                            nghttp3_rcbuf *value, uint8_t flags,
+                                            bool trailer) {
   auto namebuf = nghttp3_rcbuf_get_buf(name);
   auto valuebuf = nghttp3_rcbuf_get_buf(value);
   auto &req = downstream->request();
@@ -1972,8 +2106,13 @@
                        << ", num=" << req.fs.num_fields() + 1;
     }
 
+    // just ignore if this is a trailer part.
+    if (trailer) {
+      return 0;
+    }
+
     if (error_reply(downstream, 431) != 0) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+      return -1;
     }
 
     return 0;
@@ -1985,6 +2124,13 @@
   downstream->add_rcbuf(name);
   downstream->add_rcbuf(value);
 
+  if (trailer) {
+    req.fs.add_trailer_token(StringRef{namebuf.base, namebuf.len},
+                             StringRef{valuebuf.base, valuebuf.len}, no_index,
+                             token);
+    return 0;
+  }
+
   req.fs.add_header_token(StringRef{namebuf.base, namebuf.len},
                           StringRef{valuebuf.base, valuebuf.len}, no_index,
                           token);
@@ -1992,7 +2138,7 @@
 }
 
 namespace {
-int http_end_request_headers(nghttp3_conn *conn, int64_t stream_id,
+int http_end_request_headers(nghttp3_conn *conn, int64_t stream_id, int fin,
                              void *user_data, void *stream_user_data) {
   auto upstream = static_cast<Http3Upstream *>(user_data);
   auto handler = upstream->get_client_handler();
@@ -2002,7 +2148,7 @@
     return 0;
   }
 
-  if (upstream->http_end_request_headers(downstream) != 0) {
+  if (upstream->http_end_request_headers(downstream, fin) != 0) {
     return NGHTTP3_ERR_CALLBACK_FAILURE;
   }
 
@@ -2013,7 +2159,7 @@
 }
 } // namespace
 
-int Http3Upstream::http_end_request_headers(Downstream *downstream) {
+int Http3Upstream::http_end_request_headers(Downstream *downstream, int fin) {
   auto lgconf = log_config();
   lgconf->update_tstamp(std::chrono::system_clock::now());
   auto &req = downstream->request();
@@ -2041,11 +2187,11 @@
 
   auto content_length = req.fs.header(http2::HD_CONTENT_LENGTH);
   if (content_length) {
-    // libnghttp2 guarantees this can be parsed
+    // libnghttp3 guarantees this can be parsed
     req.fs.content_length = util::parse_uint(content_length->value);
   }
 
-  // presence of mandatory header fields are guaranteed by libnghttp2.
+  // presence of mandatory header fields are guaranteed by libnghttp3.
   auto authority = req.fs.header(http2::HD__AUTHORITY);
   auto path = req.fs.header(http2::HD__PATH);
   auto method = req.fs.header(http2::HD__METHOD);
@@ -2054,7 +2200,7 @@
   auto method_token = http2::lookup_method_token(method->value);
   if (method_token == -1) {
     if (error_reply(downstream, 501) != 0) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+      return -1;
     }
     return 0;
   }
@@ -2066,7 +2212,7 @@
   // For HTTP/2 proxy, we require :authority.
   if (method_token != HTTP_CONNECT && config->http2_proxy &&
       faddr->alt_mode == UpstreamAltMode::NONE && !authority) {
-    shutdown_stream(downstream, NGHTTP2_PROTOCOL_ERROR);
+    shutdown_stream(downstream, NGHTTP3_H3_GENERAL_PROTOCOL_ERROR);
     return 0;
   }
 
@@ -2102,29 +2248,37 @@
   if (connect_proto) {
     if (connect_proto->value != "websocket") {
       if (error_reply(downstream, 400) != 0) {
-        return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+        return -1;
       }
       return 0;
     }
     req.connect_proto = ConnectProto::WEBSOCKET;
   }
 
-  // We are not sure that request has body or not at the moment.
-  req.http2_expect_body = true;
+  if (!fin) {
+    req.http2_expect_body = true;
+  } else if (req.fs.content_length == -1) {
+    req.fs.content_length = 0;
+  }
 
   downstream->inspect_http2_request();
 
   downstream->set_request_state(DownstreamState::HEADER_COMPLETE);
 
+  if (config->http.require_http_scheme &&
+      !http::check_http_scheme(req.scheme, /* encrypted = */ true)) {
+    if (error_reply(downstream, 400) != 0) {
+      return -1;
+    }
+  }
+
 #ifdef HAVE_MRUBY
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto worker = handler->get_worker();
+  auto worker = handler_->get_worker();
   auto mruby_ctx = worker->get_mruby_context();
 
   if (mruby_ctx->run_on_request_proc(downstream) != 0) {
     if (error_reply(downstream, 500) != 0) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+      return -1;
     }
     return 0;
   }
@@ -2151,16 +2305,19 @@
 void Http3Upstream::initiate_downstream(Downstream *downstream) {
   int rv;
 
+#ifdef HAVE_MRUBY
   DownstreamConnection *dconn_ptr;
+#endif // HAVE_MRUBY
 
   for (;;) {
     auto dconn = handler_->get_downstream_connection(rv, downstream);
     if (!dconn) {
       if (rv == SHRPX_ERR_TLS_REQUIRED) {
-        rv = redirect_to_https(downstream);
-      } else {
-        rv = error_reply(downstream, 502);
+        assert(0);
+        abort();
       }
+
+      rv = error_reply(downstream, 502);
       if (rv != 0) {
         shutdown_stream(downstream, NGHTTP3_H3_INTERNAL_ERROR);
       }
@@ -2277,7 +2434,7 @@
 
   if (downstream->end_upload_data() != 0) {
     if (downstream->get_response_state() != DownstreamState::MSG_COMPLETE) {
-      shutdown_stream(downstream, NGHTTP2_INTERNAL_ERROR);
+      shutdown_stream(downstream, NGHTTP3_H3_INTERNAL_ERROR);
     }
   }
 
@@ -2353,12 +2510,12 @@
 }
 
 namespace {
-int http_send_stop_sending(nghttp3_conn *conn, int64_t stream_id,
-                           uint64_t app_error_code, void *user_data,
-                           void *stream_user_data) {
+int http_stop_sending(nghttp3_conn *conn, int64_t stream_id,
+                      uint64_t app_error_code, void *user_data,
+                      void *stream_user_data) {
   auto upstream = static_cast<Http3Upstream *>(user_data);
 
-  if (upstream->http_send_stop_sending(stream_id, app_error_code) != 0) {
+  if (upstream->http_stop_sending(stream_id, app_error_code) != 0) {
     return NGHTTP3_ERR_CALLBACK_FAILURE;
   }
 
@@ -2366,8 +2523,8 @@
 }
 } // namespace
 
-int Http3Upstream::http_send_stop_sending(int64_t stream_id,
-                                          uint64_t app_error_code) {
+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);
   if (ngtcp2_err_is_fatal(rv)) {
     ULOG(ERROR, this) << "ngtcp2_conn_shutdown_stream_read: "
@@ -2420,9 +2577,9 @@
       shrpx::http_recv_request_header,
       shrpx::http_end_request_headers,
       nullptr, // begin_trailers
-      nullptr, // recv_trailer
+      shrpx::http_recv_request_trailer,
       nullptr, // end_trailers
-      shrpx::http_send_stop_sending,
+      shrpx::http_stop_sending,
       shrpx::http_end_stream,
       shrpx::http_reset_stream,
   };
@@ -2431,7 +2588,7 @@
 
   nghttp3_settings settings;
   nghttp3_settings_default(&settings);
-  settings.qpack_max_table_capacity = 4_k;
+  settings.qpack_max_dtable_capacity = 4_k;
 
   if (!config->http2_proxy) {
     settings.enable_connect_protocol = 1;
@@ -2445,11 +2602,10 @@
     return -1;
   }
 
-  ngtcp2_transport_params params;
-  ngtcp2_conn_get_local_transport_params(conn_, &params);
+  auto params = ngtcp2_conn_get_local_transport_params(conn_);
 
   nghttp3_conn_set_max_client_streams_bidi(httpconn_,
-                                           params.initial_max_streams_bidi);
+                                           params->initial_max_streams_bidi);
 
   int64_t ctrl_stream_id;
 
@@ -2571,39 +2727,6 @@
   return 0;
 }
 
-int Http3Upstream::redirect_to_https(Downstream *downstream) {
-  auto &req = downstream->request();
-  if (req.regular_connect_method() || req.scheme != "http") {
-    return error_reply(downstream, 400);
-  }
-
-  auto authority = util::extract_host(req.authority);
-  if (authority.empty()) {
-    return error_reply(downstream, 400);
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  StringRef loc;
-  if (httpconf.redirect_https_port == StringRef::from_lit("443")) {
-    loc = concat_string_ref(balloc, StringRef::from_lit("https://"), authority,
-                            req.path);
-  } else {
-    loc = concat_string_ref(balloc, StringRef::from_lit("https://"), authority,
-                            StringRef::from_lit(":"),
-                            httpconf.redirect_https_port, req.path);
-  }
-
-  auto &resp = downstream->response();
-  resp.http_status = 308;
-  resp.fs.add_header_token(StringRef::from_lit("location"), loc, false,
-                           http2::HD_LOCATION);
-
-  return send_reply(downstream, nullptr, 0);
-}
-
 void Http3Upstream::consume(int64_t stream_id, size_t nconsumed) {
   ngtcp2_conn_extend_max_stream_offset(conn_, stream_id, nconsumed);
   ngtcp2_conn_extend_max_offset(conn_, nconsumed);
@@ -2692,8 +2815,6 @@
   return 0;
 }
 
-void Http3Upstream::idle_close() { idle_close_ = true; }
-
 int Http3Upstream::open_qlog_file(const StringRef &dir,
                                   const ngtcp2_cid &scid) const {
   std::array<char, sizeof("20141115T125824.741+0900")> buf;
@@ -2704,7 +2825,7 @@
       util::format_iso8601_basic(buf.data(), std::chrono::system_clock::now());
   path += '-';
   path += util::format_hex(scid.data, scid.datalen);
-  path += ".qlog";
+  path += ".sqlog";
 
   int fd;
 
@@ -2734,4 +2855,6 @@
   return fd;
 }
 
+ngtcp2_conn *Http3Upstream::get_conn() const { return conn_; }
+
 } // namespace shrpx

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

@@ -92,24 +92,14 @@
            const ngtcp2_cid *odcid, const uint8_t *token, size_t tokenlen);
 
   int on_read(const UpstreamAddr *faddr, const Address &remote_addr,
-              const Address &local_addr, const uint8_t *data, size_t datalen);
+              const Address &local_addr, const ngtcp2_pkt_info &pi,
+              const uint8_t *data, size_t datalen);
 
   int write_streams();
 
-  int on_rx_secret(ngtcp2_crypto_level level, const uint8_t *secret,
-                   size_t secretlen);
-  int on_tx_secret(ngtcp2_crypto_level level, const uint8_t *secret,
-                   size_t secretlen);
-
-  int add_crypto_data(ngtcp2_crypto_level level, const uint8_t *data,
-                      size_t datalen);
-
-  void set_tls_alert(uint8_t alert);
-
   int handle_error();
 
   int handle_expiry();
-  void reset_idle_timer();
   void reset_timer();
 
   int setup_httpconn();
@@ -123,14 +113,13 @@
   void http_begin_request_headers(int64_t stream_id);
   int http_recv_request_header(Downstream *downstream, int32_t token,
                                nghttp3_rcbuf *name, nghttp3_rcbuf *value,
-                               uint8_t flags);
-  int http_end_request_headers(Downstream *downstream);
+                               uint8_t flags, bool trailer);
+  int http_end_request_headers(Downstream *downstream, int fin);
   int http_end_stream(Downstream *downstream);
   void start_downstream(Downstream *downstream);
   void initiate_downstream(Downstream *downstream);
   int shutdown_stream(Downstream *downstream, uint64_t app_error_code);
   int shutdown_stream_read(int64_t stream_id, uint64_t app_error_code);
-  int redirect_to_https(Downstream *downstream);
   int http_stream_close(Downstream *downstream, uint64_t app_error_code);
   void consume(int64_t stream_id, size_t nconsumed);
   void remove_downstream(Downstream *downstream);
@@ -140,39 +129,60 @@
   int http_acked_stream_data(Downstream *downstream, uint64_t datalen);
   int http_shutdown_stream_read(int64_t stream_id);
   int http_reset_stream(int64_t stream_id, uint64_t app_error_code);
-  int http_send_stop_sending(int64_t stream_id, uint64_t app_error_code);
+  int http_stop_sending(int64_t stream_id, uint64_t app_error_code);
   int http_recv_data(Downstream *downstream, const uint8_t *data,
                      size_t datalen);
   int handshake_completed();
   int check_shutdown();
   int start_graceful_shutdown();
   int submit_goaway();
-  void idle_close();
   int send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
                   size_t remote_salen, const sockaddr *local_sa,
-                  size_t local_salen, const uint8_t *data, size_t datalen,
-                  size_t gso_size);
+                  size_t local_salen, const ngtcp2_pkt_info &pi,
+                  const uint8_t *data, size_t datalen, size_t gso_size);
 
   void qlog_write(const void *data, size_t datalen, bool fin);
   int open_qlog_file(const StringRef &dir, const ngtcp2_cid &scid) const;
 
+  void on_send_blocked(const UpstreamAddr *faddr,
+                       const ngtcp2_addr &remote_addr,
+                       const ngtcp2_addr &local_addr, const ngtcp2_pkt_info &pi,
+                       const uint8_t *data, size_t datalen, size_t gso_size);
+  int send_blocked_packet();
+  void signal_write_upstream_addr(const UpstreamAddr *faddr);
+
+  ngtcp2_conn *get_conn() const;
+
 private:
   ClientHandler *handler_;
   ev_timer timer_;
-  ev_timer idle_timer_;
   ev_timer shutdown_timer_;
   ev_prepare prep_;
-  size_t max_udp_payload_size_;
   int qlog_fd_;
   ngtcp2_cid hashed_scid_;
   ngtcp2_conn *conn_;
-  quic::Error last_error_;
-  uint8_t tls_alert_;
+  ngtcp2_connection_close_error last_error_;
   nghttp3_conn *httpconn_;
   DownstreamQueue downstream_queue_;
-  bool idle_close_;
   bool retry_close_;
   std::vector<uint8_t> conn_close_;
+
+  struct {
+    bool send_blocked;
+    size_t num_blocked;
+    size_t num_blocked_sent;
+    // blocked field is effective only when send_blocked is true.
+    struct {
+      const UpstreamAddr *faddr;
+      Address local_addr;
+      Address remote_addr;
+      ngtcp2_pkt_info pi;
+      const uint8_t *data;
+      size_t datalen;
+      size_t gso_size;
+    } blocked2;
+    std::unique_ptr<uint8_t> data;
+  } tx_;
 };
 
 } // namespace shrpx

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

@@ -266,13 +266,26 @@
     htp_msg_begincb,     // llhttp_cb      on_message_begin;
     nullptr,             // llhttp_data_cb on_url;
     nullptr,             // llhttp_data_cb on_status;
+    nullptr,             // llhttp_data_cb on_method;
+    nullptr,             // llhttp_data_cb on_version;
     htp_hdr_keycb,       // llhttp_data_cb on_header_field;
     htp_hdr_valcb,       // llhttp_data_cb on_header_value;
+    nullptr,             // llhttp_data_cb on_chunk_extension_name;
+    nullptr,             // llhttp_data_cb on_chunk_extension_value;
     htp_hdrs_completecb, // llhttp_cb      on_headers_complete;
     htp_bodycb,          // llhttp_data_cb on_body;
     htp_msg_completecb,  // llhttp_cb      on_message_complete;
-    nullptr,             // llhttp_cb      on_chunk_header
-    nullptr,             // llhttp_cb      on_chunk_complete
+    nullptr,             // llhttp_cb      on_url_complete;
+    nullptr,             // llhttp_cb      on_status_complete;
+    nullptr,             // llhttp_cb      on_method_complete;
+    nullptr,             // llhttp_cb      on_version_complete;
+    nullptr,             // llhttp_cb      on_header_field_complete;
+    nullptr,             // llhttp_cb      on_header_value_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_name_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_value_complete;
+    nullptr,             // llhttp_cb      on_chunk_header;
+    nullptr,             // llhttp_cb      on_chunk_complete;
+    nullptr,             // llhttp_cb      on_reset;
 };
 } // namespace
 
@@ -912,6 +925,12 @@
   auto &resp = downstream->response();
   int rv;
 
+  auto &balloc = downstream->get_block_allocator();
+
+  for (auto &kv : resp.fs.headers()) {
+    kv.value = util::rstrip(balloc, kv.value);
+  }
+
   auto config = get_config();
   auto &loggingconf = config->logging;
 
@@ -1138,6 +1157,12 @@
 namespace {
 int htp_msg_completecb(llhttp_t *htp) {
   auto downstream = static_cast<Downstream *>(htp->data);
+  auto &resp = downstream->response();
+  auto &balloc = downstream->get_block_allocator();
+
+  for (auto &kv : resp.fs.trailers()) {
+    kv.value = util::rstrip(balloc, kv.value);
+  }
 
   // llhttp does not treat "200 connection established" response
   // against CONNECT request, and in that case, this function is not

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_http_test.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http_test.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_http_test.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_http_test.h Changed

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

@@ -66,13 +66,26 @@
     htp_msg_begin,       // llhttp_cb      on_message_begin;
     htp_uricb,           // llhttp_data_cb on_url;
     nullptr,             // llhttp_data_cb on_status;
+    nullptr,             // llhttp_data_cb on_method;
+    nullptr,             // llhttp_data_cb on_version;
     htp_hdr_keycb,       // llhttp_data_cb on_header_field;
     htp_hdr_valcb,       // llhttp_data_cb on_header_value;
+    nullptr,             // llhttp_data_cb on_chunk_extension_name;
+    nullptr,             // llhttp_data_cb on_chunk_extension_value;
     htp_hdrs_completecb, // llhttp_cb      on_headers_complete;
     htp_bodycb,          // llhttp_data_cb on_body;
     htp_msg_completecb,  // llhttp_cb      on_message_complete;
+    nullptr,             // llhttp_cb      on_url_complete;
+    nullptr,             // llhttp_cb      on_status_complete;
+    nullptr,             // llhttp_cb      on_method_complete;
+    nullptr,             // llhttp_cb      on_version_complete;
+    nullptr,             // llhttp_cb      on_header_field_complete;
+    nullptr,             // llhttp_cb      on_header_value_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_name_complete;
+    nullptr,             // llhttp_cb      on_chunk_extension_value_complete;
     nullptr,             // llhttp_cb      on_chunk_header;
     nullptr,             // llhttp_cb      on_chunk_complete;
+    nullptr,             // llhttp_cb      on_reset;
 };
 } // namespace
 
@@ -328,6 +341,11 @@
 
   auto downstream = upstream->get_downstream();
   auto &req = downstream->request();
+  auto &balloc = downstream->get_block_allocator();
+
+  for (auto &kv : req.fs.headers()) {
+    kv.value = util::rstrip(balloc, kv.value);
+  }
 
   auto lgconf = log_config();
   lgconf->update_tstamp(std::chrono::system_clock::now());
@@ -397,7 +415,6 @@
   downstream->inspect_http1_request();
 
   auto faddr = handler->get_upstream_addr();
-  auto &balloc = downstream->get_block_allocator();
   auto config = get_config();
 
   if (method != HTTP_CONNECT) {
@@ -433,12 +450,18 @@
 
   downstream->set_request_state(DownstreamState::HEADER_COMPLETE);
 
+  auto &resp = downstream->response();
+
+  if (config->http.require_http_scheme &&
+      !http::check_http_scheme(req.scheme, handler->get_ssl() != nullptr)) {
+    resp.http_status = 400;
+    return -1;
+  }
+
 #ifdef HAVE_MRUBY
   auto worker = handler->get_worker();
   auto mruby_ctx = worker->get_mruby_context();
 
-  auto &resp = downstream->response();
-
   if (mruby_ctx->run_on_request_proc(downstream) != 0) {
     resp.http_status = 500;
     return -1;
@@ -457,7 +480,9 @@
     return 0;
   }
 
+#ifdef HAVE_MRUBY
   DownstreamConnection *dconn_ptr;
+#endif // HAVE_MRUBY
 
   for (;;) {
     auto dconn = handler->get_downstream_connection(rv, downstream);
@@ -547,6 +572,13 @@
   }
   auto handler = upstream->get_client_handler();
   auto downstream = upstream->get_downstream();
+  auto &req = downstream->request();
+  auto &balloc = downstream->get_block_allocator();
+
+  for (auto &kv : req.fs.trailers()) {
+    kv.value = util::rstrip(balloc, kv.value);
+  }
+
   downstream->set_request_state(DownstreamState::MSG_COMPLETE);
   rv = downstream->end_upload_data();
   if (rv != 0) {

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_log.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_log.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_log_config.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_log_config.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_null_downstream_connection.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_null_downstream_connection.cc Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_null_downstream_connection.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_null_downstream_connection.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_quic.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_quic.cc Changed

@@ -57,8 +57,8 @@
 
 int quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
                      size_t remote_salen, const sockaddr *local_sa,
-                     size_t local_salen, const uint8_t *data, size_t datalen,
-                     size_t gso_size) {
+                     size_t local_salen, const ngtcp2_pkt_info &pi,
+                     const uint8_t *data, size_t datalen, size_t gso_size) {
   iovec msg_iov = {const_cast<uint8_t *>(data), datalen};
   msghdr msg{};
   msg.msg_name = const_cast<sockaddr *>(remote_sa);
@@ -123,6 +123,8 @@
 
   msg.msg_controllen = controllen;
 
+  util::fd_set_send_ecn(faddr->fd, local_sa->sa_family, pi.ecn);
+
   ssize_t nwrite;
 
   do {
@@ -142,7 +144,8 @@
     LOG(INFO) << "QUIC sent packet: local="
               << util::to_numeric_addr(local_sa, local_salen)
               << " remote=" << util::to_numeric_addr(remote_sa, remote_salen)
-              << " " << nwrite << " bytes";
+              << " ecn=" << log::hex << pi.ecn << log::dec << " " << nwrite
+              << " bytes";
   }
 
   return 0;
@@ -267,16 +270,16 @@
   return 0;
 }
 
-int generate_retry_token(uint8_t *token, size_t &tokenlen, const sockaddr *sa,
-                         socklen_t salen, const ngtcp2_cid &retry_scid,
-                         const ngtcp2_cid &odcid, const uint8_t *secret,
-                         size_t secretlen) {
+int generate_retry_token(uint8_t *token, size_t &tokenlen, uint32_t version,
+                         const sockaddr *sa, socklen_t salen,
+                         const ngtcp2_cid &retry_scid, const ngtcp2_cid &odcid,
+                         const uint8_t *secret, size_t secretlen) {
   auto t = std::chrono::duration_cast<std::chrono::nanoseconds>(
                std::chrono::system_clock::now().time_since_epoch())
                .count();
 
   auto stokenlen = ngtcp2_crypto_generate_retry_token(
-      token, secret, secretlen, sa, salen, &retry_scid, &odcid, t);
+      token, secret, secretlen, version, sa, salen, &retry_scid, &odcid, t);
   if (stokenlen < 0) {
     return -1;
   }
@@ -287,16 +290,16 @@
 }
 
 int verify_retry_token(ngtcp2_cid &odcid, const uint8_t *token, size_t tokenlen,
-                       const ngtcp2_cid &dcid, const sockaddr *sa,
-                       socklen_t salen, const uint8_t *secret,
-                       size_t secretlen) {
+                       uint32_t version, const ngtcp2_cid &dcid,
+                       const sockaddr *sa, socklen_t salen,
+                       const uint8_t *secret, size_t secretlen) {
 
   auto t = std::chrono::duration_cast<std::chrono::nanoseconds>(
                std::chrono::system_clock::now().time_since_epoch())
                .count();
 
   if (ngtcp2_crypto_verify_retry_token(&odcid, token, tokenlen, secret,
-                                       secretlen, sa, salen, &dcid,
+                                       secretlen, version, sa, salen, &dcid,
                                        10 * NGTCP2_SECONDS, t) != 0) {
     return -1;
   }
@@ -355,10 +358,9 @@
 }
 
 const QUICKeyingMaterial *
-select_quic_keying_material(const QUICKeyingMaterials &qkms,
-                            const uint8_t *cid) {
+select_quic_keying_material(const QUICKeyingMaterials &qkms, uint8_t km_id) {
   for (auto &qkm : qkms.keying_materials) {
-    if (((*cid) & 0xc0) == qkm.id) {
+    if (km_id == qkm.id) {
       return &qkm;
     }
   }

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_quic.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_quic.h Changed

@@ -76,13 +76,14 @@
 constexpr size_t SHRPX_QUIC_SECRET_RESERVEDLEN = 4;
 constexpr size_t SHRPX_QUIC_SECRETLEN = 32;
 constexpr size_t SHRPX_QUIC_SALTLEN = 32;
+constexpr uint8_t SHRPX_QUIC_DCID_KM_ID_MASK = 0xc0;
 
 ngtcp2_tstamp quic_timestamp();
 
 int quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
                      size_t remote_salen, const sockaddr *local_sa,
-                     size_t local_salen, const uint8_t *data, size_t datalen,
-                     size_t gso_size);
+                     size_t local_salen, const ngtcp2_pkt_info &pi,
+                     const uint8_t *data, size_t datalen, size_t gso_size);
 
 int generate_quic_retry_connection_id(ngtcp2_cid &cid, size_t cidlen,
                                       const uint8_t *server_id, uint8_t km_id,
@@ -107,15 +108,15 @@
                                         const uint8_t *secret,
                                         size_t secretlen);
 
-int generate_retry_token(uint8_t *token, size_t &tokenlen, const sockaddr *sa,
-                         socklen_t salen, const ngtcp2_cid &retry_scid,
-                         const ngtcp2_cid &odcid, const uint8_t *secret,
-                         size_t secretlen);
+int generate_retry_token(uint8_t *token, size_t &tokenlen, uint32_t version,
+                         const sockaddr *sa, socklen_t salen,
+                         const ngtcp2_cid &retry_scid, const ngtcp2_cid &odcid,
+                         const uint8_t *secret, size_t secretlen);
 
 int verify_retry_token(ngtcp2_cid &odcid, const uint8_t *token, size_t tokenlen,
-                       const ngtcp2_cid &dcid, const sockaddr *sa,
-                       socklen_t salen, const uint8_t *secret,
-                       size_t secretlen);
+                       uint32_t version, const ngtcp2_cid &dcid,
+                       const sockaddr *sa, socklen_t salen,
+                       const uint8_t *secret, size_t secretlen);
 
 int generate_token(uint8_t *token, size_t &tokenlen, const sockaddr *sa,
                    size_t salen, const uint8_t *secret, size_t secretlen);
@@ -130,8 +131,7 @@
                                                size_t saltlen);
 
 const QUICKeyingMaterial *
-select_quic_keying_material(const QUICKeyingMaterials &qkms,
-                            const uint8_t *cid);
+select_quic_keying_material(const QUICKeyingMaterials &qkms, uint8_t km_id);
 
 } // namespace shrpx

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

@@ -61,20 +61,18 @@
 int QUICConnectionHandler::handle_packet(const UpstreamAddr *faddr,
                                          const Address &remote_addr,
                                          const Address &local_addr,
+                                         const ngtcp2_pkt_info &pi,
                                          const uint8_t *data, size_t datalen) {
   int rv;
-  uint32_t version;
-  const uint8_t *dcid, *scid;
-  size_t dcidlen, scidlen;
+  ngtcp2_version_cid vc;
 
-  rv = ngtcp2_pkt_decode_version_cid(&version, &dcid, &dcidlen, &scid, &scidlen,
-                                     data, datalen, SHRPX_QUIC_SCIDLEN);
+  rv = ngtcp2_pkt_decode_version_cid(&vc, data, datalen, SHRPX_QUIC_SCIDLEN);
   switch (rv) {
   case 0:
     break;
   case NGTCP2_ERR_VERSION_NEGOTIATION:
-    send_version_negotiation(faddr, version, dcid, dcidlen, scid, scidlen,
-                             remote_addr, local_addr);
+    send_version_negotiation(faddr, vc.version, vc.dcid, vc.dcidlen, vc.scid,
+                             vc.scidlen, remote_addr, local_addr);
 
     return 0;
   default:
@@ -84,7 +82,7 @@
   auto config = get_config();
 
   ngtcp2_cid dcid_key;
-  ngtcp2_cid_init(&dcid_key, dcid, dcidlen);
+  ngtcp2_cid_init(&dcid_key, vc.dcid, vc.dcidlen);
 
   auto conn_handler = worker_->get_connection_handler();
 
@@ -98,7 +96,7 @@
     if (cwit != std::end(close_waits_)) {
       auto cw = (*cwit).second;
 
-      cw->handle_packet(faddr, remote_addr, local_addr, data, datalen);
+      cw->handle_packet(faddr, remote_addr, local_addr, pi, data, datalen);
 
       return 0;
     }
@@ -115,7 +113,7 @@
         if (cwit != std::end(close_waits_)) {
           auto cw = (*cwit).second;
 
-          cw->handle_packet(faddr, remote_addr, local_addr, data, datalen);
+          cw->handle_packet(faddr, remote_addr, local_addr, pi, data, datalen);
 
           return 0;
         }
@@ -129,11 +127,12 @@
     auto &qkms = conn_handler->get_quic_keying_materials();
     const QUICKeyingMaterial *qkm = nullptr;
 
-    if (dcidlen == SHRPX_QUIC_SCIDLEN) {
-      qkm = select_quic_keying_material(*qkms.get(), dcid);
+    if (vc.dcidlen == SHRPX_QUIC_SCIDLEN) {
+      qkm = select_quic_keying_material(
+          *qkms.get(), vc.dcid0 & SHRPX_QUIC_DCID_KM_ID_MASK);
 
       if (decrypt_quic_connection_id(decrypted_dcid.data(),
-                                     dcid + SHRPX_QUIC_CID_PREFIX_OFFSET,
+                                     vc.dcid + SHRPX_QUIC_CID_PREFIX_OFFSET,
                                      qkm->cid_encryption_key.data()) != 0) {
         return 0;
       }
@@ -147,7 +146,7 @@
                 decrypted_dcid.data(), decrypted_dcid.size());
         if (quic_lwp) {
           if (conn_handler->forward_quic_packet_to_lingering_worker_process(
-                  quic_lwp, remote_addr, local_addr, data, datalen) == 0) {
+                  quic_lwp, remote_addr, local_addr, pi, data, datalen) == 0) {
             return 0;
           }
 
@@ -179,12 +178,12 @@
       // If we get Initial and it has the CID prefix of this worker,
       // it is likely that client is intentionally use the prefix.
       // Just drop it.
-      if (dcidlen == SHRPX_QUIC_SCIDLEN) {
+      if (vc.dcidlen == SHRPX_QUIC_SCIDLEN) {
         if (qkm != &qkms->keying_materials.front()) {
           qkm = &qkms->keying_materials.front();
 
           if (decrypt_quic_connection_id(decrypted_dcid.data(),
-                                         dcid + SHRPX_QUIC_CID_PREFIX_OFFSET,
+                                         vc.dcid + SHRPX_QUIC_CID_PREFIX_OFFSET,
                                          qkm->cid_encryption_key.data()) != 0) {
             return 0;
           }
@@ -198,15 +197,16 @@
       }
 
       if (worker_->get_graceful_shutdown()) {
-        send_connection_close(faddr, version, hd.dcid, hd.scid, remote_addr,
-                              local_addr, NGTCP2_CONNECTION_REFUSED);
+        send_connection_close(faddr, hd.version, hd.dcid, hd.scid, remote_addr,
+                              local_addr, NGTCP2_CONNECTION_REFUSED,
+                              datalen * 3);
         return 0;
       }
 
-      if (hd.token.len == 0) {
+      if (hd.tokenlen == 0) {
         if (quicconf.upstream.require_token) {
-          send_retry(faddr, version, dcid, dcidlen, scid, scidlen, remote_addr,
-                     local_addr);
+          send_retry(faddr, vc.version, vc.dcid, vc.dcidlen, vc.scid,
+                     vc.scidlen, remote_addr, local_addr, datalen * 3);
 
           return 0;
         }
@@ -214,17 +214,19 @@
         break;
       }
 
-      if (dcidlen != SHRPX_QUIC_SCIDLEN) {
-        // Initial packets with token must have DCID chosen by server.
-        return 0;
-      }
+      switch (hd.token0) {
+      case NGTCP2_CRYPTO_TOKEN_MAGIC_RETRY: {
+        if (vc.dcidlen != SHRPX_QUIC_SCIDLEN) {
+          // Initial packets with Retry token must have DCID chosen by
+          // server.
+          return 0;
+        }
 
-      auto qkm = select_quic_keying_material(*qkms.get(), dcid);
+        auto qkm = select_quic_keying_material(
+            *qkms.get(), vc.dcid0 & SHRPX_QUIC_DCID_KM_ID_MASK);
 
-      switch (hd.token.base0) {
-      case NGTCP2_CRYPTO_TOKEN_MAGIC_RETRY:
-        if (verify_retry_token(odcid, hd.token.base, hd.token.len, hd.dcid,
-                               &remote_addr.su.sa, remote_addr.len,
+        if (verify_retry_token(odcid, hd.token, hd.tokenlen, hd.version,
+                               hd.dcid, &remote_addr.su.sa, remote_addr.len,
                                qkm->secret.data(), qkm->secret.size()) != 0) {
           if (LOG_ENABLED(INFO)) {
             LOG(INFO) << "Failed to validate Retry token from remote="
@@ -233,8 +235,9 @@
 
           // 2nd Retry packet is not allowed, so send CONNECTION_CLOSE
           // with INVALID_TOKEN.
-          send_connection_close(faddr, version, hd.dcid, hd.scid, remote_addr,
-                                local_addr, NGTCP2_INVALID_TOKEN);
+          send_connection_close(faddr, hd.version, hd.dcid, hd.scid,
+                                remote_addr, local_addr, NGTCP2_INVALID_TOKEN,
+                                datalen * 3);
           return 0;
         }
 
@@ -244,12 +247,38 @@
         }
 
         podcid = &odcid;
-        token = hd.token.base;
-        tokenlen = hd.token.len;
+        token = hd.token;
+        tokenlen = hd.tokenlen;
 
         break;
-      case NGTCP2_CRYPTO_TOKEN_MAGIC_REGULAR:
-        if (verify_token(hd.token.base, hd.token.len, &remote_addr.su.sa,
+      }
+      case NGTCP2_CRYPTO_TOKEN_MAGIC_REGULAR: {
+        // If a token is a regular token, it must be at least
+        // NGTCP2_MIN_INITIAL_DCIDLEN bytes long.
+        if (vc.dcidlen < NGTCP2_MIN_INITIAL_DCIDLEN) {
+          return 0;
+        }
+
+        if (hd.tokenlen != NGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN + 1) {
+          if (LOG_ENABLED(INFO)) {
+            LOG(INFO) << "Failed to validate token from remote="
+                      << util::to_numeric_addr(&remote_addr);
+          }
+
+          if (quicconf.upstream.require_token) {
+            send_retry(faddr, vc.version, vc.dcid, vc.dcidlen, vc.scid,
+                       vc.scidlen, remote_addr, local_addr, datalen * 3);
+
+            return 0;
+          }
+
+          break;
+        }
+
+        auto qkm = select_quic_keying_material(
+            *qkms.get(), hd.tokenNGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN);
+
+        if (verify_token(hd.token, hd.tokenlen - 1, &remote_addr.su.sa,
                          remote_addr.len, qkm->secret.data(),
                          qkm->secret.size()) != 0) {
           if (LOG_ENABLED(INFO)) {
@@ -258,8 +287,8 @@
           }
 
           if (quicconf.upstream.require_token) {
-            send_retry(faddr, version, dcid, dcidlen, scid, scidlen,
-                       remote_addr, local_addr);
+            send_retry(faddr, vc.version, vc.dcid, vc.dcidlen, vc.scid,
+                       vc.scidlen, remote_addr, local_addr, datalen * 3);
 
             return 0;
           }
@@ -272,14 +301,15 @@
                     << util::to_numeric_addr(&remote_addr);
         }
 
-        token = hd.token.base;
-        tokenlen = hd.token.len;
+        token = hd.token;
+        tokenlen = hd.tokenlen;
 
         break;
+      }
       default:
         if (quicconf.upstream.require_token) {
-          send_retry(faddr, version, dcid, dcidlen, scid, scidlen, remote_addr,
-                     local_addr);
+          send_retry(faddr, vc.version, vc.dcid, vc.dcidlen, vc.scid,
+                     vc.scidlen, remote_addr, local_addr, datalen * 3);
 
           return 0;
         }
@@ -291,26 +321,27 @@
     }
     case NGTCP2_ERR_RETRY:
       if (worker_->get_graceful_shutdown()) {
-        send_connection_close(faddr, version, hd.dcid, hd.scid, remote_addr,
-                              local_addr, NGTCP2_CONNECTION_REFUSED);
+        send_connection_close(faddr, hd.version, hd.dcid, hd.scid, remote_addr,
+                              local_addr, NGTCP2_CONNECTION_REFUSED,
+                              datalen * 3);
         return 0;
       }
 
-      send_retry(faddr, version, dcid, dcidlen, scid, scidlen, remote_addr,
-                 local_addr);
+      send_retry(faddr, vc.version, vc.dcid, vc.dcidlen, vc.scid, vc.scidlen,
+                 remote_addr, local_addr, datalen * 3);
       return 0;
     case NGTCP2_ERR_VERSION_NEGOTIATION:
-      send_version_negotiation(faddr, version, dcid, dcidlen, scid, scidlen,
-                               remote_addr, local_addr);
+      send_version_negotiation(faddr, vc.version, vc.dcid, vc.dcidlen, vc.scid,
+                               vc.scidlen, remote_addr, local_addr);
       return 0;
     default:
       if (!config->single_thread && !(data0 & 0x80) &&
-          dcidlen == SHRPX_QUIC_SCIDLEN &&
+          vc.dcidlen == SHRPX_QUIC_SCIDLEN &&
           !std::equal(std::begin(decrypted_dcid),
                       std::begin(decrypted_dcid) + SHRPX_QUIC_CID_PREFIXLEN,
                       worker_->get_cid_prefix())) {
         if (conn_handler->forward_quic_packet(faddr, remote_addr, local_addr,
-                                              decrypted_dcid.data(), data,
+                                              pi, decrypted_dcid.data(), data,
                                               datalen) == 0) {
           return 0;
         }
@@ -318,7 +349,8 @@
 
       if (!(data0 & 0x80)) {
         // TODO Must be rate limited
-        send_stateless_reset(faddr, dcid, dcidlen, remote_addr, local_addr);
+        send_stateless_reset(faddr, vc.dcid, vc.dcidlen, remote_addr,
+                             local_addr);
       }
 
       return 0;
@@ -333,7 +365,8 @@
     handler = (*it).second;
   }
 
-  if (handler->read_quic(faddr, remote_addr, local_addr, data, datalen) != 0) {
+  if (handler->read_quic(faddr, remote_addr, local_addr, pi, data, datalen) !=
+      0) {
     delete handler;
     return 0;
   }
@@ -437,7 +470,7 @@
 int QUICConnectionHandler::send_retry(
     const UpstreamAddr *faddr, uint32_t version, const uint8_t *ini_dcid,
     size_t ini_dcidlen, const uint8_t *ini_scid, size_t ini_scidlen,
-    const Address &remote_addr, const Address &local_addr) {
+    const Address &remote_addr, const Address &local_addr, size_t max_pktlen) {
   std::array<char, NI_MAXHOST> host;
   std::array<char, NI_MAXSERV> port;
 
@@ -469,14 +502,14 @@
   ngtcp2_cid_init(&idcid, ini_dcid, ini_dcidlen);
   ngtcp2_cid_init(&iscid, ini_scid, ini_scidlen);
 
-  if (generate_retry_token(token.data(), tokenlen, &remote_addr.su.sa,
+  if (generate_retry_token(token.data(), tokenlen, version, &remote_addr.su.sa,
                            remote_addr.len, retry_scid, idcid,
                            qkm.secret.data(), qkm.secret.size()) != 0) {
     return -1;
   }
 
   std::vector<uint8_t> buf;
-  buf.resize(256);
+  buf.resize(std::min(max_pktlen, static_cast<size_t>(256)));
 
   auto nwrite =
       ngtcp2_crypto_write_retry(buf.data(), buf.size(), version, &iscid,
@@ -489,8 +522,8 @@
   buf.resize(nwrite);
 
   quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
-                   &local_addr.su.sa, local_addr.len, buf.data(), buf.size(),
-                   0);
+                   &local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
+                   buf.data(), buf.size(), 0);
 
   if (generate_quic_hashed_connection_id(idcid, remote_addr, local_addr,
                                          idcid) != 0) {
@@ -519,10 +552,10 @@
     const UpstreamAddr *faddr, uint32_t version, const uint8_t *ini_dcid,
     size_t ini_dcidlen, const uint8_t *ini_scid, size_t ini_scidlen,
     const Address &remote_addr, const Address &local_addr) {
-  std::array<uint32_t, 2> sv;
-
-  sv0 = generate_reserved_version(remote_addr, version);
-  sv1 = NGTCP2_PROTO_VER_V1;
+  std::array<uint32_t, 2> sv{
+      generate_reserved_version(remote_addr, version),
+      NGTCP2_PROTO_VER_V1,
+  };
 
   std::array<uint8_t, NGTCP2_MAX_UDP_PAYLOAD_SIZE> buf;
 
@@ -539,8 +572,8 @@
   }
 
   return quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
-                          &local_addr.su.sa, local_addr.len, buf.data(), nwrite,
-                          0);
+                          &local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
+                          buf.data(), nwrite, 0);
 }
 
 int QUICConnectionHandler::send_stateless_reset(const UpstreamAddr *faddr,
@@ -602,18 +635,21 @@
   }
 
   return quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
-                          &local_addr.su.sa, local_addr.len, buf.data(), nwrite,
-                          0);
+                          &local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
+                          buf.data(), nwrite, 0);
 }
 
 int QUICConnectionHandler::send_connection_close(
     const UpstreamAddr *faddr, uint32_t version, const ngtcp2_cid &ini_dcid,
     const ngtcp2_cid &ini_scid, const Address &remote_addr,
-    const Address &local_addr, uint64_t error_code) {
+    const Address &local_addr, uint64_t error_code, size_t max_pktlen) {
   std::array<uint8_t, NGTCP2_MAX_UDP_PAYLOAD_SIZE> buf;
 
+  max_pktlen = std::min(max_pktlen, buf.size());
+
   auto nwrite = ngtcp2_crypto_write_connection_close(
-      buf.data(), buf.size(), version, &ini_scid, &ini_dcid, error_code);
+      buf.data(), max_pktlen, version, &ini_scid, &ini_dcid, error_code,
+      nullptr, 0);
   if (nwrite < 0) {
     LOG(ERROR) << "ngtcp2_crypto_write_connection_close failed";
     return -1;
@@ -628,8 +664,8 @@
   }
 
   return quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
-                          &local_addr.su.sa, local_addr.len, buf.data(), nwrite,
-                          0);
+                          &local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
+                          buf.data(), nwrite, 0);
 }
 
 void QUICConnectionHandler::add_connection_id(const ngtcp2_cid &cid,
@@ -708,7 +744,8 @@
 
 int CloseWait::handle_packet(const UpstreamAddr *faddr,
                              const Address &remote_addr,
-                             const Address &local_addr, const uint8_t *data,
+                             const Address &local_addr,
+                             const ngtcp2_pkt_info &pi, const uint8_t *data,
                              size_t datalen) {
   if (pkt.empty()) {
     return 0;
@@ -723,8 +760,8 @@
   }
 
   if (quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
-                       &local_addr.su.sa, local_addr.len, pkt.data(),
-                       pkt.size(), 0) != 0) {
+                       &local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
+                       pkt.data(), pkt.size(), 0) != 0) {
     return -1;
   }

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_quic_connection_handler.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_quic_connection_handler.h Changed

@@ -55,8 +55,8 @@
   ~CloseWait();
 
   int handle_packet(const UpstreamAddr *faddr, const Address &remote_addr,
-                    const Address &local_addr, const uint8_t *data,
-                    size_t datalen);
+                    const Address &local_addr, const ngtcp2_pkt_info &pi,
+                    const uint8_t *data, size_t datalen);
 
   Worker *worker;
   // Source Connection IDs of the connection.
@@ -82,8 +82,8 @@
   QUICConnectionHandler(Worker *worker);
   ~QUICConnectionHandler();
   int handle_packet(const UpstreamAddr *faddr, const Address &remote_addr,
-                    const Address &local_addr, const uint8_t *data,
-                    size_t datalen);
+                    const Address &local_addr, const ngtcp2_pkt_info &pi,
+                    const uint8_t *data, size_t datalen);
   // Send Retry packet.  |ini_dcid| is the destination Connection ID
   // which appeared in Client Initial packet and its length is
   // |dcidlen|.  |ini_scid| is the source Connection ID which appeared
@@ -91,7 +91,8 @@
   int send_retry(const UpstreamAddr *faddr, uint32_t version,
                  const uint8_t *ini_dcid, size_t ini_dcidlen,
                  const uint8_t *ini_scid, size_t ini_scidlen,
-                 const Address &remote_addr, const Address &local_addr);
+                 const Address &remote_addr, const Address &local_addr,
+                 size_t max_pktlen);
   // Send Version Negotiation packet.  |ini_dcid| is the destination
   // Connection ID which appeared in Client Initial packet and its
   // length is |dcidlen|.  |ini_scid| is the source Connection ID
@@ -113,7 +114,8 @@
                             const ngtcp2_cid &ini_dcid,
                             const ngtcp2_cid &ini_scid,
                             const Address &remote_addr,
-                            const Address &local_addr, uint64_t error_code);
+                            const Address &local_addr, uint64_t error_code,
+                            size_t max_pktlen);
   ClientHandler *handle_new_connection(const UpstreamAddr *faddr,
                                        const Address &remote_addr,
                                        const Address &local_addr,

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

@@ -59,7 +59,8 @@
   msg.msg_iov = &msg_iov;
   msg.msg_iovlen = 1;
 
-  uint8_t msg_ctrlCMSG_SPACE(sizeof(in6_pktinfo));
+  uint8_t
+      msg_ctrlCMSG_SPACE(sizeof(uint8_t)) + CMSG_SPACE(sizeof(in6_pktinfo));
   msg.msg_control = msg_ctrl;
 
   auto quic_conn_handler = worker_->get_quic_connection_handler();
@@ -83,11 +84,16 @@
 
     util::set_port(local_addr, faddr_->port);
 
+    ngtcp2_pkt_info pi{
+        .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)
-                << " " << nread << " bytes";
+                << " ecn=" << log::hex << pi.ecn << log::dec << " " << nread
+                << " bytes";
     }
 
     if (nread == 0) {
@@ -98,7 +104,7 @@
     remote_addr.su = su;
     remote_addr.len = msg.msg_namelen;
 
-    quic_conn_handler->handle_packet(faddr_, remote_addr, local_addr,
+    quic_conn_handler->handle_packet(faddr_, remote_addr, local_addr, pi,
                                      buf.data(), nread);
   }
 }

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

@@ -55,6 +55,9 @@
 #  include <openssl/core_names.h>
 #  include <openssl/decoder.h>
 #endif // OPENSSL_3_0_0_API
+#ifdef OPENSSL_IS_BORINGSSL
+#  include <openssl/hmac.h>
+#endif // OPENSSL_IS_BORINGSSL
 
 #include <nghttp2/nghttp2.h>
 
@@ -933,25 +936,31 @@
     DIE();
   }
 
-  constexpr auto ssl_opts =
-      (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) | SSL_OP_NO_SSLv2 |
-      SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
-      SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | SSL_OP_SINGLE_ECDH_USE |
-      SSL_OP_SINGLE_DH_USE |
-      SSL_OP_CIPHER_SERVER_PREFERENCE
+  auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
+                  SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
+                  SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION |
+                  SSL_OP_SINGLE_ECDH_USE | SSL_OP_SINGLE_DH_USE |
+                  SSL_OP_CIPHER_SERVER_PREFERENCE
 #if OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-      // The reason for disabling built-in anti-replay in OpenSSL is
-      // that it only works if client gets back to the same server.
-      // The freshness check described in
-      // https://tools.ietf.org/html/rfc8446#section-8.3 is still
-      // performed.
-      | SSL_OP_NO_ANTI_REPLAY
+                  // The reason for disabling built-in anti-replay in
+                  // OpenSSL is that it only works if client gets back
+                  // to the same server.  The freshness check
+                  // described in
+                  // https://tools.ietf.org/html/rfc8446#section-8.3
+                  // is still performed.
+                  | SSL_OP_NO_ANTI_REPLAY
 #endif // OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
       ;
 
   auto config = mod_config();
   auto &tlsconf = config->tls;
 
+#ifdef SSL_OP_ENABLE_KTLS
+  if (tlsconf.ktls) {
+    ssl_opts |= SSL_OP_ENABLE_KTLS;
+  }
+#endif // SSL_OP_ENABLE_KTLS
+
   SSL_CTX_set_options(ssl_ctx, ssl_opts | tlsconf.tls_proto_mask);
 
   if (nghttp2::tls::ssl_ctx_set_proto_versions(
@@ -1076,6 +1085,7 @@
                                   SSL_FILETYPE_PEM) != 1) {
     LOG(FATAL) << "SSL_CTX_use_PrivateKey_file failed: "
                << ERR_error_string(ERR_get_error(), nullptr);
+    DIE();
   }
 #else  // HAVE_NEVERBLEED
   std::array<char, NEVERBLEED_ERRBUF_SIZE> errbuf;
@@ -1213,149 +1223,6 @@
 }
 
 #ifdef ENABLE_HTTP3
-#  ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
-namespace {
-int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level,
-                                const uint8_t *rx_secret,
-                                const uint8_t *tx_secret, size_t secretlen) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
-  auto level = ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level);
-
-  if (upstream->on_rx_secret(level, rx_secret, secretlen) != 0) {
-    return 0;
-  }
-
-  if (tx_secret && upstream->on_tx_secret(level, tx_secret, secretlen) != 0) {
-    return 0;
-  }
-
-  return 1;
-}
-} // namespace
-
-namespace {
-int quic_add_handshake_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level,
-                            const uint8_t *data, size_t len) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
-  auto level = ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level);
-
-  upstream->add_crypto_data(level, data, len);
-
-  return 1;
-}
-} // namespace
-
-namespace {
-int quic_flush_flight(SSL *ssl) { return 1; }
-} // namespace
-
-namespace {
-int quic_send_alert(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level, uint8_t alert) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
-
-  if (!upstream) {
-    return 1;
-  }
-
-  upstream->set_tls_alert(alert);
-
-  return 1;
-}
-} // namespace
-
-namespace {
-auto quic_method = SSL_QUIC_METHOD{
-    quic_set_encryption_secrets,
-    quic_add_handshake_data,
-    quic_flush_flight,
-    quic_send_alert,
-};
-} // namespace
-#  endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
-
-#  ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
-namespace {
-int quic_set_read_secret(SSL *ssl, ssl_encryption_level_t ssl_level,
-                         const SSL_CIPHER *cipher, const uint8_t *secret,
-                         size_t secretlen) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
-  auto level = ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level);
-
-  if (upstream->on_rx_secret(level, secret, secretlen) != 0) {
-    return 0;
-  }
-
-  return 1;
-}
-} // namespace
-
-namespace {
-int quic_set_write_secret(SSL *ssl, ssl_encryption_level_t ssl_level,
-                          const SSL_CIPHER *cipher, const uint8_t *secret,
-                          size_t secretlen) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
-  auto level = ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level);
-
-  if (upstream->on_tx_secret(level, secret, secretlen) != 0) {
-    return 0;
-  }
-
-  return 1;
-}
-} // namespace
-
-namespace {
-int quic_add_handshake_data(SSL *ssl, ssl_encryption_level_t ssl_level,
-                            const uint8_t *data, size_t len) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
-  auto level = ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level);
-
-  upstream->add_crypto_data(level, data, len);
-
-  return 1;
-}
-} // namespace
-
-namespace {
-int quic_flush_flight(SSL *ssl) { return 1; }
-} // namespace
-
-namespace {
-int quic_send_alert(SSL *ssl, ssl_encryption_level_t level, uint8_t alert) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto upstream = static_cast<Http3Upstream *>(handler->get_upstream());
-
-  if (!upstream) {
-    return 1;
-  }
-
-  upstream->set_tls_alert(alert);
-
-  return 1;
-}
-} // namespace
-
-namespace {
-auto quic_method = SSL_QUIC_METHOD{
-    quic_set_read_secret, quic_set_write_secret, quic_add_handshake_data,
-    quic_flush_flight,    quic_send_alert,
-};
-} // namespace
-#  endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
-
 SSL_CTX *create_quic_ssl_context(const char *private_key_file,
                                  const char *cert_file,
                                  const std::vector<uint8_t> &sct_data
@@ -1390,8 +1257,18 @@
 
   SSL_CTX_set_options(ssl_ctx, ssl_opts);
 
-  SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_3_VERSION);
-  SSL_CTX_set_max_proto_version(ssl_ctx, TLS1_3_VERSION);
+#  ifdef HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+  if (ngtcp2_crypto_openssl_configure_server_context(ssl_ctx) != 0) {
+    LOG(FATAL) << "ngtcp2_crypto_openssl_configure_server_context failed";
+    DIE();
+  }
+#  endif // HAVE_LIBNGTCP2_CRYPTO_OPENSSL
+#  ifdef HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
+  if (ngtcp2_crypto_boringssl_configure_server_context(ssl_ctx) != 0) {
+    LOG(FATAL) << "ngtcp2_crypto_boringssl_configure_server_context failed";
+    DIE();
+  }
+#  endif // HAVE_LIBNGTCP2_CRYPTO_BORINGSSL
 
   const unsigned char sid_ctx = "shrpx";
   SSL_CTX_set_session_id_context(ssl_ctx, sid_ctx, sizeof(sid_ctx) - 1);
@@ -1504,6 +1381,7 @@
                                   SSL_FILETYPE_PEM) != 1) {
     LOG(FATAL) << "SSL_CTX_use_PrivateKey_file failed: "
                << ERR_error_string(ERR_get_error(), nullptr);
+    DIE();
   }
 #  else  // HAVE_NEVERBLEED
   std::array<char, NEVERBLEED_ERRBUF_SIZE> errbuf;
@@ -1632,8 +1510,6 @@
   SSL_CTX_set_psk_server_callback(ssl_ctx, psk_server_cb);
 #  endif // !LIBRESSL_NO_PSK
 
-  SSL_CTX_set_quic_method(ssl_ctx, &quic_method);
-
   return ssl_ctx;
 }
 #endif // ENABLE_HTTP3
@@ -1700,13 +1576,18 @@
     DIE();
   }
 
-  constexpr auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
-                            SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
-                            SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
+  auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
+                  SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
+                  SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
 
   auto &tlsconf = get_config()->tls;
 
+#ifdef SSL_OP_ENABLE_KTLS
+  if (tlsconf.ktls) {
+    ssl_opts |= SSL_OP_ENABLE_KTLS;
+  }
+#endif // SSL_OP_ENABLE_KTLS
+
   SSL_CTX_set_options(ssl_ctx, ssl_opts | tlsconf.tls_proto_mask);
 
   SSL_CTX_set_session_cache_mode(ssl_ctx, SSL_SESS_CACHE_CLIENT |

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

@@ -90,12 +90,12 @@
 
 // DownstreamKey is used to index SharedDownstreamAddr in order to
 // find the same configuration.
-using DownstreamKey =
-    std::tuple<std::vector<std::tuple<StringRef, StringRef, StringRef, size_t,
-                                      size_t, Proto, uint32_t, uint32_t,
-                                      uint32_t, bool, bool, bool, bool>>,
-               bool, SessionAffinity, StringRef, StringRef,
-               SessionAffinityCookieSecure, int64_t, int64_t, StringRef, bool>;
+using DownstreamKey = std::tuple<
+    std::vector<
+        std::tuple<StringRef, StringRef, StringRef, size_t, size_t, Proto,
+                   uint32_t, uint32_t, uint32_t, bool, bool, bool, bool>>,
+    bool, SessionAffinity, StringRef, StringRef, SessionAffinityCookieSecure,
+    SessionAffinityCookieStickiness, int64_t, int64_t, StringRef, bool>;
 
 namespace {
 DownstreamKey
@@ -131,11 +131,12 @@
   std::get<3>(dkey) = affinity.cookie.name;
   std::get<4>(dkey) = affinity.cookie.path;
   std::get<5>(dkey) = affinity.cookie.secure;
+  std::get<6>(dkey) = affinity.cookie.stickiness;
   auto &timeout = shared_addr->timeout;
-  std::get<6>(dkey) = timeout.read;
-  std::get<7>(dkey) = timeout.write;
-  std::get<8>(dkey) = mruby_file;
-  std::get<9>(dkey) = shared_addr->dnf;
+  std::get<7>(dkey) = timeout.read;
+  std::get<8>(dkey) = timeout.write;
+  std::get<9>(dkey) = mruby_file;
+  std::get<10>(dkey) = shared_addr->dnf;
 
   return dkey;
 }
@@ -160,7 +161,7 @@
 #endif // ENABLE_HTTP3 && HAVE_LIBBPF
       randgen_(util::make_mt19937()),
       worker_stat_{},
-      dns_tracker_(loop),
+      dns_tracker_(loop, get_config()->conn.downstream->family),
 #ifdef ENABLE_HTTP3
       quic_upstream_addrs_{get_config()->conn.quic_listener.addrs},
 #endif // ENABLE_HTTP3
@@ -286,8 +287,10 @@
             make_string_ref(shared_addr->balloc, src.affinity.cookie.path);
       }
       shared_addr->affinity.cookie.secure = src.affinity.cookie.secure;
+      shared_addr->affinity.cookie.stickiness = src.affinity.cookie.stickiness;
     }
     shared_addr->affinity_hash = src.affinity_hash;
+    shared_addr->affinity_hash_map = src.affinity_hash_map;
     shared_addr->redirect_if_not_tls = src.redirect_if_not_tls;
     shared_addr->dnf = src.dnf;
     shared_addr->timeout.read = src.timeout.read;
@@ -306,6 +309,7 @@
       dst_addr.weight = src_addr.weight;
       dst_addr.group = make_string_ref(shared_addr->balloc, src_addr.group);
       dst_addr.group_weight = src_addr.group_weight;
+      dst_addr.affinity_hash = src_addr.affinity_hash;
       dst_addr.proto = src_addr.proto;
       dst_addr.tls = src_addr.tls;
       dst_addr.sni = make_string_ref(shared_addr->balloc, src_addr.sni);
@@ -333,9 +337,6 @@
     auto it = addr_groups_indexer.find(dkey);
 
     if (it == std::end(addr_groups_indexer)) {
-      std::shuffle(std::begin(shared_addr->addrs), std::end(shared_addr->addrs),
-                   randgen_);
-
       auto shared_addr_ptr = shared_addr.get();
 
       for (auto &addr : shared_addr->addrs) {
@@ -359,6 +360,10 @@
         addr.seq = seq++;
       }
 
+      util::shuffle(std::begin(shared_addr->addrs),
+                    std::end(shared_addr->addrs), randgen_,
+                    (auto i, auto j) { std::swap((*i).seq, (*j).seq); });
+
       if (shared_addr->affinity.type == SessionAffinity::NONE) {
         std::map<StringRef, WeightGroup *> wgs;
         size_t num_wgs = 0;
@@ -554,7 +559,7 @@
 
     quic_conn_handler_.handle_packet(
         faddr, wev.quic_pkt->remote_addr, wev.quic_pkt->local_addr,
-        wev.quic_pkt->data.data(), wev.quic_pkt->data.size());
+        wev.quic_pkt->pi, wev.quic_pkt->data.data(), wev.quic_pkt->data.size());
 
     break;
   }
@@ -833,6 +838,28 @@
         close(fd);
         continue;
       }
+
+      if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVTCLASS, &val,
+                     static_cast<socklen_t>(sizeof(val))) == -1) {
+        auto error = errno;
+        LOG(WARN) << "Failed to set IPV6_RECVTCLASS option to listener socket: "
+                  << xsi_strerror(error, errbuf.data(), errbuf.size());
+        close(fd);
+        continue;
+      }
+
+#  if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+      int mtu_disc = IPV6_PMTUDISC_DO;
+      if (setsockopt(fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &mtu_disc,
+                     static_cast<socklen_t>(sizeof(mtu_disc))) == -1) {
+        auto error = errno;
+        LOG(WARN)
+            << "Failed to set IPV6_MTU_DISCOVER option to listener socket: "
+            << xsi_strerror(error, errbuf.data(), errbuf.size());
+        close(fd);
+        continue;
+      }
+#  endif // defined(IPV6_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
     } else {
       if (setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &val,
                      static_cast<socklen_t>(sizeof(val))) == -1) {
@@ -842,9 +869,28 @@
         close(fd);
         continue;
       }
-    }
 
-    // TODO Enable ECN
+      if (setsockopt(fd, IPPROTO_IP, IP_RECVTOS, &val,
+                     static_cast<socklen_t>(sizeof(val))) == -1) {
+        auto error = errno;
+        LOG(WARN) << "Failed to set IP_RECVTOS option to listener socket: "
+                  << xsi_strerror(error, errbuf.data(), errbuf.size());
+        close(fd);
+        continue;
+      }
+
+#  if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+      int mtu_disc = IP_PMTUDISC_DO;
+      if (setsockopt(fd, IPPROTO_IP, IP_MTU_DISCOVER, &mtu_disc,
+                     static_cast<socklen_t>(sizeof(mtu_disc))) == -1) {
+        auto error = errno;
+        LOG(WARN) << "Failed to set IP_MTU_DISCOVER option to listener socket: "
+                  << xsi_strerror(error, errbuf.data(), errbuf.size());
+        close(fd);
+        continue;
+      }
+#  endif // defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+    }
 
     if (bind(fd, rp->ai_addr, rp->ai_addrlen) == -1) {
       auto error = errno;
@@ -858,32 +904,32 @@
     auto config = get_config();
 
     auto &quic_bpf_refs = conn_handler_->get_quic_bpf_refs();
-    int err;
 
     if (should_attach_bpf()) {
       auto &bpfconf = config->quic.bpf;
 
       auto obj = bpf_object__open_file(bpfconf.prog_file.c_str(), nullptr);
-      err = libbpf_get_error(obj);
-      if (err) {
+      if (!obj) {
+        auto error = errno;
         LOG(FATAL) << "Failed to open bpf object file: "
-                   << xsi_strerror(-err, errbuf.data(), errbuf.size());
+                   << xsi_strerror(error, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
 
-      if (bpf_object__load(obj)) {
+      rv = bpf_object__load(obj);
+      if (rv != 0) {
         LOG(FATAL) << "Failed to load bpf object file: "
-                   << xsi_strerror(errno, errbuf.data(), errbuf.size());
+                   << xsi_strerror(-rv, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
 
       auto prog = bpf_object__find_program_by_name(obj, "select_reuseport");
-      err = libbpf_get_error(prog);
-      if (err) {
+      if (!prog) {
+        auto error = errno;
         LOG(FATAL) << "Failed to find sk_reuseport program: "
-                   << xsi_strerror(-err, errbuf.data(), errbuf.size());
+                   << xsi_strerror(error, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
@@ -894,10 +940,10 @@
 
       auto reuseport_array =
           bpf_object__find_map_by_name(obj, "reuseport_array");
-      err = libbpf_get_error(reuseport_array);
-      if (err) {
+      if (!reuseport_array) {
+        auto error = errno;
         LOG(FATAL) << "Failed to get reuseport_array: "
-                   << xsi_strerror(-err, errbuf.data(), errbuf.size());
+                   << xsi_strerror(error, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
@@ -905,10 +951,10 @@
       ref.reuseport_array = bpf_map__fd(reuseport_array);
 
       auto cid_prefix_map = bpf_object__find_map_by_name(obj, "cid_prefix_map");
-      err = libbpf_get_error(cid_prefix_map);
-      if (err) {
+      if (!cid_prefix_map) {
+        auto error = errno;
         LOG(FATAL) << "Failed to get cid_prefix_map: "
-                   << xsi_strerror(-err, errbuf.data(), errbuf.size());
+                   << xsi_strerror(error, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
@@ -916,10 +962,10 @@
       ref.cid_prefix_map = bpf_map__fd(cid_prefix_map);
 
       auto sk_info = bpf_object__find_map_by_name(obj, "sk_info");
-      err = libbpf_get_error(sk_info);
-      if (err) {
+      if (!sk_info) {
+        auto error = errno;
         LOG(FATAL) << "Failed to get sk_info: "
-                   << xsi_strerror(-err, errbuf.data(), errbuf.size());
+                   << xsi_strerror(error, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
@@ -927,10 +973,11 @@
       constexpr uint32_t zero = 0;
       uint64_t num_socks = config->num_worker;
 
-      if (bpf_map_update_elem(bpf_map__fd(sk_info), &zero, &num_socks,
-                              BPF_ANY) != 0) {
+      rv =
+          bpf_map_update_elem(bpf_map__fd(sk_info), &zero, &num_socks, BPF_ANY);
+      if (rv != 0) {
         LOG(FATAL) << "Failed to update sk_info: "
-                   << xsi_strerror(errno, errbuf.data(), errbuf.size());
+                   << xsi_strerror(-rv, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
@@ -941,19 +988,20 @@
       auto &qkms = conn_handler_->get_quic_keying_materials();
       auto &qkm = qkms->keying_materials.front();
 
-      if (bpf_map_update_elem(bpf_map__fd(sk_info), &key_high_idx,
-                              qkm.cid_encryption_key.data(), BPF_ANY) != 0) {
+      rv = bpf_map_update_elem(bpf_map__fd(sk_info), &key_high_idx,
+                               qkm.cid_encryption_key.data(), BPF_ANY);
+      if (rv != 0) {
         LOG(FATAL) << "Failed to update key_high_idx sk_info: "
-                   << xsi_strerror(errno, errbuf.data(), errbuf.size());
+                   << xsi_strerror(-rv, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
 
-      if (bpf_map_update_elem(bpf_map__fd(sk_info), &key_low_idx,
-                              qkm.cid_encryption_key.data() + 8,
-                              BPF_ANY) != 0) {
+      rv = bpf_map_update_elem(bpf_map__fd(sk_info), &key_low_idx,
+                               qkm.cid_encryption_key.data() + 8, BPF_ANY);
+      if (rv != 0) {
         LOG(FATAL) << "Failed to update key_low_idx sk_info: "
-                   << xsi_strerror(errno, errbuf.data(), errbuf.size());
+                   << xsi_strerror(-rv, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
@@ -973,18 +1021,20 @@
       const auto &ref = quic_bpf_refsfaddr.index;
       auto sk_index = compute_sk_index();
 
-      if (bpf_map_update_elem(ref.reuseport_array, &sk_index, &fd,
-                              BPF_NOEXIST) != 0) {
+      rv =
+          bpf_map_update_elem(ref.reuseport_array, &sk_index, &fd, BPF_NOEXIST);
+      if (rv != 0) {
         LOG(FATAL) << "Failed to update reuseport_array: "
-                   << xsi_strerror(errno, errbuf.data(), errbuf.size());
+                   << xsi_strerror(-rv, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }
 
-      if (bpf_map_update_elem(ref.cid_prefix_map, cid_prefix_.data(), &sk_index,
-                              BPF_NOEXIST) != 0) {
+      rv = bpf_map_update_elem(ref.cid_prefix_map, cid_prefix_.data(),
+                               &sk_index, BPF_NOEXIST);
+      if (rv != 0) {
         LOG(FATAL) << "Failed to update cid_prefix_map: "
-                   << xsi_strerror(errno, errbuf.data(), errbuf.size());
+                   << xsi_strerror(-rv, errbuf.data(), errbuf.size());
         close(fd);
         return -1;
       }

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/shrpx_worker.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/shrpx_worker.h Changed

@@ -133,6 +133,9 @@
   // Weight of the weight group which this address belongs to.  Its
   // range is 1, 256, inclusive.
   uint32_t group_weight;
+  // affinity hash for this address.  It is assigned when strict
+  // stickiness is enabled.
+  uint32_t affinity_hash;
   // true if TLS is used in this backend
   bool tls;
   // true if dynamic DNS is enabled
@@ -215,6 +218,9 @@
   // Bunch of session affinity hash.  Only used if affinity ==
   // SessionAffinity::IP.
   std::vector<AffinityHash> affinity_hash;
+  // Maps affinity hash of each DownstreamAddr to its index in addrs.
+  // It is only assigned when strict stickiness is enabled.
+  std::unordered_map<uint32_t, size_t> affinity_hash_map;
 #ifdef HAVE_MRUBY
   std::shared_ptr<mruby::MRubyContext> mruby_ctx;
 #endif // HAVE_MRUBY
@@ -258,15 +264,18 @@
 #ifdef ENABLE_HTTP3
 struct QUICPacket {
   QUICPacket(size_t upstream_addr_index, const Address &remote_addr,
-             const Address &local_addr, const uint8_t *data, size_t datalen)
+             const Address &local_addr, const ngtcp2_pkt_info &pi,
+             const uint8_t *data, size_t datalen)
       : upstream_addr_index{upstream_addr_index},
         remote_addr{remote_addr},
         local_addr{local_addr},
+        pi{pi},
         data{data, data + datalen} {}
-  QUICPacket() {}
+  QUICPacket() : upstream_addr_index{}, remote_addr{}, local_addr{}, pi{} {}
   size_t upstream_addr_index;
   Address remote_addr;
   Address local_addr;
+  ngtcp2_pkt_info pi;
   std::vector<uint8_t> data;
 };
 #endif // ENABLE_HTTP3
@@ -436,7 +445,7 @@
   std::shared_ptr<TicketKeys> ticket_keys_;
   std::vector<std::shared_ptr<DownstreamAddrGroup>> downstream_addr_groups_;
   // Worker level blocker for downstream connection.  For example,
-  // this is used when file decriptor is exhausted.
+  // this is used when file descriptor is exhausted.
   std::unique_ptr<ConnectBlocker> connect_blocker_;
 
   bool graceful_shutdown_;

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/ssl_compat.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/ssl_compat.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/tls.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/tls.h Changed

@@ -46,26 +46,26 @@
   LibsslGlobalLock &operator=(const LibsslGlobalLock &) = delete;
 };
 
-// Recommended general purpose "Modern compatibility" cipher suites by
-// mozilla.
+// Recommended general purpose "Intermediate compatibility" cipher
+// suites for TLSv1.2 by mozilla.
 //
 // https://wiki.mozilla.org/Security/Server_Side_TLS
 constexpr char DEFAULT_CIPHER_LIST =
-    "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-"
-    "CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-"
-    "SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-"
-    "AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256";
+    "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-"
+    "AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-"
+    "POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-"
+    "AES256-GCM-SHA384";
 
+// Recommended general purpose "Modern compatibility" cipher suites
+// for TLSv1.3 by mozilla.
+//
+// https://wiki.mozilla.org/Security/Server_Side_TLS
 constexpr char DEFAULT_TLS13_CIPHER_LIST =
-#if OPENSSL_3_0_0_API
-    "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256"
-#elif OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-    TLS_DEFAULT_CIPHERSUITES
-#else  // !OPENSSL_3_0_0_API && !(OPENSSL_1_1_1_API &&
-       // !defined(OPENSSL_IS_BORINGSSL))
+#if OPENSSL_1_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
+    "TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256"
+#else
     ""
-#endif // !OPENSSL_3_0_0_API && !(OPENSSL_1_1_1_API &&
-       // !defined(OPENSSL_IS_BORINGSSL))
+#endif
     ;
 
 constexpr auto NGHTTP2_TLS_MIN_VERSION = TLS1_VERSION;

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

@@ -43,7 +43,6 @@
 #endif // HAVE_NETINET_IN_H
 #ifdef _WIN32
 #  include <ws2tcpip.h>
-#  include <boost/date_time/posix_time/posix_time.hpp>
 #else // !_WIN32
 #  include <netinet/tcp.h>
 #endif // !_WIN32
@@ -58,6 +57,7 @@
 #include <cstring>
 #include <iostream>
 #include <fstream>
+#include <iomanip>
 
 #include <openssl/evp.h>
 
@@ -90,7 +90,7 @@
 
   int size = sizeof(struct in6_addr);
 
-  if (WSAStringToAddress(addr, af, NULL, (LPSOCKADDR)dst, &size) == 0)
+  if (WSAStringToAddress(addr, af, nullptr, (LPSOCKADDR)dst, &size) == 0)
     return 1;
   return 0;
 #  endif
@@ -135,22 +135,6 @@
                         target.size());
 }
 
-std::string percent_encode_path(const std::string &s) {
-  std::string dest;
-  for (auto c : s) {
-    if (in_rfc3986_unreserved_chars(c) || in_rfc3986_sub_delims(c) ||
-        c == '/') {
-      dest += c;
-      continue;
-    }
-
-    dest += '%';
-    dest += UPPER_XDIGITS(c >> 4) & 0x0f;
-    dest += UPPER_XDIGITS(c & 0x0f);
-  }
-  return dest;
-}
-
 bool in_token(char c) {
   static constexpr char extra = {'!', '#', '$', '%', '&', '\'', '*', '+',
                                    '-', '.', '^', '_', '`', '|',  '~'};
@@ -437,34 +421,22 @@
   return p;
 }
 
-#ifdef _WIN32
-namespace bt = boost::posix_time;
-// one-time definition of the locale that is used to parse UTC strings
-// (note that the time_input_facet is ref-counted and deleted automatically)
-static const std::locale
-    ptime_locale(std::locale::classic(),
-                 new bt::time_input_facet("%a, %d %b %Y %H:%M:%S GMT"));
-#endif //_WIN32
-
 time_t parse_http_date(const StringRef &s) {
+  tm tm{};
 #ifdef _WIN32
-  // there is no strptime - use boost
+  // there is no strptime - use std::get_time
   std::stringstream sstr(s.str());
-  sstr.imbue(ptime_locale);
-  bt::ptime ltime;
-  sstr >> ltime;
-  if (!sstr)
+  sstr >> std::get_time(&tm, "%a, %d %b %Y %H:%M:%S GMT");
+  if (sstr.fail()) {
     return 0;
-
-  return boost::posix_time::to_time_t(ltime);
+  }
 #else  // !_WIN32
-  tm tm{};
   char *r = strptime(s.c_str(), "%a, %d %b %Y %H:%M:%S GMT", &tm);
   if (r == 0) {
     return 0;
   }
-  return nghttp2_timegm_without_yday(&tm);
 #endif // !_WIN32
+  return nghttp2_timegm_without_yday(&tm);
 }
 
 time_t parse_openssl_asn1_time_print(const StringRef &s) {
@@ -1688,6 +1660,19 @@
 #endif // !__APPLE__
 }
 
+StringRef rstrip(BlockAllocator &balloc, const StringRef &s) {
+  auto it = std::rbegin(s);
+  for (; it != std::rend(s) && (*it == ' ' || *it == '\t'); ++it)
+    ;
+
+  auto len = it - std::rbegin(s);
+  if (len == 0) {
+    return s;
+  }
+
+  return make_string_ref(balloc, StringRef{s.c_str(), s.size() - len});
+}
+
 #ifdef ENABLE_HTTP3
 int msghdr_get_local_addr(Address &dest, msghdr *msg, int family) {
   switch (family) {
@@ -1722,6 +1707,52 @@
 
   return -1;
 }
+
+unsigned int msghdr_get_ecn(msghdr *msg, int family) {
+  switch (family) {
+  case AF_INET:
+    for (auto cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+      if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_TOS &&
+          cmsg->cmsg_len) {
+        return *reinterpret_cast<uint8_t *>(CMSG_DATA(cmsg));
+      }
+    }
+
+    return 0;
+  case AF_INET6:
+    for (auto cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+      if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_TCLASS &&
+          cmsg->cmsg_len) {
+        return *reinterpret_cast<uint8_t *>(CMSG_DATA(cmsg));
+      }
+    }
+
+    return 0;
+  }
+
+  return 0;
+}
+
+int fd_set_send_ecn(int fd, int family, unsigned int ecn) {
+  switch (family) {
+  case AF_INET:
+    if (setsockopt(fd, IPPROTO_IP, IP_TOS, &ecn,
+                   static_cast<socklen_t>(sizeof(ecn))) == -1) {
+      return -1;
+    }
+
+    return 0;
+  case AF_INET6:
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, &ecn,
+                   static_cast<socklen_t>(sizeof(ecn))) == -1) {
+      return -1;
+    }
+
+    return 0;
+  }
+
+  return -1;
+}
 #endif // ENABLE_HTTP3
 
 } // namespace util

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

@@ -106,9 +106,6 @@
 
 std::string percent_encode(const std::string &target);
 
-// percent-encode path component of URI |s|.
-std::string percent_encode_path(const std::string &s);
-
 template <typename InputIt>
 std::string percent_decode(InputIt first, InputIt last) {
   std::string result;
@@ -572,7 +569,7 @@
 
 // Returns absolute path of executable path.  If argc == 0 or |cwd| is
 // nullptr, this function returns nullptr.  If argv0 starts with
-// '/', this function returns argv0.  Oterwise return cwd + "/" +
+// '/', this function returns argv0.  Otherwise return cwd + "/" +
 // argv0.  If non-null is returned, it is NULL-terminated string and
 // dynamically allocated by malloc.  The caller is responsible to free
 // it.
@@ -875,10 +872,30 @@
 // Fills random bytes to the range |first|, |last|).
 template <typename OutputIt, typename Generator>
 void random_bytes(OutputIt first, OutputIt last, Generator &gen) {
-  std::uniform_int_distribution<> dis(0, 255);
+  std::uniform_int_distribution<uint8_t> dis;
   std::generate(first, last, &dis, &gen() { return dis(gen); });
 }
 
+// Shuffles the range |first|, |last| by calling swap function |fun|
+// for each pair.  |fun| takes 2 RandomIt iterators.  If |fun| is
+// noop, no modification is made.
+template <typename RandomIt, typename Generator, typename SwapFun>
+void shuffle(RandomIt first, RandomIt last, Generator &&gen, SwapFun fun) {
+  auto len = std::distance(first, last);
+  if (len < 2) {
+    return;
+  }
+
+  for (unsigned int i = 0; i < static_cast<unsigned int>(len - 1); ++i) {
+    auto dis = std::uniform_int_distribution<unsigned int>(i, len - 1);
+    auto j = dis(gen);
+    if (i == j) {
+      continue;
+    }
+    fun(first + i, first + j);
+  }
+}
+
 template <typename OutputIterator, typename CharT, size_t N>
 OutputIterator copy_lit(OutputIterator it, CharT (&s)N) {
   return std::copy_n(s, N - 1, it);
@@ -916,8 +933,18 @@
 // daemon() using fork().
 int daemonize(int nochdir, int noclose);
 
+// Returns |s| from which trailing white spaces (SPC or HTAB) are
+// removed.  If any white spaces are removed, new string is allocated
+// by |balloc| and returned.  Otherwise, the copy of |s| is returned
+// without allocation.
+StringRef rstrip(BlockAllocator &balloc, const StringRef &s);
+
 #ifdef ENABLE_HTTP3
 int msghdr_get_local_addr(Address &dest, msghdr *msg, int family);
+
+unsigned int msghdr_get_ecn(msghdr *msg, int family);
+
+int fd_set_send_ecn(int fd, int family, unsigned int ecn);
 #endif // ENABLE_HTTP3
 
 } // namespace util

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/util_test.cc -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/util_test.cc Changed

@@ -144,11 +144,6 @@
             util::percent_encode_token(balloc, StringRef::from_lit("http 2")));
 }
 
-void test_util_percent_encode_path(void) {
-  CU_ASSERT("/foo1/bar%3F&/%0A" == util::percent_encode_path("/foo1/bar?&/"
-                                                             "\x0a"));
-}
-
 void test_util_percent_decode(void) {
   {
     std::string s = "%66%6F%6f%62%61%72";
@@ -207,7 +202,7 @@
 }
 
 void test_util_select_h2(void) {
-  const unsigned char *out = NULL;
+  const unsigned char *out = nullptr;
   unsigned char outlen = 0;
 
   // Check single entry and select it.
@@ -217,7 +212,7 @@
       memcmp(NGHTTP2_PROTO_VERSION_ID, out, NGHTTP2_PROTO_VERSION_ID_LEN) == 0);
   CU_ASSERT(NGHTTP2_PROTO_VERSION_ID_LEN == outlen);
 
-  out = NULL;
+  out = nullptr;
   outlen = 0;
 
   // Check the case where id is correct but length is invalid and too
@@ -233,7 +228,7 @@
       memcmp(NGHTTP2_PROTO_VERSION_ID, out, NGHTTP2_PROTO_VERSION_ID_LEN) == 0);
   CU_ASSERT(NGHTTP2_PROTO_VERSION_ID_LEN == outlen);
 
-  out = NULL;
+  out = nullptr;
   outlen = 0;
 
   // Check the case that last entry's length is invalid and too long.
@@ -448,7 +443,11 @@
   if (tz) {
     tz = strdup(tz);
   }
+#ifdef __linux__
+  setenv("TZ", "NZST-12:00:00:00", 1);
+#else  // !__linux__
   setenv("TZ", ":Pacific/Auckland", 1);
+#endif // !__linux__
   tzset();
 
   CU_ASSERT_STRING_EQUAL("02/Oct/2001:00:34:56 +1200",
@@ -695,4 +694,14 @@
       util::split_str(StringRef::from_lit("alpha,bravo,charlie"), ',', 1));
 }
 
+void test_util_rstrip(void) {
+  BlockAllocator balloc(4096, 4096);
+
+  CU_ASSERT("alpha" == util::rstrip(balloc, StringRef::from_lit("alpha")));
+  CU_ASSERT("alpha" == util::rstrip(balloc, StringRef::from_lit("alpha ")));
+  CU_ASSERT("alpha" == util::rstrip(balloc, StringRef::from_lit("alpha \t")));
+  CU_ASSERT("" == util::rstrip(balloc, StringRef::from_lit("")));
+  CU_ASSERT("" == util::rstrip(balloc, StringRef::from_lit("\t\t\t   ")));
+}
+
 } // namespace shrpx

_service:tar_scm:nghttp2-1.46.0.tar.xz/src/util_test.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/src/util_test.h Changed

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

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

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -110,13 +110,8 @@
 @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@am__append_3 = failmalloc
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -155,11 +150,13 @@
 	nghttp2_queue_test.h nghttp2_session_test.h \
 	nghttp2_frame_test.h nghttp2_stream_test.h nghttp2_hd_test.h \
 	nghttp2_npn_test.h nghttp2_helper_test.h nghttp2_test_helper.h \
-	nghttp2_buf_test.h main.c nghttp2_pq_test.c nghttp2_map_test.c \
+	nghttp2_buf_test.h nghttp2_http_test.h nghttp2_extpri_test.h \
+	main.c nghttp2_pq_test.c nghttp2_map_test.c \
 	nghttp2_queue_test.c nghttp2_test_helper.c \
 	nghttp2_frame_test.c nghttp2_stream_test.c \
 	nghttp2_session_test.c nghttp2_hd_test.c nghttp2_npn_test.c \
-	nghttp2_helper_test.c nghttp2_buf_test.c
+	nghttp2_helper_test.c nghttp2_buf_test.c nghttp2_http_test.c \
+	nghttp2_extpri_test.c
 am__objects_1 =
 @HAVE_CUNIT_TRUE@am__objects_2 = main.$(OBJEXT) \
 @HAVE_CUNIT_TRUE@	nghttp2_pq_test.$(OBJEXT) \
@@ -172,7 +169,9 @@
 @HAVE_CUNIT_TRUE@	nghttp2_hd_test.$(OBJEXT) \
 @HAVE_CUNIT_TRUE@	nghttp2_npn_test.$(OBJEXT) \
 @HAVE_CUNIT_TRUE@	nghttp2_helper_test.$(OBJEXT) \
-@HAVE_CUNIT_TRUE@	nghttp2_buf_test.$(OBJEXT)
+@HAVE_CUNIT_TRUE@	nghttp2_buf_test.$(OBJEXT) \
+@HAVE_CUNIT_TRUE@	nghttp2_http_test.$(OBJEXT) \
+@HAVE_CUNIT_TRUE@	nghttp2_extpri_test.$(OBJEXT)
 @HAVE_CUNIT_TRUE@am_main_OBJECTS = $(am__objects_1) $(am__objects_2)
 main_OBJECTS = $(am_main_OBJECTS)
 @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@main_DEPENDENCIES = ${top_builddir}/lib/.libs/*.o \
@@ -200,9 +199,11 @@
 am__depfiles_remade = ./$(DEPDIR)/failmalloc.Po \
 	./$(DEPDIR)/failmalloc_test.Po ./$(DEPDIR)/main.Po \
 	./$(DEPDIR)/malloc_wrapper.Po ./$(DEPDIR)/nghttp2_buf_test.Po \
+	./$(DEPDIR)/nghttp2_extpri_test.Po \
 	./$(DEPDIR)/nghttp2_frame_test.Po \
 	./$(DEPDIR)/nghttp2_hd_test.Po \
 	./$(DEPDIR)/nghttp2_helper_test.Po \
+	./$(DEPDIR)/nghttp2_http_test.Po \
 	./$(DEPDIR)/nghttp2_map_test.Po \
 	./$(DEPDIR)/nghttp2_npn_test.Po ./$(DEPDIR)/nghttp2_pq_test.Po \
 	./$(DEPDIR)/nghttp2_queue_test.Po \
@@ -510,11 +511,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -531,7 +527,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -547,6 +542,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -615,15 +611,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -718,14 +708,18 @@
 @HAVE_CUNIT_TRUE@	nghttp2_hd_test.c \
 @HAVE_CUNIT_TRUE@	nghttp2_npn_test.c \
 @HAVE_CUNIT_TRUE@	nghttp2_helper_test.c \
-@HAVE_CUNIT_TRUE@	nghttp2_buf_test.c
+@HAVE_CUNIT_TRUE@	nghttp2_buf_test.c \
+@HAVE_CUNIT_TRUE@	nghttp2_http_test.c \
+@HAVE_CUNIT_TRUE@	nghttp2_extpri_test.c
 
 @HAVE_CUNIT_TRUE@HFILES = nghttp2_pq_test.h nghttp2_map_test.h nghttp2_queue_test.h \
 @HAVE_CUNIT_TRUE@	nghttp2_session_test.h \
 @HAVE_CUNIT_TRUE@	nghttp2_frame_test.h nghttp2_stream_test.h nghttp2_hd_test.h \
 @HAVE_CUNIT_TRUE@	nghttp2_npn_test.h nghttp2_helper_test.h \
 @HAVE_CUNIT_TRUE@	nghttp2_test_helper.h \
-@HAVE_CUNIT_TRUE@	nghttp2_buf_test.h
+@HAVE_CUNIT_TRUE@	nghttp2_buf_test.h \
+@HAVE_CUNIT_TRUE@	nghttp2_http_test.h \
+@HAVE_CUNIT_TRUE@	nghttp2_extpri_test.h
 
 @HAVE_CUNIT_TRUE@main_SOURCES = $(HFILES) $(OBJECTS)
 # With static lib disabled and symbol hiding enabled, we have to link object
@@ -745,6 +739,7 @@
 @HAVE_CUNIT_TRUE@	-I${top_srcdir}/lib \
 @HAVE_CUNIT_TRUE@	-I${top_srcdir}/lib/includes \
 @HAVE_CUNIT_TRUE@	-I${top_builddir}/lib/includes \
+@HAVE_CUNIT_TRUE@	-DBUILDING_NGHTTP2 \
 @HAVE_CUNIT_TRUE@	@CUNIT_CFLAGS@ @DEFS@
 
 all: all-recursive
@@ -809,9 +804,11 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc_wrapper.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_buf_test.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_extpri_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_frame_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_hd_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_helper_test.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_http_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_map_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_npn_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_pq_test.Po@am__quote@ # am--include-marker
@@ -1233,9 +1230,11 @@
 	-rm -f ./$(DEPDIR)/main.Po
 	-rm -f ./$(DEPDIR)/malloc_wrapper.Po
 	-rm -f ./$(DEPDIR)/nghttp2_buf_test.Po
+	-rm -f ./$(DEPDIR)/nghttp2_extpri_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_frame_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_hd_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_helper_test.Po
+	-rm -f ./$(DEPDIR)/nghttp2_http_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_map_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_npn_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_pq_test.Po
@@ -1293,9 +1292,11 @@
 	-rm -f ./$(DEPDIR)/main.Po
 	-rm -f ./$(DEPDIR)/malloc_wrapper.Po
 	-rm -f ./$(DEPDIR)/nghttp2_buf_test.Po
+	-rm -f ./$(DEPDIR)/nghttp2_extpri_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_frame_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_hd_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_helper_test.Po
+	-rm -f ./$(DEPDIR)/nghttp2_http_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_map_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_npn_test.Po
 	-rm -f ./$(DEPDIR)/nghttp2_pq_test.Po

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

@@ -40,6 +40,8 @@
 #include "nghttp2_npn_test.h"
 #include "nghttp2_helper_test.h"
 #include "nghttp2_buf_test.h"
+#include "nghttp2_http_test.h"
+#include "nghttp2_extpri_test.h"
 
 extern int nghttp2_enable_strict_preface;
 
@@ -93,6 +95,8 @@
                    test_nghttp2_session_recv_headers_early_response) ||
       !CU_add_test(pSuite, "session_recv_headers_for_closed_stream",
                    test_nghttp2_session_recv_headers_for_closed_stream) ||
+      !CU_add_test(pSuite, "session_recv_headers_with_extpri",
+                   test_nghttp2_session_recv_headers_with_extpri) ||
       !CU_add_test(pSuite, "session_server_recv_push_response",
                    test_nghttp2_session_server_recv_push_response) ||
       !CU_add_test(pSuite, "session_recv_premature_headers",
@@ -111,6 +115,8 @@
                    test_nghttp2_session_recv_altsvc) ||
       !CU_add_test(pSuite, "session_recv_origin",
                    test_nghttp2_session_recv_origin) ||
+      !CU_add_test(pSuite, "session_recv_priority_update",
+                   test_nghttp2_session_recv_priority_update) ||
       !CU_add_test(pSuite, "session_continue", test_nghttp2_session_continue) ||
       !CU_add_test(pSuite, "session_add_frame",
                    test_nghttp2_session_add_frame) ||
@@ -211,6 +217,8 @@
       !CU_add_test(pSuite, "submit_extension", test_nghttp2_submit_extension) ||
       !CU_add_test(pSuite, "submit_altsvc", test_nghttp2_submit_altsvc) ||
       !CU_add_test(pSuite, "submit_origin", test_nghttp2_submit_origin) ||
+      !CU_add_test(pSuite, "submit_priority_update",
+                   test_nghttp2_submit_priority_update) ||
       !CU_add_test(pSuite, "submit_rst_stream",
                    test_nghttp2_submit_rst_stream) ||
       !CU_add_test(pSuite, "session_open_stream",
@@ -309,6 +317,8 @@
       !CU_add_test(pSuite, "session_flooding", test_nghttp2_session_flooding) ||
       !CU_add_test(pSuite, "session_change_stream_priority",
                    test_nghttp2_session_change_stream_priority) ||
+      !CU_add_test(pSuite, "session_change_extpri_stream_priority",
+                   test_nghttp2_session_change_extpri_stream_priority) ||
       !CU_add_test(pSuite, "session_create_idle_stream",
                    test_nghttp2_session_create_idle_stream) ||
       !CU_add_test(pSuite, "session_repeated_priority_change",
@@ -329,6 +339,10 @@
                    test_nghttp2_session_no_closed_streams) ||
       !CU_add_test(pSuite, "session_set_stream_user_data",
                    test_nghttp2_session_set_stream_user_data) ||
+      !CU_add_test(pSuite, "session_no_rfc7540_priorities",
+                   test_nghttp2_session_no_rfc7540_priorities) ||
+      !CU_add_test(pSuite, "session_server_fallback_rfc7540_priorities",
+                   test_nghttp2_session_server_fallback_rfc7540_priorities) ||
       !CU_add_test(pSuite, "http_mandatory_headers",
                    test_nghttp2_http_mandatory_headers) ||
       !CU_add_test(pSuite, "http_content_length",
@@ -349,6 +363,9 @@
                    test_nghttp2_http_push_promise) ||
       !CU_add_test(pSuite, "http_head_method_upgrade_workaround",
                    test_nghttp2_http_head_method_upgrade_workaround) ||
+      !CU_add_test(
+          pSuite, "http_no_rfc9113_leading_and_trailing_ws_validation",
+          test_nghttp2_http_no_rfc9113_leading_and_trailing_ws_validation) ||
       !CU_add_test(pSuite, "frame_pack_headers",
                    test_nghttp2_frame_pack_headers) ||
       !CU_add_test(pSuite, "frame_pack_headers_frame_too_large",
@@ -370,6 +387,8 @@
                    test_nghttp2_frame_pack_altsvc) ||
       !CU_add_test(pSuite, "frame_pack_origin",
                    test_nghttp2_frame_pack_origin) ||
+      !CU_add_test(pSuite, "frame_pack_priority_update",
+                   test_nghttp2_frame_pack_priority_update) ||
       !CU_add_test(pSuite, "nv_array_copy", test_nghttp2_nv_array_copy) ||
       !CU_add_test(pSuite, "iv_check", test_nghttp2_iv_check) ||
       !CU_add_test(pSuite, "hd_deflate", test_nghttp2_hd_deflate) ||
@@ -415,6 +434,8 @@
                    test_nghttp2_check_header_name) ||
       !CU_add_test(pSuite, "check_header_value",
                    test_nghttp2_check_header_value) ||
+      !CU_add_test(pSuite, "check_header_value_rfc9113",
+                   test_nghttp2_check_header_value_rfc9113) ||
       !CU_add_test(pSuite, "bufs_add", test_nghttp2_bufs_add) ||
       !CU_add_test(pSuite, "bufs_add_stack_buffer_overflow_bug",
                    test_nghttp2_bufs_add_stack_buffer_overflow_bug) ||
@@ -425,7 +446,13 @@
       !CU_add_test(pSuite, "bufs_advance", test_nghttp2_bufs_advance) ||
       !CU_add_test(pSuite, "bufs_next_present",
                    test_nghttp2_bufs_next_present) ||
-      !CU_add_test(pSuite, "bufs_realloc", test_nghttp2_bufs_realloc)) {
+      !CU_add_test(pSuite, "bufs_realloc", test_nghttp2_bufs_realloc) ||
+      !CU_add_test(pSuite, "http_parse_priority",
+                   test_nghttp2_http_parse_priority) ||
+      !CU_add_test(pSuite, "sf_parse_item", test_nghttp2_sf_parse_item) ||
+      !CU_add_test(pSuite, "sf_parse_inner_list",
+                   test_nghttp2_sf_parse_inner_list) ||
+      !CU_add_test(pSuite, "extpri_to_uint8", test_nghttp2_extpri_to_uint8)) {
     CU_cleanup_registry();
     return (int)CU_get_error();
   }

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_extpri_test.c Added

@@ -0,0 +1,50 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2022 nghttp3 contributors
+ * Copyright (c) 2022 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 "nghttp2_extpri_test.h"
+
+#include <CUnit/CUnit.h>
+
+#include "nghttp2_extpri.h"
+#include "nghttp2_test_helper.h"
+
+void test_nghttp2_extpri_to_uint8(void) {
+  {
+    nghttp2_extpri pri = {1, 0};
+    CU_ASSERT(1 == nghttp2_extpri_to_uint8(&pri));
+  }
+  {
+    nghttp2_extpri pri = {1, 1};
+    CU_ASSERT((0x80 | 1) == nghttp2_extpri_to_uint8(&pri));
+  }
+  {
+    nghttp2_extpri pri = {7, 1};
+    CU_ASSERT((0x80 | 7) == nghttp2_extpri_to_uint8(&pri));
+  }
+  {
+    nghttp2_extpri pri = {7, 0};
+    CU_ASSERT(7 == nghttp2_extpri_to_uint8(&pri));
+  }
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_extpri_test.h Added

@@ -0,0 +1,35 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2022 nghttp3 contributors
+ * Copyright (c) 2022 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 NGHTTP2_EXTPRI_TEST_H
+#define NGHTTP2_EXTPRI_TEST_H
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+void test_nghttp2_extpri_to_uint8(void);
+
+#endif /* NGHTTP2_EXTPRI_TEST_H */

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

@@ -600,6 +600,43 @@
   nghttp2_bufs_free(&bufs);
 }
 
+void test_nghttp2_frame_pack_priority_update(void) {
+  nghttp2_extension frame, oframe;
+  nghttp2_ext_priority_update priority_update, opriority_update;
+  nghttp2_bufs bufs;
+  int rv;
+  size_t payloadlen;
+  static const uint8_t field_value = "i,u=0";
+
+  frame_pack_bufs_init(&bufs);
+
+  frame.payload = &priority_update;
+  oframe.payload = &opriority_update;
+
+  nghttp2_frame_priority_update_init(&frame, 1000000007, (uint8_t *)field_value,
+                                     sizeof(field_value) - 1);
+
+  payloadlen = 4 + sizeof(field_value) - 1;
+
+  rv = nghttp2_frame_pack_priority_update(&bufs, &frame);
+
+  CU_ASSERT(0 == rv);
+  CU_ASSERT(NGHTTP2_FRAME_HDLEN + payloadlen == nghttp2_bufs_len(&bufs));
+
+  rv = unpack_framebuf((nghttp2_frame *)&oframe, &bufs);
+
+  CU_ASSERT(0 == rv);
+
+  check_frame_header(payloadlen, NGHTTP2_PRIORITY_UPDATE, NGHTTP2_FLAG_NONE, 0,
+                     &oframe.hd);
+
+  CU_ASSERT(sizeof(field_value) - 1 == opriority_update.field_value_len);
+  CU_ASSERT(0 == memcmp(field_value, opriority_update.field_value,
+                        sizeof(field_value) - 1));
+
+  nghttp2_bufs_free(&bufs);
+}
+
 void test_nghttp2_nv_array_copy(void) {
   nghttp2_nv *nva;
   ssize_t rv;

_service:tar_scm:nghttp2-1.46.0.tar.xz/tests/nghttp2_frame_test.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_frame_test.h Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/tests/nghttp2_hd_test.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_hd_test.c Changed

@@ -734,7 +734,7 @@
 
   CU_ASSERT(4096 == deflater.ctx.hd_table_bufsize_max);
 
-  CU_ASSERT(8000 == inflater.ctx.hd_table_bufsize_max);
+  CU_ASSERT(4096 == inflater.ctx.hd_table_bufsize_max);
   CU_ASSERT(8000 == inflater.settings_hd_table_bufsize_max);
 
   /* This will emit encoding context update with header table size 4096 */
@@ -830,8 +830,8 @@
 
   CU_ASSERT(8000 == deflater.ctx.hd_table_bufsize_max);
   CU_ASSERT(8000 == nghttp2_hd_deflate_get_max_dynamic_table_size(&deflater));
-  CU_ASSERT(8000 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(8000 == nghttp2_hd_inflate_get_max_dynamic_table_size(&inflater));
+  CU_ASSERT(4096 == inflater.ctx.hd_table_bufsize_max);
+  CU_ASSERT(4096 == nghttp2_hd_inflate_get_max_dynamic_table_size(&inflater));
   CU_ASSERT(8000 == inflater.settings_hd_table_bufsize_max);
 
   rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
@@ -856,8 +856,8 @@
   CU_ASSERT(8192 == deflater.ctx.hd_table_bufsize_max);
   CU_ASSERT(8192 == nghttp2_hd_deflate_get_max_dynamic_table_size(&deflater));
 
-  CU_ASSERT(16383 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(16383 == nghttp2_hd_inflate_get_max_dynamic_table_size(&inflater));
+  CU_ASSERT(8000 == inflater.ctx.hd_table_bufsize_max);
+  CU_ASSERT(8000 == nghttp2_hd_inflate_get_max_dynamic_table_size(&inflater));
   CU_ASSERT(16383 == inflater.settings_hd_table_bufsize_max);
 
   rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);

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

@@ -166,4 +166,28 @@
   CU_ASSERT(check_header_value(goodval));
   CU_ASSERT(!check_header_value(badval1));
   CU_ASSERT(!check_header_value(badval2));
+  CU_ASSERT(check_header_value(""));
+  CU_ASSERT(check_header_value(" "));
+  CU_ASSERT(check_header_value("\t"));
+}
+
+#define check_header_value_rfc9113(S)                                          \
+  nghttp2_check_header_value_rfc9113((const uint8_t *)S, sizeof(S) - 1)
+
+void test_nghttp2_check_header_value_rfc9113(void) {
+  uint8_t goodval = {'a', 'b', 0x80u, 'c', 0xffu, 'd'};
+  uint8_t badval1 = {'a', 0x1fu, 'b'};
+  uint8_t badval2 = {'a', 0x7fu, 'b'};
+
+  CU_ASSERT(check_header_value_rfc9113("!|}~"));
+  CU_ASSERT(!check_header_value_rfc9113(" !|}~"));
+  CU_ASSERT(!check_header_value_rfc9113("!|}~ "));
+  CU_ASSERT(!check_header_value_rfc9113("\t!|}~"));
+  CU_ASSERT(!check_header_value_rfc9113("!|}~\t"));
+  CU_ASSERT(check_header_value_rfc9113(goodval));
+  CU_ASSERT(!check_header_value_rfc9113(badval1));
+  CU_ASSERT(!check_header_value_rfc9113(badval2));
+  CU_ASSERT(check_header_value_rfc9113(""));
+  CU_ASSERT(!check_header_value_rfc9113(" "));
+  CU_ASSERT(!check_header_value_rfc9113("\t"));
 }

_service:tar_scm:nghttp2-1.46.0.tar.xz/tests/nghttp2_helper_test.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_helper_test.h Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_http_test.c Added

@@ -0,0 +1,655 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2022 nghttp3 contributors
+ * Copyright (c) 2022 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 "nghttp2_http_test.h"
+
+#include <assert.h>
+
+#include <CUnit/CUnit.h>
+
+#include "nghttp2_http.h"
+#include "nghttp2_test_helper.h"
+
+void test_nghttp2_http_parse_priority(void) {
+  int rv;
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(0 == rv);
+    CU_ASSERT((uint32_t)-1 == pri.urgency);
+    CU_ASSERT(-1 == pri.inc);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=7,i";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(0 == rv);
+    CU_ASSERT((uint32_t)7 == pri.urgency);
+    CU_ASSERT(1 == pri.inc);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=0,i=?0";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(0 == rv);
+    CU_ASSERT((uint32_t)0 == pri.urgency);
+    CU_ASSERT(0 == pri.inc);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=3, i";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(0 == rv);
+    CU_ASSERT((uint32_t)3 == pri.urgency);
+    CU_ASSERT(1 == pri.inc);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=0, i, i=?0, u=6";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(0 == rv);
+    CU_ASSERT((uint32_t)6 == pri.urgency);
+    CU_ASSERT(0 == pri.inc);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=0,";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=0, ";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "i=?1";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(0 == rv);
+    CU_ASSERT((uint32_t)-1 == pri.urgency);
+    CU_ASSERT(1 == pri.inc);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "i=?2";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "i=?";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "i=";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=-1";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = "u=8";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v =
+        "i=?0, u=1, a=(x y z), u=2; i=?0;foo=\",,,\", i=?1;i=?0; u=6";
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v) - 1);
+
+    CU_ASSERT(0 == rv);
+    CU_ASSERT((uint32_t)2 == pri.urgency);
+    CU_ASSERT(1 == pri.inc);
+  }
+
+  {
+    nghttp2_extpri pri = {(uint32_t)-1, -1};
+    const uint8_t v = {'u', '='};
+
+    rv = nghttp2_http_parse_priority(&pri, v, sizeof(v));
+
+    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 Added

@@ -0,0 +1,37 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2022 nghttp3 contributors
+ * Copyright (c) 2022 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 NGHTTP2_HTTP_TEST_H
+#define NGHTTP2_HTTP_TEST_H
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+void test_nghttp2_http_parse_priority(void);
+void test_nghttp2_sf_parse_item(void);
+void test_nghttp2_sf_parse_inner_list(void);
+
+#endif /* NGHTTP2_HTTP_TEST_H */

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

@@ -35,6 +35,7 @@
 #include "nghttp2_helper.h"
 #include "nghttp2_test_helper.h"
 #include "nghttp2_priority_spec.h"
+#include "nghttp2_extpri.h"
 
 typedef struct {
   uint8_t buf65535;
@@ -1828,6 +1829,107 @@
   nghttp2_session_del(session);
 }
 
+void test_nghttp2_session_recv_headers_with_extpri(void) {
+  nghttp2_session *session;
+  nghttp2_session_callbacks callbacks;
+  nghttp2_nv *nva;
+  size_t nvlen;
+  nghttp2_frame frame;
+  nghttp2_bufs bufs;
+  nghttp2_buf *buf;
+  ssize_t rv;
+  nghttp2_hd_deflater deflater;
+  nghttp2_stream *stream;
+  nghttp2_mem *mem;
+  const nghttp2_nv extpri_reqnv = {
+      MAKE_NV(":method", "GET"),    MAKE_NV(":path", "/"),
+      MAKE_NV(":scheme", "https"),  MAKE_NV(":authority", "localhost"),
+      MAKE_NV("priority", "i,u=2"),
+  };
+  nghttp2_settings_entry iv;
+
+  mem = nghttp2_mem_default();
+  frame_pack_bufs_init(&bufs);
+
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+
+  nghttp2_session_server_new(&session, &callbacks, NULL);
+
+  iv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv.value = 1;
+
+  nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
+
+  nghttp2_hd_deflate_init(&deflater, mem);
+
+  nvlen = ARRLEN(extpri_reqnv);
+  nghttp2_nv_array_copy(&nva, extpri_reqnv, nvlen, mem);
+
+  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
+                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
+
+  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
+
+  CU_ASSERT(0 == rv);
+  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
+
+  nghttp2_frame_headers_free(&frame.headers, mem);
+
+  buf = &bufs.head->buf;
+  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
+
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  stream = nghttp2_session_get_stream(session, 1);
+
+  CU_ASSERT(2 == nghttp2_extpri_uint8_urgency(stream->extpri));
+  CU_ASSERT(1 == nghttp2_extpri_uint8_inc(stream->extpri));
+
+  nghttp2_hd_deflate_free(&deflater);
+  nghttp2_session_del(session);
+
+  nghttp2_bufs_reset(&bufs);
+
+  /* Client should ignore priority header field included in
+     PUSH_PROMISE. */
+  nghttp2_session_client_new(&session, &callbacks, NULL);
+
+  nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
+
+  open_sent_stream(session, 1);
+
+  nghttp2_hd_deflate_init(&deflater, mem);
+
+  nvlen = ARRLEN(extpri_reqnv);
+  nghttp2_nv_array_copy(&nva, extpri_reqnv, nvlen, mem);
+
+  nghttp2_frame_push_promise_init(&frame.push_promise, NGHTTP2_FLAG_END_HEADERS,
+                                  1, 2, nva, nvlen);
+
+  rv = nghttp2_frame_pack_push_promise(&bufs, &frame.push_promise, &deflater);
+
+  CU_ASSERT(0 == rv);
+  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
+
+  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
+
+  buf = &bufs.head->buf;
+  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
+
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  stream = nghttp2_session_get_stream(session, 2);
+
+  CU_ASSERT(NGHTTP2_EXTPRI_DEFAULT_URGENCY ==
+            nghttp2_extpri_uint8_urgency(stream->http_extpri));
+  CU_ASSERT(NGHTTP2_EXTPRI_DEFAULT_URGENCY ==
+            nghttp2_extpri_uint8_urgency(stream->extpri));
+
+  nghttp2_hd_deflate_free(&deflater);
+  nghttp2_session_del(session);
+  nghttp2_bufs_free(&bufs);
+}
+
 void test_nghttp2_session_server_recv_push_response(void) {
   nghttp2_session *session;
   nghttp2_session_callbacks callbacks;
@@ -2668,6 +2770,209 @@
   nghttp2_bufs_free(&bufs);
 }
 
+void test_nghttp2_session_recv_priority_update(void) {
+  nghttp2_session *session;
+  nghttp2_session_callbacks callbacks;
+  my_user_data ud;
+  nghttp2_bufs bufs;
+  ssize_t rv;
+  nghttp2_option *option;
+  nghttp2_extension frame;
+  nghttp2_ext_priority_update priority_update;
+  nghttp2_stream *stream;
+  nghttp2_hd_deflater deflater;
+  nghttp2_mem *mem;
+  uint8_t large_field_valuesizeof(session->iframe.raw_sbuf) + 1;
+  nghttp2_outbound_item *item;
+  size_t i;
+  int32_t stream_id;
+  static const uint8_t field_value = "u=2,i";
+
+  mem = nghttp2_mem_default();
+
+  memset(large_field_value, ' ', sizeof(large_field_value));
+  memcpy(large_field_value, field_value, sizeof(field_value) - 1);
+
+  frame_pack_bufs_init(&bufs);
+
+  frame.payload = &priority_update;
+
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+
+  callbacks.on_frame_recv_callback = on_frame_recv_callback;
+
+  nghttp2_option_new(&option);
+  nghttp2_option_set_builtin_recv_extension_type(option,
+                                                 NGHTTP2_PRIORITY_UPDATE);
+
+  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
+
+  session->pending_no_rfc7540_priorities = 1;
+
+  nghttp2_frame_priority_update_init(&frame, 1, (uint8_t *)field_value,
+                                     sizeof(field_value) - 1);
+
+  nghttp2_frame_pack_priority_update(&bufs, &frame);
+
+  open_recv_stream(session, 1);
+
+  ud.frame_recv_cb_called = 0;
+  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                nghttp2_bufs_len(&bufs));
+
+  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
+  CU_ASSERT(1 == ud.frame_recv_cb_called);
+  CU_ASSERT(NGHTTP2_PRIORITY_UPDATE == ud.recv_frame_hd.type);
+  CU_ASSERT(NGHTTP2_FLAG_NONE == ud.recv_frame_hd.flags);
+  CU_ASSERT(0 == ud.recv_frame_hd.stream_id);
+
+  stream = nghttp2_session_get_stream_raw(session, 1);
+
+  CU_ASSERT(2 == nghttp2_extpri_uint8_urgency(stream->extpri));
+  CU_ASSERT(1 == nghttp2_extpri_uint8_inc(stream->extpri));
+
+  nghttp2_session_del(session);
+  nghttp2_bufs_reset(&bufs);
+
+  /* Check that priority which is received in idle state is
+     retained. */
+  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
+
+  session->pending_no_rfc7540_priorities = 1;
+
+  nghttp2_frame_priority_update_init(&frame, 1, (uint8_t *)field_value,
+                                     sizeof(field_value) - 1);
+
+  nghttp2_frame_pack_priority_update(&bufs, &frame);
+
+  ud.frame_recv_cb_called = 0;
+  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                nghttp2_bufs_len(&bufs));
+
+  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
+  CU_ASSERT(1 == ud.frame_recv_cb_called);
+  CU_ASSERT(NGHTTP2_PRIORITY_UPDATE == ud.recv_frame_hd.type);
+  CU_ASSERT(NGHTTP2_FLAG_NONE == ud.recv_frame_hd.flags);
+  CU_ASSERT(0 == ud.recv_frame_hd.stream_id);
+
+  stream = nghttp2_session_get_stream_raw(session, 1);
+
+  CU_ASSERT(NGHTTP2_STREAM_IDLE == stream->state);
+  CU_ASSERT(2 == nghttp2_extpri_uint8_urgency(stream->extpri));
+  CU_ASSERT(1 == nghttp2_extpri_uint8_inc(stream->extpri));
+
+  nghttp2_hd_deflate_init(&deflater, mem);
+  nghttp2_bufs_reset(&bufs);
+  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, reqnv,
+                    ARRLEN(reqnv), mem);
+
+  CU_ASSERT(0 == rv);
+
+  ud.frame_recv_cb_called = 0;
+  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                nghttp2_bufs_len(&bufs));
+
+  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
+  CU_ASSERT(1 == ud.frame_recv_cb_called);
+  CU_ASSERT(NGHTTP2_HEADERS == ud.recv_frame_hd.type);
+  CU_ASSERT(NGHTTP2_STREAM_OPENING == stream->state);
+  CU_ASSERT(2 == nghttp2_extpri_uint8_urgency(stream->extpri));
+  CU_ASSERT(1 == nghttp2_extpri_uint8_inc(stream->extpri));
+
+  nghttp2_hd_deflate_free(&deflater);
+
+  nghttp2_session_del(session);
+  nghttp2_bufs_reset(&bufs);
+
+  /* PRIORITY_UPDATE with too large field_value is discarded */
+  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
+
+  session->pending_no_rfc7540_priorities = 1;
+
+  nghttp2_frame_priority_update_init(&frame, 1, large_field_value,
+                                     sizeof(large_field_value));
+
+  nghttp2_frame_pack_priority_update(&bufs, &frame);
+
+  open_recv_stream(session, 1);
+
+  ud.frame_recv_cb_called = 0;
+  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                nghttp2_bufs_len(&bufs));
+
+  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
+  CU_ASSERT(0 == ud.frame_recv_cb_called);
+
+  stream = nghttp2_session_get_stream_raw(session, 1);
+
+  CU_ASSERT(NGHTTP2_EXTPRI_DEFAULT_URGENCY == stream->extpri);
+
+  nghttp2_session_del(session);
+  nghttp2_bufs_reset(&bufs);
+
+  /* Connection error if client receives PRIORITY_UPDATE. */
+  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
+
+  session->pending_no_rfc7540_priorities = 1;
+
+  nghttp2_frame_priority_update_init(&frame, 1, (uint8_t *)field_value,
+                                     sizeof(field_value) - 1);
+
+  nghttp2_frame_pack_priority_update(&bufs, &frame);
+
+  open_sent_stream(session, 1);
+
+  ud.frame_recv_cb_called = 0;
+  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                nghttp2_bufs_len(&bufs));
+
+  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
+  CU_ASSERT(0 == ud.frame_recv_cb_called);
+
+  item = nghttp2_session_get_next_ob_item(session);
+  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
+  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
+
+  nghttp2_session_del(session);
+  nghttp2_bufs_reset(&bufs);
+
+  /* The number of idle streams exceeds the maximum. */
+  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
+
+  session->pending_no_rfc7540_priorities = 1;
+  session->local_settings.max_concurrent_streams = 100;
+
+  for (i = 0; i < 101; ++i) {
+    stream_id = (int32_t)(i * 2 + 1);
+    nghttp2_frame_priority_update_init(
+        &frame, stream_id, (uint8_t *)field_value, sizeof(field_value) - 1);
+
+    nghttp2_frame_pack_priority_update(&bufs, &frame);
+
+    ud.frame_recv_cb_called = 0;
+    rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                  nghttp2_bufs_len(&bufs));
+
+    if (i < 100) {
+      CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
+      CU_ASSERT(1 == ud.frame_recv_cb_called);
+      CU_ASSERT(NGHTTP2_PRIORITY_UPDATE == ud.recv_frame_hd.type);
+    } else {
+      CU_ASSERT(0 == ud.frame_recv_cb_called);
+    }
+
+    nghttp2_bufs_reset(&bufs);
+  }
+
+  item = nghttp2_session_get_next_ob_item(session);
+  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
+  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
+
+  nghttp2_session_del(session);
+  nghttp2_option_del(option);
+  nghttp2_bufs_free(&bufs);
+}
+
 void test_nghttp2_session_continue(void) {
   nghttp2_session *session;
   nghttp2_session_callbacks callbacks;
@@ -2954,7 +3259,7 @@
   session->local_settings.max_concurrent_streams =
       NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS;
 
-  /* Stream ID less than or equal to the previouly received request
+  /* Stream ID less than or equal to the previously received request
      HEADERS is just ignored due to race condition */
   nghttp2_frame_headers_init(&frame.headers,
                              NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
@@ -3380,6 +3685,11 @@
   nghttp2_nv nv = MAKE_NV(":authority", "example.org");
   nghttp2_mem *mem;
   nghttp2_option *option;
+  uint8_t data2048;
+  nghttp2_frame_hd hd;
+  int rv;
+  ssize_t nread;
+  nghttp2_stream *stream;
 
   mem = nghttp2_mem_default();
 
@@ -3588,6 +3898,87 @@
   CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
 
   nghttp2_session_del(session);
+
+  /* Should send WINDOW_UPDATE with no_auto_window_update option on if
+     the initial window size is decreased and becomes smaller than or
+     equal to the amount of data that has already received. */
+  nghttp2_option_new(&option);
+  nghttp2_option_set_no_auto_window_update(option, 1);
+
+  nghttp2_session_server_new2(&session, &callbacks, NULL, option);
+
+  iv0.settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
+  iv0.value = 1024;
+
+  rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 1);
+
+  CU_ASSERT(0 == rv);
+
+  rv = nghttp2_session_send(session);
+
+  CU_ASSERT(0 == rv);
+
+  stream = open_recv_stream(session, 1);
+
+  memset(data, 0, sizeof(data));
+  hd.length = 1024;
+  hd.type = NGHTTP2_DATA;
+  hd.flags = NGHTTP2_FLAG_NONE;
+  hd.stream_id = 1;
+  nghttp2_frame_pack_frame_hd(data, &hd);
+
+  nread =
+      nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + hd.length);
+
+  CU_ASSERT((ssize_t)(NGHTTP2_FRAME_HDLEN + hd.length) == nread);
+
+  rv = nghttp2_session_consume(session, 1, hd.length);
+
+  CU_ASSERT(0 == rv);
+  CU_ASSERT((int32_t)hd.length == stream->recv_window_size);
+  CU_ASSERT((int32_t)hd.length == stream->consumed_size);
+
+  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_ACK, NULL, 0);
+
+  rv = nghttp2_session_on_settings_received(session, &frame, 0);
+
+  CU_ASSERT(0 == rv);
+  CU_ASSERT(1024 == stream->local_window_size);
+  CU_ASSERT(0 == stream->recv_window_size);
+  CU_ASSERT(0 == stream->consumed_size);
+
+  item = nghttp2_session_get_next_ob_item(session);
+
+  CU_ASSERT(NULL != item);
+  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
+  CU_ASSERT((int32_t)hd.length ==
+            item->frame.window_update.window_size_increment);
+
+  nghttp2_session_del(session);
+  nghttp2_option_del(option);
+
+  /* It is invalid to change SETTINGS_NO_RFC7540_PRIORITIES in the
+     following SETTINGS. */
+  nghttp2_session_client_new(&session, &callbacks, NULL);
+
+  session->remote_settings.no_rfc7540_priorities = 1;
+
+  iv0.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv0.value = 0;
+
+  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 1),
+                              1);
+
+  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
+
+  nghttp2_frame_settings_free(&frame.settings, mem);
+
+  item = nghttp2_session_get_next_ob_item(session);
+
+  CU_ASSERT(NULL != item);
+  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
+
+  nghttp2_session_del(session);
 }
 
 void test_nghttp2_session_on_push_promise_received(void) {
@@ -4650,7 +5041,7 @@
   CU_ASSERT(10 == stream->weight);
   CU_ASSERT(&session->root == stream->dep_prev);
 
-  /* If depenency to idle stream which is not in depdenency tree yet */
+  /* If dependency to idle stream which is not in dependency tree yet */
 
   nghttp2_priority_spec_init(&pri_spec, 3, 99, 0);
 
@@ -5720,7 +6111,7 @@
   nghttp2_frame_settings_free(&ack_frame.settings, mem);
 
   CU_ASSERT(16 * 1024 == session->local_settings.initial_window_size);
-  CU_ASSERT(1023 == session->hd_inflater.ctx.hd_table_bufsize_max);
+  CU_ASSERT(111 == session->hd_inflater.ctx.hd_table_bufsize_max);
   CU_ASSERT(111 == session->hd_inflater.min_hd_table_bufsize_max);
   CU_ASSERT(50 == session->local_settings.max_concurrent_streams);
 
@@ -5733,6 +6124,37 @@
   CU_ASSERT(50 == session->pending_local_max_concurrent_stream);
 
   nghttp2_session_del(session);
+
+  /* Bail out if there are contradicting
+     SETTINGS_NO_RFC7540_PRIORITIES in one SETTINGS. */
+  nghttp2_session_server_new(&session, &callbacks, &ud);
+
+  iv0.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv0.value = 1;
+  iv1.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv1.value = 0;
+
+  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
+            nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 2));
+
+  nghttp2_session_del(session);
+
+  /* Attempt to change SETTINGS_NO_RFC7540_PRIORITIES in the 2nd
+     SETTINGS. */
+  nghttp2_session_server_new(&session, &callbacks, &ud);
+
+  iv0.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv0.value = 1;
+
+  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 1));
+
+  iv0.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv0.value = 0;
+
+  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
+            nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 1));
+
+  nghttp2_session_del(session);
 }
 
 void test_nghttp2_submit_settings_update_local_window_size(void) {
@@ -6398,6 +6820,110 @@
   nghttp2_session_del(session);
 }
 
+void test_nghttp2_submit_priority_update(void) {
+  nghttp2_session *session;
+  nghttp2_session_callbacks callbacks;
+  const uint8_t field_value = "i";
+  my_user_data ud;
+  const uint8_t *data;
+  int rv;
+  nghttp2_frame frame;
+  nghttp2_ext_priority_update priority_update;
+  ssize_t len;
+  int32_t stream_id;
+
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+  callbacks.on_frame_send_callback = on_frame_send_callback;
+
+  nghttp2_session_client_new(&session, &callbacks, &ud);
+
+  session->pending_no_rfc7540_priorities = 1;
+
+  stream_id =
+      nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), NULL, NULL);
+
+  CU_ASSERT(1 == stream_id);
+
+  len = nghttp2_session_mem_send(session, &data);
+
+  CU_ASSERT(len > 0);
+
+  rv = nghttp2_submit_priority_update(session, NGHTTP2_FLAG_NONE, stream_id,
+                                      field_value, sizeof(field_value) - 1);
+
+  CU_ASSERT(0 == rv);
+
+  frame.ext.payload = &priority_update;
+
+  ud.frame_send_cb_called = 0;
+  len = nghttp2_session_mem_send(session, &data);
+
+  CU_ASSERT(len > 0);
+  CU_ASSERT(1 == ud.frame_send_cb_called);
+
+  nghttp2_frame_unpack_frame_hd(&frame.hd, data);
+  nghttp2_frame_unpack_priority_update_payload(
+      &frame.ext, (uint8_t *)(data + NGHTTP2_FRAME_HDLEN),
+      (size_t)len - NGHTTP2_FRAME_HDLEN);
+
+  CU_ASSERT(0 == frame.hd.stream_id);
+  CU_ASSERT(NGHTTP2_PRIORITY_UPDATE == frame.hd.type);
+  CU_ASSERT(stream_id == priority_update.stream_id);
+  CU_ASSERT(sizeof(field_value) - 1 == priority_update.field_value_len);
+  CU_ASSERT(0 == memcmp(field_value, priority_update.field_value,
+                        sizeof(field_value) - 1));
+
+  nghttp2_session_del(session);
+
+  /* Submitting PRIORITY_UPDATE frame from server session is error */
+  nghttp2_session_server_new(&session, &callbacks, &ud);
+
+  open_recv_stream(session, 1);
+
+  rv = nghttp2_submit_priority_update(session, NGHTTP2_FLAG_NONE, 1,
+                                      field_value, sizeof(field_value) - 1);
+
+  CU_ASSERT(NGHTTP2_ERR_INVALID_STATE == rv);
+
+  nghttp2_session_del(session);
+
+  /* Submitting PRIORITY_UPDATE with empty field_value */
+  nghttp2_session_client_new(&session, &callbacks, &ud);
+
+  stream_id =
+      nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), NULL, NULL);
+
+  CU_ASSERT(1 == stream_id);
+
+  len = nghttp2_session_mem_send(session, &data);
+
+  CU_ASSERT(len > 0);
+
+  rv = nghttp2_submit_priority_update(session, NGHTTP2_FLAG_NONE, stream_id,
+                                      NULL, 0);
+
+  CU_ASSERT(0 == rv);
+
+  frame.ext.payload = &priority_update;
+
+  len = nghttp2_session_mem_send(session, &data);
+
+  CU_ASSERT(len > 0);
+
+  nghttp2_frame_unpack_frame_hd(&frame.hd, data);
+  nghttp2_frame_unpack_priority_update_payload(
+      &frame.ext, (uint8_t *)(data + NGHTTP2_FRAME_HDLEN),
+      (size_t)len - NGHTTP2_FRAME_HDLEN);
+
+  CU_ASSERT(0 == frame.hd.stream_id);
+  CU_ASSERT(NGHTTP2_PRIORITY_UPDATE == frame.hd.type);
+  CU_ASSERT(stream_id == priority_update.stream_id);
+  CU_ASSERT(0 == priority_update.field_value_len);
+  CU_ASSERT(NULL == priority_update.field_value);
+
+  nghttp2_session_del(session);
+}
+
 void test_nghttp2_submit_rst_stream(void) {
   nghttp2_session *session;
   nghttp2_session_callbacks callbacks;
@@ -9070,7 +9596,7 @@
   CU_ASSERT(NGHTTP2_STREAM_STATE_RESERVED_LOCAL ==
             nghttp2_stream_get_state(stream));
 
-  /* Send resposne to push stream 2 with END_STREAM set */
+  /* Send response to push stream 2 with END_STREAM set */
   nghttp2_submit_response(session, 2, resnv, ARRLEN(resnv), NULL);
 
   rv = nghttp2_session_send(session);
@@ -10212,6 +10738,84 @@
   nghttp2_session_del(session);
 }
 
+void test_nghttp2_session_change_extpri_stream_priority(void) {
+  nghttp2_session *session;
+  nghttp2_session_callbacks callbacks;
+  nghttp2_bufs bufs;
+  nghttp2_buf *buf;
+  ssize_t rv;
+  nghttp2_option *option;
+  nghttp2_extension frame;
+  nghttp2_ext_priority_update priority_update;
+  nghttp2_extpri extpri;
+  nghttp2_stream *stream;
+  static const uint8_t field_value = "u=2";
+
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+
+  frame_pack_bufs_init(&bufs);
+
+  nghttp2_option_new(&option);
+  nghttp2_option_set_builtin_recv_extension_type(option,
+                                                 NGHTTP2_PRIORITY_UPDATE);
+
+  nghttp2_session_server_new2(&session, &callbacks, NULL, option);
+
+  session->pending_no_rfc7540_priorities = 1;
+
+  open_recv_stream(session, 1);
+
+  extpri.urgency = NGHTTP2_EXTPRI_URGENCY_LOW + 1;
+  extpri.inc = 1;
+
+  rv = nghttp2_session_change_extpri_stream_priority(
+      session, 1, &extpri, /* ignore_client_signal = */ 0);
+
+  CU_ASSERT(0 == rv);
+
+  stream = nghttp2_session_get_stream(session, 1);
+
+  CU_ASSERT(NGHTTP2_EXTPRI_URGENCY_LOW ==
+            nghttp2_extpri_uint8_urgency(stream->extpri));
+  CU_ASSERT(1 == nghttp2_extpri_uint8_inc(stream->extpri));
+
+  /* Client can still update stream priority. */
+  frame.payload = &priority_update;
+  nghttp2_frame_priority_update_init(&frame, 1, (uint8_t *)field_value,
+                                     sizeof(field_value) - 1);
+  nghttp2_frame_pack_priority_update(&bufs, &frame);
+
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+  CU_ASSERT(2 == stream->extpri);
+
+  /* Start to ignore client priority signal for this stream. */
+  rv = nghttp2_session_change_extpri_stream_priority(
+      session, 1, &extpri, /* ignore_client_signal = */ 1);
+
+  CU_ASSERT(0 == rv);
+
+  stream = nghttp2_session_get_stream(session, 1);
+
+  CU_ASSERT(NGHTTP2_EXTPRI_URGENCY_LOW ==
+            nghttp2_extpri_uint8_urgency(stream->extpri));
+  CU_ASSERT(1 == nghttp2_extpri_uint8_inc(stream->extpri));
+
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+  CU_ASSERT(NGHTTP2_EXTPRI_URGENCY_LOW ==
+            nghttp2_extpri_uint8_urgency(stream->extpri));
+  CU_ASSERT(1 == nghttp2_extpri_uint8_inc(stream->extpri));
+
+  nghttp2_session_del(session);
+  nghttp2_option_del(option);
+  nghttp2_bufs_free(&bufs);
+}
+
 void test_nghttp2_session_create_idle_stream(void) {
   nghttp2_session *session;
   nghttp2_session_callbacks callbacks;
@@ -11055,6 +11659,292 @@
   nghttp2_session_del(session);
 }
 
+void test_nghttp2_session_no_rfc7540_priorities(void) {
+  nghttp2_session *session;
+  nghttp2_session_callbacks callbacks;
+  nghttp2_data_provider data_prd;
+  my_user_data ud;
+  nghttp2_outbound_item *item;
+  nghttp2_mem *mem;
+  nghttp2_settings_entry iv;
+  nghttp2_priority_spec pri_spec;
+
+  mem = nghttp2_mem_default();
+
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+  callbacks.send_callback = null_send_callback;
+
+  /* Do not use a dependency tree if SETTINGS_NO_RFC7540_PRIORITIES =
+     1. */
+  data_prd.read_callback = fixed_length_data_source_read_callback;
+
+  ud.data_source_length = 128 * 1024;
+  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
+
+  iv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv.value = 1;
+
+  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1));
+  CU_ASSERT(0 == nghttp2_session_send(session));
+
+  open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
+  CU_ASSERT(0 == nghttp2_submit_response(session, 1, resnv, ARRLEN(resnv),
+                                         &data_prd));
+  item = nghttp2_session_get_next_ob_item(session);
+  CU_ASSERT(ARRLEN(resnv) == item->frame.headers.nvlen);
+  assert_nv_equal(resnv, item->frame.headers.nva, item->frame.headers.nvlen,
+                  mem);
+
+  CU_ASSERT(0 == nghttp2_session_send(session));
+  CU_ASSERT(1 == nghttp2_pq_size(
+                     &session->schedNGHTTP2_EXTPRI_DEFAULT_URGENCY.ob_data));
+  CU_ASSERT(nghttp2_pq_empty(&session->root.obq));
+
+  nghttp2_session_del(session);
+
+  /* Priorities are sent as is before client receives
+     SETTINGS_NO_RFC7540_PRIORITIES = 1 from server. */
+  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, NULL));
+
+  iv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv.value = 1;
+
+  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1));
+
+  pri_spec.stream_id = 5;
+  pri_spec.weight = 111;
+  pri_spec.exclusive = 1;
+
+  CU_ASSERT(1 == nghttp2_submit_request(session, &pri_spec, reqnv,
+                                        ARRLEN(reqnv), NULL, NULL));
+
+  item = nghttp2_outbound_queue_top(&session->ob_syn);
+
+  CU_ASSERT(NULL != item);
+  CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
+  CU_ASSERT(pri_spec.stream_id == item->frame.headers.pri_spec.stream_id);
+  CU_ASSERT(pri_spec.weight == item->frame.headers.pri_spec.weight);
+  CU_ASSERT(pri_spec.exclusive == item->frame.headers.pri_spec.exclusive);
+
+  nghttp2_session_del(session);
+
+  /* Priorities are defaulted if client received
+     SETTINGS_NO_RFC7540_PRIORITIES = 1 from server. */
+  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, NULL));
+
+  iv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv.value = 1;
+
+  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1));
+
+  session->remote_settings.no_rfc7540_priorities = 1;
+
+  pri_spec.stream_id = 5;
+  pri_spec.weight = 111;
+  pri_spec.exclusive = 1;
+
+  CU_ASSERT(1 == nghttp2_submit_request(session, &pri_spec, reqnv,
+                                        ARRLEN(reqnv), NULL, NULL));
+
+  item = nghttp2_outbound_queue_top(&session->ob_syn);
+
+  CU_ASSERT(NULL != item);
+  CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
+  CU_ASSERT(nghttp2_priority_spec_check_default(&item->frame.headers.pri_spec));
+
+  nghttp2_session_del(session);
+}
+
+void test_nghttp2_session_server_fallback_rfc7540_priorities(void) {
+  nghttp2_session *session;
+  nghttp2_option *option;
+  nghttp2_session_callbacks callbacks;
+  nghttp2_frame frame;
+  nghttp2_bufs bufs;
+  nghttp2_buf *buf;
+  ssize_t rv;
+  nghttp2_settings_entry iv;
+  nghttp2_mem *mem;
+  nghttp2_hd_deflater deflater;
+  nghttp2_nv *nva;
+  size_t nvlen;
+  nghttp2_priority_spec pri_spec;
+  nghttp2_stream *anchor_stream, *stream;
+  my_user_data ud;
+  nghttp2_ext_priority_update priority_update;
+  static const uint8_t field_value = "u=0";
+
+  mem = nghttp2_mem_default();
+  frame_pack_bufs_init(&bufs);
+
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+  callbacks.send_callback = null_send_callback;
+  callbacks.on_frame_recv_callback = on_frame_recv_callback;
+
+  nghttp2_option_new(&option);
+  nghttp2_option_set_server_fallback_rfc7540_priorities(option, 1);
+
+  iv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv.value = 1;
+
+  /* Server falls back to RFC 7540 priorities. */
+  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
+
+  rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
+
+  CU_ASSERT(0 == rv);
+
+  rv = nghttp2_session_send(session);
+
+  CU_ASSERT(0 == rv);
+
+  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, NULL, 0);
+  rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
+
+  CU_ASSERT(0 == rv);
+
+  nghttp2_frame_settings_free(&frame.settings, mem);
+
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+  CU_ASSERT(1 == session->fallback_rfc7540_priorities);
+
+  nghttp2_hd_deflate_init(&deflater, mem);
+
+  nvlen = ARRLEN(reqnv);
+  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
+  nghttp2_priority_spec_init(&pri_spec, 3, 111, 1);
+  nghttp2_frame_headers_init(&frame.headers,
+                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
+                             1, NGHTTP2_HCAT_HEADERS, &pri_spec, nva, nvlen);
+  nghttp2_bufs_reset(&bufs);
+  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
+
+  CU_ASSERT(0 == rv);
+
+  nghttp2_frame_headers_free(&frame.headers, mem);
+
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+
+  anchor_stream = nghttp2_session_get_stream_raw(session, 3);
+
+  CU_ASSERT(NGHTTP2_STREAM_IDLE == anchor_stream->state);
+  CU_ASSERT(
+      !(anchor_stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES));
+  CU_ASSERT(&session->root == anchor_stream->dep_prev);
+
+  stream = nghttp2_session_get_stream(session, 1);
+
+  CU_ASSERT(NGHTTP2_STREAM_OPENING == stream->state);
+  CU_ASSERT(!(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES));
+  CU_ASSERT(anchor_stream == stream->dep_prev);
+
+  /* Make sure that PRIORITY frame updates stream priority. */
+  nghttp2_priority_spec_init(&pri_spec, 5, 1, 0);
+  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
+  nghttp2_bufs_reset(&bufs);
+  rv = nghttp2_frame_pack_priority(&bufs, &frame.priority);
+
+  CU_ASSERT(0 == rv);
+
+  nghttp2_frame_priority_free(&frame.priority);
+
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+
+  anchor_stream = nghttp2_session_get_stream_raw(session, 5);
+
+  CU_ASSERT(NGHTTP2_STREAM_IDLE == anchor_stream->state);
+  CU_ASSERT(&session->root == anchor_stream->dep_prev);
+  CU_ASSERT(anchor_stream == stream->dep_prev);
+
+  /* Make sure that PRIORITY_UPDATE frame is ignored. */
+  frame.ext.payload = &priority_update;
+  nghttp2_frame_priority_update_init(&frame.ext, 1, (uint8_t *)field_value,
+                                     sizeof(field_value) - 1);
+  nghttp2_bufs_reset(&bufs);
+  nghttp2_frame_pack_priority_update(&bufs, &frame.ext);
+
+  ud.frame_recv_cb_called = 0;
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+  CU_ASSERT(0 == ud.frame_recv_cb_called);
+  CU_ASSERT(NGHTTP2_EXTPRI_DEFAULT_URGENCY == stream->extpri);
+
+  nghttp2_hd_deflate_free(&deflater);
+  nghttp2_session_del(session);
+
+  /* Server does not fallback to RFC 7540 priorities. */
+  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
+
+  rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
+
+  CU_ASSERT(0 == rv);
+
+  rv = nghttp2_session_send(session);
+
+  CU_ASSERT(0 == rv);
+
+  iv.settings_id = NGHTTP2_SETTINGS_NO_RFC7540_PRIORITIES;
+  iv.value = 0;
+
+  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE,
+                              dup_iv(&iv, 1), 1);
+  nghttp2_bufs_reset(&bufs);
+  rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
+
+  CU_ASSERT(0 == rv);
+
+  nghttp2_frame_settings_free(&frame.settings, mem);
+
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+  CU_ASSERT(0 == session->fallback_rfc7540_priorities);
+
+  nghttp2_hd_deflate_init(&deflater, mem);
+
+  nvlen = ARRLEN(reqnv);
+  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
+  nghttp2_priority_spec_init(&pri_spec, 3, 111, 1);
+  nghttp2_frame_headers_init(&frame.headers,
+                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
+                             1, NGHTTP2_HCAT_HEADERS, &pri_spec, nva, nvlen);
+  nghttp2_bufs_reset(&bufs);
+  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
+
+  CU_ASSERT(0 == rv);
+
+  nghttp2_frame_headers_free(&frame.headers, mem);
+
+  buf = &bufs.head->buf;
+  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
+  CU_ASSERT(NULL == nghttp2_session_get_stream_raw(session, 3));
+
+  stream = nghttp2_session_get_stream(session, 1);
+
+  CU_ASSERT(NGHTTP2_STREAM_OPENING == stream->state);
+  CU_ASSERT(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES);
+
+  nghttp2_hd_deflate_free(&deflater);
+  nghttp2_session_del(session);
+
+  nghttp2_option_del(option);
+  nghttp2_bufs_free(&bufs);
+}
+
 static void check_nghttp2_http_recv_headers_fail(
     nghttp2_session *session, nghttp2_hd_deflater *deflater, int32_t stream_id,
     int stream_state, const nghttp2_nv *nva, size_t nvlen) {
@@ -11164,6 +12054,8 @@
   const nghttp2_nv clnonzero204_resnv = {MAKE_NV(":status", "204"),
                                            MAKE_NV("content-length", "100")};
   const nghttp2_nv status101_resnv = {MAKE_NV(":status", "101")};
+  const nghttp2_nv unexpectedhost_resnv = {MAKE_NV(":status", "200"),
+                                             MAKE_NV("host", "/localhost")};
 
   /* test case for request */
   const nghttp2_nv nopath_reqnv = {MAKE_NV(":scheme", "https"),
@@ -11301,6 +12193,12 @@
                                        NGHTTP2_STREAM_OPENING, status101_resnv,
                                        ARRLEN(status101_resnv));
 
+  /* Specific characters check for host field in response header
+     should not be done as its use is undefined. */
+  check_nghttp2_http_recv_headers_ok(
+      session, &deflater, 25, NGHTTP2_STREAM_OPENING, unexpectedhost_resnv,
+      ARRLEN(unexpectedhost_resnv));
+
   nghttp2_hd_deflate_free(&deflater);
 
   nghttp2_session_del(session);
@@ -12326,3 +13224,83 @@
   nghttp2_session_del(session);
   nghttp2_bufs_free(&bufs);
 }
+
+void test_nghttp2_http_no_rfc9113_leading_and_trailing_ws_validation(void) {
+  nghttp2_session *session;
+  nghttp2_session_callbacks callbacks;
+  nghttp2_hd_deflater deflater;
+  nghttp2_mem *mem;
+  nghttp2_bufs bufs;
+  ssize_t rv;
+  const nghttp2_nv ws_reqnv = {
+      MAKE_NV(":path", "/"),
+      MAKE_NV(":method", "GET"),
+      MAKE_NV(":authority", "localhost"),
+      MAKE_NV(":scheme", "https"),
+      MAKE_NV("foo", "bar "),
+  };
+  nghttp2_outbound_item *item;
+  nghttp2_option *option;
+
+  mem = nghttp2_mem_default();
+  frame_pack_bufs_init(&bufs);
+
+  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
+  callbacks.send_callback = null_send_callback;
+
+  /* By default, the leading and trailing white spaces validation is
+     enabled as per RFC 9113. */
+  nghttp2_session_server_new(&session, &callbacks, NULL);
+
+  nghttp2_hd_deflate_init(&deflater, mem);
+
+  rv = pack_headers(&bufs, &deflater, 1,
+                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
+                    ws_reqnv, ARRLEN(ws_reqnv), mem);
+
+  CU_ASSERT(0 == rv);
+
+  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                nghttp2_buf_len(&bufs.head->buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
+
+  item = nghttp2_session_get_next_ob_item(session);
+
+  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
+  CU_ASSERT(0 == nghttp2_session_send(session));
+
+  nghttp2_bufs_reset(&bufs);
+  nghttp2_hd_deflate_free(&deflater);
+  nghttp2_session_del(session);
+
+  /* Turn off the validation */
+  nghttp2_option_new(&option);
+  nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation(option, 1);
+
+  nghttp2_session_server_new2(&session, &callbacks, NULL, option);
+
+  nghttp2_hd_deflate_init(&deflater, mem);
+
+  rv = pack_headers(&bufs, &deflater, 1,
+                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
+                    ws_reqnv, ARRLEN(ws_reqnv), mem);
+
+  CU_ASSERT(0 == rv);
+
+  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
+                                nghttp2_buf_len(&bufs.head->buf));
+
+  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
+
+  item = nghttp2_session_get_next_ob_item(session);
+
+  CU_ASSERT(NULL == item);
+
+  nghttp2_bufs_reset(&bufs);
+  nghttp2_hd_deflate_free(&deflater);
+  nghttp2_session_del(session);
+  nghttp2_option_del(option);
+
+  nghttp2_bufs_free(&bufs);
+}

_service:tar_scm:nghttp2-1.46.0.tar.xz/tests/nghttp2_session_test.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/tests/nghttp2_session_test.h Changed

@@ -40,6 +40,7 @@
 void test_nghttp2_session_recv_headers_with_padding(void);
 void test_nghttp2_session_recv_headers_early_response(void);
 void test_nghttp2_session_recv_headers_for_closed_stream(void);
+void test_nghttp2_session_recv_headers_with_extpri(void);
 void test_nghttp2_session_server_recv_push_response(void);
 void test_nghttp2_session_recv_premature_headers(void);
 void test_nghttp2_session_recv_unknown_frame(void);
@@ -49,6 +50,7 @@
 void test_nghttp2_session_recv_extension(void);
 void test_nghttp2_session_recv_altsvc(void);
 void test_nghttp2_session_recv_origin(void);
+void test_nghttp2_session_recv_priority_update(void);
 void test_nghttp2_session_continue(void);
 void test_nghttp2_session_add_frame(void);
 void test_nghttp2_session_on_request_headers_received(void);
@@ -103,6 +105,7 @@
 void test_nghttp2_submit_extension(void);
 void test_nghttp2_submit_altsvc(void);
 void test_nghttp2_submit_origin(void);
+void test_nghttp2_submit_priority_update(void);
 void test_nghttp2_submit_rst_stream(void);
 void test_nghttp2_session_open_stream(void);
 void test_nghttp2_session_open_stream_with_idle_stream_dep(void);
@@ -152,6 +155,7 @@
 void test_nghttp2_session_detach_item_from_closed_stream(void);
 void test_nghttp2_session_flooding(void);
 void test_nghttp2_session_change_stream_priority(void);
+void test_nghttp2_session_change_extpri_stream_priority(void);
 void test_nghttp2_session_create_idle_stream(void);
 void test_nghttp2_session_repeated_priority_change(void);
 void test_nghttp2_session_repeated_priority_submission(void);
@@ -162,6 +166,8 @@
 void test_nghttp2_session_pause_data(void);
 void test_nghttp2_session_no_closed_streams(void);
 void test_nghttp2_session_set_stream_user_data(void);
+void test_nghttp2_session_no_rfc7540_priorities(void);
+void test_nghttp2_session_server_fallback_rfc7540_priorities(void);
 void test_nghttp2_http_mandatory_headers(void);
 void test_nghttp2_http_content_length(void);
 void test_nghttp2_http_content_length_mismatch(void);
@@ -172,5 +178,6 @@
 void test_nghttp2_http_record_request_method(void);
 void test_nghttp2_http_push_promise(void);
 void test_nghttp2_http_head_method_upgrade_workaround(void);
+void test_nghttp2_http_no_rfc9113_leading_and_trailing_ws_validation(void);
 
 #endif /* NGHTTP2_SESSION_TEST_H */

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

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -105,13 +105,8 @@
 target_triplet = @target@
 subdir = tests/testdata
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -153,11 +148,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -174,7 +164,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -190,6 +179,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -258,15 +248,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@

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

@@ -23,7 +23,477 @@
 
 AM_CPPFLAGS = @DEFS@
 
-EXTRA_DIST = CMakeLists.txt build_config.rb mruby/*
+EXTRA_DIST = CMakeLists.txt build_config.rb
+
+# Enumerate all mruby files with the following command:
+# find mruby -type f ! -ipath 'mruby/.*' | awk '{print "\t"$0" \\"}'
+EXTRA_DIST += \
+	mruby/AUTHORS \
+	mruby/codespell.txt \
+	mruby/CONTRIBUTING.md \
+	mruby/NEWS \
+	mruby/CODEOWNERS \
+	mruby/appveyor.yml \
+	mruby/benchmark/plot.gpl \
+	mruby/benchmark/bm_ao_render.rb \
+	mruby/benchmark/bm_fib.rb \
+	mruby/benchmark/bm_so_lists.rb \
+	mruby/benchmark/bm_app_lc_fizzbuzz.rb \
+	mruby/Makefile \
+	mruby/LEGAL \
+	mruby/tasks/libmruby.rake \
+	mruby/tasks/core.rake \
+	mruby/tasks/toolchains/visualcpp.rake \
+	mruby/tasks/toolchains/openwrt.rake \
+	mruby/tasks/toolchains/android.rake \
+	mruby/tasks/toolchains/gcc.rake \
+	mruby/tasks/toolchains/clang.rake \
+	mruby/tasks/doc.rake \
+	mruby/tasks/benchmark.rake \
+	mruby/tasks/mrbgems.rake \
+	mruby/tasks/presym.rake \
+	mruby/tasks/bin.rake \
+	mruby/tasks/test.rake \
+	mruby/tasks/mrblib.rake \
+	mruby/README.md \
+	mruby/oss-fuzz/ruby.proto \
+	mruby/oss-fuzz/proto_to_ruby.cpp \
+	mruby/oss-fuzz/mruby_proto_fuzzer.cpp \
+	mruby/oss-fuzz/config/mruby.dict \
+	mruby/oss-fuzz/config/mruby_proto_fuzzer.options \
+	mruby/oss-fuzz/config/mruby_fuzzer.options \
+	mruby/oss-fuzz/mruby_fuzzer.c \
+	mruby/oss-fuzz/proto_to_ruby.h \
+	mruby/build_config/cross-mingw-winetest.rb \
+	mruby/build_config/host-f32.rb \
+	mruby/build_config/chipKITMax32.rb \
+	mruby/build_config/gameboyadvance.rb \
+	mruby/build_config/minimal.rb \
+	mruby/build_config/host-m32.rb \
+	mruby/build_config/host-shared.rb \
+	mruby/build_config/host-debug.rb \
+	mruby/build_config/bench.rb \
+	mruby/build_config/host-cxx.rb \
+	mruby/build_config/mrbc.rb \
+	mruby/build_config/ArduinoDue.rb \
+	mruby/build_config/IntelEdison.rb \
+	mruby/build_config/boxing.rb \
+	mruby/build_config/IntelGalileo.rb \
+	mruby/build_config/ci/msvc.rb \
+	mruby/build_config/ci/gcc-clang.rb \
+	mruby/build_config/nintendo_switch.rb \
+	mruby/build_config/serenity.rb \
+	mruby/build_config/dreamcast_shelf.rb \
+	mruby/build_config/default.rb \
+	mruby/build_config/android_armeabi_v7a_neon_hard.rb \
+	mruby/build_config/host-gprof.rb \
+	mruby/build_config/clang-asan.rb \
+	mruby/build_config/RX630.rb \
+	mruby/build_config/host-nofloat.rb \
+	mruby/build_config/android_armeabi.rb \
+	mruby/build_config/android_arm64_v8a.rb \
+	mruby/build_config/cross-32bit.rb \
+	mruby/build_config/cross-mingw.rb \
+	mruby/build_config/helpers/wine_runner.rb \
+	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/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/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 \
+	mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb \
+	mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c \
+	mruby/examples/mrbgems/c_extension_example/mrbgem.rake \
+	mruby/examples/mrbgems/c_extension_example/README.md \
+	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/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 \
+	mruby/test/t/bs_literal.rb \
+	mruby/test/t/regexperror.rb \
+	mruby/test/t/class.rb \
+	mruby/test/t/iterations.rb \
+	mruby/test/t/true.rb \
+	mruby/test/t/lang.rb \
+	mruby/test/t/range.rb \
+	mruby/test/t/kernel.rb \
+	mruby/test/t/unicode.rb \
+	mruby/test/t/localjumperror.rb \
+	mruby/test/t/hash.rb \
+	mruby/test/t/syntax.rb \
+	mruby/test/t/nameerror.rb \
+	mruby/test/t/module.rb \
+	mruby/test/t/argumenterror.rb \
+	mruby/test/t/methods.rb \
+	mruby/test/t/ensure.rb \
+	mruby/test/t/indexerror.rb \
+	mruby/test/t/runtimeerror.rb \
+	mruby/test/t/gc.rb \
+	mruby/test/t/array.rb \
+	mruby/test/t/string.rb \
+	mruby/test/t/proc.rb \
+	mruby/test/t/basicobject.rb \
+	mruby/test/t/integer.rb \
+	mruby/test/t/nomethoderror.rb \
+	mruby/test/t/codegen.rb \
+	mruby/test/t/literals.rb \
+	mruby/test/t/nil.rb \
+	mruby/test/t/typeerror.rb \
+	mruby/test/t/symbol.rb \
+	mruby/test/t/object.rb \
+	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/mrblib/range.rb \
+	mruby/mrblib/kernel.rb \
+	mruby/mrblib/hash.rb \
+	mruby/mrblib/00class.rb \
+	mruby/mrblib/10error.rb \
+	mruby/mrblib/array.rb \
+	mruby/mrblib/string.rb \
+	mruby/mrblib/compar.rb \
+	mruby/mrblib/symbol.rb \
+	mruby/mrblib/enum.rb \
+	mruby/mrblib/numeric.rb \
+	mruby/build_config.rb \
+	mruby/LICENSE \
+	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/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/mrbgems/mruby-eval/mrbgem.rake \
+	mruby/mrbgems/mruby-eval/test/eval.rb \
+	mruby/mrbgems/mruby-eval/src/eval.c \
+	mruby/mrbgems/stdlib.gembox \
+	mruby/mrbgems/mruby-string-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-string-ext/test/range.rb \
+	mruby/mrbgems/mruby-string-ext/test/string.rb \
+	mruby/mrbgems/mruby-string-ext/test/numeric.rb \
+	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-method/mrbgem.rake \
+	mruby/mrbgems/mruby-method/README.md \
+	mruby/mrbgems/mruby-method/test/method.rb \
+	mruby/mrbgems/mruby-method/mrblib/kernel.rb \
+	mruby/mrbgems/mruby-method/mrblib/method.rb \
+	mruby/mrbgems/mruby-method/src/method.c \
+	mruby/mrbgems/mruby-random/mrbgem.rake \
+	mruby/mrbgems/mruby-random/test/random.rb \
+	mruby/mrbgems/mruby-random/src/random.c \
+	mruby/mrbgems/mruby-catch/mrbgem.rake \
+	mruby/mrbgems/mruby-catch/test/catch.rb \
+	mruby/mrbgems/mruby-catch/mrblib/catch.rb \
+	mruby/mrbgems/mruby-catch/src/catch.c \
+	mruby/mrbgems/mruby-cmath/mrbgem.rake \
+	mruby/mrbgems/mruby-cmath/test/cmath.rb \
+	mruby/mrbgems/mruby-cmath/src/cmath.c \
+	mruby/mrbgems/mruby-compar-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-compar-ext/mrblib/compar.rb \
+	mruby/mrbgems/mruby-pack/mrbgem.rake \
+	mruby/mrbgems/mruby-pack/README.md \
+	mruby/mrbgems/mruby-pack/test/pack.rb \
+	mruby/mrbgems/mruby-pack/src/pack.c \
+	mruby/mrbgems/mruby-struct/mrbgem.rake \
+	mruby/mrbgems/mruby-struct/test/struct.rb \
+	mruby/mrbgems/mruby-struct/mrblib/struct.rb \
+	mruby/mrbgems/mruby-struct/src/struct.c \
+	mruby/mrbgems/mruby-symbol-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-symbol-ext/test/symbol.rb \
+	mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb \
+	mruby/mrbgems/mruby-symbol-ext/src/symbol.c \
+	mruby/mrbgems/mruby-io/mrbgem.rake \
+	mruby/mrbgems/mruby-io/README.md \
+	mruby/mrbgems/mruby-io/test/mruby_io_test.c \
+	mruby/mrbgems/mruby-io/test/io.rb \
+	mruby/mrbgems/mruby-io/test/file.rb \
+	mruby/mrbgems/mruby-io/test/file_test.rb \
+	mruby/mrbgems/mruby-io/mrblib/io.rb \
+	mruby/mrbgems/mruby-io/mrblib/file.rb \
+	mruby/mrbgems/mruby-io/mrblib/file_constants.rb \
+	mruby/mrbgems/mruby-io/mrblib/kernel.rb \
+	mruby/mrbgems/mruby-io/src/mruby_io_gem.c \
+	mruby/mrbgems/mruby-io/src/file_test.c \
+	mruby/mrbgems/mruby-io/src/io.c \
+	mruby/mrbgems/mruby-io/src/file.c \
+	mruby/mrbgems/mruby-io/include/mruby/ext/io.h \
+	mruby/mrbgems/mruby-compiler/core/parse.y \
+	mruby/mrbgems/mruby-compiler/core/y.tab.c \
+	mruby/mrbgems/mruby-compiler/core/node.h \
+	mruby/mrbgems/mruby-compiler/core/keywords \
+	mruby/mrbgems/mruby-compiler/core/codegen.c \
+	mruby/mrbgems/mruby-compiler/core/lex.def \
+	mruby/mrbgems/mruby-compiler/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-config/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-config/mruby-config \
+	mruby/mrbgems/mruby-bin-config/mruby-config.bat \
+	mruby/mrbgems/mruby-proc-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-proc-ext/test/proc.rb \
+	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-object-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-object-ext/test/nil.rb \
+	mruby/mrbgems/mruby-object-ext/test/object.rb \
+	mruby/mrbgems/mruby-object-ext/mrblib/object.rb \
+	mruby/mrbgems/mruby-object-ext/src/object.c \
+	mruby/mrbgems/mruby-kernel-ext/mrbgem.rake \
+	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/module.rb \
+	mruby/mrbgems/mruby-class-ext/mrblib/module.rb \
+	mruby/mrbgems/mruby-class-ext/src/class.c \
+	mruby/mrbgems/mruby-binding/mrbgem.rake \
+	mruby/mrbgems/mruby-binding/test/binding.rb \
+	mruby/mrbgems/mruby-binding/test/binding.c \
+	mruby/mrbgems/mruby-binding/src/binding.c \
+	mruby/mrbgems/mruby-print/mrbgem.rake \
+	mruby/mrbgems/mruby-print/mrblib/print.rb \
+	mruby/mrbgems/mruby-print/src/print.c \
+	mruby/mrbgems/mruby-hash-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-hash-ext/test/hash.rb \
+	mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb \
+	mruby/mrbgems/mruby-hash-ext/src/hash-ext.c \
+	mruby/mrbgems/mruby-sleep/example/sleep.rb \
+	mruby/mrbgems/mruby-sleep/mrbgem.rake \
+	mruby/mrbgems/mruby-sleep/README.md \
+	mruby/mrbgems/mruby-sleep/test/sleep_test.rb \
+	mruby/mrbgems/mruby-sleep/src/sleep.c \
+	mruby/mrbgems/mruby-sprintf/mrbgem.rake \
+	mruby/mrbgems/mruby-sprintf/test/sprintf.rb \
+	mruby/mrbgems/mruby-sprintf/mrblib/string.rb \
+	mruby/mrbgems/mruby-sprintf/src/sprintf.c \
+	mruby/mrbgems/mruby-enum-chain/mrbgem.rake \
+	mruby/mrbgems/mruby-enum-chain/test/enum_chain.rb \
+	mruby/mrbgems/mruby-enum-chain/mrblib/chain.rb \
+	mruby/mrbgems/mruby-range-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-range-ext/test/range.rb \
+	mruby/mrbgems/mruby-range-ext/mrblib/range.rb \
+	mruby/mrbgems/mruby-range-ext/src/range.c \
+	mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c \
+	mruby/mrbgems/mruby-bin-mirb/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb \
+	mruby/mrbgems/mruby-metaprog/mrbgem.rake \
+	mruby/mrbgems/mruby-metaprog/test/metaprog.rb \
+	mruby/mrbgems/mruby-metaprog/src/metaprog.c \
+	mruby/mrbgems/mruby-test-inline-struct/mrbgem.rake \
+	mruby/mrbgems/mruby-test-inline-struct/test/inline.c \
+	mruby/mrbgems/mruby-test-inline-struct/test/inline.rb \
+	mruby/mrbgems/mruby-time/mrbgem.rake \
+	mruby/mrbgems/mruby-time/test/time.rb \
+	mruby/mrbgems/mruby-time/mrblib/time.rb \
+	mruby/mrbgems/mruby-time/src/time.c \
+	mruby/mrbgems/mruby-time/include/mruby/time.h \
+	mruby/mrbgems/mruby-proc-binding/mrbgem.rake \
+	mruby/mrbgems/mruby-proc-binding/test/proc-binding.c \
+	mruby/mrbgems/mruby-proc-binding/test/proc-binding.rb \
+	mruby/mrbgems/mruby-proc-binding/src/proc-binding.c \
+	mruby/mrbgems/stdlib-ext.gembox \
+	mruby/mrbgems/metaprog.gembox \
+	mruby/mrbgems/mruby-enumerator/mrbgem.rake \
+	mruby/mrbgems/mruby-enumerator/test/enumerator.rb \
+	mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb \
+	mruby/mrbgems/math.gembox \
+	mruby/mrbgems/mruby-socket/mrbgem.rake \
+	mruby/mrbgems/mruby-socket/README.md \
+	mruby/mrbgems/mruby-socket/test/socket.rb \
+	mruby/mrbgems/mruby-socket/test/udpsocket.rb \
+	mruby/mrbgems/mruby-socket/test/tcpsocket.rb \
+	mruby/mrbgems/mruby-socket/test/sockettest.c \
+	mruby/mrbgems/mruby-socket/test/basicsocket.rb \
+	mruby/mrbgems/mruby-socket/test/addrinfo.rb \
+	mruby/mrbgems/mruby-socket/test/unix.rb \
+	mruby/mrbgems/mruby-socket/test/ipsocket.rb \
+	mruby/mrbgems/mruby-socket/mrblib/socket.rb \
+	mruby/mrbgems/mruby-socket/src/socket.c \
+	mruby/mrbgems/mruby-socket/src/gen.rb \
+	mruby/mrbgems/mruby-socket/src/const.cstub \
+	mruby/mrbgems/mruby-socket/src/const.def \
+	mruby/mrbgems/mruby-objectspace/mrbgem.rake \
+	mruby/mrbgems/mruby-objectspace/test/objectspace.rb \
+	mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c \
+	mruby/mrbgems/full-core.gembox \
+	mruby/mrbgems/mruby-rational/mrbgem.rake \
+	mruby/mrbgems/mruby-rational/test/rational.rb \
+	mruby/mrbgems/mruby-rational/mrblib/rational.rb \
+	mruby/mrbgems/mruby-rational/src/rational.c \
+	mruby/mrbgems/mruby-numeric-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-numeric-ext/test/numeric.rb \
+	mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb \
+	mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c \
+	mruby/mrbgems/mruby-binding-core/mrbgem.rake \
+	mruby/mrbgems/mruby-binding-core/test/binding-core.rb \
+	mruby/mrbgems/mruby-binding-core/src/binding-core.c \
+	mruby/mrbgems/mruby-fiber/mrbgem.rake \
+	mruby/mrbgems/mruby-fiber/test/fiber.rb \
+	mruby/mrbgems/mruby-fiber/src/fiber.c \
+	mruby/mrbgems/mruby-complex/mrbgem.rake \
+	mruby/mrbgems/mruby-complex/test/complex.rb \
+	mruby/mrbgems/mruby-complex/mrblib/complex.rb \
+	mruby/mrbgems/mruby-complex/src/complex.c \
+	mruby/mrbgems/mruby-exit/mrbgem.rake \
+	mruby/mrbgems/mruby-exit/src/mruby-exit.c \
+	mruby/mrbgems/mruby-error/mrbgem.rake \
+	mruby/mrbgems/mruby-error/test/exception.rb \
+	mruby/mrbgems/mruby-error/test/exception.c \
+	mruby/mrbgems/mruby-error/src/exception.c \
+	mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c \
+	mruby/mrbgems/mruby-bin-mruby/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb \
+	mruby/mrbgems/mruby-test/mrbgem.rake \
+	mruby/mrbgems/mruby-test/vformat.c \
+	mruby/mrbgems/mruby-test/README.md \
+	mruby/mrbgems/mruby-test/driver.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdberror.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c \
+	mruby/mrbgems/mruby-bin-debugger/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb \
+	mruby/mrbgems/mruby-bin-debugger/bintest/print.rb \
+	mruby/mrbgems/mruby-array-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-array-ext/test/array.rb \
+	mruby/mrbgems/mruby-array-ext/mrblib/array.rb \
+	mruby/mrbgems/mruby-array-ext/src/array.c \
+	mruby/mrbgems/mruby-enum-lazy/mrbgem.rake \
+	mruby/mrbgems/mruby-enum-lazy/test/lazy.rb \
+	mruby/mrbgems/mruby-enum-lazy/mrblib/lazy.rb \
+	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-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/mrbc.c \
+	mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb \
+	mruby/mrbgems/stdlib-io.gembox \
+	mruby/mrbgems/default.gembox \
+	mruby/mrbgems/mruby-os-memsize/mrbgem.rake \
+	mruby/mrbgems/mruby-os-memsize/test/memsize.rb \
+	mruby/mrbgems/mruby-os-memsize/src/memsize.c \
+	mruby/mrbgems/default-no-fpu.gembox \
+	mruby/mrbgems/mruby-enum-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-enum-ext/test/enum.rb \
+	mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb \
+	mruby/Rakefile \
+	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/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/presym/disable.h \
+	mruby/include/mruby/presym/scanning.h \
+	mruby/include/mruby/proc.h \
+	mruby/include/mrbconf.h \
+	mruby/include/mruby.h
 
 if ENABLE_THIRD_PARTY

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

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -115,13 +115,8 @@
 @ENABLE_THIRD_PARTY_TRUE@@HAVE_NEVERBLEED_TRUE@am__append_1 = libneverbleed.la
 subdir = third-party
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
-	$(top_srcdir)/m4/ax_boost_base.m4 \
-	$(top_srcdir)/m4/ax_boost_system.m4 \
-	$(top_srcdir)/m4/ax_boost_thread.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_python_devel.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
@@ -237,11 +232,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
 BPFCFLAGS = @BPFCFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -258,7 +248,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-CYTHON = @CYTHON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -274,6 +263,7 @@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
@@ -342,15 +332,9 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -428,7 +412,373 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = @DEFS@
-EXTRA_DIST = CMakeLists.txt build_config.rb mruby/*
+
+# Enumerate all mruby files with the following command:
+# find mruby -type f ! -ipath 'mruby/.*' | awk '{print "\t"$0" \\"}'
+EXTRA_DIST = CMakeLists.txt build_config.rb mruby/AUTHORS \
+	mruby/codespell.txt mruby/CONTRIBUTING.md mruby/NEWS \
+	mruby/CODEOWNERS mruby/appveyor.yml mruby/benchmark/plot.gpl \
+	mruby/benchmark/bm_ao_render.rb mruby/benchmark/bm_fib.rb \
+	mruby/benchmark/bm_so_lists.rb \
+	mruby/benchmark/bm_app_lc_fizzbuzz.rb mruby/Makefile \
+	mruby/LEGAL mruby/tasks/libmruby.rake mruby/tasks/core.rake \
+	mruby/tasks/toolchains/visualcpp.rake \
+	mruby/tasks/toolchains/openwrt.rake \
+	mruby/tasks/toolchains/android.rake \
+	mruby/tasks/toolchains/gcc.rake \
+	mruby/tasks/toolchains/clang.rake mruby/tasks/doc.rake \
+	mruby/tasks/benchmark.rake mruby/tasks/mrbgems.rake \
+	mruby/tasks/presym.rake mruby/tasks/bin.rake \
+	mruby/tasks/test.rake mruby/tasks/mrblib.rake mruby/README.md \
+	mruby/oss-fuzz/ruby.proto mruby/oss-fuzz/proto_to_ruby.cpp \
+	mruby/oss-fuzz/mruby_proto_fuzzer.cpp \
+	mruby/oss-fuzz/config/mruby.dict \
+	mruby/oss-fuzz/config/mruby_proto_fuzzer.options \
+	mruby/oss-fuzz/config/mruby_fuzzer.options \
+	mruby/oss-fuzz/mruby_fuzzer.c mruby/oss-fuzz/proto_to_ruby.h \
+	mruby/build_config/cross-mingw-winetest.rb \
+	mruby/build_config/host-f32.rb \
+	mruby/build_config/chipKITMax32.rb \
+	mruby/build_config/gameboyadvance.rb \
+	mruby/build_config/minimal.rb mruby/build_config/host-m32.rb \
+	mruby/build_config/host-shared.rb \
+	mruby/build_config/host-debug.rb mruby/build_config/bench.rb \
+	mruby/build_config/host-cxx.rb mruby/build_config/mrbc.rb \
+	mruby/build_config/ArduinoDue.rb \
+	mruby/build_config/IntelEdison.rb mruby/build_config/boxing.rb \
+	mruby/build_config/IntelGalileo.rb \
+	mruby/build_config/ci/msvc.rb \
+	mruby/build_config/ci/gcc-clang.rb \
+	mruby/build_config/nintendo_switch.rb \
+	mruby/build_config/serenity.rb \
+	mruby/build_config/dreamcast_shelf.rb \
+	mruby/build_config/default.rb \
+	mruby/build_config/android_armeabi_v7a_neon_hard.rb \
+	mruby/build_config/host-gprof.rb \
+	mruby/build_config/clang-asan.rb mruby/build_config/RX630.rb \
+	mruby/build_config/host-nofloat.rb \
+	mruby/build_config/android_armeabi.rb \
+	mruby/build_config/android_arm64_v8a.rb \
+	mruby/build_config/cross-32bit.rb \
+	mruby/build_config/cross-mingw.rb \
+	mruby/build_config/helpers/wine_runner.rb \
+	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/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/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 \
+	mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb \
+	mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c \
+	mruby/examples/mrbgems/c_extension_example/mrbgem.rake \
+	mruby/examples/mrbgems/c_extension_example/README.md \
+	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/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 \
+	mruby/test/t/bs_literal.rb mruby/test/t/regexperror.rb \
+	mruby/test/t/class.rb mruby/test/t/iterations.rb \
+	mruby/test/t/true.rb mruby/test/t/lang.rb \
+	mruby/test/t/range.rb mruby/test/t/kernel.rb \
+	mruby/test/t/unicode.rb mruby/test/t/localjumperror.rb \
+	mruby/test/t/hash.rb mruby/test/t/syntax.rb \
+	mruby/test/t/nameerror.rb mruby/test/t/module.rb \
+	mruby/test/t/argumenterror.rb mruby/test/t/methods.rb \
+	mruby/test/t/ensure.rb mruby/test/t/indexerror.rb \
+	mruby/test/t/runtimeerror.rb mruby/test/t/gc.rb \
+	mruby/test/t/array.rb mruby/test/t/string.rb \
+	mruby/test/t/proc.rb mruby/test/t/basicobject.rb \
+	mruby/test/t/integer.rb mruby/test/t/nomethoderror.rb \
+	mruby/test/t/codegen.rb mruby/test/t/literals.rb \
+	mruby/test/t/nil.rb mruby/test/t/typeerror.rb \
+	mruby/test/t/symbol.rb mruby/test/t/object.rb \
+	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/mrblib/range.rb mruby/mrblib/kernel.rb \
+	mruby/mrblib/hash.rb mruby/mrblib/00class.rb \
+	mruby/mrblib/10error.rb mruby/mrblib/array.rb \
+	mruby/mrblib/string.rb mruby/mrblib/compar.rb \
+	mruby/mrblib/symbol.rb mruby/mrblib/enum.rb \
+	mruby/mrblib/numeric.rb mruby/build_config.rb mruby/LICENSE \
+	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/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/mrbgems/mruby-eval/mrbgem.rake \
+	mruby/mrbgems/mruby-eval/test/eval.rb \
+	mruby/mrbgems/mruby-eval/src/eval.c \
+	mruby/mrbgems/stdlib.gembox \
+	mruby/mrbgems/mruby-string-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-string-ext/test/range.rb \
+	mruby/mrbgems/mruby-string-ext/test/string.rb \
+	mruby/mrbgems/mruby-string-ext/test/numeric.rb \
+	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-method/mrbgem.rake \
+	mruby/mrbgems/mruby-method/README.md \
+	mruby/mrbgems/mruby-method/test/method.rb \
+	mruby/mrbgems/mruby-method/mrblib/kernel.rb \
+	mruby/mrbgems/mruby-method/mrblib/method.rb \
+	mruby/mrbgems/mruby-method/src/method.c \
+	mruby/mrbgems/mruby-random/mrbgem.rake \
+	mruby/mrbgems/mruby-random/test/random.rb \
+	mruby/mrbgems/mruby-random/src/random.c \
+	mruby/mrbgems/mruby-catch/mrbgem.rake \
+	mruby/mrbgems/mruby-catch/test/catch.rb \
+	mruby/mrbgems/mruby-catch/mrblib/catch.rb \
+	mruby/mrbgems/mruby-catch/src/catch.c \
+	mruby/mrbgems/mruby-cmath/mrbgem.rake \
+	mruby/mrbgems/mruby-cmath/test/cmath.rb \
+	mruby/mrbgems/mruby-cmath/src/cmath.c \
+	mruby/mrbgems/mruby-compar-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-compar-ext/mrblib/compar.rb \
+	mruby/mrbgems/mruby-pack/mrbgem.rake \
+	mruby/mrbgems/mruby-pack/README.md \
+	mruby/mrbgems/mruby-pack/test/pack.rb \
+	mruby/mrbgems/mruby-pack/src/pack.c \
+	mruby/mrbgems/mruby-struct/mrbgem.rake \
+	mruby/mrbgems/mruby-struct/test/struct.rb \
+	mruby/mrbgems/mruby-struct/mrblib/struct.rb \
+	mruby/mrbgems/mruby-struct/src/struct.c \
+	mruby/mrbgems/mruby-symbol-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-symbol-ext/test/symbol.rb \
+	mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb \
+	mruby/mrbgems/mruby-symbol-ext/src/symbol.c \
+	mruby/mrbgems/mruby-io/mrbgem.rake \
+	mruby/mrbgems/mruby-io/README.md \
+	mruby/mrbgems/mruby-io/test/mruby_io_test.c \
+	mruby/mrbgems/mruby-io/test/io.rb \
+	mruby/mrbgems/mruby-io/test/file.rb \
+	mruby/mrbgems/mruby-io/test/file_test.rb \
+	mruby/mrbgems/mruby-io/mrblib/io.rb \
+	mruby/mrbgems/mruby-io/mrblib/file.rb \
+	mruby/mrbgems/mruby-io/mrblib/file_constants.rb \
+	mruby/mrbgems/mruby-io/mrblib/kernel.rb \
+	mruby/mrbgems/mruby-io/src/mruby_io_gem.c \
+	mruby/mrbgems/mruby-io/src/file_test.c \
+	mruby/mrbgems/mruby-io/src/io.c \
+	mruby/mrbgems/mruby-io/src/file.c \
+	mruby/mrbgems/mruby-io/include/mruby/ext/io.h \
+	mruby/mrbgems/mruby-compiler/core/parse.y \
+	mruby/mrbgems/mruby-compiler/core/y.tab.c \
+	mruby/mrbgems/mruby-compiler/core/node.h \
+	mruby/mrbgems/mruby-compiler/core/keywords \
+	mruby/mrbgems/mruby-compiler/core/codegen.c \
+	mruby/mrbgems/mruby-compiler/core/lex.def \
+	mruby/mrbgems/mruby-compiler/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-config/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-config/mruby-config \
+	mruby/mrbgems/mruby-bin-config/mruby-config.bat \
+	mruby/mrbgems/mruby-proc-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-proc-ext/test/proc.rb \
+	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-object-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-object-ext/test/nil.rb \
+	mruby/mrbgems/mruby-object-ext/test/object.rb \
+	mruby/mrbgems/mruby-object-ext/mrblib/object.rb \
+	mruby/mrbgems/mruby-object-ext/src/object.c \
+	mruby/mrbgems/mruby-kernel-ext/mrbgem.rake \
+	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/module.rb \
+	mruby/mrbgems/mruby-class-ext/mrblib/module.rb \
+	mruby/mrbgems/mruby-class-ext/src/class.c \
+	mruby/mrbgems/mruby-binding/mrbgem.rake \
+	mruby/mrbgems/mruby-binding/test/binding.rb \
+	mruby/mrbgems/mruby-binding/test/binding.c \
+	mruby/mrbgems/mruby-binding/src/binding.c \
+	mruby/mrbgems/mruby-print/mrbgem.rake \
+	mruby/mrbgems/mruby-print/mrblib/print.rb \
+	mruby/mrbgems/mruby-print/src/print.c \
+	mruby/mrbgems/mruby-hash-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-hash-ext/test/hash.rb \
+	mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb \
+	mruby/mrbgems/mruby-hash-ext/src/hash-ext.c \
+	mruby/mrbgems/mruby-sleep/example/sleep.rb \
+	mruby/mrbgems/mruby-sleep/mrbgem.rake \
+	mruby/mrbgems/mruby-sleep/README.md \
+	mruby/mrbgems/mruby-sleep/test/sleep_test.rb \
+	mruby/mrbgems/mruby-sleep/src/sleep.c \
+	mruby/mrbgems/mruby-sprintf/mrbgem.rake \
+	mruby/mrbgems/mruby-sprintf/test/sprintf.rb \
+	mruby/mrbgems/mruby-sprintf/mrblib/string.rb \
+	mruby/mrbgems/mruby-sprintf/src/sprintf.c \
+	mruby/mrbgems/mruby-enum-chain/mrbgem.rake \
+	mruby/mrbgems/mruby-enum-chain/test/enum_chain.rb \
+	mruby/mrbgems/mruby-enum-chain/mrblib/chain.rb \
+	mruby/mrbgems/mruby-range-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-range-ext/test/range.rb \
+	mruby/mrbgems/mruby-range-ext/mrblib/range.rb \
+	mruby/mrbgems/mruby-range-ext/src/range.c \
+	mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c \
+	mruby/mrbgems/mruby-bin-mirb/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb \
+	mruby/mrbgems/mruby-metaprog/mrbgem.rake \
+	mruby/mrbgems/mruby-metaprog/test/metaprog.rb \
+	mruby/mrbgems/mruby-metaprog/src/metaprog.c \
+	mruby/mrbgems/mruby-test-inline-struct/mrbgem.rake \
+	mruby/mrbgems/mruby-test-inline-struct/test/inline.c \
+	mruby/mrbgems/mruby-test-inline-struct/test/inline.rb \
+	mruby/mrbgems/mruby-time/mrbgem.rake \
+	mruby/mrbgems/mruby-time/test/time.rb \
+	mruby/mrbgems/mruby-time/mrblib/time.rb \
+	mruby/mrbgems/mruby-time/src/time.c \
+	mruby/mrbgems/mruby-time/include/mruby/time.h \
+	mruby/mrbgems/mruby-proc-binding/mrbgem.rake \
+	mruby/mrbgems/mruby-proc-binding/test/proc-binding.c \
+	mruby/mrbgems/mruby-proc-binding/test/proc-binding.rb \
+	mruby/mrbgems/mruby-proc-binding/src/proc-binding.c \
+	mruby/mrbgems/stdlib-ext.gembox mruby/mrbgems/metaprog.gembox \
+	mruby/mrbgems/mruby-enumerator/mrbgem.rake \
+	mruby/mrbgems/mruby-enumerator/test/enumerator.rb \
+	mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb \
+	mruby/mrbgems/math.gembox \
+	mruby/mrbgems/mruby-socket/mrbgem.rake \
+	mruby/mrbgems/mruby-socket/README.md \
+	mruby/mrbgems/mruby-socket/test/socket.rb \
+	mruby/mrbgems/mruby-socket/test/udpsocket.rb \
+	mruby/mrbgems/mruby-socket/test/tcpsocket.rb \
+	mruby/mrbgems/mruby-socket/test/sockettest.c \
+	mruby/mrbgems/mruby-socket/test/basicsocket.rb \
+	mruby/mrbgems/mruby-socket/test/addrinfo.rb \
+	mruby/mrbgems/mruby-socket/test/unix.rb \
+	mruby/mrbgems/mruby-socket/test/ipsocket.rb \
+	mruby/mrbgems/mruby-socket/mrblib/socket.rb \
+	mruby/mrbgems/mruby-socket/src/socket.c \
+	mruby/mrbgems/mruby-socket/src/gen.rb \
+	mruby/mrbgems/mruby-socket/src/const.cstub \
+	mruby/mrbgems/mruby-socket/src/const.def \
+	mruby/mrbgems/mruby-objectspace/mrbgem.rake \
+	mruby/mrbgems/mruby-objectspace/test/objectspace.rb \
+	mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c \
+	mruby/mrbgems/full-core.gembox \
+	mruby/mrbgems/mruby-rational/mrbgem.rake \
+	mruby/mrbgems/mruby-rational/test/rational.rb \
+	mruby/mrbgems/mruby-rational/mrblib/rational.rb \
+	mruby/mrbgems/mruby-rational/src/rational.c \
+	mruby/mrbgems/mruby-numeric-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-numeric-ext/test/numeric.rb \
+	mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb \
+	mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c \
+	mruby/mrbgems/mruby-binding-core/mrbgem.rake \
+	mruby/mrbgems/mruby-binding-core/test/binding-core.rb \
+	mruby/mrbgems/mruby-binding-core/src/binding-core.c \
+	mruby/mrbgems/mruby-fiber/mrbgem.rake \
+	mruby/mrbgems/mruby-fiber/test/fiber.rb \
+	mruby/mrbgems/mruby-fiber/src/fiber.c \
+	mruby/mrbgems/mruby-complex/mrbgem.rake \
+	mruby/mrbgems/mruby-complex/test/complex.rb \
+	mruby/mrbgems/mruby-complex/mrblib/complex.rb \
+	mruby/mrbgems/mruby-complex/src/complex.c \
+	mruby/mrbgems/mruby-exit/mrbgem.rake \
+	mruby/mrbgems/mruby-exit/src/mruby-exit.c \
+	mruby/mrbgems/mruby-error/mrbgem.rake \
+	mruby/mrbgems/mruby-error/test/exception.rb \
+	mruby/mrbgems/mruby-error/test/exception.c \
+	mruby/mrbgems/mruby-error/src/exception.c \
+	mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c \
+	mruby/mrbgems/mruby-bin-mruby/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb \
+	mruby/mrbgems/mruby-test/mrbgem.rake \
+	mruby/mrbgems/mruby-test/vformat.c \
+	mruby/mrbgems/mruby-test/README.md \
+	mruby/mrbgems/mruby-test/driver.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdberror.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c \
+	mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c \
+	mruby/mrbgems/mruby-bin-debugger/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb \
+	mruby/mrbgems/mruby-bin-debugger/bintest/print.rb \
+	mruby/mrbgems/mruby-array-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-array-ext/test/array.rb \
+	mruby/mrbgems/mruby-array-ext/mrblib/array.rb \
+	mruby/mrbgems/mruby-array-ext/src/array.c \
+	mruby/mrbgems/mruby-enum-lazy/mrbgem.rake \
+	mruby/mrbgems/mruby-enum-lazy/test/lazy.rb \
+	mruby/mrbgems/mruby-enum-lazy/mrblib/lazy.rb \
+	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-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/mrbc.c \
+	mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake \
+	mruby/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb \
+	mruby/mrbgems/stdlib-io.gembox mruby/mrbgems/default.gembox \
+	mruby/mrbgems/mruby-os-memsize/mrbgem.rake \
+	mruby/mrbgems/mruby-os-memsize/test/memsize.rb \
+	mruby/mrbgems/mruby-os-memsize/src/memsize.c \
+	mruby/mrbgems/default-no-fpu.gembox \
+	mruby/mrbgems/mruby-enum-ext/mrbgem.rake \
+	mruby/mrbgems/mruby-enum-ext/test/enum.rb \
+	mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb mruby/Rakefile \
+	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/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/presym/disable.h \
+	mruby/include/mruby/presym/scanning.h \
+	mruby/include/mruby/proc.h mruby/include/mrbconf.h \
+	mruby/include/mruby.h
 @ENABLE_THIRD_PARTY_TRUE@noinst_LTLIBRARIES = liburl-parser.la \
 @ENABLE_THIRD_PARTY_TRUE@	libllhttp.la $(am__append_1)
 @ENABLE_THIRD_PARTY_TRUE@liburl_parser_la_SOURCES = \

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

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

@@ -1,9 +1,9 @@
 #ifndef INCLUDE_LLHTTP_H_
 #define INCLUDE_LLHTTP_H_
 
-#define LLHTTP_VERSION_MAJOR 6
-#define LLHTTP_VERSION_MINOR 0
-#define LLHTTP_VERSION_PATCH 2
+#define LLHTTP_VERSION_MAJOR 8
+#define LLHTTP_VERSION_MINOR 1
+#define LLHTTP_VERSION_PATCH 0
 
 #ifndef LLHTTP_STRICT_MODE
 # define LLHTTP_STRICT_MODE 0
@@ -38,6 +38,7 @@
   uint8_t finish;
   uint16_t flags;
   uint16_t status_code;
+  uint8_t initial_message_completed;
   void* settings;
 };
 
@@ -59,8 +60,10 @@
   HPE_OK = 0,
   HPE_INTERNAL = 1,
   HPE_STRICT = 2,
+  HPE_CR_EXPECTED = 25,
   HPE_LF_EXPECTED = 3,
   HPE_UNEXPECTED_CONTENT_LENGTH = 4,
+  HPE_UNEXPECTED_SPACE = 30,
   HPE_CLOSED_CONNECTION = 5,
   HPE_INVALID_METHOD = 6,
   HPE_INVALID_URL = 7,
@@ -80,7 +83,16 @@
   HPE_PAUSED = 21,
   HPE_PAUSED_UPGRADE = 22,
   HPE_PAUSED_H2_UPGRADE = 23,
-  HPE_USER = 24
+  HPE_USER = 24,
+  HPE_CB_URL_COMPLETE = 26,
+  HPE_CB_STATUS_COMPLETE = 27,
+  HPE_CB_METHOD_COMPLETE = 32,
+  HPE_CB_VERSION_COMPLETE = 33,
+  HPE_CB_HEADER_FIELD_COMPLETE = 28,
+  HPE_CB_HEADER_VALUE_COMPLETE = 29,
+  HPE_CB_CHUNK_EXTENSION_NAME_COMPLETE = 34,
+  HPE_CB_CHUNK_EXTENSION_VALUE_COMPLETE = 35,
+  HPE_CB_RESET = 31
 };
 typedef enum llhttp_errno llhttp_errno_t;
 
@@ -100,7 +112,9 @@
 enum llhttp_lenient_flags {
   LENIENT_HEADERS = 0x1,
   LENIENT_CHUNKED_LENGTH = 0x2,
-  LENIENT_KEEP_ALIVE = 0x4
+  LENIENT_KEEP_ALIVE = 0x4,
+  LENIENT_TRANSFER_ENCODING = 0x8,
+  LENIENT_VERSION = 0x10
 };
 typedef enum llhttp_lenient_flags llhttp_lenient_flags_t;
 
@@ -168,12 +182,117 @@
 };
 typedef enum llhttp_method llhttp_method_t;
 
+enum llhttp_status {
+  HTTP_STATUS_CONTINUE = 100,
+  HTTP_STATUS_SWITCHING_PROTOCOLS = 101,
+  HTTP_STATUS_PROCESSING = 102,
+  HTTP_STATUS_EARLY_HINTS = 103,
+  HTTP_STATUS_RESPONSE_IS_STALE = 110,
+  HTTP_STATUS_REVALIDATION_FAILED = 111,
+  HTTP_STATUS_DISCONNECTED_OPERATION = 112,
+  HTTP_STATUS_HEURISTIC_EXPIRATION = 113,
+  HTTP_STATUS_MISCELLANEOUS_WARNING = 199,
+  HTTP_STATUS_OK = 200,
+  HTTP_STATUS_CREATED = 201,
+  HTTP_STATUS_ACCEPTED = 202,
+  HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION = 203,
+  HTTP_STATUS_NO_CONTENT = 204,
+  HTTP_STATUS_RESET_CONTENT = 205,
+  HTTP_STATUS_PARTIAL_CONTENT = 206,
+  HTTP_STATUS_MULTI_STATUS = 207,
+  HTTP_STATUS_ALREADY_REPORTED = 208,
+  HTTP_STATUS_TRANSFORMATION_APPLIED = 214,
+  HTTP_STATUS_IM_USED = 226,
+  HTTP_STATUS_MISCELLANEOUS_PERSISTENT_WARNING = 299,
+  HTTP_STATUS_MULTIPLE_CHOICES = 300,
+  HTTP_STATUS_MOVED_PERMANENTLY = 301,
+  HTTP_STATUS_FOUND = 302,
+  HTTP_STATUS_SEE_OTHER = 303,
+  HTTP_STATUS_NOT_MODIFIED = 304,
+  HTTP_STATUS_USE_PROXY = 305,
+  HTTP_STATUS_SWITCH_PROXY = 306,
+  HTTP_STATUS_TEMPORARY_REDIRECT = 307,
+  HTTP_STATUS_PERMANENT_REDIRECT = 308,
+  HTTP_STATUS_BAD_REQUEST = 400,
+  HTTP_STATUS_UNAUTHORIZED = 401,
+  HTTP_STATUS_PAYMENT_REQUIRED = 402,
+  HTTP_STATUS_FORBIDDEN = 403,
+  HTTP_STATUS_NOT_FOUND = 404,
+  HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
+  HTTP_STATUS_NOT_ACCEPTABLE = 406,
+  HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
+  HTTP_STATUS_REQUEST_TIMEOUT = 408,
+  HTTP_STATUS_CONFLICT = 409,
+  HTTP_STATUS_GONE = 410,
+  HTTP_STATUS_LENGTH_REQUIRED = 411,
+  HTTP_STATUS_PRECONDITION_FAILED = 412,
+  HTTP_STATUS_PAYLOAD_TOO_LARGE = 413,
+  HTTP_STATUS_URI_TOO_LONG = 414,
+  HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
+  HTTP_STATUS_RANGE_NOT_SATISFIABLE = 416,
+  HTTP_STATUS_EXPECTATION_FAILED = 417,
+  HTTP_STATUS_IM_A_TEAPOT = 418,
+  HTTP_STATUS_PAGE_EXPIRED = 419,
+  HTTP_STATUS_ENHANCE_YOUR_CALM = 420,
+  HTTP_STATUS_MISDIRECTED_REQUEST = 421,
+  HTTP_STATUS_UNPROCESSABLE_ENTITY = 422,
+  HTTP_STATUS_LOCKED = 423,
+  HTTP_STATUS_FAILED_DEPENDENCY = 424,
+  HTTP_STATUS_TOO_EARLY = 425,
+  HTTP_STATUS_UPGRADE_REQUIRED = 426,
+  HTTP_STATUS_PRECONDITION_REQUIRED = 428,
+  HTTP_STATUS_TOO_MANY_REQUESTS = 429,
+  HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE_UNOFFICIAL = 430,
+  HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431,
+  HTTP_STATUS_LOGIN_TIMEOUT = 440,
+  HTTP_STATUS_NO_RESPONSE = 444,
+  HTTP_STATUS_RETRY_WITH = 449,
+  HTTP_STATUS_BLOCKED_BY_PARENTAL_CONTROL = 450,
+  HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS = 451,
+  HTTP_STATUS_CLIENT_CLOSED_LOAD_BALANCED_REQUEST = 460,
+  HTTP_STATUS_INVALID_X_FORWARDED_FOR = 463,
+  HTTP_STATUS_REQUEST_HEADER_TOO_LARGE = 494,
+  HTTP_STATUS_SSL_CERTIFICATE_ERROR = 495,
+  HTTP_STATUS_SSL_CERTIFICATE_REQUIRED = 496,
+  HTTP_STATUS_HTTP_REQUEST_SENT_TO_HTTPS_PORT = 497,
+  HTTP_STATUS_INVALID_TOKEN = 498,
+  HTTP_STATUS_CLIENT_CLOSED_REQUEST = 499,
+  HTTP_STATUS_INTERNAL_SERVER_ERROR = 500,
+  HTTP_STATUS_NOT_IMPLEMENTED = 501,
+  HTTP_STATUS_BAD_GATEWAY = 502,
+  HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
+  HTTP_STATUS_GATEWAY_TIMEOUT = 504,
+  HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED = 505,
+  HTTP_STATUS_VARIANT_ALSO_NEGOTIATES = 506,
+  HTTP_STATUS_INSUFFICIENT_STORAGE = 507,
+  HTTP_STATUS_LOOP_DETECTED = 508,
+  HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509,
+  HTTP_STATUS_NOT_EXTENDED = 510,
+  HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511,
+  HTTP_STATUS_WEB_SERVER_UNKNOWN_ERROR = 520,
+  HTTP_STATUS_WEB_SERVER_IS_DOWN = 521,
+  HTTP_STATUS_CONNECTION_TIMEOUT = 522,
+  HTTP_STATUS_ORIGIN_IS_UNREACHABLE = 523,
+  HTTP_STATUS_TIMEOUT_OCCURED = 524,
+  HTTP_STATUS_SSL_HANDSHAKE_FAILED = 525,
+  HTTP_STATUS_INVALID_SSL_CERTIFICATE = 526,
+  HTTP_STATUS_RAILGUN_ERROR = 527,
+  HTTP_STATUS_SITE_IS_OVERLOADED = 529,
+  HTTP_STATUS_SITE_IS_FROZEN = 530,
+  HTTP_STATUS_IDENTITY_PROVIDER_AUTHENTICATION_ERROR = 561,
+  HTTP_STATUS_NETWORK_READ_TIMEOUT = 598,
+  HTTP_STATUS_NETWORK_CONNECT_TIMEOUT = 599
+};
+typedef enum llhttp_status llhttp_status_t;
+
 #define HTTP_ERRNO_MAP(XX) \
   XX(0, OK, OK) \
   XX(1, INTERNAL, INTERNAL) \
   XX(2, STRICT, STRICT) \
+  XX(25, CR_EXPECTED, CR_EXPECTED) \
   XX(3, LF_EXPECTED, LF_EXPECTED) \
   XX(4, UNEXPECTED_CONTENT_LENGTH, UNEXPECTED_CONTENT_LENGTH) \
+  XX(30, UNEXPECTED_SPACE, UNEXPECTED_SPACE) \
   XX(5, CLOSED_CONNECTION, CLOSED_CONNECTION) \
   XX(6, INVALID_METHOD, INVALID_METHOD) \
   XX(7, INVALID_URL, INVALID_URL) \
@@ -194,6 +313,15 @@
   XX(22, PAUSED_UPGRADE, PAUSED_UPGRADE) \
   XX(23, PAUSED_H2_UPGRADE, PAUSED_H2_UPGRADE) \
   XX(24, USER, USER) \
+  XX(26, CB_URL_COMPLETE, CB_URL_COMPLETE) \
+  XX(27, CB_STATUS_COMPLETE, CB_STATUS_COMPLETE) \
+  XX(32, CB_METHOD_COMPLETE, CB_METHOD_COMPLETE) \
+  XX(33, CB_VERSION_COMPLETE, CB_VERSION_COMPLETE) \
+  XX(28, CB_HEADER_FIELD_COMPLETE, CB_HEADER_FIELD_COMPLETE) \
+  XX(29, CB_HEADER_VALUE_COMPLETE, CB_HEADER_VALUE_COMPLETE) \
+  XX(34, CB_CHUNK_EXTENSION_NAME_COMPLETE, CB_CHUNK_EXTENSION_NAME_COMPLETE) \
+  XX(35, CB_CHUNK_EXTENSION_VALUE_COMPLETE, CB_CHUNK_EXTENSION_VALUE_COMPLETE) \
+  XX(31, CB_RESET, CB_RESET) \
 
 
 #define HTTP_METHOD_MAP(XX) \
@@ -299,6 +427,108 @@
   XX(45, FLUSH, FLUSH) \
 
 
+#define HTTP_STATUS_MAP(XX) \
+  XX(100, CONTINUE, CONTINUE) \
+  XX(101, SWITCHING_PROTOCOLS, SWITCHING_PROTOCOLS) \
+  XX(102, PROCESSING, PROCESSING) \
+  XX(103, EARLY_HINTS, EARLY_HINTS) \
+  XX(110, RESPONSE_IS_STALE, RESPONSE_IS_STALE) \
+  XX(111, REVALIDATION_FAILED, REVALIDATION_FAILED) \
+  XX(112, DISCONNECTED_OPERATION, DISCONNECTED_OPERATION) \
+  XX(113, HEURISTIC_EXPIRATION, HEURISTIC_EXPIRATION) \
+  XX(199, MISCELLANEOUS_WARNING, MISCELLANEOUS_WARNING) \
+  XX(200, OK, OK) \
+  XX(201, CREATED, CREATED) \
+  XX(202, ACCEPTED, ACCEPTED) \
+  XX(203, NON_AUTHORITATIVE_INFORMATION, NON_AUTHORITATIVE_INFORMATION) \
+  XX(204, NO_CONTENT, NO_CONTENT) \
+  XX(205, RESET_CONTENT, RESET_CONTENT) \
+  XX(206, PARTIAL_CONTENT, PARTIAL_CONTENT) \
+  XX(207, MULTI_STATUS, MULTI_STATUS) \
+  XX(208, ALREADY_REPORTED, ALREADY_REPORTED) \
+  XX(214, TRANSFORMATION_APPLIED, TRANSFORMATION_APPLIED) \
+  XX(226, IM_USED, IM_USED) \
+  XX(299, MISCELLANEOUS_PERSISTENT_WARNING, MISCELLANEOUS_PERSISTENT_WARNING) \
+  XX(300, MULTIPLE_CHOICES, MULTIPLE_CHOICES) \
+  XX(301, MOVED_PERMANENTLY, MOVED_PERMANENTLY) \
+  XX(302, FOUND, FOUND) \
+  XX(303, SEE_OTHER, SEE_OTHER) \
+  XX(304, NOT_MODIFIED, NOT_MODIFIED) \
+  XX(305, USE_PROXY, USE_PROXY) \
+  XX(306, SWITCH_PROXY, SWITCH_PROXY) \
+  XX(307, TEMPORARY_REDIRECT, TEMPORARY_REDIRECT) \
+  XX(308, PERMANENT_REDIRECT, PERMANENT_REDIRECT) \
+  XX(400, BAD_REQUEST, BAD_REQUEST) \
+  XX(401, UNAUTHORIZED, UNAUTHORIZED) \
+  XX(402, PAYMENT_REQUIRED, PAYMENT_REQUIRED) \
+  XX(403, FORBIDDEN, FORBIDDEN) \
+  XX(404, NOT_FOUND, NOT_FOUND) \
+  XX(405, METHOD_NOT_ALLOWED, METHOD_NOT_ALLOWED) \
+  XX(406, NOT_ACCEPTABLE, NOT_ACCEPTABLE) \
+  XX(407, PROXY_AUTHENTICATION_REQUIRED, PROXY_AUTHENTICATION_REQUIRED) \
+  XX(408, REQUEST_TIMEOUT, REQUEST_TIMEOUT) \
+  XX(409, CONFLICT, CONFLICT) \
+  XX(410, GONE, GONE) \
+  XX(411, LENGTH_REQUIRED, LENGTH_REQUIRED) \
+  XX(412, PRECONDITION_FAILED, PRECONDITION_FAILED) \
+  XX(413, PAYLOAD_TOO_LARGE, PAYLOAD_TOO_LARGE) \
+  XX(414, URI_TOO_LONG, URI_TOO_LONG) \
+  XX(415, UNSUPPORTED_MEDIA_TYPE, UNSUPPORTED_MEDIA_TYPE) \
+  XX(416, RANGE_NOT_SATISFIABLE, RANGE_NOT_SATISFIABLE) \
+  XX(417, EXPECTATION_FAILED, EXPECTATION_FAILED) \
+  XX(418, IM_A_TEAPOT, IM_A_TEAPOT) \
+  XX(419, PAGE_EXPIRED, PAGE_EXPIRED) \
+  XX(420, ENHANCE_YOUR_CALM, ENHANCE_YOUR_CALM) \
+  XX(421, MISDIRECTED_REQUEST, MISDIRECTED_REQUEST) \
+  XX(422, UNPROCESSABLE_ENTITY, UNPROCESSABLE_ENTITY) \
+  XX(423, LOCKED, LOCKED) \
+  XX(424, FAILED_DEPENDENCY, FAILED_DEPENDENCY) \
+  XX(425, TOO_EARLY, TOO_EARLY) \
+  XX(426, UPGRADE_REQUIRED, UPGRADE_REQUIRED) \
+  XX(428, PRECONDITION_REQUIRED, PRECONDITION_REQUIRED) \
+  XX(429, TOO_MANY_REQUESTS, TOO_MANY_REQUESTS) \
+  XX(430, REQUEST_HEADER_FIELDS_TOO_LARGE_UNOFFICIAL, REQUEST_HEADER_FIELDS_TOO_LARGE_UNOFFICIAL) \
+  XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, REQUEST_HEADER_FIELDS_TOO_LARGE) \
+  XX(440, LOGIN_TIMEOUT, LOGIN_TIMEOUT) \
+  XX(444, NO_RESPONSE, NO_RESPONSE) \
+  XX(449, RETRY_WITH, RETRY_WITH) \
+  XX(450, BLOCKED_BY_PARENTAL_CONTROL, BLOCKED_BY_PARENTAL_CONTROL) \
+  XX(451, UNAVAILABLE_FOR_LEGAL_REASONS, UNAVAILABLE_FOR_LEGAL_REASONS) \
+  XX(460, CLIENT_CLOSED_LOAD_BALANCED_REQUEST, CLIENT_CLOSED_LOAD_BALANCED_REQUEST) \
+  XX(463, INVALID_X_FORWARDED_FOR, INVALID_X_FORWARDED_FOR) \
+  XX(494, REQUEST_HEADER_TOO_LARGE, REQUEST_HEADER_TOO_LARGE) \
+  XX(495, SSL_CERTIFICATE_ERROR, SSL_CERTIFICATE_ERROR) \
+  XX(496, SSL_CERTIFICATE_REQUIRED, SSL_CERTIFICATE_REQUIRED) \
+  XX(497, HTTP_REQUEST_SENT_TO_HTTPS_PORT, HTTP_REQUEST_SENT_TO_HTTPS_PORT) \
+  XX(498, INVALID_TOKEN, INVALID_TOKEN) \
+  XX(499, CLIENT_CLOSED_REQUEST, CLIENT_CLOSED_REQUEST) \
+  XX(500, INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR) \
+  XX(501, NOT_IMPLEMENTED, NOT_IMPLEMENTED) \
+  XX(502, BAD_GATEWAY, BAD_GATEWAY) \
+  XX(503, SERVICE_UNAVAILABLE, SERVICE_UNAVAILABLE) \
+  XX(504, GATEWAY_TIMEOUT, GATEWAY_TIMEOUT) \
+  XX(505, HTTP_VERSION_NOT_SUPPORTED, HTTP_VERSION_NOT_SUPPORTED) \
+  XX(506, VARIANT_ALSO_NEGOTIATES, VARIANT_ALSO_NEGOTIATES) \
+  XX(507, INSUFFICIENT_STORAGE, INSUFFICIENT_STORAGE) \
+  XX(508, LOOP_DETECTED, LOOP_DETECTED) \
+  XX(509, BANDWIDTH_LIMIT_EXCEEDED, BANDWIDTH_LIMIT_EXCEEDED) \
+  XX(510, NOT_EXTENDED, NOT_EXTENDED) \
+  XX(511, NETWORK_AUTHENTICATION_REQUIRED, NETWORK_AUTHENTICATION_REQUIRED) \
+  XX(520, WEB_SERVER_UNKNOWN_ERROR, WEB_SERVER_UNKNOWN_ERROR) \
+  XX(521, WEB_SERVER_IS_DOWN, WEB_SERVER_IS_DOWN) \
+  XX(522, CONNECTION_TIMEOUT, CONNECTION_TIMEOUT) \
+  XX(523, ORIGIN_IS_UNREACHABLE, ORIGIN_IS_UNREACHABLE) \
+  XX(524, TIMEOUT_OCCURED, TIMEOUT_OCCURED) \
+  XX(525, SSL_HANDSHAKE_FAILED, SSL_HANDSHAKE_FAILED) \
+  XX(526, INVALID_SSL_CERTIFICATE, INVALID_SSL_CERTIFICATE) \
+  XX(527, RAILGUN_ERROR, RAILGUN_ERROR) \
+  XX(529, SITE_IS_OVERLOADED, SITE_IS_OVERLOADED) \
+  XX(530, SITE_IS_FROZEN, SITE_IS_FROZEN) \
+  XX(561, IDENTITY_PROVIDER_AUTHENTICATION_ERROR, IDENTITY_PROVIDER_AUTHENTICATION_ERROR) \
+  XX(598, NETWORK_READ_TIMEOUT, NETWORK_READ_TIMEOUT) \
+  XX(599, NETWORK_CONNECT_TIMEOUT, NETWORK_CONNECT_TIMEOUT) \
+
+
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
@@ -330,8 +560,12 @@
   /* Possible return values 0, -1, HPE_USER */
   llhttp_data_cb on_url;
   llhttp_data_cb on_status;
+  llhttp_data_cb on_method;
+  llhttp_data_cb on_version;
   llhttp_data_cb on_header_field;
   llhttp_data_cb on_header_value;
+  llhttp_data_cb      on_chunk_extension_name;
+  llhttp_data_cb      on_chunk_extension_value;
 
   /* Possible return values:
    * 0  - Proceed normally
@@ -349,6 +583,14 @@
 
   /* Possible return values 0, -1, `HPE_PAUSED` */
   llhttp_cb      on_message_complete;
+  llhttp_cb      on_url_complete;
+  llhttp_cb      on_status_complete;
+  llhttp_cb      on_method_complete;
+  llhttp_cb      on_version_complete;
+  llhttp_cb      on_header_field_complete;
+  llhttp_cb      on_header_value_complete;
+  llhttp_cb      on_chunk_extension_name_complete;
+  llhttp_cb      on_chunk_extension_value_complete;
 
   /* When on_chunk_header is called, the current chunk length is stored
    * in parser->content_length.
@@ -356,12 +598,7 @@
    */
   llhttp_cb      on_chunk_header;
   llhttp_cb      on_chunk_complete;
-
-  /* Information-only callbacks, return value is ignored */
-  llhttp_cb      on_url_complete;
-  llhttp_cb      on_status_complete;
-  llhttp_cb      on_header_field_complete;
-  llhttp_cb      on_header_value_complete;
+  llhttp_cb      on_reset;
 };
 
 /* Initialize the parser with specific type and user settings.
@@ -374,8 +611,6 @@
 void llhttp_init(llhttp_t* parser, llhttp_type_t type,
                  const llhttp_settings_t* settings);
 
-#if defined(__wasm__)
-
 LLHTTP_EXPORT
 llhttp_t* llhttp_alloc(llhttp_type_t type);
 
@@ -400,8 +635,6 @@
 LLHTTP_EXPORT
 uint8_t llhttp_get_upgrade(llhttp_t* parser);
 
-#endif  // defined(__wasm__)
-
 /* Reset an already initialized parser back to the start state, preserving the
  * existing parser type, callback settings, user data, and lenient flags.
  */
@@ -515,6 +748,9 @@
 LLHTTP_EXPORT
 const char* llhttp_method_name(llhttp_method_t method);
 
+/* Returns textual name of HTTP status */
+LLHTTP_EXPORT
+const char* llhttp_status_name(llhttp_status_t status);
 
 /* Enables/disables lenient header value parsing (disabled by default).
  *
@@ -554,8 +790,23 @@
  *
  * **(USE AT YOUR OWN RISK)**
  */
+LLHTTP_EXPORT
 void llhttp_set_lenient_keep_alive(llhttp_t* parser, int enabled);
 
+/* Enables/disables lenient handling of `Transfer-Encoding` header.
+ *
+ * Normally `llhttp` would error when a `Transfer-Encoding` has `chunked` value
+ * and another value after it (either in a single header or in multiple
+ * headers whose value are internally joined using `, `).
+ * This is mandated by the spec to reliably determine request body size and thus
+ * avoid request smuggling.
+ * With this flag the extra value will be parsed normally.
+ *
+ * **(USE AT YOUR OWN RISK)**
+ */
+LLHTTP_EXPORT
+void llhttp_set_lenient_transfer_encoding(llhttp_t* parser, int enabled);
+
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

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

@@ -46,21 +46,40 @@
 extern int wasm_on_status(llhttp_t* p, const char* at, size_t length);
 extern int wasm_on_header_field(llhttp_t* p, const char* at, size_t length);
 extern int wasm_on_header_value(llhttp_t* p, const char* at, size_t length);
-extern int wasm_on_headers_complete(llhttp_t * p);
+extern int wasm_on_headers_complete(llhttp_t * p, int status_code,
+                                    uint8_t upgrade, int should_keep_alive);
 extern int wasm_on_body(llhttp_t* p, const char* at, size_t length);
 extern int wasm_on_message_complete(llhttp_t * p);
 
+static int wasm_on_headers_complete_wrap(llhttp_t* p) {
+  return wasm_on_headers_complete(p, p->status_code, p->upgrade,
+                                  llhttp_should_keep_alive(p));
+}
+
 const llhttp_settings_t wasm_settings = {
   wasm_on_message_begin,
   wasm_on_url,
   wasm_on_status,
+  NULL,
+  NULL,
   wasm_on_header_field,
   wasm_on_header_value,
-  wasm_on_headers_complete,
+  NULL,
+  NULL,
+  wasm_on_headers_complete_wrap,
   wasm_on_body,
   wasm_on_message_complete,
   NULL,
   NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
 };
 
 
@@ -74,6 +93,8 @@
   free(parser);
 }
 
+#endif  // defined(__wasm__)
+
 /* Some getters required to get stuff from the parser */
 
 uint8_t llhttp_get_type(llhttp_t* parser) {
@@ -100,8 +121,6 @@
   return parser->upgrade;
 }
 
-#endif  // defined(__wasm__)
-
 
 void llhttp_reset(llhttp_t* parser) {
   llhttp_type_t type = parser->type;
@@ -220,6 +239,15 @@
 #undef HTTP_METHOD_GEN
 }
 
+const char* llhttp_status_name(llhttp_status_t status) {
+#define HTTP_STATUS_GEN(NUM, NAME, STRING) case HTTP_STATUS_##NAME: return #STRING;
+  switch (status) {
+    HTTP_STATUS_MAP(HTTP_STATUS_GEN)
+    default: abort();
+  }
+#undef HTTP_STATUS_GEN
+}
+
 
 void llhttp_set_lenient_headers(llhttp_t* parser, int enabled) {
   if (enabled) {
@@ -247,6 +275,14 @@
   }
 }
 
+void llhttp_set_lenient_transfer_encoding(llhttp_t* parser, int enabled) {
+  if (enabled) {
+    parser->lenient_flags |= LENIENT_TRANSFER_ENCODING;
+  } else {
+    parser->lenient_flags &= ~LENIENT_TRANSFER_ENCODING;
+  }
+}
+
 /* Callbacks */
 
 
@@ -285,6 +321,34 @@
 }
 
 
+int llhttp__on_method(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  SPAN_CALLBACK_MAYBE(s, on_method, p, endp - p);
+  return err;
+}
+
+
+int llhttp__on_method_complete(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  CALLBACK_MAYBE(s, on_method_complete);
+  return err;
+}
+
+
+int llhttp__on_version(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  SPAN_CALLBACK_MAYBE(s, on_version, p, endp - p);
+  return err;
+}
+
+
+int llhttp__on_version_complete(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  CALLBACK_MAYBE(s, on_version_complete);
+  return err;
+}
+
+
 int llhttp__on_header_field(llhttp_t* s, const char* p, const char* endp) {
   int err;
   SPAN_CALLBACK_MAYBE(s, on_header_field, p, endp - p);
@@ -341,6 +405,34 @@
 }
 
 
+int llhttp__on_chunk_extension_name(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  SPAN_CALLBACK_MAYBE(s, on_chunk_extension_name, p, endp - p);
+  return err;
+}
+
+
+int llhttp__on_chunk_extension_name_complete(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  CALLBACK_MAYBE(s, on_chunk_extension_name_complete);
+  return err;
+}
+
+
+int llhttp__on_chunk_extension_value(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  SPAN_CALLBACK_MAYBE(s, on_chunk_extension_value, p, endp - p);
+  return err;
+}
+
+
+int llhttp__on_chunk_extension_value_complete(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  CALLBACK_MAYBE(s, on_chunk_extension_value_complete);
+  return err;
+}
+
+
 int llhttp__on_chunk_complete(llhttp_t* s, const char* p, const char* endp) {
   int err;
   CALLBACK_MAYBE(s, on_chunk_complete);
@@ -348,6 +440,13 @@
 }
 
 
+int llhttp__on_reset(llhttp_t* s, const char* p, const char* endp) {
+  int err;
+  CALLBACK_MAYBE(s, on_reset);
+  return err;
+}
+
+
 /* Private */

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

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

@@ -339,17 +339,33 @@
   s_n_llhttp__internal__n_span_start_llhttp__on_body,
   s_n_llhttp__internal__n_invoke_is_equal_content_length,
   s_n_llhttp__internal__n_chunk_size_almost_done,
-  s_n_llhttp__internal__n_chunk_parameters,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete,
+  s_n_llhttp__internal__n_chunk_extension_quoted_value_done,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1,
+  s_n_llhttp__internal__n_error_21,
+  s_n_llhttp__internal__n_chunk_extension_quoted_value,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2,
+  s_n_llhttp__internal__n_error_23,
+  s_n_llhttp__internal__n_chunk_extension_value,
+  s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value,
+  s_n_llhttp__internal__n_error_24,
+  s_n_llhttp__internal__n_chunk_extension_name,
+  s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name,
+  s_n_llhttp__internal__n_chunk_extensions,
   s_n_llhttp__internal__n_chunk_size_otherwise,
   s_n_llhttp__internal__n_chunk_size,
   s_n_llhttp__internal__n_chunk_size_digit,
-  s_n_llhttp__internal__n_invoke_update_content_length,
+  s_n_llhttp__internal__n_invoke_update_content_length_1,
   s_n_llhttp__internal__n_consume_content_length_1,
   s_n_llhttp__internal__n_span_start_llhttp__on_body_1,
   s_n_llhttp__internal__n_eof,
   s_n_llhttp__internal__n_span_start_llhttp__on_body_2,
   s_n_llhttp__internal__n_invoke_llhttp__after_headers_complete,
   s_n_llhttp__internal__n_headers_almost_done,
+  s_n_llhttp__internal__n_header_field_colon_discard_ws,
+  s_n_llhttp__internal__n_error_33,
   s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete,
   s_n_llhttp__internal__n_span_start_llhttp__on_header_value,
   s_n_llhttp__internal__n_header_value_discard_lws,
@@ -357,6 +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_header_value_otherwise,
   s_n_llhttp__internal__n_header_value_connection_token,
   s_n_llhttp__internal__n_header_value_connection_ws,
@@ -364,14 +381,16 @@
   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_23,
-  s_n_llhttp__internal__n_error_24,
+  s_n_llhttp__internal__n_error_42,
+  s_n_llhttp__internal__n_error_43,
   s_n_llhttp__internal__n_header_value_content_length_ws,
   s_n_llhttp__internal__n_header_value_content_length,
-  s_n_llhttp__internal__n_header_value_te_chunked_last,
+  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,
+  s_n_llhttp__internal__n_header_value_te_chunked_last,
   s_n_llhttp__internal__n_header_value_te_chunked,
   s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1,
   s_n_llhttp__internal__n_header_value_discard_ws,
@@ -389,6 +408,7 @@
   s_n_llhttp__internal__n_header_field,
   s_n_llhttp__internal__n_span_start_llhttp__on_header_field,
   s_n_llhttp__internal__n_header_field_start,
+  s_n_llhttp__internal__n_headers_start,
   s_n_llhttp__internal__n_url_to_http_09,
   s_n_llhttp__internal__n_url_skip_to_http09,
   s_n_llhttp__internal__n_url_skip_lf_to_http09_1,
@@ -396,9 +416,16 @@
   s_n_llhttp__internal__n_req_pri_upgrade,
   s_n_llhttp__internal__n_req_http_complete_1,
   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_56,
   s_n_llhttp__internal__n_req_http_dot,
+  s_n_llhttp__internal__n_error_57,
   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,
   s_n_llhttp__internal__n_req_http_start_2,
   s_n_llhttp__internal__n_req_http_start_3,
@@ -426,102 +453,124 @@
   s_n_llhttp__internal__n_url_entry_connect,
   s_n_llhttp__internal__n_req_spaces_before_url,
   s_n_llhttp__internal__n_req_first_space_before_url,
-  s_n_llhttp__internal__n_start_req_2,
-  s_n_llhttp__internal__n_start_req_3,
-  s_n_llhttp__internal__n_start_req_1,
-  s_n_llhttp__internal__n_start_req_4,
-  s_n_llhttp__internal__n_start_req_6,
-  s_n_llhttp__internal__n_start_req_8,
-  s_n_llhttp__internal__n_start_req_9,
-  s_n_llhttp__internal__n_start_req_7,
-  s_n_llhttp__internal__n_start_req_5,
-  s_n_llhttp__internal__n_start_req_12,
-  s_n_llhttp__internal__n_start_req_13,
-  s_n_llhttp__internal__n_start_req_11,
-  s_n_llhttp__internal__n_start_req_10,
-  s_n_llhttp__internal__n_start_req_14,
-  s_n_llhttp__internal__n_start_req_17,
-  s_n_llhttp__internal__n_start_req_16,
-  s_n_llhttp__internal__n_start_req_15,
-  s_n_llhttp__internal__n_start_req_18,
-  s_n_llhttp__internal__n_start_req_20,
-  s_n_llhttp__internal__n_start_req_21,
-  s_n_llhttp__internal__n_start_req_19,
-  s_n_llhttp__internal__n_start_req_23,
-  s_n_llhttp__internal__n_start_req_24,
-  s_n_llhttp__internal__n_start_req_26,
-  s_n_llhttp__internal__n_start_req_28,
-  s_n_llhttp__internal__n_start_req_29,
-  s_n_llhttp__internal__n_start_req_27,
-  s_n_llhttp__internal__n_start_req_25,
-  s_n_llhttp__internal__n_start_req_30,
-  s_n_llhttp__internal__n_start_req_22,
-  s_n_llhttp__internal__n_start_req_31,
-  s_n_llhttp__internal__n_start_req_32,
-  s_n_llhttp__internal__n_start_req_35,
-  s_n_llhttp__internal__n_start_req_36,
-  s_n_llhttp__internal__n_start_req_34,
-  s_n_llhttp__internal__n_start_req_37,
-  s_n_llhttp__internal__n_start_req_38,
-  s_n_llhttp__internal__n_start_req_42,
-  s_n_llhttp__internal__n_start_req_43,
-  s_n_llhttp__internal__n_start_req_41,
-  s_n_llhttp__internal__n_start_req_40,
-  s_n_llhttp__internal__n_start_req_39,
-  s_n_llhttp__internal__n_start_req_45,
-  s_n_llhttp__internal__n_start_req_44,
-  s_n_llhttp__internal__n_start_req_33,
-  s_n_llhttp__internal__n_start_req_48,
-  s_n_llhttp__internal__n_start_req_49,
-  s_n_llhttp__internal__n_start_req_50,
-  s_n_llhttp__internal__n_start_req_51,
-  s_n_llhttp__internal__n_start_req_47,
-  s_n_llhttp__internal__n_start_req_46,
-  s_n_llhttp__internal__n_start_req_54,
-  s_n_llhttp__internal__n_start_req_56,
-  s_n_llhttp__internal__n_start_req_57,
-  s_n_llhttp__internal__n_start_req_55,
-  s_n_llhttp__internal__n_start_req_53,
-  s_n_llhttp__internal__n_start_req_58,
-  s_n_llhttp__internal__n_start_req_59,
-  s_n_llhttp__internal__n_start_req_52,
-  s_n_llhttp__internal__n_start_req_61,
-  s_n_llhttp__internal__n_start_req_62,
-  s_n_llhttp__internal__n_start_req_60,
-  s_n_llhttp__internal__n_start_req_65,
-  s_n_llhttp__internal__n_start_req_67,
-  s_n_llhttp__internal__n_start_req_68,
-  s_n_llhttp__internal__n_start_req_66,
-  s_n_llhttp__internal__n_start_req_69,
-  s_n_llhttp__internal__n_start_req_64,
-  s_n_llhttp__internal__n_start_req_63,
-  s_n_llhttp__internal__n_start_req,
+  s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1,
+  s_n_llhttp__internal__n_after_start_req_2,
+  s_n_llhttp__internal__n_after_start_req_3,
+  s_n_llhttp__internal__n_after_start_req_1,
+  s_n_llhttp__internal__n_after_start_req_4,
+  s_n_llhttp__internal__n_after_start_req_6,
+  s_n_llhttp__internal__n_after_start_req_8,
+  s_n_llhttp__internal__n_after_start_req_9,
+  s_n_llhttp__internal__n_after_start_req_7,
+  s_n_llhttp__internal__n_after_start_req_5,
+  s_n_llhttp__internal__n_after_start_req_12,
+  s_n_llhttp__internal__n_after_start_req_13,
+  s_n_llhttp__internal__n_after_start_req_11,
+  s_n_llhttp__internal__n_after_start_req_10,
+  s_n_llhttp__internal__n_after_start_req_14,
+  s_n_llhttp__internal__n_after_start_req_17,
+  s_n_llhttp__internal__n_after_start_req_16,
+  s_n_llhttp__internal__n_after_start_req_15,
+  s_n_llhttp__internal__n_after_start_req_18,
+  s_n_llhttp__internal__n_after_start_req_20,
+  s_n_llhttp__internal__n_after_start_req_21,
+  s_n_llhttp__internal__n_after_start_req_19,
+  s_n_llhttp__internal__n_after_start_req_23,
+  s_n_llhttp__internal__n_after_start_req_24,
+  s_n_llhttp__internal__n_after_start_req_26,
+  s_n_llhttp__internal__n_after_start_req_28,
+  s_n_llhttp__internal__n_after_start_req_29,
+  s_n_llhttp__internal__n_after_start_req_27,
+  s_n_llhttp__internal__n_after_start_req_25,
+  s_n_llhttp__internal__n_after_start_req_30,
+  s_n_llhttp__internal__n_after_start_req_22,
+  s_n_llhttp__internal__n_after_start_req_31,
+  s_n_llhttp__internal__n_after_start_req_32,
+  s_n_llhttp__internal__n_after_start_req_35,
+  s_n_llhttp__internal__n_after_start_req_36,
+  s_n_llhttp__internal__n_after_start_req_34,
+  s_n_llhttp__internal__n_after_start_req_37,
+  s_n_llhttp__internal__n_after_start_req_38,
+  s_n_llhttp__internal__n_after_start_req_42,
+  s_n_llhttp__internal__n_after_start_req_43,
+  s_n_llhttp__internal__n_after_start_req_41,
+  s_n_llhttp__internal__n_after_start_req_40,
+  s_n_llhttp__internal__n_after_start_req_39,
+  s_n_llhttp__internal__n_after_start_req_45,
+  s_n_llhttp__internal__n_after_start_req_44,
+  s_n_llhttp__internal__n_after_start_req_33,
+  s_n_llhttp__internal__n_after_start_req_48,
+  s_n_llhttp__internal__n_after_start_req_49,
+  s_n_llhttp__internal__n_after_start_req_50,
+  s_n_llhttp__internal__n_after_start_req_51,
+  s_n_llhttp__internal__n_after_start_req_47,
+  s_n_llhttp__internal__n_after_start_req_46,
+  s_n_llhttp__internal__n_after_start_req_54,
+  s_n_llhttp__internal__n_after_start_req_56,
+  s_n_llhttp__internal__n_after_start_req_57,
+  s_n_llhttp__internal__n_after_start_req_55,
+  s_n_llhttp__internal__n_after_start_req_53,
+  s_n_llhttp__internal__n_after_start_req_58,
+  s_n_llhttp__internal__n_after_start_req_59,
+  s_n_llhttp__internal__n_after_start_req_52,
+  s_n_llhttp__internal__n_after_start_req_61,
+  s_n_llhttp__internal__n_after_start_req_62,
+  s_n_llhttp__internal__n_after_start_req_60,
+  s_n_llhttp__internal__n_after_start_req_65,
+  s_n_llhttp__internal__n_after_start_req_67,
+  s_n_llhttp__internal__n_after_start_req_68,
+  s_n_llhttp__internal__n_after_start_req_66,
+  s_n_llhttp__internal__n_after_start_req_69,
+  s_n_llhttp__internal__n_after_start_req_64,
+  s_n_llhttp__internal__n_after_start_req_63,
+  s_n_llhttp__internal__n_after_start_req,
+  s_n_llhttp__internal__n_span_start_llhttp__on_method_1,
   s_n_llhttp__internal__n_invoke_llhttp__on_status_complete,
   s_n_llhttp__internal__n_res_line_almost_done,
   s_n_llhttp__internal__n_res_status,
   s_n_llhttp__internal__n_span_start_llhttp__on_status,
   s_n_llhttp__internal__n_res_status_start,
   s_n_llhttp__internal__n_res_status_code_otherwise,
-  s_n_llhttp__internal__n_res_status_code,
-  s_n_llhttp__internal__n_res_http_end,
+  s_n_llhttp__internal__n_res_status_code_digit_3,
+  s_n_llhttp__internal__n_res_status_code_digit_2,
+  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_85,
   s_n_llhttp__internal__n_res_http_dot,
+  s_n_llhttp__internal__n_error_86,
   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,
+  s_n_llhttp__internal__n_invoke_llhttp__on_method_complete,
   s_n_llhttp__internal__n_req_or_res_method_2,
+  s_n_llhttp__internal__n_invoke_update_type_1,
   s_n_llhttp__internal__n_req_or_res_method_3,
   s_n_llhttp__internal__n_req_or_res_method_1,
   s_n_llhttp__internal__n_req_or_res_method,
+  s_n_llhttp__internal__n_span_start_llhttp__on_method,
   s_n_llhttp__internal__n_start_req_or_res,
   s_n_llhttp__internal__n_invoke_load_type,
+  s_n_llhttp__internal__n_invoke_update_finish,
   s_n_llhttp__internal__n_start,
 };
 typedef enum llparse_state_e llparse_state_t;
 
+int llhttp__on_method(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__on_url(
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__on_version(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__on_header_field(
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
@@ -534,10 +583,29 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__on_chunk_extension_name(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
+int llhttp__on_chunk_extension_value(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__on_status(
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__internal__c_load_initial_message_completed(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return state->initial_message_completed;
+}
+
+int llhttp__on_reset(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__internal__c_update_finish(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -566,6 +634,10 @@
   return 0;
 }
 
+int llhttp__on_method_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__internal__c_is_equal_method(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -593,6 +665,13 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__internal__c_test_lenient_flags(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->lenient_flags & 1) == 1;
+}
+
 int llhttp__internal__c_test_flags(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -619,6 +698,22 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__internal__c_update_content_length(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  state->content_length = 0;
+  return 0;
+}
+
+int llhttp__internal__c_update_initial_message_completed(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  state->initial_message_completed = 1;
+  return 0;
+}
+
 int llhttp__internal__c_update_finish_1(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -627,7 +722,7 @@
   return 0;
 }
 
-int llhttp__internal__c_test_lenient_flags(
+int llhttp__internal__c_test_lenient_flags_1(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -641,7 +736,7 @@
   return (state->flags & 544) == 544;
 }
 
-int llhttp__internal__c_test_lenient_flags_1(
+int llhttp__internal__c_test_lenient_flags_2(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -660,14 +755,6 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
-int llhttp__internal__c_update_content_length(
-    llhttp__internal_t* state,
-    const unsigned char* p,
-    const unsigned char* endp) {
-  state->content_length = 0;
-  return 0;
-}
-
 int llhttp__internal__c_mul_add_content_length(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -713,6 +800,14 @@
   return 0;
 }
 
+int llhttp__on_chunk_extension_name_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
+int llhttp__on_chunk_extension_value_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__internal__c_update_finish_3(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -801,7 +896,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_2(
+int llhttp__internal__c_update_header_state_3(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -809,14 +904,7 @@
   return 0;
 }
 
-int llhttp__internal__c_test_lenient_flags_2(
-    llhttp__internal_t* state,
-    const unsigned char* p,
-    const unsigned char* endp) {
-  return (state->lenient_flags & 1) == 1;
-}
-
-int llhttp__internal__c_update_header_state_4(
+int llhttp__internal__c_update_header_state_1(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -824,7 +912,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_5(
+int llhttp__internal__c_update_header_state_6(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -832,7 +920,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_6(
+int llhttp__internal__c_update_header_state_7(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -881,6 +969,20 @@
   return 0;
 }
 
+int llhttp__internal__c_test_flags_3(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->flags & 8) == 8;
+}
+
+int llhttp__internal__c_test_lenient_flags_6(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->lenient_flags & 8) == 8;
+}
+
 int llhttp__internal__c_or_flags_16(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -897,7 +999,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_7(
+int llhttp__internal__c_update_header_state_8(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -905,7 +1007,7 @@
   return 0;
 }
 
-int llhttp__internal__c_or_flags_17(
+int llhttp__internal__c_or_flags_18(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -938,6 +1040,31 @@
   return 0;
 }
 
+int llhttp__internal__c_test_lenient_flags_8(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->lenient_flags & 16) == 16;
+}
+
+int llhttp__on_version_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
+int llhttp__internal__c_load_http_major(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return state->http_major;
+}
+
+int llhttp__internal__c_load_http_minor(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return state->http_minor;
+}
+
 int llhttp__internal__c_update_status_code(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -969,11 +1096,6 @@
     }
   }
   state->status_code += match;
-  
-  /* Enforce maximum */
-  if (state->status_code > 999) {
-    return 1;
-  }
   return 0;
 }
 
@@ -1025,7 +1147,7 @@
         }
         default: {
           p++;
-          goto s_n_llhttp__internal__n_error_4;
+          goto s_n_llhttp__internal__n_error_7;
         }
       }
       /* UNREACHABLE */;
@@ -1035,7 +1157,7 @@
     s_n_llhttp__internal__n_invoke_llhttp__after_message_complete: {
       switch (llhttp__after_message_complete(state, p, endp)) {
         case 1:
-          goto s_n_llhttp__internal__n_invoke_update_finish_2;
+          goto s_n_llhttp__internal__n_invoke_update_content_length;
         default:
           goto s_n_llhttp__internal__n_invoke_update_finish_1;
       }
@@ -1069,9 +1191,9 @@
         case 0:
           goto s_n_llhttp__internal__n_invoke_is_equal_upgrade;
         case 21:
-          goto s_n_llhttp__internal__n_pause_5;
+          goto s_n_llhttp__internal__n_pause_11;
         default:
-          goto s_n_llhttp__internal__n_error_13;
+          goto s_n_llhttp__internal__n_error_28;
       }
       /* UNREACHABLE */;
       abort();
@@ -1094,7 +1216,7 @@
           return s_n_llhttp__internal__n_chunk_data_almost_done;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_8;
+          goto s_n_llhttp__internal__n_error_11;
         }
       }
       /* UNREACHABLE */;
@@ -1103,7 +1225,7 @@
     case s_n_llhttp__internal__n_consume_content_length:
     s_n_llhttp__internal__n_consume_content_length: {
       size_t avail;
-      size_t need;
+      uint64_t need;
       
       avail = endp - p;
       need = state->content_length;
@@ -1151,25 +1273,294 @@
           goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_header;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_9;
+          goto s_n_llhttp__internal__n_error_12;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_chunk_parameters:
-    s_n_llhttp__internal__n_chunk_parameters: {
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete: {
+      switch (llhttp__on_chunk_extension_name_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_size_almost_done;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_5;
+        default:
+          goto s_n_llhttp__internal__n_error_15;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1: {
+      switch (llhttp__on_chunk_extension_name_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_extensions;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_6;
+        default:
+          goto s_n_llhttp__internal__n_error_16;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete: {
+      switch (llhttp__on_chunk_extension_value_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_size_almost_done;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_7;
+        default:
+          goto s_n_llhttp__internal__n_error_18;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_quoted_value_done:
+    s_n_llhttp__internal__n_chunk_extension_quoted_value_done: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_chunk_parameters;
+        return s_n_llhttp__internal__n_chunk_extension_quoted_value_done;
       }
       switch (*p) {
         case 13: {
           p++;
           goto s_n_llhttp__internal__n_chunk_size_almost_done;
         }
+        case ';': {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extensions;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_error_20;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1: {
+      switch (llhttp__on_chunk_extension_value_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_extension_quoted_value_done;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_8;
+        default:
+          goto s_n_llhttp__internal__n_error_19;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_21:
+    s_n_llhttp__internal__n_error_21: {
+      state->error = 0x2;
+      state->reason = "Invalid character in chunk extensions quoted value";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_quoted_value:
+    s_n_llhttp__internal__n_chunk_extension_quoted_value: {
+      static uint8_t lookup_table = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+      };
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extension_quoted_value;
+      }
+      switch (lookup_table(uint8_t) *p) {
+        case 1: {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extension_quoted_value;
+        }
+        case 2: {
+          p++;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_1;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_2;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2: {
+      switch (llhttp__on_chunk_extension_value_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_size_otherwise;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_9;
+        default:
+          goto s_n_llhttp__internal__n_error_22;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_23:
+    s_n_llhttp__internal__n_error_23: {
+      state->error = 0x2;
+      state->reason = "Invalid character in chunk extensions value";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_value:
+    s_n_llhttp__internal__n_chunk_extension_value: {
+      static uint8_t lookup_table = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 2, 3, 2, 2, 2, 2, 2, 0, 0, 2, 2, 0, 2, 2, 0,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 4, 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, 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, 0, 2, 0, 2, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      };
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extension_value;
+      }
+      switch (lookup_table(uint8_t) *p) {
+        case 1: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value;
+        }
+        case 2: {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extension_value;
+        }
+        case 3: {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extension_quoted_value;
+        }
+        case 4: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_3;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_4;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value:
+    s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_chunk_extension_value;
+      goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_2;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_24:
+    s_n_llhttp__internal__n_error_24: {
+      state->error = 0x2;
+      state->reason = "Invalid character in chunk extensions name";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_name:
+    s_n_llhttp__internal__n_chunk_extension_name: {
+      static uint8_t lookup_table = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 2, 0, 2, 2, 2, 2, 2, 0, 0, 2, 2, 0, 2, 2, 0,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 3, 0, 4, 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, 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, 0, 2, 0, 2, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      };
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extension_name;
+      }
+      switch (lookup_table(uint8_t) *p) {
+        case 1: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name;
+        }
+        case 2: {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extension_name;
+        }
+        case 3: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_1;
+        }
+        case 4: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_2;
+        }
         default: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_3;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name:
+    s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_chunk_extension_name;
+      goto s_n_llhttp__internal__n_chunk_extension_name;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extensions:
+    s_n_llhttp__internal__n_chunk_extensions: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extensions;
+      }
+      switch (*p) {
+        case 13: {
           p++;
-          goto s_n_llhttp__internal__n_chunk_parameters;
+          goto s_n_llhttp__internal__n_error_13;
+        }
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_error_14;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name;
         }
       }
       /* UNREACHABLE */;
@@ -1185,16 +1576,12 @@
           p++;
           goto s_n_llhttp__internal__n_chunk_size_almost_done;
         }
-        case ' ': {
-          p++;
-          goto s_n_llhttp__internal__n_chunk_parameters;
-        }
         case ';': {
           p++;
-          goto s_n_llhttp__internal__n_chunk_parameters;
+          goto s_n_llhttp__internal__n_chunk_extensions;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_10;
+          goto s_n_llhttp__internal__n_error_25;
         }
       }
       /* UNREACHABLE */;
@@ -1440,14 +1827,14 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_content_length;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_12;
+          goto s_n_llhttp__internal__n_error_27;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_invoke_update_content_length:
-    s_n_llhttp__internal__n_invoke_update_content_length: {
+    case s_n_llhttp__internal__n_invoke_update_content_length_1:
+    s_n_llhttp__internal__n_invoke_update_content_length_1: {
       switch (llhttp__internal__c_update_content_length(state, p, endp)) {
         default:
           goto s_n_llhttp__internal__n_chunk_size_digit;
@@ -1458,7 +1845,7 @@
     case s_n_llhttp__internal__n_consume_content_length_1:
     s_n_llhttp__internal__n_consume_content_length_1: {
       size_t avail;
-      size_t need;
+      uint64_t need;
       
       avail = endp - p;
       need = state->content_length;
@@ -1511,13 +1898,13 @@
         case 1:
           goto s_n_llhttp__internal__n_invoke_llhttp__on_message_complete_1;
         case 2:
-          goto s_n_llhttp__internal__n_invoke_update_content_length;
+          goto s_n_llhttp__internal__n_invoke_update_content_length_1;
         case 3:
           goto s_n_llhttp__internal__n_span_start_llhttp__on_body_1;
         case 4:
           goto s_n_llhttp__internal__n_invoke_update_finish_3;
         case 5:
-          goto s_n_llhttp__internal__n_error_14;
+          goto s_n_llhttp__internal__n_error_29;
         default:
           goto s_n_llhttp__internal__n_invoke_llhttp__on_message_complete;
       }
@@ -1535,17 +1922,48 @@
           goto s_n_llhttp__internal__n_invoke_test_flags;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_17;
+          goto s_n_llhttp__internal__n_error_32;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_header_field_colon_discard_ws:
+    s_n_llhttp__internal__n_header_field_colon_discard_ws: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_header_field_colon_discard_ws;
+      }
+      switch (*p) {
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_header_field_colon_discard_ws;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_header_field_colon;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_33:
+    s_n_llhttp__internal__n_error_33: {
+      state->error = 0xa;
+      state->reason = "Invalid header field char";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete:
     s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete: {
       switch (llhttp__on_header_value_complete(state, p, endp)) {
-        default:
+        case 0:
           goto s_n_llhttp__internal__n_header_field_start;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_14;
+        default:
+          goto s_n_llhttp__internal__n_error_36;
       }
       /* UNREACHABLE */;
       abort();
@@ -1593,7 +2011,7 @@
           goto s_n_llhttp__internal__n_header_value_discard_lws;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_19;
+          goto s_n_llhttp__internal__n_error_38;
         }
       }
       /* UNREACHABLE */;
@@ -1606,13 +2024,13 @@
       }
       switch (*p) {
         case 9: {
-          goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_3;
         }
         case ' ': {
-          goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_load_header_state_3;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_4;
         }
       }
       /* UNREACHABLE */;
@@ -1629,7 +2047,7 @@
           goto s_n_llhttp__internal__n_header_value_lws;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_20;
+          goto s_n_llhttp__internal__n_error_39;
         }
       }
       /* UNREACHABLE */;
@@ -1642,10 +2060,10 @@
       }
       switch (*p) {
         case 10: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3;
         }
         case 13: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4;
         }
         default: {
           p++;
@@ -1655,20 +2073,27 @@
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_40:
+    s_n_llhttp__internal__n_error_40: {
+      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();
+    }
     case s_n_llhttp__internal__n_header_value_otherwise:
     s_n_llhttp__internal__n_header_value_otherwise: {
       if (p == endp) {
         return s_n_llhttp__internal__n_header_value_otherwise;
       }
       switch (*p) {
-        case 10: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
-        }
         case 13: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_2;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
         }
       }
       /* UNREACHABLE */;
@@ -1731,10 +2156,10 @@
         }
         case ',': {
           p++;
-          goto s_n_llhttp__internal__n_invoke_load_header_state_4;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_5;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_4;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_5;
         }
       }
       /* UNREACHABLE */;
@@ -1752,7 +2177,7 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_header_state_2;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_3;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_header_value_connection_1;
@@ -1776,7 +2201,7 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_header_state_5;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_6;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_header_value_connection_2;
@@ -1800,7 +2225,7 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_header_state_6;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_7;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_header_value_connection_3;
@@ -1845,8 +2270,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_23:
-    s_n_llhttp__internal__n_error_23: {
+    case s_n_llhttp__internal__n_error_42:
+    s_n_llhttp__internal__n_error_42: {
       state->error = 0xb;
       state->reason = "Content-Length overflow";
       state->error_pos = (const char*) p;
@@ -1855,8 +2280,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_24:
-    s_n_llhttp__internal__n_error_24: {
+    case s_n_llhttp__internal__n_error_43:
+    s_n_llhttp__internal__n_error_43: {
       state->error = 0xb;
       state->reason = "Invalid character in Content-Length";
       state->error_pos = (const char*) p;
@@ -1882,7 +2307,7 @@
           goto s_n_llhttp__internal__n_header_value_content_length_ws;
         }
         default: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_6;
         }
       }
       /* UNREACHABLE */;
@@ -1951,26 +2376,23 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_header_value_te_chunked_last:
-    s_n_llhttp__internal__n_header_value_te_chunked_last: {
-      if (p == endp) {
-        return s_n_llhttp__internal__n_header_value_te_chunked_last;
-      }
-      switch (*p) {
-        case 10: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_7;
-        }
-        case 13: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_7;
-        }
-        case ' ': {
-          p++;
-          goto s_n_llhttp__internal__n_header_value_te_chunked_last;
-        }
-        default: {
-          goto s_n_llhttp__internal__n_header_value_te_chunked;
-        }
-      }
+    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;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_44:
+    s_n_llhttp__internal__n_error_44: {
+      state->error = 0xf;
+      state->reason = "Invalid `Transfer-Encoding` header value";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
       /* UNREACHABLE */;
       abort();
     }
@@ -2087,8 +2509,34 @@
           goto s_n_llhttp__internal__n_header_value_te_token_ows;
         }
         default: {
+          goto s_n_llhttp__internal__n_invoke_update_header_state_9;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_header_value_te_chunked_last:
+    s_n_llhttp__internal__n_header_value_te_chunked_last: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_header_value_te_chunked_last;
+      }
+      switch (*p) {
+        case 10: {
           goto s_n_llhttp__internal__n_invoke_update_header_state_8;
         }
+        case 13: {
+          goto s_n_llhttp__internal__n_invoke_update_header_state_8;
+        }
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_header_value_te_chunked_last;
+        }
+        case ',': {
+          goto s_n_llhttp__internal__n_invoke_load_type_1;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_header_value_te_token;
+        }
       }
       /* UNREACHABLE */;
       abort();
@@ -2140,7 +2588,7 @@
         }
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_header_value_discard_lws;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_4;
         }
         case 13: {
           p++;
@@ -2160,8 +2608,12 @@
     case s_n_llhttp__internal__n_invoke_llhttp__on_header_field_complete:
     s_n_llhttp__internal__n_invoke_llhttp__on_header_field_complete: {
       switch (llhttp__on_header_field_complete(state, p, endp)) {
-        default:
+        case 0:
           goto s_n_llhttp__internal__n_header_value_discard_ws;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_15;
+        default:
+          goto s_n_llhttp__internal__n_error_34;
       }
       /* UNREACHABLE */;
       abort();
@@ -2173,10 +2625,10 @@
       }
       switch (*p) {
         case ':': {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_25;
+          goto s_n_llhttp__internal__n_error_46;
         }
       }
       /* UNREACHABLE */;
@@ -2260,14 +2712,13 @@
       }
       switch (*p) {
         case ' ': {
-          p++;
-          goto s_n_llhttp__internal__n_header_field_colon;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_3;
         }
         case ':': {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_9;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
         }
       }
       /* UNREACHABLE */;
@@ -2292,7 +2743,7 @@
           return s_n_llhttp__internal__n_header_field_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2317,7 +2768,7 @@
           return s_n_llhttp__internal__n_header_field_4;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2338,7 +2789,7 @@
           goto s_n_llhttp__internal__n_header_field_4;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2362,7 +2813,7 @@
           return s_n_llhttp__internal__n_header_field_1;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2387,7 +2838,7 @@
           return s_n_llhttp__internal__n_header_field_5;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2412,7 +2863,7 @@
           return s_n_llhttp__internal__n_header_field_6;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2437,7 +2888,7 @@
           return s_n_llhttp__internal__n_header_field_7;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2466,7 +2917,7 @@
           goto s_n_llhttp__internal__n_header_field_7;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -2503,6 +2954,23 @@
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_headers_start:
+    s_n_llhttp__internal__n_headers_start: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_headers_start;
+      }
+      switch (*p) {
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_header_field_start;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_url_to_http_09:
     s_n_llhttp__internal__n_url_to_http_09: {
       if (p == endp) {
@@ -2511,11 +2979,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         default: {
           goto s_n_llhttp__internal__n_invoke_update_http_major;
@@ -2532,11 +3000,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         default: {
           p++;
@@ -2557,7 +3025,7 @@
           goto s_n_llhttp__internal__n_url_to_http_09;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_26;
+          goto s_n_llhttp__internal__n_error_47;
         }
       }
       /* UNREACHABLE */;
@@ -2571,18 +3039,18 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 13: {
           p++;
           goto s_n_llhttp__internal__n_url_skip_lf_to_http09_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_26;
+          goto s_n_llhttp__internal__n_error_47;
         }
       }
       /* UNREACHABLE */;
@@ -2600,13 +3068,13 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_error_29;
+          goto s_n_llhttp__internal__n_error_53;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_req_pri_upgrade;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_30;
+          goto s_n_llhttp__internal__n_error_54;
         }
       }
       /* UNREACHABLE */;
@@ -2620,10 +3088,10 @@
       switch (*p) {
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_header_field_start;
+          goto s_n_llhttp__internal__n_headers_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_28;
+          goto s_n_llhttp__internal__n_error_52;
         }
       }
       /* UNREACHABLE */;
@@ -2637,19 +3105,63 @@
       switch (*p) {
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_header_field_start;
+          goto s_n_llhttp__internal__n_headers_start;
         }
         case 13: {
           p++;
           goto s_n_llhttp__internal__n_req_http_complete_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_28;
+          goto s_n_llhttp__internal__n_error_52;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_load_method_1:
+    s_n_llhttp__internal__n_invoke_load_method_1: {
+      switch (llhttp__internal__c_load_method(state, p, endp)) {
+        case 34:
+          goto s_n_llhttp__internal__n_req_pri_upgrade;
+        default:
+          goto s_n_llhttp__internal__n_req_http_complete;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_version_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_version_complete: {
+      switch (llhttp__on_version_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_invoke_load_method_1;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_17;
+        default:
+          goto s_n_llhttp__internal__n_error_51;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_50:
+    s_n_llhttp__internal__n_error_50: {
+      state->error = 0x9;
+      state->reason = "Invalid HTTP version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_55:
+    s_n_llhttp__internal__n_error_55: {
+      state->error = 0x9;
+      state->reason = "Invalid minor version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_minor:
     s_n_llhttp__internal__n_req_http_minor: {
       if (p == endp) {
@@ -2707,12 +3219,22 @@
           goto s_n_llhttp__internal__n_invoke_store_http_minor;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_31;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_2;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_56:
+    s_n_llhttp__internal__n_error_56: {
+      state->error = 0x9;
+      state->reason = "Expected dot";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_dot:
     s_n_llhttp__internal__n_req_http_dot: {
       if (p == endp) {
@@ -2724,12 +3246,22 @@
           goto s_n_llhttp__internal__n_req_http_minor;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_32;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_3;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_57:
+    s_n_llhttp__internal__n_error_57: {
+      state->error = 0x9;
+      state->reason = "Invalid major version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_major:
     s_n_llhttp__internal__n_req_http_major: {
       if (p == endp) {
@@ -2787,12 +3319,23 @@
           goto s_n_llhttp__internal__n_invoke_store_http_major;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_33;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_4;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_version:
+    s_n_llhttp__internal__n_span_start_llhttp__on_version: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_version;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_version;
+      goto s_n_llhttp__internal__n_req_http_major;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_start_1:
     s_n_llhttp__internal__n_req_http_start_1: {
       llparse_match_t match_seq;
@@ -2811,7 +3354,7 @@
           return s_n_llhttp__internal__n_req_http_start_1;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_36;
+          goto s_n_llhttp__internal__n_error_60;
         }
       }
       /* UNREACHABLE */;
@@ -2835,7 +3378,7 @@
           return s_n_llhttp__internal__n_req_http_start_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_36;
+          goto s_n_llhttp__internal__n_error_60;
         }
       }
       /* UNREACHABLE */;
@@ -2859,7 +3402,7 @@
           return s_n_llhttp__internal__n_req_http_start_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_36;
+          goto s_n_llhttp__internal__n_error_60;
         }
       }
       /* UNREACHABLE */;
@@ -2888,7 +3431,7 @@
           goto s_n_llhttp__internal__n_req_http_start_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_36;
+          goto s_n_llhttp__internal__n_error_60;
         }
       }
       /* UNREACHABLE */;
@@ -2902,11 +3445,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         default: {
           goto s_n_llhttp__internal__n_invoke_llhttp__on_url_complete_1;
@@ -2923,11 +3466,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         default: {
           p++;
@@ -2963,7 +3506,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url_6;
@@ -2979,7 +3522,7 @@
           goto s_n_llhttp__internal__n_url_fragment;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_37;
+          goto s_n_llhttp__internal__n_error_61;
         }
       }
       /* UNREACHABLE */;
@@ -3021,7 +3564,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url_9;
@@ -3040,7 +3583,7 @@
           goto s_n_llhttp__internal__n_span_end_stub_query_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_38;
+          goto s_n_llhttp__internal__n_error_62;
         }
       }
       /* UNREACHABLE */;
@@ -3054,14 +3597,14 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 10: {
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url_3;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 13: {
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url_4;
@@ -3078,7 +3621,7 @@
           goto s_n_llhttp__internal__n_url_query;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_39;
+          goto s_n_llhttp__internal__n_error_63;
         }
       }
       /* UNREACHABLE */;
@@ -3110,7 +3653,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 2: {
           p++;
@@ -3179,7 +3722,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url_12;
@@ -3203,10 +3746,10 @@
         }
         case 8: {
           p++;
-          goto s_n_llhttp__internal__n_error_40;
+          goto s_n_llhttp__internal__n_error_64;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_41;
+          goto s_n_llhttp__internal__n_error_65;
         }
       }
       /* UNREACHABLE */;
@@ -3238,7 +3781,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url;
@@ -3265,7 +3808,7 @@
           goto s_n_llhttp__internal__n_url_server_with_at;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_42;
+          goto s_n_llhttp__internal__n_error_66;
         }
       }
       /* UNREACHABLE */;
@@ -3282,7 +3825,7 @@
           goto s_n_llhttp__internal__n_url_server;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_44;
+          goto s_n_llhttp__internal__n_error_68;
         }
       }
       /* UNREACHABLE */;
@@ -3296,30 +3839,30 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_error_43;
+          goto s_n_llhttp__internal__n_error_67;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 13: {
           p++;
-          goto s_n_llhttp__internal__n_error_43;
+          goto s_n_llhttp__internal__n_error_67;
         }
         case ' ': {
           p++;
-          goto s_n_llhttp__internal__n_error_43;
+          goto s_n_llhttp__internal__n_error_67;
         }
         case '/': {
           p++;
           goto s_n_llhttp__internal__n_url_schema_delim_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_44;
+          goto s_n_llhttp__internal__n_error_68;
         }
       }
       /* UNREACHABLE */;
@@ -3361,11 +3904,11 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 2: {
           p++;
-          goto s_n_llhttp__internal__n_error_43;
+          goto s_n_llhttp__internal__n_error_67;
         }
         case 3: {
           goto s_n_llhttp__internal__n_span_end_stub_schema;
@@ -3375,7 +3918,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_45;
+          goto s_n_llhttp__internal__n_error_69;
         }
       }
       /* UNREACHABLE */;
@@ -3407,11 +3950,11 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 2: {
           p++;
-          goto s_n_llhttp__internal__n_error_43;
+          goto s_n_llhttp__internal__n_error_67;
         }
         case 3: {
           goto s_n_llhttp__internal__n_span_start_stub_path_2;
@@ -3420,7 +3963,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_46;
+          goto s_n_llhttp__internal__n_error_70;
         }
       }
       /* UNREACHABLE */;
@@ -3445,11 +3988,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         default: {
           goto s_n_llhttp__internal__n_span_start_llhttp__on_url_1;
@@ -3477,11 +4020,11 @@
       switch (*p) {
         case 9: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         case 12: {
           p++;
-          goto s_n_llhttp__internal__n_error_1;
+          goto s_n_llhttp__internal__n_error_2;
         }
         default: {
           goto s_n_llhttp__internal__n_span_start_llhttp__on_url;
@@ -3518,16 +4061,29 @@
           goto s_n_llhttp__internal__n_req_spaces_before_url;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_47;
+          goto s_n_llhttp__internal__n_error_71;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_2:
-    s_n_llhttp__internal__n_start_req_2: {
+    case s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1: {
+      switch (llhttp__on_method_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_req_first_space_before_url;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_22;
+        default:
+          goto s_n_llhttp__internal__n_error_88;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_after_start_req_2:
+    s_n_llhttp__internal__n_after_start_req_2: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_2;
+        return s_n_llhttp__internal__n_after_start_req_2;
       }
       switch (*p) {
         case 'L': {
@@ -3536,18 +4092,18 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_3:
-    s_n_llhttp__internal__n_start_req_3: {
+    case s_n_llhttp__internal__n_after_start_req_3:
+    s_n_llhttp__internal__n_after_start_req_3: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_3;
+        return s_n_llhttp__internal__n_after_start_req_3;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob18, 6);
       p = match_seq.current;
@@ -3558,42 +4114,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_3;
+          return s_n_llhttp__internal__n_after_start_req_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_1:
-    s_n_llhttp__internal__n_start_req_1: {
+    case s_n_llhttp__internal__n_after_start_req_1:
+    s_n_llhttp__internal__n_after_start_req_1: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_1;
+        return s_n_llhttp__internal__n_after_start_req_1;
       }
       switch (*p) {
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_2;
+          goto s_n_llhttp__internal__n_after_start_req_2;
         }
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_3;
+          goto s_n_llhttp__internal__n_after_start_req_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_4:
-    s_n_llhttp__internal__n_start_req_4: {
+    case s_n_llhttp__internal__n_after_start_req_4:
+    s_n_llhttp__internal__n_after_start_req_4: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_4;
+        return s_n_llhttp__internal__n_after_start_req_4;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob19, 3);
       p = match_seq.current;
@@ -3604,21 +4160,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_4;
+          return s_n_llhttp__internal__n_after_start_req_4;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_6:
-    s_n_llhttp__internal__n_start_req_6: {
+    case s_n_llhttp__internal__n_after_start_req_6:
+    s_n_llhttp__internal__n_after_start_req_6: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_6;
+        return s_n_llhttp__internal__n_after_start_req_6;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob20, 6);
       p = match_seq.current;
@@ -3629,21 +4185,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_6;
+          return s_n_llhttp__internal__n_after_start_req_6;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_8:
-    s_n_llhttp__internal__n_start_req_8: {
+    case s_n_llhttp__internal__n_after_start_req_8:
+    s_n_llhttp__internal__n_after_start_req_8: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_8;
+        return s_n_llhttp__internal__n_after_start_req_8;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob21, 4);
       p = match_seq.current;
@@ -3654,19 +4210,19 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_8;
+          return s_n_llhttp__internal__n_after_start_req_8;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_9:
-    s_n_llhttp__internal__n_start_req_9: {
+    case s_n_llhttp__internal__n_after_start_req_9:
+    s_n_llhttp__internal__n_after_start_req_9: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_9;
+        return s_n_llhttp__internal__n_after_start_req_9;
       }
       switch (*p) {
         case 'Y': {
@@ -3675,60 +4231,60 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_7:
-    s_n_llhttp__internal__n_start_req_7: {
+    case s_n_llhttp__internal__n_after_start_req_7:
+    s_n_llhttp__internal__n_after_start_req_7: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_7;
+        return s_n_llhttp__internal__n_after_start_req_7;
       }
       switch (*p) {
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_8;
+          goto s_n_llhttp__internal__n_after_start_req_8;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_9;
+          goto s_n_llhttp__internal__n_after_start_req_9;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_5:
-    s_n_llhttp__internal__n_start_req_5: {
+    case s_n_llhttp__internal__n_after_start_req_5:
+    s_n_llhttp__internal__n_after_start_req_5: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_5;
+        return s_n_llhttp__internal__n_after_start_req_5;
       }
       switch (*p) {
         case 'H': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_6;
+          goto s_n_llhttp__internal__n_after_start_req_6;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_7;
+          goto s_n_llhttp__internal__n_after_start_req_7;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_12:
-    s_n_llhttp__internal__n_start_req_12: {
+    case s_n_llhttp__internal__n_after_start_req_12:
+    s_n_llhttp__internal__n_after_start_req_12: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_12;
+        return s_n_llhttp__internal__n_after_start_req_12;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob22, 3);
       p = match_seq.current;
@@ -3739,21 +4295,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_12;
+          return s_n_llhttp__internal__n_after_start_req_12;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_13:
-    s_n_llhttp__internal__n_start_req_13: {
+    case s_n_llhttp__internal__n_after_start_req_13:
+    s_n_llhttp__internal__n_after_start_req_13: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_13;
+        return s_n_llhttp__internal__n_after_start_req_13;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob23, 5);
       p = match_seq.current;
@@ -3764,59 +4320,59 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_13;
+          return s_n_llhttp__internal__n_after_start_req_13;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_11:
-    s_n_llhttp__internal__n_start_req_11: {
+    case s_n_llhttp__internal__n_after_start_req_11:
+    s_n_llhttp__internal__n_after_start_req_11: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_11;
+        return s_n_llhttp__internal__n_after_start_req_11;
       }
       switch (*p) {
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_12;
+          goto s_n_llhttp__internal__n_after_start_req_12;
         }
         case 'S': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_13;
+          goto s_n_llhttp__internal__n_after_start_req_13;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_10:
-    s_n_llhttp__internal__n_start_req_10: {
+    case s_n_llhttp__internal__n_after_start_req_10:
+    s_n_llhttp__internal__n_after_start_req_10: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_10;
+        return s_n_llhttp__internal__n_after_start_req_10;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_11;
+          goto s_n_llhttp__internal__n_after_start_req_11;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_14:
-    s_n_llhttp__internal__n_start_req_14: {
+    case s_n_llhttp__internal__n_after_start_req_14:
+    s_n_llhttp__internal__n_after_start_req_14: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_14;
+        return s_n_llhttp__internal__n_after_start_req_14;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob24, 4);
       p = match_seq.current;
@@ -3827,21 +4383,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_14;
+          return s_n_llhttp__internal__n_after_start_req_14;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_17:
-    s_n_llhttp__internal__n_start_req_17: {
+    case s_n_llhttp__internal__n_after_start_req_17:
+    s_n_llhttp__internal__n_after_start_req_17: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_17;
+        return s_n_llhttp__internal__n_after_start_req_17;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob26, 9);
       p = match_seq.current;
@@ -3852,24 +4408,24 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_17;
+          return s_n_llhttp__internal__n_after_start_req_17;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_16:
-    s_n_llhttp__internal__n_start_req_16: {
+    case s_n_llhttp__internal__n_after_start_req_16:
+    s_n_llhttp__internal__n_after_start_req_16: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_16;
+        return s_n_llhttp__internal__n_after_start_req_16;
       }
       switch (*p) {
         case '_': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_17;
+          goto s_n_llhttp__internal__n_after_start_req_17;
         }
         default: {
           match = 1;
@@ -3879,36 +4435,36 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_15:
-    s_n_llhttp__internal__n_start_req_15: {
+    case s_n_llhttp__internal__n_after_start_req_15:
+    s_n_llhttp__internal__n_after_start_req_15: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_15;
+        return s_n_llhttp__internal__n_after_start_req_15;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob25, 2);
       p = match_seq.current;
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_start_req_16;
+          goto s_n_llhttp__internal__n_after_start_req_16;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_15;
+          return s_n_llhttp__internal__n_after_start_req_15;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_18:
-    s_n_llhttp__internal__n_start_req_18: {
+    case s_n_llhttp__internal__n_after_start_req_18:
+    s_n_llhttp__internal__n_after_start_req_18: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_18;
+        return s_n_llhttp__internal__n_after_start_req_18;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob27, 3);
       p = match_seq.current;
@@ -3919,21 +4475,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_18;
+          return s_n_llhttp__internal__n_after_start_req_18;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_20:
-    s_n_llhttp__internal__n_start_req_20: {
+    case s_n_llhttp__internal__n_after_start_req_20:
+    s_n_llhttp__internal__n_after_start_req_20: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_20;
+        return s_n_llhttp__internal__n_after_start_req_20;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob28, 2);
       p = match_seq.current;
@@ -3944,21 +4500,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_20;
+          return s_n_llhttp__internal__n_after_start_req_20;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_21:
-    s_n_llhttp__internal__n_start_req_21: {
+    case s_n_llhttp__internal__n_after_start_req_21:
+    s_n_llhttp__internal__n_after_start_req_21: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_21;
+        return s_n_llhttp__internal__n_after_start_req_21;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob29, 2);
       p = match_seq.current;
@@ -3969,42 +4525,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_21;
+          return s_n_llhttp__internal__n_after_start_req_21;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_19:
-    s_n_llhttp__internal__n_start_req_19: {
+    case s_n_llhttp__internal__n_after_start_req_19:
+    s_n_llhttp__internal__n_after_start_req_19: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_19;
+        return s_n_llhttp__internal__n_after_start_req_19;
       }
       switch (*p) {
         case 'I': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_20;
+          goto s_n_llhttp__internal__n_after_start_req_20;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_21;
+          goto s_n_llhttp__internal__n_after_start_req_21;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_23:
-    s_n_llhttp__internal__n_start_req_23: {
+    case s_n_llhttp__internal__n_after_start_req_23:
+    s_n_llhttp__internal__n_after_start_req_23: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_23;
+        return s_n_llhttp__internal__n_after_start_req_23;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob30, 6);
       p = match_seq.current;
@@ -4015,21 +4571,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_23;
+          return s_n_llhttp__internal__n_after_start_req_23;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_24:
-    s_n_llhttp__internal__n_start_req_24: {
+    case s_n_llhttp__internal__n_after_start_req_24:
+    s_n_llhttp__internal__n_after_start_req_24: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_24;
+        return s_n_llhttp__internal__n_after_start_req_24;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob31, 3);
       p = match_seq.current;
@@ -4040,21 +4596,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_24;
+          return s_n_llhttp__internal__n_after_start_req_24;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_26:
-    s_n_llhttp__internal__n_start_req_26: {
+    case s_n_llhttp__internal__n_after_start_req_26:
+    s_n_llhttp__internal__n_after_start_req_26: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_26;
+        return s_n_llhttp__internal__n_after_start_req_26;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob32, 7);
       p = match_seq.current;
@@ -4065,21 +4621,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_26;
+          return s_n_llhttp__internal__n_after_start_req_26;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_28:
-    s_n_llhttp__internal__n_start_req_28: {
+    case s_n_llhttp__internal__n_after_start_req_28:
+    s_n_llhttp__internal__n_after_start_req_28: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_28;
+        return s_n_llhttp__internal__n_after_start_req_28;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob33, 6);
       p = match_seq.current;
@@ -4090,19 +4646,19 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_28;
+          return s_n_llhttp__internal__n_after_start_req_28;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_29:
-    s_n_llhttp__internal__n_start_req_29: {
+    case s_n_llhttp__internal__n_after_start_req_29:
+    s_n_llhttp__internal__n_after_start_req_29: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_29;
+        return s_n_llhttp__internal__n_after_start_req_29;
       }
       switch (*p) {
         case 'L': {
@@ -4111,60 +4667,60 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_27:
-    s_n_llhttp__internal__n_start_req_27: {
+    case s_n_llhttp__internal__n_after_start_req_27:
+    s_n_llhttp__internal__n_after_start_req_27: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_27;
+        return s_n_llhttp__internal__n_after_start_req_27;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_28;
+          goto s_n_llhttp__internal__n_after_start_req_28;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_29;
+          goto s_n_llhttp__internal__n_after_start_req_29;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_25:
-    s_n_llhttp__internal__n_start_req_25: {
+    case s_n_llhttp__internal__n_after_start_req_25:
+    s_n_llhttp__internal__n_after_start_req_25: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_25;
+        return s_n_llhttp__internal__n_after_start_req_25;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_26;
+          goto s_n_llhttp__internal__n_after_start_req_26;
         }
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_27;
+          goto s_n_llhttp__internal__n_after_start_req_27;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_30:
-    s_n_llhttp__internal__n_start_req_30: {
+    case s_n_llhttp__internal__n_after_start_req_30:
+    s_n_llhttp__internal__n_after_start_req_30: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_30;
+        return s_n_llhttp__internal__n_after_start_req_30;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob34, 2);
       p = match_seq.current;
@@ -4175,50 +4731,50 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_30;
+          return s_n_llhttp__internal__n_after_start_req_30;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_22:
-    s_n_llhttp__internal__n_start_req_22: {
+    case s_n_llhttp__internal__n_after_start_req_22:
+    s_n_llhttp__internal__n_after_start_req_22: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_22;
+        return s_n_llhttp__internal__n_after_start_req_22;
       }
       switch (*p) {
         case '-': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_23;
+          goto s_n_llhttp__internal__n_after_start_req_23;
         }
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_24;
+          goto s_n_llhttp__internal__n_after_start_req_24;
         }
         case 'K': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_25;
+          goto s_n_llhttp__internal__n_after_start_req_25;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_30;
+          goto s_n_llhttp__internal__n_after_start_req_30;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_31:
-    s_n_llhttp__internal__n_start_req_31: {
+    case s_n_llhttp__internal__n_after_start_req_31:
+    s_n_llhttp__internal__n_after_start_req_31: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_31;
+        return s_n_llhttp__internal__n_after_start_req_31;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob35, 5);
       p = match_seq.current;
@@ -4229,21 +4785,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_31;
+          return s_n_llhttp__internal__n_after_start_req_31;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_32:
-    s_n_llhttp__internal__n_start_req_32: {
+    case s_n_llhttp__internal__n_after_start_req_32:
+    s_n_llhttp__internal__n_after_start_req_32: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_32;
+        return s_n_llhttp__internal__n_after_start_req_32;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob36, 6);
       p = match_seq.current;
@@ -4254,21 +4810,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_32;
+          return s_n_llhttp__internal__n_after_start_req_32;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_35:
-    s_n_llhttp__internal__n_start_req_35: {
+    case s_n_llhttp__internal__n_after_start_req_35:
+    s_n_llhttp__internal__n_after_start_req_35: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_35;
+        return s_n_llhttp__internal__n_after_start_req_35;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob37, 2);
       p = match_seq.current;
@@ -4279,21 +4835,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_35;
+          return s_n_llhttp__internal__n_after_start_req_35;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_36:
-    s_n_llhttp__internal__n_start_req_36: {
+    case s_n_llhttp__internal__n_after_start_req_36:
+    s_n_llhttp__internal__n_after_start_req_36: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_36;
+        return s_n_llhttp__internal__n_after_start_req_36;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob38, 2);
       p = match_seq.current;
@@ -4304,42 +4860,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_36;
+          return s_n_llhttp__internal__n_after_start_req_36;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_34:
-    s_n_llhttp__internal__n_start_req_34: {
+    case s_n_llhttp__internal__n_after_start_req_34:
+    s_n_llhttp__internal__n_after_start_req_34: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_34;
+        return s_n_llhttp__internal__n_after_start_req_34;
       }
       switch (*p) {
         case 'T': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_35;
+          goto s_n_llhttp__internal__n_after_start_req_35;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_36;
+          goto s_n_llhttp__internal__n_after_start_req_36;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_37:
-    s_n_llhttp__internal__n_start_req_37: {
+    case s_n_llhttp__internal__n_after_start_req_37:
+    s_n_llhttp__internal__n_after_start_req_37: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_37;
+        return s_n_llhttp__internal__n_after_start_req_37;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob39, 2);
       p = match_seq.current;
@@ -4350,21 +4906,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_37;
+          return s_n_llhttp__internal__n_after_start_req_37;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_38:
-    s_n_llhttp__internal__n_start_req_38: {
+    case s_n_llhttp__internal__n_after_start_req_38:
+    s_n_llhttp__internal__n_after_start_req_38: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_38;
+        return s_n_llhttp__internal__n_after_start_req_38;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob40, 2);
       p = match_seq.current;
@@ -4375,21 +4931,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_38;
+          return s_n_llhttp__internal__n_after_start_req_38;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_42:
-    s_n_llhttp__internal__n_start_req_42: {
+    case s_n_llhttp__internal__n_after_start_req_42:
+    s_n_llhttp__internal__n_after_start_req_42: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_42;
+        return s_n_llhttp__internal__n_after_start_req_42;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob41, 3);
       p = match_seq.current;
@@ -4400,21 +4956,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_42;
+          return s_n_llhttp__internal__n_after_start_req_42;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_43:
-    s_n_llhttp__internal__n_start_req_43: {
+    case s_n_llhttp__internal__n_after_start_req_43:
+    s_n_llhttp__internal__n_after_start_req_43: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_43;
+        return s_n_llhttp__internal__n_after_start_req_43;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob42, 4);
       p = match_seq.current;
@@ -4425,57 +4981,57 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_43;
+          return s_n_llhttp__internal__n_after_start_req_43;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_41:
-    s_n_llhttp__internal__n_start_req_41: {
+    case s_n_llhttp__internal__n_after_start_req_41:
+    s_n_llhttp__internal__n_after_start_req_41: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_41;
+        return s_n_llhttp__internal__n_after_start_req_41;
       }
       switch (*p) {
         case 'F': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_42;
+          goto s_n_llhttp__internal__n_after_start_req_42;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_43;
+          goto s_n_llhttp__internal__n_after_start_req_43;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_40:
-    s_n_llhttp__internal__n_start_req_40: {
+    case s_n_llhttp__internal__n_after_start_req_40:
+    s_n_llhttp__internal__n_after_start_req_40: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_40;
+        return s_n_llhttp__internal__n_after_start_req_40;
       }
       switch (*p) {
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_41;
+          goto s_n_llhttp__internal__n_after_start_req_41;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_39:
-    s_n_llhttp__internal__n_start_req_39: {
+    case s_n_llhttp__internal__n_after_start_req_39:
+    s_n_llhttp__internal__n_after_start_req_39: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_39;
+        return s_n_llhttp__internal__n_after_start_req_39;
       }
       switch (*p) {
         case 'I': {
@@ -4485,21 +5041,21 @@
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_40;
+          goto s_n_llhttp__internal__n_after_start_req_40;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_45:
-    s_n_llhttp__internal__n_start_req_45: {
+    case s_n_llhttp__internal__n_after_start_req_45:
+    s_n_llhttp__internal__n_after_start_req_45: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_45;
+        return s_n_llhttp__internal__n_after_start_req_45;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob43, 2);
       p = match_seq.current;
@@ -4510,24 +5066,24 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_45;
+          return s_n_llhttp__internal__n_after_start_req_45;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_44:
-    s_n_llhttp__internal__n_start_req_44: {
+    case s_n_llhttp__internal__n_after_start_req_44:
+    s_n_llhttp__internal__n_after_start_req_44: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_44;
+        return s_n_llhttp__internal__n_after_start_req_44;
       }
       switch (*p) {
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_45;
+          goto s_n_llhttp__internal__n_after_start_req_45;
         }
         case 'T': {
           p++;
@@ -4535,51 +5091,51 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_33:
-    s_n_llhttp__internal__n_start_req_33: {
+    case s_n_llhttp__internal__n_after_start_req_33:
+    s_n_llhttp__internal__n_after_start_req_33: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_33;
+        return s_n_llhttp__internal__n_after_start_req_33;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_34;
+          goto s_n_llhttp__internal__n_after_start_req_34;
         }
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_37;
+          goto s_n_llhttp__internal__n_after_start_req_37;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_38;
+          goto s_n_llhttp__internal__n_after_start_req_38;
         }
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_39;
+          goto s_n_llhttp__internal__n_after_start_req_39;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_44;
+          goto s_n_llhttp__internal__n_after_start_req_44;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_48:
-    s_n_llhttp__internal__n_start_req_48: {
+    case s_n_llhttp__internal__n_after_start_req_48:
+    s_n_llhttp__internal__n_after_start_req_48: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_48;
+        return s_n_llhttp__internal__n_after_start_req_48;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob44, 3);
       p = match_seq.current;
@@ -4590,21 +5146,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_48;
+          return s_n_llhttp__internal__n_after_start_req_48;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_49:
-    s_n_llhttp__internal__n_start_req_49: {
+    case s_n_llhttp__internal__n_after_start_req_49:
+    s_n_llhttp__internal__n_after_start_req_49: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_49;
+        return s_n_llhttp__internal__n_after_start_req_49;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob45, 3);
       p = match_seq.current;
@@ -4615,21 +5171,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_49;
+          return s_n_llhttp__internal__n_after_start_req_49;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_50:
-    s_n_llhttp__internal__n_start_req_50: {
+    case s_n_llhttp__internal__n_after_start_req_50:
+    s_n_llhttp__internal__n_after_start_req_50: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_50;
+        return s_n_llhttp__internal__n_after_start_req_50;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob46, 5);
       p = match_seq.current;
@@ -4640,21 +5196,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_50;
+          return s_n_llhttp__internal__n_after_start_req_50;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_51:
-    s_n_llhttp__internal__n_start_req_51: {
+    case s_n_llhttp__internal__n_after_start_req_51:
+    s_n_llhttp__internal__n_after_start_req_51: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_51;
+        return s_n_llhttp__internal__n_after_start_req_51;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob47, 3);
       p = match_seq.current;
@@ -4665,67 +5221,67 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_51;
+          return s_n_llhttp__internal__n_after_start_req_51;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_47:
-    s_n_llhttp__internal__n_start_req_47: {
+    case s_n_llhttp__internal__n_after_start_req_47:
+    s_n_llhttp__internal__n_after_start_req_47: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_47;
+        return s_n_llhttp__internal__n_after_start_req_47;
       }
       switch (*p) {
         case 'B': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_48;
+          goto s_n_llhttp__internal__n_after_start_req_48;
         }
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_49;
+          goto s_n_llhttp__internal__n_after_start_req_49;
         }
         case 'D': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_50;
+          goto s_n_llhttp__internal__n_after_start_req_50;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_51;
+          goto s_n_llhttp__internal__n_after_start_req_51;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_46:
-    s_n_llhttp__internal__n_start_req_46: {
+    case s_n_llhttp__internal__n_after_start_req_46:
+    s_n_llhttp__internal__n_after_start_req_46: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_46;
+        return s_n_llhttp__internal__n_after_start_req_46;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_47;
+          goto s_n_llhttp__internal__n_after_start_req_47;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_54:
-    s_n_llhttp__internal__n_start_req_54: {
+    case s_n_llhttp__internal__n_after_start_req_54:
+    s_n_llhttp__internal__n_after_start_req_54: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_54;
+        return s_n_llhttp__internal__n_after_start_req_54;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob48, 3);
       p = match_seq.current;
@@ -4736,19 +5292,19 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_54;
+          return s_n_llhttp__internal__n_after_start_req_54;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_56:
-    s_n_llhttp__internal__n_start_req_56: {
+    case s_n_llhttp__internal__n_after_start_req_56:
+    s_n_llhttp__internal__n_after_start_req_56: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_56;
+        return s_n_llhttp__internal__n_after_start_req_56;
       }
       switch (*p) {
         case 'P': {
@@ -4757,18 +5313,18 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_57:
-    s_n_llhttp__internal__n_start_req_57: {
+    case s_n_llhttp__internal__n_after_start_req_57:
+    s_n_llhttp__internal__n_after_start_req_57: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_57;
+        return s_n_llhttp__internal__n_after_start_req_57;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob49, 9);
       p = match_seq.current;
@@ -4779,63 +5335,63 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_57;
+          return s_n_llhttp__internal__n_after_start_req_57;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_55:
-    s_n_llhttp__internal__n_start_req_55: {
+    case s_n_llhttp__internal__n_after_start_req_55:
+    s_n_llhttp__internal__n_after_start_req_55: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_55;
+        return s_n_llhttp__internal__n_after_start_req_55;
       }
       switch (*p) {
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_56;
+          goto s_n_llhttp__internal__n_after_start_req_56;
         }
         case '_': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_57;
+          goto s_n_llhttp__internal__n_after_start_req_57;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_53:
-    s_n_llhttp__internal__n_start_req_53: {
+    case s_n_llhttp__internal__n_after_start_req_53:
+    s_n_llhttp__internal__n_after_start_req_53: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_53;
+        return s_n_llhttp__internal__n_after_start_req_53;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_54;
+          goto s_n_llhttp__internal__n_after_start_req_54;
         }
         case 'T': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_55;
+          goto s_n_llhttp__internal__n_after_start_req_55;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_58:
-    s_n_llhttp__internal__n_start_req_58: {
+    case s_n_llhttp__internal__n_after_start_req_58:
+    s_n_llhttp__internal__n_after_start_req_58: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_58;
+        return s_n_llhttp__internal__n_after_start_req_58;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob50, 4);
       p = match_seq.current;
@@ -4846,21 +5402,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_58;
+          return s_n_llhttp__internal__n_after_start_req_58;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_59:
-    s_n_llhttp__internal__n_start_req_59: {
+    case s_n_llhttp__internal__n_after_start_req_59:
+    s_n_llhttp__internal__n_after_start_req_59: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_59;
+        return s_n_llhttp__internal__n_after_start_req_59;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob51, 7);
       p = match_seq.current;
@@ -4871,46 +5427,46 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_59;
+          return s_n_llhttp__internal__n_after_start_req_59;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_52:
-    s_n_llhttp__internal__n_start_req_52: {
+    case s_n_llhttp__internal__n_after_start_req_52:
+    s_n_llhttp__internal__n_after_start_req_52: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_52;
+        return s_n_llhttp__internal__n_after_start_req_52;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_53;
+          goto s_n_llhttp__internal__n_after_start_req_53;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_58;
+          goto s_n_llhttp__internal__n_after_start_req_58;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_59;
+          goto s_n_llhttp__internal__n_after_start_req_59;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_61:
-    s_n_llhttp__internal__n_start_req_61: {
+    case s_n_llhttp__internal__n_after_start_req_61:
+    s_n_llhttp__internal__n_after_start_req_61: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_61;
+        return s_n_llhttp__internal__n_after_start_req_61;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob52, 6);
       p = match_seq.current;
@@ -4921,21 +5477,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_61;
+          return s_n_llhttp__internal__n_after_start_req_61;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_62:
-    s_n_llhttp__internal__n_start_req_62: {
+    case s_n_llhttp__internal__n_after_start_req_62:
+    s_n_llhttp__internal__n_after_start_req_62: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_62;
+        return s_n_llhttp__internal__n_after_start_req_62;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob53, 3);
       p = match_seq.current;
@@ -4946,42 +5502,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_62;
+          return s_n_llhttp__internal__n_after_start_req_62;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_60:
-    s_n_llhttp__internal__n_start_req_60: {
+    case s_n_llhttp__internal__n_after_start_req_60:
+    s_n_llhttp__internal__n_after_start_req_60: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_60;
+        return s_n_llhttp__internal__n_after_start_req_60;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_61;
+          goto s_n_llhttp__internal__n_after_start_req_61;
         }
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_62;
+          goto s_n_llhttp__internal__n_after_start_req_62;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_65:
-    s_n_llhttp__internal__n_start_req_65: {
+    case s_n_llhttp__internal__n_after_start_req_65:
+    s_n_llhttp__internal__n_after_start_req_65: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_65;
+        return s_n_llhttp__internal__n_after_start_req_65;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob54, 3);
       p = match_seq.current;
@@ -4992,21 +5548,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_65;
+          return s_n_llhttp__internal__n_after_start_req_65;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_67:
-    s_n_llhttp__internal__n_start_req_67: {
+    case s_n_llhttp__internal__n_after_start_req_67:
+    s_n_llhttp__internal__n_after_start_req_67: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_67;
+        return s_n_llhttp__internal__n_after_start_req_67;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob55, 2);
       p = match_seq.current;
@@ -5017,21 +5573,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_67;
+          return s_n_llhttp__internal__n_after_start_req_67;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_68:
-    s_n_llhttp__internal__n_start_req_68: {
+    case s_n_llhttp__internal__n_after_start_req_68:
+    s_n_llhttp__internal__n_after_start_req_68: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_68;
+        return s_n_llhttp__internal__n_after_start_req_68;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob56, 2);
       p = match_seq.current;
@@ -5042,42 +5598,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_68;
+          return s_n_llhttp__internal__n_after_start_req_68;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_66:
-    s_n_llhttp__internal__n_start_req_66: {
+    case s_n_llhttp__internal__n_after_start_req_66:
+    s_n_llhttp__internal__n_after_start_req_66: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_66;
+        return s_n_llhttp__internal__n_after_start_req_66;
       }
       switch (*p) {
         case 'I': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_67;
+          goto s_n_llhttp__internal__n_after_start_req_67;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_68;
+          goto s_n_llhttp__internal__n_after_start_req_68;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_69:
-    s_n_llhttp__internal__n_start_req_69: {
+    case s_n_llhttp__internal__n_after_start_req_69:
+    s_n_llhttp__internal__n_after_start_req_69: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_69;
+        return s_n_llhttp__internal__n_after_start_req_69;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob57, 8);
       p = match_seq.current;
@@ -5088,139 +5644,154 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_69;
+          return s_n_llhttp__internal__n_after_start_req_69;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_64:
-    s_n_llhttp__internal__n_start_req_64: {
+    case s_n_llhttp__internal__n_after_start_req_64:
+    s_n_llhttp__internal__n_after_start_req_64: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_64;
+        return s_n_llhttp__internal__n_after_start_req_64;
       }
       switch (*p) {
         case 'B': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_65;
+          goto s_n_llhttp__internal__n_after_start_req_65;
         }
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_66;
+          goto s_n_llhttp__internal__n_after_start_req_66;
         }
         case 'S': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_69;
+          goto s_n_llhttp__internal__n_after_start_req_69;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_63:
-    s_n_llhttp__internal__n_start_req_63: {
+    case s_n_llhttp__internal__n_after_start_req_63:
+    s_n_llhttp__internal__n_after_start_req_63: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_63;
+        return s_n_llhttp__internal__n_after_start_req_63;
       }
       switch (*p) {
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_64;
+          goto s_n_llhttp__internal__n_after_start_req_64;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req:
-    s_n_llhttp__internal__n_start_req: {
+    case s_n_llhttp__internal__n_after_start_req:
+    s_n_llhttp__internal__n_after_start_req: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req;
+        return s_n_llhttp__internal__n_after_start_req;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_1;
+          goto s_n_llhttp__internal__n_after_start_req_1;
         }
         case 'B': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_4;
+          goto s_n_llhttp__internal__n_after_start_req_4;
         }
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_5;
+          goto s_n_llhttp__internal__n_after_start_req_5;
         }
         case 'D': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_10;
+          goto s_n_llhttp__internal__n_after_start_req_10;
         }
         case 'F': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_14;
+          goto s_n_llhttp__internal__n_after_start_req_14;
         }
         case 'G': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_15;
+          goto s_n_llhttp__internal__n_after_start_req_15;
         }
         case 'H': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_18;
+          goto s_n_llhttp__internal__n_after_start_req_18;
         }
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_19;
+          goto s_n_llhttp__internal__n_after_start_req_19;
         }
         case 'M': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_22;
+          goto s_n_llhttp__internal__n_after_start_req_22;
         }
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_31;
+          goto s_n_llhttp__internal__n_after_start_req_31;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_32;
+          goto s_n_llhttp__internal__n_after_start_req_32;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_33;
+          goto s_n_llhttp__internal__n_after_start_req_33;
         }
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_46;
+          goto s_n_llhttp__internal__n_after_start_req_46;
         }
         case 'S': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_52;
+          goto s_n_llhttp__internal__n_after_start_req_52;
         }
         case 'T': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_60;
+          goto s_n_llhttp__internal__n_after_start_req_60;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_63;
+          goto s_n_llhttp__internal__n_after_start_req_63;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_56;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_method_1:
+    s_n_llhttp__internal__n_span_start_llhttp__on_method_1: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_method_1;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_method;
+      goto s_n_llhttp__internal__n_after_start_req;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_invoke_llhttp__on_status_complete:
     s_n_llhttp__internal__n_invoke_llhttp__on_status_complete: {
       switch (llhttp__on_status_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_headers_start;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_20;
         default:
-          goto s_n_llhttp__internal__n_header_field_start;
+          goto s_n_llhttp__internal__n_error_74;
       }
       /* UNREACHABLE */;
       abort();
@@ -5236,7 +5807,7 @@
           goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_75;
         }
       }
       /* UNREACHABLE */;
@@ -5311,16 +5882,142 @@
           goto s_n_llhttp__internal__n_res_status_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_50;
+          goto s_n_llhttp__internal__n_error_76;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_res_status_code:
-    s_n_llhttp__internal__n_res_status_code: {
+    case s_n_llhttp__internal__n_res_status_code_digit_3:
+    s_n_llhttp__internal__n_res_status_code_digit_3: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_res_status_code;
+        return s_n_llhttp__internal__n_res_status_code_digit_3;
+      }
+      switch (*p) {
+        case '0': {
+          p++;
+          match = 0;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '1': {
+          p++;
+          match = 1;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '2': {
+          p++;
+          match = 2;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '3': {
+          p++;
+          match = 3;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '4': {
+          p++;
+          match = 4;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '5': {
+          p++;
+          match = 5;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '6': {
+          p++;
+          match = 6;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '7': {
+          p++;
+          match = 7;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '8': {
+          p++;
+          match = 8;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '9': {
+          p++;
+          match = 9;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_error_78;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_res_status_code_digit_2:
+    s_n_llhttp__internal__n_res_status_code_digit_2: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_res_status_code_digit_2;
+      }
+      switch (*p) {
+        case '0': {
+          p++;
+          match = 0;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '1': {
+          p++;
+          match = 1;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '2': {
+          p++;
+          match = 2;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '3': {
+          p++;
+          match = 3;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '4': {
+          p++;
+          match = 4;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '5': {
+          p++;
+          match = 5;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '6': {
+          p++;
+          match = 6;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '7': {
+          p++;
+          match = 7;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '8': {
+          p++;
+          match = 8;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '9': {
+          p++;
+          match = 9;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_error_80;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_res_status_code_digit_1:
+    s_n_llhttp__internal__n_res_status_code_digit_1: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_res_status_code_digit_1;
       }
       switch (*p) {
         case '0': {
@@ -5374,16 +6071,16 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_res_status_code_otherwise;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_res_http_end:
-    s_n_llhttp__internal__n_res_http_end: {
+    case s_n_llhttp__internal__n_res_after_version:
+    s_n_llhttp__internal__n_res_after_version: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_res_http_end;
+        return s_n_llhttp__internal__n_res_after_version;
       }
       switch (*p) {
         case ' ': {
@@ -5391,12 +6088,45 @@
           goto s_n_llhttp__internal__n_invoke_update_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_51;
+          goto s_n_llhttp__internal__n_error_83;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1: {
+      switch (llhttp__on_version_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_res_after_version;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_21;
+        default:
+          goto s_n_llhttp__internal__n_error_73;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_72:
+    s_n_llhttp__internal__n_error_72: {
+      state->error = 0x9;
+      state->reason = "Invalid HTTP version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_84:
+    s_n_llhttp__internal__n_error_84: {
+      state->error = 0x9;
+      state->reason = "Invalid minor version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_res_http_minor:
     s_n_llhttp__internal__n_res_http_minor: {
       if (p == endp) {
@@ -5454,12 +6184,22 @@
           goto s_n_llhttp__internal__n_invoke_store_http_minor_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_52;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_7;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_85:
+    s_n_llhttp__internal__n_error_85: {
+      state->error = 0x9;
+      state->reason = "Expected dot";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_res_http_dot:
     s_n_llhttp__internal__n_res_http_dot: {
       if (p == endp) {
@@ -5471,12 +6211,22 @@
           goto s_n_llhttp__internal__n_res_http_minor;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_53;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_8;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_86:
+    s_n_llhttp__internal__n_error_86: {
+      state->error = 0x9;
+      state->reason = "Invalid major version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_res_http_major:
     s_n_llhttp__internal__n_res_http_major: {
       if (p == endp) {
@@ -5534,12 +6284,23 @@
           goto s_n_llhttp__internal__n_invoke_store_http_major_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_54;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_9;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_version_1:
+    s_n_llhttp__internal__n_span_start_llhttp__on_version_1: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_version_1;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_version;
+      goto s_n_llhttp__internal__n_res_http_major;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_start_res:
     s_n_llhttp__internal__n_start_res: {
       llparse_match_t match_seq;
@@ -5552,18 +6313,31 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_res_http_major;
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_version_1;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_start_res;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_57;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_method_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_method_complete: {
+      switch (llhttp__on_method_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_req_first_space_before_url;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_19;
+        default:
+          goto s_n_llhttp__internal__n_error_1;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_or_res_method_2:
     s_n_llhttp__internal__n_req_or_res_method_2: {
       llparse_match_t match_seq;
@@ -5583,12 +6357,21 @@
           return s_n_llhttp__internal__n_req_or_res_method_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_55;
+          goto s_n_llhttp__internal__n_error_87;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_update_type_1:
+    s_n_llhttp__internal__n_invoke_update_type_1: {
+      switch (llhttp__internal__c_update_type_1(state, p, endp)) {
+        default:
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_version_1;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_or_res_method_3:
     s_n_llhttp__internal__n_req_or_res_method_3: {
       llparse_match_t match_seq;
@@ -5601,13 +6384,13 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_type_1;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_method_1;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_req_or_res_method_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_55;
+          goto s_n_llhttp__internal__n_error_87;
         }
       }
       /* UNREACHABLE */;
@@ -5628,7 +6411,7 @@
           goto s_n_llhttp__internal__n_req_or_res_method_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_55;
+          goto s_n_llhttp__internal__n_error_87;
         }
       }
       /* UNREACHABLE */;
@@ -5645,12 +6428,23 @@
           goto s_n_llhttp__internal__n_req_or_res_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_55;
+          goto s_n_llhttp__internal__n_error_87;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_method:
+    s_n_llhttp__internal__n_span_start_llhttp__on_method: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_method;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_method;
+      goto s_n_llhttp__internal__n_req_or_res_method;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_start_req_or_res:
     s_n_llhttp__internal__n_start_req_or_res: {
       if (p == endp) {
@@ -5658,7 +6452,7 @@
       }
       switch (*p) {
         case 'H': {
-          goto s_n_llhttp__internal__n_req_or_res_method;
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_method;
         }
         default: {
           goto s_n_llhttp__internal__n_invoke_update_type_2;
@@ -5671,7 +6465,7 @@
     s_n_llhttp__internal__n_invoke_load_type: {
       switch (llhttp__internal__c_load_type(state, p, endp)) {
         case 1:
-          goto s_n_llhttp__internal__n_start_req;
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_method_1;
         case 2:
           goto s_n_llhttp__internal__n_start_res;
         default:
@@ -5680,6 +6474,15 @@
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_update_finish:
+    s_n_llhttp__internal__n_invoke_update_finish: {
+      switch (llhttp__internal__c_update_finish(state, p, endp)) {
+        default:
+          goto s_n_llhttp__internal__n_invoke_llhttp__on_message_begin;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_start:
     s_n_llhttp__internal__n_start: {
       if (p == endp) {
@@ -5695,7 +6498,7 @@
           goto s_n_llhttp__internal__n_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_finish;
+          goto s_n_llhttp__internal__n_invoke_load_initial_message_completed;
         }
       }
       /* UNREACHABLE */;
@@ -5705,7 +6508,7 @@
       /* UNREACHABLE */
       abort();
   }
-  s_n_llhttp__internal__n_error_1: {
+  s_n_llhttp__internal__n_error_2: {
     state->error = 0x7;
     state->reason = "Invalid characters in url (strict mode)";
     state->error_pos = (const char*) p;
@@ -5714,7 +6517,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_43: {
+  s_n_llhttp__internal__n_error_67: {
     state->error = 0x7;
     state->reason = "Invalid characters in url";
     state->error_pos = (const char*) p;
@@ -5731,7 +6534,23 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_4: {
+  s_n_llhttp__internal__n_invoke_update_initial_message_completed: {
+    switch (llhttp__internal__c_update_initial_message_completed(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_invoke_update_finish_2;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_content_length: {
+    switch (llhttp__internal__c_update_content_length(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_invoke_update_initial_message_completed;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_7: {
     state->error = 0x5;
     state->reason = "Data after `Connection: close`";
     state->error_pos = (const char*) p;
@@ -5740,10 +6559,10 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags: {
-    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_1: {
+    switch (llhttp__internal__c_test_lenient_flags_1(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_invoke_update_finish_2;
+        goto s_n_llhttp__internal__n_invoke_update_initial_message_completed;
       default:
         goto s_n_llhttp__internal__n_closed;
     }
@@ -5753,12 +6572,12 @@
   s_n_llhttp__internal__n_invoke_update_finish_1: {
     switch (llhttp__internal__c_update_finish_1(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_1;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_5: {
+  s_n_llhttp__internal__n_pause_11: {
     state->error = 0x15;
     state->reason = "on_message_complete pause";
     state->error_pos = (const char*) p;
@@ -5767,7 +6586,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_13: {
+  s_n_llhttp__internal__n_error_28: {
     state->error = 0x12;
     state->reason = "`on_message_complete` callback error";
     state->error_pos = (const char*) p;
@@ -5776,7 +6595,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_7: {
+  s_n_llhttp__internal__n_pause_13: {
     state->error = 0x15;
     state->reason = "on_chunk_complete pause";
     state->error_pos = (const char*) p;
@@ -5785,7 +6604,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_16: {
+  s_n_llhttp__internal__n_error_31: {
     state->error = 0x14;
     state->reason = "`on_chunk_complete` callback error";
     state->error_pos = (const char*) p;
@@ -5799,14 +6618,14 @@
       case 0:
         goto s_n_llhttp__internal__n_invoke_llhttp__on_message_complete_2;
       case 21:
-        goto s_n_llhttp__internal__n_pause_7;
+        goto s_n_llhttp__internal__n_pause_13;
       default:
-        goto s_n_llhttp__internal__n_error_16;
+        goto s_n_llhttp__internal__n_error_31;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_15: {
+  s_n_llhttp__internal__n_error_30: {
     state->error = 0x4;
     state->reason = "Content-Length can't be present with Transfer-Encoding";
     state->error_pos = (const char*) p;
@@ -5824,7 +6643,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_5: {
+  s_n_llhttp__internal__n_error_8: {
     state->error = 0x12;
     state->reason = "`on_message_complete` callback error";
     state->error_pos = (const char*) p;
@@ -5840,12 +6659,12 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_2;
       default:
-        goto s_n_llhttp__internal__n_error_5;
+        goto s_n_llhttp__internal__n_error_8;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_11: {
+  s_n_llhttp__internal__n_error_26: {
     state->error = 0xc;
     state->reason = "Chunk size overflow";
     state->error_pos = (const char*) p;
@@ -5858,12 +6677,12 @@
     state->error = 0x15;
     state->reason = "on_chunk_complete pause";
     state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_content_length;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_content_length_1;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_7: {
+  s_n_llhttp__internal__n_error_10: {
     state->error = 0x14;
     state->reason = "`on_chunk_complete` callback error";
     state->error_pos = (const char*) p;
@@ -5875,16 +6694,16 @@
   s_n_llhttp__internal__n_invoke_llhttp__on_chunk_complete: {
     switch (llhttp__on_chunk_complete(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_invoke_update_content_length;
+        goto s_n_llhttp__internal__n_invoke_update_content_length_1;
       case 21:
         goto s_n_llhttp__internal__n_pause_3;
       default:
-        goto s_n_llhttp__internal__n_error_7;
+        goto s_n_llhttp__internal__n_error_10;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_8: {
+  s_n_llhttp__internal__n_error_11: {
     state->error = 0x2;
     state->reason = "Expected CRLF after chunk";
     state->error_pos = (const char*) p;
@@ -5927,7 +6746,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_6: {
+  s_n_llhttp__internal__n_error_9: {
     state->error = 0x13;
     state->reason = "`on_chunk_header` callback error";
     state->error_pos = (const char*) p;
@@ -5943,12 +6762,12 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_4;
       default:
-        goto s_n_llhttp__internal__n_error_6;
+        goto s_n_llhttp__internal__n_error_9;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_9: {
+  s_n_llhttp__internal__n_error_12: {
     state->error = 0x2;
     state->reason = "Expected LF after chunk size";
     state->error_pos = (const char*) p;
@@ -5957,7 +6776,315 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_10: {
+  s_n_llhttp__internal__n_error_13: {
+    state->error = 0x2;
+    state->reason = "Invalid character in chunk extensions";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_14: {
+    state->error = 0x2;
+    state->reason = "Invalid character in chunk extensions";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_5: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_name pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_almost_done;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_15: {
+    state->error = 0x22;
+    state->reason = "`on_chunk_extension_name` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_6: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_name pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_extensions;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_16: {
+    state->error = 0x22;
+    state->reason = "`on_chunk_extension_name` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_7: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_value pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_almost_done;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_18: {
+    state->error = 0x23;
+    state->reason = "`on_chunk_extension_value` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_20: {
+    state->error = 0x2;
+    state->reason = "Invalid character in chunk extensions quote value";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_8: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_value pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_extension_quoted_value_done;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_19: {
+    state->error = 0x23;
+    state->reason = "`on_chunk_extension_value` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_21;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_21;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_9: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_value pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_otherwise;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_22: {
+    state->error = 0x23;
+    state->reason = "`on_chunk_extension_value` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_3: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_4: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_23;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_23;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_10: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_name pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_extension_value;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_17: {
+    state->error = 0x22;
+    state->reason = "`on_chunk_extension_name` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_2: {
+    switch (llhttp__on_chunk_extension_name_complete(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_chunk_extension_value;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_10;
+      default:
+        goto s_n_llhttp__internal__n_error_17;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_3: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_24;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_24;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_25: {
     state->error = 0xc;
     state->reason = "Invalid character in chunk size";
     state->error_pos = (const char*) p;
@@ -5969,14 +7096,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_content_length: {
     switch (llhttp__internal__c_mul_add_content_length(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_11;
+        goto s_n_llhttp__internal__n_error_26;
       default:
         goto s_n_llhttp__internal__n_chunk_size;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_12: {
+  s_n_llhttp__internal__n_error_27: {
     state->error = 0xc;
     state->reason = "Invalid character in chunk size";
     state->error_pos = (const char*) p;
@@ -6010,7 +7137,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_14: {
+  s_n_llhttp__internal__n_error_29: {
     state->error = 0xf;
     state->reason = "Request has invalid `Transfer-Encoding`";
     state->error_pos = (const char*) p;
@@ -6028,7 +7155,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_3: {
+  s_n_llhttp__internal__n_error_6: {
     state->error = 0x12;
     state->reason = "`on_message_complete` callback error";
     state->error_pos = (const char*) p;
@@ -6044,7 +7171,7 @@
       case 21:
         goto s_n_llhttp__internal__n_pause;
       default:
-        goto s_n_llhttp__internal__n_error_3;
+        goto s_n_llhttp__internal__n_error_6;
     }
     /* UNREACHABLE */;
     abort();
@@ -6073,7 +7200,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_6: {
+  s_n_llhttp__internal__n_pause_12: {
     state->error = 0x15;
     state->reason = "Paused by on_headers_complete";
     state->error_pos = (const char*) p;
@@ -6082,7 +7209,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_2: {
+  s_n_llhttp__internal__n_error_5: {
     state->error = 0x11;
     state->reason = "User callback error";
     state->error_pos = (const char*) p;
@@ -6100,9 +7227,9 @@
       case 2:
         goto s_n_llhttp__internal__n_invoke_update_upgrade;
       case 21:
-        goto s_n_llhttp__internal__n_pause_6;
+        goto s_n_llhttp__internal__n_pause_12;
       default:
-        goto s_n_llhttp__internal__n_error_2;
+        goto s_n_llhttp__internal__n_error_5;
     }
     /* UNREACHABLE */;
     abort();
@@ -6115,10 +7242,10 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_1: {
-    switch (llhttp__internal__c_test_lenient_flags_1(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_2: {
+    switch (llhttp__internal__c_test_lenient_flags_2(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_error_15;
+        goto s_n_llhttp__internal__n_error_30;
       default:
         goto s_n_llhttp__internal__n_invoke_llhttp__before_headers_complete;
     }
@@ -6128,7 +7255,7 @@
   s_n_llhttp__internal__n_invoke_test_flags_1: {
     switch (llhttp__internal__c_test_flags_1(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_1;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_2;
       default:
         goto s_n_llhttp__internal__n_invoke_llhttp__before_headers_complete;
     }
@@ -6145,7 +7272,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_17: {
+  s_n_llhttp__internal__n_error_32: {
     state->error = 0x2;
     state->reason = "Expected LF after headers";
     state->error_pos = (const char*) p;
@@ -6154,7 +7281,35 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_18: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_field: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_field(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_33;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_33;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_3: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_field_colon_discard_ws;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_37: {
     state->error = 0xb;
     state->reason = "Empty Content-Length";
     state->error_pos = (const char*) p;
@@ -6163,6 +7318,24 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_pause_14: {
+    state->error = 0x15;
+    state->reason = "on_header_value_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_field_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_36: {
+    state->error = 0x1d;
+    state->reason = "`on_header_value_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_span_end_llhttp__on_header_value: {
     const unsigned char* start;
     int err;
@@ -6239,14 +7412,33 @@
   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_18;
+        goto s_n_llhttp__internal__n_error_37;
       default:
         goto s_n_llhttp__internal__n_invoke_load_header_state_1;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_19: {
+  s_n_llhttp__internal__n_error_35: {
+    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_4: {
+    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_35;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_38: {
     state->error = 0x2;
     state->reason = "Expected LF after CR";
     state->error_pos = (const char*) p;
@@ -6256,6 +7448,24 @@
     abort();
   }
   s_n_llhttp__internal__n_invoke_update_header_state_1: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_header_state_3: {
+    switch (llhttp__internal__c_load_header_state(state, p, endp)) {
+      case 8:
+        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+      default:
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_header_state_2: {
     switch (llhttp__internal__c_update_header_state(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete;
@@ -6266,7 +7476,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_7: {
     switch (llhttp__internal__c_or_flags_3(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_2;
     }
     /* UNREACHABLE */;
     abort();
@@ -6274,7 +7484,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_8: {
     switch (llhttp__internal__c_or_flags_4(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_2;
     }
     /* UNREACHABLE */;
     abort();
@@ -6282,7 +7492,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_9: {
     switch (llhttp__internal__c_or_flags_5(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_2;
     }
     /* UNREACHABLE */;
     abort();
@@ -6295,7 +7505,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_load_header_state_3: {
+  s_n_llhttp__internal__n_invoke_load_header_state_4: {
     switch (llhttp__internal__c_load_header_state(state, p, endp)) {
       case 5:
         goto s_n_llhttp__internal__n_invoke_or_flags_7;
@@ -6311,7 +7521,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_20: {
+  s_n_llhttp__internal__n_error_39: {
     state->error = 0x3;
     state->reason = "Missing expected LF after header value";
     state->error_pos = (const char*) p;
@@ -6329,15 +7539,16 @@
     err = llhttp__on_header_value(state, start, p);
     if (err != 0) {
       state->error = err;
-      state->error_pos = (const char*) p;
+      state->error_pos = (const char*) (p + 1);
       state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_value_almost_done;
       return s_error;
     }
+    p++;
     goto s_n_llhttp__internal__n_header_value_almost_done;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3: {
     const unsigned char* start;
     int err;
     
@@ -6346,16 +7557,15 @@
     err = llhttp__on_header_value(state, start, p);
     if (err != 0) {
       state->error = err;
-      state->error_pos = (const char*) (p + 1);
+      state->error_pos = (const char*) p;
       state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_value_almost_done;
       return s_error;
     }
-    p++;
     goto s_n_llhttp__internal__n_header_value_almost_done;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4: {
     const unsigned char* start;
     int err;
     
@@ -6373,26 +7583,34 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_21: {
-    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;
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_40;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_40;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_2: {
-    switch (llhttp__internal__c_test_lenient_flags_2(state, p, endp)) {
+  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_lenient;
       default:
-        goto s_n_llhttp__internal__n_error_21;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_3: {
+  s_n_llhttp__internal__n_invoke_update_header_state_4: {
     switch (llhttp__internal__c_update_header_state(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection;
@@ -6403,7 +7621,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_11: {
     switch (llhttp__internal__c_or_flags_3(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_3;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_4;
     }
     /* UNREACHABLE */;
     abort();
@@ -6411,7 +7629,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_12: {
     switch (llhttp__internal__c_or_flags_4(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_3;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_4;
     }
     /* UNREACHABLE */;
     abort();
@@ -6419,7 +7637,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_13: {
     switch (llhttp__internal__c_or_flags_5(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_3;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_4;
     }
     /* UNREACHABLE */;
     abort();
@@ -6432,7 +7650,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_load_header_state_4: {
+  s_n_llhttp__internal__n_invoke_load_header_state_5: {
     switch (llhttp__internal__c_load_header_state(state, p, endp)) {
       case 5:
         goto s_n_llhttp__internal__n_invoke_or_flags_11;
@@ -6448,39 +7666,39 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_4: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_5: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_token;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_2: {
-    switch (llhttp__internal__c_update_header_state_2(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_3: {
+    switch (llhttp__internal__c_update_header_state_3(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_ws;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_5: {
-    switch (llhttp__internal__c_update_header_state_5(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_6: {
+    switch (llhttp__internal__c_update_header_state_6(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_ws;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_6: {
-    switch (llhttp__internal__c_update_header_state_6(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_7: {
+    switch (llhttp__internal__c_update_header_state_7(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_ws;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5: {
     const unsigned char* start;
     int err;
     
@@ -6490,17 +7708,17 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_23;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_42;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_23;
+    goto s_n_llhttp__internal__n_error_42;
     /* UNREACHABLE */;
     abort();
   }
   s_n_llhttp__internal__n_invoke_mul_add_content_length_1: {
     switch (llhttp__internal__c_mul_add_content_length_1(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5;
       default:
         goto s_n_llhttp__internal__n_header_value_content_length;
     }
@@ -6515,7 +7733,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_6: {
     const unsigned char* start;
     int err;
     
@@ -6525,14 +7743,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_24;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_43;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_24;
+    goto s_n_llhttp__internal__n_error_43;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_22: {
+  s_n_llhttp__internal__n_error_41: {
     state->error = 0x4;
     state->reason = "Duplicate Content-Length";
     state->error_pos = (const char*) p;
@@ -6546,21 +7764,77 @@
       case 0:
         goto s_n_llhttp__internal__n_header_value_content_length;
       default:
-        goto s_n_llhttp__internal__n_error_22;
+        goto s_n_llhttp__internal__n_error_41;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_7: {
-    switch (llhttp__internal__c_update_header_state_7(state, p, endp)) {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_8: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_value(state, start, p);
+    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;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_45;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_header_state_8: {
+    switch (llhttp__internal__c_update_header_state_8(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_otherwise;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_8: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_7: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_value(state, start, p);
+    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;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_44;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_6: {
+    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_7;
+      default:
+        goto s_n_llhttp__internal__n_header_value_te_chunked;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  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;
+      default:
+        goto s_n_llhttp__internal__n_header_value_te_chunked;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_header_state_9: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value;
     }
@@ -6575,6 +7849,34 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_invoke_or_flags_17: {
+    switch (llhttp__internal__c_or_flags_16(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_invoke_and_flags;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_7: {
+    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_8;
+      default:
+        goto s_n_llhttp__internal__n_invoke_or_flags_17;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  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;
+      default:
+        goto s_n_llhttp__internal__n_invoke_or_flags_17;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_or_flags_16: {
     switch (llhttp__internal__c_or_flags_16(state, p, endp)) {
       default:
@@ -6583,10 +7885,20 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_or_flags_17: {
-    switch (llhttp__internal__c_or_flags_17(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_flags_3: {
+    switch (llhttp__internal__c_test_flags_3(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_load_type_2;
+      default:
+        goto s_n_llhttp__internal__n_invoke_or_flags_16;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_or_flags_18: {
+    switch (llhttp__internal__c_or_flags_18(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_8;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_9;
     }
     /* UNREACHABLE */;
     abort();
@@ -6598,16 +7910,34 @@
       case 2:
         goto s_n_llhttp__internal__n_invoke_test_flags_2;
       case 3:
-        goto s_n_llhttp__internal__n_invoke_or_flags_16;
+        goto s_n_llhttp__internal__n_invoke_test_flags_3;
       case 4:
-        goto s_n_llhttp__internal__n_invoke_or_flags_17;
+        goto s_n_llhttp__internal__n_invoke_or_flags_18;
       default:
         goto s_n_llhttp__internal__n_header_value;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_field: {
+  s_n_llhttp__internal__n_pause_15: {
+    state->error = 0x15;
+    state->reason = "on_header_field_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_value_discard_ws;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_34: {
+    state->error = 0x1c;
+    state->reason = "`on_header_field_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1: {
     const unsigned char* start;
     int err;
     
@@ -6625,7 +7955,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2: {
     const unsigned char* start;
     int err;
     
@@ -6643,7 +7973,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_25: {
+  s_n_llhttp__internal__n_error_46: {
     state->error = 0xa;
     state->reason = "Invalid header token";
     state->error_pos = (const char*) p;
@@ -6652,8 +7982,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_9: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_10: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_field_general;
     }
@@ -6668,18 +7998,59 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_10: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_11: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_field_general;
     }
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_error_4: {
+    state->error = 0x1e;
+    state->reason = "Unexpected space after start line";
+    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: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_field_start;
+      default:
+        goto s_n_llhttp__internal__n_error_4;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_16: {
+    state->error = 0x15;
+    state->reason = "on_url_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_headers_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_3: {
+    state->error = 0x1a;
+    state->reason = "`on_url_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_llhttp__on_url_complete: {
     switch (llhttp__on_url_complete(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_headers_start;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_16;
       default:
-        goto s_n_llhttp__internal__n_header_field_start;
+        goto s_n_llhttp__internal__n_error_3;
     }
     /* UNREACHABLE */;
     abort();
@@ -6717,7 +8088,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_26: {
+  s_n_llhttp__internal__n_error_47: {
     state->error = 0x7;
     state->reason = "Expected CRLF";
     state->error_pos = (const char*) p;
@@ -6743,7 +8114,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_29: {
+  s_n_llhttp__internal__n_error_53: {
     state->error = 0x17;
     state->reason = "Pause on PRI/Upgrade";
     state->error_pos = (const char*) p;
@@ -6752,7 +8123,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_30: {
+  s_n_llhttp__internal__n_error_54: {
     state->error = 0x9;
     state->reason = "Expected HTTP/2 Connection Preface";
     state->error_pos = (const char*) p;
@@ -6761,7 +8132,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_28: {
+  s_n_llhttp__internal__n_error_52: {
     state->error = 0x9;
     state->reason = "Expected CRLF after version";
     state->error_pos = (const char*) p;
@@ -6770,12 +8141,110 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_load_method_1: {
-    switch (llhttp__internal__c_load_method(state, p, endp)) {
-      case 34:
-        goto s_n_llhttp__internal__n_req_pri_upgrade;
+  s_n_llhttp__internal__n_pause_17: {
+    state->error = 0x15;
+    state->reason = "on_version_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_load_method_1;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_51: {
+    state->error = 0x21;
+    state->reason = "`on_version_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_version_complete;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_version_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_50;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_50;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 9:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_1: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_2: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_major: {
+    switch (llhttp__internal__c_load_http_major(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor;
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_1;
+      case 2:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_2;
       default:
-        goto s_n_llhttp__internal__n_req_http_complete;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_8: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_invoke_load_http_major;
     }
     /* UNREACHABLE */;
     abort();
@@ -6783,26 +8252,42 @@
   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_load_method_1;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_8;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_31: {
-    state->error = 0x9;
-    state->reason = "Invalid minor version";
-    state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_error;
-    return s_error;
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_55;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_55;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_32: {
-    state->error = 0x9;
-    state->reason = "Expected dot";
-    state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_error;
-    return s_error;
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_3: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_56;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_56;
     /* UNREACHABLE */;
     abort();
   }
@@ -6814,16 +8299,24 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_33: {
-    state->error = 0x9;
-    state->reason = "Invalid major version";
-    state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_error;
-    return s_error;
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_4: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_57;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_57;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_27: {
+  s_n_llhttp__internal__n_error_49: {
     state->error = 0x8;
     state->reason = "Invalid method for HTTP/x.x request";
     state->error_pos = (const char*) p;
@@ -6835,82 +8328,82 @@
   s_n_llhttp__internal__n_invoke_load_method: {
     switch (llhttp__internal__c_load_method(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 1:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 2:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 3:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 4:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 5:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 6:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 7:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 8:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 9:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 10:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 11:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 12:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 13:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 14:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 15:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 16:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 17:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 18:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 19:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 20:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 21:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 22:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 23:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 24:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 25:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 26:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 27:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 28:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 29:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 30:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 31:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 32:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 33:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 34:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_27;
+        goto s_n_llhttp__internal__n_error_49;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_36: {
+  s_n_llhttp__internal__n_error_60: {
     state->error = 0x8;
     state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
@@ -6919,7 +8412,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_34: {
+  s_n_llhttp__internal__n_error_58: {
     state->error = 0x8;
     state->reason = "Expected SOURCE method for ICE/x.x request";
     state->error_pos = (const char*) p;
@@ -6931,14 +8424,14 @@
   s_n_llhttp__internal__n_invoke_load_method_2: {
     switch (llhttp__internal__c_load_method(state, p, endp)) {
       case 33:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_34;
+        goto s_n_llhttp__internal__n_error_58;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_35: {
+  s_n_llhttp__internal__n_error_59: {
     state->error = 0x8;
     state->reason = "Invalid method for RTSP/x.x request";
     state->error_pos = (const char*) p;
@@ -6950,43 +8443,65 @@
   s_n_llhttp__internal__n_invoke_load_method_3: {
     switch (llhttp__internal__c_load_method(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 3:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 6:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 35:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 36:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 37:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 38:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 39:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 40:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 41:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 42:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 43:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 44:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 45:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_35;
+        goto s_n_llhttp__internal__n_error_59;
     }
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_pause_18: {
+    state->error = 0x15;
+    state->reason = "on_url_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_req_http_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_48: {
+    state->error = 0x1a;
+    state->reason = "`on_url_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_llhttp__on_url_complete_1: {
     switch (llhttp__on_url_complete(state, p, endp)) {
-      default:
+      case 0:
         goto s_n_llhttp__internal__n_req_http_start;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_18;
+      default:
+        goto s_n_llhttp__internal__n_error_48;
     }
     /* UNREACHABLE */;
     abort();
@@ -7059,7 +8574,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_37: {
+  s_n_llhttp__internal__n_error_61: {
     state->error = 0x7;
     state->reason = "Invalid char in url fragment start";
     state->error_pos = (const char*) p;
@@ -7119,7 +8634,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_38: {
+  s_n_llhttp__internal__n_error_62: {
     state->error = 0x7;
     state->reason = "Invalid char in url query";
     state->error_pos = (const char*) p;
@@ -7128,7 +8643,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_39: {
+  s_n_llhttp__internal__n_error_63: {
     state->error = 0x7;
     state->reason = "Invalid char in url path";
     state->error_pos = (const char*) p;
@@ -7239,7 +8754,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_40: {
+  s_n_llhttp__internal__n_error_64: {
     state->error = 0x7;
     state->reason = "Double @ in url";
     state->error_pos = (const char*) p;
@@ -7248,7 +8763,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_41: {
+  s_n_llhttp__internal__n_error_65: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -7257,7 +8772,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_42: {
+  s_n_llhttp__internal__n_error_66: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -7266,7 +8781,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_44: {
+  s_n_llhttp__internal__n_error_68: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -7275,7 +8790,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_45: {
+  s_n_llhttp__internal__n_error_69: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -7284,7 +8799,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_46: {
+  s_n_llhttp__internal__n_error_70: {
     state->error = 0x7;
     state->reason = "Unexpected start char in url";
     state->error_pos = (const char*) p;
@@ -7303,7 +8818,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_47: {
+  s_n_llhttp__internal__n_error_71: {
     state->error = 0x6;
     state->reason = "Expected space after method";
     state->error_pos = (const char*) p;
@@ -7312,15 +8827,50 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_pause_22: {
+    state->error = 0x15;
+    state->reason = "on_method_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_req_first_space_before_url;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_88: {
+    state->error = 0x20;
+    state->reason = "`on_method_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_method_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_method(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_store_method_1: {
     switch (llhttp__internal__c_store_method(state, p, endp, match)) {
       default:
-        goto s_n_llhttp__internal__n_req_first_space_before_url;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_method_2;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_56: {
+  s_n_llhttp__internal__n_error_89: {
     state->error = 0x6;
     state->reason = "Invalid method encountered";
     state->error_pos = (const char*) p;
@@ -7329,26 +8879,52 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_48: {
+  s_n_llhttp__internal__n_error_81: {
     state->error = 0xd;
-    state->reason = "Response overflow";
+    state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  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_48;
-      default:
-        goto s_n_llhttp__internal__n_res_status_code;
-    }
+  s_n_llhttp__internal__n_error_79: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_49: {
+  s_n_llhttp__internal__n_error_77: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_20: {
+    state->error = 0x15;
+    state->reason = "on_status_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_headers_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_74: {
+    state->error = 0x1b;
+    state->reason = "`on_status_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_75: {
     state->error = 0x2;
     state->reason = "Expected LF after CR";
     state->error_pos = (const char*) p;
@@ -7393,7 +8969,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_50: {
+  s_n_llhttp__internal__n_error_76: {
     state->error = 0xd;
     state->reason = "Invalid response status";
     state->error_pos = (const char*) p;
@@ -7402,49 +8978,230 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_status_code: {
-    switch (llhttp__internal__c_update_status_code(state, p, endp)) {
+  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;
       default:
-        goto s_n_llhttp__internal__n_res_status_code;
+        goto s_n_llhttp__internal__n_res_status_code_otherwise;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_51: {
-    state->error = 0x9;
-    state->reason = "Expected space after version";
+  s_n_llhttp__internal__n_error_78: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_store_http_minor_1: {
-    switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) {
+  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;
       default:
-        goto s_n_llhttp__internal__n_res_http_end;
+        goto s_n_llhttp__internal__n_res_status_code_digit_3;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_52: {
-    state->error = 0x9;
-    state->reason = "Invalid minor version";
+  s_n_llhttp__internal__n_error_80: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_53: {
+  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;
+      default:
+        goto s_n_llhttp__internal__n_res_status_code_digit_2;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_82: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_status_code: {
+    switch (llhttp__internal__c_update_status_code(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_res_status_code_digit_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_83: {
     state->error = 0x9;
-    state->reason = "Expected dot";
+    state->reason = "Expected space after version";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_pause_21: {
+    state->error = 0x15;
+    state->reason = "on_version_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_res_after_version;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_73: {
+    state->error = 0x21;
+    state->reason = "`on_version_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_6: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_5: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_72;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_72;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_3: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 9:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_4: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_5: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_major_1: {
+    switch (llhttp__internal__c_load_http_major(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_3;
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_4;
+      case 2:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_5;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_9: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_invoke_load_http_major_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  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;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_7: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_84;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_84;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_8: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_85;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_85;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_store_http_major_1: {
     switch (llhttp__internal__c_store_http_major(state, p, endp, match)) {
       default:
@@ -7453,28 +9210,71 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_54: {
-    state->error = 0x9;
-    state->reason = "Invalid major version";
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_9: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_86;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_86;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_90: {
+    state->error = 0x8;
+    state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_57: {
-    state->error = 0x8;
-    state->reason = "Expected HTTP/";
+  s_n_llhttp__internal__n_pause_19: {
+    state->error = 0x15;
+    state->reason = "on_method_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_req_first_space_before_url;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_1: {
+    state->error = 0x20;
+    state->reason = "`on_method_complete` callback error";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_span_end_llhttp__on_method: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_method(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_method_complete;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_method_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_update_type: {
     switch (llhttp__internal__c_update_type(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_req_first_space_before_url;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_method;
     }
     /* UNREACHABLE */;
     abort();
@@ -7487,7 +9287,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_55: {
+  s_n_llhttp__internal__n_error_87: {
     state->error = 0x8;
     state->reason = "Invalid word encountered";
     state->error_pos = (const char*) p;
@@ -7496,23 +9296,32 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_type_1: {
-    switch (llhttp__internal__c_update_type_1(state, p, endp)) {
-      default:
-        goto s_n_llhttp__internal__n_res_http_major;
+  s_n_llhttp__internal__n_span_end_llhttp__on_method_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_method(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_type_1;
+      return s_error;
     }
+    goto s_n_llhttp__internal__n_invoke_update_type_1;
     /* UNREACHABLE */;
     abort();
   }
   s_n_llhttp__internal__n_invoke_update_type_2: {
     switch (llhttp__internal__c_update_type(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_start_req;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_method_1;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_8: {
+  s_n_llhttp__internal__n_pause_23: {
     state->error = 0x15;
     state->reason = "on_message_begin pause";
     state->error_pos = (const char*) p;
@@ -7535,17 +9344,49 @@
       case 0:
         goto s_n_llhttp__internal__n_invoke_load_type;
       case 21:
-        goto s_n_llhttp__internal__n_pause_8;
+        goto s_n_llhttp__internal__n_pause_23;
       default:
         goto s_n_llhttp__internal__n_error;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_finish: {
-    switch (llhttp__internal__c_update_finish(state, p, endp)) {
+  s_n_llhttp__internal__n_pause_24: {
+    state->error = 0x15;
+    state->reason = "on_reset pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_finish;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_91: {
+    state->error = 0x1f;
+    state->reason = "`on_reset` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_llhttp__on_reset: {
+    switch (llhttp__on_reset(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_invoke_update_finish;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_24;
+      default:
+        goto s_n_llhttp__internal__n_error_91;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_initial_message_completed: {
+    switch (llhttp__internal__c_load_initial_message_completed(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_llhttp__on_reset;
       default:
-        goto s_n_llhttp__internal__n_invoke_llhttp__on_message_begin;
+        goto s_n_llhttp__internal__n_invoke_update_finish;
     }
     /* UNREACHABLE */;
     abort();
@@ -7934,17 +9775,33 @@
   s_n_llhttp__internal__n_span_start_llhttp__on_body,
   s_n_llhttp__internal__n_invoke_is_equal_content_length,
   s_n_llhttp__internal__n_chunk_size_almost_done,
-  s_n_llhttp__internal__n_chunk_parameters,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete,
+  s_n_llhttp__internal__n_chunk_extension_quoted_value_done,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1,
+  s_n_llhttp__internal__n_error_17,
+  s_n_llhttp__internal__n_chunk_extension_quoted_value,
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2,
+  s_n_llhttp__internal__n_error_19,
+  s_n_llhttp__internal__n_chunk_extension_value,
+  s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value,
+  s_n_llhttp__internal__n_error_20,
+  s_n_llhttp__internal__n_chunk_extension_name,
+  s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name,
+  s_n_llhttp__internal__n_chunk_extensions,
   s_n_llhttp__internal__n_chunk_size_otherwise,
   s_n_llhttp__internal__n_chunk_size,
   s_n_llhttp__internal__n_chunk_size_digit,
-  s_n_llhttp__internal__n_invoke_update_content_length,
+  s_n_llhttp__internal__n_invoke_update_content_length_1,
   s_n_llhttp__internal__n_consume_content_length_1,
   s_n_llhttp__internal__n_span_start_llhttp__on_body_1,
   s_n_llhttp__internal__n_eof,
   s_n_llhttp__internal__n_span_start_llhttp__on_body_2,
   s_n_llhttp__internal__n_invoke_llhttp__after_headers_complete,
   s_n_llhttp__internal__n_headers_almost_done,
+  s_n_llhttp__internal__n_header_field_colon_discard_ws,
+  s_n_llhttp__internal__n_error_28,
   s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete,
   s_n_llhttp__internal__n_span_start_llhttp__on_header_value,
   s_n_llhttp__internal__n_header_value_discard_lws,
@@ -7952,6 +9809,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_header_value_otherwise,
   s_n_llhttp__internal__n_header_value_connection_token,
   s_n_llhttp__internal__n_header_value_connection_ws,
@@ -7959,14 +9817,16 @@
   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_17,
-  s_n_llhttp__internal__n_error_18,
+  s_n_llhttp__internal__n_error_36,
+  s_n_llhttp__internal__n_error_37,
   s_n_llhttp__internal__n_header_value_content_length_ws,
   s_n_llhttp__internal__n_header_value_content_length,
-  s_n_llhttp__internal__n_header_value_te_chunked_last,
+  s_n_llhttp__internal__n_error_39,
+  s_n_llhttp__internal__n_error_38,
   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,
+  s_n_llhttp__internal__n_header_value_te_chunked_last,
   s_n_llhttp__internal__n_header_value_te_chunked,
   s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1,
   s_n_llhttp__internal__n_header_value_discard_ws,
@@ -7984,14 +9844,22 @@
   s_n_llhttp__internal__n_header_field,
   s_n_llhttp__internal__n_span_start_llhttp__on_header_field,
   s_n_llhttp__internal__n_header_field_start,
+  s_n_llhttp__internal__n_headers_start,
   s_n_llhttp__internal__n_url_skip_to_http09,
   s_n_llhttp__internal__n_url_skip_lf_to_http09,
   s_n_llhttp__internal__n_req_pri_upgrade,
   s_n_llhttp__internal__n_req_http_complete_1,
   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_req_http_minor,
+  s_n_llhttp__internal__n_error_50,
   s_n_llhttp__internal__n_req_http_dot,
+  s_n_llhttp__internal__n_error_51,
   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,
   s_n_llhttp__internal__n_req_http_start_2,
   s_n_llhttp__internal__n_req_http_start_3,
@@ -8016,102 +9884,124 @@
   s_n_llhttp__internal__n_span_start_llhttp__on_url,
   s_n_llhttp__internal__n_req_spaces_before_url,
   s_n_llhttp__internal__n_req_first_space_before_url,
-  s_n_llhttp__internal__n_start_req_2,
-  s_n_llhttp__internal__n_start_req_3,
-  s_n_llhttp__internal__n_start_req_1,
-  s_n_llhttp__internal__n_start_req_4,
-  s_n_llhttp__internal__n_start_req_6,
-  s_n_llhttp__internal__n_start_req_8,
-  s_n_llhttp__internal__n_start_req_9,
-  s_n_llhttp__internal__n_start_req_7,
-  s_n_llhttp__internal__n_start_req_5,
-  s_n_llhttp__internal__n_start_req_12,
-  s_n_llhttp__internal__n_start_req_13,
-  s_n_llhttp__internal__n_start_req_11,
-  s_n_llhttp__internal__n_start_req_10,
-  s_n_llhttp__internal__n_start_req_14,
-  s_n_llhttp__internal__n_start_req_17,
-  s_n_llhttp__internal__n_start_req_16,
-  s_n_llhttp__internal__n_start_req_15,
-  s_n_llhttp__internal__n_start_req_18,
-  s_n_llhttp__internal__n_start_req_20,
-  s_n_llhttp__internal__n_start_req_21,
-  s_n_llhttp__internal__n_start_req_19,
-  s_n_llhttp__internal__n_start_req_23,
-  s_n_llhttp__internal__n_start_req_24,
-  s_n_llhttp__internal__n_start_req_26,
-  s_n_llhttp__internal__n_start_req_28,
-  s_n_llhttp__internal__n_start_req_29,
-  s_n_llhttp__internal__n_start_req_27,
-  s_n_llhttp__internal__n_start_req_25,
-  s_n_llhttp__internal__n_start_req_30,
-  s_n_llhttp__internal__n_start_req_22,
-  s_n_llhttp__internal__n_start_req_31,
-  s_n_llhttp__internal__n_start_req_32,
-  s_n_llhttp__internal__n_start_req_35,
-  s_n_llhttp__internal__n_start_req_36,
-  s_n_llhttp__internal__n_start_req_34,
-  s_n_llhttp__internal__n_start_req_37,
-  s_n_llhttp__internal__n_start_req_38,
-  s_n_llhttp__internal__n_start_req_42,
-  s_n_llhttp__internal__n_start_req_43,
-  s_n_llhttp__internal__n_start_req_41,
-  s_n_llhttp__internal__n_start_req_40,
-  s_n_llhttp__internal__n_start_req_39,
-  s_n_llhttp__internal__n_start_req_45,
-  s_n_llhttp__internal__n_start_req_44,
-  s_n_llhttp__internal__n_start_req_33,
-  s_n_llhttp__internal__n_start_req_48,
-  s_n_llhttp__internal__n_start_req_49,
-  s_n_llhttp__internal__n_start_req_50,
-  s_n_llhttp__internal__n_start_req_51,
-  s_n_llhttp__internal__n_start_req_47,
-  s_n_llhttp__internal__n_start_req_46,
-  s_n_llhttp__internal__n_start_req_54,
-  s_n_llhttp__internal__n_start_req_56,
-  s_n_llhttp__internal__n_start_req_57,
-  s_n_llhttp__internal__n_start_req_55,
-  s_n_llhttp__internal__n_start_req_53,
-  s_n_llhttp__internal__n_start_req_58,
-  s_n_llhttp__internal__n_start_req_59,
-  s_n_llhttp__internal__n_start_req_52,
-  s_n_llhttp__internal__n_start_req_61,
-  s_n_llhttp__internal__n_start_req_62,
-  s_n_llhttp__internal__n_start_req_60,
-  s_n_llhttp__internal__n_start_req_65,
-  s_n_llhttp__internal__n_start_req_67,
-  s_n_llhttp__internal__n_start_req_68,
-  s_n_llhttp__internal__n_start_req_66,
-  s_n_llhttp__internal__n_start_req_69,
-  s_n_llhttp__internal__n_start_req_64,
-  s_n_llhttp__internal__n_start_req_63,
-  s_n_llhttp__internal__n_start_req,
+  s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1,
+  s_n_llhttp__internal__n_after_start_req_2,
+  s_n_llhttp__internal__n_after_start_req_3,
+  s_n_llhttp__internal__n_after_start_req_1,
+  s_n_llhttp__internal__n_after_start_req_4,
+  s_n_llhttp__internal__n_after_start_req_6,
+  s_n_llhttp__internal__n_after_start_req_8,
+  s_n_llhttp__internal__n_after_start_req_9,
+  s_n_llhttp__internal__n_after_start_req_7,
+  s_n_llhttp__internal__n_after_start_req_5,
+  s_n_llhttp__internal__n_after_start_req_12,
+  s_n_llhttp__internal__n_after_start_req_13,
+  s_n_llhttp__internal__n_after_start_req_11,
+  s_n_llhttp__internal__n_after_start_req_10,
+  s_n_llhttp__internal__n_after_start_req_14,
+  s_n_llhttp__internal__n_after_start_req_17,
+  s_n_llhttp__internal__n_after_start_req_16,
+  s_n_llhttp__internal__n_after_start_req_15,
+  s_n_llhttp__internal__n_after_start_req_18,
+  s_n_llhttp__internal__n_after_start_req_20,
+  s_n_llhttp__internal__n_after_start_req_21,
+  s_n_llhttp__internal__n_after_start_req_19,
+  s_n_llhttp__internal__n_after_start_req_23,
+  s_n_llhttp__internal__n_after_start_req_24,
+  s_n_llhttp__internal__n_after_start_req_26,
+  s_n_llhttp__internal__n_after_start_req_28,
+  s_n_llhttp__internal__n_after_start_req_29,
+  s_n_llhttp__internal__n_after_start_req_27,
+  s_n_llhttp__internal__n_after_start_req_25,
+  s_n_llhttp__internal__n_after_start_req_30,
+  s_n_llhttp__internal__n_after_start_req_22,
+  s_n_llhttp__internal__n_after_start_req_31,
+  s_n_llhttp__internal__n_after_start_req_32,
+  s_n_llhttp__internal__n_after_start_req_35,
+  s_n_llhttp__internal__n_after_start_req_36,
+  s_n_llhttp__internal__n_after_start_req_34,
+  s_n_llhttp__internal__n_after_start_req_37,
+  s_n_llhttp__internal__n_after_start_req_38,
+  s_n_llhttp__internal__n_after_start_req_42,
+  s_n_llhttp__internal__n_after_start_req_43,
+  s_n_llhttp__internal__n_after_start_req_41,
+  s_n_llhttp__internal__n_after_start_req_40,
+  s_n_llhttp__internal__n_after_start_req_39,
+  s_n_llhttp__internal__n_after_start_req_45,
+  s_n_llhttp__internal__n_after_start_req_44,
+  s_n_llhttp__internal__n_after_start_req_33,
+  s_n_llhttp__internal__n_after_start_req_48,
+  s_n_llhttp__internal__n_after_start_req_49,
+  s_n_llhttp__internal__n_after_start_req_50,
+  s_n_llhttp__internal__n_after_start_req_51,
+  s_n_llhttp__internal__n_after_start_req_47,
+  s_n_llhttp__internal__n_after_start_req_46,
+  s_n_llhttp__internal__n_after_start_req_54,
+  s_n_llhttp__internal__n_after_start_req_56,
+  s_n_llhttp__internal__n_after_start_req_57,
+  s_n_llhttp__internal__n_after_start_req_55,
+  s_n_llhttp__internal__n_after_start_req_53,
+  s_n_llhttp__internal__n_after_start_req_58,
+  s_n_llhttp__internal__n_after_start_req_59,
+  s_n_llhttp__internal__n_after_start_req_52,
+  s_n_llhttp__internal__n_after_start_req_61,
+  s_n_llhttp__internal__n_after_start_req_62,
+  s_n_llhttp__internal__n_after_start_req_60,
+  s_n_llhttp__internal__n_after_start_req_65,
+  s_n_llhttp__internal__n_after_start_req_67,
+  s_n_llhttp__internal__n_after_start_req_68,
+  s_n_llhttp__internal__n_after_start_req_66,
+  s_n_llhttp__internal__n_after_start_req_69,
+  s_n_llhttp__internal__n_after_start_req_64,
+  s_n_llhttp__internal__n_after_start_req_63,
+  s_n_llhttp__internal__n_after_start_req,
+  s_n_llhttp__internal__n_span_start_llhttp__on_method_1,
   s_n_llhttp__internal__n_invoke_llhttp__on_status_complete,
   s_n_llhttp__internal__n_res_line_almost_done,
   s_n_llhttp__internal__n_res_status,
   s_n_llhttp__internal__n_span_start_llhttp__on_status,
   s_n_llhttp__internal__n_res_status_start,
   s_n_llhttp__internal__n_res_status_code_otherwise,
-  s_n_llhttp__internal__n_res_status_code,
-  s_n_llhttp__internal__n_res_http_end,
+  s_n_llhttp__internal__n_res_status_code_digit_3,
+  s_n_llhttp__internal__n_res_status_code_digit_2,
+  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_res_http_minor,
+  s_n_llhttp__internal__n_error_78,
   s_n_llhttp__internal__n_res_http_dot,
+  s_n_llhttp__internal__n_error_79,
   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,
+  s_n_llhttp__internal__n_invoke_llhttp__on_method_complete,
   s_n_llhttp__internal__n_req_or_res_method_2,
+  s_n_llhttp__internal__n_invoke_update_type_1,
   s_n_llhttp__internal__n_req_or_res_method_3,
   s_n_llhttp__internal__n_req_or_res_method_1,
   s_n_llhttp__internal__n_req_or_res_method,
+  s_n_llhttp__internal__n_span_start_llhttp__on_method,
   s_n_llhttp__internal__n_start_req_or_res,
   s_n_llhttp__internal__n_invoke_load_type,
+  s_n_llhttp__internal__n_invoke_update_finish,
   s_n_llhttp__internal__n_start,
 };
 typedef enum llparse_state_e llparse_state_t;
 
+int llhttp__on_method(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__on_url(
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__on_version(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__on_header_field(
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
@@ -8124,10 +10014,29 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__on_chunk_extension_name(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
+int llhttp__on_chunk_extension_value(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__on_status(
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__internal__c_load_initial_message_completed(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return state->initial_message_completed;
+}
+
+int llhttp__on_reset(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__internal__c_update_finish(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8156,6 +10065,10 @@
   return 0;
 }
 
+int llhttp__on_method_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__internal__c_is_equal_method(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8183,6 +10096,13 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__internal__c_test_lenient_flags(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->lenient_flags & 1) == 1;
+}
+
 int llhttp__internal__c_test_flags(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8209,6 +10129,22 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
+int llhttp__internal__c_update_content_length(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  state->content_length = 0;
+  return 0;
+}
+
+int llhttp__internal__c_update_initial_message_completed(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  state->initial_message_completed = 1;
+  return 0;
+}
+
 int llhttp__internal__c_update_finish_1(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8217,7 +10153,7 @@
   return 0;
 }
 
-int llhttp__internal__c_test_lenient_flags(
+int llhttp__internal__c_test_lenient_flags_1(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8231,7 +10167,7 @@
   return (state->flags & 544) == 544;
 }
 
-int llhttp__internal__c_test_lenient_flags_1(
+int llhttp__internal__c_test_lenient_flags_2(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8250,14 +10186,6 @@
     llhttp__internal_t* s, const unsigned char* p,
     const unsigned char* endp);
 
-int llhttp__internal__c_update_content_length(
-    llhttp__internal_t* state,
-    const unsigned char* p,
-    const unsigned char* endp) {
-  state->content_length = 0;
-  return 0;
-}
-
 int llhttp__internal__c_mul_add_content_length(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8303,6 +10231,14 @@
   return 0;
 }
 
+int llhttp__on_chunk_extension_name_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
+int llhttp__on_chunk_extension_value_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
 int llhttp__internal__c_update_finish_3(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8391,7 +10327,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_2(
+int llhttp__internal__c_update_header_state_3(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8399,14 +10335,7 @@
   return 0;
 }
 
-int llhttp__internal__c_test_lenient_flags_2(
-    llhttp__internal_t* state,
-    const unsigned char* p,
-    const unsigned char* endp) {
-  return (state->lenient_flags & 1) == 1;
-}
-
-int llhttp__internal__c_update_header_state_4(
+int llhttp__internal__c_update_header_state_1(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8414,7 +10343,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_5(
+int llhttp__internal__c_update_header_state_6(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8422,7 +10351,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_6(
+int llhttp__internal__c_update_header_state_7(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8471,6 +10400,20 @@
   return 0;
 }
 
+int llhttp__internal__c_test_flags_3(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->flags & 8) == 8;
+}
+
+int llhttp__internal__c_test_lenient_flags_6(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->lenient_flags & 8) == 8;
+}
+
 int llhttp__internal__c_or_flags_16(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8487,7 +10430,7 @@
   return 0;
 }
 
-int llhttp__internal__c_update_header_state_7(
+int llhttp__internal__c_update_header_state_8(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8495,7 +10438,7 @@
   return 0;
 }
 
-int llhttp__internal__c_or_flags_17(
+int llhttp__internal__c_or_flags_18(
     llhttp__internal_t* state,
     const unsigned char* p,
     const unsigned char* endp) {
@@ -8528,6 +10471,31 @@
   return 0;
 }
 
+int llhttp__internal__c_test_lenient_flags_8(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return (state->lenient_flags & 16) == 16;
+}
+
+int llhttp__on_version_complete(
+    llhttp__internal_t* s, const unsigned char* p,
+    const unsigned char* endp);
+
+int llhttp__internal__c_load_http_major(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return state->http_major;
+}
+
+int llhttp__internal__c_load_http_minor(
+    llhttp__internal_t* state,
+    const unsigned char* p,
+    const unsigned char* endp) {
+  return state->http_minor;
+}
+
 int llhttp__internal__c_update_status_code(
     llhttp__internal_t* state,
     const unsigned char* p,
@@ -8559,11 +10527,6 @@
     }
   }
   state->status_code += match;
-  
-  /* Enforce maximum */
-  if (state->status_code > 999) {
-    return 1;
-  }
   return 0;
 }
 
@@ -8613,7 +10576,7 @@
     s_n_llhttp__internal__n_invoke_llhttp__after_message_complete: {
       switch (llhttp__after_message_complete(state, p, endp)) {
         case 1:
-          goto s_n_llhttp__internal__n_invoke_update_finish_2;
+          goto s_n_llhttp__internal__n_invoke_update_content_length;
         default:
           goto s_n_llhttp__internal__n_invoke_update_finish_1;
       }
@@ -8647,9 +10610,9 @@
         case 0:
           goto s_n_llhttp__internal__n_invoke_is_equal_upgrade;
         case 21:
-          goto s_n_llhttp__internal__n_pause_5;
+          goto s_n_llhttp__internal__n_pause_11;
         default:
-          goto s_n_llhttp__internal__n_error_9;
+          goto s_n_llhttp__internal__n_error_24;
       }
       /* UNREACHABLE */;
       abort();
@@ -8677,7 +10640,7 @@
     case s_n_llhttp__internal__n_consume_content_length:
     s_n_llhttp__internal__n_consume_content_length: {
       size_t avail;
-      size_t need;
+      uint64_t need;
       
       avail = endp - p;
       need = state->content_length;
@@ -8724,19 +10687,288 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_chunk_parameters:
-    s_n_llhttp__internal__n_chunk_parameters: {
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete: {
+      switch (llhttp__on_chunk_extension_name_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_size_almost_done;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_5;
+        default:
+          goto s_n_llhttp__internal__n_error_11;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1: {
+      switch (llhttp__on_chunk_extension_name_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_extensions;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_6;
+        default:
+          goto s_n_llhttp__internal__n_error_12;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete: {
+      switch (llhttp__on_chunk_extension_value_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_size_almost_done;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_7;
+        default:
+          goto s_n_llhttp__internal__n_error_14;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_quoted_value_done:
+    s_n_llhttp__internal__n_chunk_extension_quoted_value_done: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_chunk_parameters;
+        return s_n_llhttp__internal__n_chunk_extension_quoted_value_done;
       }
       switch (*p) {
         case 13: {
           p++;
           goto s_n_llhttp__internal__n_chunk_size_almost_done;
         }
+        case ';': {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extensions;
+        }
         default: {
+          goto s_n_llhttp__internal__n_error_16;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1: {
+      switch (llhttp__on_chunk_extension_value_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_extension_quoted_value_done;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_8;
+        default:
+          goto s_n_llhttp__internal__n_error_15;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_17:
+    s_n_llhttp__internal__n_error_17: {
+      state->error = 0x2;
+      state->reason = "Invalid character in chunk extensions quoted value";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_quoted_value:
+    s_n_llhttp__internal__n_chunk_extension_quoted_value: {
+      static uint8_t lookup_table = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+      };
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extension_quoted_value;
+      }
+      switch (lookup_table(uint8_t) *p) {
+        case 1: {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extension_quoted_value;
+        }
+        case 2: {
+          p++;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_1;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_2;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2:
+    s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2: {
+      switch (llhttp__on_chunk_extension_value_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_chunk_size_otherwise;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_9;
+        default:
+          goto s_n_llhttp__internal__n_error_18;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_19:
+    s_n_llhttp__internal__n_error_19: {
+      state->error = 0x2;
+      state->reason = "Invalid character in chunk extensions value";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_value:
+    s_n_llhttp__internal__n_chunk_extension_value: {
+      static uint8_t lookup_table = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 2, 3, 2, 2, 2, 2, 2, 0, 0, 2, 2, 0, 2, 2, 0,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 4, 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, 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, 0, 2, 0, 2, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      };
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extension_value;
+      }
+      switch (lookup_table(uint8_t) *p) {
+        case 1: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value;
+        }
+        case 2: {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extension_value;
+        }
+        case 3: {
           p++;
-          goto s_n_llhttp__internal__n_chunk_parameters;
+          goto s_n_llhttp__internal__n_chunk_extension_quoted_value;
+        }
+        case 4: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_3;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_4;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value:
+    s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_chunk_extension_value;
+      goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_2;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_20:
+    s_n_llhttp__internal__n_error_20: {
+      state->error = 0x2;
+      state->reason = "Invalid character in chunk extensions name";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extension_name:
+    s_n_llhttp__internal__n_chunk_extension_name: {
+      static uint8_t lookup_table = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 2, 0, 2, 2, 2, 2, 2, 0, 0, 2, 2, 0, 2, 2, 0,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 3, 0, 4, 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, 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, 0, 2, 0, 2, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      };
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extension_name;
+      }
+      switch (lookup_table(uint8_t) *p) {
+        case 1: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name;
+        }
+        case 2: {
+          p++;
+          goto s_n_llhttp__internal__n_chunk_extension_name;
+        }
+        case 3: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_1;
+        }
+        case 4: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_2;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_3;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name:
+    s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_chunk_extension_name;
+      goto s_n_llhttp__internal__n_chunk_extension_name;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_chunk_extensions:
+    s_n_llhttp__internal__n_chunk_extensions: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_chunk_extensions;
+      }
+      switch (*p) {
+        case 13: {
+          p++;
+          goto s_n_llhttp__internal__n_error_9;
+        }
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_error_10;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_name;
         }
       }
       /* UNREACHABLE */;
@@ -8752,16 +10984,12 @@
           p++;
           goto s_n_llhttp__internal__n_chunk_size_almost_done;
         }
-        case ' ': {
-          p++;
-          goto s_n_llhttp__internal__n_chunk_parameters;
-        }
         case ';': {
           p++;
-          goto s_n_llhttp__internal__n_chunk_parameters;
+          goto s_n_llhttp__internal__n_chunk_extensions;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_6;
+          goto s_n_llhttp__internal__n_error_21;
         }
       }
       /* UNREACHABLE */;
@@ -9007,14 +11235,14 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_content_length;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_8;
+          goto s_n_llhttp__internal__n_error_23;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_invoke_update_content_length:
-    s_n_llhttp__internal__n_invoke_update_content_length: {
+    case s_n_llhttp__internal__n_invoke_update_content_length_1:
+    s_n_llhttp__internal__n_invoke_update_content_length_1: {
       switch (llhttp__internal__c_update_content_length(state, p, endp)) {
         default:
           goto s_n_llhttp__internal__n_chunk_size_digit;
@@ -9025,7 +11253,7 @@
     case s_n_llhttp__internal__n_consume_content_length_1:
     s_n_llhttp__internal__n_consume_content_length_1: {
       size_t avail;
-      size_t need;
+      uint64_t need;
       
       avail = endp - p;
       need = state->content_length;
@@ -9078,13 +11306,13 @@
         case 1:
           goto s_n_llhttp__internal__n_invoke_llhttp__on_message_complete_1;
         case 2:
-          goto s_n_llhttp__internal__n_invoke_update_content_length;
+          goto s_n_llhttp__internal__n_invoke_update_content_length_1;
         case 3:
           goto s_n_llhttp__internal__n_span_start_llhttp__on_body_1;
         case 4:
           goto s_n_llhttp__internal__n_invoke_update_finish_3;
         case 5:
-          goto s_n_llhttp__internal__n_error_10;
+          goto s_n_llhttp__internal__n_error_25;
         default:
           goto s_n_llhttp__internal__n_invoke_llhttp__on_message_complete;
       }
@@ -9101,11 +11329,42 @@
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_header_field_colon_discard_ws:
+    s_n_llhttp__internal__n_header_field_colon_discard_ws: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_header_field_colon_discard_ws;
+      }
+      switch (*p) {
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_header_field_colon_discard_ws;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_header_field_colon;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_28:
+    s_n_llhttp__internal__n_error_28: {
+      state->error = 0xa;
+      state->reason = "Invalid header field char";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete:
     s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete: {
       switch (llhttp__on_header_value_complete(state, p, endp)) {
-        default:
+        case 0:
           goto s_n_llhttp__internal__n_header_field_start;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_14;
+        default:
+          goto s_n_llhttp__internal__n_error_31;
       }
       /* UNREACHABLE */;
       abort();
@@ -9159,13 +11418,13 @@
       }
       switch (*p) {
         case 9: {
-          goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_3;
         }
         case ' ': {
-          goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_load_header_state_3;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_4;
         }
       }
       /* UNREACHABLE */;
@@ -9182,7 +11441,7 @@
           goto s_n_llhttp__internal__n_header_value_lws;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_14;
+          goto s_n_llhttp__internal__n_error_33;
         }
       }
       /* UNREACHABLE */;
@@ -9195,10 +11454,10 @@
       }
       switch (*p) {
         case 10: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3;
         }
         case 13: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4;
         }
         default: {
           p++;
@@ -9208,20 +11467,27 @@
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_34:
+    s_n_llhttp__internal__n_error_34: {
+      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();
+    }
     case s_n_llhttp__internal__n_header_value_otherwise:
     s_n_llhttp__internal__n_header_value_otherwise: {
       if (p == endp) {
         return s_n_llhttp__internal__n_header_value_otherwise;
       }
       switch (*p) {
-        case 10: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
-        }
         case 13: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_2;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_5;
         }
       }
       /* UNREACHABLE */;
@@ -9284,10 +11550,10 @@
         }
         case ',': {
           p++;
-          goto s_n_llhttp__internal__n_invoke_load_header_state_4;
+          goto s_n_llhttp__internal__n_invoke_load_header_state_5;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_4;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_5;
         }
       }
       /* UNREACHABLE */;
@@ -9305,7 +11571,7 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_header_state_2;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_3;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_header_value_connection_1;
@@ -9329,7 +11595,7 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_header_state_5;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_6;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_header_value_connection_2;
@@ -9353,7 +11619,7 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_header_state_6;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_7;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_header_value_connection_3;
@@ -9398,8 +11664,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_17:
-    s_n_llhttp__internal__n_error_17: {
+    case s_n_llhttp__internal__n_error_36:
+    s_n_llhttp__internal__n_error_36: {
       state->error = 0xb;
       state->reason = "Content-Length overflow";
       state->error_pos = (const char*) p;
@@ -9408,8 +11674,8 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_error_18:
-    s_n_llhttp__internal__n_error_18: {
+    case s_n_llhttp__internal__n_error_37:
+    s_n_llhttp__internal__n_error_37: {
       state->error = 0xb;
       state->reason = "Invalid character in Content-Length";
       state->error_pos = (const char*) p;
@@ -9435,7 +11701,7 @@
           goto s_n_llhttp__internal__n_header_value_content_length_ws;
         }
         default: {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_6;
         }
       }
       /* UNREACHABLE */;
@@ -9504,26 +11770,23 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_header_value_te_chunked_last:
-    s_n_llhttp__internal__n_header_value_te_chunked_last: {
-      if (p == endp) {
-        return s_n_llhttp__internal__n_header_value_te_chunked_last;
-      }
-      switch (*p) {
-        case 10: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_7;
-        }
-        case 13: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_7;
-        }
-        case ' ': {
-          p++;
-          goto s_n_llhttp__internal__n_header_value_te_chunked_last;
-        }
-        default: {
-          goto s_n_llhttp__internal__n_header_value_te_chunked;
-        }
-      }
+    case s_n_llhttp__internal__n_error_39:
+    s_n_llhttp__internal__n_error_39: {
+      state->error = 0xf;
+      state->reason = "Invalid `Transfer-Encoding` header value";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_38:
+    s_n_llhttp__internal__n_error_38: {
+      state->error = 0xf;
+      state->reason = "Invalid `Transfer-Encoding` header value";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
       /* UNREACHABLE */;
       abort();
     }
@@ -9640,8 +11903,34 @@
           goto s_n_llhttp__internal__n_header_value_te_token_ows;
         }
         default: {
+          goto s_n_llhttp__internal__n_invoke_update_header_state_9;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_header_value_te_chunked_last:
+    s_n_llhttp__internal__n_header_value_te_chunked_last: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_header_value_te_chunked_last;
+      }
+      switch (*p) {
+        case 10: {
+          goto s_n_llhttp__internal__n_invoke_update_header_state_8;
+        }
+        case 13: {
           goto s_n_llhttp__internal__n_invoke_update_header_state_8;
         }
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_header_value_te_chunked_last;
+        }
+        case ',': {
+          goto s_n_llhttp__internal__n_invoke_load_type_1;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_header_value_te_token;
+        }
       }
       /* UNREACHABLE */;
       abort();
@@ -9693,7 +11982,7 @@
         }
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_header_value_discard_lws;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_4;
         }
         case 13: {
           p++;
@@ -9713,8 +12002,12 @@
     case s_n_llhttp__internal__n_invoke_llhttp__on_header_field_complete:
     s_n_llhttp__internal__n_invoke_llhttp__on_header_field_complete: {
       switch (llhttp__on_header_field_complete(state, p, endp)) {
-        default:
+        case 0:
           goto s_n_llhttp__internal__n_header_value_discard_ws;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_15;
+        default:
+          goto s_n_llhttp__internal__n_error_29;
       }
       /* UNREACHABLE */;
       abort();
@@ -9726,10 +12019,10 @@
       }
       switch (*p) {
         case ':': {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_19;
+          goto s_n_llhttp__internal__n_error_40;
         }
       }
       /* UNREACHABLE */;
@@ -9813,14 +12106,13 @@
       }
       switch (*p) {
         case ' ': {
-          p++;
-          goto s_n_llhttp__internal__n_header_field_colon;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags_3;
         }
         case ':': {
-          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_9;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
         }
       }
       /* UNREACHABLE */;
@@ -9845,7 +12137,7 @@
           return s_n_llhttp__internal__n_header_field_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -9870,7 +12162,7 @@
           return s_n_llhttp__internal__n_header_field_4;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -9891,7 +12183,7 @@
           goto s_n_llhttp__internal__n_header_field_4;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -9915,7 +12207,7 @@
           return s_n_llhttp__internal__n_header_field_1;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -9940,7 +12232,7 @@
           return s_n_llhttp__internal__n_header_field_5;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -9965,7 +12257,7 @@
           return s_n_llhttp__internal__n_header_field_6;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -9990,7 +12282,7 @@
           return s_n_llhttp__internal__n_header_field_7;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -10019,7 +12311,7 @@
           goto s_n_llhttp__internal__n_header_field_7;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_header_state_10;
+          goto s_n_llhttp__internal__n_invoke_update_header_state_11;
         }
       }
       /* UNREACHABLE */;
@@ -10056,6 +12348,23 @@
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_headers_start:
+    s_n_llhttp__internal__n_headers_start: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_headers_start;
+      }
+      switch (*p) {
+        case ' ': {
+          p++;
+          goto s_n_llhttp__internal__n_invoke_test_lenient_flags;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_header_field_start;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_url_skip_to_http09:
     s_n_llhttp__internal__n_url_skip_to_http09: {
       if (p == endp) {
@@ -10084,7 +12393,7 @@
           return s_n_llhttp__internal__n_url_skip_lf_to_http09;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_20;
+          goto s_n_llhttp__internal__n_error_41;
         }
       }
       /* UNREACHABLE */;
@@ -10102,13 +12411,13 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_error_23;
+          goto s_n_llhttp__internal__n_error_47;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_req_pri_upgrade;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_24;
+          goto s_n_llhttp__internal__n_error_48;
         }
       }
       /* UNREACHABLE */;
@@ -10122,10 +12431,10 @@
       switch (*p) {
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_header_field_start;
+          goto s_n_llhttp__internal__n_headers_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_22;
+          goto s_n_llhttp__internal__n_error_46;
         }
       }
       /* UNREACHABLE */;
@@ -10139,19 +12448,63 @@
       switch (*p) {
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_header_field_start;
+          goto s_n_llhttp__internal__n_headers_start;
         }
         case 13: {
           p++;
           goto s_n_llhttp__internal__n_req_http_complete_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_22;
+          goto s_n_llhttp__internal__n_error_46;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_load_method_1:
+    s_n_llhttp__internal__n_invoke_load_method_1: {
+      switch (llhttp__internal__c_load_method(state, p, endp)) {
+        case 34:
+          goto s_n_llhttp__internal__n_req_pri_upgrade;
+        default:
+          goto s_n_llhttp__internal__n_req_http_complete;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_version_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_version_complete: {
+      switch (llhttp__on_version_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_invoke_load_method_1;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_17;
+        default:
+          goto s_n_llhttp__internal__n_error_45;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_44:
+    s_n_llhttp__internal__n_error_44: {
+      state->error = 0x9;
+      state->reason = "Invalid HTTP version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_49:
+    s_n_llhttp__internal__n_error_49: {
+      state->error = 0x9;
+      state->reason = "Invalid minor version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_minor:
     s_n_llhttp__internal__n_req_http_minor: {
       if (p == endp) {
@@ -10209,12 +12562,22 @@
           goto s_n_llhttp__internal__n_invoke_store_http_minor;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_25;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_2;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_50:
+    s_n_llhttp__internal__n_error_50: {
+      state->error = 0x9;
+      state->reason = "Expected dot";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_dot:
     s_n_llhttp__internal__n_req_http_dot: {
       if (p == endp) {
@@ -10226,12 +12589,22 @@
           goto s_n_llhttp__internal__n_req_http_minor;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_26;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_3;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_51:
+    s_n_llhttp__internal__n_error_51: {
+      state->error = 0x9;
+      state->reason = "Invalid major version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_major:
     s_n_llhttp__internal__n_req_http_major: {
       if (p == endp) {
@@ -10289,12 +12662,23 @@
           goto s_n_llhttp__internal__n_invoke_store_http_major;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_27;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_4;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_version:
+    s_n_llhttp__internal__n_span_start_llhttp__on_version: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_version;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_version;
+      goto s_n_llhttp__internal__n_req_http_major;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_http_start_1:
     s_n_llhttp__internal__n_req_http_start_1: {
       llparse_match_t match_seq;
@@ -10313,7 +12697,7 @@
           return s_n_llhttp__internal__n_req_http_start_1;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_30;
+          goto s_n_llhttp__internal__n_error_54;
         }
       }
       /* UNREACHABLE */;
@@ -10337,7 +12721,7 @@
           return s_n_llhttp__internal__n_req_http_start_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_30;
+          goto s_n_llhttp__internal__n_error_54;
         }
       }
       /* UNREACHABLE */;
@@ -10361,7 +12745,7 @@
           return s_n_llhttp__internal__n_req_http_start_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_30;
+          goto s_n_llhttp__internal__n_error_54;
         }
       }
       /* UNREACHABLE */;
@@ -10390,7 +12774,7 @@
           goto s_n_llhttp__internal__n_req_http_start_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_30;
+          goto s_n_llhttp__internal__n_error_54;
         }
       }
       /* UNREACHABLE */;
@@ -10444,7 +12828,7 @@
           goto s_n_llhttp__internal__n_span_end_llhttp__on_url_8;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_31;
+          goto s_n_llhttp__internal__n_error_55;
         }
       }
       /* UNREACHABLE */;
@@ -10501,7 +12885,7 @@
           goto s_n_llhttp__internal__n_span_end_stub_query_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_32;
+          goto s_n_llhttp__internal__n_error_56;
         }
       }
       /* UNREACHABLE */;
@@ -10531,7 +12915,7 @@
           goto s_n_llhttp__internal__n_url_query;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_33;
+          goto s_n_llhttp__internal__n_error_57;
         }
       }
       /* UNREACHABLE */;
@@ -10672,10 +13056,10 @@
         }
         case 7: {
           p++;
-          goto s_n_llhttp__internal__n_error_34;
+          goto s_n_llhttp__internal__n_error_58;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_35;
+          goto s_n_llhttp__internal__n_error_59;
         }
       }
       /* UNREACHABLE */;
@@ -10730,7 +13114,7 @@
           goto s_n_llhttp__internal__n_url_server_with_at;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_36;
+          goto s_n_llhttp__internal__n_error_60;
         }
       }
       /* UNREACHABLE */;
@@ -10747,7 +13131,7 @@
           goto s_n_llhttp__internal__n_url_server;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_38;
+          goto s_n_llhttp__internal__n_error_62;
         }
       }
       /* UNREACHABLE */;
@@ -10761,22 +13145,22 @@
       switch (*p) {
         case 10: {
           p++;
-          goto s_n_llhttp__internal__n_error_37;
+          goto s_n_llhttp__internal__n_error_61;
         }
         case 13: {
           p++;
-          goto s_n_llhttp__internal__n_error_37;
+          goto s_n_llhttp__internal__n_error_61;
         }
         case ' ': {
           p++;
-          goto s_n_llhttp__internal__n_error_37;
+          goto s_n_llhttp__internal__n_error_61;
         }
         case '/': {
           p++;
           goto s_n_llhttp__internal__n_url_schema_delim_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_38;
+          goto s_n_llhttp__internal__n_error_62;
         }
       }
       /* UNREACHABLE */;
@@ -10818,7 +13202,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_37;
+          goto s_n_llhttp__internal__n_error_61;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_end_stub_schema;
@@ -10828,7 +13212,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_39;
+          goto s_n_llhttp__internal__n_error_63;
         }
       }
       /* UNREACHABLE */;
@@ -10860,7 +13244,7 @@
       switch (lookup_table(uint8_t) *p) {
         case 1: {
           p++;
-          goto s_n_llhttp__internal__n_error_37;
+          goto s_n_llhttp__internal__n_error_61;
         }
         case 2: {
           goto s_n_llhttp__internal__n_span_start_stub_path_2;
@@ -10869,7 +13253,7 @@
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_40;
+          goto s_n_llhttp__internal__n_error_64;
         }
       }
       /* UNREACHABLE */;
@@ -10925,16 +13309,29 @@
           goto s_n_llhttp__internal__n_req_spaces_before_url;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_41;
+          goto s_n_llhttp__internal__n_error_65;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_2:
-    s_n_llhttp__internal__n_start_req_2: {
+    case s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1: {
+      switch (llhttp__on_method_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_req_first_space_before_url;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_22;
+        default:
+          goto s_n_llhttp__internal__n_error_81;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_after_start_req_2:
+    s_n_llhttp__internal__n_after_start_req_2: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_2;
+        return s_n_llhttp__internal__n_after_start_req_2;
       }
       switch (*p) {
         case 'L': {
@@ -10943,18 +13340,18 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_3:
-    s_n_llhttp__internal__n_start_req_3: {
+    case s_n_llhttp__internal__n_after_start_req_3:
+    s_n_llhttp__internal__n_after_start_req_3: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_3;
+        return s_n_llhttp__internal__n_after_start_req_3;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob19, 6);
       p = match_seq.current;
@@ -10965,42 +13362,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_3;
+          return s_n_llhttp__internal__n_after_start_req_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_1:
-    s_n_llhttp__internal__n_start_req_1: {
+    case s_n_llhttp__internal__n_after_start_req_1:
+    s_n_llhttp__internal__n_after_start_req_1: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_1;
+        return s_n_llhttp__internal__n_after_start_req_1;
       }
       switch (*p) {
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_2;
+          goto s_n_llhttp__internal__n_after_start_req_2;
         }
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_3;
+          goto s_n_llhttp__internal__n_after_start_req_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_4:
-    s_n_llhttp__internal__n_start_req_4: {
+    case s_n_llhttp__internal__n_after_start_req_4:
+    s_n_llhttp__internal__n_after_start_req_4: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_4;
+        return s_n_llhttp__internal__n_after_start_req_4;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob20, 3);
       p = match_seq.current;
@@ -11011,21 +13408,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_4;
+          return s_n_llhttp__internal__n_after_start_req_4;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_6:
-    s_n_llhttp__internal__n_start_req_6: {
+    case s_n_llhttp__internal__n_after_start_req_6:
+    s_n_llhttp__internal__n_after_start_req_6: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_6;
+        return s_n_llhttp__internal__n_after_start_req_6;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob21, 6);
       p = match_seq.current;
@@ -11036,21 +13433,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_6;
+          return s_n_llhttp__internal__n_after_start_req_6;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_8:
-    s_n_llhttp__internal__n_start_req_8: {
+    case s_n_llhttp__internal__n_after_start_req_8:
+    s_n_llhttp__internal__n_after_start_req_8: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_8;
+        return s_n_llhttp__internal__n_after_start_req_8;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob22, 4);
       p = match_seq.current;
@@ -11061,19 +13458,19 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_8;
+          return s_n_llhttp__internal__n_after_start_req_8;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_9:
-    s_n_llhttp__internal__n_start_req_9: {
+    case s_n_llhttp__internal__n_after_start_req_9:
+    s_n_llhttp__internal__n_after_start_req_9: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_9;
+        return s_n_llhttp__internal__n_after_start_req_9;
       }
       switch (*p) {
         case 'Y': {
@@ -11082,60 +13479,60 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_7:
-    s_n_llhttp__internal__n_start_req_7: {
+    case s_n_llhttp__internal__n_after_start_req_7:
+    s_n_llhttp__internal__n_after_start_req_7: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_7;
+        return s_n_llhttp__internal__n_after_start_req_7;
       }
       switch (*p) {
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_8;
+          goto s_n_llhttp__internal__n_after_start_req_8;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_9;
+          goto s_n_llhttp__internal__n_after_start_req_9;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_5:
-    s_n_llhttp__internal__n_start_req_5: {
+    case s_n_llhttp__internal__n_after_start_req_5:
+    s_n_llhttp__internal__n_after_start_req_5: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_5;
+        return s_n_llhttp__internal__n_after_start_req_5;
       }
       switch (*p) {
         case 'H': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_6;
+          goto s_n_llhttp__internal__n_after_start_req_6;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_7;
+          goto s_n_llhttp__internal__n_after_start_req_7;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_12:
-    s_n_llhttp__internal__n_start_req_12: {
+    case s_n_llhttp__internal__n_after_start_req_12:
+    s_n_llhttp__internal__n_after_start_req_12: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_12;
+        return s_n_llhttp__internal__n_after_start_req_12;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob23, 3);
       p = match_seq.current;
@@ -11146,21 +13543,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_12;
+          return s_n_llhttp__internal__n_after_start_req_12;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_13:
-    s_n_llhttp__internal__n_start_req_13: {
+    case s_n_llhttp__internal__n_after_start_req_13:
+    s_n_llhttp__internal__n_after_start_req_13: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_13;
+        return s_n_llhttp__internal__n_after_start_req_13;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob24, 5);
       p = match_seq.current;
@@ -11171,59 +13568,59 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_13;
+          return s_n_llhttp__internal__n_after_start_req_13;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_11:
-    s_n_llhttp__internal__n_start_req_11: {
+    case s_n_llhttp__internal__n_after_start_req_11:
+    s_n_llhttp__internal__n_after_start_req_11: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_11;
+        return s_n_llhttp__internal__n_after_start_req_11;
       }
       switch (*p) {
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_12;
+          goto s_n_llhttp__internal__n_after_start_req_12;
         }
         case 'S': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_13;
+          goto s_n_llhttp__internal__n_after_start_req_13;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_10:
-    s_n_llhttp__internal__n_start_req_10: {
+    case s_n_llhttp__internal__n_after_start_req_10:
+    s_n_llhttp__internal__n_after_start_req_10: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_10;
+        return s_n_llhttp__internal__n_after_start_req_10;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_11;
+          goto s_n_llhttp__internal__n_after_start_req_11;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_14:
-    s_n_llhttp__internal__n_start_req_14: {
+    case s_n_llhttp__internal__n_after_start_req_14:
+    s_n_llhttp__internal__n_after_start_req_14: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_14;
+        return s_n_llhttp__internal__n_after_start_req_14;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob25, 4);
       p = match_seq.current;
@@ -11234,21 +13631,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_14;
+          return s_n_llhttp__internal__n_after_start_req_14;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_17:
-    s_n_llhttp__internal__n_start_req_17: {
+    case s_n_llhttp__internal__n_after_start_req_17:
+    s_n_llhttp__internal__n_after_start_req_17: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_17;
+        return s_n_llhttp__internal__n_after_start_req_17;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob27, 9);
       p = match_seq.current;
@@ -11259,24 +13656,24 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_17;
+          return s_n_llhttp__internal__n_after_start_req_17;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_16:
-    s_n_llhttp__internal__n_start_req_16: {
+    case s_n_llhttp__internal__n_after_start_req_16:
+    s_n_llhttp__internal__n_after_start_req_16: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_16;
+        return s_n_llhttp__internal__n_after_start_req_16;
       }
       switch (*p) {
         case '_': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_17;
+          goto s_n_llhttp__internal__n_after_start_req_17;
         }
         default: {
           match = 1;
@@ -11286,36 +13683,36 @@
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_15:
-    s_n_llhttp__internal__n_start_req_15: {
+    case s_n_llhttp__internal__n_after_start_req_15:
+    s_n_llhttp__internal__n_after_start_req_15: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_15;
+        return s_n_llhttp__internal__n_after_start_req_15;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob26, 2);
       p = match_seq.current;
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_start_req_16;
+          goto s_n_llhttp__internal__n_after_start_req_16;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_15;
+          return s_n_llhttp__internal__n_after_start_req_15;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_18:
-    s_n_llhttp__internal__n_start_req_18: {
+    case s_n_llhttp__internal__n_after_start_req_18:
+    s_n_llhttp__internal__n_after_start_req_18: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_18;
+        return s_n_llhttp__internal__n_after_start_req_18;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob28, 3);
       p = match_seq.current;
@@ -11326,21 +13723,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_18;
+          return s_n_llhttp__internal__n_after_start_req_18;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_20:
-    s_n_llhttp__internal__n_start_req_20: {
+    case s_n_llhttp__internal__n_after_start_req_20:
+    s_n_llhttp__internal__n_after_start_req_20: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_20;
+        return s_n_llhttp__internal__n_after_start_req_20;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob29, 2);
       p = match_seq.current;
@@ -11351,21 +13748,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_20;
+          return s_n_llhttp__internal__n_after_start_req_20;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_21:
-    s_n_llhttp__internal__n_start_req_21: {
+    case s_n_llhttp__internal__n_after_start_req_21:
+    s_n_llhttp__internal__n_after_start_req_21: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_21;
+        return s_n_llhttp__internal__n_after_start_req_21;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob30, 2);
       p = match_seq.current;
@@ -11376,42 +13773,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_21;
+          return s_n_llhttp__internal__n_after_start_req_21;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_19:
-    s_n_llhttp__internal__n_start_req_19: {
+    case s_n_llhttp__internal__n_after_start_req_19:
+    s_n_llhttp__internal__n_after_start_req_19: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_19;
+        return s_n_llhttp__internal__n_after_start_req_19;
       }
       switch (*p) {
         case 'I': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_20;
+          goto s_n_llhttp__internal__n_after_start_req_20;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_21;
+          goto s_n_llhttp__internal__n_after_start_req_21;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_23:
-    s_n_llhttp__internal__n_start_req_23: {
+    case s_n_llhttp__internal__n_after_start_req_23:
+    s_n_llhttp__internal__n_after_start_req_23: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_23;
+        return s_n_llhttp__internal__n_after_start_req_23;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob31, 6);
       p = match_seq.current;
@@ -11422,21 +13819,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_23;
+          return s_n_llhttp__internal__n_after_start_req_23;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_24:
-    s_n_llhttp__internal__n_start_req_24: {
+    case s_n_llhttp__internal__n_after_start_req_24:
+    s_n_llhttp__internal__n_after_start_req_24: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_24;
+        return s_n_llhttp__internal__n_after_start_req_24;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob32, 3);
       p = match_seq.current;
@@ -11447,21 +13844,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_24;
+          return s_n_llhttp__internal__n_after_start_req_24;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_26:
-    s_n_llhttp__internal__n_start_req_26: {
+    case s_n_llhttp__internal__n_after_start_req_26:
+    s_n_llhttp__internal__n_after_start_req_26: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_26;
+        return s_n_llhttp__internal__n_after_start_req_26;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob33, 7);
       p = match_seq.current;
@@ -11472,21 +13869,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_26;
+          return s_n_llhttp__internal__n_after_start_req_26;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_28:
-    s_n_llhttp__internal__n_start_req_28: {
+    case s_n_llhttp__internal__n_after_start_req_28:
+    s_n_llhttp__internal__n_after_start_req_28: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_28;
+        return s_n_llhttp__internal__n_after_start_req_28;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob34, 6);
       p = match_seq.current;
@@ -11497,19 +13894,19 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_28;
+          return s_n_llhttp__internal__n_after_start_req_28;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_29:
-    s_n_llhttp__internal__n_start_req_29: {
+    case s_n_llhttp__internal__n_after_start_req_29:
+    s_n_llhttp__internal__n_after_start_req_29: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_29;
+        return s_n_llhttp__internal__n_after_start_req_29;
       }
       switch (*p) {
         case 'L': {
@@ -11518,60 +13915,60 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_27:
-    s_n_llhttp__internal__n_start_req_27: {
+    case s_n_llhttp__internal__n_after_start_req_27:
+    s_n_llhttp__internal__n_after_start_req_27: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_27;
+        return s_n_llhttp__internal__n_after_start_req_27;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_28;
+          goto s_n_llhttp__internal__n_after_start_req_28;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_29;
+          goto s_n_llhttp__internal__n_after_start_req_29;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_25:
-    s_n_llhttp__internal__n_start_req_25: {
+    case s_n_llhttp__internal__n_after_start_req_25:
+    s_n_llhttp__internal__n_after_start_req_25: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_25;
+        return s_n_llhttp__internal__n_after_start_req_25;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_26;
+          goto s_n_llhttp__internal__n_after_start_req_26;
         }
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_27;
+          goto s_n_llhttp__internal__n_after_start_req_27;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_30:
-    s_n_llhttp__internal__n_start_req_30: {
+    case s_n_llhttp__internal__n_after_start_req_30:
+    s_n_llhttp__internal__n_after_start_req_30: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_30;
+        return s_n_llhttp__internal__n_after_start_req_30;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob35, 2);
       p = match_seq.current;
@@ -11582,50 +13979,50 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_30;
+          return s_n_llhttp__internal__n_after_start_req_30;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_22:
-    s_n_llhttp__internal__n_start_req_22: {
+    case s_n_llhttp__internal__n_after_start_req_22:
+    s_n_llhttp__internal__n_after_start_req_22: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_22;
+        return s_n_llhttp__internal__n_after_start_req_22;
       }
       switch (*p) {
         case '-': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_23;
+          goto s_n_llhttp__internal__n_after_start_req_23;
         }
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_24;
+          goto s_n_llhttp__internal__n_after_start_req_24;
         }
         case 'K': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_25;
+          goto s_n_llhttp__internal__n_after_start_req_25;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_30;
+          goto s_n_llhttp__internal__n_after_start_req_30;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_31:
-    s_n_llhttp__internal__n_start_req_31: {
+    case s_n_llhttp__internal__n_after_start_req_31:
+    s_n_llhttp__internal__n_after_start_req_31: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_31;
+        return s_n_llhttp__internal__n_after_start_req_31;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob36, 5);
       p = match_seq.current;
@@ -11636,21 +14033,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_31;
+          return s_n_llhttp__internal__n_after_start_req_31;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_32:
-    s_n_llhttp__internal__n_start_req_32: {
+    case s_n_llhttp__internal__n_after_start_req_32:
+    s_n_llhttp__internal__n_after_start_req_32: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_32;
+        return s_n_llhttp__internal__n_after_start_req_32;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob37, 6);
       p = match_seq.current;
@@ -11661,21 +14058,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_32;
+          return s_n_llhttp__internal__n_after_start_req_32;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_35:
-    s_n_llhttp__internal__n_start_req_35: {
+    case s_n_llhttp__internal__n_after_start_req_35:
+    s_n_llhttp__internal__n_after_start_req_35: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_35;
+        return s_n_llhttp__internal__n_after_start_req_35;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob38, 2);
       p = match_seq.current;
@@ -11686,21 +14083,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_35;
+          return s_n_llhttp__internal__n_after_start_req_35;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_36:
-    s_n_llhttp__internal__n_start_req_36: {
+    case s_n_llhttp__internal__n_after_start_req_36:
+    s_n_llhttp__internal__n_after_start_req_36: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_36;
+        return s_n_llhttp__internal__n_after_start_req_36;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob39, 2);
       p = match_seq.current;
@@ -11711,42 +14108,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_36;
+          return s_n_llhttp__internal__n_after_start_req_36;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_34:
-    s_n_llhttp__internal__n_start_req_34: {
+    case s_n_llhttp__internal__n_after_start_req_34:
+    s_n_llhttp__internal__n_after_start_req_34: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_34;
+        return s_n_llhttp__internal__n_after_start_req_34;
       }
       switch (*p) {
         case 'T': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_35;
+          goto s_n_llhttp__internal__n_after_start_req_35;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_36;
+          goto s_n_llhttp__internal__n_after_start_req_36;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_37:
-    s_n_llhttp__internal__n_start_req_37: {
+    case s_n_llhttp__internal__n_after_start_req_37:
+    s_n_llhttp__internal__n_after_start_req_37: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_37;
+        return s_n_llhttp__internal__n_after_start_req_37;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob40, 2);
       p = match_seq.current;
@@ -11757,21 +14154,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_37;
+          return s_n_llhttp__internal__n_after_start_req_37;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_38:
-    s_n_llhttp__internal__n_start_req_38: {
+    case s_n_llhttp__internal__n_after_start_req_38:
+    s_n_llhttp__internal__n_after_start_req_38: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_38;
+        return s_n_llhttp__internal__n_after_start_req_38;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob41, 2);
       p = match_seq.current;
@@ -11782,21 +14179,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_38;
+          return s_n_llhttp__internal__n_after_start_req_38;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_42:
-    s_n_llhttp__internal__n_start_req_42: {
+    case s_n_llhttp__internal__n_after_start_req_42:
+    s_n_llhttp__internal__n_after_start_req_42: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_42;
+        return s_n_llhttp__internal__n_after_start_req_42;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob42, 3);
       p = match_seq.current;
@@ -11807,21 +14204,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_42;
+          return s_n_llhttp__internal__n_after_start_req_42;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_43:
-    s_n_llhttp__internal__n_start_req_43: {
+    case s_n_llhttp__internal__n_after_start_req_43:
+    s_n_llhttp__internal__n_after_start_req_43: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_43;
+        return s_n_llhttp__internal__n_after_start_req_43;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob43, 4);
       p = match_seq.current;
@@ -11832,57 +14229,57 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_43;
+          return s_n_llhttp__internal__n_after_start_req_43;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_41:
-    s_n_llhttp__internal__n_start_req_41: {
+    case s_n_llhttp__internal__n_after_start_req_41:
+    s_n_llhttp__internal__n_after_start_req_41: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_41;
+        return s_n_llhttp__internal__n_after_start_req_41;
       }
       switch (*p) {
         case 'F': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_42;
+          goto s_n_llhttp__internal__n_after_start_req_42;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_43;
+          goto s_n_llhttp__internal__n_after_start_req_43;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_40:
-    s_n_llhttp__internal__n_start_req_40: {
+    case s_n_llhttp__internal__n_after_start_req_40:
+    s_n_llhttp__internal__n_after_start_req_40: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_40;
+        return s_n_llhttp__internal__n_after_start_req_40;
       }
       switch (*p) {
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_41;
+          goto s_n_llhttp__internal__n_after_start_req_41;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_39:
-    s_n_llhttp__internal__n_start_req_39: {
+    case s_n_llhttp__internal__n_after_start_req_39:
+    s_n_llhttp__internal__n_after_start_req_39: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_39;
+        return s_n_llhttp__internal__n_after_start_req_39;
       }
       switch (*p) {
         case 'I': {
@@ -11892,21 +14289,21 @@
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_40;
+          goto s_n_llhttp__internal__n_after_start_req_40;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_45:
-    s_n_llhttp__internal__n_start_req_45: {
+    case s_n_llhttp__internal__n_after_start_req_45:
+    s_n_llhttp__internal__n_after_start_req_45: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_45;
+        return s_n_llhttp__internal__n_after_start_req_45;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob44, 2);
       p = match_seq.current;
@@ -11917,24 +14314,24 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_45;
+          return s_n_llhttp__internal__n_after_start_req_45;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_44:
-    s_n_llhttp__internal__n_start_req_44: {
+    case s_n_llhttp__internal__n_after_start_req_44:
+    s_n_llhttp__internal__n_after_start_req_44: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_44;
+        return s_n_llhttp__internal__n_after_start_req_44;
       }
       switch (*p) {
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_45;
+          goto s_n_llhttp__internal__n_after_start_req_45;
         }
         case 'T': {
           p++;
@@ -11942,51 +14339,51 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_33:
-    s_n_llhttp__internal__n_start_req_33: {
+    case s_n_llhttp__internal__n_after_start_req_33:
+    s_n_llhttp__internal__n_after_start_req_33: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_33;
+        return s_n_llhttp__internal__n_after_start_req_33;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_34;
+          goto s_n_llhttp__internal__n_after_start_req_34;
         }
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_37;
+          goto s_n_llhttp__internal__n_after_start_req_37;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_38;
+          goto s_n_llhttp__internal__n_after_start_req_38;
         }
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_39;
+          goto s_n_llhttp__internal__n_after_start_req_39;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_44;
+          goto s_n_llhttp__internal__n_after_start_req_44;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_48:
-    s_n_llhttp__internal__n_start_req_48: {
+    case s_n_llhttp__internal__n_after_start_req_48:
+    s_n_llhttp__internal__n_after_start_req_48: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_48;
+        return s_n_llhttp__internal__n_after_start_req_48;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob45, 3);
       p = match_seq.current;
@@ -11997,21 +14394,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_48;
+          return s_n_llhttp__internal__n_after_start_req_48;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_49:
-    s_n_llhttp__internal__n_start_req_49: {
+    case s_n_llhttp__internal__n_after_start_req_49:
+    s_n_llhttp__internal__n_after_start_req_49: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_49;
+        return s_n_llhttp__internal__n_after_start_req_49;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob46, 3);
       p = match_seq.current;
@@ -12022,21 +14419,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_49;
+          return s_n_llhttp__internal__n_after_start_req_49;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_50:
-    s_n_llhttp__internal__n_start_req_50: {
+    case s_n_llhttp__internal__n_after_start_req_50:
+    s_n_llhttp__internal__n_after_start_req_50: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_50;
+        return s_n_llhttp__internal__n_after_start_req_50;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob47, 5);
       p = match_seq.current;
@@ -12047,21 +14444,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_50;
+          return s_n_llhttp__internal__n_after_start_req_50;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_51:
-    s_n_llhttp__internal__n_start_req_51: {
+    case s_n_llhttp__internal__n_after_start_req_51:
+    s_n_llhttp__internal__n_after_start_req_51: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_51;
+        return s_n_llhttp__internal__n_after_start_req_51;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob48, 3);
       p = match_seq.current;
@@ -12072,67 +14469,67 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_51;
+          return s_n_llhttp__internal__n_after_start_req_51;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_47:
-    s_n_llhttp__internal__n_start_req_47: {
+    case s_n_llhttp__internal__n_after_start_req_47:
+    s_n_llhttp__internal__n_after_start_req_47: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_47;
+        return s_n_llhttp__internal__n_after_start_req_47;
       }
       switch (*p) {
         case 'B': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_48;
+          goto s_n_llhttp__internal__n_after_start_req_48;
         }
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_49;
+          goto s_n_llhttp__internal__n_after_start_req_49;
         }
         case 'D': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_50;
+          goto s_n_llhttp__internal__n_after_start_req_50;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_51;
+          goto s_n_llhttp__internal__n_after_start_req_51;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_46:
-    s_n_llhttp__internal__n_start_req_46: {
+    case s_n_llhttp__internal__n_after_start_req_46:
+    s_n_llhttp__internal__n_after_start_req_46: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_46;
+        return s_n_llhttp__internal__n_after_start_req_46;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_47;
+          goto s_n_llhttp__internal__n_after_start_req_47;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_54:
-    s_n_llhttp__internal__n_start_req_54: {
+    case s_n_llhttp__internal__n_after_start_req_54:
+    s_n_llhttp__internal__n_after_start_req_54: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_54;
+        return s_n_llhttp__internal__n_after_start_req_54;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob49, 3);
       p = match_seq.current;
@@ -12143,19 +14540,19 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_54;
+          return s_n_llhttp__internal__n_after_start_req_54;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_56:
-    s_n_llhttp__internal__n_start_req_56: {
+    case s_n_llhttp__internal__n_after_start_req_56:
+    s_n_llhttp__internal__n_after_start_req_56: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_56;
+        return s_n_llhttp__internal__n_after_start_req_56;
       }
       switch (*p) {
         case 'P': {
@@ -12164,18 +14561,18 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_57:
-    s_n_llhttp__internal__n_start_req_57: {
+    case s_n_llhttp__internal__n_after_start_req_57:
+    s_n_llhttp__internal__n_after_start_req_57: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_57;
+        return s_n_llhttp__internal__n_after_start_req_57;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob50, 9);
       p = match_seq.current;
@@ -12186,63 +14583,63 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_57;
+          return s_n_llhttp__internal__n_after_start_req_57;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_55:
-    s_n_llhttp__internal__n_start_req_55: {
+    case s_n_llhttp__internal__n_after_start_req_55:
+    s_n_llhttp__internal__n_after_start_req_55: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_55;
+        return s_n_llhttp__internal__n_after_start_req_55;
       }
       switch (*p) {
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_56;
+          goto s_n_llhttp__internal__n_after_start_req_56;
         }
         case '_': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_57;
+          goto s_n_llhttp__internal__n_after_start_req_57;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_53:
-    s_n_llhttp__internal__n_start_req_53: {
+    case s_n_llhttp__internal__n_after_start_req_53:
+    s_n_llhttp__internal__n_after_start_req_53: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_53;
+        return s_n_llhttp__internal__n_after_start_req_53;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_54;
+          goto s_n_llhttp__internal__n_after_start_req_54;
         }
         case 'T': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_55;
+          goto s_n_llhttp__internal__n_after_start_req_55;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_58:
-    s_n_llhttp__internal__n_start_req_58: {
+    case s_n_llhttp__internal__n_after_start_req_58:
+    s_n_llhttp__internal__n_after_start_req_58: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_58;
+        return s_n_llhttp__internal__n_after_start_req_58;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob51, 4);
       p = match_seq.current;
@@ -12253,21 +14650,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_58;
+          return s_n_llhttp__internal__n_after_start_req_58;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_59:
-    s_n_llhttp__internal__n_start_req_59: {
+    case s_n_llhttp__internal__n_after_start_req_59:
+    s_n_llhttp__internal__n_after_start_req_59: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_59;
+        return s_n_llhttp__internal__n_after_start_req_59;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob52, 7);
       p = match_seq.current;
@@ -12278,46 +14675,46 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_59;
+          return s_n_llhttp__internal__n_after_start_req_59;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_52:
-    s_n_llhttp__internal__n_start_req_52: {
+    case s_n_llhttp__internal__n_after_start_req_52:
+    s_n_llhttp__internal__n_after_start_req_52: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_52;
+        return s_n_llhttp__internal__n_after_start_req_52;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_53;
+          goto s_n_llhttp__internal__n_after_start_req_53;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_58;
+          goto s_n_llhttp__internal__n_after_start_req_58;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_59;
+          goto s_n_llhttp__internal__n_after_start_req_59;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_61:
-    s_n_llhttp__internal__n_start_req_61: {
+    case s_n_llhttp__internal__n_after_start_req_61:
+    s_n_llhttp__internal__n_after_start_req_61: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_61;
+        return s_n_llhttp__internal__n_after_start_req_61;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob53, 6);
       p = match_seq.current;
@@ -12328,21 +14725,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_61;
+          return s_n_llhttp__internal__n_after_start_req_61;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_62:
-    s_n_llhttp__internal__n_start_req_62: {
+    case s_n_llhttp__internal__n_after_start_req_62:
+    s_n_llhttp__internal__n_after_start_req_62: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_62;
+        return s_n_llhttp__internal__n_after_start_req_62;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob54, 3);
       p = match_seq.current;
@@ -12353,42 +14750,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_62;
+          return s_n_llhttp__internal__n_after_start_req_62;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_60:
-    s_n_llhttp__internal__n_start_req_60: {
+    case s_n_llhttp__internal__n_after_start_req_60:
+    s_n_llhttp__internal__n_after_start_req_60: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_60;
+        return s_n_llhttp__internal__n_after_start_req_60;
       }
       switch (*p) {
         case 'E': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_61;
+          goto s_n_llhttp__internal__n_after_start_req_61;
         }
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_62;
+          goto s_n_llhttp__internal__n_after_start_req_62;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_65:
-    s_n_llhttp__internal__n_start_req_65: {
+    case s_n_llhttp__internal__n_after_start_req_65:
+    s_n_llhttp__internal__n_after_start_req_65: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_65;
+        return s_n_llhttp__internal__n_after_start_req_65;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob55, 3);
       p = match_seq.current;
@@ -12399,21 +14796,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_65;
+          return s_n_llhttp__internal__n_after_start_req_65;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_67:
-    s_n_llhttp__internal__n_start_req_67: {
+    case s_n_llhttp__internal__n_after_start_req_67:
+    s_n_llhttp__internal__n_after_start_req_67: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_67;
+        return s_n_llhttp__internal__n_after_start_req_67;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob56, 2);
       p = match_seq.current;
@@ -12424,21 +14821,21 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_67;
+          return s_n_llhttp__internal__n_after_start_req_67;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_68:
-    s_n_llhttp__internal__n_start_req_68: {
+    case s_n_llhttp__internal__n_after_start_req_68:
+    s_n_llhttp__internal__n_after_start_req_68: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_68;
+        return s_n_llhttp__internal__n_after_start_req_68;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob57, 2);
       p = match_seq.current;
@@ -12449,42 +14846,42 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_68;
+          return s_n_llhttp__internal__n_after_start_req_68;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_66:
-    s_n_llhttp__internal__n_start_req_66: {
+    case s_n_llhttp__internal__n_after_start_req_66:
+    s_n_llhttp__internal__n_after_start_req_66: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_66;
+        return s_n_llhttp__internal__n_after_start_req_66;
       }
       switch (*p) {
         case 'I': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_67;
+          goto s_n_llhttp__internal__n_after_start_req_67;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_68;
+          goto s_n_llhttp__internal__n_after_start_req_68;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_69:
-    s_n_llhttp__internal__n_start_req_69: {
+    case s_n_llhttp__internal__n_after_start_req_69:
+    s_n_llhttp__internal__n_after_start_req_69: {
       llparse_match_t match_seq;
       
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_69;
+        return s_n_llhttp__internal__n_after_start_req_69;
       }
       match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob58, 8);
       p = match_seq.current;
@@ -12495,139 +14892,154 @@
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         case kMatchPause: {
-          return s_n_llhttp__internal__n_start_req_69;
+          return s_n_llhttp__internal__n_after_start_req_69;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_64:
-    s_n_llhttp__internal__n_start_req_64: {
+    case s_n_llhttp__internal__n_after_start_req_64:
+    s_n_llhttp__internal__n_after_start_req_64: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_64;
+        return s_n_llhttp__internal__n_after_start_req_64;
       }
       switch (*p) {
         case 'B': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_65;
+          goto s_n_llhttp__internal__n_after_start_req_65;
         }
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_66;
+          goto s_n_llhttp__internal__n_after_start_req_66;
         }
         case 'S': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_69;
+          goto s_n_llhttp__internal__n_after_start_req_69;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req_63:
-    s_n_llhttp__internal__n_start_req_63: {
+    case s_n_llhttp__internal__n_after_start_req_63:
+    s_n_llhttp__internal__n_after_start_req_63: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req_63;
+        return s_n_llhttp__internal__n_after_start_req_63;
       }
       switch (*p) {
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_64;
+          goto s_n_llhttp__internal__n_after_start_req_64;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_start_req:
-    s_n_llhttp__internal__n_start_req: {
+    case s_n_llhttp__internal__n_after_start_req:
+    s_n_llhttp__internal__n_after_start_req: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_start_req;
+        return s_n_llhttp__internal__n_after_start_req;
       }
       switch (*p) {
         case 'A': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_1;
+          goto s_n_llhttp__internal__n_after_start_req_1;
         }
         case 'B': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_4;
+          goto s_n_llhttp__internal__n_after_start_req_4;
         }
         case 'C': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_5;
+          goto s_n_llhttp__internal__n_after_start_req_5;
         }
         case 'D': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_10;
+          goto s_n_llhttp__internal__n_after_start_req_10;
         }
         case 'F': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_14;
+          goto s_n_llhttp__internal__n_after_start_req_14;
         }
         case 'G': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_15;
+          goto s_n_llhttp__internal__n_after_start_req_15;
         }
         case 'H': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_18;
+          goto s_n_llhttp__internal__n_after_start_req_18;
         }
         case 'L': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_19;
+          goto s_n_llhttp__internal__n_after_start_req_19;
         }
         case 'M': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_22;
+          goto s_n_llhttp__internal__n_after_start_req_22;
         }
         case 'N': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_31;
+          goto s_n_llhttp__internal__n_after_start_req_31;
         }
         case 'O': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_32;
+          goto s_n_llhttp__internal__n_after_start_req_32;
         }
         case 'P': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_33;
+          goto s_n_llhttp__internal__n_after_start_req_33;
         }
         case 'R': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_46;
+          goto s_n_llhttp__internal__n_after_start_req_46;
         }
         case 'S': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_52;
+          goto s_n_llhttp__internal__n_after_start_req_52;
         }
         case 'T': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_60;
+          goto s_n_llhttp__internal__n_after_start_req_60;
         }
         case 'U': {
           p++;
-          goto s_n_llhttp__internal__n_start_req_63;
+          goto s_n_llhttp__internal__n_after_start_req_63;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_49;
+          goto s_n_llhttp__internal__n_error_82;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_method_1:
+    s_n_llhttp__internal__n_span_start_llhttp__on_method_1: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_method_1;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_method;
+      goto s_n_llhttp__internal__n_after_start_req;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_invoke_llhttp__on_status_complete:
     s_n_llhttp__internal__n_invoke_llhttp__on_status_complete: {
       switch (llhttp__on_status_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_headers_start;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_20;
         default:
-          goto s_n_llhttp__internal__n_header_field_start;
+          goto s_n_llhttp__internal__n_error_68;
       }
       /* UNREACHABLE */;
       abort();
@@ -12711,16 +15123,142 @@
           goto s_n_llhttp__internal__n_res_status_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_43;
+          goto s_n_llhttp__internal__n_error_69;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_res_status_code_digit_3:
+    s_n_llhttp__internal__n_res_status_code_digit_3: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_res_status_code_digit_3;
+      }
+      switch (*p) {
+        case '0': {
+          p++;
+          match = 0;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '1': {
+          p++;
+          match = 1;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '2': {
+          p++;
+          match = 2;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '3': {
+          p++;
+          match = 3;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '4': {
+          p++;
+          match = 4;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '5': {
+          p++;
+          match = 5;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '6': {
+          p++;
+          match = 6;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '7': {
+          p++;
+          match = 7;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '8': {
+          p++;
+          match = 8;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        case '9': {
+          p++;
+          match = 9;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_error_71;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_res_status_code:
-    s_n_llhttp__internal__n_res_status_code: {
+    case s_n_llhttp__internal__n_res_status_code_digit_2:
+    s_n_llhttp__internal__n_res_status_code_digit_2: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_res_status_code;
+        return s_n_llhttp__internal__n_res_status_code_digit_2;
+      }
+      switch (*p) {
+        case '0': {
+          p++;
+          match = 0;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '1': {
+          p++;
+          match = 1;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '2': {
+          p++;
+          match = 2;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '3': {
+          p++;
+          match = 3;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '4': {
+          p++;
+          match = 4;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '5': {
+          p++;
+          match = 5;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '6': {
+          p++;
+          match = 6;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '7': {
+          p++;
+          match = 7;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '8': {
+          p++;
+          match = 8;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        case '9': {
+          p++;
+          match = 9;
+          goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
+        }
+        default: {
+          goto s_n_llhttp__internal__n_error_73;
+        }
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_res_status_code_digit_1:
+    s_n_llhttp__internal__n_res_status_code_digit_1: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_res_status_code_digit_1;
       }
       switch (*p) {
         case '0': {
@@ -12774,16 +15312,16 @@
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_res_status_code_otherwise;
+          goto s_n_llhttp__internal__n_error_75;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
-    case s_n_llhttp__internal__n_res_http_end:
-    s_n_llhttp__internal__n_res_http_end: {
+    case s_n_llhttp__internal__n_res_after_version:
+    s_n_llhttp__internal__n_res_after_version: {
       if (p == endp) {
-        return s_n_llhttp__internal__n_res_http_end;
+        return s_n_llhttp__internal__n_res_after_version;
       }
       switch (*p) {
         case ' ': {
@@ -12791,12 +15329,45 @@
           goto s_n_llhttp__internal__n_invoke_update_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_44;
+          goto s_n_llhttp__internal__n_error_76;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1:
+    s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1: {
+      switch (llhttp__on_version_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_res_after_version;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_21;
+        default:
+          goto s_n_llhttp__internal__n_error_67;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_66:
+    s_n_llhttp__internal__n_error_66: {
+      state->error = 0x9;
+      state->reason = "Invalid HTTP version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
+    case s_n_llhttp__internal__n_error_77:
+    s_n_llhttp__internal__n_error_77: {
+      state->error = 0x9;
+      state->reason = "Invalid minor version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_res_http_minor:
     s_n_llhttp__internal__n_res_http_minor: {
       if (p == endp) {
@@ -12854,12 +15425,22 @@
           goto s_n_llhttp__internal__n_invoke_store_http_minor_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_45;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_7;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_78:
+    s_n_llhttp__internal__n_error_78: {
+      state->error = 0x9;
+      state->reason = "Expected dot";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_res_http_dot:
     s_n_llhttp__internal__n_res_http_dot: {
       if (p == endp) {
@@ -12871,12 +15452,22 @@
           goto s_n_llhttp__internal__n_res_http_minor;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_46;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_8;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_error_79:
+    s_n_llhttp__internal__n_error_79: {
+      state->error = 0x9;
+      state->reason = "Invalid major version";
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_error;
+      return s_error;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_res_http_major:
     s_n_llhttp__internal__n_res_http_major: {
       if (p == endp) {
@@ -12934,12 +15525,23 @@
           goto s_n_llhttp__internal__n_invoke_store_http_major_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_47;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_version_9;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_version_1:
+    s_n_llhttp__internal__n_span_start_llhttp__on_version_1: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_version_1;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_version;
+      goto s_n_llhttp__internal__n_res_http_major;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_start_res:
     s_n_llhttp__internal__n_start_res: {
       llparse_match_t match_seq;
@@ -12952,18 +15554,31 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_res_http_major;
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_version_1;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_start_res;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_50;
+          goto s_n_llhttp__internal__n_error_83;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_llhttp__on_method_complete:
+    s_n_llhttp__internal__n_invoke_llhttp__on_method_complete: {
+      switch (llhttp__on_method_complete(state, p, endp)) {
+        case 0:
+          goto s_n_llhttp__internal__n_req_first_space_before_url;
+        case 21:
+          goto s_n_llhttp__internal__n_pause_19;
+        default:
+          goto s_n_llhttp__internal__n_error_1;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_or_res_method_2:
     s_n_llhttp__internal__n_req_or_res_method_2: {
       llparse_match_t match_seq;
@@ -12983,12 +15598,21 @@
           return s_n_llhttp__internal__n_req_or_res_method_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_48;
+          goto s_n_llhttp__internal__n_error_80;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_update_type_1:
+    s_n_llhttp__internal__n_invoke_update_type_1: {
+      switch (llhttp__internal__c_update_type_1(state, p, endp)) {
+        default:
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_version_1;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_req_or_res_method_3:
     s_n_llhttp__internal__n_req_or_res_method_3: {
       llparse_match_t match_seq;
@@ -13001,13 +15625,13 @@
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_invoke_update_type_1;
+          goto s_n_llhttp__internal__n_span_end_llhttp__on_method_1;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_req_or_res_method_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_48;
+          goto s_n_llhttp__internal__n_error_80;
         }
       }
       /* UNREACHABLE */;
@@ -13028,7 +15652,7 @@
           goto s_n_llhttp__internal__n_req_or_res_method_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_48;
+          goto s_n_llhttp__internal__n_error_80;
         }
       }
       /* UNREACHABLE */;
@@ -13045,12 +15669,23 @@
           goto s_n_llhttp__internal__n_req_or_res_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_48;
+          goto s_n_llhttp__internal__n_error_80;
         }
       }
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_span_start_llhttp__on_method:
+    s_n_llhttp__internal__n_span_start_llhttp__on_method: {
+      if (p == endp) {
+        return s_n_llhttp__internal__n_span_start_llhttp__on_method;
+      }
+      state->_span_pos0 = (void*) p;
+      state->_span_cb0 = llhttp__on_method;
+      goto s_n_llhttp__internal__n_req_or_res_method;
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_start_req_or_res:
     s_n_llhttp__internal__n_start_req_or_res: {
       if (p == endp) {
@@ -13058,7 +15693,7 @@
       }
       switch (*p) {
         case 'H': {
-          goto s_n_llhttp__internal__n_req_or_res_method;
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_method;
         }
         default: {
           goto s_n_llhttp__internal__n_invoke_update_type_2;
@@ -13071,7 +15706,7 @@
     s_n_llhttp__internal__n_invoke_load_type: {
       switch (llhttp__internal__c_load_type(state, p, endp)) {
         case 1:
-          goto s_n_llhttp__internal__n_start_req;
+          goto s_n_llhttp__internal__n_span_start_llhttp__on_method_1;
         case 2:
           goto s_n_llhttp__internal__n_start_res;
         default:
@@ -13080,6 +15715,15 @@
       /* UNREACHABLE */;
       abort();
     }
+    case s_n_llhttp__internal__n_invoke_update_finish:
+    s_n_llhttp__internal__n_invoke_update_finish: {
+      switch (llhttp__internal__c_update_finish(state, p, endp)) {
+        default:
+          goto s_n_llhttp__internal__n_invoke_llhttp__on_message_begin;
+      }
+      /* UNREACHABLE */;
+      abort();
+    }
     case s_n_llhttp__internal__n_start:
     s_n_llhttp__internal__n_start: {
       if (p == endp) {
@@ -13095,7 +15739,7 @@
           goto s_n_llhttp__internal__n_start;
         }
         default: {
-          goto s_n_llhttp__internal__n_invoke_update_finish;
+          goto s_n_llhttp__internal__n_invoke_load_initial_message_completed;
         }
       }
       /* UNREACHABLE */;
@@ -13105,7 +15749,7 @@
       /* UNREACHABLE */
       abort();
   }
-  s_n_llhttp__internal__n_error_37: {
+  s_n_llhttp__internal__n_error_61: {
     state->error = 0x7;
     state->reason = "Invalid characters in url";
     state->error_pos = (const char*) p;
@@ -13122,10 +15766,26 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags: {
-    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
-      case 1:
+  s_n_llhttp__internal__n_invoke_update_initial_message_completed: {
+    switch (llhttp__internal__c_update_initial_message_completed(state, p, endp)) {
+      default:
         goto s_n_llhttp__internal__n_invoke_update_finish_2;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_content_length: {
+    switch (llhttp__internal__c_update_content_length(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_invoke_update_initial_message_completed;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_1: {
+    switch (llhttp__internal__c_test_lenient_flags_1(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_update_initial_message_completed;
       default:
         goto s_n_llhttp__internal__n_closed;
     }
@@ -13135,12 +15795,12 @@
   s_n_llhttp__internal__n_invoke_update_finish_1: {
     switch (llhttp__internal__c_update_finish_1(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_1;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_5: {
+  s_n_llhttp__internal__n_pause_11: {
     state->error = 0x15;
     state->reason = "on_message_complete pause";
     state->error_pos = (const char*) p;
@@ -13149,7 +15809,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_9: {
+  s_n_llhttp__internal__n_error_24: {
     state->error = 0x12;
     state->reason = "`on_message_complete` callback error";
     state->error_pos = (const char*) p;
@@ -13158,7 +15818,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_7: {
+  s_n_llhttp__internal__n_pause_13: {
     state->error = 0x15;
     state->reason = "on_chunk_complete pause";
     state->error_pos = (const char*) p;
@@ -13167,7 +15827,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_12: {
+  s_n_llhttp__internal__n_error_27: {
     state->error = 0x14;
     state->reason = "`on_chunk_complete` callback error";
     state->error_pos = (const char*) p;
@@ -13181,14 +15841,14 @@
       case 0:
         goto s_n_llhttp__internal__n_invoke_llhttp__on_message_complete_2;
       case 21:
-        goto s_n_llhttp__internal__n_pause_7;
+        goto s_n_llhttp__internal__n_pause_13;
       default:
-        goto s_n_llhttp__internal__n_error_12;
+        goto s_n_llhttp__internal__n_error_27;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_11: {
+  s_n_llhttp__internal__n_error_26: {
     state->error = 0x4;
     state->reason = "Content-Length can't be present with Transfer-Encoding";
     state->error_pos = (const char*) p;
@@ -13206,7 +15866,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_3: {
+  s_n_llhttp__internal__n_error_6: {
     state->error = 0x12;
     state->reason = "`on_message_complete` callback error";
     state->error_pos = (const char*) p;
@@ -13222,12 +15882,12 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_2;
       default:
-        goto s_n_llhttp__internal__n_error_3;
+        goto s_n_llhttp__internal__n_error_6;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_7: {
+  s_n_llhttp__internal__n_error_22: {
     state->error = 0xc;
     state->reason = "Chunk size overflow";
     state->error_pos = (const char*) p;
@@ -13240,12 +15900,12 @@
     state->error = 0x15;
     state->reason = "on_chunk_complete pause";
     state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_content_length;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_content_length_1;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_5: {
+  s_n_llhttp__internal__n_error_8: {
     state->error = 0x14;
     state->reason = "`on_chunk_complete` callback error";
     state->error_pos = (const char*) p;
@@ -13257,11 +15917,11 @@
   s_n_llhttp__internal__n_invoke_llhttp__on_chunk_complete: {
     switch (llhttp__on_chunk_complete(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_invoke_update_content_length;
+        goto s_n_llhttp__internal__n_invoke_update_content_length_1;
       case 21:
         goto s_n_llhttp__internal__n_pause_3;
       default:
-        goto s_n_llhttp__internal__n_error_5;
+        goto s_n_llhttp__internal__n_error_8;
     }
     /* UNREACHABLE */;
     abort();
@@ -13300,7 +15960,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_4: {
+  s_n_llhttp__internal__n_error_7: {
     state->error = 0x13;
     state->reason = "`on_chunk_header` callback error";
     state->error_pos = (const char*) p;
@@ -13316,12 +15976,320 @@
       case 21:
         goto s_n_llhttp__internal__n_pause_4;
       default:
-        goto s_n_llhttp__internal__n_error_4;
+        goto s_n_llhttp__internal__n_error_7;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_6: {
+  s_n_llhttp__internal__n_error_9: {
+    state->error = 0x2;
+    state->reason = "Invalid character in chunk extensions";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_10: {
+    state->error = 0x2;
+    state->reason = "Invalid character in chunk extensions";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_5: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_name pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_almost_done;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_11: {
+    state->error = 0x22;
+    state->reason = "`on_chunk_extension_name` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_6: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_name pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_extensions;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_12: {
+    state->error = 0x22;
+    state->reason = "`on_chunk_extension_name` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_7: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_value pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_almost_done;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_14: {
+    state->error = 0x23;
+    state->reason = "`on_chunk_extension_value` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_16: {
+    state->error = 0x2;
+    state->reason = "Invalid character in chunk extensions quote value";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_8: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_value pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_extension_quoted_value_done;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_15: {
+    state->error = 0x23;
+    state->reason = "`on_chunk_extension_value` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_17;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_17;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_9: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_value pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_otherwise;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_18: {
+    state->error = 0x23;
+    state->reason = "`on_chunk_extension_value` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_3: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_value_complete_2;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_value_4: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_19;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_19;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_10: {
+    state->error = 0x15;
+    state->reason = "on_chunk_extension_name pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_extension_value;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_13: {
+    state->error = 0x22;
+    state->reason = "`on_chunk_extension_name` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_llhttp__on_chunk_extension_name_complete_2: {
+    switch (llhttp__on_chunk_extension_name_complete(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_chunk_extension_value;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_10;
+      default:
+        goto s_n_llhttp__internal__n_error_13;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_span_start_llhttp__on_chunk_extension_value;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_chunk_extension_name_3: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_chunk_extension_name(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_20;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_20;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_21: {
     state->error = 0xc;
     state->reason = "Invalid character in chunk size";
     state->error_pos = (const char*) p;
@@ -13333,14 +16301,14 @@
   s_n_llhttp__internal__n_invoke_mul_add_content_length: {
     switch (llhttp__internal__c_mul_add_content_length(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_7;
+        goto s_n_llhttp__internal__n_error_22;
       default:
         goto s_n_llhttp__internal__n_chunk_size;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_8: {
+  s_n_llhttp__internal__n_error_23: {
     state->error = 0xc;
     state->reason = "Invalid character in chunk size";
     state->error_pos = (const char*) p;
@@ -13374,7 +16342,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_10: {
+  s_n_llhttp__internal__n_error_25: {
     state->error = 0xf;
     state->reason = "Request has invalid `Transfer-Encoding`";
     state->error_pos = (const char*) p;
@@ -13392,7 +16360,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_2: {
+  s_n_llhttp__internal__n_error_5: {
     state->error = 0x12;
     state->reason = "`on_message_complete` callback error";
     state->error_pos = (const char*) p;
@@ -13408,7 +16376,7 @@
       case 21:
         goto s_n_llhttp__internal__n_pause;
       default:
-        goto s_n_llhttp__internal__n_error_2;
+        goto s_n_llhttp__internal__n_error_5;
     }
     /* UNREACHABLE */;
     abort();
@@ -13437,7 +16405,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_6: {
+  s_n_llhttp__internal__n_pause_12: {
     state->error = 0x15;
     state->reason = "Paused by on_headers_complete";
     state->error_pos = (const char*) p;
@@ -13446,7 +16414,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_1: {
+  s_n_llhttp__internal__n_error_4: {
     state->error = 0x11;
     state->reason = "User callback error";
     state->error_pos = (const char*) p;
@@ -13464,9 +16432,9 @@
       case 2:
         goto s_n_llhttp__internal__n_invoke_update_upgrade;
       case 21:
-        goto s_n_llhttp__internal__n_pause_6;
+        goto s_n_llhttp__internal__n_pause_12;
       default:
-        goto s_n_llhttp__internal__n_error_1;
+        goto s_n_llhttp__internal__n_error_4;
     }
     /* UNREACHABLE */;
     abort();
@@ -13479,10 +16447,10 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_1: {
-    switch (llhttp__internal__c_test_lenient_flags_1(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_2: {
+    switch (llhttp__internal__c_test_lenient_flags_2(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_error_11;
+        goto s_n_llhttp__internal__n_error_26;
       default:
         goto s_n_llhttp__internal__n_invoke_llhttp__before_headers_complete;
     }
@@ -13492,7 +16460,7 @@
   s_n_llhttp__internal__n_invoke_test_flags_1: {
     switch (llhttp__internal__c_test_flags_1(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_1;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_2;
       default:
         goto s_n_llhttp__internal__n_invoke_llhttp__before_headers_complete;
     }
@@ -13509,7 +16477,35 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_13: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_field: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_field(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) (p + 1);
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_28;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_28;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_3: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_field_colon_discard_ws;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_32: {
     state->error = 0xb;
     state->reason = "Empty Content-Length";
     state->error_pos = (const char*) p;
@@ -13518,6 +16514,24 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_pause_14: {
+    state->error = 0x15;
+    state->reason = "on_header_value_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_field_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_31: {
+    state->error = 0x1d;
+    state->reason = "`on_header_value_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_span_end_llhttp__on_header_value: {
     const unsigned char* start;
     int err;
@@ -13594,14 +16608,51 @@
   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_13;
+        goto s_n_llhttp__internal__n_error_32;
       default:
         goto s_n_llhttp__internal__n_invoke_load_header_state_1;
     }
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_error_30: {
+    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_4: {
+    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_30;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_update_header_state_1: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_header_state_3: {
+    switch (llhttp__internal__c_load_header_state(state, p, endp)) {
+      case 8:
+        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+      default:
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_header_value_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_header_state_2: {
     switch (llhttp__internal__c_update_header_state(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_invoke_llhttp__on_header_value_complete;
@@ -13612,7 +16663,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_7: {
     switch (llhttp__internal__c_or_flags_3(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_2;
     }
     /* UNREACHABLE */;
     abort();
@@ -13620,7 +16671,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_8: {
     switch (llhttp__internal__c_or_flags_4(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_2;
     }
     /* UNREACHABLE */;
     abort();
@@ -13628,7 +16679,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_9: {
     switch (llhttp__internal__c_or_flags_5(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_1;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_2;
     }
     /* UNREACHABLE */;
     abort();
@@ -13641,7 +16692,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_load_header_state_3: {
+  s_n_llhttp__internal__n_invoke_load_header_state_4: {
     switch (llhttp__internal__c_load_header_state(state, p, endp)) {
       case 5:
         goto s_n_llhttp__internal__n_invoke_or_flags_7;
@@ -13657,7 +16708,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_14: {
+  s_n_llhttp__internal__n_error_33: {
     state->error = 0x3;
     state->reason = "Missing expected LF after header value";
     state->error_pos = (const char*) p;
@@ -13675,15 +16726,16 @@
     err = llhttp__on_header_value(state, start, p);
     if (err != 0) {
       state->error = err;
-      state->error_pos = (const char*) p;
+      state->error_pos = (const char*) (p + 1);
       state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_value_almost_done;
       return s_error;
     }
+    p++;
     goto s_n_llhttp__internal__n_header_value_almost_done;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3: {
     const unsigned char* start;
     int err;
     
@@ -13692,16 +16744,15 @@
     err = llhttp__on_header_value(state, start, p);
     if (err != 0) {
       state->error = err;
-      state->error_pos = (const char*) (p + 1);
+      state->error_pos = (const char*) p;
       state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_value_almost_done;
       return s_error;
     }
-    p++;
     goto s_n_llhttp__internal__n_header_value_almost_done;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_3: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4: {
     const unsigned char* start;
     int err;
     
@@ -13719,26 +16770,34 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_15: {
-    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;
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_value(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_34;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_34;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_test_lenient_flags_2: {
-    switch (llhttp__internal__c_test_lenient_flags_2(state, p, endp)) {
+  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_lenient;
       default:
-        goto s_n_llhttp__internal__n_error_15;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_3: {
+  s_n_llhttp__internal__n_invoke_update_header_state_4: {
     switch (llhttp__internal__c_update_header_state(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection;
@@ -13749,7 +16808,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_11: {
     switch (llhttp__internal__c_or_flags_3(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_3;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_4;
     }
     /* UNREACHABLE */;
     abort();
@@ -13757,7 +16816,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_12: {
     switch (llhttp__internal__c_or_flags_4(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_3;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_4;
     }
     /* UNREACHABLE */;
     abort();
@@ -13765,7 +16824,7 @@
   s_n_llhttp__internal__n_invoke_or_flags_13: {
     switch (llhttp__internal__c_or_flags_5(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_3;
+        goto s_n_llhttp__internal__n_invoke_update_header_state_4;
     }
     /* UNREACHABLE */;
     abort();
@@ -13778,7 +16837,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_load_header_state_4: {
+  s_n_llhttp__internal__n_invoke_load_header_state_5: {
     switch (llhttp__internal__c_load_header_state(state, p, endp)) {
       case 5:
         goto s_n_llhttp__internal__n_invoke_or_flags_11;
@@ -13794,39 +16853,39 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_4: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_5: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_token;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_2: {
-    switch (llhttp__internal__c_update_header_state_2(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_3: {
+    switch (llhttp__internal__c_update_header_state_3(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_ws;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_5: {
-    switch (llhttp__internal__c_update_header_state_5(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_6: {
+    switch (llhttp__internal__c_update_header_state_6(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_ws;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_6: {
-    switch (llhttp__internal__c_update_header_state_6(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_7: {
+    switch (llhttp__internal__c_update_header_state_7(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_connection_ws;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5: {
     const unsigned char* start;
     int err;
     
@@ -13836,17 +16895,17 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_17;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_36;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_17;
+    goto s_n_llhttp__internal__n_error_36;
     /* UNREACHABLE */;
     abort();
   }
   s_n_llhttp__internal__n_invoke_mul_add_content_length_1: {
     switch (llhttp__internal__c_mul_add_content_length_1(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_4;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5;
       default:
         goto s_n_llhttp__internal__n_header_value_content_length;
     }
@@ -13861,7 +16920,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_5: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_6: {
     const unsigned char* start;
     int err;
     
@@ -13871,14 +16930,14 @@
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_18;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_37;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_18;
+    goto s_n_llhttp__internal__n_error_37;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_16: {
+  s_n_llhttp__internal__n_error_35: {
     state->error = 0x4;
     state->reason = "Duplicate Content-Length";
     state->error_pos = (const char*) p;
@@ -13892,21 +16951,77 @@
       case 0:
         goto s_n_llhttp__internal__n_header_value_content_length;
       default:
-        goto s_n_llhttp__internal__n_error_16;
+        goto s_n_llhttp__internal__n_error_35;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_7: {
-    switch (llhttp__internal__c_update_header_state_7(state, p, endp)) {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_8: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_value(state, start, p);
+    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;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_39;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_header_state_8: {
+    switch (llhttp__internal__c_update_header_state_8(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value_otherwise;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_8: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_value_7: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_header_value(state, start, p);
+    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;
+      return s_error;
+    }
+    p++;
+    goto s_n_llhttp__internal__n_error_38;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_6: {
+    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_7;
+      default:
+        goto s_n_llhttp__internal__n_header_value_te_chunked;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  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;
+      default:
+        goto s_n_llhttp__internal__n_header_value_te_chunked;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_header_state_9: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_value;
     }
@@ -13921,6 +17036,34 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_invoke_or_flags_17: {
+    switch (llhttp__internal__c_or_flags_16(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_invoke_and_flags;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_7: {
+    switch (llhttp__internal__c_test_lenient_flags_6(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_8;
+      default:
+        goto s_n_llhttp__internal__n_invoke_or_flags_17;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  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;
+      default:
+        goto s_n_llhttp__internal__n_invoke_or_flags_17;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_or_flags_16: {
     switch (llhttp__internal__c_or_flags_16(state, p, endp)) {
       default:
@@ -13929,10 +17072,20 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_or_flags_17: {
-    switch (llhttp__internal__c_or_flags_17(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_test_flags_3: {
+    switch (llhttp__internal__c_test_flags_3(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_load_type_2;
       default:
-        goto s_n_llhttp__internal__n_invoke_update_header_state_8;
+        goto s_n_llhttp__internal__n_invoke_or_flags_16;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_or_flags_18: {
+    switch (llhttp__internal__c_or_flags_18(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_invoke_update_header_state_9;
     }
     /* UNREACHABLE */;
     abort();
@@ -13944,16 +17097,34 @@
       case 2:
         goto s_n_llhttp__internal__n_invoke_test_flags_2;
       case 3:
-        goto s_n_llhttp__internal__n_invoke_or_flags_16;
+        goto s_n_llhttp__internal__n_invoke_test_flags_3;
       case 4:
-        goto s_n_llhttp__internal__n_invoke_or_flags_17;
+        goto s_n_llhttp__internal__n_invoke_or_flags_18;
       default:
         goto s_n_llhttp__internal__n_header_value;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_field: {
+  s_n_llhttp__internal__n_pause_15: {
+    state->error = 0x15;
+    state->reason = "on_header_field_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_header_value_discard_ws;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_29: {
+    state->error = 0x1c;
+    state->reason = "`on_header_field_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1: {
     const unsigned char* start;
     int err;
     
@@ -13971,7 +17142,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_span_end_llhttp__on_header_field_1: {
+  s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2: {
     const unsigned char* start;
     int err;
     
@@ -13989,7 +17160,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_19: {
+  s_n_llhttp__internal__n_error_40: {
     state->error = 0xa;
     state->reason = "Invalid header token";
     state->error_pos = (const char*) p;
@@ -13998,8 +17169,8 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_9: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_10: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_field_general;
     }
@@ -14014,18 +17185,59 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_header_state_10: {
-    switch (llhttp__internal__c_update_header_state_4(state, p, endp)) {
+  s_n_llhttp__internal__n_invoke_update_header_state_11: {
+    switch (llhttp__internal__c_update_header_state_1(state, p, endp)) {
       default:
         goto s_n_llhttp__internal__n_header_field_general;
     }
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_error_3: {
+    state->error = 0x1e;
+    state->reason = "Unexpected space after start line";
+    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: {
+    switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_header_field_start;
+      default:
+        goto s_n_llhttp__internal__n_error_3;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_16: {
+    state->error = 0x15;
+    state->reason = "on_url_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_headers_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_2: {
+    state->error = 0x1a;
+    state->reason = "`on_url_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_llhttp__on_url_complete: {
     switch (llhttp__on_url_complete(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_headers_start;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_16;
       default:
-        goto s_n_llhttp__internal__n_header_field_start;
+        goto s_n_llhttp__internal__n_error_2;
     }
     /* UNREACHABLE */;
     abort();
@@ -14063,7 +17275,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_20: {
+  s_n_llhttp__internal__n_error_41: {
     state->error = 0x7;
     state->reason = "Expected CRLF";
     state->error_pos = (const char*) p;
@@ -14089,7 +17301,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_23: {
+  s_n_llhttp__internal__n_error_47: {
     state->error = 0x17;
     state->reason = "Pause on PRI/Upgrade";
     state->error_pos = (const char*) p;
@@ -14098,7 +17310,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_24: {
+  s_n_llhttp__internal__n_error_48: {
     state->error = 0x9;
     state->reason = "Expected HTTP/2 Connection Preface";
     state->error_pos = (const char*) p;
@@ -14107,7 +17319,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_22: {
+  s_n_llhttp__internal__n_error_46: {
     state->error = 0x9;
     state->reason = "Expected CRLF after version";
     state->error_pos = (const char*) p;
@@ -14116,12 +17328,110 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_load_method_1: {
-    switch (llhttp__internal__c_load_method(state, p, endp)) {
-      case 34:
-        goto s_n_llhttp__internal__n_req_pri_upgrade;
+  s_n_llhttp__internal__n_pause_17: {
+    state->error = 0x15;
+    state->reason = "on_version_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_load_method_1;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_45: {
+    state->error = 0x21;
+    state->reason = "`on_version_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_version_complete;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_version_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_44;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_44;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 9:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_1: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_2: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_major: {
+    switch (llhttp__internal__c_load_http_major(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor;
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_1;
+      case 2:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_2;
       default:
-        goto s_n_llhttp__internal__n_req_http_complete;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_8: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1;
+      default:
+        goto s_n_llhttp__internal__n_invoke_load_http_major;
     }
     /* UNREACHABLE */;
     abort();
@@ -14129,26 +17439,42 @@
   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_load_method_1;
+        goto s_n_llhttp__internal__n_invoke_test_lenient_flags_8;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_25: {
-    state->error = 0x9;
-    state->reason = "Invalid minor version";
-    state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_error;
-    return s_error;
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_49;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_49;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_26: {
-    state->error = 0x9;
-    state->reason = "Expected dot";
-    state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_error;
-    return s_error;
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_3: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_50;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_50;
     /* UNREACHABLE */;
     abort();
   }
@@ -14160,16 +17486,24 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_27: {
-    state->error = 0x9;
-    state->reason = "Invalid major version";
-    state->error_pos = (const char*) p;
-    state->_current = (void*) (intptr_t) s_error;
-    return s_error;
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_4: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_51;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_51;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_21: {
+  s_n_llhttp__internal__n_error_43: {
     state->error = 0x8;
     state->reason = "Invalid method for HTTP/x.x request";
     state->error_pos = (const char*) p;
@@ -14181,82 +17515,82 @@
   s_n_llhttp__internal__n_invoke_load_method: {
     switch (llhttp__internal__c_load_method(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 1:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 2:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 3:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 4:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 5:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 6:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 7:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 8:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 9:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 10:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 11:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 12:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 13:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 14:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 15:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 16:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 17:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 18:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 19:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 20:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 21:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 22:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 23:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 24:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 25:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 26:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 27:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 28:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 29:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 30:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 31:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 32:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 33:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 34:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_21;
+        goto s_n_llhttp__internal__n_error_43;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_30: {
+  s_n_llhttp__internal__n_error_54: {
     state->error = 0x8;
     state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
@@ -14265,7 +17599,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_28: {
+  s_n_llhttp__internal__n_error_52: {
     state->error = 0x8;
     state->reason = "Expected SOURCE method for ICE/x.x request";
     state->error_pos = (const char*) p;
@@ -14277,14 +17611,14 @@
   s_n_llhttp__internal__n_invoke_load_method_2: {
     switch (llhttp__internal__c_load_method(state, p, endp)) {
       case 33:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_28;
+        goto s_n_llhttp__internal__n_error_52;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_29: {
+  s_n_llhttp__internal__n_error_53: {
     state->error = 0x8;
     state->reason = "Invalid method for RTSP/x.x request";
     state->error_pos = (const char*) p;
@@ -14296,43 +17630,65 @@
   s_n_llhttp__internal__n_invoke_load_method_3: {
     switch (llhttp__internal__c_load_method(state, p, endp)) {
       case 1:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 3:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 6:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 35:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 36:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 37:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 38:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 39:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 40:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 41:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 42:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 43:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 44:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       case 45:
-        goto s_n_llhttp__internal__n_req_http_major;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
       default:
-        goto s_n_llhttp__internal__n_error_29;
+        goto s_n_llhttp__internal__n_error_53;
     }
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_pause_18: {
+    state->error = 0x15;
+    state->reason = "on_url_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_req_http_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_42: {
+    state->error = 0x1a;
+    state->reason = "`on_url_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_llhttp__on_url_complete_1: {
     switch (llhttp__on_url_complete(state, p, endp)) {
-      default:
+      case 0:
         goto s_n_llhttp__internal__n_req_http_start;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_18;
+      default:
+        goto s_n_llhttp__internal__n_error_42;
     }
     /* UNREACHABLE */;
     abort();
@@ -14405,7 +17761,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_31: {
+  s_n_llhttp__internal__n_error_55: {
     state->error = 0x7;
     state->reason = "Invalid char in url fragment start";
     state->error_pos = (const char*) p;
@@ -14465,7 +17821,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_32: {
+  s_n_llhttp__internal__n_error_56: {
     state->error = 0x7;
     state->reason = "Invalid char in url query";
     state->error_pos = (const char*) p;
@@ -14474,7 +17830,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_33: {
+  s_n_llhttp__internal__n_error_57: {
     state->error = 0x7;
     state->reason = "Invalid char in url path";
     state->error_pos = (const char*) p;
@@ -14585,7 +17941,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_34: {
+  s_n_llhttp__internal__n_error_58: {
     state->error = 0x7;
     state->reason = "Double @ in url";
     state->error_pos = (const char*) p;
@@ -14594,7 +17950,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_35: {
+  s_n_llhttp__internal__n_error_59: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -14603,7 +17959,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_36: {
+  s_n_llhttp__internal__n_error_60: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -14612,7 +17968,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_38: {
+  s_n_llhttp__internal__n_error_62: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -14621,7 +17977,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_39: {
+  s_n_llhttp__internal__n_error_63: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -14630,7 +17986,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_40: {
+  s_n_llhttp__internal__n_error_64: {
     state->error = 0x7;
     state->reason = "Unexpected start char in url";
     state->error_pos = (const char*) p;
@@ -14649,7 +18005,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_41: {
+  s_n_llhttp__internal__n_error_65: {
     state->error = 0x6;
     state->reason = "Expected space after method";
     state->error_pos = (const char*) p;
@@ -14658,15 +18014,50 @@
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_pause_22: {
+    state->error = 0x15;
+    state->reason = "on_method_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_req_first_space_before_url;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_81: {
+    state->error = 0x20;
+    state->reason = "`on_method_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_method_2: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_method(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_method_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_store_method_1: {
     switch (llhttp__internal__c_store_method(state, p, endp, match)) {
       default:
-        goto s_n_llhttp__internal__n_req_first_space_before_url;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_method_2;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_49: {
+  s_n_llhttp__internal__n_error_82: {
     state->error = 0x6;
     state->reason = "Invalid method encountered";
     state->error_pos = (const char*) p;
@@ -14675,22 +18066,48 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_42: {
+  s_n_llhttp__internal__n_error_74: {
     state->error = 0xd;
-    state->reason = "Response overflow";
+    state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  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_42;
-      default:
-        goto s_n_llhttp__internal__n_res_status_code;
-    }
+  s_n_llhttp__internal__n_error_72: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_70: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_20: {
+    state->error = 0x15;
+    state->reason = "on_status_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_headers_start;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_68: {
+    state->error = 0x1b;
+    state->reason = "`on_status_complete` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
     /* UNREACHABLE */;
     abort();
   }
@@ -14730,7 +18147,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_43: {
+  s_n_llhttp__internal__n_error_69: {
     state->error = 0xd;
     state->reason = "Invalid response status";
     state->error_pos = (const char*) p;
@@ -14739,49 +18156,230 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_status_code: {
-    switch (llhttp__internal__c_update_status_code(state, p, endp)) {
+  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;
       default:
-        goto s_n_llhttp__internal__n_res_status_code;
+        goto s_n_llhttp__internal__n_res_status_code_otherwise;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_44: {
-    state->error = 0x9;
-    state->reason = "Expected space after version";
+  s_n_llhttp__internal__n_error_71: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_store_http_minor_1: {
-    switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) {
+  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;
       default:
-        goto s_n_llhttp__internal__n_res_http_end;
+        goto s_n_llhttp__internal__n_res_status_code_digit_3;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_45: {
-    state->error = 0x9;
-    state->reason = "Invalid minor version";
+  s_n_llhttp__internal__n_error_73: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_46: {
+  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;
+      default:
+        goto s_n_llhttp__internal__n_res_status_code_digit_2;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_75: {
+    state->error = 0xd;
+    state->reason = "Invalid status code";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_update_status_code: {
+    switch (llhttp__internal__c_update_status_code(state, p, endp)) {
+      default:
+        goto s_n_llhttp__internal__n_res_status_code_digit_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_76: {
     state->error = 0x9;
-    state->reason = "Expected dot";
+    state->reason = "Expected space after version";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_pause_21: {
+    state->error = 0x15;
+    state->reason = "on_version_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_res_after_version;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_67: {
+    state->error = 0x21;
+    state->reason = "`on_version_complete` callback error";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_6: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_5: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_66;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_66;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_3: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 9:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_4: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_minor_5: {
+    switch (llhttp__internal__c_load_http_minor(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_http_major_1: {
+    switch (llhttp__internal__c_load_http_major(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_3;
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_4;
+      case 2:
+        goto s_n_llhttp__internal__n_invoke_load_http_minor_5;
+      default:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_5;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_test_lenient_flags_9: {
+    switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6;
+      default:
+        goto s_n_llhttp__internal__n_invoke_load_http_major_1;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  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;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_7: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_77;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_77;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_8: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_78;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_78;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_store_http_major_1: {
     switch (llhttp__internal__c_store_http_major(state, p, endp, match)) {
       default:
@@ -14790,28 +18388,71 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_47: {
-    state->error = 0x9;
-    state->reason = "Invalid major version";
+  s_n_llhttp__internal__n_span_end_llhttp__on_version_9: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_version(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_79;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_error_79;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_83: {
+    state->error = 0x8;
+    state->reason = "Expected HTTP/";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_50: {
-    state->error = 0x8;
-    state->reason = "Expected HTTP/";
+  s_n_llhttp__internal__n_pause_19: {
+    state->error = 0x15;
+    state->reason = "on_method_complete pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_req_first_space_before_url;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_1: {
+    state->error = 0x20;
+    state->reason = "`on_method_complete` callback error";
     state->error_pos = (const char*) p;
     state->_current = (void*) (intptr_t) s_error;
     return s_error;
     /* UNREACHABLE */;
     abort();
   }
+  s_n_llhttp__internal__n_span_end_llhttp__on_method: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_method(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_llhttp__on_method_complete;
+      return s_error;
+    }
+    goto s_n_llhttp__internal__n_invoke_llhttp__on_method_complete;
+    /* UNREACHABLE */;
+    abort();
+  }
   s_n_llhttp__internal__n_invoke_update_type: {
     switch (llhttp__internal__c_update_type(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_req_first_space_before_url;
+        goto s_n_llhttp__internal__n_span_end_llhttp__on_method;
     }
     /* UNREACHABLE */;
     abort();
@@ -14824,7 +18465,7 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_error_48: {
+  s_n_llhttp__internal__n_error_80: {
     state->error = 0x8;
     state->reason = "Invalid word encountered";
     state->error_pos = (const char*) p;
@@ -14833,23 +18474,32 @@
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_type_1: {
-    switch (llhttp__internal__c_update_type_1(state, p, endp)) {
-      default:
-        goto s_n_llhttp__internal__n_res_http_major;
+  s_n_llhttp__internal__n_span_end_llhttp__on_method_1: {
+    const unsigned char* start;
+    int err;
+    
+    start = state->_span_pos0;
+    state->_span_pos0 = NULL;
+    err = llhttp__on_method(state, start, p);
+    if (err != 0) {
+      state->error = err;
+      state->error_pos = (const char*) p;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_type_1;
+      return s_error;
     }
+    goto s_n_llhttp__internal__n_invoke_update_type_1;
     /* UNREACHABLE */;
     abort();
   }
   s_n_llhttp__internal__n_invoke_update_type_2: {
     switch (llhttp__internal__c_update_type(state, p, endp)) {
       default:
-        goto s_n_llhttp__internal__n_start_req;
+        goto s_n_llhttp__internal__n_span_start_llhttp__on_method_1;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_pause_8: {
+  s_n_llhttp__internal__n_pause_23: {
     state->error = 0x15;
     state->reason = "on_message_begin pause";
     state->error_pos = (const char*) p;
@@ -14872,17 +18522,49 @@
       case 0:
         goto s_n_llhttp__internal__n_invoke_load_type;
       case 21:
-        goto s_n_llhttp__internal__n_pause_8;
+        goto s_n_llhttp__internal__n_pause_23;
       default:
         goto s_n_llhttp__internal__n_error;
     }
     /* UNREACHABLE */;
     abort();
   }
-  s_n_llhttp__internal__n_invoke_update_finish: {
-    switch (llhttp__internal__c_update_finish(state, p, endp)) {
+  s_n_llhttp__internal__n_pause_24: {
+    state->error = 0x15;
+    state->reason = "on_reset pause";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_update_finish;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_error_84: {
+    state->error = 0x1f;
+    state->reason = "`on_reset` callback error";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_llhttp__on_reset: {
+    switch (llhttp__on_reset(state, p, endp)) {
+      case 0:
+        goto s_n_llhttp__internal__n_invoke_update_finish;
+      case 21:
+        goto s_n_llhttp__internal__n_pause_24;
+      default:
+        goto s_n_llhttp__internal__n_error_84;
+    }
+    /* UNREACHABLE */;
+    abort();
+  }
+  s_n_llhttp__internal__n_invoke_load_initial_message_completed: {
+    switch (llhttp__internal__c_load_initial_message_completed(state, p, endp)) {
+      case 1:
+        goto s_n_llhttp__internal__n_invoke_llhttp__on_reset;
       default:
-        goto s_n_llhttp__internal__n_invoke_llhttp__on_message_begin;
+        goto s_n_llhttp__internal__n_invoke_update_finish;
     }
     /* UNREACHABLE */;
     abort();

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

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/CODEOWNERS Added

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

@@ -1,6 +1,7 @@
 # How to contribute
 
 mruby is an open-source project which is looking forward to each contribution.
+Contributors agree to license their contribution(s) under MIT license.
 
 ## Your Pull Request
 
@@ -9,7 +10,7 @@
 
 * 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```)
+* 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
@@ -17,6 +18,41 @@
 * Use mrbgem to provide non ISO features (classes, modules and methods) unless
   you have a special reason to implement them in the core
 
+## pre-commit
+
+A framework for managing and maintaining multi-language `pre-commit` hooks.
+`pre-commit` can be installed(https://pre-commit.com/#installation) with `pip`, `curl`, `brew` or `conda`.
+
+You need to first install `pre-commit` and then install the `pre-commit` hooks with `pre-commit install`.
+Now `pre-commit` will run automatically on git commit!
+
+It's usually a good idea to run the hooks against all the files when adding new hooks (usually `pre-commit` will only run on the changed files during git hooks).
+Use `pre-commit run --all-files` to check all files.
+
+To run a single hook use `pre-commit run --all-files <hook_id>`
+
+To update use `pre-commit autoupdate`
+
+* Quick start(https://pre-commit.com/#quick-start)
+* Usage(https://pre-commit.com/#usage)
+* pre-commit-autoupdate(https://pre-commit.com/#pre-commit-autoupdate)
+
+## Spell Checking
+
+We are running misspell(https://github.com/client9/misspell) which is mainly written in
+Golang(https://golang.org/) to check spelling with GitHub Actions(.github/workflows/lint.yml).
+Correct commonly misspelled English words quickly with `misspell`. You can run `misspell` locally
+against all files with:
+
+```bash
+find . -type f | xargs ./misspell -error
+```
+
+Notable `misspell` help options or flags are:
+
+* `-i` string: ignore the following corrections, comma separated
+* `-w`: Overwrite file with corrections (default is just to display)
+
 ## Coding conventions
 
 How to style your C and Ruby code which you want to submit.
@@ -31,12 +67,7 @@
 
 mruby should be highly portable to other systems and compilers. For this it is
 recommended to keep your code as close as possible to the C99 standard
-(http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf).
-
-Although we target C99, we've heard some compilers in the embedded environment
-still requires declarations of local variables to be at the beginning of a
-scope. Until we confirm the situation has changed, we use the old-style
-variable declaration.
+(<http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf>).
 
 Visual C++ is also an important target for mruby (supported version is 2013 or
 later). For this reason features that are not supported by Visual C++ may not
@@ -50,19 +81,15 @@
 increases the portability but makes it also easier to cut away parts of mruby
 on-demand.
 
-#### Don't use C++ style comments
-
-    /* This is the preferred comment style */
-
-Use C++ style comments only for temporary comment e.g. commenting out some code lines.
-
-#### Insert a break after the method return value:
+#### Insert a break after the function return value:
 
-    int
-    main(void)
-    {
-      ...
-    }
+```c
+int
+main(void)
+{
+  ...
+}
+```
 
 ### Ruby code
 
@@ -72,4 +99,5 @@
 #### Comply with the Ruby standard (ISO/IEC 30170:2012)
 
 mruby is currently targeting to execute Ruby code which complies to ISO/IEC
-30170:2012 (http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579).
+30170:2012 (<https://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579>),
+unless there's a clear reason, e.g. the latest Ruby has changed behavior from ISO.

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

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

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

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

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

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

@@ -1,4 +1,7 @@
+# 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
 
@@ -6,7 +9,7 @@
 of) the ISO standardISO-standard. Its syntax is Ruby 2.x compatible.
 
 mruby can be linked and embedded within your application.  We provide the
-interpreter program "mruby" and the interactive mruby shell "mirb" as examples.
+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
 also able to generate compiled byte code in a C source file, see the "mrbtest"
@@ -17,38 +20,30 @@
 
 ## How to get mruby
 
-The stable version 2.1.2 of mruby can be downloaded via the following URL: https://github.com/mruby/mruby/archive/2.1.2.zip(https://github.com/mruby/mruby/archive/2.1.2.zip)
+The 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 latest development version of mruby can be downloaded via the following URL: https://github.com/mruby/mruby/zipball/master(https://github.com/mruby/mruby/zipball/master)
 
 The trunk of the mruby source tree can be checked out with the
 following command:
 
-    $ git clone https://github.com/mruby/mruby.git
+```
+$ git clone https://github.com/mruby/mruby.git
+```
 
 You can also install and compile mruby using ruby-install(https://github.com/postmodern/ruby-install), ruby-build(https://github.com/rbenv/ruby-build) or rvm(https://github.com/rvm/rvm).
 
 ## mruby home-page
 
-The URL of the mruby home-page is: https://mruby.org.
+The URL of the mruby home-page is: <https://mruby.org>.
 
 ## Mailing list
 
 We don't have a mailing list, but you can use GitHub issues(https://github.com/mruby/mruby/issues).
 
-## How to compile and install (mruby and gems)
-
-See the compile.md(https://github.com/mruby/mruby/blob/master/doc/guides/compile.md) file.
-
-## Running Tests
-
-To run the tests, execute the following from the project's root directory.
-
-    $ rake test
+## How to compile, test, and install (mruby and gems)
 
-Note: `bison` bundled with MacOS is too old to compile `mruby`.
-Try `brew install bison` and follow the instuction shown to update
-the `$PATH` to compile `mruby`.
+See the compile.md(doc/guides/compile.md) file.
 
 ## Building documentation
 
@@ -56,23 +51,27 @@
 
 To build both of them, simply go
 
-    rake doc
+```
+rake doc
+```
 
 You can also view them in your browser
 
-    rake view_api
-    rake view_capi
+```
+rake view_api
+rake view_capi
+```
 
 ## How to customize mruby (mrbgems)
 
 mruby contains a package manager called *mrbgems*. To create extensions
 in C and/or Ruby you should create a *GEM*. For a documentation of how to
-use mrbgems consult the file mrbgems.md(https://github.com/mruby/mruby/blob/master/doc/guides/mrbgems.md).
+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/*.
 
 ## License
 
-mruby is released under the MIT License(https://github.com/mruby/mruby/blob/master/LICENSE).
+mruby is released under the MIT License(LICENSE).
 
 ## Note for License
 
@@ -86,7 +85,7 @@
 (that you will commit,) under the MIT License as a member of
 "mruby developers" but contributors will keep their copyright.
 (We did not intend for contributors to transfer or waive their copyrights,
-Actual copyright holder name (contributors) will be listed in the AUTHORS
+actual copyright holder name (contributors) will be listed in the AUTHORS(AUTHORS)
 file.)
 
 Please ask us if you want to distribute your code under another license.
@@ -94,12 +93,10 @@
 ## How to Contribute
 
 See the contribution guidelinescontribution-guidelines, and then send a pull
-request to <http://github.com/mruby/mruby>.  We consider you have granted
-non-exclusive right to your contributed code under MIT license.  If you want to
-be named as one of mruby developers, please include an update to the AUTHORS
-file in your pull request.
+request to <https://github.com/mruby/mruby>.  We consider you have granted
+non-exclusive right to your contributed code under MIT license.
 
-ISO-standard: http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579
+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.46.0.tar.xz/third-party/mruby/Rakefile -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/Rakefile Changed

@@ -10,11 +10,11 @@
 $LOAD_PATH << File.join(MRUBY_ROOT, "lib")
 
 # load build systems
-require "mruby-core-ext"
+require "mruby/core_ext"
 require "mruby/build"
 
 # load configuration file
-MRUBY_CONFIG = (ENV'MRUBY_CONFIG' && ENV'MRUBY_CONFIG' != '') ? ENV'MRUBY_CONFIG' : "#{MRUBY_ROOT}/build_config.rb"
+MRUBY_CONFIG = MRuby::Build.mruby_config_path
 load MRUBY_CONFIG
 
 # load basic rules
@@ -23,138 +23,47 @@
 end
 
 # load custom rules
-load "#{MRUBY_ROOT}/src/mruby_core.rake"
-load "#{MRUBY_ROOT}/mrblib/mrblib.rake"
-
+load "#{MRUBY_ROOT}/tasks/core.rake"
+load "#{MRUBY_ROOT}/tasks/mrblib.rake"
 load "#{MRUBY_ROOT}/tasks/mrbgems.rake"
 load "#{MRUBY_ROOT}/tasks/libmruby.rake"
-
+load "#{MRUBY_ROOT}/tasks/bin.rake"
+load "#{MRUBY_ROOT}/tasks/presym.rake"
+load "#{MRUBY_ROOT}/tasks/test.rake"
 load "#{MRUBY_ROOT}/tasks/benchmark.rake"
-
-load "#{MRUBY_ROOT}/tasks/gitlab.rake"
 load "#{MRUBY_ROOT}/tasks/doc.rake"
 
-def install_D(src, dst)
-  rm_f dst
-  mkdir_p File.dirname(dst)
-  cp src, dst
-end
-
 ##############################
 # generic build targets, rules
 task :default => :all
 
-bin_path = ENV'INSTALL_DIR' || "#{MRUBY_ROOT}/bin"
-
-depfiles = MRuby.targets'host'.bins.map do |bin|
-  install_path = MRuby.targets'host'.exefile("#{bin_path}/#{bin}")
-  source_path = MRuby.targets'host'.exefile("#{MRuby.targets'host'.build_dir}/bin/#{bin}")
-
-  file install_path => source_path do |t|
-    install_D t.prerequisites.first, t.name
-  end
-
-  install_path
-end
-
-MRuby.each_target do |target|
-  gems.map do |gem|
-    current_dir = gem.dir.relative_path_from(Dir.pwd)
-    relative_from_root = gem.dir.relative_path_from(MRUBY_ROOT)
-    current_build_dir = File.expand_path "#{build_dir}/#{relative_from_root}"
-
-    if current_build_dir !~ /^#{Regexp.escape(build_dir)}/
-      current_build_dir = "#{build_dir}/mrbgems/#{gem.name}"
-    end
-
-    gem.bins.each do |bin|
-      exec = exefile("#{build_dir}/bin/#{bin}")
-      objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx,cc}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) }
-
-      file exec => objs + target.libraries do |t|
-        gem_flags = gems.map { |g| g.linker.flags }
-        gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries }
-        gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries }
-        gem_libraries = gems.map { |g| g.linker.libraries }
-        gem_library_paths = gems.map { |g| g.linker.library_paths }
-        linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries, gem_flags_after_libraries
-      end
-
-      if target == MRuby.targets'host'
-        install_path = MRuby.targets'host'.exefile("#{bin_path}/#{bin}")
-
-        file install_path => exec do |t|
-          install_D t.prerequisites.first, t.name
-        end
-        depfiles +=  install_path 
-      elsif target == MRuby.targets'host-debug'
-        unless MRuby.targets'host'.gems.map {|g| g.bins}.include?(bin)
-          install_path = MRuby.targets'host-debug'.exefile("#{bin_path}/#{bin}")
-
-          file install_path => exec do |t|
-            install_D t.prerequisites.first, t.name
-          end
-          depfiles +=  install_path 
-        end
-      else
-        depfiles +=  exec 
-      end
-    end
-  end
-end
-
-depfiles += MRuby.targets.map { |n, t|
-  t.libraries
-}.flatten
-
-depfiles += MRuby.targets.reject { |n, t| n == 'host' }.map { |n, t|
-  t.bins.map { |bin| t.exefile("#{t.build_dir}/bin/#{bin}") }
-}.flatten
-
 desc "build all targets, install (locally) in-repo"
-task :all => depfiles do
+task :all => :gensym do
+  Rake::Task:build.invoke
   puts
   puts "Build summary:"
   puts
-  MRuby.each_target do
-    print_build_summary
+  MRuby.each_target do |build|
+    build.print_build_summary
   end
   MRuby::Lockfile.write
 end
 
-desc "run all mruby tests"
-task :test
-MRuby.each_target do
-  if test_enabled?
-    t = :"test_#{self.name}"
-    task t => "all" do
-      run_test
-    end
-    task :test => t
-  end
-
-  if bintest_enabled?
-    t = :"bintest_#{self.name}"
-    task t => "all" do
-      run_bintest
-    end
-    task :test => t
-  end
-end
+task :build => MRuby.targets.flat_map{|_, build| build.products}
 
 desc "clean all built and in-repo installed artifacts"
 task :clean do
-  MRuby.each_target do |t|
-    rm_rf t.build_dir
+  MRuby.each_target do |build|
+    rm_rf build.build_dir
+    rm_f build.products
   end
-  rm_f depfiles
   puts "Cleaned up target build folder"
 end
 
 desc "clean everything!"
-task :deep_clean => "clean", "clean_doc" do
-  MRuby.each_target do |t|
-    rm_rf t.gem_clone_dir
+task :deep_clean => %wclean doc:clean do
+  MRuby.each_target do |build|
+    rm_rf build.gem_clone_dir
   end
   puts "Cleaned up mrbgems build folder"
 end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/SECURITY.md Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/TODO.md Added

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/appveyor.yml -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/appveyor.yml Changed

@@ -1,39 +1,45 @@
 version: "{build}"
 
-os: Visual Studio 2017
-
 shallow_clone: true
 
 environment:
   matrix:
-    # Visual Studio 2017 64bit
-    - visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat
-
-    # Visual Studio 2017 32bit
-    - visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
+    - job_name: Visual Studio 2019 64bit
+      visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat
+      appveyor_build_worker_image: Visual Studio 2019
+
+    - job_name: Visual Studio 2019 32bit
+      visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat
+      appveyor_build_worker_image: Visual Studio 2019
+
+    - job_name: Visual Studio 2017 64bit
+      visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat
+      appveyor_build_worker_image: Visual Studio 2017
+
+    - job_name: Visual Studio 2017 32bit
+      visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat
+      appveyor_build_worker_image: Visual Studio 2017
+
+    - job_name: Visual Studio 2015 64bit
+      visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
+      appveyor_build_worker_image: Visual Studio 2015
+      machine: x86_amd64
+
+    - job_name: Visual Studio 2015 32bit
+      visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
+      appveyor_build_worker_image: Visual Studio 2015
       machine: x86
 
-    # Visual Studio 2015 64bit
-    - visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
-      machine: amd64
-
-    # Visual Studio 2015 32bit
-    - visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
-      machine: x86
-
-    # Visual Studio 2013 64bit
-    - visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
-      machine: amd64
-
-
 init:
   - call "%visualcpp%" %machine%
-  # For using Rubyinstaller's Ruby 2.4 64bit
-  - set PATH=C:\Ruby24-x64\bin;%PATH%
+  # For using RubyInstaller's Ruby 2.6 64bit
+  # 2.6 is the highest supported Ruby version across all historical
+  # Visual Studio AppVeyor images. Ruby 2.7 is only on the 2019 image.
+  - set PATH=C:\Ruby26-x64\bin;%PATH%
   - ruby --version
 
 
 build_script:
-  - set MRUBY_CONFIG=appveyor_config.rb
-  - rake -m
-  - rake -E $stdout.sync=true test
+  - set MRUBY_CONFIG=ci/msvc
+  - rake -m test:build
+  - rake test:run

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

@@ -1,29 +1,29 @@
 # AO render benchmark
-# Original program (C) Syoyo Fujita in Javascript (and other languages)
+# Original program (C) Syoyo Fujita in JavaScript (and other languages)
 #      https://code.google.com/p/aobench/
 # Ruby(yarv2llvm) version by Hideki Miura
 # mruby version by Hideki Miura
 #
 
-IMAGE_WIDTH = 64
-IMAGE_HEIGHT = 64
+IMAGE_WIDTH = Integer(ARGV0 || 64)
+IMAGE_HEIGHT = IMAGE_WIDTH
 NSUBSAMPLES = 2
 NAO_SAMPLES = 8
 
 module Rand
   # Use xorshift
-  @@x = 123456789
-  @@y = 362436069
-  @@z = 521288629
-  @@w = 88675123
+  @x = 123456789
+  @y = 362436069
+  @z = 521288629
+  @w = 88675123
   BNUM = 1 << 29
   BNUMF = BNUM.to_f
   def self.rand
-    x = @@x
+    x = @x
     t = x ^ ((x & 0xfffff) << 11)
-    w = @@w
-    @@x, @@y, @@z = @@y, @@z, w
-    w = @@w = (w ^ (w >> 19) ^ (t ^ (t >> 8)))
+    w = @w
+    @x, @y, @z = @y, @z, w
+    w = @w = (w ^ (w >> 19) ^ (t ^ (t >> 8)))
     (w % BNUM) / BNUMF
   end
 end
@@ -260,7 +260,7 @@
       w.times do |x|
         rad = Vec.new(0.0, 0.0, 0.0)
 
-        # Subsmpling
+        # Subsampling
         nsubsamples.times do |v|
           nsubsamples.times do |u|
             cnt = cnt + 1

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/benchmark/bm_so_lists.rb -> _service:tar_scm:nghttp2-1.52.0.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 Added

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

@@ -1,152 +1,9 @@
-MRuby::Build.new do |conf|
-  # load specific toolchain settings
-
-  # Gets set by the VS command prompts.
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  # Turn on `enable_debug` for better debugging
-  # enable_debug
-
-  # Use mrbgems
-  # conf.gem 'examples/mrbgems/ruby_extension_example'
-  # conf.gem 'examples/mrbgems/c_extension_example' do |g|
-  #   g.cc.flags << '-g' # append cflags in this gem
-  # end
-  # conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
-  # conf.gem :core => 'mruby-eval'
-  # conf.gem :mgem => 'mruby-onig-regexp'
-  # conf.gem :github => 'mattn/mruby-onig-regexp'
-  # conf.gem :git => 'git@github.com:mattn/mruby-onig-regexp.git', :branch => 'master', :options => '-v'
-
-  # include the default GEMs
-  conf.gembox 'default'
-  # C compiler settings
-  # conf.cc do |cc|
-  #   cc.command = ENV'CC' || 'gcc'
-  #   cc.flags = ENV'CFLAGS' || %w()
-  #   cc.include_paths = "#{root}/include"
-  #   cc.defines = %w()
-  #   cc.option_include_path = %q-I"%s"
-  #   cc.option_define = '-D%s'
-  #   cc.compile_options = %Q%{flags} -MMD -o "%{outfile}" -c "%{infile}"
-  # end
-
-  # mrbc settings
-  # conf.mrbc do |mrbc|
-  #   mrbc.compile_options = "-g -B%{funcname} -o-" # The -g option is required for line numbers
-  # end
-
-  # Linker settings
-  # conf.linker do |linker|
-  #   linker.command = ENV'LD' || 'gcc'
-  #   linker.flags = ENV'LDFLAGS' || 
-  #   linker.flags_before_libraries = 
-  #   linker.libraries = %w()
-  #   linker.flags_after_libraries = 
-  #   linker.library_paths = 
-  #   linker.option_library = '-l%s'
-  #   linker.option_library_path = '-L%s'
-  #   linker.link_options = "%{flags} -o "%{outfile}" %{objs} %{libs}"
-  # end
-
-  # Archiver settings
-  # conf.archiver do |archiver|
-  #   archiver.command = ENV'AR' || 'ar'
-  #   archiver.archive_options = 'rs "%{outfile}" %{objs}'
-  # end
-
-  # Parser generator settings
-  # conf.yacc do |yacc|
-  #   yacc.command = ENV'YACC' || 'bison'
-  #   yacc.compile_options = %q-o "%{outfile}" "%{infile}"
-  # end
-
-  # gperf settings
-  # conf.gperf do |gperf|
-  #   gperf.command = 'gperf'
-  #   gperf.compile_options = %q-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" "%{infile}" > "%{outfile}"
-  # end
-
-  # file extensions
-  # conf.exts do |exts|
-  #   exts.object = '.o'
-  #   exts.executable = '' # '.exe' if Windows
-  #   exts.library = '.a'
-  # end
-
-  # file separetor
-  # conf.file_separator = '/'
-
-  # bintest
-  # conf.enable_bintest
-end
-
-MRuby::Build.new('host-debug') do |conf|
-  # load specific toolchain settings
-
-  # Gets set by the VS command prompts.
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-  # C compiler settings
-  conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)
-
-  # Generate mruby debugger command (require mruby-eval)
-  conf.gem :core => "mruby-bin-debugger"
-
-  # bintest
-  # conf.enable_bintest
-end
-
-MRuby::Build.new('test') do |conf|
-  # Gets set by the VS command prompts.
-  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-  conf.enable_bintest
-  conf.enable_test
-
-  conf.gembox 'default'
-end
-
-#MRuby::Build.new('bench') do |conf|
-#  # Gets set by the VS command prompts.
-#  if ENV'VisualStudioVersion' || ENV'VSINSTALLDIR'
-#    toolchain :visualcpp
-#  else
-#    toolchain :gcc
-#    conf.cc.flags << '-O3'
-#  end
-#
-#  conf.gembox 'default'
-#end
-
-# Define cross build settings
-# MRuby::CrossBuild.new('32bit') do |conf|
-#   toolchain :gcc
-#
-#   conf.cc.flags << "-m32"
-#   conf.linker.flags << "-m32"
-#
-#   conf.build_mrbtest_lib_only
-#
-#   conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
-#
-#   conf.test_runner.command = 'env'
-# end
+# The default build configuration file was moved to `build_config/default.rb`.
+#
+# Recommended way to customize the build configuration is:
+#  * copy `default.rb` (or any config file) to a new file (e.g. `myconfig.rb`)
+#  * edit `myconfig.rb`.
+#  * `rake MRUBY_CONFIG=/path/to/myconfig.rb` to compile and test.
+#  * or `rake MRUBY_CONFIG=myconfig` if your configuration file is in the `build_config` directory.
+#  * (optional) submit your configuration as a pull-request if it's useful for others
+raise "The default configuration was moved to `build_config/default.rb`"

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/ArduinoDue.rb Added

@@ -0,0 +1,73 @@
+# Cross Compiling configuration for Arduino Due
+# https://arduino.cc/en/Main/ArduinoBoardDue
+#
+# Requires Arduino IDE >= 1.5
+MRuby::CrossBuild.new("ArduinoDue") do |conf|
+  toolchain :gcc
+
+  # Mac OS X, Arduino IDE <= 1.5.6
+  # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Resources/Java'
+  # Mac OS X, Arduino IDE >= 1.5.7
+  # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Java'
+  # GNU Linux
+  ARDUINO_PATH = '/opt/arduino'
+  # Arduino IDE <= 1.5.6
+  BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/g++_arm_none_eabi/bin"
+  # Arduino IDE >= 1.5.7
+  # BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin"
+  SAM_PATH = "#{ARDUINO_PATH}/hardware/arduino/sam"
+  TARGET_PATH = "#{SAM_PATH}/variants/arduino_due_x"
+
+  conf.cc do |cc|
+    cc.command = "#{BIN_PATH}/arm-none-eabi-gcc"
+    cc.include_paths << "#{SAM_PATH}/system/libsam", "#{SAM_PATH}/system/CMSIS/CMSIS/Include/",
+                        "#{SAM_PATH}/system/CMSIS/Device/ATMEL/",
+                        "#{SAM_PATH}/cores/arduino", "#{SAM_PATH}/libraries","#{TARGET_PATH}"
+    cc.flags = %w(-g -Os -w -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500
+                -Dprintf=iprintf -mcpu=cortex-m3 -DF_CPU=84000000L -DARDUINO=156 -DARDUINO_SAM_DUE -DARDUINO_ARCH_SAM
+                -D__SAM3X8E__ -mthumb -DUSB_PID=0x003e -DUSB_VID=0x2341 -DUSBCON -DUSB_MANUFACTURER="Unknown" -DUSB_PRODUCT="Arduino Due")
+    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
+
+    #configuration for low memory environment
+    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
+    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
+    cc.defines << %w(MRB_GC_STRESS)
+    #cc.defines << %w(MRB_NO_STDIO) #if you don't need stdio.
+    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
+  end
+
+  conf.cxx do |cxx|
+    cxx.command = conf.cc.command.dup
+    cxx.include_paths = conf.cc.include_paths.dup
+    cxx.flags = conf.cc.flags.dup
+    cxx.flags << %w(-fno-rtti -fno-exceptions)
+    cxx.defines = conf.cc.defines.dup
+    cxx.compile_options = conf.cc.compile_options.dup
+  end
+
+  conf.archiver do |archiver|
+    archiver.command = "#{BIN_PATH}/arm-none-eabi-ar"
+    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
+  end
+
+  #no executables
+  conf.bins = 
+
+  #do not build executable test
+  conf.build_mrbtest_lib_only
+
+  #disable C++ exception
+  conf.disable_cxx_exception
+
+  #gems from core
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-math"
+  conf.gem :core => "mruby-enum-ext"
+
+  #light-weight regular expression
+  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
+
+  #Arduino API
+  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
+
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/IntelEdison.rb Added

@@ -0,0 +1,69 @@
+# Cross-compiling setup for Intel Edison (poky linux) platform
+# Get SDK from here: https://software.intel.com/en-us/iot/hardware/edison/downloads
+# REMEMBER to check and update the SDK root in the constant POKY_EDISON_PATH
+
+MRuby::Build.new do |conf|
+  toolchain :gcc
+  conf.gembox 'default'
+  conf.cc.defines = %w(MRB_USE_READLINE)
+  conf.gembox 'default'
+
+  #lightweight regular expression
+  conf.gem :github => "pbosetti/mruby-hs-regexp", :branch => "master"
+
+end
+
+# Define cross build settings
+MRuby::CrossBuild.new('core2-32-poky-linux') do |conf|
+  toolchain :gcc
+
+  # Mac OS X
+  #
+  POKY_EDISON_PATH = '/opt/poky-edison/1.7.2'
+
+  POKY_EDISON_SYSROOT  = "#{POKY_EDISON_PATH}/sysroots/core2-32-poky-linux"
+  POKY_EDISON_X86_PATH = "#{POKY_EDISON_PATH}/sysroots/i386-pokysdk-darwin"
+  POKY_EDISON_BIN_PATH = "#{POKY_EDISON_X86_PATH}/usr/bin/i586-poky-linux"
+
+
+  conf.cc do |cc|
+    cc.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-gcc"
+    cc.include_paths << "#{POKY_EDISON_SYSROOT}/usr/include", "#{POKY_EDISON_X86_PATH}/usr/include"
+    cc.flags = %w(-m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mstackrealign -fno-omit-frame-pointer)
+    cc.flags << %w(-O2 -pipe -g -feliminate-unused-debug-types)
+    cc.flags << "--sysroot=#{POKY_EDISON_SYSROOT}"
+    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
+    cc.defines = %w(MRB_USE_READLINE)
+  end
+
+  conf.cxx do |cxx|
+    cxx.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-g++"
+    cxx.include_paths = conf.cc.include_paths.dup
+    cxx.include_paths << "#{POKY_EDISON_SYSROOT}/usr/include/c++/4.9.1"
+    cxx.flags = conf.cc.flags.dup
+    cxx.defines = conf.cc.defines.dup
+    cxx.compile_options = conf.cc.compile_options.dup
+  end
+
+  conf.archiver do |archiver|
+    archiver.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-ar"
+    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
+  end
+
+  conf.linker do |linker|
+    linker.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-g++"
+    linker.flags = %w(-m32 -march=i586)
+    linker.flags << "--sysroot=#{POKY_EDISON_SYSROOT}"
+    linker.flags << %w(-O1)
+    linker.libraries = %w(m pthread)
+  end
+
+  #do not build executable test
+  conf.build_mrbtest_lib_only
+
+  conf.gembox 'default'
+
+  #lightweight regular expression
+  conf.gem :github => "pbosetti/mruby-hs-regexp", :branch => "master"
+
+end

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

@@ -0,0 +1,89 @@
+# Cross Compiling configuration for Intel Galileo on Arduino environment
+# https://arduino.cc/en/ArduinoCertified/IntelGalileo
+#
+# Requires Arduino IDE for Intel Galileo
+MRuby::CrossBuild.new("Galileo") do |conf|
+  toolchain :gcc
+
+  # Mac OS X
+  # Assume you renamed Arduino.app to Arduino_Galileo.app
+  GALILEO_ARDUINO_PATH = '/Applications/Arduino_Galileo.app/Contents/Resources/Java'
+  # GNU Linux
+  #ARDUINO_GALILEO_PATH = '/opt/arduino'
+
+  GALILEO_BIN_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i386-pokysdk-darwin/usr/bin/i586-poky-linux-uclibc"
+  GALILEO_SYSROOT =  "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc"
+  GALILEO_X86_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/arduino/x86"
+
+
+  conf.cc do |cc|
+    cc.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-gcc"
+    cc.include_paths << "#{GALILEO_X86_PATH}/cores/arduino", "#{GALILEO_X86_PATH}/variants/galileo_fab_d"
+    cc.flags = %w(-m32 -march=i586 -c -g -Os -w
+              -ffunction-sections -fdata-sections -MMD -DARDUINO=153)
+    cc.flags << "--sysroot=#{GALILEO_SYSROOT}"
+    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
+  end
+
+  conf.cxx do |cxx|
+    cxx.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-g++"
+    cxx.include_paths = conf.cc.include_paths.dup
+    cxx.include_paths << "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc/usr/include/c++"
+    cxx.include_paths << "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc/usr/include/c++/i586-poky-linux-uclibc"
+    cxx.flags = conf.cc.flags.dup
+    cxx.defines = conf.cc.defines.dup
+    cxx.compile_options = conf.cc.compile_options.dup
+  end
+
+  conf.archiver do |archiver|
+    archiver.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-ar"
+    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
+  end
+
+  conf.linker do |linker|
+    linker.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-g++"
+    linker.flags = %w(-m32 -march=i586)
+    linker.flags << "--sysroot=#{GALILEO_SYSROOT}"
+    linker.flags << %w(-Os -Wl,--gc-sections)
+    linker.libraries = %w(m pthread)
+  end
+
+  #no executables
+  conf.bins = 
+
+  #do not build executable test
+  conf.build_mrbtest_lib_only
+
+  #official mrbgems
+  conf.gem :core => "mruby-sprintf"
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-math"
+  conf.gem :core => "mruby-time"
+  conf.gem :core => "mruby-struct"
+  conf.gem :core => "mruby-enum-ext"
+  conf.gem :core => "mruby-string-ext"
+  conf.gem :core => "mruby-numeric-ext"
+  conf.gem :core => "mruby-array-ext"
+  conf.gem :core => "mruby-hash-ext"
+  conf.gem :core => "mruby-range-ext"
+  conf.gem :core => "mruby-proc-ext"
+  conf.gem :core => "mruby-symbol-ext"
+  conf.gem :core => "mruby-random"
+  conf.gem :core => "mruby-object-ext"
+  conf.gem :core => "mruby-objectspace"
+  conf.gem :core => "mruby-fiber"
+  conf.gem :core => "mruby-toplevel-ext"
+
+  #lightweight regular expression
+  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
+
+  #Arduino API
+  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master" do |g|
+  #  g.cxx.include_paths << "#{GALILEO_X86_PATH}/libraries/Wire"
+  #  g.cxx.include_paths << "#{GALILEO_X86_PATH}/libraries/Servo"
+
+    #enable unsupported Servo class
+  #  g.cxx.defines << "MRUBY_ARDUINO_GALILEO_ENABLE_SERVO"
+  #end
+
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/RX630.rb Added

@@ -0,0 +1,64 @@
+# Cross Compiling configuration for RX630
+# http://gadget.renesas.com/
+#
+# Requires gnurx_v14.03
+MRuby::CrossBuild.new("RX630") do |conf|
+  toolchain :gcc
+
+  # Linux
+  BIN_PATH = "/usr/share/gnurx_v14.03_elf-1/bin"
+
+  conf.cc do |cc|
+    cc.command = "#{BIN_PATH}/rx-elf-gcc"
+    cc.flags = "-Wall -g -O2 -flto -mcpu=rx600 -m64bit-doubles"
+    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
+
+    #configuration for low memory environment
+    cc.defines << %w(MRB_USE_FLOAT32)
+    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
+    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
+    cc.defines << %w(MRB_GC_STRESS)
+    cc.defines << %w(MRB_NO_STDIO) #if you don't need stdio.
+    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
+  end
+
+  conf.cxx do |cxx|
+    cxx.command = conf.cc.command.dup
+    cxx.include_paths = conf.cc.include_paths.dup
+    cxx.flags = conf.cc.flags.dup
+    cxx.defines = conf.cc.defines.dup
+    cxx.compile_options = conf.cc.compile_options.dup
+  end
+
+  conf.linker do |linker|
+    linker.command="#{BIN_PATH}/rx-elf-ld"
+  end
+
+  conf.archiver do |archiver|
+    archiver.command = "#{BIN_PATH}/rx-elf-ar"
+    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
+  end
+
+  #no executables
+  conf.bins = 
+
+  #do not build executable test
+  conf.build_mrbtest_lib_only
+
+  #disable C++ exception
+  conf.disable_cxx_exception
+
+  #gems from core
+  conf.gem :core => "mruby-sprintf"
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-math"
+  conf.gem :core => "mruby-enum-ext"
+  conf.gem :core => "mruby-numeric-ext"
+
+  #light-weight regular expression
+  #conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
+
+  #Arduino API
+  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
+
+end

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

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

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/bench.rb Added

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/chipKITMax32.rb Added

@@ -0,0 +1,69 @@
+# Cross Compiling configuration for Digilent chipKIT Max32
+# https://www.digilentinc.com/Products/Detail.cfm?Prod=CHIPKIT-MAX32
+#
+# Requires MPIDE (https://github.com/chipKIT32/chipKIT32-MAX)
+#
+# This configuration is based on @kyab's version
+# http://d.hatena.ne.jp/kyab/20130201
+MRuby::CrossBuild.new("chipKITMax32") do |conf|
+  toolchain :gcc
+
+  # Mac OS X
+  # MPIDE_PATH = '/Applications/Mpide.app/Contents/Resources/Java'
+  # GNU Linux
+  MPIDE_PATH = '/opt/mpide-0023-linux-20120903'
+
+  PIC32_PATH = "#{MPIDE_PATH}/hardware/pic32"
+
+  conf.cc do |cc|
+    cc.command = "#{PIC32_PATH}/compiler/pic32-tools/bin/pic32-gcc"
+    cc.include_paths << "#{PIC32_PATH}/cores/pic32",
+                        "#{PIC32_PATH}/variants/Max32",
+                        "#{PIC32_PATH}/libraries"
+    cc.flags = %w(-O2 -mno-smart-io -w -ffunction-sections -fdata-sections -g -mdebugger -Wcast-align
+                -fno-short-double -mprocessor=32MX795F512L -DF_CPU=80000000L -DARDUINO=23 -D_BOARD_MEGA_
+                -DMPIDEVER=0x01000202 -DMPIDE=23)
+    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
+
+    #configuration for low memory environment
+    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
+    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
+    cc.defines << %w(MRB_GC_STRESS)
+    #cc.defines << %w(MRB_NO_STDIO) #if you don't need stdio.
+    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
+  end
+
+  conf.cxx do |cxx|
+    cxx.command = conf.cc.command.dup
+    cxx.include_paths = conf.cc.include_paths.dup
+    cxx.flags = conf.cc.flags.dup
+    cxx.defines = conf.cc.defines.dup
+    cxx.compile_options = conf.cc.compile_options.dup
+  end
+
+  conf.archiver do |archiver|
+    archiver.command = "#{PIC32_PATH}/compiler/pic32-tools/bin/pic32-ar"
+    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
+  end
+
+  #no executables
+  conf.bins = 
+
+  #do not build test executable
+  conf.build_mrbtest_lib_only
+
+  #disable C++ exception
+  conf.disable_cxx_exception
+
+  #gems from core
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-math"
+  conf.gem :core => "mruby-enum-ext"
+
+  #light-weight regular expression
+  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
+
+  #Arduino API
+  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
+
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/ci Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/ci/gcc-clang.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/ci/msvc.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/clang-asan.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/cross-32bit.rb Added

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

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/cross-mingw.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/default.rb Added

@@ -0,0 +1,80 @@
+MRuby::Build.new do |conf|
+  # load specific toolchain settings
+  conf.toolchain
+
+  # Use mrbgems
+  # conf.gem 'examples/mrbgems/ruby_extension_example'
+  # conf.gem 'examples/mrbgems/c_extension_example' do |g|
+  #   g.cc.flags << '-g' # append cflags in this gem
+  # end
+  # conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
+  # conf.gem :core => 'mruby-eval'
+  # conf.gem :mgem => 'mruby-onig-regexp'
+  # conf.gem :github => 'mattn/mruby-onig-regexp'
+  # conf.gem :git => 'git@github.com:mattn/mruby-onig-regexp.git', :branch => 'master', :options => '-v'
+
+  # include the GEM box
+  conf.gembox 'default'
+
+  # C compiler settings
+  # conf.cc do |cc|
+  #   cc.command = ENV'CC' || 'gcc'
+  #   cc.flags = ENV'CFLAGS' || %w()
+  #   cc.include_paths = "#{root}/include"
+  #   cc.defines = %w()
+  #   cc.option_include_path = %q-I"%s"
+  #   cc.option_define = '-D%s'
+  #   cc.compile_options = %Q%{flags} -MMD -o "%{outfile}" -c "%{infile}"
+  # end
+
+  # mrbc settings
+  # conf.mrbc do |mrbc|
+  #   mrbc.compile_options = "-g -B%{funcname} -o-" # The -g option is required for line numbers
+  # end
+
+  # Linker settings
+  # conf.linker do |linker|
+  #   linker.command = ENV'LD' || 'gcc'
+  #   linker.flags = ENV'LDFLAGS' || 
+  #   linker.flags_before_libraries = 
+  #   linker.libraries = %w()
+  #   linker.flags_after_libraries = 
+  #   linker.library_paths = 
+  #   linker.option_library = '-l%s'
+  #   linker.option_library_path = '-L%s'
+  #   linker.link_options = %Q%{flags} -o "%{outfile}" %{objs} %{libs}
+  # end
+
+  # Archiver settings
+  # conf.archiver do |archiver|
+  #   archiver.command = ENV'AR' || 'ar'
+  #   archiver.archive_options = 'rs "%{outfile}" %{objs}'
+  # end
+
+  # Parser generator settings
+  # conf.yacc do |yacc|
+  #   yacc.command = ENV'YACC' || 'bison'
+  #   yacc.compile_options = %q-o "%{outfile}" "%{infile}"
+  # end
+
+  # gperf settings
+  # conf.gperf do |gperf|
+  #   gperf.command = 'gperf'
+  #   gperf.compile_options = %q-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" "%{infile}" > "%{outfile}"
+  # end
+
+  # file extensions
+  # conf.exts do |exts|
+  #   exts.object = '.o'
+  #   exts.executable = '' # '.exe' if Windows
+  #   exts.library = '.a'
+  # end
+
+  # file separator
+  # conf.file_separator = '/'
+
+  # Turn on `enable_debug` for better debugging
+  # conf.enable_debug
+  conf.enable_bintest
+  conf.enable_test
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/dreamcast_shelf.rb Added

@@ -0,0 +1,117 @@
+# Cross Compiling configuration for the Sega Dreamcast
+# https://dreamcast.wiki/Using_Ruby_for_Sega_Dreamcast_development
+#
+# Requires KallistiOS (KOS)
+# http://gamedev.allusion.net/softprj/kos/
+#
+# Tested on GNU/Linux, macOS and Windows (through MinGW-w64/MSYS2, Cygwin and DreamSDK).
+# DreamSDK is based on MinGW/MSYS: https://dreamsdk.org/
+#
+# Input this command on the directory where mruby is installed:
+#   make MRUBY_CONFIG=dreamcast_shelf
+#
+MRuby::CrossBuild.new("dreamcast") do |conf|
+  toolchain :gcc
+
+  # Support for DreamSDK (based on MinGW/MSYS)
+  # To compile mruby with DreamSDK, RubyInstaller for Windows should be installed
+  DREAMSDK_HOME = ENV"DREAMSDK_HOME"
+  MSYS_ROOT = !(DREAMSDK_HOME.nil? || DREAMSDK_HOME.empty?) ? "#{DREAMSDK_HOME}/msys/1.0" : ""
+
+  # Setting paths
+  DREAMCAST_PATH = "#{MSYS_ROOT}/opt/toolchains/dc"
+  KOS_PATH = "#{DREAMCAST_PATH}/kos"
+  BIN_PATH = "#{DREAMCAST_PATH}/sh-elf/bin"
+
+  # C compiler
+  # Flags were extracted from KallistiOS environment files
+  conf.cc do |cc|
+    cc.command = "#{BIN_PATH}/sh-elf-gcc"
+    cc.include_paths << "#{KOS_PATH}/include", "#{KOS_PATH}/kernel/arch/dreamcast/include", "#{KOS_PATH}/addons/include", "#{KOS_PATH}/../kos-ports/include"
+    cc.flags << "-O2", "-fomit-frame-pointer", "-ml", "-m4-single-only", "-ffunction-sections", "-fdata-sections", "-Wall", "-g", "-fno-builtin", "-ml", "-m4-single-only", "-Wl,-Ttext=0x8c010000", "-Wl,--gc-sections", "-T#{KOS_PATH}/utils/ldscripts/shlelf.xc", "-nodefaultlibs"
+    cc.compile_options = %Q%{flags} -o "%{outfile}" -c "%{infile}"
+    cc.defines << %w(_arch_dreamcast)
+    cc.defines << %w(_arch_sub_pristine)
+  end
+
+  # C++ compiler
+  conf.cxx do |cxx|
+    cxx.command = conf.cc.command.dup
+    cxx.include_paths = conf.cc.include_paths.dup
+    cxx.flags = conf.cc.flags.dup
+    cxx.flags << %w(-fno-rtti -fno-exceptions)
+    cxx.defines = conf.cc.defines.dup
+    cxx.compile_options = conf.cc.compile_options.dup
+  end
+
+  # Linker
+  # There is an issue when making the mruby library with KallistiOS:
+  # 'newlib_kill.o' and 'newlib_getpid.o' aren't found so they are explicitly
+  # specified here at least for now.
+  conf.linker do |linker|
+    linker.command="#{BIN_PATH}/sh-elf-gcc"
+    linker.flags << "#{MSYS_ROOT}/opt/toolchains/dc/kos/kernel/build/newlib_kill.o", "#{MSYS_ROOT}/opt/toolchains/dc/kos/kernel/build/newlib_getpid.o", "-Wl,--start-group -lkallisti -lc -lgcc -Wl,--end-group"
+    linker.library_paths << "#{KOS_PATH}/lib/dreamcast", "#{KOS_PATH}/addons/lib/dreamcast", "#{KOS_PATH}/../kos-ports/lib"
+  end
+
+  # Archiver
+  conf.archiver do |archiver|
+    archiver.command = "#{BIN_PATH}/sh-elf-ar"
+    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
+  end
+
+  # No executables
+  conf.bins = 
+
+  # Do not build executable test
+  conf.build_mrbtest_lib_only
+
+  # Disable C++ exception
+  conf.disable_cxx_exception
+
+  # Gems from core
+  # Some Gems are incompatible and were disabled.
+
+  conf.gem :core => "mruby-array-ext"
+  conf.gem :core => "mruby-binding"
+  conf.gem :core => "mruby-catch"
+  conf.gem :core => "mruby-class-ext"
+  conf.gem :core => "mruby-cmath"
+  conf.gem :core => "mruby-compar-ext"
+  conf.gem :core => "mruby-compiler"
+  conf.gem :core => "mruby-complex"
+  conf.gem :core => "mruby-enum-chain"
+  conf.gem :core => "mruby-enum-ext"
+  conf.gem :core => "mruby-enum-lazy"
+  conf.gem :core => "mruby-enumerator"
+  conf.gem :core => "mruby-error"
+  conf.gem :core => "mruby-eval"
+  conf.gem :core => "mruby-exit"
+  conf.gem :core => "mruby-fiber"
+  conf.gem :core => "mruby-hash-ext"
+#  conf.gem :core => "mruby-io"
+  conf.gem :core => "mruby-kernel-ext"
+  conf.gem :core => "mruby-math"
+  conf.gem :core => "mruby-metaprog"
+  conf.gem :core => "mruby-method"
+  conf.gem :core => "mruby-numeric-ext"
+  conf.gem :core => "mruby-object-ext"
+  conf.gem :core => "mruby-objectspace"
+  conf.gem :core => "mruby-os-memsize"
+  conf.gem :core => "mruby-pack"
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-proc-binding"
+  conf.gem :core => "mruby-proc-ext"
+  conf.gem :core => "mruby-random"
+  conf.gem :core => "mruby-range-ext"
+  conf.gem :core => "mruby-rational"
+  conf.gem :core => "mruby-sleep"
+#  conf.gem :core => "mruby-socket"
+  conf.gem :core => "mruby-sprintf"
+  conf.gem :core => "mruby-string-ext"
+  conf.gem :core => "mruby-struct"
+  conf.gem :core => "mruby-symbol-ext"
+#  conf.gem :core => "mruby-test"
+#  conf.gem :core => "mruby-time"
+  conf.gem :core => "mruby-toplevel-ext"
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/gameboyadvance.rb Added

@@ -0,0 +1,73 @@
+# Cross Compiling configuration for the Nintendo GameBoyAdvance.
+# This configuration requires devkitARM
+# https://devkitpro.org/wiki/Getting_Started/devkitARM
+#
+# Tested only on GNU/Linux
+#
+MRuby::CrossBuild.new("gameboyadvance") do |conf|
+  toolchain :gcc
+
+  DEVKITPRO_PATH = "/opt/devkitpro"
+  BIN_PATH = "#{DEVKITPRO_PATH}/devkitARM/bin"
+
+  # C compiler
+  conf.cc do |cc|
+    cc.command = "#{BIN_PATH}/arm-none-eabi-gcc"
+    cc.flags << "-mthumb-interwork", "-mthumb", "-O2"
+    cc.compile_options = %(%{flags} -o "%{outfile}" -c "%{infile}")
+  end
+
+  # C++ compiler
+  conf.cxx do |cxx|
+    cxx.command = "#{BIN_PATH}/arm-none-eabi-g++"
+    cxx.include_paths = conf.cc.include_paths.dup
+    cxx.flags = conf.cc.flags.dup
+    cxx.flags << %w-fno-rtti -fno-exceptions
+    cxx.defines = conf.cc.defines.dup
+    cxx.compile_options = conf.cc.compile_options.dup
+  end
+
+  # Linker
+  conf.linker do |linker|
+    linker.command = "#{BIN_PATH}/arm-none-eabi-gcc"
+    linker.flags << "-mthumb-interwork", "-mthumb", "-specs=gba.specs"
+  end
+
+  # No executables
+  conf.bins = 
+
+  # Do not build executable test
+  conf.build_mrbtest_lib_only
+
+  # Disable C++ exception
+  conf.disable_cxx_exception
+
+  # Gems from core
+  # removing mruby-io
+  conf.gem core: "mruby-metaprog"
+  conf.gem core: "mruby-pack"
+  conf.gem core: "mruby-sprintf"
+  conf.gem core: "mruby-print"
+  conf.gem core: "mruby-math"
+  conf.gem core: "mruby-time"
+  conf.gem core: "mruby-struct"
+  conf.gem core: "mruby-compar-ext"
+  conf.gem core: "mruby-enum-ext"
+  conf.gem core: "mruby-string-ext"
+  conf.gem core: "mruby-numeric-ext"
+  conf.gem core: "mruby-array-ext"
+  conf.gem core: "mruby-hash-ext"
+  conf.gem core: "mruby-range-ext"
+  conf.gem core: "mruby-proc-ext"
+  conf.gem core: "mruby-symbol-ext"
+  conf.gem core: "mruby-random"
+  conf.gem core: "mruby-object-ext"
+  conf.gem core: "mruby-objectspace"
+  conf.gem core: "mruby-fiber"
+  conf.gem core: "mruby-enumerator"
+  conf.gem core: "mruby-enum-lazy"
+  conf.gem core: "mruby-toplevel-ext"
+  conf.gem core: "mruby-kernel-ext"
+  conf.gem core: "mruby-class-ext"
+  conf.gem core: "mruby-compiler"
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/helpers Added

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

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/host-cxx.rb Added

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

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

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

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/host-nofloat.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/host-shared.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/minimal.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/mrbc.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/nintendo_switch.rb Added

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/build_config/serenity.rb Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/codespell.txt Added

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

@@ -6,45 +6,54 @@
 ## Prerequisites
 
 To compile mruby out of the source code you need the following tools:
+
 * C Compiler (e.g. `gcc` or `clang`)
 * Linker (e.g. `gcc` or `clang`)
 * Archive utility (e.g. `ar`)
-* Parser generator (e.g. `bison`)
-* Ruby 2.0 or later (e.g. `ruby` or `jruby`)
-
-Note that `bison` bundled with MacOS is too old to compile `mruby`.
-Try `brew install bison` and follow the instuction shown to update
-the `$PATH` to compile `mruby`.
+* Ruby 2.5 or later (e.g. `ruby` or `jruby`)
 
 Optional:
-* GIT (to update mruby source and integrate mrbgems easier)
-* C++ compiler (to use GEMs which include \*.cpp, \*.cxx, \*.cc)
-* Assembler (to use GEMs which include \*.asm)
 
-## Usage
+* Git (to update mruby source and integrate mrbgems easier)
+* C++ compiler (to use mrbgems which include `*.cpp`, `*.cxx`, `*.cc`)
+* Bison (to compile `mrbgems/mruby-compiler/core/parse.y`)
+* gperf (to compile `mrbgems/mruby-compiler/core/keywords`)
+
+Note that `bison` bundled with macOS is too old to compile `mruby`.
+Try `brew install bison` and follow the instruction shown to update
+the `$PATH` to compile `mruby`. We also encourage you to upgrade `ruby`
+on macOS in similar manner.
+
+## Build
+
+To compile `mruby` with the default build configuration, just invoke `rake`
+inside of the mruby source root. To generate and execute the test tools call
+`rake test`. To clean all build files call `rake clean`. To see full command
+line on build, call `rake -v`.
+
+You can specify your own configuration file by the `MRUBY_CONFIG` environment
+variable (you can use `CONFIG` for shorthand for `MRUBY_CONFIG`). If the path
+doesn't exist, `build_config/${MRUBY_CONFIG}.rb` is used. The default
+configuration is defined in the `build_config/default.rb` file.
+
+Those build configuration files contain the build configuration of mruby, for
+example:
 
-Inside of the root directory of the mruby source a file exists
-called *build_config.rb*. This file contains the build configuration
-of mruby and looks like this for example:
 ```ruby
 MRuby::Build.new do |conf|
-  toolchain :gcc
+  conf.toolchain :gcc
 end
 ```
 
-All tools necessary to compile mruby can be set or modified here. In case
-you want to maintain an additional *build_config.rb* you can define a
-customized path using the *$MRUBY_CONFIG* environment variable.
-
-To compile just call `rake` inside of the mruby source root. To
-generate and execute the test tools call `rake test`. To clean
-all build files call `rake clean`. To see full command line on
-build, call `rake -v`.
+All tools necessary to compile mruby can be set or modified here.
 
 ## Build Configuration
 
-Inside of the *build_config.rb* the following options can be configured
-based on your environment.
+We wish you submit a pull-request to `build_config/PLATFORM.rb`, once you
+created a new configuration for a new platform.
+
+Inside the configuration file, the following options can be
+configured based on your environment.
 
 ### Toolchains
 
@@ -54,32 +63,36 @@
 #### GCC
 
 Toolchain configuration for the GNU C Compiler.
+
 ```ruby
-toolchain :gcc
+conf.toolchain :gcc
 ```
 
 #### clang
 
 Toolchain configuration for the LLVM C Compiler clang. Mainly equal to the
 GCC toolchain.
+
 ```ruby
-toolchain :clang
+conf.toolchain :clang
 ```
 
 #### Visual Studio 2010, 2012 and 2013
 
 Toolchain configuration for Visual Studio on Windows. If you use the
-Visual Studio Command Prompt(http://msdn.microsoft.com/en-us/library/ms229859$v=vs.110$.aspx),
+Visual Studio Command Prompt(https://msdn.microsoft.com/en-us/library/ms229859$v=vs.110$.aspx),
 you normally do not have to specify this manually, since it gets automatically detected by our build process.
+
 ```ruby
-toolchain :visualcpp
+conf.toolchain :visualcpp
 ```
 
 #### Android
 
 Toolchain configuration for Android.
+
 ```ruby
-toolchain :android
+conf.toolchain :android
 ```
 
 Requires the custom standalone Android NDK and the toolchain path
@@ -88,20 +101,18 @@
 ### Binaries
 
 It is possible to select which tools should be compiled during the compilation
-process. The following tools can be selected:
-* mruby (mruby interpreter)
-* mirb (mruby interactive shell)
+process. For example,
 
-To select them declare conf.gem as follows:
-```ruby
-conf.gem "#{root}/mrbgems/mruby-bin-mruby"
-conf.gem "#{root}/mrbgems/mruby-bin-mirb"
-```
+* `mruby`
+* `mirb`
+
+The configuration are done via `mrbgems`. See `Mrbgems` section.
 
 ### File Separator
 
 Some environments require a different file separator character. It is possible to
 set the character via `conf.file_separator`.
+
 ```ruby
 conf.file_separator = '/'
 ```
@@ -109,6 +120,7 @@
 ### C Compiler
 
 Configuration of the C compiler binary, flags and include paths.
+
 ```ruby
 conf.cc do |cc|
   cc.command = ...
@@ -123,19 +135,21 @@
 
 C Compiler has header searcher to detect installed library.
 
-If you need a include path of header file use `search_header_path`:
+If you need an include path of header file use `search_header_path`:
+
 ```ruby
-# Searches ```iconv.h```.
+# Searches `iconv.h`.
 # If found it will return include path of the header file.
-# Otherwise it will return nil .
+# Otherwise it will return nil.
 fail 'iconv.h not found' unless conf.cc.search_header_path 'iconv.h'
 ```
 
 If you need a full file name of header file use `search_header`:
+
 ```ruby
-# Searches ```iconv.h```.
+# Searches `iconv.h`.
 # If found it will return full path of the header file.
-# Otherwise it will return nil .
+# Otherwise it will return nil.
 iconv_h = conf.cc.search_header 'iconv.h'
 print "iconv.h found: #{iconv_h}\n"
 ```
@@ -145,6 +159,7 @@
 it will use compiler specific include paths too. (For example `/usr/local/include`, `/usr/include`)
 
 If you need a special header search paths define a singleton method `header_search_paths` to C compiler:
+
 ```ruby
 def conf.cc.header_search_paths
   '/opt/local/include' + include_paths
@@ -154,6 +169,7 @@
 ### Linker
 
 Configuration of the Linker binary, flags and library paths.
+
 ```ruby
 conf.linker do |linker|
   linker.command = ...
@@ -171,6 +187,7 @@
 ### Archiver
 
 Configuration of the Archiver binary and flags.
+
 ```ruby
 conf.archiver do |archiver|
   archiver.command = ...
@@ -181,6 +198,7 @@
 ### Parser Generator
 
 Configuration of the Parser Generator binary and flags.
+
 ```ruby
 conf.yacc do |yacc|
   yacc.command = ...
@@ -191,6 +209,7 @@
 ### GPerf
 
 Configuration of the GPerf binary and flags.
+
 ```ruby
 conf.gperf do |gperf|
   gperf.command = ...
@@ -199,6 +218,7 @@
 ```
 
 ### File Extensions
+
 ```ruby
 conf.exts do |exts|
   exts.object = ...
@@ -207,26 +227,52 @@
 end
 ```
 
+### Preallocated Symbols
+
+By far, preallocated symbols are highly compatible with the previous versions, so
+we expect you won't see any problem with them. But just in case you face any
+issue, you can disable preallocated symbols by specifying `conf.disable_presym`.
+
+In the build process, `mrbc` under cross compiling environment will be compiled
+with this configuration.
+
 ### Mrbgems
 
-Integrate GEMs in the build process.
+`mruby` comes with the (sort of) packaging system named `mrbgems`. To
+specify `gem`, you can use `conf.gem` in the configuration file.
+
 ```ruby
-# Integrate GEM with additional configuration
-conf.gem 'path/to/gem' do |g|
-  g.cc.flags << ...
-end
+# Integrate a bundled Gem you see in `mrbgems` directory
+conf.gem :core => 'mruby-something'
+
+# Integrate a Gem from GitHub
+conf.gem :github => 'someone/mruby-another'
+
+# Integrate a mruby binary Gem
+conf.gem :core => 'mruby-bin-mruby'
 
-# Integrate GEM without additional configuration
-conf.gem 'path/to/another/gem'
+# Integrate a interactive mruby binary Gem
+conf.gem :core => 'mruby-bin-mirb'
+
+# Integrate GemBox (set of Gems)
+conf.gembox "default"
 ```
 
+A GemBox is a set of Gems defined in `mrbgems/default.gembox` for example.
+It's just a set of `mrbgem` configurations.
+
+There is a `RubyGem` (gem for CRuby) named `mgem` that help you to
+manage `mrbgems`. Try `gem install mgem`. `mgem` can show you the list
+of registered `mrbgems`.
+
 See doc/mrbgems/README.md for more option about mrbgems.
 
 ### Mrbtest
 
 Configuration Mrbtest build process.
 
-If you want mrbtest.a only, You should set `conf.build_mrbtest_lib_only`
+If you want `mrbtest.a` only, You should set `conf.build_mrbtest_lib_only`
+
 ```ruby
 conf.build_mrbtest_lib_only
 ```
@@ -234,11 +280,12 @@
 ### Bintest
 
 Tests for mrbgem tools using CRuby.
-To have bintests place \*.rb scripts to `bintest/` directory of mrbgems.
+To have bintests place `*.rb` scripts to `bintest/` directory of mrbgems.
 See `mruby-bin-*/bintest/*.rb` if you need examples.
 If you want a temporary files use `tempfile` module of CRuby instead of `/tmp/`.
 
 You can enable it with following:
+
 ```ruby
 conf.enable_bintest
 ```
@@ -257,58 +304,65 @@
 
 When you mix C++ code, C++ exception would be enabled automatically.
 If you need to enable C++ exception explicitly add the following:
+
 ```ruby
 conf.enable_cxx_exception
 ```
 
-#### C++ exception disabling.
+#### C++ exception disabling
 
-If your compiler does not support C++ and you want to ensure
+If your compiler does not support C++, and you want to ensure
 you don't use mrbgem written in C++, you can explicitly disable
 C++ exception, add following:
+
 ```ruby
 conf.disable_cxx_exception
 ```
+
 and you will get an error when you try to use C++ gem.
 Note that it must be called before `enable_cxx_exception` or `gem` method.
 
 ### Debugging mode
 
 To enable debugging mode add the following:
+
 ```ruby
 conf.enable_debug
 ```
 
 When debugging mode is enabled
+
 * Macro `MRB_DEBUG` would be defined.
-	* Which means `mrb_assert()` macro is enabled.
+  * 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.
+  * Because `-g` flag would be added to `mrbc` runner.
     * You can have better backtrace of mruby scripts with this.
 
 ## Cross-Compilation
 
-mruby can also be cross-compiled from one platform to another. To
-achieve this the *build_config.rb* needs to contain an instance of
-`MRuby::CrossBuild`. This instance defines the compilation
-tools and flags for the target platform. An example could look
-like this:
+mruby can also be cross-compiled from one platform to another. To achieve
+cross-compilation, the build configuration needs to contain an instance of
+`MRuby::CrossBuild`. This instance defines the compilation tools and flags
+for the target platform. An example could look like this:
+
 ```ruby
 MRuby::CrossBuild.new('32bit') do |conf|
-  toolchain :gcc
+  conf.toolchain :gcc
 
   conf.cc.flags << "-m32"
   conf.linker.flags << "-m32"
 end
 ```
 
-All configuration options of `MRuby::Build` can also be used
-in `MRuby::CrossBuild`.
+All configuration options of `MRuby::Build` can also be used in
+`MRuby::CrossBuild`. You can find examples under the `build_config`
+directory.
 
 ### Mrbtest in Cross-Compilation
 
-In cross compilation, you can run `mrbtest` on emulator if
+In cross compilation, you can run `mrbtest` on an emulator if
 you have it by changing configuration of test runner.
+
 ```ruby
 conf.test_runner do |t|
   t.command = ... # set emulator. this value must be non nil or false
@@ -322,48 +376,44 @@
 
 ## Build process
 
-During the build process the directory *build* will be created in the
+During the build process the directory `build` will be created in the
 root directory. The structure of this directory will look like this:
 
-	+- build
-	   |
-	   +-  host
-	       |
-	       +- bin          <- Binaries (mirb, mrbc and mruby)
-	       |
-	       +- lib          <- Libraries (libmruby.a and libmruby_core.a)
-	       |
-	       +- mrblib
-	       |
-	       +- src
-	       |
-	       +- test         <- mrbtest tool
-	       |
-	       +- tools
-	          |
-	          +- mirb
-	          |
-	          +- mrbc
-	          |
-	          +- mruby
+```
++- build
+    |
+    +- host
+        |
+        +- LEGAL        <- License description
+        |
+        +- bin          <- Binaries (mirb, mrbc and mruby)
+        |
+        +- lib          <- Libraries (libmruby.a and libmruby_core.a)
+        |
+        +- mrbc         <- Minimal mrbc place
+        |
+        +- mrbgems      <- Compilation result from mrbgems
+        |
+        +- mrblib       <- Compilation result from mrblib
+        |
+        +- src          <- Compilation result from C sources
+```
 
 The compilation workflow will look like this:
-* compile all files under *src* (object files will be stored
-in *build/host/src*)
-* generate parser grammar out of *src/parse.y* (generated
-result will be stored in *build/host/src/y.tab.c*)
-* compile  *build/host/src/y.tab.c* to  *build/host/src/y.tab.o*
-* create *build/host/lib/libmruby_core.a* out of all object files (C only)
-* create `build/host/bin/mrbc` by compiling *tools/mrbc/mrbc.c* and
-linking with *build/host/lib/libmruby_core.a*
-* create *build/host/mrblib/mrblib.c* by compiling all \*.rb files
-under *mrblib* with `build/host/bin/mrbc`
-* compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o*
-* create *build/host/lib/libmruby.a* out of all object files (C and Ruby)
-* create `build/host/bin/mruby` by compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and
-linking with *build/host/lib/libmruby.a*
-* create `build/host/bin/mirb` by compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and
-linking with *build/host/lib/libmruby.a*
+
+* compile minimal `mrbc` from `src` and `mrblib` sources
+  * compile all files under `src` (object files will be stored in `build/host/mrbc/src`)
+  * compile `mruby-compiler` gem
+  * create `build/host/mrbc/lib/libmruby_core.a` out of all object files (C only)
+  * create `build/host/mrbc/bin/mrbc` via `mruby-bin-mrbc` gem
+* compile all files under `src` and store result in `build/host/src`
+* create `build/host/mrblib/mrblib.c` by compiling all `*.rb` files under `mrblib` with `build/host/mrbc/bin/mrbc`
+* compile `build/host/mrblib/mrblib.c` to `build/host/mrblib/mrblib.o`
+* create `build/host/lib/libmruby.a` out of all object files (C and Ruby)
+* compile (normal) mrbgems specified in the configuration file
+* create `build/host/lib/libmruby.a` from object files from gems and `libmruby_core.a`
+* create binary commands according to binary gems (e.g. `mirb` and `mruby`)
+* copy binaries under `build/host/bin` to `bin` directory
 
 ```
  _____    _____    ______    ____    ____    _____    _____    ____
@@ -374,73 +424,54 @@
 
 ### Cross-Compilation
 
-In case of a cross-compilation to *i386* the *build* directory structure looks
+In case of a cross-compilation to `i386` the `build` directory structure looks
 like this:
 
-	+- build
-	   |
-	   +-  host
-	   |   |
-	   |   +- bin           <- Native Binaries
-	   |   |
-	   |   +- lib           <- Native Libraries
-	   |   |
-	   |   +- mrblib
-	   |   |
-	   |   +- src
-	   |   |
-	   |   +- test          <- Native mrbtest tool
-	   |   |
-	   |   +- tools
-	   |      |
-	   |      +- mirb
-	   |      |
-	   |      +- mrbc
-	   |      |
-	   |      +- mruby
-	   +- i386
-	      |
-	      +- bin            <- Cross-compiled Binaries
-	      |
-	      +- lib            <- Cross-compiled Libraries
-	      |
-	      +- mrblib
-	      |
-	      +- src
-	      |
-	      +- test           <- Cross-compiled mrbtest tool
-	      |
-	      +- tools
-	         |
-	         +- mirb
-	         |
-	         +- mrbc
-	         |
-	         +- mruby
+```
++- build
+    |
+    +- host
+    |   |
+    |   +- bin           <- Native Binaries
+    |   |
+    |   +- lib           <- Native Libraries
+    |   |
+    |   +- mrbgems
+    |   |
+    |   +- src
+    |
+    +- i386
+        |
+        +- bin            <- Cross-compiled Binaries
+        |
+        +- include        <- Header Directory
+        |
+        +- lib            <- Cross-compiled Libraries
+        |
+        +- mrbgems
+        |
+        +- mrblib
+        |
+        +- src
+```
 
 An extra directory is created for the target platform. In case you
-compile for *i386* a directory called *i386* is created under the
+compile for `i386` a directory called `i386` is created under the
 build directory.
 
 The cross compilation workflow starts in the same way as the normal
-compilation by compiling all *native* libraries and binaries.
-Afterwards the cross compilation process proceeds like this:
-* cross-compile all files under *src* (object files will be stored
-in *build/i386/src*)
-* generate parser grammar out of *src/parse.y* (generated
-result will be stored in *build/i386/src/y.tab.c*)
-* cross-compile *build/i386/src/y.tab.c* to *build/i386/src/y.tab.o*
-* create *build/i386/mrblib/mrblib.c* by compiling all \*.rb files
-under *mrblib* with the native `build/host/bin/mrbc`
-* cross-compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o*
-* create *build/i386/lib/libmruby.a* out of all object files (C and Ruby)
-* create `build/i386/bin/mruby` by cross-compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and
-linking with *build/i386/lib/libmruby.a*
-* create `build/i386/bin/mirb` by cross-compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and
-linking with *build/i386/lib/libmruby.a*
-* create *build/i386/lib/libmruby_core.a* out of all object files (C only)
-* create `build/i386/bin/mrbc` by cross-compiling *tools/mrbc/mrbc.c* and
-linking with *build/i386/lib/libmruby_core.a*
+compilation by compiling all *native* libraries and binaries, except
+for we don't have `host/mrbc` directory (`host` directory itself works
+as placeholder for `mrbc`). Afterwards the cross compilation process
+proceeds like this:
+
+* cross-compile all files under `src` 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
 
 ```
  _______________________________________________________________
@@ -471,22 +502,57 @@
 can't be disabled for the main build.
 
 ```ruby
-MRuby::CrossBuild.new('Minimal') do |conf|
-  toolchain :gcc
-
-  conf.cc.defines = %w(MRB_DISABLE_STDIO)
-  conf.bins = 
+MRuby::CrossBuild.new('minimal') do |conf|
+  conf.toolchain :gcc
+  conf.cc.defines << 'MRB_NO_STDIO'
 end
 ```
 
-This configuration defines a cross compile build called 'Minimal' which
+This configuration defines a cross compile build called 'minimal' which
 is using the GCC and compiles for the host machine. It also disables
-all usages of stdio and doesn't compile any binaries (e.g. mrbc).
+all usages of stdio and doesn't compile any binaries (e.g. `mrbc`).
 
 ## Test Environment
 
 mruby's build process includes a test environment. In case you start the testing
 of mruby, a native binary called `mrbtest` will be generated and executed.
-This binary contains all test cases which are defined under *test/t*. In case
-of a cross-compilation an additional cross-compiled *mrbtest* binary is
+This binary contains all test cases which are defined under `test/t`. In case
+of a cross-compilation an additional cross-compiled `mrbtest` binary is
 generated. You can copy this binary and run on your target system.
+
+## Embedding `mruby` in Your Application
+
+After the build, you will get `libmruby.a`. You can link it to your application.
+
+For compiler options and library path, you can use `mruby-config` command for
+convenience. `mruby-config` command prints the configuration used for `libmruby.a`.
+
+```
+$ mruby-config --help
+Usage: mruby-config switches
+  switches:
+  --cc                        print compiler name
+  --cflags                    print flags passed to compiler
+  --ld                        print linker name
+  --ldflags                   print flags passed to linker
+  --ldflags-before-libs       print flags passed to linker before linked libraries
+  --libs                      print linked libraries
+  --libmruby-path             print libmruby path
+  --help                      print this help
+```
+
+For example, when you have a C source file (`c.c`) and try to
+compile and link it with `libmruby.a`, you can run the following command,
+
+```
+gcc `mruby-config --cflags` c.c `mruby-config --ldflags` `mruby-config --libs`
+```
+
+When you use `make`, add following lines in `Makefile`
+
+```
+MRB_CONFIG = <path-to-mruby-config>
+CFLAGS = `$(MRB_CONFIG) --cflags`
+LDFLAGS = `$(MRB_CONFIG) --ldflags`
+LIBS = `$(MRB_CONFIG) --libs`
+```

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

@@ -38,7 +38,7 @@
 
 ```bash
 $ mrdb --version
-mruby 2.1.2 (2020-08-06)
+mruby 3.1.0 (2022-05-12)
 ```
 
 ## 2.2 Basic Operation
@@ -114,8 +114,8 @@
 The breakpoint will be ordered in serial from 1.
 The number, which was given to the deleted breakpoint, will never be given to another breakpoint again.
 
-You can give multiple breakpoints to specified the line number and method.
-Be ware that breakpoint command will not check the validity of the class name and method name.
+You can give multiple breakpoints to the specified the line number and method.
+Be aware that the breakpoint command will not check the validity of the class name and method name.
 
 You can get the current breakpoint information by the following options.
 
@@ -165,7 +165,7 @@
 (foo.rb:1) delete
 ```
 
-This will delete all of the breakpoints.
+This will delete all the breakpoints.
 
 ```
 (foo.rb:1) delete 1 3
@@ -192,7 +192,7 @@
 (foo.rb:1) disable
 ```
 
-Use `disable` if you would like to disable all of the breakpoints.
+Use `disable` if you would like to disable all the breakpoints.
 
 ```
 (foo.rb:1) disable 1 3
@@ -220,6 +220,7 @@
 ```
 
 Enabling all breakpoints
+
 ```
 (foo.rb:1) enable 1 3
 ```
@@ -263,7 +264,7 @@
 
 ```
 (sample.rb:1) info breakpoints
-Num     Type           Enb What  
+Num     Type           Enb What
 1       breakpoint     y   at sample.rb:3                      -> file name,line number
 2       breakpoint     n   in Sample_class:sample_class_method -> class:method name
 3       breakpoint     y   in sample_global_method
@@ -273,8 +274,8 @@
 
 ```
 (foo.rb:1) info breakpoints 1 3
-Num     Type           Enb What  
-1       breakpoint     y   at sample.rb:3  
+Num     Type           Enb What
+1       breakpoint     y   at sample.rb:3
 3       breakpoint     y   in sample_global_method
 ```
 
@@ -323,7 +324,7 @@
 
 The expression is mandatory.
 The displayed expressions will be serially ordered from 1.
-If an exception occurs, the exception information will be displayed and the debugging will be continued.
+If an exception occurs, the exception information will be displayed, and the debugging will be continued.
 
 Example:
 
@@ -366,5 +367,5 @@
 #### Step Command
 
 This will run the program step by step.
-When the method and the block are invoked, the program will be stop at the first row.
+When the method and the block are invoked, the program will stop at the first row.
 The program, which is developed in C, will be ignored.

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

@@ -3,7 +3,7 @@
 _This is an English translation of Matz's blog postmatz blog post
 written in Japanese._
 _Some parts are updated to reflect recent changes._
-matz blog post: http://www.rubyist.net/~matz/20130731.html
+matz blog post: <https://www.rubyist.net/~matz/20130731.html>
 
 When you are extending mruby using C language, you may encounter
 mysterious "arena overflow error" or memory leak or very slow
@@ -11,13 +11,13 @@
 implementing "conservative GC".
 
 GC (garbage collector) must ensure that object is "alive", in other
-words, that it is referenced by somewhere from program.  This can be
+words, that it is referenced by somewhere from the program.  This can be
 determined by checking if the object can be directly or indirectly
 referenced by root.  The local variables, global variables and
 constants etc are root.
 
 If program execution is performed inside mruby VM, there is nothing to
-worry about because GC can access all roots owned by VM.
+worry about because GC can access all roots owned by the VM.
 
 The problem arises when executing C functions.  The object referenced
 by C variable is also "alive", but mruby GC cannot aware of this, so
@@ -38,7 +38,7 @@
 portable way.  Therefore, we cannot use this method if we'd like to
 implement highly portable runtime, like mruby.
 
-So we came up with an another plan to implement "conservative GC" in mruby.
+So we came up with another plan to implement "conservative GC" in mruby.
 
 Again, the problem is when an object which was created in C function, becomes
 no longer referenced in the Ruby world, and cannot be treated as garbage.
@@ -46,7 +46,7 @@
 In mruby, we recognize all objects created in C function are alive.
 Then we have no problem such as confusing a live object as dead.
 
-This means that because we cannot collect truly dead object, we may
+This means that because we cannot collect a truly dead object, we may
 lose efficiency, but as a trade-off the GC itself is highly portable.
 We can say goodbye to the problem that GC deletes live objects due to
 optimization which sometimes occurs in CRuby.
@@ -140,7 +140,7 @@
 }
 ```
 
-This is a real example, so a little bit complicated, but bear with me.
+This is a real example, so slightly complicated, but bear with me.
 The essence of `Array#inspect` is that after stringifying each element
 of array using `inspect` method, we join them together so that we can
 get `inspect` representation of the entire array.
@@ -161,7 +161,7 @@
 was created before the call of `mrb_gc_arena_restore()`.  Otherwise,
 required temporal object may be deleted by GC.
 
-We may have a usecase where after creating many temporal objects, we'd
+We may have an usecase where after creating many temporal objects, we'd
 like to keep some of them.  In this case, we cannot use the same idea
 in `ary_inspect()` like appending objects to existing one.
 Instead, after `mrb_gc_arena_restore()`, we must re-register the objects we

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

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

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

@@ -1,181 +1,209 @@
-# mruby configuration macros.
+# mruby configuration macros
+
+## How to use these macros
 
-## How to use these macros.
 You can use mrbconfs with following ways:
+
 * 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.
+  * 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.
+  * 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.
+
+## stdio setting
+
+`MRB_NO_STDIO`
 
-## stdio setting.
-`MRB_DISABLE_STDIO`
 * When defined `<stdio.h>` functions won't be used.
 * Some features will be disabled when this is enabled:
   * `mrb_irep` load/dump from/to file.
-  * Compiling mruby script from file.
+  * Compiling mruby script from a file.
   * Printing features in **src/print.c**.
 
-## Debug macros.
-`MRB_ENABLE_DEBUG_HOOK`
+## 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`.
 
 `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`.
 
 ## Stack configuration
 
 `MRB_STACK_EXTEND_DOUBLING`
+
 * If defined doubles the stack size when extending it.
 * Else 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.
 
 `MRB_STACK_MAX`
+
 * Default value is `0x40000 - MRB_STACK_GROWTH`.
 * Raises `RuntimeError` when stack size exceeds this value.
 
-## Primitive type configuration.
+## Primitive type configuration
 
-`MRB_USE_FLOAT`
-* When defined single precision floating point type(C type `float`) is used as `mrb_float`.
-* Else double precision floating point type(C type `double`) is used as `mrb_float`.
+`MRB_USE_FLOAT32`
 
-`MRB_WITHOUT_FLOAT`
-* When defined removes floating point numbers from mruby.
+* 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".
 
 `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`.
 
 `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`.
 
-## Garbage collector configuration.
+## Garbage collector configuration
 
 `MRB_GC_STRESS`
+
 * When defined full GC is emitted per each `RBasic` allocation.
 * Mainly used in memory manager debugging.
 
 `MRB_GC_TURN_OFF_GENERATIONAL`
+
 * 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.
 
 `MRB_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.
 
-## Memory pool configuration.
+## Memory pool configuration
 
 `POOL_ALIGNMENT`
+
 * Default value is `4`.
 * If you're allocating data types that requires alignment more than default value define the
 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.
 
-## State atexit configuration.
+## State atexit configuration
 
 `MRB_FIXED_STATE_ATEXIT_STACK`
+
 * If defined enables fixed size `mrb_state` atexit stack.
 * Raises `RuntimeError` when `mrb_state_atexit` call count to same `mrb_state` exceeds
 `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.
 
-## `mrb_value` configuration.
+## `mrb_value` configuration
 
 `MRB_ENDIAN_BIG`
+
 * If defined compiles mruby for big endian machines.
 * Used in `MRB_NAN_BOXING`.
 * Some mrbgem use this mrbconf.
 
 `MRB_NAN_BOXING`
+
 * If defined represent `mrb_value` in boxed `double`.
-* Conflicts with `MRB_USE_FLOAT` and `MRB_WITHOUT_FLOAT`.
+* 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`.
 
-## Instance variable configuration.
-`MRB_IV_SEGMENT_SIZE`
-* Default value is `4`.
-* Specifies size of each segment in segment list.
+## Reduce heap memory configuration
+
+`MRB_USE_ETEXT_RO_DATA_P`
 
-## Reduce heap memory configuration.
+* 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_USE_LINK_TIME_RO_DATA_P`
-* Only available on ELF platforms.
-* If you specify the address of a read-only section when creating a symbol or string, that string will be used as it is.
-* Heap memory can be saved.
-* Uses `__ehdr_start` and `__init_array_start`.
-* It must be `__ehdr_start < data_addr < __init_array_start`.
+`MRB_NO_DEFAULT_RO_DATA_P`
+
+* Define this macro when the default `mrb_ro_data_p()` does not work for any reason.
 
 `MRB_USE_CUSTOM_RO_DATA_P`
-* Takes precedence over `MRB_USE_LINK_TIME_RO_DATA_P`.
+
 * Please try if `MRB_USE_LINK_TIME_RO_DATA_P` is not available.
 * The `mrb_ro_data_p()` function is implemented by the user in an arbitrary file.
 * The prototype declaration is `mrb_bool mrb_ro_data_p(const char *ptr)`.
-* Return `TRUE` if `ptr` is in read-only section, otherwise return `FALSE`.
+* Return `TRUE` if `ptr` is in the read-only section, otherwise return `FALSE`.
+
+## Other configuration
 
-## Other configuration.
 `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.
 
 `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`.
 
 `KHASH_DEFAULT_SIZE`
+
 * Default value is `32`.
 * Specifies default size of khash table bucket.
 * Used in `kh_init_ ## name` function.
 
-`MRB_STR_BUF_MIN_SIZE`
-* Default value is `128`.
-* Specifies initial capacity of `RString` created by `mrb_str_buf_new` function..
+`MRB_NO_METHOD_CACHE`
 
-`MRB_METHOD_CACHE`
-* Improve performance for method dispatch.
+* Disable method cache to save memory.
 
 `MRB_METHOD_CACHE_SIZE`
-* Default value is `128`.
-* Ignored if `MRB_METHOD_CACHE` is not defined.
+
+* Default value is `256`.
+* Ignored if `MRB_NO_METHOD_CACHE` is defined.
 * Need to be the power of 2.
 
-`MRB_METHOD_T_STRUCT`
+`MRB_USE_METHOD_T_STRUCT`
+
 * Use C struct to represent `mrb_method_t`
-* No `MRB_METHOD_T_STRUCT` requires highest 2 bits of function pointers to be zero
+* 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_ENABLE_ALL_SYMBOLS`
-* Make it available `Symbols.all_symbols` in `mrbgems/mruby-symbol-ext`
+`MRB_USE_ALL_SYMBOLS`
+
+* Make it available `Symbol.all_symbols` in `mrbgems/mruby-symbol-ext`
 * Increase heap memory usage.

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

@@ -1,52 +1,62 @@
 # mrbgems
 
 mrbgems is a library manager to integrate C and Ruby extension in an easy and
-standardised way into mruby.
+standardised way into mruby. Conventionally, each mrbgem name is prefixed by
+`mruby-`, e.g. `mruby-time` for a gem that provides `Time` class functionality.
 
 ## Usage
 
-By default mrbgems is currently deactivated. As soon as you add a GEM to your
-build configuration (i.e. *build_config.rb*), mrbgems will be activated and the
-extension integrated.
+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:
 
-To add a GEM into the *build_config.rb* add the following line for example:
 ```ruby
 conf.gem '/path/to/your/gem/dir'
 ```
 
-You can also use a relative path which would be relative from the mruby root:
+You can also use a relative path to specify a gem.
+
 ```ruby
 conf.gem 'examples/mrbgems/ruby_extension_example'
 ```
 
+In that case,
+
+* 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.
+
 A remote GIT repository location for a GEM is also supported:
+
 ```ruby
 conf.gem :git => 'https://github.com/masuidrive/mrbgems-example.git', :branch => 'master'
 conf.gem :github => 'masuidrive/mrbgems-example', :branch => 'master'
 conf.gem :bitbucket => 'mruby/mrbgems-example', :branch => 'master'
 ```
 
-You can specify the sub directory of the repository with `:path` option:
+You can specify the subdirectory of the repository with `:path` option:
+
 ```ruby
 conf.gem github: 'mruby/mruby', path: 'mrbgems/mruby-socket'
 ```
 
 To use mrbgem from mgem-list(https://github.com/mruby/mgem-list) use `:mgem` option:
+
 ```ruby
 conf.gem :mgem => 'mruby-yaml'
 conf.gem :mgem => 'yaml' # 'mruby-' prefix could be omitted
 ```
 
-For specifying commit hash to checkout use `:checksum_hash` option:
+For specifying the commit hash to checkout use `:checksum_hash` option:
+
 ```ruby
 conf.gem mgem: 'mruby-redis', checksum_hash: '3446d19fc4a3f9697b5ddbf2a904f301c42f2f4e'
 ```
 
-If there is missing dependencies, mrbgem dependencies solver will reference
-mrbgem from core or mgem-list.
+If there are missing dependencies, mrbgem dependencies solver will reference
+mrbgem from the core or mgem-list.
 
-To pull all gems from remote GIT repository on build, call ```rake -p```,
-or ```rake --pull-gems```.
+To pull all gems from remote GIT repository on build, call `rake -p`,
+or `rake --pull-gems`.
 
 NOTE: `:bitbucket` option supports only git. Hg is unsupported in this version.
 
@@ -54,13 +64,14 @@
 
 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 the *build_config.rb* file.  A packaged collection of mrbgems
+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 *build_config.rb*
+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
 loaded into mruby via `config.gembox 'boxname'`.
 
-Below we have created a GemBox containing *mruby-time* and *mrbgems-example*:
+Below we have created a GemBox containing `mruby-time` and `mrbgems-example`:
+
 ```ruby
 MRuby::GemBox.new do |conf|
   conf.gem "#{root}/mrbgems/mruby-time"
@@ -69,20 +80,23 @@
 ```
 
 As mentioned, the GemBox uses the same conventions as `MRuby::Build`.  The GemBox
-must be saved with a *.gembox* extension inside the *mrbgems* directory to to be
+must be saved with a `.gembox` extension inside the `mrbgems` directory to be
 picked up by mruby.
 
-To use this example GemBox, we save it as `custom.gembox` inside the *mrbgems*
-directory in mruby, and add the following to our *build_config.rb* file inside
+To use this example GemBox, we save it as `custom.gembox` inside the `mrbgems`
+directory in mruby, and add the following to your build configuration file inside
 the build block:
+
 ```ruby
 conf.gembox 'custom'
 ```
-This will cause the *custom* GemBox to be read in during the build process,
-adding *mruby-time* and *mrbgems-example* to the build.
+
+This will cause the `custom` GemBox to be read in during the build process,
+adding `mruby-time` and `mrbgems-example` to the build.
 
 If you want, you can put GemBox outside of mruby directory. In that case you must
 specify an absolute path like below.
+
 ```ruby
 conf.gembox "#{ENV"HOME"}/mygemboxes/custom"
 ```
@@ -90,36 +104,41 @@
 There are two GemBoxes that ship with mruby: default(../../mrbgems/default.gembox)
 and full-core(../../mrbgems/full-core.gembox). The default(../../mrbgems/default.gembox) GemBox
 contains several core components of mruby, and full-core(../../mrbgems/full-core.gembox)
-contains every gem found in the *mrbgems* directory.
+contains every gem found in the `mrbgems` directory.
 
 ## GEM Structure
 
 The maximal GEM structure looks like this:
 
-	+- GEM_NAME         <- Name of GEM
-	   |
-	   +- include/      <- Header for Ruby extension (will exported)
-	   |
-	   +- mrblib/       <- Source for Ruby extension
-	   |
-	   +- src/          <- Source for C extension
-	   |
-	   +- test/         <- Test code (Ruby)
-	   |
-	   +- mrbgem.rake   <- GEM Specification
-	   |
-	   +- README.md     <- Readme for GEM
-
-The folder *mrblib* contains pure Ruby files to extend mruby. The folder *src*
-contains C/C++ files to extend mruby. The folder *include* contains C/C++ header
-files. The folder *test* contains C/C++ and pure Ruby files for testing purposes
-which will be used by `mrbtest`. *mrbgem.rake* contains the specification
-to compile C and Ruby files. *README.md* is a short description of your GEM.
+```
++- GEM_NAME             <- Name of GEM
+    |
+    +- README.md        <- Readme for GEM
+    |
+    +- mrbgem.rake      <- GEM Specification
+    |
+    +- include/         <- Header for Ruby extension (will exported)
+    |
+    +- mrblib/          <- Source for Ruby extension
+    |
+    +- src/             <- Source for C extension
+    |
+    +- tools/           <- Source for Executable (in C)
+    |
+    +- test/            <- Test code (Ruby)
+```
+
+The folder `mrblib` contains pure Ruby files to extend mruby. The folder `src`
+contains C/C++ files to extend mruby. The folder `include` contains C/C++ header
+files. The folder `test` contains C/C++ and pure Ruby files for testing purposes
+which will be used by `mrbtest`. `mrbgem.rake` contains the specification
+to compile C and Ruby files. `README.md` is a short description of your GEM.
 
 ## Build process
 
-mrbgems expects a specification file called *mrbgem.rake* inside of your
+mrbgems expects a specification file called `mrbgem.rake` inside of your
 GEM directory. A typical GEM specification could look like this for example:
+
 ```ruby
 MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
   spec.license = 'MIT'
@@ -129,10 +148,10 @@
 ```
 
 The mrbgems build process will use this specification to compile Object and Ruby
-files. The compilation results will be added to *lib/libmruby.a*. This file exposes
+files. The compilation results will be added to `lib/libmruby.a`. This file exposes
 the GEM functionality to tools like `mruby` and `mirb`.
 
-The following properties can be set inside of your `MRuby::Gem::Specification` for
+The following properties can be set inside your `MRuby::Gem::Specification` for
 information purpose:
 
 * `spec.license` or `spec.licenses` (A single license or a list of them under which this GEM is licensed)
@@ -149,6 +168,7 @@
 
 In case your GEM is depending on other GEMs please use
 `spec.add_dependency(gem, *requirements, default_get_info)` like:
+
 ```ruby
 MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
   spec.license = 'MIT'
@@ -158,10 +178,10 @@
   # The version must be between 1.0.0 and 1.5.2 .
   spec.add_dependency('mruby-parser', '>= 1.0.0', '<= 1.5.2')
 
-  # Use any version of mruby-uv from github.
+  # Use any version of mruby-uv from GitHub.
   spec.add_dependency('mruby-uv', '>= 0.0.0', :github => 'mattn/mruby-uv')
 
-  # Use latest mruby-onig-regexp from github. (version requirements can be omitted)
+  # Use latest mruby-onig-regexp from GitHub. (version requirements can be omitted)
   spec.add_dependency('mruby-onig-regexp', :github => 'mattn/mruby-onig-regexp')
 
   # You can add extra mgems active only on test
@@ -172,6 +192,7 @@
 The version requirements and default gem information are optional.
 
 Version requirement supports following operators:
+
 * '=': is equal
 * '!=': is not equal
 * '>': is greater
@@ -179,23 +200,25 @@
 * '>=': 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'
+  * 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.
 
-You can have default gem to use as dependency when it's not defined in *build_config.rb*.
+You can have default gem to use as dependency when it's not defined in your build configuration.
 When the last argument of `add_dependency` call is `Hash`, it will be treated as default gem information.
 Its format is same as argument of method `MRuby::Build#gem`, expect that it can't be treated as path gem location.
 
 When a special version of dependency is required,
-use `MRuby::Build#gem` in *build_config.rb* to override default gem.
+use `MRuby::Build#gem` in the build configuration to override default gem.
 
 If you have conflicting GEMs use the following method:
+
 * `spec.add_conflict(gem, *requirements)`
-    * The `requirements` argument is same as in `add_dependency` method.
+  * The `requirements` argument is same as in `add_dependency` method.
 
 like following code:
+
 ```ruby
 MRuby::Gem::Specification.new 'some-regexp-binding' do |spec|
   spec.license = 'BSD'
@@ -209,7 +232,7 @@
 ```
 
 In case your GEM has more complex build requirements you can use
-the following options additionally inside of your GEM specification:
+the following options additionally inside your GEM specification:
 
 * `spec.cc.flags` (C compiler flags)
 * `spec.cc.defines` (C compiler defines)
@@ -224,7 +247,7 @@
 * `spec.test_objs` (Object test files for integration into mrbtest)
 * `spec.test_preload` (Initialization files for mrbtest)
 
-You also can use `spec.mruby.cc` and `spec.mruby.linker` to add extra global parameters for compiler and linker.
+You also can use `spec.mruby.cc` and `spec.mruby.linker` to add extra global parameters for the compiler and linker.
 
 ### include_paths and dependency
 
@@ -233,12 +256,11 @@
 So it is recommended not to put GEM's local header files on include/.
 
 These exports are retroactive.
-For example: when B depends to C and A depends to B, A will get include paths exported by C.
+For example: when B depends on C and A depends on B, A will get include paths exported by C.
 
 Exported include_paths are automatically appended to GEM local include_paths by rake.
 You can use `spec.export_include_paths` accessor if you want more complex build.
 
-
 ## C Extension
 
 mruby can be extended with C. This is possible by using the C API to
@@ -248,9 +270,10 @@
 
 mrbgems expects that you have implemented a C method called
 `mrb_YOURGEMNAME_gem_init(mrb_state)`. `YOURGEMNAME` will be replaced
-by the name of your GEM. If you call your GEM *c_extension_example*, your
+by the name of your GEM. If you call your GEM `c_extension_example`, your
 initialisation method could look like this:
-```C
+
+```c
 void
 mrb_c_extension_example_gem_init(mrb_state* mrb) {
   struct RClass *class_cextension = mrb_define_module(mrb, "CExtension");
@@ -262,10 +285,10 @@
 
 mrbgems expects that you have implemented a C method called
 `mrb_YOURGEMNAME_gem_final(mrb_state)`. `YOURGEMNAME` will be replaced
-by the name of your GEM. If you call your GEM *c_extension_example*, your
+by the name of your GEM. If you call your GEM `c_extension_example`, your
 finalizer method could look like this:
 
-```C
+```c
 void
 mrb_c_extension_example_gem_final(mrb_state* mrb) {
   free(someone);
@@ -274,54 +297,57 @@
 
 ### Example
 
-	+- c_extension_example/
-	   |
-	   +- src/
-	   |  |
-	   |  +- example.c         <- C extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for C extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
+```
++- c_extension_example/
+    |
+    +- README.md        (Optional)
+    |
+    +- src/
+    |   |
+    |   +- example.c    <- C extension source
+    |
+    +- test/
+    |   |
+    |   +- example.rb   <- Test code for C extension
+    |
+    +- mrbgem.rake      <- GEM specification
+```
 
 ## Ruby Extension
 
 mruby can be extended with pure Ruby. It is possible to override existing
-classes or add new ones in this way. Put all Ruby files into the *mrblib*
+classes or add new ones in this way. Put all Ruby files into the `mrblib`
 folder.
 
-
 ### Pre-Conditions
 
 none
 
 ### Example
 
-	+- ruby_extension_example/
-	   |
-	   +- mrblib/
-	   |  |
-	   |  +- example.rb        <- Ruby extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for Ruby extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
+```
++- ruby_extension_example/
+    |
+    +- README.md        (Optional)
+    |
+    +- mrblib/
+    |   |
+    |   +- example.rb   <- Ruby extension source
+    |
+    +- test/
+    |   |
+    |   +- example.rb   <- Test code for Ruby extension
+    |
+    +- mrbgem.rake      <- GEM specification
+```
 
 ## C and Ruby Extension
 
 mruby can be extended with C and Ruby at the same time. It is possible to
 override existing classes or add new ones in this way. Put all Ruby files
-into the *mrblib* folder and all C files into the *src* folder.
+into the `mrblib` folder and all C files into the `src` folder.
 
-mruby codes under *mrblib* directory would be executed after gem init C
+mruby codes under `mrblib` directory would be executed after gem init C
 function is called. Make sure *mruby script* depends on *C code* and
 *C code* doesn't depend on *mruby script*.
 
@@ -331,20 +357,61 @@
 
 ### Example
 
-	+- c_and_ruby_extension_example/
-	   |
-	   +- mrblib/
-	   |  |
-	   |  +- example.rb        <- Ruby extension source
-	   |
-	   +- src/
-	   |  |
-	   |  +- example.c         <- C extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for C and Ruby extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
+```
++- c_and_ruby_extension_example/
+    |
+    +- README.md        (Optional)
+    |
+    +- mrblib/
+    |   |
+    |   +- example.rb   <- Ruby extension source
+    |
+    +- src/
+    |   |
+    |   +- example.c    <- C extension source
+    |
+    +- test/
+    |   |
+    |   +- example.rb   <- Test code for C and Ruby extension
+    |
+    +- mrbgem.rake      <- GEM specification
+```
+
+## Binary gems
+
+Some gems can generate executables under `bin` directory. Those gems are called
+binary gems.  Names of binary gems are conventionally prefixed by `mruby-bin`,
+e.g. `mruby-bin-mirb` and `mruby-bin-strip`.
+
+To specify the name of executable, you need to specify `spec.bins` in the
+`mrbgem.rake`. The entry point `main()` should be in the C source file under
+`tools/<bin>/*.c` where `<bin>` is a name of the executable. C files under the
+`<bin>` directory are compiled and linked to the executable, but not included in
+`libmruby.a`, whereas files under `mrblib` and `src` are.
+
+It is strongly recommended not to include `mrblib` and `src` directories in the
+binary gems, to separate normal gems and binary gems.
+
+### Example
+
+```
++- mruby-bin-example/
+    |
+    +- README.md        (Optional)
+    |
+    +- bintest/
+    |   |
+    |   +- example.rb   <- Test code for binary gem
+    |
+    +- mrbgem.rake      <- Gem specification
+    |
+    +- mrblib/          <- Source for Ruby extension (Optional)
+    |
+    +- src/             <- Source for C extension (Optional)
+    |
+    +- tools/
+        |
+        +- example/     <- Executable name directory
+        |
+        +- example.c    <- Source for Executable (includes main)
+```

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

@@ -0,0 +1,83 @@
+# 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
+used as flags, e.g. `struct mt_elem` in `class.c`.
+
+```c
+struct mt_elem {
+  union mt_ptr ptr;
+  size_t func_p:1;
+  size_t noarg_p:1;
+  mrb_sym key:sizeof(mrb_sym)*8-2;
+};
+```
+
+## C API
+
+We provide following C API for symbols.
+
+### Generate Symbols
+
+#### `mrb_sym mrb_intern(mrb_state*,const char*,size_t)`
+
+Get a symbol from a string.
+
+#### `mrb_sym mrb_intern_check_cstr(mrb_state*,const char*)`
+
+Get a symbol from a NULL terminated (C) string.
+
+#### `mrb_sym mrb_intern_str(mrb_state*,mrb_value)`
+
+Get a symbol from a Ruby string object.
+
+#### `mrb_intern_lit(mrb_state*,const char*)`
+
+Get a symbol from a C string literal. The second argument should be a C string
+literal, otherwise you will get a compilation error. It does not copy C string
+given the fact it's a literal.
+
+#### `mrb_sym mrb_intern_check(mrb_state*,const char*,size_t)`
+
+Get a symbol from a string if the string has been already registered as a
+symbol, otherwise return `0`. We also provide variants `mrb_intern_check_str()`
+(from Ruby string) and `mrb_intern_check_cstr()` (from C string).
+
+#### `const char *mrb_sym_name(mrb_state*,mrb_sym)`
+
+Get a string representation of a symbol as a C string.
+
+#### `const char *mrb_sym_name_len(mrb_state*,mrb_sym,mrb_int*)`
+
+Get a string representation of a symbol, and its length.
+
+## Preallocate Symbols
+
+To save RAM, `mruby` can use compile-time allocation of some symbols. You can
+use following macros to get preallocated symbols by including `mruby/presym.h`
+header.
+
+* `MRB_SYM(xor)`    //=> xor    (Word characters)
+* `MRB_SYM_B(xor)`  //=> xor!   (Method with Bang)
+* `MRB_SYM_Q(xor)`  //=> xor?   (Method with Question mark)
+* `MRB_SYM_E(xor)`  //=> xor=   (Method with Equal)
+* `MRB_CVSYM(xor)`  //=> @@xor  (Class Variable)
+* `MRB_IVSYM(xor)`  //=> @xor   (Instance Variable)
+* `MRB_OPSYM(xor)`  //=> ^      (Operator)
+
+For `MRB_OPSYM()`, specify the names corresponding to operators (see
+`MRuby::Presym::OPERATORS` in `lib/mruby/presym.rb` for the names that
+can be specified for it). Other than that, describe only word characters
+excluding leading and ending punctuations.
+
+These macros are converted to static symbol IDs at compile time, unless
+preallocate symbols are disabled by  `conf.disable_presym`. In that case,
+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
+its name is not `mrb`, you need to use macros with `_2` suffix, such as
+`MRB_SYM_2` to specify `mrb_state*` variable.
+
+### Disabling Preallocated Symbols
+
+You can disable preallocated symbols by specifying `conf.disable_presym` in the
+configuration file.

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/doc/internal Added

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

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

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

@@ -0,0 +1,128 @@
+# The new bytecode
+
+We will reimplement the VM to use 8bit instruction code. By
+bytecode, we mean real byte code. The whole purpose is
+reducing the memory consumption of mruby VM.
+
+# Instructions
+
+Instructions are bytes. There can be 256 instructions. Currently, we
+have 94 instructions. Instructions can take 0 to 3 operands.
+
+## operands
+
+The size of operands can be either 8bits, 16bits or 24bits.
+In the table.1 below, the second field describes the size (and
+sign) of operands.
+
+* B: 8bit
+* S: 16bit
+* sS: signed 16bit
+* W: 24bit
+
+## table.1 Instruction Table
+
+| Instruction Name | Operand type | Semantics                                                |
+|------------------|--------------|----------------------------------------------------------|
+| `OP_NOP`         | `-`          | `no operation`                                           |
+| `OP_MOVE`        | `BB`         | `R(a) = R(b)`                                            |
+| `OP_LOADL`       | `BB`         | `R(a) = Pool(b)`                                         |
+| `OP_LOADI`       | `BB`         | `R(a) = mrb_int(b)`                                      |
+| `OP_LOADINEG`    | `BB`         | `R(a) = mrb_int(-b)`                                     |
+| `OP_LOADI__1`    | `B`          | `R(a) = mrb_int(-1)`                                     |
+| `OP_LOADI_0`     | `B`          | `R(a) = mrb_int(0)`                                      |
+| `OP_LOADI_1`     | `B`          | `R(a) = mrb_int(1)`                                      |
+| `OP_LOADI_2`     | `B`          | `R(a) = mrb_int(2)`                                      |
+| `OP_LOADI_3`     | `B`          | `R(a) = mrb_int(3)`                                      |
+| `OP_LOADI_4`     | `B`          | `R(a) = mrb_int(4)`                                      |
+| `OP_LOADI_5`     | `B`          | `R(a) = mrb_int(5)`                                      |
+| `OP_LOADI_6`     | `B`          | `R(a) = mrb_int(6)`                                      |
+| `OP_LOADI_7`     | `B`          | `R(a) = mrb_int(7)`                                      |
+| `OP_LOADI16`     | `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`                                                |
+|------------------|--------------|----------------------------------------------------------|

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

@@ -13,37 +13,6 @@
 This document does not contain a complete list of limitations.
 Please help to improve it by submitting your findings.
 
-
-## `1/2` gives `0.5`
-
-Since mruby does not have `Bignum`, bigger integers are represented
-by `Float` numbers. To enhance interoperability between `Fixnum`
-and `Float`, mruby provides `Float#upto` and other iterating
-methods for the `Float` class.  As a side effect, `1/2` gives `0.5`
-not `0`.
-
-## `Array` passed to `puts`
-
-Passing an Array to `puts` results in different output.
-
-```ruby
-puts 1,2,3
-```
-
-#### Ruby ruby 2.0.0p645 (2015-04-13 revision 50299)
-
-```
-1
-2
-3
-```
-
-#### mruby 2.1.2 (2020-08-06)
-
-```
-1, 2, 3
-```
-
 ## `Kernel.raise` in rescue clause
 
 `Kernel.raise` without arguments does not raise the current exception within
@@ -61,13 +30,21 @@
 
 `ZeroDivisionError` is raised.
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
-No exception is raised.
+`RuntimeError` is raised instead of `ZeroDivisionError`. To re-raise the exception, you have to do:
+
+```ruby
+begin
+  1 / 0
+rescue => e
+  raise e
+end
+```
 
 ## Fiber execution can't cross C function boundary
 
-mruby's `Fiber` is implemented in a similar way to Lua's co-routine. This
+mruby's `Fiber` is implemented similarly to Lua's co-routine. This
 results in the consequence that you can't switch context within C functions.
 Only exception is `mrb_fiber_yield` at return.
 
@@ -78,7 +55,7 @@
 ```ruby
 class Liste < Array
   def initialize(str = nil)
-    @feld = str
+    @field = str
   end
 end
 
@@ -89,14 +66,14 @@
 
 `  `
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
 `ArgumentError` is raised.
 
 ## Method visibility
 
 For simplicity reasons no method visibility (public/private/protected) is
-supported. Those methods are defined but they are dummy methods.
+supported. Those methods are defined, but they are dummy methods.
 
 ```ruby
 class VisibleTest
@@ -119,7 +96,7 @@
 true
 ```
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
 ```
 true
@@ -156,7 +133,7 @@
 ok
 ```
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
 ```
 test.rb:8: undefined method 'test_func' (NoMethodError)
@@ -178,7 +155,7 @@
 nil
 ```
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
 `NameError` is raised.
 
@@ -195,7 +172,7 @@
 
 ` nil `
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
 Syntax error
 
@@ -217,7 +194,7 @@
 `ArgumentError` is raised.
 The re-defined `+` operator does not accept any arguments.
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
 ` 'ab' `
 Behavior of the operator wasn't changed.
@@ -233,7 +210,7 @@
 #<Binding:0x00000e9deabb9950>
 ```
 
-#### mruby 2.1.2 (2020-08-06)
+#### mruby 3.1.0 (2022-05-12)
 
 ```
 $ ./bin/mruby -e 'puts Proc.new {}.binding'
@@ -242,27 +219,19 @@
 -e:1: undefined method 'binding' (NoMethodError)
 ```
 
-## Keyword arguments
-
-mruby keyword arguments behave slightly different from CRuby 2.5
-to make the behavior simpler and less confusing. Maybe in the
-future, the simpler behavior will be adopted to CRuby as well.
+## `nil?` redefinition in conditional expressions
 
-#### Ruby ruby 2.5.1p57 (2018-03-29 revision 63029)
+Redefinition of `nil?` is ignored in conditional expressions.
 
-```
-$ ruby -e 'def m(*r,**k) p r,k end; m("a"=>1,:b=>2)'
-{"a"=>1}, {:b=>2}
+```ruby
+a = "a"
+def a.nil?
+  true
+end
+puts(a.nil? ? "truthy" : "falsy")
 ```
 
-#### mruby mruby 2.1.2
-
-```
-$ ./bin/mruby -e 'def m(*r,**k) p r,k end; m("a"=>1,:b=>2)'
-trace (most recent call last):
-	0 -e:1
--e:1: keyword argument hash with non symbol keys (ArgumentError)
-```
+Ruby outputs `falsy`. mruby outputs `truthy`.
 
 ## Argument Destructuring
 
@@ -270,6 +239,7 @@
 def m(a,(b,c),d); p a,b,c,d; end
 m(1,2,3,4)  # => 1,2,3,4
 ```
+
 Destructured arguments (`b` and `c` in above example) cannot be accessed
 from the default expression of optional arguments and keyword arguments,
 since actual assignment is done after the evaluation of those default
@@ -283,17 +253,3 @@
 ```
 
 CRuby gives `1,2,3,nil`. mruby raises `NoMethodError` for `b`.
-
-## `nil?` redefinition in conditional expressions
-
-Redefinition of `nil?` is ignored in conditional expressions.
-
-```ruby
-a = "a"
-def a.nil?
-  true
-end
-puts(a.nil? ? "truthy" : "falsy")
-```
-
-Ruby outputs `falsy`. mruby outputs `truthy`.

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

@@ -0,0 +1,162 @@
+# User visible changes in `mruby3.0`
+
+# Build System
+
+## `build_config` directory
+
+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
+
+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`,
+for example.
+
+# Build Configuration Contribution
+
+When you write a new build configuration description, please
+contribute. We welcome your contribution as a GitHub
+pull-request.
+
+# Language Changes
+
+## New Syntax
+
+We have ported some new syntax from CRuby.
+
+* 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`)
+
+# Configuration Options Changed
+
+## Renamed for consistency
+
+Some configuration macro names are changed for consistency (use `MRB_USE_XXX`
+ or `MRB_NO_XXX`).
+
+|             mruby2             |          mruby3           |
+|--------------------------------|---------------------------|
+| `MRB_ENABLE_ALL_SYMBOLS`       | `MRB_USE_ALL_SYMBOLS`     |
+| `MRB_ENABLE_CXX_ABI`           | `MRB_USE_CXX_ABI`         |
+| `MRB_ENABLE_CXX_EXCEPTION`     | `MRB_USE_CXX_EXCEPTION`   |
+| `MRB_ENABLE_DEBUG_HOOK`        | `MRB_USE_DEBUG_HOOK`      |
+| `MRB_DISABLE_DIRECT_THREADING` | `MRB_NO_DIRECT_THREADING` |
+| `MRB_DISABLE_STDIO`            | `MRB_NO_STDIO`            |
+| `MRB_METHOD_T_STRUCT`          | `MRB_USE_METHOD_T_STRUCT` |
+| `MRB_USE_FLOAT`                | `MRB_USE_FLOAT32`         |
+| `MRB_WITHOUT_FLOAT`            | `MRB_NO_FLOAT`            |
+| `ENABLE_LINENOISE`             | `MRB_USE_LINENOISE`       |
+| `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
+  portable but consumes more memory. Turned on by default on 32bit platforms.
+* `MRB_` prefix is added to those without.
+
+## `MRB_NO_BOXING`
+
+Uses `struct` to represent `mrb_value`. Consumes more memory
+but easier to investigate the internal and to debug. It used
+to be default `mrb_value` representation. Now the default is
+`MRB_WORD_BOXING`.
+
+## `MRB_WORD_BOXING`
+
+Pack `mrb_value` in an `intptr_t` integer. Consumes less
+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
+changed from previous versions.
+
+## `MRB_USE_MALLOC_TRIM`
+
+Call `malloc_trim(0)` from mrb_full_gc() if this macro is defined.
+If you are using glibc malloc, this macro could reduce memory consumption.
+
+# Command Line Program
+
+## `bin/mruby` (by mrbgems/mruby-bin-mruby)
+
+The mruby3 now automatically detects `*.mrb` files without the `-b`
+switch. Therefore, it can be mixed with the `*.rb` file in combination
+with the `-r` switch and specified at the same time.
+Here's an example that works fine:
+
+```console
+$ bin/mruby app.mrb
+$ bin/mruby -r lib1.mrb -r lib2.rb app.rb
+$ bin/mruby -r lib1.rb -r lib2.rb < app.mrb
+```
+
+# Internal Changes
+
+## New Instructions
+
+`mruby3` introduces a few new instructions.
+
+Instructions that access pooli/symsi where i>255.
+
+* `OP_LOADL16`
+* `OP_STRING16`
+* `OP_LOADSYM16`
+
+Instructions that load a 32 bit integer.
+
+* `OP_LOADI32`
+
+Instruction that unwinds jump table for rescue/ensure.
+
+* `OP_JMPUW`
+
+Renamed from `OP_RAISE`
+
+* `OP_RAISEIF`
+
+Instruction that is reserved for the future keyword argument support.
+
+* OP_SENDVK
+
+## Removed Instructions
+
+Instructions for old exception handling
+
+* `OP_ONERR`
+* `OP_POPERR`
+* `OP_EPUSH`
+* `OP_EPOP`
+
+No more operand extension
+
+* `OP_EXT1`
+* `OP_EXT2`
+* `OP_EXT3`
+
+## Changed Instructions
+
+Jump addresses used to be specified by absolute offset from the start of `iseq`. Now they are relative offset from the address of the next instruction.
+
+## `Random` now use `xoshiro128++`.
+
+For better and faster random number generation.
+
+## Preallocated Symbol
+
+Preallocated symbols are interned at compile-time. They can be accessed via symbols macros (e.g. `MRB_SYM()`).
+
+See Symbols(https://github.com/mruby/mruby/blob/master/doc/guides/symbol.md).

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

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/mrbgems/c_extension_example/src/example.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/examples/mrbgems/c_extension_example/src/example.c Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb Changed

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

@@ -7,9 +7,6 @@
 #ifndef MRUBYCONF_H
 #define MRUBYCONF_H
 
-#include <limits.h>
-#include <stdint.h>
-
 /* architecture selection: */
 /* specify -DMRB_32BIT or -DMRB_64BIT to override */
 #if !defined(MRB_32BIT) && !defined(MRB_64BIT)
@@ -25,33 +22,72 @@
 #endif
 
 /* configuration options: */
-/* add -DMRB_USE_FLOAT to use float instead of double for floating point numbers */
-//#define MRB_USE_FLOAT
+/* add -DMRB_USE_FLOAT32 to use float instead of double for floating-point numbers */
+//#define MRB_USE_FLOAT32
+
+/* exclude floating-point numbers */
+//#define MRB_NO_FLOAT
+
+/* obsolete configuration */
+#if defined(MRB_USE_FLOAT)
+# define MRB_USE_FLOAT32
+#endif
 
-/* exclude floating point numbers */
-//#define MRB_WITHOUT_FLOAT
+/* obsolete configuration */
+#if defined(MRB_WITHOUT_FLOAT)
+# define MRB_NO_FLOAT
+#endif
+
+#if defined(MRB_USE_FLOAT32) && defined(MRB_NO_FLOAT)
+#error Cannot define MRB_USE_FLOAT32 and MRB_NO_FLOAT at the same time
+#endif
 
-/* add -DMRB_METHOD_CACHE to use method cache to improve performance */
-//#define MRB_METHOD_CACHE
+/* add -DMRB_NO_METHOD_CACHE to disable method cache to save memory */
+//#define MRB_NO_METHOD_CACHE
 /* size of the method cache (need to be the power of 2) */
-//#define MRB_METHOD_CACHE_SIZE (1<<7)
+//#define MRB_METHOD_CACHE_SIZE (1<<8)
 
-/* add -DMRB_METHOD_T_STRUCT on machines that use higher bits of pointers */
-/* no MRB_METHOD_T_STRUCT requires highest 2 bits of function pointers to be zero */
-#ifndef MRB_METHOD_T_STRUCT
+/* add -DMRB_USE_METHOD_T_STRUCT on machines that use higher bits of function pointers */
+/* no MRB_USE_METHOD_T_STRUCT requires highest 2 bits of function pointers to be zero */
+#ifndef MRB_USE_METHOD_T_STRUCT
   // can't use highest 2 bits of function pointers at least on 32bit
   // Windows and 32bit Linux.
 # ifdef MRB_32BIT
-#   define MRB_METHOD_T_STRUCT
+#   define MRB_USE_METHOD_T_STRUCT
+# endif
+#endif
+
+/* define on big endian machines; used by MRB_NAN_BOXING, etc. */
+#ifndef MRB_ENDIAN_BIG
+# if (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN) || \
+     (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#  define MRB_ENDIAN_BIG
 # endif
 #endif
 
+/* represent mrb_value in boxed double; conflict with MRB_USE_FLOAT32 and MRB_NO_FLOAT */
+//#define MRB_NAN_BOXING
+
+/* represent mrb_value as a word (natural unit of data for the processor) */
+//#define MRB_WORD_BOXING
+
+/* represent mrb_value as a struct; occupies 2 words */
+//#define MRB_NO_BOXING
+
+/* if no specific boxing type is chosen */
+#if !defined(MRB_NAN_BOXING) && !defined(MRB_WORD_BOXING) && !defined(MRB_NO_BOXING)
+# define MRB_WORD_BOXING
+#endif
+
+/* if defined mruby allocates Float objects in the heap to keep full precision if needed */
+//#define MRB_WORDBOX_NO_FLOAT_TRUNCATE
+
 /* add -DMRB_INT32 to use 32bit integer for mrb_int; conflict with MRB_INT64;
    Default for 32-bit CPU mode. */
 //#define MRB_INT32
 
 /* add -DMRB_INT64 to use 64bit integer for mrb_int; conflict with MRB_INT32;
-   Default for 64-bit CPU mode. */
+   Default for 64-bit CPU mode (unless using MRB_NAN_BOXING). */
 //#define MRB_INT64
 
 /* if no specific integer type is chosen */
@@ -65,19 +101,8 @@
 # endif
 #endif
 
-/* define on big endian machines; used by MRB_NAN_BOXING, etc. */
-#ifndef MRB_ENDIAN_BIG
-# if (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN) || \
-     (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#  define MRB_ENDIAN_BIG
-# endif
-#endif
-
-/* represent mrb_value in boxed double; conflict with MRB_USE_FLOAT and MRB_WITHOUT_FLOAT */
-//#define MRB_NAN_BOXING
-
-/* represent mrb_value as a word (natural unit of data for the processor) */
-//#define MRB_WORD_BOXING
+/* call malloc_trim(0) from mrb_full_gc() */
+//#define MRB_USE_MALLOC_TRIM
 
 /* string class to handle UTF-8 encoding */
 //#define MRB_UTF8_STRING
@@ -88,11 +113,17 @@
 /* number of object per heap page */
 //#define MRB_HEAP_PAGE_SIZE 1024
 
-/* if __ehdr_start is available, mruby can reduce memory used by symbols */
-//#define MRB_USE_LINK_TIME_RO_DATA_P
+/* define if your platform does not support etext, edata */
+//#define MRB_NO_DEFAULT_RO_DATA_P
 
-/* if MRB_USE_LINK_TIME_RO_DATA_P does not work,
-   you can try mrb_ro_data_p() that you have implemented yourself in any file;
+/* define if your platform supports etext, edata */
+//#define MRB_USE_RO_DATA_P_ETEXT
+/* use MRB_USE_ETEXT_RO_DATA_P by default on Linux */
+#if (defined(__linux__) && !defined(__KERNEL__))
+#define MRB_USE_ETEXT_RO_DATA_P
+#endif
+
+/* you can provide and use mrb_ro_data_p() for your platform.
    prototype is `mrb_bool mrb_ro_data_p(const char *ptr)` */
 //#define MRB_USE_CUSTOM_RO_DATA_P
 
@@ -108,9 +139,6 @@
 /* page size of memory pool */
 //#define POOL_PAGE_SIZE 16000
 
-/* initial minimum size for string buffer */
-//#define MRB_STR_BUF_MIN_SIZE 128
-
 /* arena size */
 //#define MRB_GC_ARENA_SIZE 100
 
@@ -123,35 +151,40 @@
 /* fixed size state atexit stack */
 //#define MRB_FIXED_STATE_ATEXIT_STACK
 
-/* -DMRB_DISABLE_XXXX to drop following features */
-//#define MRB_DISABLE_STDIO /* use of stdio */
-
-/* -DMRB_ENABLE_XXXX to enable following features */
-//#define MRB_ENABLE_DEBUG_HOOK /* hooks for debugger */
-//#define MRB_ENABLE_ALL_SYMBOLS /* Symbols.all_symbols */
+/* -DMRB_NO_XXXX to drop following features */
+//#define MRB_NO_STDIO /* use of stdio */
 
-/* end of configuration */
+/* -DMRB_USE_XXXX to enable following features */
+//#define MRB_USE_DEBUG_HOOK /* hooks for debugger */
+//#define MRB_USE_ALL_SYMBOLS /* Symbol.all_symbols */
 
-/* define MRB_DISABLE_XXXX from DISABLE_XXX (for compatibility) */
-#ifdef DISABLE_STDIO
-#define MRB_DISABLE_STDIO
+/* obsolete configurations */
+#ifdef MRB_METHOD_T_STRUCT
+# define MRB_USE_METHOD_T_STRUCT
 #endif
-
-/* define MRB_ENABLE_XXXX from ENABLE_XXX (for compatibility) */
-#ifdef ENABLE_DEBUG
-#define MRB_ENABLE_DEBUG_HOOK
+#if defined(DISABLE_STDIO) || defined(MRB_DISABLE_STDIO)
+# define MRB_NO_STDIO
 #endif
-
-#ifndef MRB_DISABLE_STDIO
-# include <stdio.h>
+#ifdef MRB_DISABLE_DIRECT_THREADING
+# define MRB_NO_DIRECT_THREADING
 #endif
-
-#ifndef FALSE
-# define FALSE 0
+#if defined(ENABLE_DEBUG) || defined(MRB_ENABLE_DEBUG_HOOK)
+# define MRB_USE_DEBUG_HOOK
+#endif
+#ifdef MRB_ENABLE_ALL_SYMBOLS
+# define MRB_USE_ALL_SYMBOLS
+#endif
+#ifdef MRB_ENABLE_CXX_ABI
+# define MRB_USE_CXX_ABI
+#endif
+#ifdef MRB_ENABLE_CXX_EXCEPTION
+# define MRB_USE_CXX_EXCEPTION
 #endif
 
-#ifndef TRUE
-# define TRUE 1
+/* end of configuration */
+
+#ifndef MRB_NO_STDIO
+# include <stdio.h>
 #endif
 
 /*
@@ -160,12 +193,12 @@
 
 /* A profile for micro controllers */
 #if defined(MRB_CONSTRAINED_BASELINE_PROFILE)
-# ifndef KHASH_DEFAULT_SIZE
-#  define KHASH_DEFAULT_SIZE 16
+# ifndef MRB_NO_METHOD_CACHE
+#  define MRB_NO_METHOD_CACHE
 # endif
 
-# ifndef MRB_STR_BUF_MIN_SIZE
-#  define MRB_STR_BUF_MIN_SIZE 32
+# ifndef KHASH_DEFAULT_SIZE
+#  define KHASH_DEFAULT_SIZE 16
 # endif
 
 # ifndef MRB_HEAP_PAGE_SIZE
@@ -177,36 +210,20 @@
 
 /* A profile for desktop computers or workstations; rich memory! */
 #elif defined(MRB_MAIN_PROFILE)
-# ifndef MRB_METHOD_CACHE
-#  define MRB_METHOD_CACHE
-# endif
-
 # ifndef MRB_METHOD_CACHE_SIZE
 #  define MRB_METHOD_CACHE_SIZE (1<<10)
 # endif
 
-# ifndef MRB_IV_SEGMENT_SIZE
-#  define MRB_IV_SEGMENT_SIZE 32
-# endif
-
 # ifndef MRB_HEAP_PAGE_SIZE
 #  define MRB_HEAP_PAGE_SIZE 4096
 # endif
 
 /* A profile for server; mruby vm is long life */
 #elif defined(MRB_HIGH_PROFILE)
-# ifndef MRB_METHOD_CACHE
-#  define MRB_METHOD_CACHE
-# endif
-
 # ifndef MRB_METHOD_CACHE_SIZE
 #  define MRB_METHOD_CACHE_SIZE (1<<12)
 # endif
 
-# ifndef MRB_IV_SEGMENT_SIZE
-#  define MRB_IV_SEGMENT_SIZE 64
-# endif
-
 # ifndef MRB_HEAP_PAGE_SIZE
 #  define MRB_HEAP_PAGE_SIZE 4096
 # endif

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

@@ -1,7 +1,7 @@
 /*
 ** mruby - An embeddable Ruby implementation
 **
-** Copyright (c) mruby developers 2010-2020
+** Copyright (c) mruby developers 2010-2021
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -22,7 +22,7 @@
 ** 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 
+**  MIT license: https://www.opensource.org/licenses/mit-license.php 
 */
 
 /**
@@ -44,6 +44,9 @@
 #include <limits.h>
 
 #ifdef __cplusplus
+#ifndef UINTPTR_MAX
+#error Must be placed `#include <mruby.h>` before `#include <stdint.h>`
+#endif
 #ifndef SIZE_MAX
 #ifdef __SIZE_MAX__
 #define SIZE_MAX __SIZE_MAX__
@@ -53,6 +56,10 @@
 #endif
 #endif
 
+#ifdef _MSC_VER
+# define __func__ __FUNCTION__
+#endif
+
 #ifdef MRB_DEBUG
 #include <assert.h>
 #define mrb_assert(p) assert(p)
@@ -62,12 +69,48 @@
 #define mrb_assert_int_fit(t1,n,t2,max) ((void)0)
 #endif
 
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L
-#define mrb_static_assert(exp, str) _Static_assert(exp, str)
+#if (defined __cplusplus && __cplusplus >= 201703L)
+# define mrb_static_assert(...) static_assert(__VA_ARGS__)
+# define mrb_static_assert1(exp) static_assert(exp)
+# define mrb_static_assert2(exp, str) static_assert(exp, str)
+#elif (defined __cplusplus && __cplusplus >= 201103L) || \
+    (defined _MSC_VER) || \
+    (defined __GXX_EXPERIMENTAL_CXX0X__)  /* for old G++/Clang++ */
+# define mrb_static_assert2(exp, str) static_assert(exp, str)
+#elif defined __STDC_VERSION__ && \
+        ((__STDC_VERSION__ >= 201112L) || \
+         (defined __GNUC__ && __GNUC__ * 100 + __GNUC_MINOR__ >= 406))
+# define mrb_static_assert2(exp, str) _Static_assert(exp, str)
 #else
-#define mrb_static_assert(exp, str) mrb_assert(exp)
+# /* alternative implementation of static_assert() */
+# define _mrb_static_assert_cat0(a, b) a##b
+# define _mrb_static_assert_cat(a, b) _mrb_static_assert_cat0(a, b)
+# ifdef __COUNTER__
+#  define _mrb_static_assert_id(prefix) _mrb_static_assert_cat(prefix, __COUNTER__)
+# else
+#  define _mrb_static_assert_id(prefix) _mrb_static_assert_cat(prefix, __LINE__)
+# endif
+# define mrb_static_assert2(exp, str) \
+   struct _mrb_static_assert_id(_mrb_static_assert_) { char x(exp) ? 1 : -1; }
 #endif
 
+#ifndef mrb_static_assert
+# define mrb_static_assert1(exp) mrb_static_assert2(exp, #exp)
+# define mrb_static_assert_expand(...) __VA_ARGS__ /* for MSVC behaviour - https://stackoverflow.com/q/5530505 */
+# define mrb_static_assert_selector(a, b, name, ...) name
+/**
+ * The `mrb_static_assert()` macro function takes one or two arguments.
+ *
+ *      !!!c
+ *      mrb_static_assert(expect_condition);
+ *      mrb_static_assert(expect_condition, error_message);
+ */
+# define mrb_static_assert(...) \
+    mrb_static_assert_expand(mrb_static_assert_selector(__VA_ARGS__, mrb_static_assert2, mrb_static_assert1, _)(__VA_ARGS__))
+#endif
+
+#define mrb_static_assert_powerof2(num) mrb_static_assert((num) > 0 && (num) == ((num) & -(num)), "need power of 2 for " #num)
+
 #include "mrbconf.h"
 
 #include <mruby/common.h>
@@ -75,7 +118,8 @@
 #include <mruby/gc.h>
 #include <mruby/version.h>
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
+#include <math.h>
 #include <float.h>
 #ifndef FLT_EPSILON
 #define FLT_EPSILON (1.19209290e-07f)
@@ -87,7 +131,7 @@
 #define LDBL_EPSILON (1.08420217248550443401e-19L)
 #endif
 
-#ifdef MRB_USE_FLOAT
+#ifdef MRB_USE_FLOAT32
 #define MRB_FLOAT_EPSILON FLT_EPSILON
 #else
 #define MRB_FLOAT_EPSILON DBL_EPSILON
@@ -129,17 +173,17 @@
 #endif
 
 typedef struct {
+  uint8_t n:4;                  /* (15=*) c=n|nk<<4 */
+  uint8_t nk:4;                 /* (15=*) */
+  uint8_t cci;                  /* called from C function */
   mrb_sym mid;
-  struct RProc *proc;
-  mrb_value *stackent;
-  uint16_t ridx;
-  uint16_t epos;
-  struct REnv *env;
-  const mrb_code *pc;           /* return address */
-  const mrb_code *err;          /* error position */
-  int argc;
-  int acc;
-  struct RClass *target_class;
+  const struct RProc *proc;
+  mrb_value *stack;
+  const mrb_code *pc;           /* current address on iseq of this proc */
+  union {
+    struct REnv *env;
+    struct RClass *target_class;
+  } u;
 } mrb_callinfo;
 
 enum mrb_fiber_state {
@@ -154,28 +198,23 @@
 struct mrb_context {
   struct mrb_context *prev;
 
-  mrb_value *stack;                       /* stack of virtual machine */
-  mrb_value *stbase, *stend;
+  mrb_value *stbase, *stend;              /* stack of virtual machine */
 
   mrb_callinfo *ci;
   mrb_callinfo *cibase, *ciend;
 
-  uint16_t *rescue;                       /* exception handler stack */
-  uint16_t rsize;
-  struct RProc **ensure;                  /* ensure handler stack */
-  uint16_t esize, eidx;
-
   enum mrb_fiber_state status : 4;
   mrb_bool vmexec : 1;
   struct RFiber *fib;
 };
 
 #ifdef MRB_METHOD_CACHE_SIZE
-# define MRB_METHOD_CACHE
+# undef MRB_NO_METHOD_CACHE
+mrb_static_assert_powerof2(MRB_METHOD_CACHE_SIZE);
 #else
-/* default method cache size: 128 */
+/* default method cache size: 256 */
 /* cache size needs to be power of 2 */
-# define MRB_METHOD_CACHE_SIZE (1<<7)
+# define MRB_METHOD_CACHE_SIZE (1<<8)
 #endif
 
 /**
@@ -189,7 +228,7 @@
  */
 typedef mrb_value (*mrb_func_t)(struct mrb_state *mrb, mrb_value self);
 
-#ifndef MRB_METHOD_T_STRUCT
+#ifndef MRB_USE_METHOD_T_STRUCT
 typedef uintptr_t mrb_method_t;
 #else
 typedef struct {
@@ -201,7 +240,7 @@
 } mrb_method_t;
 #endif
 
-#ifdef MRB_METHOD_CACHE
+#ifndef MRB_NO_METHOD_CACHE
 struct mrb_cache_entry {
   struct RClass *c, *c0;
   mrb_sym mid;
@@ -235,10 +274,10 @@
   struct RClass *hash_class;
   struct RClass *range_class;
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   struct RClass *float_class;
 #endif
-  struct RClass *fixnum_class;
+  struct RClass *integer_class;
   struct RClass *true_class;
   struct RClass *false_class;
   struct RClass *nil_class;
@@ -247,21 +286,23 @@
 
   mrb_gc gc;
 
-#ifdef MRB_METHOD_CACHE
+#ifndef MRB_NO_METHOD_CACHE
   struct mrb_cache_entry cacheMRB_METHOD_CACHE_SIZE;
 #endif
 
   mrb_sym symidx;
-  struct symbol_name *symtbl;   /* symbol table */
+  const char **symtbl;
+  uint8_t *symlink;
+  uint8_t *symflags;
   mrb_sym symhash256;
   size_t symcapa;
-#ifndef MRB_ENABLE_SYMBOLL_ALL
+#ifndef MRB_USE_ALL_SYMBOLS
   char symbuf8;               /* buffer for small symbol names */
 #endif
 
-#ifdef MRB_ENABLE_DEBUG_HOOK
-  void (*code_fetch_hook)(struct mrb_state* mrb, struct mrb_irep *irep, const mrb_code *pc, mrb_value *regs);
-  void (*debug_op_hook)(struct mrb_state* mrb, struct mrb_irep *irep, const mrb_code *pc, mrb_value *regs);
+#ifdef MRB_USE_DEBUG_HOOK
+  void (*code_fetch_hook)(struct mrb_state* mrb, const struct mrb_irep *irep, const mrb_code *pc, mrb_value *regs);
+  void (*debug_op_hook)(struct mrb_state* mrb, const struct mrb_irep *irep, const mrb_code *pc, mrb_value *regs);
 #endif
 
 #ifdef MRB_BYTECODE_DECODE_OPTION
@@ -273,7 +314,7 @@
   struct RObject *nomem_err;              /* pre-allocated NoMemoryError */
   struct RObject *stack_err;              /* pre-allocated SysStackError */
 #ifdef MRB_GC_FIXED_ARENA
-  struct RObject *arena_err;              /* pre-allocated arena overfow error */
+  struct RObject *arena_err;              /* pre-allocated arena overflow error */
 #endif
 
   void *ud; /* auxiliary data */
@@ -284,7 +325,6 @@
   mrb_atexit_func *atexit_stack;
 #endif
   uint16_t atexit_stack_len;
-  uint16_t ecall_nest;                    /* prevent infinite recursive ecall() */
 } mrb_state;
 
 /**
@@ -309,6 +349,7 @@
  * @see mrb_define_class_under
  */
 MRB_API struct RClass *mrb_define_class(mrb_state *mrb, const char *name, struct RClass *super);
+MRB_API struct RClass *mrb_define_class_id(mrb_state *mrb, mrb_sym name, struct RClass *super);
 
 /**
  * Defines a new module.
@@ -318,6 +359,7 @@
  * @return struct RClass * Reference to the newly defined module.
  */
 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);
 
 MRB_API mrb_value mrb_singleton_class(mrb_state *mrb, mrb_value val);
 MRB_API struct RClass *mrb_singleton_class_ptr(mrb_state *mrb, mrb_value val);
@@ -373,6 +415,7 @@
  * @param aspec The method parameters declaration.
  */
 MRB_API void mrb_define_method(mrb_state *mrb, struct RClass *cla, const char *name, mrb_func_t func, mrb_aspec aspec);
+MRB_API void mrb_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t func, mrb_aspec aspec);
 
 /**
  * Defines a class method.
@@ -400,6 +443,7 @@
  * @param aspec The method parameters declaration.
  */
 MRB_API void mrb_define_class_method(mrb_state *mrb, struct RClass *cla, const char *name, mrb_func_t fun, mrb_aspec aspec);
+MRB_API void mrb_define_class_method_id(mrb_state *mrb, struct RClass *cla, mrb_sym name, mrb_func_t fun, mrb_aspec aspec);
 
 /**
  * Defines a singleton method
@@ -407,6 +451,7 @@
  * @see mrb_define_class_method
  */
 MRB_API void mrb_define_singleton_method(mrb_state *mrb, struct RObject *cla, const char *name, mrb_func_t fun, mrb_aspec aspec);
+MRB_API void mrb_define_singleton_method_id(mrb_state *mrb, struct RObject *cla, mrb_sym name, mrb_func_t fun, mrb_aspec aspec);
 
 /**
  *  Defines a module function.
@@ -434,6 +479,7 @@
  *  @param aspec The method parameters declaration.
  */
 MRB_API void mrb_define_module_function(mrb_state *mrb, struct RClass *cla, const char *name, mrb_func_t fun, mrb_aspec aspec);
+MRB_API void mrb_define_module_function_id(mrb_state *mrb, struct RClass *cla, mrb_sym name, mrb_func_t fun, mrb_aspec aspec);
 
 /**
  *  Defines a constant.
@@ -462,6 +508,7 @@
  *  @param val The value for the constant.
  */
 MRB_API void mrb_define_const(mrb_state* mrb, struct RClass* cla, const char *name, mrb_value val);
+MRB_API void mrb_define_const_id(mrb_state* mrb, struct RClass* cla, mrb_sym name, mrb_value val);
 
 /**
  * Undefines a method.
@@ -552,6 +599,7 @@
  * @param name The name of the class method to be undefined.
  */
 MRB_API void mrb_undef_class_method(mrb_state *mrb, struct RClass *cls, const char *name);
+MRB_API void mrb_undef_class_method_id(mrb_state *mrb, struct RClass *cls, mrb_sym name);
 
 /**
  * Initialize a new object instance of c class.
@@ -653,6 +701,7 @@
  * @return mrb_bool A boolean value.
  */
 MRB_API mrb_bool mrb_class_defined(mrb_state *mrb, const char *name);
+MRB_API mrb_bool mrb_class_defined_id(mrb_state *mrb, mrb_sym name);
 
 /**
  * Gets a class.
@@ -660,7 +709,8 @@
  * @param name The name of the class.
  * @return struct RClass * A reference to the class.
 */
-MRB_API struct RClass * mrb_class_get(mrb_state *mrb, const char *name);
+MRB_API struct RClass* mrb_class_get(mrb_state *mrb, const char *name);
+MRB_API struct RClass* mrb_class_get_id(mrb_state *mrb, mrb_sym name);
 
 /**
  * Gets a exception class.
@@ -668,7 +718,8 @@
  * @param name The name of the class.
  * @return struct RClass * A reference to the class.
 */
-MRB_API struct RClass * mrb_exc_get(mrb_state *mrb, const char *name);
+MRB_API struct RClass* mrb_exc_get_id(mrb_state *mrb, mrb_sym name);
+#define mrb_exc_get(mrb, name) mrb_exc_get_id(mrb, mrb_intern_cstr(mrb, name))
 
 /**
  * Returns an mrb_bool. True if inner class was defined, and false if the inner class was not defined.
@@ -700,6 +751,7 @@
  * @return mrb_bool A boolean value.
  */
 MRB_API mrb_bool mrb_class_defined_under(mrb_state *mrb, struct RClass *outer, const char *name);
+MRB_API mrb_bool mrb_class_defined_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name);
 
 /**
  * Gets a child class.
@@ -709,6 +761,7 @@
  * @return struct RClass * A reference to the class.
 */
 MRB_API struct RClass * mrb_class_get_under(mrb_state *mrb, struct RClass *outer, const char *name);
+MRB_API struct RClass * mrb_class_get_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name);
 
 /**
  * Gets a module.
@@ -717,6 +770,7 @@
  * @return struct RClass * A reference to the module.
 */
 MRB_API struct RClass * mrb_module_get(mrb_state *mrb, const char *name);
+MRB_API struct RClass * mrb_module_get_id(mrb_state *mrb, mrb_sym name);
 
 /**
  * Gets a module defined under another module.
@@ -726,6 +780,8 @@
  * @return struct RClass * A reference to the module.
 */
 MRB_API struct RClass * mrb_module_get_under(mrb_state *mrb, struct RClass *outer, const char *name);
+MRB_API struct RClass * mrb_module_get_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name);
+
 /* a function to raise NotImplementedError with current method name */
 MRB_API void mrb_notimplement(mrb_state*);
 /* a function to be replacement of unimplemented method */
@@ -794,9 +850,11 @@
  * @return struct RClass * Reference to the newly defined class
  * @see mrb_define_class
  */
-MRB_API struct RClass * mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, struct RClass *super);
+MRB_API struct RClass* mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, struct RClass *super);
+MRB_API struct RClass* mrb_define_class_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name, struct RClass *super);
 
-MRB_API struct RClass * mrb_define_module_under(mrb_state *mrb, struct RClass *outer, const char *name);
+MRB_API struct RClass* mrb_define_module_under(mrb_state *mrb, struct RClass *outer, const char *name);
+MRB_API struct RClass* mrb_define_module_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name);
 
 /**
  * Function requires n arguments.
@@ -856,26 +914,34 @@
  * | char | Ruby type      | C types           | Notes                                              |
  * |:----:|----------------|-------------------|----------------------------------------------------|
  * | `o`  | {Object}       | {mrb_value}       | Could be used to retrieve any type of argument     |
- * | `C`  | {Class}/{Module} | {mrb_value}     |                                                    |
+ * | `C`  | {Class}/{Module} | {mrb_value}     | when `!` follows, the value may be `nil`           |
  * | `S`  | {String}       | {mrb_value}       | when `!` follows, the value may be `nil`           |
  * | `A`  | {Array}        | {mrb_value}       | when `!` follows, the value may be `nil`           |
  * | `H`  | {Hash}         | {mrb_value}       | when `!` follows, the value may be `nil`           |
- * | `s`  | {String}       | char *, {mrb_int} | Receive two arguments; `s!` gives (`NULL`,`0`) for `nil`        |
- * | `z`  | {String}       | char *            | `NULL` terminated string; `z!` gives `NULL` for `nil`           |
- * | `a`  | {Array}        | {mrb_value} *, {mrb_int} | Receive two arguments; `a!` gives (`NULL`,`0`) for `nil` |
- * | `f`  | {Fixnum}/{Float} | {mrb_float}       |                                                    |
- * | `i`  | {Fixnum}/{Float} | {mrb_int}         |                                                    |
+ * | `s`  | {String}       | const char *, {mrb_int} | Receive two arguments; `s!` gives (`NULL`,`0`) for `nil` |
+ * | `z`  | {String}       | const char *      | `NULL` terminated string; `z!` gives `NULL` for `nil` |
+ * | `a`  | {Array}        | const {mrb_value} *, {mrb_int} | Receive two arguments; `a!` gives (`NULL`,`0`) for `nil` |
+ * | `c`  | {Class}/{Module} | strcut RClass * | `c!` gives `NULL` for `nil`                        |
+ * | `f`  | {Integer}/{Float} | {mrb_float}    |                                                    |
+ * | `i`  | {Integer}/{Float} | {mrb_int}      |                                                    |
  * | `b`  | boolean        | {mrb_bool}        |                                                    |
  * | `n`  | {String}/{Symbol} | {mrb_sym}         |                                                    |
  * | `d`  | data           | void *, {mrb_data_type} const | 2nd argument will be used to check data type so it won't be modified; when `!` follows, the value may be `nil` |
- * | `I`  | inline struct  | void *          |                                                    |
+ * | `I`  | inline struct  | void *, struct RClass | `I!` gives `NULL` for `nil`                    |
  * | `&`  | block          | {mrb_value}       | &! raises exception if no block given.             |
- * | `*`  | rest arguments | {mrb_value} *, {mrb_int} | Receive the rest of arguments as an array; `*!` avoid copy of the stack.  |
+ * | `*`  | rest arguments | const {mrb_value} *, {mrb_int} | Receive the rest of arguments as an array; `*!` avoid copy of the stack.  |
  * | <code>\|</code> | optional     |                   | After this spec following specs would be optional. |
  * | `?`  | optional given | {mrb_bool}        | `TRUE` if preceding argument is given. Used to check optional argument is given. |
  * | `:`  | keyword args   | {mrb_kwargs} const | Get keyword arguments. @see mrb_kwargs |
  *
  * @see mrb_get_args
+ *
+ * Immediately after format specifiers it can add format modifiers:
+ *
+ * | char | Notes                                                                                   |
+ * |:----:|-----------------------------------------------------------------------------------------|
+ * | `!`  | Switch to the alternate mode; The behaviour changes depending on the format specifier   |
+ * | `+`  | Request a not frozen object; However, except nil value                                  |
  */
 typedef const char *mrb_args_format;
 
@@ -902,7 +968,7 @@
  *      const char *kw_nameskw_num = { "a", "b" };
  *      uint32_t kw_required = 0;
  *      mrb_value kw_valueskw_num;
- *      const mrb_kwargs kwargs = { kw_num, kw_values, kw_names, kw_required, NULL };
+ *      const 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); }
@@ -913,10 +979,10 @@
  *
  *      mrb_value str, kw_rest;
  *      uint32_t kw_num = 3;
- *      const char *kw_nameskw_num = { "x", "y", "z" };
+ *      const mrb_sym kw_nameskw_num = { MRB_SYM(x), MRB_SYM(y), MRB_SYM(z) };
  *      uint32_t kw_required = 1;
  *      mrb_value kw_valueskw_num;
- *      const mrb_kwargs kwargs = { kw_num, kw_values, kw_names, kw_required, &kw_rest };
+ *      const 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);
@@ -927,11 +993,11 @@
 
 struct mrb_kwargs
 {
-  uint32_t num;
-  mrb_value *values;
-  const char *const *table;
-  uint32_t required;
-  mrb_value *rest;
+  uint32_t num;                 /* number of keyword arguments */
+  uint32_t 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) */
 };
 
 /**
@@ -964,7 +1030,7 @@
  *
  * Correctly handles *splat arguments.
  */
-MRB_API mrb_value* mrb_get_argv(mrb_state *mrb);
+MRB_API const mrb_value *mrb_get_argv(mrb_state *mrb);
 
 /**
  * Retrieve the first and only argument from mrb_state.
@@ -974,6 +1040,11 @@
  */
 MRB_API mrb_value mrb_get_arg1(mrb_state *mrb);
 
+/**
+ * Check if a block argument is given from mrb_state.
+ */
+MRB_API mrb_bool mrb_block_given_p(mrb_state *mrb);
+
 /* `strlen` for character string literals (use with caution or `strlen` instead)
     Adjacent string literals are concatenated in C/C++ in translation phase 6.
     If `lit` is not one, the compiler will report a syntax error:
@@ -1001,6 +1072,7 @@
  *        FILE *fp = fopen("test.rb","r");
  *        mrb_value obj = mrb_load_file(mrb,fp);
  *        mrb_funcall(mrb, obj, "method_name", 1, mrb_fixnum_value(i));
+ *        mrb_funcall_id(mrb, obj, MRB_SYM(method_name), 1, mrb_fixnum_value(i));
  *        fclose(fp);
  *        mrb_close(mrb);
  *      }
@@ -1013,6 +1085,7 @@
  * @return mrb_value mruby function value.
  */
 MRB_API mrb_value mrb_funcall(mrb_state *mrb, mrb_value val, const char *name, mrb_int argc, ...);
+MRB_API mrb_value mrb_funcall_id(mrb_state *mrb, mrb_value val, mrb_sym mid, mrb_int argc, ...);
 /**
  * Call existing ruby functions. This is basically the type safe version of mrb_funcall.
  *
@@ -1022,15 +1095,14 @@
  *      int
  *      main()
  *      {
- *        mrb_int i = 99;
  *        mrb_state *mrb = mrb_open();
+ *        mrb_value obj = mrb_fixnum_value(1);
  *
  *        if (!mrb) { }
- *        mrb_sym m_sym = mrb_intern_lit(mrb, "method_name"); // Symbol for method.
  *
  *        FILE *fp = fopen("test.rb","r");
  *        mrb_value obj = mrb_load_file(mrb,fp);
- *        mrb_funcall_argv(mrb, obj, m_sym, 1, &obj); // Calling ruby function from test.rb.
+ *        mrb_funcall_argv(mrb, obj, MRB_SYM(method_name), 1, &obj); // Calling ruby function from test.rb.
  *        fclose(fp);
  *        mrb_close(mrb);
  *       }
@@ -1048,7 +1120,8 @@
  */
 MRB_API mrb_value mrb_funcall_with_block(mrb_state *mrb, mrb_value val, mrb_sym name, mrb_int argc, const mrb_value *argv, mrb_value block);
 /**
- * Create a symbol
+ * Create a symbol from C string. But usually it's better to use MRB_SYM,
+ * MRB_OPSYM, MRB_CVSYM, MRB_IVSYM, MRB_SYM_B, MRB_SYM_Q, MRB_SYM_E macros.
  *
  * Example:
  *
@@ -1056,7 +1129,9 @@
  *     :pizza # => :pizza
  *
  *     // C style:
- *     mrb_sym m_sym = mrb_intern_lit(mrb, "pizza"); //  => :pizza
+ *     mrb_sym sym1 = mrb_intern_lit(mrb, "pizza"); //  => :pizza
+ *     mrb_sym sym2 = MRB_SYM(pizza);               //  => :pizza
+ *     mrb_sym sym3 = MRB_SYM_Q(pizza);             //  => :pizza?
  *
  * @param mrb The current mruby state.
  * @param str The string to be symbolized
@@ -1065,8 +1140,14 @@
 MRB_API mrb_sym mrb_intern_cstr(mrb_state *mrb, const char* str);
 MRB_API mrb_sym mrb_intern(mrb_state*,const char*,size_t);
 MRB_API mrb_sym mrb_intern_static(mrb_state*,const char*,size_t);
-#define mrb_intern_lit(mrb, lit) mrb_intern_static(mrb, lit, mrb_strlen_lit(lit))
+#define mrb_intern_lit(mrb, lit) mrb_intern_static(mrb, (lit ""), mrb_strlen_lit(lit))
 MRB_API mrb_sym mrb_intern_str(mrb_state*,mrb_value);
+/* mrb_intern_check series functions returns 0 if the symbol is not defined */
+MRB_API mrb_sym mrb_intern_check_cstr(mrb_state*,const char*);
+MRB_API mrb_sym mrb_intern_check(mrb_state*,const char*,size_t);
+MRB_API mrb_sym mrb_intern_check_str(mrb_state*,mrb_value);
+/* mrb_check_intern series functions returns nil if the symbol is not defined */
+/* otherwise returns mrb_value */
 MRB_API mrb_value mrb_check_intern_cstr(mrb_state*,const char*);
 MRB_API mrb_value mrb_check_intern(mrb_state*,const char*,size_t);
 MRB_API mrb_value mrb_check_intern_str(mrb_state*,mrb_value);
@@ -1086,6 +1167,17 @@
 MRB_API struct RBasic *mrb_obj_alloc(mrb_state*, enum mrb_vtype, struct RClass*);
 MRB_API void mrb_free(mrb_state*, void*);
 
+/**
+ * Allocates a Ruby object that matches the constant literal defined in
+ * `enum mrb_vtype` and returns a pointer to the corresponding C type.
+ *
+ * @param mrb   The current mruby state
+ * @param tt    The constant literal of `enum mrb_vtype`
+ * @param klass A Class object
+ * @return      Reference to the newly created object
+ */
+#define MRB_OBJ_ALLOC(mrb, tt, klass) ((MRB_VTYPE_TYPEOF(tt)*)mrb_obj_alloc(mrb, tt, klass))
+
 MRB_API mrb_value mrb_str_new(mrb_state *mrb, const char *p, size_t len);
 
 /**
@@ -1164,9 +1256,9 @@
 MRB_API void* mrb_default_allocf(mrb_state*, void*, size_t, void*);
 
 MRB_API mrb_value mrb_top_self(mrb_state *mrb);
-MRB_API mrb_value mrb_top_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep);
-MRB_API mrb_value mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep);
-MRB_API mrb_value mrb_vm_exec(mrb_state *mrb, struct RProc *proc, const mrb_code *iseq);
+MRB_API mrb_value mrb_top_run(mrb_state *mrb, const struct RProc *proc, mrb_value self, mrb_int stack_keep);
+MRB_API mrb_value mrb_vm_run(mrb_state *mrb, const struct RProc *proc, mrb_value self, mrb_int stack_keep);
+MRB_API mrb_value mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *iseq);
 /* compatibility macros */
 #define mrb_toplevel_run_keep(m,p,k) mrb_top_run((m),(p),mrb_top_self(m),(k))
 #define mrb_toplevel_run(m,p) mrb_toplevel_run_keep((m),(p),0)
@@ -1179,10 +1271,11 @@
 MRB_API mrb_bool mrb_obj_eq(mrb_state *mrb, mrb_value a, mrb_value b);
 MRB_API mrb_bool mrb_obj_equal(mrb_state *mrb, mrb_value a, mrb_value b);
 MRB_API mrb_bool mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
-MRB_API mrb_value mrb_convert_to_integer(mrb_state *mrb, mrb_value val, mrb_int base);
-MRB_API mrb_value mrb_Integer(mrb_state *mrb, mrb_value val);
-#ifndef MRB_WITHOUT_FLOAT
-MRB_API mrb_value mrb_Float(mrb_state *mrb, mrb_value val);
+#ifndef MRB_NO_FLOAT
+MRB_API mrb_value mrb_ensure_float_type(mrb_state *mrb, mrb_value val);
+#define mrb_as_float(mrb, x) mrb_float(mrb_ensure_float_type(mrb, x))
+/* obsolete: use mrb_ensure_float_type() instead */
+#define mrb_to_float(mrb, val) mrb_ensure_float_type(mrb, val)
 #endif
 MRB_API mrb_value mrb_inspect(mrb_state *mrb, mrb_value obj);
 MRB_API mrb_bool mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
@@ -1214,12 +1307,15 @@
 } while (0)
 MRB_API void mrb_write_barrier(mrb_state *, struct RBasic*);
 
-MRB_API mrb_value mrb_check_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method);
+MRB_API mrb_value mrb_type_convert(mrb_state *mrb, mrb_value val, enum mrb_vtype type, mrb_sym method);
+#define mrb_convert_type(mrb, val, type, tname, method) mrb_type_convert(mrb, val, type, mrb_intern_lit(mrb, method))
+MRB_API mrb_value mrb_type_convert_check(mrb_state *mrb, mrb_value val, enum mrb_vtype type, mrb_sym method);
+#define mrb_check_convert_type(mrb, val, type, tname, method) mrb_type_convert_check(mrb, val, type, mrb_intern_lit(mrb, method))
+
 MRB_API mrb_value mrb_any_to_s(mrb_state *mrb, mrb_value obj);
 MRB_API const char * mrb_obj_classname(mrb_state *mrb, mrb_value obj);
 MRB_API struct RClass* mrb_obj_class(mrb_state *mrb, mrb_value obj);
 MRB_API mrb_value mrb_class_path(mrb_state *mrb, struct RClass *c);
-MRB_API mrb_value mrb_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method);
 MRB_API mrb_bool mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c);
 MRB_API mrb_value mrb_obj_inspect(mrb_state *mrb, mrb_value self);
 MRB_API mrb_value mrb_obj_clone(mrb_state *mrb, mrb_value self);
@@ -1260,26 +1356,26 @@
    + those E_* macros requires mrb_state* variable named mrb.
    + exception objects obtained from those macros are local to mrb
 */
-#define E_RUNTIME_ERROR             (mrb_exc_get(mrb, "RuntimeError"))
-#define E_TYPE_ERROR                (mrb_exc_get(mrb, "TypeError"))
-#define E_ARGUMENT_ERROR            (mrb_exc_get(mrb, "ArgumentError"))
-#define E_INDEX_ERROR               (mrb_exc_get(mrb, "IndexError"))
-#define E_RANGE_ERROR               (mrb_exc_get(mrb, "RangeError"))
-#define E_NAME_ERROR                (mrb_exc_get(mrb, "NameError"))
-#define E_NOMETHOD_ERROR            (mrb_exc_get(mrb, "NoMethodError"))
-#define E_SCRIPT_ERROR              (mrb_exc_get(mrb, "ScriptError"))
-#define E_SYNTAX_ERROR              (mrb_exc_get(mrb, "SyntaxError"))
-#define E_LOCALJUMP_ERROR           (mrb_exc_get(mrb, "LocalJumpError"))
-#define E_REGEXP_ERROR              (mrb_exc_get(mrb, "RegexpError"))
-#define E_FROZEN_ERROR              (mrb_exc_get(mrb, "FrozenError"))
-
-#define E_NOTIMP_ERROR              (mrb_exc_get(mrb, "NotImplementedError"))
-#ifndef MRB_WITHOUT_FLOAT
-#define E_FLOATDOMAIN_ERROR         (mrb_exc_get(mrb, "FloatDomainError"))
+#define MRB_ERROR_SYM(sym) mrb_intern_lit(mrb, #sym)
+#define E_RUNTIME_ERROR      mrb_exc_get_id(mrb, MRB_ERROR_SYM(RuntimeError))
+#define E_TYPE_ERROR         mrb_exc_get_id(mrb, MRB_ERROR_SYM(TypeError))
+#define E_ZERODIV_ERROR      mrb_exc_get_id(mrb, MRB_ERROR_SYM(ZeroDivisionError))
+#define E_ARGUMENT_ERROR     mrb_exc_get_id(mrb, MRB_ERROR_SYM(ArgumentError))
+#define E_INDEX_ERROR        mrb_exc_get_id(mrb, MRB_ERROR_SYM(IndexError))
+#define E_RANGE_ERROR        mrb_exc_get_id(mrb, MRB_ERROR_SYM(RangeError))
+#define E_NAME_ERROR         mrb_exc_get_id(mrb, MRB_ERROR_SYM(NameError))
+#define E_NOMETHOD_ERROR     mrb_exc_get_id(mrb, MRB_ERROR_SYM(NoMethodError))
+#define E_SCRIPT_ERROR       mrb_exc_get_id(mrb, MRB_ERROR_SYM(ScriptError))
+#define E_SYNTAX_ERROR       mrb_exc_get_id(mrb, MRB_ERROR_SYM(SyntaxError))
+#define E_LOCALJUMP_ERROR    mrb_exc_get_id(mrb, MRB_ERROR_SYM(LocalJumpError))
+#define E_REGEXP_ERROR       mrb_exc_get_id(mrb, MRB_ERROR_SYM(RegexpError))
+#define E_FROZEN_ERROR       mrb_exc_get_id(mrb, MRB_ERROR_SYM(FrozenError))
+#define E_NOTIMP_ERROR       mrb_exc_get_id(mrb, MRB_ERROR_SYM(NotImplementedError))
+#define E_KEY_ERROR          mrb_exc_get_id(mrb, MRB_ERROR_SYM(KeyError))
+#ifndef MRB_NO_FLOAT
+# define E_FLOATDOMAIN_ERROR mrb_exc_get_id(mrb, MRB_ERROR_SYM(FloatDomainError))
 #endif
 
-#define E_KEY_ERROR                 (mrb_exc_get(mrb, "KeyError"))
-
 MRB_API mrb_value mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg);
 MRB_API mrb_value mrb_yield_argv(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv);
 MRB_API mrb_value mrb_yield_with_class(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv, mrb_value self, struct RClass *c);
@@ -1296,10 +1392,25 @@
 /* mrb_gc_unregister() removes the object from GC root. */
 MRB_API void mrb_gc_unregister(mrb_state *mrb, mrb_value obj);
 
-MRB_API mrb_value mrb_to_int(mrb_state *mrb, mrb_value val);
-#define mrb_int(mrb, val) mrb_fixnum(mrb_to_int(mrb, val))
+/* type conversion/check functions */
+MRB_API mrb_value mrb_ensure_array_type(mrb_state *mrb, mrb_value self);
+MRB_API mrb_value mrb_check_array_type(mrb_state *mrb, mrb_value self);
+MRB_API mrb_value mrb_ensure_hash_type(mrb_state *mrb, mrb_value hash);
+MRB_API mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash);
+MRB_API mrb_value mrb_ensure_string_type(mrb_state *mrb, mrb_value str);
+MRB_API mrb_value mrb_check_string_type(mrb_state *mrb, mrb_value str);
+/* obsolete: use mrb_ensure_string_type() instead */
+#define mrb_string_type(mrb, str) mrb_ensure_string_type(mrb,str)
+#define mrb_to_str(mrb, str) mrb_ensure_string_type(mrb,str)
+/* obsolete: use mrb_obj_as_string() instead */
+#define mrb_str_to_str(mrb, str) mrb_obj_as_string(mrb, str)
+MRB_API mrb_value mrb_ensure_int_type(mrb_state *mrb, mrb_value val);
+#define mrb_as_int(mrb, val) mrb_integer(mrb_ensure_int_type(mrb, val))
+/* obsolete: use mrb_ensure_int_type() instead */
+#define mrb_to_integer(mrb, val) mrb_ensure_int_type(mrb, val)
+#define mrb_to_int(mrb, val) mrb_ensure_int_type(mrb, val)
+
 /* string type checking (contrary to the name, it doesn't convert) */
-MRB_API mrb_value mrb_to_str(mrb_state *mrb, mrb_value val);
 MRB_API void mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t);
 
 MRB_INLINE void mrb_check_frozen(mrb_state *mrb, void *o)
@@ -1307,14 +1418,8 @@
   if (mrb_frozen_p((struct RBasic*)o)) mrb_frozen_error(mrb, o);
 }
 
-typedef enum call_type {
-  CALL_PUBLIC,
-  CALL_FCALL,
-  CALL_VCALL,
-  CALL_TYPE_MAX
-} call_type;
-
 MRB_API void mrb_define_alias(mrb_state *mrb, struct RClass *c, const char *a, const char *b);
+MRB_API void mrb_define_alias_id(mrb_state *mrb, struct RClass *c, mrb_sym a, mrb_sym b);
 MRB_API const char *mrb_class_name(mrb_state *mrb, struct RClass* klass);
 MRB_API void mrb_define_global_const(mrb_state *mrb, const char *name, mrb_value val);
 
@@ -1324,6 +1429,8 @@
 MRB_API mrb_bool mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c);
 MRB_API mrb_bool mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func);
 
+/* obsolete function(s); will be removed */
+#define mrb_int(mrb, val) mrb_as_int(mrb, val)
 
 /**
  * Resume a Fiber
@@ -1351,7 +1458,7 @@
  *
  * Implemented in mruby-fiber
  */
-#define E_FIBER_ERROR (mrb_exc_get(mrb, "FiberError"))
+#define E_FIBER_ERROR mrb_exc_get_id(mrb, MRB_ERROR_SYM(FiberError))
 MRB_API void mrb_stack_extend(mrb_state*, mrb_int);
 
 /* memory pool implementation */
@@ -1371,6 +1478,10 @@
 
 MRB_API mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
 
+#ifdef MRB_PRESYM_SCANNING
+# include <mruby/presym/scanning.h>
+#endif
+
 #if 0
 /* memcpy and memset does not work with gdb reverse-next on my box */
 /* use naive memcpy and memset instead */

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

@@ -14,14 +14,23 @@
  */
 MRB_BEGIN_DECL
 
-
 typedef struct mrb_shared_array {
   int refcnt;
   mrb_ssize len;
   mrb_value *ptr;
 } mrb_shared_array;
 
-#define MRB_ARY_EMBED_LEN_MAX ((mrb_int)(sizeof(void*)*3/sizeof(mrb_value)))
+#if defined(MRB_32BIT) && defined(MRB_NO_BOXING) && !defined(MRB_USE_FLOAT32) && !defined(MRB_ARY_NO_EMBED)
+# define MRB_ARY_NO_EMBED
+#endif
+
+#ifdef MRB_ARY_NO_EMBED
+# define MRB_ARY_EMBED_LEN_MAX 0
+#else
+# define MRB_ARY_EMBED_LEN_MAX ((mrb_int)(sizeof(void*)*3/sizeof(mrb_value)))
+mrb_static_assert(MRB_ARY_EMBED_LEN_MAX > 0, "MRB_ARY_EMBED_LEN_MAX > 0");
+#endif
+
 struct RArray {
   MRB_OBJECT_HEADER;
   union {
@@ -33,7 +42,9 @@
       } aux;
       mrb_value *ptr;
     } heap;
-    void *ary3;
+#ifndef MRB_ARY_NO_EMBED
+    mrb_value aryMRB_ARY_EMBED_LEN_MAX;
+#endif
   } as;
 };
 
@@ -41,14 +52,22 @@
 #define mrb_ary_value(p)  mrb_obj_value((void*)(p))
 #define RARRAY(v)  ((struct RArray*)(mrb_ptr(v)))
 
+#ifdef MRB_ARY_NO_EMBED
+#define ARY_EMBED_P(a) 0
+#define ARY_UNSET_EMBED_FLAG(a) (void)0
+#define ARY_EMBED_LEN(a) 0
+#define ARY_SET_EMBED_LEN(a,len) (void)0
+#define ARY_EMBED_PTR(a) 0
+#else
 #define MRB_ARY_EMBED_MASK  7
 #define ARY_EMBED_P(a) ((a)->flags & MRB_ARY_EMBED_MASK)
 #define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED_MASK))
 #define ARY_EMBED_LEN(a) ((mrb_int)(((a)->flags & MRB_ARY_EMBED_MASK) - 1))
 #define ARY_SET_EMBED_LEN(a,len) ((a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | ((uint32_t)(len) + 1))
-#define ARY_EMBED_PTR(a) ((mrb_value*)(&(a)->as.ary))
+#define ARY_EMBED_PTR(a) ((a)->as.ary)
+#endif
 
-#define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(a)->as.heap.len)
+#define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(mrb_int)(a)->as.heap.len)
 #define ARY_PTR(a) (ARY_EMBED_P(a)?ARY_EMBED_PTR(a):(a)->as.heap.ptr)
 #define RARRAY_LEN(a) ARY_LEN(RARRAY(a))
 #define RARRAY_PTR(a) ARY_PTR(RARRAY(a))
@@ -90,7 +109,7 @@
  *      Arrayvalue1, value2, ...
  *
  * @param mrb The mruby state reference.
- * @param size The numer of values.
+ * @param size The number of values.
  * @param vals The actual values.
  * @return The initialized array.
  */
@@ -160,20 +179,6 @@
 MRB_API mrb_value mrb_ary_pop(mrb_state *mrb, mrb_value ary);
 
 /*
- * Returns a reference to an element of the array on the given index.
- *
- * Equivalent to:
- *
- *      aryn
- *
- * @param mrb The mruby state reference.
- * @param ary The target array.
- * @param n The array index being referenced
- * @return The referenced value.
- */
-MRB_API mrb_value mrb_ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n);
-
-/*
  * Sets a value on an array at the given index
  *
  * Equivalent to:
@@ -183,7 +188,7 @@
  * @param mrb The mruby state reference.
  * @param ary The target array.
  * @param n The array index being referenced.
- * @param val The value being setted.
+ * @param val The value being set.
  */
 MRB_API void mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val);
 
@@ -199,8 +204,6 @@
  * @param other The array to replace it with.
  */
 MRB_API void mrb_ary_replace(mrb_state *mrb, mrb_value self, mrb_value other);
-MRB_API mrb_value mrb_ensure_array_type(mrb_state *mrb, mrb_value self);
-MRB_API mrb_value mrb_check_array_type(mrb_state *mrb, mrb_value self);
 
 /*
  * Unshift an element into the array
@@ -226,16 +229,17 @@
  * @param offset The element position (negative counts from the tail).
  */
 MRB_API mrb_value mrb_ary_entry(mrb_value ary, mrb_int offset);
+#define mrb_ary_ref(mrb, ary, n) mrb_ary_entry(ary, n)
 
 /*
  * Replace subsequence of an array.
  *
  * Equivalent to:
  *
- *      ary.shift
+ *      aryhead, len = rpl
  *
  * @param mrb The mruby state reference.
- * @param self The array from which the value will be shifted.
+ * @param self The array from which the value will be partiality replaced.
  * @param head Beginning position of a replacement subsequence.
  * @param len Length of a replacement subsequence.
  * @param rpl The array of replacement elements.
@@ -279,7 +283,7 @@
  *
  * @param mrb The mruby state reference.
  * @param ary The target array
- * @param sep The separater, can be NULL
+ * @param sep The separator, can be NULL
  */
 MRB_API mrb_value mrb_ary_join(mrb_state *mrb, mrb_value ary, mrb_value sep);

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

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

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

@@ -9,9 +9,11 @@
 
 #define MRB_FIXNUM_SHIFT 0
 #define MRB_SYMBOL_SHIFT 0
+#define MRB_FIXNUM_MIN MRB_INT_MIN
+#define MRB_FIXNUM_MAX MRB_INT_MAX
 
 union mrb_value_union {
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   mrb_float f;
 #endif
   void *p;
@@ -24,16 +26,13 @@
   enum mrb_vtype tt;
 } mrb_value;
 
-#ifndef MRB_WITHOUT_FLOAT
-#define mrb_float_pool(mrb,f) mrb_float_value(mrb,f)
-#endif
-
 #define mrb_ptr(o)      (o).value.p
 #define mrb_cptr(o)     mrb_ptr(o)
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 #define mrb_float(o)    (o).value.f
 #endif
 #define mrb_fixnum(o)   (o).value.i
+#define mrb_integer(o)  mrb_fixnum(o)
 #define mrb_symbol(o)   (o).value.sym
 #define mrb_type(o)     (o).tt
 
@@ -46,8 +45,9 @@
 #define SET_FALSE_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_FALSE, value.i, 1)
 #define SET_TRUE_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_TRUE, value.i, 1)
 #define SET_BOOL_VALUE(r,b) BOXNIX_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1)
-#define SET_INT_VALUE(r,n) BOXNIX_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n))
-#ifndef MRB_WITHOUT_FLOAT
+#define SET_INT_VALUE(mrb,r,n) BOXNIX_SET_VALUE(r, MRB_TT_INTEGER, value.i, (n))
+#define SET_FIXNUM_VALUE(r,n) BOXNIX_SET_VALUE(r, MRB_TT_INTEGER, value.i, (n))
+#ifndef MRB_NO_FLOAT
 #define SET_FLOAT_VALUE(mrb,r,v) BOXNIX_SET_VALUE(r, MRB_TT_FLOAT, value.f, (v))
 #endif
 #define SET_SYM_VALUE(r,v) BOXNIX_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v))

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

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

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

@@ -17,7 +17,7 @@
 struct RClass {
   MRB_OBJECT_HEADER;
   struct iv_tbl *iv;
-  struct kh_mt *mt;
+  struct mt_tbl *mt;
   struct RClass *super;
 };
 
@@ -35,9 +35,9 @@
     return mrb->true_class;
   case MRB_TT_SYMBOL:
     return mrb->symbol_class;
-  case MRB_TT_FIXNUM:
-    return mrb->fixnum_class;
-#ifndef MRB_WITHOUT_FLOAT
+  case MRB_TT_INTEGER:
+    return mrb->integer_class;
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
     return mrb->float_class;
 #endif
@@ -73,13 +73,11 @@
 #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)
 
-MRB_API struct RClass* mrb_define_class_id(mrb_state*, mrb_sym, struct RClass*);
-MRB_API struct RClass* mrb_define_module_id(mrb_state*, mrb_sym);
 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_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t func, mrb_aspec aspec);
 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);
 
 MRB_API mrb_method_t mrb_method_search_vm(mrb_state*, struct RClass**, mrb_sym);
 MRB_API mrb_method_t mrb_method_search(mrb_state*, struct RClass*, mrb_sym);
@@ -95,12 +93,16 @@
 size_t mrb_gc_mark_mt_size(mrb_state*, struct RClass*);
 void mrb_gc_free_mt(mrb_state*, struct RClass*);
 
-#ifdef MRB_METHOD_CACHE
+#ifndef MRB_NO_METHOD_CACHE
 void mrb_mc_clear_by_class(mrb_state *mrb, struct RClass* c);
 #else
 #define mrb_mc_clear_by_class(mrb,c)
 #endif
 
+/* return non zero to break the loop */
+typedef int (mrb_mt_foreach_func)(mrb_state*,mrb_sym,mrb_method_t,void*);
+MRB_API void mrb_mt_foreach(mrb_state*, struct RClass*, mrb_mt_foreach_func*, void*);
+
 MRB_END_DECL
 
 #endif  /* MRUBY_CLASS_H */

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

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

@@ -16,8 +16,6 @@
 
 #include <mruby.h>
 
-struct mrb_jmpbuf;
-
 struct mrb_parser_state;
 /* load context */
 typedef struct mrbc_context {
@@ -33,7 +31,8 @@
   mrb_bool no_exec:1;
   mrb_bool keep_lv:1;
   mrb_bool no_optimize:1;
-  struct RProc *upper;
+  mrb_bool no_ext_ops:1;
+  const struct RProc *upper;
 
   size_t parser_nerr;
 } mrbc_context;
@@ -42,6 +41,7 @@
 MRB_API void mrbc_context_free(mrb_state *mrb, mrbc_context *cxt);
 MRB_API const char *mrbc_filename(mrb_state *mrb, mrbc_context *c, const char *s);
 MRB_API void mrbc_partial_hook(mrb_state *mrb, mrbc_context *c, int (*partial_hook)(struct mrb_parser_state*), void*data);
+MRB_API void mrbc_cleanup_local_variables(mrb_state *mrb, mrbc_context *c);
 
 /* AST node structure */
 typedef struct mrb_ast_node {
@@ -57,7 +57,7 @@
   EXPR_ENDFN,                 /* ditto, and unbound braces. */
   EXPR_ARG,                   /* newline significant, +/- is an operator. */
   EXPR_CMDARG,                /* newline significant, +/- is an operator. */
-  EXPR_MID,                   /* newline significant, +/- is an operator. */
+  EXPR_MID,                   /* newline significant, +/- is a sign. */
   EXPR_FNAME,                 /* ignore newline, no reserved words. */
   EXPR_DOT,                   /* right after '.' or '::', no reserved words. */
   EXPR_CLASS,                 /* immediate after 'class', no here document. */
@@ -98,6 +98,9 @@
 /* heredoc structure */
 struct mrb_parser_heredoc_info {
   mrb_bool allow_indent:1;
+  mrb_bool remove_indent:1;
+  size_t indent;
+  mrb_ast_node *indented;
   mrb_bool line_head:1;
   enum mrb_string_type type;
   const char *term;
@@ -114,7 +117,8 @@
   struct mrb_pool *pool;
   mrb_ast_node *cells;
   const char *s, *send;
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
+  /* If both f and s are non-null, it will be taken preferentially from s until s < send. */
   FILE *f;
 #endif
   mrbc_context *cxt;
@@ -152,7 +156,8 @@
 
   mrb_bool no_optimize:1;
   mrb_bool capture_errors:1;
-  struct RProc *upper;
+  mrb_bool no_ext_ops:1;
+  const struct RProc *upper;
   struct mrb_parser_message error_buffer10;
   struct mrb_parser_message warn_buffer10;
 
@@ -160,7 +165,6 @@
   uint16_t filename_table_length;
   uint16_t current_filename_index;
 
-  struct mrb_jmpbuf* jmp;
   mrb_ast_node *nvars;
 };
 
@@ -172,7 +176,7 @@
 MRB_API mrb_sym mrb_parser_get_filename(struct mrb_parser_state*, uint16_t idx);
 
 /* utility functions */
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 MRB_API struct mrb_parser_state* mrb_parse_file(mrb_state*,FILE*,mrbc_context*);
 #endif
 MRB_API struct mrb_parser_state* mrb_parse_string(mrb_state*,const char*,mrbc_context*);
@@ -180,8 +184,8 @@
 MRB_API struct RProc* mrb_generate_code(mrb_state*, struct mrb_parser_state*);
 MRB_API mrb_value mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c);
 
-/** program load functions 
-* Please note! Currently due to interactions with the GC calling these functions will 
+/** program load functions
+* Please note! Currently due to interactions with the GC calling these functions will
 * leak one RProc object per function call.
 * To prevent this save the current memory arena before calling and restore the arena
 * right after, like so
@@ -189,9 +193,10 @@
 * mrb_value status = mrb_load_string(mrb, buffer);
 * mrb_gc_arena_restore(mrb, ai);
 */
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 MRB_API mrb_value mrb_load_file(mrb_state*,FILE*);
 MRB_API mrb_value mrb_load_file_cxt(mrb_state*,FILE*, mrbc_context *cxt);
+MRB_API mrb_value mrb_load_detect_file_cxt(mrb_state *mrb, FILE *fp, mrbc_context *c);
 #endif
 MRB_API mrb_value mrb_load_string(mrb_state *mrb, const char *s);
 MRB_API mrb_value mrb_load_nstring(mrb_state *mrb, const char *s, size_t len);

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

@@ -16,7 +16,8 @@
 
 typedef enum mrb_debug_line_type {
   mrb_debug_line_ary = 0,
-  mrb_debug_line_flat_map = 1
+  mrb_debug_line_flat_map,
+  mrb_debug_line_packed_map
 } mrb_debug_line_type;
 
 typedef struct mrb_irep_debug_info_line {
@@ -31,8 +32,9 @@
   mrb_debug_line_type line_type;
   union {
     void *ptr;
-    mrb_irep_debug_info_line *flat_map;
     uint16_t *ary;
+    mrb_irep_debug_info_line *flat_map;
+    uint8_t *packed_map;
   } lines;
 } mrb_irep_debug_info_file;
 
@@ -46,13 +48,13 @@
  * get line from irep's debug info and program counter
  * @return returns NULL if not found
  */
-MRB_API const char *mrb_debug_get_filename(mrb_state *mrb, mrb_irep *irep, ptrdiff_t pc);
+MRB_API const char *mrb_debug_get_filename(mrb_state *mrb, const mrb_irep *irep, uint32_t pc);
 
 /*
  * get line from irep's debug info and program counter
  * @return returns -1 if not found
  */
-MRB_API int32_t mrb_debug_get_line(mrb_state *mrb, mrb_irep *irep, ptrdiff_t pc);
+MRB_API int32_t mrb_debug_get_line(mrb_state *mrb, const mrb_irep *irep, uint32_t pc);
 
 MRB_API mrb_irep_debug_info *mrb_debug_info_alloc(mrb_state *mrb, mrb_irep *irep);
 MRB_API mrb_irep_debug_info_file *mrb_debug_info_append_file(

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

@@ -16,12 +16,16 @@
  */
 MRB_BEGIN_DECL
 
-#define DUMP_DEBUG_INFO 1
-
-int mrb_dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size);
-#ifndef MRB_DISABLE_STDIO
-int mrb_dump_irep_binary(mrb_state*, mrb_irep*, uint8_t, FILE*);
-int mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep*, uint8_t flags, FILE *f, const char *initname);
+/* flags for mrb_dump_irep{,_binary,_cfunc,_cstruct} */
+#define MRB_DUMP_DEBUG_INFO 1
+#define MRB_DUMP_STATIC 2
+#define DUMP_DEBUG_INFO MRB_DUMP_DEBUG_INFO  /* deprecated */
+
+int mrb_dump_irep(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size);
+#ifndef MRB_NO_STDIO
+int mrb_dump_irep_binary(mrb_state*, const mrb_irep*, uint8_t, FILE*);
+int mrb_dump_irep_cfunc(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname);
+int mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname);
 mrb_irep *mrb_read_irep_file(mrb_state*, FILE*);
 MRB_API mrb_value mrb_load_irep_file(mrb_state*,FILE*);
 MRB_API mrb_value mrb_load_irep_file_cxt(mrb_state*, FILE*, mrbc_context*);
@@ -38,21 +42,25 @@
 #define MRB_DUMP_GENERAL_FAILURE      (-1)
 #define MRB_DUMP_WRITE_FAULT          (-2)
 #define MRB_DUMP_READ_FAULT           (-3)
-#define MRB_DUMP_CRC_ERROR            (-4)
-#define MRB_DUMP_INVALID_FILE_HEADER  (-5)
-#define MRB_DUMP_INVALID_IREP         (-6)
-#define MRB_DUMP_INVALID_ARGUMENT     (-7)
+#define MRB_DUMP_INVALID_FILE_HEADER  (-4)
+#define MRB_DUMP_INVALID_IREP         (-5)
+#define MRB_DUMP_INVALID_ARGUMENT     (-6)
 
 /* null symbol length */
 #define MRB_DUMP_NULL_SYM_LEN         0xFFFF
 
 /* Rite Binary File header */
 #define RITE_BINARY_IDENT              "RITE"
-#define RITE_BINARY_FORMAT_VER         "0007"
+/* Binary Format Version Major:Minor */
+/*   Major: Incompatible to prior versions */
+/*   Minor: Upper-compatible to prior versions */
+#define RITE_BINARY_MAJOR_VER          "03"
+#define RITE_BINARY_MINOR_VER          "00"
+#define RITE_BINARY_FORMAT_VER         RITE_BINARY_MAJOR_VER RITE_BINARY_MINOR_VER
 #define RITE_COMPILER_NAME             "MATZ"
 #define RITE_COMPILER_VERSION          "0000"
 
-#define RITE_VM_VER                    "0002"
+#define RITE_VM_VER                    "0300"
 
 #define RITE_BINARY_EOF                "END\0"
 #define RITE_SECTION_IREP_IDENT        "IREP"
@@ -65,8 +73,8 @@
 /* binary header */
 struct rite_binary_header {
   uint8_t binary_ident4;    /* Binary Identifier */
-  uint8_t binary_version4;  /* Binary Format Version */
-  uint8_t binary_crc2;      /* Binary CRC */
+  uint8_t major_version2;   /* Binary Format Major Version */
+  uint8_t minor_version2;   /* Binary Format Minor Version */
   uint8_t binary_size4;     /* Binary Size */
   uint8_t compiler_name4;   /* Compiler name */
   uint8_t compiler_version4;
@@ -126,16 +134,6 @@
   return sizeof(uint32_t);
 }
 
-static inline size_t
-uint32l_to_bin(uint32_t l, uint8_t *bin)
-{
-  bin3 = (l >> 24) & 0xff;
-  bin2 = (l >> 16) & 0xff;
-  bin1 = (l >> 8) & 0xff;
-  bin0 = l & 0xff;
-  return sizeof(uint32_t);
-}
-
 static inline uint32_t
 bin_to_uint32(const uint8_t *bin)
 {
@@ -145,15 +143,6 @@
          (uint32_t)bin3;
 }
 
-static inline uint32_t
-bin_to_uint32l(const uint8_t *bin)
-{
-  return (uint32_t)bin3 << 24 |
-         (uint32_t)bin2 << 16 |
-         (uint32_t)bin1 << 8  |
-         (uint32_t)bin0;
-}
-
 static inline uint16_t
 bin_to_uint16(const uint8_t *bin)
 {
@@ -169,8 +158,4 @@
 
 MRB_END_DECL
 
-/** @internal crc.c */
-uint16_t
-calc_crc_16_ccitt(const uint8_t *src, size_t nbytes, uint16_t crc);
-
 #endif  /* MRUBY_DUMP_H */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/endian.h Added

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

@@ -17,25 +17,29 @@
 struct RException {
   MRB_OBJECT_HEADER;
   struct iv_tbl *iv;
+  struct RString *mesg;
 };
 
 #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_value mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str);
-#define mrb_exc_new_str_lit(mrb, c, lit) mrb_exc_new_str(mrb, c, mrb_str_new_lit(mrb, lit))
+#define mrb_exc_new_lit(mrb, c, lit) mrb_exc_new_str(mrb, c, mrb_str_new_lit(mrb, lit))
+#define mrb_exc_new_str_lit(mrb, c, lit) mrb_exc_new_lit(mrb, c, lit)
 MRB_API mrb_value mrb_make_exception(mrb_state *mrb, mrb_int argc, const mrb_value *argv);
-MRB_API mrb_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);
-MRB_API mrb_value mrb_get_backtrace(mrb_state *mrb);
+mrb_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 */
 MRB_API mrb_value mrb_f_raise(mrb_state*, mrb_value);
 
-#if defined(MRB_64BIT) || defined(MRB_USE_FLOAT) || defined(MRB_NAN_BOXING) || defined(MRB_WORD_BOXING)
+#if defined(MRB_64BIT) || defined(MRB_USE_FLOAT32) || defined(MRB_NAN_BOXING) || defined(MRB_WORD_BOXING)
 struct RBreak {
   MRB_OBJECT_HEADER;
-  struct RProc *proc;
+  const struct RProc *proc;
   mrb_value val;
 };
 #define mrb_break_value_get(brk) ((brk)->val)
@@ -43,7 +47,7 @@
 #else
 struct RBreak {
   MRB_OBJECT_HEADER;
-  struct RProc *proc;
+  const struct RProc *proc;
   union mrb_value_union value;
 };
 #define RBREAK_VALUE_TT_MASK ((1 << 8) - 1)
@@ -62,13 +66,53 @@
   brk->flags &= ~RBREAK_VALUE_TT_MASK;
   brk->flags |= val.tt;
 }
-#endif  /* MRB_64BIT || MRB_USE_FLOAT || MRB_NAN_BOXING || MRB_WORD_BOXING */
+#endif  /* MRB_64BIT || MRB_USE_FLOAT32 || MRB_NAN_BOXING || MRB_WORD_BOXING */
 #define mrb_break_proc_get(brk) ((brk)->proc)
 #define mrb_break_proc_set(brk, p) ((brk)->proc = p)
 
+#define RBREAK_TAG_FOREACH(f) \
+  f(RBREAK_TAG_BREAK, 0) \
+  f(RBREAK_TAG_BREAK_UPPER, 1) \
+  f(RBREAK_TAG_BREAK_INTARGET, 2) \
+  f(RBREAK_TAG_RETURN_BLOCK, 3) \
+  f(RBREAK_TAG_RETURN, 4) \
+  f(RBREAK_TAG_RETURN_TOPLEVEL, 5) \
+  f(RBREAK_TAG_JUMP, 6) \
+  f(RBREAK_TAG_STOP, 7)
+
+#define RBREAK_TAG_DEFINE(tag, i) tag = i,
+enum {
+  RBREAK_TAG_FOREACH(RBREAK_TAG_DEFINE)
+};
+#undef RBREAK_TAG_DEFINE
+
+#define RBREAK_TAG_BIT          3
+#define RBREAK_TAG_BIT_OFF      8
+#define RBREAK_TAG_MASK         (~(~UINT32_C(0) << RBREAK_TAG_BIT))
+
+static inline uint32_t
+mrb_break_tag_get(struct RBreak *brk)
+{
+  return (brk->flags >> RBREAK_TAG_BIT_OFF) & RBREAK_TAG_MASK;
+}
+
+static inline void
+mrb_break_tag_set(struct RBreak *brk, uint32_t tag)
+{
+  brk->flags &= ~(RBREAK_TAG_MASK << RBREAK_TAG_BIT_OFF);
+  brk->flags |= (tag & RBREAK_TAG_MASK) << RBREAK_TAG_BIT_OFF;
+}
+
 /**
  * Protect
  *
+ */
+typedef mrb_value mrb_protect_error_func(mrb_state *mrb, void *userdata);
+MRB_API mrb_value mrb_protect_error(mrb_state *mrb, mrb_protect_error_func *body, void *userdata, mrb_bool *error);
+
+/**
+ * Protect (takes mrb_value for body argument)
+ *
  * Implemented in the mruby-error mrbgem
  */
 MRB_API mrb_value mrb_protect(mrb_state *mrb, mrb_func_t body, mrb_value data, mrb_bool *state);

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

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

@@ -14,18 +14,29 @@
  */
 MRB_BEGIN_DECL
 
+/* offset of `iv` must be 3 words */
 struct RHash {
   MRB_OBJECT_HEADER;
+#ifdef MRB_64BIT
+  uint32_t size;
   struct iv_tbl *iv;
-  struct htable *ht;
+  uint32_t ea_capa;
+  uint32_t ea_n_used;
+#else
+  struct iv_tbl *iv;
+  uint32_t size;
+#endif
+  union {
+    struct hash_entry *ea;
+    struct hash_table *ht;
+  } hsh;
 };
 
 #define mrb_hash_ptr(v)    ((struct RHash*)(mrb_ptr(v)))
 #define mrb_hash_value(p)  mrb_obj_value((void*)(p))
 
+size_t mrb_hash_memsize(mrb_value obj);
 MRB_API mrb_value mrb_hash_new_capa(mrb_state *mrb, mrb_int capa);
-MRB_API mrb_value mrb_ensure_hash_type(mrb_state *mrb, mrb_value hash);
-MRB_API mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash);
 
 /*
  * Initializes a new hash.
@@ -178,8 +189,9 @@
 MRB_API mrb_int mrb_hash_size(mrb_state *mrb, mrb_value hash);
 
 /*
- * Copies the hash.
- *
+ * Copies the hash. This function does NOT copy the instance variables
+ * (except for the default value). Use mrb_obj_dup() to copy the instance
+ * variables as well.
  *
  * @param mrb The mruby state reference.
  * @param hash The target hash.
@@ -197,16 +209,22 @@
  */
 MRB_API void mrb_hash_merge(mrb_state *mrb, mrb_value hash1, mrb_value hash2);
 
-/* RHASH_TBL allocates st_table if not available. */
-#define RHASH(obj)   ((struct RHash*)(mrb_ptr(obj)))
-#define RHASH_TBL(h)          (RHASH(h)->ht)
-#define RHASH_IFNONE(h)       mrb_iv_get(mrb, (h), mrb_intern_lit(mrb, "ifnone"))
-#define RHASH_PROCDEFAULT(h)  RHASH_IFNONE(h)
-
-#define MRB_HASH_DEFAULT      1
-#define MRB_HASH_PROC_DEFAULT 2
-#define MRB_RHASH_DEFAULT_P(h) (RHASH(h)->flags & MRB_HASH_DEFAULT)
-#define MRB_RHASH_PROCDEFAULT_P(h) (RHASH(h)->flags & MRB_HASH_PROC_DEFAULT)
+#define RHASH(hash) ((struct RHash*)(mrb_ptr(hash)))
+
+#define MRB_HASH_IB_BIT_BIT         5
+#define MRB_HASH_AR_EA_CAPA_BIT     5
+#define MRB_HASH_IB_BIT_SHIFT       0
+#define MRB_HASH_AR_EA_CAPA_SHIFT   0
+#define MRB_HASH_AR_EA_N_USED_SHIFT MRB_HASH_AR_EA_CAPA_BIT
+#define MRB_HASH_SIZE_FLAGS_SHIFT   (MRB_HASH_AR_EA_CAPA_BIT * 2)
+#define MRB_HASH_IB_BIT_MASK        ((1 << MRB_HASH_IB_BIT_BIT) - 1)
+#define MRB_HASH_AR_EA_CAPA_MASK    ((1 << MRB_HASH_AR_EA_CAPA_BIT) - 1)
+#define MRB_HASH_AR_EA_N_USED_MASK  (MRB_HASH_AR_EA_CAPA_MASK << MRB_HASH_AR_EA_N_USED_SHIFT)
+#define MRB_HASH_DEFAULT            (1 << (MRB_HASH_SIZE_FLAGS_SHIFT + 0))
+#define MRB_HASH_PROC_DEFAULT       (1 << (MRB_HASH_SIZE_FLAGS_SHIFT + 1))
+#define MRB_HASH_HT                 (1 << (MRB_HASH_SIZE_FLAGS_SHIFT + 2))
+#define MRB_RHASH_DEFAULT_P(hash) (RHASH(hash)->flags & MRB_HASH_DEFAULT)
+#define MRB_RHASH_PROCDEFAULT_P(hash) (RHASH(hash)->flags & MRB_HASH_PROC_DEFAULT)
 
 /* GC functions */
 void mrb_gc_mark_hash(mrb_state*, struct RHash*);

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

@@ -16,36 +16,71 @@
 MRB_BEGIN_DECL
 
 enum irep_pool_type {
-  IREP_TT_STRING,
-  IREP_TT_FIXNUM,
-  IREP_TT_FLOAT,
+  IREP_TT_STR   = 0,          /* string (need free) */
+  IREP_TT_SSTR  = 2,          /* string (static) */
+  IREP_TT_INT32 = 1,          /* 32bit integer */
+  IREP_TT_INT64 = 3,          /* 64bit integer */
+  IREP_TT_BIGINT = 7,         /* big integer (not yet supported) */
+  IREP_TT_FLOAT = 5,          /* float (double/float) */
 };
 
-struct mrb_locals {
-  mrb_sym name;
-  uint16_t r;
+#define IREP_TT_NFLAG 1       /* number (non string) flag */
+#define IREP_TT_SFLAG 2       /* static string flag */
+
+typedef struct mrb_pool_value {
+  uint32_t tt;     /* packed type and length (for string) */
+  union {
+    const char *str;
+    int32_t i32;
+    int64_t i64;
+#ifndef MRB_NO_FLOAT
+    mrb_float f;
+#endif
+  } u;
+} mrb_pool_value;
+
+enum mrb_catch_type {
+  MRB_CATCH_RESCUE = 0,
+  MRB_CATCH_ENSURE = 1,
+};
+
+struct mrb_irep_catch_handler {
+  uint8_t type;         /* enum mrb_catch_type */
+  uint8_t begin4;     /* The starting address to match the handler. Includes this. */
+  uint8_t end4;       /* The endpoint address that matches the handler. Not Includes this. */
+  uint8_t target4;    /* The address to jump to if a match is made. */
 };
 
 /* Program data array struct */
 typedef struct mrb_irep {
   uint16_t nlocals;        /* Number of local variables */
   uint16_t nregs;          /* Number of register variables */
+  uint16_t clen;           /* Number of catch handlers */
   uint8_t flags;
 
   const mrb_code *iseq;
-  mrb_value *pool;
-  mrb_sym *syms;
-  struct mrb_irep **reps;
-
-  struct mrb_locals *lv;
+  /*
+   * A catch handler table is placed after the iseq entity.
+   * The reason it doesn't add fields to the structure is to keep the mrb_irep structure from bloating.
+   * The catch handler table can be obtained with `mrb_irep_catch_handler_table(irep)`.
+   */
+  const mrb_pool_value *pool;
+  const mrb_sym *syms;
+  const struct mrb_irep * const *reps;
+
+  const mrb_sym *lv;
   /* debug info */
   struct mrb_irep_debug_info* debug_info;
 
-  uint16_t ilen, plen, slen, rlen;
-  uint32_t refcnt;
+  uint32_t ilen;
+  uint16_t plen, slen;
+  uint16_t rlen;
+  uint16_t refcnt;
 } mrb_irep;
 
 #define MRB_ISEQ_NO_FREE 1
+#define MRB_IREP_NO_FREE 2
+#define MRB_IREP_STATIC  (MRB_ISEQ_NO_FREE | MRB_IREP_NO_FREE)
 
 MRB_API mrb_irep *mrb_add_irep(mrb_state *mrb);
 
@@ -87,11 +122,26 @@
   uint8_t insn;
   uint16_t a;
   uint16_t b;
-  uint8_t c;
+  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)
+
 MRB_END_DECL
 
 #endif  /* MRUBY_IREP_H */

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

@@ -61,7 +61,6 @@
   typedef struct kh_##name {                                            \
     khint_t n_buckets;                                                  \
     khint_t size;                                                       \
-    khint_t n_occupied;                                                 \
     uint8_t *ed_flags;                                                  \
     khkey_t *keys;                                                      \
     khval_t *vals;                                                      \
@@ -73,7 +72,6 @@
   void kh_clear_##name(mrb_state *mrb, kh_##name##_t *h);               \
   khint_t kh_get_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key);           \
   khint_t kh_put_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key, int *ret); \
-  void kh_put_prepare_##name(mrb_state *mrb, kh_##name##_t *h);                   \
   void kh_resize_##name(mrb_state *mrb, kh_##name##_t *h, khint_t new_n_buckets); \
   void kh_del_##name(mrb_state *mrb, kh_##name##_t *h, khint_t x);                \
   kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h);
@@ -93,7 +91,7 @@
    khval_t: value data type
    kh_is_map: (0: hash set / 1: hash map)
    __hash_func: hash function
-   __hash_equal: hash comparation function
+   __hash_equal: hash comparison function
 */
 #define KHASH_DEFINE(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
   mrb_noreturn void mrb_raise_nomemory(mrb_state *mrb);                 \
@@ -103,7 +101,7 @@
     size_t len = sizeof(khkey_t) + (kh_is_map ? sizeof(khval_t) : 0);   \
     uint8_t *p = (uint8_t*)mrb_malloc_simple(mrb, sizeof(uint8_t)*sz/4+len*sz); \
     if (!p) { return 1; }                                               \
-    h->size = h->n_occupied = 0;                                        \
+    h->size = 0;                                                        \
     h->keys = (khkey_t *)p;                                             \
     h->vals = kh_is_map ? (khval_t *)(p+sizeof(khkey_t)*sz) : NULL;     \
     h->ed_flags = p+len*sz;                                             \
@@ -143,7 +141,7 @@
     (void)mrb;                                                          \
     if (h && h->ed_flags) {                                             \
       kh_fill_flags(h->ed_flags, 0xaa, h->n_buckets/4);                 \
-      h->size = h->n_occupied = 0;                                      \
+      h->size = 0;                                                      \
     }                                                                   \
   }                                                                     \
   khint_t kh_get_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key)  \
@@ -184,16 +182,12 @@
       mrb_free(mrb, old_keys);                                          \
     }                                                                   \
   }                                                                     \
-  void kh_put_prepare_##name(mrb_state *mrb, kh_##name##_t *h)          \
-  {                                                                     \
-    if (h->n_occupied >= khash_upper_bound(h)) {                        \
-      kh_resize_##name(mrb, h, h->n_buckets*2);                         \
-    }                                                                   \
-  }                                                                     \
   khint_t kh_put_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key, int *ret) \
   {                                                                     \
     khint_t k, del_k, step = 0;                                         \
-    kh_put_prepare_##name(mrb, h);                                      \
+    if (h->size >= khash_upper_bound(h)) {                              \
+      kh_resize_##name(mrb, h, h->n_buckets*2);                         \
+    }                                                                   \
     k = __hash_func(mrb,key) & khash_mask(h);                           \
     del_k = kh_end(h);                                                  \
     while (!__ac_isempty(h->ed_flags, k)) {                             \
@@ -221,7 +215,6 @@
       h->keysk = key;                                                 \
       h->ed_flagsk/4 &= ~__m_emptyk%4;                              \
       h->size++;                                                        \
-      h->n_occupied++;                                                  \
       if (ret) *ret = 1;                                                \
       return k;                                                         \
     }                                                                   \
@@ -256,7 +249,6 @@
 #define kh_destroy(name, mrb, h) kh_destroy_##name(mrb, h)
 #define kh_clear(name, mrb, h) kh_clear_##name(mrb, h)
 #define kh_resize(name, mrb, h, s) kh_resize_##name(mrb, h, s)
-#define kh_put_prepare(name, mrb, h) kh_put_prepare_##name(mrb, h)
 #define kh_put(name, mrb, h, k) kh_put_##name(mrb, h, k, NULL)
 #define kh_put2(name, mrb, h, k, r) kh_put_##name(mrb, h, k, r)
 #define kh_get(name, mrb, h, k) kh_get_##name(mrb, h, k)

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

@@ -1,5 +1,5 @@
 /**
-** @file mruby/numeric.h - Numeric, Integer, Float, Fixnum class
+** @file mruby/numeric.h - Numeric, Integer, Float class
 **
 ** See Copyright Notice in mruby.h
 */
@@ -12,17 +12,17 @@
 /**
  * Numeric class and it's sub-classes.
  *
- * Integer, Float and Fixnum
+ * Integer and Float
  */
 MRB_BEGIN_DECL
 
-#define TYPED_POSFIXABLE(f,t) ((f) <= (t)MRB_INT_MAX)
-#define TYPED_NEGFIXABLE(f,t) ((f) >= (t)MRB_INT_MIN)
+#define TYPED_POSFIXABLE(f,t) ((f) <= (t)MRB_FIXNUM_MAX)
+#define TYPED_NEGFIXABLE(f,t) ((f) >= (t)MRB_FIXNUM_MIN)
 #define TYPED_FIXABLE(f,t) (TYPED_POSFIXABLE(f,t) && TYPED_NEGFIXABLE(f,t))
 #define POSFIXABLE(f) TYPED_POSFIXABLE(f,mrb_int)
 #define NEGFIXABLE(f) TYPED_NEGFIXABLE(f,mrb_int)
 #define FIXABLE(f) TYPED_FIXABLE(f,mrb_int)
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 #ifdef MRB_INT64
 #define FIXABLE_FLOAT(f) ((f)>=-9223372036854775808.0 && (f)<9223372036854775808.0)
 #else
@@ -30,22 +30,19 @@
 #endif
 #endif
 
-#ifndef MRB_WITHOUT_FLOAT
-MRB_API mrb_value mrb_flo_to_fixnum(mrb_state *mrb, mrb_value val);
-#endif
-MRB_API mrb_value mrb_fixnum_to_str(mrb_state *mrb, mrb_value x, mrb_int base);
-/* ArgumentError if format string doesn't match /%(\.0-9+)?aAeEfFgG/ */
-#ifndef MRB_WITHOUT_FLOAT
-MRB_API mrb_value mrb_float_to_str(mrb_state *mrb, mrb_value x, const char *fmt);
-MRB_API int mrb_float_to_cstr(mrb_state *mrb, char *buf, size_t len, const char *fmt, mrb_float f);
-MRB_API mrb_float mrb_to_flo(mrb_state *mrb, mrb_value x);
-MRB_API mrb_value mrb_int_value(mrb_state *mrb, mrb_float f);
-#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);
 MRB_API mrb_value mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value 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)
+
 #ifndef __has_builtin
   #define __has_builtin(x) 0
 #endif
@@ -71,103 +68,75 @@
 
 #ifdef MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
 
-#ifndef MRB_WORD_BOXING
-# define WBCHK(x) 0
-#else
-# define WBCHK(x) !FIXABLE(x)
-#endif
-
 static inline mrb_bool
 mrb_int_add_overflow(mrb_int augend, mrb_int addend, mrb_int *sum)
 {
-  return __builtin_add_overflow(augend, addend, sum) || WBCHK(*sum);
+  return __builtin_add_overflow(augend, addend, sum);
 }
 
 static inline mrb_bool
 mrb_int_sub_overflow(mrb_int minuend, mrb_int subtrahend, mrb_int *difference)
 {
-  return __builtin_sub_overflow(minuend, subtrahend, difference) || WBCHK(*difference);
+  return __builtin_sub_overflow(minuend, subtrahend, difference);
 }
 
 static inline mrb_bool
 mrb_int_mul_overflow(mrb_int multiplier, mrb_int multiplicand, mrb_int *product)
 {
-  return __builtin_mul_overflow(multiplier, multiplicand, product) || WBCHK(*product);
+  return __builtin_mul_overflow(multiplier, multiplicand, product);
 }
 
-#undef WBCHK
-
 #else
 
-#define MRB_UINT_MAKE2(n) uint ## n ## _t
-#define MRB_UINT_MAKE(n) MRB_UINT_MAKE2(n)
-#define mrb_uint MRB_UINT_MAKE(MRB_INT_BIT)
-
-#define MRB_INT_OVERFLOW_MASK ((mrb_uint)1 << (MRB_INT_BIT - 1 - MRB_FIXNUM_SHIFT))
+#define MRB_INT_OVERFLOW_MASK ((mrb_uint)1 << (MRB_INT_BIT - 1))
 
 static inline mrb_bool
-mrb_int_add_overflow(mrb_int augend, mrb_int addend, mrb_int *sum)
+mrb_int_add_overflow(mrb_int a, mrb_int b, mrb_int *c)
 {
-  mrb_uint x = (mrb_uint)augend;
-  mrb_uint y = (mrb_uint)addend;
+  mrb_uint x = (mrb_uint)a;
+  mrb_uint y = (mrb_uint)b;
   mrb_uint z = (mrb_uint)(x + y);
-  *sum = (mrb_int)z;
+  *c = (mrb_int)z;
   return !!(((x ^ z) & (y ^ z)) & MRB_INT_OVERFLOW_MASK);
 }
 
 static inline mrb_bool
-mrb_int_sub_overflow(mrb_int minuend, mrb_int subtrahend, mrb_int *difference)
+mrb_int_sub_overflow(mrb_int a, mrb_int b, mrb_int *c)
 {
-  mrb_uint x = (mrb_uint)minuend;
-  mrb_uint y = (mrb_uint)subtrahend;
+  mrb_uint x = (mrb_uint)a;
+  mrb_uint y = (mrb_uint)b;
   mrb_uint z = (mrb_uint)(x - y);
-  *difference = (mrb_int)z;
+  *c = (mrb_int)z;
   return !!(((x ^ z) & (~y ^ z)) & MRB_INT_OVERFLOW_MASK);
 }
 
 static inline mrb_bool
-mrb_int_mul_overflow(mrb_int multiplier, mrb_int multiplicand, mrb_int *product)
+mrb_int_mul_overflow(mrb_int a, mrb_int b, mrb_int *c)
 {
-#if MRB_INT_BIT == 32
-  int64_t n = (int64_t)multiplier * multiplicand;
-  *product = (mrb_int)n;
-  return !FIXABLE(n);
-#else
-  if (multiplier > 0) {
-    if (multiplicand > 0) {
-      if (multiplier > MRB_INT_MAX / multiplicand) return TRUE;
-    }
-    else {
-      if (multiplicand < MRB_INT_MAX / multiplier) return TRUE;
-    }
-  }
-  else {
-    if (multiplicand > 0) {
-      if (multiplier < MRB_INT_MAX / multiplicand) return TRUE;
-    }
-    else {
-      if (multiplier != 0 && multiplicand < MRB_INT_MAX / multiplier) return TRUE;
-    }
-  }
-  *product = multiplier * multiplicand;
+#ifdef MRB_INT32
+  int64_t n = (int64_t)a * b;
+  *c = (mrb_int)n;
+  return n > MRB_INT_MAX || n < MRB_INT_MIN;
+#else /* MRB_INT64 */
+  if (a > 0 && b > 0 && a > MRB_INT_MAX / b) return TRUE;
+  if (a < 0 && b > 0 && a < MRB_INT_MIN / b) return TRUE;
+  if (a > 0 && b < 0 && b < MRB_INT_MIN / a) return TRUE;
+  if (a < 0 && b < 0 && (a <= MRB_INT_MIN || b <= MRB_INT_MIN || -a > MRB_INT_MAX / -b))
+    return TRUE;
+  *c = a * b;
   return FALSE;
 #endif
 }
 
 #undef MRB_INT_OVERFLOW_MASK
-#undef mrb_uint
-#undef MRB_UINT_MAKE
-#undef MRB_UINT_MAKE2
 
 #endif
 
-#ifndef MRB_WITHOUT_FLOAT
-# include <stdint.h>
-# include <float.h>
+#ifndef MRB_NO_FLOAT
 
 # define MRB_FLT_RADIX          FLT_RADIX
 
-# ifdef MRB_USE_FLOAT
+# ifdef MRB_USE_FLOAT32
 #  define MRB_FLT_MANT_DIG      FLT_MANT_DIG
 #  define MRB_FLT_EPSILON       FLT_EPSILON
 #  define MRB_FLT_DIG           FLT_DIG
@@ -178,7 +147,7 @@
 #  define MRB_FLT_MAX           FLT_MAX
 #  define MRB_FLT_MAX_10_EXP    FLT_MAX_10_EXP
 
-# else /* not MRB_USE_FLOAT */
+# else /* not MRB_USE_FLOAT32 */
 #  define MRB_FLT_MANT_DIG      DBL_MANT_DIG
 #  define MRB_FLT_EPSILON       DBL_EPSILON
 #  define MRB_FLT_DIG           DBL_DIG
@@ -188,8 +157,20 @@
 #  define MRB_FLT_MAX_EXP       DBL_MAX_EXP
 #  define MRB_FLT_MAX           DBL_MAX
 #  define MRB_FLT_MAX_10_EXP    DBL_MAX_10_EXP
-# endif /* MRB_USE_FLOAT */
-#endif /* MRB_WITHOUT_FLOAT */
+# endif /* MRB_USE_FLOAT32 */
+
+MRB_API mrb_value mrb_float_to_integer(mrb_state *mrb, mrb_value val);
+
+/* internal functions */
+mrb_float mrb_div_float(mrb_float x, mrb_float y);
+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.46.0.tar.xz/third-party/mruby/include/mruby/opcode.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/opcode.h Changed

@@ -36,6 +36,7 @@
 #define FETCH_BB() do {a=READ_B(); b=READ_B();} while (0)
 #define FETCH_BBB() do {a=READ_B(); b=READ_B(); c=READ_B();} while (0)
 #define FETCH_BS() do {a=READ_B(); b=READ_S();} while (0)
+#define FETCH_BSS() do {a=READ_B(); b=READ_S(); c=READ_S();} while (0)
 #define FETCH_S() do {a=READ_S();} while (0)
 #define FETCH_W() do {a=READ_W();} while (0)
 
@@ -45,6 +46,7 @@
 #define FETCH_BB_1() do {a=READ_S(); b=READ_B();} while (0)
 #define FETCH_BBB_1() do {a=READ_S(); b=READ_B(); c=READ_B();} while (0)
 #define FETCH_BS_1() do {a=READ_S(); b=READ_S();} while (0)
+#define FETCH_BSS_1() do {a=READ_S(); b=READ_S();c=READ_S();} while (0)
 #define FETCH_S_1() FETCH_S()
 #define FETCH_W_1() FETCH_W()
 
@@ -54,6 +56,7 @@
 #define FETCH_BB_2() do {a=READ_B(); b=READ_S();} while (0)
 #define FETCH_BBB_2() do {a=READ_B(); b=READ_S(); c=READ_B();} while (0)
 #define FETCH_BS_2() FETCH_BS()
+#define FETCH_BSS_2() FETCH_BSS()
 #define FETCH_S_2() FETCH_S()
 #define FETCH_W_2() FETCH_W()
 
@@ -63,6 +66,7 @@
 #define FETCH_BB_3() do {a=READ_S(); b=READ_S();} while (0)
 #define FETCH_BBB_3() do {a=READ_S(); b=READ_S(); c=READ_B();} while (0)
 #define FETCH_BS_3() do {a=READ_S(); b=READ_S();} while (0)
+#define FETCH_BSS_3() FETCH_BSS_1()
 #define FETCH_S_3() FETCH_S()
 #define FETCH_W_3() FETCH_W()

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

@@ -1,118 +1,120 @@
 /* operand types:
-   + Z: no operand (Z,Z,Z,Z)
-   + B: 8bit (B,S,B,B)
-   + BB: 8+8bit (BB,SB,BS,SS)
-   + BBB: 8+8+8bit (BBB,SBB,BSB,SSB)
-   + BS: 8+16bit (BS,SS,BS,BS)
-   + S: 16bit (S,S,S,S)
-   + W: 24bit (W,W,W,W)
+   + Z: no operand
+   + B: 8bit
+   + BB: 8+8bit
+   + BBB: 8+8+8bit
+   + BS: 8+16bit
+   + BSS: 8+16+16bit
+   + S: 16bit
+   + W: 24bit
 */
 
 /*-----------------------------------------------------------------------
 operation code    operands      semantics
 ------------------------------------------------------------------------*/
 OPCODE(NOP,        Z)        /* no operation */
-OPCODE(MOVE,       BB)       /* R(a) = R(b) */
-OPCODE(LOADL,      BB)       /* R(a) = Pool(b) */
-OPCODE(LOADI,      BB)       /* R(a) = mrb_int(b) */
-OPCODE(LOADINEG,   BB)       /* R(a) = mrb_int(-b) */
-OPCODE(LOADI__1,   B)        /* R(a) = mrb_int(-1) */
-OPCODE(LOADI_0,    B)        /* R(a) = mrb_int(0) */
-OPCODE(LOADI_1,    B)        /* R(a) = mrb_int(1) */
-OPCODE(LOADI_2,    B)        /* R(a) = mrb_int(2) */
-OPCODE(LOADI_3,    B)        /* R(a) = mrb_int(3) */
-OPCODE(LOADI_4,    B)        /* R(a) = mrb_int(4) */
-OPCODE(LOADI_5,    B)        /* R(a) = mrb_int(5) */
-OPCODE(LOADI_6,    B)        /* R(a) = mrb_int(6) */
-OPCODE(LOADI_7,    B)        /* R(a) = mrb_int(7) */
-OPCODE(LOADSYM,    BB)       /* R(a) = Syms(b) */
-OPCODE(LOADNIL,    B)        /* R(a) = nil */
-OPCODE(LOADSELF,   B)        /* R(a) = self */
-OPCODE(LOADT,      B)        /* R(a) = true */
-OPCODE(LOADF,      B)        /* R(a) = false */
-OPCODE(GETGV,      BB)       /* R(a) = getglobal(Syms(b)) */
-OPCODE(SETGV,      BB)       /* setglobal(Syms(b), R(a)) */
-OPCODE(GETSV,      BB)       /* R(a) = SpecialSyms(b) */
-OPCODE(SETSV,      BB)       /* SpecialSyms(b) = R(a) */
-OPCODE(GETIV,      BB)       /* R(a) = ivget(Syms(b)) */
-OPCODE(SETIV,      BB)       /* ivset(Syms(b),R(a)) */
-OPCODE(GETCV,      BB)       /* R(a) = cvget(Syms(b)) */
-OPCODE(SETCV,      BB)       /* cvset(Syms(b),R(a)) */
-OPCODE(GETCONST,   BB)       /* R(a) = constget(Syms(b)) */
-OPCODE(SETCONST,   BB)       /* constset(Syms(b),R(a)) */
-OPCODE(GETMCNST,   BB)       /* R(a) = R(a)::Syms(b) */
-OPCODE(SETMCNST,   BB)       /* R(a+1)::Syms(b) = R(a) */
-OPCODE(GETUPVAR,   BBB)      /* R(a) = uvget(b,c) */
-OPCODE(SETUPVAR,   BBB)      /* uvset(b,c,R(a)) */
-OPCODE(JMP,        S)        /* pc=a */
-OPCODE(JMPIF,      BS)       /* if R(a) pc=b */
-OPCODE(JMPNOT,     BS)       /* if !R(a) pc=b */
-OPCODE(JMPNIL,     BS)       /* if R(a)==nil pc=b */
-OPCODE(ONERR,      S)        /* rescue_push(a) */
-OPCODE(EXCEPT,     B)        /* R(a) = exc */
-OPCODE(RESCUE,     BB)       /* R(b) = R(a).isa?(R(b)) */
-OPCODE(POPERR,     B)        /* a.times{rescue_pop()} */
-OPCODE(RAISE,      B)        /* raise(R(a)) */
-OPCODE(EPUSH,      B)        /* ensure_push(SEQa) */
-OPCODE(EPOP,       B)        /* A.times{ensure_pop().call} */
-OPCODE(SENDV,      BB)       /* R(a) = call(R(a),Syms(b),*R(a+1)) */
-OPCODE(SENDVB,     BB)       /* R(a) = call(R(a),Syms(b),*R(a+1),&R(a+2)) */
-OPCODE(SEND,       BBB)      /* R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c)) */
-OPCODE(SENDB,      BBB)      /* R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c),&R(a+c+1)) */
-OPCODE(CALL,       Z)        /* R(0) = self.call(frame.argc, frame.argv) */
-OPCODE(SUPER,      BB)       /* R(a) = super(R(a+1),... ,R(a+b+1)) */
-OPCODE(ARGARY,     BS)       /* R(a) = argument array (16=m5:r1:m5:d1:lv4) */
+OPCODE(MOVE,       BB)       /* Ra = Rb */
+OPCODE(LOADL,      BB)       /* Ra = Poolb */
+OPCODE(LOADI,      BB)       /* Ra = mrb_int(b) */
+OPCODE(LOADINEG,   BB)       /* Ra = mrb_int(-b) */
+OPCODE(LOADI__1,   B)        /* Ra = mrb_int(-1) */
+OPCODE(LOADI_0,    B)        /* Ra = mrb_int(0) */
+OPCODE(LOADI_1,    B)        /* Ra = mrb_int(1) */
+OPCODE(LOADI_2,    B)        /* Ra = mrb_int(2) */
+OPCODE(LOADI_3,    B)        /* Ra = mrb_int(3) */
+OPCODE(LOADI_4,    B)        /* Ra = mrb_int(4) */
+OPCODE(LOADI_5,    B)        /* Ra = mrb_int(5) */
+OPCODE(LOADI_6,    B)        /* Ra = mrb_int(6) */
+OPCODE(LOADI_7,    B)        /* Ra = mrb_int(7) */
+OPCODE(LOADI16,    BS)       /* Ra = mrb_int(b) */
+OPCODE(LOADI32,    BSS)      /* Ra = mrb_int((b<<16)+c) */
+OPCODE(LOADSYM,    BB)       /* Ra = Symsb */
+OPCODE(LOADNIL,    B)        /* Ra = nil */
+OPCODE(LOADSELF,   B)        /* Ra = self */
+OPCODE(LOADT,      B)        /* Ra = true */
+OPCODE(LOADF,      B)        /* Ra = false */
+OPCODE(GETGV,      BB)       /* Ra = getglobal(Symsb) */
+OPCODE(SETGV,      BB)       /* setglobal(Symsb, Ra) */
+OPCODE(GETSV,      BB)       /* Ra = SpecialSymsb */
+OPCODE(SETSV,      BB)       /* SpecialSymsb = Ra */
+OPCODE(GETIV,      BB)       /* Ra = ivget(Symsb) */
+OPCODE(SETIV,      BB)       /* ivset(Symsb,Ra) */
+OPCODE(GETCV,      BB)       /* Ra = cvget(Symsb) */
+OPCODE(SETCV,      BB)       /* cvset(Symsb,Ra) */
+OPCODE(GETCONST,   BB)       /* Ra = constget(Symsb) */
+OPCODE(SETCONST,   BB)       /* constset(Symsb,Ra) */
+OPCODE(GETMCNST,   BB)       /* Ra = Ra::Symsb */
+OPCODE(SETMCNST,   BB)       /* Ra+1::Symsb = Ra */
+OPCODE(GETUPVAR,   BBB)      /* Ra = uvget(b,c) */
+OPCODE(SETUPVAR,   BBB)      /* uvset(b,c,Ra) */
+OPCODE(GETIDX,     B)        /* Ra = RaRa+1 */
+OPCODE(SETIDX,     B)        /* RaRa+1 = Ra+2 */
+OPCODE(JMP,        S)        /* pc+=a */
+OPCODE(JMPIF,      BS)       /* if Ra pc+=b */
+OPCODE(JMPNOT,     BS)       /* if !Ra pc+=b */
+OPCODE(JMPNIL,     BS)       /* if Ra==nil pc+=b */
+OPCODE(JMPUW,      S)        /* unwind_and_jump_to(a) */
+OPCODE(EXCEPT,     B)        /* Ra = exc */
+OPCODE(RESCUE,     BB)       /* Rb = Ra.isa?(Rb) */
+OPCODE(RAISEIF,    B)        /* raise(Ra) if Ra */
+OPCODE(SSEND,      BBB)      /* Ra = self.send(Symsb,Ra+1..,Ra+n+1:Ra+n+2..) (c=n|k<<4) */
+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(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) */
-OPCODE(KEY_P,      BB)       /* R(a) = kdict.key?(Syms(b))                      # todo */
-OPCODE(KEYEND,     Z)        /* raise unless kdict.empty?                       # todo */
-OPCODE(KARG,       BB)       /* R(a) = kdictSyms(b); kdict.delete(Syms(b))    # todo */
-OPCODE(RETURN,     B)        /* return R(a) (normal) */
-OPCODE(RETURN_BLK, B)        /* return R(a) (in-block return) */
-OPCODE(BREAK,      B)        /* break R(a) */
-OPCODE(BLKPUSH,    BS)       /* R(a) = block (16=m5:r1:m5:d1:lv4) */
-OPCODE(ADD,        B)        /* R(a) = R(a)+R(a+1) */
-OPCODE(ADDI,       BB)       /* R(a) = R(a)+mrb_int(b) */
-OPCODE(SUB,        B)        /* R(a) = R(a)-R(a+1) */
-OPCODE(SUBI,       BB)       /* R(a) = R(a)-mrb_int(b) */
-OPCODE(MUL,        B)        /* R(a) = R(a)*R(a+1) */
-OPCODE(DIV,        B)        /* R(a) = R(a)/R(a+1) */
-OPCODE(EQ,         B)        /* R(a) = R(a)==R(a+1) */
-OPCODE(LT,         B)        /* R(a) = R(a)<R(a+1) */
-OPCODE(LE,         B)        /* R(a) = R(a)<=R(a+1) */
-OPCODE(GT,         B)        /* R(a) = R(a)>R(a+1) */
-OPCODE(GE,         B)        /* R(a) = R(a)>=R(a+1) */
-OPCODE(ARRAY,      BB)       /* R(a) = ary_new(R(a),R(a+1)..R(a+b)) */
-OPCODE(ARRAY2,     BBB)      /* R(a) = ary_new(R(b),R(b+1)..R(b+c)) */
-OPCODE(ARYCAT,     B)        /* ary_cat(R(a),R(a+1)) */
-OPCODE(ARYPUSH,    B)        /* ary_push(R(a),R(a+1)) */
-OPCODE(ARYDUP,     B)        /* R(a) = ary_dup(R(a)) */
-OPCODE(AREF,       BBB)      /* R(a) = R(b)c */
-OPCODE(ASET,       BBB)      /* R(a)c = R(b) */
-OPCODE(APOST,      BBB)      /* *R(a),R(a+1)..R(a+c) = R(a)b.. */
-OPCODE(INTERN,     B)        /* R(a) = intern(R(a)) */
-OPCODE(STRING,     BB)       /* R(a) = str_dup(Lit(b)) */
-OPCODE(STRCAT,     B)        /* str_cat(R(a),R(a+1)) */
-OPCODE(HASH,       BB)       /* R(a) = hash_new(R(a),R(a+1)..R(a+b*2-1)) */
-OPCODE(HASHADD,    BB)       /* R(a) = hash_push(R(a),R(a+1)..R(a+b*2)) */
-OPCODE(HASHCAT,    B)        /* R(a) = hash_cat(R(a),R(a+1)) */
-OPCODE(LAMBDA,     BB)       /* R(a) = lambda(SEQb,L_LAMBDA) */
-OPCODE(BLOCK,      BB)       /* R(a) = lambda(SEQb,L_BLOCK) */
-OPCODE(METHOD,     BB)       /* R(a) = lambda(SEQb,L_METHOD) */
-OPCODE(RANGE_INC,  B)        /* R(a) = range_new(R(a),R(a+1),FALSE) */
-OPCODE(RANGE_EXC,  B)        /* R(a) = range_new(R(a),R(a+1),TRUE) */
-OPCODE(OCLASS,     B)        /* R(a) = ::Object */
-OPCODE(CLASS,      BB)       /* R(a) = newclass(R(a),Syms(b),R(a+1)) */
-OPCODE(MODULE,     BB)       /* R(a) = newmodule(R(a),Syms(b)) */
-OPCODE(EXEC,       BB)       /* R(a) = blockexec(R(a),SEQb) */
-OPCODE(DEF,        BB)       /* R(a).newmethod(Syms(b),R(a+1)) */
-OPCODE(ALIAS,      BB)       /* alias_method(target_class,Syms(a),Syms(b)) */
-OPCODE(UNDEF,      B)        /* undef_method(target_class,Syms(a)) */
-OPCODE(SCLASS,     B)        /* R(a) = R(a).singleton_class */
-OPCODE(TCLASS,     B)        /* R(a) = target_class */
+OPCODE(KEY_P,      BB)       /* Ra = kdict.key?(Symsb) */
+OPCODE(KEYEND,     Z)        /* raise unless kdict.empty? */
+OPCODE(KARG,       BB)       /* Ra = kdictSymsb; kdict.delete(Symsb) */
+OPCODE(RETURN,     B)        /* return Ra (normal) */
+OPCODE(RETURN_BLK, B)        /* return Ra (in-block return) */
+OPCODE(BREAK,      B)        /* break Ra */
+OPCODE(BLKPUSH,    BS)       /* Ra = block (16=m5:r1:m5:d1:lv4) */
+OPCODE(ADD,        B)        /* Ra = Ra+Ra+1 */
+OPCODE(ADDI,       BB)       /* Ra = Ra+mrb_int(b) */
+OPCODE(SUB,        B)        /* Ra = Ra-Ra+1 */
+OPCODE(SUBI,       BB)       /* Ra = Ra-mrb_int(b) */
+OPCODE(MUL,        B)        /* Ra = Ra*Ra+1 */
+OPCODE(DIV,        B)        /* Ra = Ra/Ra+1 */
+OPCODE(EQ,         B)        /* Ra = Ra==Ra+1 */
+OPCODE(LT,         B)        /* Ra = Ra<Ra+1 */
+OPCODE(LE,         B)        /* Ra = Ra<=Ra+1 */
+OPCODE(GT,         B)        /* Ra = Ra>Ra+1 */
+OPCODE(GE,         B)        /* Ra = Ra>=Ra+1 */
+OPCODE(ARRAY,      BB)       /* Ra = ary_new(Ra,Ra+1..Ra+b) */
+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(AREF,       BBB)      /* Ra = Rbc */
+OPCODE(ASET,       BBB)      /* Rbc = Ra */
+OPCODE(APOST,      BBB)      /* *Ra,Ra+1..Ra+c = Rab.. */
+OPCODE(INTERN,     B)        /* Ra = intern(Ra) */
+OPCODE(SYMBOL,     BB)       /* Ra = intern(Poolb) */
+OPCODE(STRING,     BB)       /* Ra = str_dup(Poolb) */
+OPCODE(STRCAT,     B)        /* str_cat(Ra,Ra+1) */
+OPCODE(HASH,       BB)       /* Ra = hash_new(Ra,Ra+1..Ra+b*2-1) */
+OPCODE(HASHADD,    BB)       /* hash_push(Ra,Ra+1..Ra+b*2) */
+OPCODE(HASHCAT,    B)        /* Ra = hash_cat(Ra,Ra+1) */
+OPCODE(LAMBDA,     BB)       /* Ra = lambda(Irepb,L_LAMBDA) */
+OPCODE(BLOCK,      BB)       /* Ra = lambda(Irepb,L_BLOCK) */
+OPCODE(METHOD,     BB)       /* Ra = lambda(Irepb,L_METHOD) */
+OPCODE(RANGE_INC,  B)        /* Ra = range_new(Ra,Ra+1,FALSE) */
+OPCODE(RANGE_EXC,  B)        /* Ra = range_new(Ra,Ra+1,TRUE) */
+OPCODE(OCLASS,     B)        /* Ra = ::Object */
+OPCODE(CLASS,      BB)       /* Ra = newclass(Ra,Symsb,Ra+1) */
+OPCODE(MODULE,     BB)       /* Ra = newmodule(Ra,Symsb) */
+OPCODE(EXEC,       BB)       /* Ra = blockexec(Ra,Irepb) */
+OPCODE(DEF,        BB)       /* Ra.newmethod(Symsb,Ra+1); Ra = Symsb */
+OPCODE(ALIAS,      BB)       /* alias_method(target_class,Symsa,Symsb) */
+OPCODE(UNDEF,      B)        /* undef_method(target_class,Symsa) */
+OPCODE(SCLASS,     B)        /* Ra = Ra.singleton_class */
+OPCODE(TCLASS,     B)        /* Ra = target_class */
 OPCODE(DEBUG,      BBB)      /* print a,b,c */
-OPCODE(ERR,        B)        /* raise(LocalJumpError, Lit(a)) */
-OPCODE(EXT1,       Z)        /* make 1st operand 16bit */
-OPCODE(EXT2,       Z)        /* make 2nd operand 16bit */
+OPCODE(ERR,        B)        /* raise(LocalJumpError, Poola) */
+OPCODE(EXT1,       Z)        /* make 1st operand (a) 16bit */
+OPCODE(EXT2,       Z)        /* make 2nd operand (b) 16bit */
 OPCODE(EXT3,       Z)        /* make 1st and 2nd operands 16bit */
 OPCODE(STOP,       Z)        /* stop VM */
-OPCODE(LOADI16,    BS)       /* R(a) = mrb_int(b) */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/presym Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/presym.h Added

@@ -0,0 +1,40 @@
+/**
+** @file mruby/presym.h - Preallocated Symbols
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_PRESYM_H
+#define MRUBY_PRESYM_H
+
+#if defined(MRB_NO_PRESYM)
+# include <mruby/presym/disable.h>
+#elif !defined(MRB_PRESYM_SCANNING)
+# include <mruby/presym/enable.h>
+#endif
+
+/*
+ * Where `mrb_intern_lit` is allowed for symbol interning, it is directly
+ * replaced by the symbol ID if presym is enabled by using the following
+ * macros.
+ *
+ *   MRB_OPSYM(xor)  //=> ^      (Operator)
+ *   MRB_CVSYM(xor)  //=> @@xor  (Class Variable)
+ *   MRB_IVSYM(xor)  //=> @xor   (Instance Variable)
+ *   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_SYM(xor)    //=> xor    (Word characters)
+ *
+ * For `MRB_OPSYM`, specify the names corresponding to operators (see
+ * `MRuby::Presym::OPERATORS` in `lib/mruby/presym.rb` for the names that
+ * can be specified for it). Other than that, describe only word characters
+ * excluding leading and ending punctuations.
+ *
+ * These macros are expanded to `mrb_intern_lit` if presym is disabled,
+ * therefore the mruby state variable is required. The above macros can be
+ * used when the variable name is `mrb`. If you want to use other variable
+ * names, you need to use macros with `_2` suffix, such as `MRB_SYM_2`.
+ */
+
+#endif  /* MRUBY_PRESYM_H */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/presym/disable.h Added

@@ -0,0 +1,70 @@
+/**
+** @file mruby/presym/disable.h - Disable Preallocated Symbols
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_PRESYM_DISABLE_H
+#define MRUBY_PRESYM_DISABLE_H
+
+#include <string.h>
+
+#define MRB_PRESYM_MAX 0
+
+#define MRB_OPSYM(name) MRB_OPSYM__##name(mrb)
+#define MRB_CVSYM(name) mrb_intern_lit(mrb, "@@" #name)
+#define MRB_IVSYM(name) mrb_intern_lit(mrb, "@" #name)
+#define MRB_SYM_B(name) mrb_intern_lit(mrb, #name "!")
+#define MRB_SYM_Q(name) mrb_intern_lit(mrb, #name "?")
+#define MRB_SYM_E(name) mrb_intern_lit(mrb, #name "=")
+#define MRB_SYM(name) mrb_intern_lit(mrb, #name)
+
+#define MRB_OPSYM_2(mrb, name) MRB_OPSYM__##name(mrb)
+#define MRB_CVSYM_2(mrb, name) mrb_intern_lit(mrb, "@@" #name)
+#define MRB_IVSYM_2(mrb, name) mrb_intern_lit(mrb, "@" #name)
+#define MRB_SYM_B_2(mrb, name) mrb_intern_lit(mrb, #name "!")
+#define MRB_SYM_Q_2(mrb, name) mrb_intern_lit(mrb, #name "?")
+#define MRB_SYM_E_2(mrb, name) mrb_intern_lit(mrb, #name "=")
+#define MRB_SYM_2(mrb, name) mrb_intern_lit(mrb, #name)
+
+#define MRB_OPSYM__not(mrb) mrb_intern_lit(mrb, "!")
+#define MRB_OPSYM__mod(mrb) mrb_intern_lit(mrb, "%")
+#define MRB_OPSYM__and(mrb) mrb_intern_lit(mrb, "&")
+#define MRB_OPSYM__mul(mrb) mrb_intern_lit(mrb, "*")
+#define MRB_OPSYM__add(mrb) mrb_intern_lit(mrb, "+")
+#define MRB_OPSYM__sub(mrb) mrb_intern_lit(mrb, "-")
+#define MRB_OPSYM__div(mrb) mrb_intern_lit(mrb, "/")
+#define MRB_OPSYM__lt(mrb) mrb_intern_lit(mrb, "<")
+#define MRB_OPSYM__gt(mrb) mrb_intern_lit(mrb, ">")
+#define MRB_OPSYM__xor(mrb) mrb_intern_lit(mrb, "^")
+#define MRB_OPSYM__tick(mrb) mrb_intern_lit(mrb, "`")
+#define MRB_OPSYM__or(mrb) mrb_intern_lit(mrb, "|")
+#define MRB_OPSYM__neg(mrb) mrb_intern_lit(mrb, "~")
+#define MRB_OPSYM__neq(mrb) mrb_intern_lit(mrb, "!=")
+#define MRB_OPSYM__nmatch(mrb) mrb_intern_lit(mrb, "!~")
+#define MRB_OPSYM__andand(mrb) mrb_intern_lit(mrb, "&&")
+#define MRB_OPSYM__pow(mrb) mrb_intern_lit(mrb, "**")
+#define MRB_OPSYM__plus(mrb) mrb_intern_lit(mrb, "+@")
+#define MRB_OPSYM__minus(mrb) mrb_intern_lit(mrb, "-@")
+#define MRB_OPSYM__lshift(mrb) mrb_intern_lit(mrb, "<<")
+#define MRB_OPSYM__le(mrb) mrb_intern_lit(mrb, "<=")
+#define MRB_OPSYM__eq(mrb) mrb_intern_lit(mrb, "==")
+#define MRB_OPSYM__match(mrb) mrb_intern_lit(mrb, "=~")
+#define MRB_OPSYM__ge(mrb) mrb_intern_lit(mrb, ">=")
+#define MRB_OPSYM__rshift(mrb) mrb_intern_lit(mrb, ">>")
+#define MRB_OPSYM__aref(mrb) mrb_intern_lit(mrb, "")
+#define MRB_OPSYM__oror(mrb) mrb_intern_lit(mrb, "||")
+#define MRB_OPSYM__cmp(mrb) mrb_intern_lit(mrb, "<=>")
+#define MRB_OPSYM__eqq(mrb) mrb_intern_lit(mrb, "===")
+#define MRB_OPSYM__aset(mrb) mrb_intern_lit(mrb, "=")
+
+#define MRB_PRESYM_DEFINE_VAR_AND_INITER(name, size, ...)                     \
+  static mrb_sym namesize;                                                  \
+  static void presym_init_##name(mrb_state *mrb) {                            \
+    mrb_sym name__ = {__VA_ARGS__};                                         \
+    memcpy(name, name__, sizeof(name));                                       \
+  }
+
+#define MRB_PRESYM_INIT_SYMBOLS(mrb, name) presym_init_##name(mrb)
+
+#endif  /* MRUBY_PRESYM_DISABLE_H */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/presym/enable.h Added

@@ -0,0 +1,37 @@
+/**
+** @file mruby/presym/enable.h - Enable Preallocated Symbols
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_PRESYM_ENABLE_H
+#define MRUBY_PRESYM_ENABLE_H
+
+#include <mruby/presym/id.h>
+
+#define MRB_OPSYM(name) MRB_OPSYM__##name
+#define MRB_CVSYM(name) MRB_CVSYM__##name
+#define MRB_IVSYM(name) MRB_IVSYM__##name
+#define MRB_SYM_B(name) MRB_SYM_B__##name
+#define MRB_SYM_Q(name) MRB_SYM_Q__##name
+#define MRB_SYM_E(name) MRB_SYM_E__##name
+#define MRB_SYM(name) MRB_SYM__##name
+
+#define MRB_OPSYM_2(mrb, name) MRB_OPSYM__##name
+#define MRB_CVSYM_2(mrb, name) MRB_CVSYM__##name
+#define MRB_IVSYM_2(mrb, name) MRB_IVSYM__##name
+#define MRB_SYM_B_2(mrb, name) MRB_SYM_B__##name
+#define MRB_SYM_Q_2(mrb, name) MRB_SYM_Q__##name
+#define MRB_SYM_E_2(mrb, name) MRB_SYM_E__##name
+#define MRB_SYM_2(mrb, name) MRB_SYM__##name
+
+#define MRB_PRESYM_DEFINE_VAR_AND_INITER(name, size, ...)                     \
+  static const mrb_sym name = {__VA_ARGS__};
+
+#define MRB_PRESYM_INIT_SYMBOLS(mrb, name) (void)(mrb)
+
+/* use MRB_SYM() for E_RUNTIME_ERROR etc. */
+#undef MRB_ERROR_SYM
+#define MRB_ERROR_SYM(sym) MRB_SYM(sym)
+
+#endif  /* MRUBY_PRESYM_ENABLE_H */

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/include/mruby/presym/scanning.h Added

@@ -0,0 +1,79 @@
+/**
+** @file mruby/presym/scanning.h - Scanning Preallocated Symbols
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_PRESYM_SCANNING_H
+#define MRUBY_PRESYM_SCANNING_H
+
+#define MRB_PRESYM_SCANNING_TAGGED(arg) <@! arg !@>
+
+#undef mrb_intern_lit
+#define mrb_intern_lit(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name)
+#define mrb_intern_cstr(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name)
+#define mrb_define_method(mrb, c, name, ...) MRB_PRESYM_SCANNING_TAGGED(name) (c) (__VA_ARGS__)
+#define mrb_define_class_method(mrb, c, name, ...) MRB_PRESYM_SCANNING_TAGGED(name) (c) (__VA_ARGS__)
+#define mrb_define_singleton_method(mrb, c, name, ...) MRB_PRESYM_SCANNING_TAGGED(name) (c) (__VA_ARGS__)
+#define mrb_define_class(mrb, name, s) MRB_PRESYM_SCANNING_TAGGED(name) (s)
+#define mrb_define_class_under(mrb, o, name, s) MRB_PRESYM_SCANNING_TAGGED(name) (o) (s)
+#define mrb_define_module(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name)
+#define mrb_define_module_under(mrb, o, name) MRB_PRESYM_SCANNING_TAGGED(name) (o)
+#define mrb_define_module_function(mrb, c, name, ...) MRB_PRESYM_SCANNING_TAGGED(name) (c) (__VA_ARGS__)
+#define mrb_define_const(mrb, c, name, v) MRB_PRESYM_SCANNING_TAGGED(name) (c) (v)
+#define mrb_define_global_const(mrb, name, v) MRB_PRESYM_SCANNING_TAGGED(name) (v)
+#define mrb_define_alias(mrb, c, a, b) MRB_PRESYM_SCANNING_TAGGED(a) MRB_PRESYM_SCANNING_TAGGED(b) (c)
+#define mrb_class_get(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name)
+#define mrb_class_get_under(mrb, outer, name) MRB_PRESYM_SCANNING_TAGGED(name) (outer)
+#define mrb_module_get(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name)
+#define mrb_module_get_under(mrb, outer, name) MRB_PRESYM_SCANNING_TAGGED(name) (outer)
+#define mrb_funcall(mrb, v, name, ...) MRB_PRESYM_SCANNING_TAGGED(name) (v) (__VA_ARGS__)
+
+#define MRB_OPSYM(name) MRB_OPSYM__##name(mrb)
+#define MRB_CVSYM(name) MRB_PRESYM_SCANNING_TAGGED("@@" #name)
+#define MRB_IVSYM(name) MRB_PRESYM_SCANNING_TAGGED("@" #name)
+#define MRB_SYM_B(name) MRB_PRESYM_SCANNING_TAGGED(#name "!")
+#define MRB_SYM_Q(name) MRB_PRESYM_SCANNING_TAGGED(#name "?")
+#define MRB_SYM_E(name) MRB_PRESYM_SCANNING_TAGGED(#name "=")
+#define MRB_SYM(name) MRB_PRESYM_SCANNING_TAGGED(#name)
+
+#define MRB_OPSYM_2(mrb, name) MRB_OPSYM__##name(mrb)
+#define MRB_CVSYM_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED("@@" #name)
+#define MRB_IVSYM_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED("@" #name)
+#define MRB_SYM_B_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED(#name "!")
+#define MRB_SYM_Q_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED(#name "?")
+#define MRB_SYM_E_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED(#name "=")
+#define MRB_SYM_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED(#name)
+
+#define MRB_OPSYM__not(mrb) MRB_PRESYM_SCANNING_TAGGED("!")
+#define MRB_OPSYM__mod(mrb) MRB_PRESYM_SCANNING_TAGGED("%")
+#define MRB_OPSYM__and(mrb) MRB_PRESYM_SCANNING_TAGGED("&")
+#define MRB_OPSYM__mul(mrb) MRB_PRESYM_SCANNING_TAGGED("*")
+#define MRB_OPSYM__add(mrb) MRB_PRESYM_SCANNING_TAGGED("+")
+#define MRB_OPSYM__sub(mrb) MRB_PRESYM_SCANNING_TAGGED("-")
+#define MRB_OPSYM__div(mrb) MRB_PRESYM_SCANNING_TAGGED("/")
+#define MRB_OPSYM__lt(mrb) MRB_PRESYM_SCANNING_TAGGED("<")
+#define MRB_OPSYM__gt(mrb) MRB_PRESYM_SCANNING_TAGGED(">")
+#define MRB_OPSYM__xor(mrb) MRB_PRESYM_SCANNING_TAGGED("^")
+#define MRB_OPSYM__tick(mrb) MRB_PRESYM_SCANNING_TAGGED("`")
+#define MRB_OPSYM__or(mrb) MRB_PRESYM_SCANNING_TAGGED("|")
+#define MRB_OPSYM__neg(mrb) MRB_PRESYM_SCANNING_TAGGED("~")
+#define MRB_OPSYM__neq(mrb) MRB_PRESYM_SCANNING_TAGGED("!=")
+#define MRB_OPSYM__nmatch(mrb) MRB_PRESYM_SCANNING_TAGGED("!~")
+#define MRB_OPSYM__andand(mrb) MRB_PRESYM_SCANNING_TAGGED("&&")
+#define MRB_OPSYM__pow(mrb) MRB_PRESYM_SCANNING_TAGGED("**")
+#define MRB_OPSYM__plus(mrb) MRB_PRESYM_SCANNING_TAGGED("+@")
+#define MRB_OPSYM__minus(mrb) MRB_PRESYM_SCANNING_TAGGED("-@")
+#define MRB_OPSYM__lshift(mrb) MRB_PRESYM_SCANNING_TAGGED("<<")
+#define MRB_OPSYM__le(mrb) MRB_PRESYM_SCANNING_TAGGED("<=")
+#define MRB_OPSYM__eq(mrb) MRB_PRESYM_SCANNING_TAGGED("==")
+#define MRB_OPSYM__match(mrb) MRB_PRESYM_SCANNING_TAGGED("=~")
+#define MRB_OPSYM__ge(mrb) MRB_PRESYM_SCANNING_TAGGED(">=")
+#define MRB_OPSYM__rshift(mrb) MRB_PRESYM_SCANNING_TAGGED(">>")
+#define MRB_OPSYM__aref(mrb) MRB_PRESYM_SCANNING_TAGGED("")
+#define MRB_OPSYM__oror(mrb) MRB_PRESYM_SCANNING_TAGGED("||")
+#define MRB_OPSYM__cmp(mrb) MRB_PRESYM_SCANNING_TAGGED("<=>")
+#define MRB_OPSYM__eqq(mrb) MRB_PRESYM_SCANNING_TAGGED("===")
+#define MRB_OPSYM__aset(mrb) MRB_PRESYM_SCANNING_TAGGED("=")
+
+#endif  /* MRUBY_PRESYM_SCANNING_H */

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

@@ -41,10 +41,10 @@
 struct RProc {
   MRB_OBJECT_HEADER;
   union {
-    mrb_irep *irep;
+    const mrb_irep *irep;
     mrb_func_t func;
   } body;
-  struct RProc *upper;
+  const struct RProc *upper;
   union {
     struct RClass *target_class;
     struct REnv *env;
@@ -57,7 +57,7 @@
 #define MRB_ASPEC_REST(a)         (((a) >> 12) & 0x1)
 #define MRB_ASPEC_POST(a)         (((a) >> 7) & 0x1f)
 #define MRB_ASPEC_KEY(a)          (((a) >> 2) & 0x1f)
-#define MRB_ASPEC_KDICT(a)        ((a) & (1<<1))
+#define MRB_ASPEC_KDICT(a)        (((a) >> 1) & 0x1)
 #define MRB_ASPEC_BLOCK(a)        ((a) & 1)
 
 #define MRB_PROC_CFUNC_FL 128
@@ -83,19 +83,18 @@
 } while (0)
 #define MRB_PROC_SCOPE 2048
 #define MRB_PROC_SCOPE_P(p) (((p)->flags & MRB_PROC_SCOPE) != 0)
+#define MRB_PROC_NOARG 4096 /* for MRB_PROC_CFUNC_FL, it would be something like MRB_ARGS_NONE() or MRB_METHOD_NOARG_FL */
+#define MRB_PROC_NOARG_P(p) (((p)->flags & MRB_PROC_NOARG) != 0)
 
 #define mrb_proc_ptr(v)    ((struct RProc*)(mrb_ptr(v)))
 
-struct RProc *mrb_proc_new(mrb_state*, mrb_irep*);
-struct RProc *mrb_closure_new(mrb_state*, mrb_irep*);
+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(struct RProc *a, struct RProc *b);
+void mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b);
 mrb_int mrb_proc_arity(const struct RProc *p);
 
-/* implementation of #send method */
-mrb_value mrb_f_send(mrb_state *mrb, mrb_value self);
-
 /* 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);
 MRB_API mrb_value mrb_proc_cfunc_env_get(mrb_state *mrb, mrb_int idx);
@@ -104,10 +103,11 @@
 
 #define MRB_METHOD_FUNC_FL 1
 #define MRB_METHOD_NOARG_FL 2
-#ifndef MRB_METHOD_T_STRUCT
+
+#ifndef MRB_USE_METHOD_T_STRUCT
 
 #define MRB_METHOD_FUNC_P(m) (((uintptr_t)(m))&MRB_METHOD_FUNC_FL)
-#define MRB_METHOD_NOARG_P(m) (((uintptr_t)(m))&MRB_METHOD_NOARG_FL)
+#define MRB_METHOD_NOARG_P(m) ((((uintptr_t)(m))&MRB_METHOD_NOARG_FL)?1:0)
 #define MRB_METHOD_NOARG_SET(m) ((m)=(mrb_method_t)(((uintptr_t)(m))|MRB_METHOD_NOARG_FL))
 #define MRB_METHOD_FUNC(m) ((mrb_func_t)((uintptr_t)(m)>>2))
 #define MRB_METHOD_FROM_FUNC(m,fn) ((m)=(mrb_method_t)((((uintptr_t)(fn))<<2)|MRB_METHOD_FUNC_FL))
@@ -119,23 +119,92 @@
 #else
 
 #define MRB_METHOD_FUNC_P(m) ((m).flags&MRB_METHOD_FUNC_FL)
-#define MRB_METHOD_NOARG_P(m) ((m).flags&MRB_METHOD_NOARG_FL)
+#define MRB_METHOD_NOARG_P(m) (((m).flags&MRB_METHOD_NOARG_FL)?1:0)
 #define MRB_METHOD_FUNC(m) ((m).func)
 #define MRB_METHOD_NOARG_SET(m) do{(m).flags|=MRB_METHOD_NOARG_FL;}while(0)
 #define MRB_METHOD_FROM_FUNC(m,fn) do{(m).flags=MRB_METHOD_FUNC_FL;(m).func=(fn);}while(0)
-#define MRB_METHOD_FROM_PROC(m,pr) do{(m).flags=0;(m).proc=(pr);}while(0)
+#define MRB_METHOD_FROM_PROC(m,pr) do{(m).flags=0;(m).proc=(struct RProc*)(pr);}while(0)
 #define MRB_METHOD_PROC_P(m) (!MRB_METHOD_FUNC_P(m))
 #define MRB_METHOD_PROC(m) ((m).proc)
 #define MRB_METHOD_UNDEF_P(m) ((m).proc==NULL)
 
-#endif /* MRB_METHOD_T_STRUCT */
+#endif /* MRB_USE_METHOD_T_STRUCT */
 
 #define MRB_METHOD_CFUNC_P(m) (MRB_METHOD_FUNC_P(m)?TRUE:(MRB_METHOD_PROC(m)?(MRB_PROC_CFUNC_P(MRB_METHOD_PROC(m))):FALSE))
 #define MRB_METHOD_CFUNC(m) (MRB_METHOD_FUNC_P(m)?MRB_METHOD_FUNC(m):((MRB_METHOD_PROC(m)&&MRB_PROC_CFUNC_P(MRB_METHOD_PROC(m)))?MRB_PROC_CFUNC(MRB_METHOD_PROC(m)):NULL))
 
 
 #include <mruby/khash.h>
-KHASH_DECLARE(mt, mrb_sym, mrb_method_t, TRUE)
+
+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;
+  }
+}
 
 MRB_END_DECL

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

@@ -35,7 +35,7 @@
 };
 struct RStringEmbed {
   MRB_OBJECT_HEADER;
-  char ary;
+  char aryRSTRING_EMBED_LEN_MAX+1;
 };
 
 #define RSTR_SET_TYPE_FLAG(s, type) (RSTR_UNSET_TYPE_FLAG(s), (s)->flags |= MRB_STR_##type)
@@ -92,9 +92,6 @@
 # define RSTR_COPY_ASCII_FLAG(dst, src) (void)0
 #endif
 
-#define RSTR_POOL_P(s) ((s)->flags & MRB_STR_POOL)
-#define RSTR_SET_POOL_FLAG(s) ((s)->flags |= MRB_STR_POOL)
-
 /**
  * Returns a pointer from a Ruby string
  */
@@ -112,13 +109,11 @@
 #define MRB_STR_FSHARED   2
 #define MRB_STR_NOFREE    4
 #define MRB_STR_EMBED     8  /* type flags up to here */
-#define MRB_STR_POOL     16  /* status flags from here */
-#define MRB_STR_ASCII    32
+#define MRB_STR_ASCII    16
 #define MRB_STR_EMBED_LEN_SHIFT 6
 #define MRB_STR_EMBED_LEN_BIT 5
 #define MRB_STR_EMBED_LEN_MASK (((1 << MRB_STR_EMBED_LEN_BIT) - 1) << MRB_STR_EMBED_LEN_SHIFT)
-#define MRB_STR_TYPE_MASK (MRB_STR_POOL - 1)
-
+#define MRB_STR_TYPE_MASK 15
 
 void mrb_gc_free_str(mrb_state*, struct RString*);
 
@@ -164,7 +159,7 @@
  *
  *       mrb_close(mrb);
  *       return 0;
- *     } 
+ *     }
  *
  * Result:
  *
@@ -329,30 +324,16 @@
  */
 MRB_API mrb_value mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len);
 
-/**
- * Returns a Ruby string type.
- *
- *
- * @param mrb The current mruby state.
- * @param str Ruby string.
- * @return mrb_value A Ruby string.
- */
-MRB_API mrb_value mrb_ensure_string_type(mrb_state *mrb, mrb_value str);
-MRB_API mrb_value mrb_check_string_type(mrb_state *mrb, mrb_value str);
-/* obsolete: use mrb_ensure_string_type() instead */
-MRB_API mrb_value mrb_string_type(mrb_state *mrb, mrb_value str);
-
-
 MRB_API mrb_value mrb_str_new_capa(mrb_state *mrb, size_t capa);
-MRB_API mrb_value mrb_str_buf_new(mrb_state *mrb, size_t capa);
+#define mrb_str_buf_new(mrb, capa) mrb_str_new_capa(mrb, (capa))
 
 /* NULL terminated C string from mrb_value */
 MRB_API const char *mrb_string_cstr(mrb_state *mrb, mrb_value str);
 /* 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);
-/* obslete: use RSTRING_PTR() */
+/* obsolete: use RSTRING_PTR() */
 MRB_API const char *mrb_string_value_ptr(mrb_state *mrb, mrb_value str);
-/* obslete: use RSTRING_LEN() */
+/* obsolete: use RSTRING_LEN() */
 MRB_API mrb_int mrb_string_value_len(mrb_state *mrb, mrb_value str);
 
 /**
@@ -374,16 +355,10 @@
  */
 MRB_API mrb_value mrb_str_intern(mrb_state *mrb, mrb_value self);
 
-MRB_API mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck);
-MRB_API mrb_value mrb_cstr_to_inum(mrb_state *mrb, const char *s, mrb_int base, mrb_bool badcheck);
+MRB_API mrb_value mrb_str_to_integer(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck);
+/* obsolete: use mrb_str_to_integer() */
+#define mrb_str_to_inum(mrb, str, base, badcheck) mrb_str_to_integer(mrb, str, base, badcheck)
 MRB_API double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck);
-MRB_API double mrb_cstr_to_dbl(mrb_state *mrb, const char *s, mrb_bool badcheck);
-
-/**
- * Returns a converted string type.
- * For type checking, non converting `mrb_to_str` is recommended.
- */
-MRB_API mrb_value mrb_str_to_str(mrb_state *mrb, mrb_value str);
 
 /**
  * Returns true if the strings match and false if the strings don't match.
@@ -437,7 +412,7 @@
  * - Returned string does not contain any NUL characters (but terminator).
  * - It raises an ArgumentError exception if Ruby string contains
  *   NUL characters.
- * - Retured string will be freed automatically on next GC.
+ * - Returned string will be freed automatically on next GC.
  * - Caller can modify returned string without affecting Ruby string
  *   (e.g. it can be used for mkstemp(3)).
  *
@@ -447,7 +422,6 @@
  */
 MRB_API char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
 
-mrb_value mrb_str_pool(mrb_state *mrb, const char *s, mrb_int len, mrb_bool nofree);
 uint32_t mrb_str_hash(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);

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

@@ -7,13 +7,15 @@
 #ifndef MRB_THROW_H
 #define MRB_THROW_H
 
-#if defined(MRB_ENABLE_CXX_ABI)
+#if defined(MRB_USE_CXX_ABI)
 # if !defined(__cplusplus)
 #  error Trying to use C++ exception handling in C code
 # endif
 #endif
 
-#if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
+#if defined(MRB_USE_CXX_EXCEPTION)
+
+# if defined(__cplusplus)
 
 #define MRB_TRY(buf) try {
 #define MRB_CATCH(buf) } catch(mrb_jmpbuf_impl e) { if (e != (buf)->impl) { throw e; }
@@ -22,6 +24,10 @@
 #define MRB_THROW(buf) throw((buf)->impl)
 typedef mrb_int mrb_jmpbuf_impl;
 
+# else
+# error "need to be compiled with C++ compiler"
+# endif  /* __cplusplus */
+
 #else
 
 #include <setjmp.h>
@@ -29,6 +35,9 @@
 #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #define MRB_SETJMP _setjmp
 #define MRB_LONGJMP _longjmp
+#elif defined(__MINGW64__) && defined(__GNUC__) && __GNUC__ >= 4
+#define MRB_SETJMP __builtin_setjmp
+#define MRB_LONGJMP __builtin_longjmp
 #else
 #define MRB_SETJMP setjmp
 #define MRB_LONGJMP longjmp
@@ -46,9 +55,11 @@
 struct mrb_jmpbuf {
   mrb_jmpbuf_impl impl;
 
-#if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
+#if defined(MRB_USE_CXX_EXCEPTION)
   static mrb_int jmpbuf_id;
+# if defined(__cplusplus)
   mrb_jmpbuf() : impl(jmpbuf_id++) {}
+# endif
 #endif
 };

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

@@ -31,7 +31,30 @@
  * Not to be confused with Ruby's boolean classes, which can be
  * obtained using mrb_false_value() and mrb_true_value()
  */
+#if defined(__cplusplus) || (defined(__bool_true_false_are_defined) && __bool_true_false_are_defined)
+typedef bool mrb_bool;
+
+# ifndef FALSE
+#  define FALSE false
+# endif
+# ifndef TRUE
+#  define TRUE true
+# endif
+#else
+# if __STDC_VERSION__ >= 199901L
+typedef _Bool mrb_bool;
+# else
 typedef uint8_t mrb_bool;
+# endif
+
+# ifndef FALSE
+#  define FALSE 0
+# endif
+# ifndef TRUE
+#  define TRUE 1
+# endif
+#endif
+
 struct mrb_state;
 
 #if defined _MSC_VER && _MSC_VER < 1800
@@ -53,17 +76,19 @@
 
 #if defined(MRB_INT64)
   typedef int64_t mrb_int;
+  typedef uint64_t mrb_uint;
 # define MRB_INT_BIT 64
-# define MRB_INT_MIN (INT64_MIN>>MRB_FIXNUM_SHIFT)
-# define MRB_INT_MAX (INT64_MAX>>MRB_FIXNUM_SHIFT)
+# define MRB_INT_MIN INT64_MIN
+# define MRB_INT_MAX INT64_MAX
 # define MRB_PRIo PRIo64
 # define MRB_PRId PRId64
 # define MRB_PRIx PRIx64
 #else
   typedef int32_t mrb_int;
+  typedef uint32_t mrb_uint;
 # define MRB_INT_BIT 32
-# define MRB_INT_MIN (INT32_MIN>>MRB_FIXNUM_SHIFT)
-# define MRB_INT_MAX (INT32_MAX>>MRB_FIXNUM_SHIFT)
+# define MRB_INT_MIN INT32_MIN
+# define MRB_INT_MAX INT32_MAX
 # define MRB_PRIo PRIo32
 # define MRB_PRId PRId32
 # define MRB_PRIx PRIx32
@@ -75,9 +100,10 @@
 # define MRB_ENDIAN_LOHI(a,b) b a
 #endif
 
-#ifndef MRB_WITHOUT_FLOAT
+MRB_API mrb_int mrb_int_read(const char *p, const char *e, char **endp);
+#ifndef MRB_NO_FLOAT
 MRB_API double mrb_float_read(const char*, char**);
-#ifdef MRB_USE_FLOAT
+#ifdef MRB_USE_FLOAT32
   typedef float mrb_float;
 #else
   typedef double mrb_float;
@@ -85,13 +111,11 @@
 #endif
 
 #if defined _MSC_VER && _MSC_VER < 1900
-# include <stdarg.h>
 MRB_API int mrb_msvc_vsnprintf(char *s, size_t n, const char *format, va_list arg);
 MRB_API int mrb_msvc_snprintf(char *s, size_t n, const char *format, ...);
 # define vsnprintf(s, n, format, arg) mrb_msvc_vsnprintf(s, n, format, arg)
 # define snprintf(s, n, format, ...) mrb_msvc_snprintf(s, n, format, __VA_ARGS__)
-# if _MSC_VER < 1800 && !defined MRB_WITHOUT_FLOAT
-#  include <float.h>
+# if _MSC_VER < 1800 && !defined MRB_NO_FLOAT
 #  define isfinite(n) _finite(n)
 #  define isnan _isnan
 #  define isinf(n) (!_finite(n) && !_isnan(n))
@@ -102,34 +126,52 @@
 # endif
 #endif
 
+#define MRB_VTYPE_FOREACH(f) \
+    /* mrb_vtype */     /* c type */        /* ruby class */ \
+  f(MRB_TT_FALSE,       void,               "false") \
+  f(MRB_TT_TRUE,        void,               "true") \
+  f(MRB_TT_SYMBOL,      void,               "Symbol") \
+  f(MRB_TT_UNDEF,       void,               "undefined") \
+  f(MRB_TT_FREE,        void,               "free") \
+  f(MRB_TT_FLOAT,       struct RFloat,      "Float") \
+  f(MRB_TT_INTEGER,     struct RInteger,    "Integer") \
+  f(MRB_TT_CPTR,        struct RCptr,       "cptr") \
+  f(MRB_TT_OBJECT,      struct RObject,     "Object") \
+  f(MRB_TT_CLASS,       struct RClass,      "Class") \
+  f(MRB_TT_MODULE,      struct RClass,      "Module") \
+  f(MRB_TT_ICLASS,      struct RClass,      "iClass") \
+  f(MRB_TT_SCLASS,      struct RClass,      "SClass") \
+  f(MRB_TT_PROC,        struct RProc,       "Proc") \
+  f(MRB_TT_ARRAY,       struct RArray,      "Array") \
+  f(MRB_TT_HASH,        struct RHash,       "Hash") \
+  f(MRB_TT_STRING,      struct RString,     "String") \
+  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_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")
+
 enum mrb_vtype {
-  MRB_TT_FALSE = 0,
-  MRB_TT_TRUE,
-  MRB_TT_FLOAT,
-  MRB_TT_FIXNUM,
-  MRB_TT_SYMBOL,
-  MRB_TT_UNDEF,
-  MRB_TT_CPTR,
-  MRB_TT_FREE,
-  MRB_TT_OBJECT,
-  MRB_TT_CLASS,
-  MRB_TT_MODULE,
-  MRB_TT_ICLASS,
-  MRB_TT_SCLASS,
-  MRB_TT_PROC,
-  MRB_TT_ARRAY,
-  MRB_TT_HASH,
-  MRB_TT_STRING,
-  MRB_TT_RANGE,
-  MRB_TT_EXCEPTION,
-  MRB_TT_ENV,
-  MRB_TT_DATA,
-  MRB_TT_FIBER,
-  MRB_TT_ISTRUCT,
-  MRB_TT_BREAK,
+#define MRB_VTYPE_DEFINE(tt, type, name) tt,
+  MRB_VTYPE_FOREACH(MRB_VTYPE_DEFINE)
+#undef MRB_VTYPE_DEFINE
   MRB_TT_MAXDEFINE
 };
 
+#define MRB_VTYPE_TYPEOF(tt) MRB_TYPEOF_##tt
+
+#define MRB_VTYPE_TYPEDEF(tt, type, name) typedef type MRB_VTYPE_TYPEOF(tt);
+MRB_VTYPE_FOREACH(MRB_VTYPE_TYPEDEF)
+#undef MRB_VTYPE_TYPEDEF
+
+/* for compatibility */
+#define MRB_TT_FIXNUM MRB_TT_INTEGER
+
 #include <mruby/object.h>
 
 #ifdef MRB_DOCUMENTATION_BLOCK
@@ -163,22 +205,22 @@
 #include "boxing_no.h"
 #endif
 
-#define MRB_SYMBOL_BIT (sizeof(mrb_sym) * CHAR_BIT - MRB_SYMBOL_SHIFT)
-#define MRB_SYMBOL_MAX (UINT32_MAX >> MRB_SYMBOL_SHIFT)
-
 #if INTPTR_MAX < MRB_INT_MAX
   typedef intptr_t mrb_ssize;
-# define MRB_SSIZE_MAX (INTPTR_MAX>>MRB_FIXNUM_SHIFT)
+# define MRB_SSIZE_MAX INTPTR_MAX
 #else
   typedef mrb_int mrb_ssize;
 # define MRB_SSIZE_MAX MRB_INT_MAX
 #endif
 
 #ifndef mrb_immediate_p
-#define mrb_immediate_p(o) (mrb_type(o) < MRB_TT_FREE)
+#define mrb_immediate_p(o) (mrb_type(o) <= MRB_TT_CPTR)
+#endif
+#ifndef mrb_integer_p
+#define mrb_integer_p(o) (mrb_type(o) == MRB_TT_INTEGER)
 #endif
 #ifndef mrb_fixnum_p
-#define mrb_fixnum_p(o) (mrb_type(o) == MRB_TT_FIXNUM)
+#define mrb_fixnum_p(o) mrb_integer_p(o)
 #endif
 #ifndef mrb_symbol_p
 #define mrb_symbol_p(o) (mrb_type(o) == MRB_TT_SYMBOL)
@@ -195,7 +237,7 @@
 #ifndef mrb_true_p
 #define mrb_true_p(o)  (mrb_type(o) == MRB_TT_TRUE)
 #endif
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 #ifndef mrb_float_p
 #define mrb_float_p(o) (mrb_type(o) == MRB_TT_FLOAT)
 #endif
@@ -264,7 +306,7 @@
  *
  * Takes a float and boxes it into an mrb_value
  */
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 MRB_INLINE mrb_value mrb_float_value(struct mrb_state *mrb, mrb_float f)
 {
   mrb_value v;
@@ -284,14 +326,19 @@
 }
 
 /**
- * Returns a fixnum in Ruby.
- *
- * Takes an integer and boxes it into an mrb_value
+ * Returns an integer in Ruby.
  */
+MRB_INLINE mrb_value mrb_int_value(struct mrb_state *mrb, mrb_int i)
+{
+  mrb_value v;
+  SET_INT_VALUE(mrb, v, i);
+  return v;
+}
+
 MRB_INLINE mrb_value mrb_fixnum_value(mrb_int i)
 {
   mrb_value v;
-  SET_INT_VALUE(v, i);
+  SET_FIXNUM_VALUE(v, i);
   return v;
 }
 
@@ -362,26 +409,29 @@
   return v;
 }
 
-#if defined(MRB_USE_ETEXT_EDATA) && !defined(MRB_USE_LINK_TIME_RO_DATA_P)
-# ifdef __GNUC__
-#  warning MRB_USE_ETEXT_EDATA is deprecated. Define MRB_USE_LINK_TIME_RO_DATA_P instead.
-# endif
-# define MRB_USE_LINK_TIME_RO_DATA_P
-#endif
-
 #if defined(MRB_USE_CUSTOM_RO_DATA_P)
 /* If you define `MRB_USE_CUSTOM_RO_DATA_P`, you must implement `mrb_ro_data_p()`. */
 mrb_bool mrb_ro_data_p(const char *p);
-#elif defined(MRB_USE_LINK_TIME_RO_DATA_P)
-extern char __ehdr_start;
-extern char __init_array_start;
-
+#elif !defined(MRB_NO_DEFAULT_RO_DATA_P)
+#if defined(MRB_USE_ETEXT_RO_DATA_P)
+#define MRB_LINK_TIME_RO_DATA_P
+extern char etext, edata;
 static inline mrb_bool
 mrb_ro_data_p(const char *p)
 {
-  return __ehdr_start < p && p < __init_array_start;
+  return &etext < p && p < &edata;
 }
-#else
+#elif defined(__APPLE__)
+#define MRB_LINK_TIME_RO_DATA_P
+#include <mach-o/getsect.h>
+static inline mrb_bool
+mrb_ro_data_p(const char *p)
+{
+  return (char*)get_etext() < p && p < (char*)get_edata();
+}
+#endif  /* Linux or macOS */
+#endif  /* MRB_NO_DEFAULT_RO_DATA_P */
+#ifndef MRB_LINK_TIME_RO_DATA_P
 # define mrb_ro_data_p(p) FALSE
 #endif

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

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

@@ -27,7 +27,7 @@
 /*
  * The version of Ruby used by mruby.
  */
-#define MRUBY_RUBY_VERSION "2.0"
+#define MRUBY_RUBY_VERSION "3.1"
 
 /*
  * Ruby engine.
@@ -37,7 +37,7 @@
 /*
  * Major release version number.
  */
-#define MRUBY_RELEASE_MAJOR 2
+#define MRUBY_RELEASE_MAJOR 3
 
 /*
  * Minor release version number.
@@ -47,7 +47,25 @@
 /*
  * Tiny release version number.
  */
-#define MRUBY_RELEASE_TEENY 2
+#define MRUBY_RELEASE_TEENY 0
+
+/*
+ * Patch level.
+ */
+#define MRUBY_PATCHLEVEL -1
+
+/*
+ * Patch level string. (optional)
+ */
+#define MRUBY_PATCHLEVEL_STR ""
+
+#ifndef MRUBY_PATCHLEVEL_STR
+# if MRUBY_PATCHLEVEL < 0
+#   define MRUBY_PATCHLEVEL_STR "dev"
+# else
+#   define MRUBY_PATCHLEVEL_STR "p"MRB_STRINGIZE(MRUBY_PATCHLEVEL)
+# endif
+#endif
 
 /*
  * The mruby version.
@@ -62,17 +80,17 @@
 /*
  * Release year.
  */
-#define MRUBY_RELEASE_YEAR 2020
+#define MRUBY_RELEASE_YEAR 2022
 
 /*
  * Release month.
  */
-#define MRUBY_RELEASE_MONTH 8
+#define MRUBY_RELEASE_MONTH 5
 
 /*
  * Release day.
  */
-#define MRUBY_RELEASE_DAY 6
+#define MRUBY_RELEASE_DAY 12
 
 /*
  * Release date as a string.
@@ -108,6 +126,7 @@
  */
 #define MRUBY_DESCRIPTION     \
   "mruby " MRUBY_VERSION      \
+  MRUBY_PATCHLEVEL_STR        \
   " (" MRUBY_RELEASE_DATE ")" \
 
 /*

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

@@ -1,10 +1,11 @@
-require "mruby-core-ext"
+require "mruby/core_ext"
 require "mruby/build/load_gems"
 require "mruby/build/command"
 
 module MRuby
   autoload :Gem, "mruby/gem"
   autoload :Lockfile, "mruby/lockfile"
+  autoload :Presym, "mruby/presym"
 
   class << self
     def targets
@@ -22,6 +23,18 @@
   class Toolchain
     class << self
       attr_accessor :toolchains
+
+      def guess
+        if cc = ENV"CC" || ENV"CXX"
+          return "clang" if cc.include?("clang")
+        else
+          return "clang" if RUBY_PLATFORM =~ /darwin|(?:free|open)bsd/
+          return "gcc" if RUBY_PLATFORM.include?("cygwin")
+          return "visualcpp" if ENV.include?("VisualStudioVersion")
+          return "visualcpp" if ENV.include?("VSINSTALLDIR")
+        end
+        "gcc"
+      end
     end
 
     def initialize(name, &block)
@@ -29,7 +42,7 @@
       MRuby::Toolchain.toolchains@name = self
     end
 
-    def setup(conf,params={})
+    def setup(conf, params={})
       conf.instance_exec(conf, params, &@initializer)
     end
 
@@ -39,12 +52,27 @@
   class Build
     class << self
       attr_accessor :current
+
+      def mruby_config_path
+        path = ENV'MRUBY_CONFIG' || ENV'CONFIG'
+        if path.nil? || path.empty?
+          path = "#{MRUBY_ROOT}/build_config/default.rb"
+        elsif !File.file?(path) && !Pathname.new(path).absolute?
+          f = "#{MRUBY_ROOT}/build_config/#{path}.rb"
+          path = File.exist?(f) ? f : File.extname(path).empty? ? f : path
+        end
+        path
+      end
+
+      def install_dir
+        @install_dir ||= ENV'INSTALL_DIR' || "#{MRUBY_ROOT}/bin"
+      end
     end
+
     include Rake::DSL
     include LoadGems
-    attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir
-    attr_reader :libmruby_objs, :gems, :toolchains, :gem_dir_to_repo_url
-    attr_writer :enable_bintest, :enable_test
+    attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir, :defines
+    attr_reader :products, :libmruby_core_objs, :libmruby_objs, :gems, :toolchains, :presym, :mrbc_build, :gem_dir_to_repo_url
 
     alias libmruby libmruby_objs
 
@@ -52,16 +80,16 @@
     COMMANDS = COMPILERS + %w(linker archiver yacc gperf git exts mrbc)
     attr_block MRuby::Build::COMMANDS
 
-    Exts = Struct.new(:object, :executable, :library)
+    Exts = Struct.new(:object, :executable, :library, :presym_preprocessed)
 
-    def initialize(name='host', build_dir=nil, &block)
+    def initialize(name='host', build_dir=nil, internal: false, &block)
       @name = name.to_s
 
-      unless MRuby.targets@name
+      unless current = MRuby.targets@name
         if ENV'OS' == 'Windows_NT'
-          @exts = Exts.new('.o', '.exe', '.a')
+          @exts = Exts.new('.o', '.exe', '.a', '.pi')
         else
-          @exts = Exts.new('.o', '', '.a')
+          @exts = Exts.new('.o', '', '.a', '.pi')
         end
 
         build_dir = build_dir || ENV'MRUBY_BUILD_DIR' || "#{MRUBY_ROOT}/build"
@@ -69,10 +97,11 @@
         @file_separator = '/'
         @build_dir = "#{build_dir}/#{@name}"
         @gem_clone_dir = "#{build_dir}/repos/#{@name}"
-        @cc = Command::Compiler.new(self, %w(.c))
-        @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp))
-        @objc = Command::Compiler.new(self, %w(.m))
-        @asm = Command::Compiler.new(self, %w(.S .asm))
+        @defines = 
+        @cc = Command::Compiler.new(self, %w(.c), label: "CC")
+        @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp), label: "CXX")
+        @objc = Command::Compiler.new(self, %w(.m), label: "OBJC")
+        @asm = Command::Compiler.new(self, %w(.S .asm .s), label: "ASM")
         @linker = Command::Linker.new(self)
         @archiver = Command::Archiver.new(self)
         @yacc = Command::Yacc.new(self)
@@ -80,8 +109,12 @@
         @git = Command::Git.new(self)
         @mrbc = Command::Mrbc.new(self)
 
+        @products = 
         @bins = 
-        @gems, @libmruby_objs = MRuby::Gem::List.new, 
+        @gems = MRuby::Gem::List.new
+        @libmruby_core_objs = 
+        @libmruby_objs = @libmruby_core_objs
+        @enable_libmruby = true
         @build_mrbtest_lib_only = false
         @cxx_exception_enabled = false
         @cxx_exception_disabled = false
@@ -89,17 +122,36 @@
         @enable_bintest = false
         @enable_test = false
         @enable_lock = true
+        @enable_presym = true
+        @mrbcfile_external = false
+        @internal = internal
         @toolchains = 
         @gem_dir_to_repo_url = {}
 
-        MRuby.targets@name = self
+        MRuby.targets@name = current = self
+      end
+
+      MRuby::Build.current = current
+      begin
+        current.instance_eval(&block)
+      ensure
+        if current.libmruby_enabled? && !current.mrbcfile_external?
+          if current.presym_enabled?
+            current.create_mrbc_build if current.host? || current.gems"mruby-bin-mrbc"
+          elsif current.host?
+            current.build_mrbc_exec
+          end
+        end
+        current.presym = Presym.new(current) if current.presym_enabled?
       end
+    end
 
-      MRuby::Build.current = MRuby.targets@name
-      MRuby.targets@name.instance_eval(&block)
+    def libmruby_enabled?
+      @enable_libmruby
+    end
 
-      build_mrbc_exec if name == 'host'
-      build_mrbtest if test_enabled?
+    def disable_libmruby
+      @enable_libmruby = false
     end
 
     def debug_enabled?
@@ -118,6 +170,17 @@
       @enable_debug = true
     end
 
+    def presym_enabled?
+      @enable_presym
+    end
+
+    def disable_presym
+      if @enable_presym
+        @enable_presym = false
+        compilers.each{|c| c.defines << "MRB_NO_PRESYM"}
+      end
+    end
+
     def disable_lock
       @enable_lock = false
     end
@@ -141,7 +204,7 @@
       end
       @cxx_exception_enabled = true
       compilers.each { |c|
-        c.defines += %w(MRB_ENABLE_CXX_EXCEPTION)
+        c.defines += %w(MRB_USE_CXX_EXCEPTION)
         c.flags << c.cxx_exception_flag
       }
       linker.command = cxx.command if toolchains.find { |v| v == 'gcc' }
@@ -161,7 +224,7 @@
         raise "cxx_exception already enabled"
       end
       compilers.each { |c|
-        c.defines += %w(MRB_ENABLE_CXX_EXCEPTION MRB_ENABLE_CXX_ABI)
+        c.defines += %w(MRB_USE_CXX_EXCEPTION MRB_USE_CXX_ABI)
         c.flags << c.cxx_compile_flag
         c.flags = c.flags.flatten - c.cxx_invalid_flags.flatten
       }
@@ -169,8 +232,29 @@
       @cxx_abi_enabled = true
     end
 
-    def compile_as_cxx src, cxx_src, obj = nil, includes = 
-      obj = objfile(cxx_src) if obj.nil?
+    def compile_as_cxx(src, cxx_src = nil, obj = nil, includes = )
+      #
+      # If `cxx_src` is specified, this method behaves the same as before as
+      # compatibility mode, but `.d` file is not read.
+      #
+      # If `cxx_src` is omitted, `.d` file is read by using mruby standard
+      # Rake rule (C++ source name is also changed).
+      #
+      if cxx_src
+        obj ||= cxx_src + @exts.object
+        dsts = obj
+        dsts << (cxx_src + @exts.presym_preprocessed) if presym_enabled?
+        defines = 
+        include_paths = "#{MRUBY_ROOT}/src", *includes
+        dsts.each do |dst|
+          file dst => cxx_src do |t|
+            cxx.run t.name, t.prerequisites.first, defines, include_paths
+          end
+        end
+      else
+        cxx_src = "#{build_dir}/#{src.relative_path.to_s.remove_leading_parents}".ext << "-cxx.cxx"
+        obj = cxx_src.ext(@exts.object)
+      end
 
       file cxx_src => src, __FILE__ do |t|
         mkdir_p File.dirname t.name
@@ -178,20 +262,16 @@
 #define __STDC_CONSTANT_MACROS
 #define __STDC_LIMIT_MACROS
 
-#ifndef MRB_ENABLE_CXX_ABI
+#ifndef MRB_USE_CXX_ABI
 extern "C" {
 #endif
 #include "#{File.absolute_path src}"
-#ifndef MRB_ENABLE_CXX_ABI
+#ifndef MRB_USE_CXX_ABI
 }
 #endif
 EOS
       end
 
-      file obj => cxx_src do |t|
-        cxx.run t.name, t.prerequisites.first, , "#{MRUBY_ROOT}/src" + includes
-      end
-
       obj
     end
 
@@ -203,7 +283,7 @@
       @enable_bintest
     end
 
-    def toolchain(name, params={})
+    def toolchain(name=Toolchain.guess, params={})
       name = name.to_s
       tc = Toolchain.toolchainsname || begin
         path = "#{MRUBY_ROOT}/tasks/toolchains/#{name}.rake"
@@ -226,17 +306,14 @@
     def enable_test
       @enable_test = true
     end
+    alias build_mrbtest enable_test
 
     def test_enabled?
       @enable_test
     end
 
-    def build_mrbtest
-      gem :core => 'mruby-test'
-    end
-
     def build_mrbc_exec
-      gem :core => 'mruby-bin-mrbc'
+      gem :core => 'mruby-bin-mrbc' unless @gems'mruby-bin-mrbc'
     end
 
     def locks
@@ -246,9 +323,26 @@
     def mrbcfile
       return @mrbcfile if @mrbcfile
 
-      mrbc_build = MRuby.targets'host'
-      gems.each { |v| mrbc_build = self if v.name == 'mruby-bin-mrbc' }
-      @mrbcfile = mrbc_build.exefile("#{mrbc_build.build_dir}/bin/mrbc")
+      gem_name = "mruby-bin-mrbc"
+      if (gem = @gemsgem_name)
+        @mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
+      elsif !host? && (host = MRuby.targets"host")
+        if (gem = host.gemsgem_name)
+          @mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
+        elsif host.mrbcfile_external?
+          @mrbcfile = host.mrbcfile
+        end
+      end
+      @mrbcfile || fail("external mrbc or mruby-bin-mrbc gem in current('#{@name}') or 'host' build is required")
+    end
+
+    def mrbcfile=(path)
+      @mrbcfile = path
+      @mrbcfile_external = true
+    end
+
+    def mrbcfile_external?
+      @mrbcfile_external
     end
 
     def compilers
@@ -259,15 +353,27 @@
 
     def define_rules
       compilers.each do |compiler|
-        if respond_to?(:enable_gems?) && enable_gems?
-          compiler.defines -= %w(DISABLE_GEMS)
-        else
-          compiler.defines += %w(DISABLE_GEMS)
-        end
-        compiler.define_rules build_dir, File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+        compiler.defines << "MRB_NO_GEMS" unless enable_gems? && libmruby_enabled?
+      end
+      @cc, *(@cxx if cxx_exception_enabled?).each do |compiler|
+        compiler.define_rules(@build_dir, MRUBY_ROOT, @exts.object)
+        compiler.define_rules(@build_dir, MRUBY_ROOT, @exts.presym_preprocessed) if presym_enabled?
       end
     end
 
+    def define_installer(src)
+      dst = "#{self.class.install_dir}/#{File.basename(src)}"
+      file dst => src do
+        install_D src, dst
+      end
+      dst
+    end
+
+    def define_installer_if_needed(bin)
+      exe = exefile("#{build_dir}/bin/#{bin}")
+      host? ? define_installer(exe) : exe
+    end
+
     def filename(name)
       if name.is_a?(Array)
         name.flatten.map { |n| filename(n) }
@@ -326,7 +432,9 @@
       puts ">>> Bintest #{name} <<<"
       targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir }
       targets << filename(".") if File.directory? "./bintest"
-      sh "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
+      mrbc = @gems"mruby-bin-mrbc" ? exefile("#{@build_dir}/bin/mrbc") : mrbcfile
+      env = {"BUILD_DIR" => @build_dir, "MRBCFILE" => mrbc}
+      sh env, "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
     end
 
     def print_build_summary
@@ -359,6 +467,42 @@
     def libraries
       libmruby_static
     end
+
+    def host?
+      @name == "host"
+    end
+
+    def internal?
+      @internal
+    end
+
+    protected
+
+    attr_writer :presym
+
+    def create_mrbc_build
+      exclusions = %i@name @build_dir @gems @enable_test @enable_bintest @internal
+      name = "#{@name}/mrbc"
+      MRuby.targets.delete(name)
+      build = self.class.new(name, internal: true){}
+      build.build_dir = "#{@build_dir}/mrbc"
+      instance_variables.each do |n|
+        next if exclusions.include?(n)
+        v = instance_variable_get(n)
+        v = case v
+            when nil, true, false, Numeric; v
+            when String, Command; v.clone
+            else Marshal.load(Marshal.dump(v))  # deep clone
+            end
+        build.instance_variable_set(n, v)
+      end
+      build.build_mrbc_exec
+      build.disable_libmruby
+      build.disable_presym
+      @mrbc_build = build
+      self.mrbcfile = build.mrbcfile
+      build
+    end
   end # Build
 
   class CrossBuild < Build
@@ -369,13 +513,21 @@
     attr_accessor :host_target, :build_target
 
     def initialize(name, build_dir=nil, &block)
-      @endian = nil
       @test_runner = Command::CrossTestRunner.new(self)
       super
+      unless mrbcfile_external? || MRuby.targets'host'
+        # add minimal 'host'
+        MRuby::Build.new('host') do |conf|
+          conf.toolchain
+          conf.build_mrbc_exec
+          conf.disable_libmruby
+          conf.disable_presym
+        end
+      end
     end
 
     def mrbcfile
-      MRuby.targets'host'.exefile("#{MRuby.targets'host'.build_dir}/bin/mrbc")
+      mrbcfile_external? ? super : MRuby::targets'host'.mrbcfile
     end
 
     def run_test
@@ -388,5 +540,26 @@
         @test_runner.run(mrbtest)
       end
     end
+
+    def run_bintest
+      puts ">>> Bintest #{name} <<<"
+      targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir }
+      targets << filename(".") if File.directory? "./bintest"
+      mrbc = @gems"mruby-bin-mrbc" ? exefile("#{@build_dir}/bin/mrbc") : mrbcfile
+
+      emulator = @test_runner.command
+      emulator = @test_runner.shellquote(emulator) if emulator
+
+      env = {
+        "BUILD_DIR" => @build_dir,
+        "MRBCFILE" => mrbc,
+        "EMULATOR" => @test_runner.emulator,
+      }
+      sh env, "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
+    end
+
+    protected
+
+    def create_mrbc_build; end
   end # CrossBuild
 end # MRuby

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

@@ -32,39 +32,39 @@
       end
     end
 
-    NotFoundCommands = {}
-
     private
     def _run(options, params={})
-      return sh command + ' ' + ( options % params ) if NotFoundCommands.key? @command
-      begin
-        sh build.filename(command) + ' ' + ( options % params )
-      rescue RuntimeError
-        NotFoundCommands@command = true
-        _run options, params
-      end
+      sh "#{build.filename(command)} #{options % params}"
     end
   end
 
   class Command::Compiler < Command
-    attr_accessor :flags, :include_paths, :defines, :source_exts
+    attr_accessor :label, :flags, :include_paths, :defines, :source_exts
     attr_accessor :compile_options, :option_define, :option_include_path, :out_ext
     attr_accessor :cxx_compile_flag, :cxx_exception_flag, :cxx_invalid_flags
+    attr_writer :preprocess_options
 
-    def initialize(build, source_exts=)
+    def initialize(build, source_exts=, label: "CC")
       super(build)
       @command = ENV'CC' || 'cc'
+      @label = label
       @flags = ENV'CFLAGS' || 
       @source_exts = source_exts
       @include_paths = "#{MRUBY_ROOT}/include"
-      @defines = %w()
+      @defines = 
       @option_include_path = %q-I"%s"
       @option_define = %q-D"%s"
       @compile_options = %q%{flags} -o "%{outfile}" -c "%{infile}"
       @cxx_invalid_flags = 
+      @out_ext = build.exts.object
     end
 
     alias header_search_paths include_paths
+
+    def preprocess_options
+      @preprocess_options ||= @compile_options.sub(/(?:\A|\s)\K-c(?=\s)/, "-E -P")
+    end
+
     def search_header_path(name)
       header_search_paths.find do |v|
         File.exist? build.filename("#{v}/#{name}").sub(/^"(.*)"$/, '\1')
@@ -77,7 +77,7 @@
     end
 
     def all_flags(_defines=, _include_paths=, _flags=)
-      define_flags = defines, _defines.flatten.map{ |d| option_define % d }
+      define_flags = defines, _defines, build.defines.flatten.map{ |d| option_define % d }
       include_path_flags = include_paths, _include_paths.flatten.map do |f|
         option_include_path % filename(f)
       end
@@ -86,20 +86,27 @@
 
     def run(outfile, infile, _defines=, _include_paths=, _flags=)
       mkdir_p File.dirname(outfile)
-      _pp "CC", infile.relative_path, outfile.relative_path
-      _run compile_options, { :flags => all_flags(_defines, _include_paths, _flags),
-                              :infile => filename(infile), :outfile => filename(outfile) }
+      flags = all_flags(_defines, _include_paths, _flags)
+      if object_ext?(outfile)
+        label = @label
+        opts = compile_options
+      else
+        label = "CPP"
+        opts = preprocess_options
+        flags << " -DMRB_PRESYM_SCANNING"
+      end
+      _pp label, infile.relative_path, outfile.relative_path
+      _run opts, flags: flags, infile: filename(infile), outfile: filename(outfile)
     end
 
-    def define_rules(build_dir, source_dir='')
-      @out_ext = build.exts.object
+    def define_rules(build_dir, source_dir='', out_ext=build.exts.object)
       gemrake = File.join(source_dir, "mrbgem.rake")
       rakedep = File.exist?(gemrake) ?  gemrake  : 
 
       if build_dir.include? "mrbgems/"
-        generated_file_matcher = Regexp.new("^#{Regexp.escape build_dir}/(.*)#{Regexp.escape out_ext}$")
+        generated_file_matcher = Regexp.new("^#{Regexp.escape build_dir}/(?!mrbc/)(.*)#{Regexp.escape out_ext}$")
       else
-        generated_file_matcher = Regexp.new("^#{Regexp.escape build_dir}/(?!mrbgems/.+/)(.*)#{Regexp.escape out_ext}$")
+        generated_file_matcher = Regexp.new("^#{Regexp.escape build_dir}/(?!mrbc/|mrbgems/.+/)(.*)#{Regexp.escape out_ext}$")
       end
       source_exts.each do |ext, compile|
         rule generated_file_matcher => 
@@ -133,18 +140,14 @@
     #
     # ==== Without <tt>-MP</tt> compiler flag
     #
-    #   /build/host/src/array.o: \
-    #     /src/array.c \
-    #     /include/mruby/common.h \
-    #     /include/mruby/value.h \
+    #   /build/host/src/array.o: /src/array.c \
+    #     /include/mruby/common.h /include/mruby/value.h \
     #     /src/value_array.h
     #
     # ==== With <tt>-MP</tt> compiler flag
     #
-    #   /build/host/src/array.o: \
-    #     /src/array.c \
-    #     /include/mruby/common.h \
-    #     /include/mruby/value.h \
+    #   /build/host/src/array.o: /src/array.c \
+    #     /include/mruby/common.h /include/mruby/value.h \
     #     /src/value_array.h
     #
     #   /include/mruby/common.h:
@@ -154,14 +157,25 @@
     #   /src/value_array.h:
     #
     def get_dependencies(file)
-      file = file.ext('d') unless File.extname(file) == '.d'
-      deps = 
-      if File.exist?(file)
-        File.foreach(file){|line| deps << $1 if /^ +(.*?)(?: *\\)?$/ =~ line}
-        deps.uniq!
-      end
+      dep_file = file.ext(".d")
+      return MRUBY_CONFIG unless object_ext?(file) && File.exist?(dep_file)
+
+      deps = File.read(dep_file).gsub("\\\n ", "").split("\n").map do |dep_line|
+        # dep_line:
+        # - "/build/host/src/array.o:   /src/array.c   /include/mruby/common.h ..."
+        # - ""
+        # - "/include/mruby/common.h:"
+        dep_line.scan(/^\S+:\s+(.+)$/).flatten.map { |s| s.split(' ') }.flatten
+        # => "/src/array.c", "/include/mruby/common.h" , ...
+        #    
+        #    
+      end.flatten.uniq
       deps << MRUBY_CONFIG
     end
+
+    def object_ext?(path)
+      File.extname(path) == build.exts.object
+    end
   end
 
   class Command::Linker < Command
@@ -191,6 +205,10 @@
       libraries, _libraries.flatten.map{ |d| option_library % d }.join(' ')
     end
 
+    def run_attrs
+      @libraries, @library_paths, @flags, @flags_before_libraries, @flags_after_libraries
+    end
+
     def run(outfile, objfiles, _libraries=, _library_paths=, _flags=, _flags_before_libraries=, _flags_after_libraries=)
       mkdir_p File.dirname(outfile)
       library_flags = libraries, _libraries.flatten.map { |d| option_library % d }
@@ -259,7 +277,7 @@
     def initialize(build)
       super
       @command = 'git'
-      @flags = %w
+      @flags = 
       @clone_options = "clone %{flags} %{url} %{dir}"
       @pull_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} pull"
       @checkout_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} checkout %{checksum_hash}"
@@ -310,21 +328,24 @@
       @compile_options = "-B%{funcname} -o-"
     end
 
-    def run(out, infiles, funcname)
+    def run(out, infiles, funcname, cdump: true, static: false)
       @command ||= @build.mrbcfile
       infiles = infiles.flatten
-      infiles.each do |f|
-        _pp "MRBC", f.relative_path, nil, :indent => 2
+      infiles.each_with_index do |f, i|
+        _pp i == 0 ? "MRBC" : "", f.relative_path, indent: 2
       end
-      cmd = %Q"#{filename @command}" #{@compile_options % {:funcname => funcname}} #{filename(infiles).map{|f| %Q"#{f}"}.join(' ')}
+      opt = @compile_options % {funcname: funcname}
+      opt << " -S" if cdump
+      opt << " -s" if static
+      cmd = %"#{filename @command}" #{opt} #{filename(infiles).map{|f| %"#{f}"}.join(' ')}
       puts cmd if Rake.verbose
       IO.popen(cmd, 'r+') do |io|
         out.puts io.read
       end
       # if mrbc execution fail, drop the file
-      if $?.exitstatus != 0
-        File.delete(out.path)
-        exit(-1)
+      unless $?.success?
+        rm_f out.path
+        fail "Command failed with status (#{$?.exitstatus}): #{cmd0,42}..."
       end
     end
   end
@@ -342,6 +363,11 @@
       @flags = 
     end
 
+    def emulator
+      return "" unless @command
+      return @command, *@flags.map{|c| shellquote(c)}.join(' ')
+    end
+
     def run(testbinfile)
       puts "TEST for " + @build.name
       _run runner_options, { :flags => flags, verbose_flag.flatten.join(' '), :infile => testbinfile }

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

@@ -15,10 +15,13 @@
     def gem(gemdir, &block)
       if gemdir.is_a?(Hash)
         gemdir = load_special_path_gem(gemdir)
-      elsif GemBox.path && gemdir.is_a?(String)
+      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
 
@@ -28,18 +31,17 @@
       Gem.current = nil
       load gemrake
       return nil unless Gem.current
+      current = Gem.current
 
-      Gem.current.dir = gemdir
-      Gem.current.build = self.is_a?(MRuby::Build) ? self : MRuby::Build.current
-      Gem.current.build_config_initializer = block
-      gems << Gem.current
+      current.dir = gemdir
+      current.build = self.is_a?(MRuby::Build) ? self : MRuby::Build.current
+      current.build_config_initializer = block
+      gems << current
 
-      cxx_srcs = 'src', 'test', 'tools'.map do |subdir|
-        Dir.glob("#{Gem.current.dir}/#{subdir}/*.{cpp,cxx,cc}")
-      end.flatten
+      cxx_srcs = Dir.glob("#{current.dir}/{src,test,tools}/*.{cpp,cxx,cc}")
       enable_cxx_exception unless cxx_srcs.empty?
 
-      Gem.current
+      current
     end
 
     def load_special_path_gem(params)
@@ -98,7 +100,7 @@
           options = params:options || 
           options << "--recursive"
           options << "--branch \"#{branch}\""
-          options << "--depth 1" unless params:checksum_hash
+          options << "--depth 1" unless params:checksum_hash || lock
           mkdir_p "#{gem_clone_dir}"
           git.run_clone gemdir, url, options

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/lib/mruby/core_ext.rb Added

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

@@ -7,7 +7,6 @@
     class << self
       attr_accessor :current
     end
-    LinkerConfig = Struct.new(:libraries, :library_paths, :flags, :flags_before_libraries, :flags_after_libraries)
 
     class Specification
       include Rake::DSL
@@ -17,7 +16,6 @@
       attr_accessor :name, :dir, :build
       alias mruby build
       attr_accessor :build_config_initializer
-      attr_accessor :mrblib_dir, :objs_dir
 
       attr_accessor :version
       attr_accessor :description, :summary
@@ -27,8 +25,8 @@
       alias :author= :authors=
 
       attr_accessor :rbfiles, :objs
-      attr_accessor :test_objs, :test_rbfiles, :test_args
-      attr_accessor :test_preload
+      attr_writer :test_objs, :test_rbfiles
+      attr_accessor :test_args, :test_preload
 
       attr_accessor :bins
 
@@ -45,37 +43,30 @@
         @name = name
         @initializer = block
         @version = "0.0.0"
-        @mrblib_dir = "mrblib"
-        @objs_dir = "src"
+        @dependencies = 
+        @conflicts = 
         MRuby::Gem.current = self
       end
 
       def setup
-        return if defined?(@linker)  # return if already set up
+        return if defined?(@bins)  # return if already set up
 
         MRuby::Gem.current = self
         MRuby::Build::COMMANDS.each do |command|
           instance_variable_set("@#{command}", @build.send(command).clone)
         end
-        @linker = LinkerConfig.new(, , , , )
+        @linker.run_attrs.each(&:clear)
 
-        @rbfiles = Dir.glob("#{@dir}/#{@mrblib_dir}/**/*.rb").sort
-        @objs = Dir.glob("#{@dir}/#{@objs_dir}/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
-          objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X"))
-        end
+        @rbfiles = Dir.glob("#{@dir}/mrblib/**/*.rb").sort
+        @objs = srcs_to_objs("src")
 
-        @test_rbfiles = Dir.glob("#{dir}/test/**/*.rb").sort
-        @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
-          objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X"))
-        end
-        @custom_test_init = !@test_objs.empty?
         @test_preload = nil # 'test/assert.rb'
         @test_args = {}
 
         @bins = 
+        @cdump = true
 
         @requirements = 
-        @dependencies, @conflicts = , 
         @export_include_paths = 
         @export_include_paths << "#{dir}/include" if File.directory? "#{dir}/include"
 
@@ -97,10 +88,11 @@
       end
 
       def setup_compilers
-        compilers.each do |compiler|
-          compiler.define_rules build_dir, "#{dir}"
+        (core? ? @cc, *(@cxx if build.cxx_exception_enabled?) : compilers).each do |compiler|
+          compiler.define_rules build_dir, @dir, @build.exts.presym_preprocessed if build.presym_enabled?
+          compiler.define_rules build_dir, @dir, @build.exts.object
           compiler.defines << %QMRBGEM_#{funcname.upcase}_VERSION=#{version}
-          compiler.include_paths << "#{dir}/include" if File.directory? "#{dir}/include"
+          compiler.include_paths << "#{@dir}/include" if File.directory? "#{@dir}/include"
         end
 
         define_gem_init_builder if @generate_functions
@@ -115,6 +107,22 @@
         return false
       end
 
+      def disable_cdump
+        @cdump = false
+      end
+
+      def cdump?
+        build.presym_enabled? && @cdump
+      end
+
+      def core?
+        @dir.start_with?("#{MRUBY_ROOT}/mrbgems/")
+      end
+
+      def bin?
+        @bins.size > 0
+      end
+
       def add_dependency(name, *requirements)
         default_gem = requirements.last.kind_of?(Hash) ? requirements.pop : nil
         requirements = '>= 0.0.0' if requirements.empty?
@@ -138,6 +146,14 @@
         "#{build_dir}/gem_test.c"
       end
 
+      def test_objs
+        @test_objs ||= srcs_to_objs("test")
+      end
+
+      def test_rbfiles
+        @test_rbfiles ||= Dir"#{@dir}/test/**/*.rb".sort!
+      end
+
       def search_package(name, version_query=nil)
         package_query = name
         package_query += " #{version_query}" if version_query
@@ -163,8 +179,14 @@
         end
       end
 
+      def srcs_to_objs(src_dir_from_gem_dir)
+        exts = compilers.flat_map{|c| c.source_exts} * ","
+        Dir"#{@dir}/#{src_dir_from_gem_dir}/*{#{exts}}".map do |f|
+          objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X"))
+        end
+      end
+
       def define_gem_init_builder
-        file objfile("#{build_dir}/gem_init") =>  "#{build_dir}/gem_init.c", File.join(dir, "mrbgem.rake") 
         file "#{build_dir}/gem_init.c" => build.mrbcfile, __FILE__ + rbfiles.flatten do |t|
           mkdir_p build_dir
           generate_gem_init("#{build_dir}/gem_init.c")
@@ -172,22 +194,38 @@
       end
 
       def generate_gem_init(fname)
+        _pp "GEN", fname.relative_path
         open(fname, 'w') do |f|
           print_gem_init_header f
-          build.mrbc.run f, rbfiles, "gem_mrblib_irep_#{funcname}" unless rbfiles.empty?
+          unless rbfiles.empty?
+            opts = {cdump: cdump?, static: true}
+            if cdump?
+              build.mrbc.run f, rbfiles, "gem_mrblib_#{funcname}_proc", **opts
+            else
+              build.mrbc.run f, rbfiles, "gem_mrblib_irep_#{funcname}", **opts
+            end
+          end
           f.puts %Qvoid mrb_#{funcname}_gem_init(mrb_state *mrb);
           f.puts %Qvoid mrb_#{funcname}_gem_final(mrb_state *mrb);
           f.puts %Q
           f.puts %Qvoid GENERATED_TMP_mrb_#{funcname}_gem_init(mrb_state *mrb) {
           f.puts %Q  int ai = mrb_gc_arena_save(mrb);
+          f.puts %Q  gem_mrblib_#{funcname}_proc_init_syms(mrb); if !rbfiles.empty? && cdump?
           f.puts %Q  mrb_#{funcname}_gem_init(mrb); if objs != objfile("#{build_dir}/gem_init")
           unless rbfiles.empty?
-            f.puts %Q  mrb_load_irep(mrb, gem_mrblib_irep_#{funcname});
+            if cdump?
+              f.puts %Q  mrb_load_proc(mrb, gem_mrblib_#{funcname}_proc);
+            else
+              f.puts %Q  mrb_load_irep(mrb, gem_mrblib_irep_#{funcname});
+            end
             f.puts %Q  if (mrb->exc) {
             f.puts %Q    mrb_print_error(mrb);
             f.puts %Q    mrb_close(mrb);
             f.puts %Q    exit(EXIT_FAILURE);
             f.puts %Q  }
+            f.puts %Q  struct REnv *e = mrb_vm_ci_env(mrb->c->cibase);
+            f.puts %Q  mrb_vm_ci_env_set(mrb->c->cibase, NULL);
+            f.puts %Q  mrb_env_unshare(mrb, e);
           end
           f.puts %Q  mrb_gc_arena_restore(mrb, ai);
           f.puts %Q}
@@ -211,9 +249,15 @@
 
       def print_gem_init_header(f)
         print_gem_comment(f)
-        f.puts %Q#include <stdlib.h> unless rbfiles.empty?
-        f.puts %Q#include <mruby.h>
-        f.puts %Q#include <mruby/irep.h> unless rbfiles.empty?
+        if rbfiles.empty?
+          f.puts %Q#include <mruby.h>
+        else
+          f.puts %Q#include <stdlib.h>
+          unless cdump?
+            f.puts %Q#include <mruby.h>
+            f.puts %Q#include <mruby/proc.h>
+          end
+        end
       end
 
       def print_gem_test_header(f)
@@ -226,12 +270,8 @@
         f.puts %Q#include <mruby/hash.h> unless test_args.empty?
       end
 
-      def test_dependencies
-        @name
-      end
-
       def custom_test_init?
-        @custom_test_init
+        !test_objs.empty?
       end
 
       def version_ok?(req_versions)
@@ -323,6 +363,10 @@
         @ary.each(&b)
       end
 
+      def (name)
+        @ary.detect {|g| g.name == name}
+      end
+
       def <<(gem)
         unless @ary.detect {|g| g.dir == gem.dir }
           @ary << gem
@@ -456,6 +500,12 @@
           end
         end
       end
+
+      def linker_attrs(gem=nil)
+        gems = self.reject{|g| g.bin?}  # library gems
+        gems << gem unless gem.nil?
+        gems.map{|g| g.linker.run_attrs}.transpose
+      end
     end # List
   end # Gem

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

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

@@ -0,0 +1,130 @@
+module MRuby
+  class Presym
+    OPERATORS = {
+      "!" => "not",
+      "%" => "mod",
+      "&" => "and",
+      "*" => "mul",
+      "+" => "add",
+      "-" => "sub",
+      "/" => "div",
+      "<" => "lt",
+      ">" => "gt",
+      "^" => "xor",
+      "`" => "tick",
+      "|" => "or",
+      "~" => "neg",
+      "!=" => "neq",
+      "!~" => "nmatch",
+      "&&" => "andand",
+      "**" => "pow",
+      "+@" => "plus",
+      "-@" => "minus",
+      "<<" => "lshift",
+      "<=" => "le",
+      "==" => "eq",
+      "=~" => "match",
+      ">=" => "ge",
+      ">>" => "rshift",
+      "" => "aref",
+      "||" => "oror",
+      "<=>" => "cmp",
+      "===" => "eqq",
+      "=" => "aset",
+    }.freeze
+
+    SYMBOL_TO_MACRO = {
+    #      Symbol      =>      Macro
+    # prefix, suffix => prefix, suffix
+      "@@"  , ""     => "CV"  , ""    ,
+      "@"   , ""     => "IV"  , ""    ,
+      ""    , "!"    => ""    , "_B"  ,
+      ""    , "?"    => ""    , "_Q"  ,
+      ""    , "="    => ""    , "_E"  ,
+      ""    , ""     => ""    , ""    ,
+    }.freeze
+
+    C_STR_LITERAL_RE = /"(?:^\\\"|\\.)*"/
+
+    def initialize(build)
+      @build = build
+    end
+
+    def scan(paths)
+      presym_hash = {}
+      paths.each {|path| read_preprocessed(presym_hash, path)}
+      presym_hash.keys.sort_by!{|sym| c_literal_size(sym), sym}
+    end
+
+    def read_list
+      File.readlines(list_path, mode: "r:binary").each(&:chomp!)
+    end
+
+    def write_list(presyms)
+      _pp "GEN", list_path.relative_path
+      File.binwrite(list_path, presyms.join("\n") << "\n")
+    end
+
+    def write_id_header(presyms)
+      prefix_re = Regexp.union(*SYMBOL_TO_MACRO.keys.map(&:first).uniq)
+      suffix_re = Regexp.union(*SYMBOL_TO_MACRO.keys.map(&:last).uniq)
+      sym_re = /\A(#{prefix_re})?(\w&&\D\w*)(#{suffix_re})?\z/o
+      _pp "GEN", id_header_path.relative_path
+      File.open(id_header_path, "w:binary") do |f|
+        f.puts "enum mruby_presym {"
+        presyms.each.with_index(1) do |sym, num|
+          if sym_re =~ sym && (affixes = SYMBOL_TO_MACRO$1, $3)
+            f.puts "  MRB_#{affixes * 'SYM'}__#{$2} = #{num},"
+          elsif name = OPERATORSsym
+            f.puts "  MRB_OPSYM__#{name} = #{num},"
+          end
+        end
+        f.puts "};"
+        f.puts
+        f.puts "#define MRB_PRESYM_MAX #{presyms.size}"
+      end
+    end
+
+    def write_table_header(presyms)
+      _pp "GEN", table_header_path.relative_path
+      File.open(table_header_path, "w:binary") do |f|
+        f.puts "static const uint16_t presym_length_table = {"
+        presyms.each{|sym| f.puts "  #{sym.bytesize},\t/* #{sym} */"}
+        f.puts "};"
+        f.puts
+        f.puts "static const char * const presym_name_table = {"
+        presyms.each{|sym| f.puts %|  "#{sym}",|}
+        f.puts "};"
+      end
+    end
+
+    def list_path
+      @list_path ||= "#{@build.build_dir}/presym".freeze
+    end
+
+    def header_dir;
+      @header_dir ||= "#{@build.build_dir}/include/mruby/presym".freeze
+    end
+
+    def id_header_path
+      @id_header_path ||= "#{header_dir}/id.h".freeze
+    end
+
+    def table_header_path
+      @table_header_path ||= "#{header_dir}/table.h".freeze
+    end
+
+    private
+
+    def read_preprocessed(presym_hash, path)
+      File.binread(path).scan(/<@! (.*?) !@>/) do |part,|
+        literals = part.scan(C_STR_LITERAL_RE)
+        presym_hashliterals.map{|l| l1..-2}.join = true unless literals.empty?
+      end
+    end
+
+    def c_literal_size(literal_without_quote)
+      literal_without_quote.size  # TODO: consider escape sequence
+    end
+  end
+end

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/minirake -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/minirake Changed

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/default-no-fpu.gembox Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/default-no-stdio.gembox Added

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

@@ -1,79 +1,12 @@
 MRuby::GemBox.new do |conf|
-  # Meta-programming features
-  conf.gem :core => "mruby-metaprog"
+  conf.gembox "stdlib"
+  conf.gembox "stdlib-ext"
+  conf.gembox "stdlib-io"
+  conf.gembox "math"
+  conf.gembox "metaprog"
 
-  # Use standard IO/File class
-  conf.gem :core => "mruby-io"
-
-  # Use standard Array#pack, String#unpack methods
-  conf.gem :core => "mruby-pack"
-
-  # Use standard Kernel#sprintf method
-  conf.gem :core => "mruby-sprintf"
-
-  # Use standard print/puts/p
-  conf.gem :core => "mruby-print"
-
-  # Use standard Math module
-  conf.gem :core => "mruby-math"
-
-  # Use standard Time class
-  conf.gem :core => "mruby-time"
-
-  # Use standard Struct class
-  conf.gem :core => "mruby-struct"
-
-  # Use Comparable module extension
-  conf.gem :core => "mruby-compar-ext"
-
-  # Use Enumerable module extension
-  conf.gem :core => "mruby-enum-ext"
-
-  # Use String class extension
-  conf.gem :core => "mruby-string-ext"
-
-  # Use Numeric class extension
-  conf.gem :core => "mruby-numeric-ext"
-
-  # Use Array class extension
-  conf.gem :core => "mruby-array-ext"
-
-  # Use Hash class extension
-  conf.gem :core => "mruby-hash-ext"
-
-  # Use Range class extension
-  conf.gem :core => "mruby-range-ext"
-
-  # Use Proc class extension
-  conf.gem :core => "mruby-proc-ext"
-
-  # Use Symbol class extension
-  conf.gem :core => "mruby-symbol-ext"
-
-  # Use Random class
-  conf.gem :core => "mruby-random"
-
-  # Use Object class extension
-  conf.gem :core => "mruby-object-ext"
-
-  # Use ObjectSpace class
-  conf.gem :core => "mruby-objectspace"
-
-  # Use Fiber class
-  conf.gem :core => "mruby-fiber"
-
-  # Use Enumerator class (require mruby-fiber)
-  conf.gem :core => "mruby-enumerator"
-
-  # Use Enumerator::Lazy class (require mruby-enumerator)
-  conf.gem :core => "mruby-enum-lazy"
-
-  # Use toplevel object (main) methods extension
-  conf.gem :core => "mruby-toplevel-ext"
-
-  # Use Rational/Complex numbers
-  conf.gem :core => "mruby-rational"
-  conf.gem :core => "mruby-complex"
+  # Generate mrbc command
+  conf.gem :core => "mruby-bin-mrbc"
 
   # Generate mirb command
   conf.gem :core => "mruby-bin-mirb"
@@ -84,18 +17,6 @@
   # Generate mruby-strip command
   conf.gem :core => "mruby-bin-strip"
 
-  # Use Kernel module extension
-  conf.gem :core => "mruby-kernel-ext"
-
-  # Use class/module extension
-  conf.gem :core => "mruby-class-ext"
-
-  # Use Method/UnboundMethod class
-  conf.gem :core => "mruby-method"
-
-  # Use eval()
-  conf.gem :core => "mruby-eval"
-
-  # Use mruby-compiler to build other mrbgems
-  conf.gem :core => "mruby-compiler"
+  # Generate mruby-config command
+  conf.gem :core => "mruby-bin-config"
 end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/full-core.gembox -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/full-core.gembox Changed

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/metaprog.gembox Added

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

@@ -51,7 +51,7 @@
   #    b.uniq { |s| s.first } # => "student", "sam", "teacher", "matz"
   #
   def uniq(&block)
-    ary = self.dup
+    ary = self0..-1
     ary.uniq!(&block)
     ary
   end
@@ -150,7 +150,7 @@
   #     1, 1, 3, 5  &  1, 2, 3    #=>  1, 3 
   #
   def &(elem)
-    raise TypeError, "can't convert #{elem.class} into Array" unless elem.class == Array
+    raise TypeError, "cannot convert #{elem.class} into Array" unless elem.class == Array
 
     hash = {}
     array = 
@@ -193,6 +193,47 @@
 
   ##
   # call-seq:
+  #   ary.intersect?(other_ary)   -> true or false
+  #
+  # Returns +true+ if the array and +other_ary+ have at least one element in
+  # common, otherwise returns +false+.
+  #
+  #    a =  1, 2, 3 
+  #    b =  3, 4, 5 
+  #    c =  5, 6, 7 
+  #    a.intersect?(b)   #=> true
+  #    a.intersect?(c)   #=> false
+  def intersect?(ary)
+    raise TypeError, "cannot convert #{ary.class} into Array" unless ary.class == Array
+
+    hash = {}
+    if self.length > ary.length
+      shorter = ary
+      longer = self
+    else
+      shorter = self
+      longer = ary
+    end
+    idx = 0
+    len = shorter.size
+    while idx < len
+      hashshorteridx = true
+      idx += 1
+    end
+    idx = 0
+    len = size
+    while idx < len
+      v = longeridx
+      if hashv
+        return true
+      end
+      idx += 1
+    end
+    false
+  end
+
+  ##
+  # call-seq:
   #    ary.flatten -> new_ary
   #    ary.flatten(level) -> new_ary
   #
@@ -209,7 +250,7 @@
   #    a.flatten(1)              #=> 1, 2, 3, 4, 5
   #
   def flatten(depth=nil)
-    res = dup
+    res = Array.new(self)
     res.flatten! depth
     res
   end
@@ -253,41 +294,6 @@
     end
   end
 
-  ##
-  # call-seq:
-  #    ary.compact     -> new_ary
-  #
-  # Returns a copy of +self+ with all +nil+ elements removed.
-  #
-  #     "a", nil, "b", nil, "c", nil .compact
-  #                      #=>  "a", "b", "c" 
-  #
-  def compact
-    result = self.dup
-    result.compact!
-    result
-  end
-
-  ##
-  # call-seq:
-  #    ary.compact!    -> ary  or  nil
-  #
-  # Removes +nil+ elements from the array.
-  # Returns +nil+ if no changes were made, otherwise returns
-  # <i>ary</i>.
-  #
-  #     "a", nil, "b", nil, "c" .compact! #=>  "a", "b", "c" 
-  #     "a", "b", "c" .compact!           #=> nil
-  #
-  def compact!
-    result = self.select { |e| !e.nil? }
-    if result.size == self.size
-      nil
-    else
-      self.replace(result)
-    end
-  end
-
   # for efficiency
   def reverse_each(&block)
     return to_enum :reverse_each unless block
@@ -325,7 +331,7 @@
   #
 
   def fetch(n, ifnone=NONE, &block)
-    warn "block supersedes default value argument" if !n.nil? && ifnone != NONE && block
+    #warn "block supersedes default value argument" if !n.nil? && ifnone != NONE && block
 
     idx = n
     if idx < 0
@@ -376,11 +382,10 @@
 
   def fill(arg0=nil, arg1=nil, arg2=nil, &block)
     if arg0.nil? && arg1.nil? && arg2.nil? && !block
-      raise ArgumentError, "wrong number of arguments (0 for 1..3)"
+      raise ArgumentError, "wrong number of arguments (given 0, expected 1..3)"
     end
 
     beg = len = 0
-    ary = 
     if block
       if arg0.nil? && arg1.nil? && arg2.nil?
         # ary.fill { |index| block }                    -> ary
@@ -444,57 +449,6 @@
 
   ##
   #  call-seq:
-  #     ary.rotate(count=1)    -> new_ary
-  #
-  #  Returns a new array by rotating +self+ so that the element at +count+ is
-  #  the first element of the new array.
-  #
-  #  If +count+ is negative then it rotates in the opposite direction, starting
-  #  from the end of +self+ where +-1+ is the last element.
-  #
-  #     a =  "a", "b", "c", "d" 
-  #     a.rotate         #=> "b", "c", "d", "a"
-  #     a                #=> "a", "b", "c", "d"
-  #     a.rotate(2)      #=> "c", "d", "a", "b"
-  #     a.rotate(-3)     #=> "b", "c", "d", "a"
-
-  def rotate(count=1)
-    ary = 
-    len = self.length
-
-    if len > 0
-      idx = (count < 0) ? (len - (~count % len) - 1) : (count % len) # rotate count
-      len.times do
-        ary << selfidx
-        idx += 1
-        idx = 0 if idx > len-1
-      end
-    end
-    ary
-  end
-
-  ##
-  #  call-seq:
-  #     ary.rotate!(count=1)   -> ary
-  #
-  #  Rotates +self+ in place so that the element at +count+ comes first, and
-  #  returns +self+.
-  #
-  #  If +count+ is negative then it rotates in the opposite direction, starting
-  #  from the end of the array where +-1+ is the last element.
-  #
-  #     a =  "a", "b", "c", "d" 
-  #     a.rotate!        #=> "b", "c", "d", "a"
-  #     a                #=> "b", "c", "d", "a"
-  #     a.rotate!(2)     #=> "d", "a", "b", "c"
-  #     a.rotate!(-3)    #=> "a", "b", "c", "d"
-
-  def rotate!(count=1)
-    self.replace(self.rotate(count))
-  end
-
-  ##
-  #  call-seq:
   #     ary.delete_if { |item| block }  -> ary
   #     ary.delete_if                   -> Enumerator
   #
@@ -705,7 +659,6 @@
     return to_enum :keep_if unless block
 
     idx = 0
-    len = self.size
     while idx < self.size do
       if block.call(selfidx)
         idx += 1
@@ -920,7 +873,7 @@
   #    ary.to_h                ->   Hash
   #    ary.to_h{|item| ... }   ->   Hash
   #
-  # Returns the result of interpreting <i>aray</i> as an array of
+  # Returns the result of interpreting <i>array</i> as an array of
   # <tt>key, value</tt> pairs. If a block is given, it should
   # return <tt>key, value</tt> pairs to construct a hash.
   #
@@ -943,4 +896,124 @@
   alias append push
   alias prepend unshift
   alias filter! select!
+
+  ##
+  # call-seq:
+  #   ary.product(*arys)                  ->   array
+  #   ary.product(*arys) { |item| ... }   ->   self
+  def product(*arys, &block)
+    size = arys.size
+    i = size
+    while i > 0
+      i -= 1
+      unless arysi.kind_of?(Array)
+        raise TypeError, "no implicit conversion into Array"
+      end
+    end
+
+    i = size
+    total = self.size
+    total *= arysi -= 1.size while i > 0
+
+    if block
+      result = self
+      list = ->(*, e) { block.call e }
+      class << list; alias = call; end
+    else
+      result = nil * total
+      list = result
+    end
+
+    i = 0
+    while i < total
+      group = nil * (size + 1)
+      j = size
+      n = i
+      while j > 0
+        j -= 1
+        a = arysj
+        b = a.size
+        groupj + 1 = an % b
+        n /= b
+      end
+      group0 = selfn
+      listi = group
+      i += 1
+    end
+
+    result
+  end
+
+  ##
+  # call-seq:
+  #   ary.repeated_combination(n) { |combination| ... }   ->   self
+  #   ary.repeated_combination(n)                         ->   enumerator
+  #
+  # A +combination+ method that contains the same elements.
+  def repeated_combination(n, &block)
+    raise TypeError, "no implicit conversion into Integer" unless 0 <=> n
+    return to_enum(:repeated_combination, n) unless block
+    __repeated_combination(n, false, &block)
+  end
+
+  ##
+  # call-seq:
+  #   ary.repeated_permutation(n) { |permutation| ... }   ->   self
+  #   ary.repeated_permutation(n)                         ->   enumerator
+  #
+  # A +permutation+ method that contains the same elements.
+  def repeated_permutation(n, &block)
+    raise TypeError, "no implicit conversion into Integer" unless 0 <=> n
+    return to_enum(:repeated_permutation, n) unless block
+    __repeated_combination(n, true, &block)
+  end
+
+  def __repeated_combination(n, permutation, &block)
+    case n
+    when 0
+      yield 
+    when 1
+      i = 0
+      while i < self.size
+        yield selfi
+        i += 1
+      end
+    else
+      if n > 0
+        v = 0 * n
+        while true
+          tmp = nil * n
+          i = 0
+          while i < n
+            tmpi = selfvi
+            i += 1
+          end
+
+          yield tmp
+
+          tmp = self.size
+          i = n - 1
+          while i >= 0
+            vi += 1
+            break if vi < tmp
+            i -= 1
+          end
+          break unless v0 < tmp
+          i = 1
+          while i < n
+            unless vi < tmp
+              if permutation
+                vi = 0
+              else
+                vi = vi - 1
+              end
+            end
+            i += 1
+          end
+        end
+      end
+    end
+
+    self
+  end
 end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-array-ext/src/array.c -> _service:tar_scm:nghttp2-1.52.0.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/presym.h>
 
 /*
  *  call-seq:
@@ -94,17 +95,22 @@
 }
 
 static mrb_value
+ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n)
+{
+  return mrb_ary_entry(ary, n);
+}
+
+static mrb_value
 mrb_ary_values_at(mrb_state *mrb, mrb_value self)
 {
   mrb_int argc;
-  mrb_value *argv;
+  const mrb_value *argv;
 
   mrb_get_args(mrb, "*", &argv, &argc);
 
-  return mrb_get_values_at(mrb, self, RARRAY_LEN(self), argc, argv, mrb_ary_ref);
+  return mrb_get_values_at(mrb, self, RARRAY_LEN(self), argc, argv, ary_ref);
 }
 
-
 /*
  *  call-seq:
  *     ary.slice!(index)         -> obj or nil
@@ -148,11 +154,11 @@
       else {
         return mrb_nil_value();
       }
-    case MRB_TT_FIXNUM:
-      val = mrb_funcall(mrb, self, "delete_at", 1, index);
+    case MRB_TT_INTEGER:
+      val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
       return val;
     default:
-      val = mrb_funcall(mrb, self, "delete_at", 1, index);
+      val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
       return val;
     }
   }
@@ -182,6 +188,172 @@
   return ary;
 }
 
+/*
+ * call-seq:
+ *    ary.compact     -> new_ary
+ *
+ * Returns a copy of +self+ with all +nil+ elements removed.
+ *
+ *    "a", nil, "b", nil, "c", nil .compact
+ *                      #=>  "a", "b", "c" 
+ */
+
+static mrb_value
+mrb_ary_compact(mrb_state *mrb, mrb_value self)
+{
+  mrb_value ary = mrb_ary_new(mrb);
+  mrb_int len = RARRAY_LEN(self);
+  mrb_value *p = RARRAY_PTR(self);
+
+  for (mrb_int i = 0; i < len; ++i) {
+    if (!mrb_nil_p(pi)) {
+      mrb_ary_push(mrb, ary, pi);
+    }
+  }
+  return ary;
+}
+
+/*
+ * call-seq:
+ *    ary.compact!    -> ary  or  nil
+ *
+ * Removes +nil+ elements from the array.
+ * Returns +nil+ if no changes were made, otherwise returns
+ * <i>ary</i>.
+ *
+ *     "a", nil, "b", nil, "c" .compact! #=>  "a", "b", "c" 
+ *     "a", "b", "c" .compact!           #=> nil
+ */
+static mrb_value
+mrb_ary_compact_bang(mrb_state *mrb, mrb_value self)
+{
+  struct RArray *a = mrb_ary_ptr(self);
+  mrb_int i, j = 0;
+  mrb_int len = ARY_LEN(a);
+  mrb_value *p = ARY_PTR(a);
+
+  mrb_ary_modify(mrb, a);
+  for (i = 0; i < len; ++i) {
+    if (!mrb_nil_p(pi)) {
+      if (i != j) pj = pi;
+      j++;
+    }
+  }
+  if (i == j) return mrb_nil_value();
+  if (j < len) ARY_SET_LEN(RARRAY(self), j);
+  return self;
+}
+
+
+/*
+ *  call-seq:
+ *     ary.rotate(count=1)    -> new_ary
+ *
+ *  Returns a new array by rotating +self+ so that the element at +count+ is
+ *  the first element of the new array.
+ *
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of +self+ where +-1+ is the last element.
+ *
+ *     a =  "a", "b", "c", "d" 
+ *     a.rotate         #=> "b", "c", "d", "a"
+ *     a                #=> "a", "b", "c", "d"
+ *     a.rotate(2)      #=> "c", "d", "a", "b"
+ *     a.rotate(-3)     #=> "b", "c", "d", "a"
+ */
+static mrb_value
+mrb_ary_rotate(mrb_state *mrb, mrb_value self)
+{
+  mrb_int count=1;
+  mrb_get_args(mrb, "|i", &count);
+
+  mrb_value ary = mrb_ary_new(mrb);
+  mrb_int len = RARRAY_LEN(self);
+  mrb_value *p = RARRAY_PTR(self);
+  mrb_int idx;
+
+  if (len <= 0) return ary;
+  if (count < 0) {
+    idx = len - (~count % len) - 1;
+  }
+  else {
+    idx = count % len;
+  }
+  for (mrb_int i = 0; i<len; i++) {
+    mrb_ary_push(mrb, ary, pidx++);
+    if (idx == len) idx = 0;
+  }
+  return ary;
+}
+
+static void
+rev(mrb_value *p, mrb_int beg, mrb_int end)
+{
+  for (mrb_int i=beg,j=end-1; i<j; i++,j--) {
+    mrb_value v = pi;
+    pi = pj;
+    pj = v;
+  }
+}
+
+/*
+ *  call-seq:
+ *     ary.rotate!(count=1)   -> ary
+ *
+ *  Rotates +self+ in place so that the element at +count+ comes first, and
+ *  returns +self+.
+ *
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of the array where +-1+ is the last element.
+ *
+ *     a =  "a", "b", "c", "d" 
+ *     a.rotate!        #=> "b", "c", "d", "a"
+ *     a                #=> "b", "c", "d", "a"
+ *     a.rotate!(2)     #=> "d", "a", "b", "c"
+ *     a.rotate!(-3)    #=> "a", "b", "c", "d"
+ */
+static mrb_value
+mrb_ary_rotate_bang(mrb_state *mrb, mrb_value self)
+{
+  mrb_int count=1;
+  mrb_get_args(mrb, "|i", &count);
+
+  struct RArray *a = mrb_ary_ptr(self);
+  mrb_int len = ARY_LEN(a);
+  mrb_value *p = ARY_PTR(a);
+  mrb_int idx;
+
+  mrb_ary_modify(mrb, a);
+  if (len == 0 || count == 0) return self;
+  if (count == 1) {
+    mrb_value v = p0;
+    for (mrb_int i=1; i<len; i++) {
+      pi-1 = pi;
+    }
+    plen-1 = v;
+    return self;
+  }
+  if (count < 0) {
+    idx = len - (~count % len) - 1;
+  }
+  else {
+    idx = count % len;
+  }
+  /* e.g. 1,2,3,4,5.rotate!(2) -> 3,4,5,1,2 */
+  /* first, reverse the whole array */
+  /* 1,2,3,4,5 -> 5,4,3,2,1 */
+  rev(p, 0, len);
+  /* then, re-reverse part before idx */
+  /* 5,4,3,2,1 -> 3,4,5,2,1 */
+  /*        ^idx     ~~~~~      */
+  rev(p, 0, len-idx);
+  /* finally, re-reverse part after idx */
+  /* 3,4,5,2,1 -> 3,4,5,1,2 */
+  /*        ^idx           ~~~  */
+  rev(p, len-idx, len);
+  return self;
+}
+
 void
 mrb_mruby_array_ext_gem_init(mrb_state* mrb)
 {
@@ -191,7 +363,11 @@
   mrb_define_method(mrb, a, "at",     mrb_ary_at,     MRB_ARGS_REQ(1));
   mrb_define_method(mrb, a, "rassoc", mrb_ary_rassoc, MRB_ARGS_REQ(1));
   mrb_define_method(mrb, a, "values_at", mrb_ary_values_at, MRB_ARGS_ANY());
-  mrb_define_method(mrb, a, "slice!", mrb_ary_slice_bang,   MRB_ARGS_ARG(1,1));
+  mrb_define_method(mrb, a, "slice!", mrb_ary_slice_bang, MRB_ARGS_ARG(1,1));
+  mrb_define_method(mrb, a, "compact", mrb_ary_compact, MRB_ARGS_NONE());
+  mrb_define_method(mrb, a, "compact!", mrb_ary_compact_bang, MRB_ARGS_NONE());
+  mrb_define_method(mrb, a, "rotate", mrb_ary_rotate, MRB_ARGS_OPT(1));
+  mrb_define_method(mrb, a, "rotate!", mrb_ary_rotate_bang, MRB_ARGS_OPT(1));
 }
 
 void

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

@@ -18,6 +18,14 @@
   assert_permutation_combination(exp, receiver, :combination, *args)
 end
 
+def assert_repeated_permutation(exp, receiver, *args)
+  assert_permutation_combination(exp, receiver, :repeated_permutation, *args)
+end
+
+def assert_repeated_combination(exp, receiver, *args)
+  assert_permutation_combination(exp, receiver, :repeated_combination, *args)
+end
+
 assert("Array#assoc") do
   s1 =  "colors", "red", "blue", "green" 
   s2 =  "letters", "a", "b", "c" 
@@ -119,6 +127,14 @@
   assert_equal 1, 8, a.intersection(b,c)
 end
 
+assert("Array#intersect?") do
+  a =  1, 2, 3 
+  b =  3, 4, 5 
+  c =  5, 6, 7 
+  assert_true(a.intersect?(b))
+  assert_false(a.intersect?(c))
+end
+
 assert("Array#flatten") do
   assert_equal 1, 2, "3", {4=>5}, :'6',    1, 2, "3", {4=>5}, :'6'.flatten
   assert_equal 1, 2, 3, 4, 5, 6, 1, 2,    3, 4, 5, 6.flatten
@@ -413,3 +429,73 @@
   assert_raise(TypeError) { 1.transpose }
   assert_raise(IndexError) { 1, 2,3,4.transpose }
 end
+
+assert "Array#product" do
+  assert_equal 1, 2, 3, 1, 2, 3.product
+  assert_equal , 1, 2, 3.product()
+  assert_equal , 1, 2, 3.product(4, 5, 6, )
+
+  expect = 1, 5, 8, 1, 5, 9, 1, 6, 8, 1, 6, 9, 1, 7, 8, 1, 7, 9,
+            2, 5, 8, 2, 5, 9, 2, 6, 8, 2, 6, 9, 2, 7, 8, 2, 7, 9,
+            3, 5, 8, 3, 5, 9, 3, 6, 8, 3, 6, 9, 3, 7, 8, 3, 7, 9,
+            4, 5, 8, 4, 5, 9, 4, 6, 8, 4, 6, 9, 4, 7, 8, 4, 7, 9
+  assert_equal expect, 1, 2, 3, 4.product(5, 6, 7, 8, 9)
+
+  expect = 1, 4, 7, 1, 4, 8, 1, 4, 9, 1, 5, 7, 1, 5, 8, 1, 5, 9, 1, 6, 7, 1, 6, 8, 1, 6, 9,
+            2, 4, 7, 2, 4, 8, 2, 4, 9, 2, 5, 7, 2, 5, 8, 2, 5, 9, 2, 6, 7, 2, 6, 8, 2, 6, 9,
+            3, 4, 7, 3, 4, 8, 3, 4, 9, 3, 5, 7, 3, 5, 8, 3, 5, 9, 3, 6, 7, 3, 6, 8, 3, 6, 9
+
+  assert_equal expect, 1, 2, 3.product(4, 5, 6, 7, 8, 9)
+  base = 1, 2, 3
+  x = 
+  assert_equal base, base.product(4, 5, 6, 7, 8, 9) { |e| x << e }
+  assert_equal expect, x
+end
+
+assert("Array#repeated_combination") do
+  a = 1, 2, 3
+  assert_raise(ArgumentError) { a.repeated_combination }
+  #assert_kind_of(Enumerator, a.repeated_combination(1))
+  assert_repeated_combination(1,2,3, a, 1)
+  assert_repeated_combination(1,1,1,2,1,3,2,2,2,3,3,3, a, 2)
+  assert_repeated_combination(1,1,1,1,1,2,1,1,3,1,2,2,1,2,3,1,3,3,2,2,2,
+                               2,2,3,2,3,3,3,3,3, a, 3)
+  assert_repeated_combination(1,1,1,1,1,1,1,2,1,1,1,3,1,1,2,2,1,1,2,3,1,1,3,3,
+                               1,2,2,2,1,2,2,3,1,2,3,3,1,3,3,3,2,2,2,2,2,2,2,3,
+                               2,2,3,3,2,3,3,3,3,3,3,3, a, 4)
+  assert_repeated_combination(1,1,1,1,1,1,1,1,1,2,1,1,1,1,3,1,1,1,2,2,1,1,1,2,3,
+                               1,1,1,3,3,1,1,2,2,2,1,1,2,2,3,1,1,2,3,3,1,1,3,3,3,
+                               1,2,2,2,2,1,2,2,2,3,1,2,2,3,3,1,2,3,3,3,1,3,3,3,3,
+                               2,2,2,2,2,2,2,2,2,3,2,2,2,3,3,2,2,3,3,3,2,3,3,3,3,
+                               3,3,3,3,3, a, 5)
+  assert_repeated_combination(, a, 0)
+  assert_repeated_combination(, a, -1)
+end
+
+assert("Array#repeated_permutation") do
+  a = 1, 2, 3
+  assert_raise(ArgumentError) { a.repeated_permutation }
+  #assert_kind_of(Enumerator, a.repeated_permutation(1))
+  assert_repeated_permutation(1,2,3, a, 1)
+  assert_repeated_permutation(1,1,1,2,1,3,2,1,2,2,2,3,3,1,3,2,3,3, a, 2)
+  assert_repeated_permutation(1,1,1,1,1,2,1,1,3,1,2,1,1,2,2,1,2,3,1,3,1,1,3,2,1,3,3,
+                               2,1,1,2,1,2,2,1,3,2,2,1,2,2,2,2,2,3,2,3,1,2,3,2,2,3,3,
+                               3,1,1,3,1,2,3,1,3,3,2,1,3,2,2,3,2,3,3,3,1,3,3,2,3,3,3,
+                              a, 3)
+  assert_repeated_permutation(1,1,1,1,1,1,1,2,1,1,1,3,1,1,2,1,1,1,2,2,1,1,2,3,
+                               1,1,3,1,1,1,3,2,1,1,3,3,1,2,1,1,1,2,1,2,1,2,1,3,
+                               1,2,2,1,1,2,2,2,1,2,2,3,1,2,3,1,1,2,3,2,1,2,3,3,
+                               1,3,1,1,1,3,1,2,1,3,1,3,1,3,2,1,1,3,2,2,1,3,2,3,
+                               1,3,3,1,1,3,3,2,1,3,3,3,2,1,1,1,2,1,1,2,2,1,1,3,
+                               2,1,2,1,2,1,2,2,2,1,2,3,2,1,3,1,2,1,3,2,2,1,3,3,
+                               2,2,1,1,2,2,1,2,2,2,1,3,2,2,2,1,2,2,2,2,2,2,2,3,
+                               2,2,3,1,2,2,3,2,2,2,3,3,2,3,1,1,2,3,1,2,2,3,1,3,
+                               2,3,2,1,2,3,2,2,2,3,2,3,2,3,3,1,2,3,3,2,2,3,3,3,
+                               3,1,1,1,3,1,1,2,3,1,1,3,3,1,2,1,3,1,2,2,3,1,2,3,
+                               3,1,3,1,3,1,3,2,3,1,3,3,3,2,1,1,3,2,1,2,3,2,1,3,
+                               3,2,2,1,3,2,2,2,3,2,2,3,3,2,3,1,3,2,3,2,3,2,3,3,
+                               3,3,1,1,3,3,1,2,3,3,1,3,3,3,2,1,3,3,2,2,3,3,2,3,
+                               3,3,3,1,3,3,3,2,3,3,3,3, a, 4)
+  assert_repeated_permutation(, a, 0)
+  assert_repeated_permutation(, a, -1)
+end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-config/mrbgem.rake -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-config/mrbgem.rake Changed

@@ -1,26 +1,35 @@
-unless MRuby::Build.current.kind_of?(MRuby::CrossBuild)
-  MRuby::Gem::Specification.new('mruby-bin-config') do |spec|
-    name = 'mruby-config'
-    spec.license = 'MIT'
-    spec.author  = 'mruby developers'
-    spec.summary = "#{name} command"
+iscross = MRuby::Build.current.kind_of?(MRuby::CrossBuild)
 
+MRuby::Gem::Specification.new('mruby-bin-config') do |spec|
+  name = 'mruby-config'
+  spec.license = 'MIT'
+  spec.author  = 'mruby developers'
+  spec.summary = "#{name} command"
+
+  if iscross
+    mruby_config_dir = "#{build.build_dir}/host-bin"
+  else
     mruby_config_dir = "#{build.build_dir}/bin"
-    mruby_config = name + (ENV'OS' == 'Windows_NT' ? '.bat' : '')
-    mruby_config_path = "#{mruby_config_dir}/#{mruby_config}"
-    make_cfg = "#{build.build_dir}/lib/libmruby.flags.mak"
-    tmplt_path = "#{__dir__}/#{mruby_config}"
+  end
+  mruby_config = name + (ENV'OS' == 'Windows_NT' ? '.bat' : '')
+  mruby_config_path = "#{mruby_config_dir}/#{mruby_config}"
+  make_cfg = "#{build.build_dir}/lib/libmruby.flags.mak"
+  tmplt_path = "#{__dir__}/#{mruby_config}"
+
+  if iscross
+    build.products << mruby_config_path
+  else
     build.bins << mruby_config
+  end
 
-    directory mruby_config_dir
+  directory mruby_config_dir
 
-    file mruby_config_path => mruby_config_dir, make_cfg, tmplt_path do |t|
-      config = HashFile.readlines(make_cfg).map!(&:chomp).map! {|l|
-        l.gsub('\\"', '"').split(' = ', 2).map! {|s| s.sub(/^(?=.)/, 'echo ')}
-      }
-      tmplt = File.read(tmplt_path)
-      File.write(t.name, tmplt.gsub(/(#{Regexp.union(*config.keys)})\b/, config))
-      chmod(0755, t.name)
-    end
+  file mruby_config_path => mruby_config_dir, make_cfg, tmplt_path do |t|
+    config = HashFile.readlines(make_cfg).map!(&:chomp).map! {|l|
+      l.gsub('\\"', '"').split(' = ', 2).map! {|s| s.sub(/^(?=.)/, 'echo ')}
+    }
+    tmplt = File.read(tmplt_path)
+    File.write(t.name, tmplt.gsub(/(#{Regexp.union(*config.keys)})\b/, config))
+    chmod(0755, t.name)
   end
 end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-config/mruby-config -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-config/mruby-config Changed

@@ -1,20 +1,34 @@
 #!/bin/sh
 
+print_help()
+{
+  echo "Usage: mruby-config switches"
+  echo "  switches:"
+  echo "  --cc                        print compiler name"
+  echo "  --cflags                    print flags passed to compiler"
+  echo "  --ld                        print linker name"
+  echo "  --ldflags                   print flags passed to linker"
+  echo "  --ldflags-before-libs       print flags passed to linker before linked libraries"
+  echo "  --libs                      print linked libraries"
+  echo "  --libmruby-path             print libmruby path"
+  echo "  --help                      print this help"
+  exit 0
+}
+
+if  $# -eq 0 ; then
+   print_help
+fi
+
 while  $# -gt 0 ; do
   case $1 in
+    --cc) echo MRUBY_CC;;
     --cflags) echo MRUBY_CFLAGS;;
+    --ld) echo MRUBY_LD;;
     --ldflags) echo MRUBY_LDFLAGS;;
     --ldflags-before-libs) echo MRUBY_LDFLAGS_BEFORE_LIBS;;
     --libs) echo MRUBY_LIBS;;
     --libmruby-path) echo MRUBY_LIBMRUBY_PATH;;
-    --help) echo "Usage: mruby-config switches"
-            echo "  switches:"
-            echo "  --cflags                    print flags passed to compiler"
-            echo "  --ldflags                   print flags passed to linker"
-            echo "  --ldflags-before-libs       print flags passed to linker before linked libraries"
-            echo "  --libs                      print linked libraries"
-            echo "  --libmruby-path             print libmruby path"
-            exit 0;;
+    *) print_help;;
   esac
   shift
 done

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-config/mruby-config.bat -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-config/mruby-config.bat Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/print.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/print.rb Changed

@@ -13,7 +13,7 @@
     script.flush
 
     # compile
-    `./bin/mrbc -g -o "#{bin.path}" "#{script.path}"`
+    `#{cmd("mrbc")} -g -o "#{bin.path}" "#{script.path}"`
 
     # add mrdb quit
     testcase << {:cmd=>"quit"}
@@ -21,7 +21,7 @@
     stdin_data = testcase.map{|t| t:cmd}.join("\n") << "\n"
 
     prompt = /^$#{Regexp.escape(script.path)}:\d+$ /
-    "bin/mrdb #{script.path}","bin/mrdb -b #{bin.path}".each do |cmd|
+    "#{cmd('mrdb')} #{script.path}", "#{cmd('mrdb')} -b #{bin.path}".each do |cmd|
       o, s = Open3.capture2(cmd, :stdin_data => stdin_data)
       scanner = StringScanner.new(o)
       scanner.skip_until(prompt)
@@ -67,7 +67,7 @@
   BinTest_MrubyBinDebugger.test(src, tc)
 end
 
-assert('mruby-bin-debugger(print) nomal') do
+assert('mruby-bin-debugger(print) normal') do
   # ruby source
   src = <<"SRC"
 foo = 'foo'
@@ -99,7 +99,7 @@
   BinTest_MrubyBinDebugger.test(src, tc)
 end
 
-# Kernel#instance_eval(string) does't work multiple statements.
+# Kernel#instance_eval(string) doesn't work multiple statements.
 =begin
 assert('mruby-bin-debugger(print) multiple statements') do
   # ruby source
@@ -234,7 +234,7 @@
   BinTest_MrubyBinDebugger.test(src, tc)
 end
 
-assert('mruby-bin-debugger(print) same name:local variabe') do
+assert('mruby-bin-debugger(print) same name:local variable') do
   # ruby source (bp is break point)
   src = <<"SRC"
 lv = 'top'
@@ -264,7 +264,7 @@
   BinTest_MrubyBinDebugger.test(src, tc)
 end
 
-assert('mruby-bin-debugger(print) same name:instance variabe') do
+assert('mruby-bin-debugger(print) same name:instance variable') do
   # ruby source (bp is break point)
   src = <<"SRC"
 @iv = 'top'
@@ -296,7 +296,7 @@
   BinTest_MrubyBinDebugger.test(src, tc)
 end
 
-# Kernel#instance_eval(string) does't work const.
+# Kernel#instance_eval(string) doesn't work const.
 =begin
 assert('mruby-bin-debugger(print) same name:const') do
   # ruby source (bp is break point)
@@ -516,7 +516,7 @@
   tc << {:cmd=>'p a+1',   :exp=>'$1 = 2'}
   tc << {:cmd=>'p 2-b',   :exp=>'$2 = -3'}
   tc << {:cmd=>'p c * 3', :exp=>'$3 = 24'}
-  tc << {:cmd=>'p a/b',   :exp=>'$4 = 0.2'}
+  tc << {:cmd=>'p a/b',   :exp=>'$4 = 0'}
   tc << {:cmd=>'p c%b',   :exp=>'$5 = 3'}
   tc << {:cmd=>'p 2**10', :exp=>'$6 = 1024'}
   tc << {:cmd=>'p ~3',    :exp=>'$7 = -4'}
@@ -614,13 +614,13 @@
   tc << {:cmd=>'p a+=9',   :exp=>'$1 = 10'}
   tc << {:cmd=>'p b-=c',   :exp=>'$2 = 15'}
   tc << {:cmd=>'p bar*=2', :exp=>'$3 = "barbar"'}
-  tc << {:cmd=>'p a/=4',   :exp=>'$4 = 2.5'}
+  tc << {:cmd=>'p a/=4',   :exp=>'$4 = 2'}
   tc << {:cmd=>'p c%=4',   :exp=>'$5 = 2'}
 
   tc << {:cmd=>'p b&=0b0101', :exp=>'$6 = 5'}
   tc << {:cmd=>'p c|=0x10',   :exp=>'$7 = 18'}
 
-  tc << {:cmd=>'p "#{a} #{b} #{c}"',     :exp=>'$8 = "2.5 5 18"'}
+  tc << {:cmd=>'p "#{a} #{b} #{c}"',     :exp=>'$8 = "2 5 18"'}
   tc << {:cmd=>'p "#{foo}#{bar}#{baz}"', :exp=>'$9 = "foobarbarbaz"'}
 
   tc << {:cmd=>'p a,b,c=10,20,30',:exp=>'$10 = 10, 20, 30'}
@@ -682,13 +682,13 @@
   tc << {:cmd=>'p a+=9',   :exp=>'$1 = 10'}
   tc << {:cmd=>'p b-=c',   :exp=>'$2 = 15'}
   tc << {:cmd=>'p bar*=2', :exp=>'$3 = "barbar"'}
-  tc << {:cmd=>'p a/=4',   :exp=>'$4 = 2.5'}
+  tc << {:cmd=>'p a/=4',   :exp=>'$4 = 2'}
   tc << {:cmd=>'p c%=4',   :exp=>'$5 = 2'}
 
   tc << {:cmd=>'p b&=0b0101', :exp=>'$6 = 5'}
   tc << {:cmd=>'p c|=0x10',   :exp=>'$7 = 18'}
 
-  tc << {:cmd=>'p "#{a} #{b} #{c}"',     :exp=>'$8 = "2.5 5 18"'}
+  tc << {:cmd=>'p "#{a} #{b} #{c}"',     :exp=>'$8 = "2 5 18"'}
   tc << {:cmd=>'p "#{foo}#{bar}#{baz}"', :exp=>'$9 = "foobarbarbaz"'}
 
   tc << {:cmd=>'p a,b,c=10,20,30',:exp=>'$10 = 10, 20, 30'}

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/mrbgem.rake -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/mrbgem.rake Changed

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

@@ -14,30 +14,49 @@
 #include <mruby/variable.h>
 #include "mrdberror.h"
 #include "apibreak.h"
+#include "apistring.h"
 
 #define MAX_BREAKPOINTNO (MAX_BREAKPOINT * 1024)
 #define MRB_DEBUG_BP_FILE_OK   (0x0001)
 #define MRB_DEBUG_BP_LINENO_OK (0x0002)
 
+uint32_t mrb_packed_int_decode(uint8_t *p, uint8_t **newpos);
+
 static uint16_t
 check_lineno(mrb_irep_debug_info_file *info_file, uint16_t lineno)
 {
   uint32_t count = info_file->line_entry_count;
   uint16_t l_idx;
 
-  if (info_file->line_type == mrb_debug_line_ary) {
+  switch (info_file->line_type) {
+  case mrb_debug_line_ary:
     for (l_idx = 0; l_idx < count; ++l_idx) {
       if (lineno == info_file->lines.aryl_idx) {
         return lineno;
       }
     }
-  }
-  else {
+    break;
+
+  case mrb_debug_line_flat_map:
     for (l_idx = 0; l_idx < count; ++l_idx) {
       if (lineno == info_file->lines.flat_mapl_idx.line) {
         return lineno;
       }
     }
+    break;
+
+  case mrb_debug_line_packed_map:
+    {
+      uint8_t *p = info_file->lines.packed_map;
+      uint8_t *pend = p + count;
+      uint32_t line = 0;
+      while (p < pend) {
+        mrb_packed_int_decode(p, &p);
+        line += mrb_packed_int_decode(p, &p);
+        if (line == lineno) return lineno;
+      }
+    }
+    break;
   }
 
   return 0;
@@ -84,7 +103,7 @@
 }
 
 static uint16_t
-check_file_lineno(mrb_state *mrb, struct mrb_irep *irep, const char *file, uint16_t lineno)
+check_file_lineno(mrb_state *mrb, const struct mrb_irep *irep, const char *file, uint16_t lineno)
 {
   mrb_irep_debug_info_file *info_file;
   uint16_t result = 0;
@@ -151,7 +170,7 @@
       }
 
       sc = mrb_class_get(mrb, method_p->class_name);
-      ssym = mrb_symbol(mrb_check_intern_cstr(mrb, method_p->method_name));
+      ssym = mrb_intern_check_cstr(mrb, method_p->method_name);
       m = mrb_method_search_vm(mrb, &sc, ssym);
       if (MRB_METHOD_UNDEF_P(m)) {
         return MRB_DEBUG_OK;
@@ -186,7 +205,7 @@
     return MRB_DEBUG_BREAK_NO_OVER;
   }
 
-  /* file and lineno check (line type mrb_debug_line_ary only.) */
+  /* file and lineno check. */
   result = check_file_lineno(mrb, dbg->root_irep, file, lineno);
   if (result == 0) {
     return MRB_DEBUG_BREAK_INVALID_FILE;
@@ -195,7 +214,7 @@
     return MRB_DEBUG_BREAK_INVALID_LINENO;
   }
 
-  set_file = (char*)mrb_malloc(mrb, strlen(file) + 1);
+  set_file = mrdb_strdup(mrb, file);
 
   index = dbg->bpnum;
   dbg->bpindex.bpno = dbg->next_bpno;
@@ -205,8 +224,6 @@
   dbg->bpindex.point.linepoint.lineno = lineno;
   dbg->bpnum++;
 
-  strncpy(set_file, file, strlen(file) + 1);
-
   dbg->bpindex.point.linepoint.file = set_file;
 
   return dbg->bpindex.bpno;
@@ -232,16 +249,16 @@
   }
 
   if (class_name != NULL) {
-    set_class = (char*)mrb_malloc(mrb, strlen(class_name) + 1);
-    strncpy(set_class, class_name, strlen(class_name) + 1);
+    set_class = mrdb_strdup(mrb, class_name);
   }
   else {
     set_class = NULL;
   }
 
-  set_method = (char*)mrb_malloc(mrb, strlen(method_name) + 1);
-
-  strncpy(set_method, method_name, strlen(method_name) + 1);
+  set_method = mrdb_strdup(mrb, method_name);
+  if (set_method == NULL) {
+    mrb_free(mrb, set_class);
+  }
 
   index = dbg->bpnum;
   dbg->bpindex.bpno = dbg->next_bpno;
@@ -327,10 +344,10 @@
 
   for(i = index ; i < dbg->bpnum; i++) {
     if ((i + 1) == dbg->bpnum) {
-      memset(&dbg->bpi, 0, sizeof(mrb_debug_breakpoint));
+      dbg->bpi = (mrb_debug_breakpoint){0};
     }
     else {
-      memcpy(&dbg->bpi, &dbg->bpi + 1, sizeof(mrb_debug_breakpoint));
+      dbg->bpi = dbg->bpi + 1;
     }
   }
 
@@ -428,7 +445,7 @@
 }
 
 static mrb_bool
-check_start_pc_for_line(mrb_state *mrb, mrb_irep *irep, const mrb_code *pc, uint16_t line)
+check_start_pc_for_line(mrb_state *mrb, const mrb_irep *irep, const mrb_code *pc, uint16_t line)
 {
   if (pc > irep->iseq) {
     if (line == mrb_debug_get_line(mrb, irep, pc - irep->iseq - 1)) {

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

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.h Added

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

@@ -8,6 +8,7 @@
 #include <string.h>
 
 #include "apilist.h"
+#include "apistring.h"
 #include <mruby/compile.h>
 
 typedef struct help_msg {
@@ -140,7 +141,8 @@
 listcmd_parser_state_new(mrb_state *mrb)
 {
   listcmd_parser_state *st = (listcmd_parser_state*)mrb_malloc(mrb, sizeof(listcmd_parser_state));
-  memset(st, 0, sizeof(listcmd_parser_state));
+  static const listcmd_parser_state st_zero = {0};
+  *st = st_zero;
   return st;
 }
 
@@ -232,10 +234,7 @@
     len = strlen(*sp);
   }
 
-  if (len > 0) {
-    st->filename = (char*)mrb_malloc(mrb, len + 1);
-    strncpy(st->filename, *sp, len);
-    st->filenamelen = '\0';
+  if (len > 0 && (st->filename = mrdb_strndup(mrb, *sp, len)) != NULL) {
     *sp += len;
     return TRUE;
   }
@@ -502,7 +501,7 @@
   if (mrdb->dbg->xm == DBG_QUIT) {
     struct RClass *exc;
     exc = mrb_define_class(mrb, "DebuggerExit", mrb->eException_class);
-    mrb_raise(mrb, exc, "Exit mrdb.");
+    mrb_raise(mrb, exc, "Exit mrdb");
   }
   return DBGST_PROMPT;
 }

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

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

@@ -13,6 +13,7 @@
 #include <mruby/class.h>
 #include <mruby/opcode.h>
 #include <mruby/variable.h>
+#include <mruby/proc.h>
 
 #include "mrdb.h"
 #include "apibreak.h"
@@ -185,9 +186,9 @@
 mrb_debug_context_new(mrb_state *mrb)
 {
   mrb_debug_context *dbg = (mrb_debug_context*)mrb_malloc(mrb, sizeof(mrb_debug_context));
+  static const mrb_debug_context dbg_zero = {0};
 
-  memset(dbg, 0, sizeof(mrb_debug_context));
-
+  *dbg = dbg_zero;
   dbg->xm = DBG_INIT;
   dbg->xphase = DBG_PHASE_BEFORE_RUN;
   dbg->next_bpno = 1;
@@ -224,9 +225,9 @@
 mrdb_state_new(mrb_state *mrb)
 {
   mrdb_state *mrdb = (mrdb_state*)mrb_malloc(mrb, sizeof(mrdb_state));
+  static const mrdb_state mrdb_zero = {0};
 
-  memset(mrdb, 0, sizeof(mrdb_state));
-
+  *mrdb = mrdb_zero;
   mrdb->dbg = mrb_debug_context_get(mrb);
   mrdb->command = (char*)mrb_malloc(mrb, MAX_COMMAND_LINE+1);
   mrdb->print_no = 1;
@@ -504,7 +505,7 @@
 }
 
 static int32_t
-check_method_breakpoint(mrb_state *mrb, mrb_irep *irep, const mrb_code *pc, mrb_value *regs)
+check_method_breakpoint(mrb_state *mrb, const mrb_irep *irep, const mrb_code *pc, mrb_value *regs)
 {
   struct RClass* c;
   mrb_sym sym;
@@ -526,7 +527,7 @@
       sym = irep->symsinsn.b;
       break;
     case OP_SUPER:
-      c = mrb->c->ci->target_class->super;
+      c = mrb_vm_ci_target_class(mrb->c->ci)->super;
       sym = mrb->c->ci->mid;
       break;
     default:
@@ -545,7 +546,7 @@
 }
 
 static void
-mrb_code_fetch_hook(mrb_state *mrb, mrb_irep *irep, const mrb_code *pc, mrb_value *regs)
+mrb_code_fetch_hook(mrb_state *mrb, const mrb_irep *irep, const mrb_code *pc, mrb_value *regs)
 {
   const char *file;
   int32_t line;
@@ -573,7 +574,7 @@
 
   switch (dbg->xm) {
   case DBG_STEP:
-    if (!file || (dbg->prvfile == file && dbg->prvline == line)) {
+    if (*pc != OP_JMP && (!file || (dbg->prvfile == file && dbg->prvline == line))) {
       return;
     }
     dbg->method_bpno = 0;

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

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

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

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

@@ -1,20 +1,21 @@
 require 'open3'
+require 'tempfile'
 
 assert('mirb normal operations') do
-  o, s = Open3.capture2('bin/mirb', :stdin_data => "a=1\nb=2\na+b\n")
+  o, s = Open3.capture2(cmd("mirb"), :stdin_data => "a=1\nb=2\na+b\n")
   assert_true o.include?('=> 3')
   assert_true o.include?('=> 2')
 end
 
 assert('regression for #1563') do
-  o, s = Open3.capture2('bin/mirb', :stdin_data => "a=1;b=2;c=3\nb\nc")
+  o, s = Open3.capture2(cmd("mirb"), :stdin_data => "a=1;b=2;c=3\nb\nc")
   assert_true o.include?('=> 3')
 end
 
 assert('mirb -d option') do
-  o, _ = Open3.capture2('bin/mirb', :stdin_data => "$DEBUG\n")
+  o, _ = Open3.capture2(cmd("mirb"), :stdin_data => "$DEBUG\n")
   assert_true o.include?('=> false')
-  o, _ = Open3.capture2('bin/mirb -d', :stdin_data => "$DEBUG\n")
+  o, _ = Open3.capture2("#{cmd('mirb')} -d", :stdin_data => "$DEBUG\n")
   assert_true o.include?('=> true')
 end
 
@@ -29,6 +30,23 @@
 EOS
   lib.flush
 
-  o, _ = Open3.capture2("bin/mirb -r #{lib.path}", :stdin_data => "Hoge.new.hoge\n")
+  o, _ = Open3.capture2("#{cmd('mirb')} -r #{lib.path}", :stdin_data => "Hoge.new.hoge\n")
   assert_true o.include?('=> :hoge')
 end
+
+assert('top level local variables are in file scope') do
+  lib = Tempfile.new('lib.rb')
+  lib.write <<-TESTLIB
+a = 1
+A = -> { a }
+  TESTLIB
+  lib.flush
+
+  o, _ = Open3.capture2("#{cmd('mirb')} -r #{lib.path}", :stdin_data => <<-TESTCODE)
+a
+a = 5
+A.call
+  TESTCODE
+
+  assert_kind_of Integer, o =~ /\bundefined method 'a' $NoMethodError$.*=> 5\b.*=> 1\b/m
+end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mirb/mrbgem.rake -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mirb/mrbgem.rake Changed

@@ -4,7 +4,9 @@
   spec.summary = 'mirb command'
 
   if spec.build.cc.search_header_path 'readline/readline.h'
-    spec.cc.defines << "ENABLE_READLINE"
+    spec.cc.defines << "MRB_USE_READLINE"
+    spec.cc.defines << "MRB_READLINE_HEADER='<readline/readline.h>'"
+    spec.cc.defines << "MRB_READLINE_HISTORY='<readline/history.h>'"
     if spec.build.cc.search_header_path 'termcap.h'
       if MRUBY_BUILD_HOST_IS_CYGWIN || MRUBY_BUILD_HOST_IS_OPENBSD
         if spec.build.cc.search_header_path 'termcap.h'
@@ -20,12 +22,26 @@
       spec.linker.libraries << 'edit'
     else
       spec.linker.libraries << 'readline'
+      if RUBY_PLATFORM.include?('darwin')
+        # Workaround to build with Homebrew's readline on Mac (#4537)
+        lib_path = spec.build.cc.header_search_paths.find do |include_path|
+          lib_path = File.expand_path("#{include_path}/../lib")
+          break lib_path if File.exist?("#{lib_path}/libreadline.dylib") ||
+                            File.exist?("#{lib_path}/libreadline.a")
+        end
+        spec.linker.library_paths << lib_path if lib_path
+      end
       if spec.build.cc.search_header_path 'curses.h'
         spec.linker.libraries << 'ncurses'
       end
     end
+  elsif spec.build.cc.search_header_path 'edit/readline/readline.h'
+    spec.cc.defines << "MRB_USE_READLINE"
+    spec.cc.defines << "MRB_READLINE_HEADER='<edit/readline/readline.h>'"
+    spec.cc.defines << "MRB_READLINE_HISTORY='<edit/readline/history.h>'"
+    spec.linker.libraries << "edit"
   elsif spec.build.cc.search_header_path 'linenoise.h'
-    spec.cc.defines << "ENABLE_LINENOISE"
+    spec.cc.defines << "MRB_USE_LINENOISE"
   end
 
   spec.bins = %w(mirb)

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

@@ -8,8 +8,8 @@
 
 #include <mruby.h>
 
-#ifdef MRB_DISABLE_STDIO
-# error mruby-bin-mirb conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#ifdef MRB_NO_STDIO
+# error mruby-bin-mirb conflicts 'MRB_NO_STDIO' in your build configuration
 #endif
 
 #include <mruby/array.h>
@@ -18,7 +18,7 @@
 #include <mruby/dump.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
-#include <mruby/throw.h>
+#include <mruby/presym.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -27,9 +27,20 @@
 #include <signal.h>
 #include <setjmp.h>
 
+/* obsolete configuration */
 #ifdef ENABLE_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
+# define MRB_USE_READLINE
+#endif
+#ifdef ENABLE_LINENOISE
+# define MRB_USE_LINENOISE
+#endif
+#ifdef DISABLE_MIRB_UNDERSCORE
+# define MRB_NO_MIRB_UNDERSCORE
+#endif
+
+#ifdef MRB_USE_READLINE
+#include MRB_READLINE_HEADER
+#include MRB_READLINE_HISTORY
 #define MIRB_ADD_HISTORY(line) add_history(line)
 #define MIRB_READLINE(ch) readline(ch)
 #if !defined(RL_READLINE_VERSION) || RL_READLINE_VERSION < 0x600
@@ -41,8 +52,8 @@
 #define MIRB_WRITE_HISTORY(path) write_history(path)
 #define MIRB_READ_HISTORY(path) read_history(path)
 #define MIRB_USING_HISTORY() using_history()
-#elif defined(ENABLE_LINENOISE)
-#define ENABLE_READLINE
+#elif defined(MRB_USE_LINENOISE)
+#define MRB_USE_READLINE
 #include <linenoise.h>
 #define MIRB_ADD_HISTORY(line) linenoiseHistoryAdd(line)
 #define MIRB_READLINE(ch) linenoise(ch)
@@ -52,7 +63,7 @@
 #define MIRB_USING_HISTORY()
 #endif
 
-#ifndef _WIN32
+#if !defined(_WIN32) && defined(_POSIX_C_SOURCE)
 #define MIRB_SIGSETJMP(env) sigsetjmp(env, 1)
 #define MIRB_SIGLONGJMP(env, val) siglongjmp(env, val)
 #define SIGJMP_BUF sigjmp_buf
@@ -62,7 +73,7 @@
 #define SIGJMP_BUF jmp_buf
 #endif
 
-#ifdef ENABLE_READLINE
+#ifdef MRB_USE_READLINE
 
 static const char history_file_name = ".mirb_history";
 
@@ -104,13 +115,13 @@
   mrb_value val;
   char* msg;
 
-  val = mrb_funcall(mrb, obj, "inspect", 0);
+  val = mrb_funcall_id(mrb, obj, MRB_SYM(inspect), 0);
   if (prompt) {
     if (!mrb->exc) {
       fputs(" => ", stdout);
     }
     else {
-      val = mrb_funcall(mrb, mrb_obj_value(mrb->exc), "inspect", 0);
+      val = mrb_funcall_id(mrb, mrb_obj_value(mrb->exc), MRB_SYM(inspect), 0);
     }
   }
   if (!mrb_string_p(val)) {
@@ -123,7 +134,7 @@
 }
 
 /* Guess if the user might want to enter more
- * or if he wants an evaluation of his code now */
+ * or if they wants an evaluation of their code now */
 static mrb_bool
 is_code_block_open(struct mrb_parser_state *parser)
 {
@@ -200,7 +211,7 @@
     /* an expression was ended */
     break;
   case EXPR_ENDARG:
-    /* closing parenthese */
+    /* closing parenthesis */
     break;
   case EXPR_ENDFN:
     /* definition end */
@@ -353,7 +364,7 @@
   printf("mirb - Embeddable Interactive Ruby Shell\n\n");
 }
 
-#ifndef ENABLE_READLINE
+#ifndef MRB_USE_READLINE
 /* Print the command line prompt of the REPL */
 static void
 print_cmdline(int code_block_open)
@@ -394,7 +405,7 @@
 }
 
 
-#ifndef ENABLE_READLINE
+#ifndef MRB_USE_READLINE
 volatile sig_atomic_t input_canceled = 0;
 void
 ctrl_c_handler(int signo)
@@ -410,7 +421,7 @@
 }
 #endif
 
-#ifndef DISABLE_MIRB_UNDERSCORE
+#ifndef MRB_NO_MIRB_UNDERSCORE
 void decl_lv_underscore(mrb_state *mrb, mrbc_context *cxt)
 {
   struct RProc *proc;
@@ -435,7 +446,7 @@
 {
   char ruby_code4096 = { 0 };
   char last_code_line1024 = { 0 };
-#ifndef ENABLE_READLINE
+#ifndef MRB_USE_READLINE
   int last_char;
   size_t char_index;
 #else
@@ -479,7 +490,7 @@
   mrb_define_global_const(mrb, "ARGV", ARGV);
   mrb_gv_set(mrb, mrb_intern_lit(mrb, "$DEBUG"), mrb_bool_value(args.debug));
 
-#ifdef ENABLE_READLINE
+#ifdef MRB_USE_READLINE
   history_path = get_history_path(mrb);
   if (history_path == NULL) {
     fputs("failed to get history path\n", stderr);
@@ -495,12 +506,9 @@
 
   cxt = mrbc_context_new(mrb);
 
-#ifndef DISABLE_MIRB_UNDERSCORE
-  decl_lv_underscore(mrb, cxt);
-#endif
-
   /* Load libraries */
   for (i = 0; i < args.libc; i++) {
+    struct REnv *e;
     FILE *lfp = fopen(args.libvi, "r");
     if (lfp == NULL) {
       printf("Cannot open library file. (%s)\n", args.libvi);
@@ -509,8 +517,16 @@
     }
     mrb_load_file_cxt(mrb, lfp, cxt);
     fclose(lfp);
+    e = mrb_vm_ci_env(mrb->c->cibase);
+    mrb_vm_ci_env_set(mrb->c->cibase, NULL);
+    mrb_env_unshare(mrb, e);
+    mrbc_cleanup_local_variables(mrb, cxt);
   }
 
+#ifndef MRB_NO_MIRB_UNDERSCORE
+  decl_lv_underscore(mrb, cxt);
+#endif
+
   cxt->capture_errors = TRUE;
   cxt->lineno = 1;
   mrbc_filename(mrb, cxt, "(mirb)");
@@ -520,17 +536,14 @@
 
   while (TRUE) {
     char *utf8;
-    struct mrb_jmpbuf c_jmp;
 
-    MRB_TRY(&c_jmp);
-    mrb->jmp = &c_jmp;
     if (args.rfp) {
       if (fgets(last_code_line, sizeof(last_code_line)-1, args.rfp) != NULL)
         goto done;
       break;
     }
 
-#ifndef ENABLE_READLINE
+#ifndef MRB_USE_READLINE
     print_cmdline(code_block_open);
 
     signal(SIGINT, ctrl_c_handler);
@@ -638,17 +651,16 @@
         /* generate bytecode */
         struct RProc *proc = mrb_generate_code(mrb, parser);
         if (proc == NULL) {
-          fputs("codegen error\n", stderr);
           mrb_parser_free(parser);
-          break;
+          continue;
         }
 
         if (args.verbose) {
           mrb_codedump_all(mrb, proc);
         }
         /* adjust stack length of toplevel environment */
-        if (mrb->c->cibase->env) {
-          struct REnv *e = mrb->c->cibase->env;
+        if (mrb->c->cibase->u.env) {
+          struct REnv *e = mrb_vm_ci_env(mrb->c->cibase);
           if (e && MRB_ENV_LEN(e) < proc->body.irep->nlocals) {
             MRB_ENV_SET_LEN(e, proc->body.irep->nlocals);
           }
@@ -667,12 +679,12 @@
         }
         else {
           /* no */
-          if (!mrb_respond_to(mrb, result, mrb_intern_lit(mrb, "inspect"))){
+          if (!mrb_respond_to(mrb, result, MRB_SYM(inspect))){
             result = mrb_any_to_s(mrb, result);
           }
           p(mrb, result, 1);
-#ifndef DISABLE_MIRB_UNDERSCORE
-          *(mrb->c->stack + 1) = result;
+#ifndef MRB_NO_MIRB_UNDERSCORE
+          *(mrb->c->ci->stack + 1) = result;
 #endif
         }
       }
@@ -682,14 +694,9 @@
     }
     mrb_parser_free(parser);
     cxt->lineno++;
-    MRB_CATCH(&c_jmp) {
-      p(mrb, mrb_obj_value(mrb->exc), 0);
-      mrb->exc = 0;
-    }
-    MRB_END_EXC(&c_jmp);
   }
 
-#ifdef ENABLE_READLINE
+#ifdef MRB_USE_READLINE
   MIRB_WRITE_HISTORY(history_path);
   mrb_free(mrb, history_path);
 #endif

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mrbc/bintest Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb Added

@@ -0,0 +1,30 @@
+require 'tempfile'
+
+assert('Compiling multiple files without new line in last line. #2361') do
+  a, b, out = Tempfile.new('a.rb'), Tempfile.new('b.rb'), Tempfile.new('out.mrb')
+  a.write('module A; end')
+  a.flush
+  b.write('module B; end')
+  b.flush
+  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} #{b.path} 2>&1`
+  assert_equal "#{cmd_bin('mrbc')}:#{a.path}:Syntax OK", result.chomp
+  assert_equal 0, $?.exitstatus
+end
+
+assert('parsing function with void argument') do
+  a, out = Tempfile.new('a.rb'), Tempfile.new('out.mrb')
+  a.write('f ()')
+  a.flush
+  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} 2>&1`
+  assert_equal "#{cmd_bin('mrbc')}:#{a.path}:Syntax OK", result.chomp
+  assert_equal 0, $?.exitstatus
+end
+
+assert('embedded document with invalid terminator') do
+  a, out = Tempfile.new('a.rb'), Tempfile.new('out.mrb')
+  a.write("=begin\n=endx\n")
+  a.flush
+  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} 2>&1`
+  assert_equal "#{a.path}:3:0: embedded document meets end of file", result.chomp
+  assert_equal 1, $?.exitstatus
+end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake Changed

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

@@ -1,7 +1,7 @@
 #include <mruby.h>
 
-#ifdef MRB_DISABLE_STDIO
-# error mruby-bin-mrbc conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#ifdef MRB_NO_STDIO
+# error mruby-bin-mrbc conflicts 'MRB_NO_STDIO' in your build configuration
 #endif
 
 #include <stdlib.h>
@@ -14,16 +14,18 @@
 #define C_EXT       ".c"
 
 struct mrbc_args {
-  int argc;
-  char **argv;
-  int idx;
   const char *prog;
   const char *outfile;
   const char *initname;
+  char **argv;
+  int argc;
+  int idx;
+  mrb_bool dump_struct  : 1;
   mrb_bool check_syntax : 1;
   mrb_bool verbose      : 1;
   mrb_bool remove_lv    : 1;
-  unsigned int flags    : 4;
+  mrb_bool no_ext_ops   : 1;
+  uint8_t flags         : 4;
 };
 
 static void
@@ -32,11 +34,14 @@
   static const char *const usage_msg = {
   "switches:",
   "-c           check syntax only",
-  "-o<outfile>  place the output into <outfile>",
+  "-o<outfile>  place the output into <outfile>; required for multi-files",
   "-v           print version number, then turn on verbose mode",
   "-g           produce debugging information",
   "-B<symbol>   binary <symbol> output in C language format",
+  "-S           dump C struct (requires -B)",
+  "-s           define <symbol> as static variable",
   "--remove-lv  remove local variables",
+  "--no-ext-ops prohibit using OP_EXTs",
   "--verbose    run at verbose mode",
   "--version    print the version",
   "--copyright  print the copyright",
@@ -44,7 +49,7 @@
   };
   const char *const *p = usage_msg;
 
-  printf("Usage: %s switches programfile\n", name);
+  printf("Usage: %s switches programfile...\n", name);
   while (*p)
     printf("  %s\n", *p++);
 }
@@ -105,6 +110,9 @@
           args->outfile = get_outfilename(mrb, argvi + 2, "");
         }
         break;
+      case 'S':
+        args->dump_struct = TRUE;
+        break;
       case 'B':
         if (argvi2 == '\0' && argvi+1) {
           i++;
@@ -126,7 +134,10 @@
         args->verbose = TRUE;
         break;
       case 'g':
-        args->flags |= DUMP_DEBUG_INFO;
+        args->flags |= MRB_DUMP_DEBUG_INFO;
+        break;
+      case 's':
+        args->flags |= MRB_DUMP_STATIC;
         break;
       case 'E':
       case 'e':
@@ -154,6 +165,10 @@
           args->remove_lv = TRUE;
           break;
         }
+        else if (strcmp(argvi + 2, "no-ext-ops") == 0) {
+          args->no_ext_ops = TRUE;
+          break;
+        }
         return -1;
       default:
         return i;
@@ -208,6 +223,7 @@
   if (args->verbose)
     c->dump_result = TRUE;
   c->no_exec = TRUE;
+  c->no_ext_ops = args->no_ext_ops;
   if (input0 == '-' && input1 == '\0') {
     infile = stdin;
   }
@@ -238,13 +254,18 @@
 dump_file(mrb_state *mrb, FILE *wfp, const char *outfile, struct RProc *proc, struct mrbc_args *args)
 {
   int n = MRB_DUMP_OK;
-  mrb_irep *irep = proc->body.irep;
+  const mrb_irep *irep = proc->body.irep;
 
   if (args->remove_lv) {
-    mrb_irep_remove_lv(mrb, irep);
+    mrb_irep_remove_lv(mrb, (mrb_irep*)irep);
   }
   if (args->initname) {
-    n = mrb_dump_irep_cfunc(mrb, irep, args->flags, wfp, args->initname);
+    if (args->dump_struct) {
+      n = mrb_dump_irep_cstruct(mrb, irep, args->flags, wfp, args->initname);
+    }
+    else {
+      n = mrb_dump_irep_cfunc(mrb, irep, args->flags, wfp, args->initname);
+    }
     if (n == MRB_DUMP_INVALID_ARGUMENT) {
       fprintf(stderr, "%s: invalid C language symbol name\n", args->initname);
     }
@@ -261,7 +282,7 @@
 int
 main(int argc, char **argv)
 {
-  mrb_state *mrb = mrb_open();
+  mrb_state *mrb = mrb_open_core(NULL, NULL);
   int n, result;
   struct mrbc_args args;
   FILE *wfp;
@@ -334,7 +355,7 @@
 {
 }
 
-#ifndef DISABLE_GEMS
+#ifndef MRB_NO_GEMS
 void
 mrb_init_mrbgems(mrb_state *mrb)
 {
@@ -345,3 +366,31 @@
 {
 }
 #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.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb Changed

@@ -2,7 +2,7 @@
 require 'open3'
 
 def assert_mruby(exp_out, exp_err, exp_success, args)
-  out, err, stat = Open3.capture3(cmd("mruby"), *args)
+  out, err, stat = Open3.capture3( *(cmd_list("mruby") + args))
   assert "assert_mruby" do
     assert_operator(exp_out, :===, out, "standard output")
     assert_operator(exp_err, :===, err, "standard error")
@@ -19,7 +19,7 @@
   script, bin = Tempfile.new('test.rb'), Tempfile.new('test.mrb')
   File.write script.path, 'p "ok"'
   system "#{cmd('mrbc')} -g -o #{bin.path} #{script.path}"
-  o = `#{cmd('mruby')} -b #{bin.path}`.strip
+  o = `#{cmd('mruby')} #{bin.path}`.strip
   assert_equal '"ok"', o
 end
 
@@ -33,7 +33,7 @@
 
   # .mrb file
   `#{cmd('mrbc')} -o "#{bin.path}" "#{script.path}"`
-  assert_equal "\"#{bin.path}\"", `#{cmd('mruby')} -b "#{bin.path}"`.chomp
+  assert_equal "\"#{bin.path}\"", `#{cmd('mruby')} "#{bin.path}"`.chomp
 
   # one liner
   assert_equal '"-e"', `#{cmd('mruby')} -e #{shellquote('p $0')}`.chomp
@@ -44,13 +44,6 @@
   assert_mruby("\n", "", true, %w-e p(ARGV))
 end
 
-assert('float literal') do
-  script, bin = Tempfile.new('test.rb'), Tempfile.new('test.mrb')
-  File.write script.path, 'p 3.21, 2e308.infinite?, -2e308.infinite?'
-  system "#{cmd('mrbc')} -g -o #{bin.path} #{script.path}"
-  assert_equal "3.21, 1, -1", `#{cmd('mruby')} -b #{bin.path}`.chomp!
-end
-
 assert '__END__', '8.6' do
   script = Tempfile.new('test.rb')
 
@@ -94,7 +87,7 @@
 end
 
 assert('mruby -h option') do
-  assert_mruby(/\AUsage: #{Regexp.escape cmd("mruby")} .*/m, "", true, %w-h)
+  assert_mruby(/\AUsage: #{Regexp.escape cmd_bin("mruby")} .*/m, "", true, %w-h)
 end
 
 assert('mruby -r option') do
@@ -129,7 +122,7 @@
 end
 
 assert('mruby -v option') do
-  ver_re = '\Amruby \d+\.\d+\.\d+ $\d+-\d+-\d+$\n'
+  ver_re = '\Amruby \d+\.\d+\.\d+.* $\d+-\d+-\d+$\n'
   assert_mruby(/#{ver_re}\z/, "", true, %w-v)
   assert_mruby(/#{ver_re}^^\n*NODE.*\n:end\n\z/m, "", true, %w-v -e p(:end))
 end
@@ -160,5 +153,26 @@
 
 assert('codegen error') do
   code = "def f(#{(1..100).map{|n| "a#{n}"} * ","}); end"
-  assert_mruby("", /\Acodegen error:.*\n\z/, false, "-e", code)
+  assert_mruby("", /\A.*\n\z/, false, "-e", code)
+end
+
+assert('top level local variables are in file scope') do
+  arb, amrb = Tempfile.new('a.rb'), Tempfile.new('a.mrb')
+  brb, bmrb = Tempfile.new('b.rb'), Tempfile.new('b.mrb')
+  crb, cmrb = Tempfile.new('c.rb'), Tempfile.new('c.mrb')
+  drb, dmrb = Tempfile.new('d.rb'), Tempfile.new('d.mrb')
+
+  File.write arb.path, 'a = 1'
+  system "#{cmd('mrbc')} -g -o #{amrb.path} #{arb.path}"
+  File.write brb.path, 'p a'
+  system "#{cmd('mrbc')} -g -o #{bmrb.path} #{brb.path}"
+  assert_mruby("", /:1: undefined method 'a' $NoMethodError$\n\z/, false, "-r", arb.path, brb.path)
+  assert_mruby("", /:1: undefined method 'a' $NoMethodError$\n\z/, false, "-b", "-r", amrb.path, bmrb.path)
+
+  File.write crb.path, 'a, b, c = 1, 2, 3; A = -> { b = -2; a, b, c }'
+  system "#{cmd('mrbc')} -g -o #{cmrb.path} #{crb.path}"
+  File.write drb.path, 'a, b = 5, 6; p A.call; p a, b'
+  system "#{cmd('mrbc')} -g -o #{dmrb.path} #{drb.path}"
+  assert_mruby("1, -2, 3\n5\n6\n", "", true, "-r", crb.path, drb.path)
+  assert_mruby("1, -2, 3\n5\n6\n", "", true, "-b", "-r", cmrb.path, dmrb.path)
 end

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

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

@@ -1,7 +1,7 @@
 #include <mruby.h>
 
-#ifdef MRB_DISABLE_STDIO
-# error mruby-bin-mruby conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#ifdef MRB_NO_STDIO
+# error mruby-bin-mruby conflicts 'MRB_NO_STDIO' in your build configuration
 #endif
 
 #include <stdlib.h>
@@ -10,6 +10,12 @@
 #include <mruby/compile.h>
 #include <mruby/dump.h>
 #include <mruby/variable.h>
+#include <mruby/proc.h>
+
+#if defined(_WIN32) || defined(_WIN64)
+# include <io.h> /* for setmode */
+# include <fcntl.h>
+#endif
 
 struct _args {
   FILE *rfp;
@@ -217,7 +223,7 @@
     }
     else {
       args->rfp = strcmp(argv0, "-") == 0 ?
-        stdin : fopen(argv0, args->mrbfile ? "rb" : "r");
+        stdin : fopen(argv0, "rb");
       if (args->rfp == NULL) {
         fprintf(stderr, "%s: Cannot open program file: %s\n", opts->program, argv0);
         return EXIT_FAILURE;
@@ -227,6 +233,11 @@
       argc--; argv++;
     }
   }
+#if defined(_WIN32) || defined(_WIN64)
+  if (args->rfp == stdin) {
+    _setmode(_fileno(stdin), O_BINARY);
+  }
+#endif
   args->argv = (char **)mrb_realloc(mrb, args->argv, sizeof(char*) * (argc + 1));
   memcpy(args->argv, argv, (argc+1) * sizeof(char*));
   args->argc = argc;
@@ -261,7 +272,6 @@
   mrb_value ARGV;
   mrbc_context *c;
   mrb_value v;
-  mrb_sym zero_sym;
 
   if (mrb == NULL) {
     fprintf(stderr, "%s: Invalid mrb_state, exiting mruby\n", *argv);
@@ -293,42 +303,48 @@
       c->no_exec = TRUE;
 
     /* Set $0 */
-    zero_sym = mrb_intern_lit(mrb, "$0");
+    const char *cmdline;
     if (args.rfp) {
-      const char *cmdline;
       cmdline = args.cmdline ? args.cmdline : "-";
-      mrbc_filename(mrb, c, cmdline);
-      mrb_gv_set(mrb, zero_sym, mrb_str_new_cstr(mrb, cmdline));
     }
     else {
-      mrbc_filename(mrb, c, "-e");
-      mrb_gv_set(mrb, zero_sym, mrb_str_new_lit(mrb, "-e"));
+      cmdline = "-e";
     }
+    mrb_gv_set(mrb, mrb_intern_lit(mrb, "$0"), mrb_str_new_cstr(mrb, cmdline));
 
     /* Load libraries */
     for (i = 0; i < args.libc; i++) {
-      FILE *lfp = fopen(args.libvi, args.mrbfile ? "rb" : "r");
+      struct REnv *e;
+      FILE *lfp = fopen(args.libvi, "rb");
       if (lfp == NULL) {
         fprintf(stderr, "%s: Cannot open library file: %s\n", *argv, args.libvi);
         mrbc_context_free(mrb, c);
         cleanup(mrb, &args);
         return EXIT_FAILURE;
       }
+      mrbc_filename(mrb, c, args.libvi);
       if (args.mrbfile) {
         v = mrb_load_irep_file_cxt(mrb, lfp, c);
       }
       else {
-        v = mrb_load_file_cxt(mrb, lfp, c);
+        v = mrb_load_detect_file_cxt(mrb, lfp, c);
       }
       fclose(lfp);
+      e = mrb_vm_ci_env(mrb->c->cibase);
+      mrb_vm_ci_env_set(mrb->c->cibase, NULL);
+      mrb_env_unshare(mrb, e);
+      mrbc_cleanup_local_variables(mrb, c);
     }
 
+    /* set program file name */
+    mrbc_filename(mrb, c, cmdline);
+
     /* Load program */
     if (args.mrbfile) {
       v = mrb_load_irep_file_cxt(mrb, args.rfp, c);
     }
     else if (args.rfp) {
-      v = mrb_load_file_cxt(mrb, args.rfp, c);
+      v = mrb_load_detect_file_cxt(mrb, args.rfp, c);
     }
     else {
       char* utf8 = mrb_utf8_from_locale(args.cmdline, -1);

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c -> _service:tar_scm:nghttp2-1.52.0.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 Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding-core Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding-core/mrbgem.rake Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding-core/src Added

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

@@ -0,0 +1,309 @@
+#include <mruby.h>
+#include <mruby/array.h>
+#include <mruby/hash.h>
+#include <mruby/proc.h>
+#include <mruby/variable.h>
+#include <mruby/presym.h>
+#include <mruby/opcode.h>
+#include <mruby/debug.h>
+
+void mrb_proc_merge_lvar(mrb_state *mrb, mrb_irep *irep, struct REnv *env, int num, const mrb_sym *lv, const mrb_value *stack);
+mrb_value mrb_proc_local_variables(mrb_state *mrb, const struct RProc *proc);
+const struct RProc *mrb_proc_get_caller(mrb_state *mrb, struct REnv **env);
+
+static mrb_int
+binding_extract_pc(mrb_state *mrb, mrb_value binding)
+{
+  mrb_value obj = mrb_iv_get(mrb, binding, MRB_SYM(pc));
+  if (mrb_nil_p(obj)) {
+    return -1;
+  }
+  else {
+    mrb_check_type(mrb, obj, MRB_TT_INTEGER);
+    return mrb_int(mrb, obj);
+  }
+}
+
+const struct RProc *
+mrb_binding_extract_proc(mrb_state *mrb, mrb_value binding)
+{
+  mrb_value obj = mrb_iv_get(mrb, binding, MRB_SYM(proc));
+  mrb_check_type(mrb, obj, MRB_TT_PROC);
+  return mrb_proc_ptr(obj);
+}
+
+struct REnv *
+mrb_binding_extract_env(mrb_state *mrb, mrb_value binding)
+{
+  mrb_value obj = mrb_iv_get(mrb, binding, MRB_SYM(env));
+  if (mrb_nil_p(obj)) {
+    return NULL;
+  }
+  else {
+    mrb_check_type(mrb, obj, MRB_TT_ENV);
+    return (struct REnv *)mrb_obj_ptr(obj);
+  }
+}
+
+static void
+binding_local_variable_name_check(mrb_state *mrb, mrb_sym id)
+{
+  if (id == 0) {
+  badname:
+    mrb_raisef(mrb, E_NAME_ERROR, "wrong local variable name %!n for binding", id);
+  }
+
+  mrb_int len;
+  const char *name = mrb_sym_name_len(mrb, id, &len);
+  if (len == 0) {
+    goto badname;
+  }
+
+  if (ISASCII(*name) && !(*name == '_' || ISLOWER(*name))) {
+    goto badname;
+  }
+  len--;
+  name++;
+
+  for (; len > 0; len--, name++) {
+    if (ISASCII(*name) && !(*name == '_' || ISALNUM(*name))) {
+      goto badname;
+    }
+  }
+}
+
+static mrb_value *
+binding_local_variable_search(mrb_state *mrb, const struct RProc *proc, struct REnv *env, mrb_sym varname)
+{
+  binding_local_variable_name_check(mrb, varname);
+
+  while (proc) {
+    if (MRB_PROC_CFUNC_P(proc)) break;
+
+    const mrb_irep *irep = proc->body.irep;
+    const mrb_sym *lv;
+    if (irep && (lv = irep->lv)) {
+      for (int i = 0; i + 1 < irep->nlocals; i++, lv++) {
+        if (varname == *lv) {
+          return (env && MRB_ENV_LEN(env) > i) ? &env->stacki + 1 : NULL;
+        }
+      }
+    }
+
+    if (MRB_PROC_SCOPE_P(proc)) break;
+    env = MRB_PROC_ENV(proc);
+    proc = proc->upper;
+  }
+
+  return NULL;
+}
+
+/*
+ * call-seq:
+ *  local_variable_defined?(symbol) -> bool
+ */
+static mrb_value
+binding_local_variable_defined_p(mrb_state *mrb, mrb_value self)
+{
+  mrb_sym varname;
+  mrb_get_args(mrb, "n", &varname);
+
+  const struct RProc *proc = mrb_binding_extract_proc(mrb, self);
+  struct REnv *env = mrb_binding_extract_env(mrb, self);
+  mrb_value *e = binding_local_variable_search(mrb, proc, env, varname);
+  if (e) {
+    return mrb_true_value();
+  }
+  else {
+    return mrb_false_value();
+  }
+}
+
+/*
+ * call-seq:
+ *  local_variable_get(symbol) -> object
+ */
+static mrb_value
+binding_local_variable_get(mrb_state *mrb, mrb_value self)
+{
+  mrb_sym varname;
+  mrb_get_args(mrb, "n", &varname);
+
+  const struct RProc *proc = mrb_binding_extract_proc(mrb, self);
+  struct REnv *env = mrb_binding_extract_env(mrb, self);
+  mrb_value *e = binding_local_variable_search(mrb, proc, env, varname);
+  if (!e) {
+    mrb_raisef(mrb, E_NAME_ERROR, "local variable %!n is not defined", varname);
+  }
+
+  return *e;
+}
+
+static mrb_value
+binding_local_variable_set(mrb_state *mrb, mrb_value self)
+{
+  mrb_sym varname;
+  mrb_value obj;
+  mrb_get_args(mrb, "no", &varname, &obj);
+
+  const struct RProc *proc = mrb_binding_extract_proc(mrb, self);
+  struct REnv *env = mrb_binding_extract_env(mrb, self);
+  mrb_value *e = binding_local_variable_search(mrb, proc, env, varname);
+  if (e) {
+    *e = obj;
+    if (!mrb_immediate_p(obj)) {
+      mrb_field_write_barrier(mrb, (struct RBasic*)env, (struct RBasic*)mrb_obj_ptr(obj));
+    }
+  }
+  else {
+    mrb_proc_merge_lvar(mrb, (mrb_irep*)proc->body.irep, env, 1, &varname, &obj);
+  }
+
+  return obj;
+}
+
+static mrb_value
+binding_local_variables(mrb_state *mrb, mrb_value self)
+{
+  const struct RProc *proc = mrb_proc_ptr(mrb_iv_get(mrb, self, MRB_SYM(proc)));
+  return mrb_proc_local_variables(mrb, proc);
+}
+
+static mrb_value
+binding_receiver(mrb_state *mrb, mrb_value self)
+{
+  return mrb_iv_get(mrb, self, MRB_SYM(recv));
+}
+
+/*
+ * call-seq:
+ *  source_location -> String, Integer
+ */
+static mrb_value
+binding_source_location(mrb_state *mrb, mrb_value self)
+{
+  if (mrb_iv_defined(mrb, self, MRB_SYM(source_location))) {
+    return mrb_iv_get(mrb, self, MRB_SYM(source_location));
+  }
+
+  mrb_value srcloc;
+  const struct RProc *proc = mrb_binding_extract_proc(mrb, self);
+  if (!proc || MRB_PROC_CFUNC_P(proc) ||
+      !proc->upper || MRB_PROC_CFUNC_P(proc->upper)) {
+    srcloc = mrb_nil_value();
+  }
+  else {
+    const mrb_irep *irep = proc->upper->body.irep;
+    mrb_int pc = binding_extract_pc(mrb, self);
+    if (pc < 0) {
+      srcloc = mrb_nil_value();
+    }
+    else {
+      const char *fname = mrb_debug_get_filename(mrb, irep, (uint32_t)pc);
+      mrb_int fline = mrb_debug_get_line(mrb, irep, (uint32_t)pc);
+
+      if (fname && fline >= 0) {
+        srcloc = mrb_assoc_new(mrb, mrb_str_new_cstr(mrb, fname), mrb_fixnum_value(fline));
+      }
+      else {
+        srcloc = mrb_nil_value();
+      }
+    }
+  }
+
+  if (!mrb_frozen_p(mrb_obj_ptr(self))) {
+    mrb_iv_set(mrb, self, MRB_SYM(source_location), srcloc);
+  }
+  return srcloc;
+}
+
+mrb_value
+mrb_binding_alloc(mrb_state *mrb)
+{
+  struct RObject *obj = MRB_OBJ_ALLOC(mrb, MRB_TT_OBJECT, mrb_class_get_id(mrb, MRB_SYM(Binding)));
+  return mrb_obj_value(obj);
+}
+
+struct RProc*
+mrb_binding_wrap_lvspace(mrb_state *mrb, const struct RProc *proc, struct REnv **envp)
+{
+  /*
+   * local variable space: It is a space to hold the top-level variable of
+   * binding.eval and binding.local_variable_set.
+   */
+
+  static const mrb_code iseq_dummy = { OP_RETURN, 0 };
+
+  struct RProc *lvspace = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb->proc_class);
+  mrb_irep *irep = mrb_add_irep(mrb);
+  irep->flags = MRB_ISEQ_NO_FREE;
+  irep->iseq = iseq_dummy;
+  irep->ilen = sizeof(iseq_dummy) / sizeof(iseq_dummy0);
+  irep->lv = (mrb_sym*)mrb_calloc(mrb, 1, sizeof(mrb_sym)); /* initial allocation for dummy */
+  irep->nlocals = 1;
+  irep->nregs = 1;
+  lvspace->body.irep = irep;
+  lvspace->upper = proc;
+  if (*envp) {
+    lvspace->e.env = *envp;
+    lvspace->flags |= MRB_PROC_ENVSET;
+  }
+
+  *envp = MRB_OBJ_ALLOC(mrb, MRB_TT_ENV, NULL);
+  (*envp)->stack = (mrb_value*)mrb_calloc(mrb, 1, sizeof(mrb_value));
+  (*envp)->stack0 = lvspace->e.env ? lvspace->e.env->stack0 : mrb_nil_value();
+  (*envp)->cxt = lvspace->e.env ? lvspace->e.env->cxt : mrb->c;
+  (*envp)->mid = 0;
+  (*envp)->flags = MRB_ENV_CLOSED | MRB_ENV_HEAPED;
+  MRB_ENV_SET_LEN(*envp, 1);
+
+  return lvspace;
+}
+
+static mrb_value
+mrb_f_binding(mrb_state *mrb, mrb_value self)
+{
+  mrb_value binding;
+  struct RProc *proc;
+  struct REnv *env;
+
+  binding = mrb_binding_alloc(mrb);
+  proc = (struct RProc*)mrb_proc_get_caller(mrb, &env);
+  if (!env || MRB_PROC_CFUNC_P(proc)) {
+    proc = NULL;
+    env = NULL;
+  }
+
+  if (proc && !MRB_PROC_CFUNC_P(proc)) {
+    const mrb_irep *irep = proc->body.irep;
+    mrb_iv_set(mrb, binding, MRB_SYM(pc), mrb_fixnum_value(mrb->c->ci-1.pc - irep->iseq - 1 /* step back */));
+  }
+  proc = mrb_binding_wrap_lvspace(mrb, proc, &env);
+  mrb_iv_set(mrb, binding, MRB_SYM(proc), mrb_obj_value(proc));
+  mrb_iv_set(mrb, binding, MRB_SYM(recv), self);
+  mrb_iv_set(mrb, binding, MRB_SYM(env), mrb_obj_value(env));
+  return binding;
+}
+
+void
+mrb_mruby_binding_core_gem_init(mrb_state *mrb)
+{
+  struct RClass *binding = mrb_define_class(mrb, "Binding", mrb->object_class);
+  mrb_undef_class_method(mrb, binding, "new");
+  mrb_undef_class_method(mrb, binding, "allocate");
+
+  mrb_define_method(mrb, mrb->kernel_module, "binding", mrb_f_binding, MRB_ARGS_NONE());
+
+  mrb_define_method(mrb, binding, "local_variable_defined?", binding_local_variable_defined_p, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, binding, "local_variable_get", binding_local_variable_get, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, binding, "local_variable_set", binding_local_variable_set, MRB_ARGS_REQ(2));
+  mrb_define_method(mrb, binding, "local_variables", binding_local_variables, MRB_ARGS_NONE());
+  mrb_define_method(mrb, binding, "receiver", binding_receiver, MRB_ARGS_NONE());
+  mrb_define_method(mrb, binding, "source_location", binding_source_location, MRB_ARGS_NONE());
+  mrb_define_method(mrb, binding, "inspect", mrb_any_to_s, MRB_ARGS_NONE());
+}
+
+void
+mrb_mruby_binding_core_gem_final(mrb_state *mrb)
+{
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding-core/test Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding-core/test/binding-core.rb Added

@@ -0,0 +1,40 @@
+assert("Kernel.#binding") do
+  assert_kind_of Binding, binding
+end
+
+assert("Binding#local_variables") do
+  block = Proc.new do |a|
+    b = 1
+    binding
+  end
+  assert_equal :a, :b, :block, block.call(0).local_variables.sort
+end
+
+assert("Binding#local_variable_set") do
+  bind = binding
+  1.times {
+    assert_equal(9, bind.local_variable_set(:x, 9))
+    assert_raise(NameError) { x }
+    assert_equal(:bind, :x, bind.local_variables.sort)
+  }
+end
+
+assert("Binding#local_variable_get") do
+  bind = binding
+  x = 1
+  1.times {
+    y = 2
+    assert_equal(1, bind.local_variable_get(:x))
+    x = 10
+    assert_equal(10, bind.local_variable_get(:x))
+    assert_raise(NameError) { bind.local_variable_get(:y) }
+    assert_equal(:bind, :x, bind.local_variables.sort)
+  }
+end
+
+assert("Binding#source_location") do
+  skip unless -> {}.source_location
+
+  bind, source_location = binding, __FILE__, __LINE__
+  assert_equal source_location, bind.source_location
+end

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding/src Added

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

@@ -0,0 +1,170 @@
+#include <mruby.h>
+#include <mruby/array.h>
+#include <mruby/class.h>
+#include <mruby/compile.h>
+#include <mruby/error.h>
+#include <mruby/proc.h>
+#include <mruby/presym.h>
+#include <mruby/string.h>
+
+mrb_noreturn void mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args);
+void mrb_proc_merge_lvar(mrb_state *mrb, mrb_irep *irep, struct REnv *env, int num, const mrb_sym *lv, const mrb_value *stack);
+mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);
+const struct RProc *mrb_binding_extract_proc(mrb_state *mrb, mrb_value binding);
+struct REnv *mrb_binding_extract_env(mrb_state *mrb, mrb_value binding);
+typedef mrb_bool mrb_parser_foreach_top_variable_func(mrb_state *mrb, mrb_sym sym, void *user);
+void mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_parser_foreach_top_variable_func *func, void *user);
+
+static void
+binding_eval_error_check(mrb_state *mrb, struct mrb_parser_state *p, const char *file)
+{
+  if (!p) {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "Failed to create parser state (out of memory)");
+  }
+
+  if (0 < p->nerr) {
+    mrb_value str;
+
+    if (file) {
+      str = mrb_format(mrb, "file %s line %d: %s",
+                       file,
+                       p->error_buffer0.lineno,
+                       p->error_buffer0.message);
+    }
+    else {
+      str = mrb_format(mrb, "line %d: %s",
+                       p->error_buffer0.lineno,
+                       p->error_buffer0.message);
+    }
+    mrb_exc_raise(mrb, mrb_exc_new_str(mrb, E_SYNTAX_ERROR, str));
+  }
+}
+
+#define LV_BUFFERS 8
+
+struct expand_lvspace {
+  mrb_irep *irep;
+  struct REnv *env;
+  size_t numvar;
+  mrb_sym symsLV_BUFFERS;
+};
+
+static mrb_bool
+expand_lvspace(mrb_state *mrb, mrb_sym sym, void *user)
+{
+  struct expand_lvspace *p = (struct expand_lvspace*)user;
+  mrb_int symlen;
+  const char *symname = mrb_sym_name_len(mrb, sym, &symlen);
+
+  if (symname && symlen > 0) {
+    if (symname0 != '&' && symname0 != '*') {
+      p->symsp->numvar++ = sym;
+      if (p->numvar >= LV_BUFFERS) {
+        mrb_proc_merge_lvar(mrb, p->irep, p->env, p->numvar, p->syms, NULL);
+        p->numvar = 0;
+      }
+    }
+  }
+
+  return TRUE;
+}
+
+struct binding_eval_prepare_body {
+  mrb_value binding;
+  const char *file;
+  const char *expr;
+  mrb_int exprlen;
+  mrbc_context *mrbc;
+  struct mrb_parser_state *pstate;
+};
+
+static mrb_value
+binding_eval_prepare_body(mrb_state *mrb, void *opaque)
+{
+  struct binding_eval_prepare_body *p = (struct binding_eval_prepare_body*)opaque;
+
+  const struct RProc *proc = mrb_binding_extract_proc(mrb, p->binding);
+  mrb_assert(!MRB_PROC_CFUNC_P(proc));
+
+  p->mrbc = mrbc_context_new(mrb);
+  mrbc_filename(mrb, p->mrbc, p->file ? p->file : "(eval)");
+  p->mrbc->upper = proc;
+  p->mrbc->capture_errors = TRUE;
+  p->pstate = mrb_parse_nstring(mrb, p->expr, p->exprlen, p->mrbc);
+  binding_eval_error_check(mrb, p->pstate, p->file);
+
+  struct expand_lvspace args = {
+    (mrb_irep*)proc->body.irep,
+    mrb_binding_extract_env(mrb, p->binding),
+    0,
+    { 0 }
+  };
+  mrb_parser_foreach_top_variable(mrb, p->pstate, expand_lvspace, &args);
+  if (args.numvar > 0) {
+    mrb_proc_merge_lvar(mrb, args.irep, args.env, args.numvar, args.syms, NULL);
+  }
+
+  return mrb_nil_value();
+}
+
+static void
+binding_eval_prepare(mrb_state *mrb, mrb_value binding)
+{
+  struct binding_eval_prepare_body d = { binding, NULL, NULL, 0, NULL, NULL };
+  mrb_int argc;
+  mrb_value *argv;
+  mrb_get_args(mrb, "s|z*!", &d.expr, &d.exprlen, &d.file, &argv, &argc);
+
+  /* `eval` should take (string, file, line) */
+  if (argc > 3) mrb_argnum_error(mrb, argc, 1, 3);
+  mrb_bool error;
+  mrb_value ret = mrb_protect_error(mrb, binding_eval_prepare_body, &d, &error);
+  if (d.pstate) mrb_parser_free(d.pstate);
+  if (d.mrbc) mrbc_context_free(mrb, d.mrbc);
+  if (error) mrb_exc_raise(mrb, ret);
+}
+
+static mrb_value
+mrb_binding_eval(mrb_state *mrb, mrb_value binding)
+{
+  binding_eval_prepare(mrb, binding);
+
+  struct RClass *c = mrb->kernel_module;
+  mrb_method_t m = mrb_method_search_vm(mrb, &c, MRB_SYM(eval));
+  mrb_callinfo *ci = mrb->c->ci;
+  int argc = ci->n;
+  mrb_value *argv = ci->stack + 1;
+  struct RProc *proc;
+
+  if (argc < 15) {
+    argv0 = mrb_ary_new_from_values(mrb, argc, argv);
+    argv1 = argvargc;       /* copy block */
+    ci->n = 15;
+  }
+  if (MRB_METHOD_UNDEF_P(m)) {
+    mrb_method_missing(mrb, MRB_SYM(eval), binding, argv0);
+  }
+
+  mrb_ary_splice(mrb, argv0, 1, 0, binding); /* insert binding as 2nd argument */
+  if (MRB_METHOD_FUNC_P(m)) {
+    proc = mrb_proc_new_cfunc(mrb, MRB_METHOD_FUNC(m));
+    MRB_PROC_SET_TARGET_CLASS(proc, c);
+  }
+  else {
+    proc = MRB_METHOD_PROC(m);
+  }
+  ci->u.target_class = c;
+  return mrb_exec_irep(mrb, binding, proc);
+}
+
+void
+mrb_mruby_binding_gem_init(mrb_state *mrb)
+{
+  struct RClass *binding = mrb_class_get_id(mrb, MRB_SYM(Binding));
+  mrb_define_method(mrb, binding, "eval", mrb_binding_eval, MRB_ARGS_ANY());
+}
+
+void
+mrb_mruby_binding_gem_final(mrb_state *mrb)
+{
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-binding/test Added

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

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

@@ -0,0 +1,70 @@
+assert("Binding#eval") do
+  b = nil
+  1.times { x, y, z = 1, 2, 3; x,y,z; b = binding }
+  assert_equal(1, 2, 3, b.eval("x, y, z"))
+  here = self
+  assert_equal(here, b.eval("self"))
+end
+
+assert("Binding#local_variables") do
+  block = Proc.new do |a|
+    b = 1
+    binding
+  end
+  bind = block.call(0)
+  assert_equal :a, :b, :bind, :block, bind.local_variables.sort
+  bind.eval("x = 2")
+  assert_equal :a, :b, :bind, :block, :x, bind.local_variables.sort
+end
+
+assert("Binding#local_variable_set") do
+  bind = binding
+  1.times {
+    assert_equal(9, bind.local_variable_set(:x, 9))
+    assert_equal(9, bind.eval("x"))
+    assert_equal(:bind, :x, bind.eval("local_variables.sort"))
+  }
+end
+
+assert("Binding#local_variable_get") do
+  bind = binding
+  x = 1
+  1.times {
+    y = 2
+    assert_equal(1, bind.local_variable_get(:x))
+    x = 10
+    assert_equal(10, bind.local_variable_get(:x))
+    assert_raise(NameError) { bind.local_variable_get(:y) }
+    bind.eval("z = 3")
+    assert_equal(3, bind.local_variable_get(:z))
+    bind.eval("y = 5")
+    assert_equal(5, bind.local_variable_get(:y))
+    assert_equal(2, y)
+  }
+end
+
+assert "Kernel#binding and .eval from C" do
+  bind = binding_in_c
+  assert_equal 5, bind.eval("2 + 3")
+  assert_nothing_raised { bind.eval("self") }
+end
+
+assert "Binding#eval with Binding.new via UnboundMethod" do
+  assert_raise(NoMethodError) { Class.instance_method(:new).bind_call(Binding) }
+end
+
+assert "Binding#eval with Binding.new via Method" do
+  # The following test is OK if SIGSEGV does not occur
+  cx = Class.new(Binding)
+  cx.define_singleton_method(:allocate, &Object.method(:allocate))
+  Class.instance_method(:new).bind_call(cx).eval("")
+
+  assert_true true
+end
+
+assert "access local variables into procs" do
+  bx = binding
+  block = bx.eval("a = 1; proc { a }")
+  bx.eval("a = 2")
+  assert_equal 2, block.call
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-catch Added

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-catch/mrblib Added

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-catch/src Added

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

@@ -0,0 +1,124 @@
+#include <mruby.h>
+#include <mruby/class.h>
+#include <mruby/variable.h>
+#include <mruby/error.h>
+#include <mruby/proc.h>
+#include <mruby/opcode.h>
+#include <mruby/presym.h>
+
+
+MRB_PRESYM_DEFINE_VAR_AND_INITER(catch_syms_3, 1, MRB_SYM(call))
+static const mrb_code catch_iseq_318 = {
+  OP_ENTER,    0x00, 0x00, 0x00,
+  OP_GETUPVAR, 0x02, 0x02, 0x01,
+  OP_GETUPVAR, 0x03, 0x01, 0x01,
+  OP_SEND,     0x02, 0x00, 0x01,
+  OP_RETURN,   0x02,};
+static const mrb_irep catch_irep_3 = {
+  2,5,0,
+  MRB_IREP_STATIC,catch_iseq_3,
+  NULL,catch_syms_3,NULL,
+  NULL,
+  NULL,
+  18,0,1,0,0
+};
+static const mrb_irep *catch_reps_21 = {
+  &catch_irep_3,
+};
+static const mrb_code catch_iseq_213 = {
+  OP_ENTER,    0x00, 0x00, 0x00,
+  OP_LAMBDA,   0x02, 0x00,
+  OP_SEND,     0x02, 0x00, 0x00,
+  OP_RETURN,   0x02,};
+static const mrb_irep catch_irep_2 = {
+  2,4,0,
+  MRB_IREP_STATIC,catch_iseq_2,
+  NULL,catch_syms_3,catch_reps_2,
+  NULL,
+  NULL,
+  13,0,1,1,0
+};
+static const mrb_irep *catch_reps_11 = {
+  &catch_irep_2,
+};
+MRB_PRESYM_DEFINE_VAR_AND_INITER(catch_syms_1, 3, MRB_SYM(Object), MRB_SYM(new), MRB_SYM(call))
+static const mrb_code catch_iseq_129 = {
+  OP_ENTER,    0x00, 0x20, 0x01,
+  OP_JMP,      0x00, 0x03,
+  OP_JMP,      0x00, 0x0a,
+  OP_GETCONST, 0x03, 0x00,
+  OP_SEND,     0x03, 0x01, 0x00,
+  OP_MOVE,     0x01, 0x03,
+  OP_LAMBDA,   0x03, 0x00,
+  OP_SEND,     0x03, 0x02, 0x00,
+  OP_RETURN,   0x03,};
+static const mrb_irep catch_irep = {
+  3,5,0,
+  MRB_IREP_STATIC,catch_iseq_1,
+  NULL,catch_syms_1,catch_reps_1,
+  NULL,
+  NULL,
+  29,0,3,1,0
+};
+
+static const struct RProc catch_proc = {
+  NULL, NULL, MRB_TT_PROC, MRB_GC_RED, MRB_FL_OBJ_IS_FROZEN | MRB_PROC_SCOPE | MRB_PROC_STRICT,
+  { &catch_irep }, NULL, { NULL }
+};
+
+static const mrb_callinfo *
+find_catcher(mrb_state *mrb, mrb_value tag)
+{
+  const mrb_callinfo *ci = mrb->c->ci;
+  size_t n = ci - mrb->c->cibase;
+  ci--;
+  for (; n > 0; n--, ci--) {
+    const mrb_value *arg1 = ci->stack + 1;
+    if (ci->proc == &catch_proc && mrb_obj_eq(mrb, *arg1, tag)) {
+      return ci;
+    }
+  }
+
+  return NULL;
+}
+
+static mrb_value
+mrb_f_throw(mrb_state *mrb, mrb_value self)
+{
+  mrb_value tag, obj;
+  if (mrb_get_args(mrb, "o|o", &tag, &obj) == 1) {
+    obj = mrb_nil_value();
+  }
+
+  const mrb_callinfo *ci = find_catcher(mrb, tag);
+  if (ci) {
+    struct RBreak *b = MRB_OBJ_ALLOC(mrb, MRB_TT_BREAK, NULL);
+    mrb_break_value_set(b, obj);
+    mrb_break_proc_set(b, ci2.proc); /* Back to the closure in `catch` method */
+    mrb_exc_raise(mrb, mrb_obj_value(b));
+  }
+  else {
+    mrb_value argv2 = {tag, obj};
+    mrb_exc_raise(mrb, mrb_obj_new(mrb, mrb_exc_get_id(mrb, MRB_ERROR_SYM(UncaughtThrowError)), 2, argv));
+  }
+  /* not reached */
+  return mrb_nil_value();
+}
+
+void
+mrb_mruby_catch_gem_init(mrb_state *mrb)
+{
+  mrb_method_t m;
+
+  MRB_PRESYM_INIT_SYMBOLS(mrb, catch_syms_3);
+  MRB_PRESYM_INIT_SYMBOLS(mrb, catch_syms_1);
+  MRB_METHOD_FROM_PROC(m, &catch_proc);
+  mrb_define_method_raw(mrb, mrb->kernel_module, MRB_SYM(catch), m);
+
+  mrb_define_method(mrb, mrb->kernel_module, "throw", mrb_f_throw, MRB_ARGS_ARG(1,1));
+}
+
+void
+mrb_mruby_catch_gem_final(mrb_state *mrb)
+{
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-catch/test Added

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

@@ -0,0 +1,86 @@
+assert "return throw value" do
+  val = "val"
+  result = catch :foo do
+    loop do
+      loop do
+        begin
+          throw :foo, val
+        rescue Exception
+          flunk("should not reach here 1")
+        end
+        break
+      end
+      flunk("should not reach here 2")
+    end
+    false
+  end
+  assert_same(val, result)
+end
+
+assert "no throw" do
+  assert_equal(:foo, catch(:bar){:foo})
+end
+
+assert "no throw value" do
+  result = catch :foo do
+    throw :foo
+    1
+  end
+  assert_equal(nil, result)
+end
+
+assert "pass the given tag to block" do
+  tag = :foo
+  catch(tag){|t| assert_same(tag, t)}
+end
+
+assert "tag identity, uncaught throw" do
+  tag, val = :tag, :val
+  catch :tag do
+    throw tag, val
+  end
+  flunk("should not reach here")
+rescue Exception => e
+  assert_match("uncaught throw *", e.message)
+  assert_same(tag, e.tag)
+  assert_same(val, e.value)
+end
+
+assert "without catch arguments" do
+  result = catch do |tag1|
+    catch do |tag2|
+      throw tag1, 1
+      flunk("should not reach here 1")
+    end
+    flunk("should not reach here 2")
+  end
+  assert_equal(1, result)
+end
+
+assert "catches across invocation boundaries" do
+  v = 
+  catch :one do
+    v << 1
+    catch :two do
+      v << 2
+      throw :one
+      v << 3
+    end
+    v << 4
+  end
+  assert_equal(1,2, v)
+end
+
+assert "catches in the nested invocation with the same key" do
+  v = 
+  catch :tag do
+    v << 1
+    catch :tag do
+      v << 2
+      throw :tag
+      v << 3
+    end
+    v << 4
+  end
+  assert_equal(1,2,4, v)
+end

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-cmath Added

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-cmath/src Added

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

@@ -0,0 +1,269 @@
+/*
+** cmath.c - Math module with complex numbers
+**
+** See Copyright Notice in mruby.h
+*/
+
+/*
+** This `mruby-cmath` gem uses C99 _Complex features
+** You need C compiler that support C99+
+*/
+
+#include <mruby.h>
+
+#ifdef MRB_NO_FLOAT
+# error CMath conflicts with 'MRB_NO_FLOAT' configuration
+#endif
+
+#include <complex.h>
+
+mrb_value mrb_complex_new(mrb_state *mrb, mrb_float real, mrb_float imag);
+void mrb_complex_get(mrb_state *mrb, mrb_value cpx, mrb_float*, mrb_float*);
+
+static mrb_bool
+cmath_get_complex(mrb_state *mrb, mrb_value c, mrb_float *r, mrb_float *i)
+{
+  if (mrb_integer_p(c)) {
+    *r = (mrb_float)mrb_integer(c);
+    *i = 0;
+    return FALSE;
+  }
+  else if (mrb_float_p(c)) {
+    *r = mrb_float(c);
+    *i = 0;
+    return FALSE;
+  }
+  else if (mrb_obj_is_kind_of(mrb, c, mrb_class_get(mrb, "Complex"))) {
+    mrb_complex_get(mrb, c, r, i);
+    return TRUE;
+  }
+  else {
+    mrb_raise(mrb, E_TYPE_ERROR, "Numeric required");
+    return FALSE;
+  }
+}
+
+#ifdef MRB_USE_FLOAT32
+#define F(x) x##f
+#else
+#define F(x) x
+#endif
+
+#if defined(_WIN32) && !defined(__MINGW32__)
+
+#ifdef MRB_USE_FLOAT32
+typedef _Fcomplex mrb_complex;
+#define CX(r,i) _FCbuild(r,i)
+#else
+typedef _Dcomplex mrb_complex;
+#define CX(r,i) _Cbuild(r,i)
+#endif
+
+static mrb_complex
+CXDIVf(mrb_complex x, mrb_float y)
+{
+  return CX(creal(x)/y, cimag(x)/y);
+}
+
+static mrb_complex
+CXDIVc(mrb_complex a, mrb_complex b)
+{
+  mrb_float ratio, den;
+  mrb_float abr, abi, cr, ci;
+
+  if ((abr = creal(b)) < 0)
+    abr = - abr;
+  if ((abi = cimag(b)) < 0)
+    abi = - abi;
+  if (abr <= abi) {
+    ratio = creal(b) / cimag(b) ;
+    den = cimag(a) * (1 + ratio*ratio);
+    cr = (creal(a)*ratio + cimag(a)) / den;
+    ci = (cimag(a)*ratio - creal(a)) / den;
+  }
+  else {
+    ratio = cimag(b) / creal(b) ;
+    den = creal(a) * (1 + ratio*ratio);
+    cr = (creal(a) + cimag(a)*ratio) / den;
+    ci = (cimag(a) - creal(a)*ratio) / den;
+  }
+  return CX(cr, ci);
+}
+
+#else
+
+#if defined(__cplusplus) && (defined(__APPLE__) || (defined(__clang__) && (defined(__FreeBSD__) || defined(__OpenBSD__))))
+
+#ifdef MRB_USE_FLOAT32
+typedef std::complex<float> mrb_complex;
+#else
+typedef std::complex<double> mrb_complex;
+#endif  /* MRB_USE_FLOAT32 */
+
+#define CX(r,i) mrb_complex(r,i)
+#define creal(c) c.real()
+#define cimag(c) c.imag()
+#define FC(n) F(n)
+
+#else  /* cpp */
+
+#ifdef MRB_USE_FLOAT32
+typedef float _Complex mrb_complex;
+#else
+typedef double _Complex mrb_complex;
+#endif  /*  MRB_USE_FLOAT32 */
+
+#define CX(r,i) ((r)+(i)*_Complex_I)
+#endif
+
+#define CXDIVf(x,y) (x)/(y)
+#define CXDIVc(x,y) (x)/(y)
+
+#endif
+
+#ifndef FC
+#define FC(n) F(c ## n)
+#endif
+
+#define DEF_CMATH_METHOD(name) \
+static mrb_value \
+cmath_ ## name(mrb_state *mrb, mrb_value self)\
+{\
+  mrb_value z = mrb_get_arg1(mrb);\
+  mrb_float real, imag;\
+  if (cmath_get_complex(mrb, z, &real, &imag)) {\
+    mrb_complex c = CX(real,imag);\
+    c = FC(name)(c);\
+    return mrb_complex_new(mrb, creal(c), cimag(c));\
+  }\
+  return mrb_float_value(mrb, F(name)(real));\
+}
+
+/* exp(z): return the exponential of z */
+DEF_CMATH_METHOD(exp)
+
+/* log(z): return the natural logarithm of z, with branch cut along the negative real axis */
+static mrb_value
+cmath_log(mrb_state *mrb, mrb_value self) {
+  mrb_value z;
+  mrb_float base;
+  mrb_float real, imag;
+
+  mrb_int n = mrb_get_args(mrb, "o|f", &z, &base);
+
+#ifndef M_E
+#define M_E F(exp)(1.0)
+#endif
+
+  if (n == 1) base = M_E;
+  if (cmath_get_complex(mrb, z, &real, &imag) || real < 0.0) {
+    mrb_complex c = CX(real,imag);
+    c = FC(log)(c);
+    if (n == 2) c = CXDIVc(c, FC(log)(CX(base,0)));
+    return mrb_complex_new(mrb, creal(c), cimag(c));
+  }
+  if (n == 1) return mrb_float_value(mrb, F(log)(real));
+  return mrb_float_value(mrb, F(log)(real)/F(log)(base));
+}
+
+/* log10(z): return the base-10 logarithm of z, with branch cut along the negative real axis */
+static mrb_value
+cmath_log10(mrb_state *mrb, mrb_value self) {
+  mrb_value z = mrb_get_arg1(mrb);
+  mrb_float real, imag;
+  if (cmath_get_complex(mrb, z, &real, &imag) || real < 0.0) {
+    mrb_complex c = CX(real,imag);
+    c = CXDIVf(FC(log)(c),log(10));
+    return mrb_complex_new(mrb, creal(c), cimag(c));
+  }
+  return mrb_float_value(mrb, F(log10)(real));
+}
+
+/* log2(z): return the base-2 logarithm of z, with branch cut along the negative real axis */
+static mrb_value
+cmath_log2(mrb_state *mrb, mrb_value self) {
+  mrb_value z = mrb_get_arg1(mrb);
+  mrb_float real, imag;
+  if (cmath_get_complex(mrb, z, &real, &imag) || real < 0.0) {
+    mrb_complex c = CX(real,imag);
+    c = CXDIVf(FC(log)(c),log(2.0));
+    return mrb_complex_new(mrb, creal(c), cimag(c));
+  }
+  return mrb_float_value(mrb, F(log2)(real));
+}
+
+/* sqrt(z): return square root of z */
+static mrb_value
+cmath_sqrt(mrb_state *mrb, mrb_value self) {
+  mrb_value z = mrb_get_arg1(mrb);
+  mrb_float real, imag;
+  if (cmath_get_complex(mrb, z, &real, &imag) || real < 0.0) {
+    mrb_complex c = CX(real,imag);
+    c = FC(sqrt)(c);
+    return mrb_complex_new(mrb, creal(c), cimag(c));
+  }
+  return mrb_float_value(mrb, F(sqrt)(real));
+}
+
+/* sin(z): sine function */
+DEF_CMATH_METHOD(sin)
+/* cos(z): cosine function */
+DEF_CMATH_METHOD(cos)
+/* tan(z): tangent function */
+DEF_CMATH_METHOD(tan)
+/* asin(z): arc sine function */
+DEF_CMATH_METHOD(asin)
+/* acos(z): arc cosine function */
+DEF_CMATH_METHOD(acos)
+/* atan(z): arg tangent function */
+DEF_CMATH_METHOD(atan)
+/* sinh(z): hyperbolic sine function */
+DEF_CMATH_METHOD(sinh)
+/* cosh(z): hyperbolic cosine function */
+DEF_CMATH_METHOD(cosh)
+/* tanh(z): hyperbolic tangent function */
+DEF_CMATH_METHOD(tanh)
+/* asinh(z): inverse hyperbolic sine function */
+DEF_CMATH_METHOD(asinh)
+/* acosh(z): inverse hyperbolic cosine function */
+DEF_CMATH_METHOD(acosh)
+/* atanh(z): inverse hyperbolic tangent function */
+DEF_CMATH_METHOD(atanh)
+
+/* ------------------------------------------------------------------------*/
+
+void
+mrb_mruby_cmath_gem_init(mrb_state* mrb)
+{
+  struct RClass *cmath;
+  cmath = mrb_define_module(mrb, "CMath");
+
+  mrb_include_module(mrb, cmath, mrb_module_get(mrb, "Math"));
+
+  mrb_define_module_function(mrb, cmath, "sin", cmath_sin, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "cos", cmath_cos, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "tan", cmath_tan, MRB_ARGS_REQ(1));
+
+  mrb_define_module_function(mrb, cmath, "asin", cmath_asin, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "acos", cmath_acos, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "atan", cmath_atan, MRB_ARGS_REQ(1));
+
+  mrb_define_module_function(mrb, cmath, "sinh", cmath_sinh, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "cosh", cmath_cosh, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "tanh", cmath_tanh, MRB_ARGS_REQ(1));
+
+  mrb_define_module_function(mrb, cmath, "asinh", cmath_asinh, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "acosh", cmath_acosh, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "atanh", cmath_atanh, MRB_ARGS_REQ(1));
+
+  mrb_define_module_function(mrb, cmath, "exp", cmath_exp, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "log", cmath_log, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
+  mrb_define_module_function(mrb, cmath, "log2", cmath_log2, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "log10", cmath_log10, MRB_ARGS_REQ(1));
+  mrb_define_module_function(mrb, cmath, "sqrt", cmath_sqrt, MRB_ARGS_REQ(1));
+}
+
+void
+mrb_mruby_cmath_gem_final(mrb_state* mrb)
+{
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-cmath/test Added

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

@@ -0,0 +1,41 @@
+##
+# CMath Test
+
+def assert_complex(c1, c2)
+  assert('assert_complex') do
+    assert_float(c1.real, c2.real)
+    assert_float(c1.imaginary, c2.imaginary)
+  end
+end
+
+assert('CMath.exp') do
+  assert_float(1.0, CMath.exp(0))
+  assert_complex(-1+0i, CMath.exp(Math::PI.i))
+  assert_complex((-1.1312043837568135+2.4717266720048188i), CMath.exp(1+2i))
+end
+
+assert('CMath.log') do
+  assert_float(0, CMath.log(1))
+  assert_float(3.0, CMath.log(8,2))
+  assert_complex((1.092840647090816-0.42078724841586035i), CMath.log(-8,-2))
+end
+
+assert('CMath.sqrt') do
+  assert_complex(Complex(0,2), CMath.sqrt(-4.0))
+  assert_complex(Complex(0,3), CMath.sqrt(-9.0))
+end
+
+assert('CMath trigonometric_functions') do
+  assert_complex(Math.sinh(2).i, CMath.sin(2i))
+  assert_complex(Math.cosh(2)+0i,   CMath.cos(2i))
+  assert_complex(Math.tanh(2).i, CMath.tan(2i))
+  assert_complex(Math.sin(2).i, CMath.sinh(2i))
+  assert_complex(Math.cos(2)+0i, CMath.cosh(2i))
+  assert_complex(Math.tan(2).i, CMath.tanh(2i))
+  assert_complex(1+1i, CMath.sin(CMath.asin(1+1i)))
+  assert_complex(1+1i, CMath.cos(CMath.acos(1+1i)))
+  assert_complex(1+1i, CMath.tan(CMath.atan(1+1i)))
+  assert_complex(1+1i, CMath.sinh(CMath.asinh(1+1i)))
+  assert_complex(1+1i, CMath.cosh(CMath.acosh(1+1i)))
+  assert_complex(1+1i, CMath.tanh(CMath.atanh(1+1i)))
+end

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-compar-ext/mrbgem.rake -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-compar-ext/mrbgem.rake Changed

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

@@ -4,24 +4,23 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
 #include <mruby.h>
 #include <mruby/compile.h>
 #include <mruby/proc.h>
+#include <mruby/dump.h>
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/debug.h>
+#include <mruby/presym.h>
 #include "node.h"
 #include <mruby/opcode.h>
 #include <mruby/re.h>
 #include <mruby/throw.h>
+#include <ctype.h>
+#include <string.h>
 
 #ifndef MRB_CODEGEN_LEVEL_MAX
-#define MRB_CODEGEN_LEVEL_MAX 1024
+#define MRB_CODEGEN_LEVEL_MAX 256
 #endif
 
 #define MAXARG_S (1<<16)
@@ -39,29 +38,29 @@
 
 struct loopinfo {
   enum looptype type;
-  int pc0, pc1, pc2, pc3, acc;
-  int ensure_level;
+  uint32_t pc0;                 /* `next` destination */
+  uint32_t pc1;                 /* `redo` destination */
+  uint32_t pc2;                 /* `break` destination */
+  int reg;                      /* destination register */
   struct loopinfo *prev;
 };
 
 typedef struct scope {
   mrb_state *mrb;
   mrb_pool *mpool;
-  struct mrb_jmpbuf jmp;
 
   struct scope *prev;
 
   node *lv;
 
   uint16_t sp;
-  uint16_t pc;
-  uint16_t lastpc;
-  uint16_t lastlabel;
-  int ainfo:15;
+  uint32_t pc;
+  uint32_t lastpc;
+  uint32_t lastlabel;
+  size_t ainfo:15;
   mrb_bool mscope:1;
 
   struct loopinfo *loop;
-  int ensure_level;
   mrb_sym filename_sym;
   uint16_t lineno;
 
@@ -70,6 +69,10 @@
   uint32_t icapa;
 
   mrb_irep *irep;
+  mrb_pool_value *pool;
+  mrb_sym *syms;
+  mrb_irep **reps;
+  struct mrb_irep_catch_handler *catch_table;
   uint32_t pcapa, scapa, rcapa;
 
   uint16_t nlocals;
@@ -89,6 +92,15 @@
 static void loop_break(codegen_scope *s, node *tree);
 static void loop_pop(codegen_scope *s, int val);
 
+/*
+ * The search for catch handlers starts at the end of the table in mrb_vm_run().
+ * Therefore, the next handler to be added must meet one of the following conditions.
+ * - Larger start position
+ * - Same start position but smaller end position
+ */
+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);
 
@@ -99,23 +111,42 @@
 codegen_error(codegen_scope *s, const char *message)
 {
   if (!s) return;
-  while (s->prev) {
-    codegen_scope *tmp = s->prev;
-    mrb_free(s->mrb, s->iseq);
-    mrb_free(s->mrb, s->lines);
-    mrb_pool_close(s->mpool);
-    s = tmp;
-  }
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   if (s->filename_sym && s->lineno) {
     const char *filename = mrb_sym_name_len(s->mrb, s->filename_sym, NULL);
-    fprintf(stderr, "codegen error:%s:%d: %s\n", filename, s->lineno, message);
+    fprintf(stderr, "%s:%d: %s\n", filename, s->lineno, message);
   }
   else {
-    fprintf(stderr, "codegen error: %s\n", message);
+    fprintf(stderr, "%s\n", message);
   }
 #endif
-  MRB_THROW(&s->jmp);
+  while (s->prev) {
+    codegen_scope *tmp = s->prev;
+    if (s->irep) {
+      mrb_free(s->mrb, s->iseq);
+      for (int i=0; i<s->irep->plen; i++) {
+        mrb_pool_value *pv = &s->pooli;
+        if ((pv->tt & 0x3) == IREP_TT_STR || pv->tt == IREP_TT_BIGINT) {
+          mrb_free(s->mrb, (void*)pv->u.str);
+        }
+      }
+      mrb_free(s->mrb, s->pool);
+      mrb_free(s->mrb, s->syms);
+      mrb_free(s->mrb, s->catch_table);
+      if (s->reps) {
+        /* copied from mrb_irep_free() in state.c */
+        for (int i=0; i<s->irep->rlen; i++) {
+          if (s->repsi)
+            mrb_irep_decref(s->mrb, (mrb_irep*)s->repsi);
+        }
+        mrb_free(s->mrb, s->reps);
+      }
+      mrb_free(s->mrb, s->lines);
+    }
+    mrb_pool_close(s->mpool);
+    s = tmp;
+  }
+  MRB_THROW(s->mrb->jmp);
 }
 
 static void*
@@ -136,6 +167,14 @@
   return p;
 }
 
+static void
+check_no_ext_ops(codegen_scope *s, uint16_t a, uint16_t b)
+{
+  if (s->parser->no_ext_ops && (a | b) > 0xff) {
+    codegen_error(s, "need OP_EXTs instruction (currently OP_EXTs are prohibited)");
+  }
+}
+
 static int
 new_label(codegen_scope *s)
 {
@@ -145,13 +184,15 @@
 static void
 emit_B(codegen_scope *s, uint32_t pc, uint8_t i)
 {
-  if (pc >= MAXARG_S || s->icapa >= MAXARG_S) {
-    codegen_error(s, "too big code block");
-  }
   if (pc >= s->icapa) {
-    s->icapa *= 2;
-    if (s->icapa > MAXARG_S) {
-      s->icapa = MAXARG_S;
+    if (pc == UINT32_MAX) {
+      codegen_error(s, "too big code block");
+    }
+    if (pc >= UINT32_MAX / 2) {
+      pc = UINT32_MAX;
+    }
+    else {
+      s->icapa *= 2;
     }
     s->iseq = (mrb_code *)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->icapa);
     if (s->lines) {
@@ -202,6 +243,7 @@
 genop_1(codegen_scope *s, mrb_code i, uint16_t a)
 {
   s->lastpc = s->pc;
+  check_no_ext_ops(s, a, 0);
   if (a > 0xff) {
     gen_B(s, OP_EXT1);
     gen_B(s, i);
@@ -217,6 +259,7 @@
 genop_2(codegen_scope *s, mrb_code i, uint16_t a, uint16_t b)
 {
   s->lastpc = s->pc;
+  check_no_ext_ops(s, a, b);
   if (a > 0xff && b > 0xff) {
     gen_B(s, OP_EXT3);
     gen_B(s, i);
@@ -257,6 +300,14 @@
 }
 
 static void
+genop_2SS(codegen_scope *s, mrb_code i, uint16_t a, uint32_t b)
+{
+  genop_1(s, i, a);
+  gen_S(s, b>>16);
+  gen_S(s, b&0xffff);
+}
+
+static void
 genop_W(codegen_scope *s, mrb_code i, uint32_t a)
 {
   uint8_t a1 = (a>>16) & 0xff;
@@ -285,10 +336,12 @@
 mrb_decode_insn(const mrb_code *pc)
 {
   struct mrb_insn_data data = { 0 };
+  if (pc == 0) return data;
+  data.addr = pc;
   mrb_code insn = READ_B();
   uint16_t a = 0;
   uint16_t b = 0;
-  uint8_t  c = 0;
+  uint16_t c = 0;
 
   switch (insn) {
 #define FETCH_Z() /* empty */
@@ -331,13 +384,101 @@
   return data;
 }
 
+#undef OPCODE
+#define Z 1
+#define S 3
+#define W 4
+#define OPCODE(_,x) x,
+/* instruction sizes */
+static uint8_t mrb_insn_size = {
+#define B 2
+#define BB 3
+#define BBB 4
+#define BS 4
+#define BSS 6
+#include "mruby/ops.h"
+#undef B
+#undef BB
+#undef BBB
+#undef BS
+#undef BSS
+};
+/* EXT1 instruction sizes */
+static uint8_t mrb_insn_size1 = {
+#define B 3
+#define BB 4
+#define BBB 5
+#define BS 5
+#define BSS 7
+#include "mruby/ops.h"
+#undef B
+#undef BS
+#undef BSS
+};
+/* EXT2 instruction sizes */
+static uint8_t mrb_insn_size2 = {
+#define B 2
+#define BS 4
+#define BSS 6
+#include "mruby/ops.h"
+#undef B
+#undef BB
+#undef BBB
+#undef BS
+#undef BSS
+};
+/* EXT3 instruction sizes */
+#define B 3
+#define BB 5
+#define BBB 6
+#define BS 5
+#define BSS 7
+static uint8_t mrb_insn_size3 = {
+#include "mruby/ops.h"
+};
+#undef B
+#undef BB
+#undef BBB
+#undef BS
+#undef BSS
+#undef OPCODE
+
+static const mrb_code*
+mrb_prev_pc(codegen_scope *s, const mrb_code *pc)
+{
+  const mrb_code *prev_pc = NULL;
+  const mrb_code *i = s->iseq;
+
+  while (i<pc) {
+    uint8_t insn = i0;
+    prev_pc = i;
+    switch (insn) {
+    case OP_EXT1:
+      i += mrb_insn_size1i1 + 1;
+      break;
+    case OP_EXT2:
+      i += mrb_insn_size2i1 + 1;
+      break;
+    case OP_EXT3:
+      i += mrb_insn_size3i1 + 1;
+      break;
+    default:
+      i += mrb_insn_sizeinsn;
+      break;
+    }
+  }
+  return prev_pc;
+}
+
+#define pc_addr(s) &((s)->iseq(s)->pc)
+#define addr_pc(s, addr) (uint32_t)((addr) - s->iseq)
+#define rewind_pc(s) s->pc = s->lastpc
+
 static struct mrb_insn_data
 mrb_last_insn(codegen_scope *s)
 {
-  if (s->pc == s->lastpc) {
-    struct mrb_insn_data data;
-
-    data.insn = OP_NOP;
+  if (s->pc == 0) {
+    struct mrb_insn_data data = { OP_NOP, 0 };
     return data;
   }
   return mrb_decode_insn(&s->iseqs->lastpc);
@@ -349,57 +490,105 @@
   return no_optimize(s) || s->lastlabel == s->pc || s->pc == 0 || s->pc == s->lastpc;
 }
 
-static uint16_t
-genjmp(codegen_scope *s, mrb_code i, uint16_t pc)
+#define JMPLINK_START UINT32_MAX
+
+static void
+gen_jmpdst(codegen_scope *s, uint32_t pc)
 {
-  uint16_t pos;
 
-  s->lastpc = s->pc;
-  gen_B(s, i);
+  if (pc == JMPLINK_START) {
+    pc = 0;
+  }
+  uint32_t pos2 = s->pc+2;
+  int32_t off = pc - pos2;
+
+  if (off > INT16_MAX || INT16_MIN > off) {
+    codegen_error(s, "too big jump offset");
+  }
+  gen_S(s, (uint16_t)off);
+}
+
+static uint32_t
+genjmp(codegen_scope *s, mrb_code i, uint32_t pc)
+{
+  uint32_t pos;
+
+  genop_0(s, i);
   pos = s->pc;
-  gen_S(s, pc);
+  gen_jmpdst(s, pc);
   return pos;
 }
 
-static uint16_t
-genjmp2(codegen_scope *s, mrb_code i, uint16_t a, int pc, int val)
+#define genjmp_0(s,i) genjmp(s,i,JMPLINK_START)
+
+static uint32_t
+genjmp2(codegen_scope *s, mrb_code i, uint16_t a, uint32_t pc, int val)
 {
-  uint16_t pos;
+  uint32_t pos;
 
   if (!no_peephole(s) && !val) {
     struct mrb_insn_data data = mrb_last_insn(s);
 
-    if (data.insn == OP_MOVE && data.a == a) {
-      s->pc = s->lastpc;
-      a = data.b;
+    switch (data.insn) {
+    case OP_MOVE:
+      if (data.a == a && data.a > s->nlocals) {
+        rewind_pc(s);
+        a = data.b;
+      }
+      break;
+    case OP_LOADNIL:
+    case OP_LOADF:
+      if (data.a == a || data.a > s->nlocals) {
+        s->pc = addr_pc(s, data.addr);
+        if (i == OP_JMPNOT || (i == OP_JMPNIL && data.insn == OP_LOADNIL)) {
+          return genjmp(s, OP_JMP, pc);
+        }
+        else {                  /* OP_JMPIF */
+          return JMPLINK_START;
+        }
+      }
+      break;
+    case OP_LOADT: case OP_LOADI: case OP_LOADINEG: case OP_LOADI__1:
+    case OP_LOADI_0: case OP_LOADI_1: case OP_LOADI_2: case OP_LOADI_3:
+    case OP_LOADI_4: case OP_LOADI_5: case OP_LOADI_6: case OP_LOADI_7:
+      if (data.a == a || data.a > s->nlocals) {
+        s->pc = addr_pc(s, data.addr);
+        if (i == OP_JMPIF) {
+          return genjmp(s, OP_JMP, pc);
+        }
+        else {                  /* OP_JMPNOT and OP_JMPNIL */
+          return JMPLINK_START;
+        }
+      }
+      break;
     }
   }
 
-  s->lastpc = s->pc;
   if (a > 0xff) {
+    check_no_ext_ops(s, a, 0);
     gen_B(s, OP_EXT1);
-    gen_B(s, i);
+    genop_0(s, i);
     gen_S(s, a);
-    pos = s->pc;
-    gen_S(s, pc);
   }
   else {
-    gen_B(s, i);
+    genop_0(s, i);
     gen_B(s, (uint8_t)a);
-    pos = s->pc;
-    gen_S(s, pc);
   }
+  pos = s->pc;
+  gen_jmpdst(s, pc);
   return pos;
 }
 
+#define genjmp2_0(s,i,a,val) genjmp2(s,i,a,JMPLINK_START,val)
+
+static mrb_bool get_int_operand(codegen_scope *s, struct mrb_insn_data *data, mrb_int *ns);
+static void gen_int(codegen_scope *s, uint16_t dst, mrb_int i);
+
 static void
 gen_move(codegen_scope *s, uint16_t dst, uint16_t src, int nopeep)
 {
-  if (no_peephole(s)) {
-  normal:
-    genop_2(s, OP_MOVE, dst, src);
-    return;
-  }
+  if (nopeep || no_peephole(s)) goto normal;
+  else if (dst == src) return;
   else {
     struct mrb_insn_data data = mrb_last_insn(s);
 
@@ -413,22 +602,104 @@
     case OP_LOADI__1:
     case OP_LOADI_0: case OP_LOADI_1: case OP_LOADI_2: case OP_LOADI_3:
     case OP_LOADI_4: case OP_LOADI_5: case OP_LOADI_6: case OP_LOADI_7:
-      if (nopeep || data.a != src || data.a < s->nlocals) goto normal;
-      s->pc = s->lastpc;
+      if (data.a != src || data.a < s->nlocals) goto normal;
+      rewind_pc(s);
       genop_1(s, data.insn, dst);
-      break;
-    case OP_LOADI: case OP_LOADINEG: case OP_LOADL: case OP_LOADSYM:
+      return;
+    case OP_HASH: case OP_ARRAY:
+      if (data.b != 0) goto normal;
+      /* fall through */
+    case OP_LOADI: case OP_LOADINEG:
+    case OP_LOADL: case OP_LOADSYM:
     case OP_GETGV: case OP_GETSV: case OP_GETIV: case OP_GETCV:
     case OP_GETCONST: case OP_STRING:
     case OP_LAMBDA: case OP_BLOCK: case OP_METHOD: case OP_BLKPUSH:
-      if (nopeep || data.a != src || data.a < s->nlocals) goto normal;
-      s->pc = s->lastpc;
+      if (data.a != src || data.a < s->nlocals) goto normal;
+      rewind_pc(s);
       genop_2(s, data.insn, dst, data.b);
-      break;
+      return;
+    case OP_LOADI16:
+      if (data.a != src || data.a < s->nlocals) goto normal;
+      rewind_pc(s);
+      genop_2S(s, data.insn, dst, data.b);
+      return;
+    case OP_LOADI32:
+      if (data.a != src || data.a < s->nlocals) goto normal;
+      else {
+        uint32_t i = (uint32_t)data.b<<16|data.c;
+        rewind_pc(s);
+        genop_2SS(s, data.insn, dst, i);
+      }
+      return;
+    case OP_AREF:
+    case OP_GETUPVAR:
+      if (data.a != src || data.a < s->nlocals) goto normal;
+      rewind_pc(s);
+      genop_3(s, data.insn, dst, data.b, data.c);
+      return;
+    case OP_ADDI: case OP_SUBI:
+      if (addr_pc(s, data.addr) == s->lastlabel || data.a != src || data.a < s->nlocals) goto normal;
+      else {
+        struct mrb_insn_data data0 = mrb_decode_insn(mrb_prev_pc(s, data.addr));
+        if (data0.insn != OP_MOVE || data0.a != data.a || data0.b != dst) goto normal;
+        s->pc = addr_pc(s, data0.addr);
+        if (addr_pc(s, data0.addr) != s->lastlabel) {
+          /* constant folding */
+          data0 = mrb_decode_insn(mrb_prev_pc(s, data0.addr));
+          mrb_int n;
+          if (data0.a == dst && get_int_operand(s, &data0, &n)) {
+            if ((data.insn == OP_ADDI && !mrb_int_add_overflow(n, data.b, &n)) ||
+                (data.insn == OP_SUBI && !mrb_int_sub_overflow(n, data.b, &n))) {
+              s->pc = addr_pc(s, data0.addr);
+              gen_int(s, dst, n);
+              return;
+            }
+          }
+        }
+      }
+      genop_2(s, data.insn, dst, data.b);
+      return;
     default:
-      goto normal;
+      break;
+    }
+  }
+ normal:
+  genop_2(s, OP_MOVE, dst, src);
+  return;
+}
+
+static int search_upvar(codegen_scope *s, mrb_sym id, int *idx);
+
+static void
+gen_getupvar(codegen_scope *s, uint16_t dst, mrb_sym id)
+{
+  int idx;
+  int lv = search_upvar(s, id, &idx);
+
+  if (!no_peephole(s)) {
+    struct mrb_insn_data data = mrb_last_insn(s);
+    if (data.insn == OP_SETUPVAR && data.a == dst && data.b == idx && data.c == lv) {
+      /* skip GETUPVAR right after SETUPVAR */
+      return;
+    }
+  }
+  genop_3(s, OP_GETUPVAR, dst, idx, lv);
+}
+
+static void
+gen_setupvar(codegen_scope *s, uint16_t dst, mrb_sym id)
+{
+  int idx;
+  int lv = search_upvar(s, id, &idx);
+
+  if (!no_peephole(s)) {
+    struct mrb_insn_data data = mrb_last_insn(s);
+    if (data.insn == OP_MOVE && data.a == dst) {
+      dst = data.b;
+      rewind_pc(s);
     }
   }
+  genop_3(s, OP_SETUPVAR, dst, idx, lv);
 }
 
 static void
@@ -441,7 +712,7 @@
     struct mrb_insn_data data = mrb_last_insn(s);
 
     if (data.insn == OP_MOVE && src == data.a) {
-      s->pc = s->lastpc;
+      rewind_pc(s);
       genop_1(s, op, data.b);
     }
     else if (data.insn != OP_RETURN) {
@@ -450,6 +721,55 @@
   }
 }
 
+static mrb_bool
+get_int_operand(codegen_scope *s, struct mrb_insn_data *data, mrb_int *n)
+{
+  switch (data->insn) {
+  case OP_LOADI__1:
+    *n = -1;
+    return TRUE;
+
+  case OP_LOADINEG:
+    *n = -data->b;
+    return TRUE;
+
+  case OP_LOADI_0: case OP_LOADI_1: case OP_LOADI_2: case OP_LOADI_3:
+  case OP_LOADI_4: case OP_LOADI_5: case OP_LOADI_6: case OP_LOADI_7:
+    *n = data->insn - OP_LOADI_0;
+    return TRUE;
+
+  case OP_LOADI:
+  case OP_LOADI16:
+    *n = (int16_t)data->b;
+    return TRUE;
+
+  case OP_LOADI32:
+    *n = (mrb_int)((uint32_t)data->b<<16)+data->c;
+    return TRUE;
+
+  case OP_LOADL:
+    {
+      mrb_pool_value *pv = &s->pooldata->b;
+
+      if (pv->tt == IREP_TT_INT32) {
+        *n = (mrb_int)pv->u.i32;
+      }
+#ifdef MRB_INT64
+      else if (pv->tt == IREP_TT_INT64) {
+        *n = (mrb_int)pv->u.i64;
+      }
+#endif
+      else {
+        return FALSE;
+      }
+    }
+    return TRUE;
+
+  default:
+    return FALSE;
+  }
+}
+
 static void
 gen_addsub(codegen_scope *s, uint8_t op, uint16_t dst)
 {
@@ -460,49 +780,155 @@
   }
   else {
     struct mrb_insn_data data = mrb_last_insn(s);
+    mrb_int n;
 
-    switch (data.insn) {
-    case OP_LOADI__1:
-      if (op == OP_ADD) op = OP_SUB;
-      else op = OP_ADD;
-      data.b = 1;
-      goto replace;
-    case OP_LOADI_0: case OP_LOADI_1: case OP_LOADI_2: case OP_LOADI_3:
-    case OP_LOADI_4: case OP_LOADI_5: case OP_LOADI_6: case OP_LOADI_7:
-      data.b = data.insn - OP_LOADI_0;
-      /* fall through */
-    case OP_LOADI:
-    replace:
-      if (data.b >= 128) goto normal;
-      s->pc = s->lastpc;
-      if (op == OP_ADD) {
-        genop_2(s, OP_ADDI, dst, (uint8_t)data.b);
+    if (!get_int_operand(s, &data, &n)) {
+      /* not integer immediate */
+      goto normal;
+    }
+    struct mrb_insn_data data0 = mrb_decode_insn(mrb_prev_pc(s, data.addr));
+    mrb_int n0;
+    if (addr_pc(s, data.addr) == s->lastlabel || !get_int_operand(s, &data0, &n0)) {
+      /* OP_ADDI/OP_SUBI takes upto 8bits */
+      if (n > INT8_MAX || n < INT8_MIN) goto normal;
+      rewind_pc(s);
+      if (n == 0) return;
+      if (n > 0) {
+        if (op == OP_ADD) genop_2(s, OP_ADDI, dst, (uint16_t)n);
+        else genop_2(s, OP_SUBI, dst, (uint16_t)n);
+      }
+      else {                    /* n < 0 */
+        n = -n;
+        if (op == OP_ADD) genop_2(s, OP_SUBI, dst, (uint16_t)n);
+        else genop_2(s, OP_ADDI, dst, (uint16_t)n);
+      }
+      return;
+    }
+    if (op == OP_ADD) {
+      if (mrb_int_add_overflow(n0, n, &n)) goto normal;
+    }
+    else { /* OP_SUB */
+      if (mrb_int_sub_overflow(n0, n, &n)) goto normal;
+    }
+    s->pc = addr_pc(s, data0.addr);
+    gen_int(s, dst, n);
+  }
+}
+
+static void
+gen_muldiv(codegen_scope *s, uint8_t op, uint16_t dst)
+{
+  if (no_peephole(s)) {
+  normal:
+    genop_1(s, op, dst);
+    return;
+  }
+  else {
+    struct mrb_insn_data data = mrb_last_insn(s);
+    mrb_int n, n0;
+    if (addr_pc(s, data.addr) == s->lastlabel || !get_int_operand(s, &data, &n)) {
+      /* not integer immediate */
+      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) {
+      goto normal;
+    }
+    if (op == OP_MUL) {
+      if (mrb_int_mul_overflow(n0, n, &n)) goto normal;
+    }
+    else { /* OP_DIV */
+      if (n0 == MRB_INT_MIN && n == -1) goto normal;
+      n = mrb_div_int(s->mrb, n0, n);
+    }
+    s->pc = addr_pc(s, data0.addr);
+    gen_int(s, dst, n);
+  }
+}
+
+mrb_bool mrb_num_shift(mrb_state *mrb, mrb_int val, mrb_int width, mrb_int *num);
+
+static mrb_bool
+gen_binop(codegen_scope *s, mrb_sym op, uint16_t dst)
+{
+  if (no_peephole(s)) return FALSE;
+  else if (op == MRB_OPSYM_2(s->mrb, aref)) {
+    genop_1(s, OP_GETIDX, dst);
+    return TRUE;
+  }
+  else {
+    struct mrb_insn_data data = mrb_last_insn(s);
+    mrb_int n, n0;
+    if (addr_pc(s, data.addr) == s->lastlabel || !get_int_operand(s, &data, &n)) {
+      /* not integer immediate */
+      return FALSE;
+    }
+    struct mrb_insn_data data0 = mrb_decode_insn(mrb_prev_pc(s, data.addr));
+    if (!get_int_operand(s, &data0, &n0)) {
+      return FALSE;
+    }
+    if (op == MRB_OPSYM_2(s->mrb, lshift)) {
+      if (!mrb_num_shift(s->mrb, n0, n, &n)) return FALSE;
+    }
+    else if (op == MRB_OPSYM_2(s->mrb, rshift)) {
+      if (n == MRB_INT_MIN) return FALSE;
+      if (!mrb_num_shift(s->mrb, n0, -n, &n)) return FALSE;
+    }
+    else if (op == MRB_OPSYM_2(s->mrb, mod) && n != 0) {
+      if (n0 == MRB_INT_MIN && n == -1) {
+        n = 0;
       }
       else {
-        genop_2(s, OP_SUBI, dst, (uint8_t)data.b);
+        mrb_int n1 = n0 % n;
+        if ((n0 < 0) != (n < 0) && n1 != 0) {
+          n1 += n;
+        }
+        n = n1;
       }
-      break;
-    default:
-      goto normal;
     }
+    else if (op == MRB_OPSYM_2(s->mrb, and)) {
+      n = n0 & n;
+    }
+    else if (op == MRB_OPSYM_2(s->mrb, or)) {
+      n = n0 | n;
+    }
+    else if (op == MRB_OPSYM_2(s->mrb, xor)) {
+      n = n0 ^ n;
+    }
+    else {
+      return FALSE;
+    }
+    s->pc = addr_pc(s, data0.addr);
+    gen_int(s, dst, n);
+    return TRUE;
   }
 }
 
-static int
-dispatch(codegen_scope *s, uint16_t pos0)
+static uint32_t
+dispatch(codegen_scope *s, uint32_t pos0)
 {
-  uint16_t newpos;
+  int32_t pos1;
+  int32_t offset;
+  int16_t newpos;
 
+  if (pos0 == JMPLINK_START) return 0;
+
+  pos1 = pos0 + 2;
+  offset = s->pc - pos1;
+  if (offset > INT16_MAX) {
+    codegen_error(s, "too big jmp offset");
+  }
   s->lastlabel = s->pc;
-  newpos = PEEK_S(s->iseq+pos0);
-  emit_S(s, pos0, s->pc);
-  return newpos;
+  newpos = (int16_t)PEEK_S(s->iseq+pos0);
+  emit_S(s, pos0, (uint16_t)offset);
+  if (newpos == 0) return 0;
+  return pos1+newpos;
 }
 
 static void
-dispatch_linked(codegen_scope *s, uint16_t pos)
+dispatch_linked(codegen_scope *s, uint32_t pos)
 {
-  if (pos==0) return;
+  if (pos==JMPLINK_START) return;
   for (;;) {
     pos = dispatch(s, pos);
     if (pos==0) break;
@@ -526,50 +952,100 @@
   if ((int)s->sp-n < 0) {
     codegen_error(s, "stack pointer underflow");
   }
-  s->sp-=n;
-}
+  s->sp-=n;
+}
+
+#define push() push_n_(s,1)
+#define push_n(n) push_n_(s,n)
+#define pop() pop_n_(s,1)
+#define pop_n(n) pop_n_(s,n)
+#define cursp() (s->sp)
+
+static int
+new_litbn(codegen_scope *s, const char *p, int base, mrb_bool neg)
+{
+  int i;
+  size_t plen;
+  mrb_pool_value *pv;
+
+  plen = strlen(p);
+  if (plen > 255) {
+    codegen_error(s, "integer too big");
+  }
+  for (i=0; i<s->irep->plen; i++) {
+    size_t len;
+    pv = &s->pooli;
+    if (pv->tt != IREP_TT_BIGINT) continue;
+    len = pv->u.str0;
+    if (len == plen && pv->u.str1 == base && memcmp(pv->u.str+2, p, len) == 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);
+  }
 
-#define push() push_n_(s,1)
-#define push_n(n) push_n_(s,n)
-#define pop() pop_n_(s,1)
-#define pop_n(n) pop_n_(s,n)
-#define cursp() (s->sp)
+  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 inline int
+static int
 new_lit(codegen_scope *s, mrb_value val)
 {
   int i;
-  mrb_value *pv;
+  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->irep->pooli;
-
-      if (!mrb_string_p(*pv)) continue;
-      if ((len = RSTRING_LEN(*pv)) != RSTRING_LEN(val)) continue;
-      if (memcmp(RSTRING_PTR(*pv), RSTRING_PTR(val), len) == 0)
+      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_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
     for (i=0; i<s->irep->plen; i++) {
       mrb_float f1, f2;
-      pv = &s->irep->pooli;
-      if (!mrb_float_p(*pv)) continue;
-      f1 = mrb_float(*pv);
+      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_FIXNUM:
+  case MRB_TT_INTEGER:
     for (i=0; i<s->irep->plen; i++) {
-      pv = &s->irep->pooli;
-      if (!mrb_fixnum_p(*pv)) continue;
-      if (mrb_fixnum(*pv) == mrb_fixnum(val)) return 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:
@@ -579,26 +1055,43 @@
 
   if (s->irep->plen == s->pcapa) {
     s->pcapa *= 2;
-    s->irep->pool = (mrb_value *)codegen_realloc(s, s->irep->pool, sizeof(mrb_value)*s->pcapa);
+    s->pool = (mrb_pool_value*)codegen_realloc(s, s->pool, sizeof(mrb_pool_value)*s->pcapa);
   }
 
-  pv = &s->irep->pools->irep->plen;
+  pv = &s->pools->irep->plen;
   i = s->irep->plen++;
 
   switch (mrb_type(val)) {
   case MRB_TT_STRING:
-    *pv = mrb_str_pool(s->mrb, RSTRING_PTR(val), RSTRING_LEN(val), RSTR_NOFREE_P(RSTRING(val)));
+    if (RSTR_NOFREE_P(RSTRING(val))) {
+      pv->tt = (uint32_t)(RSTRING_LEN(val)<<2) | IREP_TT_SSTR;
+      pv->u.str = RSTRING_PTR(val);
+    }
+    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;
+    }
     break;
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
-#ifdef MRB_WORD_BOXING
-    *pv = mrb_float_pool(s->mrb, mrb_float(val));
+    pv->tt = IREP_TT_FLOAT;
+    pv->u.f = mrb_float(val);
     break;
 #endif
+  case MRB_TT_INTEGER:
+#ifdef MRB_INT64
+    pv->tt = IREP_TT_INT64;
+    pv->u.i64 = mrb_integer(val);
+#else
+    pv->tt = IREP_TT_INT32;
+    pv->u.i32 = mrb_integer(val);
 #endif
-  case MRB_TT_FIXNUM:
-    *pv = val;
     break;
 
   default:
@@ -608,9 +1101,6 @@
   return i;
 }
 
-/* maximum symbol numbers */
-#define MAXSYMLEN 0x10000
-
 static int
 new_sym(codegen_scope *s, mrb_sym sym)
 {
@@ -620,16 +1110,79 @@
 
   len = s->irep->slen;
   for (i=0; i<len; i++) {
-    if (s->irep->symsi == sym) return i;
+    if (s->symsi == sym) return i;
   }
   if (s->irep->slen >= s->scapa) {
     s->scapa *= 2;
-    s->irep->syms = (mrb_sym*)codegen_realloc(s, s->irep->syms, sizeof(mrb_sym)*s->scapa);
+    if (s->scapa > 0xffff) {
+      codegen_error(s, "too many symbols");
+    }
+    s->syms = (mrb_sym*)codegen_realloc(s, s->syms, sizeof(mrb_sym)*s->scapa);
   }
-  s->irep->symss->irep->slen = sym;
+  s->symss->irep->slen = sym;
   return s->irep->slen++;
 }
 
+static void
+gen_setxv(codegen_scope *s, uint8_t op, uint16_t dst, mrb_sym sym, int val)
+{
+  int idx = new_sym(s, sym);
+  if (!val && !no_peephole(s)) {
+    struct mrb_insn_data data = mrb_last_insn(s);
+    if (data.insn == OP_MOVE && data.a == dst) {
+      dst = data.b;
+      rewind_pc(s);
+    }
+  }
+  genop_2(s, op, dst, idx);
+}
+
+static void
+gen_int(codegen_scope *s, uint16_t dst, mrb_int i)
+{
+  if (i < 0) {
+    if (i == -1) genop_1(s, OP_LOADI__1, dst);
+    else if (i >= -0xff) genop_2(s, OP_LOADINEG, dst, (uint16_t)-i);
+    else if (i >= INT16_MIN) genop_2S(s, OP_LOADI16, dst, (uint16_t)i);
+    else if (i >= INT32_MIN) genop_2SS(s, OP_LOADI32, dst, (uint32_t)i);
+    else goto int_lit;
+  }
+  else if (i < 8) genop_1(s, OP_LOADI_0 + (uint8_t)i, dst);
+  else if (i <= 0xff) genop_2(s, OP_LOADI, dst, (uint16_t)i);
+  else if (i <= INT16_MAX) genop_2S(s, OP_LOADI16, dst, (uint16_t)i);
+  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)));
+  }
+}
+
+static mrb_bool
+gen_uniop(codegen_scope *s, mrb_sym sym, uint16_t dst)
+{
+  if (no_peephole(s)) return FALSE;
+  struct mrb_insn_data data = mrb_last_insn(s);
+  mrb_int n;
+
+  if (!get_int_operand(s, &data, &n)) return FALSE;
+  if (sym == MRB_OPSYM_2(s->mrb, plus)) {
+    /* unary plus does nothing */
+  }
+  else if (sym == MRB_OPSYM_2(s->mrb, minus)) {
+    if (n == MRB_INT_MIN) return FALSE;
+    n = -n;
+  }
+  else if (sym == MRB_OPSYM_2(s->mrb, neg)) {
+    n = ~n;
+  }
+  else {
+    return FALSE;
+  }
+  s->pc = addr_pc(s, data.addr);
+  gen_int(s, dst, n);
+  return TRUE;
+}
+
 static int
 node_len(node *tree)
 {
@@ -665,7 +1218,7 @@
 static int
 search_upvar(codegen_scope *s, mrb_sym id, int *idx)
 {
-  struct RProc *u;
+  const struct RProc *u;
   int lv = 0;
   codegen_scope *up = s->prev;
 
@@ -681,13 +1234,17 @@
   if (lv < 1) lv = 1;
   u = s->parser->upper;
   while (u && !MRB_PROC_CFUNC_P(u)) {
-    struct mrb_irep *ir = u->body.irep;
+    const struct mrb_irep *ir = u->body.irep;
     uint_fast16_t n = ir->nlocals;
-    const struct mrb_locals *v = ir->lv;
-    for (; n > 1; n --, v ++) {
-      if (v->name == id) {
-        *idx = v->r;
-        return lv - 1;
+    int i;
+
+    const mrb_sym *v = ir->lv;
+    if (v) {
+      for (i=1; n > 1; n--, v++, i++) {
+        if (*v == id) {
+          *idx = i;
+          return lv - 1;
+        }
       }
     }
     if (MRB_PROC_SCOPE_P(u)) break;
@@ -725,7 +1282,7 @@
   }
   /* construct loop */
   lp = loop_push(s, LOOP_FOR);
-  lp->pc2 = new_label(s);
+  lp->pc1 = new_label(s);
 
   /* loop body */
   codegen(s, tree->cdr->cdr->car, VAL);
@@ -737,7 +1294,7 @@
   genop_2(s, OP_BLOCK, cursp(), s->irep->rlen-1);
   push();pop(); /* space for a block */
   pop();
-  idx = new_sym(s, mrb_intern_lit(s->mrb, "each"));
+  idx = new_sym(s, MRB_SYM_2(s->mrb, each));
   genop_3(s, OP_SENDB, cursp(), idx, 0);
 }
 
@@ -756,11 +1313,12 @@
   tree = tree->cdr;
   if (tree->car == NULL) {
     genop_W(s, OP_ENTER, 0);
+    s->ainfo = 0;
   }
   else {
     mrb_aspec a;
-    int ma, oa, ra, pa, ka, kd, ba;
-    int pos, i;
+    int ma, oa, ra, pa, ka, kd, ba, i;
+    uint32_t pos;
     node *opt;
     node *margs, *pargs;
     node *tail;
@@ -774,7 +1332,7 @@
     oa = node_len(tree->car->cdr->car);
     /* rest argument? */
     ra = tree->car->cdr->cdr->car ? 1 : 0;
-    /* mandatory arugments after rest argument */
+    /* mandatory arguments after rest argument */
     pa = node_len(tree->car->cdr->cdr->cdr->car);
     pargs = tree->car->cdr->cdr->cdr->car;
     /* keyword arguments */
@@ -787,25 +1345,27 @@
     if (ma > 0x1f || oa > 0x1f || pa > 0x1f || ka > 0x1f) {
       codegen_error(s, "too many formal arguments");
     }
+    /* (23bits = 5:5:1:5:5:1:1) */
     a = MRB_ARGS_REQ(ma)
       | MRB_ARGS_OPT(oa)
       | (ra? MRB_ARGS_REST() : 0)
       | MRB_ARGS_POST(pa)
       | MRB_ARGS_KEY(ka, kd)
       | (ba? MRB_ARGS_BLOCK() : 0);
-    s->ainfo = (((ma+oa) & 0x3f) << 7) /* (12bits = 5:1:5:1) */
+    genop_W(s, OP_ENTER, a);
+    /* (12bits = 5:1:5:1) */
+    s->ainfo = (((ma+oa) & 0x3f) << 7)
       | ((ra & 0x1) << 6)
       | ((pa & 0x1f) << 1)
-      | ((ka | kd) != 0 ? 0x01 : 0x00);
-    genop_W(s, OP_ENTER, a);
+      | ((ka | kd) ? 1 : 0);
     /* generate jump table for optional arguments initializer */
     pos = new_label(s);
     for (i=0; i<oa; i++) {
       new_label(s);
-      genjmp(s, OP_JMP, 0);
+      genjmp_0(s, OP_JMP);
     }
     if (oa > 0) {
-      genjmp(s, OP_JMP, 0);
+      genjmp_0(s, OP_JMP);
     }
     opt = tree->car->cdr->car;
     i = 0;
@@ -821,8 +1381,7 @@
         gen_move(s, idx, cursp(), 0);
       }
       else {
-        int lv = search_upvar(s, id, &idx);
-        genop_3(s, OP_GETUPVAR, cursp(), idx, lv);
+        gen_getupvar(s, cursp(), id);
       }
       i++;
       opt = opt->cdr;
@@ -852,7 +1411,7 @@
         if (def_arg) {
           int idx;
           genop_2(s, OP_KEY_P, lv_idx(s, kwd_sym), new_sym(s, kwd_sym));
-          jmpif_key_p = genjmp2(s, OP_JMPIF, lv_idx(s, kwd_sym), 0, 0);
+          jmpif_key_p = genjmp2_0(s, OP_JMPIF, lv_idx(s, kwd_sym), NOVAL);
           codegen(s, def_arg, VAL);
           pop();
           idx = lv_idx(s, kwd_sym);
@@ -860,10 +1419,9 @@
             gen_move(s, idx, cursp(), 0);
           }
           else {
-            int lv = search_upvar(s, kwd_sym, &idx);
-            genop_3(s, OP_GETUPVAR, cursp(), idx, lv);
+            gen_getupvar(s, cursp(), kwd_sym);
           }
-          jmp_def_set = genjmp(s, OP_JMP, 0);
+          jmp_def_set = genjmp_0(s, OP_JMP);
           dispatch(s, jmpif_key_p);
         }
         genop_2(s, OP_KARG, lv_idx(s, kwd_sym), new_sym(s, kwd_sym));
@@ -893,7 +1451,7 @@
       }
     }
     if (pargs) {
-      node *n = margs;
+      node *n = pargs;
 
       pos = ma+oa+ra+1;
       while (n) {
@@ -967,155 +1525,244 @@
   return mrb_intern(s->mrb, name2, len+1);
 }
 
-#define CALL_MAXARGS 127
+#define CALL_MAXARGS 15
+#define GEN_LIT_ARY_MAX 64
+#define GEN_VAL_STACK_MAX 99
 
 static int
-gen_values(codegen_scope *s, node *t, int val, int extra)
+gen_values(codegen_scope *s, node *t, int val, int extra, int limit)
 {
   int n = 0;
-  int is_splat;
+  int first = 1;
+  int slimit = GEN_VAL_STACK_MAX;
+
+  if (limit == 0) limit = GEN_LIT_ARY_MAX;
+  if (cursp() >= slimit) slimit = INT16_MAX;
+
+  if (!val) {
+    while (t) {
+      codegen(s, t->car, NOVAL);
+      n++;
+      t = t->cdr;
+    }
+    return n;
+  }
 
   while (t) {
-    is_splat = nint(t->car->car) == NODE_SPLAT; /* splat mode */
-    if (
-      n+extra >= CALL_MAXARGS - 1 /* need to subtract one because vm.c expects an array if n == CALL_MAXARGS */
-      || is_splat) {
-      if (val) {
-        if (is_splat && n == 0 && nint(t->car->cdr->car) == NODE_ARRAY) {
-          codegen(s, t->car->cdr, VAL);
-          pop();
+    int is_splat = nint(t->car->car) == NODE_SPLAT;
+
+    if (is_splat || n+extra >= limit-1 || cursp() >= slimit) { /* flush stack */
+      pop_n(n);
+      if (first) {
+        if (n == 0) {
+          genop_1(s, OP_LOADNIL, cursp());
         }
         else {
-          pop_n(n);
-          if (n == 0 && is_splat) {
-            genop_1(s, OP_LOADNIL, cursp());
-          }
-          else {
-            genop_2(s, OP_ARRAY, cursp(), n);
-          }
-          push();
-          codegen(s, t->car, VAL);
-          pop(); pop();
-          if (is_splat) {
-            genop_1(s, OP_ARYCAT, cursp());
-          }
-          else {
-            genop_1(s, OP_ARYPUSH, cursp());
-          }
-        }
-        t = t->cdr;
-        while (t) {
-          push();
-          codegen(s, t->car, VAL);
-          pop(); pop();
-          if (nint(t->car->car) == NODE_SPLAT) {
-            genop_1(s, OP_ARYCAT, cursp());
-          }
-          else {
-            genop_1(s, OP_ARYPUSH, cursp());
-          }
-          t = t->cdr;
+          genop_2(s, OP_ARRAY, cursp(), n);
         }
+        push();
+        first = 0;
+        limit = GEN_LIT_ARY_MAX;
       }
-      else {
-        while (t) {
-          codegen(s, t->car, NOVAL);
-          t = t->cdr;
-        }
+      else if (n > 0) {
+        pop();
+        genop_2(s, OP_ARYPUSH, cursp(), n);
+        push();
       }
-      return -1;
+      n = 0;
     }
-    /* normal (no splat) mode */
     codegen(s, t->car, val);
-    n++;
+    if (is_splat) {
+      pop(); pop();
+      genop_1(s, OP_ARYCAT, cursp());
+      push();
+    }
+    else {
+      n++;
+    }
     t = t->cdr;
   }
+  if (!first) {
+    pop();
+    if (n > 0) {
+      pop_n(n);
+      genop_2(s, OP_ARYPUSH, cursp(), n);
+    }
+    return -1;                  /* variable length */
+  }
   return n;
 }
 
+static int
+gen_hash(codegen_scope *s, node *tree, int val, int limit)
+{
+  int slimit = GEN_VAL_STACK_MAX;
+  if (cursp() >= GEN_LIT_ARY_MAX) slimit = INT16_MAX;
+  int len = 0;
+  mrb_bool update = FALSE;
+
+  while (tree) {
+    if (nint(tree->car->car->car) == NODE_KW_REST_ARGS) {
+      if (val && len > 0) {
+        pop_n(len*2);
+        if (!update) {
+          genop_2(s, OP_HASH, cursp(), len);
+        }
+        else {
+          pop();
+          genop_2(s, OP_HASHADD, cursp(), len);
+        }
+        push();
+      }
+      codegen(s, tree->car->cdr, val);
+      if (val && (len > 0 || update)) {
+        pop(); pop();
+        genop_1(s, OP_HASHCAT, cursp());
+        push();
+      }
+      update = TRUE;
+      len = 0;
+    }
+    else {
+      codegen(s, tree->car->car, val);
+      codegen(s, tree->car->cdr, val);
+      len++;
+    }
+    tree = tree->cdr;
+    if (val && cursp() >= slimit) {
+      pop_n(len*2);
+      if (!update) {
+        genop_2(s, OP_HASH, cursp(), len);
+      }
+      else {
+        pop();
+        genop_2(s, OP_HASHADD, cursp(), len);
+      }
+      push();
+      update = TRUE;
+      len = 0;
+    }
+  }
+  if (update) {
+    if (val && len > 0) {
+      pop_n(len*2+1);
+      genop_2(s, OP_HASHADD, cursp(), len);
+      push();
+    }
+    return -1;                  /* variable length */
+  }
+  return len;
+}
+
 static void
 gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
 {
   mrb_sym sym = name ? name : nsym(tree->cdr->car);
-  int skip = 0;
-  int n = 0, noop = 0, sendv = 0, blk = 0;
+  int skip = 0, n = 0, nk = 0, noop = 0, noself = 0, blk = 0, sp_save = cursp();
 
-  codegen(s, tree->car, VAL); /* receiver */
+  if (!tree->car) {
+    noself = noop = 1;
+    push();
+  }
+  else {
+    codegen(s, tree->car, VAL); /* receiver */
+  }
   if (safe) {
     int recv = cursp()-1;
     gen_move(s, cursp(), recv, 1);
-    skip = genjmp2(s, OP_JMPNIL, cursp(), 0, val);
+    skip = genjmp2_0(s, OP_JMPNIL, cursp(), val);
   }
   tree = tree->cdr->cdr->car;
   if (tree) {
-    n = gen_values(s, tree->car, VAL, sp?1:0);
-    if (n < 0) {
-      n = noop = sendv = 1;
-      push();
+    if (tree->car) {            /* positional arguments */
+      n = gen_values(s, tree->car, VAL, sp?1:0, 14);
+      if (n < 0) {              /* variable length */
+        noop = 1;               /* not operator */
+        n = 15;
+        push();
+      }
+    }
+    if (tree->cdr->car) {       /* keyword arguments */
+      noop = 1;
+      nk = gen_hash(s, tree->cdr->car->cdr, VAL, 14);
+      if (nk < 0) nk = 15;
     }
   }
-  if (sp) {                     /* last argument pushed (attr=) */
-    if (sendv) {
+  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_1(s, OP_ARYPUSH, cursp());
+      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) {
-    noop = 1;
-    codegen(s, tree->cdr, VAL);
+  if (tree && tree->cdr && tree->cdr->cdr) {
+    codegen(s, tree->cdr->cdr, VAL);
     pop();
+    noop = 1;
     blk = 1;
   }
   push();pop();
-  pop_n(n+1);
-  {
-    mrb_int symlen;
-    const char *symname = mrb_sym_name_len(s->mrb, sym, &symlen);
-
-    if (!noop && symlen == 1 && symname0 == '+' && n == 1)  {
-      gen_addsub(s, OP_ADD, cursp());
-    }
-    else if (!noop && symlen == 1 && symname0 == '-' && n == 1)  {
-      gen_addsub(s, OP_SUB, cursp());
-    }
-    else if (!noop && symlen == 1 && symname0 == '*' && n == 1)  {
-      genop_1(s, OP_MUL, cursp());
-    }
-    else if (!noop && symlen == 1 && symname0 == '/' && n == 1)  {
-      genop_1(s, OP_DIV, cursp());
-    }
-    else if (!noop && symlen == 1 && symname0 == '<' && n == 1)  {
-      genop_1(s, OP_LT, cursp());
-    }
-    else if (!noop && symlen == 2 && symname0 == '<' && symname1 == '=' && n == 1)  {
-      genop_1(s, OP_LE, cursp());
-    }
-    else if (!noop && symlen == 1 && symname0 == '>' && n == 1)  {
-      genop_1(s, OP_GT, cursp());
-    }
-    else if (!noop && symlen == 2 && symname0 == '>' && symname1 == '=' && n == 1)  {
-      genop_1(s, OP_GE, cursp());
-    }
-    else if (!noop && symlen == 2 && symname0 == '=' && symname1 == '=' && n == 1)  {
-      genop_1(s, OP_EQ, cursp());
-    }
-    else {
-      int idx = new_sym(s, sym);
-
-      if (sendv) {
-        genop_2(s, blk ? OP_SENDVB : OP_SENDV, cursp(), idx);
-      }
-      else {
-        genop_3(s, blk ? OP_SENDB : OP_SEND, cursp(), idx, n);
-      }
-    }
+  s->sp = sp_save;
+  if (!noop && sym == MRB_OPSYM_2(s->mrb, add) && n == 1)  {
+    gen_addsub(s, OP_ADD, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, sub) && n == 1)  {
+    gen_addsub(s, OP_SUB, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, mul) && n == 1)  {
+    gen_muldiv(s, OP_MUL, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, div) && n == 1)  {
+    gen_muldiv(s, OP_DIV, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, lt) && n == 1)  {
+    genop_1(s, OP_LT, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, le) && n == 1)  {
+    genop_1(s, OP_LE, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, gt) && n == 1)  {
+    genop_1(s, OP_GT, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, ge) && n == 1)  {
+    genop_1(s, OP_GE, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, eq) && n == 1)  {
+    genop_1(s, OP_EQ, cursp());
+  }
+  else if (!noop && sym == MRB_OPSYM_2(s->mrb, aset) && n == 2)  {
+    genop_1(s, OP_SETIDX, cursp());
+  }
+  else if (!noop && n == 0 && gen_uniop(s, sym, cursp())) {
+    /* constant folding succeeded */
+  }
+  else if (!noop && n == 1 && gen_binop(s, sym, cursp())) {
+    /* constant folding succeeded */
+  }
+  else if (noself){
+    genop_3(s, blk ? OP_SSENDB : OP_SSEND, cursp(), new_sym(s, sym), n|(nk<<4));
+  }
+  else {
+    genop_3(s, blk ? OP_SENDB : OP_SEND, cursp(), new_sym(s, sym), n|(nk<<4));
   }
   if (safe) {
     dispatch(s, skip);
@@ -1134,8 +1781,7 @@
   tree = tree->cdr;
   switch (type) {
   case NODE_GVAR:
-    idx = new_sym(s, nsym(tree));
-    genop_2(s, OP_SETGV, sp, idx);
+    gen_setxv(s, OP_SETGV, sp, nsym(tree), val);
     break;
   case NODE_ARG:
   case NODE_LVAR:
@@ -1147,8 +1793,7 @@
       break;
     }
     else {                      /* upvar */
-      int lv = search_upvar(s, nsym(tree), &idx);
-      genop_3(s, OP_SETUPVAR, sp, idx, lv);
+      gen_setupvar(s, sp, nsym(tree));
     }
     break;
   case NODE_NVAR:
@@ -1156,16 +1801,13 @@
     codegen_error(s, "Can't assign to numbered parameter");
     break;
   case NODE_IVAR:
-    idx = new_sym(s, nsym(tree));
-    genop_2(s, OP_SETIV, sp, idx);
+    gen_setxv(s, OP_SETIV, sp, nsym(tree), val);
     break;
   case NODE_CVAR:
-    idx = new_sym(s, nsym(tree));
-    genop_2(s, OP_SETCV, sp, idx);
+    gen_setxv(s, OP_SETCV, sp, nsym(tree), val);
     break;
   case NODE_CONST:
-    idx = new_sym(s, nsym(tree));
-    genop_2(s, OP_SETCONST, sp, idx);
+    gen_setxv(s, OP_SETCONST, sp, nsym(tree), val);
     break;
   case NODE_COLON2:
     gen_move(s, cursp(), sp, 0);
@@ -1182,7 +1824,7 @@
     gen_call(s, tree, attrsym(s, nsym(tree->cdr->car)), sp, NOVAL,
              type == NODE_SCALL);
     pop();
-    if (val) {
+    if (val && cursp() != sp) {
       gen_move(s, cursp(), sp, 0);
     }
     break;
@@ -1196,9 +1838,7 @@
     break;
 
   default:
-#ifndef MRB_DISABLE_STDIO
-    fprintf(stderr, "unknown lhs %d\n", type);
-#endif
+    codegen_error(s, "unknown lhs");
     break;
   }
   if (val) push();
@@ -1259,6 +1899,16 @@
 gen_intern(codegen_scope *s)
 {
   pop();
+  if (!no_peephole(s)) {
+    struct mrb_insn_data data = mrb_last_insn(s);
+
+    if (data.insn == OP_STRING && data.a == cursp()) {
+      rewind_pc(s);
+      genop_2(s, OP_SYMBOL, data.a, data.b);
+      push();
+      return;
+    }
+  }
   genop_1(s, OP_INTERN, cursp());
   push();
 }
@@ -1267,7 +1917,7 @@
 gen_literal_array(codegen_scope *s, node *tree, mrb_bool sym, int val)
 {
   if (val) {
-    int i = 0, j = 0;
+    int i = 0, j = 0, gen = 0;
 
     while (tree) {
       switch (nint(tree->car->car)) {
@@ -1295,6 +1945,19 @@
         push();
         j--;
       }
+      if (i > GEN_LIT_ARY_MAX) {
+        pop_n(i);
+        if (gen) {
+          pop();
+          genop_2(s, OP_ARYPUSH, cursp(), i);
+        }
+        else {
+          genop_2(s, OP_ARRAY, cursp(), i);
+          gen = 1;
+        }
+        push();
+        i = 0;
+      }
       tree = tree->cdr;
     }
     if (j > 0) {
@@ -1303,7 +1966,13 @@
         gen_intern(s);
     }
     pop_n(i);
-    genop_2(s, OP_ARRAY, cursp(), i);
+    if (gen) {
+      pop();
+      genop_2(s, OP_ARYPUSH, cursp(), i);
+    }
+    else {
+      genop_2(s, OP_ARRAY, cursp(), i);
+    }
     push();
   }
   else {
@@ -1325,74 +1994,49 @@
   genop_1(s, OP_ERR, idx);
 }
 
-#ifndef MRB_WITHOUT_FLOAT
-static double
-readint_float(codegen_scope *s, const char *p, int base)
-{
-  const char *e = p + strlen(p);
-  double f = 0;
-  int n;
-
-  if (*p == '+') p++;
-  while (p < e) {
-    char c = *p;
-    c = tolower((unsigned char)c);
-    for (n=0; n<base; n++) {
-      if (mrb_digitmapn == c) {
-        f *= base;
-        f += n;
-        break;
-      }
-    }
-    if (n == base) {
-      codegen_error(s, "malformed readint input");
-    }
-    p++;
-  }
-  return f;
-}
-#endif
-
 static mrb_int
-readint_mrb_int(codegen_scope *s, const char *p, int base, mrb_bool neg, mrb_bool *overflow)
+readint(codegen_scope *s, const char *p, int base, mrb_bool neg, mrb_bool *overflow)
 {
   const char *e = p + strlen(p);
   mrb_int result = 0;
-  int n;
 
-  mrb_assert(base >= 2 && base <= 36);
+  mrb_assert(base >= 2 && base <= 16);
   if (*p == '+') p++;
   while (p < e) {
+    int n;
     char c = *p;
-    c = tolower((unsigned char)c);
-    for (n=0; n<base; n++) {
-      if (mrb_digitmapn == c) {
-        break;
-      }
-    }
-    if (n == base) {
+    switch (c) {
+    case '0': case '1': case '2': case '3':
+    case '4': case '5': case '6': case '7':
+      n = c - '0'; break;
+    case '8': case '9':
+      n = c - '0'; break;
+    case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+      n = c - 'a' + 10; break;
+    case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+      n = c - 'A' + 10; break;
+    default:
       codegen_error(s, "malformed readint input");
-    }
-
-    if (neg) {
-      if ((MRB_INT_MIN + n)/base > result) {
-        *overflow = TRUE;
-        return 0;
-      }
-      result *= base;
-      result -= n;
-    }
-    else {
-      if ((MRB_INT_MAX - n)/base < result) {
-        *overflow = TRUE;
-        return 0;
-      }
-      result *= base;
-      result += n;
-    }
+      *overflow = TRUE;
+      /* not reached */
+      return result;
+    }
+    if (mrb_int_mul_overflow(result, base, &result)) {
+    overflow:
+      *overflow = TRUE;
+      return 0;
+    }
+    mrb_uint tmp = ((mrb_uint)result)+n;
+    if (neg && tmp == (mrb_uint)MRB_INT_MAX+1) {
+      *overflow = FALSE;
+      return MRB_INT_MIN;
+    }
+    if (tmp > MRB_INT_MAX) goto overflow;
+    result = (mrb_int)tmp;
     p++;
   }
   *overflow = FALSE;
+  if (neg) return -result;
   return result;
 }
 
@@ -1410,6 +2054,49 @@
   }
 }
 
+static mrb_bool
+true_always(node *tree)
+{
+  switch (nint(tree->car)) {
+  case NODE_TRUE:
+  case NODE_INT:
+  case NODE_STR:
+  case NODE_SYM:
+    return TRUE;
+  default:
+    return FALSE;
+  }
+}
+
+static mrb_bool
+false_always(node *tree)
+{
+  switch (nint(tree->car)) {
+  case NODE_FALSE:
+  case NODE_NIL:
+    return TRUE;
+  default:
+    return FALSE;
+  }
+}
+
+static void
+gen_blkmove(codegen_scope *s, uint16_t ainfo, int lv)
+{
+  int m1 = (ainfo>>7)&0x3f;
+  int r  = (ainfo>>6)&0x1;
+  int m2 = (ainfo>>1)&0x1f;
+  int kd = (ainfo)&0x1;
+  int off = m1+r+m2+kd+1;
+  if (lv == 0) {
+    gen_move(s, cursp(), off, 0);
+  }
+  else {
+    genop_3(s, OP_GETUPVAR, cursp(), off, lv);
+  }
+  push();
+}
+
 static void
 codegen(codegen_scope *s, node *tree, int val)
 {
@@ -1456,21 +2143,25 @@
 
   case NODE_RESCUE:
     {
-      int noexc, exend, pos1, pos2, tmp;
+      int noexc;
+      uint32_t exend, pos1, pos2, tmp;
       struct loopinfo *lp;
+      int catch_entry, begin, end;
 
       if (tree->car == NULL) goto exit;
       lp = loop_push(s, LOOP_BEGIN);
       lp->pc0 = new_label(s);
-      lp->pc1 = genjmp(s, OP_ONERR, 0);
+      catch_entry = catch_handler_new(s);
+      begin = s->pc;
       codegen(s, tree->car, VAL);
       pop();
       lp->type = LOOP_RESCUE;
-      noexc = genjmp(s, OP_JMP, 0);
-      dispatch(s, lp->pc1);
+      end = s->pc;
+      noexc = genjmp_0(s, OP_JMP);
+      catch_handler_set(s, catch_entry, MRB_CATCH_RESCUE, begin, end, s->pc);
       tree = tree->cdr;
-      exend = 0;
-      pos1 = 0;
+      exend = JMPLINK_START;
+      pos1 = JMPLINK_START;
       if (tree->car) {
         node *n2 = tree->car;
         int exc = cursp();
@@ -1481,22 +2172,22 @@
           node *n3 = n2->car;
           node *n4 = n3->car;
 
-          if (pos1) dispatch(s, pos1);
-          pos2 = 0;
+          dispatch(s, pos1);
+          pos2 = JMPLINK_START;
           do {
             if (n4 && n4->car && nint(n4->car->car) == NODE_SPLAT) {
               codegen(s, n4->car, VAL);
               gen_move(s, cursp(), exc, 0);
               push_n(2); pop_n(2); /* space for one arg and a block */
               pop();
-              genop_3(s, OP_SEND, cursp(), new_sym(s, mrb_intern_lit(s->mrb, "__case_eqq")), 1);
+              genop_3(s, OP_SEND, cursp(), new_sym(s, MRB_SYM_2(s->mrb, __case_eqq)), 1);
             }
             else {
               if (n4) {
                 codegen(s, n4->car, VAL);
               }
               else {
-                genop_2(s, OP_GETCONST, cursp(), new_sym(s, mrb_intern_lit(s->mrb, "StandardError")));
+                genop_2(s, OP_GETCONST, cursp(), new_sym(s, MRB_SYM_2(s->mrb, StandardError)));
                 push();
               }
               pop();
@@ -1508,7 +2199,7 @@
               n4 = n4->cdr;
             }
           } while (n4);
-          pos1 = genjmp(s, OP_JMP, 0);
+          pos1 = genjmp_0(s, OP_JMP);
           dispatch_linked(s, pos2);
 
           pop();
@@ -1524,15 +2215,14 @@
           n2 = n2->cdr;
           push();
         }
-        if (pos1) {
+        if (pos1 != JMPLINK_START) {
           dispatch(s, pos1);
-          genop_1(s, OP_RAISE, exc);
+          genop_1(s, OP_RAISEIF, exc);
         }
       }
       pop();
       tree = tree->cdr;
       dispatch(s, noexc);
-      genop_1(s, OP_POPERR, 1);
       if (tree->car) {
         codegen(s, tree->car, val);
       }
@@ -1548,14 +2238,22 @@
     if (!tree->cdr || !tree->cdr->cdr ||
         (nint(tree->cdr->cdr->car) == NODE_BEGIN &&
          tree->cdr->cdr->cdr)) {
+      int catch_entry, begin, end, target;
       int idx;
 
-      s->ensure_level++;
-      idx = scope_body(s, tree->cdr, NOVAL);
-      genop_1(s, OP_EPUSH, idx);
+      catch_entry = catch_handler_new(s);
+      begin = s->pc;
       codegen(s, tree->car, val);
-      s->ensure_level--;
-      genop_1(s, OP_EPOP, 1);
+      end = target = s->pc;
+      push();
+      idx = cursp();
+      genop_1(s, OP_EXCEPT, idx);
+      push();
+      codegen(s, tree->cdr->cdr, NOVAL);
+      pop();
+      genop_1(s, OP_RAISEIF, idx);
+      pop();
+      catch_handler_set(s, catch_entry, MRB_CATCH_ENSURE, begin, end, target);
     }
     else {                      /* empty ensure ignored */
       codegen(s, tree->car, val);
@@ -1582,34 +2280,30 @@
 
   case NODE_IF:
     {
-      int pos1, pos2, nil_p = FALSE;
+      uint32_t pos1, pos2;
+      mrb_bool nil_p = FALSE;
       node *elsepart = tree->cdr->cdr->car;
 
       if (!tree->car) {
         codegen(s, elsepart, val);
         goto exit;
       }
-      switch (nint(tree->car->car)) {
-      case NODE_TRUE:
-      case NODE_INT:
-      case NODE_STR:
+      if (true_always(tree->car)) {
         codegen(s, tree->cdr->car, val);
         goto exit;
-      case NODE_FALSE:
-      case NODE_NIL:
+      }
+      if (false_always(tree->car)) {
         codegen(s, elsepart, val);
         goto exit;
-      case NODE_CALL:
-        {
-          node *n = tree->car->cdr;
-          mrb_sym mid = nsym(n->cdr->car);
-          mrb_sym mnil = mrb_intern_lit(s->mrb, "nil?");
-          if (mid == mnil && n->cdr->cdr->car == NULL) {
-            nil_p = TRUE;
-            codegen(s, n->car, VAL);
-          }
+      }
+      if (nint(tree->car->car) == NODE_CALL) {
+        node *n = tree->car->cdr;
+        mrb_sym mid = nsym(n->cdr->car);
+        mrb_sym sym_nil_p = MRB_SYM_Q_2(s->mrb, nil);
+        if (mid == sym_nil_p && n->cdr->cdr->car == NULL) {
+          nil_p = TRUE;
+          codegen(s, n->car, VAL);
         }
-        break;
       }
       if (!nil_p) {
         codegen(s, tree->car, VAL);
@@ -1617,17 +2311,17 @@
       pop();
       if (val || tree->cdr->car) {
         if (nil_p) {
-          pos2 = genjmp2(s, OP_JMPNIL, cursp(), 0, val);
-          pos1 = genjmp(s, OP_JMP, 0);
+          pos2 = genjmp2_0(s, OP_JMPNIL, cursp(), val);
+          pos1 = genjmp_0(s, OP_JMP);
           dispatch(s, pos2);
         }
         else {
-          pos1 = genjmp2(s, OP_JMPNOT, cursp(), 0, val);
+          pos1 = genjmp2_0(s, OP_JMPNOT, cursp(), val);
         }
         codegen(s, tree->cdr->car, val);
         if (val) pop();
         if (elsepart || val) {
-          pos2 = genjmp(s, OP_JMP, 0);
+          pos2 = genjmp_0(s, OP_JMP);
           dispatch(s, pos1);
           codegen(s, elsepart, val);
           dispatch(s, pos2);
@@ -1639,10 +2333,10 @@
       else {                    /* empty then-part */
         if (elsepart) {
           if (nil_p) {
-            pos1 = genjmp2(s, OP_JMPNIL, cursp(), 0, val);
+            pos1 = genjmp2_0(s, OP_JMPNIL, cursp(), val);
           }
           else {
-            pos1 = genjmp2(s, OP_JMPIF, cursp(), 0, val);
+            pos1 = genjmp2_0(s, OP_JMPIF, cursp(), val);
           }
           codegen(s, elsepart, val);
           dispatch(s, pos1);
@@ -1657,11 +2351,19 @@
 
   case NODE_AND:
     {
-      int pos;
+      uint32_t pos;
 
+      if (true_always(tree->car)) {
+        codegen(s, tree->cdr, val);
+        goto exit;
+      }
+      if (false_always(tree->car)) {
+        codegen(s, tree->car, val);
+        goto exit;
+      }
       codegen(s, tree->car, VAL);
       pop();
-      pos = genjmp2(s, OP_JMPNOT, cursp(), 0, val);
+      pos = genjmp2_0(s, OP_JMPNOT, cursp(), val);
       codegen(s, tree->cdr, val);
       dispatch(s, pos);
     }
@@ -1669,46 +2371,63 @@
 
   case NODE_OR:
     {
-      int pos;
+      uint32_t pos;
 
+      if (true_always(tree->car)) {
+        codegen(s, tree->car, val);
+        goto exit;
+      }
+      if (false_always(tree->car)) {
+        codegen(s, tree->cdr, val);
+        goto exit;
+      }
       codegen(s, tree->car, VAL);
       pop();
-      pos = genjmp2(s, OP_JMPIF, cursp(), 0, val);
+      pos = genjmp2_0(s, OP_JMPIF, cursp(), val);
       codegen(s, tree->cdr, val);
       dispatch(s, pos);
     }
     break;
 
   case NODE_WHILE:
-    {
-      struct loopinfo *lp = loop_push(s, LOOP_NORMAL);
-
-      lp->pc0 = new_label(s);
-      lp->pc1 = genjmp(s, OP_JMP, 0);
-      lp->pc2 = new_label(s);
-      codegen(s, tree->cdr, NOVAL);
-      dispatch(s, lp->pc1);
-      codegen(s, tree->car, VAL);
-      pop();
-      genjmp2(s, OP_JMPIF, cursp(), lp->pc2, NOVAL);
-
-      loop_pop(s, val);
-    }
-    break;
-
   case NODE_UNTIL:
     {
+      if (true_always(tree->car)) {
+        if (nt == NODE_UNTIL) {
+          if (val) {
+            genop_1(s, OP_LOADNIL, cursp());
+            push();
+          }
+          goto exit;
+        }
+      }
+      else if (false_always(tree->car)) {
+        if (nt == NODE_WHILE) {
+          if (val) {
+            genop_1(s, OP_LOADNIL, cursp());
+            push();
+          }
+          goto exit;
+        }
+      }
+
+      uint32_t pos = JMPLINK_START;
       struct loopinfo *lp = loop_push(s, LOOP_NORMAL);
 
+      if (!val) lp->reg = -1;
       lp->pc0 = new_label(s);
-      lp->pc1 = genjmp(s, OP_JMP, 0);
-      lp->pc2 = new_label(s);
-      codegen(s, tree->cdr, NOVAL);
-      dispatch(s, lp->pc1);
       codegen(s, tree->car, VAL);
       pop();
-      genjmp2(s, OP_JMPNOT, cursp(), lp->pc2, NOVAL);
-
+      if (nt == NODE_WHILE) {
+        pos = genjmp2_0(s, OP_JMPNOT, cursp(), NOVAL);
+      }
+      else {
+        pos = genjmp2_0(s, OP_JMPIF, cursp(), NOVAL);
+      }
+      lp->pc1 = new_label(s);
+      codegen(s, tree->cdr, NOVAL);
+      genjmp(s, OP_JMP, lp->pc0);
+      dispatch(s, pos);
       loop_pop(s, val);
     }
     break;
@@ -1721,10 +2440,10 @@
   case NODE_CASE:
     {
       int head = 0;
-      int pos1, pos2, pos3, tmp;
+      uint32_t pos1, pos2, pos3, tmp;
       node *n;
 
-      pos3 = 0;
+      pos3 = JMPLINK_START;
       if (tree->car) {
         head = cursp();
         codegen(s, tree->car, VAL);
@@ -1732,17 +2451,17 @@
       tree = tree->cdr;
       while (tree) {
         n = tree->car->car;
-        pos1 = pos2 = 0;
+        pos1 = pos2 = JMPLINK_START;
         while (n) {
           codegen(s, n->car, VAL);
           if (head) {
             gen_move(s, cursp(), head, 0);
             push(); push(); pop(); pop(); pop();
             if (nint(n->car->car) == NODE_SPLAT) {
-              genop_3(s, OP_SEND, cursp(), new_sym(s, mrb_intern_lit(s->mrb, "__case_eqq")), 1);
+              genop_3(s, OP_SEND, cursp(), new_sym(s, MRB_SYM_2(s->mrb, __case_eqq)), 1);
             }
             else {
-              genop_3(s, OP_SEND, cursp(), new_sym(s, mrb_intern_lit(s->mrb, "===")), 1);
+              genop_3(s, OP_SEND, cursp(), new_sym(s, MRB_OPSYM_2(s->mrb, eqq)), 1);
             }
           }
           else {
@@ -1753,20 +2472,20 @@
           n = n->cdr;
         }
         if (tree->car->car) {
-          pos1 = genjmp(s, OP_JMP, 0);
+          pos1 = genjmp_0(s, OP_JMP);
           dispatch_linked(s, pos2);
         }
         codegen(s, tree->car->cdr, val);
         if (val) pop();
         tmp = genjmp(s, OP_JMP, pos3);
         pos3 = tmp;
-        if (pos1) dispatch(s, pos1);
+        dispatch(s, pos1);
         tree = tree->cdr;
       }
       if (val) {
-        int pos = cursp();
+        uint32_t pos = cursp();
         genop_1(s, OP_LOADNIL, cursp());
-        if (pos3) dispatch_linked(s, pos3);
+        if (pos3 != JMPLINK_START) dispatch_linked(s, pos3);
         if (head) pop();
         if (cursp() != pos) {
           gen_move(s, cursp(), pos, 0);
@@ -1774,7 +2493,7 @@
         push();
       }
       else {
-        if (pos3) {
+        if (pos3 != JMPLINK_START) {
           dispatch_linked(s, pos3);
         }
         if (head) {
@@ -1841,15 +2560,12 @@
     {
       int n;
 
-      n = gen_values(s, tree, val, 0);
-      if (n >= 0) {
-        if (val) {
+      n = gen_values(s, tree, val, 0, 0);
+      if (val) {
+        if (n >= 0) {
           pop_n(n);
           genop_2(s, OP_ARRAY, cursp(), n);
-          push();
         }
-      }
-      else if (val) {
         push();
       }
     }
@@ -1858,62 +2574,10 @@
   case NODE_HASH:
   case NODE_KW_HASH:
     {
-      int len = 0;
-      mrb_bool update = FALSE;
-
-      while (tree) {
-        if (nint(tree->car->car->car) == NODE_KW_REST_ARGS) {
-          if (len > 0) {
-            pop_n(len*2);
-            if (!update) {
-              genop_2(s, OP_HASH, cursp(), len);
-            }
-            else {
-              pop();
-              genop_2(s, OP_HASHADD, cursp(), len);
-            }
-            push();
-          }
-          codegen(s, tree->car->cdr, VAL);
-          if (len > 0 || update) {
-            pop(); pop();
-            genop_1(s, OP_HASHCAT, cursp());
-            push();
-          }
-          update = TRUE;
-          len = 0;
-        }
-        else {
-          codegen(s, tree->car->car, val);
-          codegen(s, tree->car->cdr, val);
-          len++;
-        }
-        tree = tree->cdr;
-        if (val && cursp() > 127) {
-          pop_n(len*2);
-          if (!update) {
-            genop_2(s, OP_HASH, cursp(), len);
-          }
-          else {
-            pop();
-            genop_2(s, OP_HASHADD, cursp(), len);
-          }
-          push();
-          update = TRUE;
-          len = 0;
-        }
-      }
-      if (val) {
-        pop_n(len*2);
-        if (!update) {
-          genop_2(s, OP_HASH, cursp(), len);
-        }
-        else {
-          pop();
-          if (len > 0) {
-            genop_2(s, OP_HASHADD, cursp(), len);
-          }
-        }
+      int nk = gen_hash(s, tree, val, GEN_LIT_ARY_MAX);
+      if (val && nk >= 0) {
+        pop_n(nk*2);
+        genop_2(s, OP_HASH, cursp(), nk);
         push();
       }
     }
@@ -2017,18 +2681,20 @@
       if ((len == 2 && name0 == '|' && name1 == '|') &&
           (nint(tree->car->car) == NODE_CONST ||
            nint(tree->car->car) == NODE_CVAR)) {
-        int onerr, noexc, exc;
+        int catch_entry, begin, end;
+        int noexc, exc;
         struct loopinfo *lp;
 
-        onerr = genjmp(s, OP_ONERR, 0);
         lp = loop_push(s, LOOP_BEGIN);
-        lp->pc1 = onerr;
+        lp->pc0 = new_label(s);
+        catch_entry = catch_handler_new(s);
+        begin = s->pc;
         exc = cursp();
         codegen(s, tree->car, VAL);
+        end = s->pc;
+        noexc = genjmp_0(s, OP_JMP);
         lp->type = LOOP_RESCUE;
-        genop_1(s, OP_POPERR, 1);
-        noexc = genjmp(s, OP_JMP, 0);
-        dispatch(s, onerr);
+        catch_handler_set(s, catch_entry, MRB_CATCH_RESCUE, begin, end, s->pc);
         genop_1(s, OP_EXCEPT, exc);
         genop_1(s, OP_LOADF, exc);
         dispatch(s, noexc);
@@ -2047,7 +2713,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);
+          nargs = gen_values(s, n->cdr->cdr->car->car, VAL, 1, 14);
           if (nargs >= 0) {
             callargs = nargs;
           }
@@ -2072,17 +2738,17 @@
       if (len == 2 &&
           ((name0 == '|' && name1 == '|') ||
            (name0 == '&' && name1 == '&'))) {
-        int pos;
+        uint32_t pos;
 
         pop();
         if (val) {
           if (vsp >= 0) {
             gen_move(s, vsp, cursp(), 1);
           }
-          pos = genjmp2(s, name0=='|'?OP_JMPIF:OP_JMPNOT, cursp(), 0, val);
+          pos = genjmp2_0(s, name0=='|'?OP_JMPIF:OP_JMPNOT, cursp(), val);
         }
         else {
-          pos = genjmp2(s, name0=='|'?OP_JMPIF:OP_JMPNOT, cursp(), 0, val);
+          pos = genjmp2_0(s, name0=='|'?OP_JMPIF:OP_JMPNOT, cursp(), val);
         }
         codegen(s, tree->cdr->cdr->car, VAL);
         pop();
@@ -2092,7 +2758,7 @@
         if (nint(tree->car->car) == NODE_CALL) {
           if (callargs == CALL_MAXARGS) {
             pop();
-            genop_1(s, OP_ARYPUSH, cursp());
+            genop_2(s, OP_ARYPUSH, cursp(), 1);
           }
           else {
             pop_n(callargs);
@@ -2149,7 +2815,7 @@
         }
         if (callargs == CALL_MAXARGS) {
           pop();
-          genop_1(s, OP_ARYPUSH, cursp());
+          genop_2(s, OP_ARYPUSH, cursp(), 1);
         }
         else {
           pop_n(callargs);
@@ -2166,37 +2832,49 @@
     {
       codegen_scope *s2 = s;
       int lv = 0;
-      int n = 0, noop = 0, sendv = 0;
+      int n = 0, nk = 0, st = 0;
 
-      push();        /* room for receiver */
+      push();
       while (!s2->mscope) {
         lv++;
         s2 = s2->prev;
         if (!s2) break;
       }
-      genop_2S(s, OP_ARGARY, cursp(), (lv & 0xf));
-      push(); push();         /* ARGARY pushes two values */
-      pop(); pop();
       if (tree) {
         node *args = tree->car;
         if (args) {
-          n = gen_values(s, args, VAL, 0);
+          st = n = gen_values(s, args, VAL, 0, 14);
           if (n < 0) {
-            n = noop = sendv = 1;
+            st = 1; n = 15;
             push();
           }
         }
-      }
-      if (tree && tree->cdr) {
-        codegen(s, tree->cdr, VAL);
-        pop();
+        /* keyword arguments */
+        if (tree->cdr->car) {
+          nk = gen_hash(s, tree->cdr->car->cdr, VAL, 14);
+          if (nk < 0) {st++; nk = 15;}
+          else st += nk*2;
+          n |= nk<<4;
+        }
+        /* block arguments */
+        if (tree->cdr->cdr) {
+          codegen(s, tree->cdr->cdr, VAL);
+        }
+        else if (s2) gen_blkmove(s, s2->ainfo, lv);
+        else {
+          genop_1(s, OP_LOADNIL, cursp());
+          push();
+        }
       }
       else {
-        genop_1(s, OP_LOADNIL, cursp());
-        push(); pop();
+        if (s2) gen_blkmove(s, s2->ainfo, lv);
+        else {
+          genop_1(s, OP_LOADNIL, cursp());
+          push();
+        }
       }
-      pop_n(n+1);
-      if (sendv) n = CALL_MAXARGS;
+      st++;
+      pop_n(st+1);
       genop_2(s, OP_SUPER, cursp(), n);
       if (val) push();
     }
@@ -2205,7 +2883,10 @@
   case NODE_ZSUPER:
     {
       codegen_scope *s2 = s;
-      int lv = 0, ainfo = 0;
+      int lv = 0;
+      size_t ainfo = 0;
+      int n = CALL_MAXARGS;
+      int sp = cursp();
 
       push();        /* room for receiver */
       while (!s2->mscope) {
@@ -2213,15 +2894,36 @@
         s2 = s2->prev;
         if (!s2) break;
       }
-      if (s2) ainfo = s2->ainfo;
-      genop_2S(s, OP_ARGARY, cursp(), (ainfo<<4)|(lv & 0xf));
-      push(); push(); pop();    /* ARGARY pushes two values */
-      if (tree && tree->cdr) {
-        codegen(s, tree->cdr, VAL);
-        pop();
+      if (s2 && s2->ainfo > 0) {
+        ainfo = s2->ainfo;
       }
-      pop(); pop();
-      genop_2(s, OP_SUPER, cursp(), CALL_MAXARGS);
+      if (ainfo > 0) {
+        genop_2S(s, OP_ARGARY, cursp(), (ainfo<<4)|(lv & 0xf));
+        push(); push(); push();   /* ARGARY pushes 3 values at most */
+        pop(); pop(); pop();
+        /* keyword arguments */
+        if (ainfo & 0x1) {
+          n |= CALL_MAXARGS<<4;
+          push();
+        }
+        /* block argument */
+        if (tree && tree->cdr && tree->cdr->cdr) {
+          push();
+          codegen(s, tree->cdr->cdr, VAL);
+        }
+      }
+      else {
+        /* block argument */
+        if (tree && tree->cdr && tree->cdr->cdr) {
+          codegen(s, tree->cdr->cdr, VAL);
+        }
+        else {
+          gen_blkmove(s, 0, lv);
+        }
+        n = 0;
+      }
+      s->sp = sp;
+      genop_2(s, OP_SUPER, cursp(), n);
       if (val) push();
     }
     break;
@@ -2245,7 +2947,7 @@
   case NODE_YIELD:
     {
       codegen_scope *s2 = s;
-      int lv = 0, ainfo = 0;
+      int lv = 0, ainfo = -1;
       int n = 0, sendv = 0;
 
       while (!s2->mscope) {
@@ -2253,10 +2955,13 @@
         s2 = s2->prev;
         if (!s2) break;
       }
-      if (s2) ainfo = s2->ainfo;
+      if (s2) {
+        ainfo = (int)s2->ainfo;
+      }
+      if (ainfo < 0) codegen_error(s, "invalid yield (SyntaxError)");
       push();
       if (tree) {
-        n = gen_values(s, tree, VAL, 0);
+        n = gen_values(s, tree, VAL, 0, 14);
         if (n < 0) {
           n = sendv = 1;
           push();
@@ -2266,7 +2971,7 @@
       pop_n(n+1);
       genop_2S(s, OP_BLKPUSH, cursp(), (ainfo<<4)|(lv & 0xf));
       if (sendv) n = CALL_MAXARGS;
-      genop_3(s, OP_SEND, cursp(), new_sym(s, mrb_intern_lit(s->mrb, "call")), n);
+      genop_3(s, OP_SEND, cursp(), new_sym(s, MRB_SYM_2(s->mrb, call)), n);
       if (val) push();
     }
     break;
@@ -2281,11 +2986,8 @@
       raise_error(s, "unexpected next");
     }
     else if (s->loop->type == LOOP_NORMAL) {
-      if (s->ensure_level > s->loop->ensure_level) {
-        genop_1(s, OP_EPOP, s->ensure_level - s->loop->ensure_level);
-      }
       codegen(s, tree, NOVAL);
-      genjmp(s, OP_JMP, s->loop->pc0);
+      genjmp(s, OP_JMPUW, s->loop->pc0);
     }
     else {
       if (tree) {
@@ -2305,10 +3007,7 @@
       raise_error(s, "unexpected redo");
     }
     else {
-      if (s->ensure_level > s->loop->ensure_level) {
-        genop_1(s, OP_EPOP, s->ensure_level - s->loop->ensure_level);
-      }
-      genjmp(s, OP_JMP, s->loop->pc2);
+      genjmp(s, OP_JMPUW, s->loop->pc1);
     }
     if (val) push();
     break;
@@ -2316,32 +3015,16 @@
   case NODE_RETRY:
     {
       const char *msg = "unexpected retry";
+      const struct loopinfo *lp = s->loop;
 
-      if (!s->loop) {
+      while (lp && lp->type != LOOP_RESCUE) {
+        lp = lp->prev;
+      }
+      if (!lp) {
         raise_error(s, msg);
       }
       else {
-        struct loopinfo *lp = s->loop;
-        int n = 0;
-
-        while (lp && lp->type != LOOP_RESCUE) {
-          if (lp->type == LOOP_BEGIN) {
-            n++;
-          }
-          lp = lp->prev;
-        }
-        if (!lp) {
-          raise_error(s, msg);
-        }
-        else {
-          if (n > 0) {
-            genop_1(s, OP_POPERR, n);
-          }
-          if (s->ensure_level > lp->ensure_level) {
-            genop_1(s, OP_EPOP, s->ensure_level - lp->ensure_level);
-          }
-          genjmp(s, OP_JMP, lp->pc0);
-        }
+        genjmp(s, OP_JMPUW, lp->pc0);
       }
       if (val) push();
     }
@@ -2355,8 +3038,7 @@
         gen_move(s, cursp(), idx, val);
       }
       else {
-        int lv = search_upvar(s, nsym(tree), &idx);
-        genop_3(s, OP_GETUPVAR, cursp(), idx, lv);
+        gen_getupvar(s, cursp(), nsym(tree));
       }
       push();
     }
@@ -2436,7 +3118,18 @@
     break;
 
   case NODE_BLOCK_ARG:
-    codegen(s, tree, val);
+    if (!tree) {
+      int idx = lv_idx(s, MRB_OPSYM_2(s->mrb, and));
+
+      if (idx == 0) {
+        codegen_error(s, "no anonymous block argument");
+      }
+      gen_move(s, cursp(), idx, val);
+      if (val) push();
+    }
+    else {
+      codegen(s, tree, val);
+    }
     break;
 
   case NODE_INT:
@@ -2446,39 +3139,19 @@
       mrb_int i;
       mrb_bool overflow;
 
-      i = readint_mrb_int(s, p, base, FALSE, &overflow);
-#ifndef MRB_WITHOUT_FLOAT
+      i = readint(s, p, base, FALSE, &overflow);
       if (overflow) {
-        double f = readint_float(s, p, base);
-        int off = new_lit(s, mrb_float_value(s->mrb, f));
-
+        int off = new_litbn(s, p, base, FALSE);
         genop_2(s, OP_LOADL, cursp(), off);
       }
-      else
-#endif
-      {
-        if (i < 0) {
-          if (i == -1) genop_1(s, OP_LOADI__1, cursp());
-          else if (i >= -0xff) genop_2(s, OP_LOADINEG, cursp(), (uint16_t)-i); 
-          else if (i >= -0x8000) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
-          else goto lit_int;
-        }
-        else if (i < 8) genop_1(s, OP_LOADI_0 + (uint8_t)i, cursp());
-        else if (i <= 0xff) genop_2(s, OP_LOADI, cursp(), (uint16_t)i);
-        else if (i <= 0x7fff) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
-        else {
-          int off;
-
-        lit_int:
-          off = new_lit(s, mrb_fixnum_value(i));
-          genop_2(s, OP_LOADL, cursp(), off);
-        }
+      else {
+        gen_int(s, cursp(), i);
       }
       push();
     }
     break;
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   case NODE_FLOAT:
     if (val) {
       char *p = (char*)tree;
@@ -2495,7 +3168,7 @@
     {
       nt = nint(tree->car);
       switch (nt) {
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
       case NODE_FLOAT:
         if (val) {
           char *p = (char*)tree->cdr;
@@ -2515,40 +3188,27 @@
           mrb_int i;
           mrb_bool overflow;
 
-          i = readint_mrb_int(s, p, base, TRUE, &overflow);
-#ifndef MRB_WITHOUT_FLOAT
+          i = readint(s, p, base, TRUE, &overflow);
           if (overflow) {
-            double f = readint_float(s, p, base);
-            int off = new_lit(s, mrb_float_value(s->mrb, -f));
-
+            int off = new_litbn(s, p, base, TRUE);
             genop_2(s, OP_LOADL, cursp(), off);
           }
           else {
-#endif
-            if (i == -1) genop_1(s, OP_LOADI__1, cursp());
-            else if (i >= -0xff) {
-              genop_2(s, OP_LOADINEG, cursp(), (uint16_t)-i);
-            }
-            else if (i >= -0x8000) {
-              genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
-            }
-            else {
-              int off = new_lit(s, mrb_fixnum_value(i));
-              genop_2(s, OP_LOADL, cursp(), off);
-            }
-#ifndef MRB_WITHOUT_FLOAT
+            gen_int(s, cursp(), i);
           }
-#endif
           push();
         }
         break;
 
       default:
         if (val) {
-          int sym = new_sym(s, mrb_intern_lit(s->mrb, "-@"));
           codegen(s, tree, VAL);
           pop();
-          genop_3(s, OP_SEND, cursp(), sym, 0);
+          push_n(2);pop_n(2); /* space for receiver&block */
+          mrb_sym minus = MRB_OPSYM_2(s->mrb, minus);
+          if (!gen_uniop(s, minus, cursp())) {
+            genop_3(s, OP_SEND, cursp(), new_sym(s, minus), 0);
+          }
           push();
         }
         else {
@@ -2618,7 +3278,7 @@
     {
       node *n;
       int ai = mrb_gc_arena_save(s->mrb);
-      int sym = new_sym(s, mrb_intern_lit(s->mrb, "Kernel"));
+      int sym = new_sym(s, MRB_SYM_2(s->mrb, Kernel));
 
       genop_1(s, OP_LOADSELF, cursp());
       push();
@@ -2637,7 +3297,7 @@
       }
       push();                   /* for block */
       pop_n(3);
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "`"));
+      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);
@@ -2657,7 +3317,7 @@
       genop_2(s, OP_STRING, cursp(), off);
       push(); push();
       pop_n(3);
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "`"));
+      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);
@@ -2698,7 +3358,7 @@
       }
       push(); /* space for a block */
       pop_n(argc+2);
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "compile"));
+      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();
@@ -2752,7 +3412,7 @@
       }
       push(); /* space for a block */
       pop_n(argc+2);
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "compile"));
+      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();
@@ -2946,10 +3606,7 @@
       push(); pop();
       pop();
       genop_2(s, OP_DEF, cursp(), sym);
-      if (val) {
-        genop_2(s, OP_LOADSYM, cursp(), sym);
-        push();
-      }
+      if (val) push();
     }
     break;
 
@@ -2966,10 +3623,7 @@
       genop_2(s, OP_METHOD, cursp(), idx);
       pop();
       genop_2(s, OP_DEF, cursp(), sym);
-      if (val) {
-        genop_2(s, OP_LOADSYM, cursp(), sym);
-        push();
-      }
+      if (val) push();
     }
     break;
 
@@ -2985,99 +3639,100 @@
 }
 
 static void
-scope_add_irep(codegen_scope *s, mrb_irep *irep)
+scope_add_irep(codegen_scope *s)
 {
-  if (s->irep == NULL) {
-    s->irep = irep;
+  mrb_irep *irep;
+  codegen_scope *prev = s->prev;
+
+  if (prev->irep == NULL) {
+    irep = mrb_add_irep(s->mrb);
+    prev->irep = s->irep = irep;
     return;
   }
-  if (s->irep->rlen == s->rcapa) {
-    s->rcapa *= 2;
-    s->irep->reps = (mrb_irep**)codegen_realloc(s, s->irep->reps, sizeof(mrb_irep*)*s->rcapa);
+  else {
+    if (prev->irep->rlen == UINT16_MAX) {
+      codegen_error(s, "too many nested blocks/methods");
+    }
+    s->irep = irep = mrb_add_irep(s->mrb);
+    if (prev->irep->rlen == prev->rcapa) {
+      prev->rcapa *= 2;
+      prev->reps = (mrb_irep**)codegen_realloc(s, prev->reps, sizeof(mrb_irep*)*prev->rcapa);
+    }
+    prev->repsprev->irep->rlen = irep;
+    prev->irep->rlen++;
   }
-  s->irep->repss->irep->rlen = irep;
-  s->irep->rlen++;
 }
 
 static codegen_scope*
-scope_new(mrb_state *mrb, codegen_scope *prev, node *lv)
+scope_new(mrb_state *mrb, codegen_scope *prev, node *nlv)
 {
   static const codegen_scope codegen_scope_zero = { 0 };
   mrb_pool *pool = mrb_pool_open(mrb);
-  codegen_scope *p = (codegen_scope *)mrb_pool_alloc(pool, sizeof(codegen_scope));
+  codegen_scope *s = (codegen_scope *)mrb_pool_alloc(pool, sizeof(codegen_scope));
 
-  if (!p) {
+  if (!s) {
     if (prev)
       codegen_error(prev, "unexpected scope");
     return NULL;
   }
-  *p = codegen_scope_zero;
-  p->mrb = mrb;
-  p->mpool = pool;
-  if (!prev) return p;
-  p->prev = prev;
-  p->ainfo = -1;
-  p->mscope = 0;
-
-  p->irep = mrb_add_irep(mrb);
-  scope_add_irep(prev, p->irep);
-
-  p->rcapa = 8;
-  p->irep->reps = (mrb_irep**)mrb_malloc(mrb, sizeof(mrb_irep*)*p->rcapa);
-
-  p->icapa = 1024;
-  p->iseq = (mrb_code*)mrb_malloc(mrb, sizeof(mrb_code)*p->icapa);
-  p->irep->iseq = NULL;
-
-  p->pcapa = 32;
-  p->irep->pool = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value)*p->pcapa);
-  p->irep->plen = 0;
-
-  p->scapa = 256;
-  p->irep->syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym)*p->scapa);
-  p->irep->slen = 0;
-
-  p->lv = lv;
-  p->sp += node_len(lv)+1;        /* add self */
-  p->nlocals = p->sp;
-  if (lv) {
-    node *n = lv;
+  *s = codegen_scope_zero;
+  s->mrb = mrb;
+  s->mpool = pool;
+  if (!prev) return s;
+  s->prev = prev;
+  s->ainfo = 0;
+  s->mscope = 0;
+
+  scope_add_irep(s);
+
+  s->rcapa = 8;
+  s->reps = (mrb_irep**)mrb_malloc(mrb, sizeof(mrb_irep*)*s->rcapa);
+
+  s->icapa = 1024;
+  s->iseq = (mrb_code*)mrb_malloc(mrb, sizeof(mrb_code)*s->icapa);
+
+  s->pcapa = 32;
+  s->pool = (mrb_pool_value*)mrb_malloc(mrb, sizeof(mrb_pool_value)*s->pcapa);
+
+  s->scapa = 256;
+  s->syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym)*s->scapa);
+
+  s->lv = nlv;
+  s->sp += node_len(nlv)+1;        /* add self */
+  s->nlocals = s->sp;
+  if (nlv) {
+    mrb_sym *lv;
+    node *n = nlv;
     size_t i = 0;
 
-    p->irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * (p->nlocals - 1));
-    for (i=0, n=lv; n; i++,n=n->cdr) {
-      p->irep->lvi.name = lv_name(n);
-      if (lv_name(n)) {
-        p->irep->lvi.r = lv_idx(p, lv_name(n));
-      }
-      else {
-        p->irep->lvi.r = 0;
-      }
+    s->irep->lv = lv = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym)*(s->nlocals-1));
+    for (i=0, n=nlv; n; i++,n=n->cdr) {
+      lvi = lv_name(n);
     }
-    mrb_assert(i + 1 == p->nlocals);
+    mrb_assert(i + 1 == s->nlocals);
   }
-  p->ai = mrb_gc_arena_save(mrb);
+  s->ai = mrb_gc_arena_save(mrb);
 
-  p->filename_sym = prev->filename_sym;
-  if (p->filename_sym) {
-    p->lines = (uint16_t*)mrb_malloc(mrb, sizeof(short)*p->icapa);
+  s->filename_sym = prev->filename_sym;
+  if (s->filename_sym) {
+    s->lines = (uint16_t*)mrb_malloc(mrb, sizeof(short)*s->icapa);
   }
-  p->lineno = prev->lineno;
+  s->lineno = prev->lineno;
 
   /* debug setting */
-  p->debug_start_pos = 0;
-  if (p->filename_sym) {
-    mrb_debug_info_alloc(mrb, p->irep);
+  s->debug_start_pos = 0;
+  if (s->filename_sym) {
+    mrb_debug_info_alloc(mrb, s->irep);
   }
   else {
-    p->irep->debug_info = NULL;
+    s->irep->debug_info = NULL;
   }
-  p->parser = prev->parser;
-  p->filename_index = prev->filename_index;
+  s->parser = prev->parser;
+  s->filename_index = prev->filename_index;
 
-  p->rlev = prev->rlev+1;
+  s->rlev = prev->rlev+1;
 
-  return p;
+  return s;
 }
 
 static void
@@ -3086,17 +3741,26 @@
   mrb_state *mrb = s->mrb;
   mrb_irep *irep = s->irep;
 
-  if (s->nlocals >= 0x3ff) {
+  if (s->nlocals > 0xff) {
     codegen_error(s, "too many local variables");
   }
   irep->flags = 0;
   if (s->iseq) {
-    irep->iseq = (mrb_code *)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->pc);
+    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->ilen = s->pc;
+    if (irep->clen > 0) {
+      memcpy((void *)(irep->iseq + irep->ilen), s->catch_table, catchsize);
+    }
   }
-  irep->pool = (mrb_value*)codegen_realloc(s, irep->pool, sizeof(mrb_value)*irep->plen);
-  irep->syms = (mrb_sym*)codegen_realloc(s, irep->syms, sizeof(mrb_sym)*irep->slen);
-  irep->reps = (mrb_irep**)codegen_realloc(s, irep->reps, sizeof(mrb_irep*)*irep->rlen);
+  else {
+    irep->clen = 0;
+  }
+  mrb_free(s->mrb, s->catch_table);
+  s->catch_table = NULL;
+  irep->pool = (const mrb_pool_value*)codegen_realloc(s, s->pool, sizeof(mrb_pool_value)*irep->plen);
+  irep->syms = (const mrb_sym*)codegen_realloc(s, s->syms, sizeof(mrb_sym)*irep->slen);
+  irep->reps = (const mrb_irep**)codegen_realloc(s, s->reps, sizeof(mrb_irep*)*irep->rlen);
   if (s->filename_sym) {
     mrb_sym fname = mrb_parser_get_filename(s->parser, s->filename_index);
     const char *filename = mrb_sym_name_len(s->mrb, fname, NULL);
@@ -3119,10 +3783,9 @@
   struct loopinfo *p = (struct loopinfo *)codegen_palloc(s, sizeof(struct loopinfo));
 
   p->type = t;
-  p->pc0 = p->pc1 = p->pc2 = p->pc3 = 0;
+  p->pc0 = p->pc1 = p->pc2 = JMPLINK_START;
   p->prev = s->loop;
-  p->ensure_level = s->ensure_level;
-  p->acc = cursp();
+  p->reg = cursp();
   s->loop = p;
 
   return p;
@@ -3137,16 +3800,19 @@
   }
   else {
     struct loopinfo *loop;
-    int n = 0;
 
-    if (tree) {
-      gen_retval(s, tree);
-    }
 
     loop = s->loop;
+    if (tree) {
+      if (loop->reg < 0) {
+        codegen(s, tree, NOVAL);
+      }
+      else {
+        gen_retval(s, tree);
+      }
+    }
     while (loop) {
       if (loop->type == LOOP_BEGIN) {
-        n++;
         loop = loop->prev;
       }
       else if (loop->type == LOOP_RESCUE) {
@@ -3160,21 +3826,20 @@
       raise_error(s, "unexpected break");
       return;
     }
-    if (n > 0) {
-      genop_1(s, OP_POPERR, n);
-    }
 
     if (loop->type == LOOP_NORMAL) {
       int tmp;
 
-      if (s->ensure_level > s->loop->ensure_level) {
-        genop_1(s, OP_EPOP, s->ensure_level - s->loop->ensure_level);
-      }
-      if (tree) {
-        gen_move(s, loop->acc, cursp(), 0);
+      if (loop->reg >= 0) {
+        if (tree) {
+          gen_move(s, loop->reg, cursp(), 0);
+        }
+        else {
+          genop_1(s, OP_LOADNIL, loop->reg);
+        }
       }
-      tmp = genjmp(s, OP_JMP, loop->pc3);
-      loop->pc3 = tmp;
+      tmp = genjmp(s, OP_JMPUW, loop->pc2);
+      loop->pc2 = tmp;
     }
     else {
       if (!tree) {
@@ -3191,25 +3856,49 @@
   if (val) {
     genop_1(s, OP_LOADNIL, cursp());
   }
-  dispatch_linked(s, s->loop->pc3);
+  dispatch_linked(s, s->loop->pc2);
   s->loop = s->loop->prev;
   if (val) push();
 }
 
+static int
+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 ++;
+}
+
+static void
+catch_handler_set(codegen_scope *s, int ent, enum mrb_catch_type type, uint32_t begin, uint32_t end, uint32_t target)
+{
+  struct mrb_irep_catch_handler *e;
+
+  mrb_assert(ent >= 0 && ent < s->irep->clen);
+
+  e = &s->catch_tableent;
+  uint8_to_bin(type, &e->type);
+  mrb_irep_catch_handler_pack(begin, e->begin);
+  mrb_irep_catch_handler_pack(end, e->end);
+  mrb_irep_catch_handler_pack(target, e->target);
+}
+
 static struct RProc*
 generate_code(mrb_state *mrb, parser_state *p, int val)
 {
   codegen_scope *scope = scope_new(mrb, 0, 0);
-  struct RProc *proc;
   struct mrb_jmpbuf *prev_jmp = mrb->jmp;
+  struct mrb_jmpbuf jmpbuf;
+  struct RProc *proc;
+
+  mrb->jmp = &jmpbuf;
 
   scope->mrb = mrb;
   scope->parser = p;
   scope->filename_sym = p->filename_sym;
   scope->filename_index = p->current_filename_index;
 
-  MRB_TRY(&scope->jmp) {
-    mrb->jmp = &scope->jmp;
+  MRB_TRY(mrb->jmp) {
     /* prepare irep */
     codegen(scope, p->tree, val);
     proc = mrb_proc_new(mrb, scope->irep);
@@ -3222,13 +3911,13 @@
     mrb->jmp = prev_jmp;
     return proc;
   }
-  MRB_CATCH(&scope->jmp) {
+  MRB_CATCH(mrb->jmp) {
     mrb_irep_decref(mrb, scope->irep);
     mrb_pool_close(scope->mpool);
     mrb->jmp = prev_jmp;
     return NULL;
   }
-  MRB_END_EXC(&scope->jmp);
+  MRB_END_EXC(mrb->jmp);
 }
 
 MRB_API struct RProc*
@@ -3242,65 +3931,13 @@
 {
   int i;
 
+  if (irep->flags & MRB_IREP_NO_FREE) return;
   if (irep->lv) {
-    mrb_free(mrb, irep->lv);
+    mrb_free(mrb, (void*)irep->lv);
     irep->lv = NULL;
   }
-
+  if (!irep->reps) return;
   for (i = 0; i < irep->rlen; ++i) {
-    mrb_irep_remove_lv(mrb, irep->repsi);
+    mrb_irep_remove_lv(mrb, (mrb_irep*)irep->repsi);
   }
 }
-
-#undef OPCODE
-#define Z 1
-#define S 3
-#define W 4
-/* instruction sizes */
-uint8_t mrb_insn_size = {
-#define B 2
-#define BB 3
-#define BBB 4
-#define BS 4
-#define SB 4
-#define OPCODE(_,x) x,
-#include "mruby/ops.h"
-#undef OPCODE
-#undef B
-#undef BB
-#undef BS
-#undef SB
-#undef BBB
-};
-/* EXT1 instruction sizes */
-uint8_t mrb_insn_size1 = {
-#define B 3
-#define BB 4
-#define BBB 5
-#define BS 5
-#define SB 5
-#define OPCODE(_,x) x,
-#include "mruby/ops.h"
-#undef OPCODE
-#undef B
-};
-/* EXT2 instruction sizes */
-uint8_t mrb_insn_size2 = {
-#define B 2
-#define OPCODE(_,x) x,
-#include "mruby/ops.h"
-#undef OPCODE
-#undef BB
-#undef BBB
-#undef BS
-#undef SB
-};
-/* EXT3 instruction sizes */
-#define BB 5
-#define BBB 6
-#define BS 4
-#define SB 5
-uint8_t mrb_insn_size3 = {
-#define OPCODE(_,x) x,
-#include "mruby/ops.h"
-};

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/keywords -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/keywords Changed

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/lex.def -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-compiler/core/lex.def Changed

@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k'1,3,$' /home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords  */
+/* Command-line: gperf -L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k'1,3,$' mrbgems/mruby-compiler/core/keywords  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,10 +28,15 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
-#line 1 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 1 "mrbgems/mruby-compiler/core/keywords"
+
+/* Workaround for `enable_cxx_exception` (#5199) */
+#if defined __cplusplus && __cplusplus >= 201103L
+# define register
+#endif
 
 struct kwtable {const char *name; int id2; enum mrb_lex_state_enum state;};
-#line 5 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 10 "mrbgems/mruby-compiler/core/keywords"
 struct kwtable;
 
 #define TOTAL_KEYWORDS 40
@@ -101,87 +106,87 @@
   static const struct kwtable wordlist =
     {
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 15 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 20 "mrbgems/mruby-compiler/core/keywords"
       {"break",        {keyword_break,       keyword_break},       EXPR_MID},
-#line 20 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 25 "mrbgems/mruby-compiler/core/keywords"
       {"else",         {keyword_else,        keyword_else},        EXPR_BEG},
-#line 30 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 35 "mrbgems/mruby-compiler/core/keywords"
       {"nil",          {keyword_nil,         keyword_nil},         EXPR_END},
-#line 23 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 28 "mrbgems/mruby-compiler/core/keywords"
       {"ensure",       {keyword_ensure,      keyword_ensure},      EXPR_BEG},
-#line 22 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 27 "mrbgems/mruby-compiler/core/keywords"
       {"end",          {keyword_end,         keyword_end},         EXPR_END},
-#line 39 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 44 "mrbgems/mruby-compiler/core/keywords"
       {"then",         {keyword_then,        keyword_then},        EXPR_BEG},
-#line 31 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 36 "mrbgems/mruby-compiler/core/keywords"
       {"not",          {keyword_not,         keyword_not},         EXPR_ARG},
-#line 24 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 29 "mrbgems/mruby-compiler/core/keywords"
       {"false",        {keyword_false,       keyword_false},       EXPR_END},
-#line 37 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 42 "mrbgems/mruby-compiler/core/keywords"
       {"self",         {keyword_self,        keyword_self},        EXPR_END},
-#line 21 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 26 "mrbgems/mruby-compiler/core/keywords"
       {"elsif",        {keyword_elsif,       keyword_elsif},       EXPR_VALUE},
-#line 34 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 39 "mrbgems/mruby-compiler/core/keywords"
       {"rescue",       {keyword_rescue,      modifier_rescue},     EXPR_MID},
-#line 40 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 45 "mrbgems/mruby-compiler/core/keywords"
       {"true",         {keyword_true,        keyword_true},        EXPR_END},
-#line 43 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 48 "mrbgems/mruby-compiler/core/keywords"
       {"until",        {keyword_until,       modifier_until},      EXPR_VALUE},
-#line 42 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 47 "mrbgems/mruby-compiler/core/keywords"
       {"unless",       {keyword_unless,      modifier_unless},     EXPR_VALUE},
-#line 36 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 41 "mrbgems/mruby-compiler/core/keywords"
       {"return",       {keyword_return,      keyword_return},      EXPR_MID},
-#line 18 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 23 "mrbgems/mruby-compiler/core/keywords"
       {"def",          {keyword_def,         keyword_def},         EXPR_FNAME},
-#line 13 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 18 "mrbgems/mruby-compiler/core/keywords"
       {"and",          {keyword_and,         keyword_and},         EXPR_VALUE},
-#line 19 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 24 "mrbgems/mruby-compiler/core/keywords"
       {"do",           {keyword_do,          keyword_do},          EXPR_BEG},
-#line 46 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 51 "mrbgems/mruby-compiler/core/keywords"
       {"yield",        {keyword_yield,       keyword_yield},       EXPR_ARG},
-#line 25 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 30 "mrbgems/mruby-compiler/core/keywords"
       {"for",          {keyword_for,         keyword_for},         EXPR_VALUE},
-#line 41 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 46 "mrbgems/mruby-compiler/core/keywords"
       {"undef",        {keyword_undef,       keyword_undef},       EXPR_FNAME},
-#line 32 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 37 "mrbgems/mruby-compiler/core/keywords"
       {"or",           {keyword_or,          keyword_or},          EXPR_VALUE},
-#line 27 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 32 "mrbgems/mruby-compiler/core/keywords"
       {"in",           {keyword_in,          keyword_in},          EXPR_VALUE},
-#line 44 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 49 "mrbgems/mruby-compiler/core/keywords"
       {"when",         {keyword_when,        keyword_when},        EXPR_VALUE},
-#line 35 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 40 "mrbgems/mruby-compiler/core/keywords"
       {"retry",        {keyword_retry,       keyword_retry},       EXPR_END},
-#line 26 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 31 "mrbgems/mruby-compiler/core/keywords"
       {"if",           {keyword_if,          modifier_if},         EXPR_VALUE},
-#line 16 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 21 "mrbgems/mruby-compiler/core/keywords"
       {"case",         {keyword_case,        keyword_case},        EXPR_VALUE},
-#line 33 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 38 "mrbgems/mruby-compiler/core/keywords"
       {"redo",         {keyword_redo,        keyword_redo},        EXPR_END},
-#line 29 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 34 "mrbgems/mruby-compiler/core/keywords"
       {"next",         {keyword_next,        keyword_next},        EXPR_MID},
-#line 38 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 43 "mrbgems/mruby-compiler/core/keywords"
       {"super",        {keyword_super,       keyword_super},       EXPR_ARG},
-#line 28 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 33 "mrbgems/mruby-compiler/core/keywords"
       {"module",       {keyword_module,      keyword_module},      EXPR_VALUE},
-#line 14 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 19 "mrbgems/mruby-compiler/core/keywords"
       {"begin",        {keyword_begin,       keyword_begin},       EXPR_BEG},
-#line 9 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 14 "mrbgems/mruby-compiler/core/keywords"
       {"__LINE__",     {keyword__LINE__,     keyword__LINE__},     EXPR_END},
-#line 8 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 13 "mrbgems/mruby-compiler/core/keywords"
       {"__FILE__",     {keyword__FILE__,     keyword__FILE__},     EXPR_END},
-#line 7 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 12 "mrbgems/mruby-compiler/core/keywords"
       {"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
-#line 11 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 16 "mrbgems/mruby-compiler/core/keywords"
       {"END",          {keyword_END,         keyword_END},         EXPR_END},
-#line 12 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 17 "mrbgems/mruby-compiler/core/keywords"
       {"alias",        {keyword_alias,       keyword_alias},       EXPR_FNAME},
-#line 10 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 15 "mrbgems/mruby-compiler/core/keywords"
       {"BEGIN",        {keyword_BEGIN,       keyword_BEGIN},       EXPR_END},
       {""},
-#line 17 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 22 "mrbgems/mruby-compiler/core/keywords"
       {"class",        {keyword_class,       keyword_class},       EXPR_CLASS},
       {""}, {""},
-#line 45 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
+#line 50 "mrbgems/mruby-compiler/core/keywords"
       {"while",        {keyword_while,       modifier_while},      EXPR_VALUE}
     };
 
@@ -199,5 +204,4 @@
     }
   return 0;
 }
-#line 47 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-
+#line 52 "mrbgems/mruby-compiler/core/keywords"

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

@@ -13,7 +13,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
 #include <mruby.h>
 #include <mruby/compile.h>
@@ -21,6 +20,8 @@
 #include <mruby/error.h>
 #include <mruby/throw.h>
 #include <mruby/string.h>
+#include <mruby/dump.h>
+#include <mruby/presym.h>
 #include "node.h"
 
 #define YYLEX_PARAM p
@@ -32,7 +33,6 @@
 static int yyparse(parser_state *p);
 static int yylex(void *lval, parser_state *p);
 static void yyerror(parser_state *p, const char *s);
-static void yywarn(parser_state *p, const char *s);
 static void yywarning(parser_state *p, const char *s);
 static void backref_error(parser_state *p, node *n);
 static void void_expr_error(parser_state *p, node *n);
@@ -69,6 +69,7 @@
 #define nsym(x) ((node*)(intptr_t)(x))
 #define nint(x) ((node*)(intptr_t)(x))
 #define intn(x) ((int)(intptr_t)(x))
+#define typen(x) ((enum node_type)(intptr_t)(x))
 
 #define NUM_SUFFIX_R   (1<<0)
 #define NUM_SUFFIX_I   (1<<1)
@@ -87,7 +88,7 @@
 }
 #define intern(s,len) intern_gen(p,(s),(len))
 
-#define intern_lit(s) mrb_intern_lit(p->mrb, s)
+#define intern_op(op) MRB_OPSYM_2(p->mrb, op)
 
 static void
 cons_free_gen(parser_state *p, node *cons)
@@ -103,7 +104,7 @@
   void *m = mrb_pool_alloc(p->pool, size);
 
   if (!m) {
-    MRB_THROW(p->jmp);
+    MRB_THROW(p->mrb->jmp);
   }
   return m;
 }
@@ -265,7 +266,7 @@
 static mrb_bool
 local_var_p(parser_state *p, mrb_sym sym)
 {
-  struct RProc *u;
+  const struct RProc *u;
   node *l = p->locals;
 
   while (l) {
@@ -279,11 +280,14 @@
 
   u = p->upper;
   while (u && !MRB_PROC_CFUNC_P(u)) {
-    struct mrb_irep *ir = u->body.irep;
-    uint_fast16_t n = ir->nlocals;
-    const struct mrb_locals *v = ir->lv;
-    for (; n > 1; n --, v ++) {
-      if (v->name == sym) return TRUE;
+    const struct mrb_irep *ir = u->body.irep;
+    const mrb_sym *v = ir->lv;
+    int i;
+
+    if (v) {
+      for (i=0; i+1 < ir->nlocals; i++) {
+        if (vi == sym) return TRUE;
+      }
     }
     if (MRB_PROC_SCOPE_P(u)) break;
     u = u->upper;
@@ -295,6 +299,18 @@
 local_add_f(parser_state *p, mrb_sym sym)
 {
   if (p->locals) {
+    node *n = p->locals->car;
+    while (n) {
+      if (sym(n->car) == sym) {
+        mrb_int len;
+        const char* name = mrb_sym_name_len(p->mrb, sym, &len);
+        if (len > 0 && name0 != '_') {
+          yyerror(p, "duplicated argument name");
+          return;
+        }
+      }
+      n = n->cdr;
+    }
     p->locals->car = push(p->locals->car, nsym(sym));
   }
 }
@@ -311,14 +327,14 @@
 local_add_blk(parser_state *p, mrb_sym blk)
 {
   /* allocate register for block */
-  local_add_f(p, blk ? blk : mrb_intern_lit(p->mrb, "&"));
+  local_add_f(p, blk ? blk : intern_op(and));
 }
 
 static void
 local_add_kw(parser_state *p, mrb_sym kwd)
 {
   /* allocate register for keywords hash */
-  local_add_f(p, kwd ? kwd : mrb_intern_lit(p->mrb, "**"));
+  local_add_f(p, kwd ? kwd : intern_op(pow));
 }
 
 static node*
@@ -495,13 +511,18 @@
 static node*
 new_fcall(parser_state *p, mrb_sym b, node *c)
 {
-  node *n = new_self(p);
-  NODE_LINENO(n, c);
-  n = list4((node*)NODE_FCALL, n, nsym(b), c);
+  node *n = list4((node*)NODE_FCALL, 0, nsym(b), c);
   NODE_LINENO(n, c);
   return n;
 }
 
+/* (a b . c) */
+static node*
+new_callargs(parser_state *p, node *a, node *b, node *c)
+{
+  return cons(a, cons(b, c));
+}
+
 /* (:super . c) */
 static node*
 new_super(parser_state *p, node *c)
@@ -513,7 +534,7 @@
 static node*
 new_zsuper(parser_state *p)
 {
-  return list1((node*)NODE_ZSUPER);
+  return cons((node*)NODE_ZSUPER, 0);
 }
 
 /* (:yield . c) */
@@ -522,7 +543,12 @@
 {
   if (c) {
     if (c->cdr) {
-      yyerror(p, "both block arg and actual block given");
+      if (c->cdr->cdr) {
+        yyerror(p, "both block arg and actual block given");
+      }
+      if (c->cdr->car) {
+        return cons((node*)NODE_YIELD, push(c->car, c->cdr->car));
+      }
     }
     return cons((node*)NODE_YIELD, c->car);
   }
@@ -597,6 +623,7 @@
 static node*
 new_and(parser_state *p, node *a, node *b)
 {
+  void_expr_error(p, a);
   return cons((node*)NODE_AND, cons(a, b));
 }
 
@@ -604,6 +631,7 @@
 static node*
 new_or(parser_state *p, node *a, node *b)
 {
+  void_expr_error(p, a);
   return cons((node*)NODE_OR, cons(a, b));
 }
 
@@ -618,6 +646,7 @@
 static node*
 new_splat(parser_state *p, node *a)
 {
+  void_expr_error(p, a);
   return cons((node*)NODE_SPLAT, a);
 }
 
@@ -683,9 +712,6 @@
 static node*
 new_nvar(parser_state *p, int num)
 {
-  int nvars = intn(p->nvars->car);
-
-  p->nvars->car = nint(nvars > num ? nvars : num);
   return cons((node*)NODE_NVAR, nint(num));
 }
 
@@ -730,7 +756,19 @@
 static node*
 new_def(parser_state *p, mrb_sym m, node *a, node *b)
 {
-  return list5((node*)NODE_DEF, nsym(m), locals_node(p), a, b);
+  return list5((node*)NODE_DEF, nsym(m), 0, a, b);
+}
+
+static void
+defn_setup(parser_state *p, node *d, node *a, node *b)
+{
+  node *n = d->cdr->cdr;
+
+  n->car = locals_node(p);
+  p->cmdarg_stack = intn(n->cdr->car);
+  n->cdr->car = a;
+  local_resume(p, n->cdr->cdr->car);
+  n->cdr->cdr->car = b;
 }
 
 /* (:sdef obj m lv (arg . body)) */
@@ -738,7 +776,19 @@
 new_sdef(parser_state *p, node *o, mrb_sym m, node *a, node *b)
 {
   void_expr_error(p, o);
-  return list6((node*)NODE_SDEF, o, nsym(m), locals_node(p), a, b);
+  return list6((node*)NODE_SDEF, o, nsym(m), 0, a, b);
+}
+
+static void
+defs_setup(parser_state *p, node *d, node *a, node *b)
+{
+  node *n = d->cdr->cdr->cdr;
+
+  n->car = locals_node(p);
+  p->cmdarg_stack = intn(n->cdr->car);
+  n->cdr->car = a;
+  local_resume(p, n->cdr->cdr->car);
+  n->cdr->cdr->car = b;
 }
 
 /* (:arg . sym) */
@@ -752,7 +802,7 @@
 local_add_margs(parser_state *p, node *n)
 {
   while (n) {
-    if (n->car->car == (node*)NODE_MASGN) {
+    if (typen(n->car->car) == NODE_MASGN) {
       node *t = n->car->cdr->cdr;
 
       n->car->cdr->cdr = NULL;
@@ -846,6 +896,17 @@
   return cons((node*)NODE_KW_REST_ARGS, a);
 }
 
+static node*
+new_args_dots(parser_state *p, node *m)
+{
+  mrb_sym r = intern_op(mul);
+  mrb_sym k = intern_op(pow);
+  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));
+}
+
 /* (:block_arg . a) */
 static node*
 new_block_arg(parser_state *p, node *a)
@@ -932,13 +993,14 @@
 static node*
 new_imaginary(parser_state *p, node *imaginary)
 {
-  return new_call(p, new_const(p, intern_lit("Kernel")), intern_lit("Complex"), list1(list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary)), 1);
+  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);
 }
 
 static node*
 new_rational(parser_state *p, node *rational)
 {
-  return new_call(p, new_const(p, intern_lit("Kernel")), intern_lit("Rational"), list1(list1(rational)), 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), 1);
 }
 
 /* (:int . i) */
@@ -955,7 +1017,7 @@
   return result;
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 /* (:float . i) */
 static node*
 new_float(parser_state *p, const char *s, int suffix)
@@ -988,7 +1050,7 @@
 static int
 string_node_p(node *n)
 {
-  return (int)((enum node_type)(intptr_t)n->car == NODE_STR);
+  return (int)(typen(n->car) == NODE_STR);
 }
 
 static node*
@@ -1161,17 +1223,32 @@
 static node*
 call_bin_op(parser_state *p, node *recv, const char *m, node *arg1)
 {
-  return new_call(p, recv, intern_cstr(m), list1(list1(arg1)), 1);
+  return new_call(p, recv, intern_cstr(m), new_callargs(p, list1(arg1), 0, 0), 1);
 }
 
 static void
 args_with_block(parser_state *p, node *a, node *b)
 {
   if (b) {
-    if (a->cdr) {
+    if (a->cdr && a->cdr->cdr) {
       yyerror(p, "both block arg and actual block given");
     }
-    a->cdr = b;
+    a->cdr->cdr = b;
+  }
+}
+
+static void
+endless_method_name(parser_state *p, node *defn)
+{
+  mrb_sym sym = sym(defn->cdr->car);
+  mrb_int len;
+  const char *name = mrb_sym_name_len(p->mrb, sym, &len);
+
+  if (len > 1 && namelen-1 == '=') {
+    for (int i=0; i<len-1; i++) {
+      if (!identchar(namei)) return;
+    }
+    yyerror(p, "setter method cannot be defined by endless method definition");
   }
 }
 
@@ -1180,22 +1257,19 @@
 {
   node *n;
 
-  switch ((enum node_type)intn(a->car)) {
+  switch (typen(a->car)) {
   case NODE_SUPER:
   case NODE_ZSUPER:
-    if (!a->cdr) a->cdr = cons(0, b);
-    else {
-      args_with_block(p, a->cdr, b);
-    }
+    if (!a->cdr) a->cdr = new_callargs(p, 0, 0, b);
+    else args_with_block(p, a->cdr, b);
     break;
   case NODE_CALL:
   case NODE_FCALL:
   case NODE_SCALL:
-    n = a->cdr->cdr->cdr;
-    if (!n->car) n->car = cons(0, b);
-    else {
-      args_with_block(p, n->car, b);
-    }
+    /* (NODE_CALL recv mid (args kw . blk)) */
+    n = a->cdr->cdr->cdr; /* (args kw . blk) */
+    if (!n->car) n->car = new_callargs(p, 0, 0, b);
+    else args_with_block(p, n->car, b);
     break;
   default:
     break;
@@ -1203,7 +1277,7 @@
 }
 
 static node*
-negate_lit(parser_state *p, node *n)
+new_negate(parser_state *p, node *n)
 {
   return cons((node*)NODE_NEGATE, n);
 }
@@ -1217,10 +1291,11 @@
 static node*
 ret_args(parser_state *p, node *n)
 {
-  if (n->cdr) {
+  if (n->cdr->cdr) {
     yyerror(p, "block argument should not be given");
     return NULL;
   }
+  if (!n->car) return NULL;
   if (!n->car->cdr) return n->car->car;
   return new_array(p, n->car);
 }
@@ -1249,12 +1324,30 @@
   return lhs;
 }
 
+static node*
+label_reference(parser_state *p, mrb_sym sym)
+{
+  const char *name = mrb_sym_name(p->mrb, sym);
+  node *n;
+
+  if (local_var_p(p, sym)) {
+    n = new_lvar(p, sym);
+  }
+  else if (ISUPPER(name0)) {
+    n = new_const(p, sym);
+  }
+  else {
+    n = new_fcall(p, sym, 0);
+  }
+  return n;
+}
+
 typedef enum mrb_string_type  string_type;
 
 static node*
 new_strterm(parser_state *p, string_type type, int term, int paren)
 {
-  return cons(nint(type), cons((node*)0, cons(nint(paren), nint(term))));
+  return cons(nint(type), cons(nint(0), cons(nint(paren), nint(term))));
 }
 
 static void
@@ -1407,15 +1500,24 @@
         keyword__FILE__
         keyword__ENCODING__
 
-%token <id>  tIDENTIFIER tFID tGVAR tIVAR tCONSTANT tCVAR tLABEL_TAG
-%token <nd>  tINTEGER tFLOAT tCHAR tXSTRING tREGEXP
+%token <id>  tIDENTIFIER "local variable or method"
+%token <id>  tFID "method"
+%token <id>  tGVAR "global variable"
+%token <id>  tIVAR "instance variable"
+%token <id>  tCONSTANT "constant"
+%token <id>  tCVAR "class variable"
+%token <id>  tLABEL_TAG "label"
+%token <nd>  tINTEGER "integer literal"
+%token <nd>  tFLOAT "float literal"
+%token <nd>  tCHAR "character literal"
+%token <nd>  tXSTRING tREGEXP
 %token <nd>  tSTRING tSTRING_PART tSTRING_MID
 %token <nd>  tNTH_REF tBACK_REF
 %token <num> tREGEXP_END
-%token <num> tNUMPARAM
+%token <num> tNUMPARAM "numbered parameter"
 
 %type <nd> singleton string string_fragment string_rep string_interp xstring regexp
-%type <nd> literal numeric cpath symbol
+%type <nd> literal numeric cpath symbol defn_head defs_head
 %type <nd> top_compstmt top_stmts top_stmt
 %type <nd> bodystmt compstmt stmts stmt expr arg primary command command_call method_call
 %type <nd> expr_value arg_rhs primary_value
@@ -1425,7 +1527,8 @@
 %type <nd> command_args aref_args opt_block_arg block_arg var_ref var_lhs
 %type <nd> command_asgn command_rhs mrhs superclass block_call block_command
 %type <nd> f_block_optarg f_block_opt
-%type <nd> f_arglist f_args f_arg f_arg_item f_optarg f_margs
+%type <nd> f_opt_arglist_paren f_arglist_paren f_arglist
+%type <nd> f_args f_arg f_arg_item f_optarg f_margs
 %type <nd> assoc_list assocs assoc undef_list backref for_var
 %type <nd> block_param opt_block_param block_param_def f_opt
 %type <nd> bv_decls opt_bv_decl bvar f_larglist lambda_body
@@ -1440,38 +1543,41 @@
 %type <nd> f_block_kwarg f_block_kw block_args_tail opt_block_args_tail
 %type <id> f_label
 
-%token tUPLUS             /* unary+ */
-%token tUMINUS            /* unary- */
-%token tPOW               /* ** */
-%token tCMP               /* <=> */
-%token tEQ                /* == */
-%token tEQQ               /* === */
-%token tNEQ               /* != */
-%token tGEQ               /* >= */
-%token tLEQ               /* <= */
-%token tANDOP tOROP       /* && and || */
-%token tMATCH tNMATCH     /* =~ and !~ */
-%token tDOT2 tDOT3        /* .. and ... */
+%token tUPLUS             "unary plus"
+%token tUMINUS            "unary minus"
+%token tCMP               "<=>"
+%token tEQ                "=="
+%token tEQQ               "==="
+%token tNEQ               "!="
+%token tGEQ               ">="
+%token tLEQ               "<="
+%token tANDOP             "&&"
+%token tOROP              "||"
+%token tMATCH             "=~"
+%token tNMATCH            "!~"
+%token tDOT2              ".."
+%token tDOT3              "..."
+%token tBDOT2 tBDOT3      /* (.. and (... */
 %token tAREF tASET        /*  and = */
-%token tLSHFT tRSHFT      /* << and >> */
-%token tCOLON2            /* :: */
+%token tLSHFT             "<<"
+%token tRSHFT             ">>"
+%token tCOLON2            "::"
 %token tCOLON3            /* :: at EXPR_BEG */
 %token <id> tOP_ASGN      /* +=, -=  etc. */
-%token tASSOC             /* => */
-%token tLPAREN            /* ( */
-%token tLPAREN_ARG        /* ( */
-%token tRPAREN            /* ) */
-%token tLBRACK            /*  */
-%token tLBRACE            /* { */
-%token tLBRACE_ARG        /* { */
-%token tSTAR              /* * */
-%token tDSTAR             /* ** */
-%token tAMPER             /* & */
-%token tLAMBDA            /* -> */
-%token tANDDOT            /* &. */
-%token tSYMBEG tREGEXP_BEG tWORDS_BEG tSYMBOLS_BEG
-%token tSTRING_BEG tXSTRING_BEG tSTRING_DVAR tLAMBEG
-%token <nd> tHEREDOC_BEG  /* <<, <<- */
+%token tASSOC             "=>"
+%token tLPAREN tLPAREN_ARG "("
+%token tRPAREN            ")"
+%token tLBRACK            ""
+%token tLBRACE tLBRACE_ARG "{"
+%token tSTAR              "*"
+%token tPOW tDSTAR        "**"
+%token tAMPER             "&"
+%token tLAMBDA            "->"
+%token tANDDOT            "&."
+%token tSYMBEG "symbol"
+%token tSTRING_BEG "string literal"
+%token tXSTRING_BEG tSTRING_DVAR tREGEXP_BEG tWORDS_BEG tSYMBOLS_BEG tLAMBEG
+%token <nd> tHEREDOC_BEG  "here document"
 %token tHEREDOC_END tLITERAL_DELIM tHD_LITERAL_DELIM
 %token <nd> tHD_STRING_PART tHD_STRING_MID
 
@@ -1488,7 +1594,7 @@
 %right '=' tOP_ASGN
 %left modifier_rescue
 %right '?' ':' tLABEL_TAG
-%nonassoc tDOT2 tDOT3
+%nonassoc tDOT2 tDOT3 tBDOT2 tBDOT3
 %left  tOROP
 %left  tANDOP
 %nonassoc  tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
@@ -1566,7 +1672,7 @@
                         NODE_LINENO($$, $1);
                       }
                       else if ($3) {
-                        yywarn(p, "else without rescue is useless");
+                        yywarning(p, "else without rescue is useless");
                         $$ = push($1, $3);
                       }
                       else {
@@ -1658,6 +1764,12 @@
                     {
                       $$ = new_masgn(p, $1, new_array(p, $3));
                     }
+                | arg tASSOC tIDENTIFIER
+                    {
+                      node *lhs = new_lvar(p, $3);
+                      assignable(p, lhs);
+                      $$ = new_asgn(p, lhs, $1);
+                    }
                 | expr
                 ;
 
@@ -1671,7 +1783,7 @@
                     }
                 | primary_value '' opt_call_args '' tOP_ASGN command_rhs
                     {
-                      $$ = new_op_asgn(p, new_call(p, $1, intern_lit(""), $3, '.'), $5, $6);
+                      $$ = new_op_asgn(p, new_call(p, $1, intern_op(aref), $3, '.'), $5, $6);
                     }
                 | primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
                     {
@@ -1690,6 +1802,42 @@
                     {
                       $$ = new_op_asgn(p, new_call(p, $1, $3, 0, tCOLON2), $4, $5);
                     }
+                | defn_head f_opt_arglist_paren '=' command
+                    {
+                      $$ = $1;
+                      endless_method_name(p, $1);
+                      void_expr_error(p, $4);
+                      defn_setup(p, $$, $2, $4);
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+                | defn_head f_opt_arglist_paren '=' command modifier_rescue arg
+                    {
+                      $$ = $1;
+                      endless_method_name(p, $1);
+                      void_expr_error(p, $4);
+                      defn_setup(p, $$, $2, new_mod_rescue(p, $4, $6));
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+                | defs_head f_opt_arglist_paren '=' command
+                    {
+                      $$ = $1;
+                      void_expr_error(p, $4);
+                      defs_setup(p, $$, $2, $4);
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
+                | defs_head f_opt_arglist_paren '=' command modifier_rescue arg
+                    {
+                      $$ = $1;
+                      void_expr_error(p, $4);
+                      defs_setup(p, $$, $2, new_mod_rescue(p, $4, $6));
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
                 | backref tOP_ASGN command_rhs
                     {
                       backref_error(p, $1);
@@ -1726,6 +1874,31 @@
                 | arg
                 ;
 
+
+defn_head       : keyword_def fname
+                    {
+                      $$ = new_def(p, $2, nint(p->cmdarg_stack), local_switch(p));
+                      p->cmdarg_stack = 0;
+                      p->in_def++;
+                      nvars_block(p);
+                    }
+                ;
+
+defs_head       : keyword_def singleton dot_or_colon
+                    {
+                      p->lstate = EXPR_FNAME;
+                    }
+                    fname
+                    {
+                      $$ = new_sdef(p, $2, $5, nint(p->cmdarg_stack), local_switch(p));
+                      p->cmdarg_stack = 0;
+                      p->in_def++;
+                      p->in_single++;
+                      nvars_block(p);
+                      p->lstate = EXPR_ENDFN; /* force for args */
+                    }
+                ;
+
 expr_value      : expr
                     {
                       if (!$1) $$ = new_nil(p);
@@ -1902,7 +2075,7 @@
                     }
                 | primary_value '' opt_call_args ''
                     {
-                      $$ = new_call(p, $1, intern_lit(""), $3, '.');
+                      $$ = new_call(p, $1, intern_op(aref), $3, '.');
                     }
                 | primary_value call_op tIDENTIFIER
                     {
@@ -1941,7 +2114,7 @@
                     }
                 | primary_value '' opt_call_args ''
                     {
-                      $$ = new_call(p, $1, intern_lit(""), $3, '.');
+                      $$ = new_call(p, $1, intern_op(aref), $3, '.');
                     }
                 | primary_value call_op tIDENTIFIER
                     {
@@ -1987,11 +2160,11 @@
 
 cpath           : tCOLON3 cname
                     {
-                      $$ = cons((node*)1, nsym($2));
+                      $$ = cons(nint(1), nsym($2));
                     }
                 | cname
                     {
-                      $$ = cons((node*)0, nsym($1));
+                      $$ = cons(nint(0), nsym($1));
                     }
                 | primary_value tCOLON2 cname
                     {
@@ -2029,36 +2202,36 @@
                     }
                 ;
 
-op              : '|'           { $$ = intern_lit("|");   }
-                | '^'           { $$ = intern_lit("^");   }
-                | '&'           { $$ = intern_lit("&");   }
-                | tCMP          { $$ = intern_lit("<=>"); }
-                | tEQ           { $$ = intern_lit("==");  }
-                | tEQQ          { $$ = intern_lit("==="); }
-                | tMATCH        { $$ = intern_lit("=~");  }
-                | tNMATCH       { $$ = intern_lit("!~");  }
-                | '>'           { $$ = intern_lit(">");   }
-                | tGEQ          { $$ = intern_lit(">=");  }
-                | '<'           { $$ = intern_lit("<");   }
-                | tLEQ          { $$ = intern_lit("<=");  }
-                | tNEQ          { $$ = intern_lit("!=");  }
-                | tLSHFT        { $$ = intern_lit("<<");  }
-                | tRSHFT        { $$ = intern_lit(">>");  }
-                | '+'           { $$ = intern_lit("+");   }
-                | '-'           { $$ = intern_lit("-");   }
-                | '*'           { $$ = intern_lit("*");   }
-                | tSTAR         { $$ = intern_lit("*");   }
-                | '/'           { $$ = intern_lit("/");   }
-                | '%'           { $$ = intern_lit("%");   }
-                | tPOW          { $$ = intern_lit("**");  }
-                | tDSTAR        { $$ = intern_lit("**");  }
-                | '!'           { $$ = intern_lit("!");   }
-                | '~'           { $$ = intern_lit("~");   }
-                | tUPLUS        { $$ = intern_lit("+@");  }
-                | tUMINUS       { $$ = intern_lit("-@");  }
-                | tAREF         { $$ = intern_lit("");  }
-                | tASET         { $$ = intern_lit("="); }
-                | '`'           { $$ = intern_lit("`");   }
+op              : '|'           { $$ = intern_op(or);     }
+                | '^'           { $$ = intern_op(xor);    }
+                | '&'           { $$ = intern_op(and);    }
+                | tCMP          { $$ = intern_op(cmp);    }
+                | tEQ           { $$ = intern_op(eq);     }
+                | tEQQ          { $$ = intern_op(eqq);    }
+                | tMATCH        { $$ = intern_op(match);  }
+                | tNMATCH       { $$ = intern_op(nmatch); }
+                | '>'           { $$ = intern_op(gt);     }
+                | tGEQ          { $$ = intern_op(ge);     }
+                | '<'           { $$ = intern_op(lt);     }
+                | tLEQ          { $$ = intern_op(le);     }
+                | tNEQ          { $$ = intern_op(neq);    }
+                | tLSHFT        { $$ = intern_op(lshift); }
+                | tRSHFT        { $$ = intern_op(rshift); }
+                | '+'           { $$ = intern_op(add);    }
+                | '-'           { $$ = intern_op(sub);    }
+                | '*'           { $$ = intern_op(mul);    }
+                | tSTAR         { $$ = intern_op(mul);    }
+                | '/'           { $$ = intern_op(div);    }
+                | '%'           { $$ = intern_op(mod);    }
+                | tPOW          { $$ = intern_op(pow);    }
+                | tDSTAR        { $$ = intern_op(pow);    }
+                | '!'           { $$ = intern_op(not);    }
+                | '~'           { $$ = intern_op(neg);    }
+                | tUPLUS        { $$ = intern_op(plus);   }
+                | tUMINUS       { $$ = intern_op(minus);  }
+                | tAREF         { $$ = intern_op(aref);   }
+                | tASET         { $$ = intern_op(aset);   }
+                | '`'           { $$ = intern_op(tick);   }
                 ;
 
 reswords        : keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__
@@ -2085,7 +2258,7 @@
                     }
                 | primary_value '' opt_call_args '' tOP_ASGN arg_rhs
                     {
-                      $$ = new_op_asgn(p, new_call(p, $1, intern_lit(""), $3, '.'), $5, $6);
+                      $$ = new_op_asgn(p, new_call(p, $1, intern_op(aref), $3, '.'), $5, $6);
                     }
                 | primary_value call_op tIDENTIFIER tOP_ASGN arg_rhs
                     {
@@ -2118,10 +2291,26 @@
                     {
                       $$ = new_dot2(p, $1, $3);
                     }
+                | arg tDOT2
+                    {
+                      $$ = new_dot2(p, $1, new_nil(p));
+                    }
+                | tBDOT2 arg
+                    {
+                      $$ = new_dot2(p, new_nil(p), $2);
+                    }
                 | arg tDOT3 arg
                     {
                       $$ = new_dot3(p, $1, $3);
                     }
+                | arg tDOT3
+                    {
+                      $$ = new_dot3(p, $1, new_nil(p));
+                    }
+                | tBDOT3 arg
+                    {
+                      $$ = new_dot3(p, new_nil(p), $2);
+                    }
                 | arg '+' arg
                     {
                       $$ = call_bin_op(p, $1, "+", $3);
@@ -2148,11 +2337,11 @@
                     }
                 | tUMINUS_NUM tINTEGER tPOW arg
                     {
-                      $$ = call_uni_op(p, call_bin_op(p, $2, "**", $4), "-@");
+                      $$ = new_negate(p, call_bin_op(p, $2, "**", $4));
                     }
                 | tUMINUS_NUM tFLOAT tPOW arg
                     {
-                      $$ = call_uni_op(p, call_bin_op(p, $2, "**", $4), "-@");
+                      $$ = new_negate(p, call_bin_op(p, $2, "**", $4));
                     }
                 | tUPLUS arg
                     {
@@ -2160,7 +2349,7 @@
                     }
                 | tUMINUS arg
                     {
-                      $$ = call_uni_op(p, $2, "-@");
+                      $$ = new_negate(p, $2);
                     }
                 | arg '|' arg
                     {
@@ -2246,6 +2435,42 @@
                     {
                       $$ = new_if(p, cond($1), $3, $6);
                     }
+                | defn_head f_opt_arglist_paren '=' arg
+                    {
+                      $$ = $1;
+                      endless_method_name(p, $1);
+                      void_expr_error(p, $4);
+                      defn_setup(p, $$, $2, $4);
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+                | defn_head f_opt_arglist_paren '=' arg modifier_rescue arg
+                    {
+                      $$ = $1;
+                      endless_method_name(p, $1);
+                      void_expr_error(p, $4);
+                      defn_setup(p, $$, $2, new_mod_rescue(p, $4, $6));
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+                | defs_head f_opt_arglist_paren '=' arg
+                    {
+                      $$ = $1;
+                      void_expr_error(p, $4);
+                      defs_setup(p, $$, $2, $4);
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
+                | defs_head f_opt_arglist_paren '=' arg modifier_rescue arg
+                    {
+                      $$ = $1;
+                      void_expr_error(p, $4);
+                      defs_setup(p, $$, $2, new_mod_rescue(p, $4, $6));
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
                 | primary
                     {
                       $$ = $1;
@@ -2260,7 +2485,7 @@
                     }
                 | args comma assocs trailer
                     {
-                      $$ = push($1, new_kw_hash(p, $3));
+                      $$ = push($1, new_hash(p, $3));
                     }
                 | assocs trailer
                     {
@@ -2276,7 +2501,6 @@
                 | arg modifier_rescue arg
                     {
                       void_expr_error(p, $1);
-                      void_expr_error(p, $3);
                       $$ = new_mod_rescue(p, $1, $3);
                     }
                 ;
@@ -2285,25 +2509,25 @@
                     {
                       $$ = $2;
                     }
-                | '(' tDOT3 rparen
+                | '(' args comma tBDOT3 rparen
                     {
-#if 1
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
-                      if (local_var_p(p, r)  && local_var_p(p, b)) {
-                        $$ = cons(list1(new_splat(p, new_lvar(p, r))),
-                                  new_block_arg(p, new_lvar(p, b)));
-                      }
-#else
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym k = mrb_intern_lit(p->mrb, "**");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
+                      mrb_sym r = intern_op(mul);
+                      mrb_sym k = intern_op(pow);
+                      mrb_sym b = intern_op(and);
+                      $$ = new_callargs(p, push($2, new_splat(p, new_lvar(p, r))),
+                                        new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k)))),
+                                        new_block_arg(p, new_lvar(p, b)));
+                    }
+                | '(' tBDOT3 rparen
+                    {
+                      mrb_sym r = intern_op(mul);
+                      mrb_sym k = intern_op(pow);
+                      mrb_sym b = intern_op(and);
                       if (local_var_p(p, r) && local_var_p(p, k) && local_var_p(p, b)) {
-                        $$ = cons(list2(new_splat(p, new_lvar(p, r)),
-                                        new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k))))),
-                                  new_block_arg(p, new_lvar(p, b)));
+                        $$ = new_callargs(p, list1(new_splat(p, new_lvar(p, r))),
+                                          new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k)))),
+                                          new_block_arg(p, new_lvar(p, b)));
                       }
-#endif
                       else {
                         yyerror(p, "unexpected argument forwarding ...");
                         $$ = 0;
@@ -2319,17 +2543,17 @@
                 | call_args opt_terms
                 | args comma
                     {
-                      $$ = cons($1,0);
+                      $$ = new_callargs(p,$1,0,0);
                       NODE_LINENO($$, $1);
                     }
                 | args comma assocs comma
                     {
-                      $$ = cons(push($1, new_kw_hash(p, $3)), 0);
+                      $$ = new_callargs(p,$1,new_kw_hash(p,$3),0);
                       NODE_LINENO($$, $1);
                     }
                 | assocs comma
                     {
-                      $$ = cons(list1(new_kw_hash(p, $1)), 0);
+                      $$ = new_callargs(p,0,new_kw_hash(p,$1),0);
                       NODE_LINENO($$, $1);
                     }
                 ;
@@ -2337,27 +2561,27 @@
 call_args       : command
                     {
                       void_expr_error(p, $1);
-                      $$ = cons(list1($1), 0);
+                      $$ = new_callargs(p, list1($1), 0, 0);
                       NODE_LINENO($$, $1);
                     }
                 | args opt_block_arg
                     {
-                      $$ = cons($1, $2);
+                      $$ = new_callargs(p, $1, 0, $2);
                       NODE_LINENO($$, $1);
                     }
                 | assocs opt_block_arg
                     {
-                      $$ = cons(list1(new_kw_hash(p, $1)), $2);
+                      $$ = new_callargs(p, 0, new_kw_hash(p, $1), $2);
                       NODE_LINENO($$, $1);
                     }
                 | args comma assocs opt_block_arg
                     {
-                      $$ = cons(push($1, new_kw_hash(p, $3)), $4);
+                      $$ = new_callargs(p, $1, new_kw_hash(p, $3), $4);
                       NODE_LINENO($$, $1);
                     }
                 | block_arg
                     {
-                      $$ = cons(0, $1);
+                      $$ = new_callargs(p, 0, 0, $1);
                       NODE_LINENO($$, $1);
                     }
                 ;
@@ -2377,6 +2601,10 @@
                     {
                       $$ = new_block_arg(p, $2);
                     }
+                | tAMPER
+                    {
+                      $$ = new_block_arg(p, 0);
+                    }
                 ;
 
 opt_block_arg   : comma block_arg
@@ -2389,20 +2617,18 @@
                     }
                 ;
 
-comma           : ','
-                | ','  opt_nl heredoc_bodies
+comma           : ','  opt_nl
                 ;
 
 args            : arg
                     {
                       void_expr_error(p, $1);
-                      $$ = cons($1, 0);
+                      $$ = list1($1);
                       NODE_LINENO($$, $1);
                     }
                 | tSTAR arg
                     {
-                      void_expr_error(p, $2);
-                      $$ = cons(new_splat(p, $2), 0);
+                      $$ = list1(new_splat(p, $2));
                       NODE_LINENO($$, $2);
                     }
                 | args comma arg
@@ -2412,7 +2638,6 @@
                     }
                 | args comma tSTAR arg
                     {
-                      void_expr_error(p, $4);
                       $$ = push($1, new_splat(p, $4));
                     }
                 ;
@@ -2424,12 +2649,10 @@
                     }
                 | args comma tSTAR arg
                     {
-                      void_expr_error(p, $4);
                       $$ = push($1, new_splat(p, $4));
                     }
                 | tSTAR arg
                     {
-                      void_expr_error(p, $2);
                       $$ = list1(new_splat(p, $2));
                     }
                 ;
@@ -2514,7 +2737,7 @@
                     }
                 | operation brace_block
                     {
-                      $$ = new_fcall(p, $1, cons(0, $2));
+                      $$ = new_fcall(p, $1, new_callargs(p, 0, 0, $2));
                     }
                 | method_call
                 | method_call brace_block
@@ -2525,6 +2748,7 @@
                 | tLAMBDA
                     {
                       local_nest(p);
+                      nvars_nest(p);
                       $<num>$ = p->lpar_beg;
                       p->lpar_beg = ++p->paren_nest;
                     }
@@ -2538,6 +2762,7 @@
                       p->lpar_beg = $<num>2;
                       $$ = new_lambda(p, $3, $5);
                       local_unnest(p);
+                      nvars_unnest(p);
                       p->cmdarg_stack = $<stack>4;
                       CMDARG_LEXPOP();
                     }
@@ -2645,50 +2870,26 @@
                       local_resume(p, $<nd>3);
                       nvars_unnest(p);
                     }
-                | keyword_def fname
-                    {
-                      $<stack>$ = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-                    {
-                      p->in_def++;
-                      $<nd>$ = local_switch(p);
-                      nvars_block(p);
-                    }
+                | defn_head
                   f_arglist
                   bodystmt
                   keyword_end
                     {
-                      $$ = new_def(p, $2, $5, $6);
-                      SET_LINENO($$, $1);
-                      local_resume(p, $<nd>4);
+                      $$ = $1;
+                      defn_setup(p, $$, $2, $3);
                       nvars_unnest(p);
                       p->in_def--;
-                      p->cmdarg_stack = $<stack>3;
-                    }
-                | keyword_def singleton dot_or_colon
-                    {
-                      p->lstate = EXPR_FNAME;
-                      $<stack>$ = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-                    fname
-                    {
-                      p->in_single++;
-                      p->lstate = EXPR_ENDFN; /* force for args */
-                      $<nd>$ = local_switch(p);
-                      nvars_block(p);
                     }
+                | defs_head
                   f_arglist
                   bodystmt
                   keyword_end
                     {
-                      $$ = new_sdef(p, $2, $5, $7, $8);
-                      SET_LINENO($$, $1);
-                      local_resume(p, $<nd>6);
+                      $$ = $1;
+                      defs_setup(p, $$, $2, $3);
                       nvars_unnest(p);
+                      p->in_def--;
                       p->in_single--;
-                      p->cmdarg_stack = $<stack>4;
                     }
                 | keyword_break
                     {
@@ -2761,12 +2962,12 @@
                     }
                 | f_arg ',' tSTAR
                     {
-                      local_add_f(p, 0);
-                      $$ = list3($1, (node*)-1, 0);
+                      local_add_f(p, intern_op(mul));
+                      $$ = list3($1, nint(-1), 0);
                     }
                 | f_arg ',' tSTAR ',' f_arg
                     {
-                      $$ = list3($1, (node*)-1, $5);
+                      $$ = list3($1, nint(-1), $5);
                     }
                 | tSTAR f_norm_arg
                     {
@@ -2778,16 +2979,16 @@
                     }
                 | tSTAR
                     {
-                      local_add_f(p, 0);
-                      $$ = list3(0, (node*)-1, 0);
+                      local_add_f(p, intern_op(mul));
+                      $$ = list3(0, nint(-1), 0);
                     }
                 | tSTAR ','
                     {
-                      local_add_f(p, 0);
+                      local_add_f(p, intern_op(mul));
                     }
                   f_arg
                     {
-                      $$ = list3(0, (node*)-1, $4);
+                      $$ = list3(0, nint(-1), $4);
                     }
                 ;
 
@@ -2968,7 +3169,7 @@
 
 block_call      : command do_block
                     {
-                      if ($1->car == (node*)NODE_YIELD) {
+                      if (typen($1->car) == NODE_YIELD) {
                         yyerror(p, "block given to yield");
                       }
                       else {
@@ -3010,11 +3211,11 @@
                     }
                 | primary_value call_op paren_args
                     {
-                      $$ = new_call(p, $1, intern_lit("call"), $3, $2);
+                      $$ = new_call(p, $1, MRB_SYM_2(p->mrb, call), $3, $2);
                     }
                 | primary_value tCOLON2 paren_args
                     {
-                      $$ = new_call(p, $1, intern_lit("call"), $3, tCOLON2);
+                      $$ = new_call(p, $1, MRB_SYM_2(p->mrb, call), $3, tCOLON2);
                     }
                 | keyword_super paren_args
                     {
@@ -3026,7 +3227,7 @@
                     }
                 | primary_value '' opt_call_args ''
                     {
-                      $$ = new_call(p, $1, intern_lit(""), $3, '.');
+                      $$ = new_call(p, $1, intern_op(aref), $3, '.');
                     }
                 ;
 
@@ -3133,7 +3334,14 @@
                     }
                 | tSTRING_BEG string_rep tSTRING
                     {
-                      $$ = new_dstr(p, push($2, $3));
+                      node *n = $2;
+                      if (intn($3->cdr->cdr) > 0) {
+                        n = push(n, $3);
+                      }
+                      else {
+                        cons_free($3);
+                      }
+                      $$ = new_dstr(p, n);
                     }
                 ;
 
@@ -3175,7 +3383,14 @@
                     }
                 | tXSTRING_BEG string_rep tXSTRING
                     {
-                      $$ = new_dxstr(p, push($2, $3));
+                      node *n = $2;
+                      if (intn($3->cdr->cdr) > 0) {
+                        n = push(n, $3);
+                      }
+                      else {
+                        cons_free($3);
+                      }
+                      $$ = new_dxstr(p, n);
                     }
                 ;
 
@@ -3238,7 +3453,14 @@
                     }
                 | tWORDS_BEG string_rep tSTRING
                     {
-                      $$ = new_words(p, push($2, $3));
+                      node *n = $2;
+                      if (intn($3->cdr->cdr) > 0) {
+                        n = push(n, $3);
+                      }
+                      else {
+                        cons_free($3);
+                      }
+                      $$ = new_words(p, n);
                     }
                 ;
 
@@ -3250,8 +3472,15 @@
                     }
                 | tSYMBEG tSTRING_BEG string_rep tSTRING
                     {
+                      node *n = $3;
                       p->lstate = EXPR_ENDARG;
-                      $$ = new_dsym(p, new_dstr(p, push($3, $4)));
+                      if (intn($4->cdr->cdr) > 0) {
+                        n = push(n, $4);
+                      }
+                      else {
+                        cons_free($4);
+                      }
+                      $$ = new_dsym(p, new_dstr(p, n));
                     }
                 ;
 
@@ -3281,7 +3510,11 @@
                     }
                 | tSYMBOLS_BEG string_rep tSTRING
                     {
-                      $$ = new_symbols(p, push($2, $3));
+                      node *n = $2;
+                      if (intn($3->cdr->cdr) > 0) {
+                        n = push(n, $3);
+                      }
+                      $$ = new_symbols(p, n);
                     }
                 ;
 
@@ -3289,11 +3522,11 @@
                 | tFLOAT
                 | tUMINUS_NUM tINTEGER          %prec tLOWEST
                     {
-                      $$ = negate_lit(p, $2);
+                      $$ = new_negate(p, $2);
                     }
                 | tUMINUS_NUM tFLOAT            %prec tLOWEST
                     {
-                      $$ = negate_lit(p, $2);
+                      $$ = new_negate(p, $2);
                     }
                 ;
 
@@ -3366,12 +3599,7 @@
                     }
                 | keyword__ENCODING__
                     {
-#ifdef MRB_UTF8_STRING
-                      const char *enc = "UTF-8";
-#else
-                      const char *enc = "ASCII-8BIT";
-#endif
-                      $$ = new_str(p, enc, strlen(enc));
+                      $$ = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0);
                     }
                 ;
 
@@ -3399,34 +3627,40 @@
                     } */
                 ;
 
-f_arglist       : '(' f_args rparen
+f_opt_arglist_paren
+                : f_arglist_paren
+                | none
+                ;
+
+f_arglist_paren : '(' f_args rparen
                     {
                       $$ = $2;
                       p->lstate = EXPR_BEG;
                       p->cmd_start = TRUE;
                     }
-                | '(' tDOT3 rparen
+                | '(' f_arg ',' tBDOT3 rparen
                     {
-#if 1
-                      /* til real keyword args implemented */
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
-                      local_add_f(p, r);
-                      $$ = new_args(p, 0, 0, r, 0,
-                                    new_args_tail(p, 0, 0, b));
-#else
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym k = mrb_intern_lit(p->mrb, "**");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
-                      local_add_f(p, r); local_add_f(p, k);
-                      $$ = new_args(p, 0, 0, r, 0,
-                                    new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
-#endif
+                      $$ = new_args_dots(p, $2);
                     }
+                | '(' tBDOT3 rparen
+                    {
+                      $$ = new_args_dots(p, 0);
+                    }
+                ;
+
+f_arglist       : f_arglist_paren
                 | f_args term
                     {
                       $$ = $1;
                     }
+                | f_arg ',' tBDOT3 term
+                    {
+                      $$ = new_args_dots(p, $1);
+                    }
+                | tDOT3 term
+                    {
+                      $$ = new_args_dots(p, 0);
+                    }
                 ;
 
 f_label         : tIDENTIFIER tLABEL_TAG
@@ -3450,6 +3684,7 @@
 
 f_block_kw      : f_label primary_value
                     {
+                      void_expr_error(p, $2);
                       $$ = new_kw_arg(p, $1, cons($2, locals_node(p)));
                       local_unnest(p);
                     }
@@ -3580,7 +3815,7 @@
                     }
                 | /* none */
                     {
-                      local_add_f(p, mrb_intern_lit(p->mrb, "&"));
+                      local_add_f(p, intern_op(and));
                       $$ = new_args(p, 0, 0, 0, 0, 0);
                     }
                 ;
@@ -3704,8 +3939,8 @@
                     }
                 | restarg_mark
                     {
-                      local_add_f(p, mrb_intern_lit(p->mrb, "*"));
-                      $$ = -1;
+                      $$ = intern_op(mul);
+                      local_add_f(p, $$);
                     }
                 ;
 
@@ -3717,6 +3952,10 @@
                     {
                       $$ = $2;
                     }
+                | blkarg_mark
+                    {
+                      $$ = intern_op(and);
+                    }
                 ;
 
 opt_f_block_arg : ',' f_block_arg
@@ -3740,7 +3979,7 @@
                         yyerror(p, "can't define singleton method for ().");
                       }
                       else {
-                        switch ((enum node_type)intn($3->car)) {
+                        switch (typen($3->car)) {
                         case NODE_STR:
                         case NODE_DSTR:
                         case NODE_XSTR:
@@ -3777,25 +4016,25 @@
                     }
                 ;
 
-label_tag       : tLABEL_TAG
-                | tLABEL_TAG heredoc_bodies
-                ;
-
 assoc           : arg tASSOC arg
                     {
                       void_expr_error(p, $1);
                       void_expr_error(p, $3);
                       $$ = cons($1, $3);
                     }
-                | tIDENTIFIER label_tag arg
+                | tIDENTIFIER tLABEL_TAG arg
                     {
                       void_expr_error(p, $3);
                       $$ = cons(new_sym(p, $1), $3);
                     }
-                | string_fragment label_tag arg
+                | tIDENTIFIER tLABEL_TAG
+                    {
+                      $$ = cons(new_sym(p, $1), label_reference(p, $1));
+                    }
+                | string_fragment tLABEL_TAG arg
                     {
                       void_expr_error(p, $3);
-                      if ($1->car == (node*)NODE_DSTR) {
+                      if (typen($1->car) == NODE_DSTR) {
                         $$ = cons(new_dsym(p, $1), $3);
                       }
                       else {
@@ -3851,7 +4090,7 @@
                 ;
 
 opt_nl          : /* none */
-                | nl
+                | opt_nl nl
                 ;
 
 rparen          : opt_terms ')'
@@ -3864,7 +4103,6 @@
 
 term            : ';' {yyerrok;}
                 | nl
-                | heredoc_body
                 ;
 
 nl              : '\n'
@@ -3872,6 +4110,7 @@
                       p->lineno += $<num>1;
                       p->column = 0;
                     }
+                | heredoc_body
                 ;
 
 terms           : term
@@ -3893,7 +4132,7 @@
   size_t n;
 
   if (! p->capture_errors) {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
     if (p->filename_sym) {
       const char *filename = mrb_sym_name_len(p->mrb, p->filename_sym, NULL);
       fprintf(stderr, "%s:%d:%d: %s\n", filename, p->lineno, p->column, s);
@@ -3926,13 +4165,13 @@
 }
 
 static void
-yywarn(parser_state *p, const char *s)
+yywarning(parser_state *p, const char *s)
 {
   char* c;
   size_t n;
 
   if (! p->capture_errors) {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
     if (p->filename_sym) {
       const char *filename = mrb_sym_name_len(p->mrb, p->filename_sym, NULL);
       fprintf(stderr, "%s:%d:%d: warning: %s\n", filename, p->lineno, p->column, s);
@@ -3954,12 +4193,6 @@
 }
 
 static void
-yywarning(parser_state *p, const char *s)
-{
-  yywarn(p, s);
-}
-
-static void
 yywarning_s(parser_state *p, const char *msg, const char *s)
 {
   char buf256;
@@ -4032,20 +4265,20 @@
 nextc0(parser_state *p)
 {
   int c;
-#ifndef MRB_DISABLE_STDIO
-  if (p->f) {
-    if (feof(p->f)) return -1;
-    c = fgetc(p->f);
-    if (c == EOF) return -1;
+
+  if (p->s && p->s < p->send) {
+    c = (unsigned char)*p->s++;
   }
-  else
+  else {
+#ifndef MRB_NO_STDIO
+    if (p->f) {
+      c = fgetc(p->f);
+      if (feof(p->f)) return -1;
+    }
+    else
 #endif
-    if (!p->s || p->s >= p->send) {
       return -1;
-    }
-    else {
-      c = (unsigned char)*p->s++;
-    }
+  }
   return c;
 }
 
@@ -4121,7 +4354,7 @@
     list = push(list, nint(c0));
   } while(n--);
   if (p->pb) {
-    p->pb = append((node*)list, p->pb);
+    p->pb = append(list, p->pb);
   }
   else {
     p->pb = list;
@@ -4141,7 +4374,7 @@
 {
   size_t len = strlen(s);
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   if (p->f) {
     int n = 0;
     while (*s) {
@@ -4499,6 +4732,89 @@
   }
 }
 
+static void
+heredoc_count_indent(parser_heredoc_info *hinf, const char *str, size_t len, size_t spaces, size_t *offset)
+{
+  size_t indent = 0;
+  *offset = 0;
+  for (size_t i = 0; i < len; i++) {
+    size_t size;
+    if (stri == '\n')
+      break;
+    else if (stri == '\t')
+      size = 8;
+    else if (ISSPACE(stri))
+      size = 1;
+    else
+      break;
+    size_t nindent = indent + size;
+    if (nindent > spaces || nindent > hinf->indent)
+      break;
+    indent = nindent;
+    *offset += 1;
+  }
+}
+
+static void
+heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinf)
+{
+  if (!hinf->remove_indent || hinf->indent == 0)
+    return;
+  node *indented, *n, *pair, *escaped, *nspaces;
+  const char *str;
+  size_t len, spaces, offset, start, end;
+  indented = hinf->indented;
+  while (indented) {
+    n = indented->car;
+    pair = n->car;
+    str = (char*)pair->car;
+    len = (size_t)pair->cdr;
+    escaped = n->cdr->car;
+    nspaces = n->cdr->cdr;
+    if (escaped) {
+      char *newstr = strndup(str, len);
+      size_t newlen = 0;
+      start = 0;
+      while (start < len) {
+        end = escaped ? (size_t)escaped->car : len;
+        if (end > len) end = len;
+        spaces = (size_t)nspaces->car;
+        size_t esclen = end - start;
+        heredoc_count_indent(hinf, str + start, esclen, spaces, &offset);
+        esclen -= offset;
+        memcpy(newstr + newlen, str + start + offset, esclen);
+        newlen += esclen;
+        start = end;
+        if (escaped)
+          escaped = escaped->cdr;
+        nspaces = nspaces->cdr;
+      }
+      if (newlen < len)
+        newstrnewlen = '\0';
+      pair->car = (node*)newstr;
+      pair->cdr = (node*)newlen;
+    } else {
+      spaces = (size_t)nspaces->car;
+      heredoc_count_indent(hinf, str, len, spaces, &offset);
+      pair->car = (node*)(str + offset);
+      pair->cdr = (node*)(len - offset);
+    }
+    indented = indented->cdr;
+  }
+}
+
+static void
+heredoc_push_indented(parser_state *p, parser_heredoc_info *hinf, node *pair, node *escaped, node *nspaces, mrb_bool empty_line)
+{
+  hinf->indented = push(hinf->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;
+    nspaces = nspaces->cdr;
+  }
+}
+
 static int
 parse_string(parser_state *p)
 {
@@ -4509,10 +4825,19 @@
   int end = intn(p->lex_strterm->cdr->cdr->cdr);
   parser_heredoc_info *hinf = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_inf(p) : NULL;
 
+  mrb_bool unindent = hinf && hinf->remove_indent;
+  mrb_bool head = hinf && hinf->line_head;
+  mrb_bool empty = TRUE;
+  size_t spaces = 0;
+  size_t pos = -1;
+  node *escaped = NULL;
+  node *nspaces = NULL;
+
   if (beg == 0) beg = -3;       /* should never happen */
   if (end == 0) end = -3;
   newtok(p);
   while ((c = nextc(p)) != end || nest_level != 0) {
+    pos++;
     if (hinf && (c == '\n' || c < 0)) {
       mrb_bool line_head;
       tokadd(p, '\n');
@@ -4531,7 +4856,8 @@
             --len;
           }
         }
-        if ((len-1 == hinf->term_len) && (strncmp(s, hinf->term, len-1) == 0)) {
+        if (hinf->term_len > 0 && len-1 == hinf->term_len && strncmp(s, hinf->term, len-1) == 0) {
+          heredoc_remove_indent(p, hinf);
           return tHEREDOC_END;
         }
       }
@@ -4550,9 +4876,22 @@
         }
         return 0;
       }
-      pylval.nd = new_str(p, tok(p), toklen(p));
+      node *nd = new_str(p, tok(p), toklen(p));
+      pylval.nd = nd;
+      if (unindent && head) {
+        nspaces = push(nspaces, nint(spaces));
+        heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, empty && line_head);
+      }
       return tHD_STRING_MID;
     }
+    if (unindent && empty) {
+      if (c == '\t')
+        spaces += 8;
+      else if (ISSPACE(c))
+        ++spaces;
+      else
+        empty = FALSE;
+    }
     if (c < 0) {
       yyerror(p, "unterminated string meets end of file");
       return 0;
@@ -4574,6 +4913,13 @@
         else if (c == '\n') {
           p->lineno++;
           p->column = 0;
+          if (unindent) {
+            nspaces = push(nspaces, nint(spaces));
+            escaped = push(escaped, nint(pos));
+            pos--;
+            empty = TRUE;
+            spaces = 0;
+          }
           if (type & STR_FUNC_ARRAY) {
             tokadd(p, '\n');
           }
@@ -4623,8 +4969,13 @@
         tokfix(p);
         p->lstate = EXPR_BEG;
         p->cmd_start = TRUE;
-        pylval.nd = new_str(p, tok(p), toklen(p));
+        node *nd = new_str(p, tok(p), toklen(p));
+        pylval.nd = nd;
         if (hinf) {
+          if (unindent && head) {
+            nspaces = push(nspaces, nint(spaces));
+            heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, FALSE);
+          }
           hinf->line_head = FALSE;
           return tHD_STRING_PART;
         }
@@ -4745,7 +5096,7 @@
   int mask = NUM_SUFFIX_R|NUM_SUFFIX_I;
 
   while ((c = nextc(p)) != -1) {
-    list = push(list, (node*)(intptr_t)c);
+    list = push(list, nint(c));
 
     if ((mask & NUM_SUFFIX_I) && c == 'i') {
       result |= (mask & NUM_SUFFIX_I);
@@ -4762,7 +5113,7 @@
     if (!ISASCII(c) || ISALPHA(c) || c == '_') {
       p->column = column;
       if (p->pb) {
-        p->pb = append((node*)list, p->pb);
+        p->pb = append(list, p->pb);
       }
       else {
         p->pb = list;
@@ -4781,6 +5132,7 @@
   int c;
   int type = str_heredoc;
   mrb_bool indent = FALSE;
+  mrb_bool squiggly = FALSE;
   mrb_bool quote = FALSE;
   node *newnode;
   parser_heredoc_info *info;
@@ -4790,8 +5142,11 @@
     pushback(p, c);
     return 0;
   }
-  if (c == '-') {
-    indent = TRUE;
+  if (c == '-' || c == '~') {
+    if (c == '-')
+      indent = TRUE;
+    if (c == '~')
+      squiggly = TRUE;
     c = nextc(p);
   }
   if (c == '\'' || c == '"') {
@@ -4818,6 +5173,7 @@
     if (! identchar(c)) {
       pushback(p, c);
       if (indent) pushback(p, '-');
+      if (squiggly) pushback(p, '~');
       return 0;
     }
     newtok(p);
@@ -4834,7 +5190,10 @@
   if (! quote)
     type |= STR_FUNC_EXPAND;
   info->type = (string_type)type;
-  info->allow_indent = indent;
+  info->allow_indent = indent || squiggly;
+  info->remove_indent = squiggly;
+  info->indent = ~0U;
+  info->indented = NULL;
   info->line_head = TRUE;
   info->doc = NULL;
   p->heredocs_from_nextline = push(p->heredocs_from_nextline, newnode);
@@ -4961,7 +5320,7 @@
   case '*':
     if ((c = nextc(p)) == '*') {
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("**");
+        pylval.id = intern_op(pow);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -4979,7 +5338,7 @@
     }
     else {
       if (c == '=') {
-        pylval.id = intern_lit("*");
+        pylval.id = intern_op(mul);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -5095,7 +5454,7 @@
     }
     if (c == '<') {
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("<<");
+        pylval.id = intern_op(lshift);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -5117,7 +5476,7 @@
     }
     if (c == '>') {
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit(">>");
+        pylval.id = intern_op(rshift);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -5225,7 +5584,7 @@
     if ((c = nextc(p)) == '&') {
       p->lstate = EXPR_BEG;
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("&&");
+        pylval.id = intern_op(andand);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -5237,7 +5596,7 @@
       return tANDDOT;
     }
     else if (c == '=') {
-      pylval.id = intern_lit("&");
+      pylval.id = intern_op(and);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -5264,7 +5623,7 @@
     if ((c = nextc(p)) == '|') {
       p->lstate = EXPR_BEG;
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("||");
+        pylval.id = intern_op(oror);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -5272,7 +5631,7 @@
       return tOROP;
     }
     if (c == '=') {
-      pylval.id = intern_lit("|");
+      pylval.id = intern_op(or);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -5296,7 +5655,7 @@
       return '+';
     }
     if (c == '=') {
-      pylval.id = intern_lit("+");
+      pylval.id = intern_op(add);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -5324,7 +5683,7 @@
       return '-';
     }
     if (c == '=') {
-      pylval.id = intern_lit("-");
+      pylval.id = intern_op(sub);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -5345,20 +5704,24 @@
     return '-';
 
   case '.':
-    p->lstate = EXPR_BEG;
-    if ((c = nextc(p)) == '.') {
+    {
+      int is_beg = IS_BEG();
+      p->lstate = EXPR_MID;
       if ((c = nextc(p)) == '.') {
-        return tDOT3;
+        if ((c = nextc(p)) == '.') {
+          return is_beg ? tBDOT3 : tDOT3;
+        }
+        pushback(p, c);
+        return is_beg ? tBDOT2 : tDOT2;
       }
       pushback(p, c);
-      return tDOT2;
-    }
-    pushback(p, c);
-    if (c >= 0 && ISDIGIT(c)) {
-      yyerror(p, "no .<digit> floating literal anymore; put 0 before dot");
+      p->lstate = EXPR_BEG;
+      if (c >= 0 && ISDIGIT(c)) {
+        yyerror(p, "no .<digit> floating literal anymore; put 0 before dot");
+      }
+      p->lstate = EXPR_DOT;
+      return '.';
     }
-    p->lstate = EXPR_DOT;
-    return '.';
 
     start_num:
   case '0': case '1': case '2': case '3': case '4':
@@ -5574,8 +5937,8 @@
     }
     tokfix(p);
     if (is_float) {
-#ifdef MRB_WITHOUT_FLOAT
-      yywarning_s(p, "floating point numbers are not supported", tok(p));
+#ifdef MRB_NO_FLOAT
+      yywarning_s(p, "floating-point numbers are not supported", tok(p));
       pylval.nd = new_int(p, "0", 10, 0);
       return tINTEGER;
 #else
@@ -5592,6 +5955,10 @@
         errno = 0;
       }
       suffix = number_literal_suffix(p);
+      if (seen_e && (suffix & NUM_SUFFIX_R)) {
+        pushback(p, 'r');
+        suffix &= ~NUM_SUFFIX_R;
+      }
       pylval.nd = new_float(p, tok(p), suffix);
       return tFLOAT;
 #endif
@@ -5629,14 +5996,14 @@
       p->lstate = EXPR_BEG;
       return tLABEL_TAG;
     }
-    if (!ISSPACE(c) || IS_BEG()) {
+    if (IS_END() || ISSPACE(c) || c == '#') {
       pushback(p, c);
-      p->lstate = EXPR_FNAME;
-      return tSYMBEG;
+      p->lstate = EXPR_BEG;
+      return ':';
     }
     pushback(p, c);
-    p->lstate = EXPR_BEG;
-    return ':';
+    p->lstate = EXPR_FNAME;
+    return tSYMBEG;
 
   case '/':
     if (IS_BEG()) {
@@ -5644,7 +6011,7 @@
       return tREGEXP_BEG;
     }
     if ((c = nextc(p)) == '=') {
-      pylval.id = intern_lit("/");
+      pylval.id = intern_op(div);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -5663,7 +6030,7 @@
 
   case '^':
     if ((c = nextc(p)) == '=') {
-      pylval.id = intern_lit("^");
+      pylval.id = intern_op(xor);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -5716,6 +6083,7 @@
     p->paren_nest++;
     if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
       p->lstate = EXPR_ARG;
+      p->paren_nest--;
       if ((c = nextc(p)) == '') {
         if ((c = nextc(p)) == '=') {
           return tASET;
@@ -5840,7 +6208,7 @@
       }
     }
     if ((c = nextc(p)) == '=') {
-      pylval.id = intern_lit("%");
+      pylval.id = intern_op(mod);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -5930,10 +6298,10 @@
       if (last_state == EXPR_FNAME) goto gvar;
       tokfix(p);
       {
-        unsigned long n = strtoul(tok(p), NULL, 10);
-        if (n > INT_MAX) {
-          yyerror(p, "capture group index must be <= " MRB_STRINGIZE(INT_MAX));
-          return 0;
+        mrb_int n = mrb_int_read(tok(p), NULL, NULL);
+        if (n > INT32_MAX) {
+          yywarning(p, "capture group index too big; always nil");
+          return keyword_nil;
         }
         pylval.nd = new_nth_ref(p, (int)n);
       }
@@ -6043,7 +6411,7 @@
       break;
 
     case '_':
-      if (toklen(p) == 2 && ISDIGIT(tok(p)1) && p->nvars) {
+      if (p->lstate != EXPR_FNAME && toklen(p) == 2 && ISDIGIT(tok(p)1) && p->nvars) {
         int n = tok(p)1 - '0';
         int nvar;
 
@@ -6061,17 +6429,17 @@
             nvars = nvars->cdr;
           }
           nvar = intn(p->nvars->car);
-          if (nvar == -1) {
-            yywarning(p, "numbered parameter used in inner block");
-          }
-          if (nvar >= -1) {
+          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;
           }
-          else {
-            yywarning(p, "identifier for numbered parameter; consider another name");
-          }
         }
       }
       /* fall through */
@@ -6205,6 +6573,7 @@
   }
   p->capture_errors = cxt->capture_errors;
   p->no_optimize = cxt->no_optimize;
+  p->no_ext_ops = cxt->no_ext_ops;
   p->upper = cxt->upper;
   if (cxt->partial_hook) {
     p->cxt = cxt;
@@ -6218,6 +6587,7 @@
   int i = 0;
 
   if (!cxt) return;
+  if (!p->tree) return;
   if (intn(p->tree->car) != NODE_SCOPE) return;
   n0 = n = p->tree->cdr->car;
   while (n) {
@@ -6238,53 +6608,39 @@
 mrb_parser_parse(parser_state *p, mrbc_context *c)
 {
   struct mrb_jmpbuf buf1;
-  p->jmp = &buf1;
+  struct mrb_jmpbuf *prev = p->mrb->jmp;
+  p->mrb->jmp = &buf1;
 
-  MRB_TRY(p->jmp) {
+  MRB_TRY(p->mrb->jmp) {
     int n = 1;
 
     p->cmd_start = TRUE;
     p->in_def = p->in_single = 0;
     p->nerr = p->nwarn = 0;
     p->lex_strterm = NULL;
-
     parser_init_cxt(p, c);
 
-    if (p->mrb->jmp) {
-      n = yyparse(p);
-    }
-    else {
-      struct mrb_jmpbuf buf2;
-
-      p->mrb->jmp = &buf2;
-      MRB_TRY(p->mrb->jmp) {
-        n = yyparse(p);
-      }
-      MRB_CATCH(p->mrb->jmp) {
-        p->nerr++;
-      }
-      MRB_END_EXC(p->mrb->jmp);
-      p->mrb->jmp = 0;
-    }
+    n = yyparse(p);
     if (n != 0 || p->nerr > 0) {
       p->tree = 0;
+      p->mrb->jmp = prev;
       return;
     }
-    if (!p->tree) {
-      p->tree = new_nil(p);
-    }
     parser_update_cxt(p, c);
     if (c && c->dump_result) {
       mrb_parser_dump(p->mrb, p->tree, 0);
     }
   }
-  MRB_CATCH(p->jmp) {
-    yyerror(p, "memory allocation error");
+  MRB_CATCH(p->mrb->jmp) {
     p->nerr++;
-    p->tree = 0;
-    return;
+    if (p->mrb->exc == NULL) {
+      yyerror(p, "memory allocation error");
+      p->nerr++;
+      p->tree = 0;
+    }
   }
   MRB_END_EXC(p->jmp);
+  p->mrb->jmp = prev;
 }
 
 MRB_API parser_state*
@@ -6304,7 +6660,7 @@
   p->pool = pool;
 
   p->s = p->send = NULL;
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   p->f = NULL;
 #endif
 
@@ -6377,10 +6733,20 @@
 }
 
 MRB_API void
+mrbc_cleanup_local_variables(mrb_state *mrb, mrbc_context *c)
+{
+  if (c->syms) {
+    mrb_free(mrb, c->syms);
+    c->syms = NULL;
+    c->slen = 0;
+  }
+}
+
+MRB_API void
 mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
 {
   mrb_sym sym;
-  size_t i;
+  uint16_t i;
   mrb_sym* new_table;
 
   sym = mrb_intern_cstr(p->mrb, f);
@@ -6389,7 +6755,7 @@
 
   for (i = 0; i < p->filename_table_length; ++i) {
     if (p->filename_tablei == sym) {
-      p->current_filename_index = (int)i;
+      p->current_filename_index = i;
       return;
     }
   }
@@ -6416,20 +6782,32 @@
   }
 }
 
-#ifndef MRB_DISABLE_STDIO
-MRB_API parser_state*
-mrb_parse_file(mrb_state *mrb, FILE *f, mrbc_context *c)
+#ifndef MRB_NO_STDIO
+static struct mrb_parser_state *
+mrb_parse_file_continue(mrb_state *mrb, FILE *f, const void *prebuf, size_t prebufsize, mrbc_context *c)
 {
   parser_state *p;
 
   p = mrb_parser_new(mrb);
   if (!p) return NULL;
-  p->s = p->send = NULL;
+  if (prebuf) {
+    p->s = (const char *)prebuf;
+    p->send = (const char *)prebuf + prebufsize;
+  }
+  else {
+    p->s = p->send = NULL;
+  }
   p->f = f;
 
   mrb_parser_parse(p, c);
   return p;
 }
+
+MRB_API parser_state*
+mrb_parse_file(mrb_state *mrb, FILE *f, mrbc_context *c)
+{
+  return mrb_parse_file_continue(mrb, f, NULL, 0, c);
+}
 #endif
 
 MRB_API parser_state*
@@ -6458,7 +6836,7 @@
   struct RClass *target = mrb->object_class;
   struct RProc *proc;
   mrb_value v;
-  unsigned int keep = 0;
+  mrb_int keep = 0;
 
   if (!p) {
     return mrb_undef_value();
@@ -6478,7 +6856,7 @@
     }
     else {
       if (mrb->exc == NULL) {
-        mrb->exc = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, E_SYNTAX_ERROR, "syntax error"));
+        mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SYNTAX_ERROR, "syntax error"));
       }
       mrb_parser_free(p);
       return mrb_undef_value();
@@ -6488,7 +6866,7 @@
   mrb_parser_free(p);
   if (proc == NULL) {
     if (mrb->exc == NULL) {
-      mrb->exc = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, E_SCRIPT_ERROR, "codegen error"));
+      mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SCRIPT_ERROR, "codegen error"));
     }
     return mrb_undef_value();
   }
@@ -6507,14 +6885,14 @@
   }
   MRB_PROC_SET_TARGET_CLASS(proc, target);
   if (mrb->c->ci) {
-    mrb->c->ci->target_class = target;
+    mrb_vm_ci_target_class_set(mrb->c->ci, target);
   }
   v = mrb_top_run(mrb, proc, mrb_top_self(mrb), keep);
   if (mrb->exc) return mrb_nil_value();
   return v;
 }
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 MRB_API mrb_value
 mrb_load_file_cxt(mrb_state *mrb, FILE *f, mrbc_context *c)
 {
@@ -6526,6 +6904,55 @@
 {
   return mrb_load_file_cxt(mrb, f, NULL);
 }
+
+#define DETECT_SIZE 64
+
+/*
+ * In order to be recognized as a `.mrb` file, the following three points must be satisfied:
+ * - File starts with "RITE"
+ * - At least `sizeof(struct rite_binary_header)` bytes can be read
+ * - `NUL` is included in the first 64 bytes of the file
+ */
+MRB_API mrb_value
+mrb_load_detect_file_cxt(mrb_state *mrb, FILE *fp, mrbc_context *c)
+{
+  union {
+    char bDETECT_SIZE;
+    struct rite_binary_header h;
+  } leading;
+  size_t bufsize;
+
+  if (mrb == NULL || fp == NULL) {
+    return mrb_nil_value();
+  }
+
+  bufsize = fread(leading.b, sizeof(char), sizeof(leading), fp);
+  if (bufsize < sizeof(leading.h) ||
+      memcmp(leading.h.binary_ident, RITE_BINARY_IDENT, sizeof(leading.h.binary_ident)) != 0 ||
+      memchr(leading.b, '\0', bufsize) == NULL) {
+    return mrb_load_exec(mrb, mrb_parse_file_continue(mrb, fp, leading.b, bufsize, c), c);
+  }
+  else {
+    size_t 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() */
+    }
+
+    result = mrb_load_irep_buf_cxt(mrb, bin, binsize, c);
+    if (mrb_string_p(bin_obj)) mrb_str_resize(mrb, bin_obj, 0);
+    return result;
+  }
+}
 #endif
 
 MRB_API mrb_value
@@ -6552,7 +6979,7 @@
   return mrb_load_string_cxt(mrb, s, NULL);
 }
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 
 static void
 dump_prefix(node *tree, int offset)
@@ -6598,8 +7025,13 @@
   }
   n = n->cdr;
   if (n->car) {
+    mrb_sym rest = sym(n->car);
+
     dump_prefix(n, offset+1);
-    printf("rest=*%s\n", mrb_sym_name(mrb, sym(n->car)));
+    if (rest == MRB_OPSYM(mul))
+      printf("rest=*\n");
+    else
+      printf("rest=*%s\n", mrb_sym_name(mrb, rest));
   }
   n = n->cdr;
   if (n->car) {
@@ -6627,7 +7059,7 @@
   int ai = mrb_gc_arena_save(mrb);
   mrb_value s;
 # if INT_MAX > MRB_INT_MAX / 4
-  /* check maximum length with "\xNN" charactor */
+  /* check maximum length with "\xNN" character */
   if (len > MRB_INT_MAX / 4) {
     len = MRB_INT_MAX / 4;
   }
@@ -6642,7 +7074,7 @@
 void
 mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
 {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   int nodetype;
 
   if (!tree) return;
@@ -6876,9 +7308,16 @@
       printf("args:\n");
       dump_recur(mrb, tree->car, offset+2);
       if (tree->cdr) {
-        dump_prefix(tree, offset+1);
-        printf("block:\n");
-        mrb_parser_dump(mrb, tree->cdr, offset+2);
+        if (tree->cdr->car) {
+          dump_prefix(tree, offset+1);
+          printf("kwargs:\n");
+          mrb_parser_dump(mrb, tree->cdr->car, offset+2);
+        }
+        if (tree->cdr->cdr) {
+          dump_prefix(tree, offset+1);
+          printf("block:\n");
+          mrb_parser_dump(mrb, tree->cdr->cdr, offset+2);
+        }
       }
     }
     break;
@@ -6969,7 +7408,7 @@
         if (n2->car) {
           dump_prefix(n2, offset+2);
           printf("rest:\n");
-          if (n2->car == (node*)-1) {
+          if (n2->car == nint(-1)) {
             dump_prefix(n2, offset+2);
             printf("(empty)\n");
           }
@@ -7019,7 +7458,17 @@
     break;
 
   case NODE_ZSUPER:
-    printf("NODE_ZSUPER\n");
+    printf("NODE_ZSUPER:\n");
+    if (tree) {
+      dump_prefix(tree, offset+1);
+      printf("args:\n");
+      dump_recur(mrb, tree->car, offset+2);
+      if (tree->cdr) {
+        dump_prefix(tree, offset+1);
+        printf("block:\n");
+        mrb_parser_dump(mrb, tree->cdr, offset+2);
+      }
+    }
     break;
 
   case NODE_RETURN:
@@ -7211,11 +7660,11 @@
 
   case NODE_CLASS:
     printf("NODE_CLASS:\n");
-    if (tree->car->car == (node*)0) {
+    if (tree->car->car == nint(0)) {
       dump_prefix(tree, offset+1);
       printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
-    else if (tree->car->car == (node*)1) {
+    else if (tree->car->car == nint(1)) {
       dump_prefix(tree, offset+1);
       printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
@@ -7236,11 +7685,11 @@
 
   case NODE_MODULE:
     printf("NODE_MODULE:\n");
-    if (tree->car->car == (node*)0) {
+    if (tree->car->car == nint(0)) {
       dump_prefix(tree, offset+1);
       printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
-    else if (tree->car->car == (node*)1) {
+    else if (tree->car->car == nint(1)) {
       dump_prefix(tree, offset+1);
       printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
@@ -7345,7 +7794,10 @@
     break;
 
   case NODE_KW_REST_ARGS:
-    printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree)));
+    if (tree)
+      printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree)));
+    else
+      printf("NODE_KW_REST_ARGS\n");
     break;
 
   default:
@@ -7354,3 +7806,19 @@
   }
 #endif
 }
+
+typedef mrb_bool mrb_parser_foreach_top_variable_func(mrb_state *mrb, mrb_sym sym, void *user);
+void mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_parser_foreach_top_variable_func *func, void *user);
+
+void
+mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_parser_foreach_top_variable_func *func, void *user)
+{
+  const mrb_ast_node *n = p->tree;
+  if ((intptr_t)n->car == NODE_SCOPE) {
+    n = n->cdr->car;
+    for (; n; n = n->cdr) {
+      mrb_sym sym = sym(n->car);
+      if (sym && !func(mrb, sym, user)) break;
+    }
+  }
+}

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

@@ -76,7 +76,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
 #include <mruby.h>
 #include <mruby/compile.h>
@@ -84,6 +83,8 @@
 #include <mruby/error.h>
 #include <mruby/throw.h>
 #include <mruby/string.h>
+#include <mruby/dump.h>
+#include <mruby/presym.h>
 #include "node.h"
 
 #define YYLEX_PARAM p
@@ -95,7 +96,6 @@
 static int yyparse(parser_state *p);
 static int yylex(void *lval, parser_state *p);
 static void yyerror(parser_state *p, const char *s);
-static void yywarn(parser_state *p, const char *s);
 static void yywarning(parser_state *p, const char *s);
 static void backref_error(parser_state *p, node *n);
 static void void_expr_error(parser_state *p, node *n);
@@ -132,6 +132,7 @@
 #define nsym(x) ((node*)(intptr_t)(x))
 #define nint(x) ((node*)(intptr_t)(x))
 #define intn(x) ((int)(intptr_t)(x))
+#define typen(x) ((enum node_type)(intptr_t)(x))
 
 #define NUM_SUFFIX_R   (1<<0)
 #define NUM_SUFFIX_I   (1<<1)
@@ -150,7 +151,7 @@
 }
 #define intern(s,len) intern_gen(p,(s),(len))
 
-#define intern_lit(s) mrb_intern_lit(p->mrb, s)
+#define intern_op(op) MRB_OPSYM_2(p->mrb, op)
 
 static void
 cons_free_gen(parser_state *p, node *cons)
@@ -166,7 +167,7 @@
   void *m = mrb_pool_alloc(p->pool, size);
 
   if (!m) {
-    MRB_THROW(p->jmp);
+    MRB_THROW(p->mrb->jmp);
   }
   return m;
 }
@@ -328,7 +329,7 @@
 static mrb_bool
 local_var_p(parser_state *p, mrb_sym sym)
 {
-  struct RProc *u;
+  const struct RProc *u;
   node *l = p->locals;
 
   while (l) {
@@ -342,11 +343,14 @@
 
   u = p->upper;
   while (u && !MRB_PROC_CFUNC_P(u)) {
-    struct mrb_irep *ir = u->body.irep;
-    uint_fast16_t n = ir->nlocals;
-    const struct mrb_locals *v = ir->lv;
-    for (; n > 1; n --, v ++) {
-      if (v->name == sym) return TRUE;
+    const struct mrb_irep *ir = u->body.irep;
+    const mrb_sym *v = ir->lv;
+    int i;
+
+    if (v) {
+      for (i=0; i+1 < ir->nlocals; i++) {
+        if (vi == sym) return TRUE;
+      }
     }
     if (MRB_PROC_SCOPE_P(u)) break;
     u = u->upper;
@@ -358,6 +362,18 @@
 local_add_f(parser_state *p, mrb_sym sym)
 {
   if (p->locals) {
+    node *n = p->locals->car;
+    while (n) {
+      if (sym(n->car) == sym) {
+        mrb_int len;
+        const char* name = mrb_sym_name_len(p->mrb, sym, &len);
+        if (len > 0 && name0 != '_') {
+          yyerror(p, "duplicated argument name");
+          return;
+        }
+      }
+      n = n->cdr;
+    }
     p->locals->car = push(p->locals->car, nsym(sym));
   }
 }
@@ -374,14 +390,14 @@
 local_add_blk(parser_state *p, mrb_sym blk)
 {
   /* allocate register for block */
-  local_add_f(p, blk ? blk : mrb_intern_lit(p->mrb, "&"));
+  local_add_f(p, blk ? blk : intern_op(and));
 }
 
 static void
 local_add_kw(parser_state *p, mrb_sym kwd)
 {
   /* allocate register for keywords hash */
-  local_add_f(p, kwd ? kwd : mrb_intern_lit(p->mrb, "**"));
+  local_add_f(p, kwd ? kwd : intern_op(pow));
 }
 
 static node*
@@ -558,13 +574,18 @@
 static node*
 new_fcall(parser_state *p, mrb_sym b, node *c)
 {
-  node *n = new_self(p);
-  NODE_LINENO(n, c);
-  n = list4((node*)NODE_FCALL, n, nsym(b), c);
+  node *n = list4((node*)NODE_FCALL, 0, nsym(b), c);
   NODE_LINENO(n, c);
   return n;
 }
 
+/* (a b . c) */
+static node*
+new_callargs(parser_state *p, node *a, node *b, node *c)
+{
+  return cons(a, cons(b, c));
+}
+
 /* (:super . c) */
 static node*
 new_super(parser_state *p, node *c)
@@ -576,7 +597,7 @@
 static node*
 new_zsuper(parser_state *p)
 {
-  return list1((node*)NODE_ZSUPER);
+  return cons((node*)NODE_ZSUPER, 0);
 }
 
 /* (:yield . c) */
@@ -585,7 +606,12 @@
 {
   if (c) {
     if (c->cdr) {
-      yyerror(p, "both block arg and actual block given");
+      if (c->cdr->cdr) {
+        yyerror(p, "both block arg and actual block given");
+      }
+      if (c->cdr->car) {
+        return cons((node*)NODE_YIELD, push(c->car, c->cdr->car));
+      }
     }
     return cons((node*)NODE_YIELD, c->car);
   }
@@ -660,6 +686,7 @@
 static node*
 new_and(parser_state *p, node *a, node *b)
 {
+  void_expr_error(p, a);
   return cons((node*)NODE_AND, cons(a, b));
 }
 
@@ -667,6 +694,7 @@
 static node*
 new_or(parser_state *p, node *a, node *b)
 {
+  void_expr_error(p, a);
   return cons((node*)NODE_OR, cons(a, b));
 }
 
@@ -681,6 +709,7 @@
 static node*
 new_splat(parser_state *p, node *a)
 {
+  void_expr_error(p, a);
   return cons((node*)NODE_SPLAT, a);
 }
 
@@ -746,9 +775,6 @@
 static node*
 new_nvar(parser_state *p, int num)
 {
-  int nvars = intn(p->nvars->car);
-
-  p->nvars->car = nint(nvars > num ? nvars : num);
   return cons((node*)NODE_NVAR, nint(num));
 }
 
@@ -793,7 +819,19 @@
 static node*
 new_def(parser_state *p, mrb_sym m, node *a, node *b)
 {
-  return list5((node*)NODE_DEF, nsym(m), locals_node(p), a, b);
+  return list5((node*)NODE_DEF, nsym(m), 0, a, b);
+}
+
+static void
+defn_setup(parser_state *p, node *d, node *a, node *b)
+{
+  node *n = d->cdr->cdr;
+
+  n->car = locals_node(p);
+  p->cmdarg_stack = intn(n->cdr->car);
+  n->cdr->car = a;
+  local_resume(p, n->cdr->cdr->car);
+  n->cdr->cdr->car = b;
 }
 
 /* (:sdef obj m lv (arg . body)) */
@@ -801,7 +839,19 @@
 new_sdef(parser_state *p, node *o, mrb_sym m, node *a, node *b)
 {
   void_expr_error(p, o);
-  return list6((node*)NODE_SDEF, o, nsym(m), locals_node(p), a, b);
+  return list6((node*)NODE_SDEF, o, nsym(m), 0, a, b);
+}
+
+static void
+defs_setup(parser_state *p, node *d, node *a, node *b)
+{
+  node *n = d->cdr->cdr->cdr;
+
+  n->car = locals_node(p);
+  p->cmdarg_stack = intn(n->cdr->car);
+  n->cdr->car = a;
+  local_resume(p, n->cdr->cdr->car);
+  n->cdr->cdr->car = b;
 }
 
 /* (:arg . sym) */
@@ -815,7 +865,7 @@
 local_add_margs(parser_state *p, node *n)
 {
   while (n) {
-    if (n->car->car == (node*)NODE_MASGN) {
+    if (typen(n->car->car) == NODE_MASGN) {
       node *t = n->car->cdr->cdr;
 
       n->car->cdr->cdr = NULL;
@@ -909,6 +959,17 @@
   return cons((node*)NODE_KW_REST_ARGS, a);
 }
 
+static node*
+new_args_dots(parser_state *p, node *m)
+{
+  mrb_sym r = intern_op(mul);
+  mrb_sym k = intern_op(pow);
+  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));
+}
+
 /* (:block_arg . a) */
 static node*
 new_block_arg(parser_state *p, node *a)
@@ -995,13 +1056,14 @@
 static node*
 new_imaginary(parser_state *p, node *imaginary)
 {
-  return new_call(p, new_const(p, intern_lit("Kernel")), intern_lit("Complex"), list1(list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary)), 1);
+  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);
 }
 
 static node*
 new_rational(parser_state *p, node *rational)
 {
-  return new_call(p, new_const(p, intern_lit("Kernel")), intern_lit("Rational"), list1(list1(rational)), 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), 1);
 }
 
 /* (:int . i) */
@@ -1018,7 +1080,7 @@
   return result;
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 /* (:float . i) */
 static node*
 new_float(parser_state *p, const char *s, int suffix)
@@ -1051,7 +1113,7 @@
 static int
 string_node_p(node *n)
 {
-  return (int)((enum node_type)(intptr_t)n->car == NODE_STR);
+  return (int)(typen(n->car) == NODE_STR);
 }
 
 static node*
@@ -1224,17 +1286,32 @@
 static node*
 call_bin_op(parser_state *p, node *recv, const char *m, node *arg1)
 {
-  return new_call(p, recv, intern_cstr(m), list1(list1(arg1)), 1);
+  return new_call(p, recv, intern_cstr(m), new_callargs(p, list1(arg1), 0, 0), 1);
 }
 
 static void
 args_with_block(parser_state *p, node *a, node *b)
 {
   if (b) {
-    if (a->cdr) {
+    if (a->cdr && a->cdr->cdr) {
       yyerror(p, "both block arg and actual block given");
     }
-    a->cdr = b;
+    a->cdr->cdr = b;
+  }
+}
+
+static void
+endless_method_name(parser_state *p, node *defn)
+{
+  mrb_sym sym = sym(defn->cdr->car);
+  mrb_int len;
+  const char *name = mrb_sym_name_len(p->mrb, sym, &len);
+
+  if (len > 1 && namelen-1 == '=') {
+    for (int i=0; i<len-1; i++) {
+      if (!identchar(namei)) return;
+    }
+    yyerror(p, "setter method cannot be defined by endless method definition");
   }
 }
 
@@ -1243,22 +1320,19 @@
 {
   node *n;
 
-  switch ((enum node_type)intn(a->car)) {
+  switch (typen(a->car)) {
   case NODE_SUPER:
   case NODE_ZSUPER:
-    if (!a->cdr) a->cdr = cons(0, b);
-    else {
-      args_with_block(p, a->cdr, b);
-    }
+    if (!a->cdr) a->cdr = new_callargs(p, 0, 0, b);
+    else args_with_block(p, a->cdr, b);
     break;
   case NODE_CALL:
   case NODE_FCALL:
   case NODE_SCALL:
-    n = a->cdr->cdr->cdr;
-    if (!n->car) n->car = cons(0, b);
-    else {
-      args_with_block(p, n->car, b);
-    }
+    /* (NODE_CALL recv mid (args kw . blk)) */
+    n = a->cdr->cdr->cdr; /* (args kw . blk) */
+    if (!n->car) n->car = new_callargs(p, 0, 0, b);
+    else args_with_block(p, n->car, b);
     break;
   default:
     break;
@@ -1266,7 +1340,7 @@
 }
 
 static node*
-negate_lit(parser_state *p, node *n)
+new_negate(parser_state *p, node *n)
 {
   return cons((node*)NODE_NEGATE, n);
 }
@@ -1280,10 +1354,11 @@
 static node*
 ret_args(parser_state *p, node *n)
 {
-  if (n->cdr) {
+  if (n->cdr->cdr) {
     yyerror(p, "block argument should not be given");
     return NULL;
   }
+  if (!n->car) return NULL;
   if (!n->car->cdr) return n->car->car;
   return new_array(p, n->car);
 }
@@ -1312,12 +1387,30 @@
   return lhs;
 }
 
+static node*
+label_reference(parser_state *p, mrb_sym sym)
+{
+  const char *name = mrb_sym_name(p->mrb, sym);
+  node *n;
+
+  if (local_var_p(p, sym)) {
+    n = new_lvar(p, sym);
+  }
+  else if (ISUPPER(name0)) {
+    n = new_const(p, sym);
+  }
+  else {
+    n = new_fcall(p, sym, 0);
+  }
+  return n;
+}
+
 typedef enum mrb_string_type  string_type;
 
 static node*
 new_strterm(parser_state *p, string_type type, int term, int paren)
 {
-  return cons(nint(type), cons((node*)0, cons(nint(paren), nint(term))));
+  return cons(nint(type), cons(nint(0), cons(nint(paren), nint(term))));
 }
 
 static void
@@ -1404,7 +1497,7 @@
 /* xxx ----------------------------- */
 
 
-#line 1408 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 1501 "mrbgems/mruby-compiler/core/y.tab.c"
 
 # ifndef YY_CAST
 #  ifdef __cplusplus
@@ -1518,55 +1611,57 @@
     tNUMPARAM = 324,
     tUPLUS = 325,
     tUMINUS = 326,
-    tPOW = 327,
-    tCMP = 328,
-    tEQ = 329,
-    tEQQ = 330,
-    tNEQ = 331,
-    tGEQ = 332,
-    tLEQ = 333,
-    tANDOP = 334,
-    tOROP = 335,
-    tMATCH = 336,
-    tNMATCH = 337,
-    tDOT2 = 338,
-    tDOT3 = 339,
-    tAREF = 340,
-    tASET = 341,
-    tLSHFT = 342,
-    tRSHFT = 343,
-    tCOLON2 = 344,
-    tCOLON3 = 345,
-    tOP_ASGN = 346,
-    tASSOC = 347,
-    tLPAREN = 348,
-    tLPAREN_ARG = 349,
-    tRPAREN = 350,
-    tLBRACK = 351,
-    tLBRACE = 352,
-    tLBRACE_ARG = 353,
-    tSTAR = 354,
-    tDSTAR = 355,
-    tAMPER = 356,
-    tLAMBDA = 357,
-    tANDDOT = 358,
-    tSYMBEG = 359,
-    tREGEXP_BEG = 360,
-    tWORDS_BEG = 361,
-    tSYMBOLS_BEG = 362,
-    tSTRING_BEG = 363,
-    tXSTRING_BEG = 364,
-    tSTRING_DVAR = 365,
-    tLAMBEG = 366,
-    tHEREDOC_BEG = 367,
-    tHEREDOC_END = 368,
-    tLITERAL_DELIM = 369,
-    tHD_LITERAL_DELIM = 370,
-    tHD_STRING_PART = 371,
-    tHD_STRING_MID = 372,
-    tLOWEST = 373,
-    tUMINUS_NUM = 374,
-    tLAST_TOKEN = 375
+    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
   };
 #endif
 
@@ -1574,7 +1669,7 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 1350 "mrbgems/mruby-compiler/core/parse.y"
+#line 1443 "mrbgems/mruby-compiler/core/parse.y"
 
     node *nd;
     mrb_sym id;
@@ -1582,7 +1677,7 @@
     stack_type stack;
     const struct vtable *vars;
 
-#line 1586 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 1681 "mrbgems/mruby-compiler/core/y.tab.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -1900,19 +1995,19 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   11586
+#define YYLAST   13387
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  147
+#define YYNTOKENS  149
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  176
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  594
+#define YYNRULES  613
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  1034
+#define YYNSTATES  1078
 
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   375
+#define YYMAXUTOK   377
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -1925,18 +2020,18 @@
 static const yytype_uint8 yytranslate =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     146,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     148,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   133,     2,     2,     2,   131,   126,     2,
-     142,   143,   129,   127,   140,   128,   145,   130,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   121,   144,
-     123,   119,   122,   120,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   135,     2,     2,     2,   133,   128,     2,
+     144,   145,   131,   129,   142,   130,   147,   132,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   123,   146,
+     125,   121,   124,   122,     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,   138,     2,   139,   125,     2,   141,     2,     2,     2,
+       2,   140,     2,   141,   127,     2,   143,     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,   136,   124,   137,   134,     2,     2,     2,
+       2,     2,     2,   138,   126,   139,   136,     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,     2,
@@ -1961,73 +2056,75 @@
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   132,   135
+     115,   116,   117,   118,   119,   120,   134,   137
 };
 
 #if YYDEBUG
   /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline =
 {
-       0,  1508,  1508,  1508,  1519,  1525,  1529,  1534,  1538,  1544,
-    1546,  1545,  1559,  1586,  1592,  1596,  1601,  1605,  1611,  1611,
-    1615,  1619,  1623,  1627,  1631,  1635,  1639,  1644,  1645,  1649,
-    1653,  1657,  1661,  1664,  1668,  1672,  1676,  1680,  1684,  1689,
-    1693,  1700,  1701,  1705,  1709,  1710,  1714,  1718,  1722,  1726,
-    1729,  1738,  1739,  1742,  1743,  1750,  1749,  1764,  1768,  1773,
-    1777,  1782,  1786,  1791,  1795,  1799,  1803,  1807,  1813,  1817,
-    1823,  1824,  1830,  1834,  1838,  1842,  1846,  1850,  1854,  1858,
-    1862,  1866,  1872,  1873,  1879,  1883,  1889,  1893,  1899,  1903,
-    1907,  1911,  1915,  1919,  1925,  1931,  1938,  1942,  1946,  1950,
-    1954,  1958,  1964,  1970,  1975,  1981,  1985,  1988,  1992,  1996,
-    2003,  2004,  2005,  2006,  2011,  2018,  2019,  2022,  2026,  2026,
-    2032,  2033,  2034,  2035,  2036,  2037,  2038,  2039,  2040,  2041,
-    2042,  2043,  2044,  2045,  2046,  2047,  2048,  2049,  2050,  2051,
-    2052,  2053,  2054,  2055,  2056,  2057,  2058,  2059,  2060,  2061,
-    2064,  2064,  2064,  2065,  2065,  2066,  2066,  2066,  2067,  2067,
-    2067,  2067,  2068,  2068,  2068,  2069,  2069,  2069,  2070,  2070,
-    2070,  2070,  2071,  2071,  2071,  2071,  2072,  2072,  2072,  2072,
-    2073,  2073,  2073,  2073,  2074,  2074,  2074,  2074,  2075,  2075,
-    2078,  2082,  2086,  2090,  2094,  2098,  2102,  2107,  2112,  2117,
-    2121,  2125,  2129,  2133,  2137,  2141,  2145,  2149,  2153,  2157,
-    2161,  2165,  2169,  2173,  2177,  2181,  2185,  2189,  2193,  2197,
-    2201,  2205,  2209,  2213,  2217,  2221,  2225,  2229,  2233,  2237,
-    2241,  2245,  2249,  2255,  2256,  2261,  2265,  2272,  2276,  2284,
-    2288,  2314,  2315,  2318,  2319,  2320,  2325,  2330,  2337,  2343,
-    2348,  2353,  2358,  2365,  2365,  2376,  2382,  2386,  2392,  2393,
-    2396,  2402,  2408,  2413,  2420,  2425,  2430,  2437,  2438,  2439,
-    2440,  2441,  2442,  2443,  2444,  2448,  2453,  2452,  2464,  2468,
-    2463,  2473,  2473,  2477,  2481,  2485,  2489,  2494,  2499,  2503,
-    2507,  2511,  2515,  2519,  2520,  2526,  2532,  2525,  2544,  2552,
-    2560,  2560,  2560,  2567,  2567,  2567,  2574,  2580,  2585,  2587,
-    2584,  2596,  2594,  2612,  2617,  2610,  2634,  2632,  2649,  2653,
-    2648,  2670,  2676,  2669,  2693,  2697,  2701,  2705,  2711,  2718,
-    2719,  2720,  2723,  2724,  2727,  2728,  2736,  2737,  2743,  2747,
-    2750,  2754,  2758,  2762,  2767,  2771,  2775,  2779,  2785,  2784,
-    2794,  2798,  2802,  2806,  2812,  2817,  2822,  2826,  2830,  2834,
-    2838,  2842,  2846,  2850,  2854,  2858,  2862,  2866,  2870,  2874,
-    2878,  2884,  2889,  2896,  2896,  2900,  2905,  2912,  2916,  2922,
-    2923,  2926,  2931,  2934,  2938,  2944,  2948,  2955,  2954,  2969,
-    2979,  2983,  2988,  2995,  2999,  3003,  3007,  3011,  3015,  3019,
-    3023,  3027,  3034,  3033,  3048,  3047,  3063,  3071,  3080,  3083,
-    3090,  3093,  3097,  3098,  3101,  3105,  3108,  3112,  3115,  3116,
-    3117,  3118,  3121,  3122,  3128,  3129,  3130,  3134,  3140,  3141,
-    3147,  3152,  3151,  3162,  3166,  3172,  3176,  3182,  3186,  3192,
-    3195,  3196,  3199,  3205,  3211,  3212,  3215,  3222,  3221,  3235,
-    3239,  3246,  3251,  3258,  3264,  3265,  3266,  3267,  3268,  3272,
-    3278,  3282,  3288,  3289,  3290,  3294,  3300,  3304,  3308,  3312,
-    3316,  3322,  3326,  3332,  3336,  3340,  3344,  3348,  3352,  3360,
-    3367,  3378,  3379,  3383,  3387,  3386,  3402,  3408,  3426,  3432,
-    3438,  3444,  3451,  3456,  3463,  3467,  3473,  3477,  3483,  3484,
-    3487,  3491,  3497,  3501,  3505,  3509,  3515,  3520,  3525,  3529,
-    3533,  3537,  3541,  3545,  3549,  3553,  3557,  3561,  3565,  3569,
-    3573,  3577,  3582,  3588,  3593,  3598,  3603,  3608,  3615,  3619,
-    3626,  3631,  3630,  3642,  3646,  3652,  3660,  3668,  3676,  3680,
-    3686,  3690,  3696,  3697,  3700,  3705,  3712,  3713,  3716,  3722,
-    3726,  3732,  3737,  3737,  3762,  3763,  3769,  3774,  3780,  3781,
-    3784,  3790,  3795,  3805,  3812,  3813,  3814,  3817,  3818,  3819,
-    3820,  3823,  3824,  3825,  3828,  3829,  3832,  3836,  3842,  3843,
-    3849,  3850,  3853,  3854,  3857,  3860,  3861,  3862,  3865,  3866,
-    3867,  3870,  3877,  3878,  3882
+       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
 };
 #endif
 
@@ -2048,53 +2145,55 @@
   "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__", "tIDENTIFIER", "tFID", "tGVAR",
-  "tIVAR", "tCONSTANT", "tCVAR", "tLABEL_TAG", "tINTEGER", "tFLOAT",
-  "tCHAR", "tXSTRING", "tREGEXP", "tSTRING", "tSTRING_PART", "tSTRING_MID",
-  "tNTH_REF", "tBACK_REF", "tREGEXP_END", "tNUMPARAM", "tUPLUS", "tUMINUS",
-  "tPOW", "tCMP", "tEQ", "tEQQ", "tNEQ", "tGEQ", "tLEQ", "tANDOP", "tOROP",
-  "tMATCH", "tNMATCH", "tDOT2", "tDOT3", "tAREF", "tASET", "tLSHFT",
-  "tRSHFT", "tCOLON2", "tCOLON3", "tOP_ASGN", "tASSOC", "tLPAREN",
-  "tLPAREN_ARG", "tRPAREN", "tLBRACK", "tLBRACE", "tLBRACE_ARG", "tSTAR",
-  "tDSTAR", "tAMPER", "tLAMBDA", "tANDDOT", "tSYMBEG", "tREGEXP_BEG",
-  "tWORDS_BEG", "tSYMBOLS_BEG", "tSTRING_BEG", "tXSTRING_BEG",
-  "tSTRING_DVAR", "tLAMBEG", "tHEREDOC_BEG", "tHEREDOC_END",
-  "tLITERAL_DELIM", "tHD_LITERAL_DELIM", "tHD_STRING_PART",
-  "tHD_STRING_MID", "tLOWEST", "'='", "'?'", "':'", "'>'", "'<'", "'|'",
-  "'^'", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "tUMINUS_NUM", "'!'",
-  "'~'", "tLAST_TOKEN", "'{'", "'}'", "''", "''", "','", "'`'", "'('",
-  "')'", "';'", "'.'", "'\\n'", "$accept", "program", "$@1",
-  "top_compstmt", "top_stmts", "top_stmt", "@2", "bodystmt", "compstmt",
-  "stmts", "stmt", "$@3", "command_asgn", "command_rhs", "expr",
-  "expr_value", "command_call", "block_command", "cmd_brace_block", "$@4",
-  "command", "mlhs", "mlhs_inner", "mlhs_basic", "mlhs_item", "mlhs_list",
+  "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\"",
+  "\"unary minus\"", "\"<=>\"", "\"==\"", "\"===\"", "\"!=\"", "\">=\"",
+  "\"<=\"", "\"&&\"", "\"||\"", "\"=~\"", "\"!~\"", "\"..\"", "\"...\"",
+  "tBDOT2", "tBDOT3", "tAREF", "tASET", "\"<<\"", "\">>\"", "\"::\"",
+  "tCOLON3", "tOP_ASGN", "\"=>\"", "tLPAREN", "\"(\"", "\")\"", "\"\"",
+  "tLBRACE", "\"{\"", "\"*\"", "tPOW", "\"**\"", "\"&\"", "\"->\"",
+  "\"&.\"", "\"symbol\"", "\"string literal\"", "tXSTRING_BEG",
+  "tSTRING_DVAR", "tREGEXP_BEG", "tWORDS_BEG", "tSYMBOLS_BEG", "tLAMBEG",
+  "\"here document\"", "tHEREDOC_END", "tLITERAL_DELIM",
+  "tHD_LITERAL_DELIM", "tHD_STRING_PART", "tHD_STRING_MID", "tLOWEST",
+  "'='", "'?'", "':'", "'>'", "'<'", "'|'", "'^'", "'&'", "'+'", "'-'",
+  "'*'", "'/'", "'%'", "tUMINUS_NUM", "'!'", "'~'", "tLAST_TOKEN", "'{'",
+  "'}'", "''", "''", "','", "'`'", "'('", "')'", "';'", "'.'", "'\\n'",
+  "$accept", "program", "$@1", "top_compstmt", "top_stmts", "top_stmt",
+  "@2", "bodystmt", "compstmt", "stmts", "stmt", "$@3", "command_asgn",
+  "command_rhs", "expr", "defn_head", "defs_head", "$@4", "expr_value",
+  "command_call", "block_command", "cmd_brace_block", "$@5", "command",
+  "mlhs", "mlhs_inner", "mlhs_basic", "mlhs_item", "mlhs_list",
   "mlhs_post", "mlhs_node", "lhs", "cname", "cpath", "fname", "fsym",
-  "undef_list", "$@5", "op", "reswords", "arg", "aref_args", "arg_rhs",
+  "undef_list", "$@6", "op", "reswords", "arg", "aref_args", "arg_rhs",
   "paren_args", "opt_paren_args", "opt_call_args", "call_args",
-  "command_args", "@6", "block_arg", "opt_block_arg", "comma", "args",
-  "mrhs", "primary", "@7", "@8", "$@9", "$@10", "@11", "@12", "$@13",
-  "$@14", "$@15", "$@16", "$@17", "$@18", "@19", "@20", "@21", "@22",
-  "@23", "@24", "@25", "@26", "primary_value", "then", "do", "if_tail",
-  "opt_else", "for_var", "f_margs", "$@27", "block_args_tail",
-  "opt_block_args_tail", "block_param", "opt_block_param",
-  "block_param_def", "$@28", "opt_bv_decl", "bv_decls", "bvar",
-  "f_larglist", "lambda_body", "do_block", "$@29", "block_call",
-  "method_call", "brace_block", "@30", "@31", "case_body", "cases",
-  "opt_rescue", "exc_list", "exc_var", "opt_ensure", "literal", "string",
-  "string_fragment", "string_rep", "string_interp", "@32", "xstring",
-  "regexp", "heredoc", "heredoc_bodies", "heredoc_body",
-  "heredoc_string_rep", "heredoc_string_interp", "@33", "words", "symbol",
-  "basic_symbol", "sym", "symbols", "numeric", "variable", "var_lhs",
-  "var_ref", "backref", "superclass", "$@34", "f_arglist", "f_label",
-  "f_kw", "f_block_kw", "f_block_kwarg", "f_kwarg", "kwrest_mark",
-  "f_kwrest", "args_tail", "opt_args_tail", "f_args", "f_bad_arg",
-  "f_norm_arg", "f_arg_item", "@35", "f_arg", "f_opt_asgn", "f_opt",
-  "f_block_opt", "f_block_optarg", "f_optarg", "restarg_mark",
-  "f_rest_arg", "blkarg_mark", "f_block_arg", "opt_f_block_arg",
-  "singleton", "$@36", "assoc_list", "assocs", "label_tag", "assoc",
-  "operation", "operation2", "operation3", "dot_or_colon", "call_op",
-  "call_op2", "opt_terms", "opt_nl", "rparen", "trailer", "term", "nl",
-  "terms", "none", YY_NULLPTR
+  "command_args", "@7", "block_arg", "opt_block_arg", "comma", "args",
+  "mrhs", "primary", "@8", "@9", "$@10", "$@11", "@12", "@13", "$@14",
+  "$@15", "$@16", "$@17", "$@18", "$@19", "@20", "@21", "@22", "@23",
+  "primary_value", "then", "do", "if_tail", "opt_else", "for_var",
+  "f_margs", "$@24", "block_args_tail", "opt_block_args_tail",
+  "block_param", "opt_block_param", "block_param_def", "$@25",
+  "opt_bv_decl", "bv_decls", "bvar", "f_larglist", "lambda_body",
+  "do_block", "$@26", "block_call", "method_call", "brace_block", "@27",
+  "@28", "case_body", "cases", "opt_rescue", "exc_list", "exc_var",
+  "opt_ensure", "literal", "string", "string_fragment", "string_rep",
+  "string_interp", "@29", "xstring", "regexp", "heredoc", "heredoc_bodies",
+  "heredoc_body", "heredoc_string_rep", "heredoc_string_interp", "@30",
+  "words", "symbol", "basic_symbol", "sym", "symbols", "numeric",
+  "variable", "var_lhs", "var_ref", "backref", "superclass", "$@31",
+  "f_opt_arglist_paren", "f_arglist_paren", "f_arglist", "f_label", "f_kw",
+  "f_block_kw", "f_block_kwarg", "f_kwarg", "kwrest_mark", "f_kwrest",
+  "args_tail", "opt_args_tail", "f_args", "f_bad_arg", "f_norm_arg",
+  "f_arg_item", "@32", "f_arg", "f_opt_asgn", "f_opt", "f_block_opt",
+  "f_block_optarg", "f_optarg", "restarg_mark", "f_rest_arg",
+  "blkarg_mark", "f_block_arg", "opt_f_block_arg", "singleton", "$@33",
+  "assoc_list", "assocs", "assoc", "operation", "operation2", "operation3",
+  "dot_or_colon", "call_op", "call_op2", "opt_terms", "opt_nl", "rparen",
+  "trailer", "term", "nl", "terms", "none", YY_NULLPTR
 };
 #endif
 
@@ -2114,19 +2213,19 @@
      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,    61,
-      63,    58,    62,    60,   124,    94,    38,    43,    45,    42,
-      47,    37,   374,    33,   126,   375,   123,   125,    91,    93,
-      44,    96,    40,    41,    59,    46,    10
+     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
 
-#define YYPACT_NINF (-829)
+#define YYPACT_NINF (-873)
 
 #define yypact_value_is_default(Yyn) \
   ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF (-595)
+#define YYTABLE_NINF (-614)
 
 #define yytable_value_is_error(Yyn) \
   ((Yyn) == YYTABLE_NINF)
@@ -2135,110 +2234,114 @@
      STATE-NUM.  */
 static const yytype_int16 yypact =
 {
-    -829,   164,  2491,  -829,  7022,  8994,  9330,  5100,  -829,  8646,
-    8646,  -829,  -829,  9106,  6520,  4956,  7370,  7370,  -829,  -829,
-    7370,  2735,  5870,  -829,  -829,  -829,  -829,   -39,  6520,  -829,
-      36,  -829,  -829,  -829,  5240,  5380,  -829,  -829,  5520,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,    20,  8762,  8762,   129,
-    4227,  1481,  7602,  7950,  6798,  -829,  6242,   614,   927,  1024,
-    1126,   839,  -829,   410,  8878,  8762,  -829,   852,  -829,  1251,
-    -829,   448,  -829,  -829,   166,   171,  -829,    80,  9218,  -829,
-     198, 11318,   299,   402,    21,    59,  -829,   354,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,   203,   165,  -829,
-     340,   137,  -829,  -829,  -829,  -829,  -829,   159,   159,   177,
-      72,   552,  -829,  8646,    99,  4344,   607,  -829,   200,  -829,
-     494,  -829,  -829,   137,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,    33,    44,    47,   101,  -829,  -829,  -829,  -829,
-    -829,  -829,   170,   218,   219,   227,  -829,   229,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,  -829,   240,  3417,   270,   448,    83,   225,   526,
-      61,   247,    86,    83,  8646,  8646,   539,   306,  -829,  -829,
-     609,   329,    95,   110,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,  -829,  6381,  -829,  -829,   253,  -829,  -829,  -829,
-    -829,  -829,  -829,   852,  -829,   264,  -829,   386,  -829,  -829,
-     852,  2601,  8762,  8762,  8762,  8762,  -829, 11297,  -829,  -829,
-     271,   361,   271,  -829,  -829,  -829,  7138,  -829,  -829,  -829,
-    7370,  -829,  -829,  -829,  4956,  8646,  -829,  -829,   286,  4461,
-    -829,   796,   355,   398,  7254,  4227,   302,   852,  1251,   852,
-     323,  -829,  7254,   852,   325,  1517,  1517,  -829, 11297,   316,
-    1517,  -829,   421,  9442,   370,   798,   826,   859,  1597,  -829,
-    -829,  -829,  -829,  1166,  -829,  -829,  -829,  -829,  -829,  -829,
-     679,   749,  -829,  -829,  1186,  -829,  1195,  -829,  1257,  -829,
-     860,   444,   446,  -829,  -829,  -829,  -829,  4722,  8646,  8646,
-    8646,  8646,  7254,  8646,  8646,  -829,  -829,  8066,  -829,  4227,
-    6910,   392,  8066,  8762,  8762,  8762,  8762,  8762,  8762,  8762,
-    8762,  8762,  8762,  8762,  8762,  8762,  8762,  8762,  8762,  8762,
-    8762,  8762,  8762,  8762,  8762,  8762,  8762,  8762,  8762,  9714,
-    -829,  7370,  -829,  9798,  -829,  -829, 10974,  -829,  -829,  -829,
-    -829,  8878,  8878,  -829,   428,  -829,   448,  -829,   961,  -829,
-    -829,  -829,  -829,  -829,  9882,  7370,  9966,  3417,  8646,  -829,
-    -829,  -829,  -829,   522,   528,   149,  -829,  3561,   533,  8762,
-   10050,  7370, 10134,  8762,  8762,  3849,   126,   126,   113, 10218,
-    7370, 10302,  -829,   501,  -829,  4461,   386,  -829,  -829,  8182,
-     542,  -829,   679,  8762, 11318, 11318, 11318,  8762,   476,  -829,
-    7486,  -829,  8762,  -829,  7718,   852,   425,   852,   271,   271,
-    -829,  -829,   745,   431,  -829,  -829,  6520,  3966,   443, 10050,
-   10134,  8762,  1251,   852,  -829,  -829,  4839,   445,  1251,  -829,
-    -829,  7834,  -829,   852,  7950,  -829,  -829,  -829,   961,    80,
-    9442,  -829,  9442, 10386,  7370, 10470,    30,  -829,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  1719,
-    -829,  8762,  -829,   451,   554,   472,  -829,  -829,  -829,  -829,
-    -829,   479,  8762,  -829,   497,   596,   511,   608,  -829,  -829,
-    1283,  4461,   679,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    8762,  8762,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-     153,  8762,  -829, 11121,   271,  -829,   852,  9442,   532,  -829,
-    -829,  -829,   570,   572,  2302,  -829,  -829,   976,   180,   355,
-    2331,  2331,  2331,  2331,  1479,  1479, 11455, 11395,  2331,  2331,
-   11378, 11378,   671,   671, 11061,  1479,  1479,  1462,  1462,  1490,
-     175,   175,   355,   355,   355,  2869,  5986,  3137,  6102,  -829,
-     159,  -829,   550,   437,  -829,   563,  -829,  -829,  5870,  -829,
-    -829,  2061,   153,   153,  -829, 11044,  -829,  -829,  -829,  -829,
-    -829,   852,  8646,  3417,   736,   813,  -829,   159,   560,   159,
-     699,   745,  1650,  6659,  -829,  8298,   706,  -829,   690,  -829,
-    5636,  5753,   605,   268,   276,   706,  -829,  -829,  -829,  -829,
-      79,    88,   613,   121,   140,  8646,  6520,   616,   740, 11318,
-     450,  -829,   679, 11318, 11318,   679,  8762, 11297,  -829,   271,
-   11318,  -829,  -829,  -829,  -829,  7486,  7718,  -829,  -829,  -829,
-     623,  -829,  -829,   136,  1251,   852,  1517,   392,  -829,   736,
-     813,   626,   959,  1023,  -829,  -829,  1123,   622,    77, 11318,
-     768,  -829,  -829,  -829,   201,  -829,  1719,  -829, 11318,  1719,
-    -829,  -829,  1907,  -829,  -829,  -829,   637,  -829,   355,   355,
-    -829,  1719,  3417,  -829,  -829, 11140,  8414,  -829,  -829,  9442,
-    7254,  8878,  8762, 10554,  7370, 10638,    70,  8878,  8878,  -829,
-     428,   672,  8878,  8878,  -829,   428,    59,   166,  3417,  4461,
-     153,  -829,   852,   762,  -829,  -829,  -829,  1826,  3417,   852,
-    -829, 11121,  -829,   689,  -829,  4110,   774,  -829,  8646,   779,
-    -829,  8762,  8762,   358,  8762,  8762,   800,  4605,  4605,   156,
-     126,  -829,  -829,  -829,  8530,  3705,   679, 11318,  -829,   271,
-    -829,  -829,  -829,   192,  -829,   104,   852,   676,   674,   678,
-    3417,  4461,  -829,   766,  -829,   472,  -829,  -829,  -829,   684,
-     686,   687,  -829,   691,   766,   687,  -829,  -829,   622,   622,
-    9554,  -829,   694,   472,   695,  9554,  -829,   698,   701,  -829,
-     835,  8762, 11209,  -829,  -829, 11318,  3003,  3271,   712,   408,
-     432,  8762,  8762,  -829,  -829,  -829,  -829,  -829,  8878,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,   840,   722,  4461,  3417,
-    -829,  -829,   852,   852,   845,  -829,  1650,  9666,    83,  -829,
-    -829,  4605,  -829,  -829,    83,  -829,  8762,  -829,   855,   856,
-    -829, 11318,   193,  7718,  -829,   733,  -829,  1530,  -829,   680,
-     868,   753,  -829,  1719,  -829,  1907,  -829,  1907,  -829,  1907,
-    -829,  -829,   769,   771,   837,   995,   768,  -829,  -829,  1282,
-    -829,   995,  1719,  -829,  1907,  -829,  -829, 11228,   439, 11318,
-   11318,  -829,  -829,  -829,  -829,   761,   896,  -829,  -829,  -829,
-    3417,   862,  -829,  1028,   826,   859,  3417,  -829,  3561,  -829,
-    -829,  4605,  -829,  -829,  -829,  1585,  1585,   547,  -829,    22,
-    -829,  -829,  -829,  -829,   687,   778,   687,   687,  -829,  -829,
-    -829, 10722,  -829,   472,   768,  -829,  -829,   780,   792,   793,
-    -829,   799,   793,  -829,  -829,   913,   961, 10806,  7370, 10890,
-     528,   690,   935,   812,   812,  1585,   823,   680,  -829,  -829,
-    1907,  -829,  -829,  -829,   824,   828,  -829,  1719,  -829,  1907,
-    -829,  1907,  -829,  1907,  -829,  -829,  -829,   736,   813,   834,
-     357,   579,  -829,  -829,  -829,  1585,   812,  1585,  -829,   687,
-     793,   842,   793,   793,   192,   812,  -829,  -829,  1907,  -829,
-    -829,  -829,   793,  -829
+    -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
 };
 
   /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
@@ -2246,156 +2349,160 @@
      means the default is an error.  */
 static const yytype_int16 yydefact =
 {
-       2,     0,     0,     1,     0,     0,     0,     0,   276,     0,
-       0,   300,   303,     0,     0,   580,   324,   325,   326,   327,
-     288,   253,   400,   475,   474,   476,   477,   582,     0,    10,
-       0,   479,   478,   480,   466,   275,   468,   467,   470,   469,
-     462,   463,   424,   425,   481,   482,   274,     0,     0,     0,
-       0,   278,   594,   594,    80,   295,     0,     0,     0,     0,
-       0,     0,   439,     0,     0,     0,     3,   580,     6,     9,
-      27,    32,    44,    52,    51,     0,    68,     0,    72,    82,
-       0,    49,   232,     0,    53,   293,   267,   268,   422,   269,
-     270,   271,   420,   419,   451,   421,   418,   473,     0,   272,
-     273,   253,     5,     8,   324,   325,   288,   594,   400,     0,
-     105,   106,   274,     0,     0,     0,     0,   108,   483,   328,
-       0,   473,   273,     0,   316,   160,   170,   161,   157,   186,
-     187,   188,   189,   168,   183,   176,   166,   165,   181,   164,
-     163,   159,   184,   158,   171,   175,   177,   169,   162,   178,
-     185,   180,   179,   172,   182,   167,   156,   174,   173,   155,
-     153,   154,   150,   151,   152,   110,   112,   111,   145,   146,
-     141,   123,   124,   125,   132,   129,   131,   126,   127,   147,
-     148,   133,   134,   138,   142,   128,   130,   120,   121,   122,
-     135,   136,   137,   139,   140,   143,   144,   149,   552,   318,
-     113,   114,   551,     0,     0,     0,    50,     0,     0,     0,
-     473,     0,   273,     0,     0,     0,   104,     0,   339,   338,
-       0,     0,   473,   273,   179,   172,   182,   167,   150,   151,
-     152,   110,   111,     0,   115,   117,    20,   116,   442,   447,
-     446,   588,   591,   580,   590,     0,   444,     0,   592,   589,
-     581,   564,     0,     0,     0,     0,   248,   260,    66,   252,
-     594,   422,   594,   556,    67,    65,   594,   242,   289,    64,
-       0,   241,   399,    63,   580,     0,   583,    18,     0,     0,
-     209,     0,   210,   285,     0,     0,     0,   580,    15,   580,
-      70,    14,     0,   580,     0,   585,   585,   233,     0,     0,
-     585,   554,     0,     0,    78,     0,    88,    95,   522,   456,
-     455,   457,   458,     0,   454,   453,   437,   431,   430,   433,
-       0,     0,   428,   449,     0,   460,     0,   426,     0,   435,
-       0,   464,   465,    48,   224,   225,     4,   581,     0,     0,
-       0,     0,     0,     0,     0,   387,   389,     0,    84,     0,
-      76,    73,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     577,   594,   576,     0,   579,   578,     0,   404,   402,   294,
-     423,     0,     0,   393,    57,   292,   313,   105,   106,   107,
-     464,   465,   484,   311,     0,   594,     0,     0,     0,   319,
-     575,   574,   321,     0,   594,   285,   330,     0,   329,     0,
-       0,   594,     0,     0,     0,     0,     0,     0,   285,     0,
-     594,     0,   308,     0,   118,     0,     0,   443,   445,     0,
-       0,   593,   558,     0,   261,   563,   255,     0,   258,   249,
-       0,   257,     0,   250,     0,   580,     0,   580,   594,   594,
-     243,   254,   580,     0,   291,    47,     0,     0,     0,     0,
-       0,     0,    17,   580,   283,    13,   581,    69,   279,   282,
-     286,   587,   234,   586,   587,   236,   287,   555,    94,    86,
-       0,    81,     0,     0,   594,     0,   529,   525,   524,   523,
-     526,   527,   498,   531,   543,   499,   547,   546,   542,   522,
-     296,   491,   496,   594,   501,   594,   521,   384,   528,   530,
-     533,   507,     0,   540,   507,   545,   507,     0,   505,   459,
-       0,     0,   434,   440,   438,   429,   450,   461,   427,   436,
-       0,     0,     7,    21,    22,    23,    24,    25,    45,    46,
-     594,     0,    28,    30,     0,    31,   580,     0,    74,    85,
-      43,    33,    41,     0,   237,   190,    29,     0,   273,   206,
-     214,   219,   220,   221,   216,   218,   228,   229,   222,   223,
-     199,   200,   226,   227,   582,   215,   217,   211,   212,   213,
-     201,   202,   203,   204,   205,   567,   572,   568,   573,   398,
-     253,   396,     0,   567,   569,   568,   570,   397,   594,   567,
-     568,   253,   594,   594,    34,   237,   191,    40,   198,    55,
-      58,     0,     0,     0,   105,   106,   109,     0,     0,   594,
-       0,   580,   522,     0,   277,   594,   594,   410,   594,   331,
-     571,   284,     0,   567,   568,   594,   333,   301,   332,   304,
-     571,   284,     0,   567,   568,     0,     0,     0,     0,   260,
-       0,   307,   559,   561,   560,     0,     0,   262,   256,   594,
-     562,   557,   240,   239,   244,   245,   247,   290,   584,    19,
-       0,    26,   197,    71,    16,   580,   585,    87,    79,    91,
-      93,     0,    90,    92,   489,   535,     0,   582,     0,   490,
-       0,   503,   550,   500,     0,   504,     0,   514,   536,     0,
-     517,   544,     0,   519,   548,   452,     0,   441,   207,   208,
-     375,   373,     0,   372,   371,   266,     0,    83,    77,     0,
-       0,     0,     0,     0,   594,     0,     0,     0,     0,   395,
-      61,   401,     0,     0,   394,    59,   390,    54,     0,     0,
-     594,   314,     0,     0,   401,   317,   553,   522,     0,     0,
-     322,   411,   412,   594,   413,     0,   594,   336,     0,     0,
-     334,     0,     0,   401,     0,     0,     0,     0,     0,   401,
-       0,   119,   448,   306,     0,     0,   259,   263,   251,   594,
-      11,   280,   235,    89,   529,   347,   580,   340,     0,   377,
-       0,     0,   297,     0,   497,   594,   549,   506,   534,   507,
-     507,   507,   541,   507,   529,   507,   432,   370,   582,   582,
-     493,   494,   594,   594,   355,     0,   538,   355,   355,   353,
-       0,     0,   264,    75,    42,   238,   567,   568,     0,   567,
-     568,     0,     0,    39,   195,    38,   196,    62,     0,    36,
-     193,    37,   194,    60,   391,   392,     0,     0,     0,     0,
-     485,   312,   580,   580,     0,   488,   522,     0,     0,   415,
-     337,     0,    12,   417,     0,   298,     0,   299,     0,     0,
-     309,   262,   594,   246,   348,   345,   532,     0,   383,     0,
-       0,     0,   502,     0,   510,     0,   512,     0,   518,     0,
-     515,   520,     0,     0,     0,   492,     0,   351,   352,   355,
-     363,   537,     0,   366,     0,   368,   388,   265,   401,   231,
-     230,    35,   192,   405,   403,     0,     0,   487,   486,   320,
-       0,     0,   414,     0,    96,   103,     0,   416,     0,   302,
-     305,     0,   407,   408,   406,     0,     0,   343,   381,   582,
-     379,   382,   386,   385,   507,   507,   507,   507,   376,   374,
-     285,     0,   495,   594,     0,   354,   361,   355,   355,   355,
-     539,   355,   355,    56,   315,     0,   102,     0,   594,     0,
-     594,   594,     0,   349,   346,     0,   341,     0,   378,   511,
-       0,   508,   513,   516,   571,   284,   350,     0,   358,     0,
-     360,     0,   367,     0,   364,   369,   323,    99,   101,     0,
-     567,   568,   409,   335,   310,     0,   344,     0,   380,   507,
-     355,   355,   355,   355,    97,   342,   509,   359,     0,   356,
-     362,   365,   355,   357
+       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,
+     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
 };
 
   /* YYPGOTONTERM-NUM.  */
 static const yytype_int16 yypgoto =
 {
-    -829,  -829,  -829,   510,  -829,    32,  -829,  -214,   182,  -829,
-      28,  -829,  -155,  -302,   867,     1,   -16,  -829,  -536,  -829,
-     131,   971,  -170,     4,   -69,  -266,  -431,   -15,  1295,   -48,
-     981,    19,     5,  -829,  -829,    24,  -829,   653,  -829,   413,
-      75,   -58,  -352,    54,    13,  -829,  -390,  -235,   -11,    39,
-    -303,    89,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,  -829,
-    -829,  -829,     8,  -206,  -382,     7,  -568,  -829,  -829,  -829,
-     272,   538,  -829,  -512,  -829,  -829,   -78,  -829,     2,  -829,
-    -829,   255,  -829,  -829,  -829,   -65,  -829,  -829,  -430,  -829,
-      14,  -829,  -829,  -829,  -829,  -829,   154,    58,  -196,  -829,
-    -829,  -829,  -829,  -377,  -257,  -829,   787,  -829,  -829,  -829,
-      -6,  -829,  -829,  -829,  1461,  1552,  1026,  1065,  -829,  -829,
-     173,   314,   343,   141,  -829,  -829,  -829,   524,  -306,   246,
-    -307,  -801,  -716,  -519,  -829,   474,  -664,  -627,  -828,   142,
-     346,  -829,   236,  -829,   517,  -439,  -829,  -829,  -829,    92,
-     785,  -411,   505,  -339,  -829,  -829,   -80,  -829,    26,   -22,
-    -152,  -254,   788,   -12,   -33,    -2
+    -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
 };
 
   /* YYDEFGOTONTERM-NUM.  */
 static const yytype_int16 yydefgoto =
 {
-      -1,     1,     2,    66,    67,    68,   278,   413,   414,   287,
-     288,   466,    70,   561,    71,   207,    72,    73,   620,   750,
-      74,    75,   289,    76,    77,    78,   491,    79,   208,   117,
-     118,   234,   235,   236,   656,   598,   201,    81,   294,   565,
-     599,   268,   456,   457,   269,   270,   259,   449,   484,   458,
-     555,    82,   204,   292,   685,   293,   308,   698,   214,   777,
-     215,   778,   655,   941,   623,   621,   859,   407,   409,   632,
-     633,   866,   281,   417,   647,   769,   770,   221,   796,   945,
-     965,   910,   818,   722,   723,   819,   798,   949,   950,   510,
-     802,   346,   550,    84,    85,   395,   613,   612,   440,   944,
-     636,   763,   868,   872,    86,    87,    88,   321,   322,   531,
-      89,    90,    91,   532,   244,   245,   246,   435,    92,    93,
-      94,   315,    95,    96,   210,   211,    99,   212,   403,   622,
-     758,   511,   512,   821,   822,   513,   514,   515,   807,   707,
-     759,   518,   519,   520,   696,   521,   522,   523,   826,   827,
-     524,   525,   526,   527,   528,   701,   203,   408,   299,   459,
-     443,   263,   123,   627,   601,   412,   406,   386,   463,   799,
-     464,   482,   248,   249,   250,   291
+      -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
 };
 
   /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
@@ -2403,1484 +2510,1839 @@
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable =
 {
-     102,   517,   516,   383,   385,   275,   658,   425,   237,   351,
-      83,   213,    83,   120,   120,   276,   243,   209,   209,   271,
-     389,   220,   237,   209,   209,   209,   199,   453,   209,   602,
-      69,   200,    69,   277,   337,   273,   103,   490,   200,   304,
-     600,   247,   485,   671,   608,   649,   487,   611,   333,   566,
-     297,   301,   200,   628,   290,   260,   260,   825,    83,   260,
-     668,   688,   305,   533,   668,   662,   399,   629,   766,   642,
-     258,   264,   209,   671,   265,   314,   705,   776,   652,   885,
-     200,   600,   812,   608,   970,   387,   305,   694,   951,   614,
-     617,   295,   629,   336,   119,   119,   267,   272,  -564,   416,
-     748,   749,   119,   274,   -99,   271,   800,   242,   262,   262,
-     384,  -472,   262,  -101,   394,   473,   324,   326,   328,   330,
-     -96,   209,  -475,    83,   380,   535,   728,   841,   535,   422,
-     535,   629,   535,  -474,   535,  -103,  -476,   477,  -102,  -104,
-     431,   479,   691,   119,   296,   300,   -98,   256,   256,   695,
-     397,   256,  -471,   646,   398,   794,   629,   497,   498,   499,
-     500,  -466,   987,   387,     3,  -100,   382,   119,   242,   970,
-     261,   261,   279,   501,   261,  -466,   393,   424,  -475,   556,
-     -96,   -97,   267,   272,   283,   533,   951,   808,   801,  -474,
-    -477,   842,  -476,   630,   345,   388,   238,   560,   393,   239,
-     240,   470,   697,   516,   847,  -103,   261,   261,  -564,   853,
-    -466,   765,    83,   439,  -564,   426,   427,  -466,  -401,   -91,
-     348,  -567,   209,   209,   453,   495,   490,   241,   -93,   242,
-    -568,   986,   286,   720,   489,   -88,   560,   560,   858,   238,
-     471,   390,   239,   240,   884,   825,  -477,   353,   825,   450,
-     -95,   454,   314,   -94,   476,   -69,   391,   200,   451,  -479,
-     451,   -90,   483,   483,   460,   671,   812,   483,  -102,   436,
-     241,   392,   242,   388,   209,   717,   -83,   721,   209,   266,
-     -92,  -401,   209,   209,   481,   668,   668,    83,   786,   290,
-     347,   490,    83,    83,  -471,  -401,   -89,   286,   833,  -103,
-      83,   266,   506,   672,   376,   377,   378,  -478,  -480,   260,
-     677,   305,   472,   475,   942,  -479,  -466,   352,  -470,   274,
-     478,   683,   -96,   402,   461,   415,   516,   507,  -401,   410,
-    -401,   552,   762,   825,   535,   558,   562,  -401,   423,   543,
-     544,   545,   546,   -88,   419,    83,   209,   209,   209,   209,
-      83,   209,   209,   290,   432,   209,   626,    83,   305,   774,
-     567,   428,   262,  -478,  -480,    69,   892,   775,   808,   542,
-     547,   530,  -466,   -98,  -470,   562,   562,   437,   808,   460,
-     239,   240,   838,   907,   908,   411,   554,   -98,  -328,   209,
-     808,   554,   119,   434,   600,  -100,   608,   256,   880,   567,
-     567,   256,  -328,   460,   727,   717,   439,   606,   533,   753,
-     606,   448,   637,   209,    42,    83,   209,    43,   442,   460,
-     261,   687,   467,   489,   261,    83,   665,   353,   460,   209,
-     606,   392,   792,    83,   788,   843,   276,  -328,   209,   119,
-     849,   851,   -68,    83,  -328,   474,   606,   675,   676,   876,
-     863,   516,   943,   486,   785,   606,   451,   451,   607,  -103,
-     237,   468,    60,   490,   480,   102,   416,   286,   331,   332,
-     -98,   679,   671,   -98,   -98,    83,   488,   -97,   660,   756,
-     -95,   607,   808,   674,    83,   343,   344,   735,   489,   471,
-     200,   379,   460,   668,   606,    69,   808,   607,   305,   742,
-     305,   -98,   209,   -98,   684,   380,   607,   101,   830,   101,
-     492,   702,   256,   702,   101,   101,   540,  -102,   541,   606,
-     101,   101,   101,   743,   996,   101,   619,   -98,   742,   717,
-     848,   286,   559,   791,   856,   261,   256,   634,   -94,    83,
-     381,   635,   669,   726,   864,   607,   921,   382,   724,   639,
-     744,  -100,   256,   746,   788,   101,   -98,   661,   -97,   261,
-     516,   256,   736,   238,   529,   305,   239,   240,   673,   101,
-     607,   744,   276,   686,   678,   261,   560,   -90,  -565,   119,
-     681,   119,   560,   404,   261,   -83,   890,   560,   560,  -582,
-     448,   700,  -582,  -582,   241,  -100,   242,   380,   794,   638,
-     497,   498,   499,   500,   261,   703,   271,   645,   261,   271,
-     724,   724,   704,   740,   730,   420,   501,   657,   101,   706,
-     101,   745,   242,   752,   747,   256,  1009,   271,  -274,   380,
-     209,    83,   405,   764,   767,   261,   767,   709,   261,   382,
-     629,  -470,  -274,   767,   886,   926,   119,   711,   261,   784,
-     237,   712,   760,   483,   743,  -470,   780,   200,   454,   714,
-     489,   781,   936,   209,   421,   400,   401,   451,   938,   257,
-     257,   382,   729,   257,   554,   739,   316,  -274,   317,   318,
-     200,   854,  -100,   267,  -274,   276,   267,   985,  -565,   741,
-    -470,   731,  -100,   560,  -565,  -100,  -100,  -470,   429,   754,
-     280,   282,   739,   -92,   267,   257,   298,   768,   765,   101,
-     927,   928,   380,   716,   755,   562,   975,   334,   335,   101,
-     101,   562,   845,  -100,   765,  -100,   562,   562,   319,   320,
-      83,   948,   460,   497,   498,   499,   500,   305,    83,   567,
-     902,   903,   209,   353,   773,   567,   209,   430,   724,   501,
-     567,   567,   779,   782,   382,   783,    83,    83,   834,   606,
-     790,   869,  -571,   848,   873,   793,    83,   789,   242,   874,
-     710,   101,   713,    83,   816,   101,   209,   861,   883,   101,
-     101,   867,   343,   344,   101,    83,    83,   451,   871,   101,
-     101,   -97,   238,    83,   875,   239,   240,   101,   374,   375,
-     376,   377,   378,   702,   616,   618,   276,   276,    83,    83,
-     607,   534,   -89,   317,   318,   877,   887,   888,   119,   803,
-     702,   702,   889,   694,   893,  -571,   895,   897,   905,   261,
-     261,   899,   562,   911,   906,   909,   616,   618,   912,  -571,
-     502,   914,   101,   101,   101,   101,   101,   101,   101,   101,
-     916,   918,   101,   979,   101,   923,   567,   101,   238,   924,
-     929,   239,   240,   319,   320,   256,    83,    83,   505,   506,
-     939,   940,  -571,   946,  -571,   933,   206,   206,  -567,    83,
-     767,  -571,   206,   952,   682,   469,   101,   493,   261,   241,
-     953,   242,   960,   958,   507,   959,   101,   101,   973,   380,
-     329,   380,  -284,   317,   318,   444,   445,   446,   334,   119,
-     101,   974,   101,   101,   119,  -473,  -284,   976,   990,   257,
-     997,   539,   101,   257,   317,   318,   101,   988,  1006,  -473,
-     101,   857,   999,  1001,   421,   101,   494,   276,    83,  1003,
-     101,   382,   810,   382,    83,   813,    83,   870,  -273,    83,
-    1014,  -284,  1015,   319,   320,  -568,   119,   828,  -284,   878,
-     879,   702,  -273,  1017,  -473,   238,  -567,   882,   239,   240,
-    -568,  -473,   101,  1024,   319,   320,   460,   680,   637,   767,
-     396,   101,  1028,   891,   218,  -567,   209,   124,  1013,  1018,
-     323,   317,   318,   817,  1012,   418,   241,  -273,   242,   101,
-     553,   418,   855,   606,  -273,   564,   569,   570,   571,   572,
-     573,   574,   575,   576,   577,   578,   579,   580,   581,   582,
-     583,   584,   585,   586,   587,   588,   589,   590,   591,   592,
-     593,   594,   438,   202,   257,   820,   101,   261,   441,   930,
-     925,   319,   320,   804,   615,   615,   452,   962,  -567,  -568,
-    -285,   967,   809,   937,   607,   894,   896,   898,   257,   900,
-       0,   901,  -567,     0,  -285,   733,     0,   100,     0,   100,
-     122,   122,   615,     0,   257,     0,   615,   615,   223,   380,
-       0,   206,   206,   257,   961,     0,     0,   325,   317,   318,
-       0,     0,   659,     0,     0,  -567,   663,  -567,   380,  -285,
-     664,  -567,     0,   667,  -567,   670,  -285,   298,     0,   256,
-       0,     0,  -568,     0,   734,   100,     0,   977,   980,   307,
-     981,   382,     0,   982,   615,   441,  -568,   101,   101,   955,
-       0,   380,   261,   405,   667,     0,     0,   298,   319,   320,
-     382,   462,   465,   307,     0,   968,     0,   257,   971,     0,
-     844,   846,     0,     0,     0,   850,   852,     0,     0,  -568,
-     101,  -568,     0,     0,   699,  -568,   978,     0,  -568,     0,
-     797,     0,     0,   382,   794,   708,   497,   498,   499,   500,
-     100,     0,     0,   811,   844,   846,   815,   850,   852,   327,
-     317,   318,   501,   718,   719,   824,     0,     0,     0,     0,
-     989,   991,   992,   993,   725,   206,   206,   206,   206,     0,
-     548,   549,     0,     0,   648,   648,   503,   806,     0,     0,
-     820,   806,   795,   820,   805,     0,   820,   101,   820,   529,
-     317,   318,     0,  1021,     0,   101,   101,     0,   829,   101,
-     319,   320,   101,   101,     0,   823,     0,   101,   101,   536,
-     317,   318,     0,   101,   101,     0,     0,     0,   537,   317,
-     318,   922,     0,   101,   441,  1026,     0,     0,     0,   100,
-     101,   441,     0,   101,     0,   631,     0,     0,   820,     0,
-     319,   320,   101,   101,     0,     0,     0,     0,   761,   922,
-     101,   338,   339,   340,   341,   342,     0,    80,     0,    80,
-     319,   320,     0,     0,     0,   101,   101,     0,   219,   319,
-     320,   820,     0,   820,     0,   820,     0,   820,     0,   787,
-     538,   317,   318,     0,     0,     0,     0,     0,   667,   298,
-       0,     0,     0,   496,     0,   497,   498,   499,   500,     0,
-       0,     0,   820,     0,   100,    80,   715,   317,   318,   100,
-     100,   501,     0,   101,   502,     0,     0,   100,     0,     0,
-       0,     0,     0,   101,   101,   913,   915,   954,   307,   956,
-       0,   319,   320,   957,     0,   503,   101,     0,     0,   832,
-       0,   504,   505,   506,   615,   835,   969,   257,   972,     0,
-     615,   615,     0,     0,     0,   615,   615,   319,   320,     0,
-       0,     0,   100,     0,     0,     0,     0,   100,   507,   751,
-      80,   508,     0,     0,   100,   307,     0,   568,     0,   983,
-     984,     0,   964,   806,   615,   615,   829,   615,   615,   829,
-     963,   829,     0,   823,     0,   101,   823,   881,   823,     0,
-       0,   101,     0,   101,     0,     0,   101,   966,   418,     0,
-       0,     0,     0,     0,     0,     0,   568,   568,     0,  1016,
-       0,     0,     0,    97,  1019,    97,   121,   121,   121,     0,
-       0,  1020,   100,  1022,   222,     0,     0,  1023,     0,     0,
-       0,   829,   100,   101,   917,     0,     0,     0,   823,   206,
-     100,  1025,     0,     0,   919,   920,     0,     0,     0,    80,
-     100,   615,  1032,     0,     0,   998,  1000,  1002,     0,  1004,
-    1005,    97,     0,     0,   829,   306,   829,     0,   829,     0,
-     829,   823,   206,   823,     0,   823,     0,   823,     0,   615,
-       0,     0,   100,     0,   353,     0,   298,     0,     0,   306,
-     860,   100,     0,     0,     0,   829,     0,   865,     0,   366,
-     367,   353,   823,     0,    98,   307,    98,   307,  1027,  1029,
-    1030,  1031,   353,     0,     0,     0,   366,   367,   648,     0,
-    1033,     0,     0,     0,    80,     0,    97,   366,   367,    80,
-      80,   794,     0,   497,   498,   499,   500,    80,   373,   374,
-     375,   376,   377,   378,  -281,     0,   100,  -281,  -281,   501,
-       0,     0,    98,   371,   372,   373,   374,   375,   376,   377,
-     378,     0,     0,     0,     0,     0,     0,   374,   375,   376,
-     377,   378,   307,   503,  -281,  -281,     0,  -281,     0,   947,
-     238,   257,    80,   239,   240,   206,   794,    80,   497,   498,
-     499,   500,     0,     0,    80,     0,     0,   563,   496,     0,
-     497,   498,   499,   500,   501,     0,   418,   448,     0,     0,
-       0,   241,   418,   242,     0,    97,   501,    98,     0,   502,
-       0,     0,     0,     0,     0,     0,     0,     0,   503,     0,
-       0,     0,     0,     0,     0,     0,   563,   563,   100,     0,
-     503,     0,     0,     0,     0,     0,   504,   505,   506,     0,
-       0,   496,    80,   497,   498,   499,   500,     0,     0,     0,
-       0,     0,    80,     0,     0,     0,     0,     0,     0,   501,
-      80,     0,   502,   507,     0,     0,   508,     0,     0,     0,
-      80,     0,     0,     0,     0,     0,     0,     0,     0,   509,
-      97,     0,     0,   503,     0,    97,    97,     0,     0,   504,
-     505,   506,     0,    97,     0,     0,    98,     0,     0,     0,
-       0,     0,    80,     0,   306,     0,     0,     0,     0,     0,
-     496,    80,   497,   498,   499,   500,   507,     0,     0,   508,
-       0,     0,     0,     0,     0,     0,     0,   100,   501,     0,
-       0,   502,   757,     0,   307,   100,   568,     0,    97,     0,
-       0,     0,   568,    97,     0,     0,     0,   568,   568,     0,
-      97,   306,   503,   100,   100,     0,     0,     0,   504,   505,
-     506,     0,     0,   100,     0,     0,    80,     0,     0,     0,
-     100,    98,     0,     0,     0,     0,    98,    98,     0,     0,
-       0,     0,   100,   100,    98,   507,     0,     0,   508,     0,
-     100,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   100,   100,     0,    97,     0,
-       0,     0,     0,     0,     0,     0,     0,   496,    97,   497,
-     498,   499,   500,     0,     0,   122,    97,     0,     0,    98,
-     122,     0,     0,     0,    98,   501,    97,     0,   502,     0,
-       0,    98,     0,     0,    98,     0,     0,     0,     0,     0,
-     862,     0,     0,   568,     0,     0,     0,     0,    80,   503,
-       0,     0,     0,   100,   100,   504,   505,   506,    97,     0,
-       0,     0,   935,     0,     0,     0,   100,    97,     0,     0,
-       0,     0,     0,    98,    98,     0,     0,     0,     0,     0,
-       0,   306,   507,   306,     0,   508,     0,     0,   814,    98,
-     497,   498,   499,   500,     0,     0,     0,     0,     0,    98,
-       0,     0,     0,     0,     0,     0,   501,    98,     0,   502,
-       0,     0,     0,     0,     0,     0,     0,    98,     0,     0,
-       0,     0,    97,     0,     0,   100,     0,     0,     0,     0,
-     503,   100,     0,   100,     0,     0,   100,   505,   506,     0,
-       0,     0,     0,     0,     0,     0,     0,    80,   306,    98,
-       0,     0,     0,     0,     0,    80,   563,     0,    98,     0,
-       0,     0,   563,   507,     0,     0,     0,   563,   563,     0,
-       0,     0,     0,    80,    80,     0,     0,     0,     0,     0,
-       0,     0,     0,    80,     0,     0,     0,     0,     0,     0,
-      80,  -594,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    80,    80,  -594,  -594,  -594,  -594,  -594,  -594,
-      80,  -594,     0,    98,    97,     0,     0,  -594,  -594,     0,
-       0,     0,     0,     0,     0,    80,    80,     0,  -594,  -594,
-       0,  -594,  -594,  -594,  -594,  -594,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   563,     0,     0,     0,     0,     0,     0,
-    -594,     0,     0,    80,    80,     0,     0,     0,     0,     0,
-       0,     0,   932,     0,  -594,     0,    80,     0,     0,     0,
-       0,     0,     0,     0,  -594,    98,     0,  -594,  -594,     0,
-       0,     0,     0,    97,     0,     0,     0,     0,     0,     0,
-     306,    97,     0,     0,     0,     0,     0,  -594,  -594,     0,
-       0,     0,     0,   266,  -594,  -594,  -594,  -594,     0,    97,
-      97,     0,     0,     0,     0,     0,     0,     0,     0,    97,
-       0,     0,     0,     0,     0,    80,    97,     0,     0,     0,
-       0,    80,     0,    80,     0,     0,    80,     0,    97,    97,
-       0,     0,     0,     0,     0,     0,    97,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    97,    97,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    98,     0,     0,     0,     0,     0,
-       0,   121,    98,    98,     0,     0,   121,     0,     0,    98,
-       0,     0,     0,     0,    98,    98,     0,     0,     0,     0,
-      98,    98,     0,     0,     0,     0,     0,     0,     0,     0,
-      98,     0,     0,     0,     0,     0,     0,    98,     0,    97,
-      97,     0,     0,     0,     0,     0,     0,     0,   934,    98,
-      98,     0,    97,     0,     0,     0,     0,    98,     0,     0,
-       0,     0,     0,     0,     0,     0,   732,     0,     0,     0,
-       0,     0,    98,    98,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   353,   354,   355,   356,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,     0,     0,   366,
-     367,    97,     0,     0,     0,     0,     0,    97,     0,    97,
-      98,     0,    97,   353,  -595,  -595,  -595,  -595,   358,   359,
-      98,    98,  -595,  -595,     0,     0,     0,     0,   366,   367,
-       0,     0,   368,    98,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,     0,     0,     0,     0,     0,     0,
-       0,     0,  -260,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    98,     0,     0,     0,     0,     0,    98,     0,
-      98,  -594,     4,    98,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,     0,     0,     0,     0,     0,     0,
+     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,
+       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,
+       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,     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,
+       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,     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,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   102,     0,     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,     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,     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,     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,  -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,     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,  -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,    29,    30,    31,
+      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,     0,     0,     0,     0,     0,
-       0,    49,     0,     0,    50,    51,     0,    52,    53,     0,
-      54,     0,     0,    55,     0,    56,    57,    58,    59,    60,
-      61,  -466,     0,    62,  -594,     0,     0,  -594,  -594,     0,
-       0,     0,     0,     0,  -466,  -466,  -466,  -466,  -466,  -466,
-       0,  -466,     0,    63,    64,    65,     0,     0,  -466,  -466,
-       0,     0,     0,     0,     0,  -594,     0,  -594,  -466,  -466,
-       0,  -466,  -466,  -466,  -466,  -466,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   442,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  -466,  -466,  -466,  -466,  -466,  -466,  -466,
-    -466,  -466,  -466,  -466,  -466,  -466,     0,     0,  -466,  -466,
-    -466,     0,  -466,  -466,     0,     0,     0,     0,     0,  -466,
-       0,     0,     0,     0,  -466,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -466,     0,     0,  -466,  -466,     0,
-    -466,  -466,     0,  -466,  -466,  -466,  -466,  -466,  -466,  -466,
-    -466,  -466,  -466,     0,     0,  -594,     0,     0,  -466,  -466,
-    -466,  -466,     0,     0,  -466,  -466,  -466,  -466,  -594,  -594,
-    -594,  -594,  -594,  -594,     0,  -594,     0,     0,     0,     0,
-       0,     0,  -594,  -594,     0,     0,     0,     0,     0,     0,
-       0,     0,  -594,  -594,     0,  -594,  -594,  -594,  -594,  -594,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  -594,  -594,  -594,
-    -594,  -594,  -594,  -594,  -594,  -594,  -594,  -594,  -594,  -594,
-       0,     0,  -594,  -594,  -594,     0,     0,  -594,     0,     0,
-       0,     0,     0,  -594,     0,     0,     0,     0,  -594,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  -594,     0,
-       0,  -594,  -594,     0,     0,  -594,     0,  -594,  -594,  -594,
-    -594,  -594,  -594,  -594,  -594,  -594,  -594,     0,     0,  -571,
-       0,     0,  -594,  -594,  -594,  -594,     0,   266,  -594,  -594,
-    -594,  -594,  -571,  -571,  -571,     0,  -571,  -571,     0,  -571,
-       0,     0,     0,     0,     0,  -571,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  -571,  -571,     0,  -571,
-    -571,  -571,  -571,  -571,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,     0,     0,  -571,  -571,  -571,     0,
-     737,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -571,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -571,     0,     0,  -571,  -571,     0,   -99,  -571,
-       0,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,     0,     0,  -571,     0,  -571,  -571,  -571,     0,   -91,
-       0,     0,  -571,  -571,  -571,  -571,  -571,  -571,  -571,     0,
-    -571,  -571,     0,  -571,     0,     0,     0,     0,     0,  -571,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -571,  -571,     0,  -571,  -571,  -571,  -571,  -571,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,     0,     0,
-    -571,  -571,  -571,     0,   737,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  -571,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  -571,     0,     0,  -571,
-    -571,     0,   -99,  -571,     0,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,     0,     0,  -284,     0,  -571,
-    -571,  -571,     0,  -571,     0,     0,  -571,  -571,  -571,  -571,
-    -284,  -284,  -284,     0,  -284,  -284,     0,  -284,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -284,  -284,     0,  -284,  -284,  -284,
-    -284,  -284,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,     0,     0,  -284,  -284,  -284,     0,   738,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -284,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -284,     0,     0,  -284,  -284,     0,  -101,  -284,     0,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,     0,
-       0,  -284,     0,     0,  -284,  -284,     0,   -93,     0,     0,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,     0,  -284,  -284,
-       0,  -284,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  -284,  -284,
-       0,  -284,  -284,  -284,  -284,  -284,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,     0,     0,  -284,  -284,
-    -284,     0,   738,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -284,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -284,     0,     0,  -284,  -284,     0,
-    -101,  -284,     0,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,     0,     0,     0,     0,     0,  -284,  -284,
-       0,  -284,     0,     0,  -284,  -284,  -284,  -284,   284,     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,
-    -594,  -594,  -594,     0,     0,  -594,    15,     0,    16,    17,
+       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,     0,     0,     0,     0,     0,     0,    49,     0,     0,
-      50,    51,     0,    52,    53,     0,    54,     0,     0,    55,
-       0,    56,    57,    58,    59,    60,    61,     0,     0,    62,
-    -594,     0,     0,  -594,  -594,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    63,
-      64,    65,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  -594,   284,  -594,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,     0,     0,  -594,     0,  -594,  -594,
-      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,     0,     0,     0,     0,     0,
-       0,    49,     0,     0,    50,    51,     0,    52,    53,     0,
-      54,     0,     0,    55,     0,    56,    57,    58,    59,    60,
-      61,     0,     0,    62,  -594,     0,     0,  -594,  -594,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    63,    64,    65,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  -594,   284,  -594,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,     0,     0,
-    -594,     0,     0,  -594,    15,  -594,    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,     0,
-       0,     0,     0,     0,     0,    49,     0,     0,    50,    51,
-       0,    52,    53,     0,    54,     0,     0,    55,     0,    56,
-      57,    58,    59,    60,    61,     0,     0,    62,  -594,     0,
-       0,  -594,  -594,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    63,    64,    65,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  -594,
-     284,  -594,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,     0,     0,  -594,     0,     0,  -594,    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,     0,     0,     0,     0,     0,     0,    49,
-       0,     0,    50,    51,     0,    52,    53,     0,    54,     0,
-       0,    55,     0,    56,    57,    58,    59,    60,    61,     0,
-       0,    62,  -594,     0,     0,  -594,  -594,     4,     0,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,     0,
-       0,    63,    64,    65,     0,    15,     0,    16,    17,    18,
-      19,     0,     0,  -594,     0,  -594,    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,
-       0,     0,     0,     0,     0,     0,    49,     0,     0,    50,
-      51,     0,    52,    53,     0,    54,     0,     0,    55,     0,
-      56,    57,    58,    59,    60,    61,     0,     0,    62,  -594,
-       0,     0,  -594,  -594,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    63,    64,
-      65,     0,     0,  -594,     0,     0,     0,     0,     0,     0,
-    -594,   284,  -594,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,     0,  -594,  -594,     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,    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,    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,
+       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,     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,  -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,  -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,  -613,  -613,     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,    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,     0,     0,    50,    51,     0,    52,    53,     0,    54,
-       0,     0,    55,     0,    56,    57,    58,    59,    60,    61,
-       0,     0,    62,  -594,     0,     0,  -594,  -594,   284,     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,   294,     0,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-       0,     0,    63,    64,    65,     0,    15,     0,    16,    17,
-      18,    19,     0,     0,  -594,     0,  -594,    20,    21,    22,
+       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,     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,     0,     0,     0,     0,     0,     0,    49,     0,     0,
-     285,    51,     0,    52,    53,     0,    54,     0,     0,    55,
-       0,    56,    57,    58,    59,    60,    61,     0,     0,    62,
-    -594,     0,     0,  -594,  -594,   284,     0,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,     0,     0,    63,
-      64,    65,     0,    15,     0,    16,    17,    18,    19,     0,
-    -594,  -594,     0,  -594,    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,     0,     0,
-       0,     0,     0,     0,    49,     0,     0,    50,    51,     0,
-      52,    53,     0,    54,     0,     0,    55,     0,    56,    57,
-      58,    59,    60,    61,     0,     0,    62,  -594,     0,     0,
-    -594,  -594,   284,     0,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,     0,     0,    63,    64,    65,     0,
-      15,     0,    16,    17,    18,    19,     0,  -594,  -594,     0,
-    -594,    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,     0,     0,     0,     0,     0,
-       0,    49,     0,     0,    50,    51,     0,    52,    53,     0,
-      54,     0,     0,    55,     0,    56,    57,    58,    59,    60,
-      61,     0,     0,    62,  -594,     0,     0,  -594,  -594,     0,
+       0,    49,    50,     0,     0,     0,     0,     0,    51,     0,
+       0,   295,    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,    65,    66,    67,     0,    15,     0,    16,    17,    18,
+      19,     0,  -613,  -613,     0,  -613,    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,
-       0,     0,     0,    63,    64,    65,     0,     0,  -594,     0,
-       0,     0,     0,     0,     0,  -594,   284,  -594,     5,     6,
+      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,
-    -594,     0,     0,     0,    15,     0,    16,    17,    18,    19,
-       0,     0,     0,     0,     0,    20,    21,    22,    23,    24,
+      65,    66,    67,     0,    15,     0,    16,    17,    18,    19,
+       0,  -613,  -613,     0,  -613,    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,     0,
-       0,     0,     0,     0,     0,    49,     0,     0,    50,    51,
-       0,    52,    53,     0,    54,     0,     0,    55,     0,    56,
-      57,    58,    59,    60,    61,     0,     0,    62,  -594,     0,
-       0,  -594,  -594,     0,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,     0,     0,    63,    64,    65,
-       0,    15,     0,    16,    17,    18,    19,     0,     0,  -594,
-       0,  -594,    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,     0,     0,     0,     0,
-       0,     0,    49,     0,     0,    50,    51,     0,    52,    53,
-       0,    54,     0,     0,    55,     0,    56,    57,    58,    59,
-      60,    61,     0,     0,    62,   238,     0,     0,   239,   240,
+       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,  -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,
+       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,     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,     0,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,     0,     0,    63,    64,    65,     0,    15,     0,
-      16,    17,    18,    19,     0,     0,   241,     0,   242,    20,
+      13,    14,     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,    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,     0,     0,     0,     0,     0,     0,    49,
-       0,     0,    50,    51,     0,    52,    53,     0,    54,     0,
-       0,    55,     0,    56,    57,    58,    59,    60,    61,     0,
-       0,    62,   238,     0,     0,   239,   240,     0,     0,     5,
+       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,
+       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,    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,    63,    64,    65,     0,    15,     0,    16,    17,    18,
-      19,     0,     0,   241,     0,   242,    20,    21,    22,    23,
+       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,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   205,     0,     0,   115,
-      51,     0,    52,    53,     0,     0,     0,     0,    55,     0,
-      56,    57,    58,    59,    60,    61,     0,     0,    62,   238,
-       0,     0,   239,   240,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    63,    64,
-      65,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     241,     0,   242,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,     0,     0,     0,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-       0,     0,     0,     0,     0,   159,   160,   161,   162,   163,
-     164,   165,   166,    36,    37,   167,    39,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,     0,
-       0,   177,   178,     0,     0,   179,   180,   181,   182,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   183,
-     184,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,     0,   195,   196,     0,     0,     0,     0,     0,
-       0,   197,   198,  -564,  -564,  -564,  -564,  -564,  -564,  -564,
-    -564,  -564,     0,     0,     0,     0,     0,     0,     0,  -564,
-       0,  -564,  -564,  -564,  -564,     0,  -564,     0,     0,     0,
-    -564,  -564,  -564,  -564,  -564,  -564,  -564,     0,     0,  -564,
-       0,     0,     0,     0,     0,     0,     0,     0,  -564,  -564,
-    -564,  -564,  -564,  -564,  -564,  -564,  -564,     0,  -564,  -564,
-    -564,     0,     0,  -564,     0,     0,  -564,  -564,     0,  -564,
-    -564,  -564,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -564,     0,     0,  -564,  -564,     0,  -564,  -564,     0,  -564,
-    -564,  -564,  -564,     0,  -564,  -564,  -564,  -564,  -564,  -564,
-       0,     0,  -564,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -564,  -564,  -564,     0,  -564,     0,     0,     0,
-       0,     0,  -564,  -566,  -566,  -566,  -566,  -566,  -566,  -566,
-    -566,  -566,     0,     0,     0,     0,     0,     0,     0,  -566,
-       0,  -566,  -566,  -566,  -566,     0,  -566,     0,     0,     0,
-    -566,  -566,  -566,  -566,  -566,  -566,  -566,     0,     0,  -566,
-       0,     0,     0,     0,     0,     0,     0,     0,  -566,  -566,
-    -566,  -566,  -566,  -566,  -566,  -566,  -566,     0,  -566,  -566,
-    -566,     0,     0,  -566,     0,     0,  -566,  -566,     0,  -566,
-    -566,  -566,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -566,     0,     0,  -566,  -566,     0,  -566,  -566,     0,  -566,
-    -566,  -566,  -566,     0,  -566,  -566,  -566,  -566,  -566,  -566,
-       0,     0,  -566,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -566,  -566,  -566,     0,  -566,     0,     0,     0,
-       0,     0,  -566,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,     0,     0,     0,     0,     0,     0,     0,  -565,
-       0,  -565,  -565,  -565,  -565,     0,  -565,     0,     0,     0,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,     0,     0,  -565,
-       0,     0,     0,     0,     0,     0,     0,     0,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,     0,  -565,  -565,
-    -565,     0,     0,  -565,     0,     0,  -565,  -565,     0,  -565,
-    -565,  -565,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -565,     0,     0,  -565,  -565,     0,  -565,  -565,     0,  -565,
-    -565,  -565,  -565,     0,  -565,  -565,  -565,  -565,  -565,  -565,
-       0,     0,  -565,     0,     0,     0,     0,     0,     0,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,     0,     0,
-       0,     0,  -565,  -565,  -565,  -567,  -565,  -567,  -567,  -567,
-    -567,     0,  -565,     0,     0,     0,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,     0,     0,  -567,     0,     0,     0,     0,
-       0,     0,     0,     0,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,     0,  -567,  -567,  -567,     0,     0,  -567,
-       0,     0,  -567,  -567,     0,  -567,  -567,  -567,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  -567,   771,     0,  -567,
-    -567,     0,  -567,  -567,     0,  -567,  -567,  -567,  -567,     0,
-    -567,  -567,  -567,  -567,  -567,  -567,     0,     0,  -567,     0,
-       0,     0,     0,     0,     0,   -99,  -568,  -568,  -568,  -568,
-    -568,  -568,  -568,  -568,  -568,     0,     0,     0,  -567,  -567,
-    -567,     0,  -568,     0,  -568,  -568,  -568,  -568,  -567,     0,
-       0,     0,     0,  -568,  -568,  -568,  -568,  -568,  -568,  -568,
-       0,     0,  -568,     0,     0,     0,     0,     0,     0,     0,
-       0,  -568,  -568,  -568,  -568,  -568,  -568,  -568,  -568,  -568,
-       0,  -568,  -568,  -568,     0,     0,  -568,     0,     0,  -568,
-    -568,     0,  -568,  -568,  -568,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  -568,   772,     0,  -568,  -568,     0,  -568,
-    -568,     0,  -568,  -568,  -568,  -568,     0,  -568,  -568,  -568,
-    -568,  -568,  -568,     0,     0,  -568,     0,     0,     0,     0,
-       0,     0,  -101,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,     0,     0,     0,  -568,  -568,  -568,     0,  -253,
-       0,  -253,  -253,  -253,  -253,  -568,     0,     0,     0,     0,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,     0,     0,  -253,
-       0,     0,     0,     0,     0,     0,     0,     0,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,     0,  -253,  -253,
-    -253,     0,     0,  -253,     0,     0,  -253,  -253,     0,  -253,
-    -253,  -253,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -253,     0,     0,  -253,  -253,     0,  -253,  -253,     0,  -253,
-    -253,  -253,  -253,     0,  -253,  -253,  -253,  -253,  -253,  -253,
-       0,     0,  -253,     0,     0,     0,     0,     0,     0,  -569,
-    -569,  -569,  -569,  -569,  -569,  -569,  -569,  -569,     0,     0,
-       0,     0,  -253,  -253,  -253,  -569,     0,  -569,  -569,  -569,
-    -569,     0,   266,     0,     0,     0,  -569,  -569,  -569,  -569,
-    -569,  -569,  -569,     0,     0,  -569,     0,     0,     0,     0,
-       0,     0,     0,     0,  -569,  -569,  -569,  -569,  -569,  -569,
-    -569,  -569,  -569,     0,  -569,  -569,  -569,     0,     0,  -569,
-       0,     0,  -569,  -569,     0,  -569,  -569,  -569,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  -569,     0,     0,  -569,
-    -569,     0,  -569,  -569,     0,  -569,  -569,  -569,  -569,     0,
-    -569,  -569,  -569,  -569,  -569,  -569,     0,     0,  -569,     0,
-       0,     0,     0,     0,     0,  -570,  -570,  -570,  -570,  -570,
-    -570,  -570,  -570,  -570,     0,     0,     0,     0,  -569,  -569,
-    -569,  -570,     0,  -570,  -570,  -570,  -570,     0,  -569,     0,
-       0,     0,  -570,  -570,  -570,  -570,  -570,  -570,  -570,     0,
-       0,  -570,     0,     0,     0,     0,     0,     0,     0,     0,
-    -570,  -570,  -570,  -570,  -570,  -570,  -570,  -570,  -570,     0,
-    -570,  -570,  -570,     0,     0,  -570,     0,     0,  -570,  -570,
-       0,  -570,  -570,  -570,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -570,     0,     0,  -570,  -570,     0,  -570,  -570,
-       0,  -570,  -570,  -570,  -570,     0,  -570,  -570,  -570,  -570,
-    -570,  -570,     0,     0,  -570,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -570,  -570,  -570,     0,     0,     0,
-       0,     0,     0,     0,  -570,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,     0,
-       0,     0,   149,   150,   151,   224,   225,   226,   227,   156,
-     157,   158,     0,     0,     0,     0,     0,   159,   160,   161,
-     228,   229,   230,   231,   166,   309,   310,   232,   311,     0,
-       0,     0,     0,     0,     0,   312,     0,     0,     0,     0,
-       0,     0,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,     0,     0,   177,   178,     0,     0,   179,   180,   181,
-     182,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   183,   184,     0,     0,     0,     0,     0,     0,     0,
-     313,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,     0,   195,   196,     0,     0,     0,
-       0,     0,     0,   197,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,     0,     0,
-       0,   149,   150,   151,   224,   225,   226,   227,   156,   157,
-     158,     0,     0,     0,     0,     0,   159,   160,   161,   228,
-     229,   230,   231,   166,   309,   310,   232,   311,     0,     0,
-       0,     0,     0,     0,   312,     0,     0,     0,     0,     0,
-       0,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-       0,     0,   177,   178,     0,     0,   179,   180,   181,   182,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     183,   184,     0,     0,     0,     0,     0,     0,     0,   433,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,     0,   195,   196,     0,     0,     0,     0,
-       0,     0,   197,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,     0,     0,     0,
-     149,   150,   151,   224,   225,   226,   227,   156,   157,   158,
-       0,     0,     0,     0,     0,   159,   160,   161,   228,   229,
-     230,   231,   166,     0,     0,   232,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,     0,
-       0,   177,   178,     0,     0,   179,   180,   181,   182,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   183,
-     184,     0,     0,     0,   233,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,     0,   195,   196,     0,     0,     0,     0,     0,
-       0,   197,   125,   126,   127,   128,   129,   130,   131,   132,
+      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,  -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,     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,     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,     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,   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,     0,     0,     0,   149,
-     150,   151,   224,   225,   226,   227,   156,   157,   158,     0,
-       0,     0,     0,     0,   159,   160,   161,   228,   229,   230,
-     231,   166,     0,     0,   232,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,     0,     0,
-     177,   178,     0,     0,   179,   180,   181,   182,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   183,   184,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   185,   186,   187,   188,   189,   190,   191,   192,   193,
-     194,     0,   195,   196,     0,     0,     0,     0,     0,     0,
-     197,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,     0,     0,     0,     0,    15,     0,   104,
-     105,    18,    19,     0,     0,     0,     0,     0,   106,   107,
-     108,    23,    24,    25,    26,     0,     0,   109,     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,   112,     0,     0,
+     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,     0,   302,     0,
-       0,   115,    51,     0,    52,    53,     0,     0,     0,     0,
-      55,     0,    56,    57,    58,    59,    60,    61,     0,     0,
-      62,     0,     0,     5,     6,     7,     8,     9,    10,    11,
+       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,
-     116,   104,   105,    18,    19,     0,     0,     0,   303,     0,
-     106,   107,   108,    23,    24,    25,    26,     0,     0,   109,
+     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,   112,
+      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,
-     302,     0,     0,   115,    51,     0,    52,    53,     0,     0,
-       0,     0,    55,     0,    56,    57,    58,    59,    60,    61,
-       0,     0,    62,     0,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,     0,     0,     0,     0,     0,
-       0,    15,   116,    16,    17,    18,    19,     0,     0,     0,
-     557,     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,     0,     0,     0,     0,
-       0,     0,    49,     0,     0,    50,    51,     0,    52,    53,
-       0,    54,     0,     0,    55,     0,    56,    57,    58,    59,
-      60,    61,     0,     0,    62,     0,     0,     0,     0,     0,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,     0,    63,    64,    65,    15,     0,    16,
-      17,    18,    19,     0,     0,     0,     0,     0,    20,    21,
-      22,    23,    24,    25,    26,     0,     0,   109,     0,     0,
-       0,     0,     0,     0,     0,     0,    31,    32,    33,   251,
-      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,   455,     0,     0,     0,     0,     0,   205,     0,
-       0,   115,    51,     0,    52,    53,     0,   252,   253,   254,
-      55,     0,    56,    57,    58,    59,    60,    61,     0,     0,
-      62,     0,     0,     0,     0,     0,     0,     5,     6,     7,
+       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,
-      63,   255,    65,    15,     0,    16,    17,    18,    19,     0,
-       0,     0,     0,     0,    20,    21,    22,    23,    24,    25,
+       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,
-       0,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      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,     0,     0,
-       0,     0,     0,     0,    49,     0,     0,    50,    51,     0,
-      52,    53,     0,    54,     0,     0,    55,     0,    56,    57,
-      58,    59,    60,    61,     0,     0,    62,     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,    63,    64,    65,    15,
+      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,   109,
+      20,    21,    22,    23,    24,    25,    26,     0,     0,   113,
        0,     0,     0,     0,     0,     0,     0,     0,    31,    32,
-      33,   251,    35,    36,    37,    38,    39,     0,    40,    41,
+      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,
-     205,     0,     0,   115,    51,     0,    52,    53,     0,   252,
-     253,   254,    55,     0,    56,    57,    58,    59,    60,    61,
-       0,     0,    62,     0,     0,     0,     0,     0,     0,     5,
+       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,    63,   255,    65,    15,     0,   104,   105,    18,
-      19,     0,     0,     0,     0,     0,   106,   107,   108,    23,
-      24,    25,    26,     0,     0,   109,     0,     0,     0,     0,
-       0,     0,     0,     0,    31,    32,    33,   251,    35,    36,
+       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,
-       0,     0,     0,     0,     0,     0,   205,     0,     0,   115,
-      51,     0,    52,    53,     0,   666,   253,   254,    55,     0,
-      56,    57,    58,    59,    60,    61,     0,     0,    62,     0,
-       0,     0,     0,     0,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,     0,    63,   255,
-      65,    15,     0,   104,   105,    18,    19,     0,     0,     0,
-       0,     0,   106,   107,   108,    23,    24,    25,    26,     0,
-       0,   109,     0,     0,     0,     0,     0,     0,     0,     0,
-      31,    32,    33,   251,    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,     0,     0,     0,     0,
-       0,     0,   205,     0,     0,   115,    51,     0,    52,    53,
-       0,   252,   253,     0,    55,     0,    56,    57,    58,    59,
-      60,    61,     0,     0,    62,     0,     0,     0,     0,     0,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,     0,    63,   255,    65,    15,     0,   104,
-     105,    18,    19,     0,     0,     0,     0,     0,   106,   107,
-     108,    23,    24,    25,    26,     0,     0,   109,     0,     0,
-       0,     0,     0,     0,     0,     0,    31,    32,    33,   251,
-      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,     0,     0,     0,     0,     0,     0,   205,     0,
-       0,   115,    51,     0,    52,    53,     0,     0,   253,   254,
-      55,     0,    56,    57,    58,    59,    60,    61,     0,     0,
-      62,     0,     0,     0,     0,     0,     0,     5,     6,     7,
+      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,
-      63,   255,    65,    15,     0,   104,   105,    18,    19,     0,
-       0,     0,     0,     0,   106,   107,   108,    23,    24,    25,
-      26,     0,     0,   109,     0,     0,     0,     0,     0,     0,
-       0,     0,    31,    32,    33,   251,    35,    36,    37,    38,
+      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,     0,     0,
-       0,     0,     0,     0,   205,     0,     0,   115,    51,     0,
-      52,    53,     0,   666,   253,     0,    55,     0,    56,    57,
-      58,    59,    60,    61,     0,     0,    62,     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,    63,   255,    65,    15,
-       0,   104,   105,    18,    19,     0,     0,     0,     0,     0,
-     106,   107,   108,    23,    24,    25,    26,     0,     0,   109,
+      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,   251,    35,    36,    37,    38,    39,     0,    40,    41,
+      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,
-     205,     0,     0,   115,    51,     0,    52,    53,     0,     0,
-     253,     0,    55,     0,    56,    57,    58,    59,    60,    61,
-       0,     0,    62,     0,     0,     0,     0,     0,     0,     5,
+       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,    63,   255,    65,    15,     0,    16,    17,    18,
-      19,     0,     0,     0,     0,     0,    20,    21,    22,    23,
-      24,    25,    26,     0,     0,   109,     0,     0,     0,     0,
-       0,     0,     0,     0,    31,    32,    33,    34,    35,    36,
+       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,
-       0,     0,     0,     0,     0,     0,   205,     0,     0,   115,
-      51,     0,    52,    53,     0,   551,     0,     0,    55,     0,
-      56,    57,    58,    59,    60,    61,     0,     0,    62,     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,    63,   255,
-      65,    15,     0,   104,   105,    18,    19,     0,     0,     0,
-       0,     0,   106,   107,   108,    23,    24,    25,    26,     0,
-       0,   109,     0,     0,     0,     0,     0,     0,     0,     0,
+      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,     0,     0,     0,     0,
-       0,     0,   205,     0,     0,   115,    51,     0,    52,    53,
-       0,   252,     0,     0,    55,     0,    56,    57,    58,    59,
-      60,    61,     0,     0,    62,     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,    63,   255,    65,    15,     0,   104,
-     105,    18,    19,     0,     0,     0,     0,     0,   106,   107,
-     108,    23,    24,    25,    26,     0,     0,   109,     0,     0,
+       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,     0,     0,     0,     0,     0,     0,   205,     0,
-       0,   115,    51,     0,    52,    53,     0,   551,     0,     0,
-      55,     0,    56,    57,    58,    59,    60,    61,     0,     0,
-      62,     0,     0,     0,     0,     0,     0,     5,     6,     7,
+       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,
-      63,   255,    65,    15,     0,   104,   105,    18,    19,     0,
-       0,     0,     0,     0,   106,   107,   108,    23,    24,    25,
-      26,     0,     0,   109,     0,     0,     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,     0,     0,
-       0,     0,     0,     0,   205,     0,     0,   115,    51,     0,
-      52,    53,     0,   831,     0,     0,    55,     0,    56,    57,
-      58,    59,    60,    61,     0,     0,    62,     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,    63,   255,    65,    15,
-       0,   104,   105,    18,    19,     0,     0,     0,     0,     0,
-     106,   107,   108,    23,    24,    25,    26,     0,     0,   109,
+      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,
+       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,
-     205,     0,     0,   115,    51,     0,    52,    53,     0,   666,
-       0,     0,    55,     0,    56,    57,    58,    59,    60,    61,
-       0,     0,    62,     0,     0,     0,     0,     0,     0,     5,
+       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,    63,   255,    65,    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,     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,    46,    47,    48,     0,     0,
+       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,   205,     0,     0,   115,
-      51,     0,    52,    53,     0,     0,     0,     0,    55,     0,
-      56,    57,    58,    59,    60,    61,     0,     0,    62,     0,
-       0,     0,     0,     0,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,     0,    63,    64,
-      65,    15,     0,   104,   105,    18,    19,     0,     0,     0,
-       0,     0,   106,   107,   108,    23,    24,    25,    26,     0,
-       0,   109,     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,     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,   205,     0,     0,   115,    51,     0,    52,    53,
-       0,     0,     0,     0,    55,     0,    56,    57,    58,    59,
-      60,    61,     0,     0,    62,     0,     0,     0,     0,     0,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,     0,    63,   255,    65,    15,     0,    16,
-      17,    18,    19,     0,     0,     0,     0,     0,    20,    21,
-      22,    23,    24,    25,    26,     0,     0,   109,     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,     0,     0,     0,     0,     0,     0,   205,     0,
-       0,   115,    51,     0,    52,    53,     0,     0,     0,     0,
-      55,     0,    56,    57,    58,    59,    60,    61,     0,     0,
-      62,     0,     0,     0,     0,     0,     0,     5,     6,     7,
+       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,
-      63,   255,    65,    15,     0,   104,   105,    18,    19,     0,
-       0,     0,     0,     0,   106,   107,   108,    23,    24,    25,
-      26,     0,     0,   109,     0,     0,     0,     0,     0,     0,
-       0,     0,    31,    32,    33,   110,    35,    36,    37,   111,
+       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,   112,     0,     0,     0,     0,     0,     0,
+      44,    45,     0,   116,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   113,     0,     0,   114,     0,     0,   115,    51,     0,
-      52,    53,     0,     0,     0,     0,    55,     0,    56,    57,
-      58,    59,    60,    61,     0,     0,    62,     0,     0,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,     0,     0,
-       0,     0,     0,     0,     0,    15,   116,   104,   105,    18,
-      19,     0,     0,     0,     0,     0,   106,   107,   108,    23,
-      24,    25,    26,     0,     0,   109,     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,   216,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   217,     0,     0,    50,
-      51,     0,    52,    53,     0,    54,     0,     0,    55,     0,
-      56,    57,    58,    59,    60,    61,     0,     0,    62,     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,   116,   104,
-     105,    18,    19,     0,     0,     0,     0,     0,   106,   107,
-     108,    23,    24,    25,    26,     0,     0,   109,     0,     0,
+       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,   112,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   302,     0,
-       0,   349,    51,     0,    52,    53,     0,   350,     0,     0,
-      55,     0,    56,    57,    58,    59,    60,    61,     0,     0,
-      62,     0,     0,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,     0,     0,     0,     0,     0,     0,     0,    15,
-     116,   104,   105,    18,    19,     0,     0,     0,     0,     0,
-     106,   107,   108,    23,    24,    25,    26,     0,     0,   109,
-       0,     0,     0,     0,     0,     0,     0,     0,    31,    32,
-      33,   110,    35,    36,    37,   111,    39,     0,    40,    41,
-      42,     0,     0,    43,     0,     0,    44,    45,     0,   112,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    43,     0,     0,    44,    45,     0,   116,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     114,     0,     0,   115,    51,     0,    52,    53,     0,     0,
-       0,     0,    55,     0,    56,    57,    58,    59,    60,    61,
-       0,     0,    62,     0,     0,     5,     6,     7,     8,     9,
+       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,   116,   104,   105,    18,    19,     0,     0,     0,
-       0,     0,   106,   107,   108,    23,    24,    25,    26,     0,
-       0,   109,     0,     0,     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,   112,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   302,     0,     0,   349,    51,     0,    52,    53,
-       0,     0,     0,     0,    55,     0,    56,    57,    58,    59,
-      60,    61,     0,     0,    62,     0,     0,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,     0,     0,     0,     0,
-       0,     0,     0,    15,   116,   104,   105,    18,    19,     0,
-       0,     0,     0,     0,   106,   107,   108,    23,    24,    25,
-      26,     0,     0,   109,     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,   112,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   904,     0,     0,   115,    51,     0,
-      52,    53,     0,     0,     0,     0,    55,     0,    56,    57,
-      58,    59,    60,    61,     0,     0,    62,     0,     0,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,     0,     0,
-       0,     0,     0,     0,     0,    15,   116,   104,   105,    18,
-      19,     0,     0,     0,     0,     0,   106,   107,   108,    23,
-      24,    25,    26,     0,     0,   109,     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,   216,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   931,     0,     0,   115,
-      51,     0,    52,    53,     0,   595,   596,     0,    55,   597,
-      56,    57,    58,    59,    60,    61,     0,     0,    62,     0,
-       0,     0,     0,     0,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,     0,     0,   177,   178,     0,   116,   179,
-     180,   181,   182,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   183,   184,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,     0,   195,   196,   603,
-     604,     0,     0,   605,     0,   197,   266,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,     0,     0,   177,
-     178,     0,     0,   179,   180,   181,   182,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   183,   184,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-       0,   195,   196,   624,   596,     0,     0,   625,     0,   197,
-     266,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,     0,     0,   177,   178,     0,     0,   179,   180,   181,
-     182,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   183,   184,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,     0,   195,   196,   609,   604,     0,
-       0,   610,     0,   197,   266,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,     0,     0,   177,   178,     0,
-       0,   179,   180,   181,   182,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   183,   184,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,     0,   195,
-     196,   640,   596,     0,     0,   641,     0,   197,   266,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,     0,
-       0,   177,   178,     0,     0,   179,   180,   181,   182,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   183,
-     184,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,     0,   195,   196,   643,   604,     0,     0,   644,
-       0,   197,   266,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,     0,     0,   177,   178,     0,     0,   179,
-     180,   181,   182,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   183,   184,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,     0,   195,   196,   650,
-     596,     0,     0,   651,     0,   197,   266,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,     0,     0,   177,
-     178,     0,     0,   179,   180,   181,   182,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   183,   184,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-       0,   195,   196,   653,   604,     0,     0,   654,     0,   197,
-     266,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,     0,     0,   177,   178,     0,     0,   179,   180,   181,
-     182,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   183,   184,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,     0,   195,   196,   689,   596,     0,
-       0,   690,     0,   197,   266,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,     0,     0,   177,   178,     0,
-       0,   179,   180,   181,   182,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   183,   184,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,     0,   195,
-     196,   692,   604,     0,     0,   693,     0,   197,   266,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,     0,
-       0,   177,   178,     0,     0,   179,   180,   181,   182,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   183,
-     184,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,     0,   195,   196,   836,   596,     0,     0,   837,
-       0,   197,   266,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,     0,     0,   177,   178,     0,     0,   179,
-     180,   181,   182,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   183,   184,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,     0,   195,   196,   839,
-     604,     0,     0,   840,     0,   197,   266,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,     0,     0,   177,
-     178,     0,     0,   179,   180,   181,   182,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   183,   184,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-       0,   195,   196,   994,   596,     0,     0,   995,     0,   197,
-     266,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,     0,     0,   177,   178,     0,     0,   179,   180,   181,
-     182,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   183,   184,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,     0,   195,   196,  1007,   596,     0,
-       0,  1008,     0,   197,   266,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,     0,     0,   177,   178,     0,
-       0,   179,   180,   181,   182,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   183,   184,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,     0,   195,
-     196,  1010,   604,     0,     0,  1011,     0,   197,   266,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,     0,
-       0,   177,   178,     0,     0,   179,   180,   181,   182,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   183,
-     184,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,     0,   195,   196,   609,   604,     0,     0,   610,
-       0,   197,   266,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,     0,     0,   177,   178,     0,     0,   179,
-     180,   181,   182,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   183,   184,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   732,     0,
-       0,     0,     0,     0,     0,     0,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,     0,   195,   196,     0,
-       0,     0,     0,     0,     0,   197,   353,   354,   355,   356,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,     0,
-       0,   366,   367,   353,   354,   355,   356,   357,   358,   359,
-     360,   361,   362,   363,   364,   365,     0,     0,   366,   367,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   368,     0,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,     0,     0,     0,     0,
-       0,   368,     0,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   353,   354,   355,   356,   357,   358,   359,
-     360,   361,   362,   363,   364,   365,     0,   242,   366,   367,
-       0,     0,   353,   354,   355,   356,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,     0,     0,   366,   367,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   368,     0,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,     0,     0,     0,     0,     0,     0,     0,
-     368,  -260,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,     0,     0,     0,     0,     0,     0,     0,     0,
-    -261,   353,   354,   355,   356,   357,   358,   359,   360,   361,
-     362,   363,   364,   365,     0,     0,   366,   367,     0,     0,
-     353,   354,   355,   356,   357,   358,   359,   360,   361,   362,
-     363,   364,   365,     0,     0,   366,   367,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   368,
-       0,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,     0,     0,     0,     0,     0,     0,     0,   368,  -262,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-       0,     0,     0,     0,     0,     0,     0,     0,  -263,   353,
-     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
-     364,   365,     0,     0,   366,   367,     0,     0,     0,   447,
-     353,   354,   355,   356,   357,   358,   359,   360,   361,   362,
-     363,   364,   365,     0,     0,   366,   367,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   368,     0,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   368,     0,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     353,   354,   355,   356,   357,   358,   359,   360,   361,   362,
-     363,  -595,  -595,     0,     0,   366,   367,   353,   354,   355,
-     356,   357,   358,   359,   360,     0,   362,   363,     0,     0,
-       0,     0,   366,   367,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-       0,     0,     0,     0,     0,     0,     0,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,   353,   354,   355,
-     356,   357,   358,   359,     0,     0,   362,   363,     0,     0,
-       0,     0,   366,   367,     0,     0,     0,     0,     0,     0,
+       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,     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,  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,     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,     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,   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,
+     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,  -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,     0,
-       0,     0,     0,     0,     0,     0,     0,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378
+       0,     0,     0,     0,     0,     0,     0,     0,   419,   420,
+     421,   422,   423,   424,   425,   426,   427,   428
 };
 
 static const yytype_int16 yycheck =
 {
-       2,   308,   308,    83,    84,    27,   436,   213,    14,    78,
-       2,    10,     4,     5,     6,    27,    15,     9,    10,    21,
-      85,    13,    28,    15,    16,    17,     7,   262,    20,   381,
-       2,     7,     4,    28,    67,    22,     4,   303,    14,    54,
-     379,    15,   296,   454,   383,   427,   300,   386,    64,   352,
-      52,    53,    28,   405,    50,    16,    17,   721,    50,    20,
-     450,   492,    54,   320,   454,   442,   114,   406,   636,   421,
-      16,    17,    64,   484,    20,    56,   515,   645,   430,   795,
-      56,   420,   709,   422,   912,    26,    78,    57,   889,   391,
-     392,    52,   431,    67,     5,     6,    21,    22,    26,    16,
-     612,   613,    13,   142,    25,   107,    29,   146,    16,    17,
-      89,    91,    20,    25,   101,   285,    58,    59,    60,    61,
-      25,   113,    89,   115,   103,   321,   557,    57,   324,   209,
-     326,   470,   328,    89,   330,    25,    89,   289,    25,   119,
-     220,   293,   494,    54,    52,    53,    25,    16,    17,   119,
-      51,    20,    91,    27,    55,    51,   495,    53,    54,    55,
-      56,    89,   140,    26,     0,    25,   145,    78,   146,   997,
-      16,    17,   136,    69,    20,   103,   101,    91,   145,   349,
-     119,    25,   107,   108,    55,   442,   987,   706,   111,   145,
-      89,   121,   145,   407,    28,   136,   113,   352,   123,   116,
-     117,   281,   509,   509,   740,   119,    52,    53,   136,   745,
-     138,    18,   204,    20,   142,   214,   215,   145,    26,   140,
-     140,   142,   214,   215,   459,   305,   492,   144,   140,   146,
-     142,   947,    50,    80,   303,   140,   391,   392,   750,   113,
-      91,    87,   116,   117,   140,   909,   145,    72,   912,   260,
-     140,   262,   233,   140,   287,   119,    91,   233,   260,    89,
-     262,   140,   295,   296,   266,   676,   893,   300,   119,   243,
-     144,    91,   146,   136,   266,   532,   140,   124,   270,   142,
-     140,    89,   274,   275,   295,   675,   676,   279,   665,   285,
-     119,   557,   284,   285,    91,   103,   140,   115,   729,   119,
-     292,   142,   101,   455,   129,   130,   131,    89,    89,   270,
-     462,   303,   284,   287,   882,   145,    89,   119,    89,   142,
-     292,   473,   119,   123,   270,    55,   632,   126,   136,    89,
-     138,   347,   635,   997,   530,   350,   352,   145,    91,   338,
-     339,   340,   341,   140,   119,   337,   338,   339,   340,   341,
-     342,   343,   344,   349,    25,   347,   404,   349,   350,    91,
-     352,    55,   270,   145,   145,   337,   805,    91,   887,   337,
-     342,   313,   145,    16,   145,   391,   392,   113,   897,   381,
-     116,   117,   734,   822,   823,   145,   347,   119,    89,   381,
-     909,   352,   303,   140,   733,   119,   735,   266,   780,   391,
-     392,   270,   103,   405,   556,   662,    20,   383,   665,   623,
-     386,   140,   414,   405,    60,   407,   408,    63,    57,   421,
-     266,   490,   136,   492,   270,   417,   448,    72,   430,   421,
-     406,    91,   686,   425,   669,   737,   448,   138,   430,   350,
-     742,   743,   119,   435,   145,   143,   422,   458,   459,    91,
-     757,   757,   882,   137,   660,   431,   458,   459,   383,   119,
-     466,   279,   108,   729,   139,   467,    16,   285,    58,    59,
-     113,   466,   883,   116,   117,   467,    55,   119,   439,   631,
-     140,   406,  1001,   457,   476,    37,    38,   567,   557,    91,
-     466,    89,   494,   883,   470,   467,  1015,   422,   490,    91,
-     492,   144,   494,   146,   476,   103,   431,     2,   722,     4,
-     140,   513,   381,   515,     9,    10,    72,   119,    72,   495,
-      15,    16,    17,    91,   963,    20,    98,   119,    91,   786,
-      91,   349,   140,   685,   748,   381,   405,    15,   140,   531,
-     138,    13,   450,   554,   758,   470,   848,   145,   550,    16,
-     608,   119,   421,   611,   789,    50,   119,    15,   119,   405,
-     866,   430,   584,   113,    63,   557,   116,   117,   143,    64,
-     495,   629,   584,   481,   143,   421,   731,   140,    26,   490,
-     137,   492,   737,    89,   430,   140,   800,   742,   743,   113,
-     140,   140,   116,   117,   144,    16,   146,   103,    51,   417,
-      53,    54,    55,    56,   450,    51,   608,   425,   454,   611,
-     612,   613,   140,   600,    44,    89,    69,   435,   113,   140,
-     115,   608,   146,   622,   611,   494,   978,   629,    89,   103,
-     622,   623,   138,   635,   636,   481,   638,   140,   484,   145,
-     979,    89,   103,   645,   796,   859,   557,    51,   494,   660,
-     656,   140,   633,   686,    91,   103,   655,   633,   669,    51,
-     729,   656,   868,   655,   138,    58,    59,   669,   874,    16,
-      17,   145,   140,    20,   635,   600,    62,   138,    64,    65,
-     656,   746,   119,   608,   145,   697,   611,   140,   136,   139,
-     138,   119,   113,   848,   142,   116,   117,   145,    89,   139,
-      47,    48,   627,   140,   629,    52,    53,    17,    18,   204,
-     862,   863,   103,   531,    15,   731,   930,    64,    65,   214,
-     215,   737,   738,   144,    18,   146,   742,   743,   114,   115,
-     722,    51,   734,    53,    54,    55,    56,   729,   730,   731,
-     818,   819,   734,    72,   139,   737,   738,   138,   750,    69,
-     742,   743,   139,   137,   145,    15,   748,   749,   730,   735,
-     137,   763,    26,    91,   766,   139,   758,   675,   146,   768,
-     524,   266,   526,   765,   137,   270,   768,    15,   789,   274,
-     275,    92,    37,    38,   279,   777,   778,   789,    14,   284,
-     285,   119,   113,   785,    15,   116,   117,   292,   127,   128,
-     129,   130,   131,   805,   391,   392,   818,   819,   800,   801,
-     735,    62,   140,    64,    65,    15,   140,   143,   729,    51,
-     822,   823,   144,    57,   140,    89,   140,   140,   820,   675,
-     676,   140,   848,   825,   140,   140,   423,   424,   140,   103,
-      72,   140,   337,   338,   339,   340,   341,   342,   343,   344,
-      15,   139,   347,   933,   349,    15,   848,   352,   113,   137,
-      15,   116,   117,   114,   115,   734,   858,   859,   100,   101,
-      15,    15,   136,   140,   138,   867,     9,    10,   142,   871,
-     882,   145,    15,    15,   471,    89,   381,    89,   734,   144,
-     137,   146,    55,   124,   126,   124,   391,   392,   137,   103,
-      61,   103,    89,    64,    65,   252,   253,   254,   255,   820,
-     405,    15,   407,   408,   825,    89,   103,    55,   140,   266,
-     140,    61,   417,   270,    64,    65,   421,   949,    15,   103,
-     425,   749,   140,   140,   138,   430,   138,   949,   930,   140,
-     435,   145,   706,   145,   936,   709,   938,   765,    89,   941,
-      15,   138,   140,   114,   115,   142,   867,   721,   145,   777,
-     778,   963,   103,   140,   138,   113,   142,   785,   116,   117,
-     142,   145,   467,   139,   114,   115,   978,   467,   980,   981,
-     113,   476,   140,   801,    13,    26,   978,     6,   981,   987,
-      63,    64,    65,   721,   980,   207,   144,   138,   146,   494,
-     347,   213,   747,   979,   145,   352,   353,   354,   355,   356,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   245,     7,   381,   721,   531,   883,   250,   866,
-     858,   114,   115,   700,   391,   392,   261,   906,    89,    26,
-      89,   909,   706,   871,   979,   809,   810,   811,   405,   813,
-      -1,   815,   103,    -1,   103,    89,    -1,     2,    -1,     4,
-       5,     6,   419,    -1,   421,    -1,   423,   424,    13,   103,
-      -1,   214,   215,   430,    89,    -1,    -1,    63,    64,    65,
-      -1,    -1,   439,    -1,    -1,   136,   443,   138,   103,   138,
-     447,   142,    -1,   450,   145,   452,   145,   454,    -1,   978,
-      -1,    -1,    89,    -1,   138,    50,    -1,    89,   936,    54,
-     938,   145,    -1,   941,   471,   337,   103,   622,   623,   893,
-      -1,   103,   978,   138,   481,    -1,    -1,   484,   114,   115,
-     145,   274,   275,    78,    -1,   909,    -1,   494,   912,    -1,
-     737,   738,    -1,    -1,    -1,   742,   743,    -1,    -1,   136,
-     655,   138,    -1,    -1,   511,   142,   138,    -1,   145,    -1,
-     696,    -1,    -1,   145,    51,   522,    53,    54,    55,    56,
-     115,    -1,    -1,   709,   771,   772,   712,   774,   775,    63,
-      64,    65,    69,   540,   541,   721,    -1,    -1,    -1,    -1,
-     954,   955,   956,   957,   551,   338,   339,   340,   341,    -1,
-     343,   344,    -1,    -1,   426,   427,    93,   700,    -1,    -1,
-     906,   704,    99,   909,   700,    -1,   912,   722,   914,    63,
-      64,    65,    -1,   997,    -1,   730,   731,    -1,   721,   734,
-     114,   115,   737,   738,    -1,   721,    -1,   742,   743,    63,
-      64,    65,    -1,   748,   749,    -1,    -1,    -1,    63,    64,
-      65,   848,    -1,   758,   476,  1019,    -1,    -1,    -1,   204,
-     765,   483,    -1,   768,    -1,   408,    -1,    -1,   964,    -1,
-     114,   115,   777,   778,    -1,    -1,    -1,    -1,   635,   876,
-     785,    40,    41,    42,    43,    44,    -1,     2,    -1,     4,
-     114,   115,    -1,    -1,    -1,   800,   801,    -1,    13,   114,
-     115,   997,    -1,   999,    -1,  1001,    -1,  1003,    -1,   666,
-      63,    64,    65,    -1,    -1,    -1,    -1,    -1,   675,   676,
-      -1,    -1,    -1,    51,    -1,    53,    54,    55,    56,    -1,
-      -1,    -1,  1028,    -1,   279,    50,    63,    64,    65,   284,
-     285,    69,    -1,   848,    72,    -1,    -1,   292,    -1,    -1,
-      -1,    -1,    -1,   858,   859,   827,   828,   893,   303,   895,
-      -1,   114,   115,   899,    -1,    93,   871,    -1,    -1,   726,
-      -1,    99,   100,   101,   731,   732,   912,   734,   914,    -1,
-     737,   738,    -1,    -1,    -1,   742,   743,   114,   115,    -1,
-      -1,    -1,   337,    -1,    -1,    -1,    -1,   342,   126,   621,
-     115,   129,    -1,    -1,   349,   350,    -1,   352,    -1,   945,
-     946,    -1,   140,   906,   771,   772,   909,   774,   775,   912,
-     906,   914,    -1,   909,    -1,   930,   912,   784,   914,    -1,
-      -1,   936,    -1,   938,    -1,    -1,   941,   909,   660,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   391,   392,    -1,   985,
-      -1,    -1,    -1,     2,   990,     4,     5,     6,     7,    -1,
-      -1,   997,   407,   999,    13,    -1,    -1,  1003,    -1,    -1,
-      -1,   964,   417,   978,   831,    -1,    -1,    -1,   964,   622,
-     425,  1017,    -1,    -1,   841,   842,    -1,    -1,    -1,   204,
-     435,   848,  1028,    -1,    -1,   967,   968,   969,    -1,   971,
-     972,    50,    -1,    -1,   997,    54,   999,    -1,  1001,    -1,
-    1003,   997,   655,   999,    -1,  1001,    -1,  1003,    -1,   876,
-      -1,    -1,   467,    -1,    72,    -1,   883,    -1,    -1,    78,
-     752,   476,    -1,    -1,    -1,  1028,    -1,   759,    -1,    87,
-      88,    72,  1028,    -1,     2,   490,     4,   492,  1020,  1021,
-    1022,  1023,    72,    -1,    -1,    -1,    87,    88,   780,    -1,
-    1032,    -1,    -1,    -1,   279,    -1,   115,    87,    88,   284,
-     285,    51,    -1,    53,    54,    55,    56,   292,   126,   127,
-     128,   129,   130,   131,   113,    -1,   531,   116,   117,    69,
-      -1,    -1,    50,   124,   125,   126,   127,   128,   129,   130,
-     131,    -1,    -1,    -1,    -1,    -1,    -1,   127,   128,   129,
-     130,   131,   557,    93,   143,   144,    -1,   146,    -1,    99,
-     113,   978,   337,   116,   117,   768,    51,   342,    53,    54,
-      55,    56,    -1,    -1,   349,    -1,    -1,   352,    51,    -1,
-      53,    54,    55,    56,    69,    -1,   868,   140,    -1,    -1,
-      -1,   144,   874,   146,    -1,   204,    69,   115,    -1,    72,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    93,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   391,   392,   623,    -1,
-      93,    -1,    -1,    -1,    -1,    -1,    99,   100,   101,    -1,
-      -1,    51,   407,    53,    54,    55,    56,    -1,    -1,    -1,
-      -1,    -1,   417,    -1,    -1,    -1,    -1,    -1,    -1,    69,
-     425,    -1,    72,   126,    -1,    -1,   129,    -1,    -1,    -1,
-     435,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,
-     279,    -1,    -1,    93,    -1,   284,   285,    -1,    -1,    99,
-     100,   101,    -1,   292,    -1,    -1,   204,    -1,    -1,    -1,
-      -1,    -1,   467,    -1,   303,    -1,    -1,    -1,    -1,    -1,
-      51,   476,    53,    54,    55,    56,   126,    -1,    -1,   129,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   722,    69,    -1,
-      -1,    72,   142,    -1,   729,   730,   731,    -1,   337,    -1,
-      -1,    -1,   737,   342,    -1,    -1,    -1,   742,   743,    -1,
-     349,   350,    93,   748,   749,    -1,    -1,    -1,    99,   100,
-     101,    -1,    -1,   758,    -1,    -1,   531,    -1,    -1,    -1,
-     765,   279,    -1,    -1,    -1,    -1,   284,   285,    -1,    -1,
-      -1,    -1,   777,   778,   292,   126,    -1,    -1,   129,    -1,
-     785,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   800,   801,    -1,   407,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,   417,    53,
-      54,    55,    56,    -1,    -1,   820,   425,    -1,    -1,   337,
-     825,    -1,    -1,    -1,   342,    69,   435,    -1,    72,    -1,
-      -1,   349,    -1,    -1,   352,    -1,    -1,    -1,    -1,    -1,
-      84,    -1,    -1,   848,    -1,    -1,    -1,    -1,   623,    93,
-      -1,    -1,    -1,   858,   859,    99,   100,   101,   467,    -1,
-      -1,    -1,   867,    -1,    -1,    -1,   871,   476,    -1,    -1,
-      -1,    -1,    -1,   391,   392,    -1,    -1,    -1,    -1,    -1,
-      -1,   490,   126,   492,    -1,   129,    -1,    -1,    51,   407,
-      53,    54,    55,    56,    -1,    -1,    -1,    -1,    -1,   417,
-      -1,    -1,    -1,    -1,    -1,    -1,    69,   425,    -1,    72,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   435,    -1,    -1,
-      -1,    -1,   531,    -1,    -1,   930,    -1,    -1,    -1,    -1,
-      93,   936,    -1,   938,    -1,    -1,   941,   100,   101,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   722,   557,   467,
-      -1,    -1,    -1,    -1,    -1,   730,   731,    -1,   476,    -1,
-      -1,    -1,   737,   126,    -1,    -1,    -1,   742,   743,    -1,
-      -1,    -1,    -1,   748,   749,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   758,    -1,    -1,    -1,    -1,    -1,    -1,
-     765,     0,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   777,   778,    13,    14,    15,    16,    17,    18,
-     785,    20,    -1,   531,   623,    -1,    -1,    26,    27,    -1,
-      -1,    -1,    -1,    -1,    -1,   800,   801,    -1,    37,    38,
+       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,
+      -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,
+      -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,    -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,
+     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,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   848,    -1,    -1,    -1,    -1,    -1,    -1,
-      89,    -1,    -1,   858,   859,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   867,    -1,   103,    -1,   871,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   623,    -1,   116,   117,    -1,
-      -1,    -1,    -1,   722,    -1,    -1,    -1,    -1,    -1,    -1,
-     729,   730,    -1,    -1,    -1,    -1,    -1,   136,   137,    -1,
-      -1,    -1,    -1,   142,   143,   144,   145,   146,    -1,   748,
-     749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   758,
-      -1,    -1,    -1,    -1,    -1,   930,   765,    -1,    -1,    -1,
-      -1,   936,    -1,   938,    -1,    -1,   941,    -1,   777,   778,
-      -1,    -1,    -1,    -1,    -1,    -1,   785,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   800,   801,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   722,    -1,    -1,    -1,    -1,    -1,
-      -1,   820,   730,   731,    -1,    -1,   825,    -1,    -1,   737,
-      -1,    -1,    -1,    -1,   742,   743,    -1,    -1,    -1,    -1,
-     748,   749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     758,    -1,    -1,    -1,    -1,    -1,    -1,   765,    -1,   858,
-     859,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   867,   777,
-     778,    -1,   871,    -1,    -1,    -1,    -1,   785,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    44,    -1,    -1,    -1,
-      -1,    -1,   800,   801,    -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,    -1,    -1,    -1,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    -1,    -1,    87,
-      88,   930,    -1,    -1,    -1,    -1,    -1,   936,    -1,   938,
-     848,    -1,   941,    72,    73,    74,    75,    76,    77,    78,
-     858,   859,    81,    82,    -1,    -1,    -1,    -1,    87,    88,
-      -1,    -1,   120,   871,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   140,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   930,    -1,    -1,    -1,    -1,    -1,   936,    -1,
-     938,     0,     1,   941,     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,    -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,    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,    90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,
-      99,    -1,    -1,   102,    -1,   104,   105,   106,   107,   108,
-     109,     0,    -1,   112,   113,    -1,    -1,   116,   117,    -1,
-      -1,    -1,    -1,    -1,    13,    14,    15,    16,    17,    18,
-      -1,    20,    -1,   132,   133,   134,    -1,    -1,    27,    28,
-      -1,    -1,    -1,    -1,    -1,   144,    -1,   146,    37,    38,
+      -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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    -1,    -1,    87,    88,
-      89,    -1,    91,    92,    -1,    -1,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,    -1,    -1,   116,   117,    -1,
-     119,   120,    -1,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,    -1,    -1,     0,    -1,    -1,   137,   138,
-     139,   140,    -1,    -1,   143,   144,   145,   146,    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,
+      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,    -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,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      -1,    -1,    87,    88,    89,    -1,    -1,    92,    -1,    -1,
-      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,    -1,
-      -1,   116,   117,    -1,    -1,   120,    -1,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,    -1,    -1,     0,
-      -1,    -1,   137,   138,   139,   140,    -1,   142,   143,   144,
-     145,   146,    13,    14,    15,    -1,    17,    18,    -1,    20,
+      -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,    -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,    84,    -1,    -1,    87,    88,    89,    -1,
-      91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,    -1,    -1,   116,   117,    -1,   119,   120,
-      -1,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,    -1,    -1,     0,    -1,   136,   137,   138,    -1,   140,
-      -1,    -1,   143,   144,   145,   146,    13,    14,    15,    -1,
-      17,    18,    -1,    20,    -1,    -1,    -1,    -1,    -1,    26,
+      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,
       -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,    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,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    -1,    -1,
-      87,    88,    89,    -1,    91,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   103,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,    -1,    -1,   116,
-     117,    -1,   119,   120,    -1,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,    -1,    -1,     0,    -1,   136,
-     137,   138,    -1,   140,    -1,    -1,   143,   144,   145,   146,
+      -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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,
@@ -3888,41 +4350,28 @@
       -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,    84,    -1,    -1,    87,    88,    89,    -1,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     103,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,    -1,    -1,   116,   117,    -1,   119,   120,    -1,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,    -1,
-      -1,     0,    -1,    -1,   137,   138,    -1,   140,    -1,    -1,
-     143,   144,   145,   146,    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,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    -1,    -1,    87,    88,
-      89,    -1,    91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,    -1,    -1,   116,   117,    -1,
-     119,   120,    -1,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,    -1,    -1,    -1,    -1,    -1,   137,   138,
-      -1,   140,    -1,    -1,   143,   144,   145,   146,     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,    -1,    -1,    -1,    -1,    -1,    -1,    90,    -1,    -1,
-      93,    94,    -1,    96,    97,    -1,    99,    -1,    -1,   102,
-      -1,   104,   105,   106,   107,   108,   109,    -1,    -1,   112,
-     113,    -1,    -1,   116,   117,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,
-     133,   134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   144,     1,   146,     3,     4,     5,     6,     7,     8,
+      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,
@@ -3930,267 +4379,269 @@
       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,    90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,
-      99,    -1,    -1,   102,    -1,   104,   105,   106,   107,   108,
-     109,    -1,    -1,   112,   113,    -1,    -1,   116,   117,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   132,   133,   134,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   144,     1,   146,     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,    -1,
-      -1,    -1,    -1,    -1,    -1,    90,    -1,    -1,    93,    94,
-      -1,    96,    97,    -1,    99,    -1,    -1,   102,    -1,   104,
-     105,   106,   107,   108,   109,    -1,    -1,   112,   113,    -1,
-      -1,   116,   117,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,   133,   134,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   144,
-       1,   146,     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,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,    -1,
-      -1,   102,    -1,   104,   105,   106,   107,   108,   109,    -1,
-      -1,   112,   113,    -1,    -1,   116,   117,     1,    -1,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    -1,
-      -1,   132,   133,   134,    -1,    19,    -1,    21,    22,    23,
-      24,    -1,    -1,   144,    -1,   146,    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,
-      -1,    -1,    -1,    -1,    -1,    -1,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    99,    -1,    -1,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,   113,
-      -1,    -1,   116,   117,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,   133,
-     134,    -1,    -1,   137,    -1,    -1,    -1,    -1,    -1,    -1,
-     144,     1,   146,     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,    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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,
-      -1,    -1,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,   113,    -1,    -1,   116,   117,     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,   132,   133,   134,    -1,    19,    -1,    21,    22,
-      23,    24,    -1,    -1,   144,    -1,   146,    30,    31,    32,
+      -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,    -1,    -1,    -1,    -1,    -1,    -1,    90,    -1,    -1,
-      93,    94,    -1,    96,    97,    -1,    99,    -1,    -1,   102,
-      -1,   104,   105,   106,   107,   108,   109,    -1,    -1,   112,
-     113,    -1,    -1,   116,   117,     1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    -1,    -1,   132,
-     133,   134,    -1,    19,    -1,    21,    22,    23,    24,    -1,
-     143,   144,    -1,   146,    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,    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,   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,    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,    90,    -1,    -1,    93,    94,    -1,
-      96,    97,    -1,    99,    -1,    -1,   102,    -1,   104,   105,
-     106,   107,   108,   109,    -1,    -1,   112,   113,    -1,    -1,
-     116,   117,     1,    -1,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    -1,    -1,   132,   133,   134,    -1,
-      19,    -1,    21,    22,    23,    24,    -1,   143,   144,    -1,
-     146,    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,    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,    -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,    90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,
-      99,    -1,    -1,   102,    -1,   104,   105,   106,   107,   108,
-     109,    -1,    -1,   112,   113,    -1,    -1,   116,   117,    -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,    67,    -1,    69,    70,    71,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   132,   133,   134,    -1,    -1,   137,    -1,
-      -1,    -1,    -1,    -1,    -1,   144,     1,   146,     3,     4,
+      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,
-      15,    -1,    -1,    -1,    19,    -1,    21,    22,    23,    24,
-      -1,    -1,    -1,    -1,    -1,    30,    31,    32,    33,    34,
+     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,    67,    -1,    69,    70,    71,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    90,    -1,    -1,    93,    94,
-      -1,    96,    97,    -1,    99,    -1,    -1,   102,    -1,   104,
-     105,   106,   107,   108,   109,    -1,    -1,   112,   113,    -1,
-      -1,   116,   117,    -1,    -1,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    -1,    -1,   132,   133,   134,
-      -1,    19,    -1,    21,    22,    23,    24,    -1,    -1,   144,
-      -1,   146,    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,    -1,    -1,    -1,    -1,
-      -1,    -1,    90,    -1,    -1,    93,    94,    -1,    96,    97,
-      -1,    99,    -1,    -1,   102,    -1,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,   113,    -1,    -1,   116,   117,
+      -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,   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,
+      -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,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    -1,    -1,   132,   133,   134,    -1,    19,    -1,
-      21,    22,    23,    24,    -1,    -1,   144,    -1,   146,    30,
+      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,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,    -1,
-      -1,   102,    -1,   104,   105,   106,   107,   108,   109,    -1,
-      -1,   112,   113,    -1,    -1,   116,   117,    -1,    -1,     3,
+      -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,
+       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,   132,   133,   134,    -1,    19,    -1,    21,    22,    23,
-      24,    -1,    -1,   144,    -1,   146,    30,    31,    32,    33,
+      -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,
-      -1,    -1,    -1,    -1,    -1,    -1,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    -1,    -1,    -1,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,   113,
-      -1,    -1,   116,   117,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,   133,
-     134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     144,    -1,   146,     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,    78,    -1,
-      -1,    81,    82,    -1,    -1,    85,    86,    87,    88,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,
-     100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,    -1,   133,   134,    -1,    -1,    -1,    -1,    -1,
-      -1,   141,   142,     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,    -1,    -1,    -1,    -1,    -1,    -1,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,
-     100,   101,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   132,   133,   134,    -1,   136,    -1,    -1,    -1,
-      -1,    -1,   142,     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,
+      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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,
-     100,   101,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -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,   132,   133,   134,    -1,   136,    -1,    -1,    -1,
-      -1,    -1,   142,     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,    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,    -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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,
-     100,   101,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+      -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,   132,   133,   134,    19,   136,    21,    22,    23,
-      24,    -1,   142,    -1,    -1,    -1,    30,    31,    32,    33,
+      -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,
-      -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,    93,
-      94,    -1,    96,    97,    -1,    99,   100,   101,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,    -1,
-      -1,    -1,    -1,    -1,    -1,   119,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    -1,   132,   133,
-     134,    -1,    19,    -1,    21,    22,    23,    24,   142,    -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,    -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,    90,    91,    -1,    93,    94,    -1,    96,
-      97,    -1,    99,   100,   101,   102,    -1,   104,   105,   106,
-     107,   108,   109,    -1,    -1,   112,    -1,    -1,    -1,    -1,
-      -1,    -1,   119,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,   132,   133,   134,    -1,    19,
-      -1,    21,    22,    23,    24,   142,    -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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,
-     100,   101,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      -1,    -1,   132,   133,   134,    19,    -1,    21,    22,    23,
-      24,    -1,   142,    -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,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    99,   100,   101,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,    -1,   132,   133,
-     134,    19,    -1,    21,    22,    23,    24,    -1,   142,    -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,    -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,    90,    -1,    -1,    93,    94,    -1,    96,    97,
-      -1,    99,   100,   101,   102,    -1,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   132,   133,   134,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   142,     3,     4,     5,     6,     7,
+      -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,
@@ -4198,708 +4649,730 @@
       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,
-      78,    -1,    -1,    81,    82,    -1,    -1,    85,    86,    87,
-      88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     108,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,   133,   134,    -1,    -1,    -1,
-      -1,    -1,    -1,   141,     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,    78,
-      -1,    -1,    81,    82,    -1,    -1,    85,    86,    87,    88,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,    -1,   133,   134,    -1,    -1,    -1,    -1,
-      -1,    -1,   141,     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,    78,    -1,
-      -1,    81,    82,    -1,    -1,    85,    86,    87,    88,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,
-     100,    -1,    -1,    -1,   104,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,    -1,   133,   134,    -1,    -1,    -1,    -1,    -1,
-      -1,   141,     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,    78,    -1,    -1,
-      81,    82,    -1,    -1,    85,    86,    87,    88,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,   100,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -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,    -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,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,    -1,   133,   134,    -1,    -1,    -1,    -1,    -1,    -1,
-     141,     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,    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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    -1,
-      -1,    93,    94,    -1,    96,    97,    -1,    -1,    -1,    -1,
-     102,    -1,   104,   105,   106,   107,   108,   109,    -1,    -1,
-     112,    -1,    -1,     3,     4,     5,     6,     7,     8,     9,
+      -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,
-     132,    21,    22,    23,    24,    -1,    -1,    -1,   140,    -1,
+     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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    -1,
-      -1,    -1,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    -1,    -1,    -1,    -1,    -1,
-      -1,    19,   132,    21,    22,    23,    24,    -1,    -1,    -1,
-     140,    -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,    -1,    -1,    -1,    -1,
-      -1,    -1,    90,    -1,    -1,    93,    94,    -1,    96,    97,
-      -1,    99,    -1,    -1,   102,    -1,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,   132,   133,   134,    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,    -1,    -1,    -1,    -1,    -1,    90,    -1,
-      -1,    93,    94,    -1,    96,    97,    -1,    99,   100,   101,
-     102,    -1,   104,   105,   106,   107,   108,   109,    -1,    -1,
-     112,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
+      -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,
-     132,   133,   134,    19,    -1,    21,    22,    23,    24,    -1,
-      -1,    -1,    -1,    -1,    30,    31,    32,    33,    34,    35,
+      -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,
-      -1,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      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,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    -1,    -1,    93,    94,    -1,
-      96,    97,    -1,    99,    -1,    -1,   102,    -1,   104,   105,
-     106,   107,   108,   109,    -1,    -1,   112,    -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,   132,   133,   134,    19,
+      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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,
-     100,   101,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+      -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,   132,   133,   134,    19,    -1,    21,    22,    23,
+      -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,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    99,   100,   101,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,    -1,   132,   133,
-     134,    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,    90,    -1,    -1,    93,    94,    -1,    96,    97,
-      -1,    99,   100,    -1,   102,    -1,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,   132,   133,   134,    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,    90,    -1,
-      -1,    93,    94,    -1,    96,    97,    -1,    -1,   100,   101,
-     102,    -1,   104,   105,   106,   107,   108,   109,    -1,    -1,
-     112,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
+      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,
-     132,   133,   134,    19,    -1,    21,    22,    23,    24,    -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,    90,    -1,    -1,    93,    94,    -1,
-      96,    97,    -1,    99,   100,    -1,   102,    -1,   104,   105,
-     106,   107,   108,   109,    -1,    -1,   112,    -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,   132,   133,   134,    19,
+      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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    -1,
-     100,    -1,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+      -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,   132,   133,   134,    19,    -1,    21,    22,    23,
+      -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,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    99,    -1,    -1,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,    -1,   132,   133,
-     134,    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,    90,    -1,    -1,    93,    94,    -1,    96,    97,
-      -1,    99,    -1,    -1,   102,    -1,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,   132,   133,   134,    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,    90,    -1,
-      -1,    93,    94,    -1,    96,    97,    -1,    99,    -1,    -1,
-     102,    -1,   104,   105,   106,   107,   108,   109,    -1,    -1,
-     112,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
+      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,
-     132,   133,   134,    19,    -1,    21,    22,    23,    24,    -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,    90,    -1,    -1,    93,    94,    -1,
-      96,    97,    -1,    99,    -1,    -1,   102,    -1,   104,   105,
-     106,   107,   108,   109,    -1,    -1,   112,    -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,   132,   133,   134,    19,
+      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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    99,
-      -1,    -1,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+      -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,   132,   133,   134,    19,    -1,    21,    22,    23,
+      -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,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    -1,    -1,    -1,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,    -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,   132,   133,
-     134,    19,    -1,    21,    22,    23,    24,    -1,    -1,    -1,
+       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,    90,    -1,    -1,    93,    94,    -1,    96,    97,
-      -1,    -1,    -1,    -1,   102,    -1,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,    -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,   132,   133,   134,    19,    -1,    21,
+      -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,    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,    90,    -1,
-      -1,    93,    94,    -1,    96,    97,    -1,    -1,    -1,    -1,
-     102,    -1,   104,   105,   106,   107,   108,   109,    -1,    -1,
-     112,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-     132,   133,   134,    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,    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,    -1,    -1,    -1,    -1,
-      -1,    87,    -1,    -1,    90,    -1,    -1,    93,    94,    -1,
-      96,    97,    -1,    -1,    -1,    -1,   102,    -1,   104,   105,
-     106,   107,   108,   109,    -1,    -1,   112,    -1,    -1,     3,
+      -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,   132,    21,    22,    23,
+      -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,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    99,    -1,    -1,   102,    -1,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,   132,    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,    90,    -1,
-      -1,    93,    94,    -1,    96,    97,    -1,    99,    -1,    -1,
-     102,    -1,   104,   105,   106,   107,   108,   109,    -1,    -1,
-     112,    -1,    -1,     3,     4,     5,     6,     7,     8,     9,
+      -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,
-     132,    21,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
+     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,
-      90,    -1,    -1,    93,    94,    -1,    96,    97,    -1,    -1,
-      -1,    -1,   102,    -1,   104,   105,   106,   107,   108,   109,
-      -1,    -1,   112,    -1,    -1,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    19,   132,    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,    90,    -1,    -1,    93,    94,    -1,    96,    97,
-      -1,    -1,    -1,    -1,   102,    -1,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,    -1,    -1,     3,     4,     5,
+      -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,   132,    21,    22,    23,    24,    -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,    90,    -1,    -1,    93,    94,    -1,
-      96,    97,    -1,    -1,    -1,    -1,   102,    -1,   104,   105,
-     106,   107,   108,   109,    -1,    -1,   112,    -1,    -1,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    19,   132,    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,    90,    -1,    -1,    93,
-      94,    -1,    96,    97,    -1,    51,    52,    -1,   102,    55,
-     104,   105,   106,   107,   108,   109,    -1,    -1,   112,    -1,
-      -1,    -1,    -1,    -1,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    -1,    -1,    81,    82,    -1,   132,    85,
-      86,    87,    88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    99,   100,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,    -1,   133,   134,    51,
-      52,    -1,    -1,    55,    -1,   141,   142,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    -1,    -1,    81,
-      82,    -1,    -1,    85,    86,    87,    88,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,   100,    -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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,   134,    51,    52,    -1,    -1,    55,    -1,   141,
-     142,    -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,
-      78,    -1,    -1,    81,    82,    -1,    -1,    85,    86,    87,
-      88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,   133,   134,    51,    52,    -1,
-      -1,    55,    -1,   141,   142,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    -1,    -1,    81,    82,    -1,
-      -1,    85,    86,    87,    88,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    99,   100,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
-     134,    51,    52,    -1,    -1,    55,    -1,   141,   142,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    -1,
-      -1,    81,    82,    -1,    -1,    85,    86,    87,    88,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,
-     100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,    -1,   133,   134,    51,    52,    -1,    -1,    55,
-      -1,   141,   142,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    -1,    -1,    81,    82,    -1,    -1,    85,
-      86,    87,    88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    99,   100,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,    -1,   133,   134,    51,
-      52,    -1,    -1,    55,    -1,   141,   142,    -1,    -1,    -1,
+      -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,    78,    -1,    -1,    81,
-      82,    -1,    -1,    85,    86,    87,    88,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,   100,    -1,
+      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,    -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,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,   134,    51,    52,    -1,    -1,    55,    -1,   141,
-     142,    -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,
-      78,    -1,    -1,    81,    82,    -1,    -1,    85,    86,    87,
-      88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,   133,   134,    51,    52,    -1,
-      -1,    55,    -1,   141,   142,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    -1,    -1,    81,    82,    -1,
-      -1,    85,    86,    87,    88,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    99,   100,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
-     134,    51,    52,    -1,    -1,    55,    -1,   141,   142,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    -1,
-      -1,    81,    82,    -1,    -1,    85,    86,    87,    88,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,
-     100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,    -1,   133,   134,    51,    52,    -1,    -1,    55,
-      -1,   141,   142,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    -1,    -1,    81,    82,    -1,    -1,    85,
-      86,    87,    88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    99,   100,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,    -1,   133,   134,    51,
-      52,    -1,    -1,    55,    -1,   141,   142,    -1,    -1,    -1,
+      -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,    78,    -1,    -1,    81,
-      82,    -1,    -1,    85,    86,    87,    88,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,   100,    -1,
+      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,    -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,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,   134,    51,    52,    -1,    -1,    55,    -1,   141,
-     142,    -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,
-      78,    -1,    -1,    81,    82,    -1,    -1,    85,    86,    87,
-      88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,   133,   134,    51,    52,    -1,
-      -1,    55,    -1,   141,   142,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    -1,    -1,    81,    82,    -1,
-      -1,    85,    86,    87,    88,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    99,   100,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
-     134,    51,    52,    -1,    -1,    55,    -1,   141,   142,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    -1,
-      -1,    81,    82,    -1,    -1,    85,    86,    87,    88,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,
-     100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,    -1,   133,   134,    51,    52,    -1,    -1,    55,
-      -1,   141,   142,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -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,    78,    -1,    -1,    81,    82,    -1,    -1,    85,
-      86,    87,    88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    99,   100,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,    -1,   133,   134,    -1,
-      -1,    -1,    -1,    -1,    -1,   141,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    -1,
-      -1,    87,    88,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    -1,    -1,    87,    88,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   120,    -1,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,    -1,    -1,    -1,    -1,
-      -1,   120,    -1,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    -1,   146,    87,    88,
-      -1,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    -1,    -1,    87,    88,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   120,    -1,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     120,   140,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     140,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    -1,    -1,    87,    88,    -1,    -1,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    -1,    -1,    87,    88,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,
-      -1,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,   140,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   140,    72,
+      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,    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,    -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,    -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,    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,    84,    -1,    -1,    87,    88,    -1,    -1,    -1,    92,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    -1,    -1,    87,    88,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,    -1,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,    -1,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+      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,    84,    -1,    -1,    87,    88,    72,    73,    74,
-      75,    76,    77,    78,    79,    -1,    81,    82,    -1,    -1,
-      -1,    -1,    87,    88,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,    72,    73,    74,
-      75,    76,    77,    78,    -1,    -1,    81,    82,    -1,    -1,
-      -1,    -1,    87,    88,    -1,    -1,    -1,    -1,    -1,    -1,
+      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,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131
+     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,
+      -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,    -1,    -1,    -1,    -1,    -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.  */
 static const yytype_int16 yystos =
 {
-       0,   148,   149,     0,     1,     3,     4,     5,     6,     7,
+       0,   150,   151,     0,     1,     3,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    19,    21,    22,    23,    24,
       30,    31,    32,    33,    34,    35,    36,    39,    45,    46,
       47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      58,    59,    60,    63,    66,    67,    69,    70,    71,    90,
-      93,    94,    96,    97,    99,   102,   104,   105,   106,   107,
-     108,   109,   112,   132,   133,   134,   150,   151,   152,   157,
-     159,   161,   163,   164,   167,   168,   170,   171,   172,   174,
-     175,   184,   198,   219,   240,   241,   251,   252,   253,   257,
-     258,   259,   265,   266,   267,   269,   270,   271,   272,   273,
-     274,   309,   322,   152,    21,    22,    30,    31,    32,    39,
-      51,    55,    69,    87,    90,    93,   132,   176,   177,   198,
-     219,   271,   274,   309,   177,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    45,
-      46,    47,    48,    49,    50,    51,    52,    55,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    81,    82,    85,
-      86,    87,    88,    99,   100,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   133,   134,   141,   142,   178,
-     182,   183,   273,   303,   199,    90,   161,   162,   175,   219,
-     271,   272,   274,   162,   205,   207,    69,    90,   168,   175,
-     219,   224,   271,   274,    33,    34,    35,    36,    48,    49,
-      50,    51,    55,   104,   178,   179,   180,   267,   113,   116,
-     117,   144,   146,   162,   261,   262,   263,   315,   319,   320,
-     321,    51,    99,   100,   101,   133,   167,   184,   190,   193,
-     196,   253,   306,   308,   190,   190,   142,   187,   188,   191,
-     192,   322,   187,   191,   142,   316,   320,   179,   153,   136,
-     184,   219,   184,    55,     1,    93,   155,   156,   157,   169,
-     170,   322,   200,   202,   185,   196,   306,   322,   184,   305,
-     306,   322,    90,   140,   174,   219,   271,   274,   203,    53,
-      54,    56,    63,   108,   178,   268,    62,    64,    65,   114,
-     115,   254,   255,    63,   254,    63,   254,    63,   254,    61,
-     254,    58,    59,   163,   184,   184,   315,   321,    40,    41,
-      42,    43,    44,    37,    38,    28,   238,   119,   140,    93,
-      99,   171,   119,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    87,    88,   120,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,    89,
-     103,   138,   145,   313,    89,   313,   314,    26,   136,   242,
-     253,    91,    91,   187,   191,   242,   161,    51,    55,   176,
-      58,    59,   123,   275,    89,   138,   313,   214,   304,   215,
-      89,   145,   312,   154,   155,    55,    16,   220,   319,   119,
-      89,   138,   313,    91,    91,   220,   162,   162,    55,    89,
-     138,   313,    25,   108,   140,   264,   315,   113,   263,    20,
-     245,   319,    57,   307,   184,   184,   184,    92,   140,   194,
-     195,   322,   307,   194,   195,    84,   189,   190,   196,   306,
-     322,   190,   161,   315,   317,   161,   158,   136,   155,    89,
-     313,    91,   157,   169,   143,   315,   321,   317,   157,   317,
-     139,   195,   318,   321,   195,   318,   137,   318,    55,   171,
-     172,   173,   140,    89,   138,   313,    51,    53,    54,    55,
-      56,    69,    72,    93,    99,   100,   101,   126,   129,   142,
-     236,   278,   279,   282,   283,   284,   285,   287,   288,   289,
-     290,   292,   293,   294,   297,   298,   299,   300,   301,    63,
-     254,   256,   260,   261,    62,   255,    63,    63,    63,    61,
-      72,    72,   152,   162,   162,   162,   162,   157,   161,   161,
-     239,    99,   163,   184,   196,   197,   169,   140,   174,   140,
-     159,   160,   163,   175,   184,   186,   197,   219,   274,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,    51,    52,    55,   182,   187,
-     310,   311,   189,    51,    52,    55,   182,   187,   310,    51,
-      55,   310,   244,   243,   160,   184,   186,   160,   186,    98,
-     165,   212,   276,   211,    51,    55,   176,   310,   189,   310,
-     154,   161,   216,   217,    15,    13,   247,   322,   155,    16,
-      51,    55,   189,    51,    55,   155,    27,   221,   319,   221,
-      51,    55,   189,    51,    55,   209,   181,   155,   245,   184,
-     196,    15,   260,   184,   184,   316,    99,   184,   193,   306,
-     184,   308,   317,   143,   315,   195,   195,   317,   143,   179,
-     150,   137,   186,   317,   157,   201,   306,   171,   173,    51,
-      55,   189,    51,    55,    57,   119,   291,   287,   204,   184,
-     140,   302,   322,    51,   140,   302,   140,   286,   184,   140,
-     286,    51,   140,   286,    51,    63,   155,   261,   184,   184,
-      80,   124,   230,   231,   322,   184,   195,   317,   173,   140,
-      44,   119,    44,    89,   138,   313,   316,    91,    91,   187,
-     191,   139,    91,    91,   188,   191,   188,   191,   230,   230,
-     166,   319,   162,   154,   139,    15,   317,   142,   277,   287,
-     178,   184,   197,   248,   322,    18,   223,   322,    17,   222,
-     223,    91,    91,   139,    91,    91,   223,   206,   208,   139,
-     162,   179,   137,    15,   195,   220,   260,   184,   194,   306,
-     137,   317,   318,   139,    51,    99,   225,   292,   233,   316,
-      29,   111,   237,    51,   279,   284,   301,   285,   290,   297,
-     299,   292,   294,   299,    51,   292,   137,   227,   229,   232,
-     278,   280,   281,   284,   292,   293,   295,   296,   299,   301,
-     154,    99,   184,   173,   157,   184,    51,    55,   189,    51,
-      55,    57,   121,   160,   186,   163,   186,   165,    91,   160,
-     186,   160,   186,   165,   242,   238,   154,   155,   230,   213,
-     319,    15,    84,   287,   154,   319,   218,    92,   249,   322,
-     155,    14,   250,   322,   162,    15,    91,    15,   155,   155,
-     221,   184,   155,   195,   140,   289,   317,   140,   143,   144,
-     154,   155,   302,   140,   286,   140,   286,   140,   286,   140,
-     286,   286,   233,   233,    90,   219,   140,   302,   302,   140,
-     228,   219,   140,   228,   140,   228,    15,   184,   139,   184,
-     184,   160,   186,    15,   137,   155,   154,   317,   317,    15,
-     277,    90,   175,   219,   271,   274,   220,   155,   220,    15,
-      15,   210,   223,   245,   246,   226,   140,    99,    51,   234,
-     235,   288,    15,   137,   292,   299,   292,   292,   124,   124,
-      55,    89,   280,   284,   140,   227,   228,   296,   299,   292,
-     295,   299,   292,   137,    15,   154,    55,    89,   138,   313,
-     155,   155,   155,   292,   292,   140,   289,   140,   316,   286,
-     140,   286,   286,   286,    51,    55,   302,   140,   228,   140,
-     228,   140,   228,   140,   228,   228,    15,    51,    55,   189,
-      51,    55,   247,   222,    15,   140,   292,   140,   235,   292,
-     292,   299,   292,   292,   139,   292,   286,   228,   140,   228,
-     228,   228,   292,   228
+      58,    59,    60,    63,    66,    67,    69,    70,    71,    84,
+      85,    91,    94,    95,    97,    98,   100,   104,   106,   107,
+     108,   110,   111,   112,   114,   134,   135,   136,   152,   153,
+     154,   159,   161,   163,   164,   165,   168,   169,   172,   173,
+     175,   176,   177,   179,   180,   189,   203,   220,   241,   242,
+     252,   253,   254,   258,   259,   260,   266,   267,   268,   270,
+     271,   272,   273,   274,   275,   311,   324,   154,    21,    22,
+      30,    31,    32,    39,    51,    55,    69,    88,    91,    94,
+     134,   164,   165,   181,   182,   203,   220,   272,   275,   311,
+     182,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    45,    46,    47,    48,    49,
+      50,    51,    52,    55,    70,    71,    72,    73,    74,    75,
+      76,    77,    80,    81,    86,    87,    88,    89,   100,   101,
+     102,   124,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   135,   136,   143,   144,   183,   187,   188,   274,   306,
+     204,    91,   163,   164,   165,   167,   180,   189,   220,   272,
+     273,   275,   167,   210,   212,    69,    91,   173,   180,   220,
+     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,
+     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
 };
 
   /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int16 yyr1 =
 {
-       0,   147,   149,   148,   150,   151,   151,   151,   151,   152,
-     153,   152,   154,   155,   156,   156,   156,   156,   158,   157,
-     157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
-     157,   157,   157,   159,   159,   159,   159,   159,   159,   159,
-     159,   160,   160,   160,   161,   161,   161,   161,   161,   161,
-     162,   163,   163,   164,   164,   166,   165,   167,   167,   167,
-     167,   167,   167,   167,   167,   167,   167,   167,   168,   168,
-     169,   169,   170,   170,   170,   170,   170,   170,   170,   170,
-     170,   170,   171,   171,   172,   172,   173,   173,   174,   174,
-     174,   174,   174,   174,   174,   174,   175,   175,   175,   175,
-     175,   175,   175,   175,   175,   176,   176,   177,   177,   177,
-     178,   178,   178,   178,   178,   179,   179,   180,   181,   180,
-     182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
-     182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
-     182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
-     183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
-     183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
-     183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
-     183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   185,   185,   185,   185,   186,   186,   187,
-     187,   188,   188,   189,   189,   189,   189,   189,   190,   190,
-     190,   190,   190,   192,   191,   193,   194,   194,   195,   195,
-     196,   196,   196,   196,   197,   197,   197,   198,   198,   198,
-     198,   198,   198,   198,   198,   198,   199,   198,   200,   201,
-     198,   202,   198,   198,   198,   198,   198,   198,   198,   198,
-     198,   198,   198,   198,   198,   203,   204,   198,   198,   198,
-     205,   206,   198,   207,   208,   198,   198,   198,   209,   210,
-     198,   211,   198,   212,   213,   198,   214,   198,   215,   216,
-     198,   217,   218,   198,   198,   198,   198,   198,   219,   220,
-     220,   220,   221,   221,   222,   222,   223,   223,   224,   224,
-     225,   225,   225,   225,   225,   225,   225,   225,   226,   225,
-     227,   227,   227,   227,   228,   228,   229,   229,   229,   229,
-     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
-     229,   230,   230,   232,   231,   231,   231,   233,   233,   234,
-     234,   235,   235,   236,   236,   237,   237,   239,   238,   240,
-     240,   240,   240,   241,   241,   241,   241,   241,   241,   241,
-     241,   241,   243,   242,   244,   242,   245,   246,   246,   247,
-     247,   248,   248,   248,   249,   249,   250,   250,   251,   251,
-     251,   251,   252,   252,   253,   253,   253,   253,   254,   254,
-     255,   256,   255,   255,   255,   257,   257,   258,   258,   259,
-     260,   260,   261,   261,   262,   262,   263,   264,   263,   265,
-     265,   266,   266,   267,   268,   268,   268,   268,   268,   268,
-     269,   269,   270,   270,   270,   270,   271,   271,   271,   271,
-     271,   272,   272,   273,   273,   273,   273,   273,   273,   273,
-     273,   274,   274,   275,   276,   275,   277,   277,   277,   278,
-     279,   279,   280,   280,   281,   281,   282,   282,   283,   283,
-     284,   284,   285,   285,   285,   285,   286,   286,   287,   287,
-     287,   287,   287,   287,   287,   287,   287,   287,   287,   287,
-     287,   287,   287,   288,   288,   288,   288,   288,   289,   289,
-     290,   291,   290,   292,   292,   293,   294,   295,   296,   296,
-     297,   297,   298,   298,   299,   299,   300,   300,   301,   302,
-     302,   303,   304,   303,   305,   305,   306,   306,   307,   307,
-     308,   308,   308,   308,   309,   309,   309,   310,   310,   310,
-     310,   311,   311,   311,   312,   312,   313,   313,   314,   314,
-     315,   315,   316,   316,   317,   318,   318,   318,   319,   319,
-     319,   320,   321,   321,   322
+       0,   149,   151,   150,   152,   153,   153,   153,   153,   154,
+     155,   154,   156,   157,   158,   158,   158,   158,   160,   159,
+     159,   159,   159,   159,   159,   159,   159,   159,   159,   159,
+     159,   159,   159,   159,   161,   161,   161,   161,   161,   161,
+     161,   161,   161,   161,   161,   161,   162,   162,   162,   163,
+     163,   163,   163,   163,   163,   164,   166,   165,   167,   168,
+     168,   169,   169,   171,   170,   172,   172,   172,   172,   172,
+     172,   172,   172,   172,   172,   172,   173,   173,   174,   174,
+     175,   175,   175,   175,   175,   175,   175,   175,   175,   175,
+     176,   176,   177,   177,   178,   178,   179,   179,   179,   179,
+     179,   179,   179,   179,   180,   180,   180,   180,   180,   180,
+     180,   180,   180,   181,   181,   182,   182,   182,   183,   183,
+     183,   183,   183,   184,   184,   185,   186,   185,   187,   187,
+     187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
+     187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
+     187,   187,   187,   187,   187,   187,   187,   187,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   189,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   189,   190,
+     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,
+     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
 };
 
   /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
@@ -4908,63 +5381,65 @@
        0,     2,     0,     2,     2,     1,     1,     3,     2,     1,
        0,     5,     4,     2,     1,     1,     3,     2,     0,     4,
        2,     3,     3,     3,     3,     3,     4,     1,     3,     3,
-       3,     3,     1,     3,     3,     6,     5,     5,     5,     5,
-       3,     1,     3,     1,     1,     3,     3,     3,     2,     1,
-       1,     1,     1,     1,     4,     0,     5,     2,     3,     4,
-       5,     4,     5,     2,     2,     2,     2,     2,     1,     3,
-       1,     3,     1,     2,     3,     5,     2,     4,     2,     4,
-       1,     3,     1,     3,     2,     3,     1,     2,     1,     4,
-       3,     3,     3,     3,     2,     1,     1,     4,     3,     3,
-       3,     3,     2,     1,     1,     1,     1,     2,     1,     3,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
+       3,     3,     3,     1,     3,     3,     6,     5,     5,     5,
+       5,     4,     6,     4,     6,     3,     1,     3,     1,     1,
+       3,     3,     3,     2,     1,     2,     0,     5,     1,     1,
+       1,     1,     4,     0,     5,     2,     3,     4,     5,     4,
+       5,     2,     2,     2,     2,     2,     1,     3,     1,     3,
+       1,     2,     3,     5,     2,     4,     2,     4,     1,     3,
+       1,     3,     2,     3,     1,     2,     1,     4,     3,     3,
+       3,     3,     2,     1,     1,     4,     3,     3,     3,     3,
+       2,     1,     1,     1,     1,     2,     1,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     4,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     3,
+       6,     5,     5,     5,     5,     4,     3,     3,     2,     2,
+       3,     2,     2,     3,     3,     3,     3,     3,     3,     4,
+       4,     2,     2,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     2,     2,     3,     3,
+       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,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       3,     3,     6,     5,     5,     5,     5,     4,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     4,     4,     2,
-       2,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     2,     2,     3,     3,     3,     3,
-       6,     6,     1,     1,     2,     4,     2,     1,     3,     3,
-       3,     1,     1,     1,     2,     2,     4,     2,     1,     2,
-       2,     4,     1,     0,     2,     2,     2,     1,     1,     3,
-       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,     0,     0,
-       7,     0,     0,     9,     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,     3,     3,     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,     2,
-       1,     1,     0,     4,     1,     2,     1,     3,     1,     2,
-       3,     3,     3,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     1,     0,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     2,     0
+       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
 };
 
 
@@ -5666,93 +6141,93 @@
   switch (yyn)
     {
   case 2:
-#line 1508 "mrbgems/mruby-compiler/core/parse.y"
+#line 1614 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lstate = EXPR_BEG;
                       if (!p->locals) p->locals = cons(0,0);
                     }
-#line 5675 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6150 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 3:
-#line 1513 "mrbgems/mruby-compiler/core/parse.y"
+#line 1619 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->tree = new_scope(p, (yyvsp0.nd));
                       NODE_LINENO(p->tree, (yyvsp0.nd));
                     }
-#line 5684 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6159 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 4:
-#line 1520 "mrbgems/mruby-compiler/core/parse.y"
+#line 1626 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 5692 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6167 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 5:
-#line 1526 "mrbgems/mruby-compiler/core/parse.y"
+#line 1632 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_begin(p, 0);
                     }
-#line 5700 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6175 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 6:
-#line 1530 "mrbgems/mruby-compiler/core/parse.y"
+#line 1636 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_begin(p, (yyvsp0.nd));
                       NODE_LINENO((yyval.nd), (yyvsp0.nd));
                     }
-#line 5709 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6184 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 7:
-#line 1535 "mrbgems/mruby-compiler/core/parse.y"
+#line 1641 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), newline_node((yyvsp0.nd)));
                     }
-#line 5717 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6192 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 8:
-#line 1539 "mrbgems/mruby-compiler/core/parse.y"
+#line 1645 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_begin(p, 0);
                     }
-#line 5725 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6200 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 10:
-#line 1546 "mrbgems/mruby-compiler/core/parse.y"
+#line 1652 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = local_switch(p);
                       nvars_block(p);
                     }
-#line 5734 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6209 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 11:
-#line 1551 "mrbgems/mruby-compiler/core/parse.y"
+#line 1657 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "BEGIN not supported");
                       local_resume(p, (yyvsp-3.nd));
                       nvars_unnest(p);
                       (yyval.nd) = 0;
                     }
-#line 5745 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6220 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 12:
-#line 1563 "mrbgems/mruby-compiler/core/parse.y"
+#line 1669 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       if ((yyvsp-2.nd)) {
                         (yyval.nd) = new_rescue(p, (yyvsp-3.nd), (yyvsp-2.nd), (yyvsp-1.nd));
                         NODE_LINENO((yyval.nd), (yyvsp-3.nd));
                       }
                       else if ((yyvsp-1.nd)) {
-                        yywarn(p, "else without rescue is useless");
+                        yywarning(p, "else without rescue is useless");
                         (yyval.nd) = push((yyvsp-3.nd), (yyvsp-1.nd));
                       }
                       else {
@@ -5767,1872 +6242,2059 @@
                         }
                       }
                     }
-#line 5771 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6246 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 13:
-#line 1587 "mrbgems/mruby-compiler/core/parse.y"
+#line 1693 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 5779 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6254 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 14:
-#line 1593 "mrbgems/mruby-compiler/core/parse.y"
+#line 1699 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_begin(p, 0);
                     }
-#line 5787 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6262 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 15:
-#line 1597 "mrbgems/mruby-compiler/core/parse.y"
+#line 1703 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_begin(p, (yyvsp0.nd));
                       NODE_LINENO((yyval.nd), (yyvsp0.nd));
                     }
-#line 5796 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6271 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 16:
-#line 1602 "mrbgems/mruby-compiler/core/parse.y"
+#line 1708 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), newline_node((yyvsp0.nd)));
                     }
-#line 5804 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6279 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 17:
-#line 1606 "mrbgems/mruby-compiler/core/parse.y"
+#line 1712 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_begin(p, (yyvsp0.nd));
                     }
-#line 5812 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6287 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 18:
-#line 1611 "mrbgems/mruby-compiler/core/parse.y"
+#line 1717 "mrbgems/mruby-compiler/core/parse.y"
                                      {p->lstate = EXPR_FNAME;}
-#line 5818 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6293 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 19:
-#line 1612 "mrbgems/mruby-compiler/core/parse.y"
+#line 1718 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_alias(p, (yyvsp-2.id), (yyvsp0.id));
                     }
-#line 5826 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6301 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 20:
-#line 1616 "mrbgems/mruby-compiler/core/parse.y"
+#line 1722 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 5834 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6309 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 21:
-#line 1620 "mrbgems/mruby-compiler/core/parse.y"
+#line 1726 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_if(p, cond((yyvsp0.nd)), (yyvsp-2.nd), 0);
                     }
-#line 5842 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6317 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 22:
-#line 1624 "mrbgems/mruby-compiler/core/parse.y"
+#line 1730 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_unless(p, cond((yyvsp0.nd)), (yyvsp-2.nd), 0);
                     }
-#line 5850 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6325 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 23:
-#line 1628 "mrbgems/mruby-compiler/core/parse.y"
+#line 1734 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_while(p, cond((yyvsp0.nd)), (yyvsp-2.nd));
                     }
-#line 5858 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6333 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 24:
-#line 1632 "mrbgems/mruby-compiler/core/parse.y"
+#line 1738 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_until(p, cond((yyvsp0.nd)), (yyvsp-2.nd));
                     }
-#line 5866 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6341 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 25:
-#line 1636 "mrbgems/mruby-compiler/core/parse.y"
+#line 1742 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 5874 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6349 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 26:
-#line 1640 "mrbgems/mruby-compiler/core/parse.y"
+#line 1746 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "END not supported");
                       (yyval.nd) = new_postexe(p, (yyvsp-1.nd));
                     }
-#line 5883 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6358 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 28:
-#line 1646 "mrbgems/mruby-compiler/core/parse.y"
+#line 1752 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_masgn(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 5891 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6366 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 29:
-#line 1650 "mrbgems/mruby-compiler/core/parse.y"
+#line 1756 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_asgn(p, (yyvsp-2.nd), new_array(p, (yyvsp0.nd)));
                     }
-#line 5899 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6374 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 30:
-#line 1654 "mrbgems/mruby-compiler/core/parse.y"
+#line 1760 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_masgn(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 5907 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6382 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 31:
-#line 1658 "mrbgems/mruby-compiler/core/parse.y"
+#line 1764 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_masgn(p, (yyvsp-2.nd), new_array(p, (yyvsp0.nd)));
                     }
-#line 5915 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6390 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 33:
-#line 1665 "mrbgems/mruby-compiler/core/parse.y"
+  case 32:
+#line 1768 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_asgn(p, (yyvsp-2.nd), (yyvsp0.nd));
+                      node *lhs = new_lvar(p, (yyvsp0.id));
+                      assignable(p, lhs);
+                      (yyval.nd) = new_asgn(p, lhs, (yyvsp-2.nd));
                     }
-#line 5923 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6400 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 34:
-#line 1669 "mrbgems/mruby-compiler/core/parse.y"
+#line 1777 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_op_asgn(p, (yyvsp-2.nd), (yyvsp-1.id), (yyvsp0.nd));
+                      (yyval.nd) = new_asgn(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 5931 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6408 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 35:
-#line 1673 "mrbgems/mruby-compiler/core/parse.y"
+#line 1781 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-5.nd), intern_lit(""), (yyvsp-3.nd), '.'), (yyvsp-1.id), (yyvsp0.nd));
+                      (yyval.nd) = new_op_asgn(p, (yyvsp-2.nd), (yyvsp-1.id), (yyvsp0.nd));
                     }
-#line 5939 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6416 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 36:
-#line 1677 "mrbgems/mruby-compiler/core/parse.y"
+#line 1785 "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));
+                      (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-5.nd), intern_op(aref), (yyvsp-3.nd), '.'), (yyvsp-1.id), (yyvsp0.nd));
                     }
-#line 5947 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6424 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 37:
-#line 1681 "mrbgems/mruby-compiler/core/parse.y"
+#line 1789 "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 5955 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6432 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 38:
-#line 1685 "mrbgems/mruby-compiler/core/parse.y"
+#line 1793 "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"
+    break;
+
+  case 39:
+#line 1797 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "constant re-assignment");
                       (yyval.nd) = 0;
                     }
-#line 5964 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6449 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 39:
-#line 1690 "mrbgems/mruby-compiler/core/parse.y"
+  case 40:
+#line 1802 "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 5972 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6457 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 40:
-#line 1694 "mrbgems/mruby-compiler/core/parse.y"
+  case 41:
+#line 1806 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-3.nd);
+                      endless_method_name(p, (yyvsp-3.nd));
+                      void_expr_error(p, (yyvsp0.nd));
+                      defn_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp0.nd));
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+#line 6470 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 42:
+#line 1815 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-5.nd);
+                      endless_method_name(p, (yyvsp-5.nd));
+                      void_expr_error(p, (yyvsp-2.nd));
+                      defn_setup(p, (yyval.nd), (yyvsp-4.nd), new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd)));
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+#line 6483 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 43:
+#line 1824 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-3.nd);
+                      void_expr_error(p, (yyvsp0.nd));
+                      defs_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp0.nd));
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
+#line 6496 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 44:
+#line 1833 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-5.nd);
+                      void_expr_error(p, (yyvsp-2.nd));
+                      defs_setup(p, (yyval.nd), (yyvsp-4.nd), new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd)));
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
+#line 6509 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 45:
+#line 1842 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       backref_error(p, (yyvsp-2.nd));
                       (yyval.nd) = new_begin(p, 0);
                     }
-#line 5981 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6518 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 42:
-#line 1702 "mrbgems/mruby-compiler/core/parse.y"
+  case 47:
+#line 1850 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 5989 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6526 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 45:
-#line 1711 "mrbgems/mruby-compiler/core/parse.y"
+  case 50:
+#line 1859 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_and(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 5997 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6534 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 46:
-#line 1715 "mrbgems/mruby-compiler/core/parse.y"
+  case 51:
+#line 1863 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_or(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 6005 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6542 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 47:
-#line 1719 "mrbgems/mruby-compiler/core/parse.y"
+  case 52:
+#line 1867 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "!");
                     }
-#line 6013 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6550 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 48:
-#line 1723 "mrbgems/mruby-compiler/core/parse.y"
+  case 53:
+#line 1871 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "!");
                     }
-#line 6021 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6558 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 50:
-#line 1730 "mrbgems/mruby-compiler/core/parse.y"
+  case 55:
+#line 1879 "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"
+    break;
+
+  case 56:
+#line 1888 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      p->lstate = EXPR_FNAME;
+                    }
+#line 6577 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 57:
+#line 1892 "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;
+                      p->in_def++;
+                      p->in_single++;
+                      nvars_block(p);
+                      p->lstate = EXPR_ENDFN; /* force for args */
+                    }
+#line 6590 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 58:
+#line 1903 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       if (!(yyvsp0.nd)) (yyval.nd) = new_nil(p);
                       else {
                         (yyval.nd) = (yyvsp0.nd);
                       }
                     }
-#line 6032 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6601 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 54:
-#line 1744 "mrbgems/mruby-compiler/core/parse.y"
+  case 62:
+#line 1917 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
                     }
-#line 6040 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6609 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 55:
-#line 1750 "mrbgems/mruby-compiler/core/parse.y"
+  case 63:
+#line 1923 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_nest(p);
                       nvars_nest(p);
                     }
-#line 6049 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6618 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 56:
-#line 1757 "mrbgems/mruby-compiler/core/parse.y"
+  case 64:
+#line 1930 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_block(p, (yyvsp-2.nd), (yyvsp-1.nd));
                       local_unnest(p);
                       nvars_unnest(p);
                     }
-#line 6059 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6628 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 57:
-#line 1765 "mrbgems/mruby-compiler/core/parse.y"
+  case 65:
+#line 1938 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_fcall(p, (yyvsp-1.id), (yyvsp0.nd));
                     }
-#line 6067 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6636 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 58:
-#line 1769 "mrbgems/mruby-compiler/core/parse.y"
+  case 66:
+#line 1942 "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 6076 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6645 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 59:
-#line 1774 "mrbgems/mruby-compiler/core/parse.y"
+  case 67:
+#line 1947 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
                     }
-#line 6084 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6653 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 60:
-#line 1778 "mrbgems/mruby-compiler/core/parse.y"
+  case 68:
+#line 1951 "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 6093 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6662 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 61:
-#line 1783 "mrbgems/mruby-compiler/core/parse.y"
+  case 69:
+#line 1956 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), tCOLON2);
                     }
-#line 6101 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6670 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 62:
-#line 1787 "mrbgems/mruby-compiler/core/parse.y"
+  case 70:
+#line 1960 "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 6110 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6679 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 63:
-#line 1792 "mrbgems/mruby-compiler/core/parse.y"
+  case 71:
+#line 1965 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_super(p, (yyvsp0.nd));
                     }
-#line 6118 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6687 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 64:
-#line 1796 "mrbgems/mruby-compiler/core/parse.y"
+  case 72:
+#line 1969 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_yield(p, (yyvsp0.nd));
                     }
-#line 6126 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6695 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 65:
-#line 1800 "mrbgems/mruby-compiler/core/parse.y"
+  case 73:
+#line 1973 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_return(p, ret_args(p, (yyvsp0.nd)));
                     }
-#line 6134 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6703 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 66:
-#line 1804 "mrbgems/mruby-compiler/core/parse.y"
+  case 74:
+#line 1977 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_break(p, ret_args(p, (yyvsp0.nd)));
                     }
-#line 6142 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6711 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 67:
-#line 1808 "mrbgems/mruby-compiler/core/parse.y"
+  case 75:
+#line 1981 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_next(p, ret_args(p, (yyvsp0.nd)));
                     }
-#line 6150 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6719 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 68:
-#line 1814 "mrbgems/mruby-compiler/core/parse.y"
+  case 76:
+#line 1987 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 6158 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6727 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 69:
-#line 1818 "mrbgems/mruby-compiler/core/parse.y"
+  case 77:
+#line 1991 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 6166 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6735 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 71:
-#line 1825 "mrbgems/mruby-compiler/core/parse.y"
+  case 79:
+#line 1998 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 6174 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6743 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 72:
-#line 1831 "mrbgems/mruby-compiler/core/parse.y"
+  case 80:
+#line 2004 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 6182 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6751 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 73:
-#line 1835 "mrbgems/mruby-compiler/core/parse.y"
+  case 81:
+#line 2008 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1(push((yyvsp-1.nd),(yyvsp0.nd)));
                     }
-#line 6190 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6759 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 74:
-#line 1839 "mrbgems/mruby-compiler/core/parse.y"
+  case 82:
+#line 2012 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list2((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 6198 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6767 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 75:
-#line 1843 "mrbgems/mruby-compiler/core/parse.y"
+  case 83:
+#line 2016 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3((yyvsp-4.nd), (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 6206 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6775 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 76:
-#line 1847 "mrbgems/mruby-compiler/core/parse.y"
+  case 84:
+#line 2020 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list2((yyvsp-1.nd), new_nil(p));
                     }
-#line 6214 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6783 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 77:
-#line 1851 "mrbgems/mruby-compiler/core/parse.y"
+  case 85:
+#line 2024 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3((yyvsp-3.nd), new_nil(p), (yyvsp0.nd));
                     }
-#line 6222 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6791 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 78:
-#line 1855 "mrbgems/mruby-compiler/core/parse.y"
+  case 86:
+#line 2028 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list2(0, (yyvsp0.nd));
                     }
-#line 6230 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6799 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 79:
-#line 1859 "mrbgems/mruby-compiler/core/parse.y"
+  case 87:
+#line 2032 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3(0, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 6238 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6807 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 80:
-#line 1863 "mrbgems/mruby-compiler/core/parse.y"
+  case 88:
+#line 2036 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list2(0, new_nil(p));
                     }
-#line 6246 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6815 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 81:
-#line 1867 "mrbgems/mruby-compiler/core/parse.y"
+  case 89:
+#line 2040 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3(0, new_nil(p), (yyvsp0.nd));
                     }
-#line 6254 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6823 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 83:
-#line 1874 "mrbgems/mruby-compiler/core/parse.y"
+  case 91:
+#line 2047 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_masgn(p, (yyvsp-1.nd), NULL);
                     }
-#line 6262 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6831 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 84:
-#line 1880 "mrbgems/mruby-compiler/core/parse.y"
+  case 92:
+#line 2053 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp-1.nd));
                     }
-#line 6270 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6839 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 85:
-#line 1884 "mrbgems/mruby-compiler/core/parse.y"
+  case 93:
+#line 2057 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp-1.nd));
                     }
-#line 6278 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6847 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 86:
-#line 1890 "mrbgems/mruby-compiler/core/parse.y"
+  case 94:
+#line 2063 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 6286 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6855 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 87:
-#line 1894 "mrbgems/mruby-compiler/core/parse.y"
+  case 95:
+#line 2067 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 6294 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6863 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 88:
-#line 1900 "mrbgems/mruby-compiler/core/parse.y"
+  case 96:
+#line 2073 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       assignable(p, (yyvsp0.nd));
                     }
-#line 6302 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6871 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 89:
-#line 1904 "mrbgems/mruby-compiler/core/parse.y"
+  case 97:
+#line 2077 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_lit(""), (yyvsp-1.nd), '.');
+                      (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_op(aref), (yyvsp-1.nd), '.');
                     }
-#line 6310 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6879 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 90:
-#line 1908 "mrbgems/mruby-compiler/core/parse.y"
+  case 98:
+#line 2081 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
                     }
-#line 6318 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6887 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 91:
-#line 1912 "mrbgems/mruby-compiler/core/parse.y"
+  case 99:
+#line 2085 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, tCOLON2);
                     }
-#line 6326 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6895 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 92:
-#line 1916 "mrbgems/mruby-compiler/core/parse.y"
+  case 100:
+#line 2089 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
                     }
-#line 6334 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6903 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 93:
-#line 1920 "mrbgems/mruby-compiler/core/parse.y"
+  case 101:
+#line 2093 "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 6344 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6913 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 94:
-#line 1926 "mrbgems/mruby-compiler/core/parse.y"
+  case 102:
+#line 2099 "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 6354 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6923 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 95:
-#line 1932 "mrbgems/mruby-compiler/core/parse.y"
+  case 103:
+#line 2105 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       backref_error(p, (yyvsp0.nd));
                       (yyval.nd) = 0;
                     }
-#line 6363 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6932 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 96:
-#line 1939 "mrbgems/mruby-compiler/core/parse.y"
+  case 104:
+#line 2112 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       assignable(p, (yyvsp0.nd));
                     }
-#line 6371 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6940 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 97:
-#line 1943 "mrbgems/mruby-compiler/core/parse.y"
+  case 105:
+#line 2116 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_lit(""), (yyvsp-1.nd), '.');
+                      (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_op(aref), (yyvsp-1.nd), '.');
                     }
-#line 6379 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6948 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 98:
-#line 1947 "mrbgems/mruby-compiler/core/parse.y"
+  case 106:
+#line 2120 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
                     }
-#line 6387 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6956 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 99:
-#line 1951 "mrbgems/mruby-compiler/core/parse.y"
+  case 107:
+#line 2124 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, tCOLON2);
                     }
-#line 6395 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6964 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 100:
-#line 1955 "mrbgems/mruby-compiler/core/parse.y"
+  case 108:
+#line 2128 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, (yyvsp-1.num));
                     }
-#line 6403 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6972 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 101:
-#line 1959 "mrbgems/mruby-compiler/core/parse.y"
+  case 109:
+#line 2132 "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 6413 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6982 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 102:
-#line 1965 "mrbgems/mruby-compiler/core/parse.y"
+  case 110:
+#line 2138 "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 6423 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6992 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 103:
-#line 1971 "mrbgems/mruby-compiler/core/parse.y"
+  case 111:
+#line 2144 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       backref_error(p, (yyvsp0.nd));
                       (yyval.nd) = 0;
                     }
-#line 6432 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7001 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 104:
-#line 1976 "mrbgems/mruby-compiler/core/parse.y"
+  case 112:
+#line 2149 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "can't assign to numbered parameter");
                     }
-#line 6440 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7009 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 105:
-#line 1982 "mrbgems/mruby-compiler/core/parse.y"
+  case 113:
+#line 2155 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "class/module name must be CONSTANT");
                     }
-#line 6448 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7017 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 107:
-#line 1989 "mrbgems/mruby-compiler/core/parse.y"
+  case 115:
+#line 2162 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons((node*)1, nsym((yyvsp0.id)));
+                      (yyval.nd) = cons(nint(1), nsym((yyvsp0.id)));
                     }
-#line 6456 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7025 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 108:
-#line 1993 "mrbgems/mruby-compiler/core/parse.y"
+  case 116:
+#line 2166 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons((node*)0, nsym((yyvsp0.id)));
+                      (yyval.nd) = cons(nint(0), nsym((yyvsp0.id)));
                     }
-#line 6464 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7033 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 109:
-#line 1997 "mrbgems/mruby-compiler/core/parse.y"
+  case 117:
+#line 2170 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp-2.nd));
                       (yyval.nd) = cons((yyvsp-2.nd), nsym((yyvsp0.id)));
                     }
-#line 6473 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7042 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 113:
-#line 2007 "mrbgems/mruby-compiler/core/parse.y"
+  case 121:
+#line 2180 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lstate = EXPR_ENDFN;
                       (yyval.id) = (yyvsp0.id);
                     }
-#line 6482 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7051 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 114:
-#line 2012 "mrbgems/mruby-compiler/core/parse.y"
+  case 122:
+#line 2185 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lstate = EXPR_ENDFN;
                       (yyval.id) = (yyvsp0.id);
                     }
-#line 6491 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7060 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 117:
-#line 2023 "mrbgems/mruby-compiler/core/parse.y"
+  case 125:
+#line 2196 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_undef(p, (yyvsp0.id));
                     }
-#line 6499 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7068 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 118:
-#line 2026 "mrbgems/mruby-compiler/core/parse.y"
+  case 126:
+#line 2199 "mrbgems/mruby-compiler/core/parse.y"
                                  {p->lstate = EXPR_FNAME;}
-#line 6505 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7074 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 119:
-#line 2027 "mrbgems/mruby-compiler/core/parse.y"
+  case 127:
+#line 2200 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-3.nd), nsym((yyvsp0.id)));
                     }
-#line 6513 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 120:
-#line 2032 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("|");   }
-#line 6519 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 121:
-#line 2033 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("^");   }
-#line 6525 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 122:
-#line 2034 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("&");   }
-#line 6531 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 123:
-#line 2035 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("<=>"); }
-#line 6537 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 124:
-#line 2036 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("==");  }
-#line 6543 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 125:
-#line 2037 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("==="); }
-#line 6549 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 126:
-#line 2038 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("=~");  }
-#line 6555 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 127:
-#line 2039 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("!~");  }
-#line 6561 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7082 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 128:
-#line 2040 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit(">");   }
-#line 6567 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2205 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(or);     }
+#line 7088 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 129:
-#line 2041 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit(">=");  }
-#line 6573 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2206 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(xor);    }
+#line 7094 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 130:
-#line 2042 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("<");   }
-#line 6579 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2207 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(and);    }
+#line 7100 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 131:
-#line 2043 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("<=");  }
-#line 6585 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2208 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(cmp);    }
+#line 7106 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 132:
-#line 2044 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("!=");  }
-#line 6591 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2209 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(eq);     }
+#line 7112 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 133:
-#line 2045 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("<<");  }
-#line 6597 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2210 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(eqq);    }
+#line 7118 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 134:
-#line 2046 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit(">>");  }
-#line 6603 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2211 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(match);  }
+#line 7124 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 135:
-#line 2047 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("+");   }
-#line 6609 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2212 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(nmatch); }
+#line 7130 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 136:
-#line 2048 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("-");   }
-#line 6615 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2213 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(gt);     }
+#line 7136 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 137:
-#line 2049 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("*");   }
-#line 6621 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2214 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(ge);     }
+#line 7142 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 138:
-#line 2050 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("*");   }
-#line 6627 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2215 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(lt);     }
+#line 7148 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 139:
-#line 2051 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("/");   }
-#line 6633 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2216 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(le);     }
+#line 7154 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 140:
-#line 2052 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("%");   }
-#line 6639 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2217 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(neq);    }
+#line 7160 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 141:
-#line 2053 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("**");  }
-#line 6645 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2218 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(lshift); }
+#line 7166 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 142:
-#line 2054 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("**");  }
-#line 6651 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2219 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(rshift); }
+#line 7172 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 143:
-#line 2055 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("!");   }
-#line 6657 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2220 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(add);    }
+#line 7178 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 144:
-#line 2056 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("~");   }
-#line 6663 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2221 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(sub);    }
+#line 7184 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 145:
-#line 2057 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("+@");  }
-#line 6669 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2222 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(mul);    }
+#line 7190 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 146:
-#line 2058 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("-@");  }
-#line 6675 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2223 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(mul);    }
+#line 7196 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 147:
-#line 2059 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("");  }
-#line 6681 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2224 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(div);    }
+#line 7202 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 148:
-#line 2060 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("="); }
-#line 6687 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2225 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(mod);    }
+#line 7208 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
   case 149:
-#line 2061 "mrbgems/mruby-compiler/core/parse.y"
-                                { (yyval.id) = intern_lit("`");   }
-#line 6693 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 2226 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(pow);    }
+#line 7214 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 190:
-#line 2079 "mrbgems/mruby-compiler/core/parse.y"
+  case 150:
+#line 2227 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(pow);    }
+#line 7220 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 151:
+#line 2228 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(not);    }
+#line 7226 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 152:
+#line 2229 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(neg);    }
+#line 7232 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 153:
+#line 2230 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(plus);   }
+#line 7238 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 154:
+#line 2231 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(minus);  }
+#line 7244 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 155:
+#line 2232 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(aref);   }
+#line 7250 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 156:
+#line 2233 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(aset);   }
+#line 7256 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 157:
+#line 2234 "mrbgems/mruby-compiler/core/parse.y"
+                                { (yyval.id) = intern_op(tick);   }
+#line 7262 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 198:
+#line 2252 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_asgn(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 6701 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7270 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 191:
-#line 2083 "mrbgems/mruby-compiler/core/parse.y"
+  case 199:
+#line 2256 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_op_asgn(p, (yyvsp-2.nd), (yyvsp-1.id), (yyvsp0.nd));
                     }
-#line 6709 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7278 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 192:
-#line 2087 "mrbgems/mruby-compiler/core/parse.y"
+  case 200:
+#line 2260 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-5.nd), intern_lit(""), (yyvsp-3.nd), '.'), (yyvsp-1.id), (yyvsp0.nd));
+                      (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp-5.nd), intern_op(aref), (yyvsp-3.nd), '.'), (yyvsp-1.id), (yyvsp0.nd));
                     }
-#line 6717 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7286 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 193:
-#line 2091 "mrbgems/mruby-compiler/core/parse.y"
+  case 201:
+#line 2264 "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 6725 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7294 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 194:
-#line 2095 "mrbgems/mruby-compiler/core/parse.y"
+  case 202:
+#line 2268 "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 6733 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7302 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 195:
-#line 2099 "mrbgems/mruby-compiler/core/parse.y"
+  case 203:
+#line 2272 "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 6741 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7310 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 196:
-#line 2103 "mrbgems/mruby-compiler/core/parse.y"
+  case 204:
+#line 2276 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "constant re-assignment");
                       (yyval.nd) = new_begin(p, 0);
                     }
-#line 6750 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7319 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 197:
-#line 2108 "mrbgems/mruby-compiler/core/parse.y"
+  case 205:
+#line 2281 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "constant re-assignment");
                       (yyval.nd) = new_begin(p, 0);
                     }
-#line 6759 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7328 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 198:
-#line 2113 "mrbgems/mruby-compiler/core/parse.y"
+  case 206:
+#line 2286 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       backref_error(p, (yyvsp-2.nd));
                       (yyval.nd) = new_begin(p, 0);
                     }
-#line 6768 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7337 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 199:
-#line 2118 "mrbgems/mruby-compiler/core/parse.y"
+  case 207:
+#line 2291 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_dot2(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 6776 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7345 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 200:
-#line 2122 "mrbgems/mruby-compiler/core/parse.y"
+  case 208:
+#line 2295 "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"
+    break;
+
+  case 209:
+#line 2299 "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"
+    break;
+
+  case 210:
+#line 2303 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_dot3(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 6784 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7369 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 201:
-#line 2126 "mrbgems/mruby-compiler/core/parse.y"
+  case 211:
+#line 2307 "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"
+    break;
+
+  case 212:
+#line 2311 "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"
+    break;
+
+  case 213:
+#line 2315 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "+", (yyvsp0.nd));
                     }
-#line 6792 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7393 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 202:
-#line 2130 "mrbgems/mruby-compiler/core/parse.y"
+  case 214:
+#line 2319 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "-", (yyvsp0.nd));
                     }
-#line 6800 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7401 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 203:
-#line 2134 "mrbgems/mruby-compiler/core/parse.y"
+  case 215:
+#line 2323 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "*", (yyvsp0.nd));
                     }
-#line 6808 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7409 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 204:
-#line 2138 "mrbgems/mruby-compiler/core/parse.y"
+  case 216:
+#line 2327 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "/", (yyvsp0.nd));
                     }
-#line 6816 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7417 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 205:
-#line 2142 "mrbgems/mruby-compiler/core/parse.y"
+  case 217:
+#line 2331 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "%", (yyvsp0.nd));
                     }
-#line 6824 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7425 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 206:
-#line 2146 "mrbgems/mruby-compiler/core/parse.y"
+  case 218:
+#line 2335 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd));
                     }
-#line 6832 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7433 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 207:
-#line 2150 "mrbgems/mruby-compiler/core/parse.y"
+  case 219:
+#line 2339 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = call_uni_op(p, call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd)), "-@");
+                      (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd)));
                     }
-#line 6840 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7441 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 208:
-#line 2154 "mrbgems/mruby-compiler/core/parse.y"
+  case 220:
+#line 2343 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = call_uni_op(p, call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd)), "-@");
+                      (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp-2.nd), "**", (yyvsp0.nd)));
                     }
-#line 6848 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7449 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 209:
-#line 2158 "mrbgems/mruby-compiler/core/parse.y"
+  case 221:
+#line 2347 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_uni_op(p, (yyvsp0.nd), "+@");
                     }
-#line 6856 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7457 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 210:
-#line 2162 "mrbgems/mruby-compiler/core/parse.y"
+  case 222:
+#line 2351 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = call_uni_op(p, (yyvsp0.nd), "-@");
+                      (yyval.nd) = new_negate(p, (yyvsp0.nd));
                     }
-#line 6864 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7465 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 211:
-#line 2166 "mrbgems/mruby-compiler/core/parse.y"
+  case 223:
+#line 2355 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "|", (yyvsp0.nd));
                     }
-#line 6872 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7473 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 212:
-#line 2170 "mrbgems/mruby-compiler/core/parse.y"
+  case 224:
+#line 2359 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "^", (yyvsp0.nd));
                     }
-#line 6880 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7481 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 213:
-#line 2174 "mrbgems/mruby-compiler/core/parse.y"
+  case 225:
+#line 2363 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "&", (yyvsp0.nd));
                     }
-#line 6888 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7489 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 214:
-#line 2178 "mrbgems/mruby-compiler/core/parse.y"
+  case 226:
+#line 2367 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<=>", (yyvsp0.nd));
                     }
-#line 6896 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7497 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 215:
-#line 2182 "mrbgems/mruby-compiler/core/parse.y"
+  case 227:
+#line 2371 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), ">", (yyvsp0.nd));
                     }
-#line 6904 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7505 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 216:
-#line 2186 "mrbgems/mruby-compiler/core/parse.y"
+  case 228:
+#line 2375 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), ">=", (yyvsp0.nd));
                     }
-#line 6912 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7513 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 217:
-#line 2190 "mrbgems/mruby-compiler/core/parse.y"
+  case 229:
+#line 2379 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<", (yyvsp0.nd));
                     }
-#line 6920 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7521 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 218:
-#line 2194 "mrbgems/mruby-compiler/core/parse.y"
+  case 230:
+#line 2383 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<=", (yyvsp0.nd));
                     }
-#line 6928 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7529 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 219:
-#line 2198 "mrbgems/mruby-compiler/core/parse.y"
+  case 231:
+#line 2387 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "==", (yyvsp0.nd));
                     }
-#line 6936 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7537 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 220:
-#line 2202 "mrbgems/mruby-compiler/core/parse.y"
+  case 232:
+#line 2391 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "===", (yyvsp0.nd));
                     }
-#line 6944 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7545 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 221:
-#line 2206 "mrbgems/mruby-compiler/core/parse.y"
+  case 233:
+#line 2395 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "!=", (yyvsp0.nd));
                     }
-#line 6952 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7553 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 222:
-#line 2210 "mrbgems/mruby-compiler/core/parse.y"
+  case 234:
+#line 2399 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "=~", (yyvsp0.nd));
                     }
-#line 6960 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7561 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 223:
-#line 2214 "mrbgems/mruby-compiler/core/parse.y"
+  case 235:
+#line 2403 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "!~", (yyvsp0.nd));
                     }
-#line 6968 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7569 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 224:
-#line 2218 "mrbgems/mruby-compiler/core/parse.y"
+  case 236:
+#line 2407 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "!");
                     }
-#line 6976 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7577 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 225:
-#line 2222 "mrbgems/mruby-compiler/core/parse.y"
+  case 237:
+#line 2411 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_uni_op(p, cond((yyvsp0.nd)), "~");
                     }
-#line 6984 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7585 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 226:
-#line 2226 "mrbgems/mruby-compiler/core/parse.y"
+  case 238:
+#line 2415 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), "<<", (yyvsp0.nd));
                     }
-#line 6992 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7593 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 227:
-#line 2230 "mrbgems/mruby-compiler/core/parse.y"
+  case 239:
+#line 2419 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_bin_op(p, (yyvsp-2.nd), ">>", (yyvsp0.nd));
                     }
-#line 7000 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7601 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 228:
-#line 2234 "mrbgems/mruby-compiler/core/parse.y"
+  case 240:
+#line 2423 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_and(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 7008 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7609 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 229:
-#line 2238 "mrbgems/mruby-compiler/core/parse.y"
+  case 241:
+#line 2427 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_or(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 7016 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7617 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 230:
-#line 2242 "mrbgems/mruby-compiler/core/parse.y"
+  case 242:
+#line 2431 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_if(p, cond((yyvsp-5.nd)), (yyvsp-3.nd), (yyvsp0.nd));
                     }
-#line 7024 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7625 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 231:
-#line 2246 "mrbgems/mruby-compiler/core/parse.y"
+  case 243:
+#line 2435 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_if(p, cond((yyvsp-5.nd)), (yyvsp-3.nd), (yyvsp0.nd));
                     }
-#line 7032 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7633 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 232:
-#line 2250 "mrbgems/mruby-compiler/core/parse.y"
+  case 244:
+#line 2439 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-3.nd);
+                      endless_method_name(p, (yyvsp-3.nd));
+                      void_expr_error(p, (yyvsp0.nd));
+                      defn_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp0.nd));
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+#line 7646 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 245:
+#line 2448 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-5.nd);
+                      endless_method_name(p, (yyvsp-5.nd));
+                      void_expr_error(p, (yyvsp-2.nd));
+                      defn_setup(p, (yyval.nd), (yyvsp-4.nd), new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd)));
+                      nvars_unnest(p);
+                      p->in_def--;
+                    }
+#line 7659 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 246:
+#line 2457 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-3.nd);
+                      void_expr_error(p, (yyvsp0.nd));
+                      defs_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp0.nd));
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
+#line 7672 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 247:
+#line 2466 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = (yyvsp-5.nd);
+                      void_expr_error(p, (yyvsp-2.nd));
+                      defs_setup(p, (yyval.nd), (yyvsp-4.nd), new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd)));
+                      nvars_unnest(p);
+                      p->in_def--;
+                      p->in_single--;
+                    }
+#line 7685 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 248:
+#line 2475 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 7040 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7693 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 234:
-#line 2257 "mrbgems/mruby-compiler/core/parse.y"
+  case 250:
+#line 2482 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                       NODE_LINENO((yyval.nd), (yyvsp-1.nd));
                     }
-#line 7049 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7702 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 235:
-#line 2262 "mrbgems/mruby-compiler/core/parse.y"
+  case 251:
+#line 2487 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = push((yyvsp-3.nd), new_kw_hash(p, (yyvsp-1.nd)));
+                      (yyval.nd) = push((yyvsp-3.nd), new_hash(p, (yyvsp-1.nd)));
                     }
-#line 7057 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7710 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 236:
-#line 2266 "mrbgems/mruby-compiler/core/parse.y"
+  case 252:
+#line 2491 "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 7066 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7719 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 237:
-#line 2273 "mrbgems/mruby-compiler/core/parse.y"
+  case 253:
+#line 2498 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 7074 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7727 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 238:
-#line 2277 "mrbgems/mruby-compiler/core/parse.y"
+  case 254:
+#line 2502 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp-2.nd));
-                      void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = new_mod_rescue(p, (yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 7084 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7736 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 239:
-#line 2285 "mrbgems/mruby-compiler/core/parse.y"
+  case 255:
+#line 2509 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 7092 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7744 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 240:
-#line 2289 "mrbgems/mruby-compiler/core/parse.y"
+  case 256:
+#line 2513 "mrbgems/mruby-compiler/core/parse.y"
                     {
-#if 1
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
-                      if (local_var_p(p, r)  && local_var_p(p, b)) {
-                        (yyval.nd) = cons(list1(new_splat(p, new_lvar(p, r))),
-                                  new_block_arg(p, new_lvar(p, b)));
-                      }
-#else
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym k = mrb_intern_lit(p->mrb, "**");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
+                      mrb_sym r = intern_op(mul);
+                      mrb_sym k = intern_op(pow);
+                      mrb_sym b = intern_op(and);
+                      (yyval.nd) = new_callargs(p, push((yyvsp-3.nd), new_splat(p, new_lvar(p, r))),
+                                        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"
+    break;
+
+  case 257:
+#line 2522 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      mrb_sym r = intern_op(mul);
+                      mrb_sym k = intern_op(pow);
+                      mrb_sym b = intern_op(and);
                       if (local_var_p(p, r) && local_var_p(p, k) && local_var_p(p, b)) {
-                        (yyval.nd) = cons(list2(new_splat(p, new_lvar(p, r)),
-                                        new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k))))),
-                                  new_block_arg(p, new_lvar(p, b)));
+                        (yyval.nd) = new_callargs(p, list1(new_splat(p, new_lvar(p, r))),
+                                          new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k)))),
+                                          new_block_arg(p, new_lvar(p, b)));
                       }
-#endif
                       else {
                         yyerror(p, "unexpected argument forwarding ...");
                         (yyval.nd) = 0;
                       }
                     }
-#line 7120 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7776 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 245:
-#line 2321 "mrbgems/mruby-compiler/core/parse.y"
+  case 262:
+#line 2545 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons((yyvsp-1.nd),0);
+                      (yyval.nd) = new_callargs(p,(yyvsp-1.nd),0,0);
                       NODE_LINENO((yyval.nd), (yyvsp-1.nd));
                     }
-#line 7129 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7785 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 246:
-#line 2326 "mrbgems/mruby-compiler/core/parse.y"
+  case 263:
+#line 2550 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons(push((yyvsp-3.nd), new_kw_hash(p, (yyvsp-1.nd))), 0);
+                      (yyval.nd) = new_callargs(p,(yyvsp-3.nd),new_kw_hash(p,(yyvsp-1.nd)),0);
                       NODE_LINENO((yyval.nd), (yyvsp-3.nd));
                     }
-#line 7138 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7794 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 247:
-#line 2331 "mrbgems/mruby-compiler/core/parse.y"
+  case 264:
+#line 2555 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons(list1(new_kw_hash(p, (yyvsp-1.nd))), 0);
+                      (yyval.nd) = new_callargs(p,0,new_kw_hash(p,(yyvsp-1.nd)),0);
                       NODE_LINENO((yyval.nd), (yyvsp-1.nd));
                     }
-#line 7147 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7803 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 248:
-#line 2338 "mrbgems/mruby-compiler/core/parse.y"
+  case 265:
+#line 2562 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp0.nd));
-                      (yyval.nd) = cons(list1((yyvsp0.nd)), 0);
+                      (yyval.nd) = new_callargs(p, list1((yyvsp0.nd)), 0, 0);
                       NODE_LINENO((yyval.nd), (yyvsp0.nd));
                     }
-#line 7157 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7813 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 249:
-#line 2344 "mrbgems/mruby-compiler/core/parse.y"
+  case 266:
+#line 2568 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons((yyvsp-1.nd), (yyvsp0.nd));
+                      (yyval.nd) = new_callargs(p, (yyvsp-1.nd), 0, (yyvsp0.nd));
                       NODE_LINENO((yyval.nd), (yyvsp-1.nd));
                     }
-#line 7166 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7822 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 250:
-#line 2349 "mrbgems/mruby-compiler/core/parse.y"
+  case 267:
+#line 2573 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons(list1(new_kw_hash(p, (yyvsp-1.nd))), (yyvsp0.nd));
+                      (yyval.nd) = new_callargs(p, 0, new_kw_hash(p, (yyvsp-1.nd)), (yyvsp0.nd));
                       NODE_LINENO((yyval.nd), (yyvsp-1.nd));
                     }
-#line 7175 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7831 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 251:
-#line 2354 "mrbgems/mruby-compiler/core/parse.y"
+  case 268:
+#line 2578 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons(push((yyvsp-3.nd), new_kw_hash(p, (yyvsp-1.nd))), (yyvsp0.nd));
+                      (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 7184 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7840 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 252:
-#line 2359 "mrbgems/mruby-compiler/core/parse.y"
+  case 269:
+#line 2583 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = cons(0, (yyvsp0.nd));
+                      (yyval.nd) = new_callargs(p, 0, 0, (yyvsp0.nd));
                       NODE_LINENO((yyval.nd), (yyvsp0.nd));
                     }
-#line 7193 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7849 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 253:
-#line 2365 "mrbgems/mruby-compiler/core/parse.y"
+  case 270:
+#line 2589 "mrbgems/mruby-compiler/core/parse.y"
                    {
                       (yyval.stack) = p->cmdarg_stack;
                       CMDARG_PUSH(1);
                     }
-#line 7202 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7858 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 254:
-#line 2370 "mrbgems/mruby-compiler/core/parse.y"
+  case 271:
+#line 2594 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->cmdarg_stack = (yyvsp-1.stack);
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 7211 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7867 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 255:
-#line 2377 "mrbgems/mruby-compiler/core/parse.y"
+  case 272:
+#line 2601 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_block_arg(p, (yyvsp0.nd));
                     }
-#line 7219 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7875 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 256:
-#line 2383 "mrbgems/mruby-compiler/core/parse.y"
+  case 273:
+#line 2605 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = new_block_arg(p, 0);
+                    }
+#line 7883 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 274:
+#line 2611 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 7227 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7891 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 257:
-#line 2387 "mrbgems/mruby-compiler/core/parse.y"
+  case 275:
+#line 2615 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = 0;
                     }
-#line 7235 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7899 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 260:
-#line 2397 "mrbgems/mruby-compiler/core/parse.y"
+  case 277:
+#line 2624 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp0.nd));
-                      (yyval.nd) = cons((yyvsp0.nd), 0);
+                      (yyval.nd) = list1((yyvsp0.nd));
                       NODE_LINENO((yyval.nd), (yyvsp0.nd));
                     }
-#line 7245 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7909 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 261:
-#line 2403 "mrbgems/mruby-compiler/core/parse.y"
+  case 278:
+#line 2630 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      void_expr_error(p, (yyvsp0.nd));
-                      (yyval.nd) = cons(new_splat(p, (yyvsp0.nd)), 0);
+                      (yyval.nd) = list1(new_splat(p, (yyvsp0.nd)));
                       NODE_LINENO((yyval.nd), (yyvsp0.nd));
                     }
-#line 7255 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7918 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 262:
-#line 2409 "mrbgems/mruby-compiler/core/parse.y"
+  case 279:
+#line 2635 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 7264 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7927 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 263:
-#line 2414 "mrbgems/mruby-compiler/core/parse.y"
+  case 280:
+#line 2640 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = push((yyvsp-3.nd), new_splat(p, (yyvsp0.nd)));
                     }
-#line 7273 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7935 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 264:
-#line 2421 "mrbgems/mruby-compiler/core/parse.y"
+  case 281:
+#line 2646 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 7282 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7944 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 265:
-#line 2426 "mrbgems/mruby-compiler/core/parse.y"
+  case 282:
+#line 2651 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = push((yyvsp-3.nd), new_splat(p, (yyvsp0.nd)));
                     }
-#line 7291 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7952 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 266:
-#line 2431 "mrbgems/mruby-compiler/core/parse.y"
+  case 283:
+#line 2655 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = list1(new_splat(p, (yyvsp0.nd)));
                     }
-#line 7300 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7960 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 274:
-#line 2445 "mrbgems/mruby-compiler/core/parse.y"
+  case 291:
+#line 2668 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_nvar(p, (yyvsp0.num));
                     }
-#line 7308 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7968 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 275:
-#line 2449 "mrbgems/mruby-compiler/core/parse.y"
+  case 292:
+#line 2672 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_fcall(p, (yyvsp0.id), 0);
                     }
-#line 7316 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7976 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 276:
-#line 2453 "mrbgems/mruby-compiler/core/parse.y"
+  case 293:
+#line 2676 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.stack) = p->cmdarg_stack;
                       p->cmdarg_stack = 0;
                     }
-#line 7325 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7985 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 277:
-#line 2459 "mrbgems/mruby-compiler/core/parse.y"
+  case 294:
+#line 2682 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->cmdarg_stack = (yyvsp-2.stack);
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 7334 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7994 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 278:
-#line 2464 "mrbgems/mruby-compiler/core/parse.y"
+  case 295:
+#line 2687 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.stack) = p->cmdarg_stack;
                       p->cmdarg_stack = 0;
                     }
-#line 7343 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8003 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 279:
-#line 2468 "mrbgems/mruby-compiler/core/parse.y"
+  case 296:
+#line 2691 "mrbgems/mruby-compiler/core/parse.y"
                        {p->lstate = EXPR_ENDARG;}
-#line 7349 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8009 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 280:
-#line 2469 "mrbgems/mruby-compiler/core/parse.y"
+  case 297:
+#line 2692 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->cmdarg_stack = (yyvsp-3.stack);
                       (yyval.nd) = (yyvsp-2.nd);
                     }
-#line 7358 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8018 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 281:
-#line 2473 "mrbgems/mruby-compiler/core/parse.y"
+  case 298:
+#line 2696 "mrbgems/mruby-compiler/core/parse.y"
                               {p->lstate = EXPR_ENDARG;}
-#line 7364 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8024 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 282:
-#line 2474 "mrbgems/mruby-compiler/core/parse.y"
+  case 299:
+#line 2697 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_nil(p);
                     }
-#line 7372 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8032 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 283:
-#line 2478 "mrbgems/mruby-compiler/core/parse.y"
+  case 300:
+#line 2701 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 7380 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8040 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 284:
-#line 2482 "mrbgems/mruby-compiler/core/parse.y"
+  case 301:
+#line 2705 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_colon2(p, (yyvsp-2.nd), (yyvsp0.id));
                     }
-#line 7388 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8048 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 285:
-#line 2486 "mrbgems/mruby-compiler/core/parse.y"
+  case 302:
+#line 2709 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_colon3(p, (yyvsp0.id));
                     }
-#line 7396 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8056 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 286:
-#line 2490 "mrbgems/mruby-compiler/core/parse.y"
+  case 303:
+#line 2713 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_array(p, (yyvsp-1.nd));
                       NODE_LINENO((yyval.nd), (yyvsp-1.nd));
                     }
-#line 7405 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8065 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 287:
-#line 2495 "mrbgems/mruby-compiler/core/parse.y"
+  case 304:
+#line 2718 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_hash(p, (yyvsp-1.nd));
                       NODE_LINENO((yyval.nd), (yyvsp-1.nd));
                     }
-#line 7414 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8074 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 288:
-#line 2500 "mrbgems/mruby-compiler/core/parse.y"
+  case 305:
+#line 2723 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_return(p, 0);
                     }
-#line 7422 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8082 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 289:
-#line 2504 "mrbgems/mruby-compiler/core/parse.y"
+  case 306:
+#line 2727 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_yield(p, (yyvsp0.nd));
                     }
-#line 7430 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8090 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 290:
-#line 2508 "mrbgems/mruby-compiler/core/parse.y"
+  case 307:
+#line 2731 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_uni_op(p, cond((yyvsp-1.nd)), "!");
                     }
-#line 7438 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8098 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 291:
-#line 2512 "mrbgems/mruby-compiler/core/parse.y"
+  case 308:
+#line 2735 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = call_uni_op(p, new_nil(p), "!");
                     }
-#line 7446 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8106 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 292:
-#line 2516 "mrbgems/mruby-compiler/core/parse.y"
+  case 309:
+#line 2739 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_fcall(p, (yyvsp-1.id), cons(0, (yyvsp0.nd)));
+                      (yyval.nd) = new_fcall(p, (yyvsp-1.id), new_callargs(p, 0, 0, (yyvsp0.nd)));
                     }
-#line 7454 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8114 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 294:
-#line 2521 "mrbgems/mruby-compiler/core/parse.y"
+  case 311:
+#line 2744 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       call_with_block(p, (yyvsp-1.nd), (yyvsp0.nd));
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 7463 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8123 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 295:
-#line 2526 "mrbgems/mruby-compiler/core/parse.y"
+  case 312:
+#line 2749 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_nest(p);
+                      nvars_nest(p);
                       (yyval.num) = p->lpar_beg;
                       p->lpar_beg = ++p->paren_nest;
                     }
-#line 7473 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8134 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 296:
-#line 2532 "mrbgems/mruby-compiler/core/parse.y"
+  case 313:
+#line 2756 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.stack) = p->cmdarg_stack;
                       p->cmdarg_stack = 0;
                     }
-#line 7482 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8143 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 297:
-#line 2537 "mrbgems/mruby-compiler/core/parse.y"
+  case 314:
+#line 2761 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lpar_beg = (yyvsp-3.num);
                       (yyval.nd) = new_lambda(p, (yyvsp-2.nd), (yyvsp0.nd));
                       local_unnest(p);
+                      nvars_unnest(p);
                       p->cmdarg_stack = (yyvsp-1.stack);
                       CMDARG_LEXPOP();
                     }
-#line 7494 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8156 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 298:
-#line 2548 "mrbgems/mruby-compiler/core/parse.y"
+  case 315:
+#line 2773 "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 7503 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8165 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 299:
-#line 2556 "mrbgems/mruby-compiler/core/parse.y"
+  case 316:
+#line 2781 "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 7512 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8174 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 300:
-#line 2560 "mrbgems/mruby-compiler/core/parse.y"
+  case 317:
+#line 2785 "mrbgems/mruby-compiler/core/parse.y"
                                 {COND_PUSH(1);}
-#line 7518 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8180 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 301:
-#line 2560 "mrbgems/mruby-compiler/core/parse.y"
+  case 318:
+#line 2785 "mrbgems/mruby-compiler/core/parse.y"
                                                               {COND_POP();}
-#line 7524 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8186 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 302:
-#line 2563 "mrbgems/mruby-compiler/core/parse.y"
+  case 319:
+#line 2788 "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 7533 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8195 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 303:
-#line 2567 "mrbgems/mruby-compiler/core/parse.y"
+  case 320:
+#line 2792 "mrbgems/mruby-compiler/core/parse.y"
                                 {COND_PUSH(1);}
-#line 7539 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8201 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 304:
-#line 2567 "mrbgems/mruby-compiler/core/parse.y"
+  case 321:
+#line 2792 "mrbgems/mruby-compiler/core/parse.y"
                                                               {COND_POP();}
-#line 7545 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8207 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 305:
-#line 2570 "mrbgems/mruby-compiler/core/parse.y"
+  case 322:
+#line 2795 "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 7554 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8216 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 306:
-#line 2577 "mrbgems/mruby-compiler/core/parse.y"
+  case 323:
+#line 2802 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_case(p, (yyvsp-3.nd), (yyvsp-1.nd));
                     }
-#line 7562 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8224 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 307:
-#line 2581 "mrbgems/mruby-compiler/core/parse.y"
+  case 324:
+#line 2806 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_case(p, 0, (yyvsp-1.nd));
                     }
-#line 7570 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8232 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 308:
-#line 2585 "mrbgems/mruby-compiler/core/parse.y"
+  case 325:
+#line 2810 "mrbgems/mruby-compiler/core/parse.y"
                   {COND_PUSH(1);}
-#line 7576 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8238 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 309:
-#line 2587 "mrbgems/mruby-compiler/core/parse.y"
+  case 326:
+#line 2812 "mrbgems/mruby-compiler/core/parse.y"
                   {COND_POP();}
-#line 7582 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8244 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 310:
-#line 2590 "mrbgems/mruby-compiler/core/parse.y"
+  case 327:
+#line 2815 "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 7591 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8253 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 311:
-#line 2596 "mrbgems/mruby-compiler/core/parse.y"
+  case 328:
+#line 2821 "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 7602 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8264 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 312:
-#line 2604 "mrbgems/mruby-compiler/core/parse.y"
+  case 329:
+#line 2829 "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 7613 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8275 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 313:
-#line 2612 "mrbgems/mruby-compiler/core/parse.y"
+  case 330:
+#line 2837 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.num) = p->in_def;
                       p->in_def = 0;
                     }
-#line 7622 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8284 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 314:
-#line 2617 "mrbgems/mruby-compiler/core/parse.y"
+  case 331:
+#line 2842 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = cons(local_switch(p), nint(p->in_single));
                       nvars_block(p);
                       p->in_single = 0;
                     }
-#line 7632 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8294 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 315:
-#line 2624 "mrbgems/mruby-compiler/core/parse.y"
+  case 332:
+#line 2849 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_sclass(p, (yyvsp-5.nd), (yyvsp-1.nd));
                       SET_LINENO((yyval.nd), (yyvsp-7.num));
@@ -7641,541 +8303,498 @@
                       p->in_def = (yyvsp-4.num);
                       p->in_single = intn((yyvsp-2.nd)->cdr);
                     }
-#line 7645 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8307 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 316:
-#line 2634 "mrbgems/mruby-compiler/core/parse.y"
+  case 333:
+#line 2859 "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 7656 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8318 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 317:
-#line 2642 "mrbgems/mruby-compiler/core/parse.y"
+  case 334:
+#line 2867 "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 7667 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 318:
-#line 2649 "mrbgems/mruby-compiler/core/parse.y"
-                    {
-                      (yyval.stack) = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-#line 7676 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8329 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 319:
-#line 2653 "mrbgems/mruby-compiler/core/parse.y"
-                    {
-                      p->in_def++;
-                      (yyval.nd) = local_switch(p);
-                      nvars_block(p);
-                    }
-#line 7686 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 320:
-#line 2661 "mrbgems/mruby-compiler/core/parse.y"
+  case 335:
+#line 2877 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_def(p, (yyvsp-5.id), (yyvsp-2.nd), (yyvsp-1.nd));
-                      SET_LINENO((yyval.nd), (yyvsp-6.num));
-                      local_resume(p, (yyvsp-3.nd));
+                      (yyval.nd) = (yyvsp-3.nd);
+                      defn_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp-1.nd));
                       nvars_unnest(p);
                       p->in_def--;
-                      p->cmdarg_stack = (yyvsp-4.stack);
                     }
-#line 7699 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8340 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 321:
-#line 2670 "mrbgems/mruby-compiler/core/parse.y"
+  case 336:
+#line 2887 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      p->lstate = EXPR_FNAME;
-                      (yyval.stack) = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-#line 7709 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 322:
-#line 2676 "mrbgems/mruby-compiler/core/parse.y"
-                    {
-                      p->in_single++;
-                      p->lstate = EXPR_ENDFN; /* force for args */
-                      (yyval.nd) = local_switch(p);
-                      nvars_block(p);
-                    }
-#line 7720 "mrbgems/mruby-compiler/core/y.tab.c"
-    break;
-
-  case 323:
-#line 2685 "mrbgems/mruby-compiler/core/parse.y"
-                    {
-                      (yyval.nd) = new_sdef(p, (yyvsp-7.nd), (yyvsp-4.id), (yyvsp-2.nd), (yyvsp-1.nd));
-                      SET_LINENO((yyval.nd), (yyvsp-8.num));
-                      local_resume(p, (yyvsp-3.nd));
+                      (yyval.nd) = (yyvsp-3.nd);
+                      defs_setup(p, (yyval.nd), (yyvsp-2.nd), (yyvsp-1.nd));
                       nvars_unnest(p);
+                      p->in_def--;
                       p->in_single--;
-                      p->cmdarg_stack = (yyvsp-5.stack);
                     }
-#line 7733 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8352 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 324:
-#line 2694 "mrbgems/mruby-compiler/core/parse.y"
+  case 337:
+#line 2895 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_break(p, 0);
                     }
-#line 7741 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8360 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 325:
-#line 2698 "mrbgems/mruby-compiler/core/parse.y"
+  case 338:
+#line 2899 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_next(p, 0);
                     }
-#line 7749 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8368 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 326:
-#line 2702 "mrbgems/mruby-compiler/core/parse.y"
+  case 339:
+#line 2903 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_redo(p);
                     }
-#line 7757 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8376 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 327:
-#line 2706 "mrbgems/mruby-compiler/core/parse.y"
+  case 340:
+#line 2907 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_retry(p);
                     }
-#line 7765 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8384 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 328:
-#line 2712 "mrbgems/mruby-compiler/core/parse.y"
+  case 341:
+#line 2913 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                       if (!(yyval.nd)) (yyval.nd) = new_nil(p);
                     }
-#line 7774 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8393 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 335:
-#line 2731 "mrbgems/mruby-compiler/core/parse.y"
+  case 348:
+#line 2932 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_if(p, cond((yyvsp-3.nd)), (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 7782 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8401 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 337:
-#line 2738 "mrbgems/mruby-compiler/core/parse.y"
+  case 350:
+#line 2939 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 7790 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8409 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 338:
-#line 2744 "mrbgems/mruby-compiler/core/parse.y"
+  case 351:
+#line 2945 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1(list1((yyvsp0.nd)));
                     }
-#line 7798 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8417 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 340:
-#line 2751 "mrbgems/mruby-compiler/core/parse.y"
+  case 353:
+#line 2952 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3((yyvsp0.nd),0,0);
                     }
-#line 7806 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8425 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 341:
-#line 2755 "mrbgems/mruby-compiler/core/parse.y"
+  case 354:
+#line 2956 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3((yyvsp-3.nd), new_arg(p, (yyvsp0.id)), 0);
                     }
-#line 7814 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8433 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 342:
-#line 2759 "mrbgems/mruby-compiler/core/parse.y"
+  case 355:
+#line 2960 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3((yyvsp-5.nd), new_arg(p, (yyvsp-2.id)), (yyvsp0.nd));
                     }
-#line 7822 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8441 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 343:
-#line 2763 "mrbgems/mruby-compiler/core/parse.y"
+  case 356:
+#line 2964 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      local_add_f(p, 0);
-                      (yyval.nd) = list3((yyvsp-2.nd), (node*)-1, 0);
+                      local_add_f(p, intern_op(mul));
+                      (yyval.nd) = list3((yyvsp-2.nd), nint(-1), 0);
                     }
-#line 7831 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8450 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 344:
-#line 2768 "mrbgems/mruby-compiler/core/parse.y"
+  case 357:
+#line 2969 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = list3((yyvsp-4.nd), (node*)-1, (yyvsp0.nd));
+                      (yyval.nd) = list3((yyvsp-4.nd), nint(-1), (yyvsp0.nd));
                     }
-#line 7839 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8458 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 345:
-#line 2772 "mrbgems/mruby-compiler/core/parse.y"
+  case 358:
+#line 2973 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3(0, new_arg(p, (yyvsp0.id)), 0);
                     }
-#line 7847 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8466 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 346:
-#line 2776 "mrbgems/mruby-compiler/core/parse.y"
+  case 359:
+#line 2977 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list3(0, new_arg(p, (yyvsp-2.id)), (yyvsp0.nd));
                     }
-#line 7855 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8474 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 347:
-#line 2780 "mrbgems/mruby-compiler/core/parse.y"
+  case 360:
+#line 2981 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      local_add_f(p, 0);
-                      (yyval.nd) = list3(0, (node*)-1, 0);
+                      local_add_f(p, intern_op(mul));
+                      (yyval.nd) = list3(0, nint(-1), 0);
                     }
-#line 7864 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8483 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 348:
-#line 2785 "mrbgems/mruby-compiler/core/parse.y"
+  case 361:
+#line 2986 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      local_add_f(p, 0);
+                      local_add_f(p, intern_op(mul));
                     }
-#line 7872 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8491 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 349:
-#line 2789 "mrbgems/mruby-compiler/core/parse.y"
+  case 362:
+#line 2990 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = list3(0, (node*)-1, (yyvsp0.nd));
+                      (yyval.nd) = list3(0, nint(-1), (yyvsp0.nd));
                     }
-#line 7880 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8499 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 350:
-#line 2795 "mrbgems/mruby-compiler/core/parse.y"
+  case 363:
+#line 2996 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, (yyvsp-3.nd), (yyvsp-1.nd), (yyvsp0.id));
                     }
-#line 7888 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8507 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 351:
-#line 2799 "mrbgems/mruby-compiler/core/parse.y"
+  case 364:
+#line 3000 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, (yyvsp-1.nd), 0, (yyvsp0.id));
                     }
-#line 7896 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8515 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 352:
-#line 2803 "mrbgems/mruby-compiler/core/parse.y"
+  case 365:
+#line 3004 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, 0, (yyvsp-1.nd), (yyvsp0.id));
                     }
-#line 7904 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8523 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 353:
-#line 2807 "mrbgems/mruby-compiler/core/parse.y"
+  case 366:
+#line 3008 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp0.id));
                     }
-#line 7912 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8531 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 354:
-#line 2813 "mrbgems/mruby-compiler/core/parse.y"
+  case 367:
+#line 3014 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 7920 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8539 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 355:
-#line 2817 "mrbgems/mruby-compiler/core/parse.y"
+  case 368:
+#line 3018 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, 0, 0, 0);
                     }
-#line 7928 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8547 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 356:
-#line 2823 "mrbgems/mruby-compiler/core/parse.y"
+  case 369:
+#line 3024 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 7936 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8555 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 357:
-#line 2827 "mrbgems/mruby-compiler/core/parse.y"
+  case 370:
+#line 3028 "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 7944 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8563 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 358:
-#line 2831 "mrbgems/mruby-compiler/core/parse.y"
+  case 371:
+#line 3032 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-3.nd), (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
                     }
-#line 7952 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8571 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 359:
-#line 2835 "mrbgems/mruby-compiler/core/parse.y"
+  case 372:
+#line 3036 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 7960 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8579 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 360:
-#line 2839 "mrbgems/mruby-compiler/core/parse.y"
+  case 373:
+#line 3040 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-3.nd), 0, (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 7968 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8587 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 361:
-#line 2843 "mrbgems/mruby-compiler/core/parse.y"
+  case 374:
+#line 3044 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-2.nd), 0, 0, 0, (yyvsp0.nd));
                     }
-#line 7976 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8595 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 362:
-#line 2847 "mrbgems/mruby-compiler/core/parse.y"
+  case 375:
+#line 3048 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-5.nd), 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 7984 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8603 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 363:
-#line 2851 "mrbgems/mruby-compiler/core/parse.y"
+  case 376:
+#line 3052 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-1.nd), 0, 0, 0, (yyvsp0.nd));
                     }
-#line 7992 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8611 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 364:
-#line 2855 "mrbgems/mruby-compiler/core/parse.y"
+  case 377:
+#line 3056 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 8000 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8619 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 365:
-#line 2859 "mrbgems/mruby-compiler/core/parse.y"
+  case 378:
+#line 3060 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-5.nd), (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 8008 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8627 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 366:
-#line 2863 "mrbgems/mruby-compiler/core/parse.y"
+  case 379:
+#line 3064 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
                     }
-#line 8016 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8635 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 367:
-#line 2867 "mrbgems/mruby-compiler/core/parse.y"
+  case 380:
+#line 3068 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 8024 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8643 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 368:
-#line 2871 "mrbgems/mruby-compiler/core/parse.y"
+  case 381:
+#line 3072 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, 0, (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 8032 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8651 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 369:
-#line 2875 "mrbgems/mruby-compiler/core/parse.y"
+  case 382:
+#line 3076 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 8040 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8659 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 370:
-#line 2879 "mrbgems/mruby-compiler/core/parse.y"
+  case 383:
+#line 3080 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp0.nd));
                     }
-#line 8048 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8667 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 371:
-#line 2885 "mrbgems/mruby-compiler/core/parse.y"
+  case 384:
+#line 3086 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_add_blk(p, 0);
                       (yyval.nd) = 0;
                     }
-#line 8057 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8676 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 372:
-#line 2890 "mrbgems/mruby-compiler/core/parse.y"
+  case 385:
+#line 3091 "mrbgems/mruby-compiler/core/parse.y"
                    {
                       p->cmd_start = TRUE;
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8066 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8685 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 373:
-#line 2896 "mrbgems/mruby-compiler/core/parse.y"
+  case 386:
+#line 3097 "mrbgems/mruby-compiler/core/parse.y"
                       {local_add_blk(p, 0);}
-#line 8072 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8691 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 374:
-#line 2897 "mrbgems/mruby-compiler/core/parse.y"
+  case 387:
+#line 3098 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = 0;
                     }
-#line 8080 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8699 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 375:
-#line 2901 "mrbgems/mruby-compiler/core/parse.y"
+  case 388:
+#line 3102 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_add_blk(p, 0);
                       (yyval.nd) = 0;
                     }
-#line 8089 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8708 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 376:
-#line 2906 "mrbgems/mruby-compiler/core/parse.y"
+  case 389:
+#line 3107 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-2.nd);
                     }
-#line 8097 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8716 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 377:
-#line 2913 "mrbgems/mruby-compiler/core/parse.y"
+  case 390:
+#line 3114 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = 0;
                     }
-#line 8105 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8724 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 378:
-#line 2917 "mrbgems/mruby-compiler/core/parse.y"
+  case 391:
+#line 3118 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = 0;
                     }
-#line 8113 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8732 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 381:
-#line 2927 "mrbgems/mruby-compiler/core/parse.y"
+  case 394:
+#line 3128 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_add_f(p, (yyvsp0.id));
                       new_bv(p, (yyvsp0.id));
                     }
-#line 8122 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8741 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 383:
-#line 2935 "mrbgems/mruby-compiler/core/parse.y"
+  case 396:
+#line 3136 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-2.nd);
                     }
-#line 8130 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8749 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 384:
-#line 2939 "mrbgems/mruby-compiler/core/parse.y"
+  case 397:
+#line 3140 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8138 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8757 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 385:
-#line 2945 "mrbgems/mruby-compiler/core/parse.y"
+  case 398:
+#line 3146 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 8146 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8765 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 386:
-#line 2949 "mrbgems/mruby-compiler/core/parse.y"
+  case 399:
+#line 3150 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 8154 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8773 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 387:
-#line 2955 "mrbgems/mruby-compiler/core/parse.y"
+  case 400:
+#line 3156 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_nest(p);
                       nvars_nest(p);
                     }
-#line 8163 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8782 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 388:
-#line 2962 "mrbgems/mruby-compiler/core/parse.y"
+  case 401:
+#line 3163 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_block(p,(yyvsp-2.nd),(yyvsp-1.nd));
                       local_unnest(p);
                       nvars_unnest(p);
                     }
-#line 8173 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8792 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 389:
-#line 2970 "mrbgems/mruby-compiler/core/parse.y"
+  case 402:
+#line 3171 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      if ((yyvsp-1.nd)->car == (node*)NODE_YIELD) {
+                      if (typen((yyvsp-1.nd)->car) == NODE_YIELD) {
                         yyerror(p, "block given to yield");
                       }
                       else {
@@ -8183,159 +8802,159 @@
                       }
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 8187 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8806 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 390:
-#line 2980 "mrbgems/mruby-compiler/core/parse.y"
+  case 403:
+#line 3181 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
                     }
-#line 8195 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8814 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 391:
-#line 2984 "mrbgems/mruby-compiler/core/parse.y"
+  case 404:
+#line 3185 "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 8204 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8823 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 392:
-#line 2989 "mrbgems/mruby-compiler/core/parse.y"
+  case 405:
+#line 3190 "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 8213 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8832 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 393:
-#line 2996 "mrbgems/mruby-compiler/core/parse.y"
+  case 406:
+#line 3197 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_fcall(p, (yyvsp-1.id), (yyvsp0.nd));
                     }
-#line 8221 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8840 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 394:
-#line 3000 "mrbgems/mruby-compiler/core/parse.y"
+  case 407:
+#line 3201 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), (yyvsp-2.num));
                     }
-#line 8229 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8848 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 395:
-#line 3004 "mrbgems/mruby-compiler/core/parse.y"
+  case 408:
+#line 3205 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-3.nd), (yyvsp-1.id), (yyvsp0.nd), tCOLON2);
                     }
-#line 8237 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8856 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 396:
-#line 3008 "mrbgems/mruby-compiler/core/parse.y"
+  case 409:
+#line 3209 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_call(p, (yyvsp-2.nd), (yyvsp0.id), 0, tCOLON2);
                     }
-#line 8245 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8864 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 397:
-#line 3012 "mrbgems/mruby-compiler/core/parse.y"
+  case 410:
+#line 3213 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_call(p, (yyvsp-2.nd), intern_lit("call"), (yyvsp0.nd), (yyvsp-1.num));
+                      (yyval.nd) = new_call(p, (yyvsp-2.nd), MRB_SYM_2(p->mrb, call), (yyvsp0.nd), (yyvsp-1.num));
                     }
-#line 8253 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8872 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 398:
-#line 3016 "mrbgems/mruby-compiler/core/parse.y"
+  case 411:
+#line 3217 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_call(p, (yyvsp-2.nd), intern_lit("call"), (yyvsp0.nd), tCOLON2);
+                      (yyval.nd) = new_call(p, (yyvsp-2.nd), MRB_SYM_2(p->mrb, call), (yyvsp0.nd), tCOLON2);
                     }
-#line 8261 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8880 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 399:
-#line 3020 "mrbgems/mruby-compiler/core/parse.y"
+  case 412:
+#line 3221 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_super(p, (yyvsp0.nd));
                     }
-#line 8269 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8888 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 400:
-#line 3024 "mrbgems/mruby-compiler/core/parse.y"
+  case 413:
+#line 3225 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_zsuper(p);
                     }
-#line 8277 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8896 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 401:
-#line 3028 "mrbgems/mruby-compiler/core/parse.y"
+  case 414:
+#line 3229 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_lit(""), (yyvsp-1.nd), '.');
+                      (yyval.nd) = new_call(p, (yyvsp-3.nd), intern_op(aref), (yyvsp-1.nd), '.');
                     }
-#line 8285 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8904 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 402:
-#line 3034 "mrbgems/mruby-compiler/core/parse.y"
+  case 415:
+#line 3235 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_nest(p);
                       nvars_nest(p);
                       (yyval.num) = p->lineno;
                     }
-#line 8295 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8914 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 403:
-#line 3041 "mrbgems/mruby-compiler/core/parse.y"
+  case 416:
+#line 3242 "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 8306 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8925 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 404:
-#line 3048 "mrbgems/mruby-compiler/core/parse.y"
+  case 417:
+#line 3249 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_nest(p);
                       nvars_nest(p);
                       (yyval.num) = p->lineno;
                     }
-#line 8316 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8935 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 405:
-#line 3055 "mrbgems/mruby-compiler/core/parse.y"
+  case 418:
+#line 3256 "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 8327 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8946 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 406:
-#line 3066 "mrbgems/mruby-compiler/core/parse.y"
+  case 419:
+#line 3267 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = cons(cons((yyvsp-3.nd), (yyvsp-1.nd)), (yyvsp0.nd));
                     }
-#line 8335 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8954 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 407:
-#line 3072 "mrbgems/mruby-compiler/core/parse.y"
+  case 420:
+#line 3273 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       if ((yyvsp0.nd)) {
                         (yyval.nd) = cons(cons(0, (yyvsp0.nd)), 0);
@@ -8344,383 +8963,415 @@
                         (yyval.nd) = 0;
                       }
                     }
-#line 8348 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8967 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 409:
-#line 3086 "mrbgems/mruby-compiler/core/parse.y"
+  case 422:
+#line 3287 "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 8357 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8976 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 411:
-#line 3094 "mrbgems/mruby-compiler/core/parse.y"
+  case 424:
+#line 3295 "mrbgems/mruby-compiler/core/parse.y"
                     {
                         (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 8365 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8984 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 414:
-#line 3102 "mrbgems/mruby-compiler/core/parse.y"
+  case 427:
+#line 3303 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8373 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8992 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 416:
-#line 3109 "mrbgems/mruby-compiler/core/parse.y"
+  case 429:
+#line 3310 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8381 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9000 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 423:
-#line 3123 "mrbgems/mruby-compiler/core/parse.y"
+  case 436:
+#line 3324 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = concat_string(p, (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 8389 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9008 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 426:
-#line 3131 "mrbgems/mruby-compiler/core/parse.y"
+  case 439:
+#line 3332 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8397 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9016 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 427:
-#line 3135 "mrbgems/mruby-compiler/core/parse.y"
+  case 440:
+#line 3336 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_dstr(p, push((yyvsp-1.nd), (yyvsp0.nd)));
+                      node *n = (yyvsp-1.nd);
+                      if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
+                        n = push(n, (yyvsp0.nd));
+                      }
+                      else {
+                        cons_free((yyvsp0.nd));
+                      }
+                      (yyval.nd) = new_dstr(p, n);
                     }
-#line 8405 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9031 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 429:
-#line 3142 "mrbgems/mruby-compiler/core/parse.y"
+  case 442:
+#line 3350 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = append((yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 8413 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9039 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 430:
-#line 3148 "mrbgems/mruby-compiler/core/parse.y"
+  case 443:
+#line 3356 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 8421 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9047 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 431:
-#line 3152 "mrbgems/mruby-compiler/core/parse.y"
+  case 444:
+#line 3360 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = p->lex_strterm;
                       p->lex_strterm = NULL;
                     }
-#line 8430 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9056 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 432:
-#line 3158 "mrbgems/mruby-compiler/core/parse.y"
+  case 445:
+#line 3366 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lex_strterm = (yyvsp-2.nd);
                       (yyval.nd) = list2((yyvsp-3.nd), (yyvsp-1.nd));
                     }
-#line 8439 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9065 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 433:
-#line 3163 "mrbgems/mruby-compiler/core/parse.y"
+  case 446:
+#line 3371 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1(new_literal_delim(p));
                     }
-#line 8447 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9073 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 434:
-#line 3167 "mrbgems/mruby-compiler/core/parse.y"
+  case 447:
+#line 3375 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1(new_literal_delim(p));
                     }
-#line 8455 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9081 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 435:
-#line 3173 "mrbgems/mruby-compiler/core/parse.y"
+  case 448:
+#line 3381 "mrbgems/mruby-compiler/core/parse.y"
                     {
                         (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8463 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9089 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 436:
-#line 3177 "mrbgems/mruby-compiler/core/parse.y"
+  case 449:
+#line 3385 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_dxstr(p, push((yyvsp-1.nd), (yyvsp0.nd)));
+                      node *n = (yyvsp-1.nd);
+                      if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
+                        n = push(n, (yyvsp0.nd));
+                      }
+                      else {
+                        cons_free((yyvsp0.nd));
+                      }
+                      (yyval.nd) = new_dxstr(p, n);
                     }
-#line 8471 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9104 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 437:
-#line 3183 "mrbgems/mruby-compiler/core/parse.y"
+  case 450:
+#line 3398 "mrbgems/mruby-compiler/core/parse.y"
                     {
                         (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8479 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9112 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 438:
-#line 3187 "mrbgems/mruby-compiler/core/parse.y"
+  case 451:
+#line 3402 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_dregx(p, (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 8487 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9120 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 442:
-#line 3200 "mrbgems/mruby-compiler/core/parse.y"
+  case 455:
+#line 3415 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       parser_heredoc_info * inf = parsing_heredoc_inf(p);
                       inf->doc = push(inf->doc, new_str(p, "", 0));
                       heredoc_end(p);
                     }
-#line 8497 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9130 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 443:
-#line 3206 "mrbgems/mruby-compiler/core/parse.y"
+  case 456:
+#line 3421 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       heredoc_end(p);
                     }
-#line 8505 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9138 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 446:
-#line 3216 "mrbgems/mruby-compiler/core/parse.y"
+  case 459:
+#line 3431 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       parser_heredoc_info * inf = parsing_heredoc_inf(p);
                       inf->doc = push(inf->doc, (yyvsp0.nd));
                       heredoc_treat_nextline(p);
                     }
-#line 8515 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9148 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 447:
-#line 3222 "mrbgems/mruby-compiler/core/parse.y"
+  case 460:
+#line 3437 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = p->lex_strterm;
                       p->lex_strterm = NULL;
                     }
-#line 8524 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9157 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 448:
-#line 3228 "mrbgems/mruby-compiler/core/parse.y"
+  case 461:
+#line 3443 "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));
                     }
-#line 8534 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9167 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 449:
-#line 3236 "mrbgems/mruby-compiler/core/parse.y"
+  case 462:
+#line 3451 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_words(p, list1((yyvsp0.nd)));
                     }
-#line 8542 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9175 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 450:
-#line 3240 "mrbgems/mruby-compiler/core/parse.y"
+  case 463:
+#line 3455 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_words(p, push((yyvsp-1.nd), (yyvsp0.nd)));
+                      node *n = (yyvsp-1.nd);
+                      if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
+                        n = push(n, (yyvsp0.nd));
+                      }
+                      else {
+                        cons_free((yyvsp0.nd));
+                      }
+                      (yyval.nd) = new_words(p, n);
                     }
-#line 8550 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9190 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 451:
-#line 3247 "mrbgems/mruby-compiler/core/parse.y"
+  case 464:
+#line 3469 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lstate = EXPR_ENDARG;
                       (yyval.nd) = new_sym(p, (yyvsp0.id));
                     }
-#line 8559 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9199 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 452:
-#line 3252 "mrbgems/mruby-compiler/core/parse.y"
+  case 465:
+#line 3474 "mrbgems/mruby-compiler/core/parse.y"
                     {
+                      node *n = (yyvsp-1.nd);
                       p->lstate = EXPR_ENDARG;
-                      (yyval.nd) = new_dsym(p, new_dstr(p, push((yyvsp-1.nd), (yyvsp0.nd))));
+                      if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
+                        n = push(n, (yyvsp0.nd));
+                      }
+                      else {
+                        cons_free((yyvsp0.nd));
+                      }
+                      (yyval.nd) = new_dsym(p, new_dstr(p, n));
                     }
-#line 8568 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9215 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 453:
-#line 3259 "mrbgems/mruby-compiler/core/parse.y"
+  case 466:
+#line 3488 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.id) = (yyvsp0.id);
                     }
-#line 8576 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9223 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 458:
-#line 3269 "mrbgems/mruby-compiler/core/parse.y"
+  case 471:
+#line 3498 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.id) = new_strsym(p, (yyvsp0.nd));
                     }
-#line 8584 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9231 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 459:
-#line 3273 "mrbgems/mruby-compiler/core/parse.y"
+  case 472:
+#line 3502 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.id) = new_strsym(p, (yyvsp0.nd));
                     }
-#line 8592 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9239 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 460:
-#line 3279 "mrbgems/mruby-compiler/core/parse.y"
+  case 473:
+#line 3508 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_symbols(p, list1((yyvsp0.nd)));
                     }
-#line 8600 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9247 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 461:
-#line 3283 "mrbgems/mruby-compiler/core/parse.y"
+  case 474:
+#line 3512 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = new_symbols(p, push((yyvsp-1.nd), (yyvsp0.nd)));
+                      node *n = (yyvsp-1.nd);
+                      if (intn((yyvsp0.nd)->cdr->cdr) > 0) {
+                        n = push(n, (yyvsp0.nd));
+                      }
+                      (yyval.nd) = new_symbols(p, n);
                     }
-#line 8608 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9259 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 464:
-#line 3291 "mrbgems/mruby-compiler/core/parse.y"
+  case 477:
+#line 3524 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = negate_lit(p, (yyvsp0.nd));
+                      (yyval.nd) = new_negate(p, (yyvsp0.nd));
                     }
-#line 8616 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9267 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 465:
-#line 3295 "mrbgems/mruby-compiler/core/parse.y"
+  case 478:
+#line 3528 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      (yyval.nd) = negate_lit(p, (yyvsp0.nd));
+                      (yyval.nd) = new_negate(p, (yyvsp0.nd));
                     }
-#line 8624 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9275 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 466:
-#line 3301 "mrbgems/mruby-compiler/core/parse.y"
+  case 479:
+#line 3534 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_lvar(p, (yyvsp0.id));
                     }
-#line 8632 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9283 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 467:
-#line 3305 "mrbgems/mruby-compiler/core/parse.y"
+  case 480:
+#line 3538 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_ivar(p, (yyvsp0.id));
                     }
-#line 8640 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9291 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 468:
-#line 3309 "mrbgems/mruby-compiler/core/parse.y"
+  case 481:
+#line 3542 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_gvar(p, (yyvsp0.id));
                     }
-#line 8648 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9299 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 469:
-#line 3313 "mrbgems/mruby-compiler/core/parse.y"
+  case 482:
+#line 3546 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_cvar(p, (yyvsp0.id));
                     }
-#line 8656 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9307 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 470:
-#line 3317 "mrbgems/mruby-compiler/core/parse.y"
+  case 483:
+#line 3550 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_const(p, (yyvsp0.id));
                     }
-#line 8664 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9315 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 471:
-#line 3323 "mrbgems/mruby-compiler/core/parse.y"
+  case 484:
+#line 3556 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       assignable(p, (yyvsp0.nd));
                     }
-#line 8672 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9323 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 472:
-#line 3327 "mrbgems/mruby-compiler/core/parse.y"
+  case 485:
+#line 3560 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "can't assign to numbered parameter");
                     }
-#line 8680 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9331 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 473:
-#line 3333 "mrbgems/mruby-compiler/core/parse.y"
+  case 486:
+#line 3566 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = var_reference(p, (yyvsp0.nd));
                     }
-#line 8688 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9339 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 474:
-#line 3337 "mrbgems/mruby-compiler/core/parse.y"
+  case 487:
+#line 3570 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_nil(p);
                     }
-#line 8696 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9347 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 475:
-#line 3341 "mrbgems/mruby-compiler/core/parse.y"
+  case 488:
+#line 3574 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_self(p);
                     }
-#line 8704 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9355 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 476:
-#line 3345 "mrbgems/mruby-compiler/core/parse.y"
+  case 489:
+#line 3578 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_true(p);
                     }
-#line 8712 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9363 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 477:
-#line 3349 "mrbgems/mruby-compiler/core/parse.y"
+  case 490:
+#line 3582 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_false(p);
                     }
-#line 8720 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9371 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 478:
-#line 3353 "mrbgems/mruby-compiler/core/parse.y"
+  case 491:
+#line 3586 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       const char *fn = mrb_sym_name_len(p->mrb, p->filename_sym, NULL);
                       if (!fn) {
@@ -8728,591 +9379,605 @@
                       }
                       (yyval.nd) = new_str(p, fn, strlen(fn));
                     }
-#line 8732 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9383 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 479:
-#line 3361 "mrbgems/mruby-compiler/core/parse.y"
+  case 492:
+#line 3594 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       char buf16;
 
                       dump_int(p->lineno, buf);
                       (yyval.nd) = new_int(p, buf, 10, 0);
                     }
-#line 8743 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9394 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 480:
-#line 3368 "mrbgems/mruby-compiler/core/parse.y"
+  case 493:
+#line 3601 "mrbgems/mruby-compiler/core/parse.y"
                     {
-#ifdef MRB_UTF8_STRING
-                      const char *enc = "UTF-8";
-#else
-                      const char *enc = "ASCII-8BIT";
-#endif
-                      (yyval.nd) = new_str(p, enc, strlen(enc));
+                      (yyval.nd) = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0);
                     }
-#line 8756 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9402 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 483:
-#line 3383 "mrbgems/mruby-compiler/core/parse.y"
+  case 496:
+#line 3611 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = 0;
                     }
-#line 8764 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9410 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 484:
-#line 3387 "mrbgems/mruby-compiler/core/parse.y"
+  case 497:
+#line 3615 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lstate = EXPR_BEG;
                       p->cmd_start = TRUE;
                     }
-#line 8773 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9419 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 485:
-#line 3392 "mrbgems/mruby-compiler/core/parse.y"
+  case 498:
+#line 3620 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 8781 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9427 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 486:
-#line 3403 "mrbgems/mruby-compiler/core/parse.y"
+  case 501:
+#line 3636 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                       p->lstate = EXPR_BEG;
                       p->cmd_start = TRUE;
                     }
-#line 8791 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9437 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 487:
-#line 3409 "mrbgems/mruby-compiler/core/parse.y"
+  case 502:
+#line 3642 "mrbgems/mruby-compiler/core/parse.y"
                     {
-#if 1
-                      /* til real keyword args implemented */
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
-                      local_add_f(p, r);
-                      (yyval.nd) = new_args(p, 0, 0, r, 0,
-                                    new_args_tail(p, 0, 0, b));
-#else
-                      mrb_sym r = mrb_intern_lit(p->mrb, "*");
-                      mrb_sym k = mrb_intern_lit(p->mrb, "**");
-                      mrb_sym b = mrb_intern_lit(p->mrb, "&");
-                      local_add_f(p, r); local_add_f(p, k);
-                      (yyval.nd) = new_args(p, 0, 0, r, 0,
-                                    new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
-#endif
+                      (yyval.nd) = new_args_dots(p, (yyvsp-3.nd));
                     }
-#line 8813 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9445 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 488:
-#line 3427 "mrbgems/mruby-compiler/core/parse.y"
+  case 503:
+#line 3646 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = new_args_dots(p, 0);
+                    }
+#line 9453 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 505:
+#line 3653 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 8821 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9461 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 489:
-#line 3433 "mrbgems/mruby-compiler/core/parse.y"
+  case 506:
+#line 3657 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = new_args_dots(p, (yyvsp-3.nd));
+                    }
+#line 9469 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 507:
+#line 3661 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.nd) = new_args_dots(p, 0);
+                    }
+#line 9477 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 508:
+#line 3667 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_nest(p);
                     }
-#line 8829 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9485 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 490:
-#line 3439 "mrbgems/mruby-compiler/core/parse.y"
+  case 509:
+#line 3673 "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 8839 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9495 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 491:
-#line 3445 "mrbgems/mruby-compiler/core/parse.y"
+  case 510:
+#line 3679 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_kw_arg(p, (yyvsp0.id), 0);
                       local_unnest(p);
                     }
-#line 8848 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9504 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 492:
-#line 3452 "mrbgems/mruby-compiler/core/parse.y"
+  case 511:
+#line 3686 "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 8857 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9514 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 493:
-#line 3457 "mrbgems/mruby-compiler/core/parse.y"
+  case 512:
+#line 3692 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_kw_arg(p, (yyvsp0.id), 0);
                       local_unnest(p);
                     }
-#line 8866 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9523 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 494:
-#line 3464 "mrbgems/mruby-compiler/core/parse.y"
+  case 513:
+#line 3699 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 8874 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9531 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 495:
-#line 3468 "mrbgems/mruby-compiler/core/parse.y"
+  case 514:
+#line 3703 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 8882 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9539 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 496:
-#line 3474 "mrbgems/mruby-compiler/core/parse.y"
+  case 515:
+#line 3709 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 8890 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9547 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 497:
-#line 3478 "mrbgems/mruby-compiler/core/parse.y"
+  case 516:
+#line 3713 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 8898 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9555 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 500:
-#line 3488 "mrbgems/mruby-compiler/core/parse.y"
+  case 519:
+#line 3723 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_kw_rest_args(p, nsym((yyvsp0.id)));
                     }
-#line 8906 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9563 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 501:
-#line 3492 "mrbgems/mruby-compiler/core/parse.y"
+  case 520:
+#line 3727 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_kw_rest_args(p, 0);
                     }
-#line 8914 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9571 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 502:
-#line 3498 "mrbgems/mruby-compiler/core/parse.y"
+  case 521:
+#line 3733 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, (yyvsp-3.nd), (yyvsp-1.nd), (yyvsp0.id));
                     }
-#line 8922 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9579 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 503:
-#line 3502 "mrbgems/mruby-compiler/core/parse.y"
+  case 522:
+#line 3737 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, (yyvsp-1.nd), 0, (yyvsp0.id));
                     }
-#line 8930 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9587 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 504:
-#line 3506 "mrbgems/mruby-compiler/core/parse.y"
+  case 523:
+#line 3741 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, 0, (yyvsp-1.nd), (yyvsp0.id));
                     }
-#line 8938 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9595 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 505:
-#line 3510 "mrbgems/mruby-compiler/core/parse.y"
+  case 524:
+#line 3745 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp0.id));
                     }
-#line 8946 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9603 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 506:
-#line 3516 "mrbgems/mruby-compiler/core/parse.y"
+  case 525:
+#line 3751 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                     }
-#line 8954 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9611 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 507:
-#line 3520 "mrbgems/mruby-compiler/core/parse.y"
+  case 526:
+#line 3755 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args_tail(p, 0, 0, 0);
                     }
-#line 8962 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9619 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 508:
-#line 3526 "mrbgems/mruby-compiler/core/parse.y"
+  case 527:
+#line 3761 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 8970 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9627 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 509:
-#line 3530 "mrbgems/mruby-compiler/core/parse.y"
+  case 528:
+#line 3765 "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 8978 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9635 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 510:
-#line 3534 "mrbgems/mruby-compiler/core/parse.y"
+  case 529:
+#line 3769 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-3.nd), (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
                     }
-#line 8986 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9643 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 511:
-#line 3538 "mrbgems/mruby-compiler/core/parse.y"
+  case 530:
+#line 3773 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-5.nd), (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 8994 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9651 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 512:
-#line 3542 "mrbgems/mruby-compiler/core/parse.y"
+  case 531:
+#line 3777 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-3.nd), 0, (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 9002 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9659 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 513:
-#line 3546 "mrbgems/mruby-compiler/core/parse.y"
+  case 532:
+#line 3781 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-5.nd), 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 9010 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9667 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 514:
-#line 3550 "mrbgems/mruby-compiler/core/parse.y"
+  case 533:
+#line 3785 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, (yyvsp-1.nd), 0, 0, 0, (yyvsp0.nd));
                     }
-#line 9018 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9675 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 515:
-#line 3554 "mrbgems/mruby-compiler/core/parse.y"
+  case 534:
+#line 3789 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 9026 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9683 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 516:
-#line 3558 "mrbgems/mruby-compiler/core/parse.y"
+  case 535:
+#line 3793 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-5.nd), (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 9034 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9691 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 517:
-#line 3562 "mrbgems/mruby-compiler/core/parse.y"
+  case 536:
+#line 3797 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-1.nd), 0, 0, (yyvsp0.nd));
                     }
-#line 9042 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9699 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 518:
-#line 3566 "mrbgems/mruby-compiler/core/parse.y"
+  case 537:
+#line 3801 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, (yyvsp-3.nd), 0, (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 9050 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9707 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 519:
-#line 3570 "mrbgems/mruby-compiler/core/parse.y"
+  case 538:
+#line 3805 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, 0, (yyvsp-1.id), 0, (yyvsp0.nd));
                     }
-#line 9058 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9715 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 520:
-#line 3574 "mrbgems/mruby-compiler/core/parse.y"
+  case 539:
+#line 3809 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, 0, (yyvsp-3.id), (yyvsp-1.nd), (yyvsp0.nd));
                     }
-#line 9066 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9723 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 521:
-#line 3578 "mrbgems/mruby-compiler/core/parse.y"
+  case 540:
+#line 3813 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp0.nd));
                     }
-#line 9074 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9731 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 522:
-#line 3582 "mrbgems/mruby-compiler/core/parse.y"
+  case 541:
+#line 3817 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      local_add_f(p, mrb_intern_lit(p->mrb, "&"));
+                      local_add_f(p, intern_op(and));
                       (yyval.nd) = new_args(p, 0, 0, 0, 0, 0);
                     }
-#line 9083 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9740 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 523:
-#line 3589 "mrbgems/mruby-compiler/core/parse.y"
+  case 542:
+#line 3824 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "formal argument cannot be a constant");
                       (yyval.nd) = 0;
                     }
-#line 9092 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9749 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 524:
-#line 3594 "mrbgems/mruby-compiler/core/parse.y"
+  case 543:
+#line 3829 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "formal argument cannot be an instance variable");
                       (yyval.nd) = 0;
                     }
-#line 9101 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9758 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 525:
-#line 3599 "mrbgems/mruby-compiler/core/parse.y"
+  case 544:
+#line 3834 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "formal argument cannot be a global variable");
                       (yyval.nd) = 0;
                     }
-#line 9110 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9767 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 526:
-#line 3604 "mrbgems/mruby-compiler/core/parse.y"
+  case 545:
+#line 3839 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "formal argument cannot be a class variable");
                       (yyval.nd) = 0;
                     }
-#line 9119 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9776 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 527:
-#line 3609 "mrbgems/mruby-compiler/core/parse.y"
+  case 546:
+#line 3844 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       yyerror(p, "formal argument cannot be a numbered parameter");
                       (yyval.nd) = 0;
                     }
-#line 9128 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9785 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 528:
-#line 3616 "mrbgems/mruby-compiler/core/parse.y"
+  case 547:
+#line 3851 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.id) = 0;
                     }
-#line 9136 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9793 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 529:
-#line 3620 "mrbgems/mruby-compiler/core/parse.y"
+  case 548:
+#line 3855 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_add_f(p, (yyvsp0.id));
                       (yyval.id) = (yyvsp0.id);
                     }
-#line 9145 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9802 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 530:
-#line 3627 "mrbgems/mruby-compiler/core/parse.y"
+  case 549:
+#line 3862 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = new_arg(p, (yyvsp0.id));
                     }
-#line 9153 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9810 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 531:
-#line 3631 "mrbgems/mruby-compiler/core/parse.y"
+  case 550:
+#line 3866 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = local_switch(p);
                     }
-#line 9161 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9818 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 532:
-#line 3635 "mrbgems/mruby-compiler/core/parse.y"
+  case 551:
+#line 3870 "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 9171 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9828 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 533:
-#line 3643 "mrbgems/mruby-compiler/core/parse.y"
+  case 552:
+#line 3878 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 9179 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9836 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 534:
-#line 3647 "mrbgems/mruby-compiler/core/parse.y"
+  case 553:
+#line 3882 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 9187 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9844 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 535:
-#line 3653 "mrbgems/mruby-compiler/core/parse.y"
+  case 554:
+#line 3888 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_add_f(p, (yyvsp-1.id));
                       local_nest(p);
                       (yyval.id) = (yyvsp-1.id);
                     }
-#line 9197 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9854 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 536:
-#line 3661 "mrbgems/mruby-compiler/core/parse.y"
+  case 555:
+#line 3896 "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 9207 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9864 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 537:
-#line 3669 "mrbgems/mruby-compiler/core/parse.y"
+  case 556:
+#line 3904 "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 9217 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9874 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 538:
-#line 3677 "mrbgems/mruby-compiler/core/parse.y"
+  case 557:
+#line 3912 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 9225 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9882 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 539:
-#line 3681 "mrbgems/mruby-compiler/core/parse.y"
+  case 558:
+#line 3916 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 9233 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9890 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 540:
-#line 3687 "mrbgems/mruby-compiler/core/parse.y"
+  case 559:
+#line 3922 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                     }
-#line 9241 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9898 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 541:
-#line 3691 "mrbgems/mruby-compiler/core/parse.y"
+  case 560:
+#line 3926 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 9249 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9906 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 544:
-#line 3701 "mrbgems/mruby-compiler/core/parse.y"
+  case 563:
+#line 3936 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       local_add_f(p, (yyvsp0.id));
                       (yyval.id) = (yyvsp0.id);
                     }
-#line 9258 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9915 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 545:
-#line 3706 "mrbgems/mruby-compiler/core/parse.y"
+  case 564:
+#line 3941 "mrbgems/mruby-compiler/core/parse.y"
                     {
-                      local_add_f(p, mrb_intern_lit(p->mrb, "*"));
-                      (yyval.id) = -1;
+                      (yyval.id) = intern_op(mul);
+                      local_add_f(p, (yyval.id));
                     }
-#line 9267 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9924 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 548:
-#line 3717 "mrbgems/mruby-compiler/core/parse.y"
+  case 567:
+#line 3952 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.id) = (yyvsp0.id);
                     }
-#line 9275 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9932 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 549:
-#line 3723 "mrbgems/mruby-compiler/core/parse.y"
+  case 568:
+#line 3956 "mrbgems/mruby-compiler/core/parse.y"
+                    {
+                      (yyval.id) = intern_op(and);
+                    }
+#line 9940 "mrbgems/mruby-compiler/core/y.tab.c"
+    break;
+
+  case 569:
+#line 3962 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.id) = (yyvsp0.id);
                     }
-#line 9283 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9948 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 550:
-#line 3727 "mrbgems/mruby-compiler/core/parse.y"
+  case 570:
+#line 3966 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.id) = 0;
                     }
-#line 9291 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9956 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 551:
-#line 3733 "mrbgems/mruby-compiler/core/parse.y"
+  case 571:
+#line 3972 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp0.nd);
                       if (!(yyval.nd)) (yyval.nd) = new_nil(p);
                     }
-#line 9300 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9965 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 552:
-#line 3737 "mrbgems/mruby-compiler/core/parse.y"
+  case 572:
+#line 3976 "mrbgems/mruby-compiler/core/parse.y"
                       {p->lstate = EXPR_BEG;}
-#line 9306 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9971 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 553:
-#line 3738 "mrbgems/mruby-compiler/core/parse.y"
+  case 573:
+#line 3977 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       if ((yyvsp-1.nd) == 0) {
                         yyerror(p, "can't define singleton method for ().");
                       }
                       else {
-                        switch ((enum node_type)intn((yyvsp-1.nd)->car)) {
+                        switch (typen((yyvsp-1.nd)->car)) {
                         case NODE_STR:
                         case NODE_DSTR:
                         case NODE_XSTR:
@@ -9329,125 +9994,133 @@
                       }
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 9333 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9998 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 555:
-#line 3764 "mrbgems/mruby-compiler/core/parse.y"
+  case 575:
+#line 4003 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = (yyvsp-1.nd);
                     }
-#line 9341 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10006 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 556:
-#line 3770 "mrbgems/mruby-compiler/core/parse.y"
+  case 576:
+#line 4009 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = list1((yyvsp0.nd));
                       NODE_LINENO((yyval.nd), (yyvsp0.nd));
                     }
-#line 9350 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10015 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 557:
-#line 3775 "mrbgems/mruby-compiler/core/parse.y"
+  case 577:
+#line 4014 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = push((yyvsp-2.nd), (yyvsp0.nd));
                     }
-#line 9358 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10023 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 560:
-#line 3785 "mrbgems/mruby-compiler/core/parse.y"
+  case 578:
+#line 4020 "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 9368 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10033 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 561:
-#line 3791 "mrbgems/mruby-compiler/core/parse.y"
+  case 579:
+#line 4026 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = cons(new_sym(p, (yyvsp-2.id)), (yyvsp0.nd));
                     }
-#line 9377 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10042 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 562:
-#line 3796 "mrbgems/mruby-compiler/core/parse.y"
+  case 580:
+#line 4031 "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"
+    break;
+
+  case 581:
+#line 4035 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp0.nd));
-                      if ((yyvsp-2.nd)->car == (node*)NODE_DSTR) {
+                      if (typen((yyvsp-2.nd)->car) == NODE_DSTR) {
                         (yyval.nd) = cons(new_dsym(p, (yyvsp-2.nd)), (yyvsp0.nd));
                       }
                       else {
                         (yyval.nd) = cons(new_sym(p, new_strsym(p, (yyvsp-2.nd))), (yyvsp0.nd));
                       }
                     }
-#line 9391 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10064 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 563:
-#line 3806 "mrbgems/mruby-compiler/core/parse.y"
+  case 582:
+#line 4045 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       void_expr_error(p, (yyvsp0.nd));
                       (yyval.nd) = cons(new_kw_rest_args(p, 0), (yyvsp0.nd));
                     }
-#line 9400 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10073 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 576:
-#line 3833 "mrbgems/mruby-compiler/core/parse.y"
+  case 595:
+#line 4072 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.num) = '.';
                     }
-#line 9408 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10081 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 577:
-#line 3837 "mrbgems/mruby-compiler/core/parse.y"
+  case 596:
+#line 4076 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.num) = 0;
                     }
-#line 9416 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10089 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 579:
-#line 3844 "mrbgems/mruby-compiler/core/parse.y"
+  case 598:
+#line 4083 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.num) = tCOLON2;
                     }
-#line 9424 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10097 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 588:
-#line 3865 "mrbgems/mruby-compiler/core/parse.y"
+  case 607:
+#line 4104 "mrbgems/mruby-compiler/core/parse.y"
                       {yyerrok;}
-#line 9430 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10103 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 591:
-#line 3871 "mrbgems/mruby-compiler/core/parse.y"
+  case 609:
+#line 4109 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       p->lineno += (yyvsp0.num);
                       p->column = 0;
                     }
-#line 9439 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10112 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
-  case 594:
-#line 3882 "mrbgems/mruby-compiler/core/parse.y"
+  case 613:
+#line 4121 "mrbgems/mruby-compiler/core/parse.y"
                     {
                       (yyval.nd) = 0;
                     }
-#line 9447 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10120 "mrbgems/mruby-compiler/core/y.tab.c"
     break;
 
 
-#line 9451 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 10124 "mrbgems/mruby-compiler/core/y.tab.c"
 
       default: break;
     }
@@ -9679,7 +10352,7 @@
 #endif
   return yyresult;
 }
-#line 3886 "mrbgems/mruby-compiler/core/parse.y"
+#line 4125 "mrbgems/mruby-compiler/core/parse.y"
 
 #define pylval  (*((YYSTYPE*)(p->ylval)))
 
@@ -9690,7 +10363,7 @@
   size_t n;
 
   if (! p->capture_errors) {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
     if (p->filename_sym) {
       const char *filename = mrb_sym_name_len(p->mrb, p->filename_sym, NULL);
       fprintf(stderr, "%s:%d:%d: %s\n", filename, p->lineno, p->column, s);
@@ -9723,13 +10396,13 @@
 }
 
 static void
-yywarn(parser_state *p, const char *s)
+yywarning(parser_state *p, const char *s)
 {
   char* c;
   size_t n;
 
   if (! p->capture_errors) {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
     if (p->filename_sym) {
       const char *filename = mrb_sym_name_len(p->mrb, p->filename_sym, NULL);
       fprintf(stderr, "%s:%d:%d: warning: %s\n", filename, p->lineno, p->column, s);
@@ -9751,12 +10424,6 @@
 }
 
 static void
-yywarning(parser_state *p, const char *s)
-{
-  yywarn(p, s);
-}
-
-static void
 yywarning_s(parser_state *p, const char *msg, const char *s)
 {
   char buf256;
@@ -9829,20 +10496,20 @@
 nextc0(parser_state *p)
 {
   int c;
-#ifndef MRB_DISABLE_STDIO
-  if (p->f) {
-    if (feof(p->f)) return -1;
-    c = fgetc(p->f);
-    if (c == EOF) return -1;
+
+  if (p->s && p->s < p->send) {
+    c = (unsigned char)*p->s++;
   }
-  else
+  else {
+#ifndef MRB_NO_STDIO
+    if (p->f) {
+      c = fgetc(p->f);
+      if (feof(p->f)) return -1;
+    }
+    else
 #endif
-    if (!p->s || p->s >= p->send) {
       return -1;
-    }
-    else {
-      c = (unsigned char)*p->s++;
-    }
+  }
   return c;
 }
 
@@ -9918,7 +10585,7 @@
     list = push(list, nint(c0));
   } while(n--);
   if (p->pb) {
-    p->pb = append((node*)list, p->pb);
+    p->pb = append(list, p->pb);
   }
   else {
     p->pb = list;
@@ -9938,7 +10605,7 @@
 {
   size_t len = strlen(s);
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   if (p->f) {
     int n = 0;
     while (*s) {
@@ -10296,6 +10963,89 @@
   }
 }
 
+static void
+heredoc_count_indent(parser_heredoc_info *hinf, const char *str, size_t len, size_t spaces, size_t *offset)
+{
+  size_t indent = 0;
+  *offset = 0;
+  for (size_t i = 0; i < len; i++) {
+    size_t size;
+    if (stri == '\n')
+      break;
+    else if (stri == '\t')
+      size = 8;
+    else if (ISSPACE(stri))
+      size = 1;
+    else
+      break;
+    size_t nindent = indent + size;
+    if (nindent > spaces || nindent > hinf->indent)
+      break;
+    indent = nindent;
+    *offset += 1;
+  }
+}
+
+static void
+heredoc_remove_indent(parser_state *p, parser_heredoc_info *hinf)
+{
+  if (!hinf->remove_indent || hinf->indent == 0)
+    return;
+  node *indented, *n, *pair, *escaped, *nspaces;
+  const char *str;
+  size_t len, spaces, offset, start, end;
+  indented = hinf->indented;
+  while (indented) {
+    n = indented->car;
+    pair = n->car;
+    str = (char*)pair->car;
+    len = (size_t)pair->cdr;
+    escaped = n->cdr->car;
+    nspaces = n->cdr->cdr;
+    if (escaped) {
+      char *newstr = strndup(str, len);
+      size_t newlen = 0;
+      start = 0;
+      while (start < len) {
+        end = escaped ? (size_t)escaped->car : len;
+        if (end > len) end = len;
+        spaces = (size_t)nspaces->car;
+        size_t esclen = end - start;
+        heredoc_count_indent(hinf, str + start, esclen, spaces, &offset);
+        esclen -= offset;
+        memcpy(newstr + newlen, str + start + offset, esclen);
+        newlen += esclen;
+        start = end;
+        if (escaped)
+          escaped = escaped->cdr;
+        nspaces = nspaces->cdr;
+      }
+      if (newlen < len)
+        newstrnewlen = '\0';
+      pair->car = (node*)newstr;
+      pair->cdr = (node*)newlen;
+    } else {
+      spaces = (size_t)nspaces->car;
+      heredoc_count_indent(hinf, str, len, spaces, &offset);
+      pair->car = (node*)(str + offset);
+      pair->cdr = (node*)(len - offset);
+    }
+    indented = indented->cdr;
+  }
+}
+
+static void
+heredoc_push_indented(parser_state *p, parser_heredoc_info *hinf, node *pair, node *escaped, node *nspaces, mrb_bool empty_line)
+{
+  hinf->indented = push(hinf->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;
+    nspaces = nspaces->cdr;
+  }
+}
+
 static int
 parse_string(parser_state *p)
 {
@@ -10306,10 +11056,19 @@
   int end = intn(p->lex_strterm->cdr->cdr->cdr);
   parser_heredoc_info *hinf = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_inf(p) : NULL;
 
+  mrb_bool unindent = hinf && hinf->remove_indent;
+  mrb_bool head = hinf && hinf->line_head;
+  mrb_bool empty = TRUE;
+  size_t spaces = 0;
+  size_t pos = -1;
+  node *escaped = NULL;
+  node *nspaces = NULL;
+
   if (beg == 0) beg = -3;       /* should never happen */
   if (end == 0) end = -3;
   newtok(p);
   while ((c = nextc(p)) != end || nest_level != 0) {
+    pos++;
     if (hinf && (c == '\n' || c < 0)) {
       mrb_bool line_head;
       tokadd(p, '\n');
@@ -10328,7 +11087,8 @@
             --len;
           }
         }
-        if ((len-1 == hinf->term_len) && (strncmp(s, hinf->term, len-1) == 0)) {
+        if (hinf->term_len > 0 && len-1 == hinf->term_len && strncmp(s, hinf->term, len-1) == 0) {
+          heredoc_remove_indent(p, hinf);
           return tHEREDOC_END;
         }
       }
@@ -10347,9 +11107,22 @@
         }
         return 0;
       }
-      pylval.nd = new_str(p, tok(p), toklen(p));
+      node *nd = new_str(p, tok(p), toklen(p));
+      pylval.nd = nd;
+      if (unindent && head) {
+        nspaces = push(nspaces, nint(spaces));
+        heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, empty && line_head);
+      }
       return tHD_STRING_MID;
     }
+    if (unindent && empty) {
+      if (c == '\t')
+        spaces += 8;
+      else if (ISSPACE(c))
+        ++spaces;
+      else
+        empty = FALSE;
+    }
     if (c < 0) {
       yyerror(p, "unterminated string meets end of file");
       return 0;
@@ -10371,6 +11144,13 @@
         else if (c == '\n') {
           p->lineno++;
           p->column = 0;
+          if (unindent) {
+            nspaces = push(nspaces, nint(spaces));
+            escaped = push(escaped, nint(pos));
+            pos--;
+            empty = TRUE;
+            spaces = 0;
+          }
           if (type & STR_FUNC_ARRAY) {
             tokadd(p, '\n');
           }
@@ -10420,8 +11200,13 @@
         tokfix(p);
         p->lstate = EXPR_BEG;
         p->cmd_start = TRUE;
-        pylval.nd = new_str(p, tok(p), toklen(p));
+        node *nd = new_str(p, tok(p), toklen(p));
+        pylval.nd = nd;
         if (hinf) {
+          if (unindent && head) {
+            nspaces = push(nspaces, nint(spaces));
+            heredoc_push_indented(p, hinf, nd->cdr, escaped, nspaces, FALSE);
+          }
           hinf->line_head = FALSE;
           return tHD_STRING_PART;
         }
@@ -10542,7 +11327,7 @@
   int mask = NUM_SUFFIX_R|NUM_SUFFIX_I;
 
   while ((c = nextc(p)) != -1) {
-    list = push(list, (node*)(intptr_t)c);
+    list = push(list, nint(c));
 
     if ((mask & NUM_SUFFIX_I) && c == 'i') {
       result |= (mask & NUM_SUFFIX_I);
@@ -10559,7 +11344,7 @@
     if (!ISASCII(c) || ISALPHA(c) || c == '_') {
       p->column = column;
       if (p->pb) {
-        p->pb = append((node*)list, p->pb);
+        p->pb = append(list, p->pb);
       }
       else {
         p->pb = list;
@@ -10578,6 +11363,7 @@
   int c;
   int type = str_heredoc;
   mrb_bool indent = FALSE;
+  mrb_bool squiggly = FALSE;
   mrb_bool quote = FALSE;
   node *newnode;
   parser_heredoc_info *info;
@@ -10587,8 +11373,11 @@
     pushback(p, c);
     return 0;
   }
-  if (c == '-') {
-    indent = TRUE;
+  if (c == '-' || c == '~') {
+    if (c == '-')
+      indent = TRUE;
+    if (c == '~')
+      squiggly = TRUE;
     c = nextc(p);
   }
   if (c == '\'' || c == '"') {
@@ -10615,6 +11404,7 @@
     if (! identchar(c)) {
       pushback(p, c);
       if (indent) pushback(p, '-');
+      if (squiggly) pushback(p, '~');
       return 0;
     }
     newtok(p);
@@ -10631,7 +11421,10 @@
   if (! quote)
     type |= STR_FUNC_EXPAND;
   info->type = (string_type)type;
-  info->allow_indent = indent;
+  info->allow_indent = indent || squiggly;
+  info->remove_indent = squiggly;
+  info->indent = ~0U;
+  info->indented = NULL;
   info->line_head = TRUE;
   info->doc = NULL;
   p->heredocs_from_nextline = push(p->heredocs_from_nextline, newnode);
@@ -10758,7 +11551,7 @@
   case '*':
     if ((c = nextc(p)) == '*') {
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("**");
+        pylval.id = intern_op(pow);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -10776,7 +11569,7 @@
     }
     else {
       if (c == '=') {
-        pylval.id = intern_lit("*");
+        pylval.id = intern_op(mul);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -10892,7 +11685,7 @@
     }
     if (c == '<') {
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("<<");
+        pylval.id = intern_op(lshift);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -10914,7 +11707,7 @@
     }
     if (c == '>') {
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit(">>");
+        pylval.id = intern_op(rshift);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -11022,7 +11815,7 @@
     if ((c = nextc(p)) == '&') {
       p->lstate = EXPR_BEG;
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("&&");
+        pylval.id = intern_op(andand);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -11034,7 +11827,7 @@
       return tANDDOT;
     }
     else if (c == '=') {
-      pylval.id = intern_lit("&");
+      pylval.id = intern_op(and);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -11061,7 +11854,7 @@
     if ((c = nextc(p)) == '|') {
       p->lstate = EXPR_BEG;
       if ((c = nextc(p)) == '=') {
-        pylval.id = intern_lit("||");
+        pylval.id = intern_op(oror);
         p->lstate = EXPR_BEG;
         return tOP_ASGN;
       }
@@ -11069,7 +11862,7 @@
       return tOROP;
     }
     if (c == '=') {
-      pylval.id = intern_lit("|");
+      pylval.id = intern_op(or);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -11093,7 +11886,7 @@
       return '+';
     }
     if (c == '=') {
-      pylval.id = intern_lit("+");
+      pylval.id = intern_op(add);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -11121,7 +11914,7 @@
       return '-';
     }
     if (c == '=') {
-      pylval.id = intern_lit("-");
+      pylval.id = intern_op(sub);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -11142,20 +11935,24 @@
     return '-';
 
   case '.':
-    p->lstate = EXPR_BEG;
-    if ((c = nextc(p)) == '.') {
+    {
+      int is_beg = IS_BEG();
+      p->lstate = EXPR_MID;
       if ((c = nextc(p)) == '.') {
-        return tDOT3;
+        if ((c = nextc(p)) == '.') {
+          return is_beg ? tBDOT3 : tDOT3;
+        }
+        pushback(p, c);
+        return is_beg ? tBDOT2 : tDOT2;
       }
       pushback(p, c);
-      return tDOT2;
-    }
-    pushback(p, c);
-    if (c >= 0 && ISDIGIT(c)) {
-      yyerror(p, "no .<digit> floating literal anymore; put 0 before dot");
+      p->lstate = EXPR_BEG;
+      if (c >= 0 && ISDIGIT(c)) {
+        yyerror(p, "no .<digit> floating literal anymore; put 0 before dot");
+      }
+      p->lstate = EXPR_DOT;
+      return '.';
     }
-    p->lstate = EXPR_DOT;
-    return '.';
 
     start_num:
   case '0': case '1': case '2': case '3': case '4':
@@ -11371,8 +12168,8 @@
     }
     tokfix(p);
     if (is_float) {
-#ifdef MRB_WITHOUT_FLOAT
-      yywarning_s(p, "floating point numbers are not supported", tok(p));
+#ifdef MRB_NO_FLOAT
+      yywarning_s(p, "floating-point numbers are not supported", tok(p));
       pylval.nd = new_int(p, "0", 10, 0);
       return tINTEGER;
 #else
@@ -11389,6 +12186,10 @@
         errno = 0;
       }
       suffix = number_literal_suffix(p);
+      if (seen_e && (suffix & NUM_SUFFIX_R)) {
+        pushback(p, 'r');
+        suffix &= ~NUM_SUFFIX_R;
+      }
       pylval.nd = new_float(p, tok(p), suffix);
       return tFLOAT;
 #endif
@@ -11426,14 +12227,14 @@
       p->lstate = EXPR_BEG;
       return tLABEL_TAG;
     }
-    if (!ISSPACE(c) || IS_BEG()) {
+    if (IS_END() || ISSPACE(c) || c == '#') {
       pushback(p, c);
-      p->lstate = EXPR_FNAME;
-      return tSYMBEG;
+      p->lstate = EXPR_BEG;
+      return ':';
     }
     pushback(p, c);
-    p->lstate = EXPR_BEG;
-    return ':';
+    p->lstate = EXPR_FNAME;
+    return tSYMBEG;
 
   case '/':
     if (IS_BEG()) {
@@ -11441,7 +12242,7 @@
       return tREGEXP_BEG;
     }
     if ((c = nextc(p)) == '=') {
-      pylval.id = intern_lit("/");
+      pylval.id = intern_op(div);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -11460,7 +12261,7 @@
 
   case '^':
     if ((c = nextc(p)) == '=') {
-      pylval.id = intern_lit("^");
+      pylval.id = intern_op(xor);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -11513,6 +12314,7 @@
     p->paren_nest++;
     if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
       p->lstate = EXPR_ARG;
+      p->paren_nest--;
       if ((c = nextc(p)) == '') {
         if ((c = nextc(p)) == '=') {
           return tASET;
@@ -11637,7 +12439,7 @@
       }
     }
     if ((c = nextc(p)) == '=') {
-      pylval.id = intern_lit("%");
+      pylval.id = intern_op(mod);
       p->lstate = EXPR_BEG;
       return tOP_ASGN;
     }
@@ -11727,10 +12529,10 @@
       if (last_state == EXPR_FNAME) goto gvar;
       tokfix(p);
       {
-        unsigned long n = strtoul(tok(p), NULL, 10);
-        if (n > INT_MAX) {
-          yyerror(p, "capture group index must be <= " MRB_STRINGIZE(INT_MAX));
-          return 0;
+        mrb_int n = mrb_int_read(tok(p), NULL, NULL);
+        if (n > INT32_MAX) {
+          yywarning(p, "capture group index too big; always nil");
+          return keyword_nil;
         }
         pylval.nd = new_nth_ref(p, (int)n);
       }
@@ -11840,7 +12642,7 @@
       break;
 
     case '_':
-      if (toklen(p) == 2 && ISDIGIT(tok(p)1) && p->nvars) {
+      if (p->lstate != EXPR_FNAME && toklen(p) == 2 && ISDIGIT(tok(p)1) && p->nvars) {
         int n = tok(p)1 - '0';
         int nvar;
 
@@ -11861,14 +12663,13 @@
           if (nvar == -1) {
             yywarning(p, "numbered parameter used in inner block");
           }
-          if (nvar >= -1) {
-            pylval.num = n;
-            p->lstate = EXPR_END;
-            return tNUMPARAM;
-          }
           else {
-            yywarning(p, "identifier for numbered parameter; consider another name");
+            int nvars = intn(p->nvars->car);
+            p->nvars->car = nint(nvars > n ? nvars : n);
           }
+          pylval.num = n;
+          p->lstate = EXPR_END;
+          return tNUMPARAM;
         }
       }
       /* fall through */
@@ -12002,6 +12803,7 @@
   }
   p->capture_errors = cxt->capture_errors;
   p->no_optimize = cxt->no_optimize;
+  p->no_ext_ops = cxt->no_ext_ops;
   p->upper = cxt->upper;
   if (cxt->partial_hook) {
     p->cxt = cxt;
@@ -12015,6 +12817,7 @@
   int i = 0;
 
   if (!cxt) return;
+  if (!p->tree) return;
   if (intn(p->tree->car) != NODE_SCOPE) return;
   n0 = n = p->tree->cdr->car;
   while (n) {
@@ -12035,53 +12838,39 @@
 mrb_parser_parse(parser_state *p, mrbc_context *c)
 {
   struct mrb_jmpbuf buf1;
-  p->jmp = &buf1;
+  struct mrb_jmpbuf *prev = p->mrb->jmp;
+  p->mrb->jmp = &buf1;
 
-  MRB_TRY(p->jmp) {
+  MRB_TRY(p->mrb->jmp) {
     int n = 1;
 
     p->cmd_start = TRUE;
     p->in_def = p->in_single = 0;
     p->nerr = p->nwarn = 0;
     p->lex_strterm = NULL;
-
     parser_init_cxt(p, c);
 
-    if (p->mrb->jmp) {
-      n = yyparse(p);
-    }
-    else {
-      struct mrb_jmpbuf buf2;
-
-      p->mrb->jmp = &buf2;
-      MRB_TRY(p->mrb->jmp) {
-        n = yyparse(p);
-      }
-      MRB_CATCH(p->mrb->jmp) {
-        p->nerr++;
-      }
-      MRB_END_EXC(p->mrb->jmp);
-      p->mrb->jmp = 0;
-    }
+    n = yyparse(p);
     if (n != 0 || p->nerr > 0) {
       p->tree = 0;
+      p->mrb->jmp = prev;
       return;
     }
-    if (!p->tree) {
-      p->tree = new_nil(p);
-    }
     parser_update_cxt(p, c);
     if (c && c->dump_result) {
       mrb_parser_dump(p->mrb, p->tree, 0);
     }
   }
-  MRB_CATCH(p->jmp) {
-    yyerror(p, "memory allocation error");
+  MRB_CATCH(p->mrb->jmp) {
     p->nerr++;
-    p->tree = 0;
-    return;
+    if (p->mrb->exc == NULL) {
+      yyerror(p, "memory allocation error");
+      p->nerr++;
+      p->tree = 0;
+    }
   }
   MRB_END_EXC(p->jmp);
+  p->mrb->jmp = prev;
 }
 
 MRB_API parser_state*
@@ -12101,7 +12890,7 @@
   p->pool = pool;
 
   p->s = p->send = NULL;
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   p->f = NULL;
 #endif
 
@@ -12174,10 +12963,20 @@
 }
 
 MRB_API void
+mrbc_cleanup_local_variables(mrb_state *mrb, mrbc_context *c)
+{
+  if (c->syms) {
+    mrb_free(mrb, c->syms);
+    c->syms = NULL;
+    c->slen = 0;
+  }
+}
+
+MRB_API void
 mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
 {
   mrb_sym sym;
-  size_t i;
+  uint16_t i;
   mrb_sym* new_table;
 
   sym = mrb_intern_cstr(p->mrb, f);
@@ -12186,7 +12985,7 @@
 
   for (i = 0; i < p->filename_table_length; ++i) {
     if (p->filename_tablei == sym) {
-      p->current_filename_index = (int)i;
+      p->current_filename_index = i;
       return;
     }
   }
@@ -12213,20 +13012,32 @@
   }
 }
 
-#ifndef MRB_DISABLE_STDIO
-MRB_API parser_state*
-mrb_parse_file(mrb_state *mrb, FILE *f, mrbc_context *c)
+#ifndef MRB_NO_STDIO
+static struct mrb_parser_state *
+mrb_parse_file_continue(mrb_state *mrb, FILE *f, const void *prebuf, size_t prebufsize, mrbc_context *c)
 {
   parser_state *p;
 
   p = mrb_parser_new(mrb);
   if (!p) return NULL;
-  p->s = p->send = NULL;
+  if (prebuf) {
+    p->s = (const char *)prebuf;
+    p->send = (const char *)prebuf + prebufsize;
+  }
+  else {
+    p->s = p->send = NULL;
+  }
   p->f = f;
 
   mrb_parser_parse(p, c);
   return p;
 }
+
+MRB_API parser_state*
+mrb_parse_file(mrb_state *mrb, FILE *f, mrbc_context *c)
+{
+  return mrb_parse_file_continue(mrb, f, NULL, 0, c);
+}
 #endif
 
 MRB_API parser_state*
@@ -12255,7 +13066,7 @@
   struct RClass *target = mrb->object_class;
   struct RProc *proc;
   mrb_value v;
-  unsigned int keep = 0;
+  mrb_int keep = 0;
 
   if (!p) {
     return mrb_undef_value();
@@ -12275,7 +13086,7 @@
     }
     else {
       if (mrb->exc == NULL) {
-        mrb->exc = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, E_SYNTAX_ERROR, "syntax error"));
+        mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SYNTAX_ERROR, "syntax error"));
       }
       mrb_parser_free(p);
       return mrb_undef_value();
@@ -12285,7 +13096,7 @@
   mrb_parser_free(p);
   if (proc == NULL) {
     if (mrb->exc == NULL) {
-      mrb->exc = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, E_SCRIPT_ERROR, "codegen error"));
+      mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SCRIPT_ERROR, "codegen error"));
     }
     return mrb_undef_value();
   }
@@ -12304,14 +13115,14 @@
   }
   MRB_PROC_SET_TARGET_CLASS(proc, target);
   if (mrb->c->ci) {
-    mrb->c->ci->target_class = target;
+    mrb_vm_ci_target_class_set(mrb->c->ci, target);
   }
   v = mrb_top_run(mrb, proc, mrb_top_self(mrb), keep);
   if (mrb->exc) return mrb_nil_value();
   return v;
 }
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 MRB_API mrb_value
 mrb_load_file_cxt(mrb_state *mrb, FILE *f, mrbc_context *c)
 {
@@ -12323,6 +13134,55 @@
 {
   return mrb_load_file_cxt(mrb, f, NULL);
 }
+
+#define DETECT_SIZE 64
+
+/*
+ * In order to be recognized as a `.mrb` file, the following three points must be satisfied:
+ * - File starts with "RITE"
+ * - At least `sizeof(struct rite_binary_header)` bytes can be read
+ * - `NUL` is included in the first 64 bytes of the file
+ */
+MRB_API mrb_value
+mrb_load_detect_file_cxt(mrb_state *mrb, FILE *fp, mrbc_context *c)
+{
+  union {
+    char bDETECT_SIZE;
+    struct rite_binary_header h;
+  } leading;
+  size_t bufsize;
+
+  if (mrb == NULL || fp == NULL) {
+    return mrb_nil_value();
+  }
+
+  bufsize = fread(leading.b, sizeof(char), sizeof(leading), fp);
+  if (bufsize < sizeof(leading.h) ||
+      memcmp(leading.h.binary_ident, RITE_BINARY_IDENT, sizeof(leading.h.binary_ident)) != 0 ||
+      memchr(leading.b, '\0', bufsize) == NULL) {
+    return mrb_load_exec(mrb, mrb_parse_file_continue(mrb, fp, leading.b, bufsize, c), c);
+  }
+  else {
+    size_t 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() */
+    }
+
+    result = mrb_load_irep_buf_cxt(mrb, bin, binsize, c);
+    if (mrb_string_p(bin_obj)) mrb_str_resize(mrb, bin_obj, 0);
+    return result;
+  }
+}
 #endif
 
 MRB_API mrb_value
@@ -12349,7 +13209,7 @@
   return mrb_load_string_cxt(mrb, s, NULL);
 }
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 
 static void
 dump_prefix(node *tree, int offset)
@@ -12395,8 +13255,13 @@
   }
   n = n->cdr;
   if (n->car) {
+    mrb_sym rest = sym(n->car);
+
     dump_prefix(n, offset+1);
-    printf("rest=*%s\n", mrb_sym_name(mrb, sym(n->car)));
+    if (rest == MRB_OPSYM(mul))
+      printf("rest=*\n");
+    else
+      printf("rest=*%s\n", mrb_sym_name(mrb, rest));
   }
   n = n->cdr;
   if (n->car) {
@@ -12424,7 +13289,7 @@
   int ai = mrb_gc_arena_save(mrb);
   mrb_value s;
 # if INT_MAX > MRB_INT_MAX / 4
-  /* check maximum length with "\xNN" charactor */
+  /* check maximum length with "\xNN" character */
   if (len > MRB_INT_MAX / 4) {
     len = MRB_INT_MAX / 4;
   }
@@ -12439,7 +13304,7 @@
 void
 mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
 {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   int nodetype;
 
   if (!tree) return;
@@ -12673,9 +13538,16 @@
       printf("args:\n");
       dump_recur(mrb, tree->car, offset+2);
       if (tree->cdr) {
-        dump_prefix(tree, offset+1);
-        printf("block:\n");
-        mrb_parser_dump(mrb, tree->cdr, offset+2);
+        if (tree->cdr->car) {
+          dump_prefix(tree, offset+1);
+          printf("kwargs:\n");
+          mrb_parser_dump(mrb, tree->cdr->car, offset+2);
+        }
+        if (tree->cdr->cdr) {
+          dump_prefix(tree, offset+1);
+          printf("block:\n");
+          mrb_parser_dump(mrb, tree->cdr->cdr, offset+2);
+        }
       }
     }
     break;
@@ -12766,7 +13638,7 @@
         if (n2->car) {
           dump_prefix(n2, offset+2);
           printf("rest:\n");
-          if (n2->car == (node*)-1) {
+          if (n2->car == nint(-1)) {
             dump_prefix(n2, offset+2);
             printf("(empty)\n");
           }
@@ -12816,7 +13688,17 @@
     break;
 
   case NODE_ZSUPER:
-    printf("NODE_ZSUPER\n");
+    printf("NODE_ZSUPER:\n");
+    if (tree) {
+      dump_prefix(tree, offset+1);
+      printf("args:\n");
+      dump_recur(mrb, tree->car, offset+2);
+      if (tree->cdr) {
+        dump_prefix(tree, offset+1);
+        printf("block:\n");
+        mrb_parser_dump(mrb, tree->cdr, offset+2);
+      }
+    }
     break;
 
   case NODE_RETURN:
@@ -13008,11 +13890,11 @@
 
   case NODE_CLASS:
     printf("NODE_CLASS:\n");
-    if (tree->car->car == (node*)0) {
+    if (tree->car->car == nint(0)) {
       dump_prefix(tree, offset+1);
       printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
-    else if (tree->car->car == (node*)1) {
+    else if (tree->car->car == nint(1)) {
       dump_prefix(tree, offset+1);
       printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
@@ -13033,11 +13915,11 @@
 
   case NODE_MODULE:
     printf("NODE_MODULE:\n");
-    if (tree->car->car == (node*)0) {
+    if (tree->car->car == nint(0)) {
       dump_prefix(tree, offset+1);
       printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
-    else if (tree->car->car == (node*)1) {
+    else if (tree->car->car == nint(1)) {
       dump_prefix(tree, offset+1);
       printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr)));
     }
@@ -13142,7 +14024,10 @@
     break;
 
   case NODE_KW_REST_ARGS:
-    printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree)));
+    if (tree)
+      printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree)));
+    else
+      printf("NODE_KW_REST_ARGS\n");
     break;
 
   default:
@@ -13151,3 +14036,19 @@
   }
 #endif
 }
+
+typedef mrb_bool mrb_parser_foreach_top_variable_func(mrb_state *mrb, mrb_sym sym, void *user);
+void mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_parser_foreach_top_variable_func *func, void *user);
+
+void
+mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_parser_foreach_top_variable_func *func, void *user)
+{
+  const mrb_ast_node *n = p->tree;
+  if ((intptr_t)n->car == NODE_SCOPE) {
+    n = n->cdr->car;
+    for (; n; n = n->cdr) {
+      mrb_sym sym = sym(n->car);
+      if (sym && !func(mrb, sym, user)) break;
+    }
+  }
+}

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

@@ -3,36 +3,38 @@
   spec.author  = 'mruby developers'
   spec.summary = 'mruby compiler library'
 
-  lex_def = "#{dir}/core/lex.def"
-  core_objs = Dir.glob("#{dir}/core/*.c").map { |f|
-    next nil if build.cxx_exception_enabled? and f =~ /(codegen).c$/
-    objfile(f.pathmap("#{build_dir}/core/%n"))
-  }.compact
-
-  if build.cxx_exception_enabled?
-    core_objs <<
-      build.compile_as_cxx("#{dir}/core/y.tab.c", "#{build_dir}/core/y.tab.cxx",
-                           objfile("#{build_dir}/y.tab"), "#{dir}/core") <<
-      build.compile_as_cxx("#{dir}/core/codegen.c", "#{build_dir}/core/codegen.cxx")
-  else
-    core_objs << objfile("#{build_dir}/core/y.tab")
-    file objfile("#{build_dir}/core/y.tab") => "#{dir}/core/y.tab.c" do |t|
-      cc.run t.name, t.prerequisites.first, , "#{dir}/core"
+  objs = %wcodegen y.tab.map do |name|
+    src = "#{dir}/core/#{name}.c"
+    if build.cxx_exception_enabled?
+      build.compile_as_cxx(src)
+    else
+      objfile(src.pathmap("#{build_dir}/core/%n"))
     end
   end
+  build.libmruby_core_objs << objs
+end
+
+if MRuby::Build.current.name == "host"
+  dir = __dir__
+  lex_def = "#{dir}/core/lex.def"
 
   # Parser
   file "#{dir}/core/y.tab.c" => "#{dir}/core/parse.y", lex_def do |t|
-    yacc.run t.name, t.prerequisites.first
-    content = File.read(t.name).gsub(/^#line +\d+ +"\K.*$/){$&.relative_path}
-    File.write(t.name, content)
+    MRuby.targets"host".yacc.run t.name, t.prerequisites.first
+    replace_line_directive(t.name)
   end
 
   # Lexical analyzer
   file lex_def => "#{dir}/core/keywords" do |t|
-    gperf.run t.name, t.prerequisites.first
+    MRuby.targets"host".gperf.run t.name, t.prerequisites.first
+    replace_line_directive(t.name)
   end
 
-  file build.libmruby_core_static => core_objs
-  build.libmruby << core_objs
+  def replace_line_directive(path)
+    content = File.read(path).gsub(%r{
+      ^\#line\s+\d+\s+"\K.*(?="$) |             # #line directive
+      ^/\*\s+Command-line:.*\s\K\S+(?=\s+\*/$)  # header comment in lex.def
+    }x, &:relative_path)
+    File.write(path, content)
+  end
 end

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

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

@@ -8,58 +8,17 @@
   end
 
   def to_s
-    "#{real}#{'+' unless imaginary < 0}#{imaginary}i"
+    "#{real}#{'+' unless imaginary < 0}#{imaginary}#{'*' unless imaginary.finite?}i"
   end
 
   def +@
-    Complex(real, imaginary)
+    self
   end
 
   def -@
     Complex(-real, -imaginary)
   end
 
-  def +(rhs)
-    if rhs.is_a? Complex
-      Complex(real + rhs.real, imaginary + rhs.imaginary)
-    elsif rhs.is_a? Numeric
-      Complex(real + rhs, imaginary)
-    end
-  end
-
-  def -(rhs)
-    if rhs.is_a? Complex
-      Complex(real - rhs.real, imaginary - rhs.imaginary)
-    elsif rhs.is_a? Numeric
-      Complex(real - rhs, imaginary)
-    end
-  end
-
-  def *(rhs)
-    if rhs.is_a? Complex
-      Complex(real * rhs.real - imaginary * rhs.imaginary, real * rhs.imaginary + rhs.real * imaginary)
-    elsif rhs.is_a? Numeric
-      Complex(real * rhs, imaginary * rhs)
-    end
-  end
-
-  def /(rhs)
-    if rhs.is_a? Complex
-      __div__(rhs)
-    elsif rhs.is_a? Numeric
-      Complex(real / rhs, imaginary / rhs)
-    end
-  end
-  alias_method :quo, :/
-
-  def ==(rhs)
-    if rhs.is_a? Complex
-      real == rhs.real && imaginary == rhs.imaginary
-    elsif rhs.is_a? Numeric
-      imaginary == 0 && real == rhs
-    end
-  end
-
   def abs
     Math.hypot imaginary, real
   end
@@ -81,7 +40,7 @@
   alias_method :conj, :conjugate
 
   def fdiv(numeric)
-    Complex(real.to_f / numeric, imaginary.to_f / numeric)
+    Complex(real / numeric, imaginary / numeric)
   end
 
   def polar
@@ -97,6 +56,10 @@
   end
   alias_method :rect, :rectangular
 
+  def to_c
+    self
+  end
+
   def to_r
     raise RangeError.new "can't convert #{to_s} into Rational" unless imaginary.zero?
     Rational(real, 1)
@@ -104,19 +67,10 @@
 
   alias_method :imag, :imaginary
 
-  Fixnum, Float.each do |cls|
-    :+, :-, :*, :/, :==.each do |op|
-      cls.instance_eval do
-        original_operator_name = :"__original_operator_#{op}_complex"
-        alias_method original_operator_name, op
-        define_method op do |rhs|
-          if rhs.is_a? Complex
-            Complex(self).__send__(op, rhs)
-          else
-            __send__(original_operator_name, rhs)
-          end
-        end
-      end
+  Numeric.class_eval do
+    def i
+      Complex(0, self)
     end
   end
+  undef i
 end

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

@@ -1,75 +1,76 @@
 #include <mruby.h>
 #include <mruby/class.h>
 #include <mruby/numeric.h>
-#include <math.h>
+#include <mruby/presym.h>
 
-#ifdef MRB_WITHOUT_FLOAT
-# error Complex conflicts 'MRB_WITHOUT_FLOAT' configuration in your 'build_config.rb'
+#ifdef MRB_NO_FLOAT
+# error Complex conflicts with 'MRB_NO_FLOAT' configuration
 #endif
 
-struct mrb_complex {
-  mrb_float real;
-  mrb_float imaginary;
-};
-
-#ifdef MRB_USE_FLOAT
+#ifdef MRB_USE_FLOAT32
 #define F(x) x##f
 #else
 #define F(x) x
 #endif
 
-#if defined(MRB_64BIT) || defined(MRB_USE_FLOAT)
+struct mrb_complex {
+  mrb_float real;
+  mrb_float imaginary;
+};
 
-#define COMPLEX_USE_ISTRUCT
-/* use TT_ISTRUCT */
-#include <mruby/istruct.h>
+#if defined(MRB_32BIT) && !defined(MRB_USE_FLOAT32)
 
-#define complex_ptr(mrb, v) (struct mrb_complex*)mrb_istruct_ptr(v)
+struct RComplex {
+  MRB_OBJECT_HEADER;
+  struct mrb_complex *p;
+};
 
-static struct RBasic*
-complex_alloc(mrb_state *mrb, struct RClass *c, struct mrb_complex **p)
+static struct mrb_complex*
+complex_ptr(mrb_state *mrb, mrb_value v)
 {
-  struct RIStruct *s;
+  struct RComplex *r = (struct RComplex*)mrb_obj_ptr(v);
 
-  s = (struct RIStruct*)mrb_obj_alloc(mrb, MRB_TT_ISTRUCT, c);
-  *p = (struct mrb_complex*)s->inline_data;
-
-  return (struct RBasic*)s;
+  if (!r->p) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "uninitialized complex");
+  }
+  return r->p;
 }
 
 #else
-/* use TT_DATA */
-#include <mruby/data.h>
-
-static const struct mrb_data_type mrb_complex_type = {"Complex", mrb_free};
+#define COMPLEX_INLINE
+struct RComplex {
+  MRB_OBJECT_HEADER;
+  struct mrb_complex r;
+};
+#define complex_ptr(mrb, v) (&((struct RComplex*)mrb_obj_ptr(v))->r)
+#endif
 
 static struct RBasic*
 complex_alloc(mrb_state *mrb, struct RClass *c, struct mrb_complex **p)
 {
-  struct RData *d;
-
-  Data_Make_Struct(mrb, c, struct mrb_complex, &mrb_complex_type, *p, d);
-
-  return (struct RBasic*)d;
+  struct RComplex *s;
+  s = MRB_OBJ_ALLOC(mrb, MRB_TT_COMPLEX, c);
+#ifdef COMPLEX_INLINE
+  *p = &s->r;
+#else
+  *p = s->p = (struct mrb_complex*)mrb_malloc(mrb, sizeof(struct mrb_complex));
+#endif
+  return (struct RBasic*)s;
 }
 
-static struct mrb_complex*
-complex_ptr(mrb_state *mrb, mrb_value v)
+void
+mrb_complex_get(mrb_state *mrb, mrb_value cpx, mrb_float *r, mrb_float *i)
 {
-  struct mrb_complex *p;
+  struct mrb_complex *c = complex_ptr(mrb, cpx);
 
-  p = DATA_GET_PTR(mrb, v, &mrb_complex_type, struct mrb_complex);
-  if (!p) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "uninitialized complex");
-  }
-  return p;
+  *r = c->real;
+  *i = c->imaginary;
 }
-#endif
 
-static mrb_value
-complex_new(mrb_state *mrb, mrb_float real, mrb_float imaginary)
+mrb_value
+mrb_complex_new(mrb_state *mrb, mrb_float real, mrb_float imaginary)
 {
-  struct RClass *c = mrb_class_get(mrb, "Complex");
+  struct RClass *c = mrb_class_get_id(mrb, MRB_SYM(Complex));
   struct mrb_complex *p;
   struct RBasic *comp = complex_alloc(mrb, c, &p);
   p->real = real;
@@ -79,6 +80,8 @@
   return mrb_obj_value(comp);
 }
 
+#define complex_new(mrb, real, imag) mrb_complex_new(mrb, real, imag)
+
 static mrb_value
 complex_real(mrb_state *mrb, mrb_value self)
 {
@@ -102,8 +105,8 @@
   return complex_new(mrb, real, imaginary);
 }
 
-static mrb_value
-complex_to_f(mrb_state *mrb, mrb_value self)
+mrb_value
+mrb_complex_to_f(mrb_state *mrb, mrb_value self)
 {
   struct mrb_complex *p = complex_ptr(mrb, self);
 
@@ -114,15 +117,15 @@
   return mrb_float_value(mrb, p->real);
 }
 
-static mrb_value
-complex_to_i(mrb_state *mrb, mrb_value self)
+mrb_value
+mrb_complex_to_i(mrb_state *mrb, mrb_value self)
 {
   struct mrb_complex *p = complex_ptr(mrb, self);
 
   if (p->imaginary != 0) {
-    mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Float", self);
+    mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Integer", self);
   }
-  return mrb_int_value(mrb, p->real);
+  return mrb_int_value(mrb, (mrb_int)p->real);
 }
 
 static mrb_value
@@ -131,6 +134,104 @@
   return self;
 }
 
+mrb_bool
+mrb_complex_eq(mrb_state *mrb, mrb_value x, mrb_value y)
+{
+  struct mrb_complex *p1 = complex_ptr(mrb, x);
+
+  switch (mrb_type(y)) {
+  case MRB_TT_COMPLEX:
+    {
+      struct mrb_complex *p2 = complex_ptr(mrb, y);
+
+      if (p1->real == p2->real && p1->imaginary == p2->imaginary) {
+        return TRUE;
+      }
+      return FALSE;
+    }
+  case MRB_TT_INTEGER:
+    if (p1->imaginary != 0) return FALSE;
+    return p1->real == mrb_integer(y);
+  case MRB_TT_FLOAT:
+    if (p1->imaginary != 0) return FALSE;
+    return p1->real == mrb_float(y);
+
+  default:
+    return mrb_equal(mrb, y, x);
+  }
+}
+
+static mrb_value
+complex_eq(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  return mrb_bool_value(mrb_complex_eq(mrb, x, y));
+}
+
+static mrb_value
+complex_add(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  struct mrb_complex *p1 = complex_ptr(mrb, x);
+
+  switch (mrb_type(y)) {
+  case MRB_TT_COMPLEX:
+    {
+      struct mrb_complex *p2 = complex_ptr(mrb, y);
+      return mrb_complex_new(mrb, p1->real+p2->real, p1->imaginary+p2->imaginary);
+    }
+
+  default:
+    {
+      mrb_float z = mrb_as_float(mrb, y);
+      return mrb_complex_new(mrb, p1->real+z, p1->imaginary);
+    }
+  }
+}
+
+static mrb_value
+complex_sub(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  struct mrb_complex *p1 = complex_ptr(mrb, x);
+
+  switch (mrb_type(y)) {
+  case MRB_TT_COMPLEX:
+    {
+      struct mrb_complex *p2 = complex_ptr(mrb, y);
+      return mrb_complex_new(mrb, p1->real-p2->real, p1->imaginary-p2->imaginary);
+    }
+
+  default:
+    {
+      mrb_float z = mrb_as_float(mrb, y);
+      return mrb_complex_new(mrb, p1->real-z, p1->imaginary);
+    }
+  }
+}
+
+static mrb_value
+complex_mul(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  struct mrb_complex *p1 = complex_ptr(mrb, x);
+
+  switch (mrb_type(y)) {
+  case MRB_TT_COMPLEX:
+    {
+      struct mrb_complex *p2 = complex_ptr(mrb, y);
+      return mrb_complex_new(mrb, p1->real*p2->real - p1->imaginary*p2->imaginary,
+                                  p1->real*p2->imaginary + p2->real*p1->imaginary);
+    }
+
+  default:
+    {
+      mrb_float z = mrb_as_float(mrb, y);
+      return mrb_complex_new(mrb, p1->real*z, p1->imaginary*z);
+    }
+  }
+}
+
 /* Arithmetic on (significand, exponent) pairs avoids premature overflow in
    complex division */
 struct float_pair {
@@ -167,15 +268,22 @@
 div_pair(struct float_pair *q, struct float_pair const *a,
          struct float_pair const *b)
 {
-  q->s = a->s / b->s;
+  q->s = mrb_div_float(a->s, b->s);
   q->x = a->x - b->x;
 }
 
 static mrb_value
 complex_div(mrb_state *mrb, mrb_value self)
 {
-  mrb_value rhs = mrb_get_arg1(mrb);
   struct mrb_complex *a, *b;
+  mrb_value rhs = mrb_get_arg1(mrb);
+
+  a = complex_ptr(mrb, self);
+  if (mrb_type(rhs) != MRB_TT_COMPLEX) {
+    mrb_float f = mrb_as_float(mrb, rhs);
+    return complex_new(mrb, mrb_div_float(a->real, f), mrb_div_float(a->imaginary, f));
+  }
+
   struct float_pair ar, ai, br, bi;
   struct float_pair br2, bi2;
   struct float_pair div;
@@ -183,10 +291,9 @@
   struct float_pair ai_br, ar_bi;
   struct float_pair zr, zi;
 
-  a = complex_ptr(mrb, self);
   b = complex_ptr(mrb, rhs);
 
-  /* Split floating point components into significand and exponent */
+  /* Split floating-point components into significand and exponent */
   ar.s = F(frexp)(a->real, &ar.x);
   ai.s = F(frexp)(a->imaginary, &ai.x);
   br.s = F(frexp)(b->real, &br.x);
@@ -217,29 +324,110 @@
   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)
+{
+  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)));
+  }
+}
+
+/* 15.2.9.3.19(x) */
+/*
+ * redefine Integer#quo
+ */
+
+static mrb_value
+cpx_int_quo(mrb_state *mrb, mrb_value x)
+{
+  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)));
+  }
+}
+
+static mrb_value
+cpx_flo_div(mrb_state *mrb, mrb_value x)
+{
+  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);
+  }
+}
+
 void mrb_mruby_complex_gem_init(mrb_state *mrb)
 {
   struct RClass *comp;
 
-#ifdef COMPLEX_USE_ISTRUCT
-  mrb_assert(sizeof(struct mrb_complex) < ISTRUCT_DATA_SIZE);
-#endif
-  comp = mrb_define_class(mrb, "Complex", mrb_class_get(mrb, "Numeric"));
-#ifdef COMPLEX_USE_ISTRUCT
-  MRB_SET_INSTANCE_TT(comp, MRB_TT_ISTRUCT);
-#else
-  MRB_SET_INSTANCE_TT(comp, MRB_TT_DATA);
+#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);
+
   mrb_undef_class_method(mrb, comp, "new");
   mrb_define_class_method(mrb, comp, "rectangular", complex_s_rect, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
   mrb_define_class_method(mrb, comp, "rect", complex_s_rect, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
   mrb_define_method(mrb, mrb->kernel_module, "Complex", complex_s_rect, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
   mrb_define_method(mrb, comp, "real", complex_real, MRB_ARGS_NONE());
   mrb_define_method(mrb, comp, "imaginary", complex_imaginary, MRB_ARGS_NONE());
-  mrb_define_method(mrb, comp, "to_f", complex_to_f, MRB_ARGS_NONE());
-  mrb_define_method(mrb, comp, "to_i", complex_to_i, MRB_ARGS_NONE());
+  mrb_define_method(mrb, comp, "to_f", mrb_complex_to_f, MRB_ARGS_NONE());
+  mrb_define_method(mrb, comp, "to_i", mrb_complex_to_i, MRB_ARGS_NONE());
   mrb_define_method(mrb, comp, "to_c", complex_to_c, MRB_ARGS_NONE());
-  mrb_define_method(mrb, comp, "__div__", complex_div, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, comp, "+", complex_add, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, comp, "-", complex_sub, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, comp, "*", complex_mul, MRB_ARGS_REQ(1));
+  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 */
 }
 
 void

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

@@ -31,6 +31,8 @@
   assert_complex Complex(-2, 9) * Complex(-9, 2), (0     - 85i)
   assert_complex Complex(9, 8)  * 4,              (36    + 32i)
   assert_complex Complex(20, 9) * 9.8,            (196.0 + 88.2i)
+  assert_complex 4 * Complex(9, 8),               (36    + 32i)
+  assert_complex 9.8 * Complex(20, 9),            (196.0 + 88.2i)
 end
 
 assert 'Complex#+' do
@@ -39,6 +41,8 @@
   assert_complex Complex(-2, 9) + Complex(-9, 2), (-11  + 11i)
   assert_complex Complex(9, 8)  + 4             , (13   + 8i)
   assert_complex Complex(20, 9) + 9.8           , (29.8 + 9i)
+  assert_complex 4 + Complex(9, 8)              , (13   + 8i)
+  assert_complex 9.8 + Complex(20, 9)           , (29.8 + 9i)
 end
 
 assert 'Complex#-' do
@@ -47,20 +51,24 @@
   assert_complex Complex(-2, 9) - Complex(-9, 2), (7    + 7i)
   assert_complex Complex(9, 8)  - 4             , (5    + 8i)
   assert_complex Complex(20, 9) - 9.8           , (10.2 + 9i)
+  assert_complex 4 - Complex(9, 8)              , (-5   - 8i)
+  assert_complex 10.5 - Complex(20, 9)          , (-9.5 - 9i)
 end
 
 assert 'Complex#-@' do
-  assert_complex(-Complex(1, 2), (-1 - 2i))
+  assert_complex((-1 - 2i), -Complex(1, 2))
 end
 
 assert 'Complex#/' do
   assert_complex Complex(2, 3)  / Complex(2, 3) , (1                  + 0i)
   assert_complex Complex(900)   / Complex(1)    , (900                + 0i)
-  assert_complex Complex(-2, 9) / Complex(-9, 2), ((36 / 85)          - (77i / 85))
-  assert_complex Complex(9, 8)  / 4             , ((9 / 4)            + 2i)
+  assert_complex Complex(-2, 9) / Complex(-9, 2), ((36.0 / 85)        - (77i / 85))
+  assert_complex Complex(9, 8)  / 4             , ((9.0 / 4)          + 2i)
   assert_complex Complex(20, 9) / 9.8           , (2.0408163265306123 + 0.9183673469387754i)
+  assert_complex 4 / Complex(9, 8)              , (0.2482758620689655 - 0.2206896551724138i)
+  assert_complex 9.8 / Complex(20, 9)           , (0.4074844074844075 - 0.1833679833679834i)
   if 1e39.infinite? then
-    # MRB_USE_FLOAT in effect
+    # MRB_USE_FLOAT32 in effect
     ten = 1e21
     one = 1e20
   else
@@ -74,13 +82,15 @@
   assert_true  Complex(2, 3)  == Complex(2, 3)
   assert_true  Complex(5)     == 5
   assert_true  Complex(0)     == 0.0
+  assert_true  5 == Complex(5)
+  assert_true  0.0 == Complex(0)
 end
 
 assert 'Complex#abs' do
   assert_float Complex(-1).abs,        1
   assert_float Complex(3.0, -4.0).abs, 5.0
   if 1e39.infinite? then
-    # MRB_USE_FLOAT in effect
+    # MRB_USE_FLOAT32 in effect
     exp = 125
   else
     exp = 1021

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

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

@@ -100,7 +100,6 @@
 assert("Enumerable#none?") do
   assert_true %w(ant bear cat).none? { |word| word.length == 5 }
   assert_false %w(ant bear cat).none? { |word| word.length >= 4 }
-  assert_false 1, 3.14, 42.none?(Float)
   assert_true .none?
   assert_true nil, false.none?
   assert_false nil, true.none?
@@ -110,21 +109,21 @@
   assert_true %w(ant bear cat).one? { |word| word.length == 4 }
   assert_false %w(ant bear cat).one? { |word| word.length > 4 }
   assert_false %w(ant bear cat).one? { |word| word.length < 4 }
-  assert_true 1, 3.14, 42.one?(Float)
   assert_false nil, true, 99.one?
   assert_true nil, true, false.one?
   assert_true  nil, true, 99 .one?(Integer)
   assert_false .one?
+  assert_true nil, true, false.one?(NilClass)
 end
 
 assert("Enumerable#all? (enhancement)") do
-  assert_false 1, 2, 3.14.all?(Integer)
-  assert_true 1, 2, 3.14.all?(Numeric)
+  assert_false 1, 2, nil.all?(Integer)
+  assert_true 1, 2, 3.all?(Numeric)
 end
 
 assert("Enumerable#any? (enhancement)") do
-  assert_false 1, 2, 3.all?(Float)
   assert_true nil, true, 99.any?(Integer)
+  assert_false 1, 2, 3.any?(Array)
 end
 
 assert("Enumerable#each_with_object") do

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-enum-lazy/test/lazy.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-enum-lazy/test/lazy.rb Changed

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

@@ -89,7 +89,7 @@
   include Enumerable
 
   ##
-  # @overload initialize(obj, method = :each, *args)
+  # @overload initialize(obj, method = :each, *args, **kwd)
   #
   # Creates a new Enumerator object, which can be used as an
   # Enumerable.
@@ -114,7 +114,7 @@
   #
   # Use of this form is discouraged.  Use Kernel#enum_for or Kernel#to_enum
   # instead.
-  def initialize(obj=NONE, meth=:each, *args, &block)
+  def initialize(obj=NONE, meth=:each, *args, **kwd, &block)
     if block
       obj = Generator.new(&block)
     elsif obj == NONE
@@ -124,13 +124,15 @@
     @obj = obj
     @meth = meth
     @args = args
+    @kwd = kwd
     @fib = nil
     @dst = nil
     @lookahead = nil
     @feedvalue = nil
     @stop_exc = false
   end
-  attr_accessor :obj, :meth, :args
+
+  attr_accessor :obj, :meth, :args, :kwd
   attr_reader :fib
 
   def initialize_copy(obj)
@@ -139,6 +141,7 @@
     @obj = obj.obj
     @meth = obj.meth
     @args = obj.args
+    @kwd = obj.kwd
     @fib = nil
     @lookahead = nil
     @feedvalue = nil
@@ -285,7 +288,7 @@
   end
 
   def enumerator_block_call(&block)
-    @obj.__send__ @meth, *@args, &block
+    @obj.__send__ @meth, *@args, **@kwd, &block
   end
   private :enumerator_block_call
 
@@ -630,7 +633,7 @@
   #       def repeat(n)
   #         raise ArgumentError, "#{n} is negative!" if n < 0
   #         unless block_given?
-  #           return to_enum(__method__, n) # __method__ is :repeat here
+  #           return to_enum(__callee__, n) do # __callee__ is :repeat here
   #         end
   #         each do |*val|
   #           n.times { yield *val }

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

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

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

@@ -1,57 +1,38 @@
 #include <mruby.h>
-#include <mruby/throw.h>
 #include <mruby/error.h>
 
+struct protect_data {
+  mrb_func_t body;
+  mrb_value data;
+};
+
+static mrb_value
+protect_body(mrb_state *mrb, void *p)
+{
+  struct protect_data *dp = (struct protect_data*)p;
+  return dp->body(mrb, dp->data);
+}
+
 MRB_API mrb_value
 mrb_protect(mrb_state *mrb, mrb_func_t body, mrb_value data, mrb_bool *state)
 {
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-  struct mrb_jmpbuf c_jmp;
-  mrb_value result = mrb_nil_value();
-  int ai = mrb_gc_arena_save(mrb);
-
-  if (state) { *state = FALSE; }
-
-  MRB_TRY(&c_jmp) {
-    mrb->jmp = &c_jmp;
-    result = body(mrb, data);
-    mrb->jmp = prev_jmp;
-  } MRB_CATCH(&c_jmp) {
-    mrb->jmp = prev_jmp;
-    result = mrb_obj_value(mrb->exc);
-    mrb->exc = NULL;
-    if (state) { *state = TRUE; }
-  } MRB_END_EXC(&c_jmp);
-
-  mrb_gc_arena_restore(mrb, ai);
-  mrb_gc_protect(mrb, result);
-  return result;
+  struct protect_data protect_data = { body, data };
+  return mrb_protect_error(mrb, protect_body, &protect_data, state);
 }
 
 MRB_API mrb_value
 mrb_ensure(mrb_state *mrb, mrb_func_t body, mrb_value b_data, mrb_func_t ensure, mrb_value e_data)
 {
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-  struct mrb_jmpbuf c_jmp;
-  mrb_value result;
   int ai = mrb_gc_arena_save(mrb);
-
-  MRB_TRY(&c_jmp) {
-    mrb->jmp = &c_jmp;
-    result = body(mrb, b_data);
-    mrb->jmp = prev_jmp;
-  } MRB_CATCH(&c_jmp) {
-    mrb->jmp = prev_jmp;
-    mrb_gc_arena_restore(mrb, ai);
-    ensure(mrb, e_data);
-    MRB_THROW(mrb->jmp); /* rethrow catched exceptions */
-  } MRB_END_EXC(&c_jmp);
-
-  mrb_gc_arena_restore(mrb, ai);
-  mrb_gc_protect(mrb, result);
+  struct protect_data protect_data = { body, b_data };
+  mrb_bool error;
+  mrb_value result = mrb_protect_error(mrb, protect_body, &protect_data, &error);
   ensure(mrb, e_data);
   mrb_gc_arena_restore(mrb, ai);
   mrb_gc_protect(mrb, result);
+  if (error) {
+    mrb_exc_raise(mrb, result); /* rethrow caught exceptions */
+  }
   return result;
 }
 
@@ -66,36 +47,26 @@
 mrb_rescue_exceptions(mrb_state *mrb, mrb_func_t body, mrb_value b_data, mrb_func_t rescue, mrb_value r_data,
                       mrb_int len, struct RClass **classes)
 {
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-  struct mrb_jmpbuf c_jmp;
-  mrb_value result;
-  mrb_bool error_matched = FALSE;
-  mrb_int i;
   int ai = mrb_gc_arena_save(mrb);
-
-  MRB_TRY(&c_jmp) {
-    mrb->jmp = &c_jmp;
-    result = body(mrb, b_data);
-    mrb->jmp = prev_jmp;
-  } MRB_CATCH(&c_jmp) {
-    mrb->jmp = prev_jmp;
-
-    for (i = 0; i < len; ++i) {
-      if (mrb_obj_is_kind_of(mrb, mrb_obj_value(mrb->exc), classesi)) {
+  struct protect_data protect_data = { body, b_data };
+  mrb_bool error;
+  mrb_value result = mrb_protect_error(mrb, protect_body, &protect_data, &error);
+  if (error) {
+    mrb_bool error_matched = FALSE;
+    for (mrb_int i = 0; i < len; ++i) {
+      if (mrb_obj_is_kind_of(mrb, result, classesi)) {
         error_matched = TRUE;
         break;
       }
     }
 
-    if (!error_matched) { MRB_THROW(mrb->jmp); }
+    if (!error_matched) { mrb_exc_raise(mrb, result); }
 
     mrb->exc = NULL;
-    mrb_gc_arena_restore(mrb, ai);
     result = rescue(mrb, r_data);
-  } MRB_END_EXC(&c_jmp);
-
-  mrb_gc_arena_restore(mrb, ai);
-  mrb_gc_protect(mrb, result);
+    mrb_gc_arena_restore(mrb, ai);
+    mrb_gc_protect(mrb, result);
+  }
   return result;
 }

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

@@ -5,47 +5,87 @@
 #include <mruby/proc.h>
 #include <mruby/opcode.h>
 #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*);
 
 static struct RProc*
-create_proc_from_string(mrb_state *mrb, char *s, mrb_int len, mrb_value binding, const char *file, mrb_int line)
+create_proc_from_string(mrb_state *mrb, const char *s, mrb_int len, mrb_value binding, const char *file, mrb_int line)
 {
   mrbc_context *cxt;
   struct mrb_parser_state *p;
   struct RProc *proc;
+  const struct RProc *scope;
   struct REnv *e;
   mrb_callinfo *ci; /* callinfo of eval caller */
   struct RClass *target_class = NULL;
-  int bidx;
+  struct mrb_context *c = mrb->c;
 
   if (!mrb_nil_p(binding)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Binding of eval must be nil.");
+    mrb_value scope_obj;
+    if (!mrb_class_defined_id(mrb, MRB_SYM(Binding))
+        || !mrb_obj_is_kind_of(mrb, binding, mrb_class_get_id(mrb, MRB_SYM(Binding)))) {
+      mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %C (expected binding)",
+          mrb_obj_class(mrb, binding));
+    }
+    scope_obj = mrb_iv_get(mrb, binding, MRB_SYM(proc));
+    mrb_assert(mrb_proc_p(scope_obj));
+    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));
+      e = (struct REnv *)mrb_obj_ptr(env);
+      mrb_assert(e != NULL);
+    }
+  }
+  else {
+    ci = (c->ci > c->cibase) ? c->ci - 1 : c->cibase;
+    scope = ci->proc;
+    e = NULL;
+  }
+
+  if (file) {
+    if (strlen(file) >= UINT16_MAX) {
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "filename too long");
+    }
+  }
+  else {
+    file = "(eval)";
   }
 
   cxt = mrbc_context_new(mrb);
   cxt->lineno = (uint16_t)line;
 
-  mrbc_filename(mrb, cxt, file ? file : "(eval)");
+  mrbc_filename(mrb, cxt, file);
   cxt->capture_errors = TRUE;
   cxt->no_optimize = TRUE;
-  ci = (mrb->c->ci > mrb->c->cibase) ? mrb->c->ci - 1 : mrb->c->cibase;
-  cxt->upper = ci->proc && MRB_PROC_CFUNC_P(ci->proc) ? NULL : ci->proc;
+  cxt->upper = scope && MRB_PROC_CFUNC_P(scope) ? NULL : scope;
 
   p = mrb_parse_nstring(mrb, s, len, cxt);
 
   /* only occur when memory ran out */
   if (!p) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "Failed to create parser state.");
+    mrbc_context_free(mrb, cxt);
+    mrb_raise(mrb, E_RUNTIME_ERROR, "Failed to create parser state (out of memory)");
   }
 
   if (0 < p->nerr) {
     /* parse error */
     mrb_value str;
 
+    mrbc_context_free(mrb, cxt);
+    if (!p->error_buffer0.message) {
+      mrb_parser_free(p);
+      mrb_raise(mrb, E_SYNTAX_ERROR, "compile error");
+    }
     if (file) {
       str = mrb_format(mrb, "file %s line %d: %s",
                        file,
@@ -58,7 +98,6 @@
                        p->error_buffer0.message);
     }
     mrb_parser_free(p);
-    mrbc_context_free(mrb, cxt);
     mrb_exc_raise(mrb, mrb_exc_new_str(mrb, E_SYNTAX_ERROR, str));
   }
 
@@ -69,38 +108,30 @@
     mrbc_context_free(mrb, cxt);
     mrb_raise(mrb, E_SCRIPT_ERROR, "codegen error");
   }
-  if (mrb->c->ci > mrb->c->cibase) {
-    ci = &mrb->c->ci-1;
+  if (c->ci > c->cibase) {
+    ci = &c->ci-1;
   }
   else {
-    ci = mrb->c->cibase;
-  }
-  if (ci->proc) {
-    target_class = MRB_PROC_TARGET_CLASS(ci->proc);
+    ci = c->cibase;
   }
-  if (ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) {
-    if (ci->env) {
-      e = ci->env;
+  if (scope) {
+    target_class = MRB_PROC_TARGET_CLASS(scope);
+    if (!MRB_PROC_CFUNC_P(scope)) {
+      if (e == NULL) {
+        /* when `binding` is nil */
+        e = mrb_vm_ci_env(ci);
+        if (e == NULL) {
+          e = mrb_env_new(mrb, c, ci, ci->proc->body.irep->nlocals, ci->stack, target_class);
+          ci->u.env = e;
+        }
+      }
+      proc->e.env = e;
+      proc->flags |= MRB_PROC_ENVSET;
+      mrb_field_write_barrier(mrb, (struct RBasic*)proc, (struct RBasic*)e);
     }
-    else {
-      e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV,
-                                      (struct RClass*)target_class);
-      e->mid = ci->mid;
-      e->stack = ci1.stackent;
-      e->cxt = mrb->c;
-      MRB_ENV_SET_LEN(e, ci->proc->body.irep->nlocals);
-      bidx = ci->argc;
-      if (ci->argc < 0) bidx = 2;
-      else bidx += 1;
-      MRB_ENV_SET_BIDX(e, bidx);
-      ci->env = e;
-    }
-    proc->e.env = e;
-    proc->flags |= MRB_PROC_ENVSET;
-    mrb_field_write_barrier(mrb, (struct RBasic*)proc, (struct RBasic*)e);
   }
-  proc->upper = ci->proc;
-  mrb->c->ci->target_class = target_class;
+  proc->upper = scope;
+  mrb_vm_ci_target_class_set(mrb->c->ci, target_class);
   /* mrb_codedump_all(mrb, proc); */
 
   mrb_parser_free(p);
@@ -113,34 +144,29 @@
 exec_irep(mrb_state *mrb, mrb_value self, struct RProc *proc)
 {
   /* no argument passed from eval() */
-  mrb->c->ci->argc = 0;
-  if (mrb->c->ci->acc < 0) {
-    ptrdiff_t cioff = mrb->c->ci - mrb->c->cibase;
-    mrb_value ret = mrb_top_run(mrb, proc, self, 0);
-    if (mrb->exc) {
-      mrb_exc_raise(mrb, mrb_obj_value(mrb->exc));
-    }
-    mrb->c->ci = mrb->c->cibase + cioff;
-    return ret;
-  }
+  mrb->c->ci->n = 0;
+  mrb->c->ci->nk = 0;
   /* clear block */
-  mrb->c->stack1 = mrb_nil_value();
+  mrb->c->ci->stack1 = mrb_nil_value();
   return mrb_exec_irep(mrb, self, proc);
 }
 
 static mrb_value
 f_eval(mrb_state *mrb, mrb_value self)
 {
-  char *s;
+  const char *s;
   mrb_int len;
   mrb_value binding = mrb_nil_value();
-  char *file = NULL;
+  const char *file = NULL;
   mrb_int line = 1;
   struct RProc *proc;
 
   mrb_get_args(mrb, "s|ozi", &s, &len, &binding, &file, &line);
 
   proc = create_proc_from_string(mrb, s, len, binding, file, line);
+  if (!mrb_nil_p(binding)) {
+    self = mrb_iv_get(mrb, binding, MRB_SYM(recv));
+  }
   mrb_assert(!MRB_PROC_CFUNC_P(proc));
   return exec_irep(mrb, self, proc);
 }
@@ -148,15 +174,10 @@
 static mrb_value
 f_instance_eval(mrb_state *mrb, mrb_value self)
 {
-  mrb_value b;
-  mrb_int argc; mrb_value *argv;
-
-  mrb_get_args(mrb, "*!&", &argv, &argc, &b);
-
-  if (mrb_nil_p(b)) {
-    char *s;
+  if (!mrb_block_given_p(mrb)) {
+    const char *s;
     mrb_int len;
-    char *file = NULL;
+    const char *file = NULL;
     mrb_int line = 1;
     mrb_value cv;
     struct RProc *proc;
@@ -166,20 +187,45 @@
     proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
     MRB_PROC_SET_TARGET_CLASS(proc, mrb_class_ptr(cv));
     mrb_assert(!MRB_PROC_CFUNC_P(proc));
-    mrb->c->ci->target_class = mrb_class_ptr(cv);
+    mrb_vm_ci_target_class_set(mrb->c->ci, mrb_class_ptr(cv));
     return exec_irep(mrb, self, proc);
   }
   else {
-    mrb_get_args(mrb, "&", &b);
+    mrb_get_args(mrb, "");
     return mrb_obj_instance_eval(mrb, self);
   }
 }
 
+static mrb_value
+f_class_eval(mrb_state *mrb, mrb_value self)
+{
+  if (!mrb_block_given_p(mrb)) {
+    const char *s;
+    mrb_int len;
+    const char *file = NULL;
+    mrb_int line = 1;
+    struct RProc *proc;
+
+    mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
+    proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
+    MRB_PROC_SET_TARGET_CLASS(proc, mrb_class_ptr(self));
+    mrb_assert(!MRB_PROC_CFUNC_P(proc));
+    mrb_vm_ci_target_class_set(mrb->c->ci, mrb_class_ptr(self));
+    return exec_irep(mrb, self, proc);
+  }
+  else {
+    mrb_get_args(mrb, "");
+    return mrb_mod_module_eval(mrb, self);
+  }
+}
+
 void
 mrb_mruby_eval_gem_init(mrb_state* mrb)
 {
   mrb_define_module_function(mrb, mrb->kernel_module, "eval", f_eval, MRB_ARGS_ARG(1, 3));
-  mrb_define_method(mrb, mrb_class_get(mrb, "BasicObject"), "instance_eval", f_instance_eval, MRB_ARGS_OPT(3)|MRB_ARGS_BLOCK());
+  mrb_define_method_id(mrb, mrb_class_get_id(mrb, MRB_SYM(BasicObject)), MRB_SYM(instance_eval), f_instance_eval, MRB_ARGS_OPT(3)|MRB_ARGS_BLOCK());
+  mrb_define_method_id(mrb, mrb_class_get_id(mrb, MRB_SYM(Module)), MRB_SYM(module_eval), f_class_eval, MRB_ARGS_OPT(3)|MRB_ARGS_BLOCK());
+  mrb_define_method_id(mrb, mrb_class_get_id(mrb, MRB_SYM(Module)), MRB_SYM(class_eval), f_class_eval, MRB_ARGS_OPT(3)|MRB_ARGS_BLOCK());
 }
 
 void

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

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

@@ -7,7 +7,8 @@
 
 #define FIBER_STACK_INIT_SIZE 64
 #define FIBER_CI_INIT_SIZE 8
-#define CI_ACC_RESUMED -3
+/* copied from vm.c */
+#define CINFO_RESUMED 3
 
 /*
  *  call-seq:
@@ -93,9 +94,7 @@
   }
   c->stbase = (mrb_value *)mrb_malloc(mrb, slen*sizeof(mrb_value));
   c->stend = c->stbase + slen;
-  c->stack = c->stbase;
 
-#ifdef MRB_NAN_BOXING
   {
     mrb_value *p = c->stbase;
     mrb_value *pend = c->stend;
@@ -105,25 +104,21 @@
       p++;
     }
   }
-#else
-  memset(c->stbase, 0, slen * sizeof(mrb_value));
-#endif
 
   /* copy receiver from a block */
-  c->stack0 = mrb->c->stack0;
+  c->stbase0 = mrb->c->ci->stack0;
 
   /* initialize callinfo stack */
   c->cibase = (mrb_callinfo *)mrb_calloc(mrb, FIBER_CI_INIT_SIZE, sizeof(mrb_callinfo));
   c->ciend = c->cibase + FIBER_CI_INIT_SIZE;
   c->ci = c->cibase;
-  c->ci->stackent = c->stack;
 
   /* adjust return callinfo */
   ci = c->ci;
-  ci->target_class = MRB_PROC_TARGET_CLASS(p);
-  ci->proc = p;
+  mrb_vm_ci_target_class_set(ci, MRB_PROC_TARGET_CLASS(p));
+  mrb_vm_ci_proc_set(ci, p);
   mrb_field_write_barrier(mrb, (struct RBasic*)mrb_obj_ptr(self), (struct RBasic*)p);
-  ci->pc = p->body.irep->iseq;
+  ci->stack = c->stbase;
   ci1 = ci0;
   c->ci++;                      /* push dummy callinfo */
 
@@ -154,7 +149,7 @@
 }
 
 /* mark return from context modifying method */
-#define MARK_CONTEXT_MODIFY(c) (c)->ci->target_class = NULL
+#define MARK_CONTEXT_MODIFY(c) (c)->ci->u.target_class = NULL
 
 static void
 fiber_check_cfunc(mrb_state *mrb, struct mrb_context *c)
@@ -162,7 +157,7 @@
   mrb_callinfo *ci;
 
   for (ci = c->ci; ci >= c->cibase; ci--) {
-    if (ci->acc < 0) {
+    if (ci->cci > 0) {
       mrb_raise(mrb, E_FIBER_ERROR, "can't cross C function boundary");
     }
   }
@@ -213,22 +208,35 @@
     if (!c->ci->proc) {
       mrb_raise(mrb, E_FIBER_ERROR, "double resume (current)");
     }
-    mrb_stack_extend(mrb, len+2); /* for receiver and (optional) block */
-    b = c->stack+1;
-    e = b + len;
-    while (b<e) {
-      *b++ = *a++;
+    if (vmexec) {
+      c->ci--;                    /* pop dummy callinfo */
     }
-    c->cibase->argc = (int)len;
-    value = c->stack0 = MRB_PROC_ENV(c->ci->proc)->stack0;
+    if (len >= 15) {
+      mrb_stack_extend(mrb, 3);   /* for receiver, args and (optional) block */
+      c->stbase1 = mrb_ary_new_from_values(mrb, len, a);
+      len = 15;
+    }
+    else {
+      mrb_stack_extend(mrb, len+2); /* for receiver and (optional) block */
+      b = c->stbase+1;
+      e = b + len;
+      while (b<e) {
+        *b++ = *a++;
+      }
+    }
+    c->cibase->n = len;
+    value = c->stbase0 = MRB_PROC_ENV(c->cibase->proc)->stack0;
   }
   else {
     value = fiber_result(mrb, a, len);
+    if (vmexec) {
+      c->ci1.stack0 = value;
+    }
   }
 
   if (vmexec) {
     c->vmexec = TRUE;
-    value = mrb_vm_exec(mrb, c->ci-1.proc, c->ci->pc);
+    value = mrb_vm_exec(mrb, c->ci->proc, c->ci->pc);
     mrb->c = old_c;
   }
   else {
@@ -255,12 +263,12 @@
 static mrb_value
 fiber_resume(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *a;
+  const mrb_value *a;
   mrb_int len;
   mrb_bool vmexec = FALSE;
 
   mrb_get_args(mrb, "*!", &a, &len);
-  if (mrb->c->ci->acc < 0) {
+  if (mrb->c->ci->cci > 0) {
     vmexec = TRUE;
   }
   return fiber_switch(mrb, self, len, a, TRUE, vmexec);
@@ -315,7 +323,7 @@
 fiber_transfer(mrb_state *mrb, mrb_value self)
 {
   struct mrb_context *c = fiber_check(mrb, self);
-  mrb_value* a;
+  const mrb_value* a;
   mrb_int len;
 
   fiber_check_cfunc(mrb, mrb->c);
@@ -353,7 +361,8 @@
   c->prev = NULL;
   if (c->vmexec) {
     c->vmexec = FALSE;
-    mrb->c->ci->acc = CI_ACC_RESUMED;
+    mrb->c->ci->cci = CINFO_RESUMED;
+    c->ci--;                    /* pop callinfo for yield */
   }
   MARK_CONTEXT_MODIFY(mrb->c);
   return fiber_result(mrb, a, len);
@@ -374,7 +383,7 @@
 static mrb_value
 fiber_yield(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *a;
+  const mrb_value *a;
   mrb_int len;
 
   mrb_get_args(mrb, "*!", &a, &len);
@@ -392,7 +401,7 @@
 fiber_current(mrb_state *mrb, mrb_value self)
 {
   if (!mrb->c->fib) {
-    struct RFiber *f = (struct RFiber*)mrb_obj_alloc(mrb, MRB_TT_FIBER, mrb_class_ptr(self));
+    struct RFiber *f = MRB_OBJ_ALLOC(mrb, MRB_TT_FIBER, mrb_class_ptr(self));
 
     f->cxt = mrb->c;
     mrb->c->fib = f;

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

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

@@ -22,7 +22,8 @@
 static mrb_value
 hash_values_at(mrb_state *mrb, mrb_value hash)
 {
-  mrb_value *argv, result;
+  const mrb_value *argv;
+  mrb_value result;
   mrb_int argc, i;
   int ai;
 
@@ -49,7 +50,8 @@
 static mrb_value
 hash_slice(mrb_state *mrb, mrb_value hash)
 {
-  mrb_value *argv, result;
+  const mrb_value *argv;
+  mrb_value result;
   mrb_int argc, i;
 
   mrb_get_args(mrb, "*", &argv, &argc);
@@ -67,6 +69,31 @@
   return result;
 }
 
+/*
+ *  call-seq:
+ *     hsh.except(*keys) -> a_hash
+ *
+ *  Returns a hash excluding the given keys and their values.
+ *
+ *     h = { a: 100, b: 200, c: 300 }
+ *     h.except(:a)          #=> {:b=>200, :c=>300}
+ *     h.except(:b, :c, :d)  #=> {:a=>100}
+ */
+static mrb_value
+hash_except(mrb_state *mrb, mrb_value hash)
+{
+  const mrb_value *argv;
+  mrb_value result;
+  mrb_int argc, i;
+
+  mrb_get_args(mrb, "*", &argv, &argc);
+  result = mrb_hash_dup(mrb, hash);
+  for (i = 0; i < argc; i++) {
+    mrb_hash_delete_key(mrb, result, argvi);
+  }
+  return result;
+}
+
 void
 mrb_mruby_hash_ext_gem_init(mrb_state *mrb)
 {
@@ -75,6 +102,7 @@
   h = mrb->hash_class;
   mrb_define_method(mrb, h, "values_at", hash_values_at, MRB_ARGS_ANY());
   mrb_define_method(mrb, h, "slice",     hash_slice, MRB_ARGS_ANY());
+  mrb_define_method(mrb, h, "except",    hash_except, MRB_ARGS_ANY());
 }
 
 void

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

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

@@ -1,10 +1,10 @@
-mruby-io
-========
+# mruby-io
 
 `IO` and `File` classes for mruby
 
 ## Installation
-Add the line below to your `build_config.rb`:
+
+Add the line below to your build configuration.
 
 ```
   conf.gem core: 'mruby-io'
@@ -13,7 +13,8 @@
 ## Implemented methods
 
 ### IO
- - http://doc.ruby-lang.org/ja/1.9.3/class/IO.html
+
+* <https://doc.ruby-lang.org/ja/1.9.3/class/IO.html>
 
 | method                     | mruby-io | memo |
 | -------------------------  | -------- | ---- |
@@ -57,7 +58,7 @@
 | IO#fileno, IO#to_i         |    o     |      |
 | IO#flush                   |    o     |      |
 | IO#fsync                   |          |      |
-| IO#getbyte                 |          |      |
+| IO#getbyte                 |    o     |      |
 | IO#getc                    |    o     |      |
 | IO#gets                    |    o     |      |
 | IO#internal_encoding       |          |      |
@@ -75,7 +76,7 @@
 | IO#puts                    |    o     |      |
 | IO#read                    |    o     |      |
 | IO#read_nonblock           |          |      |
-| IO#readbyte                |          |      |
+| IO#readbyte                |    o     |      |
 | IO#readchar                |    o     |      |
 | IO#readline                |    o     |      |
 | IO#readlines               |    o     |      |
@@ -91,13 +92,14 @@
 | IO#sysseek                 |    o     |      |
 | IO#syswrite                |    o     |      |
 | IO#to_io                   |          |      |
-| IO#ungetbyte               |          |      |
+| IO#ungetbyte               |    o     |      |
 | IO#ungetc                  |    o     |      |
 | IO#write                   |    o     |      |
 | IO#write_nonblock          |          |      |
 
 ### File
- - http://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 |
 | --------------------------- | -------- | ---- |
@@ -167,26 +169,25 @@
 | File#size                   |          |      |
 | File#truncate               |          |      |
 
-
 ## License
 
 Copyright (c) 2013 Internet Initiative Japan Inc.
 Copyright (c) 2017 mruby developers
 
-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 
+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 
+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 
+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.46.0.tar.xz/third-party/mruby/mrbgems/mruby-io/include/mruby/ext/io.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/include/mruby/ext/io.h Changed

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

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

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

@@ -26,11 +26,11 @@
     end
   end
 
-  def self.popen(command, mode = 'r', opts={}, &block)
+  def self.popen(command, mode = 'r', **opts, &block)
     if !self.respond_to?(:_popen)
       raise NotImplementedError, "popen is not supported on this platform"
     end
-    io = self._popen(command, mode, opts)
+    io = self._popen(command, mode, **opts)
     return io unless block
 
     begin
@@ -61,39 +61,14 @@
     end
   end
 
-  def self.read(path, length=nil, offset=nil, opt=nil)
-    if not opt.nil?        # 4 arguments
-      offset ||= 0
-    elsif not offset.nil?  # 3 arguments
-      if offset.is_a? Hash
-        opt = offset
-        offset = 0
-      else
-        opt = {}
-      end
-    elsif not length.nil?  # 2 arguments
-      if length.is_a? Hash
-        opt = length
-        offset = 0
-        length = nil
-      else
-        offset = 0
-        opt = {}
-      end
-    else                   # only 1 argument
-      opt = {}
-      offset = 0
-      length = nil
-    end
-
+  def self.read(path, length=nil, offset=0, mode: "r")
     str = ""
     fd = -1
     io = nil
     begin
       if path0 == "|"
-        io = IO.popen(path1..-1, (opt:mode || "r"))
+        io = IO.popen(path1..-1, mode)
       else
-        mode = opt:mode || "r"
         fd = IO.sysopen(path, mode)
         io = IO.open(fd, mode)
       end
@@ -184,9 +159,20 @@
     nil
   end
 
+  def ungetbyte(c)
+    if c.is_a? String
+      c = c.getbyte(0)
+    else
+      c &= 0xff
+    end
+    s = " "
+    s.setbyte(0,c)
+    ungetc s
+  end
+
   def read(length = nil, outbuf = "")
     unless length.nil?
-      unless length.is_a? Fixnum
+      unless length.is_a? Integer
         raise TypeError.new "can't convert #{length.class} into Integer"
       end
       if length < 0
@@ -198,7 +184,7 @@
     end
 
     array = 
-    while 1
+    while true
       begin
         _read_buf
       rescue EOFError
@@ -229,7 +215,7 @@
     case arg
     when String
       rs = arg
-    when Fixnum
+    when Integer
       rs = "\n"
       limit = arg
     else
@@ -245,7 +231,7 @@
     end
 
     array = 
-    while 1
+    while true
       begin
         _read_buf
       rescue EOFError
@@ -290,12 +276,21 @@
     begin
       readchar
     rescue EOFError
-      c = @buf0
-      @buf0,1="" if c
       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
@@ -310,8 +305,8 @@
   def each_byte(&block)
     return to_enum(:each_byte) unless block
 
-    while char = self.getc
-      block.call(char)
+    while byte = self.getbyte
+      block.call(byte)
     end
     self
   end
@@ -319,7 +314,14 @@
   # 15.2.20.5.5
   alias each_line each
 
-  alias each_char each_byte
+  def each_char(&block)
+    return to_enum(:each_char) unless block
+
+    while char = self.getc
+      block.call(char)
+    end
+    self
+  end
 
   def readlines
     ary = 
@@ -333,9 +335,14 @@
     i = 0
     len = args.size
     while i < len
-      s = argsi.to_s
-      write s
-      write "\n" if (s-1 != "\n")
+      s = argsi
+      if s.kind_of?(Array)
+        puts(*s)
+      else
+        s = s.to_s
+        write s
+        write "\n" if (s-1 != "\n")
+      end
       i += 1
     end
     write "\n" if len == 0

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

@@ -8,12 +8,12 @@
 #include "mruby/string.h"
 #include "mruby/ext/io.h"
 #include "mruby/error.h"
+#include "mruby/presym.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <fcntl.h>
-#include <limits.h>
 
 #include <errno.h>
 #include <stdlib.h>
@@ -66,12 +66,16 @@
 #define LOCK_UN 8
 #endif
 
-#ifndef _WIN32
+#if !defined(_WIN32) || defined(MRB_MINGW32_LEGACY)
 typedef struct stat         mrb_stat;
 # define mrb_stat(path, sb) stat(path, sb)
 # define mrb_fstat(fd, sb)  fstat(fd, sb)
+#elif defined MRB_INT32
+typedef struct _stat32      mrb_stat;
+# define mrb_stat(path, sb) _stat32(path, sb)
+# define mrb_fstat(fd, sb)  _fstat32(fd, sb)
 #else
-typedef struct __stat64     mrb_stat;
+typedef struct _stat64      mrb_stat;
 # define mrb_stat(path, sb) _stat64(path, sb)
 # define mrb_fstat(fd, sb)  _fstat64(fd, sb)
 #endif
@@ -84,7 +88,7 @@
   DWORD flags;
   flags = ((operation & LOCK_NB) ? LOCKFILE_FAIL_IMMEDIATELY : 0)
           | ((operation & LOCK_SH) ? LOCKFILE_EXCLUSIVE_LOCK : 0);
-  memset(&ov, 0, sizeof(ov));
+  ov = (OVERLAPPED){0};
   return LockFileEx(h, flags, 0, 0xffffffff, 0xffffffff, &ov) ? 0 : -1;
 }
 #endif
@@ -111,15 +115,15 @@
 static mrb_value
 mrb_file_s_unlink(mrb_state *mrb, mrb_value obj)
 {
-  mrb_value *argv;
-  mrb_value pathv;
+  const mrb_value *argv;
   mrb_int argc, i;
   char *path;
 
   mrb_get_args(mrb, "*", &argv, &argc);
   for (i = 0; i < argc; i++) {
     const char *utf8_path;
-    pathv = mrb_ensure_string_type(mrb, argvi);
+    mrb_value pathv = argvi;
+    mrb_ensure_string_type(mrb, pathv);
     utf8_path = RSTRING_CSTR(mrb, pathv);
     path = mrb_locale_from_utf8(utf8_path, -1);
     if (UNLINK(path) < 0) {
@@ -254,7 +258,7 @@
     pathname = s;
   }
   cpath = mrb_locale_from_utf8(RSTRING_CSTR(mrb, pathname), -1);
-  result = mrb_str_buf_new(mrb, PATH_MAX);
+  result = mrb_str_new_capa(mrb, PATH_MAX);
   if (realpath(cpath, RSTRING_PTR(result)) == NULL) {
     mrb_locale_free(cpath);
     mrb_sys_fail(mrb, cpath);
@@ -286,20 +290,20 @@
 #define IS_DEVICEID(x) (x == '.' || x == '?')
 #define CHECK_UNCDEV_PATH (IS_FILESEP(path0) && IS_FILESEP(path1))
 
-static int 
+static int
 is_absolute_traditional_path(const char *path, size_t len)
 {
   if (len < 3) return 0;
   return (ISALPHA(path0) && IS_VOLSEP(path1) && IS_FILESEP(path2));
 }
 
-static int 
-is_aboslute_unc_path(const char *path, size_t len) {
+static int
+is_absolute_unc_path(const char *path, size_t len) {
   if (len < 2) return 0;
   return (CHECK_UNCDEV_PATH && !IS_DEVICEID(path2));
 }
 
-static int 
+static int
 is_absolute_device_path(const char *path, size_t len) {
   if (len < 4) return 0;
   return (CHECK_UNCDEV_PATH && IS_DEVICEID(path2) && IS_FILESEP(path3));
@@ -312,8 +316,8 @@
   if (IS_FILESEP(path0)) return 1;
   if (len > 0)
     return (
-      is_absolute_traditional_path(path, len) || 
-      is_aboslute_unc_path(path, len) || 
+      is_absolute_traditional_path(path, len) ||
+      is_absolute_unc_path(path, len) ||
       is_absolute_device_path(path, len)
       );
   else
@@ -390,15 +394,12 @@
 static mrb_value
 mrb_file_mtime(mrb_state *mrb, mrb_value self)
 {
-  mrb_value obj;
-  struct stat st;
-  int fd;
+  int fd = mrb_io_fileno(mrb, self);
+  mrb_stat st;
 
-  obj = mrb_obj_value(mrb_class_get(mrb, "Time"));
-  fd = mrb_io_fileno(mrb, self);
-  if (fstat(fd, &st) == -1)
+  if (mrb_fstat(fd, &st) == -1)
     return mrb_false_value();
-  return mrb_funcall(mrb, obj, "at", 1, mrb_fixnum_value(st.st_mtime));
+  return mrb_int_value(mrb, (mrb_int)st.st_mtime);
 }
 
 static mrb_value
@@ -447,14 +448,14 @@
   }
 
   if (st.st_size > MRB_INT_MAX) {
-#ifdef MRB_WITHOUT_FLOAT
-    mrb_raise(mrb, E_RUNTIME_ERROR, "File#size too large for MRB_WITHOUT_FLOAT");
+#ifdef MRB_NO_FLOAT
+    mrb_raise(mrb, E_RUNTIME_ERROR, "File#size too large for MRB_NO_FLOAT");
 #else
     return mrb_float_value(mrb, (mrb_float)st.st_size);
 #endif
   }
 
-  return mrb_fixnum_value((mrb_int)st.st_size);
+  return mrb_int_value(mrb, (mrb_int)st.st_size);
 }
 
 static int
@@ -495,7 +496,7 @@
   mrb_value lenv = mrb_get_arg1(mrb);
 
   fd = mrb_io_fileno(mrb, self);
-  length = mrb_int(mrb, lenv);
+  length = mrb_as_int(mrb, lenv);
   if (mrb_ftruncate(fd, length) != 0) {
     mrb_raise(mrb, E_IO_ERROR, "ftruncate failed");
   }
@@ -532,7 +533,7 @@
 mrb_file_s_chmod(mrb_state *mrb, mrb_value klass) {
   mrb_int mode;
   mrb_int argc, i;
-  mrb_value *filenames;
+  const mrb_value *filenames;
   int ai = mrb_gc_arena_save(mrb);
 
   mrb_get_args(mrb, "i*", &mode, &filenames, &argc);
@@ -556,7 +557,8 @@
   mrb_raise(mrb, E_NOTIMP_ERROR, "readlink is not supported on this platform");
   return mrb_nil_value(); // unreachable
 #else
-  char *path, *buf, *tmp;
+  const char *path;
+  char *buf, *tmp;
   size_t bufsize = 100;
   ssize_t rc;
   mrb_value ret;
@@ -590,7 +592,7 @@
 {
   struct RClass *io, *file, *cnst;
 
-  io   = mrb_class_get(mrb, "IO");
+  io   = mrb_class_get_id(mrb, MRB_SYM(IO));
   file = mrb_define_class(mrb, "File", io);
   MRB_SET_INSTANCE_TT(file, MRB_TT_DATA);
   mrb_define_class_method(mrb, file, "umask",  mrb_file_s_umask, MRB_ARGS_OPT(1));
@@ -608,40 +610,40 @@
   mrb_define_class_method(mrb, file, "_gethome",  mrb_file__gethome,   MRB_ARGS_OPT(1));
 
   mrb_define_method(mrb, file, "flock", mrb_file_flock, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, file, "mtime", mrb_file_mtime, MRB_ARGS_NONE());
+  mrb_define_method(mrb, file, "_mtime", mrb_file_mtime, MRB_ARGS_NONE());
   mrb_define_method(mrb, file, "size", mrb_file_size, MRB_ARGS_NONE());
   mrb_define_method(mrb, file, "truncate", mrb_file_truncate, MRB_ARGS_REQ(1));
 
-  cnst = mrb_define_module_under(mrb, file, "Constants");
-  mrb_define_const(mrb, cnst, "LOCK_SH", mrb_fixnum_value(LOCK_SH));
-  mrb_define_const(mrb, cnst, "LOCK_EX", mrb_fixnum_value(LOCK_EX));
-  mrb_define_const(mrb, cnst, "LOCK_UN", mrb_fixnum_value(LOCK_UN));
-  mrb_define_const(mrb, cnst, "LOCK_NB", mrb_fixnum_value(LOCK_NB));
-  mrb_define_const(mrb, cnst, "SEPARATOR", mrb_str_new_cstr(mrb, FILE_SEPARATOR));
-  mrb_define_const(mrb, cnst, "PATH_SEPARATOR", mrb_str_new_cstr(mrb, PATH_SEPARATOR));
+  cnst = mrb_define_module_under_id(mrb, file, MRB_SYM(Constants));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(LOCK_SH), mrb_fixnum_value(LOCK_SH));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(LOCK_EX), mrb_fixnum_value(LOCK_EX));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(LOCK_UN), mrb_fixnum_value(LOCK_UN));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(LOCK_NB), mrb_fixnum_value(LOCK_NB));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(SEPARATOR), mrb_str_new_cstr(mrb, FILE_SEPARATOR));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(PATH_SEPARATOR), mrb_str_new_cstr(mrb, PATH_SEPARATOR));
 #if defined(_WIN32) || defined(_WIN64)
-  mrb_define_const(mrb, cnst, "ALT_SEPARATOR", mrb_str_new_cstr(mrb, FILE_ALT_SEPARATOR));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(ALT_SEPARATOR), mrb_str_new_cstr(mrb, FILE_ALT_SEPARATOR));
 #else
-  mrb_define_const(mrb, cnst, "ALT_SEPARATOR", mrb_nil_value());
+  mrb_define_const_id(mrb, cnst, MRB_SYM(ALT_SEPARATOR), mrb_nil_value());
 #endif
-  mrb_define_const(mrb, cnst, "NULL", mrb_str_new_cstr(mrb, NULL_FILE));
-
-  mrb_define_const(mrb, cnst, "RDONLY", mrb_fixnum_value(MRB_O_RDONLY));
-  mrb_define_const(mrb, cnst, "WRONLY", mrb_fixnum_value(MRB_O_WRONLY));
-  mrb_define_const(mrb, cnst, "RDWR", mrb_fixnum_value(MRB_O_RDWR));
-  mrb_define_const(mrb, cnst, "APPEND", mrb_fixnum_value(MRB_O_APPEND));
-  mrb_define_const(mrb, cnst, "CREAT", mrb_fixnum_value(MRB_O_CREAT));
-  mrb_define_const(mrb, cnst, "EXCL", mrb_fixnum_value(MRB_O_EXCL));
-  mrb_define_const(mrb, cnst, "TRUNC", mrb_fixnum_value(MRB_O_TRUNC));
-  mrb_define_const(mrb, cnst, "NONBLOCK", mrb_fixnum_value(MRB_O_NONBLOCK));
-  mrb_define_const(mrb, cnst, "NOCTTY", mrb_fixnum_value(MRB_O_NOCTTY));
-  mrb_define_const(mrb, cnst, "BINARY", mrb_fixnum_value(MRB_O_BINARY));
-  mrb_define_const(mrb, cnst, "SHARE_DELETE", mrb_fixnum_value(MRB_O_SHARE_DELETE));
-  mrb_define_const(mrb, cnst, "SYNC", mrb_fixnum_value(MRB_O_SYNC));
-  mrb_define_const(mrb, cnst, "DSYNC", mrb_fixnum_value(MRB_O_DSYNC));
-  mrb_define_const(mrb, cnst, "RSYNC", mrb_fixnum_value(MRB_O_RSYNC));
-  mrb_define_const(mrb, cnst, "NOFOLLOW", mrb_fixnum_value(MRB_O_NOFOLLOW));
-  mrb_define_const(mrb, cnst, "NOATIME", mrb_fixnum_value(MRB_O_NOATIME));
-  mrb_define_const(mrb, cnst, "DIRECT", mrb_fixnum_value(MRB_O_DIRECT));
-  mrb_define_const(mrb, cnst, "TMPFILE", mrb_fixnum_value(MRB_O_TMPFILE));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(NULL), mrb_str_new_cstr(mrb, NULL_FILE));
+
+  mrb_define_const_id(mrb, cnst, MRB_SYM(RDONLY), mrb_fixnum_value(MRB_O_RDONLY));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(WRONLY), mrb_fixnum_value(MRB_O_WRONLY));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(RDWR), mrb_fixnum_value(MRB_O_RDWR));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(APPEND), mrb_fixnum_value(MRB_O_APPEND));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(CREAT), mrb_fixnum_value(MRB_O_CREAT));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(EXCL), mrb_fixnum_value(MRB_O_EXCL));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(TRUNC), mrb_fixnum_value(MRB_O_TRUNC));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(NONBLOCK), mrb_fixnum_value(MRB_O_NONBLOCK));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(NOCTTY), mrb_fixnum_value(MRB_O_NOCTTY));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(BINARY), mrb_fixnum_value(MRB_O_BINARY));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(SHARE_DELETE), mrb_fixnum_value(MRB_O_SHARE_DELETE));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(SYNC), mrb_fixnum_value(MRB_O_SYNC));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(DSYNC), mrb_fixnum_value(MRB_O_DSYNC));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(RSYNC), mrb_fixnum_value(MRB_O_RSYNC));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(NOFOLLOW), mrb_fixnum_value(MRB_O_NOFOLLOW));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(NOATIME), mrb_fixnum_value(MRB_O_NOATIME));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(DIRECT), mrb_fixnum_value(MRB_O_DIRECT));
+  mrb_define_const_id(mrb, cnst, MRB_SYM(TMPFILE), mrb_fixnum_value(MRB_O_TMPFILE));
 }

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-io/src/io.c -> _service:tar_scm:nghttp2-1.52.0.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/presym.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -18,6 +19,7 @@
 #if defined(_WIN32) || defined(_WIN64)
   #include <winsock.h>
   #include <io.h>
+  #include <basetsd.h>
   #define open  _open
   #define close _close
   #define dup _dup
@@ -80,10 +82,10 @@
 
   fptr = (struct mrb_io *)mrb_data_get_ptr(mrb, self, &mrb_io_type);
   if (fptr == NULL) {
-    mrb_raise(mrb, E_IO_ERROR, "uninitialized stream.");
+    mrb_raise(mrb, E_IO_ERROR, "uninitialized stream");
   }
   if (fptr->fd < 0) {
-    mrb_raise(mrb, E_IO_ERROR, "closed stream.");
+    mrb_raise(mrb, E_IO_ERROR, "closed stream");
   }
   return fptr;
 }
@@ -95,18 +97,18 @@
   mrb_value v;
 
   c_status = NULL;
-  if (mrb_class_defined(mrb, "Process")) {
-    c_process = mrb_module_get(mrb, "Process");
-    if (mrb_const_defined(mrb, mrb_obj_value(c_process), mrb_intern_cstr(mrb, "Status"))) {
-      c_status = mrb_class_get_under(mrb, c_process, "Status");
+  if (mrb_class_defined_id(mrb, MRB_SYM(Process))) {
+    c_process = mrb_module_get_id(mrb, MRB_SYM(Process));
+    if (mrb_const_defined(mrb, mrb_obj_value(c_process), MRB_SYM(Status))) {
+      c_status = mrb_class_get_under_id(mrb, c_process, MRB_SYM(Status));
     }
   }
   if (c_status != NULL) {
-    v = mrb_funcall(mrb, mrb_obj_value(c_status), "new", 2, mrb_fixnum_value(pid), mrb_fixnum_value(status));
+    v = mrb_funcall_id(mrb, mrb_obj_value(c_status), MRB_SYM(new), 2, mrb_fixnum_value(pid), mrb_fixnum_value(status));
   } else {
     v = mrb_fixnum_value(WEXITSTATUS(status));
   }
-  mrb_gv_set(mrb, mrb_intern_cstr(mrb, "$?"), v);
+  mrb_gv_set(mrb, mrb_intern_lit(mrb, "$?"), v);
 }
 
 static int
@@ -161,7 +163,7 @@
   }
   else {
     int flags = 0;
-    mrb_int flags0 = mrb_int(mrb, mode);
+    mrb_int flags0 = mrb_as_int(mrb, mode);
 
     switch (flags0 & MRB_O_ACCMODE) {
       case MRB_O_RDONLY:
@@ -319,20 +321,20 @@
 #define NOFILE 64
 #endif
 
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+# define mrb_io_s_popen mrb_notimplement_m
+#else
 static int
-option_to_fd(mrb_state *mrb, mrb_value hash, const char *key)
+option_to_fd(mrb_state *mrb, mrb_value v)
 {
-  mrb_value opt;
-
-  if (!mrb_hash_p(hash)) return -1;
-  opt = mrb_hash_fetch(mrb, hash, mrb_symbol_value(mrb_intern_static(mrb, key, strlen(key))), mrb_nil_value());
-  if (mrb_nil_p(opt)) return -1;
+  if (mrb_undef_p(v)) return -1;
+  if (mrb_nil_p(v)) return -1;
 
-  switch (mrb_type(opt)) {
+  switch (mrb_type(v)) {
     case MRB_TT_DATA: /* IO */
-      return mrb_io_fileno(mrb, opt);
-    case MRB_TT_FIXNUM:
-      return (int)mrb_fixnum(opt);
+      return mrb_io_fileno(mrb, v);
+    case MRB_TT_INTEGER:
+      return (int)mrb_integer(v);
     default:
       mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong exec redirect action");
       break;
@@ -340,16 +342,42 @@
   return -1; /* never reached */
 }
 
+static mrb_value
+mrb_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)
+{
+  mrb_value mode = mrb_nil_value();
+  struct { mrb_value opt_in, opt_out, opt_err; } kv;
+  mrb_sym knames3 = {MRB_SYM(in), MRB_SYM(out), MRB_SYM(err)};
+  const mrb_kwargs kw = {
+    3, 0,
+    knames,
+    &kv.opt_in,
+    NULL,
+  };
+
+  mrb_get_args(mrb, "zo:", cmd, &mode, &kw);
+
+  *flags = mrb_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);
+  *opt_err = option_to_fd(mrb, kv.opt_err);
+
+  return mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
+}
+
 #ifdef _WIN32
 static mrb_value
 mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
 {
-  mrb_value cmd, io;
-  mrb_value mode = mrb_str_new_cstr(mrb, "r");
-  mrb_value opt  = mrb_hash_new(mrb);
+  mrb_value io;
+  int doexec;
+  int opt_in, opt_out, opt_err;
+  const char *cmd;
 
   struct mrb_io *fptr;
-  const char *pname;
   int pid = 0, flags;
   STARTUPINFO si;
   PROCESS_INFORMATION pi;
@@ -358,24 +386,14 @@
   HANDLE ifd2;
   HANDLE ofd2;
 
-  int doexec;
-  int opt_in, opt_out, opt_err;
-
   ifd0 = INVALID_HANDLE_VALUE;
   ifd1 = INVALID_HANDLE_VALUE;
   ofd0 = INVALID_HANDLE_VALUE;
   ofd1 = INVALID_HANDLE_VALUE;
 
-  mrb_get_args(mrb, "S|oH", &cmd, &mode, &opt);
-  io = mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
-
-  pname = RSTRING_CSTR(mrb, cmd);
-  flags = mrb_io_mode_to_flags(mrb, mode);
-
-  doexec = (strcmp("-", pname) != 0);
-  opt_in = option_to_fd(mrb, opt, "in");
-  opt_out = option_to_fd(mrb, opt, "out");
-  opt_err = option_to_fd(mrb, opt, "err");
+  mrb->c->ci->mid = 0;
+  io = mrb_io_s_popen_args(mrb, klass, &cmd, &flags, &doexec,
+                           &opt_in, &opt_out, &opt_err);
 
   saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
   saAttr.bInheritHandle = TRUE;
@@ -410,13 +428,13 @@
       si.hStdInput = ifd0;
     }
     if (!CreateProcess(
-        NULL, (char*)pname, NULL, NULL,
+        NULL, (char*)cmd, NULL, NULL,
         TRUE, CREATE_NEW_PROCESS_GROUP, NULL, NULL, &si, &pi)) {
       CloseHandle(ifd0);
       CloseHandle(ifd1);
       CloseHandle(ofd0);
       CloseHandle(ofd1);
-      mrb_raisef(mrb, E_IO_ERROR, "command not found: %v", cmd);
+      mrb_raisef(mrb, E_IO_ERROR, "command not found: %s", cmd);
     }
     CloseHandle(pi.hThread);
     CloseHandle(ifd0);
@@ -424,7 +442,7 @@
     pid = pi.dwProcessId;
   }
 
-  mrb_iv_set(mrb, io, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
+  mrb_iv_set(mrb, io, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
 
   fptr = mrb_io_alloc(mrb);
   fptr->fd = _open_osfhandle((intptr_t)ofd0, 0);
@@ -438,40 +456,24 @@
   DATA_PTR(io)  = fptr;
   return io;
 }
-#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-static mrb_value
-mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
-{
-  mrb_raise(mrb, E_NOTIMP_ERROR, "IO#popen is not supported on the platform");
-  return mrb_false_value();
-}
 #else
 static mrb_value
 mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
 {
-  mrb_value cmd, io, result;
-  mrb_value mode = mrb_str_new_cstr(mrb, "r");
-  mrb_value opt  = mrb_hash_new(mrb);
+  mrb_value io, result;
+  int doexec;
+  int opt_in, opt_out, opt_err;
+  const char *cmd;
 
   struct mrb_io *fptr;
-  const char *pname;
   int pid, flags, fd, write_fd = -1;
   int pr2 = { -1, -1 };
   int pw2 = { -1, -1 };
-  int doexec;
   int saved_errno;
-  int opt_in, opt_out, opt_err;
-
-  mrb_get_args(mrb, "S|oH", &cmd, &mode, &opt);
-  io = mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
 
-  pname = RSTRING_CSTR(mrb, cmd);
-  flags = mrb_io_mode_to_flags(mrb, mode);
-
-  doexec = (strcmp("-", pname) != 0);
-  opt_in = option_to_fd(mrb, opt, "in");
-  opt_out = option_to_fd(mrb, opt, "out");
-  opt_err = option_to_fd(mrb, opt, "err");
+  mrb->c->ci->mid = 0;
+  io = mrb_io_s_popen_args(mrb, klass, &cmd, &flags, &doexec,
+                           &opt_in, &opt_out, &opt_err);
 
   if (OPEN_READABLE_P(flags)) {
     if (pipe(pr) == -1) {
@@ -528,8 +530,8 @@
         for (fd = 3; fd < NOFILE; fd++) {
           close(fd);
         }
-        mrb_proc_exec(pname);
-        mrb_raisef(mrb, E_IO_ERROR, "command not found: %v", cmd);
+        mrb_proc_exec(cmd);
+        mrb_raisef(mrb, E_IO_ERROR, "command not found: %s", cmd);
         _exit(127);
       }
       result = mrb_nil_value();
@@ -549,7 +551,7 @@
         fd = pw1;
       }
 
-      mrb_iv_set(mrb, io, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
+      mrb_iv_set(mrb, io, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
 
       fptr = mrb_io_alloc(mrb);
       fptr->fd = fd;
@@ -575,12 +577,13 @@
         close(pw1);
       }
       errno = saved_errno;
-      mrb_sys_fail(mrb, "pipe_open failed.");
+      mrb_sys_fail(mrb, "pipe_open failed");
       break;
   }
   return result;
 }
-#endif
+#endif /* _WIN32 */
+#endif /* TARGET_OS_IPHONE */
 
 static int
 mrb_dup(mrb_state *mrb, int fd, mrb_bool *failed)
@@ -617,8 +620,8 @@
   DATA_TYPE(copy) = &mrb_io_type;
   DATA_PTR(copy) = fptr_copy;
 
-  buf = mrb_iv_get(mrb, orig, mrb_intern_cstr(mrb, "@buf"));
-  mrb_iv_set(mrb, copy, mrb_intern_cstr(mrb, "@buf"), buf);
+  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);
   if (failed) {
@@ -692,7 +695,15 @@
   mode = opt = mrb_nil_value();
 
   mrb_get_args(mrb, "i|oo", &fd, &mode, &opt);
-  check_file_descriptor(mrb, fd);
+  switch (fd) {
+    case 0: /* STDIN_FILENO */
+    case 1: /* STDOUT_FILENO */
+    case 2: /* STDERR_FILENO */
+      break;
+    default:
+      check_file_descriptor(mrb, fd);
+      break;
+  }
   if (mrb_nil_p(mode)) {
     mode = mrb_str_new_cstr(mrb, "r");
   }
@@ -702,7 +713,7 @@
 
   flags = mrb_io_mode_to_flags(mrb, mode);
 
-  mrb_iv_set(mrb, io, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
+  mrb_iv_set(mrb, io, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
 
   fptr = (struct mrb_io *)DATA_PTR(io);
   if (fptr != NULL) {
@@ -780,7 +791,7 @@
 
   if (!quiet && saved_errno != 0) {
     errno = saved_errno;
-    mrb_sys_fail(mrb, "fptr_finalize failed.");
+    mrb_sys_fail(mrb, "fptr_finalize failed");
   }
 }
 
@@ -822,6 +833,7 @@
 mrb_io_s_sysclose(mrb_state *mrb, mrb_value klass)
 {
   mrb_int fd;
+  mrb->c->ci->mid = 0;
   mrb_get_args(mrb, "i", &fd);
   if (close((int)fd) == -1) {
     mrb_sys_fail(mrb, "close");
@@ -966,13 +978,13 @@
     mrb_sys_fail(mrb, "sysseek");
   }
   if (pos > MRB_INT_MAX) {
-#ifndef MRB_WITHOUT_FLOAT
+#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_WITHOUT_FLOAT");
+    mrb_raise(mrb, E_IO_ERROR, "sysseek reached too far for MRB_NO_FLOAT");
 #endif
   } else {
-    return mrb_fixnum_value(pos);
+    return mrb_int_value(mrb, pos);
   }
 }
 
@@ -999,7 +1011,7 @@
     mrb_sys_fail(mrb, 0);
   }
 
-  return mrb_fixnum_value(length);
+  return mrb_int_value(mrb, (mrb_int)length);
 }
 
 static mrb_io_read_write_size
@@ -1069,12 +1081,12 @@
   struct timeval t = { 0, 0 };
 
   switch (mrb_type(time)) {
-    case MRB_TT_FIXNUM:
-      t.tv_sec = (ftime_t)mrb_fixnum(time);
+    case MRB_TT_INTEGER:
+      t.tv_sec = (ftime_t)mrb_integer(time);
       t.tv_usec = 0;
       break;
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
     case MRB_TT_FLOAT:
       t.tv_sec = (ftime_t)mrb_float(time);
       t.tv_usec = (fsuseconds_t)((mrb_float(time) - t.tv_sec) * 1000000.0);
@@ -1091,7 +1103,7 @@
 static int
 mrb_io_read_data_pending(mrb_state *mrb, mrb_value io)
 {
-  mrb_value buf = mrb_iv_get(mrb, io, mrb_intern_cstr(mrb, "@buf"));
+  mrb_value buf = mrb_iv_get(mrb, io, mrb_intern_lit(mrb, "@buf"));
   if (mrb_string_p(buf) && RSTRING_LEN(buf) > 0) {
     return 1;
   }
@@ -1113,7 +1125,7 @@
   }
 
   r = mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
-  mrb_iv_set(mrb, r, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
+  mrb_iv_set(mrb, r, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
   fptr_r = mrb_io_alloc(mrb);
   fptr_r->fd = pipes0;
   fptr_r->readable = 1;
@@ -1123,7 +1135,7 @@
   DATA_PTR(r)  = 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_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
+  mrb_iv_set(mrb, w, mrb_intern_lit(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
   fptr_w = mrb_io_alloc(mrb);
   fptr_w->fd = pipes1;
   fptr_w->readable = 0;
@@ -1139,7 +1151,7 @@
 static mrb_value
 mrb_io_s_select(mrb_state *mrb, mrb_value klass)
 {
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc;
   mrb_value read, read_io, write, except, timeout, list;
   struct timeval *tp, timerec;
@@ -1316,10 +1328,10 @@
   return mrb_fixnum_value(fd);
 }
 
+#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)
 {
-#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
   struct mrb_io *fptr;
   int ret;
 
@@ -1333,17 +1345,15 @@
   if ((ret = fcntl(fptr->fd, F_GETFD)) == -1) mrb_sys_fail(mrb, "F_GETFD failed");
   if (!(ret & FD_CLOEXEC)) return mrb_false_value();
   return mrb_true_value();
-
+}
 #else
-  mrb_raise(mrb, E_NOTIMP_ERROR, "IO#close_on_exec? is not supported on the platform");
-  return mrb_false_value();
+# define mrb_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)
 {
-#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
   struct mrb_io *fptr;
   int flag, ret;
   mrb_bool b;
@@ -1370,11 +1380,10 @@
   }
 
   return mrb_bool_value(b);
+}
 #else
-  mrb_raise(mrb, E_NOTIMP_ERROR, "IO#close_on_exec= is not supported on the platform");
-  return mrb_nil_value();
+# define mrb_io_set_close_on_exec mrb_notimplement_m
 #endif
-}
 
 static mrb_value
 mrb_io_set_sync(mrb_state *mrb, mrb_value self)
@@ -1403,7 +1412,7 @@
 static off_t
 value2off(mrb_state *mrb, mrb_value offv)
 {
-  return (off_t)mrb_int(mrb, offv);
+  return (off_t)mrb_as_int(mrb, offv);
 }
 
 /*
@@ -1463,7 +1472,11 @@
   mrb_value str;
   mrb_int len;
 
+  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);
 }
 
@@ -1476,6 +1489,7 @@
   unsigned char c;
 #endif
 
+  mrb->c->ci->mid = 0;
   mrb_get_args(mrb, "S", &buf);
   mrb_assert(RSTRING_LEN(buf) > 0);
   mrb_assert(RSTRING_PTR(buf) != NULL);

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

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

@@ -7,7 +7,7 @@
 def assert_io_open(meth)
   assert "assert_io_open" do
     fd = IO.sysopen($mrbtest_io_rfname)
-    assert_equal Fixnum, fd.class
+    assert_equal Integer, fd.class
     io1 = IO.__send__(meth, fd)
     begin
       assert_equal IO, io1.class
@@ -27,7 +27,6 @@
 
     assert_raise(RuntimeError) { IO.__send__(meth, 1023) } # For Windows
     assert_raise(RuntimeError) { IO.__send__(meth, 1 << 26) }
-    assert_raise(RuntimeError) { IO.__send__(meth, 1 << 32) } if (1 << 32).kind_of?(Integer)
   end
 end
 
@@ -106,6 +105,15 @@
   io.close
 end
 
+assert('IO#getbyte') do
+  io = IO.new(IO.sysopen($mrbtest_io_rfname))
+  $mrbtest_io_msg.split("").each do |ch|
+    assert_equal ch.getbyte(0), io.getbyte
+  end
+  assert_equal nil, io.getbyte
+  io.close
+end
+
 #assert('IO#gets', '15.2.20.5.9') do
 #assert('IO#initialize_copy', '15.2.20.5.10') do
 #assert('IO#print', '15.2.20.5.11') do
@@ -433,7 +441,7 @@
     $? = nil
     io = IO.popen("#{$cmd}echo mruby-io")
     assert_true io.close_on_exec?
-    assert_equal Fixnum, io.pid.class
+    assert_equal Integer, io.pid.class
 
     out = io.read
     assert_equal out.class, String
@@ -525,7 +533,7 @@
   fd = IO.sysopen $mrbtest_io_wfname, "w"
   io = IO.new fd, "w"
   begin
-    # IO.sysopen opens a file descripter with O_CLOEXEC flag.
+    # IO.sysopen opens a file descriptor with O_CLOEXEC flag.
     assert_true io.close_on_exec?
   rescue ScriptError
     io.close

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-io/test/mruby_io_test.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-io/test/mruby_io_test.c Changed

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

@@ -3,69 +3,73 @@
 #include <mruby/array.h>
 #include <mruby/hash.h>
 #include <mruby/range.h>
+#include <mruby/string.h>
+#include <mruby/numeric.h>
+#include <mruby/proc.h>
+#include <mruby/presym.h>
 
 static mrb_value
 mrb_f_caller(mrb_state *mrb, mrb_value self)
 {
-  mrb_value bt, v, length;
+  mrb_value bt, v;
   mrb_int bt_len, argc, lev, n;
 
+  argc = mrb_get_args(mrb, "|oi", &v, &n);
+
   bt = mrb_get_backtrace(mrb);
   bt_len = RARRAY_LEN(bt);
-  argc = mrb_get_args(mrb, "|oo", &v, &length);
 
   switch (argc) {
-    case 0:
-      lev = 1;
-      n = bt_len - lev;
-      break;
-    case 1:
-      if (mrb_range_p(v)) {
-        mrb_int beg, len;
-        if (mrb_range_beg_len(mrb, v, &beg, &len, bt_len, TRUE) == MRB_RANGE_OK) {
-          lev = beg;
-          n = len;
-        }
-        else {
-          return mrb_nil_value();
-        }
+  case 0:
+    lev = 1;
+    n = bt_len - 1;
+    break;
+  case 1:
+    if (mrb_range_p(v)) {
+      mrb_int beg, len;
+      if (mrb_range_beg_len(mrb, v, &beg, &len, bt_len, TRUE) == MRB_RANGE_OK) {
+        lev = beg;
+        n = len;
       }
       else {
-        lev = mrb_int(mrb, v);
-        if (lev < 0) {
-          mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative level (%v)", v);
-        }
-        n = bt_len - lev;
+        return mrb_nil_value();
       }
-      break;
-    case 2:
-      lev = mrb_int(mrb, v);
-      n = mrb_int(mrb, length);
+    }
+    else {
+      lev = mrb_as_int(mrb, v);
       if (lev < 0) {
         mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative level (%v)", v);
       }
-      if (n < 0) {
-        mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative size (%v)", length);
-      }
-      break;
-    default:
-      lev = n = 0;
-      break;
+      n = bt_len - lev;
+    }
+    break;
+  case 2:
+    lev = mrb_as_int(mrb, v);
+    break;
+  default:
+    /* not reached */
+    lev = n = 0;
+    break;
   }
-
-  if (n == 0) {
+  if (lev >= bt_len) return mrb_nil_value();
+  if (lev < 0) {
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative level (%v)", v);
+  }
+  if (n < 0) {
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative size (%d)", n);
+  }
+  if (n == 0 || bt_len <= lev) {
     return mrb_ary_new(mrb);
   }
-
-  return mrb_funcall(mrb, bt, "", 2, mrb_fixnum_value(lev), mrb_fixnum_value(n));
+  if (bt_len <= n + lev) n = bt_len - lev - 1;
+  return mrb_ary_new_from_values(mrb, n, RARRAY_PTR(bt)+lev+1);
 }
 
 /*
  *  call-seq:
  *     __method__         -> symbol
  *
- *  Returns the name at the definition of the current method as a
- *  Symbol.
+ *  Returns the called name of the current method as a Symbol.
  *  If called outside of a method, it returns <code>nil</code>.
  *
  */
@@ -74,6 +78,27 @@
 {
   mrb_callinfo *ci = mrb->c->ci;
   ci--;
+  if (ci->proc->e.env->tt == MRB_TT_ENV && ci->proc->e.env->mid)
+    return mrb_symbol_value(ci->proc->e.env->mid);
+  else if (ci->mid)
+    return mrb_symbol_value(ci->mid);
+  else
+    return mrb_nil_value();
+}
+
+/*
+ *  call-seq:
+ *     __callee__         -> symbol
+ *
+ *  Returns the called name of the current method as a Symbol.
+ *  If called outside of a method, it returns <code>nil</code>.
+ *
+ */
+static mrb_value
+mrb_f_callee(mrb_state *mrb, mrb_value self)
+{
+  mrb_callinfo *ci = mrb->c->ci;
+  ci--;
   if (ci->mid)
     return mrb_symbol_value(ci->mid);
   else
@@ -84,8 +109,8 @@
  *  call-seq:
  *     Integer(arg,base=0)    -> integer
  *
- *  Converts <i>arg</i> to a <code>Fixnum</code>.
- *  Numeric types are converted directly (with floating point numbers
+ *  Converts <i>arg</i> to a <code>Integer</code>.
+ *  Numeric types are converted directly (with floating-point numbers
  *  being truncated).    <i>base</i> (0, or between 2 and 36) is a base for
  *  integer string representation.  If <i>arg</i> is a <code>String</code>,
  *  when <i>base</i> is omitted or equals to zero, radix indicators
@@ -105,14 +130,46 @@
 static mrb_value
 mrb_f_integer(mrb_state *mrb, mrb_value self)
 {
-  mrb_value arg;
+  mrb_value val, tmp;
   mrb_int base = 0;
 
-  mrb_get_args(mrb, "o|i", &arg, &base);
-  return mrb_convert_to_integer(mrb, arg, base);
+  mrb_get_args(mrb, "o|i", &val, &base);
+  if (mrb_nil_p(val)) {
+    if (base != 0) goto arg_error;
+    mrb_raise(mrb, E_TYPE_ERROR, "can't convert nil into Integer");
+  }
+  switch (mrb_type(val)) {
+#ifndef MRB_NO_FLOAT
+    case MRB_TT_FLOAT:
+      if (base != 0) goto arg_error;
+      return mrb_float_to_integer(mrb, val);
+#endif
+
+    case MRB_TT_INTEGER:
+      if (base != 0) goto arg_error;
+      return val;
+
+    case MRB_TT_STRING:
+    string_conv:
+      return mrb_str_to_integer(mrb, val, base, TRUE);
+
+    default:
+      break;
+  }
+  if (base != 0) {
+    tmp = mrb_obj_as_string(mrb, val);
+    if (mrb_string_p(tmp)) {
+      val = tmp;
+      goto string_conv;
+    }
+arg_error:
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "base specified for non string value");
+  }
+  /* to raise TypeError */
+  return mrb_to_integer(mrb, val);
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 /*
  *  call-seq:
  *     Float(arg)    -> float
@@ -130,7 +187,10 @@
 {
   mrb_value arg = mrb_get_arg1(mrb);
 
-  return mrb_Float(mrb, arg);
+  if (mrb_string_p(arg)) {
+    return mrb_float_value(mrb, mrb_str_to_dbl(mrb, arg, TRUE));
+  }
+  return mrb_to_float(mrb, arg);
 }
 #endif
 
@@ -151,7 +211,7 @@
   mrb_value arg = mrb_get_arg1(mrb);
   mrb_value tmp;
 
-  tmp = mrb_convert_type(mrb, arg, MRB_TT_STRING, "String", "to_s");
+  tmp = mrb_type_convert(mrb, arg, MRB_TT_STRING, MRB_SYM(to_s));
   return tmp;
 }
 
@@ -170,7 +230,7 @@
   mrb_value arg = mrb_get_arg1(mrb);
   mrb_value tmp;
 
-  tmp = mrb_check_convert_type(mrb, arg, MRB_TT_ARRAY, "Array", "to_a");
+  tmp = mrb_type_convert_check(mrb, arg, MRB_TT_ARRAY, MRB_SYM(to_a));
   if (mrb_nil_p(tmp)) {
     return mrb_ary_new_from_values(mrb, 1, &arg);
   }
@@ -200,7 +260,8 @@
   if (mrb_nil_p(arg) || (mrb_array_p(arg) && RARRAY_LEN(arg) == 0)) {
     return mrb_hash_new(mrb);
   }
-  return mrb_ensure_hash_type(mrb, arg);
+  mrb_ensure_hash_type(mrb, arg);
+  return arg;
 }
 
 void
@@ -211,8 +272,9 @@
   mrb_define_module_function(mrb, krn, "fail", mrb_f_raise, MRB_ARGS_OPT(2));
   mrb_define_module_function(mrb, krn, "caller", mrb_f_caller, MRB_ARGS_OPT(2));
   mrb_define_method(mrb, krn, "__method__", mrb_f_method, MRB_ARGS_NONE());
+  mrb_define_method(mrb, krn, "__callee__", mrb_f_callee, MRB_ARGS_NONE());
   mrb_define_module_function(mrb, krn, "Integer", mrb_f_integer, MRB_ARGS_ARG(1,1));
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   mrb_define_module_function(mrb, krn, "Float", mrb_f_float, MRB_ARGS_REQ(1));
 #endif
   mrb_define_module_function(mrb, krn, "String", mrb_f_string, MRB_ARGS_REQ(1));

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

@@ -20,6 +20,9 @@
       bar(*args)
     end
   end
+
+  skip "backtrace isn't available" if (c.new.baz(0)0.include?("unknown"))
+
   assert_equal "kernel.rb:#{caller_lineno}:in foo", c.new.baz(0)0-19..-1
   assert_equal "bar", c.new.baz0-3..-1
   assert_equal "foo", c.new.baz(0)0-3..-1
@@ -35,17 +38,29 @@
 end
 
 assert('Kernel#__method__') do
-  assert_equal(:m, Class.new {def m; __method__; end}.new.m)
-  assert_equal(:m, Class.new {define_method(:m) {__method__}}.new.m)
   c = Class.new do
-    :m1, :m2.each do |m|
-      define_method(m) do
-        __method__
-      end
-    end
+    def m1; __method__ end
+    define_method(:m2) {__method__}
+    alias m3 m1
+    alias_method :m4, :m2
+  end
+  assert_equal(:m1, c.new.m1)
+  assert_equal(:m2, c.new.m2)
+  assert_equal(:m1, c.new.m3)
+  assert_equal(:m2, c.new.m4)
+end
+
+assert('Kernel#__callee__') do
+  c = Class.new do
+    def m1; __callee__ end
+    define_method(:m2) {__callee__}
+    alias m3 m1
+    alias_method :m4, :m2
   end
   assert_equal(:m1, c.new.m1)
   assert_equal(:m2, c.new.m2)
+  assert_equal(:m3, c.new.m3)
+  assert_equal(:m4, c.new.m4)
 end
 
 assert('Kernel#Integer') do

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

@@ -4,28 +4,26 @@
 ** See Copyright Notice in mruby.h
 */
 
-#ifdef MRB_WITHOUT_FLOAT
-# error Math conflicts 'MRB_WITHOUT_FLOAT' configuration in your 'build_config.rb'
+#include <mruby.h>
+
+#ifdef MRB_NO_FLOAT
+# error Math conflicts with 'MRB_NO_FLOAT' configuration
 #endif
 
-#include <mruby.h>
 #include <mruby/array.h>
-
-#include <math.h>
+#include <mruby/presym.h>
 
 static void
 domain_error(mrb_state *mrb, const char *func)
 {
-  struct RClass *math = mrb_module_get(mrb, "Math");
-  struct RClass *domainerror = mrb_class_get_under(mrb, math, "DomainError");
+  struct RClass *math = mrb_module_get_id(mrb, MRB_SYM(Math));
+  struct RClass *domainerror = mrb_class_get_under_id(mrb, math, MRB_SYM(DomainError));
   mrb_raisef(mrb, domainerror, "Numerical argument is out of domain - %s", func);
 }
 
 /* math functions not provided by Microsoft Visual C++ 2012 or older */
 #if defined _MSC_VER && _MSC_VER <= 1700
 
-#include <float.h>
-
 double
 asinh(double x)
 {
@@ -629,7 +627,7 @@
  *     Math.frexp(numeric)    ->  fraction, exponent 
  *
  *  Returns a two-element array containing the normalized fraction (a
- *  <code>Float</code>) and exponent (a <code>Fixnum</code>) of
+ *  <code>Float</code>) and exponent (a <code>Integer</code>) of
  *  <i>numeric</i>.
  *
  *     fraction, exponent = Math.frexp(1234)   #=> 0.6025390625, 11
@@ -730,18 +728,18 @@
   struct RClass *mrb_math;
   mrb_math = mrb_define_module(mrb, "Math");
 
-  mrb_define_class_under(mrb, mrb_math, "DomainError", mrb->eStandardError_class);
+  mrb_define_class_under_id(mrb, mrb_math, MRB_SYM(DomainError), mrb->eStandardError_class);
 
 #ifdef M_PI
-  mrb_define_const(mrb, mrb_math, "PI", mrb_float_value(mrb, M_PI));
+  mrb_define_const_id(mrb, mrb_math, MRB_SYM(PI), mrb_float_value(mrb, M_PI));
 #else
-  mrb_define_const(mrb, mrb_math, "PI", mrb_float_value(mrb, atan(1.0)*4.0));
+  mrb_define_const_id(mrb, mrb_math, MRB_SYM(PI), mrb_float_value(mrb, atan(1.0)*4.0));
 #endif
 
 #ifdef M_E
-  mrb_define_const(mrb, mrb_math, "E", mrb_float_value(mrb, M_E));
+  mrb_define_const_id(mrb, mrb_math, MRB_SYM(E), mrb_float_value(mrb, M_E));
 #else
-  mrb_define_const(mrb, mrb_math, "E", mrb_float_value(mrb, exp(1.0)));
+  mrb_define_const_id(mrb, mrb_math, MRB_SYM(E), mrb_float_value(mrb, exp(1.0)));
 #endif
 
   mrb_define_module_function(mrb, mrb_math, "sin", math_sin, MRB_ARGS_REQ(1));

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

@@ -9,27 +9,18 @@
   end
 end
 
-assert('Math.sin 0') do
+assert('Math.sin') do
   assert_float(0, Math.sin(0))
-end
-
-assert('Math.sin PI/2') do
   assert_float(1, Math.sin(Math::PI / 2))
 end
 
-assert('Math.cos 0') do
+assert('Math.cos') do
   assert_float(1, Math.cos(0))
-end
-
-assert('Math.cos PI/2') do
   assert_float(0, Math.cos(Math::PI / 2))
 end
 
-assert('Math.tan 0') do
+assert('Math.tan') do
   assert_float(0, Math.tan(0))
-end
-
-assert('Math.tan PI/4') do
   assert_float(1, Math.tan(Math::PI / 4))
 end
 
@@ -49,52 +40,27 @@
   end
 end
 
-assert('Math.erf 0') do
-  assert_float(0, Math.erf(0))
-end
-
-assert('Math.exp 0') do
+assert('Math.exp') do
   assert_float(1.0, Math.exp(0))
-end
-
-assert('Math.exp 1') do
   assert_float(2.718281828459045, Math.exp(1))
-end
-
-assert('Math.exp 1.5') do
   assert_float(4.4816890703380645, Math.exp(1.5))
 end
 
-assert('Math.log 1') do
+assert('Math.log') do
   assert_float(0, Math.log(1))
-end
-
-assert('Math.log E') do
   assert_float(1.0, Math.log(Math::E))
-end
-
-assert('Math.log E**3') do
   assert_float(3.0, Math.log(Math::E**3))
 end
 
-assert('Math.log2 1') do
+assert('Math.log2') do
   assert_float(0.0, Math.log2(1))
-end
-
-assert('Math.log2 2') do
   assert_float(1.0, Math.log2(2))
 end
 
-assert('Math.log10 1') do
+assert('Math.log10') do
   assert_float(0.0, Math.log10(1))
-end
-
-assert('Math.log10 10') do
   assert_float(1.0, Math.log10(10))
-end
-
-assert('Math.log10 10**100') do
-  assert_float(100.0, Math.log10(10**100))
+  assert_float(30.0, Math.log10(10.0**30))
 end
 
 assert('Math.sqrt') do
@@ -117,19 +83,14 @@
   assert_float(5.0, Math.hypot(3, 4))
 end
 
-assert('Math.erf 1') do
+assert('Math.erf') do
+  assert_float(0, Math.erf(0))
   assert_float(0.842700792949715, Math.erf(1))
-end
-
-assert('Math.erfc 1') do
-  assert_float(0.157299207050285, Math.erfc(1))
-end
-
-assert('Math.erf -1') do
   assert_float(-0.8427007929497148, Math.erf(-1))
 end
 
-assert('Math.erfc -1') do
+assert('Math.erfc') do
+  assert_float(0.157299207050285, Math.erfc(1))
   assert_float(1.8427007929497148, Math.erfc(-1))
 end
 
@@ -209,17 +170,18 @@
   assert_float(+Math::PI, Math.atan2(+0.0, -0.0))
   assert_float(-Math::PI, Math.atan2(-0.0, -0.0))
 
+  assert_float(0, Math.atan2(0, 1))
+  assert_float(Math::PI / 4, Math.atan2(1, 1))
+  assert_float(Math::PI / 2, Math.atan2(1, 0))
+
   inf = Float::INFINITY
+  skip "Math.atan2() return NaN" if Math.atan2(+inf, -inf).nan?
   expected = 3.0 * Math::PI / 4.0
   assert_float(+expected, Math.atan2(+inf, -inf))
   assert_float(-expected, Math.atan2(-inf, -inf))
   expected = Math::PI / 4.0
   assert_float(+expected, Math.atan2(+inf, +inf))
   assert_float(-expected, Math.atan2(-inf, +inf))
-
-  assert_float(0, Math.atan2(0, 1))
-  assert_float(Math::PI / 4, Math.atan2(1, 1))
-  assert_float(Math::PI / 2, Math.atan2(1, 0))
 end
 
 assert('Math.ldexp') do

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-metaprog/src/metaprog.c -> _service:tar_scm:nghttp2-1.52.0.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/presym.h"
 
 typedef enum {
   NOEX_PUBLIC    = 0x00,
@@ -20,6 +21,8 @@
   NOEX_RESPONDS  = 0x80
 } mrb_method_flag_t;
 
+mrb_value mrb_proc_local_variables(mrb_state *mrb, const struct RProc *proc);
+
 static mrb_value
 mrb_f_nil(mrb_state *mrb, mrb_value cv)
 {
@@ -132,103 +135,76 @@
 static mrb_value
 mrb_local_variables(mrb_state *mrb, mrb_value self)
 {
-  struct RProc *proc;
-  mrb_irep *irep;
-  mrb_value vars;
-  size_t i;
+  return mrb_proc_local_variables(mrb, mrb->c->ci-1.proc);
+}
 
-  proc = mrb->c->ci-1.proc;
+KHASH_DECLARE(st, mrb_sym, char, FALSE)
+KHASH_DEFINE(st, mrb_sym, char, FALSE, kh_int_hash_func, kh_int_hash_equal)
 
-  if (proc == NULL || MRB_PROC_CFUNC_P(proc)) {
-    return mrb_ary_new(mrb);
-  }
-  vars = mrb_hash_new(mrb);
-  while (proc) {
-    if (MRB_PROC_CFUNC_P(proc)) break;
-    irep = proc->body.irep;
-    if (irep->lv) {
-      for (i = 0; i + 1 < irep->nlocals; ++i) {
-        if (irep->lvi.name) {
-          mrb_sym sym = irep->lvi.name;
-          const char *name = mrb_sym_name(mrb, sym);
-          switch (name0) {
-          case '*': case '&':
-            break;
-          default:
-            mrb_hash_set(mrb, vars, mrb_symbol_value(sym), mrb_true_value());
-            break;
-          }
-        }
-      }
+struct mt_set {
+  khash_t(st) *set;
+  khash_t(st) *undef;
+};
+
+static int
+method_entry_i(mrb_state *mrb, mrb_sym mid, mrb_method_t m, void *p)
+{
+  struct mt_set *s = (struct mt_set*)p;
+
+  if (MRB_METHOD_UNDEF_P(m)) {
+    if (s->undef) {
+      kh_put(st, mrb, s->undef, mid);
     }
-    if (MRB_PROC_SCOPE_P(proc)) break;
-    proc = proc->upper;
   }
-
-  return mrb_hash_keys(mrb, vars);
+  else if (s->undef == NULL ||
+           kh_get(st, mrb, s->undef, mid) == kh_end(s->undef)) {
+    kh_put(st, mrb, s->set, mid);
+  }
+  return 0;
 }
 
-KHASH_DECLARE(st, mrb_sym, char, FALSE)
-
 static void
 method_entry_loop(mrb_state *mrb, struct RClass *klass, khash_t(st) *set, khash_t(st) *undef)
 {
-  khint_t i;
+  struct mt_set s;
 
-  khash_t(mt) *h = klass->mt;
-  if (!h || kh_size(h) == 0) return;
-  for (i=0;i<kh_end(h);i++) {
-    if (kh_exist(h, i)) {
-      mrb_method_t m = kh_value(h, i);
-      if (MRB_METHOD_UNDEF_P(m)) {
-        if (undef) {
-          kh_put(st, mrb, undef, kh_key(h, i));
-        }
-      }
-      else if (undef == NULL ||
-               kh_get(st, mrb, undef, kh_key(h, i)) == kh_end(undef)) {
-        kh_put(st, mrb, set, kh_key(h, i));
-      }
-    }
-  }
+  s.set = set;
+  s.undef = undef;
+  mrb_mt_foreach(mrb, klass, method_entry_i, (void*)&s);
 }
 
 static mrb_value
-mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass *klass, int obj)
+mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass *klass)
 {
-  khint_t i;
   mrb_value ary;
-  mrb_bool prepended = FALSE;
   struct RClass *oldklass;
   khash_t(st) *set = kh_init(st, mrb);
-  khash_t(st) *undef = (recur ? kh_init(st, mrb) : NULL);
 
-  if (!recur && (klass->flags & MRB_FL_CLASS_IS_PREPENDED)) {
-    MRB_CLASS_ORIGIN(klass);
-    prepended = TRUE;
+  if (!recur) {
+    if (klass->flags & MRB_FL_CLASS_IS_PREPENDED) {
+      MRB_CLASS_ORIGIN(klass);
+    }
+    method_entry_loop(mrb, klass, set, NULL);
   }
+  else {
+    khash_t(st) *undef = kh_init(st, mrb);
 
-  oldklass = 0;
-  while (klass && (klass != oldklass)) {
-    method_entry_loop(mrb, klass, set, undef);
-    if ((klass->tt == MRB_TT_ICLASS && !prepended) ||
-        (klass->tt == MRB_TT_SCLASS)) {
-    }
-    else {
-      if (!recur) break;
+    oldklass = NULL;
+    while (klass && (klass != oldklass)) {
+      method_entry_loop(mrb, klass, set, undef);
+      oldklass = klass;
+      klass = klass->super;
     }
-    oldklass = klass;
-    klass = klass->super;
+    kh_destroy(st, mrb, undef);
   }
 
   ary = mrb_ary_new_capa(mrb, kh_size(set));
-  for (i=0;i<kh_end(set);i++) {
+  for (khint_t i=0; i<kh_end(set); i++) {
     if (kh_exist(set, i)) {
       mrb_ary_push(mrb, ary, mrb_symbol_value(kh_key(set, i)));
     }
   }
   kh_destroy(st, mrb, set);
-  if (undef) kh_destroy(st, mrb, undef);
 
   return ary;
 }
@@ -236,7 +212,7 @@
 static mrb_value
 mrb_obj_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj, mrb_method_flag_t flag)
 {
-  return mrb_class_instance_method_list(mrb, recur, mrb_class(mrb, obj), 0);
+  return mrb_class_instance_method_list(mrb, recur, mrb_class(mrb, obj));
 }
 /* 15.3.1.3.31 */
 /*
@@ -391,21 +367,12 @@
   return mrb_obj_singleton_methods(mrb, recur, self);
 }
 
+mrb_value mrb_mod_define_method_m(mrb_state *mrb, struct RClass *c);
+
 static mrb_value
 mod_define_singleton_method(mrb_state *mrb, mrb_value self)
 {
-  struct RProc *p;
-  mrb_method_t m;
-  mrb_sym mid;
-  mrb_value blk = mrb_nil_value();
-
-  mrb_get_args(mrb, "n&!", &mid, &blk);
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  mrb_proc_copy(p, mrb_proc_ptr(blk));
-  p->flags |= MRB_PROC_STRICT;
-  MRB_METHOD_FROM_PROC(m, p);
-  mrb_define_method_raw(mrb, mrb_class_ptr(mrb_singleton_class(mrb, self)), mid, m);
-  return mrb_symbol_value(mid);
+  return mrb_mod_define_method_m(mrb, mrb_class_ptr(mrb_singleton_class(mrb, self)));
 }
 
 static mrb_bool
@@ -605,29 +572,7 @@
   struct RClass *c = mrb_class_ptr(mod);
   mrb_bool recur = TRUE;
   mrb_get_args(mrb, "|b", &recur);
-  return mrb_class_instance_method_list(mrb, recur, c, 0);
-}
-
-static void
-remove_method(mrb_state *mrb, mrb_value mod, mrb_sym mid)
-{
-  struct RClass *c = mrb_class_ptr(mod);
-  khash_t(mt) *h;
-  khiter_t k;
-
-  MRB_CLASS_ORIGIN(c);
-  h = c->mt;
-
-  if (h) {
-    k = kh_get(mt, mrb, h, mid);
-    if (k != kh_end(h)) {
-      kh_del(mt, mrb, h, k);
-      mrb_funcall(mrb, mod, "method_removed", 1, mrb_symbol_value(mid));
-      return;
-    }
-  }
-
-  mrb_name_error(mrb, mid, "method '%n' not defined in %v", mid, mod);
+  return mrb_class_instance_method_list(mrb, recur, c);
 }
 
 /* 15.2.2.4.41 */
@@ -643,12 +588,14 @@
 mrb_mod_remove_method(mrb_state *mrb, mrb_value mod)
 {
   mrb_int argc;
-  mrb_value *argv;
+  const mrb_value *argv;
+  struct RClass *c = mrb_class_ptr(mod);
 
   mrb_get_args(mrb, "*", &argv, &argc);
   mrb_check_frozen(mrb, mrb_obj_ptr(mod));
   while (argc--) {
-    remove_method(mrb, mod, mrb_obj_to_sym(mrb, *argv));
+    mrb_remove_method(mrb, c, mrb_obj_to_sym(mrb, *argv));
+    mrb_funcall_id(mrb, mod, MRB_SYM(method_removed), 1, *argv);
     argv++;
   }
   return mod;
@@ -664,7 +611,7 @@
 static mrb_value
 mrb_mod_s_nesting(mrb_state *mrb, mrb_value mod)
 {
-  struct RProc *proc;
+  const struct RProc *proc;
   mrb_value ary;
   struct RClass *c = NULL;
 
@@ -684,6 +631,9 @@
   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)
 {

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

@@ -64,6 +64,8 @@
 
 assert('Kernel#methods', '15.3.1.3.31') do
   assert_equal Array, methods.class
+  assert_equal :foo, Class.new{def self.foo; end}.methods(false)
+  assert_equal , Class.new{}.methods(false)
 end
 
 assert('Kernel#private_methods', '15.3.1.3.36') do
@@ -102,6 +104,17 @@
   assert_equal(1, variables2.size - variables1.size)
 end
 
+assert('Kernel#local_variables', '15.3.1.3.28') do
+  assert_equal Array, local_variables.class
+
+  def local_var_list
+    a = "hello"
+    local_variables
+  end
+
+  assert_equal :a, local_var_list
+end
+
 assert('Kernel.local_variables', '15.3.1.2.7') do
   a, b = 0, 1
   a += b
@@ -395,15 +408,15 @@
 
 assert('alias_method and remove_method') do
   begin
-    Fixnum.alias_method :to_s_, :to_s
-    Fixnum.remove_method :to_s
+    Integer.alias_method :to_s_, :to_s
+    Integer.remove_method :to_s
 
     assert_nothing_raised do
       # segfaults if mrb_cptr is used
       1.to_s
     end
   ensure
-    Fixnum.alias_method :to_s, :to_s_
-    Fixnum.remove_method :to_s_
+    Integer.alias_method :to_s, :to_s_
+    Integer.remove_method :to_s_
   end
 end

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

@@ -1,7 +1,6 @@
-mruby-method
-===
+# mruby-method
 
-A implementetion of class **Method** and **UnboundMethod** for mruby
+An implementation of class **Method** and **UnboundMethod** for mruby
 
 ```ruby
 p Enumerable.instance_method(:find_all).source_location
@@ -10,11 +9,12 @@
 
 # Note
 
-`source_location` method need this configuration in build_config.rb
+You need to enable debug option in your build configuration to use
+`source_location` method in this gem, for example:
 
 ```ruby
 MRuby::Build.new do |conf|
-  enable_debug
+  conf.enable_debug
 end
 ```
 
@@ -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.46.0.tar.xz/third-party/mruby/mrbgems/mruby-method/mrblib/method.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-method/mrblib/method.rb Changed

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

@@ -4,11 +4,148 @@
 #include "mruby/variable.h"
 #include "mruby/proc.h"
 #include "mruby/string.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);
+
+static mrb_value
+args_shift(mrb_state *mrb)
+{
+  mrb_callinfo *ci = mrb->c->ci;
+  mrb_value *argv = ci->stack + 1;
+
+  if (ci->n < 15) {
+    if (ci->n == 0) { goto argerr; }
+    mrb_assert(ci->nk == 0 || ci->nk == 15);
+    mrb_value obj = argv0;
+    int count = ci->n + (ci->nk == 0 ? 0 : 1) + 1 /* block */ - 1 /* first value */;
+    memmove(argv, argv + 1, count * sizeof(mrb_value));
+    ci->n--;
+    return obj;
+  }
+  else if (RARRAY_LEN(*argv) > 0) {
+    return mrb_ary_shift(mrb, *argv);
+  }
+  else {
+  argerr:
+    mrb_argnum_error(mrb, 0, 1, -1);
+    return mrb_undef_value(); /* not reached */
+  }
+}
+
+static void
+args_unshift(mrb_state *mrb, mrb_value obj)
+{
+  mrb_callinfo *ci = mrb->c->ci;
+  mrb_value *argv = ci->stack + 1;
+
+  if (ci->n < 15) {
+    mrb_assert(ci->nk == 0 || ci->nk == 15);
+    mrb_value args = mrb_ary_new_from_values(mrb, ci->n, argv);
+    if (ci->nk == 0) {
+      mrb_value block = argvci->n;
+      argv0 = args;
+      argv1 = block;
+    }
+    else {
+      mrb_value keyword = argvci->n;
+      mrb_value block = argvci->n + 1;
+      argv0 = args;
+      argv1 = keyword;
+      argv2 = block;
+    }
+    ci->n = 15;
+  }
+
+  mrb_ary_unshift(mrb, *argv, obj);
+}
+
+static struct RProc*
+method_missing_prepare(mrb_state *mrb, mrb_sym *mid, mrb_value recv, struct RClass **tc)
+{
+  const mrb_sym id_method_missing = MRB_SYM(method_missing);
+  mrb_callinfo *ci = mrb->c->ci;
+
+  if (*mid == id_method_missing) {
+  method_missing: ;
+    int n = ci->n;
+    mrb_value *argv = ci->stack + 1;
+    mrb_value args = (n == 15) ? argv0 : mrb_ary_new_from_values(mrb, n, argv);
+    mrb_method_missing(mrb, id_method_missing, recv, args);
+  }
+
+  *tc = mrb_class(mrb, recv);
+  mrb_method_t m = mrb_method_search_vm(mrb, tc, id_method_missing);
+  if (MRB_METHOD_UNDEF_P(m)) {
+    goto method_missing;
+  }
+
+  struct RProc *proc;
+  if (MRB_METHOD_FUNC_P(m)) {
+    proc = mrb_proc_new_cfunc(mrb, MRB_METHOD_FUNC(m));
+    MRB_PROC_SET_TARGET_CLASS(proc, *tc);
+  }
+  else {
+    proc = MRB_METHOD_PROC(m);
+  }
+
+  args_unshift(mrb, mrb_symbol_value(*mid));
+  *mid = id_method_missing;
+
+  return proc;
+}
 
 static struct RObject *
 method_object_alloc(mrb_state *mrb, struct RClass *mclass)
 {
-  return (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mclass);
+  return MRB_OBJ_ALLOC(mrb, MRB_TT_OBJECT, mclass);
+}
+
+static struct RProc*
+method_extract_proc(mrb_state *mrb, mrb_value self)
+{
+  mrb_value obj = mrb_iv_get(mrb, self, MRB_SYM(_proc));
+  if (mrb_nil_p(obj)) {
+    return NULL;
+  }
+  else {
+    mrb_check_type(mrb, obj, MRB_TT_PROC);
+    return mrb_proc_ptr(obj);
+  }
+}
+
+static mrb_value
+method_extract_receiver(mrb_state *mrb, mrb_value self)
+{
+  return mrb_iv_get(mrb, self, MRB_SYM(_recv));
+}
+
+static mrb_sym
+method_extract_mid(mrb_state *mrb, mrb_value self)
+{
+  mrb_value obj = mrb_iv_get(mrb, self, MRB_SYM(_name));
+  mrb_check_type(mrb, obj, MRB_TT_SYMBOL);
+  return mrb_symbol(obj);
+}
+
+static struct RClass*
+method_extract_owner(mrb_state *mrb, mrb_value self)
+{
+  mrb_value obj = mrb_iv_get(mrb, self, MRB_SYM(_owner));
+  switch (mrb_type(obj)) {
+    case MRB_TT_CLASS:
+    case MRB_TT_MODULE:
+    case MRB_TT_SCLASS:
+      break;
+    default:
+      mrb_raise(mrb, E_TYPE_ERROR, "not class/module as owner of method object");
+  }
+  return mrb_class_ptr(obj);
 }
 
 static void
@@ -29,24 +166,24 @@
 unbound_method_bind(mrb_state *mrb, mrb_value self)
 {
   struct RObject *me;
-  mrb_value owner = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_owner"));
-  mrb_value name = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_name"));
-  mrb_value proc = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_proc"));
-  mrb_value klass = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_klass"));
+  mrb_value owner = mrb_iv_get(mrb, self, MRB_SYM(_owner));
+  mrb_value name = mrb_iv_get(mrb, self, MRB_SYM(_name));
+  mrb_value proc = mrb_iv_get(mrb, self, MRB_SYM(_proc));
+  mrb_value klass = mrb_iv_get(mrb, self, MRB_SYM(_klass));
   mrb_value recv = mrb_get_arg1(mrb);
 
   bind_check(mrb, recv, owner);
-  me = method_object_alloc(mrb, mrb_class_get(mrb, "Method"));
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_owner"), owner);
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_recv"), recv);
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_name"), name);
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_proc"), proc);
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_klass"), klass);
+  me = method_object_alloc(mrb, mrb_class_get_id(mrb, MRB_SYM(Method)));
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_owner), owner);
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_recv), recv);
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_name), name);
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_proc), proc);
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_klass), klass);
 
   return mrb_obj_value(me);
 }
 
-#define IV_GET(value, name) mrb_iv_get(mrb, value, mrb_intern_lit(mrb, name))
+#define IV_GET(value, name) mrb_iv_get(mrb, value, name)
 static mrb_value
 method_eql(mrb_state *mrb, mrb_value self)
 {
@@ -61,22 +198,22 @@
   if (mrb_class(mrb, self) != mrb_class(mrb, other))
     return mrb_false_value();
 
-  klass = mrb_class_ptr(IV_GET(self, "_klass"));
-  if (klass != mrb_class_ptr(IV_GET(other, "_klass")))
+  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, "_owner"));
-  if (owner != mrb_class_ptr(IV_GET(other, "_owner")))
+  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();
 
-  receiver = IV_GET(self, "_recv");
-  if (!mrb_obj_equal(mrb, receiver, IV_GET(other, "_recv")))
+  receiver = IV_GET(self, MRB_SYM(_recv));
+  if (!mrb_obj_equal(mrb, receiver, IV_GET(other, MRB_SYM(_recv))))
     return mrb_false_value();
 
-  orig_proc = IV_GET(self, "_proc");
-  other_proc = IV_GET(other, "_proc");
+  orig_proc = IV_GET(self, MRB_SYM(_proc));
+  other_proc = IV_GET(other, MRB_SYM(_proc));
   if (mrb_nil_p(orig_proc) && mrb_nil_p(other_proc)) {
-    if (mrb_symbol(IV_GET(self, "_name")) == mrb_symbol(IV_GET(other, "_name")))
+    if (mrb_symbol(IV_GET(self, MRB_SYM(_name))) == mrb_symbol(IV_GET(other, MRB_SYM(_name))))
       return mrb_true_value();
     else
       return mrb_false_value();
@@ -108,76 +245,57 @@
 #undef IV_GET
 
 static mrb_value
-mcall(mrb_state *mrb, mrb_value recv, mrb_value proc, mrb_value name, struct RClass *owner,
-      mrb_int argc, mrb_value *argv, mrb_value block)
+mcall(mrb_state *mrb, mrb_value self, mrb_value recv)
 {
-  mrb_value ret;
-  mrb_sym orig_mid = mrb->c->ci->mid;
+  struct RProc *proc = method_extract_proc(mrb, self);
+  mrb_sym mid = method_extract_mid(mrb, self);
+  struct RClass *tc = method_extract_owner(mrb, self);
 
-  mrb->c->ci->mid = mrb_symbol(name);
-  if (mrb_nil_p(proc)) {
-    mrb_value missing_argv = mrb_ary_new_from_values(mrb, argc, argv);
-    mrb_ary_unshift(mrb, missing_argv, name);
-    ret = mrb_funcall_argv(mrb, recv, mrb_intern_lit(mrb, "method_missing"), argc + 1, RARRAY_PTR(missing_argv));
-  }
-  else if (!mrb_nil_p(block)) {
-    /*
-      workaround since `mrb_yield_with_class` does not support passing block as parameter
-      need new API that initializes `mrb->c->stackargc+1` with block passed by argument
-    */
-    ret = mrb_funcall_with_block(mrb, recv, mrb_symbol(name), argc, argv, block);
+  if (mrb_undef_p(recv)) {
+    recv = method_extract_receiver(mrb, self);
   }
   else {
-    ret = mrb_yield_with_class(mrb, proc, argc, argv, recv, owner);
+    bind_check(mrb, recv, mrb_obj_value(tc));
   }
-  mrb->c->ci->mid = orig_mid;
-  return ret;
+
+  if (!proc) {
+    proc = method_missing_prepare(mrb, &mid, recv, &tc);
+  }
+  mrb->c->ci->mid = mid;
+  mrb->c->ci->u.target_class = tc;
+
+  return mrb_exec_irep(mrb, recv, proc);
 }
 
 static mrb_value
 method_call(mrb_state *mrb, mrb_value self)
 {
-  mrb_value proc = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_proc"));
-  mrb_value name = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_name"));
-  mrb_value recv = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_recv"));
-  struct RClass *owner = mrb_class_ptr(mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_owner")));
-  mrb_int argc;
-  mrb_value *argv, block;
-
-  mrb_get_args(mrb, "*&", &argv, &argc, &block);
-  return mcall(mrb, recv, proc, name, owner, argc, argv, block);
+  return mcall(mrb, self, mrb_undef_value());
 }
 
 static mrb_value
 method_bcall(mrb_state *mrb, mrb_value self)
 {
-  mrb_value proc = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_proc"));
-  mrb_value name = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_name"));
-  mrb_value recv = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_recv"));
-  mrb_value owner = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_owner"));
-  mrb_int argc;
-  mrb_value *argv, block;
-
-  mrb_get_args(mrb, "o*&", &recv, &argv, &argc, &block);
-  bind_check(mrb, recv, owner);
-  return mcall(mrb, recv, proc, name, mrb_class_ptr(owner), argc, argv, block);
+  mrb_value recv = args_shift(mrb);
+  mrb_gc_protect(mrb, recv);
+  return mcall(mrb, self, recv);
 }
 
 static mrb_value
 method_unbind(mrb_state *mrb, mrb_value self)
 {
   struct RObject *ume;
-  mrb_value owner = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_owner"));
-  mrb_value name = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_name"));
-  mrb_value proc = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_proc"));
-  mrb_value klass = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_klass"));
-
-  ume = method_object_alloc(mrb, mrb_class_get(mrb, "UnboundMethod"));
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_owner"), owner);
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_recv"), mrb_nil_value());
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_name"), name);
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_proc"), proc);
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_klass"), klass);
+  mrb_value owner = mrb_iv_get(mrb, self, MRB_SYM(_owner));
+  mrb_value name = mrb_iv_get(mrb, self, MRB_SYM(_name));
+  mrb_value proc = mrb_iv_get(mrb, self, MRB_SYM(_proc));
+  mrb_value klass = mrb_iv_get(mrb, self, MRB_SYM(_klass));
+
+  ume = method_object_alloc(mrb, mrb_class_get_id(mrb, MRB_SYM(UnboundMethod)));
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_owner), owner);
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_recv), mrb_nil_value());
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_name), name);
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_proc), proc);
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_klass), klass);
 
   return mrb_obj_value(ume);
 }
@@ -190,16 +308,21 @@
     return NULL;
   if (MRB_METHOD_PROC_P(m))
     return MRB_METHOD_PROC(m);
-  return mrb_proc_new_cfunc(mrb, MRB_METHOD_FUNC(m));
+
+  struct RProc *proc = mrb_proc_new_cfunc(mrb, MRB_METHOD_FUNC(m));
+  if (MRB_METHOD_NOARG_P(m)) {
+    proc->flags |= MRB_PROC_NOARG;
+  }
+  return proc;
 }
 
 static mrb_value
 method_super_method(mrb_state *mrb, mrb_value self)
 {
-  mrb_value recv = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_recv"));
-  mrb_value klass = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_klass"));
-  mrb_value owner = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_owner"));
-  mrb_value name = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_name"));
+  mrb_value recv = mrb_iv_get(mrb, self, MRB_SYM(_recv));
+  mrb_value klass = mrb_iv_get(mrb, self, MRB_SYM(_klass));
+  mrb_value owner = mrb_iv_get(mrb, self, MRB_SYM(_owner));
+  mrb_value name = mrb_iv_get(mrb, self, MRB_SYM(_name));
   struct RClass *super, *rklass;
   struct RProc *proc;
   struct RObject *me;
@@ -225,11 +348,11 @@
     super = super->c;
 
   me = method_object_alloc(mrb, mrb_obj_class(mrb, self));
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_owner"), mrb_obj_value(super));
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_recv"), recv);
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_name"), name);
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_proc"), mrb_obj_value(proc));
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_klass"), mrb_obj_value(rklass));
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_owner), mrb_obj_value(super));
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_recv), recv);
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_name), name);
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_proc), mrb_obj_value(proc));
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_klass), mrb_obj_value(rklass));
 
   return mrb_obj_value(me);
 }
@@ -237,7 +360,7 @@
 static mrb_value
 method_arity(mrb_state *mrb, mrb_value self)
 {
-  mrb_value proc = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_proc"));
+  mrb_value proc = mrb_iv_get(mrb, self, MRB_SYM(_proc));
   mrb_int arity = mrb_nil_p(proc) ? -1 : mrb_proc_arity(mrb_proc_ptr(proc));
   return mrb_fixnum_value(arity);
 }
@@ -245,50 +368,34 @@
 static mrb_value
 method_source_location(mrb_state *mrb, mrb_value self)
 {
-  mrb_value proc = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_proc"));
-  struct RProc *rproc;
-  struct RClass *orig;
-  mrb_value ret;
+  mrb_value proc = mrb_iv_get(mrb, self, MRB_SYM(_proc));
 
   if (mrb_nil_p(proc))
     return mrb_nil_value();
 
-  rproc = mrb_proc_ptr(proc);
-  orig = rproc->c;
-  rproc->c = mrb->proc_class;
-  ret = mrb_funcall(mrb, proc, "source_location", 0);
-  rproc->c = orig;
-  return ret;
+  return mrb_proc_source_location(mrb, mrb_proc_ptr(proc));
 }
 
 static mrb_value
 method_parameters(mrb_state *mrb, mrb_value self)
 {
-  mrb_value proc = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_proc"));
-  struct RProc *rproc;
-  struct RClass *orig;
-  mrb_value ret;
+  mrb_value proc = mrb_iv_get(mrb, self, MRB_SYM(_proc));
 
   if (mrb_nil_p(proc)) {
-    mrb_value rest = mrb_symbol_value(mrb_intern_lit(mrb, "rest"));
+    mrb_value rest = mrb_symbol_value(MRB_SYM(rest));
     mrb_value arest = mrb_ary_new_from_values(mrb, 1, &rest);
     return mrb_ary_new_from_values(mrb, 1, &arest);
   }
 
-  rproc = mrb_proc_ptr(proc);
-  orig = rproc->c;
-  rproc->c = mrb->proc_class;
-  ret = mrb_funcall(mrb, proc, "parameters", 0);
-  rproc->c = orig;
-  return ret;
+  return mrb_proc_parameters(mrb, proc);
 }
 
 static mrb_value
 method_to_s(mrb_state *mrb, mrb_value self)
 {
-  mrb_value owner = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_owner"));
-  mrb_value klass = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_klass"));
-  mrb_value name = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_name"));
+  mrb_value owner = mrb_iv_get(mrb, self, MRB_SYM(_owner));
+  mrb_value klass = mrb_iv_get(mrb, self, MRB_SYM(_klass));
+  mrb_value name = mrb_iv_get(mrb, self, MRB_SYM(_name));
   mrb_value str = mrb_str_new_lit(mrb, "#<");
   struct RClass *rklass;
 
@@ -322,10 +429,10 @@
     if (unbound) {
       goto name_error;
     }
-    if (!mrb_respond_to(mrb, obj, mrb_intern_lit(mrb, "respond_to_missing?"))) {
+    if (!mrb_respond_to(mrb, obj, MRB_SYM_Q(respond_to_missing))) {
       goto name_error;
     }
-    ret = mrb_funcall(mrb, obj, "respond_to_missing?", 2, mrb_symbol_value(name), mrb_true_value());
+    ret = mrb_funcall_id(mrb, obj, MRB_SYM_Q(respond_to_missing), 2, mrb_symbol_value(name), mrb_true_value());
     if (!mrb_test(ret)) {
       goto name_error;
     }
@@ -353,12 +460,12 @@
 
   mrb_search_method_owner(mrb, mrb_class(mrb, self), self, name, &owner, &proc, FALSE);
 
-  me = method_object_alloc(mrb, mrb_class_get(mrb, "Method"));
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_owner"), mrb_obj_value(owner));
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_recv"), self);
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_name"), mrb_symbol_value(name));
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_proc"), proc ? mrb_obj_value(proc) : mrb_nil_value());
-  mrb_obj_iv_set(mrb, me, mrb_intern_lit(mrb, "_klass"), mrb_obj_value(mrb_class(mrb, self)));
+  me = method_object_alloc(mrb, mrb_class_get_id(mrb, MRB_SYM(Method)));
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_owner), mrb_obj_value(owner));
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_recv), self);
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_name), mrb_symbol_value(name));
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_proc), proc ? mrb_obj_value(proc) : mrb_nil_value());
+  mrb_obj_iv_set(mrb, me, MRB_SYM(_klass), mrb_obj_value(mrb_class(mrb, self)));
 
   return mrb_obj_value(me);
 }
@@ -375,12 +482,12 @@
 
   mrb_search_method_owner(mrb, mrb_class_ptr(self), self, name, &owner, &proc, TRUE);
 
-  ume = method_object_alloc(mrb, mrb_class_get(mrb, "UnboundMethod"));
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_owner"), mrb_obj_value(owner));
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_recv"), mrb_nil_value());
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_name"), mrb_symbol_value(name));
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_proc"), proc ? mrb_obj_value(proc) : mrb_nil_value());
-  mrb_obj_iv_set(mrb, ume, mrb_intern_lit(mrb, "_klass"), self);
+  ume = method_object_alloc(mrb, mrb_class_get_id(mrb, MRB_SYM(UnboundMethod)));
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_owner), mrb_obj_value(owner));
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_recv), mrb_nil_value());
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_name), mrb_symbol_value(name));
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_proc), proc ? mrb_obj_value(proc) : mrb_nil_value());
+  mrb_obj_iv_set(mrb, ume, MRB_SYM(_klass), self);
 
   return mrb_obj_value(ume);
 }
@@ -388,26 +495,26 @@
 static mrb_value
 method_owner(mrb_state *mrb, mrb_value self)
 {
-  return mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_owner"));
+  return mrb_iv_get(mrb, self, MRB_SYM(_owner));
 }
 
 static mrb_value
 method_receiver(mrb_state *mrb, mrb_value self)
 {
-  return mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_recv"));
+  return mrb_iv_get(mrb, self, MRB_SYM(_recv));
 }
 
 static mrb_value
 method_name(mrb_state *mrb, mrb_value self)
 {
-  return mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "_name"));
+  return mrb_iv_get(mrb, self, MRB_SYM(_name));
 }
 
 void
 mrb_mruby_method_gem_init(mrb_state* mrb)
 {
-  struct RClass *unbound_method = mrb_define_class(mrb, "UnboundMethod", mrb->object_class);
-  struct RClass *method = mrb_define_class(mrb, "Method", mrb->object_class);
+  struct RClass *unbound_method = mrb_define_class_id(mrb, MRB_SYM(UnboundMethod), mrb->object_class);
+  struct RClass *method = mrb_define_class_id(mrb, MRB_SYM(Method), mrb->object_class);
 
   mrb_undef_class_method(mrb, unbound_method, "new");
   mrb_define_method(mrb, unbound_method, "bind", unbound_method_bind, MRB_ARGS_REQ(1));

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

@@ -77,7 +77,7 @@
 
 assert 'instance' do
   assert_kind_of Method, 1.method(:+)
-  assert_kind_of UnboundMethod, Fixnum.instance_method(:+)
+  assert_kind_of UnboundMethod, Integer.instance_method(:+)
 end
 
 assert 'Method#call' do
@@ -92,12 +92,15 @@
   assert_equal 42, klass2.new.method(:foo).call
 
   i = Class.new {
-   def bar
-     yield 3
-   end
+    def bar
+      yield 3
+    end
   }.new
   assert_raise(LocalJumpError) { i.method(:bar).call }
   assert_equal 3, i.method(:bar).call { |i| i }
+
+  assert_raise(ArgumentError) { nil.method(:__id__).call nil, 1 }
+  assert_raise(ArgumentError) { nil.method(:__id__).call nil, opts: 1 }
 end
 
 assert 'Method#call for regression' do
@@ -208,6 +211,19 @@
     yield 39
   end
   assert_equal 42, o.bar(&3.method(:+))
+
+  def o.baz(x, y, z, *w, u:, v:, **opts, &blk)
+    { x:, y:, z:, w:, u:, v:, opts:, blk: }
+  end
+  blk = -> { }
+  values = { x: 1, y: 2, z: 3, w: 4, 5, 6, u: 7, v: 8, opts: { s: 9, t: 10 }, blk: blk }
+  assert_equal values, o.method(:baz).to_proc.call(1, 2, 3, 4, 5, 6, u: 7, v: 8, s: 9, t: 10, &blk)
+  assert_equal values, o.method(:baz).to_proc.call(1, 2, 3, 4, 5, 6, **{ u: 7, v: 8, s: 9, t: 10 }, &blk)
+  assert_equal values, o.method(:baz).to_proc.call(*1, 2, 3, 4, 5, 6, u: 7, v: 8, s: 9, t: 10, &blk)
+  assert_equal values, o.method(:baz).to_proc.call(*1, 2, 3, 4, 5, 6, **{ u: 7, v: 8, s: 9, t: 10 }, &blk)
+
+  assert_raise(ArgumentError) { nil.method(:__id__).to_proc.call nil, 1 }
+  assert_raise(ArgumentError) { nil.method(:__id__).to_proc.call nil, opts: 1 }
 end
 
 assert 'to_s' do
@@ -404,10 +420,11 @@
 end
 
 assert 'UnboundMethod#==' do
-  assert_false(Fixnum.instance_method(:+) == Fixnum.instance_method(:-))
-  assert_true(Fixnum.instance_method(:+) == Fixnum.instance_method(:+))
-  assert_false(Fixnum.instance_method(:+) == Float.instance_method(:+))
+  assert_false(Integer.instance_method(:+) == Integer.instance_method(:-))
+  assert_true(Integer.instance_method(:+) == Integer.instance_method(:+))
   assert_true(UnboundMethod.instance_method(:==) == UnboundMethod.instance_method(:eql?))
+  skip unless Object.const_defined?(:Float)
+  assert_false(Integer.instance_method(:+) == Float.instance_method(:+))
 end
 
 assert 'UnboundMethod#super_method' do
@@ -448,4 +465,20 @@
   assert_equal(0, m.bind_call())
   assert_equal(1, m.bind_call(1))
   assert_equal(2, m.bind_call(1,2))
+
+  o = Object.new
+  def m(x, y, z, *w, u:, v:, **opts, &blk)
+    { x:, y:, z:, w:, u:, v:, opts:, blk: }
+  end
+  m = o.method(:m).unbind
+  blk = -> { }
+  values = { x: 1, y: 2, z: 3, w: 4, 5, 6, u: 7, v: 8, opts: { s: 9, t: 10 }, blk: blk }
+  assert_equal values, m.bind_call(o, 1, 2, 3, 4, 5, 6, u: 7, v: 8, s: 9, t: 10, &blk)
+  assert_equal values, m.bind_call(o, 1, 2, 3, 4, 5, 6, **{ u: 7, v: 8, s: 9, t: 10 }, &blk)
+  assert_equal values, m.bind_call(o, *1, 2, 3, 4, 5, 6, u: 7, v: 8, s: 9, t: 10, &blk)
+  assert_equal values, m.bind_call(o, *1, 2, 3, 4, 5, 6, **{ u: 7, v: 8, s: 9, t: 10 }, &blk)
+  assert_raise(ArgumentError) { m.bind_call }
+
+  assert_raise(ArgumentError) { BasicObject.instance_method(:__id__).bind_call nil, 1 }
+  assert_raise(ArgumentError) { BasicObject.instance_method(:__id__).bind_call nil, opts: 1 }
 end

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

@@ -1,6 +1,6 @@
-#include <limits.h>
 #include <mruby.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 
 /*
  *  call-seq:
@@ -9,12 +9,12 @@
  *  Returns +true+ if all bits of <code>+int+ & +mask+</code> are 1.
  */
 static mrb_value
-mrb_int_allbits(mrb_state *mrb, mrb_value self)
+int_allbits(mrb_state *mrb, mrb_value self)
 {
   mrb_int n, m;
 
   mrb_get_args(mrb, "i", &m);
-  n = mrb_int(mrb, self);
+  n = mrb_integer(self);
   return mrb_bool_value((n & m) == m);
 }
 
@@ -25,12 +25,12 @@
  *  Returns +true+ if any bits of <code>+int+ & +mask+</code> are 1.
  */
 static mrb_value
-mrb_int_anybits(mrb_state *mrb, mrb_value self)
+int_anybits(mrb_state *mrb, mrb_value self)
 {
   mrb_int n, m;
 
   mrb_get_args(mrb, "i", &m);
-  n = mrb_int(mrb, self);
+  n = mrb_integer(self);
   return mrb_bool_value((n & m) != 0);
 }
 
@@ -41,36 +41,96 @@
  *  Returns +true+ if no bits of <code>+int+ & +mask+</code> are 1.
  */
 static mrb_value
-mrb_int_nobits(mrb_state *mrb, mrb_value self)
+int_nobits(mrb_state *mrb, mrb_value self)
 {
   mrb_int n, m;
 
   mrb_get_args(mrb, "i", &m);
-  n = mrb_int(mrb, self);
+  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");
+}
+
+/*
+ *  call-seq:
+ *     num.remainder(numeric)  ->  real
+ *
+ *  <code>x.remainder(y)</code> means <code>x-y*(x/y).truncate</code>.
+ *
+ *  See Numeric#divmod.
+ */
+static mrb_value
+int_remainder(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  mrb_int a, b;
+
+  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);
+  }
+#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
+}
+
+#ifndef MRB_NO_FLOAT
+static mrb_value
+flo_remainder(mrb_state *mrb, mrb_value self)
+{
+  mrb_float a, b;
+
+  a = mrb_float(self);
+  mrb_get_args(mrb, "f", &b);
+  if (b == 0) zerodiv(mrb);
+  if (isinf(b)) return mrb_float_value(mrb, a);
+  return mrb_float_value(mrb, a-b*trunc(a/b));
+}
+#endif
+
 void
 mrb_mruby_numeric_ext_gem_init(mrb_state* mrb)
 {
-  struct RClass *i = mrb_module_get(mrb, "Integral");
-
-  mrb_define_method(mrb, i, "allbits?", mrb_int_allbits, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, i, "anybits?", mrb_int_anybits, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, i, "nobits?", mrb_int_nobits, MRB_ARGS_REQ(1));
-
-#ifndef MRB_WITHOUT_FLOAT
-  mrb_define_const(mrb, mrb->float_class, "RADIX",        mrb_fixnum_value(MRB_FLT_RADIX));
-  mrb_define_const(mrb, mrb->float_class, "MANT_DIG",     mrb_fixnum_value(MRB_FLT_MANT_DIG));
-  mrb_define_const(mrb, mrb->float_class, "EPSILON",      mrb_float_value(mrb, MRB_FLT_EPSILON));
-  mrb_define_const(mrb, mrb->float_class, "DIG",          mrb_fixnum_value(MRB_FLT_DIG));
-  mrb_define_const(mrb, mrb->float_class, "MIN_EXP",      mrb_fixnum_value(MRB_FLT_MIN_EXP));
-  mrb_define_const(mrb, mrb->float_class, "MIN",          mrb_float_value(mrb, MRB_FLT_MIN));
-  mrb_define_const(mrb, mrb->float_class, "MIN_10_EXP",   mrb_fixnum_value(MRB_FLT_MIN_10_EXP));
-  mrb_define_const(mrb, mrb->float_class, "MAX_EXP",      mrb_fixnum_value(MRB_FLT_MAX_EXP));
-  mrb_define_const(mrb, mrb->float_class, "MAX",          mrb_float_value(mrb, MRB_FLT_MAX));
-  mrb_define_const(mrb, mrb->float_class, "MAX_10_EXP",   mrb_fixnum_value(MRB_FLT_MAX_10_EXP));
-#endif /* MRB_WITHOUT_FLOAT */
+  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));
+
+  mrb_define_alias(mrb, i, "modulo", "%");
+  mrb_define_method(mrb, i, "remainder", int_remainder, MRB_ARGS_REQ(1));
+
+#ifndef MRB_NO_FLOAT
+  struct RClass *f = mrb_class_get(mrb, "Float");
+
+  mrb_define_alias(mrb, f, "modulo", "%");
+  mrb_define_method(mrb, f, "remainder", flo_remainder, MRB_ARGS_REQ(1));
+
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(RADIX),        mrb_fixnum_value(MRB_FLT_RADIX));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MANT_DIG),     mrb_fixnum_value(MRB_FLT_MANT_DIG));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(EPSILON),      mrb_float_value(mrb, MRB_FLT_EPSILON));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(DIG),          mrb_fixnum_value(MRB_FLT_DIG));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MIN_EXP),      mrb_fixnum_value(MRB_FLT_MIN_EXP));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MIN),          mrb_float_value(mrb, MRB_FLT_MIN));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MIN_10_EXP),   mrb_fixnum_value(MRB_FLT_MIN_10_EXP));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MAX_EXP),      mrb_fixnum_value(MRB_FLT_MAX_EXP));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MAX),          mrb_float_value(mrb, MRB_FLT_MAX));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MAX_10_EXP),   mrb_fixnum_value(MRB_FLT_MAX_10_EXP));
+#endif /* MRB_NO_FLOAT */
 }
 
 void

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

@@ -3,6 +3,7 @@
 #include <mruby/class.h>
 #include <mruby/hash.h>
 #include <mruby/proc.h>
+#include <mruby/presym.h>
 
 /*
  *  call-seq:
@@ -17,7 +18,7 @@
   return mrb_ary_new(mrb);
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 /*
  *  call-seq:
  *     nil.to_f    -> 0.0
@@ -102,10 +103,10 @@
 
   mrb_get_args(mrb, "*&!", &argv, &argc, &blk);
   c = mrb_singleton_class_ptr(mrb, self);
-  if (mrb->c->ci->acc < 0) {
+  if (mrb->c->ci->cci > 0) {
     return mrb_yield_with_class(mrb, blk, argc, argv, self, c);
   }
-  mrb->c->ci->target_class = c;
+  mrb_vm_ci_target_class_set(mrb->c->ci, c);
   return mrb_yield_cont(mrb, blk, self, argc, argv);
 }
 
@@ -115,7 +116,7 @@
   struct RClass * n = mrb->nil_class;
 
   mrb_define_method(mrb, n, "to_a", nil_to_a,       MRB_ARGS_NONE());
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   mrb_define_method(mrb, n, "to_f", nil_to_f,       MRB_ARGS_NONE());
 #endif
   mrb_define_method(mrb, n, "to_h", nil_to_h,       MRB_ARGS_NONE());
@@ -123,7 +124,7 @@
 
   mrb_define_method(mrb, mrb->kernel_module, "itself", mrb_f_itself, MRB_ARGS_NONE());
 
-  mrb_define_method(mrb, mrb_class_get(mrb, "BasicObject"), "instance_exec", mrb_obj_instance_exec, MRB_ARGS_ANY() | MRB_ARGS_BLOCK());
+  mrb_define_method(mrb, mrb_class_get_id(mrb, MRB_SYM(BasicObject)), "instance_exec", mrb_obj_instance_exec, MRB_ARGS_ANY() | MRB_ARGS_BLOCK());
 }
 
 void

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

@@ -2,6 +2,15 @@
 #include <mruby/gc.h>
 #include <mruby/hash.h>
 #include <mruby/class.h>
+#include <mruby/object.h>
+#include <mruby/numeric.h>
+#include <mruby/string.h>
+#include <mruby/array.h>
+#include <mruby/variable.h>
+#include <mruby/proc.h>
+#include <mruby/value.h>
+#include <mruby/range.h>
+#include <mruby/presym.h>
 
 struct os_count_struct {
   mrb_int total;
@@ -63,19 +72,14 @@
 
   mrb_objspace_each_objects(mrb, os_count_object_type, &obj_count);
 
-  mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_lit(mrb, "TOTAL")), mrb_fixnum_value(obj_count.total));
-  mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_lit(mrb, "FREE")), mrb_fixnum_value(obj_count.freed));
+  mrb_hash_set(mrb, hash, mrb_symbol_value(MRB_SYM(TOTAL)), mrb_fixnum_value(obj_count.total));
+  mrb_hash_set(mrb, hash, mrb_symbol_value(MRB_SYM(FREE)), mrb_fixnum_value(obj_count.freed));
 
   for (i = MRB_TT_FALSE; i < MRB_TT_MAXDEFINE; i++) {
     mrb_value type;
     switch (i) {
 #define COUNT_TYPE(t) case (MRB_T ## t): type = mrb_symbol_value(mrb_intern_lit(mrb, #t)); break;
-      COUNT_TYPE(T_FALSE);
-      COUNT_TYPE(T_FREE);
-      COUNT_TYPE(T_TRUE);
-      COUNT_TYPE(T_FIXNUM);
-      COUNT_TYPE(T_SYMBOL);
-      COUNT_TYPE(T_UNDEF);
+      COUNT_TYPE(T_INTEGER);
       COUNT_TYPE(T_FLOAT);
       COUNT_TYPE(T_CPTR);
       COUNT_TYPE(T_OBJECT);
@@ -92,6 +96,9 @@
       COUNT_TYPE(T_ENV);
       COUNT_TYPE(T_DATA);
       COUNT_TYPE(T_FIBER);
+      COUNT_TYPE(T_ISTRUCT);
+      COUNT_TYPE(T_COMPLEX);
+      COUNT_TYPE(T_RATIONAL);
 #undef COUNT_TYPE
     default:
       type = mrb_fixnum_value(i); break;
@@ -104,9 +111,9 @@
 }
 
 struct os_each_object_data {
-  mrb_value block;
   struct RClass *target_module;
   mrb_int count;
+  mrb_value block;
 };
 
 static int
@@ -121,8 +128,8 @@
 
   /* filter internal objects */
   switch (obj->tt) {
-  case MRB_TT_ENV:
-  case MRB_TT_ICLASS:
+  case MRB_TT_FREE: case MRB_TT_ENV:
+  case MRB_TT_BREAK: case MRB_TT_ICLASS:
     return MRB_EACH_OBJ_OK;
   default:
     break;
@@ -158,12 +165,8 @@
 static mrb_value
 os_each_object(mrb_state *mrb, mrb_value self)
 {
-  mrb_value cls = mrb_nil_value();
-  struct os_each_object_data d;
-  mrb_get_args(mrb, "&!|C", &d.block, &cls);
-
-  d.target_module = mrb_nil_p(cls) ? NULL : mrb_class_ptr(cls);
-  d.count = 0;
+  struct os_each_object_data d = {0};
+  mrb_get_args(mrb, "&!|c", &d.block, &d.target_module);
   mrb_objspace_each_objects(mrb, os_each_object_cb, &d);
   return mrb_fixnum_value(d.count);
 }

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize Added

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize/src Added

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

@@ -0,0 +1,249 @@
+#include <mruby.h>
+#include <mruby/gc.h>
+#include <mruby/hash.h>
+#include <mruby/class.h>
+#include <mruby/object.h>
+#include <mruby/numeric.h>
+#include <mruby/string.h>
+#include <mruby/array.h>
+#include <mruby/variable.h>
+#include <mruby/proc.h>
+#include <mruby/value.h>
+#include <mruby/range.h>
+
+static size_t
+os_memsize_of_irep(mrb_state* state, const struct mrb_irep *irep)
+{
+  size_t size;
+  int i;
+
+  size = (irep->slen * sizeof(mrb_sym)) +
+         (irep->plen * sizeof(mrb_code)) +
+         (irep->ilen * sizeof(mrb_code));
+
+  for(i = 0; i < irep->rlen; i++) {
+    size += os_memsize_of_irep(state, irep->repsi);
+  }
+  return size;
+}
+
+static size_t
+os_memsize_of_method(mrb_state* mrb, mrb_value method_obj)
+{
+  size_t size;
+  mrb_value proc_value = mrb_obj_iv_get(mrb, mrb_obj_ptr(method_obj),
+                                        mrb_intern_lit(mrb, "_proc"));
+  if (mrb_nil_p(proc_value)) return 0;
+  struct RProc *proc = mrb_proc_ptr(proc_value);
+
+  size = sizeof(struct RProc);
+  if (!MRB_PROC_CFUNC_P(proc)) size += os_memsize_of_irep(mrb, proc->body.irep);
+  return size;
+}
+
+static mrb_bool
+obj_is_kind_of_checked(mrb_state *mrb, mrb_value obj, const char *classname)
+{
+  mrb_value objclass = mrb_obj_value(mrb->object_class);
+
+  if (mrb_const_defined(mrb, objclass, mrb_intern_cstr(mrb, classname))) {
+    struct RClass *klass = mrb_class_get(mrb, classname);
+    return mrb_obj_is_kind_of(mrb, obj, klass);
+  }
+
+  return FALSE;
+}
+
+static size_t
+os_memsize_of_object(mrb_state* mrb, mrb_value obj)
+{
+  size_t size = 0;
+
+  switch(mrb_type(obj)) {
+    case MRB_TT_STRING:
+      size += mrb_objspace_page_slot_size();
+      if (!RSTR_EMBED_P(RSTRING(obj)) && !RSTR_SHARED_P(RSTRING(obj))) {
+        size += RSTRING_CAPA(obj);
+        size++; /* NUL terminator */
+      }
+      break;
+    case MRB_TT_CLASS:
+    case MRB_TT_MODULE:
+    case MRB_TT_SCLASS:
+    case MRB_TT_ICLASS:
+      size += mrb_gc_mark_mt_size(mrb, mrb_class_ptr(obj)) * sizeof(mrb_method_t);
+      /* fall through */
+    case MRB_TT_EXCEPTION:
+    case MRB_TT_OBJECT: {
+      size += mrb_objspace_page_slot_size();
+      size += mrb_obj_iv_tbl_memsize(obj);
+      if (obj_is_kind_of_checked(mrb, obj, "UnboundMethod") ||
+          obj_is_kind_of_checked(mrb, obj, "Method")) {
+        size += os_memsize_of_method(mrb, obj);
+      }
+      break;
+    }
+    case MRB_TT_HASH: {
+      size += mrb_objspace_page_slot_size() +
+              mrb_hash_memsize(obj);
+      break;
+    }
+    case MRB_TT_STRUCT:
+    case MRB_TT_ARRAY: {
+      mrb_int len = RARRAY_LEN(obj);
+      /* Arrays that do not fit within an RArray perform a heap allocation
+      *  storing an array of pointers to the original objects*/
+      size += mrb_objspace_page_slot_size();
+      if(len > MRB_ARY_EMBED_LEN_MAX) size += sizeof(mrb_value *) * len;
+      break;
+    }
+    case MRB_TT_PROC: {
+      struct RProc* proc = mrb_proc_ptr(obj);
+      size += mrb_objspace_page_slot_size();
+      size += MRB_ENV_LEN(proc->e.env) * sizeof(mrb_value);
+      if(!MRB_PROC_CFUNC_P(proc)) size += os_memsize_of_irep(mrb, proc->body.irep);
+      break;
+    }
+    case MRB_TT_RANGE:
+#ifndef MRB_RANGE_EMBED
+      size += mrb_objspace_page_slot_size() +
+              sizeof(struct mrb_range_edges);
+#endif
+      break;
+    case MRB_TT_FIBER: {
+      struct RFiber* f = (struct RFiber *)mrb_ptr(obj);
+      ptrdiff_t stack_size = f->cxt->stend - f->cxt->stbase;
+      ptrdiff_t ci_size = f->cxt->ciend - f->cxt->cibase;
+
+      size += mrb_objspace_page_slot_size() +
+        sizeof(struct mrb_context) +
+        sizeof(mrb_value) * stack_size +
+        sizeof(mrb_callinfo) * ci_size;
+      break;
+    }
+#ifndef MRB_NO_FLOAT
+    case MRB_TT_FLOAT:
+#endif
+    case MRB_TT_INTEGER:
+      if (mrb_immediate_p(obj))
+        break;
+  case MRB_TT_RATIONAL:
+#if defined(MRB_USE_RATIONAL)
+#if defined(MRB_INT64) && defined(MRB_32BIT)
+    size += sizeof(mrb_int)*2;
+#endif
+    size += mrb_objspace_page_slot_size();
+#endif
+    break;
+
+  case MRB_TT_COMPLEX:
+#if defined(MRB_USE_COMPLEX)
+#if defined(MRB_32BIT) && !defined(MRB_USE_FLOAT32)
+    size += sizeof(mrb_float)*2;
+#endif
+    size += mrb_objspace_page_slot_size();
+#endif
+    break;
+    case MRB_TT_DATA:
+    case MRB_TT_ISTRUCT:
+      size += mrb_objspace_page_slot_size();
+      break;
+    /*  zero heap size types.
+     *  immediate VM stack values, contained within mrb_state, or on C stack */
+    case MRB_TT_TRUE:
+    case MRB_TT_FALSE:
+    case MRB_TT_BREAK:
+    case MRB_TT_CPTR:
+    case MRB_TT_SYMBOL:
+    case MRB_TT_FREE:
+    case MRB_TT_UNDEF:
+    case MRB_TT_ENV:
+    /* never used, silences compiler warning
+     * not having a default: clause lets the compiler tell us when there is a new
+     * TT not accounted for */
+    case MRB_TT_MAXDEFINE:
+      break;
+  }
+  return size;
+}
+
+/*
+ *  call-seq:
+ *    ObjectSpace.memsize_of(obj) -> Numeric
+ *
+ *  Returns the amount of heap memory allocated for object in size_t units.
+ *
+ *  The return value depends on the definition of size_t on that platform,
+ *  therefore the value is not comparable across platform types.
+ *
+ *  Immediate values such as integers, booleans, symbols and unboxed float numbers
+ *  return 0. Additionally special objects which are small enough to fit inside an
+ *  object pointer, termed embedded objects, will return the size of the object pointer.
+ *  Strings and arrays below a compile-time defined size may be embedded.
+ */
+
+static mrb_value
+os_memsize_of(mrb_state *mrb, mrb_value self)
+{
+  size_t total;
+  mrb_value obj;
+
+  mrb_get_args(mrb, "o", &obj);
+
+  total = os_memsize_of_object(mrb, obj);
+  return mrb_fixnum_value((mrb_int)total);
+}
+
+struct os_memsize_of_all_cb_data {
+  size_t t;
+  struct RClass *type;
+};
+
+static int
+os_memsize_of_all_cb(mrb_state *mrb, struct RBasic *obj, void *d)
+{
+  struct os_memsize_of_all_cb_data *data = (struct os_memsize_of_all_cb_data *)d;
+  switch (obj->tt) {
+  case MRB_TT_FREE: case MRB_TT_ENV:
+  case MRB_TT_BREAK: case MRB_TT_ICLASS:
+    /* internal objects that should not be counted */
+    return MRB_EACH_OBJ_OK;
+  default:
+    break;
+  }
+  /* skip Proc objects for methods */
+  if (obj->c == NULL) return 0;
+  if (data->type == NULL || mrb_obj_is_kind_of(mrb, mrb_obj_value(obj), data->type))
+    data->t += os_memsize_of_object(mrb, mrb_obj_value(obj));
+  return MRB_EACH_OBJ_OK;
+}
+
+/*
+ *  call-seq:
+ *    ObjectSpace.memsize_of_all(klass) -> Numeric
+ *
+ *  Return consuming memory size of all living objects of type klass.
+ *
+ */
+
+static mrb_value
+os_memsize_of_all(mrb_state *mrb, mrb_value self)
+{
+  struct os_memsize_of_all_cb_data data = { 0 };
+  mrb_get_args(mrb, "|c", &data.type);
+  mrb_objspace_each_objects(mrb, os_memsize_of_all_cb, &data);
+  return mrb_fixnum_value((mrb_int)data.t);
+}
+
+void
+mrb_mruby_os_memsize_gem_init(mrb_state *mrb)
+{
+  struct RClass *os = mrb_module_get(mrb, "ObjectSpace");
+  mrb_define_class_method(mrb, os, "memsize_of", os_memsize_of, MRB_ARGS_REQ(1));
+  mrb_define_class_method(mrb, os, "memsize_of_all", os_memsize_of_all, MRB_ARGS_OPT(1));
+}
+
+void
+mrb_mruby_os_memsize_gem_final(mrb_state *mrb)
+{
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize/test Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-os-memsize/test/memsize.rb Added

@@ -0,0 +1,63 @@
+assert 'ObjectSpace.memsize_of' do
+  # immediate literals
+  int_size = ObjectSpace.memsize_of 1
+  assert_equal int_size, 0, 'int zero'
+
+  sym_size = ObjectSpace.memsize_of :foo
+  assert_equal sym_size, 0, 'sym zero'
+
+  assert_equal ObjectSpace.memsize_of(true), int_size
+  assert_equal ObjectSpace.memsize_of(false), int_size
+
+  assert_not_equal ObjectSpace.memsize_of('a'), 0, 'memsize of str'
+
+  if __ENCODING__ == "UTF-8"
+    assert_not_equal ObjectSpace.memsize_of("こんにちは世界"), 0, 'memsize of utf8 str'
+  end
+
+  # class defs
+  class_obj_size = ObjectSpace.memsize_of Class
+  assert_not_equal class_obj_size, 0, 'Class obj not zero'
+
+  empty_class_def_size = ObjectSpace.memsize_of Class.new
+  assert_not_equal empty_class_def_size, 0, 'Class def not zero'
+
+  proc_size = ObjectSpace.memsize_of Proc.new { x = 1; x }
+  assert_not_equal proc_size, 0
+
+  class_with_methods = Class.new do
+    def foo
+      a = 0
+      a + 1
+    end
+  end
+
+  m_size = ObjectSpace.memsize_of class_with_methods.instance_method(:foo)
+  assert_not_equal m_size, 0, 'method size not zero'
+
+  # collections
+  empty_array_size = ObjectSpace.memsize_of 
+  assert_not_equal empty_array_size, 0, 'empty array size not zero'
+  assert_operator empty_array_size, :<, ObjectSpace.memsize_of(Array.new(16)), 'large array size greater than embed'
+
+  # fiber
+  empty_fiber_size = ObjectSpace.memsize_of(Fiber.new {})
+  assert_not_equal empty_fiber_size, 0, 'empty fiber not zero'
+
+  #hash
+  assert_not_equal ObjectSpace.memsize_of({}), 0, 'empty hash size not zero'
+end
+
+assert 'ObjectSpace.memsize_of_all' do
+  foo_class = Class.new do
+    def initialize
+      @a = 'a'
+      @b = 'b'
+    end
+  end
+
+  foos = Array.new(10) { foo_class.new }
+  foo_size = ObjectSpace.memsize_of(foos.first)
+
+  assert_equal ObjectSpace.memsize_of_all(foo_class), foo_size * foos.size, 'Memsize of all instance'
+end

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

@@ -1,71 +1,67 @@
-mruby-pack (pack / unpack)
-=========
+# mruby-pack (pack / unpack)
 
 mruby-pack provides `Array#pack` and `String#unpack` for mruby.
 
-
 ## Installation
-Add the line below into your `build_config.rb`:
+
+Add the line below into your build configuration:
 
 ```
-  conf.gem :github => 'iij/mruby-pack'
+  conf.gem :core => 'mruby-pack'
 ```
 
 There is no dependency on other mrbgems.
 
-
 ## Supported template string
- - A : arbitrary binary string (space padded, count is width)
- - a : arbitrary binary string (null padded, count is width)
- - C : 8-bit unsigned (unsigned char)
- - c : 8-bit signed (signed char)
- - D, d: 64-bit float, native format
- - E : 64-bit float, little endian byte order
- - e : 32-bit float, little endian byte order
- - F, f: 32-bit float, native format
- - G : 64-bit float, network (big-endian) byte order
- - g : 32-bit float, network (big-endian) byte order
- - H : hex string (high nibble first)
- - h : hex string (low nibble first)
- - I : unsigned integer, native endian (`unsigned int` in C)
- - i : signed integer, native endian (`int` in C)
- - L : 32-bit unsigned, native endian (`uint32_t`)
- - l : 32-bit signed, native endian (`int32_t`)
- - m : base64 encoded string (see RFC 2045, count is width)
- - N : 32-bit unsigned, network (big-endian) byte order
- - n : 16-bit unsigned, network (big-endian) byte order
- - Q : 64-bit unsigned, native endian (`uint64_t`)
- - q : 64-bit signed, native endian (`int64_t`)
- - S : 16-bit unsigned, native endian (`uint16_t`)
- - s : 16-bit signed, native endian (`int16_t`)
- - U : UTF-8 character
- - V : 32-bit unsigned, VAX (little-endian) byte order
- - v : 16-bit unsigned, VAX (little-endian) byte order
- - x : null byte
- - Z : same as "a", except that null is added with *
-
 
+- A : arbitrary binary string (space padded, count is width)
+- a : arbitrary binary string (null padded, count is width)
+- C : 8-bit unsigned (unsigned char)
+- c : 8-bit signed (signed char)
+- D, d: 64-bit float, native format
+- E : 64-bit float, little endian byte order
+- e : 32-bit float, little endian byte order
+- F, f: 32-bit float, native format
+- G : 64-bit float, network (big-endian) byte order
+- g : 32-bit float, network (big-endian) byte order
+- H : hex string (high nibble first)
+- h : hex string (low nibble first)
+- I : unsigned integer, native endian (`unsigned int` in C)
+- i : signed integer, native endian (`int` in C)
+- L : 32-bit unsigned, native endian (`uint32_t`)
+- l : 32-bit signed, native endian (`int32_t`)
+- m : base64 encoded string (see RFC 2045, count is width)
+- N : 32-bit unsigned, network (big-endian) byte order
+- n : 16-bit unsigned, network (big-endian) byte order
+- Q : 64-bit unsigned, native endian (`uint64_t`)
+- q : 64-bit signed, native endian (`int64_t`)
+- S : 16-bit unsigned, native endian (`uint16_t`)
+- s : 16-bit signed, native endian (`int16_t`)
+- U : UTF-8 character
+- V : 32-bit unsigned, VAX (little-endian) byte order
+- v : 16-bit unsigned, VAX (little-endian) byte order
+- x : null byte
+- Z : same as "a", except that null is added with *
 
 ## License
 
 Copyright (c) 2012 Internet Initiative Japan Inc.
 Copyright (c) 2017 mruby developers
 
-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 
+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 
+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 
+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.46.0.tar.xz/third-party/mruby/mrbgems/mruby-pack/src/pack.c -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-pack/src/pack.c Changed

@@ -9,24 +9,32 @@
 #include "mruby/numeric.h"
 #include "mruby/string.h"
 #include "mruby/variable.h"
+#include "mruby/endian.h"
 
 #include <ctype.h>
 #include <errno.h>
-#include <limits.h>
 #include <string.h>
 
+#define INT_OVERFLOW_P(n)  ((n) < MRB_INT_MIN || (n) > MRB_INT_MAX)
+#define UINT_OVERFLOW_P(n) ((n) > MRB_INT_MAX)
+
+#ifndef EOF
+# define EOF (-1) /* for MRB_NO_STDIO */
+#endif
+
 struct tmpl {
   mrb_value str;
   int idx;
 };
 
-enum {
+enum pack_dir {
   PACK_DIR_CHAR,      /* C */
   PACK_DIR_SHORT,     /* S */
   PACK_DIR_LONG,      /* L */
   PACK_DIR_QUAD,      /* Q */
   //PACK_DIR_INT,     /* i */
   //PACK_DIR_VAX,
+  PACK_DIR_BER,       /* w */
   PACK_DIR_UTF8,      /* U */
   //PACK_DIR_BER,
   PACK_DIR_DOUBLE,    /* E */
@@ -34,65 +42,38 @@
   PACK_DIR_STR,       /* A */
   PACK_DIR_HEX,       /* h */
   PACK_DIR_BASE64,    /* m */
+  PACK_DIR_QENC,      /* M */
   PACK_DIR_NUL,       /* x */
+  PACK_DIR_BACK,      /* X */
+  PACK_DIR_ABS,       /* @ */
   PACK_DIR_INVALID
 };
 
-enum {
+enum pack_type {
   PACK_TYPE_INTEGER,
   PACK_TYPE_FLOAT,
   PACK_TYPE_STRING,
   PACK_TYPE_NONE
 };
 
-#define PACK_FLAG_s             0x00000001	/* native size ("_" "!") */
-#define PACK_FLAG_a             0x00000002	/* null padding ("a") */
-#define PACK_FLAG_Z             0x00000004	/* append nul char ("z") */
-#define PACK_FLAG_SIGNED        0x00000008	/* native size ("_" "!") */
-#define PACK_FLAG_GT            0x00000010	/* big endian (">") */
-#define PACK_FLAG_LT            0x00000020	/* little endian ("<") */
-#define PACK_FLAG_WIDTH         0x00000040	/* "count" is "width" */
-#define PACK_FLAG_LSB           0x00000080	/* LSB / low nibble first */
-#define PACK_FLAG_COUNT2        0x00000100	/* "count" is special... */
-#define PACK_FLAG_LITTLEENDIAN  0x00000200	/* little endian actually */
+#define PACK_FLAG_s             0x00000001      /* native size ("_" "!") */
+#define PACK_FLAG_a             0x00000002      /* null padding ("a") */
+#define PACK_FLAG_Z             0x00000004      /* append nul char ("z") */
+#define PACK_FLAG_SIGNED        0x00000008      /* native size ("_" "!") */
+#define PACK_FLAG_GT            0x00000010      /* big endian (">") */
+#define PACK_FLAG_LT            0x00000020      /* little endian ("<") */
+#define PACK_FLAG_WIDTH         0x00000040      /* "count" is "width" */
+#define PACK_FLAG_LSB           0x00000080      /* LSB / low nibble first */
+#define PACK_FLAG_COUNT2        0x00000100      /* "count" is special... */
+#define PACK_FLAG_LITTLEENDIAN  0x00000200      /* little endian actually */
 
-#define PACK_BASE64_IGNORE	0xff
-#define PACK_BASE64_PADDING	0xfe
+#define PACK_BASE64_IGNORE      0xff
+#define PACK_BASE64_PADDING     0xfe
 
 const static unsigned char base64chars =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 static unsigned char base64_dec_tab128;
 
-#if !defined(BYTE_ORDER) && defined(__BYTE_ORDER__)
-# define BYTE_ORDER __BYTE_ORDER__
-#endif
-#if !defined(BIG_ENDIAN) && defined(__ORDER_BIG_ENDIAN__)
-# define BIG_ENDIAN __ORDER_BIG_ENDIAN__
-#endif
-#if !defined(LITTLE_ENDIAN) && defined(__ORDER_LITTLE_ENDIAN__)
-# define LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
-#endif
-
-#ifdef BYTE_ORDER
-# if BYTE_ORDER == BIG_ENDIAN
-#  define littleendian 0
-#  define check_little_endian() (void)0
-# elif BYTE_ORDER == LITTLE_ENDIAN
-#  define littleendian 1
-#  define check_little_endian() (void)0
-# endif
-#endif
-#ifndef littleendian
-/* can't distinguish endian in compile time */
-static int littleendian = 0;
-static void
-check_little_endian(void)
-{
-  unsigned int n = 1;
-  littleendian = (*(unsigned char *)&n == 1);
-}
-#endif
-
 static unsigned int
 hex2int(unsigned char ch)
 {
@@ -103,7 +84,7 @@
   else if (ch >= 'a' && ch <= 'f')
     return 10 + (ch - 'a');
   else
-    return 0;
+    return -1;
 }
 
 static void
@@ -140,15 +121,15 @@
 
 
 static int
-pack_c(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
+pack_char(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
 {
   str = str_len_ensure(mrb, str, sidx + 1);
-  RSTRING_PTR(str)sidx = (char)mrb_fixnum(o);
+  RSTRING_PTR(str)sidx = (char)mrb_integer(o);
   return 1;
 }
 
 static int
-unpack_c(mrb_state *mrb, const void *src, int srclen, mrb_value ary, unsigned int flags)
+unpack_char(mrb_state *mrb, const void *src, int srclen, mrb_value ary, unsigned int flags)
 {
   if (flags & PACK_FLAG_SIGNED)
     mrb_ary_push(mrb, ary, mrb_fixnum_value(*(signed char *)src));
@@ -158,12 +139,12 @@
 }
 
 static int
-pack_s(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
+pack_short(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
 {
   uint16_t n;
 
   str = str_len_ensure(mrb, str, sidx + 2);
-  n = (uint16_t)mrb_fixnum(o);
+  n = (uint16_t)mrb_integer(o);
   if (flags & PACK_FLAG_LITTLEENDIAN) {
     RSTRING_PTR(str)sidx+0 = n % 256;
     RSTRING_PTR(str)sidx+1 = n / 256;
@@ -175,7 +156,7 @@
 }
 
 static int
-unpack_s(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
+unpack_short(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
 {
   int n;
 
@@ -192,12 +173,12 @@
 }
 
 static int
-pack_l(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
+pack_long(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
 {
   uint32_t n;
 
   str = str_len_ensure(mrb, str, sidx + 4);
-  n = (uint32_t)mrb_fixnum(o);
+  n = (uint32_t)mrb_integer(o);
   if (flags & PACK_FLAG_LITTLEENDIAN) {
     RSTRING_PTR(str)sidx+0 = (char)(n & 0xff);
     RSTRING_PTR(str)sidx+1 = (char)(n >> 8);
@@ -216,7 +197,7 @@
 static void
 u32tostr(char *buf, size_t len, uint32_t n)
 {
-#ifdef MRB_DISABLE_STDIO
+#ifdef MRB_NO_STDIO
   char *bufend = buf + len;
   char *p = bufend - 1;
 
@@ -241,32 +222,12 @@
   memmove(buf, p, bufend - p);
 #else
   snprintf(buf, len, "%" PRIu32, n);
-#endif /* MRB_DISABLE_STDIO */
-}
-
-static void
-i32tostr(char *buf, size_t len, int32_t n)
-{
-#ifdef MRB_DISABLE_STDIO
-  if (len < 1) {
-    return;
-  }
-
-  if (n < 0) {
-    *buf ++ = '-';
-    len --;
-    n = -n;
-  }
-
-  u32tostr(buf, len, (uint32_t)n);
-#else
-  snprintf(buf, len, "%" PRId32, n);
-#endif /* MRB_DISABLE_STDIO */
+#endif /* MRB_NO_STDIO */
 }
 #endif /* MRB_INT64 */
 
 static int
-unpack_l(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
+unpack_long(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
 {
 #ifndef MRB_INT64
   char msg60;
@@ -286,34 +247,27 @@
     ul += (uint32_t)src3;
   }
   if (flags & PACK_FLAG_SIGNED) {
-    int32_t sl = ul;
-#ifndef MRB_INT64
-    if (!FIXABLE(sl)) {
-      i32tostr(msg, sizeof(msg), sl);
-      mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Fixnum: %s", msg);
-    }
-#endif
-    n = sl;
+    n = (int32_t)ul;
   } else {
 #ifndef MRB_INT64
-    if (!POSFIXABLE(ul)) {
+    if (UINT_OVERFLOW_P(ul)) {
       u32tostr(msg, sizeof(msg), ul);
-      mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Fixnum: %s", msg);
+      mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Integer: %s", msg);
     }
 #endif
     n = ul;
   }
-  mrb_ary_push(mrb, ary, mrb_fixnum_value(n));
+  mrb_ary_push(mrb, ary, mrb_int_value(mrb, n));
   return 4;
 }
 
 static int
-pack_q(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
+pack_quad(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
 {
   uint64_t n;
 
   str = str_len_ensure(mrb, str, sidx + 8);
-  n = (uint64_t)mrb_fixnum(o);
+  n = (uint64_t)mrb_integer(o);
   if (flags & PACK_FLAG_LITTLEENDIAN) {
     RSTRING_PTR(str)sidx+0 = (char)(n & 0xff);
     RSTRING_PTR(str)sidx+1 = (char)(n >> 8);
@@ -339,7 +293,7 @@
 static void
 u64tostr(char *buf, size_t len, uint64_t n)
 {
-#ifdef MRB_DISABLE_STDIO
+#ifdef MRB_NO_STDIO
   char *bufend = buf + len;
   char *p = bufend - 1;
 
@@ -364,13 +318,14 @@
   memmove(buf, p, bufend - p);
 #else
   snprintf(buf, len, "%" PRIu64, n);
-#endif /* MRB_DISABLE_STDIO */
+#endif /* MRB_NO_STDIO */
 }
 
+#ifndef MRB_INT64
 static void
 i64tostr(char *buf, size_t len, int64_t n)
 {
-#ifdef MRB_DISABLE_STDIO
+#ifdef MRB_NO_STDIO
   if (len < 1) {
     return;
   }
@@ -384,11 +339,12 @@
   u64tostr(buf, len, (uint64_t)n);
 #else
   snprintf(buf, len, "%" PRId64, n);
-#endif /* MRB_DISABLE_STDIO */
+#endif /* MRB_NO_STDIO */
 }
+#endif /* MRB_INT64 */
 
 static int
-unpack_q(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
+unpack_quad(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
 {
   char msg60;
   uint64_t ull;
@@ -409,23 +365,68 @@
   }
   if (flags & PACK_FLAG_SIGNED) {
     int64_t sll = ull;
-    if (!FIXABLE(sll)) {
+#ifndef MRB_INT64
+    if (INT_OVERFLOW_P(sll)) {
       i64tostr(msg, sizeof(msg), sll);
-      mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Fixnum: %s", msg);
+      mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Integer: %s", msg);
     }
-    n = sll;
+#endif
+    n = (mrb_int)sll;
   } else {
-    if (!POSFIXABLE(ull)) {
+    if (UINT_OVERFLOW_P(ull)) {
       u64tostr(msg, sizeof(msg), ull);
-      mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Fixnum: %s", msg);
+      mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Integer: %s", msg);
     }
-    n = ull;
+    n = (mrb_int)ull;
   }
-  mrb_ary_push(mrb, ary, mrb_fixnum_value(n));
+  mrb_ary_push(mrb, ary, mrb_int_value(mrb, n));
   return 8;
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+static int
+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;
+  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++) {
+    mrb_int mask = ~((1L<<(7*i))-1);
+    if ((n & mask) == 0) break;
+  }
+  str = str_len_ensure(mrb, str, sidx + i);
+  p = RSTRING_PTR(str)+sidx;
+  for (size_t j=i; j>0; p++,j--) {
+    mrb_int x = (n>>(7*(j-1)))&0x7f;
+    *p = (char)x;
+    if (j > 1) *p |= 0x80;
+  }
+  return i;
+}
+
+static int
+unpack_BER(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
+{
+  mrb_int i, n = 0;
+  const unsigned char *p = src;
+  const unsigned char *e = p + srclen;
+
+  for (i=1; p<e; p++,i++) {
+    if (n > (MRB_INT_MAX>>7)) {
+      mrb_raise(mrb, E_RANGE_ERROR, "BER unpacking 'w' overflow");
+    }
+    n <<= 7;
+    n |= *p & 0x7f;
+    if ((*p & 0x80) == 0) break;
+  }
+  mrb_ary_push(mrb, ary, mrb_int_value(mrb, n));
+  return i;
+}
+
+#ifndef MRB_NO_FLOAT
 static int
 pack_double(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
 {
@@ -554,13 +555,13 @@
 #endif
 
 static int
-pack_utf8(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, long count, unsigned int flags)
+pack_utf8(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, int count, unsigned int flags)
 {
   char utf84;
   int len = 0;
   uint32_t c = 0;
 
-  c = (uint32_t)mrb_fixnum(o);
+  c = (uint32_t)mrb_integer(o);
 
   /* Unicode character */
   /* from mruby-compiler gem */
@@ -671,7 +672,7 @@
 }
 
 static int
-pack_a(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, long count, unsigned int flags)
+pack_str(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int count, unsigned int flags)
 {
   mrb_int copylen, slen, padlen;
   char *dptr, *dptr0, pad, *sptr;
@@ -709,7 +710,7 @@
 }
 
 static int
-unpack_a(mrb_state *mrb, const void *src, int slen, mrb_value ary, long count, unsigned int flags)
+unpack_str(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, unsigned int flags)
 {
   mrb_value dst;
   const char *cp, *sptr;
@@ -743,7 +744,7 @@
 
 
 static int
-pack_h(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, long count, unsigned int flags)
+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;
   long slen;
@@ -774,10 +775,12 @@
     a = b = 0;
     if (slen > 0) {
       a = hex2int(*sptr++);
+      if (a < 0) break;
       slen--;
     }
     if (slen > 0) {
       b = hex2int(*sptr++);
+      if (b < 0) break;
       slen--;
     }
     *dptr++ = (a << ashift) + (b << bshift);
@@ -787,7 +790,7 @@
 }
 
 static int
-unpack_h(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, unsigned int flags)
+unpack_hex(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, unsigned int flags)
 {
   mrb_value dst;
   int a, ashift, b, bshift;
@@ -828,14 +831,13 @@
     }
   }
 
-  dst = mrb_str_resize(mrb, dst, dptr - dptr0);
+  dst = mrb_str_resize(mrb, dst, (mrb_int)(dptr - dptr0));
   mrb_ary_push(mrb, ary, dst);
   return (int)(sptr - sptr0);
 }
 
-
 static int
-pack_m(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, long count, unsigned int flags)
+pack_base64(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int count)
 {
   mrb_int dstlen;
   unsigned long l;
@@ -901,7 +903,7 @@
 }
 
 static int
-unpack_m(mrb_state *mrb, const void *src, int slen, mrb_value ary, unsigned int flags)
+unpack_base64(mrb_state *mrb, const void *src, int slen, mrb_value ary)
 {
   mrb_value dst;
   int dlen;
@@ -924,13 +926,13 @@
         if (slen-- == 0)
           goto done;
         c = *sptr++;
-	if (c >= sizeof(base64_dec_tab))
-	  continue;
-	chi = base64_dec_tabc;
-	if (chi == PACK_BASE64_PADDING) {
-	  chi = 0;
-	  padding++;
-	}
+        if (c >= sizeof(base64_dec_tab))
+          continue;
+        chi = base64_dec_tabc;
+        if (chi == PACK_BASE64_PADDING) {
+          chi = 0;
+          padding++;
+        }
       } while (c >= sizeof(base64_dec_tab) || chi == PACK_BASE64_IGNORE);
     }
 
@@ -951,31 +953,123 @@
   }
 
 done:
-  dst = mrb_str_resize(mrb, dst, dptr - dptr0);
+  dst = mrb_str_resize(mrb, dst, (mrb_int)(dptr - dptr0));
   mrb_ary_push(mrb, ary, dst);
   return (int)(sptr - sptr0);
 }
 
 static int
-pack_x(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, long count, unsigned int flags)
+pack_qenc(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, int count)
+{
+  static const char hex_table = "0123456789ABCDEF";
+  char buff1024;
+  char *s = RSTRING_PTR(src);
+  char *send = s + RSTRING_LEN(src);
+  int i = 0, n = 0, prev = EOF;
+  int dlen = 0;
+
+  if (count <= 1) count = 72;
+  while (s < send) {
+    if ((*s > 126) ||
+        (*s < 32 && *s != '\n' && *s != '\t') ||
+        (*s == '=')) {
+      buffi++ = '=';
+      buffi++ = hex_table(*s & 0xf0) >> 4;
+      buffi++ = hex_table*s & 0x0f;
+      n += 3;
+      prev = EOF;
+    }
+    else if (*s == '\n') {
+      if (prev == ' ' || prev == '\t') {
+        buffi++ = '=';
+        buffi++ = *s;
+      }
+      buffi++ = *s;
+      n = 0;
+      prev = *s;
+    }
+    else {
+      buffi++ = *s;
+      n++;
+      prev = *s;
+    }
+    if (n > count) {
+      buffi++ = '=';
+      buffi++ = '\n';
+      n = 0;
+      prev = '\n';
+    }
+    if (i > 1024 - 5) {
+      str_len_ensure(mrb, dst, didx+dlen+i);
+      memcpy(RSTRING_PTR(dst)+didx+dlen, buff, i);
+      dlen += i;
+      i = 0;
+    }
+    s++;
+  }
+  if (n > 0) {
+    buffi++ = '=';
+    buffi++ = '\n';
+  }
+  if (i > 0) {
+    str_len_ensure(mrb, dst, didx+dlen+i);
+    memcpy(RSTRING_PTR(dst)+didx+dlen, buff, i);
+    dlen += i;
+  }
+  return dlen;
+}
+
+static int
+unpack_qenc(mrb_state *mrb, const void *src, int slen, mrb_value ary)
+{
+  mrb_value buf = mrb_str_new(mrb, 0, slen);
+  const char *s = (const char*)src, *ss = s;
+  const char *send = s + slen;
+  char *ptr = RSTRING_PTR(buf);
+  int c1, c2;
+
+  while (s < send) {
+    if (*s == '=') {
+      if (++s == send) break;
+      if (s+1 < send && *s == '\r' && *(s+1) == '\n')
+        s++;
+      if (*s != '\n') {
+        if ((c1 = hex2int(*s)) == -1) break;
+        if (++s == send) break;
+        if ((c2 = hex2int(*s)) == -1) break;
+        *ptr++ = (char)(c1 << 4 | c2);
+      }
+    }
+    else {
+      *ptr++ = *s;
+    }
+    s++;
+    ss = s;
+  }
+  buf = mrb_str_resize(mrb, buf, (mrb_int)(ptr - RSTRING_PTR(buf)));
+  mrb_str_cat(mrb, buf, ss, send-ss);
+  mrb_ary_push(mrb, ary, buf);
+  return slen;
+}
+
+static int
+pack_nul(mrb_state *mrb, mrb_value dst, mrb_int didx, int count)
 {
   long i;
 
-  if (count < 0) return 0;
   dst = str_len_ensure(mrb, dst, didx + count);
   for (i = 0; i < count; i++) {
     RSTRING_PTR(dst)didx + i = '\0';
   }
   return count;
 }
-static int
-unpack_x(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, unsigned int flags)
+
+static void
+check_x(mrb_state *mrb, int a, int count, char c)
 {
-  if (count < 0) return slen;
-  if (slen < count) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "x outside of string");
+  if (a < count) {
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "%c outside of string", c);
   }
-  return count;
 }
 
 static void
@@ -992,10 +1086,12 @@
 }
 
 static void
-read_tmpl(mrb_state *mrb, struct tmpl *tmpl, int *dirp, int *typep, int *sizep, int *countp, unsigned int *flagsp)
+read_tmpl(mrb_state *mrb, struct tmpl *tmpl, enum pack_dir *dirp, enum pack_type *typep, int *sizep, int *countp, unsigned int *flagsp)
 {
   mrb_int t, tlen;
-  int ch, dir, type, size = 0;
+  int ch, size = 0;
+  enum pack_dir dir;
+  enum pack_type type;
   int count = 1;
   unsigned int flags = 0;
   const char *tptr;
@@ -1102,11 +1198,21 @@
     size = 4;
     flags |= PACK_FLAG_SIGNED;
     break;
+  case 'w':
+    dir = PACK_DIR_BER;
+    type = PACK_TYPE_INTEGER;
+    flags |= PACK_FLAG_SIGNED;
+    break;
   case 'm':
     dir = PACK_DIR_BASE64;
     type = PACK_TYPE_STRING;
     flags |= PACK_FLAG_WIDTH | PACK_FLAG_COUNT2;
     break;
+  case 'M':
+    dir = PACK_DIR_QENC;
+    type = PACK_TYPE_STRING;
+    flags |= PACK_FLAG_WIDTH | PACK_FLAG_COUNT2;
+    break;
   case 'N':  /* = "L>" */
     dir = PACK_DIR_LONG;
     type = PACK_TYPE_INTEGER;
@@ -1161,11 +1267,23 @@
     dir = PACK_DIR_NUL;
     type = PACK_TYPE_NONE;
     break;
+  case 'X':
+    dir = PACK_DIR_BACK;
+    type = PACK_TYPE_NONE;
+    break;
+  case '@':
+    dir = PACK_DIR_ABS;
+    type = PACK_TYPE_NONE;
+    break;
   case 'Z':
     dir = PACK_DIR_STR;
     type = PACK_TYPE_STRING;
     flags |= PACK_FLAG_WIDTH | PACK_FLAG_COUNT2 | PACK_FLAG_Z;
     break;
+  case 'p': case 'P':
+  case '%':
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "%c is not supported", (char)t);
+    break;
   default:
     dir = PACK_DIR_INVALID;
     type = PACK_TYPE_NONE;
@@ -1174,19 +1292,21 @@
 
   /* read suffix 0-9*_!<> */
   while (tmpl->idx < tlen) {
-    ch = tptrtmpl->idx++;
+    ch = tptrtmpl->idx;
     if (ISDIGIT(ch)) {
-      count = ch - '0';
-      while (tmpl->idx < tlen && ISDIGIT(tptrtmpl->idx)) {
-        int ch = tptrtmpl->idx++ - '0';
-        if (count+ch > INT_MAX/10) {
-          mrb_raise(mrb, E_RUNTIME_ERROR, "too big template length");
-        }
-        count = count * 10 + ch;
+      char *e;
+      mrb_int n = mrb_int_read(tptr+tmpl->idx, tptr+tlen, &e);
+      if (e == NULL || n > INT_MAX) {
+        mrb_raise(mrb, E_RUNTIME_ERROR, "too big template length");
       }
-      continue;  /* special case */
+      count = (int)n;
+      tmpl->idx = e - tptr;
+      continue;
     } else if (ch == '*')  {
-      count = -1;
+      if (type == PACK_TYPE_NONE)
+        count = 0;
+      else
+        count = -1;
     } else if (ch == '_' || ch == '!' || ch == '<' || ch == '>') {
       if (strchr("sSiIlLqQ", (int)t) == NULL) {
         mrb_raisef(mrb, E_ARGUMENT_ERROR, "'%c' allowed only after types sSiIlLqQ", ch);
@@ -1198,10 +1318,11 @@
       } else if (ch == '>') {
         flags |= PACK_FLAG_GT;
       }
-    } else {
-      tmpl->idx--;
+    }
+    else {
       break;
     }
+    tmpl->idx++;
   }
 
   if ((flags & PACK_FLAG_LT) || (!(flags & PACK_FLAG_GT) && littleendian)) {
@@ -1223,7 +1344,9 @@
   struct tmpl tmpl;
   int count;
   unsigned int flags;
-  int dir, ridx, size, type;
+  enum pack_dir dir;
+  enum pack_type type;
+  int ridx, size;
 
   prepare_tmpl(mrb, &tmpl);
 
@@ -1236,22 +1359,40 @@
     if (dir == PACK_DIR_INVALID)
       continue;
     else if (dir == PACK_DIR_NUL) {
-        ridx += pack_x(mrb, mrb_nil_value(), result, ridx, count, flags);
-        continue;
+    grow:
+      if (ridx > INT_MAX - count) goto overflow;
+      ridx += pack_nul(mrb, result, ridx, count);
+      continue;
+    }
+    else if (dir == PACK_DIR_BACK) {
+      check_x(mrb, ridx, count, 'X');
+      ridx -= count;
+      continue;
+    }
+    else if (dir == PACK_DIR_ABS) {
+      count -= ridx;
+      if (count > 0) goto grow;
+      count = -count;
+      check_x(mrb, ridx, count, '@');
+      ridx -= count;
+      continue;
     }
 
+    if ((flags & PACK_FLAG_WIDTH) && aidx >= RARRAY_LEN(ary)) {
+      mrb_raise(mrb, E_ARGUMENT_ERROR, "too few arguments");
+    }
     for (; aidx < RARRAY_LEN(ary); aidx++) {
       if (count == 0 && !(flags & PACK_FLAG_WIDTH))
         break;
 
       o = mrb_ary_ref(mrb, ary, aidx);
       if (type == PACK_TYPE_INTEGER) {
-        o = mrb_to_int(mrb, o);
+        o = mrb_to_integer(mrb, o);
       }
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
       else if (type == PACK_TYPE_FLOAT) {
         if (!mrb_float_p(o)) {
-          mrb_float f = mrb_to_flo(mrb, o);
+          mrb_float f = mrb_as_float(mrb, o);
           o = mrb_float_value(mrb, f);
         }
       }
@@ -1264,27 +1405,33 @@
 
       switch (dir) {
       case PACK_DIR_CHAR:
-        ridx += pack_c(mrb, o, result, ridx, flags);
+        ridx += pack_char(mrb, o, result, ridx, flags);
         break;
       case PACK_DIR_SHORT:
-        ridx += pack_s(mrb, o, result, ridx, flags);
+        ridx += pack_short(mrb, o, result, ridx, flags);
         break;
       case PACK_DIR_LONG:
-        ridx += pack_l(mrb, o, result, ridx, flags);
+        ridx += pack_long(mrb, o, result, ridx, flags);
         break;
       case PACK_DIR_QUAD:
-        ridx += pack_q(mrb, o, result, ridx, flags);
+        ridx += pack_quad(mrb, o, result, ridx, flags);
+        break;
+      case PACK_DIR_BER:
+        ridx += pack_BER(mrb, o, result, ridx, flags);
         break;
       case PACK_DIR_BASE64:
-        ridx += pack_m(mrb, o, result, ridx, count, flags);
+        ridx += pack_base64(mrb, o, result, ridx, count);
+        break;
+      case PACK_DIR_QENC:
+        ridx += pack_qenc(mrb, o, result, ridx, count);
         break;
       case PACK_DIR_HEX:
-        ridx += pack_h(mrb, o, result, ridx, count, flags);
+        ridx += pack_hex(mrb, o, result, ridx, count, flags);
         break;
       case PACK_DIR_STR:
-        ridx += pack_a(mrb, o, result, ridx, count, flags);
+        ridx += pack_str(mrb, o, result, ridx, count, flags);
         break;
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
       case PACK_DIR_DOUBLE:
         ridx += pack_double(mrb, o, result, ridx, flags);
         break;
@@ -1298,7 +1445,8 @@
       default:
         break;
       }
-      if (dir == PACK_DIR_STR || dir == PACK_DIR_BASE64) { /* always consumes 1 entry */
+      if (flags & PACK_FLAG_COUNT2) {
+        /* always consumes 1 entry */
         aidx++;
         break;
       }
@@ -1307,6 +1455,7 @@
       }
     }
     if (ridx < 0) {
+    overflow:
       mrb_raise(mrb, E_RANGE_ERROR, "negative (or overflowed) template size");
     }
   }
@@ -1322,7 +1471,9 @@
   struct tmpl tmpl;
   int count;
   unsigned int flags;
-  int dir, size, type;
+  enum pack_dir dir;
+  enum pack_type type;
+  int size;
   int srcidx, srclen;
   const unsigned char *sptr;
 
@@ -1338,24 +1489,39 @@
     if (dir == PACK_DIR_INVALID)
       continue;
     else if (dir == PACK_DIR_NUL) {
-      srcidx += unpack_x(mrb, sptr, srclen - srcidx, result, count, flags);
+      check_x(mrb, srclen-srcidx, count, 'x');
+      srcidx += count;
+      continue;
+    }
+    else if (dir == PACK_DIR_BACK) {
+      check_x(mrb, srcidx, count, 'X');
+      srcidx -= count;
+      continue;
+    }
+    else if (dir == PACK_DIR_ABS) {
+      check_x(mrb, srclen, count, '@');
+      srcidx = count;
       continue;
     }
 
-    if (flags & PACK_FLAG_COUNT2) {
-      sptr = (const unsigned char *)RSTRING_PTR(str) + srcidx;
-      switch (dir) {
-      case PACK_DIR_HEX:
-        srcidx += unpack_h(mrb, sptr, srclen - srcidx, result, count, flags);
-        break;
-      case PACK_DIR_STR:
-        srcidx += unpack_a(mrb, sptr, srclen - srcidx, result, count, flags);
-        break;
-      case PACK_DIR_BASE64:
-        srcidx += unpack_m(mrb, sptr, srclen - srcidx, result, flags);
-        break;
-      }
+    /* PACK_FLAG_COUNT2 directions */
+    sptr = (const unsigned char *)RSTRING_PTR(str) + srcidx;
+    switch (dir) {
+    case PACK_DIR_HEX:
+      srcidx += unpack_hex(mrb, sptr, srclen - srcidx, result, count, flags);
+      continue;
+    case PACK_DIR_STR:
+      srcidx += unpack_str(mrb, sptr, srclen - srcidx, result, count, flags);
       continue;
+    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;
+    default:
+      break;
     }
 
     while (count != 0) {
@@ -1369,18 +1535,21 @@
       sptr = (const unsigned char*)RSTRING_PTR(str) + srcidx;
       switch (dir) {
       case PACK_DIR_CHAR:
-        srcidx += unpack_c(mrb, sptr, srclen - srcidx, result, flags);
+        srcidx += unpack_char(mrb, sptr, srclen - srcidx, result, flags);
         break;
       case PACK_DIR_SHORT:
-        srcidx += unpack_s(mrb, sptr, srclen - srcidx, result, flags);
+        srcidx += unpack_short(mrb, sptr, srclen - srcidx, result, flags);
         break;
       case PACK_DIR_LONG:
-        srcidx += unpack_l(mrb, sptr, srclen - srcidx, result, flags);
+        srcidx += unpack_long(mrb, sptr, srclen - srcidx, result, flags);
         break;
       case PACK_DIR_QUAD:
-        srcidx += unpack_q(mrb, sptr, srclen - srcidx, result, flags);
+        srcidx += unpack_quad(mrb, sptr, srclen - srcidx, result, flags);
+        break;
+      case PACK_DIR_BER:
+        srcidx += unpack_BER(mrb, sptr, srclen - srcidx, result, flags);
         break;
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
       case PACK_DIR_FLOAT:
         srcidx += unpack_float(mrb, sptr, srclen - srcidx, result, flags);
         break;
@@ -1425,7 +1594,6 @@
 void
 mrb_mruby_pack_gem_init(mrb_state *mrb)
 {
-  check_little_endian();
   make_base64_dec_tab();
 
   mrb_define_method(mrb, mrb->array_class, "pack", mrb_pack_pack, MRB_ARGS_REQ(1));

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

@@ -1,3 +1,4 @@
+# coding: utf-8
 PACK_IS_LITTLE_ENDIAN = "\x01\00".unpack('S')0 == 0x01
 
 def assert_pack tmpl, packed, unpacked
@@ -9,78 +10,59 @@
 end
 
 # pack & unpack 'm' (base64)
-assert('"".pack("m")') do
+assert('pack("m")') do
   assert_pack "m", "", ""
-end
-
-assert('"\0".pack("m")') do
   assert_pack "m", "AA==\n", "\0"
-end
-
-assert('"\0\0".pack("m")') do
   assert_pack "m", "AAA=\n", "\0\0"
-end
-
-assert('"\0\0\0".pack("m")') do
   assert_pack "m", "AAAA\n", "\0\0\0"
-end
-
-assert('"abc..xyzABC..XYZ".pack("m")') do
   assert_pack "m", "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNERUZHSElKS0xNTk9QUVJT\nVFVWV1hZWg==\n", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-end
 
-assert('"YWJ...".unpack("m") should "abc..xyzABC..XYZ"') do
   ary = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
   assert_equal ary, "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNERUZHSElKS0xNTk9QUVJT\nVFVWV1hZWg==\n".unpack("m")
   assert_equal ary, "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWg==\n".unpack("m")
-end
 
-assert('"A", "B".pack') do
   assert_equal "QQ==\n", "A", "B".pack("m50")
   assert_equal "A", "QQ==\n".unpack("m50")
   assert_equal "QQ==Qg==", "A", "B".pack("m0 m0")
   assert_equal "A", "B", "QQ==Qg==".unpack("m10 m10")
+  assert_pack "m0", "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWg==", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 end
 
-assert('"abc..xyzABC..XYZ".pack("m0")') do
-  assert_pack "m0", "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWg==", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+# pack & unpack 'M' (Quoted-printable)
+assert('pack("M")') do
+  assert_pack "M", "123=\n", "123"
+  assert_pack "M", "=3D\n", "=\n"
+  assert_pack "M", "=E3=81=82=\n", "あ"
+
+  assert_equal "123", "123=\n".unpack("M")
+  assert_equal "=\n", "=3D\n".unpack("M")
+  assert_equal "あ", "=E3=81=82=\n".unpack("M")
 end
 
 # pack & unpack 'H'
-assert('"3031".pack("H*")') do
+assert('pack("H")') do
   assert_pack "H*", "01", "3031"
-end
-
-assert('"10".pack("H*")') do
   assert_pack "H*", "\020", "10"
 end
 
-assert('0,1,127,128,255.pack("C*")') do
+assert('pack("C")') do
   assert_pack "C*", "\x00\x01\x7F\x80\xFF", 0, 1, 127, 128, 255
 end
 
-# pack "a"
-assert('"abc".pack("a")') do
+assert('pack("a")') do
   assert_equal "a", "abc".pack("a")
   assert_equal "abc", "abc".pack("a*")
   assert_equal "abc\0", "abc".pack("a4")
-end
 
-# upack "a"
-assert('"abc".pack("a")') do
   assert_equal "abc\0", "abc\0".unpack("a4")
   assert_equal "abc ", "abc ".unpack("a4")
 end
 
-# pack "A"
-assert('"abc".pack("A")') do
+assert('pack("A")') do
   assert_equal "a", "abc".pack("A")
   assert_equal "abc", "abc".pack("A*")
   assert_equal "abc ", "abc".pack("A4")
-end
 
-# upack "A"
-assert('"abc".pack("A")') do
   assert_equal "abc", "abc\0".unpack("A4")
   assert_equal "abc", "abc ".unpack("A4")
 end
@@ -91,6 +73,7 @@
 end
 
 assert 'pack float' do
+  skip unless Object.const_defined?(:Float)
   assert_pack 'e', "\x00\x00@@", 3.0
   assert_pack 'g', "@@\x00\x00", 3.0
 
@@ -104,6 +87,7 @@
 end
 
 assert 'pack double' do
+  skip unless Object.const_defined?(:Float)
   assert_pack 'E', "\x00\x00\x00\x00\x00\x00\b@", 3.0
   assert_pack 'G', "@\b\x00\x00\x00\x00\x00\x00", 3.0
 
@@ -140,6 +124,12 @@
   assert_pack 'I', str, 12345
 end
 
+assert 'pack/unpack "w"' do
+  for x in 0,1,127,128,16383,16384,65535,65536
+    assert_equal x, x.pack("w").unpack("w")
+  end
+end
+
 assert 'pack/unpack "U"' do
   assert_equal , "".unpack("U")
   assert_equal , "".unpack("U*")

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

@@ -4,48 +4,50 @@
 # ISO 15.3.1
 module Kernel
   ##
-  # Invoke method +print+ on STDOUT and passing +*args+
+  # Print human readable object description
   #
-  # ISO 15.3.1.2.10
-  def print(*args)
+  # ISO 15.3.1.2.9
+  # ISO 15.3.1.3.34
+  def p(*args)
     i = 0
     len = args.size
     while i < len
-      __printstr__ argsi.to_s
+      __printstr__ argsi.inspect
+      __printstr__ "\n"
       i += 1
     end
+    args.__svalue
   end
 
-  ##
-  # Invoke method +puts+ on STDOUT and passing +*args*+
-  #
-  # ISO 15.3.1.2.11
-  def puts(*args)
+  # 15.3.1.2.10
+  # 15.3.1.3.35
+  def print(*args)
     i = 0
     len = args.size
     while i < len
-      s = argsi.to_s
-      __printstr__ s
-      __printstr__ "\n" if (s-1 != "\n")
+      __printstr__ argsi.to_s
       i += 1
     end
-    __printstr__ "\n" if len == 0
-    nil
   end
 
-  ##
-  # Print human readable object description
-  #
-  # ISO 15.3.1.3.34
-  def p(*args)
+  # 15.3.1.2.11
+  # 15.3.1.3.39
+  def puts(*args)
     i = 0
     len = args.size
     while i < len
-      __printstr__ argsi.inspect
-      __printstr__ "\n"
+      s = argsi
+      if s.kind_of?(Array)
+        puts(*s)
+      else
+        s = s.to_s
+        __printstr__ s
+        __printstr__ "\n" if (s-1 != "\n")
+      end
       i += 1
     end
-    args.__svalue
+    __printstr__ "\n" if len == 0
+    nil
   end
 
   def printf(*args)

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

@@ -1,12 +1,11 @@
 #include <mruby.h>
 
-#ifdef MRB_DISABLE_STDIO
-# error print conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#ifdef MRB_NO_STDIO
+# error print conflicts 'MRB_NO_STDIO' in your build configuration
 #endif
 
 #include <mruby/string.h>
 #include <string.h>
-#include <stdlib.h>
 #if defined(_WIN32)
 # include <windows.h>
 # include <io.h>
@@ -17,39 +16,34 @@
 #endif
 
 static void
-printstr(mrb_state *mrb, mrb_value obj)
+printstr(mrb_state *mrb, const char *p, mrb_int len)
 {
-  if (mrb_string_p(obj)) {
 #if defined(_WIN32)
-    if (isatty(fileno(stdout))) {
-      DWORD written;
-      int mlen = (int)RSTRING_LEN(obj);
-      char* utf8 = RSTRING_PTR(obj);
-      int wlen = MultiByteToWideChar(CP_UTF8, 0, utf8, mlen, NULL, 0);
-      wchar_t* utf16 = (wchar_t*)mrb_malloc(mrb, (wlen+1) * sizeof(wchar_t));
-      if (MultiByteToWideChar(CP_UTF8, 0, utf8, mlen, utf16, wlen) > 0) {
-        utf16wlen = 0;
-        WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
-          utf16, wlen, &written, NULL);
-      }
-      mrb_free(mrb, utf16);
-    } else
+  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(RSTRING_PTR(obj), RSTRING_LEN(obj), 1, stdout);
-    fflush(stdout);
-  }
+    fwrite(p, (size_t)len, 1, stdout);
+  fflush(stdout);
 }
 
-/* 15.3.1.2.9  */
-/* 15.3.1.3.34 */
-mrb_value
+static mrb_value
 mrb_printstr(mrb_state *mrb, mrb_value self)
 {
-  mrb_value argv = mrb_get_arg1(mrb);
-
-  printstr(mrb, argv);
+  mrb_value s = mrb_get_arg1(mrb);
 
-  return argv;
+  if (mrb_string_p(s)) {
+    printstr(mrb, RSTRING_PTR(s), RSTRING_LEN(s));
+  }
+  return s;
 }
 
 void

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding Added

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding/src Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding/src/proc-binding.c Added

@@ -0,0 +1,50 @@
+#include <mruby.h>
+#include <mruby/presym.h>
+#include <mruby/proc.h>
+#include <mruby/variable.h>
+
+/* provided by mruby-proc-ext */
+mrb_value mrb_proc_source_location(mrb_state *mrb, struct RProc *p);
+
+/* provided by mruby-binding-core */
+mrb_value mrb_binding_alloc(mrb_state *mrb);
+struct RProc *mrb_binding_wrap_lvspace(mrb_state *mrb, const struct RProc *proc, struct REnv **envp);
+
+static mrb_value
+mrb_proc_binding(mrb_state *mrb, mrb_value procval)
+{
+  mrb_value binding = mrb_binding_alloc(mrb);
+  const struct RProc *proc = mrb_proc_ptr(procval);
+  struct REnv *env;
+
+  mrb_value receiver;
+  if (!proc || MRB_PROC_CFUNC_P(proc) || !proc->upper || MRB_PROC_CFUNC_P(proc->upper)) {
+    env = NULL;
+    proc = NULL;
+    receiver = mrb_nil_value();
+  }
+  else {
+    env = MRB_PROC_ENV(proc);
+    mrb_assert(env);
+    proc = proc->upper;
+    receiver = MRB_ENV_LEN(env) > 0 ? env->stack0 : mrb_nil_value();
+  }
+
+  proc = mrb_binding_wrap_lvspace(mrb, proc, &env);
+  mrb_iv_set(mrb, binding, MRB_SYM(proc), mrb_obj_value((void *)proc));
+  mrb_iv_set(mrb, binding, MRB_SYM(recv), receiver);
+  mrb_iv_set(mrb, binding, MRB_SYM(env), mrb_obj_value(env));
+  mrb_iv_set(mrb, binding, MRB_SYM(source_location), mrb_proc_source_location(mrb, mrb_proc_ptr(procval)));
+  return binding;
+}
+
+void
+mrb_mruby_proc_binding_gem_init(mrb_state *mrb)
+{
+  mrb_define_method(mrb, mrb->proc_class, "binding", mrb_proc_binding, MRB_ARGS_NONE());
+}
+
+void
+mrb_mruby_proc_binding_gem_final(mrb_state *mrb)
+{
+}

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding/test Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding/test/proc-binding.c Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-proc-binding/test/proc-binding.rb Added

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

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

@@ -4,6 +4,7 @@
 #include <mruby/array.h>
 #include <mruby/string.h>
 #include <mruby/debug.h>
+#include <mruby/presym.h>
 
 static mrb_value
 mrb_proc_lambda_p(mrb_state *mrb, mrb_value self)
@@ -12,16 +13,14 @@
   return mrb_bool_value(MRB_PROC_STRICT_P(p));
 }
 
-static mrb_value
-mrb_proc_source_location(mrb_state *mrb, mrb_value self)
+mrb_value
+mrb_proc_source_location(mrb_state *mrb, struct RProc *p)
 {
-  struct RProc *p = mrb_proc_ptr(self);
-
   if (MRB_PROC_CFUNC_P(p)) {
     return mrb_nil_value();
   }
   else {
-    mrb_irep *irep = p->body.irep;
+    const mrb_irep *irep = p->body.irep;
     int32_t line;
     const char *filename;
 
@@ -34,6 +33,12 @@
 }
 
 static mrb_value
+mrb_proc_source_location_m(mrb_state *mrb, mrb_value self)
+{
+  return mrb_proc_source_location(mrb, mrb_proc_ptr(self));
+}
+
+static mrb_value
 mrb_proc_inspect(mrb_state *mrb, mrb_value self)
 {
   struct RProc *p = mrb_proc_ptr(self);
@@ -41,7 +46,7 @@
   mrb_str_cat_str(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(self)));
 
   if (!MRB_PROC_CFUNC_P(p)) {
-    mrb_irep *irep = p->body.irep;
+    const mrb_irep *irep = p->body.irep;
     const char *filename;
     int32_t line;
     mrb_str_cat_lit(mrb, str, "@");
@@ -87,25 +92,28 @@
  *    prc.parameters  #=> :req, :x, :opt, :y, :rest, :other
  */
 
-static mrb_value
+mrb_value
 mrb_proc_parameters(mrb_state *mrb, mrb_value self)
 {
   struct parameters_type {
-    size_t len;
-    const char *name;
+    mrb_sym name;
     int size;
   } *p, parameters_list  = {
-    {sizeof("req")   - 1, "req",   0},
-    {sizeof("opt")   - 1, "opt",   0},
-    {sizeof("rest")  - 1, "rest",  0},
-    {sizeof("req")   - 1, "req",   0},
-    {sizeof("block") - 1, "block", 0},
-    {0, NULL, 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);
-  const struct mrb_irep *irep = proc->body.irep;
+  const struct mrb_irep *irep;
   mrb_aspec aspec;
   mrb_value parameters;
+  mrb_value krest = mrb_nil_value();
+  mrb_value block = mrb_nil_value();
   int i, j;
   int max = -1;
 
@@ -113,6 +121,7 @@
     // TODO cfunc aspec is not implemented yet
     return mrb_ary_new(mrb);
   }
+  irep = proc->body.irep;
   if (!irep) {
     return mrb_ary_new(mrb);
   }
@@ -124,10 +133,8 @@
   }
 
   if (!MRB_PROC_STRICT_P(proc)) {
-    parameters_list0.len = sizeof("opt") - 1;
-    parameters_list0.name = "opt";
-    parameters_list3.len = sizeof("opt") - 1;
-    parameters_list3.name = "opt";
+    parameters_list0.name = MRB_SYM(opt);
+    parameters_list3.name = MRB_SYM(opt);
   }
 
   aspec = PEEK_W(irep->iseq+1);
@@ -135,21 +142,23 @@
   parameters_list1.size = MRB_ASPEC_OPT(aspec);
   parameters_list2.size = MRB_ASPEC_REST(aspec);
   parameters_list3.size = MRB_ASPEC_POST(aspec);
-  parameters_list4.size = MRB_ASPEC_BLOCK(aspec);
+  parameters_list4.size = MRB_ASPEC_KDICT(aspec);
+  parameters_list5.size = MRB_ASPEC_BLOCK(aspec);
+  parameters_list6.size = MRB_ASPEC_KEY(aspec);
 
   parameters = mrb_ary_new_capa(mrb, irep->nlocals-1);
 
   max = irep->nlocals-1;
   for (i = 0, p = parameters_list; p->name; p++) {
-    mrb_value sname = mrb_symbol_value(mrb_intern_static(mrb, p->name, p->len));
+    mrb_value sname = mrb_symbol_value(p->name);
 
     for (j = 0; j < p->size; i++, j++) {
       mrb_value a;
 
       a = mrb_ary_new(mrb);
       mrb_ary_push(mrb, a, sname);
-      if (i < max && irep->lvi.name) {
-        mrb_sym sym = irep->lvi.name;
+      if (i < max && irep->lvi) {
+        mrb_sym sym = irep->lvi;
         const char *name = mrb_sym_name(mrb, sym);
         switch (name0) {
         case '*': case '&':
@@ -159,9 +168,17 @@
           break;
         }
       }
+      if (p->name == MRB_SYM(block)) {
+        block = a; continue;
+      }
+      if (p->name == MRB_SYM(keyrest)) {
+        krest = a; continue;
+      }
       mrb_ary_push(mrb, parameters, a);
     }
   }
+  if (!mrb_nil_p(krest)) mrb_ary_push(mrb, parameters, krest);
+  if (!mrb_nil_p(block)) mrb_ary_push(mrb, parameters, block);
   return parameters;
 }
 
@@ -170,7 +187,7 @@
 {
   struct RClass *p = mrb->proc_class;
   mrb_define_method(mrb, p, "lambda?",         mrb_proc_lambda_p,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, p, "source_location", mrb_proc_source_location, MRB_ARGS_NONE());
+  mrb_define_method(mrb, p, "source_location", mrb_proc_source_location_m, MRB_ARGS_NONE());
   mrb_define_method(mrb, p, "to_s",            mrb_proc_inspect,         MRB_ARGS_NONE());
   mrb_define_method(mrb, p, "inspect",         mrb_proc_inspect,         MRB_ARGS_NONE());
   mrb_define_method(mrb, p, "parameters",      mrb_proc_parameters,      MRB_ARGS_NONE());

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

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

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

@@ -10,16 +10,40 @@
 #include <mruby/data.h>
 #include <mruby/array.h>
 #include <mruby/istruct.h>
-#if INT32_MAX <= INTPTR_MAX
+#include <mruby/presym.h>
+#include <mruby/string.h>
+
+#include <time.h>
+
+/*  Written in 2019 by David Blackman and Sebastiano Vigna (vigna@acm.org)
+
+To the extent possible under law, the author has dedicated all copyright
+and related and neighboring rights to this software to the public domain
+worldwide. This software is distributed without any warranty.
+
+See <https://creativecommons.org/publicdomain/zero/1.0/>. */
+
+/* This is xoshiro128++ 1.0, one of our 32-bit all-purpose, rock-solid
+   generators. It has excellent speed, a state size (128 bits) that is
+   large enough for mild parallelism, and it passes all tests we are aware
+   of.
+
+   For generating just single-precision (i.e., 32-bit) floating-point
+   numbers, xoshiro128+ is even faster.
+
+   The state must be seeded so that it is not everywhere zero. */
+
+
+#ifdef MRB_32BIT
 # define XORSHIFT96
 # define NSEEDS 3
+# define SEEDPOS 2
 #else
 # define NSEEDS 4
+# define SEEDPOS 0
 #endif
 #define LASTSEED (NSEEDS-1)
 
-#include <time.h>
-
 typedef struct rand_state {
   uint32_t seedNSEEDS;
 } rand_state;
@@ -35,19 +59,31 @@
 #endif
 }
 
+static uint32_t rand_uint32(rand_state *state);
+
 static uint32_t
 rand_seed(rand_state *t, uint32_t seed)
 {
-  uint32_t old_seed = t->seedLASTSEED;
+  uint32_t old_seed = t->seedSEEDPOS;
   rand_init(t);
-  t->seedLASTSEED = seed;
+  t->seedSEEDPOS = seed;
+  for (int i = 0; i < 10; i++) {
+    rand_uint32(t);
+  }
   return old_seed;
 }
 
-#ifdef XORSHIFT96
+#ifndef XORSHIFT96
+static inline uint32_t
+rotl(const uint32_t x, int k) {
+  return (x << k) | (x >> (32 - k));
+}
+#endif
+
 static uint32_t
 rand_uint32(rand_state *state)
 {
+#ifdef XORSHIFT96
   uint32_t *seed = state->seed;
   uint32_t x = seed0;
   uint32_t y = seed1;
@@ -61,90 +97,68 @@
   seed2 = z;
 
   return z;
-}
-#else  /* XORSHIFT96 */
-static uint32_t
-rand_uint32(rand_state *state)
-{
-  uint32_t *seed = state->seed;
-  uint32_t x = seed0;
-  uint32_t y = seed1;
-  uint32_t z = seed2;
-  uint32_t w = seed3;
-  uint32_t t;
+#else
+  uint32_t *s = state->seed;
+  const uint32_t result = rotl(s0 + s3, 7) + s0;
+  const uint32_t t = s1 << 9;
 
-  t = x ^ (x << 11);
-  x = y; y = z; z = w;
-  w = (w ^ (w >> 19)) ^ (t ^ (t >> 8));
-  seed0 = x;
-  seed1 = y;
-  seed2 = z;
-  seed3 = w;
+  s2 ^= s0;
+  s3 ^= s1;
+  s1 ^= s2;
+  s0 ^= s3;
 
-  return w;
-}
+  s2 ^= t;
+  s3 = rotl(s3, 11);
+
+  return result;
 #endif  /* XORSHIFT96 */
+  }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 static double
 rand_real(rand_state *t)
 {
   uint32_t x = rand_uint32(t);
-  return x*(1.0/4294967295.0);
+  return x*(1.0/4294967296.0);
 }
 #endif
 
 static mrb_value
-random_rand(mrb_state *mrb, rand_state *t, mrb_value max)
+random_rand(mrb_state *mrb, rand_state *t, mrb_int max)
 {
-  mrb_value value;
-
-  if (mrb_fixnum(max) == 0) {
-#ifndef MRB_WITHOUT_FLOAT
-    value = mrb_float_value(mrb, rand_real(t));
+  if (max == 0) {
+#ifndef MRB_NO_FLOAT
+    return mrb_float_value(mrb, rand_real(t));
 #else
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Float not supported");
+    max = 100;
 #endif
   }
-  else {
-    value = mrb_fixnum_value(rand_uint32(t) % mrb_fixnum(max));
-  }
+  return mrb_int_value(mrb, rand_uint32(t) % max);
+}
 
-  return value;
+static mrb_int
+random_rand_i(mrb_state *mrb, rand_state *t, mrb_int max)
+{
+  return rand_uint32(t) % max;
 }
 
-static mrb_value
+static mrb_int
 get_opt(mrb_state* mrb)
 {
-  mrb_value arg;
-
-  arg = mrb_nil_value();
-  mrb_get_args(mrb, "|o", &arg);
-
-  if (!mrb_nil_p(arg)) {
-    mrb_int i;
+  mrb_int arg;
 
-    arg = mrb_to_int(mrb, arg);
-    i = mrb_fixnum(arg);
-    if (i < 0) {
-      arg = mrb_fixnum_value(0 - i);
-    }
+  arg = 0;
+  mrb_get_args(mrb, "|i", &arg);
+  if (arg < 0) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument");
   }
   return arg;
 }
 
-static void
-random_check(mrb_state *mrb, mrb_value random) {
-  struct RClass *c = mrb_class_get(mrb, "Random");
-  if (!mrb_obj_is_kind_of(mrb, random, c) || !mrb_istruct_p(random)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "Random instance required");
-  }
-}
-
 static mrb_value
 random_default(mrb_state *mrb) {
-  struct RClass *c = mrb_class_get(mrb, "Random");
-  mrb_value d = mrb_const_get(mrb, mrb_obj_value(c), mrb_intern_lit(mrb, "DEFAULT"));
+  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));
   if (!mrb_obj_is_kind_of(mrb, d, c)) {
     mrb_raise(mrb, E_TYPE_ERROR, "Random::DEFAULT replaced");
   }
@@ -157,17 +171,15 @@
 static mrb_value
 random_m_init(mrb_state *mrb, mrb_value self)
 {
-  mrb_value seed;
+  mrb_int seed;
   rand_state *t;
 
-  seed = get_opt(mrb);
-  /* avoid memory leaks */
   t = random_ptr(self);
-  if (mrb_nil_p(seed)) {
+  if (mrb_get_args(mrb, "|i", &seed) == 0) {
     rand_init(t);
   }
   else {
-    rand_seed(t, (uint32_t)mrb_fixnum(seed));
+    rand_seed(t, (uint32_t)seed);
   }
 
   return self;
@@ -176,7 +188,7 @@
 static mrb_value
 random_m_rand(mrb_state *mrb, mrb_value self)
 {
-  mrb_value max;
+  mrb_int max;
   rand_state *t = random_ptr(self);
 
   max = get_opt(mrb);
@@ -188,19 +200,35 @@
 {
   uint32_t seed;
   uint32_t old_seed;
-  mrb_value sv;
+  mrb_int i;
   rand_state *t = random_ptr(self);
 
-  sv = get_opt(mrb);
-  if (mrb_nil_p(sv)) {
+  if (mrb_get_args(mrb, "|i", &i) == 0) {
     seed = (uint32_t)time(NULL) + rand_uint32(t);
   }
   else {
-    seed = (uint32_t)mrb_fixnum(sv);
+    seed = (uint32_t)i;
   }
   old_seed = rand_seed(t, seed);
 
-  return mrb_fixnum_value((mrb_int)old_seed);
+  return mrb_int_value(mrb, (mrb_int)old_seed);
+}
+
+static mrb_value
+random_m_bytes(mrb_state *mrb, mrb_value self)
+{
+  rand_state *t = random_ptr(self);
+
+  mrb_int i;
+  mrb_get_args(mrb, "i", &i);
+
+  mrb_value bytes = mrb_str_new(mrb, NULL, i);
+  uint8_t *p = (uint8_t*)RSTRING_PTR(bytes);
+  for (; i > 0; i--, p++) {
+    *p = (uint8_t)rand_uint32(t);
+  }
+
+  return bytes;
 }
 
 /*
@@ -213,29 +241,22 @@
 static mrb_value
 mrb_ary_shuffle_bang(mrb_state *mrb, mrb_value ary)
 {
-  mrb_int i;
-  mrb_value max;
-  mrb_value r = mrb_nil_value();
+  mrb_int i, max;
   rand_state *random;
 
   if (RARRAY_LEN(ary) > 1) {
-    mrb_get_args(mrb, "|o", &r);
-
-    if (mrb_nil_p(r)) {
+    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);
     }
-    else {
-      random_check(mrb, r);
-      random = random_ptr(r);
-    }
     mrb_ary_modify(mrb, mrb_ary_ptr(ary));
-    max = mrb_fixnum_value(RARRAY_LEN(ary));
+    max = RARRAY_LEN(ary);
     for (i = RARRAY_LEN(ary) - 1; i > 0; i--)  {
       mrb_int j;
       mrb_value *ptr = RARRAY_PTR(ary);
       mrb_value tmp;
 
-      j = mrb_fixnum(random_rand(mrb, random, max));
+      j = random_rand_i(mrb, random, max);
 
       tmp = ptri;
       ptri = ptrj;
@@ -282,18 +303,13 @@
 {
   mrb_int n = 0;
   mrb_bool given;
-  mrb_value r = mrb_nil_value();
   rand_state *random;
   mrb_int len;
+  struct RClass *c = mrb_class_get_id(mrb, MRB_SYM(Random));
 
-  mrb_get_args(mrb, "|i?o", &n, &given, &r);
-  if (mrb_nil_p(r)) {
+  if (mrb_get_args(mrb, "|i?I", &n, &given, &random, c) < 2) {
     random = random_default_state(mrb);
   }
-  else {
-    random_check(mrb, r);
-    random = random_ptr(r);
-  }
   len = RARRAY_LEN(ary);
   if (!given) {                 /* pick one element */
     switch (len) {
@@ -320,16 +336,18 @@
         r = (mrb_int)(rand_uint32(random) % len);
 
         for (j=0; j<i; j++) {
-          if (mrb_fixnum(RARRAY_PTR(result)j) == r) {
+          if (mrb_integer(RARRAY_PTR(result)j) == r) {
             goto retry;         /* retry if duplicate */
           }
         }
         break;
       }
-      mrb_ary_push(mrb, result, mrb_fixnum_value(r));
+      mrb_ary_push(mrb, result, mrb_int_value(mrb, r));
     }
     for (i=0; i<n; i++) {
-      mrb_ary_set(mrb, result, i, RARRAY_PTR(ary)mrb_fixnum(RARRAY_PTR(result)i));
+      mrb_int idx = mrb_integer(RARRAY_PTR(result)i);
+      mrb_value elem = RARRAY_PTR(ary)idx;
+      mrb_ary_set(mrb, result, i, elem);
     }
     return result;
   }
@@ -349,13 +367,20 @@
   return random_m_srand(mrb, random);
 }
 
+static mrb_value
+random_f_bytes(mrb_state *mrb, mrb_value self)
+{
+  mrb_value random = random_default(mrb);
+  return random_m_bytes(mrb, random);
+}
+
 
 void mrb_mruby_random_gem_init(mrb_state *mrb)
 {
   struct RClass *random;
   struct RClass *array = mrb->array_class;
 
-  mrb_assert(sizeof(rand_state) <= ISTRUCT_DATA_SIZE);
+  mrb_static_assert(sizeof(rand_state) <= ISTRUCT_DATA_SIZE);
 
   mrb_define_method(mrb, mrb->kernel_module, "rand", random_f_rand, MRB_ARGS_OPT(1));
   mrb_define_method(mrb, mrb->kernel_module, "srand", random_f_srand, MRB_ARGS_OPT(1));
@@ -364,16 +389,18 @@
   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));
+  mrb_define_class_method(mrb, random, "bytes", random_f_bytes, MRB_ARGS_REQ(1));
 
   mrb_define_method(mrb, random, "initialize", random_m_init, MRB_ARGS_OPT(1));
   mrb_define_method(mrb, random, "rand", random_m_rand, MRB_ARGS_OPT(1));
   mrb_define_method(mrb, random, "srand", random_m_srand, MRB_ARGS_OPT(1));
+  mrb_define_method(mrb, random, "bytes", random_m_bytes, MRB_ARGS_REQ(1));
 
   mrb_define_method(mrb, array, "shuffle", mrb_ary_shuffle, MRB_ARGS_OPT(1));
   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_intern_lit(mrb, "DEFAULT"),
+  mrb_const_set(mrb, mrb_obj_value(random), MRB_SYM(DEFAULT),
           mrb_obj_new(mrb, random, 0, NULL));
 }

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

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

@@ -11,6 +11,7 @@
   #   (10..20).first(3)  #=> 10, 11, 12
   #
   def first(*args)
+    raise RangeError, "cannot get the first element of beginless range" if self.begin.nil?
     return self.begin if args.empty?
 
     raise ArgumentError, "wrong number of arguments (given #{args.length}, expected 1)" unless args.length == 1
@@ -26,14 +27,42 @@
     ary
   end
 
+  ##
+  # call-seq:
+  #    rng.last    -> obj
+  #    rng.last(n) -> an_array
+  #
+  # Returns the last object in the range,
+  # or an array of the last +n+ elements.
+  #
+  # Note that with no arguments +last+ will return the object that defines
+  # the end of the range even if #exclude_end? is +true+.
+  #
+  #   (10..20).last      #=> 20
+  #   (10...20).last     #=> 20
+  #   (10..20).last(3)   #=> 18, 19, 20
+  #   (10...20).last(3)  #=> 17, 18, 19
+  def last(*args)
+    raise RangeError, "cannot get the last element of endless range" if self.end.nil?
+    return self.end if args.empty?
+
+    raise ArgumentError, "wrong number of arguments (given #{args.length}, expected 1)" unless args.length == 1
+    nv = args0
+    n = nv.__to_int
+    raise ArgumentError, "negative array size (or size too big)" unless 0 <= n
+    return self.to_a.last(nv)
+  end
+
   def max(&block)
-    val = self.first
-    last = self.last
-    return super if block
+    val = self.begin
+    last = self.end
+    return super(&block) if block
+
+    raise RangeError, "cannot get the maximum of endless range" if last.nil?
 
     # fast path for numerics
     if val.kind_of?(Numeric) && last.kind_of?(Numeric)
-      raise TypeError if exclude_end? && !last.kind_of?(Fixnum)
+      raise TypeError if exclude_end? && !last.kind_of?(Integer)
       return nil if val > last
       return nil if val == last && exclude_end?
 
@@ -43,13 +72,17 @@
     end
 
     # delegate to Enumerable
-    super
+    super()
   end
 
   def min(&block)
-    val = self.first
-    last = self.last
-    return super if block
+    val = self.begin
+    last = self.end
+    if block
+      raise RangeError, "cannot get the minimum of endless range with custom comparison method" if last.nil?
+      return super(&block)
+    end
+    return val if last.nil?
 
     # fast path for numerics
     if val.kind_of?(Numeric) && last.kind_of?(Numeric)
@@ -61,6 +94,6 @@
     end
 
     # delegate to Enumerable
-    super
+    super()
   end
 end

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

@@ -1,6 +1,5 @@
 #include <mruby.h>
 #include <mruby/range.h>
-#include <math.h>
 
 static mrb_bool
 r_le(mrb_state *mrb, mrb_value a, mrb_value b)
@@ -42,6 +41,9 @@
   end = RANGE_END(r);
 
   if (r_le(mrb, beg, val)) {
+    if (mrb_nil_p(end)) {
+      return mrb_true_value();
+    }
     if (RANGE_EXCL(r)) {
       if (r_lt(mrb, val, end))
         return mrb_true_value();
@@ -57,36 +59,6 @@
 
 /*
  *  call-seq:
- *     rng.last    -> obj
- *     rng.last(n) -> an_array
- *
- *  Returns the last object in the range,
- *  or an array of the last +n+ elements.
- *
- *  Note that with no arguments +last+ will return the object that defines
- *  the end of the range even if #exclude_end? is +true+.
- *
- *    (10..20).last      #=> 20
- *    (10...20).last     #=> 20
- *    (10..20).last(3)   #=> 18, 19, 20
- *    (10...20).last(3)  #=> 17, 18, 19
- */
-static mrb_value
-range_last(mrb_state *mrb, mrb_value range)
-{
-  mrb_value num;
-  mrb_value array;
-
-  if (mrb_get_args(mrb, "|o", &num) == 0) {
-    return mrb_range_end(mrb, range);
-  }
-
-  array = mrb_funcall(mrb, range, "to_a", 0);
-  return mrb_funcall(mrb, array, "last", 1, mrb_to_int(mrb, num));
-}
-
-/*
- *  call-seq:
  *     rng.size                   -> num
  *
  *  Returns the number of elements in the range. Both the begin and the end of
@@ -96,7 +68,7 @@
  *    ('a'..'z').size  #=> nil
  */
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 static mrb_value
 range_size(mrb_state *mrb, mrb_value range)
 {
@@ -108,9 +80,13 @@
 
   beg = RANGE_BEG(r);
   end = RANGE_END(r);
+  if ((mrb_integer_p(beg) || mrb_float_p(beg)) && mrb_nil_p(end)) {
+    return mrb_float_value(mrb, INFINITY);
+  }
+
   excl = RANGE_EXCL(r);
-  if (mrb_fixnum_p(beg)) {
-    beg_f = (mrb_float)mrb_fixnum(beg);
+  if (mrb_integer_p(beg)) {
+    beg_f = (mrb_float)mrb_integer(beg);
   }
   else if (mrb_float_p(beg)) {
     beg_f = mrb_float(beg);
@@ -118,8 +94,8 @@
   else {
     num_p = FALSE;
   }
-  if (mrb_fixnum_p(end)) {
-    end_f = (mrb_float)mrb_fixnum(end);
+  if (mrb_integer_p(end)) {
+    end_f = (mrb_float)mrb_integer(end);
   }
   else if (mrb_float_p(end)) {
     end_f = mrb_float(end);
@@ -159,18 +135,22 @@
 
   beg = RANGE_BEG(r);
   end = RANGE_END(r);
+  if (mrb_integer_p(beg) && mrb_nil_p(end)) {
+    return mrb_nil_value();
+  }
+
   excl = RANGE_EXCL(r) ? 0 : 1;
 
-  if (mrb_fixnum_p(beg) && mrb_fixnum_p(end)) {
-    mrb_int a = mrb_fixnum(beg);
-    mrb_int b = mrb_fixnum(end);
+  if (mrb_integer_p(beg) && mrb_integer_p(end)) {
+    mrb_int a = mrb_integer(beg);
+    mrb_int b = mrb_integer(end);
     mrb_int c = b - a + excl;
 
-    return mrb_fixnum_value(c);
+    return mrb_int_value(mrb, c);
   }
   return mrb_nil_value();
 }
-#endif /* MRB_WITHOUT_FLOAT */
+#endif /* MRB_NO_FLOAT */
 
 void
 mrb_mruby_range_ext_gem_init(mrb_state* mrb)
@@ -178,7 +158,6 @@
   struct RClass * s = mrb_class_get(mrb, "Range");
 
   mrb_define_method(mrb, s, "cover?", range_cover, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, s, "last",   range_last,  MRB_ARGS_OPT(1));
   mrb_define_method(mrb, s, "size",   range_size,  MRB_ARGS_NONE());
 }

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

@@ -5,11 +5,17 @@
   assert_true ("a".."z").cover?("c")
   assert_true !("a".."z").cover?("5")
   assert_true ("a".."z").cover?("cc")
+  assert_true ("a"..).cover?("c")
+  assert_false ("a"..).cover?("5")
+  assert_true ("a"..).cover?("cc")
 end
 
 assert('Range#first') do
   assert_equal 10, (10..20).first
   assert_equal 10, 11, 12, (10..20).first(3)
+  assert_equal 10, (10..).first
+  assert_equal 10, 11, 12, (10..).first(3)
+  assert_raise(RangeError) { (..1).first }
 
   skip unless Object.const_defined?(:Float)
   assert_equal 0, 1, 2, (0..Float::INFINITY).first(3)
@@ -18,6 +24,8 @@
 assert('Range#last') do
   assert_equal 20, (10..20).last
   assert_equal 20, (10...20).last
+  assert_raise(RangeError) { (10..).last }
+  assert_raise(RangeError) { (10...).last }
   assert_equal 18, 19, 20, (10..20).last(3)
   assert_equal 17, 18, 19, (10...20).last(3)
 end
@@ -26,6 +34,9 @@
   assert_equal 42, (1..42).size
   assert_equal 41, (1...42).size
   assert_nil ('a'..'z').size
+  assert_nil ('a'..).size
+
+  assert_nil (1..).size unless Object.const_defined?(:Float)
 
   skip unless Object.const_defined?(:Float)
   assert_equal 6, (1...6.3).size
@@ -33,6 +44,10 @@
   assert_equal 5, (1.1...6).size
   assert_equal 15, (1.0..15.9).size
   assert_equal Float::INFINITY, (0..Float::INFINITY).size
+
+  assert_equal Float::INFINITY, (1..).size
+  assert_equal Float::INFINITY, (1...).size
+  assert_equal Float::INFINITY, (1.0..).size
 end
 
 assert('Range#max') do
@@ -50,6 +65,10 @@
   # returns the endpoint when the endpoint equals the start point and the range is inclusive
   assert_equal 5, (5..5).max
 
+  # raises RangeError when called on an endless range
+  assert_raise(RangeError) { (10..).max }
+  assert_raise(RangeError) { (10...).max }
+
   skip unless Object.const_defined?(:Float)
 
   # returns the maximum value in the Float range when called with no arguments
@@ -94,26 +113,31 @@
   # returns the minimum value in the range when called with no arguments
   assert_equal 1, (1..10).min
   assert_equal 1, (1...10).min
+  assert_equal 1, (1..).min
 
   # returns nil when the start point is greater than the endpoint
   assert_equal nil, (100..10).min
 
   # returns nil when the endpoint equals the start point and the range is exclusive
-  assert_equal nil, (5...5).max
+  assert_equal nil, (5...5).min
 
   # returns the endpoint when the endpoint equals the start point and the range is inclusive
-  assert_equal 5, (5..5).max
+  assert_equal 5, (5..5).min
 
   skip unless Object.const_defined?(:Float)
 
   # returns the minimum value in the Float range when called with no arguments
   assert_equal 303.20, (303.20..908.1111).min
+  assert_equal 1, (1.0..).min
 
   # returns nil when the start point is greater than the endpoint in a Float range
-  assert_equal nil, (3003.20..908.1111).max
+  assert_equal nil, (3003.20..908.1111).min
 end
 
 assert('Range#min given a block') do
+  # raise when called with a block in endless range
+  assert_raise(RangeError) { (1..).min{} }
+
   # passes each pair of values in the range to the block
   acc = 
   (1..10).min do |a, b|

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

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

@@ -6,74 +6,6 @@
   def to_s
     "#{numerator}/#{denominator}"
   end
-
-  def *(rhs)
-    if rhs.is_a? Rational
-      Rational(numerator * rhs.numerator, denominator * rhs.denominator)
-    elsif rhs.is_a? Integer
-      Rational(numerator * rhs, denominator)
-    elsif rhs.is_a? Numeric
-      numerator * rhs / denominator
-    end
-  end
-
-  def +(rhs)
-    if rhs.is_a? Rational
-      Rational(numerator * rhs.denominator + rhs.numerator * denominator, denominator * rhs.denominator)
-    elsif rhs.is_a? Integer
-      Rational(numerator + rhs * denominator, denominator)
-    elsif rhs.is_a? Numeric
-      (numerator + rhs * denominator) / denominator
-    end
-  end
-
-  def -(rhs)
-    if rhs.is_a? Rational
-      Rational(numerator * rhs.denominator - rhs.numerator * denominator, denominator * rhs.denominator)
-    elsif rhs.is_a? Integer
-      Rational(numerator - rhs * denominator, denominator)
-    elsif rhs.is_a? Numeric
-      (numerator - rhs * denominator) / denominator
-    end
-  end
-
-  def /(rhs)
-    if rhs.is_a? Rational
-      Rational(numerator * rhs.denominator, denominator * rhs.numerator)
-    elsif rhs.is_a? Integer
-      Rational(numerator, denominator * rhs)
-    elsif rhs.is_a? Numeric
-      numerator / rhs / denominator
-    end
-  end
-
-  def <=>(rhs)
-    if rhs.is_a?(Integral)
-      return numerator <=> rhs if denominator == 1
-      rhs = Rational(rhs)
-    end
-
-    case rhs
-    when Rational
-      (numerator * rhs.denominator - denominator * rhs.numerator) <=> 0
-    when Numeric
-      (rhs <=> self)&.-@
-    else
-      nil
-    end
-  end
-
-  def ==(rhs)
-    return true if self.equal?(rhs)
-    if rhs.is_a?(Integral) && denominator == 1
-      return numerator == rhs
-    end
-    if rhs.is_a?(Rational)
-      numerator * rhs.denominator == denominator * rhs.numerator
-    else
-      rhs == self
-    end
-  end
 end
 
 class Numeric
@@ -81,35 +13,3 @@
     Rational(self, 1)
   end
 end
-
-module Kernel
-  def Rational(numerator, denominator = 1)
-    a = numerator
-    b = denominator
-    a, b = b, a % b until b == 0
-    Rational._new(numerator.div(a), denominator.div(a))
-  end
-
-  :+, :-, :*, :/, :<=>, :==, :<, :<=, :>, :>=.each do |op|
-    original_operator_name = :"__original_operator_#{op}_rational"
-    Fixnum.instance_eval do
-      alias_method original_operator_name, op
-      define_method op do |rhs|
-        if rhs.is_a? Rational
-          Rational(self).__send__(op, rhs)
-        else
-          __send__(original_operator_name, rhs)
-        end
-      end
-    end
-    Float.instance_eval do
-      alias_method original_operator_name, op
-      define_method op do |rhs|
-        if rhs.is_a? Rational
-          rhs = rhs.to_f
-        end
-        __send__(original_operator_name, rhs)
-      end
-    end if Object.const_defined?(:Float)
-  end
-end

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

@@ -1,160 +1,312 @@
 #include <mruby.h>
 #include <mruby/class.h>
-#include <mruby/string.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 
 struct mrb_rational {
   mrb_int numerator;
   mrb_int denominator;
 };
 
-#if MRB_INT_MAX <= INTPTR_MAX
+#if defined(MRB_INT64) && defined(MRB_32BIT)
+struct RRational {
+  MRB_OBJECT_HEADER;
+  struct mrb_rational *p;
+};
 
-#define RATIONAL_USE_ISTRUCT
-/* use TT_ISTRUCT */
-#include <mruby/istruct.h>
+static struct mrb_rational*
+rational_ptr(mrb_state *mrb, mrb_value v)
+{
+  struct RRational *r = (struct RRational*)mrb_obj_ptr(v);
 
-#define rational_ptr(mrb, v) (struct mrb_rational*)mrb_istruct_ptr(v)
+  if (!r->p) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "uninitialized rational");
+  }
+  return r->p;
+}
+#else
+#define RATIONAL_INLINE
+struct RRational {
+  MRB_OBJECT_HEADER;
+  struct mrb_rational r;
+};
+#define rational_ptr(mrb, v) (&((struct RRational*)mrb_obj_ptr(v))->r)
+#endif
 
 static struct RBasic*
 rational_alloc(mrb_state *mrb, struct RClass *c, struct mrb_rational **p)
 {
-  struct RIStruct *s;
-
-  s = (struct RIStruct*)mrb_obj_alloc(mrb, MRB_TT_ISTRUCT, c);
-  *p = (struct mrb_rational*)s->inline_data;
-
+  struct RRational *s;
+  s = MRB_OBJ_ALLOC(mrb, MRB_TT_RATIONAL, c);
+#ifdef RATIONAL_INLINE
+  *p = &s->r;
+#else
+  *p = s->p = (struct mrb_rational*)mrb_malloc(mrb, sizeof(struct mrb_rational));
+#endif
   return (struct RBasic*)s;
 }
 
-#else
-/* use TT_DATA */
-#include <mruby/data.h>
-
-static const struct mrb_data_type mrb_rational_type = {"Rational", mrb_free};
+static mrb_value
+rational_numerator(mrb_state *mrb, mrb_value self)
+{
+  struct mrb_rational *p = rational_ptr(mrb, self);
+  return mrb_int_value(mrb, p->numerator);
+}
 
-static struct RBasic*
-rational_alloc(mrb_state *mrb, struct RClass *c, struct mrb_rational **p)
+static mrb_value
+rational_denominator(mrb_state *mrb, mrb_value self)
 {
-  struct RData *d;
+  struct mrb_rational *p = rational_ptr(mrb, self);
+  return mrb_int_value(mrb, p->denominator);
+}
 
-  Data_Make_Struct(mrb, c, struct mrb_rational, &mrb_rational_type, *p, d);
+static void
+rat_overflow(mrb_state *mrb)
+{
+  mrb_raise(mrb, E_RANGE_ERROR, "integer overflow in rational");
+}
 
-  return (struct RBasic*)d;
+static void
+rat_zerodiv(mrb_state *mrb)
+{
+  mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0 in rational");
 }
 
-static struct mrb_rational*
-rational_ptr(mrb_state *mrb, mrb_value v)
+mrb_value
+mrb_rational_new(mrb_state *mrb, mrb_int numerator, mrb_int denominator)
 {
+  struct RClass *c = mrb_class_get_id(mrb, MRB_SYM(Rational));
   struct mrb_rational *p;
+  struct RBasic *rat;
 
-  p = DATA_GET_PTR(mrb, v, &mrb_rational_type, struct mrb_rational);
-  if (!p) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "uninitialized rational");
+  if (denominator == 0) {
+    rat_zerodiv(mrb);
+  }
+  if (denominator < 0) {
+    if (numerator == MRB_INT_MIN || denominator == MRB_INT_MIN) {
+      rat_overflow(mrb);
+    }
+    numerator *= -1;
+    denominator *= -1;
   }
-  return p;
+  rat = rational_alloc(mrb, c, &p);
+  p->numerator = numerator;
+  p->denominator = denominator;
+  MRB_SET_FROZEN_FLAG(rat);
+  return mrb_obj_value(rat);
 }
-#endif
 
-static mrb_value
-rational_numerator(mrb_state *mrb, mrb_value self)
+#define rational_new(mrb,n,d) mrb_rational_new(mrb, n, d)
+
+inline static mrb_int
+i_gcd(mrb_int x, mrb_int y)
 {
-  struct mrb_rational *p = rational_ptr(mrb, self);
-  return mrb_fixnum_value(p->numerator);
+  mrb_uint u, v, t;
+  int shift;
+
+  if (x < 0)
+    x = -x;
+  if (y < 0)
+    y = -y;
+
+  if (x == 0)
+    return y;
+  if (y == 0)
+    return x;
+
+  u = (mrb_uint)x;
+  v = (mrb_uint)y;
+  for (shift = 0; ((u | v) & 1) == 0; ++shift) {
+    u >>= 1;
+    v >>= 1;
+  }
+
+  while ((u & 1) == 0)
+    u >>= 1;
+
+  do {
+    while ((v & 1) == 0)
+      v >>= 1;
+
+    if (u > v) {
+      t = v;
+      v = u;
+      u = t;
+    }
+    v = v - u;
+  } while (v != 0);
+
+  return (mrb_int)(u << shift);
 }
 
 static mrb_value
-rational_denominator(mrb_state *mrb, mrb_value self)
+rational_new_i(mrb_state *mrb, mrb_int n, mrb_int d)
 {
-  struct mrb_rational *p = rational_ptr(mrb, self);
-  return mrb_fixnum_value(p->denominator);
+  mrb_int a;
+
+  if (d == 0) {
+    rat_zerodiv(mrb);
+  }
+  if (n == MRB_INT_MIN || d == MRB_INT_MIN) {
+    rat_overflow(mrb);
+  }
+  a = i_gcd(n, d);
+  return rational_new(mrb, n/a, d/a);
 }
 
+#ifndef MRB_NO_FLOAT
+
+#if defined(MRB_INT32) || defined(MRB_USE_FLOAT32)
+#define frexp_rat(x,exp) frexpf((float)x, exp)
+#define ldexp_rat(x,exp) ldexpf((float)x, exp)
+#define RAT_MANT_DIG FLT_MANT_DIG
+#define RAT_INT_LIMIT 30
+#define RAT_HUGE_VAL HUGE_VALF
+#else
+#define frexp_rat frexp
+#define ldexp_rat ldexp
+#define RAT_MANT_DIG DBL_MANT_DIG
+#define RAT_INT_LIMIT 62
+#define RAT_HUGE_VAL HUGE_VAL
+#endif
+
+static void
+float_decode_internal(mrb_state *mrb, mrb_float f, mrb_float *rf, int *n)
+{
+  f = (mrb_float)frexp_rat(f, n);
+  if (isinf(f)) rat_overflow(mrb);
+  f = (mrb_float)ldexp_rat(f, RAT_MANT_DIG);
+  *n -= RAT_MANT_DIG;
+  *rf = f;
+}
+
+void mrb_check_num_exact(mrb_state *mrb, mrb_float num);
+
 static mrb_value
-rational_new(mrb_state *mrb, mrb_int numerator, mrb_int denominator)
+rational_new_f(mrb_state *mrb, mrb_float f0)
 {
-  struct RClass *c = mrb_class_get(mrb, "Rational");
-  struct mrb_rational *p;
-  struct RBasic *rat = rational_alloc(mrb, c, &p);
-  p->numerator = numerator;
-  p->denominator = denominator;
-  MRB_SET_FROZEN_FLAG(rat);
-  return mrb_obj_value(rat);
+  mrb_float f;
+  int n;
+
+  mrb_check_num_exact(mrb, f0);
+  float_decode_internal(mrb, f0, &f, &n);
+#if FLT_RADIX == 2
+  if (n == 0)
+    return rational_new(mrb, (mrb_int)f, 1);
+  if (n > 0) {
+    f = ldexp_rat(f, n);
+    if (f == RAT_HUGE_VAL || f > (mrb_float)MRB_INT_MAX) {
+      rat_overflow(mrb);
+    }
+    return rational_new(mrb, (mrb_uint)f, 1);
+  }
+  if (n < -RAT_INT_LIMIT) {
+    f = ldexp_rat(f, n+RAT_INT_LIMIT);
+    n = RAT_INT_LIMIT;
+  }
+  else {
+    n = -n;
+  }
+  return rational_new_i(mrb, (mrb_int)f, ((mrb_int)1)<<n);
+#else
+  mrb_int pow = 1;
+  if (n < 0) {
+    n = -n;
+    while (n > RAT_INT_LIMIT) {
+      f /= 2;
+      n--;
+    }
+    while (n--) {
+      pow *= FLT_RADIX;
+    }
+    return rational_new_i(mrb, f, pow);
+  }
+  else {
+    while (n--) {
+      if (MRB_INT_MAX/FLT_RADIX < pow) {
+        rat_overflow(mrb);
+      }
+      pow *= FLT_RADIX;
+    }
+    return rational_new(mrb, (mrb_int)f*pow, 1);
+  }
+#endif
 }
+#endif
 
 static mrb_value
 rational_s_new(mrb_state *mrb, mrb_value self)
 {
   mrb_int numerator, denominator;
 
-#ifdef MRB_WITHOUT_FLOAT
+#ifdef MRB_NO_FLOAT
   mrb_get_args(mrb, "ii", &numerator, &denominator);
 #else
 
-#define DROP_PRECISION(f, num, denom) \
-  do { \
-      while (f < (mrb_float)MRB_INT_MIN || f > (mrb_float)MRB_INT_MAX) { \
-        num /= 2; \
-        denom /= 2; \
-      } \
-  } while (0)
-
-  mrb_value numv, denomv;
+ mrb_value numv, denomv;
 
   mrb_get_args(mrb, "oo", &numv, &denomv);
-  if (mrb_fixnum_p(numv)) {
-    numerator = mrb_fixnum(numv);
+  if (mrb_integer_p(numv)) {
+    numerator = mrb_integer(numv);
 
-    if (mrb_fixnum_p(denomv)) {
-      denominator = mrb_fixnum(denomv);
+    if (mrb_integer_p(denomv)) {
+      denominator = mrb_integer(denomv);
     }
     else {
-      mrb_float denomf = mrb_to_flo(mrb, denomv);
+      mrb_float numf = (mrb_float)numerator;
+      mrb_float denomf = mrb_as_float(mrb, denomv);
 
-      DROP_PRECISION(denomf, numerator, denomf);
-      denominator = (mrb_int)denomf;
+      return rational_new_f(mrb, numf/denomf);
     }
   }
   else {
-    mrb_float numf = mrb_to_flo(mrb, numv);
+    mrb_float numf = mrb_as_float(mrb, numv);
+    mrb_float denomf;
 
-    if (mrb_fixnum_p(denomv)) {
-      denominator = mrb_fixnum(denomv);
+    if (mrb_integer_p(denomv)) {
+      denomf = (mrb_float)mrb_integer(denomv);
     }
     else {
-      mrb_float denomf = mrb_to_flo(mrb, denomv);
-
-      DROP_PRECISION(denomf, numf, denomf);
-      denominator = (mrb_int)denomf;
+      denomf = mrb_as_float(mrb, denomv);
     }
-
-    DROP_PRECISION(numf, numf, denominator);
-    numerator = (mrb_int)numf;
+    return rational_new_f(mrb, numf/denomf);
   }
 #endif
-
   return rational_new(mrb, numerator, denominator);
 }
 
-#ifndef MRB_WITHOUT_FLOAT
-static mrb_value
-rational_to_f(mrb_state *mrb, mrb_value self)
+#ifndef MRB_NO_FLOAT
+static mrb_float
+rat_float(struct mrb_rational *p)
 {
-  struct mrb_rational *p = rational_ptr(mrb, self);
-  mrb_float f = (mrb_float)p->numerator / (mrb_float)p->denominator;
+  mrb_float f;
 
-  return mrb_float_value(mrb, f);
+  if (p->denominator == 0.0) {
+    f = INFINITY;
+  }
+  else {
+    f = (mrb_float)p->numerator / (mrb_float)p->denominator;
+  }
+
+  return f;
+}
+
+mrb_value
+mrb_rational_to_f(mrb_state *mrb, mrb_value self)
+{
+  struct mrb_rational *p = rational_ptr(mrb, self);
+  return mrb_float_value(mrb, rat_float(p));
 }
 #endif
 
-static mrb_value
-rational_to_i(mrb_state *mrb, mrb_value self)
+mrb_value
+mrb_rational_to_i(mrb_state *mrb, mrb_value self)
 {
   struct mrb_rational *p = rational_ptr(mrb, self);
   if (p->denominator == 0) {
-    mrb_raise(mrb, mrb->eStandardError_class, "divided by 0");
+    rat_zerodiv(mrb);
   }
-  return mrb_fixnum_value(p->numerator / p->denominator);
+  return mrb_int_value(mrb, p->numerator / p->denominator);
 }
 
 static mrb_value
@@ -176,31 +328,409 @@
 static mrb_value
 fix_to_r(mrb_state *mrb, mrb_value self)
 {
-  return rational_new(mrb, mrb_fixnum(self), 1);
+  return rational_new(mrb, mrb_integer(self), 1);
 }
 
-void mrb_mruby_rational_gem_init(mrb_state *mrb)
+static mrb_value
+rational_m(mrb_state *mrb, mrb_value self)
 {
-  struct RClass *rat;
+#ifdef MRB_NO_FLOAT
+  mrb_int n, d = 1;
+  mrb_get_args(mrb, "i|i", &n, &d);
+  return rational_new_i(mrb, n, d);
+#else
+  mrb_value a, b = mrb_fixnum_value(1);
+  mrb_get_args(mrb, "o|o", &a, &b);
+  if (mrb_integer_p(a) && mrb_integer_p(b)) {
+    return rational_new_i(mrb, mrb_integer(a), mrb_integer(b));
+  }
+  else {
+    mrb_float x = mrb_as_float(mrb, a);
+    mrb_float y = mrb_as_float(mrb, b);
+    return rational_new_f(mrb, x/y);
+  }
+#endif
+}
+
+static mrb_value
+rational_eq(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  struct mrb_rational *p1 = rational_ptr(mrb, x);
+  mrb_bool result;
+
+  switch (mrb_type(y)) {
+  case MRB_TT_INTEGER:
+    if (p1->denominator != 1) return mrb_false_value();
+    result = p1->numerator == mrb_integer(y);
+    break;
+#ifndef MRB_NO_FLOAT
+  case MRB_TT_FLOAT:
+    result = ((double)p1->numerator/p1->denominator) == mrb_float(y);
+    break;
+#endif
+  case MRB_TT_RATIONAL:
+    {
+      struct mrb_rational *p2 = rational_ptr(mrb, y);
+      mrb_int a, b;
+
+      if (p1->numerator == p2->numerator && p1->denominator == p2->denominator) {
+        return mrb_true_value();
+      }
+      if (mrb_int_mul_overflow(p1->numerator, p2->denominator, &a) ||
+          mrb_int_mul_overflow(p2->numerator, p1->denominator, &b)) {
+#ifdef MRB_NO_FLOAT
+        rat_overflow(mrb);
+#else
+        result = (double)p1->numerator*p2->denominator == (double)p2->numerator*p2->denominator;
+        break;
+#endif
+      }
+      result = a == b;
+      break;
+    }
+
+#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;
+    }
+#endif
+  default:
+    result = mrb_equal(mrb, y, x);
+    break;
+  }
+  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)
+{
+  struct mrb_rational *p1 = rational_ptr(mrb, x);
+  mrb_value y = mrb_get_arg1(mrb);
+
+  switch(mrb_type(y)) {
+  case MRB_TT_RATIONAL:
+    {
+      struct mrb_rational *p2 = rational_ptr(mrb, y);
+      mrb_int a, b;
+
+      if (mrb_int_mul_overflow(p1->numerator, p2->denominator, &a) ||
+          mrb_int_mul_overflow(p1->denominator, p2->numerator, &b)) {
+        return mrb_nil_value();
+      }
+      if (a > b)
+        return mrb_fixnum_value(1);
+      else if (a < b)
+        return mrb_fixnum_value(-1);
+      return mrb_fixnum_value(0);
+    }
+  case MRB_TT_INTEGER:
+#ifndef MRB_NO_FLOAT
+  case MRB_TT_FLOAT:
+    {
+      mrb_float a = rat_float(p1), b = mrb_as_float(mrb, y);
+      if (a > b)
+        return mrb_fixnum_value(1);
+      else if (a < b)
+        return mrb_fixnum_value(-1);
+      return mrb_fixnum_value(0);
+    }
+#else
+    {
+      mrb_int a = p1->numerator, b;
+      if (mrb_int_mul_overflow(p1->denominator, mrb_integer(y), &b)) {
+        return mrb_nil_value();
+      }
+      if (a > b)
+        return mrb_fixnum_value(1);
+      else if (a < b)
+        return mrb_fixnum_value(-1);
+      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)) {
+      mrb_int z = mrb_integer(x);
+      return mrb_fixnum_value(-z);
+    }
+    return mrb_nil_value();
+ }
+}
+
+static mrb_value
+rational_minus(mrb_state *mrb, mrb_value x)
+{
+  struct mrb_rational *p = rational_ptr(mrb, x);
+  mrb_int n = p->numerator;
+  if (n == MRB_INT_MIN) rat_overflow(mrb);
+  return rational_new(mrb, -n, p->denominator);
+}
+
+static mrb_value
+rational_add(mrb_state *mrb, mrb_value x)
+{
+  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 (mrb_int_mul_overflow(z, p1->denominator, &z)) rat_overflow(mrb);
+      if (mrb_int_add_overflow(p1->numerator, z, &z)) rat_overflow(mrb);
+      return rational_new_i(mrb, z, p1->denominator);
+    }
+  case MRB_TT_RATIONAL:
+    {
+      struct mrb_rational *p2 = rational_ptr(mrb, y);
+      mrb_int a, b;
+
+      if (mrb_int_mul_overflow(p1->numerator, p2->denominator, &a)) rat_overflow(mrb);
+      if (mrb_int_mul_overflow(p2->numerator, p1->denominator, &b)) rat_overflow(mrb);
+      if (mrb_int_add_overflow(a, b, &a)) rat_overflow(mrb);
+      if (mrb_int_mul_overflow(p1->denominator, p2->denominator, &b)) rat_overflow(mrb);
+      return rational_new_i(mrb, a, b);
+    }
+
+#ifndef MRB_NO_FLOAT
+  case MRB_TT_FLOAT:
+    {
+      mrb_float z = p1->numerator + mrb_float(y) * p1->denominator;
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
+    }
+#endif
 
-  rat = mrb_define_class(mrb, "Rational", mrb_class_get(mrb, "Numeric"));
-#ifdef RATIONAL_USE_ISTRUCT
-  MRB_SET_INSTANCE_TT(rat, MRB_TT_ISTRUCT);
-  mrb_assert(sizeof(struct mrb_rational) < ISTRUCT_DATA_SIZE);
+  default:
+    return mrb_funcall_id(mrb, y, MRB_OPSYM(add), 1, x);
+  }
+}
+
+static mrb_value
+rational_sub(mrb_state *mrb, mrb_value x)
+{
+  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 (mrb_int_mul_overflow(z, p1->denominator, &z)) rat_overflow(mrb);
+      if (mrb_int_sub_overflow(p1->numerator, z, &z)) rat_overflow(mrb);
+      return rational_new_i(mrb, z, p1->denominator);
+    }
+  case MRB_TT_RATIONAL:
+    {
+      struct mrb_rational *p2 = rational_ptr(mrb, y);
+      mrb_int a, b;
+
+      if (mrb_int_mul_overflow(p1->numerator, p2->denominator, &a)) rat_overflow(mrb);
+      if (mrb_int_mul_overflow(p2->numerator, p1->denominator, &b)) rat_overflow(mrb);
+      if (mrb_int_sub_overflow(a, b, &a)) rat_overflow(mrb);
+      if (mrb_int_mul_overflow(p1->denominator, p2->denominator, &b)) rat_overflow(mrb);
+      return rational_new_i(mrb, a, b);
+    }
+
+#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);
+#endif
+
+#ifndef MRB_NO_FLOAT
+  case MRB_TT_FLOAT:
+  default:
+    {
+      mrb_float z = p1->numerator - mrb_as_float(mrb, y) * p1->denominator;
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
+    }
 #else
-  MRB_SET_INSTANCE_TT(rat, MRB_TT_DATA);
+  default:
+    mrb_raise(mrb, E_TYPE_ERROR, "non integer subtraction");
 #endif
+  }
+}
+
+static mrb_value
+rational_mul(mrb_state *mrb, mrb_value x)
+{
+  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 (mrb_int_mul_overflow(p1->numerator, z, &z)) rat_overflow(mrb);
+      return rational_new_i(mrb, z, p1->denominator);
+    }
+  case MRB_TT_RATIONAL:
+    {
+      struct mrb_rational *p2 = rational_ptr(mrb, y);
+      mrb_int a, b;
+
+      if (mrb_int_mul_overflow(p1->numerator, p2->numerator, &a)) rat_overflow(mrb);
+      if (mrb_int_mul_overflow(p1->denominator, p2->denominator, &b)) rat_overflow(mrb);
+      return rational_new_i(mrb, a, b);
+    }
+
+#ifndef MRB_NO_FLOAT
+  case MRB_TT_FLOAT:
+    {
+      mrb_float z = p1->numerator * mrb_float(y);
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
+  }
+#endif
+
+  default:
+    return mrb_funcall_id(mrb, y, MRB_OPSYM(mul), 1, x);
+  }
+}
+
+mrb_value
+mrb_rational_div(mrb_state *mrb, mrb_value x)
+{
+  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 (mrb_int_mul_overflow(p1->denominator, z, &z)) rat_overflow(mrb);
+      return rational_new_i(mrb, p1->numerator, z);
+    }
+  case MRB_TT_RATIONAL:
+    {
+      struct mrb_rational *p2 = rational_ptr(mrb, y);
+      mrb_int a, b;
+
+      if (mrb_int_mul_overflow(p1->numerator, p2->denominator, &a)) rat_overflow(mrb);
+      if (mrb_int_mul_overflow(p2->numerator, p1->denominator, &b)) rat_overflow(mrb);
+      return rational_new_i(mrb, a, b);
+    }
+
+#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);
+#endif
+
+  default:
+#ifndef MRB_NO_FLOAT
+  case MRB_TT_FLOAT:
+    {
+      mrb_float z = mrb_div_float((mrb_float)p1->numerator, mrb_as_float(mrb, y));
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
+    }
+#else
+    mrb_raise(mrb, E_TYPE_ERROR, "non integer division");
+#endif
+  }
+}
+
+#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)
+{
+  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
+  }
+}
+
+/* 15.2.9.3.19(x) */
+/*
+ * redefine Integer#quo
+ */
+
+static mrb_value
+rational_int_quo(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  mrb_int a = mrb_integer(x);
+
+  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);
+  default:
+#ifdef MRB_NO_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
+  }
+}
+#endif  /* !MRB_USE_COMPLEX */
+
+void mrb_mruby_rational_gem_init(mrb_state *mrb)
+{
+  struct RClass *rat;
+
+  rat = mrb_define_class_id(mrb, MRB_SYM(Rational), mrb_class_get_id(mrb, MRB_SYM(Numeric)));
+  MRB_SET_INSTANCE_TT(rat, MRB_TT_RATIONAL);
   mrb_undef_class_method(mrb, rat, "new");
   mrb_define_class_method(mrb, rat, "_new", rational_s_new, MRB_ARGS_REQ(2));
   mrb_define_method(mrb, rat, "numerator", rational_numerator, MRB_ARGS_NONE());
   mrb_define_method(mrb, rat, "denominator", rational_denominator, MRB_ARGS_NONE());
-#ifndef MRB_WITHOUT_FLOAT
-  mrb_define_method(mrb, rat, "to_f", rational_to_f, MRB_ARGS_NONE());
+#ifndef MRB_NO_FLOAT
+  mrb_define_method(mrb, rat, "to_f", mrb_rational_to_f, MRB_ARGS_NONE());
 #endif
-  mrb_define_method(mrb, rat, "to_i", rational_to_i, MRB_ARGS_NONE());
+  mrb_define_method(mrb, rat, "to_i", mrb_rational_to_i, MRB_ARGS_NONE());
   mrb_define_method(mrb, rat, "to_r", rational_to_r, MRB_ARGS_NONE());
   mrb_define_method(mrb, rat, "negative?", rational_negative_p, MRB_ARGS_NONE());
-  mrb_define_method(mrb, mrb->fixnum_class, "to_r", fix_to_r, MRB_ARGS_NONE());
+  mrb_define_method(mrb, rat, "==", rational_eq, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, rat, "<=>", rational_cmp, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, rat, "-@", rational_minus, MRB_ARGS_NONE());
+  mrb_define_method(mrb, rat, "+", rational_add, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, rat, "-", rational_sub, MRB_ARGS_REQ(1));
+  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 */
+#endif
+  mrb_define_method(mrb, mrb->kernel_module, "Rational", rational_m, MRB_ARGS_ARG(1,1));
 }
 
 void

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

@@ -24,6 +24,7 @@
 
 def assert_rational(exp, real)
   assert "assert_rational" do
+    assert_kind_of Rational, real
     assert_float exp.numerator,   real.numerator
     assert_float exp.denominator, real.denominator
   end
@@ -49,6 +50,16 @@
   end
 end
 
+def assert_complex(real, imag)
+  if Object.const_defined?(:Complex)
+    assert "assert_complex" do
+      c = yield
+      assert_float(real, c.real)
+      assert_float(imag, c.imaginary)
+    end
+  end
+end
+
 assert 'Rational' do
   r = 5r
   assert_equal(Rational, r.class)
@@ -89,6 +100,9 @@
   assert_rational(Rational(1, 1),    Rational(-2, 9) * Rational(-9, 2))
   assert_rational(Rational(9, 2),    Rational(9, 8)  * 4)
   assert_float(   21.77777777777778, Rational(20, 9) * 9.8)
+  assert_float(   21.77777777777778, 9.8 * Rational(20, 9))
+  assert_complex(5.2, 2.6) {Rational(13,5)*(2.0+1i)}
+  assert_complex(5.2, 2.6) {(2.0+1i)*Rational(13,5)}
 end
 
 assert 'Rational#+' do
@@ -96,15 +110,22 @@
   assert_rational(Rational(901, 1),   Rational(900)   + Rational(1))
   assert_rational(Rational(-85, 18),  Rational(-2, 9) + Rational(-9, 2))
   assert_rational(Rational(41, 8),    Rational(9, 8)  + 4)
+  assert_rational(Rational(41, 8),    4 + Rational(9, 8))
   assert_float(   12.022222222222222, Rational(20, 9) + 9.8)
+  assert_float(   12.022222222222222, 9.8 + Rational(20, 9))
+  assert_complex(24.0, 0) {Rational(24,2)+(12.0+0i)}
+  assert_complex(24.0, 0) {(12.0+0i)+Rational(24,2)}
 end
 
 assert 'Rational#-' do
   assert_rational(Rational(0, 1),     Rational(2, 3)  - Rational(2, 3))
   assert_rational(Rational(899, 1),   Rational(900)   - Rational(1))
   assert_rational(Rational(77, 18),   Rational(-2, 9) - Rational(-9, 2))
-  assert_rational(Rational(-23, 8),   Rational(9, 8)  - 4)
+  assert_rational(Rational(23, 8),    4 - Rational(9, 8))
   assert_float(   -7.577777777777778, Rational(20, 9) - 9.8)
+  assert_float(    7.577777777777778, 9.8 - Rational(20, 9))
+  assert_complex(2.0, 0) {Rational(24,2)-(10.0+0i)}
+  assert_complex(2.0, 0) {(14.0+0i)-Rational(24,2)}
 end
 
 assert 'Rational#/' do
@@ -112,7 +133,11 @@
   assert_rational(Rational(900, 1),    Rational(900)   / Rational(1))
   assert_rational(Rational(4, 81),     Rational(-2, 9) / Rational(-9, 2))
   assert_rational(Rational(9, 32),     Rational(9, 8)  / 4)
+  assert_rational(Rational(32, 9),     4 / Rational(9, 8))
   assert_float(   0.22675736961451246, Rational(20, 9) / 9.8)
+  assert_float(   4.41,                9.8 / Rational(20, 9))
+  assert_complex(1.92, 1.44) {Rational(24,2)/(4.0-3i)}
+  assert_complex(0.25, 0.25) {(3.0+3i)/Rational(24,2)}
 end
 
 assert 'Rational#==, Rational#!=' do
@@ -143,7 +168,7 @@
   assert_equal_rational(false, 1r, ComplexLikeNumeric.new(2))
 end
 
-assert 'Fixnum#==(Rational), Fixnum#!=(Rational)' do
+assert 'Integer#==(Rational), Integer#!=(Rational)' do
   assert_equal_rational(true, 2, Rational(4,2))
   assert_equal_rational(true, -2, Rational(-4,2))
   assert_equal_rational(true, -2, Rational(4,-2))
@@ -186,7 +211,7 @@
   assert_raise(NoMethodError) { 1r <=> ComplexLikeNumeric.new(2) }
 end
 
-assert 'Fixnum#<=>(Rational)' do
+assert 'Integer#<=>(Rational)' do
   assert_cmp(-1, -2, Rational(-9,5))
   assert_cmp(0, 5, 5r)
   assert_cmp(1, 3, Rational(8,3))
@@ -210,7 +235,7 @@
   assert_raise(ArgumentError) { 1r < "2" }
 end
 
-assert 'Fixnum#<(Rational)' do
+assert 'Integer#<(Rational)' do
   assert_not_operator(1, :<, Rational(2,3))
   assert_not_operator(2, :<, 2r)
   assert_operator(-3, :<, Rational(2,3))
@@ -234,7 +259,7 @@
   assert_raise(ArgumentError) { 1r <= "2" }
 end
 
-assert 'Fixnum#<=(Rational)' do
+assert 'Integer#<=(Rational)' do
   assert_not_operator(1, :<=, Rational(2,3))
   assert_operator(2, :<=, 2r)
   assert_operator(-3, :<=, Rational(2,3))
@@ -258,7 +283,7 @@
   assert_raise(ArgumentError) { 1r > "2" }
 end
 
-assert 'Fixnum#>(Rational)' do
+assert 'Integer#>(Rational)' do
   assert_operator(1, :>, Rational(2,3))
   assert_not_operator(2, :>, 2r)
   assert_not_operator(-3, :>, Rational(2,3))
@@ -282,7 +307,7 @@
   assert_raise(ArgumentError) { 1r >= "2" }
 end
 
-assert 'Fixnum#>=(Rational)' do
+assert 'Integer#>=(Rational)' do
   assert_operator(1, :>=, Rational(2,3))
   assert_operator(2, :>=, 2r)
   assert_not_operator(-3, :>=, Rational(2,3))

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

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-sleep/example/sleep.rb -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-sleep/example/sleep.rb Changed

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

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

@@ -0,0 +1,136 @@
+/*
+** mrb_sleep - sleep methods for mruby
+**
+** Copyright (c) mod_mruby developers 2012-
+** Copyright (c) mruby developers 2018
+**
+** 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: https://www.opensource.org/licenses/mit-license.php 
+*/
+
+#include <time.h>
+#ifdef _WIN32
+    #include <windows.h>
+    #define sleep(x) Sleep(x * 1000)
+    #define usleep(x) Sleep((DWORD)(((x)<1000) ? 1 : ((x)/1000)))
+#else
+    #include <unistd.h>
+    #include <sys/time.h>
+#endif
+
+#include "mruby.h"
+
+/* not implemented forever sleep (called without an argument)*/
+static mrb_value
+mrb_f_sleep(mrb_state *mrb, mrb_value self)
+{
+    time_t beg = time(0);
+    time_t end;
+#ifndef MRB_NO_FLOAT
+    mrb_float sec;
+
+    mrb_get_args(mrb, "f", &sec);
+    if (sec >= 0) {
+        usleep(sec * 1000000);
+    }
+    else {
+        mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative");
+    }
+#else
+    mrb_int sec;
+
+    mrb_get_args(mrb, "i", &sec);
+    if (sec >= 0) {
+        sleep(sec);
+    } else {
+        mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative");
+    }
+#endif
+    end = time(0) - beg;
+
+    return mrb_fixnum_value((mrb_int)end);
+}
+
+/* mruby special; needed for mruby without float numbers */
+static mrb_value
+mrb_f_usleep(mrb_state *mrb, mrb_value self)
+{
+    mrb_int usec;
+#ifdef _WIN32
+    FILETIME st_ft,ed_ft;
+    unsigned __int64 st_time = 0;
+    unsigned __int64 ed_time = 0;
+#else
+    struct timeval st_tm,ed_tm;
+#endif
+    time_t slp_tm;
+
+#ifdef _WIN32
+    GetSystemTimeAsFileTime(&st_ft);
+#else
+    gettimeofday(&st_tm, NULL);
+#endif
+
+    /* not implemented forever sleep (called without an argument)*/
+    mrb_get_args(mrb, "i", &usec);
+
+    if (usec >= 0) {
+        usleep(usec);
+    } else {
+        mrb_raise(mrb, E_ARGUMENT_ERROR, "time interval must not be negative integer");
+    }
+
+#ifdef _WIN32
+    GetSystemTimeAsFileTime(&ed_ft);
+
+    st_time |= st_ft.dwHighDateTime;
+    st_time <<=32;
+    st_time |= st_ft.dwLowDateTime;
+    ed_time |= ed_ft.dwHighDateTime;
+    ed_time <<=32;
+    ed_time |= ed_ft.dwLowDateTime;
+
+    slp_tm = (ed_time - st_time) / 10;
+#else
+    gettimeofday(&ed_tm, NULL);
+
+    if (st_tm.tv_usec > ed_tm.tv_usec) {
+        slp_tm = 1000000 + ed_tm.tv_usec - st_tm.tv_usec;
+    }
+    else {
+        slp_tm = ed_tm.tv_usec - st_tm.tv_usec;
+    }
+#endif
+
+    return mrb_fixnum_value((mrb_int)slp_tm);
+}
+
+void
+mrb_mruby_sleep_gem_init(mrb_state *mrb)
+{
+    mrb_define_method(mrb, mrb->kernel_module, "sleep",   mrb_f_sleep,   MRB_ARGS_REQ(1));
+    mrb_define_method(mrb, mrb->kernel_module, "usleep",  mrb_f_usleep,  MRB_ARGS_REQ(1));
+}
+
+void
+mrb_mruby_sleep_gem_final(mrb_state *mrb)
+{
+}

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

@@ -1,11 +1,10 @@
-mruby-socket
-============
+# mruby-socket
 
 "mruby-socket" mrbgem provides BSD socket interface for mruby.
 API is compatible with CRuby's "socket" library.
 
-
 ## Example
+
 ```sh
 % vi kame.rb
 s = TCPSocket.open("www.kame.net", 80)
@@ -20,17 +19,18 @@
 ```
 
 ## Requirement
-- mruby-io(https://github.com/mruby/mruby/tree/master/mrbgems/mruby-io) mrbgem
-- iij/mruby-mtest(https://github.com/iij/mruby-mtest) mrgbem to run tests
-- system must have RFC3493 basic socket interface
-- and some POSIX API...
+
+* mruby-io(https://github.com/mruby/mruby/tree/master/mrbgems/mruby-io) mrbgem
+* iij/mruby-mtest(https://github.com/iij/mruby-mtest) mrgbem to run tests
+* system must have RFC3493 basic socket interface
+* and some POSIX API...
 
 ## TODO
-- add missing methods
-- write more tests
-- fix possible descriptor leakage (see XXX comments)
-- `UNIXSocket#recv_io` `UNIXSocket#send_io`
 
+* add missing methods
+* write more tests
+* fix possible descriptor leakage (see XXX comments)
+* `UNIXSocket#recv_io` `UNIXSocket#send_io`
 
 ## License

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

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

@@ -13,9 +13,6 @@
   #include <winerror.h>
 
   #define SHUT_RDWR SD_BOTH
-  #ifndef _SSIZE_T_DEFINED
-  typedef int ssize_t;
-  #endif
   typedef int fsize_t;
 #else
   #include <sys/types.h>
@@ -31,7 +28,6 @@
   typedef size_t fsize_t;
 #endif
 
-#include <stddef.h>
 #include <string.h>
 
 #include "mruby.h"
@@ -42,6 +38,7 @@
 #include "mruby/string.h"
 #include "mruby/variable.h"
 #include "mruby/error.h"
+#include "mruby/presym.h"
 
 #include "mruby/ext/io.h"
 
@@ -53,7 +50,7 @@
 #endif
 #endif
 
-#define E_SOCKET_ERROR             (mrb_class_get(mrb, "SocketError"))
+#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))
@@ -64,52 +61,52 @@
 #ifdef _WIN32
 static const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
 {
-    if (af == AF_INET)
-    {
-	struct sockaddr_in in;
-	memset(&in, 0, sizeof(in));
-	in.sin_family = AF_INET;
-	memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-	getnameinfo((struct sockaddr *)&in, sizeof(struct
-		    sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
-	return dst;
-    }
-    else if (af == AF_INET6)
-    {
-	struct sockaddr_in6 in;
-	memset(&in, 0, sizeof(in));
-	in.sin6_family = AF_INET6;
-	memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
-	getnameinfo((struct sockaddr *)&in, sizeof(struct
-		    sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
-	return dst;
-    }
-    return NULL;
+  if (af == AF_INET)
+  {
+    struct sockaddr_in in = {0};
+
+    in.sin_family = AF_INET;
+    memcpy(&in.sin_addr, src, sizeof(struct in_addr));
+    getnameinfo((struct sockaddr *)&in, sizeof(struct
+                sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
+    return dst;
+  }
+  else if (af == AF_INET6)
+  {
+    struct sockaddr_in6 in = {0};
+
+    in.sin6_family = AF_INET6;
+    memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
+    getnameinfo((struct sockaddr *)&in, sizeof(struct
+                sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
+    return dst;
+  }
+  return NULL;
 }
 
 static int inet_pton(int af, const char *src, void *dst)
 {
-    struct addrinfo hints, *res, *ressave;
+  struct addrinfo hints = {0};
+  struct addrinfo *res, *ressave;
 
-    memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family = af;
+  hints.ai_family = af;
 
-    if (getaddrinfo(src, NULL, &hints, &res) != 0)
-    {
-	printf("Couldn't resolve host %s\n", src);
-	return -1;
-    }
+  if (getaddrinfo(src, NULL, &hints, &res) != 0)
+  {
+    printf("Couldn't resolve host %s\n", src);
+    return -1;
+  }
 
-    ressave = res;
+  ressave = res;
 
-    while (res)
-    {
-	memcpy(dst, res->ai_addr, res->ai_addrlen);
-	res = res->ai_next;
-    }
+  while (res)
+  {
+    memcpy(dst, res->ai_addr, res->ai_addrlen);
+    res = res->ai_next;
+  }
 
-    freeaddrinfo(ressave);
-    return 0;
+  freeaddrinfo(ressave);
+  return 0;
 }
 
 #endif
@@ -117,7 +114,7 @@
 static mrb_value
 mrb_addrinfo_getaddrinfo(mrb_state *mrb, mrb_value klass)
 {
-  struct addrinfo hints, *res0, *res;
+  struct addrinfo hints = {0}, *res0, *res;
   mrb_value ai, ary, family, lastai, nodename, protocol, sa, service, socktype;
   mrb_int flags;
   int arena_idx, error;
@@ -140,50 +137,49 @@
 
   if (mrb_string_p(service)) {
     servname = RSTRING_CSTR(mrb, service);
-  } else if (mrb_fixnum_p(service)) {
-    servname = RSTRING_PTR(mrb_fixnum_to_str(mrb, service, 10));
+  } else if (mrb_integer_p(service)) {
+    servname = RSTRING_PTR(mrb_integer_to_str(mrb, service, 10));
   } else if (mrb_nil_p(service)) {
     servname = NULL;
   } else {
-    mrb_raise(mrb, E_TYPE_ERROR, "service must be String, Fixnum, or nil");
+    mrb_raise(mrb, E_TYPE_ERROR, "service must be String, Integer, or nil");
   }
 
-  memset(&hints, 0, sizeof(hints));
   hints.ai_flags = (int)flags;
 
-  if (mrb_fixnum_p(family)) {
-    hints.ai_family = (int)mrb_fixnum(family);
+  if (mrb_integer_p(family)) {
+    hints.ai_family = (int)mrb_integer(family);
   }
 
-  if (mrb_fixnum_p(socktype)) {
-    hints.ai_socktype = (int)mrb_fixnum(socktype);
+  if (mrb_integer_p(socktype)) {
+    hints.ai_socktype = (int)mrb_integer(socktype);
   }
 
-  if (mrb_fixnum_p(protocol)) {
-    hints.ai_protocol = (int)mrb_fixnum(protocol);
+  if (mrb_integer_p(protocol)) {
+    hints.ai_protocol = (int)mrb_integer(protocol);
   }
 
-  lastai = mrb_cv_get(mrb, klass, mrb_intern_lit(mrb, "_lastai"));
+  lastai = mrb_cv_get(mrb, klass, MRB_SYM(_lastai));
   if (mrb_cptr_p(lastai)) {
     freeaddrinfo((struct addrinfo*)mrb_cptr(lastai));
-    mrb_cv_set(mrb, klass, mrb_intern_lit(mrb, "_lastai"), mrb_nil_value());
+    mrb_cv_set(mrb, klass, MRB_SYM(_lastai), mrb_nil_value());
   }
 
   error = getaddrinfo(hostname, servname, &hints, &res0);
   if (error) {
     mrb_raisef(mrb, E_SOCKET_ERROR, "getaddrinfo: %s", gai_strerror(error));
   }
-  mrb_cv_set(mrb, klass, mrb_intern_lit(mrb, "_lastai"), mrb_cptr_value(mrb, res0));
+  mrb_cv_set(mrb, klass, MRB_SYM(_lastai), mrb_cptr_value(mrb, res0));
 
   for (res = res0; res != NULL; res = res->ai_next) {
     sa = mrb_str_new(mrb, (char*)res->ai_addr, res->ai_addrlen);
-    ai = mrb_funcall(mrb, klass, "new", 4, sa, mrb_fixnum_value(res->ai_family), mrb_fixnum_value(res->ai_socktype), mrb_fixnum_value(res->ai_protocol));
+    ai = mrb_funcall_id(mrb, klass, MRB_SYM(new), 4, sa, mrb_fixnum_value(res->ai_family), mrb_fixnum_value(res->ai_socktype), mrb_fixnum_value(res->ai_protocol));
     mrb_ary_push(mrb, ary, ai);
     mrb_gc_arena_restore(mrb, arena_idx);
   }
 
   freeaddrinfo(res0);
-  mrb_cv_set(mrb, klass, mrb_intern_lit(mrb, "_lastai"), mrb_nil_value());
+  mrb_cv_set(mrb, klass, MRB_SYM(_lastai), mrb_nil_value());
 
   return ary;
 }
@@ -197,10 +193,10 @@
 
   flags = 0;
   mrb_get_args(mrb, "|i", &flags);
-  host = mrb_str_buf_new(mrb, NI_MAXHOST);
-  serv = mrb_str_buf_new(mrb, NI_MAXSERV);
+  host = mrb_str_new_capa(mrb, NI_MAXHOST);
+  serv = mrb_str_new_capa(mrb, NI_MAXSERV);
 
-  sastr = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "@sockaddr"));
+  sastr = mrb_iv_get(mrb, self, MRB_IVSYM(sockaddr));
   if (!mrb_string_p(sastr)) {
     mrb_raise(mrb, E_SOCKET_ERROR, "invalid sockaddr");
   }
@@ -222,7 +218,7 @@
 {
   mrb_value sastr;
 
-  sastr = mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "@sockaddr"));
+  sastr = mrb_iv_get(mrb, self, MRB_IVSYM(sockaddr));
   if (((struct sockaddr *)RSTRING_PTR(sastr))->sa_family != AF_UNIX)
     mrb_raise(mrb, E_SOCKET_ERROR, "need AF_UNIX address");
   if (RSTRING_LEN(sastr) < (mrb_int)offsetof(struct sockaddr_un, sun_path) + 1) {
@@ -254,7 +250,7 @@
     return mrb_nil_value();
   }
   port = ntohs(port);
-  host = mrb_str_buf_new(mrb, NI_MAXHOST);
+  host = mrb_str_new_capa(mrb, NI_MAXHOST);
   if (getnameinfo(sa, salen, RSTRING_PTR(host), NI_MAXHOST, NULL, 0, NI_NUMERICHOST) == -1)
     mrb_sys_fail(mrb, "getnameinfo");
   mrb_str_resize(mrb, host, strlen(RSTRING_PTR(host)));
@@ -269,7 +265,7 @@
 static int
 socket_fd(mrb_state *mrb, mrb_value sock)
 {
-  return (int)mrb_fixnum(mrb_funcall(mrb, sock, "fileno", 0));
+  return (int)mrb_integer(mrb_funcall_id(mrb, sock, MRB_SYM(fileno), 0));
 }
 
 static int
@@ -347,10 +343,10 @@
   optlen = sizeof(opt);
   if (getsockopt(s, (int)level, (int)optname, opt, &optlen) == -1)
     mrb_sys_fail(mrb, "getsockopt");
-  c = mrb_const_get(mrb, mrb_obj_value(mrb_class_get(mrb, "Socket")), mrb_intern_lit(mrb, "Option"));
+  c = mrb_const_get(mrb, mrb_obj_value(mrb_class_get_id(mrb, MRB_SYM(Socket))), MRB_SYM(Option));
   family = socket_family(s);
   data = mrb_str_new(mrb, opt, optlen);
-  return mrb_funcall(mrb, c, "new", 4, mrb_fixnum_value(family), mrb_fixnum_value(level), mrb_fixnum_value(optname), data);
+  return mrb_funcall_id(mrb, c, MRB_SYM(new), 4, mrb_fixnum_value(family), mrb_fixnum_value(level), mrb_fixnum_value(optname), data);
 }
 
 static mrb_value
@@ -361,7 +357,7 @@
   mrb_value buf;
 
   mrb_get_args(mrb, "i|i", &maxlen, &flags);
-  buf = mrb_str_buf_new(mrb, maxlen);
+  buf = mrb_str_new_capa(mrb, maxlen);
   n = recv(socket_fd(mrb, self), RSTRING_PTR(buf), (fsize_t)maxlen, (int)flags);
   if (n == -1)
     mrb_sys_fail(mrb, "recv");
@@ -378,9 +374,9 @@
   socklen_t socklen;
 
   mrb_get_args(mrb, "i|i", &maxlen, &flags);
-  buf = mrb_str_buf_new(mrb, maxlen);
+  buf = mrb_str_new_capa(mrb, maxlen);
   socklen = sizeof(struct sockaddr_storage);
-  sa = mrb_str_buf_new(mrb, socklen);
+  sa = mrb_str_new_capa(mrb, socklen);
   n = recvfrom(socket_fd(mrb, self), RSTRING_PTR(buf), (fsize_t)maxlen, (int)flags, (struct sockaddr *)RSTRING_PTR(sa), &socklen);
   if (n == -1)
     mrb_sys_fail(mrb, "recvfrom");
@@ -449,21 +445,21 @@
 
   argc = mrb_get_args(mrb, "o|io", &so, &optname, &optval);
   if (argc == 3) {
-    if (!mrb_fixnum_p(so)) {
+    if (!mrb_integer_p(so)) {
       mrb_raise(mrb, E_ARGUMENT_ERROR, "level is not an integer");
     }
-    level = mrb_fixnum(so);
+    level = mrb_integer(so);
     if (mrb_string_p(optval)) {
       /* that's good */
     } else if (mrb_true_p(optval) || mrb_false_p(optval)) {
       mrb_int i = mrb_test(optval) ? 1 : 0;
       optval = mrb_str_new(mrb, (char*)&i, sizeof(i));
-    } else if (mrb_fixnum_p(optval)) {
+    } else if (mrb_integer_p(optval)) {
       if (optname == IP_MULTICAST_TTL || optname == IP_MULTICAST_LOOP) {
-        char uc = (char)mrb_fixnum(optval);
+        char uc = (char)mrb_integer(optval);
         optval = mrb_str_new(mrb, &uc, sizeof(uc));
       } else {
-        mrb_int i = mrb_fixnum(optval);
+        mrb_int i = mrb_integer(optval);
         optval = mrb_str_new(mrb, (char*)&i, sizeof(i));
       }
     } else {
@@ -472,9 +468,9 @@
   } 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_fixnum(mrb_funcall(mrb, so, "level", 0));
-    optname = mrb_fixnum(mrb_funcall(mrb, so, "optname", 0));
-    optval = mrb_funcall(mrb, so, "data", 0);
+    level = mrb_integer(mrb_funcall_id(mrb, so, MRB_SYM(level), 0));
+    optname = mrb_integer(mrb_funcall_id(mrb, so, MRB_SYM(optname), 0));
+    optval = mrb_funcall_id(mrb, so, MRB_SYM(data), 0);
   } else {
     mrb_argnum_error(mrb, argc, 3, 3);
   }
@@ -515,7 +511,8 @@
 mrb_ipsocket_ntop(mrb_state *mrb, mrb_value klass)
 {
   mrb_int af, n;
-  char *addr, buf50;
+  const char *addr;
+  char buf50;
 
   mrb_get_args(mrb, "is", &af, &addr, &n);
   if ((af == AF_INET && n != 4) || (af == AF_INET6 && n != 16))
@@ -529,7 +526,8 @@
 mrb_ipsocket_pton(mrb_state *mrb, mrb_value klass)
 {
   mrb_int af, n;
-  char *bp, buf50;
+  const char *bp;
+  char buf50;
 
   mrb_get_args(mrb, "is", &af, &bp, &n);
   if ((size_t)n > sizeof(buf) - 1)
@@ -568,10 +566,10 @@
   fd = socket_fd(mrb, self);
   flags = 0;
   mrb_get_args(mrb, "i|i", &maxlen, &flags);
-  buf = mrb_str_buf_new(mrb, maxlen);
+  buf = mrb_str_new_capa(mrb, maxlen);
   socklen = sizeof(ss);
   n = recvfrom(fd, RSTRING_PTR(buf), (fsize_t)maxlen, (int)flags,
-  	       (struct sockaddr *)&ss, &socklen);
+               (struct sockaddr *)&ss, &socklen);
   if (n == -1) {
     mrb_sys_fail(mrb, "recvfrom");
   }
@@ -594,7 +592,7 @@
 #else
   bufsize = 256;
 #endif
-  buf = mrb_str_buf_new(mrb, (mrb_int)bufsize);
+  buf = mrb_str_new_capa(mrb, (mrb_int)bufsize);
   if (gethostname(RSTRING_PTR(buf), (fsize_t)bufsize) != 0)
     mrb_sys_fail(mrb, "gethostname");
   mrb_str_resize(mrb, buf, (mrb_int)strlen(RSTRING_PTR(buf)));
@@ -625,7 +623,7 @@
 
   mrb_get_args(mrb, "i", &s0);
   socklen = sizeof(struct sockaddr_storage);
-  sastr = mrb_str_buf_new(mrb, socklen);
+  sastr = mrb_str_new_capa(mrb, socklen);
   s1 = (int)accept(s0, (struct sockaddr *)RSTRING_PTR(sastr), &socklen);
   if (s1 == -1) {
     mrb_sys_fail(mrb, "accept");
@@ -704,7 +702,7 @@
   if ((size_t)RSTRING_LEN(path) > sizeof(sunp->sun_path) - 1) {
     mrb_raisef(mrb, E_ARGUMENT_ERROR, "too long unix socket path (max: %d bytes)", (int)sizeof(sunp->sun_path) - 1);
   }
-  s = mrb_str_buf_new(mrb, sizeof(struct sockaddr_un));
+  s = mrb_str_new_capa(mrb, sizeof(struct sockaddr_un));
   sunp = (struct sockaddr_un *)RSTRING_PTR(s);
 #if HAVE_SA_LEN
   sunp->sun_len = sizeof(struct sockaddr_un);
@@ -778,7 +776,6 @@
   return mrb_nil_value();
 }
 
-#define E_EOF_ERROR                (mrb_class_get(mrb, "EOFError"))
 static mrb_value
 mrb_win32_basicsocket_sysread(mrb_state *mrb, mrb_value self)
 {
@@ -841,7 +838,7 @@
   n = send(sd, RSTRING_PTR(str), (int)RSTRING_LEN(str), 0);
   if (n == SOCKET_ERROR)
     mrb_sys_fail(mrb, "send");
-  return mrb_fixnum_value(n);
+  return mrb_int_value(mrb, n);
 }
 
 #endif
@@ -861,14 +858,14 @@
 #endif
 
   ai = mrb_define_class(mrb, "Addrinfo", mrb->object_class);
-  mrb_mod_cv_set(mrb, ai, mrb_intern_lit(mrb, "_lastai"), mrb_nil_value());
+  mrb_mod_cv_set(mrb, ai, MRB_SYM(_lastai), mrb_nil_value());
   mrb_define_class_method(mrb, ai, "getaddrinfo", mrb_addrinfo_getaddrinfo, MRB_ARGS_REQ(2)|MRB_ARGS_OPT(4));
   mrb_define_method(mrb, ai, "getnameinfo", mrb_addrinfo_getnameinfo, MRB_ARGS_OPT(1));
 #ifndef _WIN32
   mrb_define_method(mrb, ai, "unix_path", mrb_addrinfo_unix_path, MRB_ARGS_NONE());
 #endif
 
-  io = mrb_class_get(mrb, "IO");
+  io = mrb_class_get_id(mrb, MRB_SYM(IO));
 
   bsock = mrb_define_class(mrb, "BasicSocket", io);
   mrb_define_method(mrb, bsock, "_recvfrom", mrb_basicsocket_recvfrom, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
@@ -936,8 +933,8 @@
   constants = mrb_define_module_under(mrb, sock, "Constants");
 
 #define define_const(SYM) \
-  do {								\
-    mrb_define_const(mrb, constants, #SYM, mrb_fixnum_value(SYM));	\
+  do {                                                                \
+    mrb_define_const(mrb, constants, #SYM, mrb_int_value(mrb, SYM));  \
   } while (0)
 
 #include "const.cstub"
@@ -947,7 +944,7 @@
 mrb_mruby_socket_gem_final(mrb_state* mrb)
 {
   mrb_value ai;
-  ai = mrb_mod_cv_get(mrb, mrb_class_get(mrb, "Addrinfo"), mrb_intern_lit(mrb, "_lastai"));
+  ai = mrb_mod_cv_get(mrb, mrb_class_get_id(mrb, MRB_SYM(Addrinfo)), MRB_SYM(_lastai));
   if (mrb_cptr_p(ai)) {
     freeaddrinfo((struct addrinfo*)mrb_cptr(ai));
   }

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

@@ -5,14 +5,11 @@
 */
 
 #include <mruby.h>
-#include <limits.h>
-#include <string.h>
 #include <mruby/string.h>
 #include <mruby/hash.h>
 #include <mruby/numeric.h>
-#ifndef MRB_WITHOUT_FLOAT
-#include <math.h>
-#endif
+#include <mruby/presym.h>
+#include <string.h>
 #include <ctype.h>
 
 #define BIT_DIGITS(N)   (((N)*146)/485 + 1)  /* log2(10) =~ 146/485 */
@@ -20,9 +17,6 @@
 #define EXTENDSIGN(n, l) (((~0U << (n)) >> (((n)*(l)) % BITSPERDIG)) & ~(~0U << (n)))
 
 mrb_value mrb_str_format(mrb_state *, mrb_int, const mrb_value *, mrb_value);
-#ifndef MRB_WITHOUT_FLOAT
-static void fmt_setup(char*,size_t,int,int,mrb_int,mrb_int);
-#endif
 
 static char*
 remove_sign_bits(char *str, int base)
@@ -70,40 +64,38 @@
   return c;
 }
 
-static mrb_value
-mrb_fix2binstr(mrb_state *mrb, mrb_value x, int base)
+static char *
+mrb_uint_to_cstr(char *buf, size_t len, mrb_int num, int base)
 {
-  char buf66, *b = buf + sizeof buf;
-  mrb_int num = mrb_fixnum(x);
-  uint64_t val = (uint64_t)num;
+  char *b = buf + len - 1;
+  const int mask = base-1;
+  int shift;
+  mrb_uint val = (uint64_t)num;
   char d;
 
-  if (base != 2) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid radix %d", base);
+  if (num == 0) {
+    buf0 = '0'; buf1 = '\0';
+    return buf;
   }
-  if (val == 0) {
-    return mrb_str_new_lit(mrb, "0");
+  switch (base) {
+  case 16: d = 'f'; shift = 4; break;
+  case 8:  d = '7'; shift = 3; break;
+  case 2:  d = '1'; shift = 1; break;
+  default: return NULL;
   }
   *--b = '\0';
   do {
-    *--b = mrb_digitmap(int)(val % base);
-  } while (val /= base);
+    *--b = mrb_digitmap(int)(val & mask);
+  } while (val >>= shift);
 
   if (num < 0) {
     b = remove_sign_bits(b, base);
-    switch (base) {
-    case 16: d = 'f'; break;
-    case 8:  d = '7'; break;
-    case 2:  d = '1'; break;
-    default: d = 0;   break;
-    }
-
     if (d && *b != d) {
       *--b = d;
     }
   }
 
-  return mrb_str_new_cstr(mrb, b);
+  return b;
 }
 
 #define FNONE  0
@@ -116,7 +108,52 @@
 #define FPREC  64
 #define FPREC0 128
 
-#define CHECK(l) do {\
+#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)
+{
+  char sign = '\0';
+  int left_align = 0;
+  int zero_pad = 0;
+
+  if (flags & FSHARP) fmt |= 0x80;
+  if (flags & FPLUS)  sign = '+';
+  if (flags & FMINUS) left_align = 1;
+  if (flags & FZERO)  zero_pad = 1;
+  if (flags & FSPACE) sign = ' ';
+
+  int len = mrb_format_float(f, buf, buf_size, fmt, prec, sign);
+
+  // buf0 < '0' returns true if the first character is space, + or -
+  // buf1 < '9' matches a digit, and doesn't match when we get back +nan or +inf
+  if (buf0 < '0' && buf1 <= '9' && zero_pad) {
+    buf++;
+    width--;
+    len--;
+  }
+  if (*buf < '0' || *buf >= '9') {
+    // For inf or nan, we don't want to zero pad.
+    zero_pad = 0;
+  }
+  if (len >= width) {
+    return len;
+  }
+  bufwidth = '\0';
+  if (left_align) {
+    memset(&buflen, ' ', width - len);
+    return width;
+  }
+  memmove(&bufwidth - len, buf, len);
+  if (zero_pad) {
+    memset(buf, '0', width - len);
+  } else {
+    memset(buf, ' ', width - len);
+  }
+  return width;
+}
+#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;\
@@ -192,25 +229,18 @@
 #define GETNTHARG(nth) \
   ((nth >= argc) ? (mrb_raise(mrb, E_ARGUMENT_ERROR, "too few arguments"), mrb_undef_value()) : argvnth)
 
-#define GETNAMEARG(id, name, len) (\
+#define CHECKNAMEARG(name, len) (\
   check_name_arg(mrb, posarg, name, len),\
-  (posarg = -2, mrb_hash_fetch(mrb, get_hash(mrb, &hash, argc, argv), id, mrb_undef_value())))
-
-#define GETNUM(n, val) \
-  for (; p < end && ISDIGIT(*p); p++) {\
-    if (n > (MRB_INT_MAX - (*p - '0'))/10) {\
-      mrb_raise(mrb, E_ARGUMENT_ERROR, #val " too big"); \
-    } \
-    n = 10 * n + (*p - '0'); \
-  } \
-  if (p >= end) { \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "malformed format string - %*0-9"); \
-  }
+  posarg = -2)
+
+#define GETNUM(n, val) do { \
+  if (!(p = get_num(mrb, p, end, &(n)))) \
+    mrb_raise(mrb, E_ARGUMENT_ERROR, #val " too big 1"); \
+} while(0)
 
 #define GETASTER(num) do { \
   mrb_value tmp_v; \
   t = p++; \
-  n = 0; \
   GETNUM(n, val); \
   if (*p == '$') { \
     tmp_v = GETPOSARG(n); \
@@ -219,15 +249,25 @@
     tmp_v = GETNEXTARG(); \
     p = t; \
   } \
-  num = mrb_int(mrb, tmp_v); \
+  num = mrb_as_int(mrb, tmp_v); \
 } while (0)
 
-static mrb_value
+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;
+  *valp = (int)n;
+  return e;
+}
+
+static void
 get_hash(mrb_state *mrb, mrb_value *hash, mrb_int argc, const mrb_value *argv)
 {
   mrb_value tmp;
 
-  if (!mrb_undef_p(*hash)) return *hash;
+  if (!mrb_undef_p(*hash)) return;
   if (argc != 2) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "one hash required");
   }
@@ -235,7 +275,7 @@
   if (mrb_nil_p(tmp)) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "one hash required");
   }
-  return (*hash = tmp);
+  *hash = tmp;
 }
 
 /*
@@ -281,24 +321,20 @@
  *
  *      Field |  Float Format
  *      ------+--------------------------------------------------------------
- *        e   | Convert floating point argument into exponential notation
+ *        e   | Convert floating-point argument into exponential notation
  *            | with one digit before the decimal point as -d.dddddde+-dd.
  *            | The precision specifies the number of digits after the decimal
  *            | point (defaulting to six).
  *        E   | Equivalent to 'e', but uses an uppercase E to indicate
  *            | the exponent.
- *        f   | Convert floating point argument as -ddd.dddddd,
+ *        f   | Convert floating-point argument as -ddd.dddddd,
  *            | where the precision specifies the number of digits after
  *            | the decimal point.
- *        g   | Convert a floating point number using exponential form
+ *        g   | Convert a floating-point number using exponential form
  *            | if the exponent is less than -4 or greater than or
  *            | equal to the precision, or in dd.dddd form otherwise.
  *            | The precision specifies the number of significant digits.
  *        G   | Equivalent to 'g', but use an uppercase 'E' in exponent form.
- *        a   | Convert floating point argument as -0xh.hhhhp+-dd,
- *            | which is consisted from optional sign, "0x", fraction part
- *            | as hexadecimal, "p", and exponential part as decimal.
- *        A   | Equivalent to 'a', but use uppercase 'X' and 'P'.
  *
  *      Field |  Other Format
  *      ------+--------------------------------------------------------------
@@ -333,7 +369,7 @@
  *             |               | For the conversions 'x', 'X', 'b' and 'B'
  *             |               | on non-zero, prefix the result with "0x",
  *             |               | "0X", "0b" and "0B", respectively.
- *             |               | For 'a', 'A', 'e', 'E', 'f', 'g', and 'G',
+ *             |               | For 'e', 'E', 'f', 'g', and 'G',
  *             |               | force a decimal point to be added,
  *             |               | even if no digits follow.
  *             |               | For 'g' and 'G', do not remove trailing zeros.
@@ -492,18 +528,18 @@
  *  For more complex formatting, Ruby supports a reference by name.
  *  %<name>s style uses format style, but %{name} style doesn't.
  *
- *  Exapmles:
+ *  Examples:
  *    sprintf("%<foo>d : %<bar>f", { :foo => 1, :bar => 2 })
  *      #=> 1 : 2.000000
  *    sprintf("%{foo}f", { :foo => 1 })
  *      # => "1f"
  */
 
-mrb_value
+static mrb_value
 mrb_f_sprintf(mrb_state *mrb, mrb_value obj)
 {
   mrb_int argc;
-  mrb_value *argv;
+  const mrb_value *argv;
 
   mrb_get_args(mrb, "*", &argv, &argc);
 
@@ -516,50 +552,6 @@
   }
 }
 
-static int
-mrb_int2str(char *buf, size_t len, mrb_int n)
-{
-#ifdef MRB_DISABLE_STDIO
-  char *bufend = buf + len;
-  char *p = bufend - 1;
-
-  if (len < 1) return -1;
-
-  *p -- = '\0';
-  len --;
-
-  if (n < 0) {
-    if (len < 1) return -1;
-
-    *p -- = '-';
-    len --;
-    n = -n;
-  }
-
-  if (n > 0) {
-    for (; n > 0; len --, n /= 10) {
-      if (len < 1) return -1;
-
-      *p -- = '0' + (n % 10);
-    }
-    p ++;
-  }
-  else if (len > 0) {
-    *p = '0';
-    len --;
-  }
-  else {
-    return -1;
-  }
-
-  memmove(buf, p, bufend - p);
-
-  return bufend - p - 1;
-#else
-  return snprintf(buf, len, "%" MRB_PRId, n);
-#endif /* MRB_DISABLE_STDIO */
-}
-
 mrb_value
 mrb_str_format(mrb_state *mrb, mrb_int argc, const mrb_value *argv, mrb_value fmt)
 {
@@ -568,33 +560,33 @@
   mrb_int blen;
   mrb_int bsiz;
   mrb_value result;
-  mrb_int n;
-  mrb_int width;
-  mrb_int prec;
+  int n;
+  int width;
+  int prec;
   int nextarg = 1;
   int posarg = 0;
   mrb_value nextvalue;
   mrb_value str;
   mrb_value hash = mrb_undef_value();
 
-#define CHECK_FOR_WIDTH(f)                                                  \
-  if ((f) & FWIDTH) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "width given twice");         \
-  }                                                                         \
-  if ((f) & FPREC0) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "width after precision");     \
+#define CHECK_FOR_WIDTH(f)                                              \
+  if ((f) & FWIDTH) {                                                   \
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "width given twice");              \
+    }                                                                   \
+  if ((f) & FPREC0) {                                                   \
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "width after precision");          \
   }
-#define CHECK_FOR_FLAGS(f)                                                  \
-  if ((f) & FWIDTH) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "flag after width");          \
-  }                                                                         \
-  if ((f) & FPREC0) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "flag after precision");      \
+#define CHECK_FOR_FLAGS(f)                                              \
+  if ((f) & FWIDTH) {                                                   \
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "flag after width");               \
+  }                                                                     \
+  if ((f) & FPREC0) {                                                   \
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "flag after precision");           \
   }
 
   ++argc;
   --argv;
-  mrb_to_str(mrb, fmt);
+  mrb_ensure_string_type(mrb, fmt);
   p = RSTRING_PTR(fmt);
   end = p + RSTRING_LEN(fmt);
   blen = 0;
@@ -657,7 +649,6 @@
 
       case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9':
-        n = 0;
         GETNUM(n, width);
         if (*p == '$') {
           if (!mrb_undef_p(nextvalue)) {
@@ -676,7 +667,6 @@
       case '{': {
         const char *start = p;
         char term = (*p == '<') ? '>' : '}';
-        mrb_value symname;
 
         for (; p < end && *p != term; )
           p++;
@@ -684,10 +674,13 @@
           mrb_raisef(mrb, E_ARGUMENT_ERROR, "name%l after <%n>",
                      start, p - start + 1, id);
         }
-        symname = mrb_str_new(mrb, start + 1, p - start - 1);
-        id = mrb_intern_str(mrb, symname);
-        nextvalue = GETNAMEARG(mrb_symbol_value(id), start, p - start + 1);
-        if (mrb_undef_p(nextvalue)) {
+        CHECKNAMEARG(start, p - start + 1);
+        get_hash(mrb, &hash, argc, argv);
+        id = mrb_intern_check(mrb, start + 1, p - start - 1);
+        if (id) {
+          nextvalue = mrb_hash_fetch(mrb, hash, mrb_symbol_value(id), mrb_undef_value());
+        }
+        if (!id || mrb_undef_p(nextvalue)) {
           mrb_raisef(mrb, E_KEY_ERROR, "key%l not found", start, p - start + 1);
         }
         if (term == '}') goto format_s;
@@ -699,6 +692,9 @@
         CHECK_FOR_WIDTH(flags);
         flags |= FWIDTH;
         GETASTER(width);
+        if (width > INT16_MAX || INT16_MIN > width) {
+          mrb_raise(mrb, E_ARGUMENT_ERROR, "width too big");
+        }
         if (width < 0) {
           flags |= FMINUS;
           width = -width;
@@ -712,7 +708,6 @@
         }
         flags |= FPREC|FPREC0;
 
-        prec = 0;
         p++;
         if (*p == '*') {
           GETASTER(prec);
@@ -722,7 +717,6 @@
           p++;
           goto retry;
         }
-
         GETNUM(prec, precision);
         goto retry;
 
@@ -748,8 +742,8 @@
             mrb_raise(mrb, E_ARGUMENT_ERROR, "%c requires a character");
           }
         }
-        else if (mrb_fixnum_p(val)) {
-          mrb_int n = mrb_fixnum(val);
+        else if (mrb_integer_p(val)) {
+          mrb_int n = mrb_integer(val);
 #ifndef MRB_UTF8_STRING
           char buf1;
 
@@ -763,7 +757,7 @@
             tmp = mrb_str_new(mrb, buf, 1);
           }
           else {
-            tmp = mrb_funcall(mrb, val, "chr", 0);
+            tmp = mrb_funcall_id(mrb, val, MRB_SYM(chr), 0);
             mrb_check_type(mrb, tmp, MRB_TT_STRING);
           }
 #endif
@@ -863,21 +857,20 @@
 
   bin_retry:
         switch (mrb_type(val)) {
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
           case MRB_TT_FLOAT:
-            val = mrb_flo_to_fixnum(mrb, val);
-            if (mrb_fixnum_p(val)) goto bin_retry;
-            break;
+            val = mrb_float_to_integer(mrb, val);
+            goto bin_retry;
 #endif
           case MRB_TT_STRING:
-            val = mrb_str_to_inum(mrb, val, 0, TRUE);
+            val = mrb_str_to_integer(mrb, val, 0, TRUE);
             goto bin_retry;
-          case MRB_TT_FIXNUM:
-            v = mrb_fixnum(val);
+          case MRB_TT_INTEGER:
+            v = mrb_integer(val);
             break;
           default:
-            val = mrb_Integer(mrb, val);
-            goto bin_retry;
+            v = mrb_as_int(mrb, val);
+            break;
         }
 
         switch (*p) {
@@ -913,35 +906,14 @@
             sc = '-';
             width--;
           }
-          mrb_assert(base == 10);
-          mrb_int2str(nbuf, sizeof(nbuf)-1, v);
-          s = nbuf;
+          s = mrb_int_to_cstr(nbuf, sizeof(nbuf), v, base);
           if (v < 0) s++;       /* skip minus sign */
         }
         else {
-          s = nbuf;
+          /* print as unsigned */
+          s = mrb_uint_to_cstr(nbuf, sizeof(nbuf), v, base);
           if (v < 0) {
             dots = 1;
-            val = mrb_fix2binstr(mrb, mrb_fixnum_value(v), base);
-          }
-          else {
-            val = mrb_fixnum_to_str(mrb, mrb_fixnum_value(v), base);
-          }
-          strncpy(++s, RSTRING_PTR(val), sizeof(nbuf)-2);
-          if (v < 0) {
-            char d;
-
-            s = remove_sign_bits(s, base);
-            switch (base) {
-              case 16: d = 'f'; break;
-              case 8:  d = '7'; break;
-              case 2:  d = '1'; break;
-              default: d = 0; break;
-            }
-
-            if (d && *s != d) {
-              *--s = d;
-            }
           }
         }
         {
@@ -1030,20 +1002,17 @@
       }
       break;
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
       case 'f':
       case 'g':
       case 'G':
       case 'e':
-      case 'E':
-      case 'a':
-      case 'A': {
+      case 'E': {
         mrb_value val = GETARG();
         double fval;
         mrb_int need = 6;
-        char fbuf64;
 
-        fval = mrb_float(mrb_Float(mrb, val));
+        fval = mrb_as_float(mrb, val);
         if (!isfinite(fval)) {
           const char *expr;
           const mrb_int elen = 3;
@@ -1090,7 +1059,7 @@
             need = BIT_DIGITS(i);
         }
         if (need > MRB_INT_MAX - ((flags&FPREC) ? prec : 6)) {
-        too_big_width:
+        too_big_width_prec:
           mrb_raise(mrb, E_ARGUMENT_ERROR,
                     (width > prec ? "width too big" : "prec too big"));
         }
@@ -1098,13 +1067,12 @@
         if ((flags&FWIDTH) && need < width)
           need = width;
         if (need > MRB_INT_MAX - 20) {
-          goto too_big_width;
+          goto too_big_width_prec;
         }
         need += 20;
 
         CHECK(need);
-        fmt_setup(fbuf, sizeof(fbuf), *p, flags, width, prec);
-        n = mrb_float_to_cstr(mrb, &bufblen, need, fbuf, fval);
+        n = fmt_float(&bufblen, need, *p, flags, width, prec, fval);
         if (n < 0 || n >= need) {
           mrb_raise(mrb, E_RUNTIME_ERROR, "formatting error");
         }
@@ -1131,32 +1099,16 @@
   return result;
 }
 
-#ifndef MRB_WITHOUT_FLOAT
-static void
-fmt_setup(char *buf, size_t size, int c, int flags, mrb_int width, mrb_int prec)
-{
-  char *end = buf + size;
-  int n;
-
-  *buf++ = '%';
-  if (flags & FSHARP) *buf++ = '#';
-  if (flags & FPLUS)  *buf++ = '+';
-  if (flags & FMINUS) *buf++ = '-';
-  if (flags & FZERO)  *buf++ = '0';
-  if (flags & FSPACE) *buf++ = ' ';
 
-  if (flags & FWIDTH) {
-    n = mrb_int2str(buf, end - buf, width);
-    buf += n;
-  }
-
-  if (flags & FPREC) {
-    *buf ++ = '.';
-    n = mrb_int2str(buf, end - buf, prec);
-    buf += n;
-  }
+void
+mrb_mruby_sprintf_gem_init(mrb_state *mrb)
+{
+  struct RClass *krn = mrb->kernel_module;
+  mrb_define_module_function(mrb, krn, "sprintf", mrb_f_sprintf, MRB_ARGS_ANY());
+  mrb_define_module_function(mrb, krn, "format",  mrb_f_sprintf, MRB_ARGS_ANY());
+}
 
-  *buf++ = c;
-  *buf = '\0';
+void
+mrb_mruby_sprintf_gem_final(mrb_state *mrb)
+{
 }
-#endif

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

@@ -1,5 +1,7 @@
-#assert('Kernel.sprintf') do
-#end
+assert('sprintf invalid') do
+  assert_raise(ArgumentError) { sprintf('%1$*d', 3) }
+  assert_raise(ArgumentError) { sprintf('%1$.*d', 3) }
+end
 
 assert('String#%') do
   assert_equal "one=1", "one=%d" % 1
@@ -8,11 +10,11 @@
   assert_equal 15, ("%b" % (1<<14)).size
   skip unless Object.const_defined?(:Float)
   assert_equal "1.0", "%3.1f" % 1.01
-  assert_equal " 123456789.12", "% 4.2f" % 123456789.123456789
-  assert_equal "123456789.12", "%-4.2f" % 123456789.123456789
-  assert_equal "+123456789.12", "%+4.2f" % 123456789.123456789
-  assert_equal "123456789.12", "%04.2f" % 123456789.123456789
-  assert_equal "00000000123456789.12", "%020.2f" % 123456789.123456789
+  assert_equal " 12345.12", "% 4.2f" % 12345.1234
+  assert_equal "12345.12", "%-4.2f" % 12345.12345
+  assert_equal "+12345.12", "%+4.2f" % 12345.1234
+  assert_equal "12345.12", "%04.2f" % 12345.12345
+  assert_equal "0012345.12", "%010.2f" % 12345.1234
 end
 
 assert('String#% with inf') do

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

@@ -111,36 +111,6 @@
     (s == self) ? nil : self.replace(s)
   end
 
-  ##
-  # call-seq:
-  #    str.casecmp(other_str)   -> -1, 0, +1 or nil
-  #
-  # Case-insensitive version of <code>String#<=></code>.
-  #
-  #    "abcdef".casecmp("abcde")     #=> 1
-  #    "aBcDeF".casecmp("abcdef")    #=> 0
-  #    "abcdef".casecmp("abcdefg")   #=> -1
-  #    "abcdef".casecmp("ABCDEF")    #=> 0
-  #
-  def casecmp(str)
-    self.downcase <=> str.__to_str.downcase
-  rescue NoMethodError
-    nil
-  end
-
-  ##
-  # call-seq:
-  #   str.casecmp?(other)  -> true, false, or nil
-  #
-  # Returns true if str and other_str are equal after case folding,
-  # false if they are not equal, and nil if other_str is not a string.
-
-  def casecmp?(str)
-    c = self.casecmp(str)
-    return nil if c.nil?
-    return c == 0
-  end
-
   def partition(sep)
     raise TypeError, "type mismatch: #{sep.class} given" unless sep.is_a? String
     n = index(sep)
@@ -148,7 +118,7 @@
       m = n + sep.size
        slice(0, n), sep, slice(m, size - m) 
     else
-       self, "", "" 
+       self0..-1, "", "" 
     end
   end
 
@@ -181,7 +151,7 @@
   #
   def slice!(arg1, arg2=nil)
     raise FrozenError, "can't modify frozen String" if frozen?
-    raise "wrong number of arguments (for 1..2)" if arg1.nil? && arg2.nil?
+    raise ArgumentError, "wrong number of arguments (expected 1..2)" if arg1.nil? && arg2.nil?
 
     if !arg1.nil? && !arg2.nil?
       idx = arg1
@@ -275,8 +245,8 @@
   def ljust(idx, padstr = ' ')
     raise ArgumentError, 'zero width padding' if padstr == ''
     return self if idx <= self.size
-    pad_repetitions = (idx / padstr.length).ceil
-    padding = (padstr * pad_repetitions)0...(idx - self.length)
+    pad_repetitions = idx / padstr.size
+    padding = (padstr * pad_repetitions)0, idx-self.size
     self + padding
   end
 
@@ -294,11 +264,31 @@
   def rjust(idx, padstr = ' ')
     raise ArgumentError, 'zero width padding' if padstr == ''
     return self if idx <= self.size
-    pad_repetitions = (idx / padstr.length).ceil
-    padding = (padstr * pad_repetitions)0...(idx - self.length)
+    pad_repetitions = idx / padstr.size
+    padding = (padstr * pad_repetitions)0, idx-self.size
     padding + self
   end
 
+  ##
+  #  call-seq:
+  #     str.center(width, padstr=' ')   -> new_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+.
+  #
+  #     "hello".center(4)         #=> "hello"
+  #     "hello".center(20)        #=> "       hello        "
+  #     "hello".center(20, '123') #=> "1231231hello12312312"
+  def center(width, padstr = ' ')
+    raise ArgumentError, 'zero width padding' if padstr == ''
+    return self if width <= self.size
+    width -= self.size
+    pad1 = width / 2
+    pad2 = width - pad1
+    (padstr*pad1)0,pad1 + self + (padstr*pad2)0,pad2
+  end
+
   def chars(&block)
     if block_given?
       self.split('').each do |i|
@@ -324,8 +314,6 @@
   end
 
   def codepoints(&block)
-    len = self.size
-
     if block_given?
       self.split('').each do|x|
         block.call(x.ord)
@@ -422,7 +410,6 @@
     # both edges are all digits
     bi = self.to_i(10)
     ei = max.to_i(10)
-    len = self.length
     if (bi > 0 or bi == "0"*len) and (ei > 0 or ei == "0"*maxlen)
       while bi <= ei
         break if exclusive and bi == ei
@@ -440,6 +427,29 @@
       break if exclusive and n == 0
       yield bs
       break if n == 0
+      bsiz = bs.size
+      break if bsiz > max.size || bsiz == 0
+      bs = bs.succ
+    end
+    self
+  end
+
+  def __upto_endless(&block)
+    len = self.length
+    # both edges are all digits
+    bi = self.to_i(10)
+    if bi > 0 or bi == "0"*len
+      while true
+        s = bi.to_s
+        s = s.rjust(len, "0") if s.length < len
+        yield s
+        bi += 1
+      end
+      return self
+    end
+    bs = self
+    while true
+      yield bs
       bs = bs.succ
     end
     self

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

@@ -12,7 +12,7 @@
 #define ENC_COMP_P(enc, enc_lit) \
   str_casecmp_p(RSTRING_PTR(enc), RSTRING_LEN(enc), enc_lit, sizeof(enc_lit"")-1)
 
-#ifdef MRB_WITHOUT_FLOAT
+#ifdef MRB_NO_FLOAT
 # define mrb_float_p(o) FALSE
 #endif
 
@@ -35,7 +35,7 @@
 static mrb_value
 int_chr_binary(mrb_state *mrb, mrb_value num)
 {
-  mrb_int cp = mrb_int(mrb, num);
+  mrb_int cp = mrb_as_int(mrb, num);
   char c;
   mrb_value str;
 
@@ -166,7 +166,7 @@
 {
   mrb_value str = mrb_get_arg1(mrb);
 
-  if (mrb_fixnum_p(str) || mrb_float_p(str))
+  if (mrb_integer_p(str) || mrb_float_p(str))
 #ifdef MRB_UTF8_STRING
     str = int_chr_utf8(mrb, str);
 #else
@@ -194,14 +194,15 @@
 static mrb_value
 mrb_str_start_with(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *argv, sub;
+  const mrb_value *argv;
   mrb_int argc, i;
   mrb_get_args(mrb, "*", &argv, &argc);
 
   for (i = 0; i < argc; i++) {
     size_t len_l, len_r;
     int ai = mrb_gc_arena_save(mrb);
-    sub = mrb_ensure_string_type(mrb, argvi);
+    mrb_value sub = argvi;
+    mrb_ensure_string_type(mrb, sub);
     mrb_gc_arena_restore(mrb, ai);
     len_l = RSTRING_LEN(self);
     len_r = RSTRING_LEN(sub);
@@ -223,14 +224,15 @@
 static mrb_value
 mrb_str_end_with(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *argv, sub;
+  const mrb_value *argv;
   mrb_int argc, i;
   mrb_get_args(mrb, "*", &argv, &argc);
 
   for (i = 0; i < argc; i++) {
     size_t len_l, len_r;
     int ai = mrb_gc_arena_save(mrb);
-    sub = mrb_ensure_string_type(mrb, argvi);
+    mrb_value sub = argvi;
+    mrb_ensure_string_type(mrb, sub);
     mrb_gc_arena_restore(mrb, ai);
     len_l = RSTRING_LEN(self);
     len_r = RSTRING_LEN(sub);
@@ -260,7 +262,7 @@
   <range> ::= <ch> '-' <ch>
 */
 struct tr_pattern {
-  uint8_t type;		// 1:in-order, 2:range
+  uint8_t type;                 // 1:in-order, 2:range
   mrb_bool flag_reverse : 1;
   mrb_bool flag_on_heap : 1;
   uint16_t n;
@@ -286,7 +288,7 @@
 }
 
 static struct tr_pattern*
-tr_parse_pattern(mrb_state *mrb, struct tr_pattern *ret, const mrb_value v_pattern, mrb_bool flag_reverse_enable)
+tr_parse_pattern(mrb_state *mrb, struct tr_pattern *ret, const mrb_value v_pattern, mrb_bool flag_reverse_enable, struct tr_pattern *pat0)
 {
   const char *pattern = RSTRING_PTR(v_pattern);
   mrb_int pattern_length = RSTRING_LEN(v_pattern);
@@ -305,13 +307,13 @@
     pat1 = ret_uninit
            ? ret
            : (struct tr_pattern*)mrb_malloc_simple(mrb, sizeof(struct tr_pattern));
+    if (pat1 == NULL) {
+      if (pat0) tr_free_pattern(mrb, pat0);
+      tr_free_pattern(mrb, ret);
+      mrb_exc_raise(mrb, mrb_obj_value(mrb->nomem_err));
+      return NULL;            /* not reached */
+    }
     if ((i+2) < pattern_length && patterni != '\\' && patterni+1 == '-') {
-      if (pat1 == NULL && ret) {
-      nomem:
-        tr_free_pattern(mrb, ret);
-        mrb_exc_raise(mrb, mrb_obj_value(mrb->nomem_err));
-        return NULL;            /* not reached */
-      }
       pat1->type = TR_RANGE;
       pat1->flag_reverse = flag_reverse;
       pat1->flag_on_heap = !ret_uninit;
@@ -327,18 +329,18 @@
       mrb_int len;
 
       while (i < pattern_length) {
-	if ((i+2) < pattern_length && patterni != '\\' && patterni+1 == '-')
+        if ((i+2) < pattern_length && patterni != '\\' && patterni+1 == '-')
           break;
-	i++;
+        i++;
       }
 
       len = i - start_pos;
       if (len > UINT16_MAX) {
+        if (pat0) tr_free_pattern(mrb, pat0);
+        tr_free_pattern(mrb, ret);
+        if (ret != pat1) mrb_free(mrb, pat1);
         mrb_raise(mrb, E_ARGUMENT_ERROR, "tr pattern too long (max 65535)");
       }
-      if (pat1 == NULL && ret) {
-        goto nomem;
-      }
       pat1->type = TR_IN_ORDER;
       pat1->flag_reverse = flag_reverse;
       pat1->flag_on_heap = !ret_uninit;
@@ -347,10 +349,7 @@
       pat1->val.start_pos = (uint16_t)start_pos;
     }
 
-    if (ret == NULL || ret_uninit) {
-      ret = pat1;
-    }
-    else {
+    if (!ret_uninit) {
       struct tr_pattern *p = ret;
       while (p->next != NULL) {
         p = p->next;
@@ -373,7 +372,7 @@
     if (pat->type == TR_IN_ORDER) {
       int i;
       for (i = 0; i < pat->n; i++) {
-	if (pat_strpat->val.start_pos + i == ch) ret = n_sum + i;
+        if (pat_strpat->val.start_pos + i == ch) ret = n_sum + i;
       }
     }
     else if (pat->type == TR_RANGE) {
@@ -485,18 +484,17 @@
 str_tr(mrb_state *mrb, mrb_value str, mrb_value p1, mrb_value p2, mrb_bool squeeze)
 {
   struct tr_pattern pat = STATIC_TR_PATTERN;
-  struct tr_pattern rep_storage = STATIC_TR_PATTERN;
+  struct tr_pattern rep = STATIC_TR_PATTERN;
   char *s;
   mrb_int len;
   mrb_int i;
   mrb_int j;
   mrb_bool flag_changed = FALSE;
   mrb_int lastch = -1;
-  struct tr_pattern *rep;
 
   mrb_str_modify(mrb, mrb_str_ptr(str));
-  tr_parse_pattern(mrb, &pat, p1, TRUE);
-  rep = tr_parse_pattern(mrb, &rep_storage, p2, FALSE);
+  tr_parse_pattern(mrb, &pat, p1, TRUE, NULL);
+  tr_parse_pattern(mrb, &rep, p2, FALSE, &pat);
   s = RSTRING_PTR(str);
   len = RSTRING_LEN(str);
 
@@ -506,27 +504,24 @@
     if (i>j) sj = si;
     if (n >= 0) {
       flag_changed = TRUE;
-      if (rep == NULL) {
-	j--;
-      }
-      else {
-        mrb_int c = tr_get_character(rep, RSTRING_PTR(p2), n);
+      mrb_int c = tr_get_character(&rep, RSTRING_PTR(p2), n);
 
-        if (c < 0 || (squeeze && c == lastch)) {
-          j--;
-          continue;
-        }
-        if (c > 0x80) {
-          mrb_raisef(mrb, E_ARGUMENT_ERROR, "character (%i) out of range", c);
-        }
-	lastch = c;
-	si = (char)c;
+      if (c < 0 || (squeeze && c == lastch)) {
+        j--;
+        continue;
       }
+      if (c > 0x80) {
+        tr_free_pattern(mrb, &pat);
+        tr_free_pattern(mrb, &rep);
+        mrb_raisef(mrb, E_ARGUMENT_ERROR, "character (%i) out of range", c);
+      }
+      lastch = c;
+      si = (char)c;
     }
   }
 
   tr_free_pattern(mrb, &pat);
-  tr_free_pattern(mrb, rep);
+  tr_free_pattern(mrb, &rep);
 
   if (flag_changed) {
     RSTR_SET_LEN(RSTRING(str), j);
@@ -659,7 +654,7 @@
 
   mrb_str_modify(mrb, mrb_str_ptr(str));
   if (!mrb_nil_p(v_pat)) {
-    pat = tr_parse_pattern(mrb, &pat_storage, v_pat, TRUE);
+    pat = tr_parse_pattern(mrb, &pat_storage, v_pat, TRUE, NULL);
     tr_compile_pattern(pat, v_pat, bitmap);
     tr_free_pattern(mrb, pat);
   }
@@ -750,7 +745,7 @@
   uint8_t bitmap32;
 
   mrb_str_modify(mrb, mrb_str_ptr(str));
-  tr_parse_pattern(mrb, &pat, v_pat, TRUE);
+  tr_parse_pattern(mrb, &pat, v_pat, TRUE, NULL);
   tr_compile_pattern(&pat, v_pat, bitmap);
   tr_free_pattern(mrb, &pat);
 
@@ -818,7 +813,7 @@
   uint8_t bitmap32;
 
   mrb_get_args(mrb, "S", &v_pat);
-  tr_parse_pattern(mrb, &pat, v_pat, TRUE);
+  tr_parse_pattern(mrb, &pat, v_pat, TRUE, NULL);
   tr_compile_pattern(&pat, v_pat, bitmap);
   tr_free_pattern(mrb, &pat);
 
@@ -833,13 +828,13 @@
 static mrb_value
 mrb_str_hex(mrb_state *mrb, mrb_value self)
 {
-  return mrb_str_to_inum(mrb, self, 16, FALSE);
+  return mrb_str_to_integer(mrb, self, 16, FALSE);
 }
 
 static mrb_value
 mrb_str_oct(mrb_state *mrb, mrb_value self)
 {
-  return mrb_str_to_inum(mrb, self, 8, FALSE);
+  return mrb_str_to_integer(mrb, self, 8, FALSE);
 }
 
 /*
@@ -1072,7 +1067,8 @@
 mrb_str_del_prefix_bang(mrb_state *mrb, mrb_value self)
 {
   mrb_int plen, slen;
-  char *ptr, *s;
+  const char *ptr;
+  char *s;
   struct RString *str = RSTRING(self);
 
   mrb_get_args(mrb, "s", &ptr, &plen);
@@ -1105,7 +1101,7 @@
 mrb_str_del_prefix(mrb_state *mrb, mrb_value self)
 {
   mrb_int plen, slen;
-  char *ptr;
+  const char *ptr;
 
   mrb_get_args(mrb, "s", &ptr, &plen);
   slen = RSTRING_LEN(self);
@@ -1129,7 +1125,8 @@
 mrb_str_del_suffix_bang(mrb_state *mrb, mrb_value self)
 {
   mrb_int plen, slen;
-  char *ptr, *s;
+  const char *ptr;
+  char *s;
   struct RString *str = RSTRING(self);
 
   mrb_get_args(mrb, "s", &ptr, &plen);
@@ -1160,7 +1157,7 @@
 mrb_str_del_suffix(mrb_state *mrb, mrb_value self)
 {
   mrb_int plen, slen;
-  char *ptr;
+  const char *ptr;
 
   mrb_get_args(mrb, "s", &ptr, &plen);
   slen = RSTRING_LEN(self);
@@ -1170,6 +1167,60 @@
   return mrb_str_substr(mrb, self, 0, slen-plen);
 }
 
+#define lesser(a,b) (((a)>(b))?(b):(a))
+
+/*
+ * call-seq:
+ *   str.casecmp(other_str)   -> -1, 0, +1 or nil
+ *
+ * Case-insensitive version of <code>String#<=></code>.
+ *
+ *   "abcdef".casecmp("abcde")     #=> 1
+ *   "aBcDeF".casecmp("abcdef")    #=> 0
+ *   "abcdef".casecmp("abcdefg")   #=> -1
+ *   "abcdef".casecmp("ABCDEF")    #=> 0
+ */
+static mrb_value
+mrb_str_casecmp(mrb_state *mrb, mrb_value self)
+{
+  mrb_value str;
+
+  mrb_get_args(mrb, "o", &str);
+  if (!mrb_string_p(str)) return mrb_nil_value();
+
+  struct RString *s1 = mrb_str_ptr(self);
+  struct RString *s2 = mrb_str_ptr(str);
+  mrb_int len = lesser(RSTR_LEN(s1), RSTR_LEN(s2));
+  char *p1 = RSTR_PTR(s1);
+  char *p2 = RSTR_PTR(s2);
+
+  for (mrb_int i=0; i<len; i++) {
+    int c1 = p1i, c2 = p2i;
+    if (ISASCII(c1) && ISUPPER(c1)) c1 = TOLOWER(c1);
+    if (ISASCII(c2) && ISUPPER(c2)) c2 = TOLOWER(c2);
+    if (c1 > c2) return mrb_fixnum_value(1);
+    if (c1 < c2) return mrb_fixnum_value(-1);
+  }
+  if (RSTR_LEN(s1) == RSTR_LEN(s2)) return mrb_fixnum_value(0);
+  if (RSTR_LEN(s1) > RSTR_LEN(s2))  return mrb_fixnum_value(1);
+  return mrb_fixnum_value(-1);
+}
+
+/*
+ * call-seq:
+ *   str.casecmp?(other)  -> true, false, or nil
+ *
+ * Returns true if str and other_str are equal after case folding,
+ * false if they are not equal, and nil if other is not a string.
+ */
+static mrb_value
+mrb_str_casecmp_p(mrb_state *mrb, mrb_value self)
+{
+  mrb_value c = mrb_str_casecmp(mrb, self);
+  if (mrb_nil_p(c)) return c;
+  return mrb_bool_value(mrb_fixnum(c) == 0);
+}
+
 static mrb_value
 mrb_str_lines(mrb_state *mrb, mrb_value self)
 {
@@ -1180,6 +1231,7 @@
   char *p = b, *t;
   char *e = b + RSTRING_LEN(self);
 
+  mrb->c->ci->mid = 0;
   result = mrb_ary_new(mrb);
   ai = mrb_gc_arena_save(mrb);
   while (p < e) {
@@ -1226,10 +1278,12 @@
   mrb_define_method(mrb, s, "delete_prefix",   mrb_str_del_prefix,      MRB_ARGS_REQ(1));
   mrb_define_method(mrb, s, "delete_suffix!",  mrb_str_del_suffix_bang, MRB_ARGS_REQ(1));
   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, "__lines",         mrb_str_lines,           MRB_ARGS_NONE());
 
-  mrb_define_method(mrb, mrb_module_get(mrb, "Integral"), "chr", mrb_int_chr, MRB_ARGS_OPT(1));
+  mrb_define_method(mrb, mrb_class_get(mrb, "Integer"), "chr", mrb_int_chr, MRB_ARGS_OPT(1));
 }
 
 void

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

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

@@ -2,99 +2,96 @@
 # Struct
 #
 # ISO 15.2.18
+class Struct
 
-if Object.const_defined?(:Struct)
-  class Struct
+  ##
+  # Calls the given block for each element of +self+
+  # and pass the respective element.
+  #
+  # ISO 15.2.18.4.4
+  def each(&block)
+    self.class.members.each{|field|
+      block.call(selffield)
+    }
+    self
+  end
 
-    ##
-    # Calls the given block for each element of +self+
-    # and pass the respective element.
-    #
-    # ISO 15.2.18.4.4
-    def each(&block)
-      self.class.members.each{|field|
-        block.call(selffield)
-      }
-      self
-    end
+  ##
+  # Calls the given block for each element of +self+
+  # and pass the name and value of the respective
+  # element.
+  #
+  # ISO 15.2.18.4.5
+  def each_pair(&block)
+    self.class.members.each{|field|
+      block.call(field.to_sym, selffield)
+    }
+    self
+  end
 
-    ##
-    # Calls the given block for each element of +self+
-    # and pass the name and value of the respectiev
-    # element.
-    #
-    # ISO 15.2.18.4.5
-    def each_pair(&block)
-      self.class.members.each{|field|
-        block.call(field.to_sym, selffield)
-      }
-      self
-    end
+  ##
+  # Calls the given block for each element of +self+
+  # and returns an array with all elements of which
+  # block is not false.
+  #
+  # ISO 15.2.18.4.7
+  def select(&block)
+    ary = 
+    self.class.members.each{|field|
+      val = selffield
+      ary.push(val) if block.call(val)
+    }
+    ary
+  end
 
-    ##
-    # Calls the given block for each element of +self+
-    # and returns an array with all elements of which
-    # block is not false.
-    #
-    # ISO 15.2.18.4.7
-    def select(&block)
-      ary = 
-      self.class.members.each{|field|
-        val = selffield
-        ary.push(val) if block.call(val)
-      }
-      ary
+  def _inspect(recur_list)
+    return "#<struct #{self.class}:...>" if recur_listself.object_id
+    recur_listself.object_id = true
+    name = self.class.to_s
+    if name0 == "#"
+      str = "#<struct "
+    else
+      str = "#<struct #{name} "
     end
-
-    def _inspect(recur_list)
-      return "#<struct #{self.class}:...>" if recur_listself.object_id
-      recur_listself.object_id = true
-      name = self.class.to_s
-      if name0 == "#"
-        str = "#<struct "
-      else
-        str = "#<struct #{name} "
-      end
-      buf = 
-      self.each_pair do |k,v|
-        buf.push k.to_s + "=" + v._inspect(recur_list)
-      end
-      str + buf.join(", ") + ">"
+    buf = 
+    self.each_pair do |k,v|
+      buf.push k.to_s + "=" + v._inspect(recur_list)
     end
+    str + buf.join(", ") + ">"
+  end
 
-    ##
-    # call-seq:
-    #   struct.to_s      -> string
-    #   struct.inspect   -> string
-    #
-    # Describe the contents of this struct in a string.
-    #
-    # 15.2.18.4.10(x)
-    #
-    def inspect
-      self._inspect({})
-    end
+  ##
+  # call-seq:
+  #   struct.to_s      -> string
+  #   struct.inspect   -> string
+  #
+  # Describe the contents of this struct in a string.
+  #
+  # 15.2.18.4.10(x)
+  #
+  def inspect
+    self._inspect({})
+  end
 
-    ##
-    # 15.2.18.4.11(x)
-    #
-    alias to_s inspect
+  ##
+  # 15.2.18.4.11(x)
+  #
+  alias to_s inspect
 
-    ##
-    # call-seq:
-    #   hsh.dig(key,...)                 -> object
-    #
-    # Extracts the nested value specified by the sequence of <i>key</i>
-    # objects by calling +dig+ at each step, returning +nil+ if any
-    # intermediate step is +nil+.
-    #
-    def dig(idx,*args)
-      n = selfidx
-      if args.size > 0
-        n&.dig(*args)
-      else
-        n
-      end
+  ##
+  # call-seq:
+  #   hsh.dig(key,...)                 -> object
+  #
+  # Extracts the nested value specified by the sequence of <i>key</i>
+  # objects by calling +dig+ at each step, returning +nil+ if any
+  # intermediate step is +nil+.
+  #
+  def dig(idx,*args)
+    n = selfidx
+    if args.size > 0
+      n&.dig(*args)
+    else
+      n
     end
   end
 end

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

@@ -13,14 +13,17 @@
 #include <mruby/hash.h>
 #include <mruby/range.h>
 #include <mruby/proc.h>
+#include <mruby/presym.h>
 
 #define RSTRUCT_LEN(st) RARRAY_LEN(st)
 #define RSTRUCT_PTR(st) RARRAY_PTR(st)
 
+#define mrb_struct_p(o) (mrb_type(o) == MRB_TT_STRUCT)
+
 static struct RClass *
 struct_class(mrb_state *mrb)
 {
-  return mrb_class_get(mrb, "Struct");
+  return mrb_class_get_id(mrb, MRB_SYM(Struct));
 }
 
 static inline mrb_value
@@ -42,7 +45,7 @@
 static mrb_value
 struct_s_members(mrb_state *mrb, struct RClass *klass)
 {
-  mrb_value members = struct_ivar_get(mrb, mrb_obj_value(klass), mrb_intern_lit(mrb, "__members__"));
+  mrb_value members = struct_ivar_get(mrb, mrb_obj_value(klass), MRB_SYM(__members__));
 
   if (mrb_nil_p(members)) {
     mrb_raise(mrb, E_TYPE_ERROR, "uninitialized struct");
@@ -57,18 +60,13 @@
 struct_members(mrb_state *mrb, mrb_value s)
 {
   mrb_value members = struct_s_members(mrb, mrb_obj_class(mrb, s));
-  if (!mrb_array_p(s)) {
+  if (!mrb_struct_p(s) || RSTRUCT_LEN(s) == 0) {
     mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
   }
   if (RSTRUCT_LEN(s) != RARRAY_LEN(members)) {
-    if (RSTRUCT_LEN(s) == 0) {  /* probably uninitialized */
-      mrb_ary_resize(mrb, s, RARRAY_LEN(members));
-    }
-    else {
-      mrb_raisef(mrb, E_TYPE_ERROR,
-                 "struct size differs (%i required %i given)",
-                 RARRAY_LEN(members), RSTRUCT_LEN(s));
-    }
+    mrb_raisef(mrb, E_TYPE_ERROR,
+               "struct size differs (%i required %i given)",
+               RARRAY_LEN(members), RSTRUCT_LEN(s));
   }
   return members;
 }
@@ -113,7 +111,7 @@
 static mrb_value
 mrb_struct_ref(mrb_state *mrb, mrb_value obj)
 {
-  mrb_int i = mrb_fixnum(mrb_proc_cfunc_env_get(mrb, 0));
+  mrb_int i = mrb_integer(mrb_proc_cfunc_env_get(mrb, 0));
   mrb_value *ptr = RSTRUCT_PTR(obj);
 
   if (!ptr) return mrb_nil_value();
@@ -152,7 +150,7 @@
 static mrb_value
 mrb_struct_set_m(mrb_state *mrb, mrb_value obj)
 {
-  mrb_int i = mrb_fixnum(mrb_proc_cfunc_env_get(mrb, 0));
+  mrb_int i = mrb_integer(mrb_proc_cfunc_env_get(mrb, 0));
   mrb_value *ptr;
   mrb_value val = mrb_get_arg1(mrb);
 
@@ -201,7 +199,7 @@
   }
   else {
     /* old style: should we warn? */
-    mrb_to_str(mrb, name);
+    mrb_ensure_string_type(mrb, name);
     id = mrb_obj_to_sym(mrb, name);
     if (!mrb_const_name_p(mrb, RSTRING_PTR(name), RSTRING_LEN(name))) {
       mrb_name_error(mrb, id, "identifier %v needs to be constant", name);
@@ -212,9 +210,9 @@
     }
     c = mrb_define_class_under(mrb, klass, RSTRING_PTR(name), klass);
   }
-  MRB_SET_INSTANCE_TT(c, MRB_TT_ARRAY);
+  MRB_SET_INSTANCE_TT(c, MRB_TT_STRUCT);
   nstr = mrb_obj_value(c);
-  mrb_iv_set(mrb, nstr, mrb_intern_lit(mrb, "__members__"), members);
+  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());
@@ -262,12 +260,12 @@
 mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
 {
   mrb_value name, rest;
-  mrb_value *pargv;
+  const mrb_value *pargv;
   mrb_int argcnt;
   mrb_int i;
   mrb_value b, st;
   mrb_sym id;
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc;
 
   name = mrb_nil_value();
@@ -310,7 +308,7 @@
 {
   mrb_value members;
 
-  members = struct_ivar_get(mrb, mrb_obj_value(klass), mrb_intern_lit(mrb, "__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");
   }
@@ -321,7 +319,7 @@
 /*
  */
 static mrb_value
-mrb_struct_initialize_withArg(mrb_state *mrb, mrb_int argc, mrb_value *argv, mrb_value self)
+mrb_struct_initialize_withArg(mrb_state *mrb, mrb_int argc, const mrb_value *argv, mrb_value self)
 {
   struct RClass *klass = mrb_obj_class(mrb, self);
   mrb_int i, n;
@@ -343,7 +341,7 @@
 static mrb_value
 mrb_struct_initialize(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc;
 
   mrb_get_args(mrb, "*!", &argv, &argc);
@@ -361,7 +359,7 @@
   if (!mrb_obj_is_instance_of(mrb, s, mrb_obj_class(mrb, copy))) {
     mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
   }
-  if (!mrb_array_p(s)) {
+  if (!mrb_struct_p(s)) {
     mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
   }
   mrb_ary_replace(mrb, copy, s);
@@ -428,17 +426,13 @@
   mrb_value idx = mrb_get_arg1(mrb);
 
   if (mrb_string_p(idx)) {
-    mrb_value sym = mrb_check_intern_str(mrb, idx);
-
-    if (mrb_nil_p(sym)) {
-      mrb_name_error(mrb, mrb_intern_str(mrb, idx), "no member '%v' in struct", idx);
-    }
-    idx = sym;
+    mrb_sym sym = mrb_intern_str(mrb, idx);
+    idx = mrb_symbol_value(sym);
   }
   if (mrb_symbol_p(idx)) {
     return struct_aref_sym(mrb, s, mrb_symbol(idx));
   }
-  return struct_aref_int(mrb, s, mrb_int(mrb, idx));
+  return struct_aref_int(mrb, s, mrb_as_int(mrb, idx));
 }
 
 static mrb_value
@@ -495,18 +489,14 @@
   mrb_get_args(mrb, "oo", &idx, &val);
 
   if (mrb_string_p(idx)) {
-    mrb_value sym = mrb_check_intern_str(mrb, idx);
-
-    if (mrb_nil_p(sym)) {
-      mrb_name_error(mrb, mrb_intern_str(mrb, idx), "no member '%v' in struct", idx);
-    }
-    idx = sym;
+    mrb_sym sym = mrb_intern_str(mrb, idx);
+    idx = mrb_symbol_value(sym);
   }
   if (mrb_symbol_p(idx)) {
     return mrb_struct_aset_sym(mrb, s, mrb_symbol(idx), val);
   }
 
-  i = mrb_int(mrb, idx);
+  i = mrb_as_int(mrb, idx);
   if (i < 0) i = RSTRUCT_LEN(s) + i;
   if (i < 0) {
     mrb_raisef(mrb, E_INDEX_ERROR,
@@ -604,8 +594,8 @@
 
 /*
  * call-seq:
- *    struct.length   -> Fixnum
- *    struct.size     -> Fixnum
+ *    struct.length   -> Integer
+ *    struct.size     -> Integer
  *
  * Returns number of struct members.
  */
@@ -654,7 +644,7 @@
 mrb_struct_values_at(mrb_state *mrb, mrb_value self)
 {
   mrb_int argc;
-  mrb_value *argv;
+  const mrb_value *argv;
 
   mrb_get_args(mrb, "*", &argv, &argc);

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

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

@@ -1,7 +1,9 @@
 #include <mruby.h>
-#include <mruby/khash.h>
 #include <mruby/array.h>
 #include <mruby/string.h>
+#ifdef MRB_USE_ALL_SYMBOLS
+# include <mruby/presym.h>
+#endif
 
 /*
  *  call-seq:
@@ -18,16 +20,18 @@
  *                                     :Tms, :getwd, :$=, :ThreadGroup,
  *                                     :wait2, :$>
  */
-#ifdef MRB_ENABLE_ALL_SYMBOLS
+#ifdef MRB_USE_ALL_SYMBOLS
 static mrb_value
 mrb_sym_all_symbols(mrb_state *mrb, mrb_value self)
 {
   mrb_sym i, lim;
   mrb_value ary = mrb_ary_new_capa(mrb, mrb->symidx);
 
+  for (i=1; i<=MRB_PRESYM_MAX; i++) {
+    mrb_ary_push(mrb, ary, mrb_symbol_value(i));
+  }
   for (i=1, lim=mrb->symidx+1; i<lim; i++) {
-    mrb_sym sym = i<<1;
-    mrb_ary_push(mrb, ary, mrb_symbol_value(sym));
+    mrb_ary_push(mrb, ary, mrb_symbol_value(i+MRB_PRESYM_MAX));
   }
 
   return ary;
@@ -58,7 +62,7 @@
 mrb_mruby_symbol_ext_gem_init(mrb_state* mrb)
 {
   struct RClass *s = mrb->symbol_class;
-#ifdef MRB_ENABLE_ALL_SYMBOLS
+#ifdef MRB_USE_ALL_SYMBOLS
   mrb_define_class_method(mrb, s, "all_symbols", mrb_sym_all_symbols, MRB_ARGS_NONE());
 #endif
   mrb_define_method(mrb, s, "length", mrb_sym_length, MRB_ARGS_NONE());

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb -> _service:tar_scm:nghttp2-1.52.0.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 Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-test-inline-struct/mrbgem.rake Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/mrbgems/mruby-test-inline-struct/test Added

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

@@ -0,0 +1,85 @@
+#include <mruby.h>
+#include <mruby/class.h>
+#include <mruby/string.h>
+#include <mruby/istruct.h>
+
+static mrb_value
+istruct_test_initialize(mrb_state *mrb, mrb_value self)
+{
+  char *string = (char*)mrb_istruct_ptr(self);
+  mrb_int size = mrb_istruct_size();
+  mrb_value object = mrb_get_arg1(mrb);
+
+  if (mrb_integer_p(object)) {
+    strncpy(string, "fixnum", size-1);
+  }
+#ifndef MRB_NO_FLOAT
+  else if (mrb_float_p(object)) {
+    strncpy(string, "float", size-1);
+  }
+#endif
+  else if (mrb_string_p(object)) {
+    strncpy(string, "string", size-1);
+  }
+  else {
+    strncpy(string, "anything", size-1);
+  }
+
+  stringsize - 1 = 0; // force NULL at the end
+  return self;
+}
+
+static mrb_value
+istruct_test_to_s(mrb_state *mrb, mrb_value self)
+{
+  return mrb_str_new_cstr(mrb, (const char*)mrb_istruct_ptr(self));
+}
+
+static mrb_value
+istruct_test_length(mrb_state *mrb, mrb_value self)
+{
+  return mrb_fixnum_value(mrb_istruct_size());
+}
+
+static mrb_value
+istruct_test_test_receive(mrb_state *mrb, mrb_value self)
+{
+  mrb_value object = mrb_get_arg1(mrb);
+
+  if (mrb_obj_class(mrb, object) != mrb_class_get(mrb, "InlineStructTest"))
+  {
+    mrb_raise(mrb, E_TYPE_ERROR, "Expected InlineStructTest");
+  }
+  return mrb_bool_value(((char*)mrb_istruct_ptr(object))0 == 's');
+}
+
+static mrb_value
+istruct_test_test_receive_direct(mrb_state *mrb, mrb_value self)
+{
+  char *ptr;
+  struct RClass *klass = mrb_class_get(mrb, "InlineStructTest");
+  mrb_get_args(mrb, "I", &ptr, klass);
+  return mrb_bool_value(ptr0 == 's');
+}
+
+static mrb_value
+istruct_test_mutate(mrb_state *mrb, mrb_value self)
+{
+  char *ptr = (char*)mrb_istruct_ptr(self);
+  memcpy(ptr, "mutate", 6);
+  return mrb_nil_value();
+}
+
+void mrb_mruby_test_inline_struct_gem_test(mrb_state *mrb)
+{
+  struct RClass *cls;
+
+  cls = mrb_define_class(mrb, "InlineStructTest", mrb->object_class);
+  MRB_SET_INSTANCE_TT(cls, MRB_TT_ISTRUCT);
+  mrb_define_method(mrb, cls, "initialize", istruct_test_initialize, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, cls, "to_s", istruct_test_to_s, MRB_ARGS_NONE());
+  mrb_define_method(mrb, cls, "mutate", istruct_test_mutate, MRB_ARGS_NONE());
+  mrb_define_class_method(mrb, cls, "length", istruct_test_length, MRB_ARGS_NONE());
+  mrb_define_class_method(mrb, cls, "test_receive", istruct_test_test_receive, MRB_ARGS_REQ(1));
+  mrb_define_class_method(mrb, cls, "test_receive_direct", istruct_test_test_receive_direct, MRB_ARGS_REQ(1));
+}

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

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

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

@@ -50,7 +50,7 @@
 static mrb_value
 t_print(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc;
   mrb_int i;
 
@@ -220,15 +220,15 @@
 
   mrbtest = mrb_define_module(mrb, "Mrbtest");
 
-  mrb_define_const(mrb, mrbtest, "FIXNUM_MAX", mrb_fixnum_value(MRB_INT_MAX));
-  mrb_define_const(mrb, mrbtest, "FIXNUM_MIN", mrb_fixnum_value(MRB_INT_MIN));
-  mrb_define_const(mrb, mrbtest, "FIXNUM_BIT", mrb_fixnum_value(MRB_INT_BIT));
-
-#ifndef MRB_WITHOUT_FLOAT
-#ifdef MRB_USE_FLOAT
-  mrb_define_const(mrb, mrbtest, "FLOAT_TOLERANCE", mrb_float_value(mrb, 1e-6));
+#ifndef MRB_NO_FLOAT
+#ifdef MRB_USE_FLOAT32
+#ifdef MRB_WORDBOX_NO_FLOAT_TRUNCATE
+  mrb_define_const(mrb, mrbtest, "FLOAT_TOLERANCE", mrb_float_value(mrb, 1e-5));
+#else
+  mrb_define_const(mrb, mrbtest, "FLOAT_TOLERANCE", mrb_float_value(mrb, 1e-4));
+#endif
 #else
-  mrb_define_const(mrb, mrbtest, "FLOAT_TOLERANCE", mrb_float_value(mrb, 1e-12));
+  mrb_define_const(mrb, mrbtest, "FLOAT_TOLERANCE", mrb_float_value(mrb, 1e-10));
 #endif
 #endif
 
@@ -252,9 +252,9 @@
 #define TEST_COUNT_PASS(name)                                           \
   do {                                                                  \
     res_src = mrb_gv_get(mrb_src, mrb_intern_lit(mrb_src, "$" #name));  \
-    if (mrb_fixnum_p(res_src)) {                                        \
+    if (mrb_integer_p(res_src)) {                                       \
       mrb_value res_dst = mrb_gv_get(mrb_dst, mrb_intern_lit(mrb_dst, "$" #name)); \
-      mrb_gv_set(mrb_dst, mrb_intern_lit(mrb_dst, "$" #name), mrb_fixnum_value(mrb_fixnum(res_dst) + mrb_fixnum(res_src))); \
+      mrb_gv_set(mrb_dst, mrb_intern_lit(mrb_dst, "$" #name), mrb_int_value(mrb_dst, mrb_integer(res_dst) + mrb_integer(res_src))); \
     }                                                                   \
   } while (FALSE)                                                       \

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

@@ -3,32 +3,24 @@
   spec.author  = 'mruby developers'
   spec.summary = 'mruby test'
 
-  build.bins << 'mrbtest'
-  spec.add_dependency('mruby-compiler', :core => 'mruby-compiler')
-
   spec.test_rbfiles = Dir.glob("#{MRUBY_ROOT}/test/t/*.rb")
 
   clib = "#{build_dir}/mrbtest.c"
   mlib = clib.ext(exts.object)
   exec = exefile("#{build.build_dir}/bin/mrbtest")
-
-  mrbtest_lib = libfile("#{build_dir}/mrbtest")
-  mrbtest_objs = 
-
-  driver_objs = Dir.glob("#{dir}/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
-    objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X"))
-  end
-
   assert_c = "#{build_dir}/assert.c"
   assert_rb = "#{MRUBY_ROOT}/test/assert.rb"
   assert_lib = assert_c.ext(exts.object)
-  mrbtest_objs << assert_lib
+  mrbtest_lib = libfile("#{build_dir}/mrbtest")
+  mrbtest_objs = assert_lib
+  driver_objs = srcs_to_objs(".")
 
   file assert_lib => assert_c
   file assert_c => assert_rb, build.mrbcfile do |t|
+    _pp "GEN", t.name.relative_path
     mkdir_p File.dirname(t.name)
     open(t.name, 'w') do |f|
-      mrbc.run f, assert_rb, 'mrbtest_assert_irep'
+      mrbc.run f, assert_rb, 'mrbtest_assert_irep', cdump: false
     end
   end
 
@@ -36,11 +28,13 @@
 
   build.gems.each do |g|
     test_rbobj = g.test_rbireps.ext(exts.object)
-    g.test_objs << test_rbobj
-    dep_list = build.gems.tsort_dependencies(g.test_dependencies, gem_table).select(&:generate_functions)
+    mrbtest_objs.concat(g.test_objs)
+    mrbtest_objs << test_rbobj
+    dep_list = build.gems.tsort_dependencies(g.name, gem_table).select(&:generate_functions)
 
     file test_rbobj => g.test_rbireps
     file g.test_rbireps => g.test_rbfiles, build.mrbcfile.flatten do |t|
+      _pp "GEN", t.name.relative_path
       mkdir_p File.dirname(t.name)
       open(t.name, 'w') do |f|
         g.print_gem_test_header(f)
@@ -58,12 +52,12 @@
         if test_preload.nil?
           f.puts %Qextern const uint8_t mrbtest_assert_irep;
         else
-          g.build.mrbc.run f, test_preload, "gem_test_irep_#{g.funcname}_preload"
+          g.build.mrbc.run f, test_preload, "gem_test_irep_#{g.funcname}_preload", cdump: false
         end
         g.test_rbfiles.flatten.each_with_index do |rbfile, i|
-          g.build.mrbc.run f, rbfile, "gem_test_irep_#{g.funcname}_#{i}"
+          g.build.mrbc.run f, rbfile, "gem_test_irep_#{g.funcname}_#{i}", cdump: false, static: true
         end
-        f.puts %Qvoid mrb_#{g.funcname}_gem_test(mrb_state *mrb); unless g.test_objs.empty?
+        f.puts %Qvoid mrb_#{g.funcname}_gem_test(mrb_state *mrb); if g.custom_test_init?
         dep_list.each do |d|
           f.puts %Qvoid GENERATED_TMP_mrb_#{d.funcname}_gem_init(mrb_state *mrb);
           f.puts %Qvoid GENERATED_TMP_mrb_#{d.funcname}_gem_final(mrb_state *mrb);
@@ -81,7 +75,7 @@
             f.puts %Q  ai = mrb_gc_arena_save(mrb);
             f.puts %Q  mrb2 = mrb_open_core(mrb_default_allocf, NULL);
             f.puts %Q  if (mrb2 == NULL) {
-            f.puts %Q    fprintf(stderr, "Invalid mrb_state, exiting \%s", __FUNCTION__);
+            f.puts %Q    fprintf(stderr, "Invalid mrb_state, exiting \%s", __func__);
             f.puts %Q    exit(EXIT_FAILURE);
             f.puts %Q  }
             dep_list.each do |d|
@@ -126,41 +120,19 @@
     end
   end
 
-  build.gems.each do |v|
-    mrbtest_objs.concat v.test_objs
-  end
-
   file mrbtest_lib => mrbtest_objs do |t|
     build.archiver.run t.name, t.prerequisites
   end
 
   unless build.build_mrbtest_lib_only?
     file exec => *driver_objs, mlib, mrbtest_lib, build.libmruby_static do |t|
-      gem_flags = build.gems.map { |g| g.linker.flags }
-      gem_flags_before_libraries = build.gems.map { |g| g.linker.flags_before_libraries }
-      gem_flags_after_libraries = build.gems.map { |g| g.linker.flags_after_libraries }
-      gem_libraries = build.gems.map { |g| g.linker.libraries }
-      gem_library_paths = build.gems.map { |g| g.linker.library_paths }
-      build.linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags,
-                       gem_flags_before_libraries, gem_flags_after_libraries
+      build.linker.run t.name, t.prerequisites, *build.gems.linker_attrs
     end
   end
 
-  # store the last gem selection and make the re-build
-  # of the test gem depending on a change to the gem
-  # selection
-  active_gems_path = "#{build_dir}/active_gems_path.lst"
-  active_gem_list = File.read active_gems_path if File.exist? active_gems_path
-  current_gem_list = build.gems.map(&:name).join("\n")
-  task active_gems_path do |_t|
-    mkdir_p File.dirname(active_gems_path)
-    File.write active_gems_path, current_gem_list
-  end
-  file clib => active_gems_path if active_gem_list != current_gem_list
-
   file mlib => clib
-  file clib => build.mrbcfile, __FILE__ do |_t|
-    _pp "GEN", "*.rb", "#{clib.relative_path}"
+  file clib => "#{build.build_dir}/mrbgems/active_gems.txt", build.mrbcfile, __FILE__ do |_t|
+    _pp "GEN", clib.relative_path
     mkdir_p File.dirname(clib)
     open(clib, 'w') do |f|
       f.puts %Q/*

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

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

@@ -4,22 +4,23 @@
 ** See Copyright Notice in mruby.h
 */
 
-#ifndef MRB_WITHOUT_FLOAT
-#include <math.h>
-#endif
-
 #include <mruby.h>
 #include <mruby/class.h>
 #include <mruby/data.h>
 #include <mruby/numeric.h>
 #include <mruby/time.h>
 #include <mruby/string.h>
+#include <mruby/presym.h>
 
-#ifdef MRB_DISABLE_STDIO
+#ifdef MRB_NO_STDIO
 #include <string.h>
 #endif
 
+
 #include <stdlib.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
 
 #define NDIV(x,y) (-(-((x)+1)/(y))-1)
 #define TO_S_FMT "%Y-%m-%d %H:%M:%S "
@@ -30,7 +31,7 @@
 }
 #endif
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 # if !defined(__MINGW64__) && defined(_WIN32)
 #  define llround(x) round(x)
 # endif
@@ -62,10 +63,14 @@
 #define NO_GMTIME_R
 #endif
 #endif
+#ifdef __STRICT_ANSI__
+/* Strict ANSI (e.g. -std=c99) do not provide gmtime_r/localtime_r */
+#define NO_GMTIME_R
+#endif
 
 /* asctime(3) */
 /* mruby usually use its own implementation of struct tm to string conversion */
-/* except when DISABLE_STDIO is set. In that case, it uses asctime() or asctime_r(). */
+/* except when MRB_NO_STDIO is set. In that case, it uses asctime() or asctime_r(). */
 /* By default mruby tries to use asctime_r() which is reentrant. */
 /* Undef following macro on platforms that does not have asctime_r(). */
 /* #define NO_ASCTIME_R */
@@ -77,8 +82,12 @@
 
 /** end of Time class configuration */
 
-#ifndef NO_GETTIMEOFDAY
-# ifdef _WIN32
+#if (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) && defined(CLOCK_REALTIME)
+# define USE_CLOCK_GETTIME
+#endif
+
+#if !defined(NO_GETTIMEOFDAY)
+# if defined(_WIN32) && !defined(USE_CLOCK_GETTIME)
 #  define WIN32_LEAN_AND_MEAN  /* don't include winsock.h */
 #  include <windows.h>
 #  define gettimeofday my_gettimeofday
@@ -169,18 +178,7 @@
 * second level. Also, there are only 2 timezones, namely UTC and LOCAL.
 */
 
-typedef struct mrb_timezone_name {
-  const char name8;
-  size_t len;
-} mrb_timezone_name;
-
-static const mrb_timezone_name timezone_names = {
-  { "none", sizeof("none") - 1 },
-  { "UTC", sizeof("UTC") - 1 },
-  { "LOCAL", sizeof("LOCAL") - 1 },
-};
-
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 static const char mon_names124 = {
   "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
 };
@@ -199,13 +197,13 @@
 
 static const struct mrb_data_type mrb_time_type = { "Time", mrb_free };
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 void mrb_check_num_exact(mrb_state *mrb, mrb_float num);
 typedef mrb_float mrb_sec;
 #define mrb_sec_value(mrb, sec) mrb_float_value(mrb, sec)
 #else
 typedef mrb_int mrb_sec;
-#define mrb_sec_value(mrb, sec) mrb_fixnum_value(sec)
+#define mrb_sec_value(mrb, sec) mrb_int_value(mrb, sec)
 #endif
 
 #define MRB_TIME_T_UINT (~(time_t)0 > 0)
@@ -213,17 +211,23 @@
   MRB_TIME_T_UINT ? 0 :                                                     \
                     (sizeof(time_t) <= 4 ? INT32_MIN : INT64_MIN)           \
 )
-#define MRB_TIME_MAX (                                                      \
+#define MRB_TIME_MAX (time_t)(                                              \
   MRB_TIME_T_UINT ? (sizeof(time_t) <= 4 ? UINT32_MAX : UINT64_MAX) :       \
                     (sizeof(time_t) <= 4 ? INT32_MAX : INT64_MAX)           \
 )
 
+#ifndef MRB_NO_FLOAT
+/* return true if time_t is fit in mrb_int */
 static mrb_bool
 fixable_time_t_p(time_t v)
 {
   if (MRB_INT_MIN <= MRB_TIME_MIN && MRB_TIME_MAX <= MRB_INT_MAX) return TRUE;
-  return FIXABLE(v);
+  if (v > (time_t)MRB_INT_MAX) return FALSE;
+  if (MRB_TIME_T_UINT) return TRUE;
+  if (MRB_INT_MIN > (mrb_int)v) return FALSE;
+  return TRUE;
 }
+#endif
 
 static time_t
 mrb_to_time_t(mrb_state *mrb, mrb_value obj, time_t *usec)
@@ -231,7 +235,7 @@
   time_t t;
 
   switch (mrb_type(obj)) {
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
     case MRB_TT_FLOAT:
       {
         mrb_float f = mrb_float(obj);
@@ -250,14 +254,14 @@
         }
       }
       break;
-#endif /* MRB_WITHOUT_FLOAT */
+#endif /* MRB_NO_FLOAT */
     default:
-    case MRB_TT_FIXNUM:
+    case MRB_TT_INTEGER:
       {
-        mrb_int i = mrb_int(mrb, obj);
+        mrb_int i = mrb_integer(obj);
 
-        if ((MRB_INT_MAX > MRB_TIME_MAX && i > 0 && i > (mrb_int)MRB_TIME_MAX) ||
-            (MRB_TIME_MIN > MRB_INT_MIN && MRB_TIME_MIN > i)) {
+        if ((MRB_INT_MAX > MRB_TIME_MAX && i > 0 && (time_t)i > MRB_TIME_MAX) ||
+            (0 > MRB_TIME_MIN && MRB_TIME_MIN > MRB_INT_MIN && MRB_TIME_MIN > i)) {
           goto out_of_range;
         }
 
@@ -322,7 +326,7 @@
   tm = (struct mrb_time *)mrb_malloc(mrb, sizeof(struct mrb_time));
   tm->sec  = sec;
   tm->usec = usec;
-  if (tm->usec < 0) {
+  if (MRB_TIME_T_UINT && tm->usec < 0) {
     long sec2 = (long)NDIV(tm->usec,1000000); /* negative div */
     tm->usec -= sec2 * 1000000;
     tm->sec += sec2;
@@ -371,9 +375,14 @@
 #if defined(TIME_UTC) && !defined(__ANDROID__)
   {
     struct timespec ts;
-    if (timespec_get(&ts, TIME_UTC) == 0) {
-      mrb_raise(mrb, E_RUNTIME_ERROR, "timespec_get() failed for unknown reasons");
-    }
+    timespec_get(&ts, TIME_UTC);
+    sec = ts.tv_sec;
+    usec = ts.tv_nsec / 1000;
+  }
+#elif defined(USE_CLOCK_GETTIME)
+  {
+    struct timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
     sec = ts.tv_sec;
     usec = ts.tv_nsec / 1000;
   }
@@ -420,7 +429,7 @@
 MRB_API mrb_value
 mrb_time_at(mrb_state *mrb, time_t sec, time_t usec, enum mrb_timezone zone)
 {
-  return mrb_time_make_time(mrb, mrb_class_get(mrb, "Time"), sec, usec, zone);
+  return mrb_time_make_time(mrb, mrb_class_get_id(mrb, MRB_SYM(Time)), sec, usec, zone);
 }
 
 /* 15.2.19.6.1 */
@@ -444,22 +453,29 @@
   time_t nowsecs;
   struct tm nowtime = { 0 };
 
-  nowtime.tm_year  = (int)ayear  - 1900;
-  nowtime.tm_mon   = (int)amonth - 1;
+#if MRB_INT_MAX > INT_MAX
+#define OUTINT(x) (((MRB_TIME_T_UINT ? 0 : INT_MIN) > (x)) || (x) > INT_MAX)
+#else
+#define OUTINT(x) 0
+#endif
+
+  if (OUTINT(ayear-1900) ||
+      amonth  < 1 || amonth  > 12 ||
+      aday    < 1 || aday    > 31 ||
+      ahour   < 0 || ahour   > 24 ||
+      (ahour == 24 && (amin > 0 || asec > 0)) ||
+      amin    < 0 || amin    > 59 ||
+      asec    < 0 || asec    > 60)
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "argument out of range");
+
+  nowtime.tm_year  = (int)(ayear  - 1900);
+  nowtime.tm_mon   = (int)(amonth - 1);
   nowtime.tm_mday  = (int)aday;
   nowtime.tm_hour  = (int)ahour;
   nowtime.tm_min   = (int)amin;
   nowtime.tm_sec   = (int)asec;
   nowtime.tm_isdst = -1;
 
-  if (nowtime.tm_mon  < 0 || nowtime.tm_mon  > 11
-      || nowtime.tm_mday < 1 || nowtime.tm_mday > 31
-      || nowtime.tm_hour < 0 || nowtime.tm_hour > 24
-      || (nowtime.tm_hour == 24 && (nowtime.tm_min > 0 || nowtime.tm_sec > 0))
-      || nowtime.tm_min  < 0 || nowtime.tm_min  > 59
-      || nowtime.tm_sec  < 0 || nowtime.tm_sec  > 60)
-    mrb_raise(mrb, E_RUNTIME_ERROR, "argument out of range");
-
   if (timezone == MRB_TIMEZONE_UTC) {
     nowsecs = timegm(&nowtime);
   }
@@ -467,7 +483,7 @@
     nowsecs = mktime(&nowtime);
   }
   if (nowsecs == (time_t)-1) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time.");
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time");
   }
 
   return time_alloc_time(mrb, nowsecs, ausec, timezone);
@@ -551,6 +567,12 @@
   return mrb_fixnum_value(0);
 }
 
+static mrb_noreturn void
+int_overflow(mrb_state *mrb, const char *reason)
+{
+  mrb_raisef(mrb, E_RANGE_ERROR, "time_t overflow in Time %s", reason);
+}
+
 static mrb_value
 mrb_time_plus(mrb_state *mrb, mrb_value self)
 {
@@ -560,7 +582,24 @@
 
   tm = time_get_ptr(mrb, self);
   sec = mrb_to_time_t(mrb, o, &usec);
-  return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), tm->sec+sec, tm->usec+usec, tm->timezone);
+#ifdef MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
+  if (__builtin_add_overflow(tm->sec, sec, &sec)) {
+    int_overflow(mrb, "addition");
+  }
+#else
+  if (sec >= 0) {
+    if (tm->sec > MRB_TIME_MAX - sec) {
+      int_overflow(mrb, "addition");
+    }
+  }
+  else {
+    if (tm->sec < MRB_TIME_MIN - sec) {
+      int_overflow(mrb, "addition");
+    }
+  }
+  sec = tm->sec + sec;
+#endif
+  return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec+usec, tm->timezone);
 }
 
 static mrb_value
@@ -572,7 +611,7 @@
   tm = time_get_ptr(mrb, self);
   tm2 = DATA_CHECK_GET_PTR(mrb, other, &mrb_time_type, struct mrb_time);
   if (tm2) {
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
     mrb_float f;
     f = (mrb_sec)(tm->sec - tm2->sec)
       + (mrb_sec)(tm->usec - tm2->usec) / 1.0e6;
@@ -581,13 +620,30 @@
     mrb_int f;
     f = tm->sec - tm2->sec;
     if (tm->usec < tm2->usec) f--;
-    return mrb_fixnum_value(f);
+    return mrb_int_value(mrb, f);
 #endif
   }
   else {
     time_t sec, usec;
     sec = mrb_to_time_t(mrb, other, &usec);
-    return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), tm->sec-sec, tm->usec-usec, tm->timezone);
+#ifdef MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
+    if (__builtin_sub_overflow(tm->sec, sec, &sec)) {
+      int_overflow(mrb, "subtraction");
+    }
+#else
+    if (sec >= 0) {
+      if (tm->sec < MRB_TIME_MIN + sec) {
+        int_overflow(mrb, "subtraction");
+      }
+    }
+    else {
+      if (tm->sec > MRB_TIME_MAX + sec) {
+        int_overflow(mrb, "subtraction");
+      }
+    }
+    sec = tm->sec - sec;
+#endif
+    return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec-usec, tm->timezone);
   }
 }
 
@@ -624,19 +680,35 @@
   return mrb_fixnum_value(tm->datetime.tm_year + 1900);
 }
 
+static size_t
+time_zonename(mrb_state *mrb, struct mrb_time *tm, char *buf, size_t len)
+{
+#if defined(_MSC_VER) && _MSC_VER < 1900 || defined(__MINGW64__) || defined(__MINGW32__)
+  struct tm datetime = {0};
+  time_t utc_sec = timegm(&tm->datetime);
+  int offset = abs((int)(utc_sec - tm->sec) / 60);
+  datetime.tm_year = 100;
+  datetime.tm_hour = offset / 60;
+  datetime.tm_min = offset % 60;
+  buf0 = utc_sec < tm->sec ? '-' : '+';
+  return strftime(buf+1, len-1, "%H%M", &datetime) + 1;
+#else
+  return strftime(buf, len, "%z", &tm->datetime);
+#endif
+}
+
 /* 15.2.19.7.33 */
 /* Returns name of time's timezone. */
 static mrb_value
 mrb_time_zone(mrb_state *mrb, mrb_value self)
 {
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  if (tm->timezone <= MRB_TIMEZONE_NONE) return mrb_nil_value();
-  if (tm->timezone >= MRB_TIMEZONE_LAST) return mrb_nil_value();
-  return mrb_str_new_static(mrb,
-                            timezone_namestm->timezone.name,
-                            timezone_namestm->timezone.len);
+  struct mrb_time *tm = time_get_ptr(mrb, self);
+  if (tm->timezone == MRB_TIMEZONE_UTC) {
+    return mrb_str_new_lit(mrb, "UTC");
+  }
+  char buf64;
+  size_t len = time_zonename(mrb, tm, buf, sizeof(buf));
+  return mrb_str_new(mrb, buf, len);
 }
 
 /* 15.2.19.7.4 */
@@ -648,17 +720,16 @@
   struct tm *d = &tm->datetime;
   int len;
 
-#if defined(MRB_DISABLE_STDIO)
-  char *s;
+#if defined(MRB_NO_STDIO)
 # ifdef NO_ASCTIME_R
-  s = asctime(d);
+  char *buf = asctime(d);
 # else
-  char buf32;
+  char buf32, *s;
   s = asctime_r(d, buf);
 # endif
-  len = strlen(s)-1;            /* truncate the last newline */
+  len = strlen(buf)-1;       /* truncate the last newline */
 #else
-  char buf256;
+  char buf32;
 
   len = snprintf(buf, sizeof(buf), "%s %s %2d %02d:%02d:%02d %.4d",
     wday_namesd->tm_wday, mon_namesd->tm_mon, d->tm_mday,
@@ -821,7 +892,7 @@
   return mrb_fixnum_value(tm->datetime.tm_min);
 }
 
-/* 15.2.19.7.21 and 15.2.19.7.22 */
+/* 15.2.19.7.21 (mon) and 15.2.19.7.22 (month) */
 /* Returns month of time. */
 static mrb_value
 mrb_time_mon(mrb_state *mrb, mrb_value self)
@@ -843,7 +914,7 @@
   return mrb_fixnum_value(tm->datetime.tm_sec);
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 /* 15.2.19.7.24 */
 /* Returns a Float with the time since the epoch in seconds. */
 static mrb_value
@@ -864,27 +935,22 @@
   struct mrb_time *tm;
 
   tm = time_get_ptr(mrb, self);
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   if (!fixable_time_t_p(tm->sec)) {
     return mrb_float_value(mrb, (mrb_float)tm->sec);
   }
 #endif
-  return mrb_fixnum_value((mrb_int)tm->sec);
+  return mrb_int_value(mrb, (mrb_int)tm->sec);
 }
 
 /* 15.2.19.7.26 */
-/* Returns an Integer with the time since the epoch in microseconds. */
+/* Returns the number of microseconds for time. */
 static mrb_value
 mrb_time_usec(mrb_state *mrb, mrb_value self)
 {
   struct mrb_time *tm;
 
   tm = time_get_ptr(mrb, self);
-#ifndef MRB_WITHOUT_FLOAT
-  if (!fixable_time_t_p(tm->usec)) {
-    return mrb_float_value(mrb, (mrb_float)tm->usec);
-  }
-#endif
   return mrb_fixnum_value((mrb_int)tm->usec);
 }
 
@@ -912,44 +978,20 @@
   return mrb_bool_value(tm->timezone == MRB_TIMEZONE_UTC);
 }
 
-static size_t
-time_to_s_utc(mrb_state *mrb, struct mrb_time *tm, char *buf, size_t buf_len)
-{
-  return strftime(buf, buf_len, TO_S_FMT "UTC", &tm->datetime);
-}
-
-static size_t
-time_to_s_local(mrb_state *mrb, struct mrb_time *tm, char *buf, size_t buf_len)
-{
-#if defined(_MSC_VER) && _MSC_VER < 1900 || defined(__MINGW64__) || defined(__MINGW32__)
-  struct tm datetime = {0};
-  time_t utc_sec = timegm(&tm->datetime);
-  size_t len;
-  int offset;
-
-  if (utc_sec == (time_t)-1) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time.");
-  }
-  offset = abs((int)(utc_sec - tm->sec) / 60);
-  datetime.tm_year = 100;
-  datetime.tm_hour = offset / 60;
-  datetime.tm_min = offset % 60;
-  len = strftime(buf, buf_len, TO_S_FMT, &tm->datetime);
-  buflen++ = utc_sec < tm->sec ? '-' : '+';
-
-  return len + strftime(buf + len, buf_len - len, "%H%M", &datetime);
-#else
-  return strftime(buf, buf_len, TO_S_FMT "%z", &tm->datetime);
-#endif
-}
-
 static mrb_value
 mrb_time_to_s(mrb_state *mrb, mrb_value self)
 {
-  char buf64;
   struct mrb_time *tm = time_get_ptr(mrb, self);
-  mrb_bool utc = tm->timezone == MRB_TIMEZONE_UTC;
-  size_t len = (utc ? time_to_s_utc : time_to_s_local)(mrb, tm, buf, sizeof(buf));
+  char buf64;
+  size_t len;
+
+  if (tm->timezone == MRB_TIMEZONE_UTC) {
+    len = strftime(buf, sizeof(buf), TO_S_FMT "UTC", &tm->datetime);
+  }
+  else {
+    len = strftime(buf, sizeof(buf), TO_S_FMT, &tm->datetime);
+    len += time_zonename(mrb, tm, buf+len, sizeof(buf)-len);
+  }
   mrb_value str = mrb_str_new(mrb, buf, len);
   RSTR_SET_ASCII_FLAG(mrb_str_ptr(str));
   return str;
@@ -995,7 +1037,7 @@
 
   mrb_define_method(mrb, tc, "sec" , mrb_time_sec, MRB_ARGS_NONE());        /* 15.2.19.7.23 */
   mrb_define_method(mrb, tc, "to_i", mrb_time_to_i, MRB_ARGS_NONE());       /* 15.2.19.7.25 */
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   mrb_define_method(mrb, tc, "to_f", mrb_time_to_f, MRB_ARGS_NONE());       /* 15.2.19.7.24 */
 #endif
   mrb_define_method(mrb, tc, "usec", mrb_time_usec, MRB_ARGS_NONE());       /* 15.2.19.7.26 */

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

@@ -12,6 +12,7 @@
 assert('Time.at', '15.2.19.6.1') do
   assert_kind_of(Time, Time.at(1300000000.0))
 
+  skip unless Object.const_defined?(:Float)
   assert_raise(FloatDomainError) { Time.at(Float::NAN) }
   assert_raise(FloatDomainError) { Time.at(Float::INFINITY) }
   assert_raise(FloatDomainError) { Time.at(-Float::INFINITY) }
@@ -69,31 +70,33 @@
 end
 
 assert('Time#+', '15.2.19.7.1') do
-  t1 = Time.at(1300000000.0)
+  t1 = Time.at(1300000000)
   t2 = t1.+(60)
 
   assert_equal("Sun Mar 13 07:07:40 2011", t2.utc.asctime)
 
+  skip unless Object.const_defined?(:Float)
   assert_raise(FloatDomainError) { Time.at(0) + Float::NAN }
   assert_raise(FloatDomainError) { Time.at(0) + Float::INFINITY }
   assert_raise(FloatDomainError) { Time.at(0) + -Float::INFINITY }
 end
 
 assert('Time#-', '15.2.19.7.2') do
-  t1 = Time.at(1300000000.0)
+  t1 = Time.at(1300000000)
   t2 = t1.-(60)
 
   assert_equal("Sun Mar 13 07:05:40 2011", t2.utc.asctime)
 
+  skip unless Object.const_defined?(:Float)
   assert_raise(FloatDomainError) { Time.at(0) - Float::NAN }
   assert_raise(FloatDomainError) { Time.at(0) - Float::INFINITY }
   assert_raise(FloatDomainError) { Time.at(0) - -Float::INFINITY }
 end
 
 assert('Time#<=>', '15.2.19.7.3') do
-  t1 = Time.at(1300000000.0)
-  t2 = Time.at(1400000000.0)
-  t3 = Time.at(1500000000.0)
+  t1 = Time.at(1300000000)
+  t2 = Time.at(1400000000)
+  t3 = Time.at(1500000000)
 
   assert_equal(1, t2 <=> t1)
   assert_equal(0, t2 <=> t2)
@@ -118,7 +121,7 @@
 end
 
 assert('Time#getgm', '15.2.19.7.8') do
-  assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000.0).getgm.asctime)
+  assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000).getgm.asctime)
 end
 
 assert('Time#getlocal', '15.2.19.7.9') do
@@ -131,11 +134,11 @@
 end
 
 assert('Time#getutc', '15.2.19.7.10') do
-  assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000.0).getutc.asctime)
+  assert_equal("Sun Mar 13 07:06:40 2011", Time.at(1300000000).getutc.asctime)
 end
 
 assert('Time#gmt?', '15.2.19.7.11') do
-  assert_predicate(Time.at(1300000000.0).utc, :gmt?)
+  assert_predicate(Time.at(1300000000).utc, :gmt?)
 end
 
 # ATM not implemented
@@ -192,14 +195,17 @@
 end
 
 assert('Time#to_f', '15.2.19.7.24') do
+  skip unless Object.const_defined?(:Float)
   assert_operator(2.0, :eql?, Time.at(2).to_f)
 end
 
 assert('Time#to_i', '15.2.19.7.25') do
-  assert_operator(2, :eql?, Time.at(2.0).to_i)
+  assert_operator(2, :eql?, Time.at(2).to_i)
 end
 
 assert('Time#usec', '15.2.19.7.26') do
+  assert_equal(0, Time.at(1300000000).usec)
+  skip unless Object.const_defined?(:Float)
   assert_equal(0, Time.at(1300000000.0).usec)
 end
 
@@ -210,7 +216,7 @@
 end
 
 assert('Time#utc?', '15.2.19.7.28') do
-  assert_predicate(Time.at(1300000000.0).utc, :utc?)
+  assert_predicate(Time.at(1300000000).utc, :utc?)
 end
 
 # ATM not implemented
@@ -229,7 +235,7 @@
 end
 
 assert('Time#zone', '15.2.19.7.33') do
-  assert_equal('UTC', Time.at(1300000000.0).utc.zone)
+  assert_equal('UTC', Time.at(1300000000).utc.zone)
 end
 
 # Not ISO specified

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

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

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

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

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

@@ -0,0 +1,54 @@
+# It also works with MRB_NO_STDIO and MRB_NO_FLOAT.
+
+MRuby::GemBox.new do |conf|
+  # Use Comparable module extension
+  conf.gem :core => "mruby-compar-ext"
+
+  # Use Enumerable module extension
+  conf.gem :core => "mruby-enum-ext"
+
+  # Use String class extension
+  conf.gem :core => "mruby-string-ext"
+
+  # Use Numeric class extension
+  conf.gem :core => "mruby-numeric-ext"
+
+  # Use Array class extension
+  conf.gem :core => "mruby-array-ext"
+
+  # Use Hash class extension
+  conf.gem :core => "mruby-hash-ext"
+
+  # Use Range class extension
+  conf.gem :core => "mruby-range-ext"
+
+  # Use Proc class extension
+  conf.gem :core => "mruby-proc-ext"
+
+  # Use Symbol class extension
+  conf.gem :core => "mruby-symbol-ext"
+
+  # Use Object class extension
+  conf.gem :core => "mruby-object-ext"
+
+  # Use ObjectSpace class
+  conf.gem :core => "mruby-objectspace"
+
+  # Use Fiber class
+  conf.gem :core => "mruby-fiber"
+
+  # Use Enumerator class (require mruby-fiber)
+  conf.gem :core => "mruby-enumerator"
+
+  # Use Enumerator::Lazy class (require mruby-enumerator)
+  conf.gem :core => "mruby-enum-lazy"
+
+  # Use toplevel object (main) methods extension
+  conf.gem :core => "mruby-toplevel-ext"
+
+  # Use Kernel module extension
+  conf.gem :core => "mruby-kernel-ext"
+
+  # Use class/module extension
+  conf.gem :core => "mruby-class-ext"
+end

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

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

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

@@ -4,22 +4,21 @@
 #
 # ISO 15.2.12
 class Array
-
   ##
   # Calls the given block for each element of +self+
   # and pass the respective element.
   #
   # ISO 15.2.12.5.10
-  # def each(&block)
-  #   return to_enum :each unless block
+  def each(&block)
+    return to_enum :each unless block
 
-  #   idx = 0
-  #   while idx < length
-  #     block.call(selfidx)
-  #     idx += 1
-  #   end
-  #   self
-  # end
+    idx = 0
+    while idx < length
+      block.call(selfidx)
+      idx += 1
+    end
+    self
+  end
 
   ##
   # Calls the given block for each element of +self+
@@ -66,6 +65,10 @@
   #
   # ISO 15.2.12.5.15
   def initialize(size=0, obj=nil, &block)
+    if size.is_a?(Array) && obj==nil && block == nil
+      self.replace(size)
+      return self
+    end
     size = size.__to_int
     raise ArgumentError, "negative array size" if size < 0
 
@@ -189,13 +192,6 @@
     return block.call if ret.nil? && block
     ret
   end
-end
-
-##
-# Array is enumerable
-class Array
-  # ISO 15.2.12.3
-  include Enumerable
 
   ##
   # Sort all elements and replace +self+ with these
@@ -268,4 +264,14 @@
   def sort(&block)
     self.dup.sort!(&block)
   end
+
+  def to_a
+    self
+  end
+  alias entries to_a
+
+  ##
+  # Array is enumerable
+  # ISO 15.2.12.3
+  include Enumerable
 end

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

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

@@ -4,6 +4,12 @@
 # ISO 15.2.13
 class Hash
   ##
+  # Hash is enumerable
+  #
+  # ISO 15.2.13.3
+  include Enumerable
+
+  ##
   #  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
@@ -145,26 +151,6 @@
   end
 
   ##
-  # Replaces the contents of <i>hsh</i> with the contents of other hash
-  #
-  # ISO 15.2.13.4.23
-  def replace(hash)
-    raise TypeError, "Hash required (#{hash.class} given)" unless Hash === hash
-    self.clear
-    hash.each_key{|k|
-      selfk = hashk
-    }
-    if hash.default_proc
-      self.default_proc = hash.default_proc
-    else
-      self.default = hash.default
-    end
-    self
-  end
-  # ISO 15.2.13.4.17
-  alias initialize_copy replace
-
-  ##
   # Return a hash which contains the content of
   # +self+ and +other+. If a block is given
   # it will be called for each element with
@@ -203,7 +189,7 @@
   end
   ##
   # Return the contents of this hash as a string.
- #
+  #
   # ISO 15.2.13.4.30 (x)
   def inspect
     self._inspect({})
@@ -317,11 +303,3 @@
     h
   end
 end
-
-##
-# Hash is enumerable
-#
-# ISO 15.2.13.3
-class Hash
-  include Enumerable
-end

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

@@ -34,11 +34,11 @@
 end
 
 ##
-# Integral
+# Integer
 #
-# mruby special - module to share methods between Floats and Integers
-#                 to make them compatible
-module Integral
+# ISO 15.2.8
+##
+class Integer
   ##
   # Calls the given block once for each Integer
   # from +self+ downto +num+.
@@ -125,19 +125,12 @@
     end
     self
   end
-end
 
-##
-# Integer
-#
-# ISO 15.2.8
-class Integer
-  include Integral
   ##
   # Returns the receiver simply.
   #
   # ISO 15.2.8.3.14
-  def ceil
+  def ceil(n=0)
     self
   end
 
@@ -145,7 +138,7 @@
   # Returns the receiver simply.
   #
   # ISO 15.2.8.3.17
-  def floor
+  def floor(n=0)
     self
   end
 
@@ -161,3 +154,35 @@
   # ISO 15.2.8.3.26
   alias truncate floor
 end
+
+class Float
+  ##
+  # Calls the given block from +self+ to +num+
+  # incremented by +step+ (default 1).
+  #
+  def step(num=nil, step=1, &block)
+    raise ArgumentError, "step can't be 0" if step == 0
+    return to_enum(:step, num, step) unless block
+
+    i = self
+    if num == self || step.infinite?
+      block.call(i) if step > 0 && i <= (num||i) || step < 0 && i >= (num||-i)
+    elsif num == nil
+      while true
+        block.call(i)
+        i += step
+      end
+    elsif step > 0
+      while i <= num
+        block.call(i)
+        i += step
+      end
+    else
+      while i >= num
+        block.call(i)
+        i += step
+      end
+    end
+    self
+  end
+end if Object.const_defined?(:Float)

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

@@ -3,6 +3,11 @@
 #
 # ISO 15.2.14
 class Range
+  ##
+  # Range is enumerable
+  #
+  # ISO 15.2.14.3
+  include Enumerable
 
   ##
   # Calls the given block for each element of +self+
@@ -12,10 +17,27 @@
   def each(&block)
     return to_enum :each unless block
 
-    val = self.first
-    last = self.last
+    val = self.begin
+    last = self.end
+
+    if val.kind_of?(Integer) && last.nil?
+      i = val
+      while true
+        block.call(i)
+        i += 1
+      end
+      return self
+    end
+
+    if val.kind_of?(String) && last.nil?
+      if val.respond_to? :__upto_endless
+        return val.__upto_endless(&block)
+      else
+        str_each = true
+      end
+    end
 
-    if val.kind_of?(Fixnum) && last.kind_of?(Fixnum) # fixnums are special
+    if val.kind_of?(Integer) && last.kind_of?(Integer) # integers are special
       lim = last
       lim += 1 unless exclude_end?
       i = val
@@ -56,12 +78,20 @@
     h += 1 if self.exclude_end?
     h
   end
-end
 
-##
-# Range is enumerable
-#
-# ISO 15.2.14.3
-class Range
-  include Enumerable
+  ##
+  # call-seq:
+  #    rng.to_a                   -> array
+  #    rng.entries                -> array
+  #
+  # Returns an array containing the items in the range.
+  #
+  #   (1..7).to_a  #=> 1, 2, 3, 4, 5, 6, 7
+  #   (1..).to_a   #=> RangeError: cannot convert endless range to an array
+  def to_a
+    a = __num_to_a
+    return a if a
+    super
+  end
+  alias entries to_a
 end

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

@@ -29,54 +29,19 @@
     string = dup
     self_len = length
     sep_len = separator.length
-    should_yield_subclass_instances = self.class != String
 
     while (pointer = string.index(separator, start))
       pointer += sep_len
       pointer += 1 while paragraph_mode && stringpointer == "\n"
-      if should_yield_subclass_instances
-        block.call(self.class.new(stringstart, pointer - start))
-      else
-        block.call(stringstart, pointer - start)
-      end
+      block.call(stringstart, pointer - start)
       start = pointer
     end
     return self if start == self_len
 
-    if should_yield_subclass_instances
-      block.call(self.class.new(stringstart, self_len - start))
-    else
-      block.call(stringstart, self_len - start)
-    end
+    block.call(stringstart, self_len - start)
     self
   end
 
-  # private method for gsub/sub
-  def __sub_replace(pre, m, post)
-    s = ""
-    i = 0
-    while j = index("\\", i)
-      break if j == length-1
-      t = case selfj+1
-          when "\\"
-            "\\"
-          when "`"
-            pre
-          when "&", "0"
-            m
-          when "'"
-            post
-          when "1", "2", "3", "4", "5", "6", "7", "8", "9"
-            ""
-          else
-            selfj, 2
-          end
-      s += selfi, j-i + t
-      i = j + 2
-    end
-    s + selfi, length-i
-  end
-
   ##
   # Replace all matches of +pattern+ with +replacement+.
   # Call block (if given) for each match and replace
@@ -86,16 +51,13 @@
   # ISO 15.2.10.5.18
   def gsub(*args, &block)
     return to_enum(:gsub, *args) if args.length == 1 && !block
-    raise ArgumentError, "wrong number of arguments" unless (1..2).include?(args.length)
+    raise ArgumentError, "wrong number of arguments (given #{args.length}, expected 1..2)" unless (1..2).include?(args.length)
 
     pattern, replace = *args
     plen = pattern.length
     if args.length == 2 && block
       block = nil
     end
-    if !replace.nil? || !block
-      replace.__to_str
-    end
     offset = 0
     result = 
     while found = index(pattern, offset)
@@ -104,7 +66,7 @@
       result << if block
         block.call(pattern).to_s
       else
-        replace.__sub_replace(self0, found, pattern, selfoffset..-1 || "")
+        self.__sub_replace(replace, pattern, found)
       end
       if plen == 0
         result << selfoffset, 1
@@ -153,25 +115,20 @@
     end
 
     pattern, replace = *args
-    pattern.__to_str
     if args.length == 2 && block
       block = nil
     end
-    unless block
-      replace.__to_str
-    end
     result = 
-    this = dup
     found = index(pattern)
-    return this unless found
-    result << this0, found
+    return self.dup unless found
+    result << self0, found
     offset = found + pattern.length
     result << if block
       block.call(pattern).to_s
     else
-      replace.__sub_replace(this0, found, pattern, thisoffset..-1 || "")
+      self.__sub_replace(replace, pattern, found)
     end
-    result << thisoffset..-1 if offset < length
+    result << selfoffset..-1 if offset < length
     result.join
   end

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

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

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

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

@@ -10,7 +10,7 @@
 #include <mruby/string.h>
 #include <mruby/range.h>
 #include <mruby/proc.h>
-#include <mruby/opcode.h>
+#include <mruby/presym.h>
 #include "value_array.h"
 
 #define ARY_DEFAULT_LEN   4
@@ -29,7 +29,7 @@
   }
   blen = capa * sizeof(mrb_value);
 
-  a = (struct RArray*)mrb_obj_alloc(mrb, MRB_TT_ARRAY, mrb->array_class);
+  a = MRB_OBJ_ALLOC(mrb, MRB_TT_ARRAY, mrb->array_class);
   if (capa <= MRB_ARY_EMBED_LEN_MAX) {
     ARY_SET_EMBED_LEN(a, 0);
   }
@@ -56,18 +56,17 @@
 }
 
 /*
- * to copy array, use this instead of memcpy because of portability
+ * To copy array, use this instead of memcpy because of portability
  * * gcc on ARM may fail optimization of memcpy
- *   http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.faqs/ka3934.html
+ *   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56620
  * * gcc on MIPS also fail
- *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39755
+ *   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=39755
  * * memcpy doesn't exist on freestanding environment
  *
  * If you optimize for binary size, use memcpy instead of this at your own risk
  * of above portability issue.
  *
- * see also http://togetter.com/li/462898
- *
+ * See also https://togetter.com/li/462898 (Japanese)
  */
 static inline void
 array_copy(mrb_value *dst, const mrb_value *src, mrb_int size)
@@ -280,7 +279,7 @@
 mrb_ary_s_create(mrb_state *mrb, mrb_value klass)
 {
   mrb_value ary;
-  mrb_value *vals;
+  const mrb_value *vals;
   mrb_int len;
   struct RArray *a;
 
@@ -340,7 +339,7 @@
 {
   struct RArray *a1 = mrb_ary_ptr(self);
   struct RArray *a2;
-  mrb_value *ptr;
+  const mrb_value *ptr;
   mrb_int blen, len1;
 
   mrb_get_args(mrb, "a", &ptr, &blen);
@@ -508,22 +507,26 @@
 static mrb_value
 mrb_ary_push_m(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *argv;
-  mrb_int len, len2, alen;
+  mrb_int argc;
+  const mrb_value *argv;
+  mrb_int len, len2;
   struct RArray *a;
 
-  mrb_get_args(mrb, "*!", &argv, &alen);
+  argc = mrb_get_argc(mrb);
+  argv = mrb_get_argv(mrb);
   a = mrb_ary_ptr(self);
   ary_modify(mrb, a);
   len = ARY_LEN(a);
-  len2 = len + alen;
+  len2 = len + argc;
   if (ARY_CAPA(a) < len2) {
     ary_expand_capa(mrb, a, len2);
   }
-  array_copy(ARY_PTR(a)+len, argv, alen);
+  array_copy(ARY_PTR(a)+len, argv, argc);
   ARY_SET_LEN(a, len2);
-  mrb_write_barrier(mrb, (struct RBasic*)a);
-
+  while (argc--) {
+    mrb_field_write_barrier_value(mrb, (struct RBasic*)a, *argv);
+    argv++;
+  }
   return self;
 }
 
@@ -575,6 +578,50 @@
   return val;
 }
 
+static mrb_value
+mrb_ary_shift_m(mrb_state *mrb, mrb_value self)
+{
+  mrb_int n;
+
+  if (mrb_get_args(mrb, "|i", &n) == 0) {
+    return mrb_ary_shift(mrb, self);
+  }
+
+  struct RArray *a = mrb_ary_ptr(self);
+  mrb_int len = ARY_LEN(a);
+  mrb_value val;
+
+  ary_modify_check(mrb, a);
+  if (len == 0 || n == 0) return mrb_ary_new(mrb);
+  if (n < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "negative array shift");
+  if (n > len) n = len;
+  val = mrb_ary_new_from_values(mrb, n, ARY_PTR(a));
+  if (ARY_SHARED_P(a)) {
+  L_SHIFT:
+    a->as.heap.ptr+=n;
+    a->as.heap.len-=n;
+    return val;
+  }
+  if (len > ARY_SHIFT_SHARED_MIN) {
+    ary_make_shared(mrb, a);
+    goto L_SHIFT;
+  }
+  else if (len == n) {
+    ARY_SET_LEN(a, 0);
+  }
+  else {
+    mrb_value *ptr = ARY_PTR(a);
+    mrb_int size = len-n;
+
+    while (size--) {
+      *ptr = *(ptr+n);
+      ++ptr;
+    }
+    ARY_SET_LEN(a, len-n);
+  }
+  return val;
+}
+
 /* self = 1,2,3
    item = 0
    self.unshift item
@@ -611,7 +658,8 @@
 mrb_ary_unshift_m(mrb_state *mrb, mrb_value self)
 {
   struct RArray *a = mrb_ary_ptr(self);
-  mrb_value *vals, *ptr;
+  const mrb_value *vals;
+  mrb_value *ptr;
   mrb_int alen, len;
 
   mrb_get_args(mrb, "*!", &vals, &alen);
@@ -648,19 +696,6 @@
   return self;
 }
 
-MRB_API mrb_value
-mrb_ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n)
-{
-  struct RArray *a = mrb_ary_ptr(ary);
-  mrb_int len = ARY_LEN(a);
-
-  /* range check */
-  if (n < 0) n += len;
-  if (n < 0 || len <= n) return mrb_nil_value();
-
-  return ARY_PTR(a)n;
-}
-
 MRB_API void
 mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val)
 {
@@ -709,13 +744,16 @@
   /* range check */
   if (head < 0) {
     head += alen;
-    if (head < 0) {
-      mrb_raise(mrb, E_INDEX_ERROR, "index is out of array");
-    }
+    if (head < 0) goto out_of_range;
+  }
+  if (head > ARY_MAX_SIZE - len) {
+  out_of_range:
+    mrb_raisef(mrb, E_INDEX_ERROR, "index %i is out of array", head);
   }
   tail = head + len;
   if (alen < len || alen < tail) {
     len = alen - head;
+    tail = head + len;
   }
 
   /* size check */
@@ -741,12 +779,10 @@
     argv = &rpl;
   }
   if (head >= alen) {
-    if (head > ARY_MAX_SIZE - argc) {
-      mrb_raisef(mrb, E_INDEX_ERROR, "index %i too big", head);
-    }
+    if (head > ARY_MAX_SIZE - argc) goto out_of_range;
     len = head + argc;
     if (len > ARY_CAPA(a)) {
-      ary_expand_capa(mrb, a, head + argc);
+      ary_expand_capa(mrb, a, len);
     }
     ary_fill_with_nil(ARY_PTR(a) + alen, head - alen);
     if (argc > 0) {
@@ -758,7 +794,8 @@
     mrb_int newlen;
 
     if (alen - len > ARY_MAX_SIZE - argc) {
-      mrb_raisef(mrb, E_INDEX_ERROR, "index %i too big", alen + argc - len);
+      head = alen + argc - len;
+      goto out_of_range;
     }
     newlen = alen + argc - len;
     if (newlen > ARY_CAPA(a)) {
@@ -767,7 +804,6 @@
 
     if (len != argc) {
       mrb_value *ptr = ARY_PTR(a);
-      tail = head + len;
       value_move(ptr + head + argc, ptr + tail, alen - tail);
       ARY_SET_LEN(a, newlen);
     }
@@ -798,7 +834,7 @@
     return mrb_ary_new_from_values(mrb, len, ARY_PTR(a)+beg);
   }
   ary_make_shared(mrb, a);
-  b  = (struct RArray*)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;
@@ -818,17 +854,17 @@
 static mrb_int
 aget_index(mrb_state *mrb, mrb_value index)
 {
-  if (mrb_fixnum_p(index)) {
-    return mrb_fixnum(index);
+  if (mrb_integer_p(index)) {
+    return mrb_integer(index);
   }
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   else if (mrb_float_p(index)) {
     return (mrb_int)mrb_float(index);
   }
 #endif
   else {
     mrb_int i, argc;
-    mrb_value *argv;
+    const mrb_value *argv;
 
     mrb_get_args(mrb, "i*!", &i, &argv, &argc);
     return i;
@@ -881,8 +917,8 @@
       else {
         return mrb_nil_value();
       }
-    case MRB_TT_FIXNUM:
-      return mrb_ary_ref(mrb, self, mrb_fixnum(index));
+    case MRB_TT_INTEGER:
+      return mrb_ary_ref(mrb, self, mrb_integer(index));
     default:
       return mrb_ary_ref(mrb, self, aget_index(mrb, index));
     }
@@ -941,9 +977,9 @@
   mrb_value v1, v2, v3;
   mrb_int i, len;
 
-  mrb_ary_modify(mrb, mrb_ary_ptr(self));
+  ary_modify(mrb, mrb_ary_ptr(self));
   if (mrb_get_argc(mrb) == 2) {
-    mrb_value *vs = mrb_get_argv(mrb);
+    const mrb_value *vs = mrb_get_argv(mrb);
     v1 = vs0; v2 = vs1;
 
     /* an..m = v */
@@ -1050,7 +1086,7 @@
 
   for (i = 0; i < RARRAY_LEN(self); i++) {
     if (mrb_equal(mrb, RARRAY_PTR(self)i, obj)) {
-      return mrb_fixnum_value(i);
+      return mrb_int_value(mrb, i);
     }
   }
   return mrb_nil_value();
@@ -1064,7 +1100,7 @@
 
   for (i = RARRAY_LEN(self) - 1; i >= 0; i--) {
     if (mrb_equal(mrb, RARRAY_PTR(self)i, obj)) {
-      return mrb_fixnum_value(i);
+      return mrb_int_value(mrb, i);
     }
     if (i > (len = RARRAY_LEN(self))) {
       i = len;
@@ -1076,22 +1112,26 @@
 MRB_API mrb_value
 mrb_ary_splat(mrb_state *mrb, mrb_value v)
 {
-  mrb_value a;
+  mrb_value ary;
+  struct RArray *a;
 
   if (mrb_array_p(v)) {
-    return v;
+    a = ary_dup(mrb, mrb_ary_ptr(v));
+    return mrb_obj_value(a);
   }
 
-  if (!mrb_respond_to(mrb, v, mrb_intern_lit(mrb, "to_a"))) {
+  if (!mrb_respond_to(mrb, v, MRB_SYM(to_a))) {
     return mrb_ary_new_from_values(mrb, 1, &v);
   }
 
-  a = mrb_funcall(mrb, v, "to_a", 0);
-  if (mrb_nil_p(a)) {
+  ary = mrb_funcall_id(mrb, v, MRB_SYM(to_a), 0);
+  if (mrb_nil_p(ary)) {
     return mrb_ary_new_from_values(mrb, 1, &v);
   }
-  mrb_ensure_array_type(mrb, a);
-  return a;
+  mrb_ensure_array_type(mrb, ary);
+  a = mrb_ary_ptr(ary);
+  a = ary_dup(mrb, a);
+  return mrb_obj_value(a);
 }
 
 static mrb_value
@@ -1099,7 +1139,7 @@
 {
   struct RArray *a = mrb_ary_ptr(self);
 
-  return mrb_fixnum_value(ARY_LEN(a));
+  return mrb_int_value(mrb, ARY_LEN(a));
 }
 
 MRB_API mrb_value
@@ -1115,8 +1155,14 @@
   else if (!ARY_EMBED_P(a)){
     mrb_free(mrb, a->as.heap.ptr);
   }
-  ARY_SET_EMBED_LEN(a, 0);
-
+  if (MRB_ARY_EMBED_LEN_MAX > 0) {
+    ARY_SET_EMBED_LEN(a, 0);
+  }
+  else {
+    a->as.heap.ptr = NULL;
+    a->as.heap.aux.capa = 0;
+    ARY_SET_LEN(a, 0);
+  }
   return self;
 }
 
@@ -1135,15 +1181,16 @@
 }
 
 MRB_API mrb_value
-mrb_ary_entry(mrb_value ary, mrb_int offset)
+mrb_ary_entry(mrb_value ary, mrb_int n)
 {
-  if (offset < 0) {
-    offset += RARRAY_LEN(ary);
-  }
-  if (offset < 0 || RARRAY_LEN(ary) <= offset) {
-    return mrb_nil_value();
-  }
-  return RARRAY_PTR(ary)offset;
+  struct RArray *a = mrb_ary_ptr(ary);
+  mrb_int len = ARY_LEN(a);
+
+  /* range check */
+  if (n < 0) n += len;
+  if (n < 0 || len <= n) return mrb_nil_value();
+
+  return ARY_PTR(a)n;
 }
 
 static mrb_value
@@ -1237,6 +1284,7 @@
 {
   mrb_value ary2 = mrb_get_arg1(mrb);
 
+  mrb->c->ci->mid = 0;
   if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value();
   if (!mrb_array_p(ary2)) {
     return mrb_false_value();
@@ -1251,6 +1299,7 @@
 {
   mrb_value ary2 = mrb_get_arg1(mrb);
 
+  mrb->c->ci->mid = 0;
   if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_fixnum_value(0);
   if (!mrb_array_p(ary2)) {
     return mrb_nil_value();
@@ -1273,56 +1322,6 @@
   }
 }
 
-static const mrb_code each_iseq = {
-  OP_ENTER, 0x0, 0x00, 0x1,  /* OP_ENTER     0:0:0:0:0:0:1 */
-  OP_JMPIF, 0x1, 0x0, 19,    /* OP_JMPIF     R1  19 */
-  OP_LOADSELF, 0x3,          /* OP_LOADSELF  R3 */
-  OP_LOADSYM, 0x4, 0x0,      /* OP_LOADSYM   R4  :each*/
-  OP_SEND, 0x3, 0x1, 0x1,    /* OP_SEND      R3  :to_enum   1 */
-  OP_RETURN, 0x3,            /* OP_RETURN    R3 */
-  OP_LOADI_0, 0x2,           /* OP_LOADI_0   R2 */
-  OP_JMP, 0x0, 43,           /* OP_JMP       49 */
-  OP_MOVE, 0x3, 0x1,         /* OP_MOVE      R3  R1 */
-  OP_LOADSELF, 0x4,          /* OP_LOADSELF  R4 */
-  OP_MOVE, 0x5, 0x2,         /* OP_MOVE      R5  R2 */
-  OP_SEND, 0x4, 0x2, 0x1,    /* OP_SEND      R4  :        1 */
-  OP_SEND, 0x3, 0x3, 0x1,    /* OP_SEND      R3  :call      1 */
-  OP_ADDI, 0x2, 1,           /* OP_ADDI      R3  1 */
-  OP_MOVE, 0x3, 0x2,         /* OP_MOVE      R3  R2 */
-  OP_LOADSELF, 0x4,          /* OP_LOADSELF  R4 */
-  OP_SEND, 0x4, 0x4, 0x0,    /* OP_SEND      R4  :length    0 */
-  OP_LT, 0x3,                /* OP_LT        R3 */
-  OP_JMPIF, 0x3, 0x0, 24,    /* OP_JMPIF     R3  24 */
-  OP_RETURN, 0x0             /* OP_RETURN    R3 */
-};
-
-static void
-init_ary_each(mrb_state *mrb, struct RClass *ary)
-{
-  struct RProc *p;
-  mrb_method_t m;
-  mrb_irep *each_irep = (mrb_irep*)mrb_malloc(mrb, sizeof(mrb_irep));
-  static const mrb_irep mrb_irep_zero = { 0 };
-
-  *each_irep = mrb_irep_zero;
-  each_irep->syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym)*5);
-  each_irep->syms0 = mrb_intern_lit(mrb, "each");
-  each_irep->syms1 = mrb_intern_lit(mrb, "to_enum");
-  each_irep->syms2 = mrb_intern_lit(mrb, "");
-  each_irep->syms3 = mrb_intern_lit(mrb, "call");
-  each_irep->syms4 = mrb_intern_lit(mrb, "length");
-  each_irep->slen = 5;
-  each_irep->flags = MRB_ISEQ_NO_FREE;
-  each_irep->iseq = each_iseq;
-  each_irep->ilen = sizeof(each_iseq);
-  each_irep->nregs = 7;
-  each_irep->nlocals = 3;
-  p = mrb_proc_new(mrb, each_irep);
-  p->flags |= MRB_PROC_SCOPE | MRB_PROC_STRICT;
-  MRB_METHOD_FROM_PROC(m, p);
-  mrb_define_method_raw(mrb, ary, mrb_intern_lit(mrb, "each"), m);
-}
-
 void
 mrb_init_array(mrb_state *mrb)
 {
@@ -1354,7 +1353,7 @@
   mrb_define_method(mrb, a, "reverse",         mrb_ary_reverse,      MRB_ARGS_NONE());   /* 15.2.12.5.24 */
   mrb_define_method(mrb, a, "reverse!",        mrb_ary_reverse_bang, MRB_ARGS_NONE());   /* 15.2.12.5.25 */
   mrb_define_method(mrb, a, "rindex",          mrb_ary_rindex_m,     MRB_ARGS_REQ(1));   /* 15.2.12.5.26 */
-  mrb_define_method(mrb, a, "shift",           mrb_ary_shift,        MRB_ARGS_NONE());   /* 15.2.12.5.27 */
+  mrb_define_method(mrb, a, "shift",           mrb_ary_shift_m,      MRB_ARGS_OPT(1));   /* 15.2.12.5.27 */
   mrb_define_method(mrb, a, "size",            mrb_ary_size,         MRB_ARGS_NONE());   /* 15.2.12.5.28 */
   mrb_define_method(mrb, a, "slice",           mrb_ary_aget,         MRB_ARGS_ARG(1,1)); /* 15.2.12.5.29 */
   mrb_define_method(mrb, a, "unshift",         mrb_ary_unshift_m,    MRB_ARGS_ANY());    /* 15.2.12.5.30 */
@@ -1363,6 +1362,4 @@
   mrb_define_method(mrb, a, "__ary_cmp",       mrb_ary_cmp,          MRB_ARGS_REQ(1));
   mrb_define_method(mrb, a, "__ary_index",     mrb_ary_index_m,      MRB_ARGS_REQ(1));   /* kept for mruby-array-ext */
   mrb_define_method(mrb, a, "__svalue",        mrb_ary_svalue,       MRB_ARGS_NONE());
-
-  init_ary_each(mrb, a);
 }

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/src/backtrace.c -> _service:tar_scm:nghttp2-1.52.0.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/presym.h>
 
 struct backtrace_location {
   int32_t lineno;
@@ -29,52 +30,71 @@
 mrb_value mrb_unpack_backtrace(mrb_state *mrb, mrb_value backtrace);
 
 static void
-each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, const mrb_code *pc0, each_backtrace_func func, void *data)
+each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, each_backtrace_func func, void *data)
 {
-  ptrdiff_t i;
-
   if (ciidx >= mrb->c->ciend - mrb->c->cibase)
     ciidx = 10; /* ciidx is broken... */
 
-  for (i=ciidx; i >= 0; i--) {
+  for (ptrdiff_t i=ciidx; i >= 0; i--) {
     struct backtrace_location loc;
     mrb_callinfo *ci;
-    mrb_irep *irep;
+    const mrb_irep *irep = 0;
     const mrb_code *pc;
+    uint32_t idx;
 
     ci = &mrb->c->cibasei;
 
-    if (!ci->proc) continue;
-    if (MRB_PROC_CFUNC_P(ci->proc)) continue;
-
-    irep = ci->proc->body.irep;
-    if (!irep) continue;
-
-    if (mrb->c->cibasei.err) {
-      pc = mrb->c->cibasei.err;
-    }
-    else if (i+1 <= ciidx) {
-      if (!mrb->c->cibasei + 1.pc) continue;
-      pc = &mrb->c->cibasei+1.pc-1;
+    if (!ci->proc || MRB_PROC_CFUNC_P(ci->proc)) {
+      if (!ci->mid) continue;
+      loc.lineno = -1;
+      idx = 0;
     }
     else {
-      pc = pc0;
+      irep = ci->proc->body.irep;
+      if (!irep) continue;
+      if (mrb->c->cibasei.pc) {
+        pc = &mrb->c->cibasei.pc-1;
+      }
+      else {
+        continue;
+      }
+      idx = (uint32_t)(pc - irep->iseq);
+      loc.lineno = mrb_debug_get_line(mrb, irep, idx);
+    }
+    loc.method_id = ci->mid;
+    if (loc.lineno == -1) {
+      for (ptrdiff_t j=i-1; j >= 0; j--) {
+        ci = &mrb->c->cibasej;
+
+        if (!ci->proc) continue;
+        if (MRB_PROC_CFUNC_P(ci->proc)) continue;
+
+        irep = ci->proc->body.irep;
+        if (!irep) continue;
+
+        if (mrb->c->cibasej.pc) {
+          pc = &mrb->c->cibasej.pc-1;
+        }
+        else {
+          continue;
+        }
+
+        idx = (uint32_t)(pc - irep->iseq);
+        loc.lineno = mrb_debug_get_line(mrb, irep, idx);
+        if (loc.lineno > 0) break;
+      }
     }
 
-    loc.lineno = mrb_debug_get_line(mrb, irep, pc - irep->iseq);
-    if (loc.lineno == -1) continue;
-
-    loc.filename = mrb_debug_get_filename(mrb, irep, pc - irep->iseq);
+    loc.filename = mrb_debug_get_filename(mrb, irep, idx);
     if (!loc.filename) {
       loc.filename = "(unknown)";
     }
 
-    loc.method_id = ci->mid;
     func(mrb, &loc, data);
   }
 }
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 
 static void
 print_backtrace(mrb_state *mrb, struct RObject *exc, mrb_value backtrace)
@@ -82,22 +102,24 @@
   mrb_int i;
   mrb_int n = RARRAY_LEN(backtrace);
   mrb_value *loc, mesg;
-  FILE *stream = stderr;
 
   if (n != 0) {
-    fprintf(stream, "trace (most recent call last):\n");
+    if (n > 1) {
+      fprintf(stderr, "trace (most recent call last):\n");
+    }
     for (i=n-1,loc=&RARRAY_PTR(backtrace)i; i>0; i--,loc--) {
       if (mrb_string_p(*loc)) {
-        fprintf(stream, "\t%d %.*s\n",
+        fprintf(stderr, "\t%d %.*s\n",
                 (int)i, (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc));
       }
     }
     if (mrb_string_p(*loc)) {
-      fprintf(stream, "%.*s: ", (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc));
+      fprintf(stderr, "%.*s: ", (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc));
     }
   }
   mesg = mrb_exc_inspect(mrb, mrb_obj_value(exc));
-  fprintf(stream, "%.*s\n", (int)RSTRING_LEN(mesg), RSTRING_PTR(mesg));
+  fwrite(RSTRING_PTR(mesg), RSTRING_LEN(mesg), 1, stderr);
+  fputc('\n', stderr);
 }
 
 /* mrb_print_backtrace
@@ -114,7 +136,7 @@
     return;
   }
 
-  backtrace = mrb_obj_iv_get(mrb, mrb->exc, mrb_intern_lit(mrb, "backtrace"));
+  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);
@@ -159,19 +181,19 @@
   int size;
   void *ptr;
 
-  each_backtrace(mrb, ciidx, mrb->c->ci->pc, count_backtrace_i, &len);
+  each_backtrace(mrb, ciidx, count_backtrace_i, &len);
   size = len * sizeof(struct backtrace_location);
   ptr = mrb_malloc(mrb, size);
   backtrace = mrb_data_object_alloc(mrb, NULL, ptr, &bt_type);
   backtrace->flags = (uint32_t)len;
-  each_backtrace(mrb, ciidx, mrb->c->ci->pc, pack_backtrace_i, &ptr);
+  each_backtrace(mrb, ciidx, pack_backtrace_i, &ptr);
   return mrb_obj_value(backtrace);
 }
 
 void
 mrb_keep_backtrace(mrb_state *mrb, mrb_value exc)
 {
-  mrb_sym sym = mrb_intern_lit(mrb, "backtrace");
+  mrb_sym sym = MRB_SYM(backtrace);
   mrb_value backtrace;
   int ai;
 
@@ -197,13 +219,19 @@
   bt = (struct backtrace_location*)mrb_data_check_get_ptr(mrb, backtrace, &bt_type);
   if (bt == NULL) goto empty_backtrace;
   n = (mrb_int)RDATA(backtrace)->flags;
+  if (n == 0) goto empty_backtrace;
   backtrace = mrb_ary_new_capa(mrb, n);
   ai = mrb_gc_arena_save(mrb);
   for (i = 0; i < n; i++) {
     const struct backtrace_location *entry = &bti;
     mrb_value btline;
 
-    btline = mrb_format(mrb, "%s:%d", entry->filename, (int)entry->lineno);
+    if (entry->lineno != -1) {//debug info was available
+      btline = mrb_format(mrb, "%s:%d", entry->filename, (int)entry->lineno);
+    }
+    else { //all that was left was the stack frame
+      btline = mrb_format(mrb, "%s:0", entry->filename);
+    }
     if (entry->method_id != 0) {
       mrb_str_cat_lit(mrb, btline, ":in ");
       mrb_str_cat_cstr(mrb, btline, mrb_sym_name(mrb, entry->method_id));
@@ -215,23 +243,22 @@
   return backtrace;
 }
 
-MRB_API mrb_value
+mrb_value
 mrb_exc_backtrace(mrb_state *mrb, mrb_value exc)
 {
-  mrb_sym attr_name;
   mrb_value backtrace;
 
-  attr_name = mrb_intern_lit(mrb, "backtrace");
-  backtrace = mrb_iv_get(mrb, exc, attr_name);
+  backtrace = mrb_iv_get(mrb, exc, MRB_SYM(backtrace));
   if (mrb_nil_p(backtrace) || mrb_array_p(backtrace)) {
     return backtrace;
   }
+  /* unpack packed-backtrace */
   backtrace = mrb_unpack_backtrace(mrb, backtrace);
-  mrb_iv_set(mrb, exc, attr_name, backtrace);
+  mrb_iv_set(mrb, exc, MRB_SYM(backtrace), backtrace);
   return backtrace;
 }
 
-MRB_API mrb_value
+mrb_value
 mrb_get_backtrace(mrb_state *mrb)
 {
   return mrb_unpack_backtrace(mrb, packed_backtrace(mrb));

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

@@ -0,0 +1,468 @@
+/*
+** cdump.c - mruby binary dumper (in C)
+**
+** See Copyright Notice in mruby.h
+*/
+
+#include <mruby.h>
+#include <mruby/string.h>
+#include <mruby/dump.h>
+#include <mruby/irep.h>
+#include <mruby/debug.h>
+
+#include <string.h>
+
+#ifndef MRB_NO_STDIO
+
+#ifndef MRB_NO_FLOAT
+#include <mruby/endian.h>
+#define MRB_FLOAT_FMT "%.17g"
+#endif
+
+static int
+cdump_pool(mrb_state *mrb, const mrb_pool_value *p, FILE *fp)
+{
+  if (p->tt & IREP_TT_NFLAG) {  /* number */
+    switch (p->tt) {
+#ifdef MRB_64BIT
+    case IREP_TT_INT64:
+      if (p->u.i64 < INT32_MIN || INT32_MAX < p->u.i64) {
+        fprintf(fp, "{IREP_TT_INT64, {.i64=%" PRId64 "}},\n", p->u.i64);
+      }
+      else {
+        fprintf(fp, "{IREP_TT_INT32, {.i32=%" PRId32 "}},\n", (int32_t)p->u.i64);
+      }
+      break;
+#endif
+    case IREP_TT_INT32:
+      fprintf(fp, "{IREP_TT_INT32, {.i32=%" PRId32 "}},\n", p->u.i32);
+      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);
+      }
+#endif
+      break;
+    case IREP_TT_BIGINT:
+      {
+        const char *s = p->u.str;
+        int len = s0+2;
+        fputs("{IREP_TT_BIGINT, {\"", fp);
+        for (int i=0; i<len; i++) {
+          fprintf(fp, "\\x%02x", (int)si&0xff);
+        }
+        fputs("\"}},\n", fp);
+      }
+      break;
+    }
+  }
+  else {                        /* string */
+    int i, len = p->tt>>2;
+    const char *s = p->u.str;
+    fprintf(fp, "{IREP_TT_STR|(%d<<2), {\"", len);
+    for (i=0; i<len; i++) {
+      fprintf(fp, "\\x%02x", (int)si&0xff);
+    }
+    fputs("\"}},\n", fp);
+  }
+  return MRB_DUMP_OK;
+}
+
+static mrb_bool
+sym_name_word_p(const char *name, mrb_int len)
+{
+  if (len == 0) return FALSE;
+  if (name0 != '_' && !ISALPHA(name0)) return FALSE;
+  for (int i = 1; i < len; i++) {
+    if (namei != '_' && !ISALNUM(namei)) return FALSE;
+  }
+  return TRUE;
+}
+
+static mrb_bool
+sym_name_with_equal_p(const char *name, mrb_int len)
+{
+  return len >= 2 && namelen-1 == '=' && sym_name_word_p(name, len-1);
+}
+
+static mrb_bool
+sym_name_with_question_mark_p(const char *name, mrb_int len)
+{
+  return len >= 2 && namelen-1 == '?' && sym_name_word_p(name, len-1);
+}
+
+static mrb_bool
+sym_name_with_bang_p(const char *name, mrb_int len)
+{
+  return len >= 2 && namelen-1 == '!' && sym_name_word_p(name, len-1);
+}
+
+static mrb_bool
+sym_name_ivar_p(const char *name, mrb_int len)
+{
+  return len >= 2 && name0 == '@' && sym_name_word_p(name+1, len-1);
+}
+
+static mrb_bool
+sym_name_cvar_p(const char *name, mrb_int len)
+{
+  return len >= 3 && name0 == '@' && sym_name_ivar_p(name+1, len-1);
+}
+
+#define OPERATOR_SYMBOL(sym_name, name) {name, sym_name, sizeof(sym_name)-1}
+struct operator_symbol {
+  const char *name;
+  const char *sym_name;
+  uint16_t sym_name_len;
+};
+static const struct operator_symbol operator_table = {
+  OPERATOR_SYMBOL("!", "not"),
+  OPERATOR_SYMBOL("%", "mod"),
+  OPERATOR_SYMBOL("&", "and"),
+  OPERATOR_SYMBOL("*", "mul"),
+  OPERATOR_SYMBOL("+", "add"),
+  OPERATOR_SYMBOL("-", "sub"),
+  OPERATOR_SYMBOL("/", "div"),
+  OPERATOR_SYMBOL("<", "lt"),
+  OPERATOR_SYMBOL(">", "gt"),
+  OPERATOR_SYMBOL("^", "xor"),
+  OPERATOR_SYMBOL("`", "tick"),
+  OPERATOR_SYMBOL("|", "or"),
+  OPERATOR_SYMBOL("~", "neg"),
+  OPERATOR_SYMBOL("!=", "neq"),
+  OPERATOR_SYMBOL("!~", "nmatch"),
+  OPERATOR_SYMBOL("&&", "andand"),
+  OPERATOR_SYMBOL("**", "pow"),
+  OPERATOR_SYMBOL("+@", "plus"),
+  OPERATOR_SYMBOL("-@", "minus"),
+  OPERATOR_SYMBOL("<<", "lshift"),
+  OPERATOR_SYMBOL("<=", "le"),
+  OPERATOR_SYMBOL("==", "eq"),
+  OPERATOR_SYMBOL("=~", "match"),
+  OPERATOR_SYMBOL(">=", "ge"),
+  OPERATOR_SYMBOL(">>", "rshift"),
+  OPERATOR_SYMBOL("", "aref"),
+  OPERATOR_SYMBOL("||", "oror"),
+  OPERATOR_SYMBOL("<=>", "cmp"),
+  OPERATOR_SYMBOL("===", "eqq"),
+  OPERATOR_SYMBOL("=", "aset"),
+};
+
+static const char*
+sym_operator_name(const char *sym_name, mrb_int len)
+{
+  mrb_sym table_size = sizeof(operator_table)/sizeof(struct operator_symbol);
+  if (operator_tabletable_size-1.sym_name_len < len) return NULL;
+
+  mrb_sym start, idx;
+  int cmp;
+  const struct operator_symbol *op_sym;
+  for (start = 0; table_size != 0; table_size/=2) {
+    idx = start+table_size/2;
+    op_sym = &operator_tableidx;
+    cmp = (int)len-(int)op_sym->sym_name_len;
+    if (cmp == 0) {
+      cmp = memcmp(sym_name, op_sym->sym_name, len);
+      if (cmp == 0) return op_sym->name;
+    }
+    if (0 < cmp) {
+      start = ++idx;
+      --table_size;
+    }
+  }
+  return NULL;
+}
+
+static const char*
+sym_var_name(mrb_state *mrb, const char *initname, const char *key, int n)
+{
+  char buf32;
+  mrb_value s = mrb_str_new_cstr(mrb, initname);
+  mrb_str_cat_lit(mrb, s, "_");
+  mrb_str_cat_cstr(mrb, s, key);
+  mrb_str_cat_lit(mrb, s, "_");
+  snprintf(buf, sizeof(buf), "%d", n);
+  mrb_str_cat_cstr(mrb, s, buf);
+  return RSTRING_PTR(s);
+}
+
+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;
+
+  mrb_int len;
+  const char *name = mrb_sym_name_len(mrb, sym, &len), *op_name;
+  if (!name) return MRB_DUMP_INVALID_ARGUMENT;
+  if (sym_name_word_p(name, len)) {
+    fprintf(fp, "MRB_SYM(%s)", name);
+  }
+  else if (sym_name_with_equal_p(name, len)) {
+    fprintf(fp, "MRB_SYM_E(%.*s)", (int)(len-1), name);
+  }
+  else if (sym_name_with_question_mark_p(name, len)) {
+    fprintf(fp, "MRB_SYM_Q(%.*s)", (int)(len-1), name);
+  }
+  else if (sym_name_with_bang_p(name, len)) {
+    fprintf(fp, "MRB_SYM_B(%.*s)", (int)(len-1), name);
+  }
+  else if (sym_name_ivar_p(name, len)) {
+    fprintf(fp, "MRB_IVSYM(%s)", name+1);
+  }
+  else if (sym_name_cvar_p(name, len)) {
+    fprintf(fp, "MRB_CVSYM(%s)", name+2);
+  }
+  else if ((op_name = sym_operator_name(name, len))) {
+    fprintf(fp, "MRB_OPSYM(%s)", op_name);
+  }
+  else {
+    char buf32;
+    mrb_value name_obj = mrb_str_new(mrb, name, len);
+    mrb_str_cat_lit(mrb, init_syms_code, "  ");
+    mrb_str_cat_cstr(mrb, init_syms_code, var_name);
+    snprintf(buf, sizeof(buf), "%d = ", idx);
+    mrb_str_cat_cstr(mrb, init_syms_code, buf);
+    mrb_str_cat_lit(mrb, init_syms_code, "mrb_intern_lit(mrb, ");
+    mrb_str_cat_str(mrb, init_syms_code, mrb_str_dump(mrb, name_obj));
+    mrb_str_cat_lit(mrb, init_syms_code, ");\n");
+    fputs("0", fp);
+  }
+  fputs(", ", fp);
+  return MRB_DUMP_OK;
+}
+
+static int
+cdump_syms(mrb_state *mrb, const char *name, const char *key, int n, int syms_len, const mrb_sym *syms, mrb_value init_syms_code, FILE *fp)
+{
+  int ai = mrb_gc_arena_save(mrb);
+  mrb_int code_len = RSTRING_LEN(init_syms_code);
+  const char *var_name = sym_var_name(mrb, name, key, n);
+  fprintf(fp, "mrb_DEFINE_SYMS_VAR(%s, %d, (", var_name, syms_len);
+  for (int i=0; i<syms_len; i++) {
+    cdump_sym(mrb, symsi, var_name, i, init_syms_code, fp);
+  }
+  fputs("), ", fp);
+  if (code_len == RSTRING_LEN(init_syms_code)) fputs("const", fp);
+  fputs(");\n", fp);
+  mrb_gc_arena_restore(mrb, ai);
+  return MRB_DUMP_OK;
+}
+
+//Handle the simple/common case of debug_info:
+// - 1 file associated with a single irep
+// - mrb_debug_line_ary format only
+static int
+simple_debug_info(mrb_irep_debug_info *info)
+{
+  if (!info || info->flen != 1) {
+    return 0;
+  }
+  return 1;
+}
+
+//Adds debug information to c-structs and
+//adds filenames in init_syms_code block
+static int
+cdump_debug(mrb_state *mrb, const char *name, int n, mrb_irep_debug_info *info,
+    mrb_value init_syms_code, FILE *fp)
+{
+  char buffer256;
+  const char *filename;
+  mrb_int file_len;
+  int len, i;
+  const char *line_type = "mrb_debug_line_ary";
+
+  if (!simple_debug_info(info))
+    return MRB_DUMP_INVALID_IREP;
+
+  len = info->files0->line_entry_count;
+
+  filename = mrb_sym_name_len(mrb, info->files0->filename_sym, &file_len);
+  snprintf(buffer, sizeof(buffer), "  %s_debug_file_%d.filename_sym = mrb_intern_lit(mrb,\"",
+      name, n);
+  mrb_str_cat_cstr(mrb, init_syms_code, buffer);
+  mrb_str_cat_cstr(mrb, init_syms_code, filename);
+  mrb_str_cat_cstr(mrb, init_syms_code, "\");\n");
+
+  switch (info->files0->line_type) {
+  case mrb_debug_line_ary:
+    fprintf(fp, "static uint16_t %s_debug_lines_%d%d = {", name, n, len);
+    for (i=0; i<len; i++) {
+      if (i%10 == 0) fputs("\n", fp);
+      fprintf(fp, "0x%04x,", info->files0->lines.aryi);
+    }
+    fputs("};\n", fp);
+    break;
+
+  case mrb_debug_line_flat_map:
+    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;
+      fprintf(fp, "\t{.start_pos=0x%04x,.line=%d},\n", fmap->start_pos, fmap->line);
+    }
+    fputs("};\n", fp);
+    break;
+
+  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;
+    for (i=0; i<len; i++) {
+      fprintf(fp, "\\x%02x", pmapi&0xff);
+    }
+    fputs("\";\n", fp);
+    break;
+  }
+  fprintf(fp, "static mrb_irep_debug_info_file %s_debug_file_%d = {\n", name, n);
+  fprintf(fp, "%d, %d, %d, %s, {%s_debug_lines_%d}};\n",
+          info->files0->start_pos,
+          info->files0->filename_sym,
+          info->files0->line_entry_count,
+          line_type,
+          name,n);
+  fprintf(fp, "static mrb_irep_debug_info_file *%s_debug_file_%d_ = &%s_debug_file_%d;\n", name, n, name, n);
+
+  fprintf(fp, "static mrb_irep_debug_info %s_debug_%d = {\n", name, n);
+  fprintf(fp, "%d, %d, &%s_debug_file_%d_};\n", info->pc_count, info->flen, name, n);
+
+  return MRB_DUMP_OK;
+}
+
+static int
+cdump_irep_struct(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, FILE *fp, const char *name, int n, mrb_value init_syms_code, int *mp)
+{
+  int i, len;
+  int max = *mp;
+  int debug_available = 0;
+
+  /* dump reps */
+  if (irep->reps) {
+    for (i=0,len=irep->rlen; i<len; i++) {
+      *mp += len;
+      if (cdump_irep_struct(mrb, irep->repsi, flags, fp, name, max+i, init_syms_code, mp) != MRB_DUMP_OK)
+        return MRB_DUMP_INVALID_ARGUMENT;
+    }
+    fprintf(fp,   "static const mrb_irep *%s_reps_%d%d = {\n", name, n, len);
+    for (i=0,len=irep->rlen; i<len; i++) {
+      fprintf(fp,   "  &%s_irep_%d,\n", name, max+i);
+    }
+    fputs("};\n", fp);
+  }
+  /* dump pool */
+  if (irep->pool) {
+    len=irep->plen;
+    fprintf(fp,   "static const mrb_pool_value %s_pool_%d%d = {\n", name, n, len);
+    for (i=0; i<len; i++) {
+      if (cdump_pool(mrb, &irep->pooli, fp) != MRB_DUMP_OK)
+        return MRB_DUMP_INVALID_ARGUMENT;
+    }
+    fputs("};\n", fp);
+  }
+  /* dump syms */
+  if (irep->syms) {
+    cdump_syms(mrb, name, "syms", n, irep->slen, irep->syms, init_syms_code, fp);
+  }
+  /* dump iseq */
+  len=irep->ilen+sizeof(struct mrb_irep_catch_handler)*irep->clen;
+  fprintf(fp,   "static const mrb_code %s_iseq_%d%d = {", name, n, len);
+  for (i=0; i<len; i++) {
+    if (i%20 == 0) fputs("\n", fp);
+    fprintf(fp, "0x%02x,", irep->iseqi);
+  }
+  fputs("};\n", fp);
+  /* dump lv */
+  if (irep->lv) {
+    cdump_syms(mrb, name, "lv", n, irep->nlocals-1, irep->lv, init_syms_code, fp);
+  }
+  /* dump debug */
+  if (flags & MRB_DUMP_DEBUG_INFO) {
+    if(cdump_debug(mrb, name, n, irep->debug_info,
+                init_syms_code, fp) == MRB_DUMP_OK) {
+      debug_available = 1;
+    }
+  }
+
+
+  /* dump irep */
+  fprintf(fp, "static const mrb_irep %s_irep_%d = {\n", name, n);
+  fprintf(fp,   "  %d,%d,%d,\n", irep->nlocals, irep->nregs, irep->clen);
+  fprintf(fp,   "  MRB_IREP_STATIC,%s_iseq_%d,\n", name, n);
+  if (irep->pool) {
+    fprintf(fp, "  %s_pool_%d,", name, n);
+  }
+  else {
+    fputs(      "  NULL,", fp);
+  }
+  if (irep->syms) {
+    fprintf(fp, "%s_syms_%d,", name, n);
+  }
+  else {
+    fputs(      "NULL,", fp);
+  }
+  if (irep->reps) {
+    fprintf(fp, "%s_reps_%d,\n", name, n);
+  }
+  else {
+    fputs(      "NULL,\n", fp);
+  }
+  if (irep->lv) {
+    fprintf(fp, "  %s_lv_%d,\n", name, n);
+  }
+  else {
+    fputs(      "  NULL,\t\t\t\t\t/* lv */\n", fp);
+  }
+  if(debug_available) {
+    fprintf(fp, "  &%s_debug_%d,\n", name, n);
+  }
+  else {
+    fputs("  NULL,\t\t\t\t\t/* debug_info */\n", fp);
+  }
+  fprintf(fp,   "  %d,%d,%d,%d,0\n};\n", irep->ilen, irep->plen, irep->slen, irep->rlen);
+
+  return MRB_DUMP_OK;
+}
+
+int
+mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, FILE *fp, const char *initname)
+{
+  if (fp == NULL || initname == NULL || initname0 == '\0') {
+    return MRB_DUMP_INVALID_ARGUMENT;
+  }
+  if (fprintf(fp, "#include <mruby.h>\n"
+                  "#include <mruby/irep.h>\n"
+                  "#include <mruby/debug.h>\n"
+                  "#include <mruby/proc.h>\n"
+                  "#include <mruby/presym.h>\n"
+                  "\n") < 0) {
+    return MRB_DUMP_WRITE_FAULT;
+  }
+  fputs("#define mrb_BRACED(...) {__VA_ARGS__}\n", fp);
+  fputs("#define mrb_DEFINE_SYMS_VAR(name, len, syms, qualifier) \\\n", fp);
+  fputs("  static qualifier mrb_sym namelen = mrb_BRACED syms\n", fp);
+  fputs("\n", fp);
+  mrb_value init_syms_code = mrb_str_new_capa(mrb, 0);
+  int max = 1;
+  int n = cdump_irep_struct(mrb, irep, flags, fp, initname, 0, init_syms_code, &max);
+  if (n != MRB_DUMP_OK) return n;
+  fprintf(fp,
+          "%s\n"
+          "const struct RProc %s = {{\n",
+          (flags & MRB_DUMP_STATIC) ? "static"
+                                    : "#ifdef __cplusplus\n"
+                                      "extern\n"
+                                      "#endif",
+          initname);
+  fprintf(fp, "NULL,NULL,MRB_TT_PROC,MRB_GC_RED,0,{&%s_irep_0},NULL,{NULL},\n}};\n", initname);
+  fputs("static void\n", fp);
+  fprintf(fp, "%s_init_syms(mrb_state *mrb)\n", initname);
+  fputs("{\n", fp);
+  fputs(RSTRING_PTR(init_syms_code), fp);
+  fputs("}\n", fp);
+  return MRB_DUMP_OK;
+}
+#endif

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

@@ -4,7 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <stdarg.h>
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/hash.h>
@@ -17,48 +16,302 @@
 #include <mruby/data.h>
 #include <mruby/istruct.h>
 #include <mruby/opcode.h>
+#include <mruby/presym.h>
 
-KHASH_DEFINE(mt, mrb_sym, mrb_method_t, TRUE, kh_int_hash_func, kh_int_hash_equal)
+union mt_ptr {
+  struct RProc *proc;
+  mrb_func_t func;
+};
+
+#define MT_KEY_P(k) (((k)>>2) != 0)
+#define MT_FUNC_P 1
+#define MT_NOARG_P 2
+#define MT_EMPTY 0
+#define MT_DELETED 1
+
+#define MT_KEY(sym, flags) ((sym)<<2|(flags))
+#define MT_FLAGS(func_p, noarg_p) ((func_p)?MT_FUNC_P:0)|((noarg_p)?MT_NOARG_P:0)
+#define MT_KEY_SYM(k) ((k)>>2)
+#define MT_KEY_FLG(k) ((k)&3)
+
+/* method table structure */
+typedef struct mt_tbl {
+  int size;
+  int alloc;
+  union mt_ptr *ptr;
+} mt_tbl;
+
+#ifdef MRB_USE_INLINE_METHOD_CACHE
+#define MT_CACHE_SIZE 256
+static uint8_t mt_cacheMT_CACHE_SIZE;
+#endif
+
+/* Creates the method table. */
+static mt_tbl*
+mt_new(mrb_state *mrb)
+{
+  mt_tbl *t;
+
+  t = (mt_tbl*)mrb_malloc(mrb, sizeof(mt_tbl));
+  t->size = 0;
+  t->alloc = 0;
+  t->ptr = NULL;
+
+  return t;
+}
+
+static void mt_put(mrb_state *mrb, mt_tbl *t, mrb_sym sym, mrb_sym flags, union mt_ptr ptr);
+
+static void
+mt_rehash(mrb_state *mrb, mt_tbl *t)
+{
+  int old_alloc = t->alloc;
+  int new_alloc = old_alloc+8;
+  union mt_ptr *old_ptr = t->ptr;
+
+  khash_power2(new_alloc);
+  if (old_alloc == new_alloc) return;
+
+  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;
+  union mt_ptr *vals = old_ptr;
+  for (int i = 0; i < old_alloc; i++) {
+    mrb_sym key = keysi;
+    if (MT_KEY_P(key)) {
+      mt_put(mrb, t, MT_KEY_SYM(key), MT_KEY_FLG(key), valsi);
+    }
+  }
+  mrb_free(mrb, old_ptr);
+}
+
+#define slot_empty_p(slot) ((slot)->key == 0 && (slot)->func_p == 0)
+
+/* Set the value for the symbol in the method table. */
+static void
+mt_put(mrb_state *mrb, mt_tbl *t, mrb_sym sym, mrb_sym flags, union mt_ptr ptr)
+{
+  int hash, pos, start, dpos = -1;
+
+  if (t->alloc == 0) {
+    mt_rehash(mrb, t);
+  }
+
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  union mt_ptr *vals = t->ptr;
+  hash = kh_int_hash_func(mrb, sym);
+  start = pos = hash & (t->alloc-1);
+  for (;;) {
+    mrb_sym key = keyspos;
+    if (MT_KEY_SYM(key) == sym) {
+    value_set:
+      keyspos = MT_KEY(sym, flags);
+      valspos = ptr;
+      return;
+    }
+    else if (key == MT_EMPTY) {
+      t->size++;
+      goto value_set;
+    }
+    else if (key == MT_DELETED && dpos < 0) {
+      dpos = pos;
+    }
+    pos = (pos+1) & (t->alloc-1);
+    if (pos == start) {         /* not found */
+      if (dpos > 0) {
+        t->size++;
+        pos = dpos;
+        goto value_set;
+      }
+      /* no room */
+      mt_rehash(mrb, t);
+      start = pos = hash & (t->alloc-1);
+      keys = (mrb_sym*)&t->ptrt->alloc;
+      vals = t->ptr;
+    }
+  }
+}
+
+/* Get a value for a symbol from the method table. */
+static mrb_sym
+mt_get(mrb_state *mrb, mt_tbl *t, mrb_sym sym, union mt_ptr *pp)
+{
+  int hash, pos, start;
+
+  if (t == NULL) return 0;
+  if (t->alloc == 0) return 0;
+  if (t->size == 0) return 0;
+
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  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;
+  pos = mt_cachecpos;
+  if (cpos < t->alloc && t->tablecpos.key == sym) {
+    return &t->tablecpos;
+  }
+#endif
+  start = pos = hash & (t->alloc-1);
+  for (;;) {
+    mrb_sym key = keyspos;
+    if (MT_KEY_SYM(key) == sym) {
+      *pp = valspos;
+#ifdef MRB_USE_INLINE_METHOD_CACHE
+      if (pos < 0xff) {
+        mt_cachecpos = pos;
+      }
+#endif
+      return key;
+    }
+    else if (key == MT_EMPTY) {
+      return 0;
+    }
+    pos = (pos+1) & (t->alloc-1);
+    if (pos == start) {         /* not found */
+      return 0;
+    }
+  }
+}
+
+/* Deletes the value for the symbol from the method table. */
+static mrb_bool
+mt_del(mrb_state *mrb, mt_tbl *t, mrb_sym sym)
+{
+  int hash, pos, start;
+
+  if (t == NULL) return FALSE;
+  if (t->alloc == 0) return  FALSE;
+  if (t->size == 0) return FALSE;
+
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  hash = kh_int_hash_func(mrb, sym);
+  start = pos = hash & (t->alloc-1);
+  for (;;) {
+    mrb_sym key = keyspos;
+    if (MT_KEY_SYM(key) == sym) {
+      t->size--;
+      keyspos = MT_DELETED;
+      return TRUE;
+    }
+    else if (key == MT_EMPTY) {
+      return FALSE;
+    }
+    pos = (pos+1) & (t->alloc-1);
+    if (pos == start) {         /* not found */
+      return FALSE;
+    }
+  }
+}
+
+/* Copy the method table. */
+static struct mt_tbl*
+mt_copy(mrb_state *mrb, mt_tbl *t)
+{
+  mt_tbl *t2;
+  int i;
+
+  if (t == NULL) return NULL;
+  if (t->alloc == 0) return NULL;
+  if (t->size == 0) return NULL;
+
+  t2 = mt_new(mrb);
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  union mt_ptr *vals = t->ptr;
+  for (i=0; i<t->alloc; i++) {
+    if (MT_KEY_P(keysi)) {
+      mt_put(mrb, t2, MT_KEY_SYM(keysi), MT_KEY_FLG(keysi), valsi);
+    }
+  }
+  return t2;
+}
+
+/* Free memory of the method table. */
+static void
+mt_free(mrb_state *mrb, mt_tbl *t)
+{
+  mrb_free(mrb, t->ptr);
+  mrb_free(mrb, t);
+}
+
+MRB_API void
+mrb_mt_foreach(mrb_state *mrb, struct RClass *c, mrb_mt_foreach_func *fn, void *p)
+{
+  mt_tbl *t = c->mt;
+  int i;
+
+  if (t == NULL) return;
+  if (t->alloc == 0) return;
+  if (t->size == 0) return;
+
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  union mt_ptr *vals = t->ptr;
+  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)
+        return;
+    }
+  }
+  return;
+}
 
 void
 mrb_gc_mark_mt(mrb_state *mrb, struct RClass *c)
 {
-  khiter_t k;
-  khash_t(mt) *h = c->mt;
+  mt_tbl *t = c->mt;
+  int i;
 
-  if (!h) return;
-  for (k = kh_begin(h); k != kh_end(h); k++) {
-    if (kh_exist(h, k)) {
-      mrb_method_t m = kh_value(h, k);
+  if (t == NULL) return;
+  if (t->alloc == 0) return;
+  if (t->size == 0) return;
 
-      if (MRB_METHOD_PROC_P(m)) {
-        struct RProc *p = MRB_METHOD_PROC(m);
-        mrb_gc_mark(mrb, (struct RBasic*)p);
-      }
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  union mt_ptr *vals = t->ptr;
+  for (i=0; i<t->alloc; i++) {
+    if (MT_KEY_P(keysi) && (keysi & MT_FUNC_P) == 0) { /* Proc pointer */
+      struct RProc *p = valsi.proc;
+      mrb_gc_mark(mrb, (struct RBasic*)p);
     }
   }
+  return;
 }
 
 size_t
 mrb_gc_mark_mt_size(mrb_state *mrb, struct RClass *c)
 {
-  khash_t(mt) *h = c->mt;
+  struct mt_tbl *h = c->mt;
 
   if (!h) return 0;
-  return kh_size(h);
+  return (size_t)h->size;
 }
 
 void
 mrb_gc_free_mt(mrb_state *mrb, struct RClass *c)
 {
-  kh_destroy(mt, mrb, c->mt);
+  if (c->mt) mt_free(mrb, c->mt);
 }
 
 void
 mrb_class_name_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb_sym id)
 {
   mrb_value name;
-  mrb_sym nsym = mrb_intern_lit(mrb, "__classname__");
+  mrb_sym nsym = MRB_SYM(__classname__);
 
   if (mrb_obj_iv_defined(mrb, (struct RObject*)c, nsym)) return;
   if (outer == NULL || outer == mrb->object_class) {
@@ -68,7 +321,7 @@
     name = mrb_class_path(mrb, outer);
     if (mrb_nil_p(name)) {      /* unnamed outer class */
       if (outer != mrb->object_class && outer != c) {
-        mrb_obj_iv_set_force(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__outer__"),
+        mrb_obj_iv_set_force(mrb, (struct RObject*)c, MRB_SYM(__outer__),
                              mrb_obj_value(outer));
       }
       return;
@@ -104,10 +357,11 @@
 {
   struct RClass *sc, *c;
 
+  mrb_assert(o->c);
   if (o->c->tt == MRB_TT_SCLASS) return;
-  sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class);
+  sc = MRB_OBJ_ALLOC(mrb, MRB_TT_SCLASS, mrb->class_class);
   sc->flags |= MRB_FL_CLASS_IS_INHERITED;
-  sc->mt = kh_init(mt, mrb);
+  sc->mt = mt_new(mrb);
   sc->iv = 0;
   if (o->tt == MRB_TT_CLASS) {
     c = (struct RClass*)o;
@@ -132,7 +386,7 @@
   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_intern_lit(mrb, "__attached__"), mrb_obj_value(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;
 }
 
@@ -230,6 +484,15 @@
 }
 
 MRB_API struct RClass*
+mrb_define_module_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name)
+{
+  struct RClass * c = define_module(mrb, name, outer);
+
+  setup_class(mrb, outer, c, name);
+  return c;
+}
+
+MRB_API struct RClass*
 mrb_define_module_under(mrb_state *mrb, struct RClass *outer, const char *name)
 {
   mrb_sym id = mrb_intern_cstr(mrb, name);
@@ -283,12 +546,10 @@
 }
 
 static mrb_value mrb_bob_init(mrb_state *mrb, mrb_value);
-#ifdef MRB_METHOD_CACHE
-static void mc_clear_all(mrb_state *mrb);
-static void mc_clear_by_id(mrb_state *mrb, struct RClass*, mrb_sym);
+#ifndef MRB_NO_METHOD_CACHE
+static void mc_clear(mrb_state *mrb);
 #else
-#define mc_clear_all(mrb)
-#define mc_clear_by_id(mrb,c,s)
+#define mc_clear(mrb)
 #endif
 
 static void
@@ -302,7 +563,7 @@
   super->flags |= MRB_FL_CLASS_IS_INHERITED;
   s = mrb_obj_value(super);
   mrb_mc_clear_by_class(mrb, klass);
-  mid = mrb_intern_lit(mrb, "inherited");
+  mid = MRB_SYM(inherited);
   if (!mrb_func_basic_p(mrb, s, mid, mrb_bob_init)) {
     mrb_value c = mrb_obj_value(klass);
     mrb_funcall_argv(mrb, s, mid, 1, &c);
@@ -349,21 +610,29 @@
 MRB_API mrb_bool
 mrb_class_defined(mrb_state *mrb, const char *name)
 {
-  mrb_value sym = mrb_check_intern_cstr(mrb, name);
-  if (mrb_nil_p(sym)) {
-    return FALSE;
-  }
-  return mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_symbol(sym));
+  mrb_sym sym = mrb_intern_check_cstr(mrb, name);
+  if (!sym) return FALSE;
+  return mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), sym);
+}
+
+MRB_API mrb_bool
+mrb_class_defined_id(mrb_state *mrb, mrb_sym name)
+{
+  return mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), name);
 }
 
 MRB_API mrb_bool
 mrb_class_defined_under(mrb_state *mrb, struct RClass *outer, const char *name)
 {
-  mrb_value sym = mrb_check_intern_cstr(mrb, name);
-  if (mrb_nil_p(sym)) {
-    return FALSE;
-  }
-  return mrb_const_defined_at(mrb, mrb_obj_value(outer), mrb_symbol(sym));
+  mrb_sym sym = mrb_intern_check_cstr(mrb, name);
+  if (!sym) return FALSE;
+  return mrb_const_defined_at(mrb, mrb_obj_value(outer), sym);
+}
+
+MRB_API mrb_bool
+mrb_class_defined_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name)
+{
+  return mrb_const_defined_at(mrb, mrb_obj_value(outer), name);
 }
 
 MRB_API struct RClass*
@@ -373,17 +642,28 @@
 }
 
 MRB_API struct RClass*
+mrb_class_get_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name)
+{
+  return class_from_sym(mrb, outer, name);
+}
+
+MRB_API struct RClass*
 mrb_class_get(mrb_state *mrb, const char *name)
 {
   return mrb_class_get_under(mrb, mrb->object_class, name);
 }
 
 MRB_API struct RClass*
-mrb_exc_get(mrb_state *mrb, const char *name)
+mrb_class_get_id(mrb_state *mrb, mrb_sym name)
+{
+  return mrb_class_get_under_id(mrb, mrb->object_class, name);
+}
+
+MRB_API struct RClass*
+mrb_exc_get_id(mrb_state *mrb, mrb_sym name)
 {
   struct RClass *exc, *e;
-  mrb_value c = mrb_const_get(mrb, mrb_obj_value(mrb->object_class),
-                              mrb_intern_cstr(mrb, name));
+  mrb_value c = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), name);
 
   if (!mrb_class_p(c)) {
     mrb_raise(mrb, mrb->eException_class, "exception corrupted");
@@ -405,11 +685,23 @@
 }
 
 MRB_API struct RClass*
+mrb_module_get_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name)
+{
+  return module_from_sym(mrb, outer, name);
+}
+
+MRB_API struct RClass*
 mrb_module_get(mrb_state *mrb, const char *name)
 {
   return mrb_module_get_under(mrb, mrb->object_class, name);
 }
 
+MRB_API struct RClass*
+mrb_module_get_id(mrb_state *mrb, mrb_sym name)
+{
+  return mrb_module_get_under_id(mrb, mrb->object_class, name);
+}
+
 /*!
  * Defines a class under the namespace of \a outer.
  * \param outer  a class which contains the new class.
@@ -427,9 +719,8 @@
  *       \a super, the function just returns the defined class.
  */
 MRB_API struct RClass*
-mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, struct RClass *super)
+mrb_define_class_under_id(mrb_state *mrb, struct RClass *outer, mrb_sym name, struct RClass *super)
 {
-  mrb_sym id = mrb_intern_cstr(mrb, name);
   struct RClass * c;
 
 #if 0
@@ -437,34 +728,51 @@
     mrb_warn(mrb, "no super class for '%C::%n', Object assumed", outer, id);
   }
 #endif
-  c = define_class(mrb, id, super, outer);
-  setup_class(mrb, outer, c, id);
+  c = define_class(mrb, name, super, outer);
+  setup_class(mrb, outer, c, name);
   return c;
 }
 
+MRB_API struct RClass*
+mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, struct RClass *super)
+{
+  return mrb_define_class_under_id(mrb, outer, mrb_intern_cstr(mrb, name), super);
+}
+
 MRB_API void
 mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_method_t m)
 {
-  khash_t(mt) *h;
-  khiter_t k;
+  mt_tbl *h;
+  union mt_ptr ptr;
+
   MRB_CLASS_ORIGIN(c);
   h = c->mt;
-
   mrb_check_frozen(mrb, c);
-  if (!h) h = c->mt = kh_init(mt, mrb);
-  k = kh_put(mt, mrb, h, mid);
-  kh_value(h, k) = m;
-  if (MRB_METHOD_PROC_P(m) && !MRB_METHOD_UNDEF_P(m)) {
+  if (!h) h = c->mt = mt_new(mrb);
+  if (MRB_METHOD_PROC_P(m)) {
     struct RProc *p = MRB_METHOD_PROC(m);
 
-    p->flags |= MRB_PROC_SCOPE;
-    p->c = NULL;
-    mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)p);
-    if (!MRB_PROC_ENV_P(p)) {
-      MRB_PROC_SET_TARGET_CLASS(p, c);
+    ptr.proc = p;
+    if (p) {
+      if (p->color != MRB_GC_RED) {
+        p->flags |= MRB_PROC_SCOPE;
+        p->c = NULL;
+        mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)p);
+        if (!MRB_PROC_ENV_P(p)) {
+          MRB_PROC_SET_TARGET_CLASS(p, c);
+        }
+      }
+      else {
+        mrb_assert(MRB_FROZEN_P(p) && MRB_PROC_SCOPE_P(p));
+        mrb_assert(p->c == NULL && p->upper == NULL && p->e.target_class == NULL);
+      }
     }
   }
-  mc_clear_by_id(mrb, c, mid);
+  else {
+    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);
 }
 
 MRB_API void
@@ -474,6 +782,9 @@
   int ai = mrb_gc_arena_save(mrb);
 
   MRB_METHOD_FROM_FUNC(m, func);
+#ifndef MRB_USE_METHOD_T_STRUCT
+  mrb_assert(MRB_METHOD_FUNC(m) == func);
+#endif
   if (aspec == MRB_ARGS_NONE()) {
     MRB_METHOD_NOARG_SET(m);
   }
@@ -507,18 +818,12 @@
   return mrb_nil_value();
 }
 
-static mrb_value
-to_ary(mrb_state *mrb, mrb_value val)
-{
-  mrb_check_type(mrb, val, MRB_TT_ARRAY);
-  return val;
-}
-
-static mrb_value
-to_hash(mrb_state *mrb, mrb_value val)
+static void
+ensure_class_type(mrb_state *mrb, mrb_value val)
 {
-  mrb_check_type(mrb, val, MRB_TT_HASH);
-  return val;
+  if (!class_ptr_p(val)) {
+    mrb_raisef(mrb, E_TYPE_ERROR, "%v is not class/module", val);
+  }
 }
 
 #define to_sym(mrb, ss) mrb_obj_to_sym(mrb, ss)
@@ -526,22 +831,22 @@
 MRB_API mrb_int
 mrb_get_argc(mrb_state *mrb)
 {
-  mrb_int argc = mrb->c->ci->argc;
+  mrb_int argc = mrb->c->ci->n;
 
-  if (argc < 0) {
-    struct RArray *a = mrb_ary_ptr(mrb->c->stack1);
+  if (argc == 15) {
+    struct RArray *a = mrb_ary_ptr(mrb->c->ci->stack1);
 
     argc = ARY_LEN(a);
   }
   return argc;
 }
 
-MRB_API mrb_value*
+MRB_API const mrb_value*
 mrb_get_argv(mrb_state *mrb)
 {
-  mrb_int argc = mrb->c->ci->argc;
-  mrb_value *array_argv = mrb->c->stack + 1;
-  if (argc < 0) {
+  mrb_int argc = mrb->c->ci->n;
+  mrb_value *array_argv = mrb->c->ci->stack + 1;
+  if (argc == 15) {
     struct RArray *a = mrb_ary_ptr(*array_argv);
 
     array_argv = ARY_PTR(a);
@@ -552,21 +857,36 @@
 MRB_API mrb_value
 mrb_get_arg1(mrb_state *mrb)
 {
-  mrb_int argc = mrb->c->ci->argc;
-  mrb_value *array_argv = mrb->c->stack + 1;
-  if (argc < 0) {
+  mrb_callinfo *ci = mrb->c->ci;
+  mrb_int argc = ci->n;
+  mrb_value *array_argv = ci->stack + 1;
+  if (argc == 15) {
     struct RArray *a = mrb_ary_ptr(*array_argv);
 
     argc = ARY_LEN(a);
     array_argv = ARY_PTR(a);
   }
+  if (argc == 0 && ci->nk == 15) {
+    mrb_int n = ci->n;
+    if (n == 15) n = 1;
+    return ci->stackn+1;      /* kwhash next to positional arguments */
+  }
   if (argc != 1) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+    mrb_argnum_error(mrb, argc, 1, 1);
   }
   return array_argv0;
 }
 
-void mrb_hash_check_kdict(mrb_state *mrb, mrb_value self);
+mrb_int mrb_ci_bidx(mrb_callinfo *ci);
+
+MRB_API mrb_bool
+mrb_block_given_p(mrb_state *mrb)
+{
+  mrb_callinfo *ci = mrb->c->ci;
+  mrb_value b = ci->stackmrb_ci_bidx(ci);
+
+  return !mrb_nil_p(b);
+}
 
 /*
   retrieve arguments from mrb_state.
@@ -580,51 +900,53 @@
     string  mruby type     C type                 note
     ----------------------------------------------------------------------------------------------
     o:      Object         mrb_value
-    C:      Class/Module   mrb_value
+    C:      Class/Module   mrb_value            when ! follows, the value may be nil
     S:      String         mrb_value            when ! follows, the value may be nil
     A:      Array          mrb_value            when ! follows, the value may be nil
     H:      Hash           mrb_value            when ! follows, the value may be nil
-    s:      String         char*,mrb_int        Receive two arguments; s! gives (NULL,0) for nil
-    z:      String         char*                NUL terminated string; z! gives NULL for nil
-    a:      Array          mrb_value*,mrb_int   Receive two arguments; a! gives (NULL,0) for nil
-    f:      Fixnum/Float   mrb_float
-    i:      Fixnum/Float   mrb_int
+    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*
+    I:      inline struct  void*,struct RClass  I! gives NULL for nil
     &:      block          mrb_value            &! raises exception if no block given
-    *:      rest argument  mrb_value*,mrb_int   The rest of the arguments as an array; *! avoid copy of the stack
+    *:      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, const char *format, ...)
 {
   const char *fmt = format;
   char c;
-  mrb_int i = 0;
+  int i = 0;
   va_list ap;
-  mrb_int argc = mrb->c->ci->argc;
-  mrb_value *array_argv = mrb->c->stack+1;
-  mrb_bool argv_on_stack = argc >= 0;
+  mrb_callinfo *ci = mrb->c->ci;
+  int argc = ci->n;
+  const mrb_value *argv = ci->stack+1;
+  mrb_bool argv_on_stack;
   mrb_bool opt = FALSE;
   mrb_bool opt_skip = TRUE;
-  mrb_bool given = TRUE;
-  mrb_value kdict;
+  const mrb_value *pickarg = NULL; /* arguments currently being processed */
+  mrb_value kdict = mrb_nil_value();
   mrb_bool reqkarg = FALSE;
-  mrb_int needargc = 0;
+  int argc_min = 0, argc_max = 0;
 
-  if (!argv_on_stack) {
-    struct RArray *a = mrb_ary_ptr(*array_argv);
-    array_argv = ARY_PTR(a);
-    argc = ARY_LEN(a);
-  }
   va_start(ap, format);
 
-#define ARGV array_argv
-
   while ((c = *fmt++)) {
     switch (c) {
     case '|':
@@ -632,9 +954,11 @@
       break;
     case '*':
       opt_skip = FALSE;
+      argc_max = -1;
       if (!reqkarg) reqkarg = strchr(fmt, ':') ? TRUE : FALSE;
       goto check_exit;
     case '!':
+    case '+':
       break;
     case ':':
       reqkarg = TRUE;
@@ -643,173 +967,194 @@
       if (opt) opt_skip = FALSE;
       break;
     default:
-      if (!opt) needargc ++;
+      if (!opt) argc_min++;
+      argc_max++;
       break;
     }
   }
 
  check_exit:
-  if (reqkarg && argc > needargc && mrb_hash_p(kdict = ARGVargc - 1)) {
-    mrb_hash_check_kdict(mrb, kdict);
-    argc --;
+  if (!reqkarg && ci->nk > 0) {
+    mrb_assert(ci->nk == 15);
+    kdict = ci->stackmrb_ci_bidx(ci)-1;
+    if (mrb_hash_p(kdict) && mrb_hash_size(mrb, kdict) > 0) {
+      if (argc < 14) {
+        ci->n++;
+        argc++;    /* include kdict in normal arguments */
+      }
+      else {
+        /* 14+1 == 15 so pack first */
+        if (argc == 14) {
+          /* pack arguments and kdict */
+          ci->stack1 = mrb_ary_new_from_values(mrb, argc+1, &ci->stack1);
+          argc = ci->n = 15;
+        }
+        else {
+          /* push kdict to packed arguments */
+          mrb_ary_push(mrb, ci->stack1, kdict);
+        }
+        ci->stack2 = ci->stackmrb_ci_bidx(ci);
+      }
+      ci->nk = 0;
+    }
   }
-  else {
-    kdict = mrb_nil_value();
+  if (reqkarg && ci->nk > 0) {
+    kdict = ci->stackmrb_ci_bidx(ci)-1;
+    mrb_assert(ci->nk == 15);
+    mrb_assert(mrb_hash_p(kdict));
+  }
+
+  argv_on_stack = argc < 15;
+  if (!argv_on_stack) {
+    struct RArray *a = mrb_ary_ptr(*argv);
+    argv = ARY_PTR(a);
+    argc = ARY_LEN(a);
   }
 
   opt = FALSE;
   i = 0;
   while ((c = *format++)) {
-    mrb_value *argv = ARGV;
-    mrb_bool altmode;
+    mrb_bool altmode = FALSE;
+    mrb_bool needmodify = FALSE;
+
+    for (; *format; format++) {
+      switch (*format) {
+      case '!':
+        if (altmode) goto modifier_exit; /* not accept for multiple '!' */
+        altmode = TRUE;
+        break;
+      case '+':
+        if (needmodify) goto modifier_exit; /* not accept for multiple '+' */
+        needmodify = TRUE;
+        break;
+      default:
+        goto modifier_exit;
+      }
+    }
 
+  modifier_exit:
     switch (c) {
     case '|': case '*': case '&': case '?': case ':':
+      if (needmodify) {
+      bad_needmodify:
+        mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong `%c+` modified specifier`", c);
+      }
       break;
     default:
-      if (argc <= i) {
+      if (i < argc) {
+        pickarg = &argvi++;
+        if (needmodify && !mrb_nil_p(*pickarg)) {
+          if (mrb_immediate_p(*pickarg)) {
+            mrb_raisef(mrb, E_FROZEN_ERROR, "can't modify frozen %t", *pickarg);
+          }
+          mrb_check_frozen(mrb, mrb_obj_ptr(*pickarg));
+        }
+      }
+      else {
         if (opt) {
-          given = FALSE;
+          pickarg = NULL;
         }
         else {
-          mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+          mrb_argnum_error(mrb, argc, argc_min, argc_max);
         }
       }
       break;
     }
 
-    if (*format == '!') {
-      format ++;
-      altmode = TRUE;
-    }
-    else {
-      altmode = FALSE;
-    }
-
     switch (c) {
     case 'o':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (i < argc) {
-          *p = argvi++;
-        }
-      }
-      break;
     case 'C':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (i < argc) {
-          mrb_value ss;
-
-          ss = argvi++;
-          if (!class_ptr_p(ss)) {
-            mrb_raisef(mrb, E_TYPE_ERROR, "%v is not class/module", ss);
-          }
-          *p = ss;
-        }
-      }
-      break;
     case 'S':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (i < argc) {
-          *p = argvi++;
-          if (!(altmode && mrb_nil_p(*p))) {
-            mrb_to_str(mrb, *p);
-          }
-        }
-      }
-      break;
     case 'A':
+    case 'H':
       {
         mrb_value *p;
 
         p = va_arg(ap, mrb_value*);
-        if (i < argc) {
-          *p = argvi++;
-          if (!(altmode && mrb_nil_p(*p))) {
-            *p = to_ary(mrb, *p);
+        if (pickarg) {
+          if (!(altmode && mrb_nil_p(*pickarg))) {
+            switch (c) {
+            case 'C': ensure_class_type(mrb, *pickarg); break;
+            case 'S': mrb_ensure_string_type(mrb, *pickarg); break;
+            case 'A': mrb_ensure_array_type(mrb, *pickarg); break;
+            case 'H': mrb_ensure_hash_type(mrb, *pickarg); break;
+            }
           }
+          *p = *pickarg;
         }
       }
       break;
-    case 'H':
+    case 'c':
       {
-        mrb_value *p;
+        struct RClass **p;
 
-        p = va_arg(ap, mrb_value*);
-        if (i < argc) {
-          *p = argvi++;
-          if (!(altmode && mrb_nil_p(*p))) {
-            *p = to_hash(mrb, *p);
+        p = va_arg(ap, struct RClass**);
+        if (pickarg) {
+          if (altmode && mrb_nil_p(*pickarg)) {
+            *p = NULL;
+          }
+          else {
+            ensure_class_type(mrb, *pickarg);
+            *p = mrb_class_ptr(*pickarg);
           }
         }
       }
       break;
     case 's':
       {
-        mrb_value ss;
-        char **ps = 0;
+        const char **ps = 0;
         mrb_int *pl = 0;
 
-        ps = va_arg(ap, char**);
+        ps = va_arg(ap, const char**);
         pl = va_arg(ap, mrb_int*);
-        if (i < argc) {
-          ss = argvi++;
-          if (altmode && mrb_nil_p(ss)) {
+        if (needmodify) goto bad_needmodify;
+        if (pickarg) {
+          if (altmode && mrb_nil_p(*pickarg)) {
             *ps = NULL;
             *pl = 0;
           }
           else {
-            mrb_to_str(mrb, ss);
-            *ps = RSTRING_PTR(ss);
-            *pl = RSTRING_LEN(ss);
+            mrb_ensure_string_type(mrb, *pickarg);
+            *ps = RSTRING_PTR(*pickarg);
+            *pl = RSTRING_LEN(*pickarg);
           }
         }
       }
       break;
     case 'z':
       {
-        mrb_value ss;
         const char **ps;
 
         ps = va_arg(ap, const char**);
-        if (i < argc) {
-          ss = argvi++;
-          if (altmode && mrb_nil_p(ss)) {
+        if (needmodify) goto bad_needmodify;
+        if (pickarg) {
+          if (altmode && mrb_nil_p(*pickarg)) {
             *ps = NULL;
           }
           else {
-            mrb_to_str(mrb, ss);
-            *ps = RSTRING_CSTR(mrb, ss);
+            mrb_ensure_string_type(mrb, *pickarg);
+            *ps = RSTRING_CSTR(mrb, *pickarg);
           }
         }
       }
       break;
     case 'a':
       {
-        mrb_value aa;
         struct RArray *a;
-        mrb_value **pb;
+        const mrb_value **pb;
         mrb_int *pl;
 
-        pb = va_arg(ap, mrb_value**);
+        pb = va_arg(ap, const mrb_value**);
         pl = va_arg(ap, mrb_int*);
-        if (i < argc) {
-          aa = argvi++;
-          if (altmode && mrb_nil_p(aa)) {
+        if (needmodify) goto bad_needmodify;
+        if (pickarg) {
+          if (altmode && mrb_nil_p(*pickarg)) {
             *pb = 0;
             *pl = 0;
           }
           else {
-            aa = to_ary(mrb, aa);
-            a = mrb_ary_ptr(aa);
+            mrb_ensure_array_type(mrb, *pickarg);
+            a = mrb_ary_ptr(*pickarg);
             *pb = ARY_PTR(a);
             *pl = ARY_LEN(a);
           }
@@ -819,27 +1164,34 @@
     case 'I':
       {
         void* *p;
-        mrb_value ss;
+        struct RClass *klass;
 
         p = va_arg(ap, void**);
-        if (i < argc) {
-          ss = argvi++;
-          if (!mrb_istruct_p(ss))
-          {
-            mrb_raisef(mrb, E_TYPE_ERROR, "%v is not inline struct", ss);
+        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);
           }
-          *p = mrb_istruct_ptr(ss);
         }
       }
       break;
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
     case 'f':
       {
         mrb_float *p;
 
         p = va_arg(ap, mrb_float*);
-        if (i < argc) {
-          *p = mrb_to_flo(mrb, argvi++);
+        if (pickarg) {
+          *p = mrb_as_float(mrb, *pickarg);
         }
       }
       break;
@@ -849,8 +1201,8 @@
         mrb_int *p;
 
         p = va_arg(ap, mrb_int*);
-        if (i < argc) {
-          *p = mrb_fixnum(mrb_to_int(mrb, argvi++));
+        if (pickarg) {
+          *p = mrb_as_int(mrb, *pickarg);
         }
       }
       break;
@@ -858,9 +1210,8 @@
       {
         mrb_bool *boolp = va_arg(ap, mrb_bool*);
 
-        if (i < argc) {
-          mrb_value b = argvi++;
-          *boolp = mrb_test(b);
+        if (pickarg) {
+          *boolp = mrb_test(*pickarg);
         }
       }
       break;
@@ -869,11 +1220,8 @@
         mrb_sym *symp;
 
         symp = va_arg(ap, mrb_sym*);
-        if (i < argc) {
-          mrb_value ss;
-
-          ss = argvi++;
-          *symp = to_sym(mrb, ss);
+        if (pickarg) {
+          *symp = to_sym(mrb, *pickarg);
         }
       }
       break;
@@ -884,13 +1232,12 @@
 
         datap = va_arg(ap, void**);
         type = va_arg(ap, struct mrb_data_type const*);
-        if (i < argc) {
-          mrb_value dd = argvi++;
-          if (altmode && mrb_nil_p(dd)) {
+        if (pickarg) {
+          if (altmode && mrb_nil_p(*pickarg)) {
             *datap = 0;
           }
           else {
-            *datap = mrb_data_get_ptr(mrb, dd, type);
+            *datap = mrb_data_get_ptr(mrb, *pickarg, type);
           }
         }
       }
@@ -901,12 +1248,7 @@
         mrb_value *p, *bp;
 
         p = va_arg(ap, mrb_value*);
-        if (mrb->c->ci->argc < 0) {
-          bp = mrb->c->stack + 2;
-        }
-        else {
-          bp = mrb->c->stack + mrb->c->ci->argc + 1;
-        }
+        bp = ci->stack + mrb_ci_bidx(ci);
         if (altmode && mrb_nil_p(*bp)) {
           mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
         }
@@ -922,17 +1264,17 @@
         mrb_bool *p;
 
         p = va_arg(ap, mrb_bool*);
-        *p = given;
+        *p = pickarg ? TRUE : FALSE;
       }
       break;
 
     case '*':
       {
-        mrb_value **var;
+        const mrb_value **var;
         mrb_int *pl;
         mrb_bool nocopy = (altmode || !argv_on_stack) ? TRUE : FALSE;
 
-        var = va_arg(ap, mrb_value**);
+        var = va_arg(ap, const mrb_value**);
         pl = va_arg(ap, mrb_int*);
         if (argc > i) {
           *pl = argc-i;
@@ -967,7 +1309,7 @@
         else {
           uint32_t kwnum = kwargs->num;
           uint32_t required = kwargs->required;
-          const char *const *kname = kwargs->table;
+          const mrb_sym *kname = kwargs->table;
           mrb_value *values = kwargs->values;
           uint32_t j;
           const uint32_t keyword_max = 40;
@@ -976,17 +1318,17 @@
             mrb_raise(mrb, E_ARGUMENT_ERROR, "keyword number is too large");
           }
 
-          for (j = required; j > 0; j --, kname ++, values ++) {
-            mrb_value k = mrb_symbol_value(mrb_intern_cstr(mrb, *kname));
+          for (j = required; j > 0; j--, kname++, values++) {
+            mrb_value k = mrb_symbol_value(*kname);
             if (!mrb_hash_key_p(mrb, ksrc, k)) {
-              mrb_raisef(mrb, E_ARGUMENT_ERROR, "missing keyword: %s", *kname);
+              mrb_raisef(mrb, E_ARGUMENT_ERROR, "missing keyword: %n", *kname);
             }
             *values = mrb_hash_delete_key(mrb, ksrc, k);
             mrb_gc_protect(mrb, *values);
           }
 
-          for (j = kwnum - required; j > 0; j --, kname ++, values ++) {
-            mrb_value k = mrb_symbol_value(mrb_intern_cstr(mrb, *kname));
+          for (j = kwnum - required; j > 0; j--, kname++, values++) {
+            mrb_value k = mrb_symbol_value(*kname);
             if (mrb_hash_key_p(mrb, ksrc, k)) {
               *values = mrb_hash_delete_key(mrb, ksrc, k);
               mrb_gc_protect(mrb, *values);
@@ -1016,10 +1358,8 @@
     }
   }
 
-#undef ARGV
-
   if (!c && argc > i) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+    mrb_argnum_error(mrb, argc, argc_min, argc_max);
   }
 
 finish:
@@ -1032,7 +1372,7 @@
 {
   struct RClass *c;
 
-  c = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_CLASS, mrb->class_class);
+  c = MRB_OBJ_ALLOC(mrb, MRB_TT_CLASS, mrb->class_class);
   if (super) {
     c->super = super;
     mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)super);
@@ -1040,7 +1380,7 @@
   else {
     c->super = mrb->object_class;
   }
-  c->mt = kh_init(mt, mrb);
+  c->mt = mt_new(mrb);
   return c;
 }
 
@@ -1048,14 +1388,14 @@
 boot_initmod(mrb_state *mrb, struct RClass *mod)
 {
   if (!mod->mt) {
-    mod->mt = kh_init(mt, mrb);
+    mod->mt = mt_new(mrb);
   }
 }
 
 static struct RClass*
 include_class_new(mrb_state *mrb, struct RClass *m, struct RClass *super)
 {
-  struct RClass *ic = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_ICLASS, mrb->class_class);
+  struct RClass *ic = MRB_OBJ_ALLOC(mrb, MRB_TT_ICLASS, mrb->class_class);
   if (m->tt == MRB_TT_ICLASS) {
     m = m->c;
   }
@@ -1079,8 +1419,10 @@
   void *klass_mt = find_origin(c)->mt;
 
   while (m) {
-    int superclass_seen = 0;
+    int original_seen = FALSE;
+    int superclass_seen = FALSE;
 
+    if (c == ins_pos) original_seen = TRUE;
     if (m->flags & MRB_FL_CLASS_IS_PREPENDED)
       goto skip;
 
@@ -1089,16 +1431,17 @@
 
     p = c->super;
     while (p) {
+      if (c == p) original_seen = TRUE;
       if (p->tt == MRB_TT_ICLASS) {
         if (p->mt == m->mt) {
-          if (!superclass_seen) {
+          if (!superclass_seen && original_seen) {
             ins_pos = p; /* move insert point */
           }
           goto skip;
         }
       } else if (p->tt == MRB_TT_CLASS) {
         if (!search_super) break;
-        superclass_seen = 1;
+        superclass_seen = TRUE;
       }
       p = p->super;
     }
@@ -1107,15 +1450,26 @@
     m->flags |= MRB_FL_CLASS_IS_INHERITED;
     ins_pos->super = ic;
     mrb_field_write_barrier(mrb, (struct RBasic*)ins_pos, (struct RBasic*)ic);
-    mrb_mc_clear_by_class(mrb, ins_pos);
     ins_pos = ic;
   skip:
     m = m->super;
   }
-  mc_clear_all(mrb);
+  mc_clear(mrb);
   return 0;
 }
 
+static int
+fix_include_module(mrb_state *mrb, struct RBasic *obj, void *data)
+{
+  struct RClass **m = (struct RClass**)data;
+
+  if (obj->tt == MRB_TT_ICLASS && obj->c == m0 && !MRB_FLAG_TEST(obj, MRB_FL_CLASS_IS_ORIGIN)) {
+    struct RClass *ic = (struct RClass*)obj;
+    include_module_at(mrb, ic, ic, m1, 1);
+  }
+  return MRB_EACH_OBJ_OK;
+}
+
 MRB_API void
 mrb_include_module(mrb_state *mrb, struct RClass *c, struct RClass *m)
 {
@@ -1123,50 +1477,96 @@
   if (include_module_at(mrb, c, find_origin(c), m, 1) < 0) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "cyclic include detected");
   }
+  if (c->tt == MRB_TT_MODULE && (c->flags & MRB_FL_CLASS_IS_INHERITED)) {
+    struct RClass *data2;
+    data0 = c;
+    data1 = m;
+    mrb_objspace_each_objects(mrb, fix_include_module, data);
+  }
+}
+
+static int
+fix_prepend_module(mrb_state *mrb, struct RBasic *obj, void *data)
+{
+  struct RClass **m = (struct RClass**)data;
+  struct RClass *c = (struct RClass*)obj;
+
+  if (c->tt == MRB_TT_CLASS || c->tt == MRB_TT_MODULE) {
+    struct RClass *p = c->super;
+    struct RClass *ins_pos = c;
+    while (p) {
+      if (c == m0) break;
+      if (p == m0->super->c) {
+        ins_pos = c;
+      }
+      if (p->tt == MRB_TT_CLASS) break;
+      if (p->c == m0) {
+        include_module_at(mrb, ins_pos, ins_pos, m1, 0);
+        break;
+      }
+      c = p;
+      p = p->super;
+    }
+  }
+  return MRB_EACH_OBJ_OK;
 }
 
 MRB_API void
 mrb_prepend_module(mrb_state *mrb, struct RClass *c, struct RClass *m)
 {
   struct RClass *origin;
-  int changed = 0;
 
   mrb_check_frozen(mrb, c);
   if (!(c->flags & MRB_FL_CLASS_IS_PREPENDED)) {
-    origin = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_ICLASS, c);
+    struct RClass *c0;
+
+    if (c->tt == MRB_TT_ICLASS) {
+      c0 = c->c;
+    }
+    else {
+      c0 = c;
+    }
+    origin = MRB_OBJ_ALLOC(mrb, MRB_TT_ICLASS, c0);
     origin->flags |= MRB_FL_CLASS_IS_ORIGIN | MRB_FL_CLASS_IS_INHERITED;
     origin->super = c->super;
     c->super = origin;
     origin->mt = c->mt;
-    c->mt = kh_init(mt, mrb);
+    c->mt = NULL;
+    origin->iv = c->iv;
     mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)origin);
     c->flags |= MRB_FL_CLASS_IS_PREPENDED;
   }
-  changed = include_module_at(mrb, c, c, m, 0);
-  if (changed < 0) {
+  if (include_module_at(mrb, c, c, m, 0) < 0) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "cyclic prepend detected");
   }
+  if (c->tt == MRB_TT_MODULE &&
+      (c->flags & (MRB_FL_CLASS_IS_INHERITED|MRB_FL_CLASS_IS_PREPENDED))) {
+    struct RClass *data2;
+    data0 = c;
+    data1 = m;
+    mrb_objspace_each_objects(mrb, fix_prepend_module, data);
+  }
 }
 
 static mrb_value
 mrb_mod_prepend_features(mrb_state *mrb, mrb_value mod)
 {
-  mrb_value klass;
+  struct RClass *c;
 
   mrb_check_type(mrb, mod, MRB_TT_MODULE);
-  mrb_get_args(mrb, "C", &klass);
-  mrb_prepend_module(mrb, mrb_class_ptr(klass), mrb_class_ptr(mod));
+  mrb_get_args(mrb, "c", &c);
+  mrb_prepend_module(mrb, c, mrb_class_ptr(mod));
   return mod;
 }
 
 static mrb_value
 mrb_mod_append_features(mrb_state *mrb, mrb_value mod)
 {
-  mrb_value klass;
+  struct RClass *c;
 
   mrb_check_type(mrb, mod, MRB_TT_MODULE);
-  mrb_get_args(mrb, "C", &klass);
-  mrb_include_module(mrb, mrb_class_ptr(klass), mrb_class_ptr(mod));
+  mrb_get_args(mrb, "c", &c);
+  mrb_include_module(mrb, c, mrb_class_ptr(mod));
   return mod;
 }
 
@@ -1273,10 +1673,9 @@
   case MRB_TT_TRUE:
     return mrb->true_class;
   case MRB_TT_CPTR:
-    return mrb->object_class;
   case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
-#ifndef MRB_WITHOUT_FLOAT
+  case MRB_TT_INTEGER:
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
 #endif
     return NULL;
@@ -1284,6 +1683,7 @@
     break;
   }
   obj = mrb_basic_ptr(v);
+  if (obj->c == NULL) return NULL;
   prepare_singleton_class(mrb, obj);
   return obj->c;
 }
@@ -1307,27 +1707,45 @@
 }
 
 MRB_API void
+mrb_define_singleton_method_id(mrb_state *mrb, struct RObject *o, mrb_sym name, mrb_func_t func, mrb_aspec aspec)
+{
+  prepare_singleton_class(mrb, (struct RBasic*)o);
+  mrb_define_method_id(mrb, o->c, name, func, aspec);
+}
+
+MRB_API void
 mrb_define_class_method(mrb_state *mrb, struct RClass *c, const char *name, mrb_func_t func, mrb_aspec aspec)
 {
   mrb_define_singleton_method(mrb, (struct RObject*)c, name, func, aspec);
 }
 
 MRB_API void
+mrb_define_class_method_id(mrb_state *mrb, struct RClass *c, mrb_sym name, mrb_func_t func, mrb_aspec aspec)
+{
+  mrb_define_singleton_method_id(mrb, (struct RObject*)c, name, func, aspec);
+}
+
+MRB_API void
+mrb_define_module_function_id(mrb_state *mrb, struct RClass *c, mrb_sym name, mrb_func_t func, mrb_aspec aspec)
+{
+  mrb_define_class_method_id(mrb, c, name, func, aspec);
+  mrb_define_method_id(mrb, c, name, func, aspec);
+}
+
+MRB_API void
 mrb_define_module_function(mrb_state *mrb, struct RClass *c, const char *name, mrb_func_t func, mrb_aspec aspec)
 {
-  mrb_define_class_method(mrb, c, name, func, aspec);
-  mrb_define_method(mrb, c, name, func, aspec);
+  mrb_define_module_function_id(mrb, c, mrb_intern_cstr(mrb, name), func, aspec);
 }
 
-#ifdef MRB_METHOD_CACHE
+#ifndef MRB_NO_METHOD_CACHE
 static void
-mc_clear_all(mrb_state *mrb)
+mc_clear(mrb_state *mrb)
 {
-  struct mrb_cache_entry *mc = mrb->cache;
-  int i;
+  static const struct mrb_cache_entry ce_zero ={0};
 
-  for (i=0; i<MRB_METHOD_CACHE_SIZE; i++) {
-    mci.c = 0;
+  for (int i=0; i<MRB_METHOD_CACHE_SIZE; i++) {
+    mrb->cachei = ce_zero;
   }
 }
 
@@ -1338,40 +1756,21 @@
   int i;
 
   if (c->flags & MRB_FL_CLASS_IS_INHERITED) {
-    mc_clear_all(mrb);
-    c->flags &= ~MRB_FL_CLASS_IS_INHERITED;
+    mc_clear(mrb);
     return;
   }
   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, struct RClass *c, mrb_sym mid)
-{
-  struct mrb_cache_entry *mc = mrb->cache;
-  int i;
-
-  if (c->flags & MRB_FL_CLASS_IS_INHERITED) {
-    mc_clear_all(mrb);
-    c->flags &= ~MRB_FL_CLASS_IS_INHERITED;
-    return;
-  }
-  for (i=0; i<MRB_METHOD_CACHE_SIZE; i++) {
-    if (mci.c == c || mci.mid == mid)
-      mci.c = 0;
-  }
-}
 #endif
 
 MRB_API mrb_method_t
 mrb_method_search_vm(mrb_state *mrb, struct RClass **cp, mrb_sym mid)
 {
-  khiter_t k;
   mrb_method_t m;
   struct RClass *c = *cp;
-#ifdef MRB_METHOD_CACHE
+#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);
   struct mrb_cache_entry *mc = &mrb->cacheh;
@@ -1383,15 +1782,24 @@
 #endif
 
   while (c) {
-    khash_t(mt) *h = c->mt;
+    mt_tbl *h = c->mt;
 
     if (h) {
-      k = kh_get(mt, mrb, h, mid);
-      if (k != kh_end(h)) {
-        m = kh_value(h, k);
-        if (MRB_METHOD_UNDEF_P(m)) break;
+      union mt_ptr ptr;
+      mrb_sym ret = mt_get(mrb, h, mid, &ptr);
+      if (ret) {
+        if (ptr.proc == 0) break;
         *cp = c;
-#ifdef MRB_METHOD_CACHE
+        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);
+        }
+#ifndef MRB_NO_METHOD_CACHE
         mc->c = oc;
         mc->c0 = c;
         mc->mid = mid;
@@ -1466,7 +1874,7 @@
 mod_attr_define(mrb_state *mrb, mrb_value mod, mrb_value (*accessor)(mrb_state *, mrb_value), mrb_sym (*access_name)(mrb_state *, mrb_sym))
 {
   struct RClass *c = mrb_class_ptr(mod);
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc, i;
   int ai;
 
@@ -1555,13 +1963,13 @@
 mrb_instance_new(mrb_state *mrb, mrb_value cv)
 {
   mrb_value obj, blk;
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc;
   mrb_sym init;
 
   mrb_get_args(mrb, "*!&", &argv, &argc, &blk);
   obj = mrb_instance_alloc(mrb, cv);
-  init = mrb_intern_lit(mrb, "initialize");
+  init = MRB_SYM(initialize);
   if (!mrb_func_basic_p(mrb, obj, init, mrb_bob_init)) {
     mrb_funcall_with_block(mrb, obj, init, argc, argv, blk);
   }
@@ -1575,7 +1983,7 @@
   mrb_sym mid;
 
   obj = mrb_instance_alloc(mrb, mrb_obj_value(c));
-  mid = mrb_intern_lit(mrb, "initialize");
+  mid = MRB_SYM(initialize);
   if (!mrb_func_basic_p(mrb, obj, mid, mrb_bob_init)) {
     mrb_funcall_argv(mrb, obj, mid, argc, argv);
   }
@@ -1607,7 +2015,7 @@
     super = mrb_obj_value(mrb->object_class);
   }
   new_class = mrb_obj_value(mrb_class_new(mrb, mrb_class_ptr(super)));
-  mid = mrb_intern_lit(mrb, "initialize");
+  mid = MRB_SYM(initialize);
   if (mrb_func_basic_p(mrb, new_class, mid, mrb_class_initialize)) {
     mrb_class_initialize(mrb, new_class);
   }
@@ -1705,7 +2113,7 @@
 mrb_class_path(mrb_state *mrb, struct RClass *c)
 {
   mrb_value path;
-  mrb_sym nsym = mrb_intern_lit(mrb, "__classname__");
+  mrb_sym nsym = MRB_SYM(__classname__);
 
   path = mrb_obj_iv_get(mrb, (struct RObject*)c, nsym);
   if (mrb_nil_p(path)) {
@@ -1795,7 +2203,7 @@
 MRB_API struct RClass*
 mrb_module_new(mrb_state *mrb)
 {
-  struct RClass *m = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_MODULE, mrb->module_class);
+  struct RClass *m = MRB_OBJ_ALLOC(mrb, MRB_TT_MODULE, mrb->module_class);
   boot_initmod(mrb, m);
   return m;
 }
@@ -1810,7 +2218,7 @@
  *  called with an explicit receiver, as <code>class</code> is also a
  *  reserved word in Ruby.
  *
- *     1.class      #=> Fixnum
+ *     1.class      #=> Integer
  *     self.class   #=> Object
  */
 
@@ -1823,6 +2231,7 @@
 MRB_API void
 mrb_alias_method(mrb_state *mrb, struct RClass *c, mrb_sym a, mrb_sym b)
 {
+  if (a == b) return;
   mrb_method_t m = mrb_method_search(mrb, c, b);
 
   if (!MRB_METHOD_CFUNC_P(m)) {
@@ -1831,9 +2240,9 @@
     if (MRB_PROC_ENV_P(p)) {
       MRB_PROC_ENV(p)->mid = b;
     }
-    else {
+    else if (p->color != MRB_GC_RED) {
       struct RClass *tc = MRB_PROC_TARGET_CLASS(p);
-      struct REnv *e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, NULL);
+      struct REnv *e = MRB_OBJ_ALLOC(mrb, MRB_TT_ENV, NULL);
 
       e->mid = b;
       if (tc) {
@@ -1842,6 +2251,7 @@
       }
       p->e.env = e;
       p->flags |= MRB_PROC_ENVSET;
+      mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)e);
     }
   }
   mrb_define_method_raw(mrb, c, a, m);
@@ -1860,6 +2270,12 @@
   mrb_alias_method(mrb, klass, mrb_intern_cstr(mrb, name1), mrb_intern_cstr(mrb, name2));
 }
 
+MRB_API void
+mrb_define_alias_id(mrb_state *mrb, struct RClass *klass, mrb_sym a, mrb_sym b)
+{
+  mrb_alias_method(mrb, klass, a, b);
+}
+
 /*
  * call-seq:
  *   mod.to_s   -> string
@@ -1872,9 +2288,8 @@
 mrb_value
 mrb_mod_to_s(mrb_state *mrb, mrb_value klass)
 {
-
   if (mrb_sclass_p(klass)) {
-    mrb_value v = mrb_iv_get(mrb, klass, mrb_intern_lit(mrb, "__attached__"));
+    mrb_value v = mrb_iv_get(mrb, klass, MRB_SYM(__attached__));
     mrb_value str = mrb_str_new_lit(mrb, "#<Class:");
 
     if (class_ptr_p(v)) {
@@ -1890,6 +2305,8 @@
   }
 }
 
+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)
 {
@@ -1898,6 +2315,7 @@
 
   mrb_get_args(mrb, "nn", &new_name, &old_name);
   mrb_alias_method(mrb, c, new_name, old_name);
+  mrb_method_added(mrb, c, new_name);
   return mod;
 }
 
@@ -1910,7 +2328,7 @@
   mrb_define_method_raw(mrb, c, a, m);
 }
 
-void
+MRB_API void
 mrb_undef_method_id(mrb_state *mrb, struct RClass *c, mrb_sym a)
 {
   if (!mrb_obj_respond_to(mrb, c, a)) {
@@ -1926,17 +2344,35 @@
 }
 
 MRB_API void
+mrb_undef_class_method_id(mrb_state *mrb, struct RClass *c, mrb_sym name)
+{
+  mrb_undef_method_id(mrb,  mrb_class_ptr(mrb_singleton_class(mrb, mrb_obj_value(c))), name);
+}
+
+MRB_API void
 mrb_undef_class_method(mrb_state *mrb, struct RClass *c, const char *name)
 {
   mrb_undef_method(mrb,  mrb_class_ptr(mrb_singleton_class(mrb, mrb_obj_value(c))), name);
 }
 
+MRB_API void
+mrb_remove_method(mrb_state *mrb, struct RClass *c, mrb_sym mid)
+{
+  mt_tbl *h;
+
+  MRB_CLASS_ORIGIN(c);
+  h = c->mt;
+
+  if (h && mt_del(mrb, h, mid)) return;
+  mrb_name_error(mrb, mid, "method '%n' not defined in %C", mid, c);
+}
+
 static mrb_value
 mrb_mod_undef(mrb_state *mrb, mrb_value mod)
 {
   struct RClass *c = mrb_class_ptr(mod);
   mrb_int argc;
-  mrb_value *argv;
+  const mrb_value *argv;
 
   mrb_get_args(mrb, "*", &argv, &argc);
   while (argc--) {
@@ -1992,7 +2428,7 @@
   }
 
   /* const get with class path string */
-  path = mrb_ensure_string_type(mrb, path);
+  mrb_ensure_string_type(mrb, path);
   ptr = RSTRING_PTR(path);
   len = RSTRING_LEN(path);
   off = 0;
@@ -2048,6 +2484,7 @@
   mrb_sym sym;
 
   mrb_get_args(mrb, "n", &sym);
+  mrb->c->ci->mid = 0;
 
   if (mrb_class_real(mrb_class_ptr(mod)) != mrb->object_class) {
     mrb_name_error(mrb, sym, "uninitialized constant %v::%n", mod, sym);
@@ -2095,10 +2532,25 @@
   return mrb_bool_value(mrb_obj_respond_to(mrb, mrb_class_ptr(mod), id));
 }
 
-static mrb_value
-mod_define_method(mrb_state *mrb, mrb_value self)
+void
+mrb_method_added(mrb_state *mrb, struct RClass *c, mrb_sym mid)
+{
+  mrb_sym added;
+  mrb_value recv = mrb_obj_value(c);
+
+  if (c->tt == MRB_TT_SCLASS) {
+    added = MRB_SYM(singleton_method_added);
+    recv = mrb_iv_get(mrb, recv, MRB_SYM(__attached__));
+  }
+  else {
+    added = MRB_SYM(method_added);
+  }
+  mrb_funcall_id(mrb, recv, added, 1, mrb_symbol_value(mid));
+}
+
+mrb_value
+mrb_mod_define_method_m(mrb_state *mrb, struct RClass *c)
 {
-  struct RClass *c = mrb_class_ptr(self);
   struct RProc *p;
   mrb_method_t m;
   mrb_sym mid;
@@ -2120,18 +2572,25 @@
   if (mrb_nil_p(blk)) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
   }
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  mrb_proc_copy(p, mrb_proc_ptr(blk));
+  p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb->proc_class);
+  mrb_proc_copy(mrb, p, mrb_proc_ptr(blk));
   p->flags |= MRB_PROC_STRICT;
   MRB_METHOD_FROM_PROC(m, p);
   mrb_define_method_raw(mrb, c, mid, m);
+  mrb_method_added(mrb, c, mid);
   return mrb_symbol_value(mid);
 }
 
 static mrb_value
+mod_define_method(mrb_state *mrb, mrb_value self)
+{
+  return mrb_mod_define_method_m(mrb, mrb_class_ptr(self));
+}
+
+static mrb_value
 top_define_method(mrb_state *mrb, mrb_value self)
 {
-  return mod_define_method(mrb, mrb_obj_value(mrb->object_class));
+  return mrb_mod_define_method_m(mrb, mrb->object_class);
 }
 
 static mrb_value
@@ -2156,7 +2615,7 @@
 static mrb_value
 mrb_mod_module_function(mrb_state *mrb, mrb_value mod)
 {
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc, i;
   mrb_sym mid;
   mrb_method_t m;
@@ -2190,6 +2649,202 @@
   return mod;
 }
 
+static struct RClass*
+mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj)
+{
+  struct RClass *klass = mrb_basic_ptr(obj)->c;
+
+  if (klass->tt != MRB_TT_SCLASS)
+    return klass;
+  else {
+    /* copy singleton(unnamed) class */
+    struct RClass *clone = (struct RClass*)mrb_obj_alloc(mrb, klass->tt, mrb->class_class);
+
+    switch (mrb_type(obj)) {
+    case MRB_TT_CLASS:
+    case MRB_TT_SCLASS:
+      break;
+    default:
+      clone->c = mrb_singleton_class_clone(mrb, mrb_obj_value(klass));
+      break;
+    }
+    clone->super = klass->super;
+    if (klass->iv) {
+      mrb_iv_copy(mrb, mrb_obj_value(clone), mrb_obj_value(klass));
+      mrb_obj_iv_set(mrb, (struct RObject*)clone, MRB_SYM(__attached__), obj);
+    }
+    if (klass->mt) {
+      clone->mt = mt_copy(mrb, klass->mt);
+    }
+    else {
+      clone->mt = mt_new(mrb);
+    }
+    clone->tt = MRB_TT_SCLASS;
+    return clone;
+  }
+}
+
+static void
+copy_class(mrb_state *mrb, mrb_value dst, mrb_value src)
+{
+  struct RClass *dc = mrb_class_ptr(dst);
+  struct RClass *sc = mrb_class_ptr(src);
+  /* if the origin is not the same as the class, then the origin and
+     the current class need to be copied */
+  if (sc->flags & MRB_FL_CLASS_IS_PREPENDED) {
+    struct RClass *c0 = sc->super;
+    struct RClass *c1 = dc;
+
+    /* copy prepended iclasses */
+    while (!(c0->flags & MRB_FL_CLASS_IS_ORIGIN)) {
+      c1->super = mrb_class_ptr(mrb_obj_dup(mrb, mrb_obj_value(c0)));
+      c1 = c1->super;
+      c0 = c0->super;
+    }
+    c1->super = mrb_class_ptr(mrb_obj_dup(mrb, mrb_obj_value(c0)));
+    c1->super->flags |= MRB_FL_CLASS_IS_ORIGIN;
+  }
+  if (sc->mt) {
+    dc->mt = mt_copy(mrb, sc->mt);
+  }
+  else {
+    dc->mt = mt_new(mrb);
+  }
+  dc->super = sc->super;
+  MRB_SET_INSTANCE_TT(dc, MRB_INSTANCE_TT(sc));
+}
+
+/* 15.3.1.3.16 */
+static mrb_value
+mrb_obj_init_copy(mrb_state *mrb, mrb_value self)
+{
+  mrb_value orig = mrb_get_arg1(mrb);
+
+  if (mrb_obj_equal(mrb, self, orig)) return self;
+  if ((mrb_type(self) != mrb_type(orig)) || (mrb_obj_class(mrb, self) != mrb_obj_class(mrb, orig))) {
+      mrb_raise(mrb, E_TYPE_ERROR, "initialize_copy should take same class object");
+  }
+  return self;
+}
+
+static void
+init_copy(mrb_state *mrb, mrb_value dest, mrb_value obj)
+{
+  switch (mrb_type(obj)) {
+    case MRB_TT_ICLASS:
+      copy_class(mrb, dest, obj);
+      return;
+    case MRB_TT_CLASS:
+    case MRB_TT_MODULE:
+      copy_class(mrb, dest, obj);
+      mrb_iv_copy(mrb, dest, obj);
+      mrb_iv_remove(mrb, dest, MRB_SYM(__classname__));
+      break;
+    case MRB_TT_OBJECT:
+    case MRB_TT_SCLASS:
+    case MRB_TT_HASH:
+    case MRB_TT_DATA:
+    case MRB_TT_EXCEPTION:
+      mrb_iv_copy(mrb, dest, obj);
+      break;
+    case MRB_TT_ISTRUCT:
+      mrb_istruct_copy(dest, obj);
+      break;
+
+    default:
+      break;
+  }
+  if (!mrb_func_basic_p(mrb, dest, MRB_SYM(initialize_copy), mrb_obj_init_copy)) {
+    mrb_funcall_id(mrb, dest, MRB_SYM(initialize_copy), 1, obj);
+  }
+}
+
+/* 15.3.1.3.8  */
+/*
+ *  call-seq:
+ *     obj.clone -> an_object
+ *
+ *  Produces a shallow copy of <i>obj</i>---the instance variables of
+ *  <i>obj</i> are copied, but not the objects they reference. Copies
+ *  the frozen state of <i>obj</i>. See also the discussion
+ *  under <code>Object#dup</code>.
+ *
+ *     class Klass
+ *        attr_accessor :str
+ *     end
+ *     s1 = Klass.new      #=> #<Klass:0x401b3a38>
+ *     s1.str = "Hello"    #=> "Hello"
+ *     s2 = s1.clone       #=> #<Klass:0x401b3998 @str="Hello">
+ *     s2.str1,4 = "i"   #=> "i"
+ *     s1.inspect          #=> "#<Klass:0x401b3a38 @str=\"Hi\">"
+ *     s2.inspect          #=> "#<Klass:0x401b3998 @str=\"Hi\">"
+ *
+ *  This method may have class-specific behavior.  If so, that
+ *  behavior will be documented under the #+initialize_copy+ method of
+ *  the class.
+ *
+ *  Some Class(True False Nil Symbol Integer Float) Object  cannot clone.
+ */
+MRB_API mrb_value
+mrb_obj_clone(mrb_state *mrb, mrb_value self)
+{
+  struct RObject *p;
+  mrb_value clone;
+
+  if (mrb_immediate_p(self)) {
+    return self;
+  }
+  if (mrb_sclass_p(self)) {
+    mrb_raise(mrb, E_TYPE_ERROR, "can't clone singleton class");
+  }
+  p = (struct RObject*)mrb_obj_alloc(mrb, mrb_type(self), mrb_obj_class(mrb, self));
+  p->c = mrb_singleton_class_clone(mrb, self);
+  mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)p->c);
+  clone = mrb_obj_value(p);
+  init_copy(mrb, clone, self);
+  p->flags |= mrb_obj_ptr(self)->flags & MRB_FL_OBJ_IS_FROZEN;
+
+  return clone;
+}
+
+/* 15.3.1.3.9  */
+/*
+ *  call-seq:
+ *     obj.dup -> an_object
+ *
+ *  Produces a shallow copy of <i>obj</i>---the instance variables of
+ *  <i>obj</i> are copied, but not the objects they reference.
+ *  <code>dup</code> copies the frozen state of <i>obj</i>. See also
+ *  the discussion under <code>Object#clone</code>. In general,
+ *  <code>clone</code> and <code>dup</code> may have different semantics
+ *  in descendant classes. While <code>clone</code> is used to duplicate
+ *  an object, including its internal state, <code>dup</code> typically
+ *  uses the class of the descendant object to create the new instance.
+ *
+ *  This method may have class-specific behavior.  If so, that
+ *  behavior will be documented under the #+initialize_copy+ method of
+ *  the class.
+ */
+
+MRB_API mrb_value
+mrb_obj_dup(mrb_state *mrb, mrb_value obj)
+{
+  struct RBasic *p;
+  mrb_value dup;
+
+  if (mrb_immediate_p(obj)) {
+    return obj;
+  }
+  if (mrb_sclass_p(obj)) {
+    mrb_raise(mrb, E_TYPE_ERROR, "can't dup singleton class");
+  }
+  p = mrb_obj_alloc(mrb, mrb_type(obj), mrb_obj_class(mrb, obj));
+  dup = mrb_obj_value(p);
+  init_copy(mrb, dup, obj);
+
+  return dup;
+}
+
 /* implementation of __id__ */
 mrb_value mrb_obj_id_m(mrb_state *mrb, mrb_value self);
 /* implementation of instance_eval */
@@ -2202,39 +2857,43 @@
 }
 
 static const mrb_code new_iseq = {
-  OP_ENTER, 0x0, 0x10, 0x1,  /* OP_ENTER     0:0:1:0:0:0:1 */
-  OP_LOADSELF, 0x3,          /* OP_LOADSELF  R3 */
-  OP_SEND, 0x3, 0x0, 0x0,    /* OP_SEND      R3  :allocate  0 */
-  OP_MOVE, 0x0, 0x3,         /* OP_MOVE      R0  R3 */
-  OP_MOVE, 0x4, 0x1,         /* OP_MOVE      R4  R1 */
-  OP_MOVE, 0x5, 0x2,         /* OP_MOVE      R5  R2 */
-  OP_SENDVB, 0x3, 0x1,       /* OP_SENDVB    R4  :initialize */
-  OP_RETURN, 0x0             /* OP_RETURN    R0 */
+  OP_ENTER, 0x0, 0x10, 0x3,  // OP_ENTER     0:0:1:0:0:1:1
+  OP_LOADSELF, 4,            // OP_LOADSELF  R4
+  OP_SEND, 4, 0, 0,          // OP_SEND      R4  :allocate  n=0
+  OP_MOVE, 0, 4,             // OP_MOVE      R0  R4
+  OP_MOVE, 4, 3,             // OP_MOVE      R4  R3 (&)
+  OP_MOVE, 3, 2,             // OP_MOVE      R3  R2 (**)
+  OP_MOVE, 2, 1,             // OP_MOVE      R2  R1 (*)
+  OP_SSENDB, 1, 1, 255,      // OP_SSENDB    R1  :initialize n=*|nk=*
+  OP_RETURN, 0               // OP_RETURN    R0
+};
+
+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,
+  new_iseq, NULL, new_syms, NULL, NULL, NULL,
+  sizeof(new_iseq), 0, 2, 0, 0,
+};
+
+static const struct RProc new_proc = {
+  NULL, NULL, MRB_TT_PROC, MRB_GC_RED, MRB_FL_OBJ_IS_FROZEN | MRB_PROC_SCOPE | MRB_PROC_STRICT,
+  { &new_irep }, NULL, { NULL }
 };
 
 static void
 init_class_new(mrb_state *mrb, struct RClass *cls)
 {
-  struct RProc *p;
   mrb_method_t m;
-  mrb_irep *new_irep = (mrb_irep*)mrb_malloc(mrb, sizeof(mrb_irep));
-  static const mrb_irep mrb_irep_zero = { 0 };
-
-  *new_irep = mrb_irep_zero;
-  new_irep->syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym)*2);
-  new_irep->syms0 = mrb_intern_lit(mrb, "allocate");
-  new_irep->syms1 = mrb_intern_lit(mrb, "initialize");
-  new_irep->slen = 2;
-  new_irep->flags = MRB_ISEQ_NO_FREE;
-  new_irep->iseq = new_iseq;
-  new_irep->ilen = sizeof(new_iseq);
-  new_irep->nregs = 6;
-  new_irep->nlocals = 3;
-  p = mrb_proc_new(mrb, new_irep);
-  MRB_METHOD_FROM_PROC(m, p);
-  mrb_define_method_raw(mrb, cls, mrb_intern_lit(mrb, "new"), m);
+
+  MRB_PRESYM_INIT_SYMBOLS(mrb, new_syms);
+  MRB_METHOD_FROM_PROC(m, &new_proc);
+  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)
 {
@@ -2256,16 +2915,16 @@
   make_metaclass(mrb, cls);
 
   /* name basic classes */
-  mrb_define_const(mrb, bob, "BasicObject", mrb_obj_value(bob));
-  mrb_define_const(mrb, obj, "Object",      mrb_obj_value(obj));
-  mrb_define_const(mrb, obj, "Module",      mrb_obj_value(mod));
-  mrb_define_const(mrb, obj, "Class",       mrb_obj_value(cls));
+  mrb_define_const_id(mrb, bob, MRB_SYM(BasicObject), mrb_obj_value(bob));
+  mrb_define_const_id(mrb, obj, MRB_SYM(Object),      mrb_obj_value(obj));
+  mrb_define_const_id(mrb, obj, MRB_SYM(Module),      mrb_obj_value(mod));
+  mrb_define_const_id(mrb, obj, MRB_SYM(Class),       mrb_obj_value(cls));
 
   /* name each classes */
-  mrb_class_name_class(mrb, NULL, bob, mrb_intern_lit(mrb, "BasicObject"));
-  mrb_class_name_class(mrb, NULL, obj, mrb_intern_lit(mrb, "Object")); /* 15.2.1 */
-  mrb_class_name_class(mrb, NULL, mod, mrb_intern_lit(mrb, "Module")); /* 15.2.2 */
-  mrb_class_name_class(mrb, NULL, cls, mrb_intern_lit(mrb, "Class"));  /* 15.2.3 */
+  mrb_class_name_class(mrb, NULL, bob, MRB_SYM(BasicObject));
+  mrb_class_name_class(mrb, NULL, obj, MRB_SYM(Object)); /* 15.2.1 */
+  mrb_class_name_class(mrb, NULL, mod, MRB_SYM(Module)); /* 15.2.2 */
+  mrb_class_name_class(mrb, NULL, cls, MRB_SYM(Class));  /* 15.2.3 */
 
   mrb->proc_class = mrb_define_class(mrb, "Proc", mrb->object_class);  /* 15.2.17 */
   MRB_SET_INSTANCE_TT(mrb->proc_class, MRB_TT_PROC);
@@ -2278,6 +2937,7 @@
   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_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());
@@ -2318,13 +2978,14 @@
   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_undef_method(mrb, cls, "append_features");
   mrb_undef_method(mrb, cls, "prepend_features");
   mrb_undef_method(mrb, cls, "extend_object");
   mrb_undef_method(mrb, cls, "module_function");
 
-  mrb->top_self = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb->object_class);
+  mrb->top_self = MRB_OBJ_ALLOC(mrb, MRB_TT_OBJECT, mrb->object_class);
   mrb_define_singleton_method(mrb, mrb->top_self, "inspect", inspect_main, MRB_ARGS_NONE());
   mrb_define_singleton_method(mrb, mrb->top_self, "to_s", inspect_main, MRB_ARGS_NONE());
   mrb_define_singleton_method(mrb, mrb->top_self, "define_method", top_define_method, MRB_ARGS_ARG(1,1));

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

@@ -4,26 +4,20 @@
 #include <mruby/opcode.h>
 #include <mruby/string.h>
 #include <mruby/proc.h>
+#include <mruby/dump.h>
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 static void
-print_r(mrb_state *mrb, mrb_irep *irep, size_t n)
+print_r(mrb_state *mrb, const mrb_irep *irep, size_t n)
 {
-  size_t i;
-
   if (n == 0) return;
-
-  for (i=0; i+1<irep->nlocals; i++) {
-    if (irep->lvi.r == n) {
-      mrb_sym sym = irep->lvi.name;
-      printf(" R%d:%s", (int)n, mrb_sym_dump(mrb, sym));
-      break;
-    }
-  }
+  if (n >= irep->nlocals) return;
+  if (!irep->lvn-1) return;
+  printf(" R%d:%s", (int)n, mrb_sym_dump(mrb, irep->lvn-1));
 }
 
 static void
-print_lv_a(mrb_state *mrb, mrb_irep *irep, uint16_t a)
+print_lv_a(mrb_state *mrb, const mrb_irep *irep, uint16_t a)
 {
   if (!irep->lv || a >= irep->nlocals || a == 0) {
     printf("\n");
@@ -35,7 +29,7 @@
 }
 
 static void
-print_lv_ab(mrb_state *mrb, 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)
 {
   if (!irep->lv || (a >= irep->nlocals && b >= irep->nlocals) || a+b == 0) {
     printf("\n");
@@ -48,7 +42,7 @@
 }
 
 static void
-print_header(mrb_state *mrb, mrb_irep *irep, ptrdiff_t i)
+print_header(mrb_state *mrb, const mrb_irep *irep, uint32_t i)
 {
   int32_t line;
 
@@ -63,10 +57,34 @@
   printf("%03d ", (int)i);
 }
 
+static void
+print_args(uint8_t i)
+{
+  uint8_t n = i&0xf;
+  uint8_t nk = (i>>4)&0xf;
+
+  if (n == 15) {
+    printf("n=*");
+  }
+  else {
+    printf("n=%d", n);
+  }
+  if (nk > 0) {
+    printf("|");
+    if (nk == 15) {
+      printf("nk=*");
+    }
+    else {
+      printf("nk=%d", nk);
+    }
+  }
+  printf(" (0x%02x)\n", i);
+}
+
 #define CASE(insn,ops) case insn: FETCH_ ## ops (); L_ ## insn
 
 static void
-codedump(mrb_state *mrb, mrb_irep *irep)
+codedump(mrb_state *mrb, const mrb_irep *irep)
 {
   int ai;
   const mrb_code *pc, *pcend;
@@ -74,7 +92,7 @@
   const char *file = NULL, *next_file;
 
   if (!irep) return;
-  printf("irep %p nregs=%d nlocals=%d pools=%d syms=%d reps=%d iseq=%d\n", (void*)irep,
+  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);
 
   if (irep->lv) {
@@ -82,9 +100,36 @@
 
     printf("local variable names:\n");
     for (i = 1; i < irep->nlocals; ++i) {
-      char const *s = mrb_sym_dump(mrb, irep->lvi - 1.name);
-      int n = irep->lvi - 1.r ? irep->lvi - 1.r : i;
-      printf("  R%d:%s\n", n, s ? s : "");
+      char const *s = mrb_sym_dump(mrb, irep->lvi - 1);
+      printf("  R%d:%s\n", i, s ? s : "");
+    }
+  }
+
+  if (irep->clen > 0) {
+    int i = irep->clen;
+    const struct mrb_irep_catch_handler *e = mrb_irep_catch_handler_table(irep);
+
+    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);
+      char buf20;
+      const char *type;
+
+      switch (e->type) {
+        case MRB_CATCH_RESCUE:
+          type = "rescue";
+          break;
+        case MRB_CATCH_ENSURE:
+          type = "ensure";
+          break;
+        default:
+          buf0 = '\0';
+          snprintf(buf, sizeof(buf), "0x%02x <unknown>", (int)e->type);
+          type = buf;
+          break;
+      }
+      printf("catch type: %-8s begin: %04" PRIu32 " end: %04" PRIu32 " target: %04" PRIu32 "\n", type, begin, end, target);
     }
   }
 
@@ -94,48 +139,66 @@
     ptrdiff_t i;
     uint32_t a;
     uint16_t b;
-    uint8_t c;
+    uint16_t c;
 
     ai = mrb_gc_arena_save(mrb);
 
     i = pc - irep->iseq;
-    next_file = mrb_debug_get_filename(mrb, irep, i);
+    next_file = mrb_debug_get_filename(mrb, irep, (uint32_t)i);
     if (next_file && file != next_file) {
       printf("file: %s\n", next_file);
       file = next_file;
     }
-    print_header(mrb, irep, i);
+    print_header(mrb, irep, (uint32_t)i);
     ins = READ_B();
     switch (ins) {
     CASE(OP_NOP, Z):
-      printf("OP_NOP\n");
+      printf("NOP\n");
       break;
     CASE(OP_MOVE, BB):
-      printf("OP_MOVE\tR%d\tR%d\t", a, b);
+      printf("MOVE\t\tR%d\tR%d\t", a, b);
       print_lv_ab(mrb, irep, a, b);
       break;
+
     CASE(OP_LOADL, BB):
-      {
-        mrb_value v = irep->poolb;
-        mrb_value s = mrb_inspect(mrb, v);
-        printf("OP_LOADL\tR%d\tL(%d)\t; %s", a, b, RSTRING_PTR(s));
+      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);
+        break;
+#endif
+      case IREP_TT_INT32:
+        printf("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);
+        break;
+#endif
+      default:
+        printf("LOADL\t\tR%d\tL(%d)\t", a, b);
+        break;
       }
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADI, BB):
-      printf("OP_LOADI\tR%d\t%d\t", a, b);
+      printf("LOADI\t\tR%d\t%d\t", a, b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADINEG, BB):
-      printf("OP_LOADI\tR%d\t-%d\t", a, b);
+      printf("LOADI\tR%d\t-%d\t", a, b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADI16, BS):
-      printf("OP_LOADI16\tR%d\t%d\t", a, (int)(int16_t)b);
+      printf("LOADI16\tR%d\t%d\t", a, (int)(int16_t)b);
+      print_lv_a(mrb, irep, a);
+      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);
       break;
     CASE(OP_LOADI__1, B):
-      printf("OP_LOADI__1\tR%d\t\t", a);
+      printf("LOADI__1\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADI_0, B): goto L_LOADI;
@@ -147,120 +210,139 @@
     CASE(OP_LOADI_6, B): goto L_LOADI;
     CASE(OP_LOADI_7, B):
     L_LOADI:
-      printf("OP_LOADI_%d\tR%d\t\t", ins-(int)OP_LOADI_0, a);
+      printf("LOADI_%d\tR%d\t\t", ins-(int)OP_LOADI_0, a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADSYM, BB):
-      printf("OP_LOADSYM\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("LOADSYM\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADNIL, B):
-      printf("OP_LOADNIL\tR%d\t\t", a);
+      printf("LOADNIL\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADSELF, B):
-      printf("OP_LOADSELF\tR%d\t\t", a);
+      printf("LOADSELF\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADT, B):
-      printf("OP_LOADT\tR%d\t\t", a);
+      printf("LOADT\t\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LOADF, B):
-      printf("OP_LOADF\tR%d\t\t", a);
+      printf("LOADF\t\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_GETGV, BB):
-      printf("OP_GETGV\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("GETGV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SETGV, BB):
-      printf("OP_SETGV\t:%s\tR%d", mrb_sym_dump(mrb, irep->symsb), a);
+      printf("SETGV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_GETSV, BB):
-      printf("OP_GETSV\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("GETSV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SETSV, BB):
-      printf("OP_SETSV\t:%s\tR%d", mrb_sym_dump(mrb, irep->symsb), a);
+      printf("SETSV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_GETCONST, BB):
-      printf("OP_GETCONST\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("GETCONST\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SETCONST, BB):
-      printf("OP_SETCONST\t:%s\tR%d", mrb_sym_dump(mrb, irep->symsb), a);
+      printf("SETCONST\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_GETMCNST, BB):
-      printf("OP_GETMCNST\tR%d\tR%d::%s", a, a, mrb_sym_dump(mrb, irep->symsb));
+      printf("GETMCNST\tR%d\tR%d::%s\t", a, a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SETMCNST, BB):
-      printf("OP_SETMCNST\tR%d::%s\tR%d", a+1, mrb_sym_dump(mrb, irep->symsb), a);
+      printf("SETMCNST\tR%d::%s\tR%d\t", a+1, mrb_sym_dump(mrb, irep->symsb), a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_GETIV, BB):
-      printf("OP_GETIV\tR%d\t%s", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("GETIV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SETIV, BB):
-      printf("OP_SETIV\t%s\tR%d", mrb_sym_dump(mrb, irep->symsb), a);
+      printf("SETIV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_GETUPVAR, BBB):
-      printf("OP_GETUPVAR\tR%d\t%d\t%d", a, b, c);
+      printf("GETUPVAR\tR%d\t%d\t%d\t", a, b, c);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SETUPVAR, BBB):
-      printf("OP_SETUPVAR\tR%d\t%d\t%d", a, b, c);
+      printf("SETUPVAR\tR%d\t%d\t%d\t", a, b, c);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_GETCV, BB):
-      printf("OP_GETCV\tR%d\t%s", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("GETCV\t\tR%d\t%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SETCV, BB):
-      printf("OP_SETCV\t%s\tR%d", mrb_sym_dump(mrb, irep->symsb), a);
+      printf("SETCV\t\t%s\tR%d\t", mrb_sym_dump(mrb, irep->symsb), a);
       print_lv_a(mrb, irep, a);
       break;
+    CASE(OP_GETIDX, B):
+      printf("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);
+      break;
     CASE(OP_JMP, S):
-      printf("OP_JMP\t\t%03d\n", a);
+      i = pc - irep->iseq;
+      printf("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);
       break;
     CASE(OP_JMPIF, BS):
-      printf("OP_JMPIF\tR%d\t%03d\t", a, b);
+      i = pc - irep->iseq;
+      printf("JMPIF\t\tR%d\t%03d\t", a, (int)i+(int16_t)b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_JMPNOT, BS):
-      printf("OP_JMPNOT\tR%d\t%03d\t", a, b);
+      i = pc - irep->iseq;
+      printf("JMPNOT\tR%d\t%03d\t", a, (int)i+(int16_t)b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_JMPNIL, BS):
-      printf("OP_JMPNIL\tR%d\t%03d\t", a, b);
+      i = pc - irep->iseq;
+      printf("JMPNIL\tR%d\t%03d\t", a, (int)i+(int16_t)b);
       print_lv_a(mrb, irep, a);
       break;
-    CASE(OP_SENDV, BB):
-      printf("OP_SENDV\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->symsb));
+    CASE(OP_SSEND, BBB):
+      printf("SSEND\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+      print_args(c);
       break;
-    CASE(OP_SENDVB, BB):
-      printf("OP_SENDVB\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->symsb));
+    CASE(OP_SSENDB, BBB):
+      printf("SSENDB\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+      print_args(c);
       break;
     CASE(OP_SEND, BBB):
-      printf("OP_SEND\tR%d\t:%s\t%d\n", a, mrb_sym_dump(mrb, irep->symsb), c);
+      printf("SEND\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+      print_args(c);
       break;
     CASE(OP_SENDB, BBB):
-      printf("OP_SENDB\tR%d\t:%s\t%d\n", a, mrb_sym_dump(mrb, irep->symsb), c);
+      printf("SENDB\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+      print_args(c);
       break;
     CASE(OP_CALL, Z):
-      printf("OP_CALL\n");
+      printf("CALL\n");
       break;
     CASE(OP_SUPER, BB):
-      printf("OP_SUPER\tR%d\t%d\n", a, b);
+      printf("SUPER\t\tR%d\t", a);
+      print_args(b);
       break;
     CASE(OP_ARGARY, BS):
-      printf("OP_ARGARY\tR%d\t%d:%d:%d:%d (%d)", a,
+      printf("ARGARY\tR%d\t%d:%d:%d:%d (%d)\t", a,
              (b>>11)&0x3f,
              (b>>10)&0x1,
              (b>>5)&0x1f,
@@ -269,40 +351,40 @@
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_ENTER, W):
-      printf("OP_ENTER\t%d:%d:%d:%d:%d:%d:%d\n",
+      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));
+             MRB_ASPEC_BLOCK(a), a);
       break;
     CASE(OP_KEY_P, BB):
-      printf("OP_KEY_P\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("KEY_P\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_KEYEND, Z):
-      printf("OP_KEYEND\n");
+      printf("KEYEND\n");
       break;
     CASE(OP_KARG, BB):
-      printf("OP_KARG\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("KARG\t\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_RETURN, B):
-      printf("OP_RETURN\tR%d\t\t", a);
+      printf("RETURN\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_RETURN_BLK, B):
-      printf("OP_RETURN_BLK\tR%d\t\t", a);
+      printf("RETURN_BLK\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_BREAK, B):
-      printf("OP_BREAK\tR%d\t\t", a);
+      printf("BREAK\t\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_BLKPUSH, BS):
-      printf("OP_BLKPUSH\tR%d\t%d:%d:%d:%d (%d)", a,
+      printf("BLKPUSH\tR%d\t%d:%d:%d:%d (%d)\t", a,
              (b>>11)&0x3f,
              (b>>10)&0x1,
              (b>>5)&0x1f,
@@ -311,191 +393,189 @@
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_LAMBDA, BB):
-      printf("OP_LAMBDA\tR%d\tI(%d:%p)\n", a, b, irep->repsb);
+      printf("LAMBDA\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
       break;
     CASE(OP_BLOCK, BB):
-      printf("OP_BLOCK\tR%d\tI(%d:%p)\n", a, b, irep->repsb);
+      printf("BLOCK\t\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
       break;
     CASE(OP_METHOD, BB):
-      printf("OP_METHOD\tR%d\tI(%d:%p)\n", a, b, irep->repsb);
+      printf("METHOD\tR%d\tI(%d:%p)\n", a, b, (void*)irep->repsb);
       break;
     CASE(OP_RANGE_INC, B):
-      printf("OP_RANGE_INC\tR%d\n", a);
+      printf("RANGE_INC\tR%d\n", a);
       break;
     CASE(OP_RANGE_EXC, B):
-      printf("OP_RANGE_EXC\tR%d\n", a);
+      printf("RANGE_EXC\tR%d\n", a);
       break;
     CASE(OP_DEF, BB):
-      printf("OP_DEF\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("DEF\t\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->symsb));
       break;
     CASE(OP_UNDEF, B):
-      printf("OP_UNDEF\t:%s\n", mrb_sym_dump(mrb, irep->symsa));
+      printf("UNDEF\t\t:%s\n", mrb_sym_dump(mrb, irep->symsa));
       break;
     CASE(OP_ALIAS, BB):
-      printf("OP_ALIAS\t:%s\t%s\n", mrb_sym_dump(mrb, irep->symsa), mrb_sym_dump(mrb, irep->symsb));
+      printf("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("OP_ADD\tR%d\t\n", a);
+      printf("ADD\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_ADDI, BB):
-      printf("OP_ADDI\tR%d\t%d\n", a, b);
+      printf("ADDI\t\tR%d\t%d\t", a, b);
+      print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SUB, B):
-      printf("OP_SUB\tR%d\t\n", a);
+      printf("SUB\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_SUBI, BB):
-      printf("OP_SUBI\tR%d\t%d\n", a, b);
+      printf("SUBI\t\tR%d\t%d\t", a, b);
+      print_lv_a(mrb, irep, a);
       break;
     CASE(OP_MUL, B):
-      printf("OP_MUL\tR%d\t\n", a);
+      printf("MUL\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_DIV, B):
-      printf("OP_DIV\tR%d\t\n", a);
+      printf("DIV\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_LT, B):
-      printf("OP_LT\t\tR%d\t\n", a);
+      printf("LT\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_LE, B):
-      printf("OP_LE\t\tR%d\t\n", a);
+      printf("LE\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_GT, B):
-      printf("OP_GT\t\tR%d\t\n", a);
+      printf("GT\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_GE, B):
-      printf("OP_GE\t\tR%d\t\n", a);
+      printf("GE\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_EQ, B):
-      printf("OP_EQ\t\tR%d\t\n", a);
+      printf("EQ\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_ARRAY, BB):
-      printf("OP_ARRAY\tR%d\t%d\t", a, b);
+      printf("ARRAY\t\tR%d\tR%d\t%d", a, a, b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_ARRAY2, BBB):
-      printf("OP_ARRAY\tR%d\tR%d\t%d\t", a, b, c);
+      printf("ARRAY\t\tR%d\tR%d\t%d", a, b, c);
       print_lv_ab(mrb, irep, a, b);
       break;
     CASE(OP_ARYCAT, B):
-      printf("OP_ARYCAT\tR%d\t", a);
+      printf("ARYCAT\tR%d\tR%d\t", a, a+1);
       print_lv_a(mrb, irep, a);
       break;
-    CASE(OP_ARYPUSH, B):
-      printf("OP_ARYPUSH\tR%d\t", a);
+    CASE(OP_ARYPUSH, BB):
+      printf("ARYPUSH\tR%d\t%d\t", a, b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_ARYDUP, B):
-      printf("OP_ARYDUP\tR%d\t", a);
+      printf("ARYDUP\tR%d\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_AREF, BBB):
-      printf("OP_AREF\tR%d\tR%d\t%d", a, b, c);
+      printf("AREF\t\tR%d\tR%d\t%d", a, b, c);
       print_lv_ab(mrb, irep, a, b);
       break;
     CASE(OP_ASET, BBB):
-      printf("OP_ASET\tR%d\tR%d\t%d", a, b, c);
+      printf("ASET\t\tR%d\tR%d\t%d", a, b, c);
       print_lv_ab(mrb, irep, a, b);
       break;
     CASE(OP_APOST, BBB):
-      printf("OP_APOST\tR%d\t%d\t%d", a, b, c);
+      printf("APOST\t\tR%d\t%d\t%d", a, b, c);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_INTERN, B):
-      printf("OP_INTERN\tR%d", a);
+      printf("INTERN\tR%d\t\t", a);
+      print_lv_a(mrb, irep, a);
+      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);
       break;
     CASE(OP_STRING, BB):
-      {
-        mrb_value v = irep->poolb;
-        mrb_value s = mrb_str_dump(mrb, mrb_str_new(mrb, RSTRING_PTR(v), RSTRING_LEN(v)));
-        printf("OP_STRING\tR%d\tL(%d)\t; %s", a, b, RSTRING_PTR(s));
+      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);
       break;
     CASE(OP_STRCAT, B):
-      printf("OP_STRCAT\tR%d\t", a);
+      printf("STRCAT\tR%d\tR%d", a, a+1);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_HASH, BB):
-      printf("OP_HASH\tR%d\t%d\t", a, b);
+      printf("HASH\t\tR%d\t%d\t", a, b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_HASHADD, BB):
-      printf("OP_HASHADD\tR%d\t%d\t", a, b);
+      printf("HASHADD\tR%d\t%d\t", a, b);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_HASHCAT, B):
-      printf("OP_HASHCAT\tR%d\t", a);
+      printf("HASHCAT\tR%d\t", a);
       print_lv_a(mrb, irep, a);
       break;
 
     CASE(OP_OCLASS, B):
-      printf("OP_OCLASS\tR%d\t\t", a);
+      printf("OCLASS\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_CLASS, BB):
-      printf("OP_CLASS\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("CLASS\t\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_MODULE, BB):
-      printf("OP_MODULE\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
+      printf("MODULE\tR%d\t:%s", a, mrb_sym_dump(mrb, irep->symsb));
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_EXEC, BB):
-      printf("OP_EXEC\tR%d\tI(%d:%p)", a, b, irep->repsb);
+      printf("EXEC\t\tR%d\tI(%d:%p)", a, b, (void*)irep->repsb);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_SCLASS, B):
-      printf("OP_SCLASS\tR%d\t", a);
+      printf("SCLASS\t\tR%d\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_TCLASS, B):
-      printf("OP_TCLASS\tR%d\t\t", a);
+      printf("TCLASS\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_ERR, B):
-      {
-        mrb_value v = irep->poola;
-        mrb_value s = mrb_str_dump(mrb, mrb_str_new(mrb, RSTRING_PTR(v), RSTRING_LEN(v)));
-        printf("OP_ERR\t%s\n", RSTRING_PTR(s));
+      if ((irep->poola.tt & IREP_TT_NFLAG) == 0) {
+        printf("ERR\t\t%s\n", irep->poola.u.str);
+      }
+      else {
+        printf("ERR\tL(%d)\n", a);
       }
-      break;
-    CASE(OP_EPUSH, B):
-      printf("OP_EPUSH\t\t:I(%d:%p)\n", a, irep->repsa);
-      break;
-    CASE(OP_ONERR, S):
-      printf("OP_ONERR\t%03d\n", a);
       break;
     CASE(OP_EXCEPT, B):
-      printf("OP_EXCEPT\tR%d\t\t", a);
+      printf("EXCEPT\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
     CASE(OP_RESCUE, BB):
-      printf("OP_RESCUE\tR%d\tR%d", a, b);
+      printf("RESCUE\tR%d\tR%d", a, b);
       print_lv_ab(mrb, irep, a, b);
       break;
-    CASE(OP_RAISE, B):
-      printf("OP_RAISE\tR%d\t\t", a);
+    CASE(OP_RAISEIF, B):
+      printf("RAISEIF\tR%d\t\t", a);
       print_lv_a(mrb, irep, a);
       break;
-    CASE(OP_POPERR, B):
-      printf("OP_POPERR\t%d\t\t\n", a);
-      break;
-    CASE(OP_EPOP, B):
-      printf("OP_EPOP\t%d\n", a);
-      break;
 
     CASE(OP_DEBUG, BBB):
-      printf("OP_DEBUG\t%d\t%d\t%d\n", a, b, c);
+      printf("DEBUG\t\t%d\t%d\t%d\n", a, b, c);
       break;
 
     CASE(OP_STOP, Z):
-      printf("OP_STOP\n");
+      printf("STOP\n");
       break;
 
     CASE(OP_EXT1, Z):
+      printf("EXT1\n");
+      print_header(mrb, irep, pc-irep->iseq);
       ins = READ_B();
-      printf("OP_EXT1\n");
-      print_header(mrb, irep, pc-irep->iseq-2);
       switch (ins) {
 #define OPCODE(i,x) case OP_ ## i: FETCH_ ## x ## _1 (); goto L_OP_ ## i;
 #include "mruby/ops.h"
@@ -503,9 +583,9 @@
       }
       break;
     CASE(OP_EXT2, Z):
+      printf("EXT2\n");
+      print_header(mrb, irep, pc-irep->iseq);
       ins = READ_B();
-      printf("OP_EXT2\n");
-      print_header(mrb, irep, pc-irep->iseq-2);
       switch (ins) {
 #define OPCODE(i,x) case OP_ ## i: FETCH_ ## x ## _2 (); goto L_OP_ ## i;
 #include "mruby/ops.h"
@@ -513,9 +593,9 @@
       }
       break;
     CASE(OP_EXT3, Z):
+      printf("EXT3\n");
+      print_header(mrb, irep, pc-irep->iseq);
       ins = READ_B();
-      printf("OP_EXT3\n");
-      print_header(mrb, irep, pc-irep->iseq-2);
       switch (ins) {
 #define OPCODE(i,x) case OP_ ## i: FETCH_ ## x ## _3 (); goto L_OP_ ## i;
 #include "mruby/ops.h"
@@ -524,7 +604,7 @@
       break;
 
     default:
-      printf("OP_unknown (0x%x)\n", ins);
+      printf("unknown_op (0x%x)\n", ins);
       break;
     }
     mrb_gc_arena_restore(mrb, ai);
@@ -533,13 +613,15 @@
 }
 
 static void
-codedump_recur(mrb_state *mrb, mrb_irep *irep)
+codedump_recur(mrb_state *mrb, const mrb_irep *irep)
 {
   int i;
 
   codedump(mrb, irep);
-  for (i=0; i<irep->rlen; i++) {
-    codedump_recur(mrb, irep->repsi);
+  if (irep->reps) {
+    for (i=0; i<irep->rlen; i++) {
+      codedump_recur(mrb, irep->repsi);
+    }
   }
 }
 #endif
@@ -547,7 +629,7 @@
 void
 mrb_codedump_all(mrb_state *mrb, struct RProc *proc)
 {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   codedump_recur(mrb, proc->body.irep);
 #endif
 }

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

@@ -35,28 +35,55 @@
   return *ret;
 }
 
-static mrb_debug_line_type
-select_line_type(const uint16_t *lines, size_t lines_len)
+size_t
+mrb_packed_int_len(uint32_t num)
 {
-  size_t line_count = 0;
-  int prev_line = -1;
-  size_t i;
-  for (i = 0; i < lines_len; ++i) {
-    if (linesi != prev_line) {
-      ++line_count;
-    }
-  }
-  return (sizeof(uint16_t) * lines_len) <= (sizeof(mrb_irep_debug_info_line) * line_count)
-      ? mrb_debug_line_ary : mrb_debug_line_flat_map;
+  size_t llen = 0;
+
+  do {
+    llen++;
+  } while (num >>= 7);
+  return llen;
+}
+
+size_t
+mrb_packed_int_encode(uint32_t num, uint8_t *p, uint8_t *pend)
+{
+  size_t llen = 0;
+
+  do {
+    uint8_t byte = num & 0x7f;
+    num >>= 7;
+    if (num != 0) byte |= 0x80;
+    if (p < pend) *p++ = byte;
+    llen++;
+  } while (num != 0);
+
+  return llen;
+}
+
+uint32_t
+mrb_packed_int_decode(uint8_t *p, uint8_t **newpos)
+{
+  size_t i = 0, shift = 0;
+  uint32_t n = 0;
+
+  do {
+    n |= ((uint32_t)(pi & 0x7f)) << shift;
+    i++;
+    shift += 7;
+  } while (shift < sizeof(uint32_t) * 8 && (pi - 1 & 0x80));
+  if (newpos) *newpos = p + i;
+  return n;
 }
 
 MRB_API char const*
-mrb_debug_get_filename(mrb_state *mrb, mrb_irep *irep, ptrdiff_t pc)
+mrb_debug_get_filename(mrb_state *mrb, const mrb_irep *irep, uint32_t pc)
 {
-  if (irep && pc >= 0 && pc < irep->ilen) {
+  if (irep && pc < irep->ilen) {
     mrb_irep_debug_info_file* f = NULL;
     if (!irep->debug_info) return NULL;
-    else if ((f = get_file(irep->debug_info, (uint32_t)pc))) {
+    else if ((f = get_file(irep->debug_info, pc))) {
       return mrb_sym_name_len(mrb, f->filename_sym, NULL);
     }
   }
@@ -64,14 +91,14 @@
 }
 
 MRB_API int32_t
-mrb_debug_get_line(mrb_state *mrb, mrb_irep *irep, ptrdiff_t pc)
+mrb_debug_get_line(mrb_state *mrb, const mrb_irep *irep, uint32_t pc)
 {
-  if (irep && pc >= 0 && pc < irep->ilen) {
+  if (irep && pc < irep->ilen) {
     mrb_irep_debug_info_file* f = NULL;
     if (!irep->debug_info) {
       return -1;
     }
-    else if ((f = get_file(irep->debug_info, (uint32_t)pc))) {
+    else if ((f = get_file(irep->debug_info, pc))) {
       switch (f->line_type) {
         case mrb_debug_line_ary:
           mrb_assert(f->start_pos <= pc && pc < (f->start_pos + f->line_entry_count));
@@ -102,6 +129,19 @@
 
           return ret->line;
         }
+
+        case mrb_debug_line_packed_map: {
+          uint8_t *p = f->lines.packed_map;
+          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);
+            line_diff = mrb_packed_int_decode(p, &p);
+            if (pc < pos) break;
+            line += line_diff;
+          }
+          return line;
+        }
       }
     }
   }
@@ -144,10 +184,7 @@
   }
 
   f = (mrb_irep_debug_info_file*)mrb_malloc(mrb, sizeof(*f));
-  d->files = (mrb_irep_debug_info_file**)(
-          d->files
-          ? mrb_realloc(mrb, d->files, sizeof(mrb_irep_debug_info_file*) * (d->flen + 1))
-          : mrb_malloc(mrb, sizeof(mrb_irep_debug_info_file*)));
+  d->files = (mrb_irep_debug_info_file**)mrb_realloc(mrb, d->files, sizeof(mrb_irep_debug_info_file*) * (d->flen + 1));
   d->filesd->flen++ = f;
 
   file_pc_count = end_pos - start_pos;
@@ -157,42 +194,32 @@
 
   fn_len = strlen(filename);
   f->filename_sym = mrb_intern(mrb, filename, fn_len);
-
-  f->line_type = select_line_type(lines + start_pos, end_pos - start_pos);
+  f->line_type = mrb_debug_line_packed_map;
   f->lines.ptr = NULL;
 
-  switch (f->line_type) {
-    case mrb_debug_line_ary:
-      f->line_entry_count = file_pc_count;
-      f->lines.ary = (uint16_t*)mrb_malloc(mrb, sizeof(uint16_t) * file_pc_count);
-      for (i = 0; i < file_pc_count; ++i) {
-        f->lines.aryi = linesstart_pos + i;
-      }
-      break;
-
-    case mrb_debug_line_flat_map: {
-      uint16_t prev_line = 0;
-      mrb_irep_debug_info_line m;
-      f->lines.flat_map = (mrb_irep_debug_info_line*)mrb_malloc(mrb, sizeof(mrb_irep_debug_info_line) * 1);
-      f->line_entry_count = 0;
-      for (i = 0; i < file_pc_count; ++i) {
-        if (linesstart_pos + i == prev_line) { continue; }
-
-        f->lines.flat_map = (mrb_irep_debug_info_line*)mrb_realloc(
-            mrb, f->lines.flat_map,
-            sizeof(mrb_irep_debug_info_line) * (f->line_entry_count + 1));
-        m.start_pos = start_pos + i;
-        m.line = linesstart_pos + i;
-        f->lines.flat_mapf->line_entry_count = m;
-
-        /* update */
-        ++f->line_entry_count;
-        prev_line = linesstart_pos + i;
-      }
-    } break;
-
-    default: mrb_assert(0); break;
+  uint16_t prev_line = 0;
+  uint32_t prev_pc = 0;
+  size_t packed_size = 0;
+  uint8_t *p, *pend;
+
+  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);
+  pend = p + packed_size;
+  prev_line = 0; prev_pc = 0;
+  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;
+    p += mrb_packed_int_encode(linesstart_pos + i-prev_line, p, pend);
+    prev_line = linesstart_pos + i;
   }
+  f->line_entry_count = (uint32_t)packed_size;
 
   return f;
 }

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

@@ -4,41 +4,24 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <string.h>
-#include <limits.h>
-#include <math.h>
+#include <mruby.h>
 #include <mruby/dump.h>
 #include <mruby/string.h>
 #include <mruby/irep.h>
-#include <mruby/numeric.h>
 #include <mruby/debug.h>
+#include <string.h>
 
-#ifndef MRB_WITHOUT_FLOAT
-#ifdef MRB_USE_FLOAT
-#define MRB_FLOAT_FMT "%.9g"
-#else
-#define MRB_FLOAT_FMT "%.17g"
-#endif
+#ifndef MRB_NO_FLOAT
+#include <mruby/endian.h>
 #endif
 
-static size_t get_irep_record_size_1(mrb_state *mrb, mrb_irep *irep);
+static size_t get_irep_record_size_1(mrb_state *mrb, const mrb_irep *irep);
 
 #if UINT32_MAX > SIZE_MAX
 # error This code cannot be built on your environment.
 #endif
 
 static size_t
-write_padding(uint8_t *buf)
-{
-  const size_t align = MRB_DUMP_ALIGNMENT;
-  size_t pad_len = -(intptr_t)buf & (align-1);
-  if (pad_len > 0) {
-    memset(buf, 0, pad_len);
-  }
-  return pad_len;
-}
-
-static size_t
 get_irep_header_size(mrb_state *mrb)
 {
   size_t size = 0;
@@ -50,7 +33,7 @@
 }
 
 static ptrdiff_t
-write_irep_header(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
+write_irep_header(mrb_state *mrb, const mrb_irep *irep, uint8_t *buf)
 {
   uint8_t *cur = buf;
 
@@ -62,88 +45,112 @@
   return cur - buf;
 }
 
-
 static size_t
-get_iseq_block_size(mrb_state *mrb, mrb_irep *irep)
+get_iseq_block_size(mrb_state *mrb, const mrb_irep *irep)
 {
   size_t size = 0;
 
+  size += sizeof(uint16_t); /* clen */
   size += sizeof(uint32_t); /* ilen */
-  size += sizeof(uint32_t); /* max padding */
-  size += sizeof(uint32_t) * irep->ilen; /* iseq(n) */
+  size += irep->ilen * sizeof(mrb_code); /* iseq(n) */
+  size += irep->clen * sizeof(struct mrb_irep_catch_handler);
 
   return size;
 }
 
 static ptrdiff_t
-write_iseq_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf, uint8_t flags)
+write_iseq_block(mrb_state *mrb, const mrb_irep *irep, uint8_t *buf, uint8_t flags)
 {
   uint8_t *cur = buf;
+  size_t seqlen = irep->ilen * sizeof(mrb_code) +
+                  irep->clen * sizeof(struct mrb_irep_catch_handler);
 
+  cur += uint16_to_bin(irep->clen, cur); /* number of catch handlers */
   cur += uint32_to_bin(irep->ilen, cur); /* number of opcode */
-  cur += write_padding(cur);
-  memcpy(cur, irep->iseq, irep->ilen * sizeof(mrb_code));
-  cur += irep->ilen * sizeof(mrb_code);
+  memcpy(cur, irep->iseq, seqlen);
+  cur += seqlen;
 
   return cur - buf;
 }
 
-#ifndef MRB_WITHOUT_FLOAT
-static mrb_value
-float_to_str(mrb_state *mrb, mrb_value flt)
+#ifndef MRB_NO_FLOAT
+static void
+dump_float(mrb_state *mrb, uint8_t *buf, mrb_float f)
 {
-  mrb_float f = mrb_float(flt);
+  /* dump IEEE754 binary in little endian */
+  union {
+    double f;
+    char ssizeof(double);
+  } u = {.f = (double)f};
 
-  if (isinf(f)) {
-    return f < 0 ? mrb_str_new_lit(mrb, "I") : mrb_str_new_lit(mrb, "i");
+  if (littleendian) {
+    memcpy(buf, u.s, sizeof(double));
+  }
+  else {
+    size_t i;
+
+    for (i=0; i<sizeof(double); i++) {
+      bufi = u.ssizeof(double)-i-1;
+    }
   }
-  return  mrb_float_to_str(mrb, flt, MRB_FLOAT_FMT);
 }
 #endif
 
 static size_t
-get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
+get_pool_block_size(mrb_state *mrb, const mrb_irep *irep)
 {
   int pool_no;
   size_t size = 0;
-  mrb_value str;
 
-  size += sizeof(uint32_t); /* plen */
-  size += irep->plen * (sizeof(uint8_t) + sizeof(uint16_t)); /* len(n) */
+  size += sizeof(uint16_t); /* plen */
+  size += irep->plen * sizeof(uint8_t); /* len(n) */
 
   for (pool_no = 0; pool_no < irep->plen; pool_no++) {
     int ai = mrb_gc_arena_save(mrb);
 
-    switch (mrb_type(irep->poolpool_no)) {
-    case MRB_TT_FIXNUM:
-      str = mrb_fixnum_to_str(mrb, irep->poolpool_no, 10);
+    switch (irep->poolpool_no.tt) {
+    case IREP_TT_INT64:
+#ifdef MRB_64BIT
       {
-        mrb_int len = RSTRING_LEN(str);
-        mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-        size += (size_t)len;
+        int64_t i = irep->poolpool_no.u.i64;
+
+        if (i < INT32_MIN || INT32_MAX < i)
+          size += 8;
+        else
+          size += 4;
       }
       break;
+#else
+      /* fall through */
+#endif
+    case IREP_TT_INT32:
+      size += 4;                /* 32bits = 4bytes */
+      break;
 
-#ifndef MRB_WITHOUT_FLOAT
-    case MRB_TT_FLOAT:
-      str = float_to_str(mrb, irep->poolpool_no);
+    case IREP_TT_BIGINT:
       {
-        mrb_int len = RSTRING_LEN(str);
+        mrb_int len = irep->poolpool_no.u.str0;
         mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-        size += (size_t)len;
+        size += sizeof(uint8_t);
+        size += (size_t)len+2;
       }
       break;
-#endif
 
-    case MRB_TT_STRING:
+    case IREP_TT_FLOAT:
+#ifndef MRB_NO_FLOAT
       {
-        mrb_int len = RSTRING_LEN(irep->poolpool_no);
-        mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-        size += (size_t)len;
+        size += sizeof(double);
       }
+#endif
       break;
 
-    default:
+    default: /*  packed IREP_TT_STRING */
+      {
+        mrb_int len = irep->poolpool_no.tt >> 2; /* unpack length */
+        mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
+        size += sizeof(uint16_t);
+        size += (size_t)len+1;
+      }
       break;
     }
     mrb_gc_arena_restore(mrb, ai);
@@ -153,67 +160,85 @@
 }
 
 static ptrdiff_t
-write_pool_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
+write_pool_block(mrb_state *mrb, const mrb_irep *irep, uint8_t *buf)
 {
   int pool_no;
   uint8_t *cur = buf;
-  uint16_t len;
-  mrb_value str;
-  const char *char_ptr;
+  mrb_int len;
+  const char *ptr;
 
-  cur += uint32_to_bin(irep->plen, cur); /* number of pool */
+  cur += uint16_to_bin(irep->plen, cur); /* number of pool */
 
   for (pool_no = 0; pool_no < irep->plen; pool_no++) {
     int ai = mrb_gc_arena_save(mrb);
 
-    switch (mrb_type(irep->poolpool_no)) {
-    case MRB_TT_FIXNUM:
-      cur += uint8_to_bin(IREP_TT_FIXNUM, cur); /* data type */
-      str = mrb_fixnum_to_str(mrb, irep->poolpool_no, 10);
-      break;
-
-#ifndef MRB_WITHOUT_FLOAT
-    case MRB_TT_FLOAT:
-      cur += uint8_to_bin(IREP_TT_FLOAT, cur); /* data type */
-      str = float_to_str(mrb, irep->poolpool_no);
+    switch (irep->poolpool_no.tt) {
+#ifdef MRB_64BIT
+    case IREP_TT_INT64:
+      {
+        int64_t i = irep->poolpool_no.u.i64;
+        if (i < INT32_MIN || INT32_MAX < i) {
+          cur += uint8_to_bin(IREP_TT_INT64, cur); /* data type */
+          cur += uint32_to_bin((uint32_t)((i>>32) & 0xffffffff), cur); /* i64 hi */
+          cur += uint32_to_bin((uint32_t)((i    ) & 0xffffffff), cur); /* i64 lo */
+        }
+        else {
+          cur += uint8_to_bin(IREP_TT_INT32, cur); /* data type */
+          cur += uint32_to_bin(irep->poolpool_no.u.i32, cur); /* i32 */
+        }
+      }
       break;
 #endif
+    case IREP_TT_INT32:
+      cur += uint8_to_bin(IREP_TT_INT32, cur); /* data type */
+      cur += uint32_to_bin(irep->poolpool_no.u.i32, cur); /* i32 */
+      break;
 
-    case MRB_TT_STRING:
-      cur += uint8_to_bin(IREP_TT_STRING, cur); /* data type */
-      str = irep->poolpool_no;
+    case IREP_TT_BIGINT:
+      cur += uint8_to_bin(IREP_TT_BIGINT, cur); /* data type */
+      len = irep->poolpool_no.u.str0;
+      memcpy(cur, irep->poolpool_no.u.str, (size_t)len+2);
+      cur += len+2;
+      *cur++ = '\0';
       break;
 
-    default:
-      continue;
-    }
+    case IREP_TT_FLOAT:
+      cur += uint8_to_bin(IREP_TT_FLOAT, cur); /* data type */
+#ifndef MRB_NO_FLOAT
+      {
+        dump_float(mrb, cur,irep->poolpool_no.u.f);
+        cur += sizeof(double);
+      }
+#else
+      cur += uint16_to_bin(0, cur); /* zero length */
+#endif
+      break;
 
-    char_ptr = RSTRING_PTR(str);
-    {
-      mrb_int tlen = RSTRING_LEN(str);
-      mrb_assert_int_fit(mrb_int, tlen, uint16_t, UINT16_MAX);
-      len = (uint16_t)tlen;
+    default: /* string */
+      cur += uint8_to_bin(IREP_TT_STR, cur); /* data type */
+      ptr = irep->poolpool_no.u.str;
+      len = irep->poolpool_no.tt>>2;
+      mrb_assert_int_fit(mrb_int, len, uint16_t, UINT16_MAX);
+      cur += uint16_to_bin((uint16_t)len, cur); /* data length */
+      memcpy(cur, ptr, (size_t)len);
+      cur += len;
+      *cur++ = '\0';
+      break;
     }
-
-    cur += uint16_to_bin(len, cur); /* data length */
-    memcpy(cur, char_ptr, (size_t)len);
-    cur += len;
-
     mrb_gc_arena_restore(mrb, ai);
   }
 
   return cur - buf;
 }
 
-
 static size_t
-get_syms_block_size(mrb_state *mrb, mrb_irep *irep)
+get_syms_block_size(mrb_state *mrb, const mrb_irep *irep)
 {
   size_t size = 0;
   int sym_no;
   mrb_int len;
 
-  size += sizeof(uint32_t); /* slen */
+  size += sizeof(uint16_t); /* slen */
   for (sym_no = 0; sym_no < irep->slen; sym_no++) {
     size += sizeof(uint16_t); /* snl(n) */
     if (irep->symssym_no != 0) {
@@ -226,13 +251,13 @@
 }
 
 static ptrdiff_t
-write_syms_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
+write_syms_block(mrb_state *mrb, const mrb_irep *irep, uint8_t *buf)
 {
   int sym_no;
   uint8_t *cur = buf;
   const char *name;
 
-  cur += uint32_to_bin(irep->slen, cur); /* number of symbol */
+  cur += uint16_to_bin(irep->slen, cur); /* number of symbol */
 
   for (sym_no = 0; sym_no < irep->slen; sym_no++) {
     if (irep->symssym_no != 0) {
@@ -255,7 +280,7 @@
 }
 
 static size_t
-get_irep_record_size_1(mrb_state *mrb, mrb_irep *irep)
+get_irep_record_size_1(mrb_state *mrb, const mrb_irep *irep)
 {
   size_t size = 0;
 
@@ -267,7 +292,7 @@
 }
 
 static size_t
-get_irep_record_size(mrb_state *mrb, mrb_irep *irep)
+get_irep_record_size(mrb_state *mrb, const mrb_irep *irep)
 {
   size_t size = 0;
   int irep_no;
@@ -280,7 +305,7 @@
 }
 
 static int
-write_irep_record(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, size_t *irep_record_size, uint8_t flags)
+write_irep_record(mrb_state *mrb, const mrb_irep *irep, uint8_t *bin, size_t *irep_record_size, uint8_t flags)
 {
   int i;
   uint8_t *src = bin;
@@ -289,11 +314,6 @@
     return MRB_DUMP_INVALID_IREP;
   }
 
-  *irep_record_size = get_irep_record_size_1(mrb, irep);
-  if (*irep_record_size == 0) {
-    return MRB_DUMP_GENERAL_FAILURE;
-  }
-
   bin += write_irep_header(mrb, irep, bin);
   bin += write_iseq_block(mrb, irep, bin, flags);
   bin += write_pool_block(mrb, irep, bin);
@@ -341,7 +361,7 @@
 }
 
 static int
-write_section_irep(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, size_t *len_p, uint8_t flags)
+write_section_irep(mrb_state *mrb, const mrb_irep *irep, uint8_t *bin, size_t *len_p, uint8_t flags)
 {
   int result;
   size_t rsize = 0;
@@ -357,6 +377,7 @@
   if (result != MRB_DUMP_OK) {
     return result;
   }
+  mrb_assert(rsize == get_irep_record_size(mrb, irep));
   *len_p = cur - bin + rsize;
   write_section_irep_header(mrb, *len_p, bin);
 
@@ -364,7 +385,7 @@
 }
 
 static size_t
-get_debug_record_size(mrb_state *mrb, mrb_irep *irep)
+get_debug_record_size(mrb_state *mrb, const mrb_irep *irep)
 {
   size_t ret = 0;
   uint16_t f_idx;
@@ -391,6 +412,10 @@
         ret += (sizeof(uint32_t) + sizeof(uint16_t)) * (size_t)(file->line_entry_count);
         break;
 
+      case mrb_debug_line_packed_map:
+        ret += (size_t)(file->line_entry_count);
+        break;
+
       default: mrb_assert(0); break;
     }
   }
@@ -413,11 +438,11 @@
 }
 
 static size_t
-get_filename_table_size(mrb_state *mrb, mrb_irep *irep, mrb_sym **fp, uint16_t *lp)
+get_filename_table_size(mrb_state *mrb, const mrb_irep *irep, mrb_sym **fp, uint16_t *lp)
 {
   mrb_sym *filenames = *fp;
   size_t size = 0;
-  mrb_irep_debug_info *di = irep->debug_info;
+  const mrb_irep_debug_info *di = irep->debug_info;
   int i;
 
   mrb_assert(lp);
@@ -444,7 +469,7 @@
 }
 
 static size_t
-write_debug_record_1(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const* filenames, uint16_t filenames_len)
+write_debug_record_1(mrb_state *mrb, const mrb_irep *irep, uint8_t *bin, mrb_sym const* filenames, uint16_t filenames_len)
 {
   uint8_t *cur;
   uint16_t f_idx;
@@ -485,6 +510,11 @@
         }
       } break;
 
+      case mrb_debug_line_packed_map: {
+        memcpy(cur, file->lines.packed_map, file->line_entry_count);
+        cur += file->line_entry_count;
+      } break;
+
       default: mrb_assert(0); break;
     }
   }
@@ -498,7 +528,7 @@
 }
 
 static size_t
-write_debug_record(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const* filenames, uint16_t filenames_len)
+write_debug_record(mrb_state *mrb, const mrb_irep *irep, uint8_t *bin, mrb_sym const* filenames, uint16_t filenames_len)
 {
   size_t size, len;
   int irep_no;
@@ -516,7 +546,7 @@
 }
 
 static int
-write_section_debug(mrb_state *mrb, mrb_irep *irep, uint8_t *cur, mrb_sym const *filenames, uint16_t filenames_len)
+write_section_debug(mrb_state *mrb, const mrb_irep *irep, uint8_t *cur, mrb_sym const *filenames, uint16_t filenames_len)
 {
   size_t section_size = 0;
   const uint8_t *bin = cur;
@@ -566,7 +596,7 @@
   }
 
   for (i = 0; i + 1 < irep->nlocals; ++i) {
-    mrb_sym const name = irep->lvi.name;
+    mrb_sym const name = irep->lvi;
     if (name == 0) continue;
     if (find_filename_index(*syms, *syms_len, name) != -1) continue;
 
@@ -609,16 +639,14 @@
   int i;
 
   for (i = 0; i + 1 < irep->nlocals; ++i) {
-    if (irep->lvi.name == 0) {
+    if (irep->lvi == 0) {
       cur += uint16_to_bin(RITE_LV_NULL_MARK, cur);
-      cur += uint16_to_bin(0, cur);
     }
     else {
-      int const sym_idx = find_filename_index(syms, syms_len, irep->lvi.name);
+      int const sym_idx = find_filename_index(syms, syms_len, irep->lvi);
       mrb_assert(sym_idx != -1); /* local variable name must be in syms */
 
       cur += uint16_to_bin(sym_idx, cur);
-      cur += uint16_to_bin(irep->lvi.r, cur);
     }
   }
 
@@ -632,12 +660,12 @@
 }
 
 static size_t
-get_lv_record_size(mrb_state *mrb, mrb_irep *irep)
+get_lv_record_size(mrb_state *mrb, const mrb_irep *irep)
 {
   size_t ret = 0;
   int i;
 
-  ret += (sizeof(uint16_t) + sizeof(uint16_t)) * (irep->nlocals - 1);
+  ret += sizeof(uint16_t) * (irep->nlocals - 1);
 
   for (i = 0; i < irep->rlen; ++i) {
     ret += get_lv_record_size(mrb, irep->repsi);
@@ -647,7 +675,7 @@
 }
 
 static size_t
-get_lv_section_size(mrb_state *mrb, mrb_irep *irep, mrb_sym const *syms, uint32_t syms_len)
+get_lv_section_size(mrb_state *mrb, const mrb_irep *irep, mrb_sym const *syms, uint32_t syms_len)
 {
   size_t ret = 0, i;
 
@@ -665,7 +693,7 @@
 }
 
 static int
-write_section_lv(mrb_state *mrb, mrb_irep *irep, uint8_t *start, mrb_sym const *syms, uint32_t const syms_len)
+write_section_lv(mrb_state *mrb, const mrb_irep *irep, uint8_t *start, mrb_sym const *syms, uint32_t const syms_len)
 {
   uint8_t *cur = start;
   struct rite_section_lv_header *header;
@@ -703,25 +731,20 @@
 write_rite_binary_header(mrb_state *mrb, size_t binary_size, uint8_t *bin, uint8_t flags)
 {
   struct rite_binary_header *header = (struct rite_binary_header *)bin;
-  uint16_t crc;
-  uint32_t offset;
 
   memcpy(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident));
-  memcpy(header->binary_version, RITE_BINARY_FORMAT_VER, sizeof(header->binary_version));
+  memcpy(header->major_version, RITE_BINARY_MAJOR_VER, sizeof(header->major_version));
+  memcpy(header->minor_version, RITE_BINARY_MINOR_VER, sizeof(header->minor_version));
   memcpy(header->compiler_name, RITE_COMPILER_NAME, sizeof(header->compiler_name));
   memcpy(header->compiler_version, RITE_COMPILER_VERSION, sizeof(header->compiler_version));
   mrb_assert(binary_size <= UINT32_MAX);
   uint32_to_bin((uint32_t)binary_size, header->binary_size);
 
-  offset = (uint32_t)((&(header->binary_crc0) - bin) + sizeof(uint16_t));
-  crc = calc_crc_16_ccitt(bin + offset, binary_size - offset, 0);
-  uint16_to_bin(crc, header->binary_crc);
-
   return MRB_DUMP_OK;
 }
 
 static mrb_bool
-debug_info_defined_p(mrb_irep *irep)
+debug_info_defined_p(const mrb_irep *irep)
 {
   int i;
 
@@ -733,7 +756,7 @@
 }
 
 static mrb_bool
-lv_defined_p(mrb_irep *irep)
+lv_defined_p(const mrb_irep *irep)
 {
   int i;
 
@@ -747,7 +770,7 @@
 }
 
 static int
-dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size)
+dump_irep(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size)
 {
   int result = MRB_DUMP_GENERAL_FAILURE;
   size_t malloc_size;
@@ -767,7 +790,7 @@
   section_irep_size += get_irep_record_size(mrb, irep);
 
   /* DEBUG section size */
-  if (flags & DUMP_DEBUG_INFO) {
+  if (flags & MRB_DUMP_DEBUG_INFO) {
     if (debug_info_defined) {
       section_lineno_size += sizeof(struct rite_section_debug_header);
       /* filename table */
@@ -803,7 +826,7 @@
               sizeof(struct rite_binary_footer);
 
   /* write DEBUG section */
-  if (flags & DUMP_DEBUG_INFO) {
+  if (flags & MRB_DUMP_DEBUG_INFO) {
     if (debug_info_defined) {
       result = write_section_debug(mrb, irep, cur, filenames, filenames_len);
       if (result != MRB_DUMP_OK) {
@@ -835,15 +858,15 @@
 }
 
 int
-mrb_dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size)
+mrb_dump_irep(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size)
 {
   return dump_irep(mrb, irep, flags, bin, bin_size);
 }
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 
 int
-mrb_dump_irep_binary(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE* fp)
+mrb_dump_irep_binary(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, FILE* fp)
 {
   uint8_t *bin = NULL;
   size_t bin_size = 0;
@@ -865,7 +888,7 @@
 }
 
 int
-mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE *fp, const char *initname)
+mrb_dump_irep_cfunc(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, FILE *fp, const char *initname)
 {
   uint8_t *bin = NULL;
   size_t bin_size = 0, bin_idx = 0;
@@ -881,18 +904,13 @@
       return MRB_DUMP_WRITE_FAULT;
     }
     if (fprintf(fp,
-          "#ifdef __cplusplus\n"
-          "extern const uint8_t %s;\n"
-          "#endif\n"
-          "const uint8_t\n"
-          "#if defined __GNUC__\n"
-          "__attribute__((aligned(%u)))\n"
-          "#elif defined _MSC_VER\n"
-          "__declspec(align(%u))\n"
-          "#endif\n"
-          "%s = {",
-          initname,
-          (uint16_t)MRB_DUMP_ALIGNMENT, (uint16_t)MRB_DUMP_ALIGNMENT, initname) < 0) {
+          "%s\n"
+          "const uint8_t %s = {",
+          (flags & MRB_DUMP_STATIC) ? "static"
+                                    : "#ifdef __cplusplus\n"
+                                      "extern\n"
+                                      "#endif",
+          initname) < 0) {
       mrb_free(mrb, bin);
       return MRB_DUMP_WRITE_FAULT;
     }
@@ -918,4 +936,4 @@
   return result;
 }
 
-#endif /* MRB_DISABLE_STDIO */
+#endif /* MRB_NO_STDIO */

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

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

@@ -5,7 +5,6 @@
 */
 
 #include <errno.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <mruby.h>
 #include <mruby/array.h>
@@ -16,19 +15,53 @@
 #include <mruby/error.h>
 #include <mruby/class.h>
 #include <mruby/throw.h>
+#include <mruby/presym.h>
 
-MRB_API mrb_value
-mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len)
+static void
+exc_mesg_set(mrb_state *mrb, struct RException *exc, mrb_value mesg)
 {
-  mrb_value arg = mrb_str_new(mrb, ptr, len);
-  return mrb_obj_new(mrb, c, 1, &arg);
+  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);
+    }
+  }
+}
+
+static mrb_value
+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));
+  }
 }
 
 MRB_API mrb_value
 mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str)
 {
-  mrb_to_str(mrb, str);
-  return mrb_obj_new(mrb, c, 1, &str);
+  mrb_ensure_string_type(mrb, str);
+
+  struct RBasic* 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);
+  return exc;
+}
+
+MRB_API mrb_value
+mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len)
+{
+  return mrb_exc_new_str(mrb, c, mrb_str_new(mrb, ptr, len));
 }
 
 /*
@@ -45,7 +78,7 @@
   mrb_value mesg;
 
   if (mrb_get_args(mrb, "|o", &mesg) == 1) {
-    mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "mesg"), mesg);
+    exc_mesg_set(mrb, mrb_exc_ptr(exc), mesg);
   }
   return exc;
 }
@@ -74,7 +107,7 @@
   if (argc == 0) return self;
   if (mrb_obj_equal(mrb, self, a)) return self;
   exc = mrb_obj_clone(mrb, self);
-  mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "mesg"), a);
+  exc_mesg_set(mrb, mrb_exc_ptr(exc), a);
 
   return exc;
 }
@@ -87,10 +120,10 @@
  * no message is set).
  */
 
-mrb_value
+static mrb_value
 exc_to_s(mrb_state *mrb, mrb_value exc)
 {
-  mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "mesg"));
+  mrb_value mesg = exc_mesg_get(mrb, mrb_exc_ptr(exc));
   struct RObject *p;
 
   if (!mrb_string_p(mesg)) {
@@ -114,7 +147,7 @@
 static mrb_value
 exc_message(mrb_state *mrb, mrb_value exc)
 {
-  return mrb_funcall(mrb, exc, "to_s", 0);
+  return mrb_funcall_id(mrb, exc, MRB_SYM(to_s), 0);
 }
 
 /*
@@ -130,7 +163,7 @@
 mrb_value
 mrb_exc_inspect(mrb_state *mrb, mrb_value exc)
 {
-  mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "mesg"));
+  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);
@@ -154,7 +187,7 @@
       p++;
     }
   }
-  mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "backtrace"), backtrace);
+  mrb_iv_set(mrb, exc, MRB_SYM(backtrace), backtrace);
 }
 
 static mrb_value
@@ -286,9 +319,9 @@
 #else
           i = *p == 'd' ? (mrb_int)va_arg(ap, int) : va_arg(ap, mrb_int);
 #endif
-          obj = mrb_fixnum_value(i);
+          obj = mrb_int_value(mrb, i);
           goto L_cat_obj;
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
         case 'f':
           obj = mrb_float_value(mrb, (mrb_float)va_arg(ap, double));
           goto L_cat_obj;
@@ -301,6 +334,7 @@
             obj = mrb_str_new(mrb, chars, len);
             goto L_cat_obj;
           }
+        L_cat_plain:
           mrb_str_cat(mrb, result, b,  e - b - 1);
           mrb_str_cat(mrb, result, chars, len);
           b = ++p;
@@ -324,10 +358,15 @@
           obj = va_arg(ap, mrb_value);
         L_cat_obj:
           str = (inspect ? mrb_inspect : mrb_obj_as_string)(mrb, obj);
-          chars = RSTRING_PTR(str);
-          len = RSTRING_LEN(str);
-          inspect = FALSE;
-          goto L_cat;
+          if (mrb_type(str) != MRB_TT_STRING) {
+            chars = "void (no string conversion)";
+            len = strlen(chars);
+          }
+          else {
+            chars = RSTRING_PTR(str);
+            len = RSTRING_LEN(str);
+          }
+          goto L_cat_plain;
         case 'C':
           cls = va_arg(ap, struct RClass*);
         L_cat_class:
@@ -351,7 +390,7 @@
         L_cat_current:
           chars = p;
           len = 1;
-          goto L_cat;
+          goto L_cat_plain;
         default:
           mrb_raisef(mrb, E_ARGUMENT_ERROR, "malformed format string - %%%c", *p);
       }
@@ -380,47 +419,43 @@
   return str;
 }
 
-static mrb_noreturn void
-raise_va(mrb_state *mrb, struct RClass *c, const char *fmt, va_list ap, int argc, mrb_value *argv)
+static mrb_value
+error_va(mrb_state *mrb, struct RClass *c, const char *fmt, va_list ap)
 {
-  mrb_value mesg;
-
-  mesg = mrb_vformat(mrb, fmt, ap);
-  if (argv == NULL) {
-    argv = &mesg;
-  }
-  else {
-    argv0 = mesg;
-  }
-  mrb_exc_raise(mrb, mrb_obj_new(mrb, c, argc+1, argv));
+  mrb_value mesg = mrb_vformat(mrb, fmt, ap);
+  return mrb_exc_new_str(mrb, c, mesg);
 }
 
 MRB_API mrb_noreturn void
 mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...)
 {
-  va_list args;
+  va_list ap;
+  mrb_value exc;
 
-  va_start(args, fmt);
-  raise_va(mrb, c, fmt, args, 0, NULL);
-  va_end(args);
+  va_start(ap, fmt);
+  exc = error_va(mrb, c, fmt, ap);
+  va_end(ap);
+
+  mrb_exc_raise(mrb, exc);
 }
 
 MRB_API mrb_noreturn void
 mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...)
 {
-  mrb_value argv2;
-  va_list args;
+  va_list ap;
+  mrb_value exc;
 
-  va_start(args, fmt);
-  argv1 = mrb_symbol_value(id);
-  raise_va(mrb, E_NAME_ERROR, fmt, args, 1, argv);
-  va_end(args);
+  va_start(ap, fmt);
+  exc = error_va(mrb, E_NAME_ERROR, fmt, ap);
+  va_end(ap);
+  mrb_iv_set(mrb, exc, MRB_IVSYM(name), mrb_symbol_value(id));
+  mrb_exc_raise(mrb, exc);
 }
 
 MRB_API void
 mrb_warn(mrb_state *mrb, const char *fmt, ...)
 {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   va_list ap;
   mrb_value str;
 
@@ -436,7 +471,7 @@
 MRB_API mrb_noreturn void
 mrb_bug(mrb_state *mrb, const char *fmt, ...)
 {
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
   va_list ap;
   mrb_value str;
 
@@ -474,7 +509,7 @@
       n = 1;
 exception_call:
       {
-        mrb_sym exc = mrb_intern_lit(mrb, "exception");
+        mrb_sym exc = MRB_SYM(exception);
         if (mrb_respond_to(mrb, argv0, exc)) {
           mesg = mrb_funcall_argv(mrb, argv0, exc, n, argv+1);
         }
@@ -523,16 +558,14 @@
 MRB_API mrb_noreturn void
 mrb_no_method_error(mrb_state *mrb, mrb_sym id, mrb_value args, char const* fmt, ...)
 {
-  mrb_value exc;
-  mrb_value argv3;
   va_list ap;
+  mrb_value exc;
 
   va_start(ap, fmt);
-  argv0 = mrb_vformat(mrb, fmt, ap);
-  argv1 = mrb_symbol_value(id);
-  argv2 = args;
+  exc = error_va(mrb, E_NOMETHOD_ERROR, fmt, ap);
   va_end(ap);
-  exc = mrb_obj_new(mrb, E_NOMETHOD_ERROR, 3, argv);
+  mrb_iv_set(mrb, exc, MRB_IVSYM(name), mrb_symbol_value(id));
+  mrb_iv_set(mrb, exc, MRB_IVSYM(args), args);
   mrb_exc_raise(mrb, exc);
 }
 
@@ -590,6 +623,28 @@
   exc_throw(mrb, mrb_nil_value());
 }
 
+void
+mrb_protect_atexit(mrb_state *mrb)
+{
+  if (mrb->atexit_stack_len > 0) {
+    struct mrb_jmpbuf *prev_jmp = mrb->jmp;
+    struct mrb_jmpbuf c_jmp;
+    for (int i = mrb->atexit_stack_len; i > 0; --i) {
+      MRB_TRY(&c_jmp) {
+        mrb->jmp = &c_jmp;
+        mrb->atexit_stacki - 1(mrb);
+        mrb->jmp = prev_jmp;
+      } MRB_CATCH(&c_jmp) {
+        /* ignore atexit errors */
+      } MRB_END_EXC(&c_jmp);
+    }
+#ifndef MRB_FIXED_STATE_ATEXIT_STACK
+    mrb_free(mrb, mrb->atexit_stack);
+#endif
+    mrb->jmp = prev_jmp;
+  }
+}
+
 mrb_noreturn void
 mrb_raise_nomemory(mrb_state *mrb)
 {
@@ -622,11 +677,11 @@
   script_error = mrb_define_class(mrb, "ScriptError", mrb->eException_class);                /* 15.2.37 */
   mrb_define_class(mrb, "SyntaxError", script_error);                                        /* 15.2.38 */
   stack_error = mrb_define_class(mrb, "SystemStackError", exception);
-  mrb->stack_err = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, stack_error, "stack level too deep"));
+  mrb->stack_err = mrb_obj_ptr(mrb_exc_new_lit(mrb, stack_error, "stack level too deep"));
 
   nomem_error = mrb_define_class(mrb, "NoMemoryError", exception);
-  mrb->nomem_err = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, nomem_error, "Out of memory"));
+  mrb->nomem_err = mrb_obj_ptr(mrb_exc_new_lit(mrb, nomem_error, "Out of memory"));
 #ifdef MRB_GC_FIXED_ARENA
-  mrb->arena_err = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, nomem_error, "arena overflow error"));
+  mrb->arena_err = mrb_obj_ptr(mrb_exc_new_lit(mrb, nomem_error, "arena overflow error"));
 #endif
 }

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

@@ -8,13 +8,14 @@
 #include <mruby/string.h>
 #include <mruby/data.h>
 #include <mruby/class.h>
+#include <mruby/numeric.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 = (struct RData*)mrb_obj_alloc(mrb, MRB_TT_DATA, klass);
+  data = MRB_OBJ_ALLOC(mrb, MRB_TT_DATA, klass);
   data->data = ptr;
   data->type = type;
 
@@ -69,21 +70,11 @@
   return 0;  /* not reached */
 }
 
-MRB_API mrb_int
-#ifdef MRB_WITHOUT_FLOAT
-mrb_fixnum_id(mrb_int f)
-#else
-mrb_float_id(mrb_float f)
-#endif
+static mrb_int
+make_num_id(const char *p, size_t len)
 {
-  const char *p = (const char*)&f;
-  int len = sizeof(f);
   uint32_t id = 0;
 
-#ifndef MRB_WITHOUT_FLOAT
-  /* normalize -0.0 to 0.0 */
-  if (f == 0) f = 0.0;
-#endif
   while (len--) {
     id = id*65599 + *p;
     p++;
@@ -94,32 +85,65 @@
 }
 
 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
+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));
+}
+#endif
+
+MRB_API mrb_int
 mrb_obj_id(mrb_value obj)
 {
-  mrb_int tt = mrb_type(obj);
+#if defined(MRB_NAN_BOXING)
+#ifdef MRB_INT64
+  return obj.u;
+#else
+  uint64_t u = obj.u;
+  return (mrb_int)(u>>32)^u;
+#endif
+#elif defined(MRB_WORD_BOXING)
+  if (!mrb_immediate_p(obj)) {
+    if (mrb_integer_p(obj)) return mrb_integer(obj);
+#ifndef MRB_NO_FLOAT
+    if (mrb_float_p(obj)) {
+      return mrb_float_id(mrb_float(obj));
+    }
+#endif
+  }
+  return (mrb_int)obj.w;
+#else  /* MRB_NO_BOXING */
+
+#define MakeID(p,t) (mrb_int)(((intptr_t)(p))^(t))
 
-#define MakeID2(p,t) (mrb_int)(((intptr_t)(p))^(t))
-#define MakeID(p)    MakeID2(p,tt)
+  enum mrb_vtype tt = mrb_type(obj);
 
   switch (tt) {
   case MRB_TT_FREE:
   case MRB_TT_UNDEF:
-    return MakeID(0); /* not define */
+    return MakeID(0, tt); /* should not happen */
   case MRB_TT_FALSE:
     if (mrb_nil_p(obj))
-      return MakeID(1);
-    return MakeID(0);
+      return MakeID(4, tt);
+    else
+      return MakeID(0, tt);
   case MRB_TT_TRUE:
-    return MakeID(1);
+    return MakeID(2, tt);
   case MRB_TT_SYMBOL:
-    return MakeID(mrb_symbol(obj));
-  case MRB_TT_FIXNUM:
-#ifdef MRB_WITHOUT_FLOAT
-    return MakeID(mrb_fixnum_id(mrb_fixnum(obj)));
-#else
-    return MakeID2(mrb_float_id((mrb_float)mrb_fixnum(obj)), MRB_TT_FLOAT);
+    return MakeID(mrb_symbol(obj), tt);
+  case MRB_TT_INTEGER:
+    return MakeID(mrb_int_id(mrb_integer(obj)), tt);
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
-    return MakeID(mrb_float_id(mrb_float(obj)));
+    return MakeID(mrb_float_id(mrb_float(obj)), tt);
 #endif
   case MRB_TT_STRING:
   case MRB_TT_OBJECT:
@@ -135,53 +159,77 @@
   case MRB_TT_DATA:
   case MRB_TT_ISTRUCT:
   default:
-    return MakeID(mrb_ptr(obj));
+    return MakeID(mrb_ptr(obj), tt);
   }
-}
-
-#if defined(MRB_NAN_BOXING) && defined(MRB_64BIT)
-#define mrb_xxx_boxing_cptr_value mrb_nan_boxing_cptr_value
 #endif
+}
 
 #ifdef MRB_WORD_BOXING
-#define mrb_xxx_boxing_cptr_value mrb_word_boxing_cptr_value
-
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 MRB_API mrb_value
 mrb_word_boxing_float_value(mrb_state *mrb, mrb_float f)
 {
-  mrb_value v;
+  union mrb_value_ v;
 
-  v.value.p = mrb_obj_alloc(mrb, MRB_TT_FLOAT, mrb->float_class);
-  v.value.fp->f = f;
-  MRB_SET_FROZEN_FLAG(v.value.bp);
-  return v;
+#ifdef MRB_WORDBOX_NO_FLOAT_TRUNCATE
+  v.p = mrb_obj_alloc(mrb, MRB_TT_FLOAT, mrb->float_class);
+  v.fp->f = f;
+  MRB_SET_FROZEN_FLAG(v.bp);
+#elif defined(MRB_64BIT) && defined(MRB_USE_FLOAT32)
+  v.w = 0;
+  v.f = f;
+  v.w = ((v.w<<2) & ~3) | 2;
+#else
+  v.f = f;
+  v.w = (v.w & ~3) | 2;
+#endif
+  return v.value;
 }
 
-MRB_API mrb_value
-mrb_word_boxing_float_pool(mrb_state *mrb, mrb_float f)
+
+#ifndef MRB_WORDBOX_NO_FLOAT_TRUNCATE
+MRB_API mrb_float
+mrb_word_boxing_value_float(mrb_value v)
 {
-  struct RFloat *nf = (struct RFloat *)mrb_malloc(mrb, sizeof(struct RFloat));
-  nf->tt = MRB_TT_FLOAT;
-  nf->c = mrb->float_class;
-  nf->f = f;
-  MRB_SET_FROZEN_FLAG(nf);
-  return mrb_obj_value(nf);
+  union mrb_value_ u;
+  u.value = v;
+  u.w = u.w & ~3;
+#if defined(MRB_64BIT) && defined(MRB_USE_FLOAT32)
+  u.w >>= 2;
+#endif
+  return u.f;
 }
-#endif  /* MRB_WITHOUT_FLOAT */
-#endif  /* MRB_WORD_BOXING */
+#endif
+#endif  /* MRB_NO_FLOAT */
 
-#if defined(MRB_WORD_BOXING) || (defined(MRB_NAN_BOXING) && defined(MRB_64BIT))
 MRB_API mrb_value
-mrb_xxx_boxing_cptr_value(mrb_state *mrb, void *p)
+mrb_word_boxing_cptr_value(mrb_state *mrb, void *p)
 {
   mrb_value v;
-  struct RCptr *cptr = (struct RCptr*)mrb_obj_alloc(mrb, MRB_TT_CPTR, mrb->object_class);
+  struct RCptr *cptr = MRB_OBJ_ALLOC(mrb, MRB_TT_CPTR, mrb->object_class);
 
   SET_OBJ_VALUE(v, cptr);
   cptr->p = p;
   return v;
 }
+#endif  /* MRB_WORD_BOXING */
+
+#if defined(MRB_WORD_BOXING) || (defined(MRB_NAN_BOXING) && defined(MRB_INT64))
+MRB_API mrb_value
+mrb_boxing_int_value(mrb_state *mrb, mrb_int n)
+{
+  if (FIXABLE(n)) return mrb_fixnum_value(n);
+  else {
+    mrb_value v;
+    struct RInteger *p;
+
+    p = (struct RInteger*)mrb_obj_alloc(mrb, MRB_TT_INTEGER, mrb->integer_class);
+    p->i = n;
+    MRB_SET_FROZEN_FLAG((struct RBasic*)p);
+    SET_OBJ_VALUE(v, p);
+    return v;
+  }
+}
 #endif
 
 #if defined _MSC_VER && _MSC_VER < 1900

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

@@ -1,464 +1,363 @@
-#ifndef MRB_WITHOUT_FLOAT
-#if defined(MRB_DISABLE_STDIO) || defined(_WIN32) || defined(_WIN64)
-/*
-
-Most code in this file originates from musl (src/stdio/vfprintf.c)
-which, just like mruby itself, is licensed under the MIT license.
-
-Copyright (c) 2005-2014 Rich Felker, et al.
-
-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 <limits.h>
+#include <mruby.h>
 #include <string.h>
-#include <math.h>
-#include <float.h>
-#include <ctype.h>
 
-#include <mruby.h>
-#include <mruby/string.h>
+#ifndef MRB_NO_FLOAT
+/***********************************************************************
 
-struct fmt_args;
+  Routine for converting a single-precision
+  floating point number into a string.
 
-typedef void output_func(struct fmt_args *f, const char *s, size_t l);
+  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.
 
-struct fmt_args {
-  mrb_state *mrb;
-  output_func *output;
-  void *opaque;
-};
+  Dave Hylands
 
-struct mrb_cstr {
-  char *buf;
-  size_t len;
-};
+  The original code can be found in https://github.com/dhylands/format-float
+***********************************************************************/
 
-#define MAX(a,b) ((a)>(b) ? (a) : (b))
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
+/***********************************************************************
 
-/* Convenient bit representation for modifier flags, which all fall
- * within 31 codepoints of the space character. */
+  I modified the routine for mruby:
 
-#define ALT_FORM   (1U<<('#'-' '))
-#define ZERO_PAD   (1U<<('0'-' '))
-#define LEFT_ADJ   (1U<<('-'-' '))
-#define PAD_POS    (1U<<(' '-' '))
-#define MARK_POS   (1U<<('+'-' '))
+  * support `double`
+  * support `#` (alt_form) modifier
 
-#define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS)
+  My modifications in this file are also placed in the public domain.
 
-static output_func strcat_value;
-static output_func strcat_cstr;
+  Matz (Yukihiro Matsumoto)
 
-static void
-strcat_value(struct fmt_args *f, const char *s, size_t l)
-{
-  mrb_value str = *(mrb_value*)f->opaque;
-  mrb_str_cat(f->mrb, str, s, l);
-}
+***********************************************************************/
 
-static void
-strcat_cstr(struct fmt_args *f, const char *s, size_t l)
-{
-  struct mrb_cstr *cstr = (struct mrb_cstr*)f->opaque;
+#include <math.h>
 
-  if (l > cstr->len) {
-    mrb_state *mrb = f->mrb;
+#ifdef MRB_USE_FLOAT32
 
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "string buffer too small");
-  }
+// 1 sign bit, 8 exponent bits, and 23 mantissa bits.
+// exponent values 0 and 255 are reserved, exponent can be 1 to 254.
+// exponent is stored with a bias of 127.
+// The min and max floats are on the order of 1x10^37 and 1x10^-37
 
-  memcpy(cstr->buf, s, l);
+#define FLT_DECEXP      32
+#define FLT_ROUND_TO_ONE 0.9999995F
+#define FLT_MIN_BUF_SIZE 6 // -9e+99
 
-  cstr->buf += l;
-  cstr->len -= l;
-}
+#else
 
-static void
-out(struct fmt_args *f, const char *s, size_t l)
-{
-  f->output(f, s, l);
-}
+// 1 sign bit, 11 exponent bits, and 52 mantissa bits.
 
-#define PAD_SIZE 256
-static void
-pad(struct fmt_args *f, char c, ptrdiff_t w, ptrdiff_t l, uint32_t fl)
-{
-  char padPAD_SIZE;
-  if (fl & (LEFT_ADJ | ZERO_PAD) || l >= w) return;
-  l = w - l;
-  memset(pad, c, l>PAD_SIZE ? PAD_SIZE : l);
-  for (; l >= PAD_SIZE; l -= PAD_SIZE)
-    out(f, pad, PAD_SIZE);
-  out(f, pad, l);
-}
+#define FLT_DECEXP      256
+#define FLT_ROUND_TO_ONE 0.999999999995
+#define FLT_MIN_BUF_SIZE  7 // -9e+199
 
-static const char xdigits16 = {
-  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-};
+#endif  /* MRB_USE_FLOAT32 */
 
-static char*
-fmt_u(uint32_t x, char *s)
-{
-  for (; x; x /= 10) *--s = '0' + x % 10;
-  return s;
-}
-
-/* Do not override this check. The floating point printing code below
- * depends on the float.h constants being right. If they are wrong, it
- * may overflow the stack. */
-#if LDBL_MANT_DIG == 53
-typedef char compiler_defines_long_double_incorrectly9-(int)sizeof(long double);
+static const mrb_float g_pos_pow = {
+#ifndef MRB_USE_FLOAT32
+    1e256, 1e128, 1e64,
+#endif
+    1e32, 1e16, 1e8, 1e4, 1e2, 1e1
+};
+static const mrb_float g_neg_pow = {
+#ifndef MRB_USE_FLOAT32
+    1e-256, 1e-128, 1e-64,
 #endif
+    1e-32, 1e-16, 1e-8, 1e-4, 1e-2, 1e-1
+};
 
-static int
-fmt_fp(struct fmt_args *f, long double y, ptrdiff_t w, ptrdiff_t p, uint32_t fl, int t)
-{
-  uint32_t big(LDBL_MANT_DIG+28)/29 + 1          // mantissa expansion
-    + (LDBL_MAX_EXP+LDBL_MANT_DIG+28+8)/9; // exponent expansion
-  uint32_t *a, *d, *r, *z;
-  uint32_t i;
-  int e2=0, e, j;
-  ptrdiff_t l;
-  char buf9+LDBL_MANT_DIG/4, *s;
-  const char *prefix="-0X+0X 0X-0x+0x 0x";
-  ptrdiff_t pl;
-  char ebuf03*sizeof(int), *ebuf=&ebuf03*sizeof(int), *estr;
-
-  pl=1;
-  if (signbit(y)) {
-    y=-y;
-  } else if (fl & MARK_POS) {
-    prefix+=3;
-  } else if (fl & PAD_POS) {
-    prefix+=6;
-  } else prefix++, pl=0;
-
-  if (!isfinite(y)) {
-    const char *ss = (t&32)?"inf":"INF";
-    if (y!=y) ss=(t&32)?"nan":"NAN";
-    pad(f, ' ', w, 3+pl, fl&~ZERO_PAD);
-    out(f, prefix, pl);
-    out(f, ss, 3);
-    pad(f, ' ', w, 3+pl, fl^LEFT_ADJ);
-    return (int)MAX(w, 3+pl);
+/*
+ * mrb_format_float(mrb_float f, char *buf, size_t buf_size, char fmt, int prec, char sign)
+ *
+ * fmt: should be one of 'e', 'E', 'f', 'F', 'g', or 'G'. (|0x80 for '#')
+ * prec: is the precision (as specified in printf)
+ * sign: should be '\0', '+', or ' '  ('\0' is the normal one - only print
+ *       a sign if ```f``` is negative. Anything else is printed as the
+ *       sign character for positive numbers.
+ */
+
+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 alt_form = 0;
+
+  if ((uint8_t)fmt & 0x80) {
+    fmt &= 0x7f;  /* turn off alt_form flag */
+    alt_form = 1;
   }
+  if (buf_size <= FLT_MIN_BUF_SIZE) {
+    // Smallest exp notion is -9e+99 (-9e+199) which is 6 (7) chars plus terminating
+    // null.
 
-  y = frexp((double)y, &e2) * 2;
-  if (y) e2--;
-
-  if ((t|32)=='a') {
-    long double round = 8.0;
-    ptrdiff_t re;
-
-    if (t&32) prefix += 9;
-    pl += 2;
+    if (buf_size >= 2) {
+      *s++ = '?';
+    }
+    if (buf_size >= 1) {
+      *s++ = '\0';
+    }
+    return buf_size >= 2;
+  }
+  if (signbit(f)) {
+    *s++ = '-';
+    f = -f;
+  } else if (sign) {
+    *s++ = sign;
+  }
+  buf_remaining -= (s - buf); // Adjust for sign
+
+  {
+    char uc = fmt & 0x20;
+    if (isinf(f)) {
+      *s++ = 'I' ^ uc;
+      *s++ = 'N' ^ uc;
+      *s++ = 'F' ^ uc;
+      goto ret;
+    } else if (isnan(f)) {
+      *s++ = 'N' ^ uc;
+      *s++ = 'A' ^ uc;
+      *s++ = 'N' ^ uc;
+    ret:
+      *s = '\0';
+      return s - buf;
+    }
+  }
 
-    if (p<0 || p>=LDBL_MANT_DIG/4-1) re=0;
-    else re=LDBL_MANT_DIG/4-1-p;
+  if (prec < 0) {
+    prec = 6;
+  }
+  char e_char = 'E' | (fmt & 0x20);   // e_char will match case of fmt
+  fmt |= 0x20; // Force fmt to be lowercase
+  char org_fmt = fmt;
+  if (fmt == 'g' && prec == 0) {
+    prec = 1;
+  }
+  int e, e1;
+  int dec = 0;
+  char e_sign = '\0';
+  int num_digits = 0;
+  const mrb_float *pos_pow = g_pos_pow;
+  const mrb_float *neg_pow = g_neg_pow;
+
+  if (f == 0.0) {
+    e = 0;
+    if (fmt == 'e') {
+      e_sign = '+';
+    } else if (fmt == 'f') {
+      num_digits = prec + 1;
+    }
+  } else if (f < 1.0) { // f < 1.0
+    char first_dig = '0';
+    if (f >= FLT_ROUND_TO_ONE) {
+      first_dig = '1';
+    }
 
-    if (re) {
-      while (re--) round*=16;
-      if (*prefix=='-') {
-        y=-y;
-        y-=round;
-        y+=round;
-        y=-y;
+    // Build negative exponent
+    for (e = 0, e1 = FLT_DECEXP; e1; e1 >>= 1, pos_pow++, neg_pow++) {
+      if (*neg_pow > f) {
+        e += e1;
+        f *= *pos_pow;
       }
-      else {
-        y+=round;
-        y-=round;
+    }
+    char e_sign_char = '-';
+    if (f < 1.0) {
+      if (f >= FLT_ROUND_TO_ONE) {
+        f = 1.0;
+        if (e == 0) {
+          e_sign_char = '+';
+        }
+      } else {
+        e++;
+        f *= 10.0;
       }
     }
 
-    estr=fmt_u(e2<0 ? -e2 : e2, ebuf);
-    if (estr==ebuf) *--estr='0';
-    *--estr = (e2<0 ? '-' : '+');
-    *--estr = t+('p'-'a');
-
-    s=buf;
-    do {
-      int x=(int)y;
-      *s++=xdigitsx|(t&32);
-      y=16*(y-x);
-      if (s-buf==1 && (y||p>0||(fl&ALT_FORM))) *s++='.';
-    } while (y);
-
-    if (p && s-buf-2 < p)
-      l = (p+2) + (ebuf-estr);
-    else
-      l = (s-buf) + (ebuf-estr);
-
-    pad(f, ' ', w, pl+l, fl);
-    out(f, prefix, pl);
-    pad(f, '0', w, pl+l, fl^ZERO_PAD);
-    out(f, buf, s-buf);
-    pad(f, '0', l-(ebuf-estr)-(s-buf), 0, 0);
-    out(f, estr, ebuf-estr);
-    pad(f, ' ', w, pl+l, fl^LEFT_ADJ);
-    return (int)MAX(w, pl+l);
-  }
-  if (p<0) p=6;
+    // If the user specified 'g' format, and e is <= 4, then we'll switch
+    // to the fixed format ('f')
 
-  if (y) y *= 268435456.0, e2-=28;
+    if (fmt == 'f' || (fmt == 'g' && e <= 4)) {
+      fmt = 'f';
+      dec = -1;
+      *s++ = first_dig;
 
-  if (e2<0) a=r=z=big;
-  else a=r=z=big+sizeof(big)/sizeof(*big) - LDBL_MANT_DIG - 1;
-
-  do {
-    *z = (uint32_t)y;
-    y = 1000000000*(y-*z++);
-  } while (y);
-
-  while (e2>0) {
-    uint32_t carry=0;
-    int sh=MIN(29,e2);
-    for (d=z-1; d>=a; d--) {
-      uint64_t x = ((uint64_t)*d<<sh)+carry;
-      *d = x % 1000000000;
-      carry = (uint32_t)(x / 1000000000);
+      if (org_fmt == 'g') {
+        prec += (e - 1);
+      }
+      // truncate precision to prevent buffer overflow
+      if (prec + 2 > buf_remaining) {
+        prec = buf_remaining - 2;
+      }
+      num_digits = prec;
+      if (num_digits || alt_form) {
+        *s++ = '.';
+        while (--e && num_digits) {
+          *s++ = '0';
+          num_digits--;
+        }
+      }
+    } else {
+      // For e & g formats, we'll be printing the exponent, so set the
+      // sign.
+      e_sign = e_sign_char;
+      dec = 0;
+
+      if (prec > (buf_remaining - FLT_MIN_BUF_SIZE)) {
+        prec = buf_remaining - FLT_MIN_BUF_SIZE;
+        if (fmt == 'g') {
+          prec++;
+        }
+      }
     }
-    if (carry) *--a = carry;
-    while (z>a && !z-1) z--;
-    e2-=sh;
-  }
-  while (e2<0) {
-    uint32_t carry=0, *b;
-    int sh=MIN(9,-e2), need=1+((int)p+LDBL_MANT_DIG/3+8)/9;
-    for (d=a; d<z; d++) {
-      uint32_t rm = *d & ((1<<sh)-1);
-      *d = (*d>>sh) + carry;
-      carry = (1000000000>>sh) * rm;
+  } else {
+    // Build positive exponent
+    for (e = 0, e1 = FLT_DECEXP; e1; e1 >>= 1, pos_pow++, neg_pow++) {
+      if (*pos_pow <= f) {
+        e += e1;
+        f *= *neg_pow;
+      }
     }
-    if (!*a) a++;
-    if (carry) *z++ = carry;
-    /* Avoid (slow!) computation past requested precision */
-    b = (t|32)=='f' ? r : a;
-    if (z-b > need) z = b+need;
-    e2+=sh;
-  }
 
-  if (a<z) for (i=10, e=9*(int)(r-a); *a>=i; i*=10, e++);
-  else e=0;
-
-  /* Perform rounding: j is precision after the radix (possibly neg) */
-  j = (int)p - ((t|32)!='f')*e - ((t|32)=='g' && p);
-  if (j < 9*(z-r-1)) {
-    uint32_t x;
-    /* We avoid C's broken division of negative numbers */
-    d = r + 1 + ((j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP);
-    j += 9*LDBL_MAX_EXP;
-    j %= 9;
-    for (i=10, j++; j<9; i*=10, j++);
-    x = *d % i;
-    /* Are there any significant digits past j? */
-    if (x || d+1!=z) {
-      long double round = 2/LDBL_EPSILON;
-      long double small;
-      if (*d/i & 1) round += 2;
-      if (x<i/2) small=0.5;
-      else if (x==i/2 && d+1==z) small=1.0;
-      else small=1.5;
-      if (pl && *prefix=='-') round*=-1, small*=-1;
-      *d -= x;
-      /* Decide whether to round by probing round+small */
-      if (round+small != round) {
-        *d = *d + i;
-        while (*d > 999999999) {
-          *d--=0;
-          if (d<a) *--a=0;
-          (*d)++;
+    // If the user specified fixed format (fmt == 'f') and e makes the
+    // number too big to fit into the available buffer, then we'll
+    // switch to the 'e' format.
+
+    if (fmt == 'f') {
+      if (e >= buf_remaining) {
+        fmt = 'e';
+      } else if ((e + prec + 2) > buf_remaining) {
+        prec = buf_remaining - e - 2;
+        if (prec < 0) {
+          // This means no decimal point, so we can add one back
+          // for the decimal.
+          prec++;
         }
-        for (i=10, e=9*(int)(r-a); *a>=i; i*=10, e++);
       }
     }
-    if (z>d+1) z=d+1;
-  }
-  for (; z>a && !z-1; z--);
-
-  if ((t|32)=='g') {
-    if (!p) p++;
-    if (p>e && e>=-4) {
-      t--;
-      p-=e+1;
-    }
-    else {
-      t-=2;
-      p--;
+    if (fmt == 'e' && prec > (buf_remaining - 6)) {
+      prec = buf_remaining - 6;
     }
-    if (!(fl&ALT_FORM)) {
-      /* Count trailing zeros in last place */
-      if (z>a && z-1) for (i=10, j=0; z-1%i==0; i*=10, j++);
-      else j=9;
-      if ((t|32)=='f')
-        p = MIN(p,MAX(0,9*(z-r-1)-j));
-      else
-        p = MIN(p,MAX(0,9*(z-r-1)+e-j));
-    }
-  }
-  l = 1 + p + (p || (fl&ALT_FORM));
-  if ((t|32)=='f') {
-    if (e>0) l+=e;
-  }
-  else {
-    estr=fmt_u(e<0 ? -e : e, ebuf);
-    while(ebuf-estr<2) *--estr='0';
-    *--estr = (e<0 ? '-' : '+');
-    *--estr = t;
-    l += ebuf-estr;
-  }
+    // If the user specified 'g' format, and e is < prec, then we'll switch
+    // to the fixed format.
 
-  pad(f, ' ', w, pl+l, fl);
-  out(f, prefix, pl);
-  pad(f, '0', w, pl+l, fl^ZERO_PAD);
-
-  if ((t|32)=='f') {
-    if (a>r) a=r;
-    for (d=a; d<=r; d++) {
-      char *ss = fmt_u(*d, buf+9);
-      if (d!=a) while (ss>buf) *--ss='0';
-      else if (ss==buf+9) *--ss='0';
-      out(f, ss, buf+9-ss);
+    if (fmt == 'g' && e < prec) {
+      fmt = 'f';
+      prec -= (e + 1);
     }
-    if (p || (fl&ALT_FORM)) out(f, ".", 1);
-    for (; d<z && p>0; d++, p-=9) {
-      char *ss = fmt_u(*d, buf+9);
-      while (ss>buf) *--ss='0';
-      out(f, ss, MIN(9,p));
+    if (fmt == 'f') {
+      dec = e;
+      num_digits = prec + e + 1;
+    } else {
+      e_sign = '+';
     }
-    pad(f, '0', p+9, 9, 0);
   }
-  else {
-    if (z<=a) z=a+1;
-    for (d=a; d<z && p>=0; d++) {
-      char *ss = fmt_u(*d, buf+9);
-      if (ss==buf+9) *--ss='0';
-      if (d!=a) while (ss>buf) *--ss='0';
-      else {
-        out(f, ss++, 1);
-        if (p>0||(fl&ALT_FORM)) out(f, ".", 1);
-      }
-      out(f, ss, MIN(buf+9-ss, p));
-      p -= (int)(buf+9-ss);
-    }
-    pad(f, '0', p+18, 18, 0);
-    out(f, estr, ebuf-estr);
+  if (prec < 0) {
+    // This can happen when the prec is trimmed to prevent buffer overflow
+    prec = 0;
   }
 
-  pad(f, ' ', w, pl+l, fl^LEFT_ADJ);
-
-  return (int)MAX(w, pl+l);
-}
-
-static int
-fmt_core(struct fmt_args *f, const char *fmt, mrb_float flo)
-{
-  ptrdiff_t w, p;
-  uint32_t fl;
-
-  if (*fmt != '%') {
-    return -1;
-  }
-  ++fmt;
-
-  /* Read modifier flags */
-  for (fl=0; (unsigned)*fmt-' '<32 && (FLAGMASK&(1U<<(*fmt-' '))); fmt++)
-    fl |= 1U<<(*fmt-' ');
-
-  /* - and 0 flags are mutually exclusive */
-  if (fl & LEFT_ADJ) fl &= ~ZERO_PAD;
-
-  for (w = 0; ISDIGIT(*fmt); ++fmt) {
-    w = 10 * w + (*fmt - '0');
+  // 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.
+
+  // For e, prec is # digits after the decimal
+  // For f, prec is # digits after the decimal
+  // For g, prec is the max number of significant digits
+  //
+  // For e & g there will be a single digit before the decimal
+  // for f there will be e digits before the decimal
+
+  if (fmt == 'e') {
+    num_digits = prec + 1;
+  } else if (fmt == 'g') {
+    if (prec == 0) {
+      prec = 1;
+    }
+    num_digits = prec;
   }
 
-  if (*fmt == '.') {
-    ++fmt;
-    for (p = 0; ISDIGIT(*fmt); ++fmt) {
-      p = 10 * p + (*fmt - '0');
+  // Print the digits of the mantissa
+  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)) {
+      *s++ = '.';
     }
-  }
-  else {
-    p = -1;
+    f -= (mrb_float)d;
+    f *= 10.0;
   }
 
-  switch (*fmt) {
-  case 'e': case 'f': case 'g': case 'a':
-  case 'E': case 'F': case 'G': case 'A':
-    return fmt_fp(f, flo, w, p, fl, *fmt);
-  default:
-    return -1;
+  // Round
+  if (f >= 5.0) {
+    char *rs = s;
+    rs--;
+    while (1) {
+      if (*rs == '.') {
+        rs--;
+        continue;
+      }
+      if (*rs < '0' || *rs > '9') {
+        // + or -
+        rs++; // So we sit on the digit to the right of the sign
+        break;
+      }
+      if (*rs < '9') {
+        (*rs)++;
+        break;
+      }
+      *rs = '0';
+      if (rs == buf) {
+        break;
+      }
+      rs--;
+    }
+    if (*rs == '0') {
+      // We need to insert a 1
+      if (rs1 == '.' && fmt != 'f') {
+        // We're going to round 9.99 to 10.00
+        // Move the decimal point
+        rs0 = '.';
+        rs1 = '0';
+        if (e_sign == '-') {
+          e--;
+        } else {
+          e++;
+        }
+      }
+      s++;
+      char *ss = s;
+      while (ss > rs) {
+        *ss = ss-1;
+        ss--;
+      }
+      *rs = '1';
+      if (f < 1.0 && fmt == 'f') {
+        // We rounded up to 1.0
+        prec--;
+      }
+    }
   }
-}
 
-MRB_API mrb_value
-mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
-{
-  struct fmt_args f;
-  mrb_value str = mrb_str_new_capa(mrb, 24);
-
-  f.mrb = mrb;
-  f.output = strcat_value;
-  f.opaque = (void*)&str;
-  if (fmt_core(&f, fmt, mrb_float(flo)) < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid format string");
+  if (org_fmt == 'g' && prec > 0 && !alt_form) {
+    // Remove trailing zeros and a trailing decimal point
+    while (s-1 == '0') {
+      s--;
+    }
+    if (s-1 == '.') {
+      s--;
+    }
   }
-  return str;
-}
-
-MRB_API int
-mrb_float_to_cstr(mrb_state *mrb, char *buf, size_t len, const char *fmt, mrb_float fval)
-{
-  struct fmt_args f;
-  struct mrb_cstr cstr;
-
-  cstr.buf = buf;
-  cstr.len = len - 1; /* reserve NUL terminator */
-  f.mrb = mrb;
-  f.output = strcat_cstr;
-  f.opaque = (void*)&cstr;
-  if (fmt_core(&f, fmt, fval) < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid format string");
+  // Append the exponent
+  if (e_sign) {
+    *s++ = e_char;
+    *s++ = e_sign;
+    if (e >= 100) {
+      *s++ = '0' + (e / 100);
+      e %= 100;
+    }
+    *s++ = '0' + (e / 10);
+    *s++ = '0' + (e % 10);
   }
-  *cstr.buf = '\0';
-  return (int)(cstr.buf - buf);
-}
-#else   /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */
-#include <mruby.h>
-#include <stdio.h>
-
-MRB_API mrb_value
-mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
-{
-  char buf25;
-
-  snprintf(buf, sizeof(buf), fmt, mrb_float(flo));
-  return mrb_str_new_cstr(mrb, buf);
-}
+  *s = '\0';
 
-MRB_API int
-mrb_float_to_cstr(mrb_state *mrb, char *buf, size_t len, const char *fmt, mrb_float fval)
-{
-  return snprintf(buf, len, fmt, fval);
+  return s - buf;
 }
-#endif  /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */
 #endif

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

@@ -5,7 +5,9 @@
 */
 
 #include <string.h>
-#include <stdlib.h>
+#ifdef MRB_USE_MALLOC_TRIM
+#include <malloc.h>
+#endif
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/class.h>
@@ -19,6 +21,11 @@
 #include <mruby/gc.h>
 #include <mruby/error.h>
 #include <mruby/throw.h>
+#include <mruby/presym.h>
+
+#ifdef MRB_GC_STRESS
+#include <stdlib.h>
+#endif
 
 /*
   = Tri-color Incremental Garbage Collection
@@ -35,9 +42,14 @@
     * Gray - Marked, But the child objects are unmarked.
     * Black - Marked, the child objects are also marked.
 
+  Extra color
+
+    * Red - Static (ROM object) no need to be collected.
+          - All child objects should be Red as well.
+
   == Two White Types
 
-  There're two white color types in a flip-flop fashion: White-A and White-B,
+  There are two white color types in a flip-flop fashion: White-A and White-B,
   which respectively represent the Current White color (the newly allocated
   objects in the current GC cycle) and the Sweep Target White color (the
   dead objects to be swept).
@@ -99,8 +111,14 @@
   struct RBasic *next;
 };
 
+struct RVALUE_initializer {
+  MRB_OBJECT_HEADER;
+  char paddingsizeof(void*) * 4 - sizeof(uint32_t);
+};
+
 typedef struct {
   union {
+    struct RVALUE_initializer init;  /* must be first member to ensure initialization */
     struct free_obj free;
     struct RBasic basic;
     struct RObject object;
@@ -116,12 +134,6 @@
     struct RFiber fiber;
     struct RException exc;
     struct RBreak brk;
-#ifdef MRB_WORD_BOXING
-#ifndef MRB_WITHOUT_FLOAT
-    struct RFloat floatv;
-#endif
-    struct RCptr cptr;
-#endif
   } as;
 } RVALUE;
 
@@ -185,8 +197,10 @@
 #define GC_WHITE_A 1
 #define GC_WHITE_B (1 << 1)
 #define GC_BLACK (1 << 2)
+#define GC_RED MRB_GC_RED
 #define GC_WHITES (GC_WHITE_A | GC_WHITE_B)
 #define GC_COLOR_MASK 7
+mrb_static_assert(MRB_GC_RED <= GC_COLOR_MASK);
 
 #define paint_gray(o) ((o)->color = GC_GRAY)
 #define paint_black(o) ((o)->color = GC_BLACK)
@@ -194,7 +208,8 @@
 #define paint_partial_white(s, o) ((o)->color = (s)->current_white_part)
 #define is_gray(o) ((o)->color == GC_GRAY)
 #define is_white(o) ((o)->color & GC_WHITES)
-#define is_black(o) ((o)->color & GC_BLACK)
+#define is_black(o) ((o)->color == GC_BLACK)
+#define is_red(o) ((o)->color == GC_RED)
 #define flip_white_part(s) ((s)->current_white_part = other_white_part(s))
 #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)
@@ -225,14 +240,8 @@
   p2 = mrb_realloc_simple(mrb, p, len);
   if (len == 0) return p2;
   if (p2 == NULL) {
-    if (mrb->gc.out_of_memory) {
-      mrb_raise_nomemory(mrb);
-      /* mrb_panic(mrb); */
-    }
-    else {
-      mrb->gc.out_of_memory = TRUE;
-      mrb_raise_nomemory(mrb);
-    }
+    mrb->gc.out_of_memory = TRUE;
+    mrb_raise_nomemory(mrb);
   }
   else {
     mrb->gc.out_of_memory = FALSE;
@@ -283,7 +292,7 @@
 mrb_alloca(mrb_state *mrb, size_t size)
 {
   struct RString *s;
-  s = (struct RString*)mrb_obj_alloc(mrb, MRB_TT_STRING, mrb->string_class);
+  s = MRB_OBJ_ALLOC(mrb, MRB_TT_STRING, mrb->string_class);
   return s->as.heap.ptr = (char*)mrb_malloc(mrb, size);
 }
 
@@ -463,7 +472,7 @@
   gc_protect(mrb, &mrb->gc, mrb_basic_ptr(obj));
 }
 
-#define GC_ROOT_NAME "_gc_root_"
+#define GC_ROOT_SYM MRB_SYM(_gc_root_)
 
 /* mrb_gc_register() keeps the object from GC.
 
@@ -480,7 +489,7 @@
   mrb_value table;
 
   if (mrb_immediate_p(obj)) return;
-  root = mrb_intern_lit(mrb, GC_ROOT_NAME);
+  root = GC_ROOT_SYM;
   table = mrb_gv_get(mrb, root);
   if (mrb_nil_p(table) || !mrb_array_p(table)) {
     table = mrb_ary_new(mrb);
@@ -499,7 +508,7 @@
   mrb_int i;
 
   if (mrb_immediate_p(obj)) return;
-  root = mrb_intern_lit(mrb, GC_ROOT_NAME);
+  root = GC_ROOT_SYM;
   table = mrb_gv_get(mrb, root);
   if (mrb_nil_p(table)) return;
   if (!mrb_array_p(table)) {
@@ -548,6 +557,9 @@
       mrb_raisef(mrb, E_TYPE_ERROR, "allocation failure of %C", cls);
     }
   }
+  if (ttype <= MRB_TT_FREE) {
+    mrb_raisef(mrb, E_TYPE_ERROR, "allocation failure of %C (type %d)", cls, (int)ttype);
+  }
 
 #ifdef MRB_GC_STRESS
   mrb_full_gc(mrb);
@@ -587,27 +599,7 @@
   gc->gray_list = obj;
 }
 
-static int
-ci_nregs(mrb_callinfo *ci)
-{
-  struct RProc *p = ci->proc;
-  int n = 0;
-
-  if (!p) {
-    if (ci->argc < 0) return 3;
-    return ci->argc+2;
-  }
-  if (!MRB_PROC_CFUNC_P(p) && p->body.irep) {
-    n = p->body.irep->nregs;
-  }
-  if (ci->argc < 0) {
-    if (n < 3) n = 3; /* self + args + blk */
-  }
-  if (ci->argc > n) {
-    n = ci->argc + 2; /* self + blk */
-  }
-  return n;
-}
+mrb_int mrb_ci_nregs(mrb_callinfo *ci);
 
 static void
 mark_context_stack(mrb_state *mrb, struct mrb_context *c)
@@ -616,10 +608,13 @@
   size_t e;
   mrb_value nil;
 
-  if (c->stack == NULL) return;
-  e = c->stack - c->stbase;
+  if (c->stbase == NULL) return;
   if (c->ci) {
-    e += ci_nregs(c->ci);
+    e = (c->ci->stack ? c->ci->stack - c->stbase : 0);
+    e += mrb_ci_nregs(c->ci);
+  }
+  else {
+    e = 0;
   }
   if (c->stbase + e > c->stend) e = c->stend - c->stbase;
   for (i=0; i<e; i++) {
@@ -639,7 +634,6 @@
 static void
 mark_context(mrb_state *mrb, struct mrb_context *c)
 {
-  int i;
   mrb_callinfo *ci;
 
  start:
@@ -651,15 +645,10 @@
   /* mark call stack */
   if (c->cibase) {
     for (ci = c->cibase; ci <= c->ci; ci++) {
-      mrb_gc_mark(mrb, (struct RBasic*)ci->env);
       mrb_gc_mark(mrb, (struct RBasic*)ci->proc);
-      mrb_gc_mark(mrb, (struct RBasic*)ci->target_class);
+      mrb_gc_mark(mrb, (struct RBasic*)ci->u.target_class);
     }
   }
-  /* mark ensure stack */
-  for (i=0; i<c->eidx; i++) {
-    mrb_gc_mark(mrb, (struct RBasic*)c->ensurei);
-  }
   /* mark fibers */
   mrb_gc_mark(mrb, (struct RBasic*)c->fib);
   if (c->prev) {
@@ -673,7 +662,6 @@
 {
   mrb_assert(is_gray(obj));
   paint_black(obj);
-  gc->gray_list = obj->gcnext;
   mrb_gc_mark(mrb, (struct RBasic*)obj->c);
   switch (obj->tt) {
   case MRB_TT_ICLASS:
@@ -698,7 +686,6 @@
 
   case MRB_TT_OBJECT:
   case MRB_TT_DATA:
-  case MRB_TT_EXCEPTION:
     mrb_gc_mark_iv(mrb, (struct RObject*)obj);
     break;
 
@@ -734,13 +721,15 @@
     }
     break;
 
+  case MRB_TT_STRUCT:
   case MRB_TT_ARRAY:
     {
       struct RArray *a = (struct RArray*)obj;
-      size_t i, e;
+      size_t i, e=ARY_LEN(a);
+      mrb_value *p = ARY_PTR(a);
 
-      for (i=0,e=ARY_LEN(a); i<e; i++) {
-        mrb_gc_mark_value(mrb, ARY_PTR(a)i);
+      for (i=0; i<e; i++) {
+        mrb_gc_mark_value(mrb, pi);
       }
     }
     break;
@@ -761,6 +750,21 @@
     mrb_gc_mark_range(mrb, (struct RRange*)obj);
     break;
 
+  case MRB_TT_BREAK:
+    {
+      struct RBreak *brk = (struct RBreak*)obj;
+      mrb_gc_mark(mrb, (struct RBasic*)mrb_break_proc_get(brk));
+      mrb_gc_mark_value(mrb, mrb_break_value_get(brk));
+    }
+    break;
+
+  case MRB_TT_EXCEPTION:
+    mrb_gc_mark_iv(mrb, (struct RObject*)obj);
+    if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) {
+      mrb_gc_mark(mrb, (struct RBasic*)((struct RException*)obj)->mesg);
+    }
+    break;
+
   default:
     break;
   }
@@ -771,6 +775,7 @@
 {
   if (obj == 0) return;
   if (!is_white(obj)) return;
+  if (is_red(obj)) return;
   mrb_assert((obj)->tt != MRB_TT_FREE);
   add_gray_list(mrb, &mrb->gc, obj);
 }
@@ -780,22 +785,6 @@
 {
   DEBUG(fprintf(stderr, "obj_free(%p,tt=%d)\n",obj,obj->tt));
   switch (obj->tt) {
-    /* immediate - no mark */
-  case MRB_TT_TRUE:
-  case MRB_TT_FIXNUM:
-  case MRB_TT_SYMBOL:
-    /* cannot happen */
-    return;
-
-#ifndef MRB_WITHOUT_FLOAT
-  case MRB_TT_FLOAT:
-#ifdef MRB_WORD_BOXING
-    break;
-#else
-    return;
-#endif
-#endif
-
   case MRB_TT_OBJECT:
     mrb_gc_free_iv(mrb, (struct RObject*)obj);
     break;
@@ -809,12 +798,14 @@
   case MRB_TT_SCLASS:
     mrb_gc_free_mt(mrb, (struct RClass*)obj);
     mrb_gc_free_iv(mrb, (struct RObject*)obj);
-    mrb_mc_clear_by_class(mrb, (struct RClass*)obj);
+    if (!end)
+      mrb_mc_clear_by_class(mrb, (struct RClass*)obj);
     break;
   case MRB_TT_ICLASS:
     if (MRB_FLAG_TEST(obj, MRB_FL_CLASS_IS_ORIGIN))
       mrb_gc_free_mt(mrb, (struct RClass*)obj);
-    mrb_mc_clear_by_class(mrb, (struct RClass*)obj);
+    if (!end)
+      mrb_mc_clear_by_class(mrb, (struct RClass*)obj);
     break;
   case MRB_TT_ENV:
     {
@@ -840,7 +831,7 @@
           mrb_callinfo *ce = c->cibase;
 
           while (ce <= ci) {
-            struct REnv *e = ci->env;
+            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);
@@ -853,6 +844,7 @@
     }
     break;
 
+  case MRB_TT_STRUCT:
   case MRB_TT_ARRAY:
     if (ARY_SHARED_P(obj))
       mrb_ary_decref(mrb, ((struct RArray*)obj)->as.heap.aux.shared);
@@ -874,7 +866,7 @@
       struct RProc *p = (struct RProc*)obj;
 
       if (!MRB_PROC_CFUNC_P(p) && p->body.irep) {
-        mrb_irep *irep = p->body.irep;
+        mrb_irep *irep = (mrb_irep*)p->body.irep;
         if (end) {
           mrb_irep_cutref(mrb, irep);
         }
@@ -897,6 +889,24 @@
     }
     break;
 
+#if defined(MRB_USE_RATIONAL) && defined(MRB_INT64) && defined(MRB_32BIT)
+  case MRB_TT_RATIONAL:
+    {
+      struct RData *o = (struct RData*)obj;
+      mrb_free(mrb, o->iv);
+    }
+    break;
+#endif
+
+#if defined(MRB_USE_COMPLEX) && defined(MRB_32BIT) && !defined(MRB_USE_FLOAT32)
+  case MRB_TT_COMPLEX:
+    {
+      struct RData *o = (struct RData*)obj;
+      mrb_free(mrb, o->iv);
+    }
+    break;
+#endif
+
   default:
     break;
   }
@@ -930,10 +940,10 @@
   mrb_gc_mark(mrb, (struct RBasic*)mrb->hash_class);
   mrb_gc_mark(mrb, (struct RBasic*)mrb->range_class);
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   mrb_gc_mark(mrb, (struct RBasic*)mrb->float_class);
 #endif
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->fixnum_class);
+  mrb_gc_mark(mrb, (struct RBasic*)mrb->integer_class);
   mrb_gc_mark(mrb, (struct RBasic*)mrb->true_class);
   mrb_gc_mark(mrb, (struct RBasic*)mrb->false_class);
   mrb_gc_mark(mrb, (struct RBasic*)mrb->nil_class);
@@ -985,7 +995,6 @@
 
   case MRB_TT_OBJECT:
   case MRB_TT_DATA:
-  case MRB_TT_EXCEPTION:
     children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
     break;
 
@@ -1002,17 +1011,14 @@
       if (!c || c->status == MRB_FIBER_TERMINATED) break;
 
       /* mark stack */
-      i = c->stack - c->stbase;
+      i = c->ci->stack - c->stbase;
 
       if (c->ci) {
-        i += ci_nregs(c->ci);
+        i += mrb_ci_nregs(c->ci);
       }
       if (c->stbase + i > c->stend) i = c->stend - c->stbase;
       children += i;
 
-      /* mark ensure stack */
-      children += c->eidx;
-
       /* mark closure */
       if (c->cibase) {
         for (i=0, ci = c->cibase; ci <= c->ci; i++, ci++)
@@ -1022,6 +1028,7 @@
     }
     break;
 
+  case MRB_TT_STRUCT:
   case MRB_TT_ARRAY:
     {
       struct RArray *a = (struct RArray*)obj;
@@ -1036,9 +1043,17 @@
 
   case MRB_TT_PROC:
   case MRB_TT_RANGE:
+  case MRB_TT_BREAK:
     children+=2;
     break;
 
+  case MRB_TT_EXCEPTION:
+    children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
+    if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) {
+      children++;
+    }
+    break;
+
   default:
     break;
   }
@@ -1049,10 +1064,9 @@
 static void
 gc_mark_gray_list(mrb_state *mrb, mrb_gc *gc) {
   while (gc->gray_list) {
-    if (is_gray(gc->gray_list))
-      gc_mark_children(mrb, gc, gc->gray_list);
-    else
-      gc->gray_list = gc->gray_list->gcnext;
+    struct RBasic *obj = gc->gray_list;
+    gc->gray_list = obj->gcnext;
+    gc_mark_children(mrb, gc, obj);
   }
 }
 
@@ -1064,6 +1078,7 @@
 
   while (gc->gray_list && tried_marks < limit) {
     struct RBasic *obj = gc->gray_list;
+    gc->gray_list = obj->gcnext;
     gc_mark_children(mrb, gc, obj);
     tried_marks += gc_gray_counts(mrb, gc, obj);
   }
@@ -1082,7 +1097,9 @@
   }
   mrb_gc_mark_gv(mrb);
   mark_context(mrb, mrb->c);
-  mark_context(mrb, mrb->root_c);
+  if (mrb->c != mrb->root_c) {
+    mark_context(mrb, mrb->root_c);
+  }
   mrb_gc_mark(mrb, (struct RBasic*)mrb->exc);
   gc_mark_gray_list(mrb, gc);
   mrb_assert(gc->gray_list == NULL);
@@ -1321,6 +1338,9 @@
     gc->full = FALSE;
   }
 
+#ifdef MRB_USE_MALLOC_TRIM
+  malloc_trim(0);
+#endif
   GC_TIME_STOP_AND_REPORT;
 }
 
@@ -1440,7 +1460,7 @@
 
 /*
  *  call-seq:
- *     GC.interval_ratio      -> fixnum
+ *     GC.interval_ratio      -> int
  *
  *  Returns ratio of GC interval. Default value is 200(%).
  *
@@ -1449,12 +1469,12 @@
 static mrb_value
 gc_interval_ratio_get(mrb_state *mrb, mrb_value obj)
 {
-  return mrb_fixnum_value(mrb->gc.interval_ratio);
+  return mrb_int_value(mrb, mrb->gc.interval_ratio);
 }
 
 /*
  *  call-seq:
- *     GC.interval_ratio = fixnum    -> nil
+ *     GC.interval_ratio = int    -> nil
  *
  *  Updates ratio of GC interval. Default value is 200(%).
  *  GC start as soon as after end all step of GC if you set 100(%).
@@ -1473,7 +1493,7 @@
 
 /*
  *  call-seq:
- *     GC.step_ratio    -> fixnum
+ *     GC.step_ratio    -> int
  *
  *  Returns step span ratio of Incremental GC. Default value is 200(%).
  *
@@ -1482,12 +1502,12 @@
 static mrb_value
 gc_step_ratio_get(mrb_state *mrb, mrb_value obj)
 {
-  return mrb_fixnum_value(mrb->gc.step_ratio);
+  return mrb_int_value(mrb, mrb->gc.step_ratio);
 }
 
 /*
  *  call-seq:
- *     GC.step_ratio = fixnum   -> nil
+ *     GC.step_ratio = int   -> nil
  *
  *  Updates step span ratio of Incremental GC. Default value is 200(%).
  *  1 step of incrementalGC becomes long if a rate is big.
@@ -1605,11 +1625,12 @@
   }
 }
 
-#ifdef GC_TEST
-#ifdef GC_DEBUG
-static mrb_value gc_test(mrb_state *, mrb_value);
-#endif
-#endif
+size_t
+mrb_objspace_page_slot_size(void)
+{
+  return sizeof(RVALUE);
+}
+
 
 void
 mrb_init_gc(mrb_state *mrb)
@@ -1630,9 +1651,4 @@
   mrb_define_class_method(mrb, gc, "step_ratio=", gc_step_ratio_set, MRB_ARGS_REQ(1));
   mrb_define_class_method(mrb, gc, "generational_mode=", gc_generational_mode_set, MRB_ARGS_REQ(1));
   mrb_define_class_method(mrb, gc, "generational_mode", gc_generational_mode_get, MRB_ARGS_NONE());
-#ifdef GC_TEST
-#ifdef GC_DEBUG
-  mrb_define_class_method(mrb, gc, "test", gc_test, MRB_ARGS_NONE());
-#endif
-#endif
 }

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

@@ -4,88 +4,357 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <string.h>
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/class.h>
 #include <mruby/hash.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/presym.h>
 
-#ifndef MRB_WITHOUT_FLOAT
-/* a function to get hash value of a float number */
-mrb_int mrb_float_id(mrb_float f);
+/*
+ * === Glossary
+ *
+ * EA
+ *   Entry Array. Store `Hash' entries in insertion order.
+ *
+ * AR
+ *   Array Table Implementation. The structure of `Hash` that doesn't have a
+ *   hash table and linearly searches EA. It is used when `Hash` size <= 16.
+ *
+ * IB
+ *   Index Buckets. The buckets of hash table, where the bucket value is EA
+ *   index. The index is represented by variable length bits according to
+ *   the capacity.
+ *
+ * HT
+ *   Hash Table Implementation. The structure of `Hash` that has IB and is
+ *   searched by hash table algorithm. It is used when `Hash` size > 16.
+ *   Collision resolution strategy is open addressing method.
+ *
+ * size
+ *   The number of `Hash` entries (value of `Hash#size`).
+ *
+ * slot
+ *   The generic term for EA or IB elements.
+ *
+ * active
+ *   The state in which a slot is recognized as a `Hash` entry.
+ *
+ * deleted
+ *   The state in which a slot is marked as deleted.
+ *
+ * used
+ *   The state in which a slot is active or deleted.
+ *
+ * empty
+ *   The state in which a slot is not used. Capacity is equal to the sum of
+ *   the number of used slots and the number of empty slots.
+ */
+
+#define EA_N_RESERVED_INDICES 2  /* empty and deleted */
+#define EA_INCREASE_RATIO 6 / 5 + 6
+#define EA_MAX_INCREASE UINT16_MAX
+#define EA_MAX_CAPA U32(lesser(IB_MAX_CAPA - EA_N_RESERVED_INDICES, MRB_INT_MAX))
+#define IB_MAX_CAPA (U32(1) << IB_MAX_BIT)
+#define IB_TYPE_BIT 32
+#define IB_INIT_BIT (                                                         \
+  ib_upper_bound_for(32) <= AR_MAX_SIZE ? 6 :                                 \
+  ib_upper_bound_for(16) <= AR_MAX_SIZE ? 5 :                                 \
+  4                                                                           \
+)
+#define IB_MAX_BIT (IB_TYPE_BIT - 1)
+#define AR_DEFAULT_CAPA 4
+#define AR_MAX_SIZE 16
+#define H_MAX_SIZE EA_MAX_CAPA
+
+mrb_static_assert(offsetof(struct RHash, iv) == offsetof(struct RObject, iv));
+mrb_static_assert(AR_MAX_SIZE < (1 << MRB_HASH_AR_EA_CAPA_BIT));
+
+typedef struct hash_entry {
+  mrb_value key;
+  mrb_value val;
+} hash_entry;
+
+typedef struct hash_table {
+  hash_entry *ea;
+#ifdef MRB_32BIT
+  uint32_t ea_capa;
+  uint32_t ea_n_used;
+#endif
+  uint32_t ib;
+} hash_table;
+
+typedef struct index_buckets_iter {
+  struct RHash *h;
+  uint32_t bit;
+  uint32_t mask;
+  uint32_t pos;
+  uint32_t ary_index;
+  uint32_t ea_index;
+  uint32_t shift1;
+  uint32_t shift2;
+  uint32_t step;
+} index_buckets_iter;
+
+/*
+ * `c_` :: receiver class (category)
+ * `n_` :: attribute name
+ * `t_` :: attribute type
+ * `p_` :: struct member path
+ * `k_` :: macro key
+ */
+#define DEFINE_GETTER(c_, n_, t_, p_)                                         \
+  MRB_INLINE t_ c_##_##n_(const struct RHash *h) {return h->p_;}
+#define DEFINE_SETTER(c_, n_, t_, p_)                                         \
+  MRB_INLINE void c_##_set_##n_(struct RHash *h, t_ v) {h->p_ = v;}
+#define DEFINE_ACCESSOR(c_, n_, t_, p_)                                       \
+  DEFINE_GETTER(c_, n_, t_, p_)                                               \
+  DEFINE_SETTER(c_, n_, t_, p_)
+#define DEFINE_FLAG_GETTER(c_, n_, t_, k_)                                    \
+  MRB_INLINE t_ c_##_##n_(const struct RHash *h) {                            \
+    return (t_)((h->flags & MRB_HASH_##k_##_MASK) >> MRB_HASH_##k_##_SHIFT);  \
+  }
+#define DEFINE_FLAG_SETTER(c_, n_, t_, k_)                                    \
+  MRB_INLINE void c_##_set_##n_(struct RHash *h, t_ v) {                      \
+    h->flags &= ~MRB_HASH_##k_##_MASK;                                        \
+    h->flags |= v << MRB_HASH_##k_##_SHIFT;                                   \
+  }
+#define DEFINE_FLAG_ACCESSOR(c_, n_, t_, k_)                                  \
+  DEFINE_FLAG_GETTER(c_, n_, t_, k_)                                          \
+  DEFINE_FLAG_SETTER(c_, n_, t_, k_)
+#define DEFINE_INCREMENTER(c_, n_)                                            \
+  MRB_INLINE void c_##_inc_##n_(struct RHash *h) {                            \
+    c_##_set_##n_(h, c_##_##n_(h) + 1);                                       \
+  }
+#define DEFINE_DECREMENTER(c_, n_)                                            \
+  MRB_INLINE void c_##_dec_##n_(struct RHash *h) {                            \
+    c_##_set_##n_(h, c_##_##n_(h) - 1);                                       \
+  }
+#define DEFINE_SWITCHER(n_, k_)                                               \
+  MRB_INLINE void h_##n_##_on(struct RHash *h) {                              \
+    h->flags |= MRB_HASH_##k_;                                                \
+  }                                                                           \
+  MRB_INLINE void h_##n_##_off(struct RHash *h) {                             \
+    h->flags &= ~MRB_HASH_##k_;                                               \
+  }                                                                           \
+  MRB_INLINE mrb_bool h_##n_##_p(const struct RHash *h) {                     \
+    return (h->flags & MRB_HASH_##k_) == MRB_HASH_##k_;                       \
+  }
+
+#ifdef MRB_64BIT
+DEFINE_ACCESSOR(ar, ea_capa, uint32_t, ea_capa)
+DEFINE_ACCESSOR(ar, ea_n_used, uint32_t, ea_n_used)
+DEFINE_ACCESSOR(ht, ea_capa, uint32_t, ea_capa)
+DEFINE_ACCESSOR(ht, ea_n_used, uint32_t, ea_n_used)
+#else
+DEFINE_FLAG_ACCESSOR(ar, ea_capa, uint32_t, AR_EA_CAPA)
+DEFINE_FLAG_ACCESSOR(ar, ea_n_used, uint32_t, AR_EA_N_USED)
+DEFINE_ACCESSOR(ht, ea_capa, uint32_t, hsh.ht->ea_capa)
+DEFINE_ACCESSOR(ht, ea_n_used, uint32_t, hsh.ht->ea_n_used)
 #endif
+DEFINE_FLAG_ACCESSOR(ib, bit, uint32_t, IB_BIT)
+DEFINE_ACCESSOR(ar, size, uint32_t, size)
+DEFINE_ACCESSOR(ar, ea, hash_entry*, hsh.ea)
+DEFINE_DECREMENTER(ar, size)
+DEFINE_ACCESSOR(ht, size, uint32_t, size)
+DEFINE_ACCESSOR(ht, ea, hash_entry*, hsh.ht->ea)
+DEFINE_GETTER(ht, ib, uint32_t*, hsh.ht->ib)
+DEFINE_INCREMENTER(ht, size)
+DEFINE_DECREMENTER(ht, size)
+DEFINE_GETTER(h, size, uint32_t, size)
+DEFINE_ACCESSOR(h, ht, hash_table*, hsh.ht)
+DEFINE_SWITCHER(ht, HT)
+
+#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) {                                 \
+    code;                                                                     \
+  }                                                                           \
+} while (0)
+
+#define ea_each(ea, size, entry_var, code) do {                               \
+  hash_entry *entry_var = ea;                                                 \
+  uint32_t size__ = size;                                                     \
+  for (; 0 < size__; ++entry_var) {                                           \
+    if (entry_deleted_p(entry_var)) continue;                                 \
+    --size__;                                                                 \
+    code;                                                                     \
+  }                                                                           \
+} while (0)
+
+#define ib_cycle_by_key(mrb, h, key, it_var, code) do {                       \
+  index_buckets_iter it_var1;                                               \
+  ib_it_init(mrb, it_var, h, key);                                            \
+  for (;;) {                                                                  \
+    ib_it_next(it_var);                                                       \
+    code;                                                                     \
+  }                                                                           \
+} while (0)
+
+#define ib_find_by_key(mrb, h_, key_, it_var, code) do {                      \
+  mrb_value ib_fbk_key__ = key_;                                              \
+  ib_cycle_by_key(mrb, h_, ib_fbk_key__, it_var, {                            \
+    if (ib_it_empty_p(it_var)) break;                                         \
+    if (ib_it_deleted_p(it_var)) continue;                                    \
+    if (obj_eql(mrb, ib_fbk_key__, ib_it_entry(it_var)->key, it_var->h)) {    \
+      code;                                                                   \
+      break;                                                                  \
+    }                                                                         \
+  });                                                                         \
+} while (0)
+
+#define h_each(h, entry_var, code) do {                                       \
+  struct RHash *h__ = h;                                                      \
+  hash_entry *h_e_ea__;                                                       \
+  uint32_t h_e_size__;                                                        \
+  h_ar_p(h) ? (h_e_ea__ = ar_ea(h__), h_e_size__ = ar_size(h__)) :            \
+              (h_e_ea__ = ht_ea(h__), h_e_size__ = ht_size(h__));             \
+  ea_each(h_e_ea__, h_e_size__, entry_var, code);                             \
+} while (0)
 
-#ifndef MRB_HT_INIT_SIZE
-#define MRB_HT_INIT_SIZE 4
+/*
+ * In `h_check_modified()`, in the case of `MRB_NO_BOXING`, `ht_ea()` or
+ * `ht_ea_capa()` for AR may read uninitialized area (#5332). Therefore, do
+ * not use those macros for AR in `MRB_NO_BOXING` (but in the case of
+ * `MRB_64BIT`, `ht_ea_capa()` is the same as `ar_ea_capa()`, so use it).
+ */
+#ifdef MRB_NO_BOXING
+# define H_CHECK_MODIFIED_USE_HT_EA_FOR_AR FALSE
+# ifdef MRB_64BIT
+#  define H_CHECK_MODIFIED_USE_HT_EA_CAPA_FOR_AR TRUE
+# else
+#  define H_CHECK_MODIFIED_USE_HT_EA_CAPA_FOR_AR FALSE
+# endif  /* MRB_64BIT */
+#else
+# define H_CHECK_MODIFIED_USE_HT_EA_FOR_AR TRUE
+# define H_CHECK_MODIFIED_USE_HT_EA_CAPA_FOR_AR TRUE
+ /*
+  * `h_check_modified` raises an exception when a dangerous modification is
+  * made to `h` by executing `code`.
+  *
+  * `h_check_modified` macro is not called if `h->hsh.ht` (`h->hsh.ea`) is `NULL`
+  * (`Hash` size is zero). And because the `hash_entry` is rather large,
+  * `h->hsh.ht->ea` and `h->hsh.ht->ea_capa` are able to be safely accessed even for
+  * AR. This nature is used to eliminate branch of AR or HT.
+  *
+  * `HT_ASSERT_SAFE_READ` checks if members can be accessed according to its
+  * assumptions.
+  */
+# define HT_ASSERT_SAFE_READ(attr_name)                                       \
+  mrb_static_assert(                                                          \
+    offsetof(hash_table, attr_name) + sizeof(((hash_table*)0)->attr_name) <=  \
+    sizeof(hash_entry))
+HT_ASSERT_SAFE_READ(ea);
+# ifdef MRB_32BIT
+HT_ASSERT_SAFE_READ(ea_capa);
+# endif
+# undef HT_ASSERT_SAFE_READ
+#endif  /* MRB_NO_BOXING */
+
+/*
+ * `h_check_modified` raises an exception when a dangerous modification is
+ * made to `h` by executing `code`.
+ */
+#define h_check_modified(mrb, h, code) do {                                     \
+  struct RHash *h__ = h;                                                        \
+  uint32_t mask__ = MRB_HASH_HT|MRB_HASH_IB_BIT_MASK|MRB_HASH_AR_EA_CAPA_MASK;  \
+  uint32_t flags__ = h__->flags & mask__;                                       \
+  void* tbl__ = (mrb_assert(h__->hsh.ht), h__->hsh.ht);                         \
+  uint32_t ht_ea_capa__ = 0;                                                    \
+  hash_entry *ht_ea__ = NULL;                                                   \
+  if (H_CHECK_MODIFIED_USE_HT_EA_CAPA_FOR_AR || h_ht_p(h__)) {                  \
+    ht_ea_capa__ = ht_ea_capa(h__);                                             \
+  }                                                                             \
+  if (H_CHECK_MODIFIED_USE_HT_EA_FOR_AR || h_ht_p(h__)) {                       \
+    ht_ea__ = ht_ea(h__);                                                       \
+  }                                                                             \
+  code;                                                                         \
+  if (flags__ != (h__->flags & mask__) ||                                       \
+      tbl__ != h__->hsh.ht ||                                                       \
+      ((H_CHECK_MODIFIED_USE_HT_EA_CAPA_FOR_AR || h_ht_p(h__)) &&               \
+       ht_ea_capa__ != ht_ea_capa(h__)) ||                                      \
+      ((H_CHECK_MODIFIED_USE_HT_EA_FOR_AR || h_ht_p(h__)) &&                    \
+       ht_ea__ != ht_ea(h__))) {                                                \
+    mrb_raise(mrb, E_RUNTIME_ERROR, "hash modified");                           \
+  }                                                                             \
+} while (0)
+
+#define U32(v) ((uint32_t)(v))
+#define h_ar_p(h) (!h_ht_p(h))
+#define h_ar_on(h) h_ht_off(h)
+#define lesser(a, b) ((a) < (b) ? (a) : (b))
+#define RHASH_IFNONE(hash) mrb_iv_get(mrb, (hash), MRB_SYM(ifnone))
+#define RHASH_PROCDEFAULT(hash) RHASH_IFNONE(hash)
+
+static uint32_t ib_upper_bound_for(uint32_t capa);
+static uint32_t ib_bit_to_capa(uint32_t bit);
+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_without_ib_adjustment(
+  mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value val);
+
+static uint32_t
+next_power2(uint32_t v)
+{
+  mrb_assert(v != 0);
+#ifdef __GNUC__
+  return U32(1) << ((sizeof(unsigned) * CHAR_BIT) - __builtin_clz(v));
+#else
+  v |= v >> 1;
+  v |= v >> 2;
+  v |= v >> 4;
+  v |= v >> 8;
+  v |= v >> 16;
+  ++v;
+  return v;
 #endif
-#define HT_SEG_INCREASE_RATIO 6 / 5
+}
 
-struct segkv {
-  mrb_value key;
-  mrb_value val;
-};
-
-typedef struct segment {
-  uint16_t size;
-  struct segment *next;
-  struct segkv e;
-} segment;
-
-typedef struct segindex {
-  size_t size;
-  size_t capa;
-  struct segkv *table;
-} segindex;
-
-/* hash table structure */
-typedef struct htable {
-  segment *rootseg;
-  segment *lastseg;
-  mrb_int size;
-  uint16_t last_len;
-  segindex *index;
-} htable;
-
-static /* inline */ size_t
-ht_hash_func(mrb_state *mrb, htable *t, mrb_value key)
+static uint32_t
+obj_hash_code(mrb_state *mrb, mrb_value key, struct RHash *h)
 {
   enum mrb_vtype tt = mrb_type(key);
-  mrb_value hv;
-  size_t h;
-  segindex *index = t->index;
-  size_t capa = index ? index->capa : 0;
-
+  uint32_t hash_code;
+  mrb_value hash_code_obj;
   switch (tt) {
   case MRB_TT_STRING:
-    h = mrb_str_hash(mrb, key);
+    hash_code = mrb_str_hash(mrb, key);
     break;
-
   case MRB_TT_TRUE:
   case MRB_TT_FALSE:
   case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
-#ifndef MRB_WITHOUT_FLOAT
+    hash_code = U32(mrb_fixnum(key));
+    break;
+  case MRB_TT_INTEGER:
+    if (mrb_fixnum_p(key)) {
+      hash_code = U32(mrb_fixnum(key));
+      break;
+    }
+#ifndef MRB_NO_FLOAT
+    /* fall through */
   case MRB_TT_FLOAT:
 #endif
-    h = (size_t)mrb_obj_id(key);
+    hash_code = U32(mrb_obj_id(key));
     break;
-
   default:
-    hv = mrb_funcall(mrb, key, "hash", 0);
-    h = (size_t)tt ^ (size_t)mrb_fixnum(hv);
+    h_check_modified(mrb, h, {
+      hash_code_obj = mrb_funcall_argv(mrb, key, MRB_SYM(hash), 0, NULL);
+    });
+
+    hash_code = U32(tt) ^ U32(mrb_integer(hash_code_obj));
     break;
   }
-  if (index && (index != t->index || capa != index->capa)) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "hash modified");
-  }
-  return ((h)^((h)<<2)^((h)>>2));
+  return hash_code ^ (hash_code << 2) ^ (hash_code >> 2);
 }
 
-static inline mrb_bool
-ht_hash_equal(mrb_state *mrb, htable *t, mrb_value a, mrb_value b)
+static mrb_bool
+obj_eql(mrb_state *mrb, mrb_value a, mrb_value b, struct RHash *h)
 {
   enum mrb_vtype tt = mrb_type(a);
+  mrb_bool eql;
 
   switch (tt) {
   case MRB_TT_STRING:
@@ -95,609 +364,846 @@
     if (!mrb_symbol_p(b)) return FALSE;
     return mrb_symbol(a) == mrb_symbol(b);
 
-  case MRB_TT_FIXNUM:
-    switch (mrb_type(b)) {
-    case MRB_TT_FIXNUM:
-      return mrb_fixnum(a) == mrb_fixnum(b);
-#ifndef MRB_WITHOUT_FLOAT
-    case MRB_TT_FLOAT:
-      return (mrb_float)mrb_fixnum(a) == mrb_float(b);
-#endif
-    default:
-      return FALSE;
-    }
+  case MRB_TT_INTEGER:
+    if (!mrb_integer_p(b)) return FALSE;
+    return mrb_integer(a) == mrb_integer(b);
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
-    switch (mrb_type(b)) {
-    case MRB_TT_FIXNUM:
-      return mrb_float(a) == (mrb_float)mrb_fixnum(b);
-    case MRB_TT_FLOAT:
-      return mrb_float(a) == mrb_float(b);
-    default:
-      return FALSE;
-    }
+    if (!mrb_float_p(b)) return FALSE;
+    return mrb_float(a) == mrb_float(b);
 #endif
 
   default:
-    {
-      segindex *index = t->index;
-      size_t capa = index ? index->capa : 0;
-      mrb_bool eql = mrb_eql(mrb, a, b);
-      if (index && (index != t->index || capa != index->capa)) {
-        mrb_raise(mrb, E_RUNTIME_ERROR, "hash modified");
-      }
-      return eql;
-    }
-  } 
+    h_check_modified(mrb, h, {eql = mrb_eql(mrb, a, b);});
+    return eql;
+  }
 }
 
-/* Creates the hash table. */
-static htable*
-ht_new(mrb_state *mrb)
+static mrb_bool
+entry_deleted_p(const hash_entry* entry)
 {
-  htable *t;
+  return mrb_undef_p(entry->key);
+}
 
-  t = (htable*)mrb_malloc(mrb, sizeof(htable));
-  t->size = 0;
-  t->rootseg =  NULL;
-  t->lastseg =  NULL;
-  t->last_len = 0;
-  t->index = NULL;
+static void
+entry_delete(hash_entry* entry)
+{
+  entry->key = mrb_undef_value();
+}
 
-  return t;
+static uint32_t
+ea_next_capa_for(uint32_t size, uint32_t max_capa)
+{
+  if (size < AR_DEFAULT_CAPA) {
+    return AR_DEFAULT_CAPA;
+  }
+  else {
+    /*
+     * For 32-bit CPU, the theoretical value of maximum EA capacity is
+     * `UINT32_MAX / sizeof (hash_entry)`. At this time, if
+     * `EA_INCREASE_RATIO` is the current value, 32-bit range will not be
+     * exceeded during the calculation of `capa`, so `size_t` is used.
+     */
+    size_t capa = (size_t)size * EA_INCREASE_RATIO, inc = capa - size;
+    if (EA_MAX_INCREASE < inc) capa = size + EA_MAX_INCREASE;
+    return capa <= max_capa ? U32(capa) : max_capa;
+  }
 }
 
-#define power2(v) do { \
-  v--;\
-  v |= v >> 1;\
-  v |= v >> 2;\
-  v |= v >> 4;\
-  v |= v >> 8;\
-  v |= v >> 16;\
-  v++;\
-} while (0)
+static hash_entry*
+ea_resize(mrb_state *mrb, hash_entry *ea, uint32_t capa)
+{
+  return (hash_entry*)mrb_realloc(mrb, ea, sizeof(hash_entry) * capa);
+}
 
-#ifndef UPPER_BOUND
-#define UPPER_BOUND(x) ((x)>>2|(x)>>1)
-#endif
+static void
+ea_compress(hash_entry *ea, uint32_t n_used)
+{
+  hash_entry *w_entry = ea;
+  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;
+  });
+}
+
+/*
+ * Increase or decrease capacity of `ea` to a standard size that can
+ * accommodate `*capap + 1` entries (but, not exceed `max_capa`). Set the
+ * changed capacity to `*capap` and return a pointer to `mrb_realloc`ed EA.
+ */
+static hash_entry*
+ea_adjust(mrb_state *mrb, hash_entry *ea, uint32_t *capap, uint32_t max_capa)
+{
+  *capap = ea_next_capa_for(*capap, max_capa);
+  return ea_resize(mrb, ea, *capap);
+}
+
+static hash_entry*
+ea_dup(mrb_state *mrb, const hash_entry *ea, uint32_t capa)
+{
+  size_t byte_size = sizeof(hash_entry) * capa;
+  hash_entry *new_ea = (hash_entry*)mrb_malloc(mrb, byte_size);
+  return (hash_entry*)memcpy(new_ea, ea, byte_size);
+}
+
+static hash_entry*
+ea_get_by_key(mrb_state *mrb, hash_entry *ea, uint32_t size, mrb_value key,
+              struct RHash *h)
+{
+  ea_each(ea, size, entry, {
+    if (obj_eql(mrb, key, entry->key, h)) return entry;
+  });
+  return NULL;
+}
 
-#define HT_MASK(index) ((index->capa)-1)
+static hash_entry*
+ea_get(hash_entry *ea, uint32_t index)
+{
+  return &eaindex;
+}
 
-/* Build index for the hash table */
 static void
-ht_index(mrb_state *mrb, htable *t)
+ea_set(hash_entry *ea, uint32_t index, mrb_value key, mrb_value val)
 {
-  size_t size = (size_t)t->size;
-  size_t mask;
-  segindex *index = t->index;
-  segment *seg;
-  size_t i;
+  eaindex.key = key;
+  eaindex.val = val;
+}
 
-  /* allocate index table */
-  if (index && index->size >= UPPER_BOUND(index->capa)) {
-    size = index->capa+1;
-  }
-  power2(size);
-  if (!index || index->capa < size) {
-    index = (segindex*)mrb_realloc_simple(mrb, index, sizeof(segindex)+sizeof(struct segkv*)*size);
-    if (index == NULL) {
-      mrb_free(mrb, t->index);
-      t->index = NULL;
-      return;
-    }
-    t->index = index;
-  }
-  index->size = t->size;
-  index->capa = size;
-  for (i=0; i<size; i++) {
-    index->tablei = NULL;
-  }
+static void
+ar_init(struct RHash *h, uint32_t size,
+        hash_entry *ea, uint32_t ea_capa, uint32_t ea_n_used)
+{
+  h_ar_on(h);
+  ar_set_size(h, size);
+  ar_set_ea(h, ea);
+  ar_set_ea_capa(h, ea_capa);
+  ar_set_ea_n_used(h, ea_n_used);
+}
 
-  /* rebuld index */
-  mask = HT_MASK(index);
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      mrb_value key;
-      size_t k, step = 0;
+static void
+ar_free(mrb_state *mrb, struct RHash *h)
+{
+  mrb_free(mrb, ar_ea(h));
+}
 
-      if (!seg->next && i >= (size_t)t->last_len) {
-        return;
-      }
-      key = seg->ei.key;
-      if (mrb_undef_p(key)) continue;
-      k = ht_hash_func(mrb, t, key) & mask;
-      while (index->tablek) {
-        k = (k+(++step)) & mask;
-      }
-      index->tablek = &seg->ei;
-    }
-    seg = seg->next;
-  }
+static void
+ar_adjust_ea(mrb_state *mrb, struct RHash *h, uint32_t size, uint32_t max_ea_capa)
+{
+  uint32_t ea_capa = size;
+  hash_entry *ea = ea_adjust(mrb, ar_ea(h), &ea_capa, max_ea_capa);
+  ar_set_ea(h, ea);
+  ar_set_ea_capa(h, ea_capa);
 }
 
-/* Compacts the hash table removing deleted entries. */
 static void
-ht_compact(mrb_state *mrb, htable *t)
+ar_compress(mrb_state *mrb, struct RHash *h)
 {
-  segment *seg;
-  uint16_t i, i2;
-  segment *seg2 = NULL;
-  mrb_int size = 0;
+  uint32_t size = ar_size(h);
+  ea_compress(ar_ea(h), ar_ea_n_used(h));
+  ar_set_ea_n_used(h, size);
+  ar_adjust_ea(mrb, h, size, lesser(ar_ea_capa(h), AR_MAX_SIZE));
+}
 
-  if (t == NULL) return;
-  seg = t->rootseg;
-  if (t->index && (size_t)t->size == t->index->size) {
-    ht_index(mrb, t);
-    return;
-  }
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      mrb_value k = seg->ei.key;
+static mrb_bool
+ar_get(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value *valp)
+{
+  ea_each(ar_ea(h), ar_size(h), entry, {
+    if (!obj_eql(mrb, key, entry->key, h)) continue;
+    *valp = entry->val;
+    return TRUE;
+  });
+  return FALSE;
+}
 
-      if (!seg->next && i >= t->last_len) {
-        goto exit;
-      }
-      if (mrb_undef_p(k)) {     /* found deleted key */
-        if (seg2 == NULL) {
-          seg2 = seg;
-          i2 = i;
+static void
+ar_set(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value val)
+{
+  uint32_t size = ar_size(h);
+  hash_entry *entry;
+  if ((entry = ea_get_by_key(mrb, ar_ea(h), size, key, h))) {
+    entry->val = val;
+  }
+  else {
+    uint32_t ea_capa = ar_ea_capa(h), ea_n_used = ar_ea_n_used(h);
+    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);
+          return;
+        }
+        else {
+          ar_adjust_ea(mrb, h, size, AR_MAX_SIZE);
         }
       }
       else {
-        size++;
-        if (seg2 != NULL) {
-          seg2->ei2++ = seg->ei;
-          if (i2 >= seg2->size) {
-            seg2 = seg2->next;
-            i2 = 0;
-          }
-        }
+        ar_compress(mrb, h);
+        ea_n_used = size;
       }
     }
-    seg = seg->next;
+    ea_set(ar_ea(h), ea_n_used, key, val);
+    ar_set_size(h, ++size);
+    ar_set_ea_n_used(h, ++ea_n_used);
   }
- exit:
-  /* reached at end */
-  t->size = size;
-  if (seg2) {
-    seg = seg2->next;
-    seg2->next = NULL;
-    t->last_len = i2;
-    t->lastseg = seg2;
-    while (seg) {
-      seg2 = seg->next;
-      mrb_free(mrb, seg);
-      seg = seg2;
+}
+
+static mrb_bool
+ar_delete(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value *valp)
+{
+  hash_entry *entry = ea_get_by_key(mrb, ar_ea(h), ar_size(h), key, h);
+  if (!entry) return FALSE;
+  *valp = entry->val;
+  entry_delete(entry);
+  ar_dec_size(h);
+  return TRUE;
+}
+
+static void
+ar_shift(mrb_state *mrb, struct RHash *h, mrb_value *keyp, mrb_value *valp)
+{
+  uint32_t size = ar_size(h);
+  ea_each(ar_ea(h), size, entry, {
+    *keyp = entry->key;
+    *valp = entry->val;
+    entry_delete(entry);
+    ar_set_size(h, --size);
+    return;
+  });
+}
+
+static void
+ar_rehash(mrb_state *mrb, struct RHash *h)
+{
+  /* see comments in `h_rehash` */
+  uint32_t size = ar_size(h), w_size = 0, ea_capa = ar_ea_capa(h);
+  hash_entry *ea = ar_ea(h), *w_entry;
+  ea_each(ea, size, r_entry, {
+    if ((w_entry = ea_get_by_key(mrb, ea, w_size, r_entry->key, h))) {
+      w_entry->val = r_entry->val;
+      ar_set_size(h, --size);
+      entry_delete(r_entry);
     }
-  }
-  if (t->index) {
-    ht_index(mrb, t);
-  }
+    else {
+      if (w_size != U32(r_entry - ea)) {
+        ea_set(ea, w_size, r_entry->key, r_entry->val);
+        entry_delete(r_entry);
+      }
+      ++w_size;
+    }
+  });
+  mrb_assert(size == w_size);
+  ar_set_ea_n_used(h, size);
+  ar_adjust_ea(mrb, h, size, ea_capa);
 }
 
-static segment*
-segment_alloc(mrb_state *mrb, segment *seg)
+static uint32_t
+ib_it_pos_for(index_buckets_iter *it, uint32_t v)
 {
-  uint32_t size;
+  return v & it->mask;
+}
 
-  if (!seg) size = MRB_HT_INIT_SIZE;
-  else {
-    size = seg->size*HT_SEG_INCREASE_RATIO + 1;
-    if (size > UINT16_MAX) size = UINT16_MAX;
-  }
+static uint32_t
+ib_it_empty_value(const index_buckets_iter *it)
+{
+  return it->mask;
+}
 
-  seg = (segment*)mrb_malloc(mrb, sizeof(segment)+sizeof(struct segkv)*size);
-  seg->size = size;
-  seg->next = NULL;
+static uint32_t
+ib_it_deleted_value(const index_buckets_iter *it)
+{
+  return it->mask - 1;
+}
 
-  return seg;
+static mrb_bool
+ib_it_empty_p(const index_buckets_iter *it)
+{
+  return it->ea_index == ib_it_empty_value(it);
+}
+
+static mrb_bool
+ib_it_deleted_p(const index_buckets_iter *it)
+{
+  return it->ea_index == ib_it_deleted_value(it);
+}
+
+static mrb_bool
+ib_it_active_p(const index_buckets_iter *it)
+{
+  return it->ea_index < ib_it_deleted_value(it);
 }
 
-/* Set the value for the key in the indexed table. */
 static void
-ht_index_put(mrb_state *mrb, htable *t, mrb_value key, mrb_value val)
+ib_it_init(mrb_state *mrb, index_buckets_iter *it, struct RHash *h, mrb_value key)
 {
-  segindex *index = t->index;
-  size_t k, sp, step = 0, mask;
-  segment *seg;
+  it->h = h;
+  it->bit = ib_bit(h);
+  it->mask = ib_bit_to_capa(it->bit) - 1;
+  it->pos = ib_it_pos_for(it, obj_hash_code(mrb, key, h));
+  it->step = 0;
+}
 
-  if (index->size >= UPPER_BOUND(index->capa)) {
-    /* need to expand table */
-    ht_compact(mrb, t);
-    index = t->index;
-  }
-  mask = HT_MASK(index);
-  sp = index->capa;
-  k = ht_hash_func(mrb, t, key) & mask;
-  while (index->tablek) {
-    mrb_value key2 = index->tablek->key;
-    if (mrb_undef_p(key2)) {
-      if (sp == index->capa) sp = k;
-    }
-    else if (ht_hash_equal(mrb, t, key, key2)) {
-      index->tablek->val = val;
-      return;
-    }
-    k = (k+(++step)) & mask;
+static void
+ib_it_next(index_buckets_iter *it)
+{
+  /*
+   * IB image
+   *
+   *                  ary_index(1) --.
+   *                                  \          .-- shift1(3)  .-- shift2(29)
+   *                     pos(6) --.    \        /              /
+   *  View    |                    \    \    <-o-> <----------o---------->
+   * -------- +---------------------\----\--+-----------------------------+-----
+   *  array   |               0      `--. `-|--- o          1             | ...
+   *          +---------+---------+-----+\--+-----+---------+---------+---+-----
+   *  buckets |    0    |    1    | ... | o  6    |    7    |    8    |     ...
+   *          +---------+---------+-----+=========+---------+---------+---------
+   *  bit set |1 1 1 0 0|0 0 0 1 1| ... |0 1 0 1 1|0 1 1 1 0|0 1 0 1 0|     ...
+   *          +---------+---------+-----+========*+---------+---------+---------
+   *           <---o--->                          \
+   *                \                              `-- bit_pos(34)
+   *                 `-- bit(5)
+   */
+
+  /* Slide to handle as `capa == 32` to avoid 64-bit operations */
+  uint32_t slid_pos = it->pos & (IB_TYPE_BIT - 1);
+  uint32_t slid_bit_pos = it->bit * (slid_pos + 1) - 1;
+  uint32_t slid_ary_index = slid_bit_pos / IB_TYPE_BIT;
+  it->ary_index = slid_ary_index + it->pos / IB_TYPE_BIT * it->bit;
+  it->shift2 = (slid_ary_index + 1) * IB_TYPE_BIT - slid_bit_pos - 1;
+  it->ea_index = (ht_ib(it->h)it->ary_index >> it->shift2) & it->mask;
+  if (IB_TYPE_BIT - it->bit < it->shift2) {
+    it->shift1 = IB_TYPE_BIT - it->shift2;
+    it->ea_index |= (ht_ib(it->h)it->ary_index - 1 << it->shift1) & it->mask;
   }
-  if (sp < index->capa) {
-    k = sp;
+  else {
+    it->shift1 = 0;
   }
+  it->pos = ib_it_pos_for(it, it->pos + (++it->step));
+}
 
-  /* put the value at the last */
-  seg = t->lastseg;
-  if (t->last_len < seg->size) {
-    index->tablek = &seg->et->last_len++;
-  }
-  else {                        /* append a new segment */
-    seg->next = segment_alloc(mrb, seg);
-    seg = seg->next;
-    seg->next = NULL;
-    t->lastseg = seg;
-    t->last_len = 1;
-    index->tablek = &seg->e0;
+static uint32_t
+ib_it_get(const index_buckets_iter *it)
+{
+  return it->ea_index;
+}
+
+static void
+ib_it_set(index_buckets_iter *it, uint32_t ea_index)
+{
+  uint32_t mask, i;
+  it->ea_index = ea_index;
+  if (it->shift1) {
+    i = it->ary_index - 1;
+    mask = it->mask >> it->shift1;
+    ht_ib(it->h)i = (ht_ib(it->h)i & ~mask) | (ea_index >> it->shift1);
   }
-  index->tablek->key = key;
-  index->tablek->val = val;
-  index->size++;
-  t->size++;
+  i = it->ary_index;
+  mask = it->mask << it->shift2;
+  ht_ib(it->h)i = (ht_ib(it->h)i & ~mask) | (ea_index << it->shift2);
 }
 
-/* Set the value for the key in the hash table. */
 static void
-ht_put(mrb_state *mrb, htable *t, mrb_value key, mrb_value val)
+ib_it_delete(index_buckets_iter *it)
 {
-  segment *seg;
-  mrb_int i, deleted = 0;
+  ib_it_set(it, ib_it_deleted_value(it));
+}
 
-  if (t == NULL) return;
-  if (t->index) {
-    ht_index_put(mrb, t, key, val);
-    return;
-  }
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      mrb_value k = seg->ei.key;
-      /* Found room in last segment after last_len */
-      if (!seg->next && i >= t->last_len) {
-        seg->ei.key = key;
-        seg->ei.val = val;
-        t->last_len = (uint16_t)i+1;
-        t->size++;
-        return;
-      }
-      if (mrb_undef_p(k)) {
-        deleted++;
-        continue;
-      }
-      if (ht_hash_equal(mrb, t, key, k)) {
-        seg->ei.val = val;
-        return;
-      }
-    }
-    seg = seg->next;
-  }
-  /* Not found */
+static hash_entry*
+ib_it_entry(index_buckets_iter *it)
+{
+  return ea_get(ht_ea(it->h), it->ea_index);
+}
 
-  /* Compact if last segment has room */
-  if (deleted > 0 && deleted > MRB_HT_INIT_SIZE) {
-    ht_compact(mrb, t);
-  }
-  t->size++;
+static uint32_t
+ib_capa_to_bit(uint32_t capa)
+{
+#ifdef __GNUC__
+  return U32(__builtin_ctz(capa));
+#else
+  /* http://graphics.stanford.edu/~seander/bithacks.html#IntegerLogDeBruijn */
+  static const uint32_t MultiplyDeBruijnBitPosition2 = {
+    0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
+    31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
+  };
+  return MultiplyDeBruijnBitPosition2U32(capa * 0x077CB531U) >> 27;
+#endif
+}
 
-  /* check if thre's room after compaction */
-  if (t->lastseg && t->last_len < t->lastseg->size) {
-    seg = t->lastseg;
-    i = t->last_len;
-  }
-  else {
-    /* append new segment */
-    seg = segment_alloc(mrb, t->lastseg);
-    i = 0;
-    if (t->rootseg == NULL) {
-      t->rootseg = seg;
-    }
-    else {
-      t->lastseg->next = seg;
-    }
-    t->lastseg = seg;
-  }
-  seg->ei.key = key;
-  seg->ei.val = val;
-  t->last_len = (uint16_t)i+1;
-  if (t->index == NULL && t->size > MRB_HT_INIT_SIZE*4) {
-    ht_index(mrb, t);
-  }
+static uint32_t
+ib_bit_to_capa(uint32_t bit)
+{
+  return U32(1) << bit;
 }
 
-/* Get a value for a key from the indexed table. */
-static mrb_bool
-ht_index_get(mrb_state *mrb, htable *t, mrb_value key, mrb_value *vp)
-{
-  segindex *index = t->index;
-  size_t mask = HT_MASK(index);
-  size_t k = ht_hash_func(mrb, t, key) & mask;
-  size_t step = 0;
-
-  while (index->tablek) {
-    mrb_value key2 = index->tablek->key;
-    if (!mrb_undef_p(key2) && ht_hash_equal(mrb, t, key, key2)) {
-      if (vp) *vp = index->tablek->val;
-      return TRUE;
-    }
-    k = (k+(++step)) & mask;
-  }
-  return FALSE;
+static uint32_t
+ib_upper_bound_for(uint32_t capa)
+{
+  return (capa >> 2) | (capa >> 1);  /* 3/4 */
 }
 
-/* Get a value for a key from the hash table. */
-static mrb_bool
-ht_get(mrb_state *mrb, htable *t, mrb_value key, mrb_value *vp)
+static uint32_t
+ib_bit_for(uint32_t size)
 {
-  segment *seg;
-  mrb_int i;
+  uint32_t capa = next_power2(size);
+  if (capa != IB_MAX_CAPA && ib_upper_bound_for(capa) < size) capa *= 2;
+  return ib_capa_to_bit(capa);
+}
 
-  if (t == NULL) return FALSE;
-  if (t->index) {
-    return ht_index_get(mrb, t, key, vp);
-  }
+static uint32_t
+ib_byte_size_for(uint32_t ib_bit)
+{
+  mrb_assert(IB_INIT_BIT <= ib_bit);
+  uint32_t ary_size = IB_INIT_BIT == 4 ?
+    ib_bit_to_capa(ib_bit) * 2 / IB_TYPE_BIT * ib_bit / 2 :
+    ib_bit_to_capa(ib_bit) / IB_TYPE_BIT * ib_bit;
+  return U32(sizeof(uint32_t) * ary_size);
+}
 
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      mrb_value k = seg->ei.key;
+static void
+ib_init(mrb_state *mrb, struct RHash *h, uint32_t ib_bit, size_t ib_byte_size)
+{
+  hash_entry *ea = ht_ea(h);
+  memset(ht_ib(h), 0xff, ib_byte_size);
+  ib_set_bit(h, ib_bit);
+  ea_each_used(ea, ht_ea_n_used(h), entry, {
+    ib_cycle_by_key(mrb, h, entry->key, it, {
+      if (!ib_it_empty_p(it)) continue;
+      ib_it_set(it, U32(entry - ea));
+      break;
+    });
+  });
+}
 
-      if (!seg->next && i >= t->last_len) {
-        return FALSE;
-      }
-      if (mrb_undef_p(k)) continue;
-      if (ht_hash_equal(mrb, t, key, k)) {
-        if (vp) *vp = seg->ei.val;
-        return TRUE;
-      }
-    }
-    seg = seg->next;
-  }
-  return FALSE;
+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)
+{
+  size_t ib_byte_size = ib_byte_size_for(ib_bit);
+  size_t ht_byte_size = sizeof(hash_table) + ib_byte_size;
+  h_ht_on(h);
+  h_set_ht(h, (hash_table*)mrb_realloc(mrb, ht, ht_byte_size));
+  ht_set_size(h, size);
+  ht_set_ea(h, ea);
+  ht_set_ea_capa(h, ea_capa);
+  ht_set_ea_n_used(h, size);
+  ib_init(mrb, h, ib_bit, ib_byte_size);
+}
+
+static void
+ht_free(mrb_state *mrb, struct RHash *h)
+{
+  mrb_free(mrb, ht_ea(h));
+  mrb_free(mrb, h_ht(h));
+}
+
+static hash_table*
+ht_dup(mrb_state *mrb, const struct RHash *h)
+{
+  size_t ib_byte_size = ib_byte_size_for(ib_bit(h));
+  size_t ht_byte_size = sizeof(hash_table) + ib_byte_size;
+  hash_table *new_ht = (hash_table*)mrb_malloc(mrb, ht_byte_size);
+  return (hash_table*)memcpy(new_ht, h_ht(h), ht_byte_size);
+}
+
+static void
+ht_adjust_ea(mrb_state *mrb, struct RHash *h, uint32_t size, uint32_t max_ea_capa)
+{
+  uint32_t ea_capa = size;
+  hash_entry *ea = ea_adjust(mrb, ht_ea(h), &ea_capa, max_ea_capa);
+  ht_set_ea(h, ea);
+  ht_set_ea_capa(h, ea_capa);
+}
+
+static void
+ht_to_ar(mrb_state *mrb, struct RHash *h)
+{
+  uint32_t size = ht_size(h), ea_capa = size;
+  hash_entry *ea = ht_ea(h);
+  ea_compress(ea, ht_ea_n_used(h));
+  ea = ea_adjust(mrb, ea, &ea_capa, AR_MAX_SIZE);
+  mrb_free(mrb, h_ht(h));
+  ar_init(h, size, ea, ea_capa, size);
 }
 
-/* Deletes the value for the symbol from the hash table. */
-/* Deletion is done by overwriting keys by `undef`. */
 static mrb_bool
-ht_del(mrb_state *mrb, htable *t, mrb_value key, mrb_value *vp)
+ht_get(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value *valp)
 {
-  segment *seg;
-  mrb_int i;
+  ib_find_by_key(mrb, h, key, it, {
+    *valp = ib_it_entry(it)->val;
+    return TRUE;
+  });
+  return FALSE;
+}
 
-  if (t == NULL) return FALSE;
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      mrb_value key2;
+static void
+ht_set_as_ar(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value val)
+{
+  ht_to_ar(mrb, h);
+  ar_set(mrb, h, key, val);
+}
 
-      if (!seg->next && i >= t->last_len) {
-        /* not found */
-        return FALSE;
+static void
+ht_set_without_ib_adjustment(mrb_state *mrb, struct RHash *h,
+                             mrb_value key, mrb_value val)
+{
+  mrb_assert(ht_size(h) < ib_bit_to_capa(ib_bit(h)));
+  ib_cycle_by_key(mrb, h, key, it, {
+    if (ib_it_active_p(it)) {
+      if (!obj_eql(mrb, key, ib_it_entry(it)->key, h)) continue;
+      ib_it_entry(it)->val = val;
+    }
+    else {
+      uint32_t ea_n_used = ht_ea_n_used(h);
+      if (ea_n_used == H_MAX_SIZE) {
+        mrb_assert(ht_size(h) == ea_n_used);
+        mrb_raise(mrb, E_ARGUMENT_ERROR, "hash too big");
       }
-      key2 = seg->ei.key;
-      if (!mrb_undef_p(key2) && ht_hash_equal(mrb, t, key, key2)) {
-        if (vp) *vp = seg->ei.val;
-        seg->ei.key = mrb_undef_value();
-        t->size--;
-        return TRUE;
+      if (ea_n_used == ht_ea_capa(h)) ht_adjust_ea(mrb, h, ea_n_used, EA_MAX_CAPA);
+      ib_it_set(it, ea_n_used);
+      ea_set(ht_ea(h), ea_n_used, key, val);
+      ht_inc_size(h);
+      ht_set_ea_n_used(h, ++ea_n_used);
+    }
+    return;
+  });
+}
+
+static void
+ht_set(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value val)
+{
+  uint32_t size = ht_size(h);
+  uint32_t ib_bit_width = ib_bit(h), ib_capa = ib_bit_to_capa(ib_bit_width);
+  if (ib_upper_bound_for(ib_capa) <= size) {
+    if (size != ht_ea_n_used(h)) ea_compress(ht_ea(h), ht_ea_n_used(h));
+    ht_init(mrb, h, size, ht_ea(h), ht_ea_capa(h), h_ht(h), ++ib_bit_width);
+  }
+  else if (size != ht_ea_n_used(h)) {
+    if (ib_capa - EA_N_RESERVED_INDICES <= ht_ea_n_used(h)) goto compress;
+    if (ht_ea_capa(h) == ht_ea_n_used(h)) {
+      if (size <= AR_MAX_SIZE) {ht_set_as_ar(mrb, h, key, val); return;}
+      if (ea_next_capa_for(size, EA_MAX_CAPA) <= ht_ea_capa(h)) {
+       compress:
+        ea_compress(ht_ea(h), ht_ea_n_used(h));
+        ht_adjust_ea(mrb, h, size, ht_ea_capa(h));
+        ht_init(mrb, h, size, ht_ea(h), ht_ea_capa(h), h_ht(h), ib_bit_width);
       }
     }
-    seg = seg->next;
   }
+  ht_set_without_ib_adjustment(mrb, h, key, val);
+}
+
+static mrb_bool
+ht_delete(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value *valp)
+{
+  ib_find_by_key(mrb, h, key, it, {
+    hash_entry *entry = ib_it_entry(it);
+    *valp = entry->val;
+    ib_it_delete(it);
+    entry_delete(entry);
+    ht_dec_size(h);
+    return TRUE;
+  });
   return FALSE;
 }
 
-/* Iterates over the hash table. */
 static void
-ht_foreach(mrb_state *mrb, htable *t, mrb_hash_foreach_func *func, void *p)
-{
-  segment *seg;
-  mrb_int i;
-
-  if (t == NULL) return;
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      /* no value in last segment after last_len */
-      if (!seg->next && i >= t->last_len) {
-        return;
+ht_shift(mrb_state *mrb, struct RHash *h, mrb_value *keyp, mrb_value *valp)
+{
+  hash_entry *ea = ht_ea(h);
+  ea_each(ea, ht_size(h), entry, {
+    ib_cycle_by_key(mrb, h, entry->key, it, {
+      if (ib_it_get(it) != U32(entry - ea)) continue;
+      *keyp = entry->key;
+      *valp = entry->val;
+      ib_it_delete(it);
+      entry_delete(entry);
+      ht_dec_size(h);
+      return;
+    });
+  });
+}
+
+static void
+ht_rehash(mrb_state *mrb, struct RHash *h)
+{
+  /* see comments in `h_rehash` */
+  uint32_t size = ht_size(h);
+  if (size <= AR_MAX_SIZE) {
+    ht_to_ar(mrb, h);
+    ar_rehash(mrb, h);
+    return;
+  }
+  uint32_t w_size = 0, ea_capa = ht_ea_capa(h);
+  hash_entry *ea = ht_ea(h);
+  ht_init(mrb, h, 0, ea, ea_capa, h_ht(h), ib_bit_for(size));
+  ht_set_size(h, size);
+  ht_set_ea_n_used(h, ht_ea_n_used(h));
+  ea_each(ea, size, r_entry, {
+    ib_cycle_by_key(mrb, h, r_entry->key, it, {
+      if (ib_it_active_p(it)) {
+        if (!obj_eql(mrb, r_entry->key, ib_it_entry(it)->key, h)) continue;
+        ib_it_entry(it)->val = r_entry->val;
+        ht_set_size(h, --size);
+        entry_delete(r_entry);
       }
-      if (mrb_undef_p(seg->ei.key)) continue;
-      if ((*func)(mrb, seg->ei.key, seg->ei.val, p) != 0)
-        return;
-    }
-    seg = seg->next;
+      else {
+        if (w_size != U32(r_entry - ea)) {
+          ea_set(ea, w_size, r_entry->key, r_entry->val);
+          entry_delete(r_entry);
+        }
+        ib_it_set(it, w_size++);
+      }
+      break;
+    });
+  });
+  mrb_assert(size == w_size);
+  ht_set_ea_n_used(h, size);
+  size <= AR_MAX_SIZE ? ht_to_ar(mrb, h) : ht_adjust_ea(mrb, h, size, ea_capa);
+}
+
+static mrb_value
+h_key_for(mrb_state *mrb, mrb_value key)
+{
+  if (mrb_string_p(key) && !MRB_FROZEN_P(mrb_str_ptr(key))) {
+    key = mrb_str_dup(mrb, key);
+    MRB_SET_FROZEN_FLAG(mrb_str_ptr(key));
   }
+  return key;
 }
 
-/* Iterates over the hash table. */
-MRB_API void
-mrb_hash_foreach(mrb_state *mrb, struct RHash *hash, mrb_hash_foreach_func *func, void *p)
+static struct RHash*
+h_alloc(mrb_state *mrb)
 {
-  ht_foreach(mrb, hash->ht, func, p);
+  return MRB_OBJ_ALLOC(mrb, MRB_TT_HASH, mrb->hash_class);
 }
 
-/* Copy the hash table. */
-static htable*
-ht_copy(mrb_state *mrb, htable *t)
+static void
+h_init(struct RHash *h)
 {
-  segment *seg;
-  htable *t2;
-  mrb_int i;
+  ar_init(h, 0, NULL, 0, 0);
+}
 
-  seg = t->rootseg;
-  t2 = ht_new(mrb);
-  if (t->size == 0) return t2;
+static void
+h_free_table(mrb_state *mrb, struct RHash *h)
+{
+  (h_ar_p(h) ? ar_free : ht_free)(mrb, h);
+}
 
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      mrb_value key = seg->ei.key;
-      mrb_value val = seg->ei.val;
+static void
+h_clear(mrb_state *mrb, struct RHash *h)
+{
+  h_free_table(mrb, h);
+  h_init(h);
+}
 
-      if ((seg->next == NULL) && (i >= t->last_len)) {
-        return t2;
-      }
-      if (mrb_undef_p(key)) continue; /* skip deleted key */
-      ht_put(mrb, t2, key, val);
-    }
-    seg = seg->next;
-  }
-  return t2;
+static mrb_bool
+h_get(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value *valp)
+{
+  return (h_ar_p(h) ? ar_get : ht_get)(mrb, h, key, valp);
 }
 
-/* Free memory of the hash table. */
 static void
-ht_free(mrb_state *mrb, htable *t)
+h_set(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value val)
 {
-  segment *seg;
+  (h_ar_p(h) ? ar_set : ht_set)(mrb, h, key, val);
+}
 
-  if (!t) return;
-  seg = t->rootseg;
-  while (seg) {
-    segment *p = seg;
-    seg = seg->next;
-    mrb_free(mrb, p);
-  }
-  if (t->index) mrb_free(mrb, t->index);
-  mrb_free(mrb, t);
+static mrb_bool
+h_delete(mrb_state *mrb, struct RHash *h, mrb_value key, mrb_value *valp)
+{
+  return (h_ar_p(h) ? ar_delete : ht_delete)(mrb, h, key, valp);
 }
 
-static void mrb_hash_modify(mrb_state *mrb, mrb_value hash);
+/* find first element in the table, and remove it. */
+static void
+h_shift(mrb_state *mrb, struct RHash *h, mrb_value *keyp, mrb_value *valp)
+{
+  (h_ar_p(h) ? ar_shift : ht_shift)(mrb, h, keyp, valp);
+}
 
-static inline mrb_value
-ht_key(mrb_state *mrb, mrb_value key)
+static void
+h_rehash(mrb_state *mrb, struct RHash *h)
 {
-  if (mrb_string_p(key) && !mrb_frozen_p(mrb_str_ptr(key))) {
-    key = mrb_str_dup(mrb, key);
-    MRB_SET_FROZEN_FLAG(mrb_str_ptr(key));
+  /*
+   * ==== Comments common to `ar_rehash` and `ht_rehash`
+   *
+   * - Because reindex (such as elimination of duplicate keys) must be
+   *   guaranteed, it is necessary to set one by one.
+   *
+   * - To prevent EA from breaking if an exception occurs in the middle,
+   *   delete the slot before moving when moving the entry, and update size
+   *   at any time when overwriting.
+   */
+  (h_size(h) == 0 ? h_clear : h_ar_p(h) ? ar_rehash : ht_rehash)(mrb, h);
+}
+
+static void
+h_replace(mrb_state *mrb, struct RHash *h, struct RHash *orig_h)
+{
+  uint32_t size = h_size(orig_h);
+  if (size == 0) {
+    h_clear(mrb, h);
+  }
+  else if (h_ar_p(orig_h)) {
+    uint32_t ea_capa = ar_ea_capa(orig_h);
+    hash_entry *ea = ea_dup(mrb, ar_ea(orig_h), ea_capa);
+    h_free_table(mrb, h);
+    ar_init(h, size, ea, ea_capa, ar_ea_n_used(orig_h));
+  }
+  else { /* HT */
+    uint32_t ea_capa = ht_ea_capa(orig_h);
+    hash_entry *ea = ea_dup(mrb, ht_ea(orig_h), ea_capa);
+    hash_table *ht = ht_dup(mrb, orig_h);
+    h_free_table(mrb, h);
+    h_ht_on(h);
+    h_set_ht(h, ht);
+    ht_set_size(h, size);
+    ht_set_ea(h, ea);
+#ifdef MRB_64BIT
+    ht_set_ea_capa(h, ea_capa);
+    ht_set_ea_n_used(h, ht_ea_n_used(orig_h));
+#endif
+    ib_set_bit(h, ib_bit(orig_h));
   }
-  return key;
 }
 
-#define KEY(key) ht_key(mrb, key)
+void
+mrb_gc_mark_hash(mrb_state *mrb, struct RHash *h)
+{
+  h_each(h, entry, {
+    mrb_gc_mark_value(mrb, entry->key);
+    mrb_gc_mark_value(mrb, entry->val);
+  });
+}
 
-static int
-hash_mark_i(mrb_state *mrb, mrb_value key, mrb_value val, void *p)
+size_t
+mrb_gc_mark_hash_size(mrb_state *mrb, struct RHash *h)
 {
-  mrb_gc_mark_value(mrb, key);
-  mrb_gc_mark_value(mrb, val);
-  return 0;
+  return h_size(h) * 2;
 }
 
 void
-mrb_gc_mark_hash(mrb_state *mrb, struct RHash *hash)
+mrb_gc_free_hash(mrb_state *mrb, struct RHash *h)
 {
-  ht_foreach(mrb, hash->ht, hash_mark_i, NULL);
+  h_free_table(mrb, h);
 }
 
 size_t
-mrb_gc_mark_hash_size(mrb_state *mrb, struct RHash *hash)
+mrb_hash_memsize(mrb_value self)
 {
-  if (!hash->ht) return 0;
-  return hash->ht->size*2;
+  struct RHash *h = mrb_hash_ptr(self);
+  return mrb_obj_iv_tbl_memsize(self) +
+         (h_ar_p(h) ? (ar_ea_capa(h) * sizeof(hash_entry)) :
+                      (ht_ea_capa(h) * sizeof(hash_entry) +
+                       sizeof(hash_table) +
+                       ib_byte_size_for(ib_bit(h))));
 }
 
-void
-mrb_gc_free_hash(mrb_state *mrb, struct RHash *hash)
+/* Iterates over the key/value pairs. */
+MRB_API void
+mrb_hash_foreach(mrb_state *mrb, struct RHash *h, mrb_hash_foreach_func *func, void *data)
 {
-  ht_free(mrb, hash->ht);
+  h_each(h, entry, {
+    if (func(mrb, entry->key, entry->val, data) != 0) return;
+  });
 }
 
 MRB_API mrb_value
 mrb_hash_new(mrb_state *mrb)
 {
-  struct RHash *h;
-
-  h = (struct RHash*)mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class);
-  h->ht = 0;
-  h->iv = 0;
+  struct RHash *h = h_alloc(mrb);
   return mrb_obj_value(h);
 }
 
+/*
+ * Set the capacity of EA and IB to minimum capacity (and appropriate load
+ * factor) that does not cause expansion when inserting `capa` elements.
+ */
 MRB_API mrb_value
 mrb_hash_new_capa(mrb_state *mrb, mrb_int capa)
 {
-  struct RHash *h;
-
-  h = (struct RHash*)mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class);
-  /* preallocate hash table */
-  h->ht = ht_new(mrb);
-  /* capacity ignored */
-  h->iv = 0;
-  return mrb_obj_value(h);
+  if (capa < 0 || EA_MAX_CAPA < capa) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "hash too big");
+    return mrb_nil_value();  /* not reached */
+  }
+  else if (capa == 0) {
+    return mrb_hash_new(mrb);
+  }
+  else {
+    uint32_t size = U32(capa);
+    struct RHash *h = h_alloc(mrb);
+    hash_entry *ea = ea_resize(mrb, NULL, size);
+    if (size <= AR_MAX_SIZE) {
+      ar_init(h, 0, ea, size, 0);
+    }
+    else {
+      ht_init(mrb, h, 0, ea, size, NULL, ib_bit_for(size));
+    }
+    return mrb_obj_value(h);
+  }
 }
 
 static mrb_value mrb_hash_default(mrb_state *mrb, mrb_value hash);
-static mrb_value hash_default(mrb_state *mrb, mrb_value hash, mrb_value key);
 
-static mrb_value
-mrb_hash_init_copy(mrb_state *mrb, mrb_value self)
+static void
+hash_modify(mrb_state *mrb, mrb_value hash)
 {
-  mrb_value orig = mrb_get_arg1(mrb);
-  struct RHash* copy;
-  htable *orig_h;
-  mrb_value ifnone, vret;
-
-  if (mrb_obj_equal(mrb, self, orig)) return self;
-  if ((mrb_type(self) != mrb_type(orig)) || (mrb_obj_class(mrb, self) != mrb_obj_class(mrb, orig))) {
-      mrb_raise(mrb, E_TYPE_ERROR, "initialize_copy should take same class object");
-  }
-
-  orig_h = RHASH_TBL(self);
-  copy = (struct RHash*)mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class);
-  copy->ht = ht_copy(mrb, orig_h);
+  mrb_check_frozen(mrb, mrb_hash_ptr(hash));
+}
 
-  if (MRB_RHASH_DEFAULT_P(self)) {
-    copy->flags |= MRB_HASH_DEFAULT;
-  }
-  if (MRB_RHASH_PROCDEFAULT_P(self)) {
-    copy->flags |= MRB_HASH_PROC_DEFAULT;
-  }
-  vret = mrb_obj_value(copy);
-  ifnone = RHASH_IFNONE(self);
-  if (!mrb_nil_p(ifnone)) {
-      mrb_iv_set(mrb, vret, mrb_intern_lit(mrb, "ifnone"), ifnone);
+static mrb_value
+hash_default(mrb_state *mrb, mrb_value hash, mrb_value key)
+{
+  if (MRB_RHASH_DEFAULT_P(hash)) {
+    if (MRB_RHASH_PROCDEFAULT_P(hash)) {
+      return mrb_funcall_id(mrb, RHASH_PROCDEFAULT(hash), MRB_SYM(call), 2, hash, key);
+    }
+    else {
+      return RHASH_IFNONE(hash);
+    }
   }
-  return vret;
+  return mrb_nil_value();
 }
 
-static int
-check_kdict_i(mrb_state *mrb, mrb_value key, mrb_value val, void *data)
+static void
+hash_replace(mrb_state *mrb, mrb_value self, mrb_value orig)
 {
-  if (!mrb_symbol_p(key)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "keyword argument hash with non symbol keys");
+  struct RHash *h = mrb_hash_ptr(self), *orig_h = mrb_hash_ptr(orig);
+  uint32_t mask = MRB_HASH_DEFAULT | MRB_HASH_PROC_DEFAULT;
+  mrb_sym name;
+  h_replace(mrb, h, orig_h);
+  name = MRB_SYM(ifnone);
+  if (orig_h->flags & MRB_HASH_DEFAULT) {
+    mrb_iv_set(mrb, self, name, mrb_iv_get(mrb, orig, name));
   }
-  return 0;
+  else {
+    mrb_iv_remove(mrb, self, name);
+  }
+  h->flags &= ~mask;
+  h->flags |= orig_h->flags & mask;
 }
 
-void
-mrb_hash_check_kdict(mrb_state *mrb, mrb_value self)
+static mrb_value
+mrb_hash_init_copy(mrb_state *mrb, mrb_value self)
 {
-  htable *t;
-
-  t = RHASH_TBL(self);
-  if (!t || t->size == 0) return;
-  ht_foreach(mrb, t, check_kdict_i, NULL);
+  mrb_value orig;
+  mrb_get_args(mrb, "H", &orig);
+  hash_modify(mrb, self);
+  if (mrb_hash_ptr(self) != mrb_hash_ptr(orig)) hash_replace(mrb, self, orig);
+  return self;
 }
 
 MRB_API mrb_value
 mrb_hash_dup(mrb_state *mrb, mrb_value self)
 {
-  struct RHash* copy;
-  htable *orig_h;
-
-  orig_h = RHASH_TBL(self);
-  copy = (struct RHash*)mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class);
-  copy->ht = orig_h ? ht_copy(mrb, orig_h) : NULL;
-  return mrb_obj_value(copy);
+  struct RHash* copy_h = h_alloc(mrb);
+  mrb_value copy = mrb_obj_value(copy_h);
+  copy_h->c = mrb_hash_ptr(self)->c;
+  hash_replace(mrb, copy, self);
+  return copy;
 }
 
 MRB_API mrb_value
@@ -706,11 +1212,11 @@
   mrb_value val;
   mrb_sym mid;
 
-  if (ht_get(mrb, RHASH_TBL(hash), key, &val)) {
+  if (h_get(mrb, mrb_hash_ptr(hash), key, &val)) {
     return val;
   }
 
-  mid = mrb_intern_lit(mrb, "default");
+  mid = MRB_SYM(default);
   if (mrb_func_basic_p(mrb, hash, mid, mrb_hash_default)) {
     return hash_default(mrb, hash, key);
   }
@@ -723,7 +1229,7 @@
 {
   mrb_value val;
 
-  if (ht_get(mrb, RHASH_TBL(hash), key, &val)) {
+  if (h_get(mrb, mrb_hash_ptr(hash), key, &val)) {
     return val;
   }
   /* not found */
@@ -733,22 +1239,11 @@
 MRB_API void
 mrb_hash_set(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value val)
 {
-  mrb_hash_modify(mrb, hash);
-
-  key = KEY(key);
-  ht_put(mrb, RHASH_TBL(hash), key, val);
-  mrb_field_write_barrier_value(mrb, (struct RBasic*)RHASH(hash), key);
-  mrb_field_write_barrier_value(mrb, (struct RBasic*)RHASH(hash), val);
-  return;
-}
-
-static void
-mrb_hash_modify(mrb_state *mrb, mrb_value hash)
-{
-  mrb_check_frozen(mrb, mrb_hash_ptr(hash));
-  if (!RHASH_TBL(hash)) {
-    RHASH_TBL(hash) = ht_new(mrb);
-  }
+  hash_modify(mrb, hash);
+  key = h_key_for(mrb, key);
+  h_set(mrb, mrb_hash_ptr(hash), key, val);
+  mrb_field_write_barrier_value(mrb, mrb_basic_ptr(hash), key);
+  mrb_field_write_barrier_value(mrb, mrb_basic_ptr(hash), val);
 }
 
 /* 15.2.13.4.16 */
@@ -795,7 +1290,7 @@
 
   ifnone = mrb_nil_value();
   mrb_get_args(mrb, "&|o?", &block, &ifnone, &ifnone_p);
-  mrb_hash_modify(mrb, hash);
+  hash_modify(mrb, hash);
   if (!mrb_nil_p(block)) {
     if (ifnone_p) {
       mrb_argnum_error(mrb, 1, 0, 0);
@@ -805,7 +1300,7 @@
   }
   if (!mrb_nil_p(ifnone)) {
     RHASH(hash)->flags |= MRB_HASH_DEFAULT;
-    mrb_iv_set(mrb, hash, mrb_intern_lit(mrb, "ifnone"), ifnone);
+    mrb_iv_set(mrb, hash, MRB_SYM(ifnone), ifnone);
   }
   return hash;
 }
@@ -832,20 +1327,6 @@
   return mrb_hash_get(mrb, self, key);
 }
 
-static mrb_value
-hash_default(mrb_state *mrb, mrb_value hash, mrb_value key)
-{
-  if (MRB_RHASH_DEFAULT_P(hash)) {
-    if (MRB_RHASH_PROCDEFAULT_P(hash)) {
-      return mrb_funcall(mrb, RHASH_PROCDEFAULT(hash), "call", 2, hash, key);
-    }
-    else {
-      return RHASH_IFNONE(hash);
-    }
-  }
-  return mrb_nil_value();
-}
-
 /* 15.2.13.4.5  */
 /*
  *  call-seq:
@@ -878,7 +1359,7 @@
   if (MRB_RHASH_DEFAULT_P(hash)) {
     if (MRB_RHASH_PROCDEFAULT_P(hash)) {
       if (!given) return mrb_nil_value();
-      return mrb_funcall(mrb, RHASH_PROCDEFAULT(hash), "call", 2, hash, key);
+      return mrb_funcall_id(mrb, RHASH_PROCDEFAULT(hash), MRB_SYM(call), 2, hash, key);
     }
     else {
       return RHASH_IFNONE(hash);
@@ -913,8 +1394,8 @@
 {
   mrb_value ifnone = mrb_get_arg1(mrb);
 
-  mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern_lit(mrb, "ifnone"), ifnone);
+  hash_modify(mrb, hash);
+  mrb_iv_set(mrb, hash, MRB_SYM(ifnone), ifnone);
   RHASH(hash)->flags &= ~MRB_HASH_PROC_DEFAULT;
   if (!mrb_nil_p(ifnone)) {
     RHASH(hash)->flags |= MRB_HASH_DEFAULT;
@@ -940,7 +1421,6 @@
  *     a                                  #=> nil, nil, 4
  */
 
-
 static mrb_value
 mrb_hash_default_proc(mrb_state *mrb, mrb_value hash)
 {
@@ -968,8 +1448,8 @@
 {
   mrb_value ifnone = mrb_get_arg1(mrb);
 
-  mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern_lit(mrb, "ifnone"), ifnone);
+  hash_modify(mrb, hash);
+  mrb_iv_set(mrb, hash, MRB_SYM(ifnone), ifnone);
   if (!mrb_nil_p(ifnone)) {
     RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
     RHASH(hash)->flags |= MRB_HASH_DEFAULT;
@@ -985,10 +1465,10 @@
 MRB_API mrb_value
 mrb_hash_delete_key(mrb_state *mrb, mrb_value hash, mrb_value key)
 {
-  htable *t = RHASH_TBL(hash);
   mrb_value del_val;
 
-  if (ht_del(mrb, t, key, &del_val)) {
+  hash_modify(mrb, hash);
+  if (h_delete(mrb, mrb_hash_ptr(hash), key, &del_val)) {
     return del_val;
   }
 
@@ -1000,38 +1480,10 @@
 mrb_hash_delete(mrb_state *mrb, mrb_value self)
 {
   mrb_value key = mrb_get_arg1(mrb);
-
-  mrb_hash_modify(mrb, self);
+  mrb->c->ci->mid = 0;
   return mrb_hash_delete_key(mrb, self, key);
 }
 
-/* find first element in the hash table, and remove it. */
-static void
-ht_shift(mrb_state *mrb, htable *t, mrb_value *kp, mrb_value *vp)
-{
-  segment *seg = t->rootseg;
-  mrb_int i;
-
-  while (seg) {
-    for (i=0; i<seg->size; i++) {
-      mrb_value key;
-
-      if (!seg->next && i >= t->last_len) {
-        return;
-      }
-      key = seg->ei.key;
-      if (mrb_undef_p(key)) continue;
-      *kp = key;
-      *vp = seg->ei.val;
-      /* delete element */
-      seg->ei.key = mrb_undef_value();
-      t->size--;
-      return;
-    }
-    seg = seg->next;
-  }
-}
-
 /* 15.2.13.4.24 */
 /*
  *  call-seq:
@@ -1049,27 +1501,19 @@
 static mrb_value
 mrb_hash_shift(mrb_state *mrb, mrb_value hash)
 {
-  htable *t = RHASH_TBL(hash);
+  struct RHash *h = mrb_hash_ptr(hash);
 
-  mrb_hash_modify(mrb, hash);
-  if (t && t->size > 0) {
+  hash_modify(mrb, hash);
+  if (h_size(h) == 0) {
+    return mrb_nil_value();
+  }
+  else {
     mrb_value del_key, del_val;
-
-    ht_shift(mrb, t, &del_key, &del_val);
+    h_shift(mrb, h, &del_key, &del_val);
     mrb_gc_protect(mrb, del_key);
     mrb_gc_protect(mrb, del_val);
     return mrb_assoc_new(mrb, del_key, del_val);
   }
-
-  if (MRB_RHASH_DEFAULT_P(hash)) {
-    if (MRB_RHASH_PROCDEFAULT_P(hash)) {
-      return mrb_funcall(mrb, RHASH_PROCDEFAULT(hash), "call", 2, hash, mrb_nil_value());
-    }
-    else {
-      return RHASH_IFNONE(hash);
-    }
-  }
-  return mrb_nil_value();
 }
 
 /* 15.2.13.4.4  */
@@ -1087,13 +1531,8 @@
 MRB_API mrb_value
 mrb_hash_clear(mrb_state *mrb, mrb_value hash)
 {
-  htable *t = RHASH_TBL(hash);
-
-  mrb_hash_modify(mrb, hash);
-  if (t) {
-    ht_free(mrb, t);
-    RHASH_TBL(hash) = NULL;
-  }
+  hash_modify(mrb, hash);
+  h_clear(mrb, mrb_hash_ptr(hash));
   return hash;
 }
 
@@ -1129,18 +1568,15 @@
 MRB_API mrb_int
 mrb_hash_size(mrb_state *mrb, mrb_value hash)
 {
-  htable *t = RHASH_TBL(hash);
-
-  if (!t) return 0;
-  return t->size;
+  return (mrb_int)h_size(mrb_hash_ptr(hash));
 }
 
 /* 15.2.13.4.20 */
 /* 15.2.13.4.25 */
 /*
  *  call-seq:
- *     hsh.length    ->  fixnum
- *     hsh.size      ->  fixnum
+ *     hsh.length    ->  integer
+ *     hsh.size      ->  integer
  *
  *  Returns the number of key-value pairs in the hash.
  *
@@ -1153,16 +1589,13 @@
 mrb_hash_size_m(mrb_state *mrb, mrb_value self)
 {
   mrb_int size = mrb_hash_size(mrb, self);
-  return mrb_fixnum_value(size);
+  return mrb_int_value(mrb, size);
 }
 
 MRB_API mrb_bool
 mrb_hash_empty_p(mrb_state *mrb, mrb_value self)
 {
-  htable *t = RHASH_TBL(self);
-
-  if (!t) return TRUE;
-  return t->size == 0;
+  return h_size(mrb_hash_ptr(self)) == 0;
 }
 
 /* 15.2.13.4.12 */
@@ -1181,13 +1614,6 @@
   return mrb_bool_value(mrb_hash_empty_p(mrb, self));
 }
 
-static int
-hash_keys_i(mrb_state *mrb, mrb_value key, mrb_value val, void *p)
-{
-  mrb_ary_push(mrb, *(mrb_value*)p, key);
-  return 0;
-}
-
 /* 15.2.13.4.19 */
 /*
  *  call-seq:
@@ -1204,24 +1630,14 @@
 MRB_API mrb_value
 mrb_hash_keys(mrb_state *mrb, mrb_value hash)
 {
-  htable *t = RHASH_TBL(hash);
-  mrb_int size;
-  mrb_value ary;
-
-  if (!t || (size = t->size) == 0)
-    return mrb_ary_new(mrb);
-  ary = mrb_ary_new_capa(mrb, size);
-  ht_foreach(mrb, t, hash_keys_i, (void*)&ary);
+  struct RHash *h = mrb_hash_ptr(hash);
+  mrb_value ary = mrb_ary_new_capa(mrb, (mrb_int)h_size(h));
+  h_each(h, entry, {
+    mrb_ary_push(mrb, ary, entry->key);
+  });
   return ary;
 }
 
-static int
-hash_vals_i(mrb_state *mrb, mrb_value key, mrb_value val, void *p)
-{
-  mrb_ary_push(mrb, *(mrb_value*)p, val);
-  return 0;
-}
-
 /* 15.2.13.4.28 */
 /*
  *  call-seq:
@@ -1238,14 +1654,11 @@
 MRB_API mrb_value
 mrb_hash_values(mrb_state *mrb, mrb_value hash)
 {
-  htable *t = RHASH_TBL(hash);
-  mrb_int size;
-  mrb_value ary;
-
-  if (!t || (size = t->size) == 0)
-    return mrb_ary_new(mrb);
-  ary = mrb_ary_new_capa(mrb, size);
-  ht_foreach(mrb, t, hash_vals_i, (void*)&ary);
+  struct RHash *h = mrb_hash_ptr(hash);
+  mrb_value ary = mrb_ary_new_capa(mrb, (mrb_int)h_size(h));
+  h_each(h, entry, {
+    mrb_ary_push(mrb, ary, entry->val);
+  });
   return ary;
 }
 
@@ -1271,13 +1684,8 @@
 MRB_API mrb_bool
 mrb_hash_key_p(mrb_state *mrb, mrb_value hash, mrb_value key)
 {
-  htable *t;
-
-  t = RHASH_TBL(hash);
-  if (ht_get(mrb, t, key, NULL)) {
-    return TRUE;
-  }
-  return FALSE;
+  mrb_value val;
+  return h_get(mrb, mrb_hash_ptr(hash), key, &val);
 }
 
 static mrb_value
@@ -1290,23 +1698,6 @@
   return mrb_bool_value(key_p);
 }
 
-struct has_v_arg {
-  mrb_bool found;
-  mrb_value val;
-};
-
-static int
-hash_has_value_i(mrb_state *mrb, mrb_value key, mrb_value val, void *p)
-{
-  struct has_v_arg *arg = (struct has_v_arg*)p;
-  
-  if (mrb_equal(mrb, arg->val, val)) {
-    arg->found = TRUE;
-    return 1;
-  }
-  return 0;
-}
-
 /* 15.2.13.4.14 */
 /* 15.2.13.4.27 */
 /*
@@ -1326,41 +1717,32 @@
 mrb_hash_has_value(mrb_state *mrb, mrb_value hash)
 {
   mrb_value val = mrb_get_arg1(mrb);
-  struct has_v_arg arg;
-  
-  arg.found = FALSE;
-  arg.val = val;
-  ht_foreach(mrb, RHASH_TBL(hash), hash_has_value_i, &arg);
-  return mrb_bool_value(arg.found);
-}
-
-static int
-merge_i(mrb_state *mrb, mrb_value key, mrb_value val, void *data)
-{
-  htable *h1 = (htable*)data;
-
-  ht_put(mrb, h1, key, val);
-  return 0;
+  struct RHash *h = mrb_hash_ptr(hash);
+  h_each(h, entry, {
+    h_check_modified(mrb, h, {
+      if (mrb_equal(mrb, val, entry->val)) return mrb_true_value();
+    });
+  });
+  return mrb_false_value();
 }
 
 MRB_API void
 mrb_hash_merge(mrb_state *mrb, mrb_value hash1, mrb_value hash2)
 {
-  htable *h1, *h2;
-
-  mrb_hash_modify(mrb, hash1);
-  hash2 = mrb_ensure_hash_type(mrb, hash2);
-  h1 = RHASH_TBL(hash1);
-  h2 = RHASH_TBL(hash2);
-
-  if (!h2) return;
-  if (!h1) {
-    RHASH_TBL(hash1) = ht_copy(mrb, h2);
-    return;
-  }
-  ht_foreach(mrb, h2, merge_i, h1);
-  mrb_write_barrier(mrb, (struct RBasic*)RHASH(hash1));
-  return;
+  struct RHash *h1, *h2;
+
+  hash_modify(mrb, hash1);
+  mrb_ensure_hash_type(mrb, hash2);
+  h1 = mrb_hash_ptr(hash1);
+  h2 = mrb_hash_ptr(hash2);
+
+  if (h1 == h2) return;
+  if (h_size(h2) == 0) return;
+  h_each(h2, entry, {
+    h_check_modified(mrb, h2, {h_set(mrb, h1, entry->key, entry->val);});
+    mrb_field_write_barrier_value(mrb, (struct RBasic *)h1, entry->key);
+    mrb_field_write_barrier_value(mrb, (struct RBasic *)h1, entry->val);
+  });
 }
 
 /*
@@ -1375,14 +1757,10 @@
  *     k = keys0
  *     h = {}
  *     keys.each{|key| hkey = key0}
- *     h     #=> { 1=> 1, 2=> 2, 3=> 3, 4=> 4, 5=> 5, 6=> 6, 7=> 7,
- *                 8=> 8, 9=> 9,10=>10,11=>11,12=>12,13=>13,14=>14,
- *                15=>15,16=>16,17=>17}
+ *     h     #=> { 1=>1, 2=>2, ... 16=>16, 17=>17}
  *     hk  #=> 1
  *     k0 = keys.size + 1
- *     h     #=> {18=> 1, 2=> 2, 3=> 3, 4=> 4, 5=> 5, 6=> 6, 7=> 7,
- *                 8=> 8, 9=> 9,10=>10,11=>11,12=>12,13=>13,14=>14,
- *                15=>15,16=>16,17=>17}
+ *     h     #=> {18=>1, 2=>2, ... 16=>16, 17=>17}
  *     hk  #=> nil
  *     h.rehash
  *     hk  #=> 1
@@ -1390,7 +1768,7 @@
 static mrb_value
 mrb_hash_rehash(mrb_state *mrb, mrb_value self)
 {
-  ht_compact(mrb, RHASH_TBL(self));
+  h_rehash(mrb, mrb_hash_ptr(self));
   return self;
 }
 
@@ -1402,11 +1780,10 @@
   mrb->hash_class = h = mrb_define_class(mrb, "Hash", mrb->object_class);              /* 15.2.13 */
   MRB_SET_INSTANCE_TT(h, MRB_TT_HASH);
 
-  mrb_define_method(mrb, h, "initialize_copy", mrb_hash_init_copy,   MRB_ARGS_REQ(1));
   mrb_define_method(mrb, h, "",              mrb_hash_aget,        MRB_ARGS_REQ(1)); /* 15.2.13.4.2  */
   mrb_define_method(mrb, h, "=",             mrb_hash_aset,        MRB_ARGS_REQ(2)); /* 15.2.13.4.3  */
   mrb_define_method(mrb, h, "clear",           mrb_hash_clear,       MRB_ARGS_NONE()); /* 15.2.13.4.4  */
-  mrb_define_method(mrb, h, "default",         mrb_hash_default,     MRB_ARGS_OPT(1));  /* 15.2.13.4.5  */
+  mrb_define_method(mrb, h, "default",         mrb_hash_default,     MRB_ARGS_OPT(1)); /* 15.2.13.4.5  */
   mrb_define_method(mrb, h, "default=",        mrb_hash_set_default, MRB_ARGS_REQ(1)); /* 15.2.13.4.6  */
   mrb_define_method(mrb, h, "default_proc",    mrb_hash_default_proc,MRB_ARGS_NONE()); /* 15.2.13.4.7  */
   mrb_define_method(mrb, h, "default_proc=",   mrb_hash_set_default_proc,MRB_ARGS_REQ(1)); /* 15.2.13.4.7  */
@@ -1416,10 +1793,12 @@
   mrb_define_method(mrb, h, "has_value?",      mrb_hash_has_value,   MRB_ARGS_REQ(1)); /* 15.2.13.4.14 */
   mrb_define_method(mrb, h, "include?",        mrb_hash_has_key,     MRB_ARGS_REQ(1)); /* 15.2.13.4.15 */
   mrb_define_method(mrb, h, "initialize",      mrb_hash_init,        MRB_ARGS_OPT(1)|MRB_ARGS_BLOCK()); /* 15.2.13.4.16 */
+  mrb_define_method(mrb, h, "initialize_copy", mrb_hash_init_copy,   MRB_ARGS_REQ(1)); /* 15.2.13.4.17 */
   mrb_define_method(mrb, h, "key?",            mrb_hash_has_key,     MRB_ARGS_REQ(1)); /* 15.2.13.4.18 */
   mrb_define_method(mrb, h, "keys",            mrb_hash_keys,        MRB_ARGS_NONE()); /* 15.2.13.4.19 */
   mrb_define_method(mrb, h, "length",          mrb_hash_size_m,      MRB_ARGS_NONE()); /* 15.2.13.4.20 */
   mrb_define_method(mrb, h, "member?",         mrb_hash_has_key,     MRB_ARGS_REQ(1)); /* 15.2.13.4.21 */
+  mrb_define_method(mrb, h, "replace",         mrb_hash_init_copy,   MRB_ARGS_REQ(1)); /* 15.2.13.4.23 */
   mrb_define_method(mrb, h, "shift",           mrb_hash_shift,       MRB_ARGS_NONE()); /* 15.2.13.4.24 */
   mrb_define_method(mrb, h, "size",            mrb_hash_size_m,      MRB_ARGS_NONE()); /* 15.2.13.4.25 */
   mrb_define_method(mrb, h, "store",           mrb_hash_aset,        MRB_ARGS_REQ(2)); /* 15.2.13.4.26 */

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

@@ -13,13 +13,14 @@
 #include <mruby/variable.h>
 #include <mruby/error.h>
 #include <mruby/istruct.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func)
 {
   struct RClass *c = mrb_class(mrb, obj);
   mrb_method_t m = mrb_method_search_vm(mrb, &c, mid);
-  struct RProc *p;
+  const struct RProc *p;
 
   if (MRB_METHOD_UNDEF_P(m)) return FALSE;
   if (MRB_METHOD_FUNC_P(m))
@@ -33,7 +34,7 @@
 static mrb_bool
 mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj)
 {
-  return mrb_func_basic_p(mrb, obj, mrb_intern_lit(mrb, "to_s"), mrb_any_to_s);
+  return mrb_func_basic_p(mrb, obj, MRB_SYM(to_s), mrb_any_to_s);
 }
 
 /* 15.3.1.3.17 */
@@ -83,8 +84,8 @@
  *  Document-method: object_id
  *
  *  call-seq:
- *     obj.__id__       -> fixnum
- *     obj.object_id    -> fixnum
+ *     obj.__id__       -> int
+ *     obj.object_id    -> int
  *
  *  Returns an integer identifier for <i>obj</i>. The same number will
  *  be returned on all calls to <code>id</code> for a given object, and
@@ -99,6 +100,18 @@
   return mrb_fixnum_value(mrb_obj_id(self));
 }
 
+static int
+env_bidx(struct REnv *e)
+{
+  int bidx;
+
+  /* use saved block arg position */
+  bidx = MRB_ENV_BIDX(e);
+  /* bidx may be useless (e.g. define_method) */
+  if (bidx >= MRB_ENV_LEN(e)) return -1;
+  return bidx;
+}
+
 /* 15.3.1.2.2  */
 /* 15.3.1.2.5  */
 /* 15.3.1.3.6  */
@@ -129,7 +142,9 @@
   mrb_callinfo *ci = &mrb->c->ci-1;
   mrb_callinfo *cibase = mrb->c->cibase;
   mrb_value *bp;
-  struct RProc *p;
+  int bidx;
+  struct REnv *e = NULL;
+  const struct RProc *p;
 
   if (ci <= cibase) {
     /* toplevel does not have block */
@@ -139,40 +154,44 @@
   /* search method/class/module proc */
   while (p) {
     if (MRB_PROC_SCOPE_P(p)) break;
+    e = MRB_PROC_ENV(p);
     p = p->upper;
   }
   if (p == NULL) return mrb_false_value();
+  if (e) {
+    bidx = env_bidx(e);
+    if (bidx < 0) return mrb_false_value();
+    bp = &e->stackbidx;
+    goto block_given;
+  }
   /* search ci corresponding to proc */
   while (cibase < ci) {
     if (ci->proc == p) break;
     ci--;
   }
   if (ci == cibase) {
-    return mrb_false_value();
+    /* proc is closure */
+    if (!MRB_PROC_ENV_P(p)) return mrb_false_value();
+    e = MRB_PROC_ENV(p);
+    bidx = env_bidx(e);
+    if (bidx < 0) return mrb_false_value();
+    bp = &e->stackbidx;
   }
-  else if (ci->env) {
-    struct REnv *e = ci->env;
-    int bidx;
-
+  else if ((e = mrb_vm_ci_env(ci)) != NULL) {
     /* top-level does not have block slot (always false) */
-    if (e->stack == mrb->c->stbase)
-      return mrb_false_value();
-    /* use saved block arg position */
-    bidx = MRB_ENV_BIDX(e);
+    if (e->stack == mrb->c->stbase) return mrb_false_value();
+    bidx = env_bidx(e);
     /* bidx may be useless (e.g. define_method) */
-    if (bidx >= MRB_ENV_LEN(e))
-      return mrb_false_value();
+    if (bidx < 0) return mrb_false_value();
     bp = &e->stackbidx;
   }
   else {
-    bp = ci1.stackent+1;
-    if (ci->argc >= 0) {
-      bp += ci->argc;
-    }
-    else {
-      bp++;
-    }
+    uint8_t n = ci->n == 15 ? 1 : ci->n;
+    uint8_t k = ci->nk == 15 ? 1 : ci->nk*2;
+    bidx = n + k + 1;      /* self + args + kargs => bidx */
+    bp = &ci->stackbidx;
   }
+ block_given:
   if (mrb_nil_p(*bp))
     return mrb_false_value();
   return mrb_true_value();
@@ -187,7 +206,7 @@
  *  called with an explicit receiver, as <code>class</code> is also a
  *  reserved word in Ruby.
  *
- *     1.class      #=> Fixnum
+ *     1.class      #=> Integer
  *     self.class   #=> Object
  */
 static mrb_value
@@ -196,189 +215,8 @@
   return mrb_obj_value(mrb_obj_class(mrb, self));
 }
 
-static struct RClass*
-mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj)
-{
-  struct RClass *klass = mrb_basic_ptr(obj)->c;
-
-  if (klass->tt != MRB_TT_SCLASS)
-    return klass;
-  else {
-    /* copy singleton(unnamed) class */
-    struct RClass *clone = (struct RClass*)mrb_obj_alloc(mrb, klass->tt, mrb->class_class);
-
-    switch (mrb_type(obj)) {
-    case MRB_TT_CLASS:
-    case MRB_TT_SCLASS:
-      break;
-    default:
-      clone->c = mrb_singleton_class_clone(mrb, mrb_obj_value(klass));
-      break;
-    }
-    clone->super = klass->super;
-    if (klass->iv) {
-      mrb_iv_copy(mrb, mrb_obj_value(clone), mrb_obj_value(klass));
-      mrb_obj_iv_set(mrb, (struct RObject*)clone, mrb_intern_lit(mrb, "__attached__"), obj);
-    }
-    if (klass->mt) {
-      clone->mt = kh_copy(mt, mrb, klass->mt);
-    }
-    else {
-      clone->mt = kh_init(mt, mrb);
-    }
-    clone->tt = MRB_TT_SCLASS;
-    return clone;
-  }
-}
-
-static void
-copy_class(mrb_state *mrb, mrb_value dst, mrb_value src)
-{
-  struct RClass *dc = mrb_class_ptr(dst);
-  struct RClass *sc = mrb_class_ptr(src);
-  /* if the origin is not the same as the class, then the origin and
-     the current class need to be copied */
-  if (sc->flags & MRB_FL_CLASS_IS_PREPENDED) {
-    struct RClass *c0 = sc->super;
-    struct RClass *c1 = dc;
-
-    /* copy prepended iclasses */
-    while (!(c0->flags & MRB_FL_CLASS_IS_ORIGIN)) {
-      c1->super = mrb_class_ptr(mrb_obj_dup(mrb, mrb_obj_value(c0)));
-      c1 = c1->super;
-      c0 = c0->super;
-    }
-    c1->super = mrb_class_ptr(mrb_obj_dup(mrb, mrb_obj_value(c0)));
-    c1->super->flags |= MRB_FL_CLASS_IS_ORIGIN;
-  }
-  if (sc->mt) {
-    dc->mt = kh_copy(mt, mrb, sc->mt);
-  }
-  else {
-    dc->mt = kh_init(mt, mrb);
-  }
-  dc->super = sc->super;
-  MRB_SET_INSTANCE_TT(dc, MRB_INSTANCE_TT(sc));
-}
-
-static void
-init_copy(mrb_state *mrb, mrb_value dest, mrb_value obj)
-{
-  switch (mrb_type(obj)) {
-    case MRB_TT_ICLASS:
-      copy_class(mrb, dest, obj);
-      return;
-    case MRB_TT_CLASS:
-    case MRB_TT_MODULE:
-      copy_class(mrb, dest, obj);
-      mrb_iv_copy(mrb, dest, obj);
-      mrb_iv_remove(mrb, dest, mrb_intern_lit(mrb, "__classname__"));
-      break;
-    case MRB_TT_OBJECT:
-    case MRB_TT_SCLASS:
-    case MRB_TT_HASH:
-    case MRB_TT_DATA:
-    case MRB_TT_EXCEPTION:
-      mrb_iv_copy(mrb, dest, obj);
-      break;
-    case MRB_TT_ISTRUCT:
-      mrb_istruct_copy(dest, obj);
-      break;
-
-    default:
-      break;
-  }
-  mrb_funcall(mrb, dest, "initialize_copy", 1, obj);
-}
-
-/* 15.3.1.3.8  */
-/*
- *  call-seq:
- *     obj.clone -> an_object
- *
- *  Produces a shallow copy of <i>obj</i>---the instance variables of
- *  <i>obj</i> are copied, but not the objects they reference. Copies
- *  the frozen state of <i>obj</i>. See also the discussion
- *  under <code>Object#dup</code>.
- *
- *     class Klass
- *        attr_accessor :str
- *     end
- *     s1 = Klass.new      #=> #<Klass:0x401b3a38>
- *     s1.str = "Hello"    #=> "Hello"
- *     s2 = s1.clone       #=> #<Klass:0x401b3998 @str="Hello">
- *     s2.str1,4 = "i"   #=> "i"
- *     s1.inspect          #=> "#<Klass:0x401b3a38 @str=\"Hi\">"
- *     s2.inspect          #=> "#<Klass:0x401b3998 @str=\"Hi\">"
- *
- *  This method may have class-specific behavior.  If so, that
- *  behavior will be documented under the #+initialize_copy+ method of
- *  the class.
- *
- *  Some Class(True False Nil Symbol Fixnum Float) Object  cannot clone.
- */
-MRB_API mrb_value
-mrb_obj_clone(mrb_state *mrb, mrb_value self)
-{
-  struct RObject *p;
-  mrb_value clone;
-
-  if (mrb_immediate_p(self)) {
-    return self;
-  }
-  if (mrb_sclass_p(self)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "can't clone singleton class");
-  }
-  p = (struct RObject*)mrb_obj_alloc(mrb, mrb_type(self), mrb_obj_class(mrb, self));
-  p->c = mrb_singleton_class_clone(mrb, self);
-  mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)p->c);
-  clone = mrb_obj_value(p);
-  init_copy(mrb, clone, self);
-  p->flags |= mrb_obj_ptr(self)->flags & MRB_FL_OBJ_IS_FROZEN;
-
-  return clone;
-}
-
-/* 15.3.1.3.9  */
-/*
- *  call-seq:
- *     obj.dup -> an_object
- *
- *  Produces a shallow copy of <i>obj</i>---the instance variables of
- *  <i>obj</i> are copied, but not the objects they reference.
- *  <code>dup</code> copies the frozen state of <i>obj</i>. See also
- *  the discussion under <code>Object#clone</code>. In general,
- *  <code>clone</code> and <code>dup</code> may have different semantics
- *  in descendant classes. While <code>clone</code> is used to duplicate
- *  an object, including its internal state, <code>dup</code> typically
- *  uses the class of the descendant object to create the new instance.
- *
- *  This method may have class-specific behavior.  If so, that
- *  behavior will be documented under the #+initialize_copy+ method of
- *  the class.
- */
-
-MRB_API mrb_value
-mrb_obj_dup(mrb_state *mrb, mrb_value obj)
-{
-  struct RBasic *p;
-  mrb_value dup;
-
-  if (mrb_immediate_p(obj)) {
-    return obj;
-  }
-  if (mrb_sclass_p(obj)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "can't dup singleton class");
-  }
-  p = mrb_obj_alloc(mrb, mrb_type(obj), mrb_obj_class(mrb, obj));
-  dup = mrb_obj_value(p);
-  init_copy(mrb, dup, obj);
-
-  return dup;
-}
-
 static mrb_value
-mrb_obj_extend(mrb_state *mrb, mrb_int argc, mrb_value *argv, mrb_value obj)
+mrb_obj_extend(mrb_state *mrb, mrb_int argc, const mrb_value *argv, mrb_value obj)
 {
   mrb_int i;
 
@@ -389,8 +227,8 @@
     mrb_check_type(mrb, argvi, MRB_TT_MODULE);
   }
   while (argc--) {
-    mrb_funcall(mrb, argvargc, "extend_object", 1, obj);
-    mrb_funcall(mrb, argvargc, "extended", 1, obj);
+    mrb_funcall_id(mrb, argvargc, MRB_SYM(extend_object), 1, obj);
+    mrb_funcall_id(mrb, argvargc, MRB_SYM(extended), 1, obj);
   }
   return obj;
 }
@@ -423,7 +261,7 @@
 static mrb_value
 mrb_obj_extend_m(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc;
 
   mrb_get_args(mrb, "*", &argv, &argc);
@@ -452,22 +290,22 @@
 /* 15.3.1.3.15 */
 /*
  *  call-seq:
- *     obj.hash    -> fixnum
+ *     obj.hash    -> int
  *
- *  Generates a <code>Fixnum</code> hash value for this object. This
+ *  Generates a <code>Integer</code> hash value for this object. This
  *  function must have the property that <code>a.eql?(b)</code> implies
  *  <code>a.hash == b.hash</code>. The hash value is used by class
  *  <code>Hash</code>. Any hash value that exceeds the capacity of a
- *  <code>Fixnum</code> will be truncated before being used.
+ *  <code>Integer</code> will be truncated before being used.
  */
 static mrb_value
 mrb_obj_hash(mrb_state *mrb, mrb_value self)
 {
-  return mrb_fixnum_value(mrb_obj_id(self));
+  return mrb_int_value(mrb, mrb_obj_id(self));
 }
 
 /* 15.3.1.3.16 */
-static mrb_value
+mrb_value
 mrb_obj_init_copy(mrb_state *mrb, mrb_value self)
 {
   mrb_value orig = mrb_get_arg1(mrb);
@@ -479,7 +317,6 @@
   return self;
 }
 
-
 MRB_API mrb_bool
 mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c)
 {
@@ -498,11 +335,11 @@
 static mrb_value
 obj_is_instance_of(mrb_state *mrb, mrb_value self)
 {
-  mrb_value arg;
+  struct RClass *c;
 
-  mrb_get_args(mrb, "C", &arg);
+  mrb_get_args(mrb, "c", &c);
 
-  return mrb_bool_value(mrb_obj_is_instance_of(mrb, self, mrb_class_ptr(arg)));
+  return mrb_bool_value(mrb_obj_is_instance_of(mrb, self, c));
 }
 
 /* 15.3.1.3.24 */
@@ -535,16 +372,13 @@
 static mrb_value
 mrb_obj_is_kind_of_m(mrb_state *mrb, mrb_value self)
 {
-  mrb_value arg;
+  struct RClass *c;
 
-  mrb_get_args(mrb, "C", &arg);
+  mrb_get_args(mrb, "c", &c);
 
-  return mrb_bool_value(mrb_obj_is_kind_of(mrb, self, mrb_class_ptr(arg)));
+  return mrb_bool_value(mrb_obj_is_kind_of(mrb, self, c));
 }
 
-KHASH_DECLARE(st, mrb_sym, char, FALSE)
-KHASH_DEFINE(st, mrb_sym, char, FALSE, kh_int_hash_func, kh_int_hash_equal)
-
 /* 15.3.1.3.32 */
 /*
  * call_seq:
@@ -586,8 +420,8 @@
   mrb_value a2, exc;
   mrb_int argc;
 
-
   argc = mrb_get_args(mrb, "|oo", &a0, &a1);
+  mrb->c->ci->mid = 0;
   switch (argc) {
   case 0:
     mrb_raise(mrb, E_RUNTIME_ERROR, "");
@@ -673,7 +507,7 @@
  *         # ...
  *       end
  *       def method_missing(methId)
- *         str = methId.id2name
+ *         str = methId.to_s
  *         romanToInt(str)
  *       end
  *     end
@@ -683,13 +517,14 @@
  *     r.xxiii   #=> 23
  *     r.mm      #=> 2000
  */
-static mrb_value
+mrb_value
 mrb_obj_missing(mrb_state *mrb, mrb_value mod)
 {
   mrb_sym name;
-  mrb_value *a;
+  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 */
@@ -727,7 +562,7 @@
   mrb_get_args(mrb, "n|b", &id, &priv);
   respond_to_p = basic_obj_respond_to(mrb, self, id, !priv);
   if (!respond_to_p) {
-    rtm_id = mrb_intern_lit(mrb, "respond_to_missing?");
+    rtm_id = MRB_SYM_Q(respond_to_missing);
     if (basic_obj_respond_to(mrb, self, rtm_id, !priv)) {
       mrb_value args2, v;
       args0 = mrb_symbol_value(id);
@@ -744,9 +579,28 @@
 {
   mrb_value v = mrb_get_arg1(mrb);
   mrb_int i, len;
-  mrb_sym eqq = mrb_intern_lit(mrb, "===");
-  mrb_value ary = mrb_ary_splat(mrb, self);
+  mrb_sym eqq = MRB_OPSYM(eqq);
+  mrb_value ary;
 
+  mrb->c->ci->mid = 0;
+  if (mrb_array_p(self)) {
+    ary = self;
+  }
+  else if (mrb_nil_p(self)) {
+    return mrb_false_value();
+  }
+  else if (!mrb_respond_to(mrb, self, mrb_intern_lit(mrb, "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);
+    if (mrb_nil_p(ary)) {
+      return mrb_funcall_argv(mrb, self, eqq, 1, &v);
+    }
+    mrb_ensure_array_type(mrb, ary);
+  }
   len = RARRAY_LEN(ary);
   for (i=0; i<len; i++) {
     mrb_value c = mrb_funcall_argv(mrb, mrb_ary_entry(ary, i), eqq, 1, &v);
@@ -755,6 +609,17 @@
   return mrb_false_value();
 }
 
+static mrb_value
+mrb_encoding(mrb_state *mrb, mrb_value self)
+{
+  mrb_get_args(mrb, "");
+#ifdef MRB_UTF8_STRING
+  return mrb_str_new_lit(mrb, "UTF-8");
+#else
+  return mrb_str_new_lit(mrb, "ASCII-8BIT");
+#endif
+}
+
 mrb_value mrb_obj_equal_m(mrb_state *mrb, mrb_value);
 
 void
@@ -794,8 +659,8 @@
   mrb_define_method(mrb, krn, "respond_to?",                obj_respond_to,                  MRB_ARGS_ARG(1,1));     /* 15.3.1.3.43 */
   mrb_define_method(mrb, krn, "to_s",                       mrb_any_to_s,                    MRB_ARGS_NONE());    /* 15.3.1.3.46 */
   mrb_define_method(mrb, krn, "__case_eqq",                 mrb_obj_ceqq,                    MRB_ARGS_REQ(1));    /* internal */
-  mrb_define_method(mrb, krn, "__to_int",                   mrb_to_int,                      MRB_ARGS_NONE()); /* internal */
-  mrb_define_method(mrb, krn, "__to_str",                   mrb_to_str,                      MRB_ARGS_NONE()); /* internal */
+  mrb_define_method(mrb, krn, "__to_int",                   mrb_ensure_int_type,             MRB_ARGS_NONE());    /* internal */
+  mrb_define_method(mrb, krn, "__ENCODING__",               mrb_encoding,                    MRB_ARGS_NONE());
 
   mrb_include_module(mrb, mrb->object_class, mrb->kernel_module);
 }

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

@@ -4,10 +4,7 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <mruby.h>
 #include <mruby/dump.h>
 #include <mruby/irep.h>
 #include <mruby/proc.h>
@@ -15,6 +12,8 @@
 #include <mruby/debug.h>
 #include <mruby/error.h>
 #include <mruby/data.h>
+#include <mruby/endian.h>
+#include <string.h>
 
 #if SIZE_MAX < UINT32_MAX
 # error size_t must be at least 32 bits wide
@@ -25,58 +24,54 @@
 
 #define SIZE_ERROR_MUL(nmemb, size) ((size_t)(nmemb) > SIZE_MAX / (size))
 
-static size_t
-skip_padding(const uint8_t *buf)
-{
-  const size_t align = MRB_DUMP_ALIGNMENT;
-  return -(intptr_t)buf & (align-1);
-}
-
-static size_t
-offset_crc_body(void)
-{
-  struct rite_binary_header header;
-  return ((uint8_t *)header.binary_crc - (uint8_t *)&header) + sizeof(header.binary_crc);
-}
-
-#ifndef MRB_WITHOUT_FLOAT
-double mrb_str_len_to_dbl(mrb_state *mrb, const char *s, size_t len, mrb_bool badcheck);
+#define DEFINE_READ_IREP_FUNC(funcdecl, basecall) \
+  funcdecl \
+  { \
+    int ai = mrb_gc_arena_save(mrb); \
+    struct RProc *proc = basecall; \
+    struct mrb_irep *irep = (mrb_irep*)(proc ? proc->body.irep : NULL); \
+    if (irep) proc->body.irep = NULL; \
+    mrb_gc_arena_restore(mrb, ai); \
+    return irep; \
+  }
 
+#ifndef MRB_NO_FLOAT
 static double
-str_to_double(mrb_state *mrb, const char *p, size_t len)
+str_to_double(mrb_state *mrb, const char *p)
 {
-  /* `i`, `inf`, `infinity` */
-  if (len > 0 && p0 == 'i') return INFINITY;
-
-  /* `I`, `-inf`, `-infinity` */
-  if (p0 == 'I' || (len > 1 && p0 == '-' && p1 == 'i')) return -INFINITY;
-  return mrb_str_len_to_dbl(mrb, p, len, TRUE);
+  /* dump IEEE754 little endian binary */
+  union {
+    char ssizeof(double);
+    double f;
+  } u;
+
+  if (littleendian) {
+    memcpy(u.s, p, sizeof(double));
+  }
+  else {
+    size_t i;
+    for (i=0; i<sizeof(double); i++) {
+      u.si = psizeof(double)-i-1;
+    }
+  }
+  return u.f;
 }
 #endif
 
-mrb_value mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base, int badcheck);
-
-static void
-tempirep_free(mrb_state *mrb, void *p)
-{
-  if (p) mrb_irep_decref(mrb, (mrb_irep *)p);
-}
-
-static const mrb_data_type tempirep_type = { "temporary irep", tempirep_free };
-
-static mrb_irep*
-read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flags)
+static mrb_bool
+read_irep_record_1(mrb_state *mrb, const uint8_t *bin, const uint8_t *end, size_t *len, uint8_t flags, mrb_irep **irepp)
 {
   int i;
   const uint8_t *src = bin;
   ptrdiff_t diff;
   uint16_t tt, pool_data_len, snl;
   int plen;
-  struct RData *irep_obj = mrb_data_object_alloc(mrb, mrb->object_class, NULL, &tempirep_type);
-  mrb_irep *irep = mrb_add_irep(mrb);
+  mrb_pool_value *pool;
+  mrb_sym *syms;
   int ai = mrb_gc_arena_save(mrb);
+  mrb_irep *irep = mrb_add_irep(mrb);
 
-  irep_obj->data = irep;
+  *irepp = irep;
 
   /* skip record size */
   src += sizeof(uint32_t);
@@ -90,192 +85,254 @@
   src += sizeof(uint16_t);
 
   /* number of child irep */
-  irep->rlen = (size_t)bin_to_uint16(src);
+  irep->rlen = bin_to_uint16(src);
   src += sizeof(uint16_t);
 
   /* Binary Data Section */
-  /* ISEQ BLOCK */
-  irep->ilen = (uint16_t)bin_to_uint32(src);
+  /* ISEQ BLOCK (and CATCH HANDLER TABLE BLOCK) */
+  irep->clen = bin_to_uint16(src);  /* number of catch handler */
+  src += sizeof(uint16_t);
+  irep->ilen = bin_to_uint32(src);
   src += sizeof(uint32_t);
-  src += skip_padding(src);
 
   if (irep->ilen > 0) {
+    size_t data_len = sizeof(mrb_code) * irep->ilen +
+                      sizeof(struct mrb_irep_catch_handler) * irep->clen;
+    mrb_static_assert(sizeof(struct mrb_irep_catch_handler) == 13);
     if (SIZE_ERROR_MUL(irep->ilen, sizeof(mrb_code))) {
-      return NULL;
+      return FALSE;
     }
+    if (src + data_len > end) return FALSE;
     if ((flags & FLAG_SRC_MALLOC) == 0) {
       irep->iseq = (mrb_code*)src;
-      src += sizeof(mrb_code) * irep->ilen;
       irep->flags |= MRB_ISEQ_NO_FREE;
     }
     else {
-      size_t data_len = sizeof(mrb_code) * irep->ilen;
       void *buf = mrb_malloc(mrb, data_len);
       irep->iseq = (mrb_code *)buf;
       memcpy(buf, src, data_len);
-      src += data_len;
     }
+    src += data_len;
   }
 
   /* POOL BLOCK */
-  plen = bin_to_uint32(src); /* number of pool */
-  src += sizeof(uint32_t);
+  plen = bin_to_uint16(src); /* number of pool */
+  src += sizeof(uint16_t);
+  if (src > end) return FALSE;
   if (plen > 0) {
     if (SIZE_ERROR_MUL(plen, sizeof(mrb_value))) {
-      return NULL;
+      return FALSE;
     }
-    irep->pool = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * plen);
+    irep->pool = pool = (mrb_pool_value*)mrb_calloc(mrb, sizeof(mrb_pool_value), plen);
 
     for (i = 0; i < plen; i++) {
-      const char *s;
       mrb_bool st = (flags & FLAG_SRC_MALLOC)==0;
 
       tt = *src++; /* pool TT */
-      pool_data_len = bin_to_uint16(src); /* pool data length */
-      src += sizeof(uint16_t);
-      s = (const char*)src;
-      src += pool_data_len;
       switch (tt) { /* pool data */
-      case IREP_TT_FIXNUM: {
-        mrb_value num = mrb_str_len_to_inum(mrb, s, pool_data_len, 10, FALSE);
-#ifdef MRB_WITHOUT_FLOAT
-        irep->pooli = num;
+      case IREP_TT_INT32:
+        {
+          if (src + sizeof(uint32_t) > end) return FALSE;
+          mrb_int v = (int32_t)bin_to_uint32(src);
+          src += sizeof(uint32_t);
+#ifdef MRB_64BIT
+          pooli.tt = IREP_TT_INT64;
+          pooli.u.i64 = (int64_t)v;
+#else
+          pooli.tt = IREP_TT_INT32;
+          pooli.u.i32 = v;
+#endif
+        }
+        break;
+      case IREP_TT_INT64:
+#ifdef MRB_INT64
+        {
+          if (src + sizeof(uint32_t)*2 > end) return FALSE;
+          uint64_t i64 = bin_to_uint32(src);
+          src += sizeof(uint32_t);
+          i64 <<= 32;
+          i64 |= bin_to_uint32(src);
+          src += sizeof(uint32_t);
+          pooli.tt = tt;
+          pooli.u.i64 = (int64_t)i64;
+        }
+        break;
 #else
-        irep->pooli = mrb_float_p(num)? mrb_float_pool(mrb, mrb_float(num)) : num;
+        return FALSE;
 #endif
+
+      case IREP_TT_BIGINT:
+        pool_data_len = bin_to_uint8(src); /* pool data length */
+        src += sizeof(uint8_t);
+        if (src + pool_data_len > end) return FALSE;
+        {
+          char *p;
+          pooli.tt = IREP_TT_BIGINT;
+          p = (char*)mrb_malloc(mrb, pool_data_len+2);
+          memcpy(p, src, pool_data_len+2);
+          pooli.u.str = (const char*)p;
         }
+        src += pool_data_len + 2;
         break;
 
-#ifndef MRB_WITHOUT_FLOAT
       case IREP_TT_FLOAT:
-        irep->pooli = mrb_float_pool(mrb, str_to_double(mrb, s, pool_data_len));
+#ifndef MRB_NO_FLOAT
+        if (src + sizeof(double) > end) return FALSE;
+        pooli.tt = tt;
+        pooli.u.f = str_to_double(mrb, (const char*)src);
+        src += sizeof(double);
         break;
+#else
+        return FALSE;           /* MRB_NO_FLOAT */
 #endif
 
-      case IREP_TT_STRING:
-        irep->pooli = mrb_str_pool(mrb, s, pool_data_len, st);
+      case IREP_TT_STR:
+        pool_data_len = bin_to_uint16(src); /* pool data length */
+        src += sizeof(uint16_t);
+        if (src + pool_data_len > end) return FALSE;
+        if (st) {
+          pooli.tt = (pool_data_len<<2) | IREP_TT_SSTR;
+          pooli.u.str = (const char*)src;
+        }
+        else {
+          char *p;
+          pooli.tt = (pool_data_len<<2) | IREP_TT_STR;
+          p = (char*)mrb_malloc(mrb, pool_data_len+1);
+          memcpy(p, src, pool_data_len+1);
+          pooli.u.str = (const char*)p;
+        }
+        src += pool_data_len + 1;
         break;
 
       default:
         /* should not happen */
-        irep->pooli = mrb_nil_value();
-        break;
+        return FALSE;
       }
-      irep->plen++;
-      mrb_gc_arena_restore(mrb, ai);
+      irep->plen = i+1;
     }
   }
 
   /* SYMS BLOCK */
-  irep->slen = (uint16_t)bin_to_uint32(src);  /* syms length */
-  src += sizeof(uint32_t);
+  irep->slen = bin_to_uint16(src);  /* syms length */
+  src += sizeof(uint16_t);
+  if (src > end) return FALSE;
   if (irep->slen > 0) {
     if (SIZE_ERROR_MUL(irep->slen, sizeof(mrb_sym))) {
-      return NULL;
+      return FALSE;
     }
-    irep->syms = (mrb_sym *)mrb_malloc(mrb, sizeof(mrb_sym) * irep->slen);
+    irep->syms = syms = (mrb_sym *)mrb_malloc(mrb, sizeof(mrb_sym) * irep->slen);
 
     for (i = 0; i < irep->slen; i++) {
       snl = bin_to_uint16(src);               /* symbol name length */
       src += sizeof(uint16_t);
 
       if (snl == MRB_DUMP_NULL_SYM_LEN) {
-        irep->symsi = 0;
+        symsi = 0;
         continue;
       }
 
+      if (src + snl > end) return FALSE;
       if (flags & FLAG_SRC_MALLOC) {
-        irep->symsi = mrb_intern(mrb, (char *)src, snl);
+        symsi = mrb_intern(mrb, (char *)src, snl);
       }
       else {
-        irep->symsi = mrb_intern_static(mrb, (char *)src, snl);
+        symsi = mrb_intern_static(mrb, (char *)src, snl);
       }
       src += snl + 1;
-
       mrb_gc_arena_restore(mrb, ai);
     }
   }
 
-  irep->reps = (mrb_irep**)mrb_calloc(mrb, irep->rlen, sizeof(mrb_irep*));
-
   diff = src - bin;
   mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
   *len = (size_t)diff;
 
-  irep_obj->data = NULL;
-
-  return irep;
+  return TRUE;
 }
 
-static mrb_irep*
-read_irep_record(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flags)
+static mrb_bool
+read_irep_record(mrb_state *mrb, const uint8_t *bin, const uint8_t *end, size_t *len, uint8_t flags, mrb_irep **irepp)
 {
-  struct RData *irep_obj = mrb_data_object_alloc(mrb, mrb->object_class, NULL, &tempirep_type);
   int ai = mrb_gc_arena_save(mrb);
-  mrb_irep *irep = read_irep_record_1(mrb, bin, len, flags);
+  mrb_bool readsuccess = read_irep_record_1(mrb, bin, end, len, flags, irepp);
+  mrb_irep **reps;
   int i;
 
   mrb_gc_arena_restore(mrb, ai);
-  if (irep == NULL) {
-    return NULL;
+  if (!readsuccess) {
+    return FALSE;
   }
 
-  irep_obj->data = irep;
+  reps = (mrb_irep**)mrb_calloc(mrb, (*irepp)->rlen, sizeof(mrb_irep*));
+  (*irepp)->reps = (const mrb_irep**)reps;
 
   bin += *len;
-  for (i=0; i<irep->rlen; i++) {
+  for (i=0; i<(*irepp)->rlen; i++) {
     size_t rlen;
 
-    irep->repsi = read_irep_record(mrb, bin, &rlen, flags);
+    readsuccess = read_irep_record(mrb, bin, end, &rlen, flags, &repsi);
     mrb_gc_arena_restore(mrb, ai);
-    if (irep->repsi == NULL) {
-      return NULL;
+    if (!readsuccess) {
+      return FALSE;
     }
     bin += rlen;
     *len += rlen;
   }
 
-  irep_obj->data = NULL;
-
-  return irep;
+  return TRUE;
 }
 
 static mrb_irep*
-read_section_irep(mrb_state *mrb, const uint8_t *bin, uint8_t flags)
+read_section_irep(mrb_state *mrb, const uint8_t *bin, size_t size, uint8_t flags, struct RProc **proc)
 {
+  if (size < sizeof(struct rite_section_irep_header)) return NULL;
+  /*
+   * This proc object keeps all the data in progress to avoid memory leaks
+   * if something goes wrong while reading irep.
+   */
+  *proc = mrb_proc_new(mrb, NULL);
+
+  mrb_irep **irepp = (mrb_irep**)&(*proc)->body.irep;
   size_t len;
-
   bin += sizeof(struct rite_section_irep_header);
-  return read_irep_record(mrb, bin, &len, flags);
+  if (read_irep_record(mrb, bin, bin+size, &len, flags, irepp)) {
+    return *irepp;
+  }
+  else {
+    return NULL;
+  }
 }
 
 static int
-read_debug_record(mrb_state *mrb, const uint8_t *start, mrb_irep* irep, size_t *record_len, const mrb_sym *filenames, size_t filenames_len)
+read_debug_record(mrb_state *mrb, const uint8_t *start, const uint8_t *end, mrb_irep* irep, size_t *record_len, const mrb_sym *filenames, size_t filenames_len)
 {
   const uint8_t *bin = start;
   ptrdiff_t diff;
   size_t record_size;
   uint16_t f_idx;
   int i;
+  mrb_irep_debug_info *debug;
 
   if (irep->debug_info) { return MRB_DUMP_INVALID_IREP; }
 
-  irep->debug_info = (mrb_irep_debug_info*)mrb_calloc(mrb, 1, sizeof(mrb_irep_debug_info));
-  irep->debug_info->pc_count = (uint32_t)irep->ilen;
+  irep->debug_info = debug = (mrb_irep_debug_info*)mrb_calloc(mrb, 1, sizeof(mrb_irep_debug_info));
+  debug->pc_count = (uint32_t)irep->ilen;
 
   record_size = (size_t)bin_to_uint32(bin);
   bin += sizeof(uint32_t);
 
-  irep->debug_info->flen = bin_to_uint16(bin);
-  irep->debug_info->files = (mrb_irep_debug_info_file**)mrb_calloc(mrb, irep->debug_info->flen, sizeof(mrb_irep_debug_info*));
+  debug->flen = bin_to_uint16(bin);
   bin += sizeof(uint16_t);
+  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 < irep->debug_info->flen; ++f_idx) {
+  for (f_idx = 0; f_idx < debug->flen; ++f_idx) {
     mrb_irep_debug_info_file *file;
     uint16_t filename_idx;
 
+    if (bin > end) return MRB_DUMP_GENERAL_FAILURE;
     file = (mrb_irep_debug_info_file *)mrb_calloc(mrb, 1, sizeof(*file));
-    irep->debug_info->filesf_idx = file;
+    debug->filesf_idx = file;
 
     file->start_pos = bin_to_uint32(bin);
     bin += sizeof(uint32_t);
@@ -292,9 +349,10 @@
     bin += sizeof(uint8_t);
     switch (file->line_type) {
       case mrb_debug_line_ary: {
-        uint32_t l;
+        size_t l = sizeof(uint16_t) * (size_t)file->line_entry_count;
 
-        file->lines.ary = (uint16_t *)mrb_malloc(mrb, 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);
           bin += sizeof(uint16_t);
@@ -302,11 +360,12 @@
       } break;
 
       case mrb_debug_line_flat_map: {
-        uint32_t l;
+        size_t c = (size_t)file->line_entry_count;
+        size_t n = sizeof(mrb_irep_debug_info_line);
 
-        file->lines.flat_map = (mrb_irep_debug_info_line*)mrb_calloc(
-            mrb, (size_t)(file->line_entry_count), sizeof(mrb_irep_debug_info_line));
-        for (l = 0; l < file->line_entry_count; ++l) {
+        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);
           bin += sizeof(uint32_t);
           file->lines.flat_mapl.line = bin_to_uint16(bin);
@@ -314,6 +373,15 @@
         }
       } 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);
+        bin += file->line_entry_count;
+      } break;
+
       default: return MRB_DUMP_GENERAL_FAILURE;
     }
   }
@@ -329,7 +397,7 @@
     size_t len;
     int ret;
 
-    ret = read_debug_record(mrb, bin, irep->repsi, &len, filenames, filenames_len);
+    ret = read_debug_record(mrb, bin, end, (mrb_irep*)irep->repsi, &len, filenames, filenames_len);
     if (ret != MRB_DUMP_OK) return ret;
     bin += len;
   }
@@ -342,9 +410,10 @@
 }
 
 static int
-read_section_debug(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, uint8_t flags)
+read_section_debug(mrb_state *mrb, const uint8_t *start, size_t size, mrb_irep *irep, uint8_t flags)
 {
   const uint8_t *bin;
+  const uint8_t *end = start + size;
   ptrdiff_t diff;
   struct rite_section_debug_header *header;
   uint16_t i;
@@ -360,11 +429,16 @@
 
   filenames_len = bin_to_uint16(bin);
   bin += sizeof(uint16_t);
+  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) {
     uint16_t f_len = bin_to_uint16(bin);
     bin += sizeof(uint16_t);
+    if (bin + f_len > end) {
+      result = MRB_DUMP_GENERAL_FAILURE;
+      goto debug_exit;
+    }
     if (flags & FLAG_SRC_MALLOC) {
       filenamesi = mrb_intern(mrb, (const char *)bin, (size_t)f_len);
     }
@@ -374,7 +448,7 @@
     bin += f_len;
   }
 
-  result = read_debug_record(mrb, bin, irep, &len, filenames, filenames_len);
+  result = read_debug_record(mrb, bin, end, irep, &len, filenames, filenames_len);
   if (result != MRB_DUMP_OK) goto debug_exit;
 
   bin += len;
@@ -393,34 +467,32 @@
 read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *record_len, mrb_sym const *syms, uint32_t syms_len)
 {
   const uint8_t *bin = start;
+  mrb_sym *lv;
   ptrdiff_t diff;
   int i;
 
-  irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * (irep->nlocals - 1));
+  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) {
-      irep->lvi.name = 0;
-      irep->lvi.r = 0;
+      lvi = 0;
     }
     else {
       if (sym_idx >= syms_len) {
         return MRB_DUMP_GENERAL_FAILURE;
       }
-      irep->lvi.name = symssym_idx;
-
-      irep->lvi.r = bin_to_uint16(bin);
+      lvi = symssym_idx;
     }
-    bin += sizeof(uint16_t);
   }
 
   for (i = 0; i < irep->rlen; ++i) {
     size_t len;
     int ret;
 
-    ret = read_lv_record(mrb, bin, irep->repsi, &len, syms, syms_len);
+    ret = read_lv_record(mrb, bin, (mrb_irep*)irep->repsi, &len, syms, syms_len);
     if (ret != MRB_DUMP_OK) return ret;
     bin += len;
   }
@@ -433,9 +505,10 @@
 }
 
 static int
-read_section_lv(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, uint8_t flags)
+read_section_lv(mrb_state *mrb, const uint8_t *start, size_t size, mrb_irep *irep, uint8_t flags)
 {
   const uint8_t *bin;
+  const uint8_t *end = start + size;
   ptrdiff_t diff;
   struct rite_section_lv_header const *header;
   uint32_t i;
@@ -453,12 +526,13 @@
 
   syms_len = bin_to_uint32(bin);
   bin += sizeof(uint32_t);
+  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) {
     uint16_t const str_len = bin_to_uint16(bin);
     bin += sizeof(uint16_t);
-
+    if (bin > end) return MRB_DUMP_READ_FAULT;
     symsi = intern_func(mrb, (const char*)bin, str_len);
     bin += str_len;
   }
@@ -479,7 +553,7 @@
 }
 
 static int
-read_binary_header(const uint8_t *bin, size_t bufsize, size_t *bin_size, uint16_t *crc, uint8_t *flags)
+read_binary_header(const uint8_t *bin, size_t bufsize, size_t *bin_size, uint8_t *flags)
 {
   const struct rite_binary_header *header = (const struct rite_binary_header *)bin;
 
@@ -491,13 +565,15 @@
     return MRB_DUMP_INVALID_FILE_HEADER;
   }
 
-  if (memcmp(header->binary_version, RITE_BINARY_FORMAT_VER, sizeof(header->binary_version)) != 0) {
+  /* if major version is different, they are incompatible */
+  if (memcmp(header->major_version, RITE_BINARY_MAJOR_VER, sizeof(header->major_version)) != 0) {
     return MRB_DUMP_INVALID_FILE_HEADER;
   }
-
-  if (crc) {
-    *crc = bin_to_uint16(header->binary_crc);
+  /* if minor version is different, we can accept the older version */
+  if (memcmp(header->minor_version, RITE_BINARY_MINOR_VER, sizeof(header->minor_version)) > 0) {
+    return MRB_DUMP_INVALID_FILE_HEADER;
   }
+
   *bin_size = (size_t)bin_to_uint32(header->binary_size);
 
   if (bufsize < *bin_size) {
@@ -507,103 +583,99 @@
   return MRB_DUMP_OK;
 }
 
-static mrb_irep*
+static struct RProc*
 read_irep(mrb_state *mrb, const uint8_t *bin, size_t bufsize, uint8_t flags)
 {
   int result;
-  struct RData *irep_obj = NULL;
+  struct RProc *proc = NULL;
   mrb_irep *irep = NULL;
   const struct rite_section_header *section_header;
-  uint16_t crc;
   size_t bin_size = 0;
-  size_t n;
 
   if ((mrb == NULL) || (bin == NULL)) {
     return NULL;
   }
 
-  result = read_binary_header(bin, bufsize, &bin_size, &crc, &flags);
+  result = read_binary_header(bin, bufsize, &bin_size, &flags);
   if (result != MRB_DUMP_OK) {
     return NULL;
   }
 
-  n = offset_crc_body();
-  if (crc != calc_crc_16_ccitt(bin + n, bin_size - n, 0)) {
-    return NULL;
-  }
-
-  irep_obj = mrb_data_object_alloc(mrb, mrb->object_class, NULL, &tempirep_type);
-
   bin += sizeof(struct rite_binary_header);
-  do {
+  bin_size -= sizeof(struct rite_binary_header);
+  while (bin_size > sizeof(struct rite_section_header)) {
     section_header = (const struct rite_section_header *)bin;
+    uint32_t section_size = bin_to_uint32(section_header->section_size);
+    if (bin_size < section_size) return NULL;
     if (memcmp(section_header->section_ident, RITE_SECTION_IREP_IDENT, sizeof(section_header->section_ident)) == 0) {
-      irep = read_section_irep(mrb, bin, flags);
+      irep = read_section_irep(mrb, bin, bin_size, flags, &proc);
       if (!irep) return NULL;
-      irep_obj->data = irep;
     }
     else if (memcmp(section_header->section_ident, RITE_SECTION_DEBUG_IDENT, sizeof(section_header->section_ident)) == 0) {
       if (!irep) return NULL;   /* corrupted data */
-      result = read_section_debug(mrb, bin, irep, flags);
+      result = read_section_debug(mrb, bin, bin_size, irep, flags);
       if (result < MRB_DUMP_OK) {
         return NULL;
       }
     }
     else if (memcmp(section_header->section_ident, RITE_SECTION_LV_IDENT, sizeof(section_header->section_ident)) == 0) {
       if (!irep) return NULL;
-      result = read_section_lv(mrb, bin, irep, flags);
+      result = read_section_lv(mrb, bin, bin_size, irep, flags);
       if (result < MRB_DUMP_OK) {
         return NULL;
       }
     }
-    bin += bin_to_uint32(section_header->section_size);
-  } while (memcmp(section_header->section_ident, RITE_BINARY_EOF, sizeof(section_header->section_ident)) != 0);
+    else if (memcmp(section_header->section_ident, RITE_BINARY_EOF, sizeof(section_header->section_ident)) != 0) {
+      break;
+    }
 
-  irep_obj->data = NULL;
+    bin += section_size;
+    bin_size -= section_size;
+  }
 
-  return irep;
+  return proc;
 }
 
-mrb_irep*
-mrb_read_irep(mrb_state *mrb, const uint8_t *bin)
+static struct RProc*
+mrb_proc_read_irep(mrb_state *mrb, const uint8_t *bin)
 {
-#if defined(MRB_USE_LINK_TIME_RO_DATA_P) || defined(MRB_USE_CUSTOM_RO_DATA_P)
   uint8_t flags = mrb_ro_data_p((char*)bin) ? FLAG_SRC_STATIC : FLAG_SRC_MALLOC;
-#else
-  uint8_t flags = FLAG_SRC_STATIC;
-#endif
 
-  return read_irep(mrb, bin, (size_t)-1, flags);
+  return read_irep(mrb, bin, (size_t)UINT32_MAX, flags);
 }
 
-MRB_API mrb_irep*
-mrb_read_irep_buf(mrb_state *mrb, const void *buf, size_t bufsize)
+DEFINE_READ_IREP_FUNC(
+  mrb_irep *mrb_read_irep(mrb_state *mrb, const uint8_t *bin),
+  mrb_proc_read_irep(mrb, bin))
+
+static struct RProc*
+mrb_proc_read_irep_buf(mrb_state *mrb, const void *buf, size_t bufsize)
 {
   return read_irep(mrb, (const uint8_t *)buf, bufsize, FLAG_SRC_MALLOC);
 }
 
+DEFINE_READ_IREP_FUNC(
+  MRB_API mrb_irep *mrb_read_irep_buf(mrb_state *mrb, const void *buf, size_t bufsize),
+  mrb_proc_read_irep_buf(mrb, buf, bufsize))
+
 void mrb_exc_set(mrb_state *mrb, mrb_value exc);
 
 static void
 irep_error(mrb_state *mrb)
 {
-  mrb_exc_set(mrb, mrb_exc_new_str_lit(mrb, E_SCRIPT_ERROR, "irep load error"));
+  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, mrb_irep *irep, mrbc_context *c)
+load_irep(mrb_state *mrb, struct RProc *proc, mrbc_context *c)
 {
-  struct RProc *proc;
-
-  if (!irep) {
+  if (!proc || !proc->body.irep) {
     irep_error(mrb);
     return mrb_nil_value();
   }
-  proc = mrb_proc_new(mrb, irep);
   proc->c = NULL;
-  mrb_irep_decref(mrb, irep);
   if (c && c->dump_result) mrb_codedump_all(mrb, proc);
   if (c && c->no_exec) return mrb_obj_value(proc);
   return mrb_top_run(mrb, proc, mrb_top_self(mrb), 0);
@@ -612,22 +684,15 @@
 MRB_API mrb_value
 mrb_load_irep_cxt(mrb_state *mrb, const uint8_t *bin, mrbc_context *c)
 {
-  struct RData *irep_obj = mrb_data_object_alloc(mrb, mrb->object_class, NULL, &tempirep_type);
-  mrb_irep *irep = mrb_read_irep(mrb, bin);
-  mrb_value ret;
-
-  irep_obj->data = irep;
-  mrb_irep_incref(mrb, irep);
-  ret = load_irep(mrb, irep, c);
-  irep_obj->data = NULL;
-  mrb_irep_decref(mrb, irep);
-  return ret;
+  struct RProc *proc = mrb_proc_read_irep(mrb, bin);
+  if (!proc) return mrb_undef_value();
+  return load_irep(mrb, proc, c);
 }
 
 MRB_API mrb_value
 mrb_load_irep_buf_cxt(mrb_state *mrb, const void *buf, size_t bufsize, mrbc_context *c)
 {
-  return load_irep(mrb, mrb_read_irep_buf(mrb, buf, bufsize), c);
+  return load_irep(mrb, mrb_proc_read_irep_buf(mrb, buf, bufsize), c);
 }
 
 MRB_API mrb_value
@@ -642,12 +707,18 @@
   return mrb_load_irep_buf_cxt(mrb, buf, bufsize, NULL);
 }
 
-#ifndef MRB_DISABLE_STDIO
+MRB_API mrb_value
+mrb_load_proc(mrb_state *mrb, const struct RProc *proc)
+{
+  return mrb_top_run(mrb, proc, mrb_top_self(mrb), 0);
+}
+
+#ifndef MRB_NO_STDIO
 
-mrb_irep*
-mrb_read_irep_file(mrb_state *mrb, FILE* fp)
+static struct RProc*
+mrb_proc_read_irep_file(mrb_state *mrb, FILE *fp)
 {
-  mrb_irep *irep = NULL;
+  struct RProc *proc = NULL;
   uint8_t *buf;
   const size_t header_size = sizeof(struct rite_binary_header);
   size_t buf_size = 0;
@@ -662,7 +733,7 @@
   if (fread(buf, header_size, 1, fp) == 0) {
     goto irep_exit;
   }
-  result = read_binary_header(buf, (size_t)-1, &buf_size, NULL, &flags);
+  result = read_binary_header(buf, (size_t)-1, &buf_size, &flags);
   if (result != MRB_DUMP_OK || buf_size <= header_size) {
     goto irep_exit;
   }
@@ -671,17 +742,21 @@
   if (fread(buf+header_size, buf_size-header_size, 1, fp) == 0) {
     goto irep_exit;
   }
-  irep = read_irep(mrb, buf, (size_t)-1, FLAG_SRC_MALLOC);
+  proc = read_irep(mrb, buf, (size_t)-1, FLAG_SRC_MALLOC);
 
 irep_exit:
   mrb_free(mrb, buf);
-  return irep;
+  return proc;
 }
 
+DEFINE_READ_IREP_FUNC(
+  mrb_irep *mrb_read_irep_file(mrb_state *mrb, FILE *fp),
+  mrb_proc_read_irep_file(mrb, fp))
+
 MRB_API mrb_value
 mrb_load_irep_file_cxt(mrb_state *mrb, FILE* fp, mrbc_context *c)
 {
-  return load_irep(mrb, mrb_read_irep_file(mrb, fp), c);
+  return load_irep(mrb, mrb_proc_read_irep_file(mrb, fp), c);
 }
 
 MRB_API mrb_value
@@ -689,4 +764,4 @@
 {
   return mrb_load_irep_file_cxt(mrb, fp, NULL);
 }
-#endif /* MRB_DISABLE_STDIO */
+#endif /* MRB_NO_STDIO */

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

@@ -1,59 +1,36 @@
 /*
-** numeric.c - Numeric, Integer, Float, Fixnum class
+** numeric.c - Numeric, Integer, Float class
 **
 ** See Copyright Notice in mruby.h
 */
 
-#ifndef MRB_WITHOUT_FLOAT
-#include <float.h>
-#include <math.h>
-#endif
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
+#include <string.h>
 
-#ifndef MRB_WITHOUT_FLOAT
-#ifdef MRB_USE_FLOAT
+#ifndef MRB_NO_FLOAT
+#ifdef MRB_USE_FLOAT32
 #define trunc(f) truncf(f)
-#define floor(f) floorf(f)
-#define ceil(f) ceilf(f)
 #define fmod(x,y) fmodf(x,y)
-#define FLO_TO_STR_PREC 8
 #else
-#define FLO_TO_STR_PREC 16
 #endif
 #endif
 
-#ifndef MRB_WITHOUT_FLOAT
-MRB_API mrb_float
-mrb_to_flo(mrb_state *mrb, mrb_value val)
+static void
+int_overflow(mrb_state *mrb, const char *reason)
 {
-  switch (mrb_type(val)) {
-  case MRB_TT_FIXNUM:
-    return (mrb_float)mrb_fixnum(val);
-  case MRB_TT_FLOAT:
-    break;
-  default:
-    mrb_raise(mrb, E_TYPE_ERROR, "non float value");
-  }
-  return mrb_float(val);
+  mrb_raisef(mrb, E_RANGE_ERROR, "integer overflow in %s", reason);
 }
 
-MRB_API mrb_value
-mrb_int_value(mrb_state *mrb, mrb_float f)
+static void
+int_zerodiv(mrb_state *mrb)
 {
-  if (FIXABLE_FLOAT(f)) {
-    return mrb_fixnum_value((mrb_int)f);
-  }
-  return mrb_float_value(mrb, f);
+  mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0");
 }
-#endif
 
 /*
  * call-seq:
@@ -65,80 +42,95 @@
  *    2.0**3      #=> 8.0
  */
 static mrb_value
-integral_pow(mrb_state *mrb, mrb_value x)
+int_pow(mrb_state *mrb, mrb_value x)
 {
-  mrb_value y = mrb_get_arg1(mrb);
-#ifndef MRB_WITHOUT_FLOAT
-  mrb_float d;
-#endif
+  mrb_int base = mrb_integer(x);
+  mrb_int result = 1;
+  mrb_int exp;
 
-  if (mrb_fixnum_p(x) && mrb_fixnum_p(y)) {
-    /* try ipow() */
-    mrb_int base = mrb_fixnum(x);
-    mrb_int exp = mrb_fixnum(y);
-    mrb_int result = 1;
+#ifndef MRB_NO_FLOAT
+  mrb_value y = mrb_get_arg1(mrb);
 
-    if (exp < 0)
-#ifdef MRB_WITHOUT_FLOAT
-      return mrb_fixnum_value(0);
-#else
-      goto float_pow;
-#endif
-    for (;;) {
-      if (exp & 1) {
-        if (mrb_int_mul_overflow(result, base, &result)) {
-#ifndef MRB_WITHOUT_FLOAT
-          goto float_pow;
+  if (mrb_float_p(y)) {
+    return mrb_float_value(mrb, pow((double)base, mrb_float(y)));
+  }
+  else if (mrb_integer_p(y)) {
+    exp = mrb_integer(y);
+  }
+  else
 #endif
-        }
-      }
-      exp >>= 1;
-      if (exp == 0) break;
-      if (mrb_int_mul_overflow(base, base, &base)) {
-#ifndef MRB_WITHOUT_FLOAT
-        goto float_pow;
+  {
+    mrb_get_args(mrb, "i", &exp);
+  }
+  if (exp < 0) {
+#ifndef MRB_NO_FLOAT
+    return mrb_float_value(mrb, pow((double)base, (double)exp));
+#else
+    int_overflow(mrb, "negative power");
 #endif
+  }
+  for (;;) {
+    if (exp & 1) {
+      if (mrb_int_mul_overflow(result, base, &result)) {
+        int_overflow(mrb, "power");
       }
     }
-    return mrb_fixnum_value(result);
+    exp >>= 1;
+    if (exp == 0) break;
+    if (mrb_int_mul_overflow(base, base, &base)) {
+      int_overflow(mrb, "power");
+    }
   }
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
-#else
- float_pow:
-  d = pow(mrb_to_flo(mrb, x), mrb_to_flo(mrb, y));
-  return mrb_float_value(mrb, d);
-#endif
+  return mrb_int_value(mrb, result);
 }
 
-static mrb_value
-integral_idiv(mrb_state *mrb, mrb_value x)
+mrb_int
+mrb_div_int(mrb_state *mrb, mrb_int x, mrb_int y)
 {
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_value y = mrb_get_arg1(mrb);
-
-  if (!mrb_fixnum_p(y)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
+  if (y == 0) {
+    int_zerodiv(mrb);
   }
-  return mrb_fixnum_value(mrb_fixnum(x) / mrb_fixnum(y));
-#else
-  mrb_float y;
+  else if(x == MRB_INT_MIN && y == -1) {
+    int_overflow(mrb, "division");
+  }
+  else {
+    mrb_int div = x / y;
 
-  mrb_get_args(mrb, "f", &y);
-  return mrb_int_value(mrb, mrb_to_flo(mrb, x) / y);
-#endif
+    if ((x ^ y) < 0 && x != div * y) {
+      div -= 1;
+    }
+    return div;
+  }
+  /* not reached */
+  return 0;
 }
 
 /* 15.2.8.3.4  */
 /* 15.2.9.3.4  */
 /*
  * call-seq:
- *   num / other  ->  num
+ *   int / other  ->  num
  *
  * Performs division: the class of the resulting object depends on
  * the class of <code>num</code> and on the magnitude of the
  * result.
  */
+static mrb_value
+int_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);
+  }
+#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)));
+#endif
+}
 
 /* 15.2.9.3.19(x) */
 /*
@@ -148,59 +140,152 @@
  *  Returns most exact division.
  */
 
+/*
+ * call-seq:
+ *   int.div(other)  ->  int
+ *
+ * Performs division: resulting integer.
+ */
 static mrb_value
-integral_div(mrb_state *mrb, mrb_value x)
+int_idiv(mrb_state *mrb, mrb_value x)
 {
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_value y = mrb_get_arg1(mrb);
+  mrb_int y;
 
-  if (!mrb_fixnum_p(y)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
+  mrb_get_args(mrb, "i", &y);
+  if (y == 0) {
+    int_zerodiv(mrb);
   }
-  return mrb_fixnum_value(mrb_fixnum(x) / mrb_fixnum(y));
+  return mrb_int_value(mrb, mrb_integer(x) / y);
+}
+
+static mrb_value
+int_quo(mrb_state *mrb, mrb_value xv)
+{
+#ifdef MRB_NO_FLOAT
+  return int_idiv(mrb, xv);
 #else
   mrb_float y;
 
   mrb_get_args(mrb, "f", &y);
-  return mrb_float_value(mrb, mrb_to_flo(mrb, x) / y);
+  if (y == 0) {
+    int_zerodiv(mrb);
+  }
+  return mrb_float_value(mrb, mrb_integer(xv) / y);
 #endif
 }
 
 static mrb_value
-integral_coerce_step_counter(mrb_state *mrb, mrb_value self)
+coerce_step_counter(mrb_state *mrb, mrb_value self)
 {
   mrb_value num, step;
 
   mrb_get_args(mrb, "oo", &num, &step);
 
-#ifndef MRB_WITHOUT_FLOAT
-  if (mrb_float_p(self) || mrb_float_p(num) || mrb_float_p(step)) {
-    return mrb_Float(mrb, self);
+#ifndef MRB_NO_FLOAT
+  mrb->c->ci->mid = 0;
+  if (mrb_float_p(num) || mrb_float_p(step)) {
+    return mrb_to_float(mrb, self);
   }
 #endif
 
   return self;
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 /********************************************************************
  *
  * Document-class: Float
  *
  *  <code>Float</code> objects represent inexact real numbers using
- *  the native architecture's double-precision floating point
+ *  the native architecture's double-precision floating-point
  *  representation.
  */
 
+static mrb_value
+flo_pow(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  mrb_float d = pow(mrb_as_float(mrb, x), mrb_as_float(mrb, y));
+  return mrb_float_value(mrb, d);
+}
+
+static mrb_value
+flo_idiv(mrb_state *mrb, mrb_value xv)
+{
+  mrb_int y, div;
+
+  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);
+}
+
+mrb_float
+mrb_div_float(mrb_float x, mrb_float y)
+{
+  if (y != 0.0) {
+    return x / y;
+  }
+  else if (x == 0.0) {
+    return NAN;
+  }
+  else {
+    return x * (signbit(y) ? -1.0 : 1.0) * INFINITY;
+  }
+}
+
+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)) {
+    a = mrb_div_float(a, mrb_float(y));
+  }
+  else {
+    a = mrb_div_float(a, mrb_as_float(mrb, y));
+  }
+  return mrb_float_value(mrb, a);
+}
+
+/* the argument `fmt` is no longer used; you can pass `NULL` */
+mrb_value
+mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
+{
+  char buf25;
+#ifdef MRB_USE_FLOAT32
+  const int prec =  7;
+#else
+  const int prec =  15;
+#endif
+
+  mrb_format_float(mrb_float(flo), buf, sizeof(buf), 'g', prec, '\0');
+  for (char *p = buf; *p; p++) {
+    if (*p == '.') goto exit;
+    if (*p == 'e') {
+      memmove(p+2, p, strlen(p)+1);
+      memcpy(p, ".0", 2);
+      goto exit;
+    }
+  }
+  strcat(buf, ".0");
+ exit:
+  return mrb_str_new_cstr(mrb, buf);
+}
+
 /* 15.2.9.3.16(x) */
 /*
  *  call-seq:
  *     flt.to_s  ->  string
+ *     flt.inspect  ->  string
  *
  *  Returns a string containing a representation of self. As well as a
  *  fixed or exponential form of the number, the call may return
  *  "<code>NaN</code>", "<code>Infinity</code>", and
  *  "<code>-Infinity</code>".
+ *
+ *     3.0.to_s   #=> 3.0
+ *     3.25.to_s  #=> 3.25
  */
 
 static mrb_value
@@ -212,50 +297,44 @@
   if (isinf(f)) {
     str = f < 0 ? mrb_str_new_lit(mrb, "-Infinity")
                 : mrb_str_new_lit(mrb, "Infinity");
-    goto exit;
   }
   else if (isnan(f)) {
     str = mrb_str_new_lit(mrb, "NaN");
-    goto exit;
   }
   else {
-    char fmt = "%." MRB_STRINGIZE(FLO_TO_STR_PREC) "g";
-    mrb_int len;
-    char *begp, *p, *endp;
-
-    str = mrb_float_to_str(mrb, flt, fmt);
-
-    insert_dot_zero:
-    begp = RSTRING_PTR(str);
-    len = RSTRING_LEN(str);
-    for (p = begp, endp = p + len; p < endp; ++p) {
-      if (*p == '.') {
-        goto exit;
-      }
-      else if (*p == 'e') {
-        ptrdiff_t e_pos = p - begp;
-        mrb_str_cat(mrb, str, ".0", 2);
-        p = RSTRING_PTR(str) + e_pos;
-        memmove(p + 2, p, len - e_pos);
-        memcpy(p, ".0", 2);
-        goto exit;
-      }
-    }
-
-    if (FLO_TO_STR_PREC + (begp0 == '-') <= len) {
-      --fmtsizeof(fmt) - 3;  /* %.16g(%.8g) -> %.15g(%.7g) */
-      str = mrb_float_to_str(mrb, flt, fmt);
-      goto insert_dot_zero;
-    }
-
-    goto exit;
+    str = mrb_float_to_str(mrb, flt, NULL);
   }
 
-  exit:
   RSTR_SET_ASCII_FLAG(mrb_str_ptr(str));
   return str;
 }
 
+/* 15.2.9.3.1  */
+/*
+ * call-seq:
+ *   float + other  ->  float
+ *
+ * Returns a new float which is the sum of <code>float</code>
+ * and <code>other</code>.
+ */
+static mrb_value
+flo_add(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  mrb_float a = mrb_float(x);
+
+  switch (mrb_type(y)) {
+  case MRB_TT_FLOAT:
+    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);
+#endif
+  default:
+    return mrb_float_value(mrb, a + mrb_as_float(mrb, y));
+  }
+}
+
 /* 15.2.9.3.2  */
 /*
  * call-seq:
@@ -266,11 +345,22 @@
  */
 
 static mrb_value
-flo_minus(mrb_state *mrb, mrb_value x)
+flo_sub(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
+  mrb_float a = mrb_float(x);
 
-  return mrb_float_value(mrb, mrb_float(x) - mrb_to_flo(mrb, y));
+  switch (mrb_type(y)) {
+  case MRB_TT_FLOAT:
+    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);
+#endif
+  default:
+    return mrb_float_value(mrb, a - mrb_as_float(mrb, y));
+  }
 }
 
 /* 15.2.9.3.3  */
@@ -286,8 +376,18 @@
 flo_mul(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
+  mrb_float a = mrb_float(x);
 
-  return mrb_float_value(mrb, mrb_float(x) * mrb_to_flo(mrb, y));
+  switch (mrb_type(y)) {
+  case MRB_TT_FLOAT:
+    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);
+#endif
+  default:
+    return mrb_float_value(mrb, a * mrb_as_float(mrb, y));
+  }
 }
 
 static void
@@ -301,13 +401,9 @@
     goto exit;
   }
   if (y == 0.0) {
-    if (x == 0) div = NAN;
-    else if (x > 0.0) div = INFINITY;
-    else div = -INFINITY;       /* x < 0.0 */
-    mod = NAN;
-    goto exit;
+    int_zerodiv(mrb);
   }
-  if ((x == 0.0) || (isinf(y) && !isinf(x))) {
+  if (isinf(y) && !isinf(x)) {
     mod = x;
   }
   else {
@@ -349,7 +445,7 @@
   mrb_value y = mrb_get_arg1(mrb);
   mrb_float mod;
 
-  flodivmod(mrb, mrb_float(x), mrb_to_flo(mrb, y), 0, &mod);
+  flodivmod(mrb, mrb_float(x), mrb_as_float(mrb, y), 0, &mod);
   return mrb_float_value(mrb, mod);
 }
 #endif
@@ -367,15 +463,15 @@
  *     (1.0).eql?(1.0)   #=> true
  */
 static mrb_value
-fix_eql(mrb_state *mrb, mrb_value x)
+int_eql(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
 
-  if (!mrb_fixnum_p(y)) return mrb_false_value();
-  return mrb_bool_value(mrb_fixnum(x) == mrb_fixnum(y));
+  if (!mrb_integer_p(y)) return mrb_false_value();
+  return mrb_bool_value(mrb_integer(x) == mrb_integer(y));
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 static mrb_value
 flo_eql(mrb_state *mrb, mrb_value x)
 {
@@ -404,10 +500,18 @@
   mrb_value y = mrb_get_arg1(mrb);
 
   switch (mrb_type(y)) {
-  case MRB_TT_FIXNUM:
-    return mrb_bool_value(mrb_float(x) == (mrb_float)mrb_fixnum(y));
+  case MRB_TT_INTEGER:
+    return mrb_bool_value(mrb_float(x) == (mrb_float)mrb_integer(y));
   case MRB_TT_FLOAT:
     return mrb_bool_value(mrb_float(x) == mrb_float(y));
+#ifdef MRB_USE_RATIONAL
+  case MRB_TT_RATIONAL:
+    return mrb_bool_value(mrb_float(x) == mrb_as_float(mrb, y));
+#endif
+#ifdef MRB_USE_COMPLEX
+  case MRB_TT_COMPLEX:
+    return mrb_bool_value(mrb_equal(mrb, y, x));
+#endif
   default:
     return mrb_false_value();
   }
@@ -417,10 +521,15 @@
 value_int64(mrb_state *mrb, mrb_value x)
 {
   switch (mrb_type(x)) {
-  case MRB_TT_FIXNUM:
-    return (int64_t)mrb_fixnum(x);
+  case MRB_TT_INTEGER:
+    return (int64_t)mrb_integer(x);
   case MRB_TT_FLOAT:
-    return (int64_t)mrb_float(x);
+    {
+      double f = mrb_float(x);
+
+      if ((mrb_float)INT64_MAX >= f && f >= (mrb_float)INT64_MIN)
+        return (int64_t)f;
+    }
   default:
     mrb_raise(mrb, E_TYPE_ERROR, "cannot convert to Integer");
     break;
@@ -432,17 +541,16 @@
 static mrb_value
 int64_value(mrb_state *mrb, int64_t v)
 {
-  if (TYPED_FIXABLE(v,int64_t)) {
-    return mrb_fixnum_value((mrb_int)v);
+  if (!TYPED_FIXABLE(v,int64_t)) {
+    int_overflow(mrb, "bit operation");
   }
-  return mrb_float_value(mrb, (mrb_float)v);
+  return mrb_fixnum_value((mrb_int)v);
 }
 
 static mrb_value
 flo_rev(mrb_state *mrb, mrb_value x)
 {
-  int64_t v1;
-  v1 = (int64_t)mrb_float(x);
+  int64_t v1 = value_int64(mrb, x);
   return int64_value(mrb, ~v1);
 }
 
@@ -452,7 +560,7 @@
   mrb_value y = mrb_get_arg1(mrb);
   int64_t v1, v2;
 
-  v1 = (int64_t)mrb_float(x);
+  v1 = value_int64(mrb, x);
   v2 = value_int64(mrb, y);
   return int64_value(mrb, v1 & v2);
 }
@@ -463,7 +571,7 @@
   mrb_value y = mrb_get_arg1(mrb);
   int64_t v1, v2;
 
-  v1 = (int64_t)mrb_float(x);
+  v1 = value_int64(mrb, x);
   v2 = value_int64(mrb, y);
   return int64_value(mrb, v1 | v2);
 }
@@ -474,7 +582,7 @@
   mrb_value y = mrb_get_arg1(mrb);
   int64_t v1, v2;
 
-  v1 = (int64_t)mrb_float(x);
+  v1 = value_int64(mrb, x);
   v2 = value_int64(mrb, y);
   return int64_value(mrb, v1 ^ v2);
 }
@@ -488,6 +596,10 @@
     return x;
   }
   val = mrb_float(x);
+  if (width < -MRB_INT_BIT/2) {
+    if (val < 0) return mrb_fixnum_value(-1);
+    return mrb_fixnum_value(0);
+  }
   if (width < 0) {
     while (width++) {
       val /= 2;
@@ -514,7 +626,9 @@
       val *= 2;
     }
   }
-  return mrb_int_value(mrb, val);
+  if (FIXABLE_FLOAT(val))
+    return mrb_int_value(mrb, (mrb_int)val);
+  return mrb_float_value(mrb, val);
 }
 
 static mrb_value
@@ -523,6 +637,7 @@
   mrb_int width;
 
   mrb_get_args(mrb, "i", &width);
+  if (width == MRB_INT_MIN) return flo_shift(mrb, x, -MRB_INT_BIT);
   return flo_shift(mrb, x, -width);
 }
 
@@ -601,49 +716,127 @@
   }
 }
 
+static mrb_value
+flo_ceil_floor(mrb_state *mrb, mrb_value num, double (*func)(double))
+{
+  mrb_float f = mrb_float(num);
+  mrb_int ndigits = 0;
+#ifdef MRB_USE_FLOAT32
+  const int fprec =  7;
+#else
+  const int fprec =  15;
+#endif
+
+  mrb_get_args(mrb, "|i", &ndigits);
+  if (f == 0.0) {
+    return ndigits > 0 ? mrb_float_value(mrb, f) : mrb_fixnum_value(0);
+  }
+  if (ndigits > 0) {
+    if (ndigits > fprec) return num;
+    mrb_float d = pow(10, ndigits);
+    f = func(f * d) / d;
+    return mrb_float_value(mrb, f);
+  }
+  if (ndigits < 0) {
+    mrb_float d = pow(10, -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);
+}
+
 /* 15.2.9.3.10 */
 /*
  *  call-seq:
- *     flt.floor  ->  integer
+ *     float.floor(ndigits)  ->  integer or float
+ *
+ *  Returns the largest number less than or equal to +float+ with
+ *  a precision of +ndigits+ decimal digits (default: 0).
+ *
+ *  When the precision is negative, the returned value is an integer
+ *  with at least <code>ndigits.abs</code> trailing zeros.
  *
- *  Returns the largest integer less than or equal to <i>flt</i>.
+ *  Returns a floating point number when +ndigits+ is positive,
+ *  otherwise returns an integer.
  *
  *     1.2.floor      #=> 1
  *     2.0.floor      #=> 2
  *     (-1.2).floor   #=> -2
  *     (-2.0).floor   #=> -2
+ *
+ *     1.234567.floor(2)   #=> 1.23
+ *     1.234567.floor(3)   #=> 1.234
+ *     1.234567.floor(4)   #=> 1.2345
+ *     1.234567.floor(5)   #=> 1.23456
+ *
+ *     34567.89.floor(-5)  #=> 0
+ *     34567.89.floor(-4)  #=> 30000
+ *     34567.89.floor(-3)  #=> 34000
+ *     34567.89.floor(-2)  #=> 34500
+ *     34567.89.floor(-1)  #=> 34560
+ *     34567.89.floor(0)   #=> 34567
+ *     34567.89.floor(1)   #=> 34567.8
+ *     34567.89.floor(2)   #=> 34567.89
+ *     34567.89.floor(3)   #=> 34567.89
+ *
+ *  Note that the limited precision of floating point arithmetic
+ *  might lead to surprising results:
+ *
+ *     (0.3 / 0.1).floor  #=> 2 (!)
  */
-
 static mrb_value
 flo_floor(mrb_state *mrb, mrb_value num)
 {
-  mrb_float f = floor(mrb_float(num));
-
-  mrb_check_num_exact(mrb, f);
-  return mrb_int_value(mrb, f);
+  return flo_ceil_floor(mrb, num, floor);
 }
 
 /* 15.2.9.3.8  */
 /*
  *  call-seq:
- *     flt.ceil  ->  integer
+ *     float.ceil(ndigits)  ->  integer or float
+ *
+ *  Returns the smallest number greater than or equal to +float+ with
+ *  a precision of +ndigits+ decimal digits (default: 0).
  *
- *  Returns the smallest <code>Integer</code> greater than or equal to
- *  <i>flt</i>.
+ *  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,
+ *  otherwise returns an integer.
  *
  *     1.2.ceil      #=> 2
  *     2.0.ceil      #=> 2
  *     (-1.2).ceil   #=> -1
  *     (-2.0).ceil   #=> -2
+ *
+ *     1.234567.ceil(2)   #=> 1.24
+ *     1.234567.ceil(3)   #=> 1.235
+ *     1.234567.ceil(4)   #=> 1.2346
+ *     1.234567.ceil(5)   #=> 1.23457
+ *
+ *     34567.89.ceil(-5)  #=> 100000
+ *     34567.89.ceil(-4)  #=> 40000
+ *     34567.89.ceil(-3)  #=> 35000
+ *     34567.89.ceil(-2)  #=> 34600
+ *     34567.89.ceil(-1)  #=> 34570
+ *     34567.89.ceil(0)   #=> 34568
+ *     34567.89.ceil(1)   #=> 34567.9
+ *     34567.89.ceil(2)   #=> 34567.89
+ *     34567.89.ceil(3)   #=> 34567.89
+ *
+ *  Note that the limited precision of floating point arithmetic
+ *  might lead to surprising results:
+ *
+ *     (2.1 / 0.7).ceil  #=> 4 (!)
  */
 
 static mrb_value
 flo_ceil(mrb_state *mrb, mrb_value num)
 {
-  mrb_float f = ceil(mrb_float(num));
-
-  mrb_check_num_exact(mrb, f);
-  return mrb_int_value(mrb, f);
+  return flo_ceil_floor(mrb, num, ceil);
 }
 
 /* 15.2.9.3.12 */
@@ -652,7 +845,7 @@
  *     flt.round(ndigits)  ->  integer or float
  *
  *  Rounds <i>flt</i> to a given precision in decimal digits (default 0 digits).
- *  Precision may be negative.  Returns a floating point number when ndigits
+ *  Precision may be negative.  Returns a floating-point number when ndigits
  *  is more than zero.
  *
  *     1.4.round      #=> 1
@@ -693,6 +886,7 @@
   mrb_check_num_exact(mrb, number);
 
   f = 1.0;
+  if (ndigits < -DBL_DIG-2) return mrb_fixnum_value(0);
   i = ndigits >= 0 ? ndigits : -ndigits;
   if (ndigits > DBL_DIG+2) return num;
   while  (--i >= 0)
@@ -725,10 +919,24 @@
     if (!isfinite(number)) return num;
     return mrb_float_value(mrb, number);
   }
-  return mrb_int_value(mrb, number);
+  if (!FIXABLE_FLOAT(number))
+    return mrb_float_value(mrb, number);
+  return mrb_int_value(mrb, (mrb_int)number);
 }
 
 /* 15.2.9.3.14 */
+static mrb_value
+flo_to_i(mrb_state *mrb, mrb_value num)
+{
+  mrb_float f = mrb_float(num);
+
+  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);
+}
+
 /* 15.2.9.3.15 */
 /*
  *  call-seq:
@@ -741,13 +949,8 @@
 static mrb_value
 flo_truncate(mrb_state *mrb, mrb_value num)
 {
-  mrb_float f = mrb_float(num);
-
-  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, f);
+  if (signbit(mrb_float(num))) return flo_ceil(mrb, num);
+  return flo_floor(mrb, num);
 }
 
 static mrb_value
@@ -755,13 +958,21 @@
 {
   return mrb_bool_value(isnan(mrb_float(num)));
 }
+
+static mrb_value
+flo_abs(mrb_state *mrb, mrb_value num)
+{
+  mrb_float f = mrb_float(num);
+
+  if (signbit(f)) return mrb_float_value(mrb, -f);
+  return num;
+}
 #endif
 
 /*
  * Document-class: Integer
  *
- *  <code>Integer</code> is the basis for the two concrete classes that
- *  hold whole numbers, <code>Bignum</code> and <code>Fixnum</code>.
+ *  <code>Integer</code> is hold whole numbers.
  *
  */
 
@@ -785,35 +996,50 @@
 {
   mrb_int a;
 
-  a = mrb_fixnum(x);
-  if (mrb_fixnum_p(y)) {
+  a = mrb_integer(x);
+  if (mrb_integer_p(y)) {
     mrb_int b, c;
 
     if (a == 0) return x;
-    b = mrb_fixnum(y);
+    b = mrb_integer(y);
     if (mrb_int_mul_overflow(a, b, &c)) {
-#ifndef MRB_WITHOUT_FLOAT
-      return mrb_float_value(mrb, (mrb_float)a * (mrb_float)b);
-#endif
+      int_overflow(mrb, "multiplication");
     }
-    return mrb_fixnum_value(c);
+    return mrb_int_value(mrb, c);
   }
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
+  switch (mrb_type(y)) {
+#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+  case MRB_TT_RATIONAL:
+  case MRB_TT_COMPLEX:
+    return mrb_funcall_id(mrb, y, MRB_OPSYM(mul), 1, 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_to_flo(mrb, y));
+    return mrb_float_value(mrb, (mrb_float)a * mrb_as_float(mrb, y));
 #endif
+  }
 }
 
 MRB_API mrb_value
 mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y)
 {
-  if (mrb_fixnum_p(x)) {
+  if (mrb_integer_p(x)) {
     return fixnum_mul(mrb, x, y);
   }
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   if (mrb_float_p(x)) {
-    return mrb_float_value(mrb, mrb_float(x) * mrb_to_flo(mrb, y));
+    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(mul), 1, y);
+  default:
+    break;
   }
 #endif
   mrb_raise(mrb, E_TYPE_ERROR, "no number multiply");
@@ -823,7 +1049,7 @@
 /* 15.2.8.3.3  */
 /*
  * call-seq:
- *   fix * numeric  ->  numeric_result
+ *   int * numeric  ->  numeric_result
  *
  * Performs multiplication: the class of the resulting object depends on
  * the class of <code>numeric</code> and on the magnitude of the
@@ -831,7 +1057,7 @@
  */
 
 static mrb_value
-fix_mul(mrb_state *mrb, mrb_value x)
+int_mul(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
 
@@ -839,121 +1065,96 @@
 }
 
 static void
-fixdivmod(mrb_state *mrb, mrb_int x, mrb_int y, mrb_int *divp, mrb_int *modp)
+intdivmod(mrb_state *mrb, mrb_int x, mrb_int y, mrb_int *divp, mrb_int *modp)
 {
-  mrb_int div, mod;
-
-  /* TODO: add mrb_assert(y != 0) to make sure */
-
-  if (y < 0) {
-    if (x < 0)
-      div = -x / -y;
-    else
-      div = - (x / -y);
+  if (y == 0) {
+    int_zerodiv(mrb);
   }
-  else {
-    if (x < 0)
-      div = - (-x / y);
-    else
-      div = x / y;
+  else if(x == MRB_INT_MIN && y == -1) {
+    int_overflow(mrb, "division");
   }
-  mod = x - div*y;
-  if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
-    mod += y;
-    div -= 1;
+  else {
+    mrb_int div = x / y;
+    mrb_int mod = x - div * y;
+
+    if ((x ^ y) < 0 && x != div * y) {
+      mod += y;
+      div -= 1;
+    }
+    if (divp) *divp = div;
+    if (modp) *modp = mod;
   }
-  if (divp) *divp = div;
-  if (modp) *modp = mod;
 }
 
 /* 15.2.8.3.5  */
 /*
  *  call-seq:
- *    fix % other        ->  real
- *    fix.modulo(other)  ->  real
+ *    int % other        ->  real
  *
- *  Returns <code>fix</code> modulo <code>other</code>.
+ *  Returns <code>int</code> modulo <code>other</code>.
  *  See <code>numeric.divmod</code> for more information.
  */
 
 static mrb_value
-fix_mod(mrb_state *mrb, mrb_value x)
+int_mod(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
   mrb_int a, b;
 
-  a = mrb_fixnum(x);
-   if (mrb_fixnum_p(y) && a != MRB_INT_MIN && (b=mrb_fixnum(y)) != MRB_INT_MIN) {
-    mrb_int mod;
-
-    if (b == 0) {
-#ifdef MRB_WITHOUT_FLOAT
-      /* ZeroDivisionError */
-      return mrb_fixnum_value(0);
-#else
-      if (a > 0) return mrb_float_value(mrb, INFINITY);
-      if (a < 0) return mrb_float_value(mrb, INFINITY);
-      return mrb_float_value(mrb, NAN);
-#endif
+  a = mrb_integer(x);
+  if (mrb_integer_p(y)) {
+    b = mrb_integer(y);
+    if (b == 0) 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) {
+      mod += b;
     }
-    fixdivmod(mrb, a, b, NULL, &mod);
-    return mrb_fixnum_value(mod);
+    return mrb_int_value(mrb, mod);
   }
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
+#ifdef MRB_NO_FLOAT
+  mrb_raise(mrb, E_TYPE_ERROR, "non integer modulo");
 #else
-  else {
-    mrb_float mod;
+  mrb_float mod;
 
-    flodivmod(mrb, (mrb_float)a, mrb_to_flo(mrb, y), NULL, &mod);
-    return mrb_float_value(mrb, mod);
-  }
+  flodivmod(mrb, (mrb_float)a, mrb_as_float(mrb, y), NULL, &mod);
+  return mrb_float_value(mrb, mod);
 #endif
 }
 
 /*
  *  call-seq:
- *     fix.divmod(numeric)  ->  array
+ *     int.divmod(numeric)  ->  array
  *
  *  See <code>Numeric#divmod</code>.
  */
 static mrb_value
-fix_divmod(mrb_state *mrb, mrb_value x)
+int_divmod(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
 
-  if (mrb_fixnum_p(y)) {
+  if (mrb_integer_p(y)) {
     mrb_int div, mod;
 
-    if (mrb_fixnum(y) == 0) {
-#ifdef MRB_WITHOUT_FLOAT
-      return mrb_assoc_new(mrb, mrb_fixnum_value(0), mrb_fixnum_value(0));
-#else
-      return mrb_assoc_new(mrb, ((mrb_fixnum(x) == 0) ?
-                                 mrb_float_value(mrb, NAN):
-                                 mrb_float_value(mrb, INFINITY)),
-                           mrb_float_value(mrb, NAN));
-#endif
-    }
-    fixdivmod(mrb, mrb_fixnum(x), mrb_fixnum(y), &div, &mod);
-    return mrb_assoc_new(mrb, mrb_fixnum_value(div), mrb_fixnum_value(mod));
+    intdivmod(mrb, mrb_integer(x), mrb_integer(y), &div, &mod);
+    return mrb_assoc_new(mrb, mrb_int_value(mrb, div), mrb_int_value(mrb, mod));
   }
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
+#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_fixnum(x), mrb_to_flo(mrb, y), &div, &mod);
-    a = mrb_int_value(mrb, div);
+    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);
   }
 #endif
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 static mrb_value
 flo_divmod(mrb_state *mrb, mrb_value x)
 {
@@ -961,8 +1162,11 @@
   mrb_float div, mod;
   mrb_value a, b;
 
-  flodivmod(mrb, mrb_float(x), mrb_to_flo(mrb, y), &div, &mod);
-  a = mrb_int_value(mrb, div);
+  flodivmod(mrb, mrb_float(x), mrb_as_float(mrb, y), &div, &mod);
+  if (!FIXABLE_FLOAT(div))
+    a = mrb_float_value(mrb, div);
+  else
+    a = mrb_int_value(mrb, (mrb_int)div);
   b = mrb_float_value(mrb, mod);
   return mrb_assoc_new(mrb, a, b);
 }
@@ -971,9 +1175,9 @@
 /* 15.2.8.3.7  */
 /*
  * call-seq:
- *   fix == other  ->  true or false
+ *   int == other  ->  true or false
  *
- * Return <code>true</code> if <code>fix</code> equals <code>other</code>
+ * Return <code>true</code> if <code>int</code> equals <code>other</code>
  * numerically.
  *
  *   1 == 2      #=> false
@@ -981,16 +1185,24 @@
  */
 
 static mrb_value
-fix_equal(mrb_state *mrb, mrb_value x)
+int_equal(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
 
   switch (mrb_type(y)) {
-  case MRB_TT_FIXNUM:
-    return mrb_bool_value(mrb_fixnum(x) == mrb_fixnum(y));
-#ifndef MRB_WITHOUT_FLOAT
+  case MRB_TT_INTEGER:
+    return mrb_bool_value(mrb_integer(x) == mrb_integer(y));
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
-    return mrb_bool_value((mrb_float)mrb_fixnum(x) == mrb_float(y));
+    return mrb_bool_value((mrb_float)mrb_integer(x) == mrb_float(y));
+#endif
+#ifdef MRB_USE_RATIONAL
+  case MRB_TT_RATIONAL:
+    return mrb_bool_value(mrb_equal(mrb, y, x));
+#endif
+#ifdef MRB_USE_COMPLEX
+  case MRB_TT_COMPLEX:
+    return mrb_bool_value(mrb_equal(mrb, y, x));
 #endif
   default:
     return mrb_false_value();
@@ -1000,7 +1212,7 @@
 /* 15.2.8.3.8  */
 /*
  * call-seq:
- *   ~fix  ->  integer
+ *   ~int  ->  integer
  *
  * One's complement: returns a number where each bit is flipped.
  *   ex.0---00001 (1)-> 1---11110 (-2)
@@ -1009,37 +1221,37 @@
  */
 
 static mrb_value
-fix_rev(mrb_state *mrb, mrb_value num)
+int_rev(mrb_state *mrb, mrb_value num)
 {
-  mrb_int val = mrb_fixnum(num);
+  mrb_int val = mrb_integer(num);
 
-  return mrb_fixnum_value(~val);
+  return mrb_int_value(mrb, ~val);
 }
 
-#ifdef MRB_WITHOUT_FLOAT
+#ifdef MRB_NO_FLOAT
 #define bit_op(x,y,op1,op2) do {\
-  return mrb_fixnum_value(mrb_fixnum(x) op2 mrb_fixnum(y));\
+  return mrb_int_value(mrb, (mrb_integer(x) op2 mrb_integer(y)));\
 } while(0)
 #else
 static mrb_value flo_and(mrb_state *mrb, mrb_value x);
 static mrb_value flo_or(mrb_state *mrb, mrb_value x);
 static mrb_value flo_xor(mrb_state *mrb, mrb_value x);
 #define bit_op(x,y,op1,op2) do {\
-  if (mrb_fixnum_p(y)) return mrb_fixnum_value(mrb_fixnum(x) op2 mrb_fixnum(y));\
-  return flo_ ## op1(mrb, mrb_float_value(mrb, (mrb_float)mrb_fixnum(x)));\
+  if (mrb_integer_p(y)) return mrb_int_value(mrb, (mrb_integer(x) op2 mrb_integer(y))); \
+  return flo_ ## op1(mrb, mrb_float_value(mrb, (mrb_float)mrb_integer(x)));\
 } while(0)
 #endif
 
 /* 15.2.8.3.9  */
 /*
  * call-seq:
- *   fix & integer  ->  integer_result
+ *   int & integer  ->  integer_result
  *
  * Bitwise AND.
  */
 
 static mrb_value
-fix_and(mrb_state *mrb, mrb_value x)
+int_and(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
 
@@ -1049,13 +1261,13 @@
 /* 15.2.8.3.10 */
 /*
  * call-seq:
- *   fix | integer  ->  integer_result
+ *   int | integer  ->  integer_result
  *
  * Bitwise OR.
  */
 
 static mrb_value
-fix_or(mrb_state *mrb, mrb_value x)
+int_or(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
 
@@ -1065,13 +1277,13 @@
 /* 15.2.8.3.11 */
 /*
  * call-seq:
- *   fix ^ integer  ->  integer_result
+ *   int ^ integer  ->  integer_result
  *
  * Bitwise EXCLUSIVE OR.
  */
 
 static mrb_value
-fix_xor(mrb_state *mrb, mrb_value x)
+int_xor(mrb_state *mrb, mrb_value x)
 {
   mrb_value y = mrb_get_arg1(mrb);
 
@@ -1080,76 +1292,52 @@
 
 #define NUMERIC_SHIFT_WIDTH_MAX (MRB_INT_BIT-1)
 
-static mrb_value
-lshift(mrb_state *mrb, mrb_int val, mrb_int width)
+mrb_bool
+mrb_num_shift(mrb_state *mrb, mrb_int val, mrb_int width, mrb_int *num)
 {
-  if (width < 0) {              /* mrb_int overflow */
-#ifdef MRB_WITHOUT_FLOAT
-    return mrb_fixnum_value(0);
-#else
-    return mrb_float_value(mrb, INFINITY);
-#endif
+  if (width < 0) {              /* rshift */
+    if (width == MRB_INT_MIN || -width >= NUMERIC_SHIFT_WIDTH_MAX) {
+      if (val < 0) {
+        *num = -1;
+      }
+      else {
+        *num = 0;
+      }
+    }
+    else {
+      *num = val >> -width;
+    }
   }
-  if (val > 0) {
+  else if (val > 0) {
     if ((width > NUMERIC_SHIFT_WIDTH_MAX) ||
         (val   > (MRB_INT_MAX >> width))) {
-#ifdef MRB_WITHOUT_FLOAT
-      return mrb_fixnum_value(-1);
-#else
-      goto bit_overflow;
-#endif
+      return FALSE;
     }
-    return mrb_fixnum_value(val << width);
+    *num = val << width;
   }
   else {
     if ((width > NUMERIC_SHIFT_WIDTH_MAX) ||
-        (val   <= (MRB_INT_MIN >> width))) {
-#ifdef MRB_WITHOUT_FLOAT
-      return mrb_fixnum_value(0);
-#else
-      goto bit_overflow;
-#endif
+        (val   < (MRB_INT_MIN >> width))) {
+      return FALSE;
     }
-    return mrb_fixnum_value(val * ((mrb_int)1 << width));
-  }
-
-#ifndef MRB_WITHOUT_FLOAT
-bit_overflow:
-  {
-    mrb_float f = (mrb_float)val;
-    while (width--) {
-      f *= 2;
-    }
-    return mrb_float_value(mrb, f);
-  }
-#endif
-}
-
-static mrb_value
-rshift(mrb_int val, mrb_int width)
-{
-  if (width < 0) {              /* mrb_int overflow */
-    return mrb_fixnum_value(0);
-  }
-  if (width >= NUMERIC_SHIFT_WIDTH_MAX) {
-    if (val < 0) {
-      return mrb_fixnum_value(-1);
-    }
-    return mrb_fixnum_value(0);
+    if (width == NUMERIC_SHIFT_WIDTH_MAX)
+      *num = MRB_INT_MIN;
+    else
+      *num = val * ((mrb_int)1 << width);
   }
-  return mrb_fixnum_value(val >> width);
+  return TRUE;
 }
 
 /* 15.2.8.3.12 */
 /*
  * call-seq:
- *   fix << count  ->  integer or float
+ *   int << count  ->  integer or float
  *
- * Shifts _fix_ left _count_ positions (right if _count_ is negative).
+ * Shifts _int_ left _count_ positions (right if _count_ is negative).
  */
 
 static mrb_value
-fix_lshift(mrb_state *mrb, mrb_value x)
+int_lshift(mrb_state *mrb, mrb_value x)
 {
   mrb_int width, val;
 
@@ -1157,24 +1345,24 @@
   if (width == 0) {
     return x;
   }
-  val = mrb_fixnum(x);
+  val = mrb_integer(x);
   if (val == 0) return x;
-  if (width < 0) {
-    return rshift(val, -width);
+  if (!mrb_num_shift(mrb, val, width, &val)) {
+    int_overflow(mrb, "bit shift");
   }
-  return lshift(mrb, val, width);
+  return mrb_int_value(mrb, val);
 }
 
 /* 15.2.8.3.13 */
 /*
  * call-seq:
- *   fix >> count  ->  integer or float
+ *   int >> count  ->  integer or float
  *
- * Shifts _fix_ right _count_ positions (left if _count_ is negative).
+ * Shifts _int_ right _count_ positions (left if _count_ is negative).
  */
 
 static mrb_value
-fix_rshift(mrb_state *mrb, mrb_value x)
+int_rshift(mrb_state *mrb, mrb_value x)
 {
   mrb_int width, val;
 
@@ -1182,28 +1370,29 @@
   if (width == 0) {
     return x;
   }
-  val = mrb_fixnum(x);
+  val = mrb_integer(x);
   if (val == 0) return x;
-  if (width < 0) {
-    return lshift(mrb, val, -width);
+  if (width == MRB_INT_MIN) int_overflow(mrb, "bit shift");
+  if (!mrb_num_shift(mrb, val, -width, &val)) {
+    int_overflow(mrb, "bit shift");
   }
-  return rshift(val, width);
+  return mrb_int_value(mrb, val);
 }
 
 /* 15.2.8.3.23 */
 /*
  *  call-seq:
- *     fix.to_f  ->  float
+ *     int.to_f  ->  float
  *
- *  Converts <i>fix</i> to a <code>Float</code>.
+ *  Converts <i>int</i> to a <code>Float</code>.
  *
  */
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 static mrb_value
-fix_to_f(mrb_state *mrb, mrb_value num)
+int_to_f(mrb_state *mrb, mrb_value num)
 {
-  return mrb_float_value(mrb, (mrb_float)mrb_fixnum(num));
+  return mrb_float_value(mrb, (mrb_float)mrb_integer(num));
 }
 
 /*
@@ -1221,13 +1410,12 @@
  */
 /* ------------------------------------------------------------------------*/
 MRB_API mrb_value
-mrb_flo_to_fixnum(mrb_state *mrb, mrb_value x)
+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");
-    z = 0; /* not reached. just suppress warnings. */
   }
   else {
     mrb_float d = mrb_float(x);
@@ -1240,44 +1428,59 @@
       mrb_raisef(mrb, E_RANGE_ERROR, "number (%v) too big for integer", x);
     }
   }
-  return mrb_fixnum_value(z);
+  return mrb_int_value(mrb, z);
 }
 #endif
 
 static mrb_value
-fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y)
+int_plus(mrb_state *mrb, mrb_value x, mrb_value y)
 {
   mrb_int a;
 
-  a = mrb_fixnum(x);
-  if (mrb_fixnum_p(y)) {
+  a = mrb_integer(x);
+  if (mrb_integer_p(y)) {
     mrb_int b, c;
 
     if (a == 0) return y;
-    b = mrb_fixnum(y);
+    b = mrb_integer(y);
     if (mrb_int_add_overflow(a, b, &c)) {
-#ifndef MRB_WITHOUT_FLOAT
-      return mrb_float_value(mrb, (mrb_float)a + (mrb_float)b);
-#endif
+      int_overflow(mrb, "addition");
     }
-    return mrb_fixnum_value(c);
+    return mrb_int_value(mrb, c);
   }
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
+  switch (mrb_type(y)) {
+#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+  case MRB_TT_RATIONAL:
+  case MRB_TT_COMPLEX:
+    return mrb_funcall_id(mrb, y, MRB_OPSYM(add), 1, x);
+#endif
+  default:
+#ifdef MRB_NO_FLOAT
+    mrb_raise(mrb, E_TYPE_ERROR, "non integer addition");
 #else
-  return mrb_float_value(mrb, (mrb_float)a + mrb_to_flo(mrb, y));
+    return mrb_float_value(mrb, (mrb_float)a + mrb_as_float(mrb, y));
 #endif
+  }
 }
 
 MRB_API mrb_value
 mrb_num_plus(mrb_state *mrb, mrb_value x, mrb_value y)
 {
-  if (mrb_fixnum_p(x)) {
-    return fixnum_plus(mrb, x, y);
+  if (mrb_integer_p(x)) {
+    return int_plus(mrb, x, y);
   }
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   if (mrb_float_p(x)) {
-    return mrb_float_value(mrb, mrb_float(x) + mrb_to_flo(mrb, y));
+    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");
@@ -1287,53 +1490,69 @@
 /* 15.2.8.3.1  */
 /*
  * call-seq:
- *   fix + numeric  ->  numeric_result
+ *   int + numeric  ->  numeric_result
  *
  * Performs addition: the class of the resulting object depends on
  * the class of <code>numeric</code> and on the magnitude of the
  * result.
  */
 static mrb_value
-fix_plus(mrb_state *mrb, mrb_value self)
+int_add(mrb_state *mrb, mrb_value self)
 {
   mrb_value other = mrb_get_arg1(mrb);
 
-  return fixnum_plus(mrb, self, other);
+  return int_plus(mrb, self, other);
 }
 
 static mrb_value
-fixnum_minus(mrb_state *mrb, mrb_value x, mrb_value y)
+int_minus(mrb_state *mrb, mrb_value x, mrb_value y)
 {
   mrb_int a;
 
-  a = mrb_fixnum(x);
-  if (mrb_fixnum_p(y)) {
+  a = mrb_integer(x);
+  if (mrb_integer_p(y)) {
     mrb_int b, c;
 
-    b = mrb_fixnum(y);
+    b = mrb_integer(y);
     if (mrb_int_sub_overflow(a, b, &c)) {
-#ifndef MRB_WITHOUT_FLOAT
-      return mrb_float_value(mrb, (mrb_float)a - (mrb_float)b);
-#endif
+      int_overflow(mrb, "subtraction");
     }
-    return mrb_fixnum_value(c);
+    return mrb_int_value(mrb, c);
   }
-#ifdef MRB_WITHOUT_FLOAT
-  mrb_raise(mrb, E_TYPE_ERROR, "non fixnum value");
+  switch (mrb_type(y)) {
+#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
+  case MRB_TT_RATIONAL:
+  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);
+#endif
+  default:
+#ifdef MRB_NO_FLOAT
+    mrb_raise(mrb, E_TYPE_ERROR, "non integer subtraction");
 #else
-  return mrb_float_value(mrb, (mrb_float)a - mrb_to_flo(mrb, y));
+    return mrb_float_value(mrb, (mrb_float)a - mrb_as_float(mrb, y));
 #endif
+  }
 }
 
 MRB_API mrb_value
 mrb_num_minus(mrb_state *mrb, mrb_value x, mrb_value y)
 {
-  if (mrb_fixnum_p(x)) {
-    return fixnum_minus(mrb, x, y);
+  if (mrb_integer_p(x)) {
+    return int_minus(mrb, x, y);
   }
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   if (mrb_float_p(x)) {
-    return mrb_float_value(mrb, mrb_float(x) - mrb_to_flo(mrb, y));
+    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");
@@ -1344,49 +1563,65 @@
 /* 15.2.8.3.16 */
 /*
  * call-seq:
- *   fix - numeric  ->  numeric_result
+ *   int - numeric  ->  numeric_result
  *
  * Performs subtraction: the class of the resulting object depends on
  * the class of <code>numeric</code> and on the magnitude of the
  * result.
  */
 static mrb_value
-fix_minus(mrb_state *mrb, mrb_value self)
+int_sub(mrb_state *mrb, mrb_value self)
 {
   mrb_value other = mrb_get_arg1(mrb);
 
-  return fixnum_minus(mrb, self, other);
+  return int_minus(mrb, self, other);
 }
 
-
-MRB_API mrb_value
-mrb_fixnum_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)
 {
-  char bufMRB_INT_BIT+1;
-  char *b = buf + sizeof buf;
-  mrb_int val = mrb_fixnum(x);
-  mrb_value str;
+  char *bufend = buf + len;
+  char *b = bufend-1;
 
-  if (base < 2 || 36 < base) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid radix %i", base);
-  }
+  if (base < 2 || 36 < base) return NULL;
+  if (len < 2) return NULL;
 
-  if (val == 0) {
-    *--b = '0';
+  if (n == 0) {
+    buf0 = '0';
+    buf1 = '\0';
+    return buf;
   }
-  else if (val < 0) {
+
+  *b = '\0';
+  if (n < 0) {
     do {
-      *--b = mrb_digitmap-(val % base);
-    } while (val /= base);
-    *--b = '-';
+      if (b-- == buf) return NULL;
+      *b = mrb_digitmap-(n % base);
+    } while (n /= base);
+    if (b-- == buf) return NULL;
+    *b = '-';
   }
   else {
     do {
-      *--b = mrb_digitmap(int)(val % base);
-    } while (val /= base);
+      if (b-- == buf) return NULL;
+      *b = mrb_digitmap(int)(n % base);
+    } while (n /= base);
   }
+  return b;
+}
+
+MRB_API mrb_value
+mrb_integer_to_str(mrb_state *mrb, mrb_value x, mrb_int base)
+{
+  char bufMRB_INT_BIT+1;
+  mrb_int val = mrb_integer(x);
 
-  str = mrb_str_new(mrb, b, buf + sizeof(buf) - b);
+  if (base < 2 || 36 < base) {
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid radix %i", base);
+  }
+  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);
   RSTR_SET_ASCII_FLAG(mrb_str_ptr(str));
   return str;
 }
@@ -1394,9 +1629,9 @@
 /* 15.2.8.3.25 */
 /*
  *  call-seq:
- *     fix.to_s(base=10)  ->  string
+ *     int.to_s(base=10)  ->  string
  *
- *  Returns a string containing the representation of <i>fix</i> radix
+ *  Returns a string containing the representation of <i>int</i> radix
  *  <i>base</i> (between 2 and 36).
  *
  *     12345.to_s       #=> "12345"
@@ -1408,41 +1643,46 @@
  *
  */
 static mrb_value
-fix_to_s(mrb_state *mrb, mrb_value self)
+int_to_s(mrb_state *mrb, mrb_value self)
 {
   mrb_int base = 10;
 
   mrb_get_args(mrb, "|i", &base);
-  return mrb_fixnum_to_str(mrb, self, base);
+  return mrb_integer_to_str(mrb, self, base);
 }
 
 /* compare two numbers: (1:0:-1; -2 for error) */
 static mrb_int
 cmpnum(mrb_state *mrb, mrb_value v1, mrb_value v2)
 {
-#ifdef MRB_WITHOUT_FLOAT
+#ifdef MRB_NO_FLOAT
   mrb_int x, y;
 #else
   mrb_float x, y;
 #endif
 
-#ifdef MRB_WITHOUT_FLOAT
-  x = mrb_fixnum(v1);
+#ifdef MRB_NO_FLOAT
+  x = mrb_integer(v1);
 #else
-  x = mrb_to_flo(mrb, v1);
+  x = mrb_as_float(mrb, v1);
 #endif
   switch (mrb_type(v2)) {
-  case MRB_TT_FIXNUM:
-#ifdef MRB_WITHOUT_FLOAT
-    y = mrb_fixnum(v2);
+  case MRB_TT_INTEGER:
+#ifdef MRB_NO_FLOAT
+    y = mrb_integer(v2);
 #else
-    y = (mrb_float)mrb_fixnum(v2);
+    y = (mrb_float)mrb_integer(v2);
 #endif
     break;
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
     y = mrb_float(v2);
     break;
+#ifdef MRB_USE_RATIONAL
+  case MRB_TT_RATIONAL:
+    y = mrb_as_float(mrb, v2);
+    break;
+#endif
 #endif
   default:
     return -2;
@@ -1463,13 +1703,13 @@
  *             <  => -1
  *             =  =>  0
  *             >  => +1
- *  Comparison---Returns -1, 0, or +1 depending on whether <i>fix</i> is
+ *  Comparison---Returns -1, 0, or +1 depending on whether <i>int</i> is
  *  less than, equal to, or greater than <i>numeric</i>. This is the
  *  basis for the tests in <code>Comparable</code>. When the operands are
  *  not comparable, it returns nil instead of raising an exception.
  */
 static mrb_value
-integral_cmp(mrb_state *mrb, mrb_value self)
+num_cmp(mrb_state *mrb, mrb_value self)
 {
   mrb_value other = mrb_get_arg1(mrb);
   mrb_int n;
@@ -1486,7 +1726,7 @@
 }
 
 static mrb_value
-integral_lt(mrb_state *mrb, mrb_value self)
+num_lt(mrb_state *mrb, mrb_value self)
 {
   mrb_value other = mrb_get_arg1(mrb);
   mrb_int n;
@@ -1498,7 +1738,7 @@
 }
 
 static mrb_value
-integral_le(mrb_state *mrb, mrb_value self)
+num_le(mrb_state *mrb, mrb_value self)
 {
   mrb_value other = mrb_get_arg1(mrb);
   mrb_int n;
@@ -1510,7 +1750,7 @@
 }
 
 static mrb_value
-integral_gt(mrb_state *mrb, mrb_value self)
+num_gt(mrb_state *mrb, mrb_value self)
 {
   mrb_value other = mrb_get_arg1(mrb);
   mrb_int n;
@@ -1522,7 +1762,7 @@
 }
 
 static mrb_value
-integral_ge(mrb_state *mrb, mrb_value self)
+num_ge(mrb_state *mrb, mrb_value self)
 {
   mrb_value other = mrb_get_arg1(mrb);
   mrb_int n;
@@ -1539,7 +1779,7 @@
   mrb_value v;
 
   switch (mrb_type(obj1)) {
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
   case MRB_TT_FLOAT:
     return cmpnum(mrb, obj1, obj2);
   case MRB_TT_STRING:
@@ -1547,10 +1787,10 @@
       return -2;
     return mrb_str_cmp(mrb, obj1, obj2);
   default:
-    v = mrb_funcall(mrb, obj1, "<=>", 1, obj2);
-    if (mrb_nil_p(v) || !mrb_fixnum_p(v))
+    v = mrb_funcall_id(mrb, obj1, MRB_OPSYM(cmp), 1, obj2);
+    if (mrb_nil_p(v) || !mrb_integer_p(v))
       return -2;
-    return mrb_fixnum(v);
+    return mrb_integer(v);
   }
 }
 
@@ -1566,123 +1806,106 @@
   return mrb_false_value();
 }
 
-/* 15.2.9.3.1  */
-/*
- * call-seq:
- *   float + other  ->  float
- *
- * Returns a new float which is the sum of <code>float</code>
- * and <code>other</code>.
- */
-#ifndef MRB_WITHOUT_FLOAT
-static mrb_value
-flo_plus(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y = mrb_get_arg1(mrb);
-
-  return mrb_float_value(mrb, mrb_float(x) + mrb_to_flo(mrb, y));
-}
-#endif
-
 /* ------------------------------------------------------------------------*/
 void
 mrb_init_numeric(mrb_state *mrb)
 {
-  struct RClass *numeric, *integer, *fixnum, *integral;
-#ifndef MRB_WITHOUT_FLOAT
+  struct RClass *numeric, *integer;
+#ifndef MRB_NO_FLOAT
   struct RClass *fl;
 #endif
 
-  integral = mrb_define_module(mrb, "Integral");
-  mrb_define_method(mrb, integral,"**",       integral_pow,    MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, integral,"/",        integral_div,    MRB_ARGS_REQ(1)); /* 15.2.{8,9}.3.6  */
-  mrb_define_method(mrb, integral,"quo",      integral_div,    MRB_ARGS_REQ(1)); /* 15.2.7.4.5 (x) */
-  mrb_define_method(mrb, integral,"div",      integral_idiv,   MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, integral,"<=>",      integral_cmp,    MRB_ARGS_REQ(1)); /* 15.2.{8,9}.3.1  */
-  mrb_define_method(mrb, integral,"<",        integral_lt,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, integral,"<=",       integral_le,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, integral,">",        integral_gt,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, integral,">=",       integral_ge,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, integral,"__coerce_step_counter", integral_coerce_step_counter, MRB_ARGS_REQ(2));
-
   /* Numeric Class */
   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());
 
   /* Integer Class */
-  integer = mrb_define_class(mrb, "Integer",  numeric);                          /* 15.2.8 */
-  MRB_SET_INSTANCE_TT(integer, MRB_TT_FIXNUM);
+  mrb->integer_class = integer = mrb_define_class(mrb, "Integer",  numeric);     /* 15.2.8 */
+  MRB_SET_INSTANCE_TT(integer, MRB_TT_INTEGER);
   mrb_undef_class_method(mrb, integer, "new");
+  mrb_define_method(mrb, integer, "**",       int_pow,         MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, integer, "<=>",      num_cmp,         MRB_ARGS_REQ(1)); /* 15.2.8.3.1  */
+  mrb_define_method(mrb, integer, "<",        num_lt,          MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, integer, "<=",       num_le,          MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, integer, ">",        num_gt,          MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, integer, ">=",       num_ge,          MRB_ARGS_REQ(1));
+
   mrb_define_method(mrb, integer, "to_i",     int_to_i,        MRB_ARGS_NONE()); /* 15.2.8.3.24 */
   mrb_define_method(mrb, integer, "to_int",   int_to_i,        MRB_ARGS_NONE());
-#ifndef MRB_WITHOUT_FLOAT
-  mrb_define_method(mrb, integer, "ceil",     int_to_i,        MRB_ARGS_NONE()); /* 15.2.8.3.8 (x) */
-  mrb_define_method(mrb, integer, "floor",    int_to_i,        MRB_ARGS_NONE()); /* 15.2.8.3.10 (x) */
-  mrb_define_method(mrb, integer, "round",    int_to_i,        MRB_ARGS_NONE()); /* 15.2.8.3.12 (x) */
-  mrb_define_method(mrb, integer, "truncate", int_to_i,        MRB_ARGS_NONE()); /* 15.2.8.3.15 (x) */
-#endif
 
-  /* Fixnum Class */
-  mrb->fixnum_class = fixnum = mrb_define_class(mrb, "Fixnum", integer);
-  mrb_define_method(mrb, fixnum,  "+",        fix_plus,        MRB_ARGS_REQ(1)); /* 15.2.8.3.1  */
-  mrb_define_method(mrb, fixnum,  "-",        fix_minus,       MRB_ARGS_REQ(1)); /* 15.2.8.3.2  */
-  mrb_define_method(mrb, fixnum,  "*",        fix_mul,         MRB_ARGS_REQ(1)); /* 15.2.8.3.3  */
-  mrb_define_method(mrb, fixnum,  "%",        fix_mod,         MRB_ARGS_REQ(1)); /* 15.2.8.3.5  */
-  mrb_define_method(mrb, fixnum,  "==",       fix_equal,       MRB_ARGS_REQ(1)); /* 15.2.8.3.7  */
-  mrb_define_method(mrb, fixnum,  "~",        fix_rev,         MRB_ARGS_NONE()); /* 15.2.8.3.8  */
-  mrb_define_method(mrb, fixnum,  "&",        fix_and,         MRB_ARGS_REQ(1)); /* 15.2.8.3.9  */
-  mrb_define_method(mrb, fixnum,  "|",        fix_or,          MRB_ARGS_REQ(1)); /* 15.2.8.3.10 */
-  mrb_define_method(mrb, fixnum,  "^",        fix_xor,         MRB_ARGS_REQ(1)); /* 15.2.8.3.11 */
-  mrb_define_method(mrb, fixnum,  "<<",       fix_lshift,      MRB_ARGS_REQ(1)); /* 15.2.8.3.12 */
-  mrb_define_method(mrb, fixnum,  ">>",       fix_rshift,      MRB_ARGS_REQ(1)); /* 15.2.8.3.13 */
-  mrb_define_method(mrb, fixnum,  "eql?",     fix_eql,         MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
-#ifndef MRB_WITHOUT_FLOAT
-  mrb_define_method(mrb, fixnum,  "to_f",     fix_to_f,        MRB_ARGS_NONE()); /* 15.2.8.3.23 */
+  mrb_define_method(mrb, integer, "+",        int_add,         MRB_ARGS_REQ(1)); /* 15.2.8.3.1 */
+  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, "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 */
+  mrb_define_method(mrb, integer, "&",        int_and,         MRB_ARGS_REQ(1)); /* 15.2.8.3.9 */
+  mrb_define_method(mrb, integer, "|",        int_or,          MRB_ARGS_REQ(1)); /* 15.2.8.3.10 */
+  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 */
+#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, fixnum,  "to_s",     fix_to_s,        MRB_ARGS_OPT(1)); /* 15.2.8.3.25 */
-  mrb_define_method(mrb, fixnum,  "inspect",  fix_to_s,        MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, fixnum,  "divmod",   fix_divmod,      MRB_ARGS_REQ(1)); /* 15.2.8.3.30 (x) */
+  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, "__coerce_step_counter", coerce_step_counter, MRB_ARGS_REQ(2));
 
-#ifndef MRB_WITHOUT_FLOAT
+  /* Fixnum Class for compatibility */
+  mrb_define_const(mrb, mrb->object_class, "Fixnum", mrb_obj_value(integer));
+
+#ifndef MRB_NO_FLOAT
   /* Float Class */
   mrb->float_class = fl = mrb_define_class(mrb, "Float", numeric);                 /* 15.2.9 */
   MRB_SET_INSTANCE_TT(fl, MRB_TT_FLOAT);
   mrb_undef_class_method(mrb,  fl, "new");
-  mrb_define_method(mrb, fl,      "+",         flo_plus,       MRB_ARGS_REQ(1)); /* 15.2.9.3.1  */
-  mrb_define_method(mrb, fl,      "-",         flo_minus,      MRB_ARGS_REQ(1)); /* 15.2.9.3.2  */
-  mrb_define_method(mrb, fl,      "*",         flo_mul,        MRB_ARGS_REQ(1)); /* 15.2.9.3.3  */
-  mrb_define_method(mrb, fl,      "%",         flo_mod,        MRB_ARGS_REQ(1)); /* 15.2.9.3.5  */
-  mrb_define_method(mrb, fl,      "==",        flo_eq,         MRB_ARGS_REQ(1)); /* 15.2.9.3.7  */
+  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,      "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,      "<",         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_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));
   mrb_define_method(mrb, fl,      "^",         flo_xor,        MRB_ARGS_REQ(1));
   mrb_define_method(mrb, fl,      ">>",        flo_rshift,     MRB_ARGS_REQ(1));
   mrb_define_method(mrb, fl,      "<<",        flo_lshift,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, fl,      "ceil",      flo_ceil,       MRB_ARGS_NONE()); /* 15.2.9.3.8  */
+  mrb_define_method(mrb, fl,      "ceil",      flo_ceil,       MRB_ARGS_OPT(1)); /* 15.2.9.3.8  */
   mrb_define_method(mrb, fl,      "finite?",   flo_finite_p,   MRB_ARGS_NONE()); /* 15.2.9.3.9  */
-  mrb_define_method(mrb, fl,      "floor",     flo_floor,      MRB_ARGS_NONE()); /* 15.2.9.3.10 */
+  mrb_define_method(mrb, fl,      "floor",     flo_floor,      MRB_ARGS_OPT(1)); /* 15.2.9.3.10 */
   mrb_define_method(mrb, fl,      "infinite?", flo_infinite_p, MRB_ARGS_NONE()); /* 15.2.9.3.11 */
   mrb_define_method(mrb, fl,      "round",     flo_round,      MRB_ARGS_OPT(1)); /* 15.2.9.3.12 */
   mrb_define_method(mrb, fl,      "to_f",      flo_to_f,       MRB_ARGS_NONE()); /* 15.2.9.3.13 */
-  mrb_define_method(mrb, fl,      "to_i",      flo_truncate,   MRB_ARGS_NONE()); /* 15.2.9.3.14 */
-  mrb_define_method(mrb, fl,      "to_int",    flo_truncate,   MRB_ARGS_NONE());
-  mrb_define_method(mrb, fl,      "truncate",  flo_truncate,   MRB_ARGS_NONE()); /* 15.2.9.3.15 */
+  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 */
 
 #ifdef INFINITY
-  mrb_define_const(mrb, fl, "INFINITY", mrb_float_value(mrb, INFINITY));
+  mrb_define_const_id(mrb, fl, MRB_SYM(INFINITY), mrb_float_value(mrb, INFINITY));
 #endif
 #ifdef NAN
-  mrb_define_const(mrb, fl, "NAN", mrb_float_value(mrb, NAN));
+  mrb_define_const_id(mrb, fl, MRB_SYM(NAN), mrb_float_value(mrb, NAN));
 #endif
-
-  mrb_include_module(mrb, fl, integral);
 #endif
 }

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

@@ -9,22 +9,29 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
 {
+#if defined(MRB_NAN_BOXING)
+  return v1.u == v2.u;
+#elif defined(MRB_WORD_BOXING)
+  return v1.w == v2.w;
+#else  /* MRB_NO_BOXING */
   if (mrb_type(v1) != mrb_type(v2)) return FALSE;
   switch (mrb_type(v1)) {
   case MRB_TT_TRUE:
     return TRUE;
 
   case MRB_TT_FALSE:
-  case MRB_TT_FIXNUM:
     return (mrb_fixnum(v1) == mrb_fixnum(v2));
+  case MRB_TT_INTEGER:
+    return (mrb_integer(v1) == mrb_integer(v2));
   case MRB_TT_SYMBOL:
     return (mrb_symbol(v1) == mrb_symbol(v2));
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
     return (mrb_float(v1) == mrb_float(v2));
 #endif
@@ -32,6 +39,7 @@
   default:
     return (mrb_ptr(v1) == mrb_ptr(v2));
   }
+#endif
 }
 
 MRB_API mrb_bool
@@ -47,18 +55,18 @@
   mrb_value result;
 
   if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE;
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   /* value mixing with integer and float */
-  if (mrb_fixnum_p(obj1)) {
-    if (mrb_float_p(obj2) && (mrb_float)mrb_fixnum(obj1) == mrb_float(obj2))
+  if (mrb_integer_p(obj1)) {
+    if (mrb_float_p(obj2) && (mrb_float)mrb_integer(obj1) == mrb_float(obj2))
       return TRUE;
   }
   else if (mrb_float_p(obj1)) {
-    if (mrb_fixnum_p(obj2) && mrb_float(obj1) == (mrb_float)mrb_fixnum(obj2))
+    if (mrb_integer_p(obj2) && mrb_float(obj1) == (mrb_float)mrb_integer(obj2))
       return TRUE;
   }
 #endif
-  result = mrb_funcall(mrb, obj1, "==", 1, obj2);
+  result = mrb_funcall_id(mrb, obj1, MRB_OPSYM(eq), 1, obj2);
   if (mrb_test(result)) return TRUE;
   return FALSE;
 }
@@ -94,7 +102,7 @@
 static mrb_value
 nil_to_s(mrb_state *mrb, mrb_value obj)
 {
-  mrb_value str = mrb_str_new_frozen(mrb, 0, 0);
+  mrb_value str = mrb_str_new_frozen(mrb, NULL, 0);
   RSTR_SET_ASCII_FLAG(mrb_str_ptr(str));
   return str;
 }
@@ -287,7 +295,7 @@
   struct RClass *f;
 
   mrb->nil_class   = n = mrb_define_class(mrb, "NilClass",   mrb->object_class);
-  MRB_SET_INSTANCE_TT(n, MRB_TT_TRUE);
+  MRB_SET_INSTANCE_TT(n, MRB_TT_FALSE);
   mrb_undef_class_method(mrb, n, "new");
   mrb_define_method(mrb, n, "&",    false_and,      MRB_ARGS_REQ(1));  /* 15.2.4.3.1  */
   mrb_define_method(mrb, n, "^",    false_xor,      MRB_ARGS_REQ(1));  /* 15.2.4.3.2  */
@@ -306,7 +314,7 @@
   mrb_define_method(mrb, t, "inspect", true_to_s,   MRB_ARGS_NONE());
 
   mrb->false_class = f = mrb_define_class(mrb, "FalseClass", mrb->object_class);
-  MRB_SET_INSTANCE_TT(f, MRB_TT_TRUE);
+  MRB_SET_INSTANCE_TT(f, MRB_TT_FALSE);
   mrb_undef_class_method(mrb, f, "new");
   mrb_define_method(mrb, f, "&",    false_and,      MRB_ARGS_REQ(1));  /* 15.2.6.3.1  */
   mrb_define_method(mrb, f, "^",    false_xor,      MRB_ARGS_REQ(1));  /* 15.2.6.3.2  */
@@ -315,109 +323,86 @@
   mrb_define_method(mrb, f, "inspect", false_to_s,  MRB_ARGS_NONE());
 }
 
-static mrb_value
-convert_type(mrb_state *mrb, mrb_value val, const char *tname, const char *method, mrb_bool raise)
+static const char*
+type_name(enum mrb_vtype t)
 {
-  mrb_sym m = 0;
+  switch (t) {
+#define MRB_VTYPE_NAME(tt, type, name) case tt: return name;
+    MRB_VTYPE_FOREACH(MRB_VTYPE_NAME)
+#undef MRB_VTYPE_NAME
+    default: return NULL;
+  }
+}
 
-  m = mrb_intern_cstr(mrb, method);
-  if (!mrb_respond_to(mrb, val, m)) {
+static mrb_value
+convert_type(mrb_state *mrb, mrb_value val, const char *tname, mrb_sym method, mrb_bool raise)
+{
+  if (!mrb_respond_to(mrb, val, method)) {
     if (raise) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %Y into %s", val, tname);
+      if (tname) mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %Y into %s", val, tname);
+      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %Y", val);
     }
     return mrb_nil_value();
   }
-  return mrb_funcall_argv(mrb, val, m, 0, 0);
+  return mrb_funcall_argv(mrb, val, method, 0, 0);
 }
 
 MRB_API mrb_value
-mrb_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method)
+mrb_type_convert(mrb_state *mrb, mrb_value val, enum mrb_vtype type, mrb_sym method)
 {
   mrb_value v;
+  const char *tname;
 
   if (mrb_type(val) == type) return val;
+  tname = type_name(type);
   v = convert_type(mrb, val, tname, method, TRUE);
   if (mrb_type(v) != type) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "%v cannot be converted to %s by #%s", val, tname, method);
+    if (type == MRB_TT_STRING) return mrb_any_to_s(mrb, val);
+    mrb_raisef(mrb, E_TYPE_ERROR, "%v cannot be converted to %s by #%n", val, tname, method);
   }
   return v;
 }
 
 MRB_API mrb_value
-mrb_check_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method)
+mrb_type_convert_check(mrb_state *mrb, mrb_value val, enum mrb_vtype type, mrb_sym method)
 {
   mrb_value v;
 
   if (mrb_type(val) == type && type != MRB_TT_DATA && type != MRB_TT_ISTRUCT) return val;
-  v = convert_type(mrb, val, tname, method, FALSE);
+  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;
 }
 
-static const struct types {
-  unsigned char type;
-  const char *name;
-} builtin_types = {
-/*    {MRB_TT_NIL,  "nil"}, */
-  {MRB_TT_FALSE,  "false"},
-  {MRB_TT_TRUE,   "true"},
-  {MRB_TT_FIXNUM, "Fixnum"},
-  {MRB_TT_SYMBOL, "Symbol"},  /* :symbol */
-  {MRB_TT_MODULE, "Module"},
-  {MRB_TT_OBJECT, "Object"},
-  {MRB_TT_CLASS,  "Class"},
-  {MRB_TT_ICLASS, "iClass"},  /* internal use: mixed-in module holder */
-  {MRB_TT_SCLASS, "SClass"},
-  {MRB_TT_PROC,   "Proc"},
-#ifndef MRB_WITHOUT_FLOAT
-  {MRB_TT_FLOAT,  "Float"},
-#endif
-  {MRB_TT_ARRAY,  "Array"},
-  {MRB_TT_HASH,   "Hash"},
-  {MRB_TT_STRING, "String"},
-  {MRB_TT_RANGE,  "Range"},
-/*    {MRB_TT_BIGNUM,  "Bignum"}, */
-  {MRB_TT_DATA,   "Data"},  /* internal use: wrapped C pointers */
-/*    {MRB_TT_VARMAP,  "Varmap"}, */ /* internal use: dynamic variables */
-/*    {MRB_TT_NODE,  "Node"}, */ /* internal use: syntax tree node */
-/*    {MRB_TT_UNDEF,  "undef"}, */ /* internal use: #undef; should not happen */
-  {MRB_TT_MAXDEFINE,  0}
-};
-
 MRB_API void
 mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t)
 {
-  const struct types *type = builtin_types;
-  enum mrb_vtype xt;
-
-  xt = mrb_type(x);
-  if ((xt != t) || (xt == MRB_TT_DATA) || (xt == MRB_TT_ISTRUCT)) {
-    while (type->type < MRB_TT_MAXDEFINE) {
-      if (type->type == t) {
-        const char *etype;
-
-        if (mrb_nil_p(x)) {
-          etype = "nil";
-        }
-        else if (mrb_fixnum_p(x)) {
-          etype = "Fixnum";
-        }
-        else if (mrb_symbol_p(x)) {
-          etype = "Symbol";
-        }
-        else if (mrb_immediate_p(x)) {
-          etype = RSTRING_PTR(mrb_obj_as_string(mrb, x));
-        }
-        else {
-          etype = mrb_obj_classname(mrb, x);
-        }
-        mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %s (expected %s)",
-                   etype, type->name);
-      }
-      type++;
-    }
-    mrb_raisef(mrb, E_TYPE_ERROR, "unknown type %d (%d given)", t, mrb_type(x));
+  enum mrb_vtype xt = mrb_type(x);
+  const char *tname, *ename;
+
+  if (t == xt) return;
+
+  tname = type_name(t);
+  if (mrb_nil_p(x)) {
+    ename = "nil";
+  }
+  else if (mrb_integer_p(x)) {
+    ename = "Integer";
+  }
+  else if (mrb_symbol_p(x)) {
+    ename = "Symbol";
+  }
+  else if (mrb_immediate_p(x)) {
+    ename = RSTRING_PTR(mrb_obj_as_string(mrb, x));
   }
+  else {
+    ename = mrb_obj_classname(mrb, x);
+  }
+  if (tname) {
+    mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %s (expected %s)",
+               ename, tname);
+  }
+  mrb_raisef(mrb, E_TYPE_ERROR, "unknown type %d (%s given)", t, ename);
 }
 
 /* 15.3.1.3.46 */
@@ -499,104 +484,78 @@
   return FALSE;
 }
 
+#ifdef MRB_USE_RATIONAL
+// provided by mruby-rational with MRB_USE_RATIONAL
+mrb_value mrb_rational_to_i(mrb_state *mrb, mrb_value rat);
+mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value rat);
+#endif
+#ifdef MRB_USE_COMPLEX
+// provided by mruby-complex with MRB_USE_COMPLEX
+mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp);
+mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value comp);
+#endif
+
 MRB_API mrb_value
-mrb_to_int(mrb_state *mrb, mrb_value val)
+mrb_ensure_int_type(mrb_state *mrb, mrb_value val)
 {
-
-  if (!mrb_fixnum_p(val)) {
-#ifndef MRB_WITHOUT_FLOAT
+  if (!mrb_integer_p(val)) {
+#ifndef MRB_NO_FLOAT
     if (mrb_float_p(val)) {
-      return mrb_flo_to_fixnum(mrb, val);
+      return mrb_float_to_integer(mrb, val);
     }
+    else {
+      switch (mrb_type(val)) {
+#ifdef MRB_USE_RATIONAL
+      case MRB_TT_RATIONAL:
+        return mrb_rational_to_i(mrb, val);
 #endif
-    mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %Y to Integer", val);
-  }
-  return val;
-}
-
-MRB_API mrb_value
-mrb_convert_to_integer(mrb_state *mrb, mrb_value val, mrb_int base)
-{
-  mrb_value tmp;
-
-  if (mrb_nil_p(val)) {
-    if (base != 0) goto arg_error;
-    mrb_raise(mrb, E_TYPE_ERROR, "can't convert nil into Integer");
-  }
-  switch (mrb_type(val)) {
-#ifndef MRB_WITHOUT_FLOAT
-    case MRB_TT_FLOAT:
-      if (base != 0) goto arg_error;
-      return mrb_flo_to_fixnum(mrb, val);
+#ifdef MRB_USE_COMPLEX
+      case MRB_TT_COMPLEX:
+        return mrb_complex_to_i(mrb, val);
 #endif
-
-    case MRB_TT_FIXNUM:
-      if (base != 0) goto arg_error;
-      return val;
-
-    case MRB_TT_STRING:
-    string_conv:
-      return mrb_str_to_inum(mrb, val, base, TRUE);
-
-    default:
-      break;
-  }
-  if (base != 0) {
-    tmp = mrb_check_string_type(mrb, val);
-    if (!mrb_nil_p(tmp)) {
-      val = tmp;
-      goto string_conv;
+      default:
+        break;
+      }
     }
-arg_error:
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "base specified for non string value");
+#endif
+    mrb_raisef(mrb, E_TYPE_ERROR, "%Y cannot be converted to Integer", val);
   }
-  /* to raise TypeError */
-  return mrb_to_int(mrb, val);
-}
-
-MRB_API mrb_value
-mrb_Integer(mrb_state *mrb, mrb_value val)
-{
-  return mrb_convert_to_integer(mrb, val, 0);
+  return val;
 }
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
 MRB_API mrb_value
-mrb_Float(mrb_state *mrb, mrb_value val)
+mrb_ensure_float_type(mrb_state *mrb, mrb_value val)
 {
   if (mrb_nil_p(val)) {
     mrb_raise(mrb, E_TYPE_ERROR, "can't convert nil into Float");
   }
   switch (mrb_type(val)) {
-    case MRB_TT_FIXNUM:
-      return mrb_float_value(mrb, (mrb_float)mrb_fixnum(val));
+    case MRB_TT_INTEGER:
+      return mrb_float_value(mrb, (mrb_float)mrb_integer(val));
 
     case MRB_TT_FLOAT:
       return val;
 
-    case MRB_TT_STRING:
-      return mrb_float_value(mrb, mrb_str_to_dbl(mrb, val, TRUE));
+#ifdef MRB_USE_RATIONAL
+    case MRB_TT_RATIONAL:
+      return mrb_rational_to_f(mrb, val);
+#endif
+
+#ifdef MRB_USE_COMPLEX
+    case MRB_TT_COMPLEX:
+      return mrb_complex_to_f(mrb, val);
+#endif
 
     default:
-      return mrb_convert_type(mrb, val, MRB_TT_FLOAT, "Float", "to_f");
+      mrb_raisef(mrb, E_TYPE_ERROR, "%Y cannot be converted to Float", val);
+      /* not reached */
+      return val;
   }
 }
 #endif
 
 MRB_API mrb_value
-mrb_to_str(mrb_state *mrb, mrb_value val)
-{
-  return mrb_ensure_string_type(mrb, val);
-}
-
-/* obsolete: use mrb_ensure_string_type() instead */
-MRB_API mrb_value
-mrb_string_type(mrb_state *mrb, mrb_value str)
-{
-  return mrb_ensure_string_type(mrb, str);
-}
-
-MRB_API mrb_value
 mrb_ensure_string_type(mrb_state *mrb, mrb_value str)
 {
   if (!mrb_string_p(str)) {
@@ -647,12 +606,12 @@
 MRB_API mrb_value
 mrb_inspect(mrb_state *mrb, mrb_value obj)
 {
-  return mrb_obj_as_string(mrb, mrb_funcall(mrb, obj, "inspect", 0));
+  return mrb_obj_as_string(mrb, mrb_funcall_id(mrb, obj, MRB_SYM(inspect), 0));
 }
 
 MRB_API mrb_bool
 mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2)
 {
   if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE;
-  return mrb_test(mrb_funcall(mrb, obj1, "eql?", 1, obj2));
+  return mrb_test(mrb_funcall_id(mrb, obj1, MRB_SYM_Q(eql), 1, obj2));
 }

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

@@ -8,9 +8,10 @@
 #include <mruby/string.h>
 #include <mruby/variable.h>
 #include <mruby/error.h>
+#include <mruby/presym.h>
 #include <string.h>
 
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
 static void
 printcstr(const char *str, size_t len, FILE *stream)
 {
@@ -27,10 +28,6 @@
     printcstr(RSTRING_PTR(obj), RSTRING_LEN(obj), stream);
   }
 }
-#else
-# define printcstr(str, len, stream) (void)0
-# define printstr(obj, stream) (void)0
-#endif
 
 void
 mrb_core_init_printabort(void)
@@ -51,6 +48,7 @@
   }
 }
 
+
 MRB_API void
 mrb_print_error(mrb_state *mrb)
 {
@@ -60,11 +58,38 @@
 MRB_API void
 mrb_show_version(mrb_state *mrb)
 {
-  printstr(mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION")), stdout);
+  printstr(mrb_const_get(mrb, mrb_obj_value(mrb->object_class), MRB_SYM(MRUBY_DESCRIPTION)), stdout);
+}
+
+MRB_API void
+mrb_show_copyright(mrb_state *mrb)
+{
+  printstr(mrb_const_get(mrb, mrb_obj_value(mrb->object_class), MRB_SYM(MRUBY_COPYRIGHT)), stdout);
+}
+
+#else
+void
+mrb_core_init_printabort(void)
+{
+}
+
+MRB_API void
+mrb_p(mrb_state *mrb, mrb_value obj)
+{
+}
+
+MRB_API void
+mrb_print_error(mrb_state *mrb)
+{
+}
+
+MRB_API void
+mrb_show_version(mrb_state *mrb)
+{
 }
 
 MRB_API void
 mrb_show_copyright(mrb_state *mrb)
 {
-  printstr(mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT")), stdout);
 }
+#endif

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

@@ -9,52 +9,89 @@
 #include <mruby/proc.h>
 #include <mruby/opcode.h>
 #include <mruby/data.h>
+#include <mruby/presym.h>
+#include <mruby/array.h>
+#include <mruby/hash.h>
 
 static const mrb_code call_iseq = {
   OP_CALL,
 };
 
+static const mrb_irep call_irep = {
+  0,                                   /* nlocals */
+  2,                                   /* nregs */
+  0,                                   /* clen */
+  MRB_ISEQ_NO_FREE | MRB_IREP_NO_FREE, /* flags */
+  call_iseq,                           /* iseq */
+  NULL,                                /* pool */
+  NULL,                                /* syms */
+  NULL,                                /* reps */
+  NULL,                                /* lv */
+  NULL,                                /* debug_info */
+  1,                                   /* ilen */
+  0,                                   /* plen */
+  0,                                   /* slen */
+  1,                                   /* rlen */
+  0,                                   /* refcnt */
+};
+
+static const struct RProc call_proc = {
+  NULL, NULL, MRB_TT_PROC, MRB_GC_RED, MRB_FL_OBJ_IS_FROZEN | MRB_PROC_SCOPE | MRB_PROC_STRICT,
+  { &call_irep }, NULL, { NULL }
+};
+
 struct RProc*
-mrb_proc_new(mrb_state *mrb, mrb_irep *irep)
+mrb_proc_new(mrb_state *mrb, const mrb_irep *irep)
 {
   struct RProc *p;
   mrb_callinfo *ci = mrb->c->ci;
 
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
+  p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb->proc_class);
   if (ci) {
     struct RClass *tc = NULL;
 
     if (ci->proc) {
-      tc = MRB_PROC_TARGET_CLASS(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;
+        }
+      }
     }
     if (tc == NULL) {
-      tc = ci->target_class;
+      tc = mrb_vm_ci_target_class(ci);
     }
     p->upper = ci->proc;
     p->e.target_class = tc;
   }
+  if (irep) {
+    mrb_irep_incref(mrb, (mrb_irep*)irep);
+  }
   p->body.irep = irep;
-  mrb_irep_incref(mrb, irep);
 
   return p;
 }
 
-static struct REnv*
-env_new(mrb_state *mrb, mrb_int nlocals)
+struct REnv*
+mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc)
 {
   struct REnv *e;
-  mrb_callinfo *ci = mrb->c->ci;
-  int bidx;
-
-  e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, NULL);
-  MRB_ENV_SET_LEN(e, nlocals);
-  bidx = ci->argc;
-  if (ci->argc < 0) bidx = 2;
-  else bidx += 1;
+  mrb_int bidx = 1;
+  int n = ci->n;
+  int nk = ci->nk;
+
+  e = MRB_OBJ_ALLOC(mrb, MRB_TT_ENV, NULL);
+  e->c = tc;
+  MRB_ENV_SET_LEN(e, nstacks);
+  bidx += (n == 15) ? 1 : n;
+  bidx += (nk == 15) ? 1 : (2*nk);
   MRB_ENV_SET_BIDX(e, bidx);
   e->mid = ci->mid;
-  e->stack = mrb->c->stack;
-  e->cxt = mrb->c;
+  e->stack = stack;
+  e->cxt = c;
 
   return e;
 }
@@ -63,21 +100,17 @@
 closure_setup(mrb_state *mrb, struct RProc *p)
 {
   mrb_callinfo *ci = mrb->c->ci;
-  struct RProc *up = p->upper;
+  const struct RProc *up = p->upper;
   struct REnv *e = NULL;
 
-  if (ci && ci->env) {
-    e = ci->env;
+  if (ci && (e = mrb_vm_ci_env(ci)) != NULL) {
+    /* do nothing, because e is assigned already */
   }
   else if (up) {
-    struct RClass *tc = MRB_PROC_TARGET_CLASS(p);
+    struct RClass *tc = ci->u.target_class;
 
-    e = env_new(mrb, up->body.irep->nlocals);
-    ci->env = e;
-    if (tc) {
-      e->c = tc;
-      mrb_field_write_barrier(mrb, (struct RBasic*)e, (struct RBasic*)tc);
-    }
+    e = mrb_env_new(mrb, mrb->c, ci, up->body.irep->nlocals, ci->stack, tc);
+    ci->u.env = e;
     if (MRB_PROC_ENV_P(up) && MRB_PROC_ENV(up)->cxt == NULL) {
       e->mid = MRB_PROC_ENV(up)->mid;
     }
@@ -90,7 +123,7 @@
 }
 
 struct RProc*
-mrb_closure_new(mrb_state *mrb, mrb_irep *irep)
+mrb_closure_new(mrb_state *mrb, const mrb_irep *irep)
 {
   struct RProc *p = mrb_proc_new(mrb, irep);
 
@@ -103,7 +136,7 @@
 {
   struct RProc *p;
 
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
+  p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb->proc_class);
   p->body.func = func;
   p->flags |= MRB_PROC_CFUNC_FL;
   p->upper = 0;
@@ -119,15 +152,11 @@
   struct REnv *e;
   int i;
 
-  p->e.env = e = env_new(mrb, argc);
+  p->e.env = e = mrb_env_new(mrb, mrb->c, mrb->c->ci, 0, NULL, NULL);
   p->flags |= MRB_PROC_ENVSET;
   mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)e);
   MRB_ENV_CLOSE(e);
 
-  /* NOTE: Prevents keeping invalid addresses when NoMemoryError is raised from `mrb_malloc()`. */
-  e->stack = NULL;
-  MRB_ENV_SET_LEN(e, 0);
-
   e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc);
   MRB_ENV_SET_LEN(e, argc);
 
@@ -153,15 +182,15 @@
 MRB_API mrb_value
 mrb_proc_cfunc_env_get(mrb_state *mrb, mrb_int idx)
 {
-  struct RProc *p = mrb->c->ci->proc;
+  const struct RProc *p = mrb->c->ci->proc;
   struct REnv *e;
 
   if (!p || !MRB_PROC_CFUNC_P(p)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from non-cfunc proc.");
+    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from non-cfunc proc");
   }
   e = MRB_PROC_ENV(p);
   if (!e) {
-    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv.");
+    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv");
   }
   if (idx < 0 || MRB_ENV_LEN(e) <= idx) {
     mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %i (expected: 0 <= index < %i)",
@@ -172,17 +201,17 @@
 }
 
 void
-mrb_proc_copy(struct RProc *a, struct RProc *b)
+mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b)
 {
   if (a->body.irep) {
     /* already initialized proc */
     return;
   }
+  if (!MRB_PROC_CFUNC_P(b) && b->body.irep) {
+    mrb_irep_incref(mrb, (mrb_irep*)b->body.irep);
+  }
   a->flags = b->flags;
   a->body = b->body;
-  if (!MRB_PROC_CFUNC_P(a) && a->body.irep) {
-    a->body.irep->refcnt++;
-  }
   a->upper = b->upper;
   a->e.env = b->e.env;
   /* a->e.target_class = a->e.target_class; */
@@ -197,12 +226,12 @@
 
   /* Calling Proc.new without a block is not implemented yet */
   mrb_get_args(mrb, "&!", &blk);
-  p = (struct RProc *)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class));
-  mrb_proc_copy(p, mrb_proc_ptr(blk));
+  p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class));
+  mrb_proc_copy(mrb, p, mrb_proc_ptr(blk));
   proc = mrb_obj_value(p);
-  mrb_funcall_with_block(mrb, proc, mrb_intern_lit(mrb, "initialize"), 0, NULL, proc);
+  mrb_funcall_with_block(mrb, proc, MRB_SYM(initialize), 0, NULL, proc);
   if (!MRB_PROC_STRICT_P(p) &&
-      mrb->c->ci > mrb->c->cibase && MRB_PROC_ENV(p) == mrb->c->ci-1.env) {
+      mrb->c->ci > mrb->c->cibase && MRB_PROC_ENV(p) == mrb->c->ci-1.u.env) {
     p->flags |= MRB_PROC_ORPHAN;
   }
   return proc;
@@ -216,7 +245,7 @@
   if (!mrb_proc_p(proc)) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
   }
-  mrb_proc_copy(mrb_proc_ptr(self), mrb_proc_ptr(proc));
+  mrb_proc_copy(mrb, mrb_proc_ptr(self), mrb_proc_ptr(proc));
   return self;
 }
 
@@ -224,7 +253,7 @@
 static mrb_value
 proc_arity(mrb_state *mrb, mrb_value self)
 {
-  return mrb_fixnum_value(mrb_proc_arity(mrb_proc_ptr(self)));
+  return mrb_int_value(mrb, mrb_proc_arity(mrb_proc_ptr(self)));
 }
 
 /* 15.3.1.2.6  */
@@ -251,8 +280,8 @@
   }
   p = mrb_proc_ptr(blk);
   if (!MRB_PROC_STRICT_P(p)) {
-    struct RProc *p2 = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, p->c);
-    mrb_proc_copy(p2, p);
+    struct RProc *p2 = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, p->c);
+    mrb_proc_copy(mrb, p2, p);
     p2->flags |= MRB_PROC_STRICT;
     return mrb_obj_value(p2);
   }
@@ -262,7 +291,7 @@
 mrb_int
 mrb_proc_arity(const struct RProc *p)
 {
-  struct mrb_irep *irep;
+  const mrb_irep *irep;
   const mrb_code *pc;
   mrb_aspec aspec;
   int ma, op, ra, pa, arity;
@@ -293,40 +322,133 @@
   return arity;
 }
 
-static void
-tempirep_free(mrb_state *mrb, void *p)
+mrb_value
+mrb_proc_local_variables(mrb_state *mrb, const struct RProc *proc)
 {
-  if (p) mrb_irep_free(mrb, (mrb_irep *)p);
+  const mrb_irep *irep;
+  mrb_value vars;
+  size_t i;
+
+  if (proc == NULL || MRB_PROC_CFUNC_P(proc)) {
+    return mrb_ary_new(mrb);
+  }
+  vars = mrb_hash_new(mrb);
+  while (proc) {
+    if (MRB_PROC_CFUNC_P(proc)) break;
+    irep = proc->body.irep;
+    if (irep->lv) {
+      for (i = 0; i + 1 < irep->nlocals; ++i) {
+        if (irep->lvi) {
+          mrb_sym sym = irep->lvi;
+          const char *name = mrb_sym_name(mrb, sym);
+          switch (name0) {
+          case '*': case '&':
+            break;
+          default:
+            mrb_hash_set(mrb, vars, mrb_symbol_value(sym), mrb_true_value());
+            break;
+          }
+        }
+      }
+    }
+    if (MRB_PROC_SCOPE_P(proc)) break;
+    proc = proc->upper;
+  }
+
+  return mrb_hash_keys(mrb, vars);
 }
 
-static const mrb_data_type tempirep_type = { "temporary irep", tempirep_free };
+const struct RProc *
+mrb_proc_get_caller(mrb_state *mrb, struct REnv **envp)
+{
+  struct mrb_context *c = mrb->c;
+  mrb_callinfo *ci = (c->ci > c->cibase) ? c->ci - 1 : c->cibase;
+  const struct RProc *proc = ci->proc;
+
+  if (!proc || MRB_PROC_CFUNC_P(proc)) {
+    if (envp) *envp = NULL;
+  }
+  else {
+    struct RClass *tc = MRB_PROC_TARGET_CLASS(proc);
+    struct REnv *e = mrb_vm_ci_env(ci);
+
+    if (e == NULL) {
+      int nstacks = proc->body.irep->nlocals;
+      e = mrb_env_new(mrb, c, ci, nstacks, ci->stack, tc);
+      ci->u.env = e;
+    }
+    else if (tc) {
+      e->c = tc;
+      mrb_field_write_barrier(mrb, (struct RBasic*)e, (struct RBasic*)tc);
+    }
+    if (envp) *envp = e;
+  }
+
+  return proc;
+}
+
+#define IREP_LVAR_MERGE_DEFAULT  50
+#define IREP_LVAR_MERGE_MINIMUM   8
+#define IREP_LVAR_MERGE_MAXIMUM 240
+
+#ifdef MRB_IREP_LVAR_MERGE_LIMIT
+# define IREP_LVAR_MERGE_LIMIT \
+  ((MRB_IREP_LVAR_MERGE_LIMIT) < IREP_LVAR_MERGE_MINIMUM ? IREP_LVAR_MERGE_MINIMUM : \
+   (MRB_IREP_LVAR_MERGE_LIMIT) > IREP_LVAR_MERGE_MAXIMUM ? IREP_LVAR_MERGE_MAXIMUM : \
+   (MRB_IREP_LVAR_MERGE_LIMIT))
+#else
+# define IREP_LVAR_MERGE_LIMIT IREP_LVAR_MERGE_DEFAULT
+#endif
+
+void
+mrb_proc_merge_lvar(mrb_state *mrb, mrb_irep *irep, struct REnv *env, int num, const mrb_sym *lv, const mrb_value *stack)
+{
+  mrb_assert(!(irep->flags & MRB_IREP_NO_FREE));
+
+  if ((irep->nlocals + num) > IREP_LVAR_MERGE_LIMIT) {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "too many local variables for binding (mruby limitation)");
+  }
+
+  if (!lv) {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "unavailable local variable names");
+  }
+
+  irep->lv = (mrb_sym*)mrb_realloc(mrb, (mrb_sym*)irep->lv, sizeof(mrb_sym) * (irep->nlocals + num));
+  env->stack = (mrb_value*)mrb_realloc(mrb, env->stack, sizeof(mrb_value) * (irep->nlocals + 1 /* self */ + num));
+
+  mrb_sym *destlv = (mrb_sym*)irep->lv + irep->nlocals - 1 /* self */;
+  mrb_value *destst = env->stack + irep->nlocals;
+  memmove(destlv, lv, sizeof(mrb_sym) * num);
+  if (stack) {
+    memmove(destst, stack, sizeof(mrb_value) * num);
+    for (int i = 0; i < num; i++) {
+      if (!mrb_immediate_p(stacki)) {
+        mrb_field_write_barrier(mrb, (struct RBasic*)env, (struct RBasic*)mrb_obj_ptr(stacki));
+      }
+    }
+  }
+  else {
+    for (int i = num; i > 0; i--, destst++) {
+      *destst = mrb_nil_value();
+    }
+  }
+  irep->nlocals += num;
+  irep->nregs = irep->nlocals;
+  MRB_ENV_SET_LEN(env, irep->nlocals);
+}
 
 void
 mrb_init_proc(mrb_state *mrb)
 {
-  struct RProc *p;
   mrb_method_t m;
-  struct RData *irep_obj = mrb_data_object_alloc(mrb, mrb->object_class, NULL, &tempirep_type);
-  mrb_irep *call_irep;
-  static const mrb_irep mrb_irep_zero = { 0 };
-
-  call_irep = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep));
-  irep_obj->data = call_irep;
-  *call_irep = mrb_irep_zero;
-  call_irep->flags = MRB_ISEQ_NO_FREE;
-  call_irep->iseq = call_iseq;
-  call_irep->ilen = 1;
-  call_irep->nregs = 2;         /* receiver and block */
 
   mrb_define_class_method(mrb, mrb->proc_class, "new", mrb_proc_s_new, MRB_ARGS_NONE()|MRB_ARGS_BLOCK());
   mrb_define_method(mrb, mrb->proc_class, "initialize_copy", mrb_proc_init_copy, MRB_ARGS_REQ(1));
   mrb_define_method(mrb, mrb->proc_class, "arity", proc_arity, MRB_ARGS_NONE());
 
-  p = mrb_proc_new(mrb, call_irep);
-  irep_obj->data = NULL;
-  MRB_METHOD_FROM_PROC(m, p);
-  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern_lit(mrb, "call"), m);
-  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern_lit(mrb, ""), m);
+  MRB_METHOD_FROM_PROC(m, &call_proc);
+  mrb_define_method_raw(mrb, mrb->proc_class, MRB_SYM(call), m);
+  mrb_define_method_raw(mrb, mrb->proc_class, MRB_OPSYM(aref), m);
 
   mrb_define_class_method(mrb, mrb->kernel_module, "lambda", proc_lambda, MRB_ARGS_NONE()|MRB_ARGS_BLOCK()); /* 15.3.1.2.6  */
   mrb_define_method(mrb, mrb->kernel_module,       "lambda", proc_lambda, MRB_ARGS_NONE()|MRB_ARGS_BLOCK()); /* 15.3.1.3.27 */

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

@@ -9,10 +9,12 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/array.h>
+#include <mruby/numeric.h>
+#include <mruby/presym.h>
 
-#define RANGE_INITIALIZED_MASK 1
-#define RANGE_INITIALIZED(p) ((p)->flags |= RANGE_INITIALIZED_MASK)
-#define RANGE_INITIALIZED_P(p) ((p)->flags & RANGE_INITIALIZED_MASK)
+#define RANGE_INITIALIZED_FLAG 1
+#define RANGE_INITIALIZED(p) ((p)->flags |= RANGE_INITIALIZED_FLAG)
+#define RANGE_INITIALIZED_P(p) ((p)->flags & RANGE_INITIALIZED_FLAG)
 
 static void
 r_check(mrb_state *mrb, mrb_value a, mrb_value b)
@@ -23,14 +25,16 @@
 
   ta = mrb_type(a);
   tb = mrb_type(b);
-#ifdef MRB_WITHOUT_FLOAT
-  if (ta == MRB_TT_FIXNUM && tb == MRB_TT_FIXNUM ) {
+#ifdef MRB_NO_FLOAT
+  if (ta == MRB_TT_INTEGER && tb == MRB_TT_INTEGER ) return;
 #else
-  if ((ta == MRB_TT_FIXNUM || ta == MRB_TT_FLOAT) &&
-      (tb == MRB_TT_FIXNUM || tb == MRB_TT_FLOAT)) {
-#endif
+  if ((ta == MRB_TT_INTEGER || ta == MRB_TT_FLOAT) &&
+      (tb == MRB_TT_INTEGER || tb == MRB_TT_FLOAT)) {
     return;
   }
+#endif
+
+  if (mrb_nil_p(a) || mrb_nil_p(b)) return;
 
   n = mrb_cmp(mrb, a, b);
   if (n == -2) {                /* can not be compared */
@@ -78,14 +82,14 @@
   if (r) {
     if (RANGE_INITIALIZED_P(r)) {
       /* Ranges are immutable, so that they should be initialized only once. */
-      mrb_name_error(mrb, mrb_intern_lit(mrb, "initialize"), "'initialize' called twice");
+      mrb_name_error(mrb, MRB_SYM(initialize), "'initialize' called twice");
     }
     else {
       range_ptr_alloc_edges(mrb, r);
     }
   }
   else {
-    r = (struct RRange*)mrb_obj_alloc(mrb, MRB_TT_RANGE, mrb->range_class);
+    r = MRB_OBJ_ALLOC(mrb, MRB_TT_RANGE, mrb->range_class);
     range_ptr_alloc_edges(mrb, r);
   }
 
@@ -161,6 +165,7 @@
 
   mrb_get_args(mrb, "oo|b", &beg, &end, &exclusive);
   range_ptr_replace(mrb, mrb_range_raw_ptr(range), beg, end, exclusive);
+  mrb_obj_freeze(mrb, range);
   return range;
 }
 
@@ -212,15 +217,25 @@
   mrb_value val = mrb_get_arg1(mrb);
   struct RRange *r = mrb_range_ptr(mrb, range);
   mrb_value beg, end;
-  mrb_bool include_p;
 
   beg = RANGE_BEG(r);
   end = RANGE_END(r);
-  include_p = r_le(mrb, beg, val) &&                 /* beg <= val */
-              (RANGE_EXCL(r) ? r_gt(mrb, end, val)   /* end >  val */
-                             : r_ge(mrb, end, val)); /* end >= val */
-
-  return mrb_bool_value(include_p);
+  if (mrb_nil_p(beg)) {
+    if (RANGE_EXCL(r) ? r_gt(mrb, end, val)    /* end >  val */
+                      : r_ge(mrb, end, val)) { /* end >= val */
+      return mrb_true_value();
+    }
+  }
+  else if (r_le(mrb, beg, val)) {              /* beg <= val */
+    if (mrb_nil_p(end)) {
+      return mrb_true_value();
+    }
+    if (RANGE_EXCL(r) ? r_gt(mrb, end, val)    /* end >  val */
+                      : r_ge(mrb, end, val)) { /* end >= val */
+      return mrb_true_value();
+    }
+  }
+  return mrb_false_value();
 }
 
 /* 15.2.14.4.12(x) */
@@ -257,14 +272,21 @@
 static mrb_value
 range_inspect(mrb_state *mrb, mrb_value range)
 {
-  mrb_value str, str2;
+  mrb_value str;
   struct RRange *r = mrb_range_ptr(mrb, range);
 
-  str  = mrb_inspect(mrb, RANGE_BEG(r));
-  str2 = mrb_inspect(mrb, RANGE_END(r));
-  str  = mrb_str_dup(mrb, str);
-  mrb_str_cat(mrb, str, "...", RANGE_EXCL(r) ? 3 : 2);
-  mrb_str_cat_str(mrb, str, str2);
+  if (!mrb_nil_p(RANGE_BEG(r))) {
+    str  = mrb_inspect(mrb, RANGE_BEG(r));
+    str  = mrb_str_dup(mrb, str);
+    mrb_str_cat(mrb, str, "...", RANGE_EXCL(r) ? 3 : 2);
+  }
+  else {
+    str = mrb_str_new(mrb, "...", RANGE_EXCL(r) ? 3 : 2);
+  }
+  if (!mrb_nil_p(RANGE_END(r))) {
+    mrb_value str2 = mrb_inspect(mrb, RANGE_END(r));
+    mrb_str_cat_str(mrb, str, str2);
+  }
 
   return str;
 }
@@ -316,10 +338,64 @@
 
   r = mrb_range_ptr(mrb, src);
   range_ptr_replace(mrb, mrb_range_raw_ptr(copy), RANGE_BEG(r), RANGE_END(r), RANGE_EXCL(r));
+  mrb_obj_freeze(mrb, copy);
 
   return copy;
 }
 
+static mrb_value
+range_num_to_a(mrb_state *mrb, mrb_value range)
+{
+  struct RRange *r = mrb_range_ptr(mrb, range);
+  mrb_value beg = RANGE_BEG(r);
+  mrb_value end = RANGE_END(r);
+  mrb_value ary;
+
+  mrb->c->ci->mid = 0;
+  if (mrb_nil_p(end)) {
+    mrb_raise(mrb, E_RANGE_ERROR, "cannot convert endless range to an array");
+  }
+  if (mrb_integer_p(beg)) {
+    if (mrb_integer_p(end)) {
+      mrb_int a = mrb_integer(beg);
+      mrb_int b = mrb_integer(end);
+      mrb_int len;
+
+      if (mrb_int_sub_overflow(b, a, &len)) {
+        mrb_raise(mrb, E_RANGE_ERROR, "integer range too long");
+      }
+      if (!RANGE_EXCL(r)) 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));
+      }
+      return ary;
+    }
+#ifndef MRB_NO_FLOAT
+    if (mrb_float_p(end)) {
+      mrb_float a = (mrb_float)mrb_integer(beg);
+      mrb_float b = mrb_float(end);
+
+      ary = mrb_ary_new_capa(mrb, (mrb_int)(b - a) + 1);
+      if (RANGE_EXCL(r)) {
+        while (a < b) {
+          mrb_ary_push(mrb, ary, mrb_int_value(mrb, (mrb_int)a));
+          a += 1.0;
+        }
+      }
+      else {
+        while (a <= b) {
+          mrb_ary_push(mrb, ary, mrb_int_value(mrb, (mrb_int)a));
+          a += 1.0;
+        }
+      }
+      return ary;
+    }
+#endif
+  }
+  return mrb_nil_value();
+}
+
 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))
 {
@@ -328,8 +404,8 @@
   result = mrb_ary_new(mrb);
 
   for (i = 0; i < argc; ++i) {
-    if (mrb_fixnum_p(argvi)) {
-      mrb_ary_push(mrb, result, func(mrb, obj, mrb_fixnum(argvi)));
+    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;
@@ -381,13 +457,15 @@
 mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len, mrb_bool trunc)
 {
   mrb_int beg, end;
+  mrb_bool excl;
   struct RRange *r;
 
   if (!mrb_range_p(range)) return MRB_RANGE_TYPE_MISMATCH;
   r = mrb_range_ptr(mrb, range);
 
-  beg = mrb_int(mrb, RANGE_BEG(r));
-  end = mrb_int(mrb, RANGE_END(r));
+  beg = mrb_nil_p(RANGE_BEG(r)) ? 0 : mrb_as_int(mrb, RANGE_BEG(r));
+  end = mrb_nil_p(RANGE_END(r)) ? -1 : mrb_as_int(mrb, RANGE_END(r));
+  excl = mrb_nil_p(RANGE_END(r)) ? 0 : RANGE_EXCL(r);
 
   if (beg < 0) {
     beg += len;
@@ -400,7 +478,7 @@
   }
 
   if (end < 0) end += len;
-  if (!RANGE_EXCL(r) && (!trunc || end < len)) end++;  /* include end point */
+  if (!excl && (!trunc || end < len)) end++;  /* include end point */
   len = end - beg;
   if (len < 0) len = 0;
 
@@ -432,4 +510,5 @@
   mrb_define_method(mrb, r, "inspect",         range_inspect,         MRB_ARGS_NONE()); /* 15.2.14.4.13(x) */
   mrb_define_method(mrb, r, "eql?",            range_eql,             MRB_ARGS_REQ(1)); /* 15.2.14.4.14(x) */
   mrb_define_method(mrb, r, "initialize_copy", range_initialize_copy, MRB_ARGS_REQ(1)); /* 15.2.14.4.15(x) */
+  mrb_define_method(mrb, r, "__num_to_a",      range_num_to_a,        MRB_ARGS_NONE());
 }

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

@@ -0,0 +1,119 @@
+#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/third-party/mruby/src/readint.c Added

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

@@ -77,11 +77,13 @@
   return mrb;
 }
 
+#ifndef MRB_NO_GEMS
 static void
 init_mrbgems(mrb_state *mrb, void *opaque)
 {
   mrb_init_mrbgems(mrb);
 }
+#endif
 
 MRB_API mrb_state*
 mrb_open_allocf(mrb_allocf f, void *ud)
@@ -92,7 +94,7 @@
     return NULL;
   }
 
-#ifndef DISABLE_GEMS
+#ifndef MRB_NO_GEMS
   if (mrb_core_init_protect(mrb, init_mrbgems, NULL)) {
     mrb_close(mrb);
     return NULL;
@@ -107,12 +109,20 @@
 void
 mrb_irep_incref(mrb_state *mrb, mrb_irep *irep)
 {
+  if (irep->flags & MRB_IREP_NO_FREE) return;
+  if (irep->refcnt == UINT16_MAX) {
+    mrb_garbage_collect(mrb);
+    if (irep->refcnt == UINT16_MAX) {
+      mrb_raise(mrb, E_RUNTIME_ERROR, "too many irep references");
+    }
+  }
   irep->refcnt++;
 }
 
 void
 mrb_irep_decref(mrb_state *mrb, mrb_irep *irep)
 {
+  if (irep->flags & MRB_IREP_NO_FREE) return;
   irep->refcnt--;
   if (irep->refcnt == 0) {
     mrb_irep_free(mrb, irep);
@@ -122,12 +132,14 @@
 void
 mrb_irep_cutref(mrb_state *mrb, mrb_irep *irep)
 {
-  mrb_irep *tmp;
+  mrb_irep **reps;
   int i;
 
+  if (irep->flags & MRB_IREP_NO_FREE) return;
+  reps = (mrb_irep**)irep->reps;
   for (i=0; i<irep->rlen; i++) {
-    tmp = irep->repsi;
-    irep->repsi = NULL;
+    mrb_irep *tmp = repsi;
+    repsi = NULL;
     if (tmp) mrb_irep_decref(mrb, tmp);
   }
 }
@@ -137,59 +149,47 @@
 {
   int i;
 
+  if (irep->flags & MRB_IREP_NO_FREE) return;
   if (!(irep->flags & MRB_ISEQ_NO_FREE))
     mrb_free(mrb, (void*)irep->iseq);
-  if (irep->pool) for (i=0; i<irep->plen; i++) {
-    if (mrb_string_p(irep->pooli)) {
-      mrb_gc_free_str(mrb, RSTRING(irep->pooli));
-      mrb_free(mrb, mrb_obj_ptr(irep->pooli));
+  if (irep->pool) {
+    for (i=0; i<irep->plen; i++) {
+      if ((irep->pooli.tt & 3) == IREP_TT_STR ||
+          irep->pooli.tt == IREP_TT_BIGINT) {
+        mrb_free(mrb, (void*)irep->pooli.u.str);
+      }
     }
-#if defined(MRB_WORD_BOXING) && !defined(MRB_WITHOUT_FLOAT)
-    else if (mrb_float_p(irep->pooli)) {
-      mrb_free(mrb, mrb_obj_ptr(irep->pooli));
-    }
-#endif
+    mrb_free(mrb, (void*)irep->pool);
   }
-  mrb_free(mrb, irep->pool);
-  mrb_free(mrb, irep->syms);
+  mrb_free(mrb, (void*)irep->syms);
   if (irep->reps) {
     for (i=0; i<irep->rlen; i++) {
       if (irep->repsi)
-        mrb_irep_decref(mrb, irep->repsi);
+        mrb_irep_decref(mrb, (mrb_irep*)irep->repsi);
     }
+    mrb_free(mrb, (void*)irep->reps);
   }
-  mrb_free(mrb, irep->reps);
-  mrb_free(mrb, irep->lv);
+  mrb_free(mrb, (void*)irep->lv);
   mrb_debug_info_free(mrb, irep->debug_info);
   mrb_free(mrb, irep);
 }
 
-void mrb_free_backtrace(mrb_state *mrb);
-
 MRB_API void
 mrb_free_context(mrb_state *mrb, struct mrb_context *c)
 {
   if (!c) return;
   mrb_free(mrb, c->stbase);
   mrb_free(mrb, c->cibase);
-  mrb_free(mrb, c->rescue);
-  mrb_free(mrb, c->ensure);
   mrb_free(mrb, c);
 }
 
-MRB_API void
+void mrb_protect_atexit(mrb_state *mrb);
+
+  MRB_API void
 mrb_close(mrb_state *mrb)
 {
   if (!mrb) return;
-  if (mrb->atexit_stack_len > 0) {
-    mrb_int i;
-    for (i = mrb->atexit_stack_len; i > 0; --i) {
-      mrb->atexit_stacki - 1(mrb);
-    }
-#ifndef MRB_FIXED_STATE_ATEXIT_STACK
-    mrb_free(mrb, mrb->atexit_stack);
-#endif
-  }
+  mrb_protect_atexit(mrb);
 
   /* free */
   mrb_gc_destroy(mrb, &mrb->gc);

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

@@ -8,20 +8,14 @@
 # define _CRT_NONSTDC_NO_DEPRECATE
 #endif
 
-#ifndef MRB_WITHOUT_FLOAT
-#include <float.h>
-#include <math.h>
-#endif
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/class.h>
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
+#include <string.h>
 
 typedef struct mrb_shared_string {
   int refcnt;
@@ -31,7 +25,7 @@
 
 const char mrb_digitmap = "0123456789abcdefghijklmnopqrstuvwxyz";
 
-#define mrb_obj_alloc_string(mrb) ((struct RString*)mrb_obj_alloc((mrb), MRB_TT_STRING, (mrb)->string_class))
+#define mrb_obj_alloc_string(mrb) MRB_OBJ_ALLOC((mrb), MRB_TT_STRING, (mrb)->string_class)
 
 static struct RString*
 str_init_normal_capa(mrb_state *mrb, struct RString *s,
@@ -140,21 +134,6 @@
   return str_init_normal(mrb, mrb_obj_alloc_string(mrb), p, len);
 }
 
-static inline void
-str_with_class(struct RString *s, mrb_value obj)
-{
-  s->c = mrb_str_ptr(obj)->c;
-}
-
-static mrb_value
-mrb_str_new_empty(mrb_state *mrb, mrb_value str)
-{
-  struct RString *s = str_new(mrb, 0, 0);
-
-  str_with_class(s, str);
-  return mrb_obj_value(s);
-}
-
 MRB_API mrb_value
 mrb_str_new_capa(mrb_state *mrb, size_t capa)
 {
@@ -175,19 +154,6 @@
   return mrb_obj_value(s);
 }
 
-#ifndef MRB_STR_BUF_MIN_SIZE
-# define MRB_STR_BUF_MIN_SIZE 128
-#endif
-
-MRB_API mrb_value
-mrb_str_buf_new(mrb_state *mrb, size_t capa)
-{
-  if (capa < MRB_STR_BUF_MIN_SIZE) {
-    capa = MRB_STR_BUF_MIN_SIZE;
-  }
-  return mrb_str_new_capa(mrb, capa);
-}
-
 static void
 resize_capa(mrb_state *mrb, struct RString *s, size_t capacity)
 {
@@ -271,7 +237,7 @@
 static void
 check_null_byte(mrb_state *mrb, mrb_value str)
 {
-  mrb_to_str(mrb, str);
+  mrb_ensure_string_type(mrb, str);
   if (memchr(RSTRING_PTR(str), '\0', RSTRING_LEN(str))) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
   }
@@ -297,10 +263,12 @@
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
   1,1,1,1,1,1,1,1,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,2,2,
+  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)
+
 mrb_int
 mrb_utf8len(const char* p, const char* e)
 {
@@ -312,7 +280,7 @@
   if (len == 1) return 1;
   if (len > e - p) return 1;
   for (i = 1; i < len; ++i)
-    if ((pi & 0xc0) != 0x80)
+    if (utf8_islead(pi))
       return 1;
   return len;
 }
@@ -320,15 +288,15 @@
 mrb_int
 mrb_utf8_strlen(const char *str, mrb_int byte_len)
 {
-  mrb_int total = 0;
+  mrb_int len = 0;
   const char *p = str;
   const char *e = p + byte_len;
 
   while (p < e) {
     p += mrb_utf8len(p, e);
-    total++;
+    len++;
   }
-  return total;
+  return len;
 }
 
 static mrb_int
@@ -583,9 +551,6 @@
   else if (RSTR_FSHARED_P(orig)) {
     str_init_fshared(orig, s, orig->as.heap.aux.fshared);
   }
-  else if (mrb_frozen_p(orig) && !RSTR_POOL_P(orig)) {
-    str_init_fshared(orig, s, orig);
-  }
   else {
     if (orig->as.heap.aux.capa > orig->as.heap.len) {
       orig->as.heap.ptr = (char *)mrb_realloc(mrb, orig->as.heap.ptr, len+1);
@@ -597,29 +562,6 @@
 }
 
 mrb_value
-mrb_str_pool(mrb_state *mrb, const char *p, mrb_int len, mrb_bool nofree)
-{
-  struct RString *s = (struct RString *)mrb_malloc(mrb, sizeof(struct RString));
-
-  s->tt = MRB_TT_STRING;
-  s->c = mrb->string_class;
-  s->flags = 0;
-
-  if (RSTR_EMBEDDABLE_P(len)) {
-    str_init_embed(s, p, len);
-  }
-  else if (nofree) {
-    str_init_nofree(s, p, len);
-  }
-  else {
-    str_init_normal(mrb, s, p, len);
-  }
-  RSTR_SET_POOL_FLAG(s);
-  MRB_SET_FROZEN_FLAG(s);
-  return mrb_obj_value(s);
-}
-
-mrb_value
 mrb_str_byte_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len)
 {
   struct RString *orig, *s;
@@ -890,15 +832,22 @@
 {
   struct RString *s;
 
+  const char *p = RSTRING_PTR(str0);
+  size_t len = RSTRING_LEN(str0);
   check_null_byte(mrb, str0);
-  s = str_new(mrb, RSTRING_PTR(str0), RSTRING_LEN(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);
+  }
   return RSTR_PTR(s);
 }
 
 MRB_API void
 mrb_str_concat(mrb_state *mrb, mrb_value self, mrb_value other)
 {
-  other = mrb_str_to_str(mrb, other);
+  other = mrb_obj_as_string(mrb, other);
   mrb_str_cat_str(mrb, self, other);
 }
 
@@ -948,14 +897,14 @@
 mrb_str_size(mrb_state *mrb, mrb_value self)
 {
   mrb_int len = RSTRING_CHAR_LEN(self);
-  return mrb_fixnum_value(len);
+  return mrb_int_value(mrb, len);
 }
 
 static mrb_value
 mrb_str_bytesize(mrb_state *mrb, mrb_value self)
 {
   mrb_int len = RSTRING_LEN(self);
-  return mrb_fixnum_value(len);
+  return mrb_int_value(mrb, len);
 }
 
 /* 15.2.10.5.1  */
@@ -985,7 +934,6 @@
 
   len = RSTRING_LEN(self)*times;
   str2 = str_new(mrb, 0, len);
-  str_with_class(str2, self);
   p = RSTR_PTR(str2);
   if (len > 0) {
     n = RSTRING_LEN(self);
@@ -1070,7 +1018,7 @@
   else {
     result = mrb_str_cmp(mrb, str1, str2);
   }
-  return mrb_fixnum_value(result);
+  return mrb_int_value(mrb, result);
 }
 
 static mrb_bool
@@ -1111,29 +1059,11 @@
 }
 /* ---------------------------------- */
 
-MRB_API mrb_value
-mrb_str_to_str(mrb_state *mrb, mrb_value str)
-{
-  switch (mrb_type(str)) {
-  case MRB_TT_STRING:
-    return str;
-  case MRB_TT_SYMBOL:
-    return mrb_sym_str(mrb, mrb_symbol(str));
-  case MRB_TT_FIXNUM:
-    return mrb_fixnum_to_str(mrb, str, 10);
-  case MRB_TT_CLASS:
-  case MRB_TT_MODULE:
-    return mrb_mod_to_s(mrb, str);
-  default:
-    return mrb_convert_type(mrb, str, MRB_TT_STRING, "String", "to_s");
-  }
-}
-
 /* obslete: use RSTRING_PTR() */
 MRB_API const char*
 mrb_string_value_ptr(mrb_state *mrb, mrb_value str)
 {
-  str = mrb_str_to_str(mrb, str);
+  str = mrb_obj_as_string(mrb, str);
   return RSTRING_PTR(str);
 }
 
@@ -1141,7 +1071,7 @@
 MRB_API mrb_int
 mrb_string_value_len(mrb_state *mrb, mrb_value ptr)
 {
-  mrb_to_str(mrb, ptr);
+  mrb_ensure_string_type(mrb, ptr);
   return RSTRING_LEN(ptr);
 }
 
@@ -1151,7 +1081,6 @@
   struct RString *s = mrb_str_ptr(str);
   struct RString *dup = str_new(mrb, 0, 0);
 
-  str_with_class(dup, str);
   return str_replace(mrb, dup, s);
 }
 
@@ -1173,14 +1102,17 @@
 str_convert_range(mrb_state *mrb, mrb_value str, mrb_value indx, mrb_value alen, mrb_int *beg, mrb_int *len)
 {
   if (!mrb_undef_p(alen)) {
-    *beg = mrb_int(mrb, indx);
-    *len = mrb_int(mrb, alen);
+    *beg = mrb_as_int(mrb, indx);
+    *len = mrb_as_int(mrb, alen);
     return STR_CHAR_RANGE;
   }
   else {
     switch (mrb_type(indx)) {
-      case MRB_TT_FIXNUM:
-        *beg = mrb_fixnum(indx);
+      default:
+        indx = mrb_ensure_int_type(mrb, indx);
+        /* fall through */
+      case MRB_TT_INTEGER:
+        *beg = mrb_integer(indx);
         *len = 1;
         return STR_CHAR_RANGE;
 
@@ -1191,16 +1123,6 @@
         return STR_BYTE_RANGE_CORRECTED;
 
       case MRB_TT_RANGE:
-        goto range_arg;
-
-      default:
-        indx = mrb_to_int(mrb, indx);
-        if (mrb_fixnum_p(indx)) {
-          *beg = mrb_fixnum(indx);
-          *len = 1;
-          return STR_CHAR_RANGE;
-        }
-range_arg:
         *len = RSTRING_CHAR_LEN(str);
         switch (mrb_range_beg_len(mrb, indx, beg, len, *len, TRUE)) {
           case MRB_RANGE_OK:
@@ -1210,14 +1132,12 @@
           default:
             break;
         }
-
-        mrb_raise(mrb, E_TYPE_ERROR, "can't convert to Fixnum");
     }
   }
   return STR_OUT_OF_RANGE;
 }
 
-static mrb_value
+mrb_value
 mrb_str_aref(mrb_state *mrb, mrb_value str, mrb_value indx, mrb_value alen)
 {
   mrb_int beg, len;
@@ -1246,17 +1166,17 @@
 /* 15.2.10.5.34 */
 /*
  *  call-seq:
- *     strfixnum                 => fixnum or nil
- *     strfixnum, fixnum         => new_str or nil
- *     strrange                  => new_str or nil
- *     strother_str              => new_str or nil
- *     str.slice(fixnum)           => fixnum or nil
- *     str.slice(fixnum, fixnum)   => new_str or nil
- *     str.slice(range)            => new_str or nil
- *     str.slice(other_str)        => new_str or nil
- *
- *  Element Reference---If passed a single <code>Fixnum</code>, returns the code
- *  of the character at that position. If passed two <code>Fixnum</code>
+ *     strint                 => int or nil
+ *     strint, int            => new_str or nil
+ *     strrange               => new_str or nil
+ *     strother_str           => new_str or nil
+ *     str.slice(int)           => int or nil
+ *     str.slice(int, int)      => new_str or nil
+ *     str.slice(range)         => new_str or nil
+ *     str.slice(other_str)     => new_str or nil
+ *
+ *  Element Reference---If passed a single <code>Integer</code>, returns the code
+ *  of the character at that position. If passed two <code>Integer</code>
  *  objects, returns a substring starting at the offset given by the first, and
  *  a length given by the second. If given a range, a substring containing
  *  characters at offsets given by the range is returned. In all three cases, if
@@ -1310,13 +1230,11 @@
   if (end > len) { end = len; }
 
   if (pos < 0 || pos > len) {
-    str_out_of_index(mrb, mrb_fixnum_value(pos));
+    str_out_of_index(mrb, mrb_int_value(mrb, pos));
   }
 
   replen = (mrb_nil_p(rep) ? 0 : RSTRING_LEN(rep));
-  newlen = replen + len - (end - pos);
-
-  if (newlen >= MRB_SSIZE_MAX || newlen < replen /* overflowed */) {
+  if (mrb_int_add_overflow(replen, len - (end - pos), &newlen) || newlen >= MRB_SSIZE_MAX) {
     mrb_raise(mrb, E_RUNTIME_ERROR, "string size too big");
   }
 
@@ -1429,8 +1347,7 @@
 {
   mrb_int beg, len, charlen;
 
-  mrb_to_str(mrb, replace);
-
+  mrb_ensure_string_type(mrb, replace);
   switch (str_convert_range(mrb, str, indx, alen, &beg, &len)) {
     case STR_OUT_OF_RANGE:
     default:
@@ -1447,14 +1364,17 @@
       str_range_to_bytes(str, &beg, &len);
       /* fall through */
     case STR_BYTE_RANGE_CORRECTED:
-      str_replace_partial(mrb, str, beg, beg + len, replace);
+      if (mrb_int_add_overflow(beg, len, &len)) {
+        mrb_raise(mrb, E_RUNTIME_ERROR, "string index too big");
+      }
+      str_replace_partial(mrb, str, beg, len, replace);
   }
 }
 
 /*
  * call-seq:
- *    strfixnum = replace
- *    strfixnum, fixnum = replace
+ *    strint = replace
+ *    strint, int = replace
  *    strrange = replace
  *    strother_str = replace
  *
@@ -1802,26 +1722,43 @@
   return str_substr(mrb, str, beg, len);
 }
 
+/*
+ * 32 bit magic FNV-0 and FNV-1 prime
+ */
+#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)
 {
-  /* 1-8-7 */
   struct RString *s = mrb_str_ptr(str);
-  mrb_int len = RSTR_LEN(s);
-  char *p = RSTR_PTR(s);
-  uint64_t key = 0;
+  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;
 
-  while (len--) {
-    key = key*65599 + *p;
-    p++;
+  /*
+   * FNV-1 hash each octet in the buffer
+   */
+  while (bp < be) {
+    /* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+    hval *= FNV_32_PRIME;
+#else
+    hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+
+    /* xor the bottom with the current octet */
+    hval ^= (uint32_t)*bp++;
   }
-  return (uint32_t)(key + (key>>5));
+
+  /* return our new hash value */
+  return hval;
 }
 
 /* 15.2.10.5.20 */
 /*
  * call-seq:
- *    str.hash   => fixnum
+ *    str.hash   => int
  *
  * Return a hash based on the string's length and content.
  */
@@ -1829,14 +1766,14 @@
 mrb_str_hash_m(mrb_state *mrb, mrb_value self)
 {
   mrb_int key = mrb_str_hash(mrb, self);
-  return mrb_fixnum_value(key);
+  return mrb_int_value(mrb, key);
 }
 
 /* 15.2.10.5.21 */
 /*
  *  call-seq:
  *     str.include? other_str   => true or false
- *     str.include? fixnum      => true or false
+ *     str.include? int         => true or false
  *
  *  Returns <code>true</code> if <i>str</i> contains the given string or
  *  character.
@@ -1859,7 +1796,7 @@
 /* 15.2.10.5.22 */
 /*
  *  call-seq:
- *     str.index(substring , offset)   => fixnum or nil
+ *     str.index(substring , offset)   => int or nil
  *
  *  Returns the index of the first occurrence of the given
  *  <i>substring</i>. Returns <code>nil</code> if not found.
@@ -1891,7 +1828,7 @@
 
   if (pos == -1) return mrb_nil_value();
   BYTES_ALIGN_CHECK(pos);
-  return mrb_fixnum_value(pos);
+  return mrb_int_value(mrb, pos);
 }
 
 /* 15.2.10.5.24 */
@@ -1940,7 +1877,7 @@
  *     str.to_sym   => symbol
  *
  *  Returns the <code>Symbol</code> corresponding to <i>str</i>, creating the
- *  symbol if it did not previously exist. See <code>Symbol#id2name</code>.
+ *  symbol if it did not previously exist.
  *
  *     "Koala".intern         #=> :Koala
  *     s = 'cat'.to_sym       #=> :cat
@@ -1962,10 +1899,20 @@
 MRB_API mrb_value
 mrb_obj_as_string(mrb_state *mrb, mrb_value obj)
 {
-  if (mrb_string_p(obj)) {
+  switch (mrb_type(obj)) {
+  case MRB_TT_STRING:
     return obj;
+  case MRB_TT_SYMBOL:
+    return mrb_sym_str(mrb, mrb_symbol(obj));
+  case MRB_TT_INTEGER:
+    return mrb_integer_to_str(mrb, obj, 10);
+  case MRB_TT_SCLASS:
+  case MRB_TT_CLASS:
+  case MRB_TT_MODULE:
+    return mrb_mod_to_s(mrb, obj);
+  default:
+    return mrb_type_convert(mrb, obj, MRB_TT_STRING, MRB_SYM(to_s));
   }
-  return mrb_str_to_str(mrb, obj);
 }
 
 MRB_API mrb_value
@@ -2075,7 +2022,7 @@
 /* 15.2.10.5.31 */
 /*
  *  call-seq:
- *     str.rindex(substring , offset)   => fixnum or nil
+ *     str.rindex(substring , offset)   => int or nil
  *
  *  Returns the index of the last occurrence of the given <i>substring</i>.
  *  Returns <code>nil</code> if not found. If the second parameter is
@@ -2091,9 +2038,11 @@
 mrb_str_rindex(mrb_state *mrb, mrb_value str)
 {
   mrb_value sub;
-  mrb_int pos, len = RSTRING_CHAR_LEN(str);
+  mrb_int pos;
+  int argc = mrb_get_args(mrb, "S|i", &sub, &pos);
+  mrb_int len = RSTRING_CHAR_LEN(str);
 
-  if (mrb_get_args(mrb, "S|i", &sub, &pos) == 1) {
+  if (argc == 1) {
     pos = len;
   }
   else {
@@ -2110,7 +2059,7 @@
   if (pos >= 0) {
     pos = bytes2chars(RSTRING_PTR(str), RSTRING_LEN(str), pos);
     BYTES_ALIGN_CHECK(pos);
-    return mrb_fixnum_value(pos);
+    return mrb_int_value(mrb, pos);
   }
   return mrb_nil_value();
 }
@@ -2239,7 +2188,7 @@
   }
   if (RSTRING_LEN(str) > 0 && (lim_p || RSTRING_LEN(str) > beg || lim < 0)) {
     if (RSTRING_LEN(str) == beg) {
-      tmp = mrb_str_new_empty(mrb, str);
+      tmp = mrb_str_new(mrb, 0, 0);
     }
     else {
       tmp = mrb_str_byte_subseq(mrb, str, beg, RSTRING_LEN(str)-beg);
@@ -2256,14 +2205,14 @@
   return result;
 }
 
-mrb_value
-mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base, int badcheck)
+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;
   char sign = 1;
   int c;
-  uint64_t n = 0;
+  mrb_int n = 0;
   mrb_int val;
 
 #define conv_digit(c) \
@@ -2390,19 +2339,17 @@
     if (c < 0 || c >= base) {
       break;
     }
-    n *= base;
-    n += c;
-    if (n > (uint64_t)MRB_INT_MAX + (sign ? 0 : 1)) {
-#ifndef MRB_WITHOUT_FLOAT
-      if (base == 10) {
-        return mrb_float_value(mrb, mrb_str_to_dbl(mrb, mrb_str_new(mrb, str, len), badcheck));
-      }
-      else
-#endif
-      {
-        mrb_raisef(mrb, E_RANGE_ERROR, "string (%l) too big for integer", str, pend-str);
+    if (mrb_int_mul_overflow(n, base, &n)) goto overflow;
+    if (MRB_INT_MAX - c < n) {
+      if (sign == 0 && MRB_INT_MAX - n == c - 1) {
+        n = MRB_INT_MIN;
+        sign = 1;
+        break;
       }
+    overflow:
+      mrb_raisef(mrb, E_RANGE_ERROR, "string (%l) too big for integer", str, pend-str);
     }
+    n += c;
   }
   val = (mrb_int)n;
   if (badcheck) {
@@ -2412,7 +2359,7 @@
     if (p<pend) goto bad;               /* trailing garbage */
   }
 
-  return mrb_fixnum_value(sign ? val : -val);
+  return mrb_int_value(mrb, sign ? val : -val);
  nullbyte:
   mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
   /* not reached */
@@ -2422,12 +2369,6 @@
   return mrb_fixnum_value(0);
 }
 
-MRB_API mrb_value
-mrb_cstr_to_inum(mrb_state *mrb, const char *str, mrb_int base, mrb_bool badcheck)
-{
-  return mrb_str_len_to_inum(mrb, str, strlen(str), base, badcheck);
-}
-
 /* obslete: use RSTRING_CSTR() or mrb_string_cstr() */
 MRB_API const char*
 mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr)
@@ -2460,15 +2401,15 @@
 }
 
 MRB_API mrb_value
-mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
+mrb_str_to_integer(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
 {
   const char *s;
   mrb_int len;
 
-  mrb_to_str(mrb, str);
+  mrb_ensure_string_type(mrb, str);
   s = RSTRING_PTR(str);
   len = RSTRING_LEN(str);
-  return mrb_str_len_to_inum(mrb, s, len, base, badcheck);
+  return mrb_str_len_to_integer(mrb, s, len, base, badcheck);
 }
 
 /* 15.2.10.5.38 */
@@ -2498,14 +2439,14 @@
   mrb_int base = 10;
 
   mrb_get_args(mrb, "|i", &base);
-  if (base < 0) {
+  if (base < 0 || 36 < base) {
     mrb_raisef(mrb, E_ARGUMENT_ERROR, "illegal radix %i", base);
   }
-  return mrb_str_to_inum(mrb, self, base, FALSE);
+  return mrb_str_to_integer(mrb, self, base, FALSE);
 }
 
-#ifndef MRB_WITHOUT_FLOAT
-double
+#ifndef MRB_NO_FLOAT
+static double
 mrb_str_len_to_dbl(mrb_state *mrb, const char *s, size_t len, mrb_bool badcheck)
 {
   char bufDBL_DIG * 4 + 20;
@@ -2525,9 +2466,9 @@
     mrb_value x;
 
     if (!badcheck) return 0.0;
-    x = mrb_str_len_to_inum(mrb, p, pend-p, 0, badcheck);
-    if (mrb_fixnum_p(x))
-      d = (double)mrb_fixnum(x);
+    x = mrb_str_len_to_integer(mrb, p, pend-p, 0, badcheck);
+    if (mrb_integer_p(x))
+      d = (double)mrb_integer(x);
     else /* if (mrb_float_p(x)) */
       d = mrb_float(x);
     return d;
@@ -2595,12 +2536,6 @@
 }
 
 MRB_API double
-mrb_cstr_to_dbl(mrb_state *mrb, const char *s, mrb_bool badcheck)
-{
-  return mrb_str_len_to_dbl(mrb, s, strlen(s), badcheck);
-}
-
-MRB_API double
 mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck)
 {
   return mrb_str_len_to_dbl(mrb, RSTRING_PTR(str), RSTRING_LEN(str), badcheck);
@@ -2612,7 +2547,7 @@
  *     str.to_f   => float
  *
  *  Returns the result of interpreting leading characters in <i>str</i> as a
- *  floating point number. Extraneous characters past the end of a valid number
+ *  floating-point number. Extraneous characters past the end of a valid number
  *  are ignored. If there is not a valid number at the start of <i>str</i>,
  *  <code>0.0</code> is returned. This method never raises an exception.
  *
@@ -2770,7 +2705,7 @@
 MRB_API mrb_value
 mrb_str_append(mrb_state *mrb, mrb_value str1, mrb_value str2)
 {
-  mrb_to_str(mrb, str2);
+  mrb_ensure_string_type(mrb, str2);
   return mrb_str_cat_str(mrb, str1, str2);
 }
 
@@ -2793,7 +2728,7 @@
 
 /*
  * call-seq:
- *   str.bytes   -> array of fixnums
+ *   str.bytes   -> array of int
  *
  * Returns an array of bytes in _str_.
  *
@@ -2886,23 +2821,25 @@
 mrb_str_byteslice(mrb_state *mrb, mrb_value str)
 {
   mrb_value a1;
-  mrb_int str_len = RSTRING_LEN(str), beg, len;
+  mrb_int str_len, beg, len;
   mrb_bool empty = TRUE;
 
   len = mrb_get_argc(mrb);
   switch (len) {
   case 2:
     mrb_get_args(mrb, "ii", &beg, &len);
+    str_len = RSTRING_LEN(str);
     break;
   case 1:
     a1 = mrb_get_arg1(mrb);
+    str_len = RSTRING_LEN(str);
     if (mrb_range_p(a1)) {
       if (mrb_range_beg_len(mrb, a1, &beg, &len, str_len, TRUE) != MRB_RANGE_OK) {
         return mrb_nil_value();
       }
     }
     else {
-      beg = mrb_fixnum(mrb_to_int(mrb, a1));
+      beg = mrb_as_int(mrb, a1);
       len = 1;
       empty = FALSE;
     }
@@ -2919,6 +2856,51 @@
   }
 }
 
+static mrb_value
+sub_replace(mrb_state *mrb, mrb_value self)
+{
+  char *p, *match;
+  mrb_int plen, mlen;
+  mrb_int found, offset;
+  mrb_value result;
+
+  mrb_get_args(mrb, "ssi", &p, &plen, &match, &mlen, &found);
+  result = mrb_str_new(mrb, 0, 0);
+  for (mrb_int i=0; i<plen; i++) {
+    if (pi != '\\' || i+1==plen) {
+      mrb_str_cat(mrb, result, p+i, 1);
+      continue;
+    }
+    i++;
+    switch (pi) {
+    case '\\':
+      mrb_str_cat(mrb, result, "\\", 1);
+      break;
+    case '`':
+      mrb_str_cat(mrb, result, RSTRING_PTR(self), chars2bytes(self, 0, found));
+      break;
+    case '&': case '0':
+      mrb_str_cat(mrb, result, match, mlen);
+      break;
+    case '\'':
+      offset = chars2bytes(self, 0, found) + mlen;
+      if (RSTRING_LEN(self) > offset) {
+        mrb_str_cat(mrb, result, RSTRING_PTR(self)+offset, RSTRING_LEN(self)-offset);
+      }
+      break;
+    case '1': case '2': case '3':
+    case '4': case '5': case '6':
+    case '7': case '8': case '9':
+      /* ignore sub-group match (no Regexp supported) */
+      break;
+    default:
+      mrb_str_cat(mrb, result, &pi-1, 2);
+      break;
+    }
+  }
+  return result;
+}
+
 /* ---------------------------*/
 void
 mrb_init_string(mrb_state *mrb)
@@ -2965,7 +2947,7 @@
   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 */
 
-#ifndef MRB_WITHOUT_FLOAT
+#ifndef MRB_NO_FLOAT
   mrb_define_method(mrb, s, "to_f",            mrb_str_to_f,            MRB_ARGS_NONE()); /* 15.2.10.5.38 */
 #endif
   mrb_define_method(mrb, s, "to_i",            mrb_str_to_i,            MRB_ARGS_ANY());  /* 15.2.10.5.39 */
@@ -2980,251 +2962,6 @@
   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, "byteslice",       mrb_str_byteslice,       MRB_ARGS_ARG(1,1));
-}
-
-#ifndef MRB_WITHOUT_FLOAT
-/*
- * Source code for the "strtod" library procedure.
- *
- * Copyright (c) 1988-1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The University of California
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- *
- * RCS: @(#) $Id: strtod.c 11708 2007-02-12 23:01:19Z shyouhei $
- */
-
-#include <ctype.h>
-#include <errno.h>
-
-static const int maxExponent = 511; /* Largest possible base 10 exponent.  Any
-                                     * exponent larger than this will already
-                                     * produce underflow or overflow, so there's
-                                     * no need to worry about additional digits.
-                                     */
-static const double powersOf10 = {/* Table giving binary powers of 10.  Entry */
-    10.,                            /* is 10^2^i.  Used to convert decimal */
-    100.,                           /* exponents into floating-point numbers. */
-    1.0e4,
-    1.0e8,
-    1.0e16,
-    1.0e32,
-    1.0e64,
-    1.0e128,
-    1.0e256
-};
-
-MRB_API double
-mrb_float_read(const char *string, char **endPtr)
-/*  const char *string;            A decimal ASCII floating-point number,
-                                 * optionally preceded by white space.
-                                 * Must have form "-I.FE-X", where I is the
-                                 * integer part of the mantissa, F is the
-                                 * fractional part of the mantissa, and X
-                                 * is the exponent.  Either of the signs
-                                 * may be "+", "-", or omitted.  Either I
-                                 * or F may be omitted, or both.  The decimal
-                                 * point isn't necessary unless F is present.
-                                 * The "E" may actually be an "e".  E and X
-                                 * may both be omitted (but not just one).
-                                 */
-/*  char **endPtr;                 If non-NULL, store terminating character's
-                                 * address here. */
-{
-    int sign, expSign = FALSE;
-    double fraction, dblExp;
-    const double *d;
-    const char *p;
-    int c;
-    int exp = 0;                /* Exponent read from "EX" field. */
-    int fracExp = 0;            /* Exponent that derives from the fractional
-                                 * part.  Under normal circumstatnces, it is
-                                 * the negative of the number of digits in F.
-                                 * However, if I is very long, the last digits
-                                 * of I get dropped (otherwise a long I with a
-                                 * large negative exponent could cause an
-                                 * unnecessary overflow on I alone).  In this
-                                 * case, fracExp is incremented one for each
-                                 * dropped digit. */
-    int mantSize;               /* Number of digits in mantissa. */
-    int decPt;                  /* Number of mantissa digits BEFORE decimal
-                                 * point. */
-    const char *pExp;           /* Temporarily holds location of exponent
-                                 * in string. */
-
-    /*
-     * Strip off leading blanks and check for a sign.
-     */
-
-    p = string;
-    while (ISSPACE(*p)) {
-      p += 1;
-    }
-    if (*p == '-') {
-      sign = TRUE;
-      p += 1;
-    }
-    else {
-      if (*p == '+') {
-        p += 1;
-      }
-      sign = FALSE;
-    }
-
-    /*
-     * Count the number of digits in the mantissa (including the decimal
-     * point), and also locate the decimal point.
-     */
-
-    decPt = -1;
-    for (mantSize = 0; ; mantSize += 1)
-    {
-      c = *p;
-      if (!ISDIGIT(c)) {
-        if ((c != '.') || (decPt >= 0)) {
-          break;
-        }
-        decPt = mantSize;
-      }
-      p += 1;
-    }
 
-    /*
-     * Now suck up the digits in the mantissa.  Use two integers to
-     * collect 9 digits each (this is faster than using floating-point).
-     * If the mantissa has more than 18 digits, ignore the extras, since
-     * they can't affect the value anyway.
-     */
-
-    pExp  = p;
-    p -= mantSize;
-    if (decPt < 0) {
-      decPt = mantSize;
-    }
-    else {
-      mantSize -= 1; /* One of the digits was the point. */
-    }
-    if (mantSize > 18) {
-      if (decPt - 18 > 29999) {
-        fracExp = 29999;
-      }
-      else {
-        fracExp = decPt - 18;
-      }
-      mantSize = 18;
-    }
-    else {
-      fracExp = decPt - mantSize;
-    }
-    if (mantSize == 0) {
-      fraction = 0.0;
-      p = string;
-      goto done;
-    }
-    else {
-      int frac1, frac2;
-      frac1 = 0;
-      for ( ; mantSize > 9; mantSize -= 1)
-      {
-        c = *p;
-        p += 1;
-        if (c == '.') {
-          c = *p;
-          p += 1;
-        }
-        frac1 = 10*frac1 + (c - '0');
-      }
-      frac2 = 0;
-      for (; mantSize > 0; mantSize -= 1)
-      {
-        c = *p;
-        p += 1;
-        if (c == '.') {
-          c = *p;
-          p += 1;
-        }
-        frac2 = 10*frac2 + (c - '0');
-      }
-      fraction = (1.0e9 * frac1) + frac2;
-    }
-
-    /*
-     * Skim off the exponent.
-     */
-
-    p = pExp;
-    if ((*p == 'E') || (*p == 'e')) {
-      p += 1;
-      if (*p == '-') {
-        expSign = TRUE;
-        p += 1;
-      }
-      else {
-        if (*p == '+') {
-          p += 1;
-        }
-        expSign = FALSE;
-      }
-      while (ISDIGIT(*p)) {
-        exp = exp * 10 + (*p - '0');
-        if (exp > 19999) {
-          exp = 19999;
-        }
-        p += 1;
-      }
-    }
-    if (expSign) {
-      exp = fracExp - exp;
-    }
-    else {
-      exp = fracExp + exp;
-    }
-
-    /*
-     * Generate a floating-point number that represents the exponent.
-     * Do this by processing the exponent one bit at a time to combine
-     * many powers of 2 of 10. Then combine the exponent with the
-     * fraction.
-     */
-
-    if (exp < 0) {
-      expSign = TRUE;
-      exp = -exp;
-    }
-    else {
-      expSign = FALSE;
-    }
-    if (exp > maxExponent) {
-      exp = maxExponent;
-      errno = ERANGE;
-    }
-    dblExp = 1.0;
-    for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
-      if (exp & 01) {
-        dblExp *= *d;
-      }
-    }
-    if (expSign) {
-      fraction /= dblExp;
-    }
-    else {
-      fraction *= dblExp;
-    }
-
-done:
-    if (endPtr != NULL) {
-      *endPtr = (char *) p;
-    }
-
-    if (sign) {
-      return -fraction;
-    }
-    return fraction;
+  mrb_define_method(mrb, s, "__sub_replace",   sub_replace,             MRB_ARGS_REQ(3)); /* internal */
 }
-#endif

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

@@ -4,62 +4,88 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <limits.h>
 #include <string.h>
 #include <mruby.h>
 #include <mruby/khash.h>
 #include <mruby/string.h>
 #include <mruby/dump.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
-/* ------------------------------------------------------ */
-typedef struct symbol_name {
-  mrb_bool lit : 1;
-  uint8_t prev;
-  uint16_t len;
-  const char *name;
-} symbol_name;
-
-#define SYMBOL_INLINE_BIT_POS       1
-#define SYMBOL_INLINE_LOWER_BIT_POS 2
-#define SYMBOL_INLINE               (1 << (SYMBOL_INLINE_BIT_POS - 1))
-#define SYMBOL_INLINE_LOWER         (1 << (SYMBOL_INLINE_LOWER_BIT_POS - 1))
-#define SYMBOL_NORMAL_SHIFT         SYMBOL_INLINE_BIT_POS
-#define SYMBOL_INLINE_SHIFT         SYMBOL_INLINE_LOWER_BIT_POS
-#ifdef MRB_ENABLE_ALL_SYMBOLS
-# define SYMBOL_INLINE_P(sym) FALSE
-# define SYMBOL_INLINE_LOWER_P(sym) FALSE
-# define sym_inline_pack(name, len) 0
-# define sym_inline_unpack(sym, buf, lenp) NULL
-#else
-# define SYMBOL_INLINE_P(sym) ((sym) & SYMBOL_INLINE)
-# define SYMBOL_INLINE_LOWER_P(sym) ((sym) & SYMBOL_INLINE_LOWER)
+#ifndef MRB_NO_PRESYM
+
+#ifndef MRB_PRESYM_SCANNING
+/* const uint16_t presym_length_table   */
+/* const char * const presym_name_table */
+# include <mruby/presym/table.h>
 #endif
 
+static mrb_sym
+presym_find(const char *name, size_t len)
+{
+  if (presym_length_tableMRB_PRESYM_MAX-1 < len) return 0;
+
+  mrb_sym start, idx, presym_size = MRB_PRESYM_MAX;
+  int cmp;
+  for (start = 0; presym_size != 0; presym_size/=2) {
+    idx = start+presym_size/2;
+    cmp = (int)len-(int)presym_length_tableidx;
+    if (cmp == 0) {
+      cmp = memcmp(name, presym_name_tableidx, len);
+      if (cmp == 0) return idx+1;
+    }
+    if (0 < cmp) {
+      start = ++idx;
+      --presym_size;
+    }
+  }
+  return 0;
+}
+
+static const char*
+presym_sym2name(mrb_sym sym, mrb_int *lenp)
+{
+  if (sym > MRB_PRESYM_MAX) return NULL;
+  if (lenp) *lenp = presym_length_tablesym-1;
+  return presym_name_tablesym-1;
+}
+
+#endif  /* MRB_NO_PRESYM */
+
+/* ------------------------------------------------------ */
 static void
 sym_validate_len(mrb_state *mrb, size_t len)
 {
-  if (len >= RITE_LV_NULL_MARK) {
+  if (len >= UINT16_MAX) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "symbol length too long");
   }
 }
 
-#ifndef MRB_ENABLE_ALL_SYMBOLS
+#ifdef MRB_USE_ALL_SYMBOLS
+# define SYMBOL_INLINE_P(sym) FALSE
+# define sym_inline_pack(name, len) 0
+# define sym_inline_unpack(sym, buf, lenp) NULL
+#else
+# define SYMBOL_INLINE_P(sym) ((sym) >= (1<<24))
+
 static const char pack_table = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
 static mrb_sym
 sym_inline_pack(const char *name, size_t len)
 {
-  const size_t lower_length_max = (MRB_SYMBOL_BIT - 2) / 5;
-  const size_t mix_length_max   = (MRB_SYMBOL_BIT - 2) / 6;
+#if defined(MRB_WORD_BOXING) && defined(MRB_32BIT) && !defined(MRB_WORDBOX_NO_FLOAT_TRUNCATE)
+  const size_t pack_length_max = 4;
+#else
+  const size_t pack_length_max = 5;
+#endif
 
   char c;
   const char *p;
   size_t i;
   mrb_sym sym = 0;
-  mrb_bool lower = TRUE;
 
-  if (len > lower_length_max) return 0; /* too long */
+  if (len > pack_length_max) return 0; /* too long */
+  if (len == 0) return 0; /* empty string */
   for (i=0; i<len; i++) {
     uint32_t bits;
 
@@ -68,36 +94,21 @@
     p = strchr(pack_table, (int)c);
     if (p == 0) return 0;       /* non alnum char */
     bits = (uint32_t)(p - pack_table)+1;
-    if (bits > 27) lower = FALSE;
-    if (i >= mix_length_max) break;
-    sym |= bits<<(i*6+SYMBOL_INLINE_SHIFT);
+    sym |= bits<<(24-i*6);
   }
-  if (lower) {
-    sym = 0;
-    for (i=0; i<len; i++) {
-      uint32_t bits;
-
-      c = namei;
-      p = strchr(pack_table, (int)c);
-      bits = (uint32_t)(p - pack_table)+1;
-      sym |= bits<<(i*5+SYMBOL_INLINE_SHIFT);
-    }
-    return sym | SYMBOL_INLINE | SYMBOL_INLINE_LOWER;
-  }
-  if (len > mix_length_max) return 0;
-  return sym | SYMBOL_INLINE;
+  mrb_assert(SYMBOL_INLINE_P(sym));
+  return sym;
 }
 
 static const char*
 sym_inline_unpack(mrb_sym sym, char *buf, mrb_int *lenp)
 {
-  int bit_per_char = SYMBOL_INLINE_LOWER_P(sym) ? 5 : 6;
   int i;
 
   mrb_assert(SYMBOL_INLINE_P(sym));
 
-  for (i=0; i<30/bit_per_char; i++) {
-    uint32_t bits = sym>>(i*bit_per_char+SYMBOL_INLINE_SHIFT) & ((1<<bit_per_char)-1);
+  for (i=0; i<5; i++) {
+    uint32_t bits = sym>>(24-i*6) & 0x3f;
     if (bits == 0) break;
     bufi = pack_tablebits-1;;
   }
@@ -123,13 +134,46 @@
     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))
+#define sym_len(mrb, i) (size_t)(sym_lit_p(mrb, i)?strlen(mrb->symtbli):mrb_packed_int_decode(mrb->symtbli,NULL))
+
+static mrb_bool
+sym_check(mrb_state *mrb, const char *name, size_t len, mrb_sym i)
+{
+  const char *symname = mrb->symtbli;
+  size_t symlen;
+
+  if (sym_lit_p(mrb, i)) {
+    symlen = strlen(symname);
+  }
+  else {
+    /* length in BER */
+    symlen = mrb_packed_int_decode((uint8_t*)symname, (uint8_t**)&symname);
+  }
+  if (len == symlen && memcmp(symname, name, len) == 0) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
 static mrb_sym
 find_symbol(mrb_state *mrb, const char *name, size_t len, uint8_t *hashp)
 {
   mrb_sym i;
-  symbol_name *sname;
   uint8_t hash;
 
+#ifndef MRB_NO_PRESYM
+  /* presym */
+  i = presym_find(name, len);
+  if (i > 0) return i;
+#endif
+
   /* inline symbol */
   i = sym_inline_pack(name, len);
   if (i > 0) return i;
@@ -139,24 +183,24 @@
 
   i = mrb->symhashhash;
   if (i == 0) return 0;
-  do {
-    sname = &mrb->symtbli;
-    if (sname->len == len && memcmp(sname->name, name, len) == 0) {
-      return i<<SYMBOL_NORMAL_SHIFT;
+  for (;;) {
+    if (sym_check(mrb, name, len, i)) {
+      return (i+MRB_PRESYM_MAX);
     }
-    if (sname->prev == 0xff) {
+    uint8_t diff = mrb->symlinki;
+    if (diff == 0xff) {
       i -= 0xff;
-      sname = &mrb->symtbli;
-      while (mrb->symtbl < sname) {
-        if (sname->len == len && memcmp(sname->name, name, len) == 0) {
-          return (mrb_sym)(sname - mrb->symtbl)<<SYMBOL_NORMAL_SHIFT;
+      while (i > 0) {
+        if (sym_check(mrb, name, len, i)) {
+          return (i+MRB_PRESYM_MAX);
         }
-        sname--;
+        i--;
       }
       return 0;
     }
-    i -= sname->prev;
-  } while (sname->prev > 0);
+    if (diff == 0) return 0;
+    i -= diff;
+  }
   return 0;
 }
 
@@ -164,7 +208,6 @@
 sym_intern(mrb_state *mrb, const char *name, size_t len, mrb_bool lit)
 {
   mrb_sym sym;
-  symbol_name *sname;
   uint8_t hash;
 
   sym_validate_len(mrb, len);
@@ -173,39 +216,42 @@
 
   /* registering a new symbol */
   sym = mrb->symidx + 1;
-  if (mrb->symcapa < sym) {
+  if (mrb->symcapa <= sym) {
     size_t symcapa = mrb->symcapa;
     if (symcapa == 0) symcapa = 100;
     else symcapa = (size_t)(symcapa * 6 / 5);
-    mrb->symtbl = (symbol_name*)mrb_realloc(mrb, mrb->symtbl, sizeof(symbol_name)*(symcapa+1));
+    mrb->symtbl = (const char**)mrb_realloc(mrb, 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);
     mrb->symcapa = symcapa;
   }
-  sname = &mrb->symtblsym;
-  sname->len = (uint16_t)len;
-  if (lit || mrb_ro_data_p(name)) {
-    sname->name = name;
-    sname->lit = TRUE;
+  sym_flags_clear(mrb, sym);
+  if ((lit || mrb_ro_data_p(name)) && strlen(name) == len) {
+    sym_lit_set(mrb, sym);
+    mrb->symtblsym = name;
   }
   else {
-    char *p = (char *)mrb_malloc(mrb, len+1);
-    memcpy(p, name, len);
-    plen = 0;
-    sname->name = (const char*)p;
-    sname->lit = FALSE;
+    int ilen = mrb_packed_int_len(len);
+    char *p = (char *)mrb_malloc(mrb, len+ilen+1);
+    mrb_packed_int_encode(len, (uint8_t*)p, (uint8_t*)p+ilen);
+    memcpy(p+ilen, name, len);
+    pilen+len = 0;
+    mrb->symtblsym = p;
   }
   if (mrb->symhashhash) {
     mrb_sym i = sym - mrb->symhashhash;
     if (i > 0xff)
-      sname->prev = 0xff;
+      mrb->symlinksym = 0xff;
     else
-      sname->prev = i;
+      mrb->symlinksym = i;
   }
   else {
-    sname->prev = 0;
+    mrb->symlinksym = 0;
   }
   mrb->symhashhash = mrb->symidx = sym;
 
-  return sym<<SYMBOL_NORMAL_SHIFT;
+  return (sym+MRB_PRESYM_MAX);
 }
 
 MRB_API mrb_sym
@@ -232,48 +278,92 @@
   return mrb_intern(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
 }
 
-MRB_API mrb_value
-mrb_check_intern(mrb_state *mrb, const char *name, size_t len)
+MRB_API mrb_sym
+mrb_intern_check(mrb_state *mrb, const char *name, size_t len)
 {
   mrb_sym sym;
 
   sym_validate_len(mrb, len);
   sym = find_symbol(mrb, name, len, NULL);
-  if (sym > 0) return mrb_symbol_value(sym);
-  return mrb_nil_value();
+  if (sym > 0) return sym;
+  return 0;
+}
+
+MRB_API mrb_value
+mrb_check_intern(mrb_state *mrb, const char *name, size_t len)
+{
+  mrb_sym sym = mrb_intern_check(mrb, name, len);
+  if (sym == 0) return mrb_nil_value();
+  return mrb_symbol_value(sym);
+}
+
+MRB_API mrb_sym
+mrb_intern_check_cstr(mrb_state *mrb, const char *name)
+{
+  return mrb_intern_check(mrb, name, strlen(name));
 }
 
 MRB_API mrb_value
 mrb_check_intern_cstr(mrb_state *mrb, const char *name)
 {
-  return mrb_check_intern(mrb, name, strlen(name));
+  mrb_sym sym = mrb_intern_check_cstr(mrb, name);
+  if (sym == 0) return mrb_nil_value();
+  return mrb_symbol_value(sym);
+}
+
+MRB_API mrb_sym
+mrb_intern_check_str(mrb_state *mrb, mrb_value str)
+{
+  return mrb_intern_check(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
 }
 
 MRB_API mrb_value
 mrb_check_intern_str(mrb_state *mrb, mrb_value str)
 {
-  return mrb_check_intern(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
+  mrb_sym sym = mrb_intern_check_str(mrb, str);
+  if (sym == 0) return mrb_nil_value();
+  return mrb_symbol_value(sym);
 }
 
 static const char*
 sym2name_len(mrb_state *mrb, mrb_sym sym, char *buf, mrb_int *lenp)
 {
+  if (sym == 0) goto outofsym;
   if (SYMBOL_INLINE_P(sym)) return sym_inline_unpack(sym, buf, lenp);
 
-  sym >>= SYMBOL_NORMAL_SHIFT;
-  if (sym == 0 || mrb->symidx < sym) {
+#ifndef MRB_NO_PRESYM
+  {
+    const char *name = presym_sym2name(sym, lenp);
+    if (name) return name;
+  }
+#endif
+  sym -= MRB_PRESYM_MAX;
+
+  if (mrb->symidx < sym) {
+  outofsym:
     if (lenp) *lenp = 0;
     return NULL;
   }
 
-  if (lenp) *lenp = mrb->symtblsym.len;
-  return mrb->symtblsym.name;
+  const char *symname = mrb->symtblsym;
+  if (!sym_lit_p(mrb, sym)) {
+    size_t len = mrb_packed_int_decode((uint8_t*)symname, (uint8_t**)&symname);
+    if (lenp) *lenp = (mrb_int)len;
+  }
+  else if (lenp) {
+    *lenp = (mrb_int)strlen(symname);
+  }
+  return symname;
 }
 
 MRB_API const char*
 mrb_sym_name_len(mrb_state *mrb, mrb_sym sym, mrb_int *lenp)
 {
+#ifdef MRB_USE_ALL_SYMBOLS
+  return sym2name_len(mrb, sym, NULL, lenp);
+#else
   return sym2name_len(mrb, sym, mrb->symbuf, lenp);
+#endif
 }
 
 void
@@ -282,11 +372,13 @@
   mrb_sym i, lim;
 
   for (i=1, lim=mrb->symidx+1; i<lim; i++) {
-    if (!mrb->symtbli.lit) {
-      mrb_free(mrb, (char*)mrb->symtbli.name);
+    if (!sym_lit_p(mrb, i)) {
+      mrb_free(mrb, (char*)mrb->symtbli);
     }
   }
   mrb_free(mrb, mrb->symtbl);
+  mrb_free(mrb, mrb->symlink);
+  mrb_free(mrb, mrb->symflags);
 }
 
 void
@@ -331,12 +423,11 @@
 /* 15.2.11.3.3  */
 /*
  *  call-seq:
- *     sym.id2name   -> string
  *     sym.to_s      -> string
  *
  *  Returns the name or string corresponding to <i>sym</i>.
  *
- *     :fred.id2name   #=> "fred"
+ *     :fred.to_s   #=> "fred"
  */
 static mrb_value
 sym_to_s(mrb_state *mrb, mrb_value sym)
@@ -344,6 +435,30 @@
   return mrb_sym_str(mrb, mrb_symbol(sym));
 }
 
+/*
+ *  call-seq:
+ *     sym.name   -> string
+ *
+ *  Returns the name or string corresponding to <i>sym</i>. Unlike #to_s, the
+ *  returned string is frozen.
+ *
+ *     :fred.name         #=> "fred"
+ *     :fred.name.frozen? #=> true
+ */
+static mrb_value
+sym_name(mrb_state *mrb, mrb_value vsym)
+{
+  mrb_sym sym = mrb_symbol(vsym);
+  mrb_int len;
+  const char *name = mrb_sym_name_len(mrb, sym, &len);
+
+  mrb_assert(name != NULL);
+  if (SYMBOL_INLINE_P(sym)) {
+    return mrb_str_new_frozen(mrb, name, len);
+  }
+  return mrb_str_new_static_frozen(mrb, name, len);
+}
+
 /* 15.2.11.3.4  */
 /*
  * call-seq:
@@ -497,7 +612,7 @@
   char *sp;
 
   name = mrb_sym_name_len(mrb, id, &len);
-  str = mrb_str_new(mrb, 0, len+1);
+  str = mrb_str_new(mrb, NULL, len+1);
   sp = RSTRING_PTR(str);
   sp0 = ':';
   memcpy(sp+1, name, len);
@@ -530,7 +645,7 @@
 }
 
 static const char*
-sym_name(mrb_state *mrb, mrb_sym sym, mrb_bool dump)
+sym_cstr(mrb_state *mrb, mrb_sym sym, mrb_bool dump)
 {
   mrb_int len;
   const char *name = mrb_sym_name_len(mrb, sym, &len);
@@ -540,8 +655,7 @@
     return name;
   }
   else {
-    mrb_value str = SYMBOL_INLINE_P(sym) ?
-      mrb_str_new(mrb, name, len) : mrb_str_new_static(mrb, name, len);
+    mrb_value str = mrb_str_new_static(mrb, name, len);
     str = mrb_str_dump(mrb, str);
     return RSTRING_PTR(str);
   }
@@ -550,13 +664,13 @@
 MRB_API const char*
 mrb_sym_name(mrb_state *mrb, mrb_sym sym)
 {
-  return sym_name(mrb, sym, FALSE);
+  return sym_cstr(mrb, sym, FALSE);
 }
 
 MRB_API const char*
 mrb_sym_dump(mrb_state *mrb, mrb_sym sym)
 {
-  return sym_name(mrb, sym, TRUE);
+  return sym_cstr(mrb, sym, TRUE);
 }
 
 #define lesser(a,b) (((a)>(b))?(b):(a))
@@ -600,8 +714,8 @@
   MRB_SET_INSTANCE_TT(sym, MRB_TT_SYMBOL);
   mrb_undef_class_method(mrb,  sym, "new");
 
-  mrb_define_method(mrb, sym, "id2name", sym_to_s,    MRB_ARGS_NONE());          /* 15.2.11.3.2 */
   mrb_define_method(mrb, sym, "to_s",    sym_to_s,    MRB_ARGS_NONE());          /* 15.2.11.3.3 */
+  mrb_define_method(mrb, sym, "name",    sym_name,    MRB_ARGS_NONE());
   mrb_define_method(mrb, sym, "to_sym",  sym_to_sym,  MRB_ARGS_NONE());          /* 15.2.11.3.4 */
   mrb_define_method(mrb, sym, "inspect", sym_inspect, MRB_ARGS_NONE());          /* 15.2.11.3.5(x) */
   mrb_define_method(mrb, sym, "<=>",     sym_cmp,     MRB_ARGS_REQ(1));

_service:tar_scm:nghttp2-1.46.0.tar.xz/third-party/mruby/src/value_array.h -> _service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/src/value_array.h Changed

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

@@ -10,24 +10,18 @@
 #include <mruby/proc.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
-
-#ifndef MRB_IV_SEGMENT_SIZE
-#define MRB_IV_SEGMENT_SIZE 4
-#endif
-
-typedef struct segment {
-  mrb_sym keyMRB_IV_SEGMENT_SIZE;
-  mrb_value valMRB_IV_SEGMENT_SIZE;
-  struct segment *next;
-} segment;
+#include <mruby/presym.h>
 
 /* Instance variable table structure */
 typedef struct iv_tbl {
-  segment *rootseg;
-  size_t size;
-  size_t last_len;
+  int size, alloc;
+  mrb_value *ptr;
 } iv_tbl;
 
+#define IV_EMPTY 0
+#define IV_DELETED (1UL<<31)
+#define IV_KEY_P(k) (((k)&~((uint32_t)IV_DELETED))!=0)
+
 /* Creates the instance variable table. */
 static iv_tbl*
 iv_new(mrb_state *mrb)
@@ -36,197 +30,197 @@
 
   t = (iv_tbl*)mrb_malloc(mrb, sizeof(iv_tbl));
   t->size = 0;
-  t->rootseg =  NULL;
-  t->last_len = 0;
+  t->alloc = 0;
+  t->ptr = NULL;
 
   return t;
 }
 
+static void iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val);
+
+static void
+iv_rehash(mrb_state *mrb, iv_tbl *t)
+{
+  int old_alloc = t->alloc;
+  int new_alloc = old_alloc+4;
+  mrb_value *old_ptr = t->ptr;
+
+  khash_power2(new_alloc);
+  if (old_alloc == new_alloc) return;
+
+  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;
+  mrb_value *vals = old_ptr;
+  for (int i = 0; i < old_alloc; i++) {
+    if (IV_KEY_P(keysi)) {
+      iv_put(mrb, t, keysi, valsi);
+    }
+  }
+  mrb_free(mrb, old_ptr);
+}
+
 /* Set the value for the symbol in the instance variable table. */
 static void
 iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val)
 {
-  segment *seg;
-  segment *prev = NULL;
-  segment *matched_seg = NULL;
-  size_t matched_idx = 0;
-  size_t i;
+  int hash, pos, start, dpos = -1;
 
   if (t == NULL) return;
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->keyi;
-      /* Found room in last segment after last_len */
-      if (!seg->next && i >= t->last_len) {
-        seg->keyi = sym;
-        seg->vali = val;
-        t->last_len = i+1;
+  if (t->alloc == 0) {
+    iv_rehash(mrb, t);
+  }
+
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  mrb_value *vals = t->ptr;
+  hash = kh_int_hash_func(mrb, sym);
+  start = pos = hash & (t->alloc-1);
+  for (;;) {
+    mrb_sym key = keyspos;
+    if (key == sym) {
+      valspos = val;
+      return;
+    }
+    else if (key == IV_EMPTY) {
+      t->size++;
+      keyspos = sym;
+      valspos = val;
+      return;
+    }
+    else if (key == IV_DELETED && dpos < 0) {
+      dpos = pos;
+    }
+    pos = (pos+1) & (t->alloc-1);
+    if (pos == start) {         /* not found */
+      if (dpos >= 0) {
         t->size++;
+        keysdpos = sym;
+        valsdpos = val;
         return;
       }
-      if (!matched_seg && key == 0) {
-        matched_seg = seg;
-        matched_idx = i;
-      }
-      else if (key == sym) {
-        seg->vali = val;
-        return;
-      }
+      /* no room */
+      iv_rehash(mrb, t);
+      keys = (mrb_sym*)&t->ptrt->alloc;
+      vals = t->ptr;
+      start = pos = hash & (t->alloc-1);
     }
-    prev = seg;
-    seg = seg->next;
-  }
-
-  /* Not found */
-  if (matched_seg) {
-    matched_seg->keymatched_idx = sym;
-    matched_seg->valmatched_idx = val;
-    t->size++;
-    return;
-  }
-
-  seg = (segment*)mrb_malloc(mrb, sizeof(segment));
-  seg->next = NULL;
-  seg->key0 = sym;
-  seg->val0 = val;
-  t->last_len = 1;
-  t->size++;
-  if (prev) {
-    prev->next = seg;
-  }
-  else {
-    t->rootseg = seg;
   }
 }
 
 /* Get a value for a symbol from the instance variable table. */
-static mrb_bool
+static int
 iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
 {
-  segment *seg;
-  size_t i;
+  int hash, pos, start;
 
   if (t == NULL) return FALSE;
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->keyi;
+  if (t->alloc == 0) return FALSE;
+  if (t->size == 0) return FALSE;
 
-      if (!seg->next && i >= t->last_len) {
-        return FALSE;
-      }
-      if (key == sym) {
-        if (vp) *vp = seg->vali;
-        return TRUE;
-      }
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  mrb_value *vals = t->ptr;
+  hash = kh_int_hash_func(mrb, sym);
+  start = pos = hash & (t->alloc-1);
+  for (;;) {
+    mrb_sym key = keyspos;
+    if (key == sym) {
+      if (vp) *vp = valspos;
+      return pos+1;
+    }
+    else if (key == IV_EMPTY) {
+      return 0;
+    }
+    pos = (pos+1) & (t->alloc-1);
+    if (pos == start) {         /* not found */
+      return 0;
     }
-    seg = seg->next;
   }
-  return FALSE;
 }
 
 /* Deletes the value for the symbol from the instance variable table. */
 static mrb_bool
 iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
 {
-  segment *seg;
-  size_t i;
+  int hash, pos, start;
 
   if (t == NULL) return FALSE;
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->keyi;
+  if (t->alloc == 0) return FALSE;
+  if (t->size == 0) return FALSE;
 
-      if (!seg->next && i >= t->last_len) {
-        return FALSE;
-      }
-      if (key == sym) {
-        t->size--;
-        seg->keyi = 0;
-        if (vp) *vp = seg->vali;
-        return TRUE;
-      }
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  mrb_value *vals = t->ptr;
+  hash = kh_int_hash_func(mrb, sym);
+  start = pos = hash & (t->alloc-1);
+  for (;;) {
+    mrb_sym key = keyspos;
+    if (key == sym) {
+      if (vp) *vp = valspos;
+      t->size--;
+      keyspos = IV_DELETED;
+      return TRUE;
+    }
+    else if (key == IV_EMPTY) {
+      return FALSE;
+    }
+    pos = (pos+1) & (t->alloc-1);
+    if (pos == start) {         /* not found */
+      return FALSE;
     }
-    seg = seg->next;
   }
-  return FALSE;
 }
 
 /* Iterates over the instance variable table. */
 static void
 iv_foreach(mrb_state *mrb, iv_tbl *t, mrb_iv_foreach_func *func, void *p)
 {
-  segment *seg;
-  size_t i;
+  int i;
 
   if (t == NULL) return;
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->keyi;
-
-      /* no value in last segment after last_len */
-      if (!seg->next && i >= t->last_len) {
+  if (t->alloc == 0) return;
+  if (t->size == 0) return;
+
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  mrb_value *vals = t->ptr;
+  for (i=0; i<t->alloc; i++) {
+    if (IV_KEY_P(keysi)) {
+      if ((*func)(mrb, keysi, valsi, p) != 0) {
         return;
       }
-      if (key != 0) {
-        if ((*func)(mrb, key, seg->vali, p) != 0) {
-          return;
-        }
-      }
     }
-    seg = seg->next;
   }
   return;
 }
 
 /* Get the size of the instance variable table. */
+/* Size is approximated by the allocated table size. */
 static size_t
 iv_size(mrb_state *mrb, iv_tbl *t)
 {
-  segment *seg;
-  size_t size = 0;
-
   if (t == NULL) return 0;
-  if (t->size > 0) return t->size;
-  seg = t->rootseg;
-  while (seg) {
-    if (seg->next == NULL) {
-      size += t->last_len;
-      return size;
-    }
-    seg = seg->next;
-    size += MRB_IV_SEGMENT_SIZE;
-  }
-  /* empty iv_tbl */
-  return 0;
+  return (size_t)t->size;
 }
 
 /* Copy the instance variable table. */
 static iv_tbl*
 iv_copy(mrb_state *mrb, iv_tbl *t)
 {
-  segment *seg;
   iv_tbl *t2;
+  int i;
 
-  size_t i;
+  if (t == NULL) return NULL;
+  if (t->alloc == 0) return NULL;
+  if (t->size == 0) return NULL;
 
-  seg = t->rootseg;
+  mrb_sym *keys = (mrb_sym*)&t->ptrt->alloc;
+  mrb_value *vals = t->ptr;
   t2 = iv_new(mrb);
-
-  while (seg != NULL) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->keyi;
-      mrb_value val = seg->vali;
-
-      if ((seg->next == NULL) && (i >= t->last_len)) {
-        return t2;
-      }
-      iv_put(mrb, t2, key, val);
+  for (i=0; i<t->alloc; i++) {
+    if (IV_KEY_P(keysi)) {
+      iv_put(mrb, t2, keysi, valsi);
     }
-    seg = seg->next;
   }
   return t2;
 }
@@ -235,14 +229,7 @@
 static void
 iv_free(mrb_state *mrb, iv_tbl *t)
 {
-  segment *seg;
-
-  seg = t->rootseg;
-  while (seg) {
-    segment *p = seg;
-    seg = seg->next;
-    mrb_free(mrb, p);
-  }
+  mrb_free(mrb, t->ptr);
   mrb_free(mrb, t);
 }
 
@@ -349,7 +336,7 @@
     obj->iv = iv_new(mrb);
   }
   iv_put(mrb, obj->iv, sym, v);
-  mrb_write_barrier(mrb, (struct RBasic*)obj);
+  mrb_field_write_barrier_value(mrb, (struct RBasic*)obj, v);
 }
 
 MRB_API void
@@ -379,11 +366,11 @@
   if (namespace_p(obj->tt) && namespace_p(mrb_type(v))) {
     struct RObject *c = mrb_obj_ptr(v);
     if (obj != c && ISUPPER(mrb_sym_name_len(mrb, sym, NULL)0)) {
-      mrb_sym id_classname = mrb_intern_lit(mrb, "__classname__");
+      mrb_sym id_classname = MRB_SYM(__classname__);
       mrb_value o = mrb_obj_iv_get(mrb, c, id_classname);
 
       if (mrb_nil_p(o)) {
-        mrb_sym id_outer = mrb_intern_lit(mrb, "__outer__");
+        mrb_sym id_outer = MRB_SYM(__outer__);
         o = mrb_obj_iv_get(mrb, c, id_outer);
 
         if (mrb_nil_p(o)) {
@@ -416,9 +403,7 @@
   iv_tbl *t;
 
   t = obj->iv;
-  if (t) {
-    return iv_get(mrb, t, sym, NULL);
-  }
+  if (t && iv_get(mrb, t, sym, NULL)) return TRUE;
   return FALSE;
 }
 
@@ -500,7 +485,7 @@
 mrb_obj_iv_inspect(mrb_state *mrb, struct RObject *obj)
 {
   iv_tbl *t = obj->iv;
-  size_t len = iv_size(mrb, t);
+  int len = iv_size(mrb, t);
 
   if (len > 0) {
     const char *cn = mrb_obj_classname(mrb, mrb_obj_value(obj));
@@ -643,8 +628,7 @@
   if (cls && cls->tt == MRB_TT_SCLASS) {
     mrb_value klass;
 
-    klass = mrb_obj_iv_get(mrb, (struct RObject *)cls,
-                           mrb_intern_lit(mrb, "__attached__"));
+    klass = mrb_obj_iv_get(mrb, (struct RObject *)cls, MRB_SYM(__attached__));
     c = mrb_class_ptr(klass);
     if (c->tt == MRB_TT_CLASS || c->tt == MRB_TT_MODULE) {
       given = FALSE;
@@ -675,11 +659,12 @@
 
   while (c) {
     iv_tbl *t = c->iv;
+    int pos = iv_get(mrb, t, sym, NULL);
 
-    if (iv_get(mrb, t, sym, NULL)) {
+    if (pos) {
       mrb_check_frozen(mrb, c);
-      iv_put(mrb, t, sym, v);
-      mrb_write_barrier(mrb, (struct RBasic*)c);
+      t->ptrpos-1 = v;        /* iv_get returns pos+1 to put */
+      mrb_field_write_barrier_value(mrb, (struct RBasic*)c, v);
       return;
     }
     c = c->super;
@@ -688,8 +673,7 @@
   if (cls && cls->tt == MRB_TT_SCLASS) {
     mrb_value klass;
 
-    klass = mrb_obj_iv_get(mrb, (struct RObject*)cls,
-                           mrb_intern_lit(mrb, "__attached__"));
+    klass = mrb_obj_iv_get(mrb, (struct RObject*)cls, MRB_SYM(__attached__));
     switch (mrb_type(klass)) {
     case MRB_TT_CLASS:
     case MRB_TT_MODULE:
@@ -711,7 +695,7 @@
   }
 
   iv_put(mrb, c->iv, sym, v);
-  mrb_write_barrier(mrb, (struct RBasic*)c);
+  mrb_field_write_barrier_value(mrb, (struct RBasic*)c, v);
 }
 
 MRB_API void
@@ -743,11 +727,11 @@
 {
   struct RClass *c;
 
-  struct RProc *p = mrb->c->ci->proc;
+  const struct RProc *p = mrb->c->ci->proc;
 
   for (;;) {
     c = MRB_PROC_TARGET_CLASS(p);
-    if (c->tt != MRB_TT_SCLASS) break;
+    if (c && c->tt != MRB_TT_SCLASS) break;
     p = p->upper;
   }
   return mrb_mod_cv_get(mrb, c, sym);
@@ -757,11 +741,11 @@
 mrb_vm_cv_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
 {
   struct RClass *c;
-  struct RProc *p = mrb->c->ci->proc;
+  const struct RProc *p = mrb->c->ci->proc;
 
   for (;;) {
     c = MRB_PROC_TARGET_CLASS(p);
-    if (c->tt != MRB_TT_SCLASS) break;
+    if (c && c->tt != MRB_TT_SCLASS) break;
     p = p->upper;
   }
   mrb_mod_cv_set(mrb, c, sym, v);
@@ -782,16 +766,17 @@
 }
 
 static mrb_value
-const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym)
+const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym, mrb_bool skip)
 {
   struct RClass *c = base;
   mrb_value v;
   mrb_bool retry = FALSE;
   mrb_value name;
 
+  if (skip) c = c->super;
 L_RETRY:
   while (c) {
-    if (c->iv) {
+    if (!MRB_FLAG_TEST(c, MRB_FL_CLASS_IS_PREPENDED) && c->iv) {
       if (iv_get(mrb, c->iv, sym, &v))
         return v;
     }
@@ -803,14 +788,14 @@
     goto L_RETRY;
   }
   name = mrb_symbol_value(sym);
-  return mrb_funcall_argv(mrb, mrb_obj_value(base), mrb_intern_lit(mrb, "const_missing"), 1, &name);
+  return mrb_funcall_argv(mrb, mrb_obj_value(base), MRB_SYM(const_missing), 1, &name);
 }
 
 MRB_API mrb_value
 mrb_const_get(mrb_state *mrb, mrb_value mod, mrb_sym sym)
 {
   mod_const_check(mrb, mod);
-  return const_get(mrb, mrb_class_ptr(mod), sym);
+  return const_get(mrb, mrb_class_ptr(mod), sym, FALSE);
 }
 
 mrb_value
@@ -819,9 +804,10 @@
   struct RClass *c;
   struct RClass *c2;
   mrb_value v;
-  struct RProc *proc;
+  const struct RProc *proc = mrb->c->ci->proc;
 
-  c = MRB_PROC_TARGET_CLASS(mrb->c->ci->proc);
+  c = MRB_PROC_TARGET_CLASS(proc);
+  if (!c) c = mrb->object_class;
   if (iv_get(mrb, c->iv, sym, &v)) {
     return v;
   }
@@ -829,15 +815,14 @@
   while (c2 && c2->tt == MRB_TT_SCLASS) {
     mrb_value klass;
 
-    if (!iv_get(mrb, c2->iv, mrb_intern_lit(mrb, "__attached__"), &klass)) {
+    if (!iv_get(mrb, c2->iv, MRB_SYM(__attached__), &klass)) {
       c2 = NULL;
       break;
     }
     c2 = mrb_class_ptr(klass);
   }
   if (c2 && (c2->tt == MRB_TT_CLASS || c2->tt == MRB_TT_MODULE)) c = c2;
-  mrb_assert(!MRB_PROC_CFUNC_P(mrb->c->ci->proc));
-  proc = mrb->c->ci->proc;
+  proc = proc->upper;
   while (proc) {
     c2 = MRB_PROC_TARGET_CLASS(proc);
     if (c2 && iv_get(mrb, c2->iv, sym, &v)) {
@@ -845,7 +830,7 @@
     }
     proc = proc->upper;
   }
-  return const_get(mrb, c, sym);
+  return const_get(mrb, c, sym, TRUE);
 }
 
 MRB_API void
@@ -864,6 +849,7 @@
   struct RClass *c;
 
   c = MRB_PROC_TARGET_CLASS(mrb->c->ci->proc);
+  if (!c) c = mrb->object_class;
   mrb_obj_iv_set(mrb, (struct RObject*)c, sym, v);
 }
 
@@ -875,6 +861,12 @@
 }
 
 MRB_API void
+mrb_define_const_id(mrb_state *mrb, struct RClass *mod, mrb_sym name, mrb_value v)
+{
+  mrb_obj_iv_set(mrb, (struct RObject*)mod, name, v);
+}
+
+MRB_API void
 mrb_define_const(mrb_state *mrb, struct RClass *mod, const char *name, mrb_value v)
 {
   mrb_obj_iv_set(mrb, (struct RObject*)mod, mrb_intern_cstr(mrb, name), v);
@@ -914,7 +906,7 @@
  *  call-seq:
  *     mod.constants    -> array
  *
- *  Returns an array of all names of contants defined in the receiver.
+ *  Returns an array of all names of constants defined in the receiver.
  */
 mrb_value
 mrb_mod_constants(mrb_state *mrb, mrb_value mod)
@@ -1070,7 +1062,7 @@
 {
   mrb_value ov;
 
-  ov = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__outer__"));
+  ov = mrb_obj_iv_get(mrb, (struct RObject*)c, MRB_SYM(__outer__));
   if (mrb_nil_p(ov)) return NULL;
   switch (mrb_type(ov)) {
   case MRB_TT_CLASS:
@@ -1120,14 +1112,22 @@
   str = mrb_sym_name_len(mrb, name, &len);
   mrb_str_cat(mrb, path, str, len);
   if (RSTRING_PTR(path)0 != '#') {
-    iv_del(mrb, c->iv, mrb_intern_lit(mrb, "__outer__"), NULL);
-    iv_put(mrb, c->iv, mrb_intern_lit(mrb, "__classname__"), path);
+    iv_del(mrb, c->iv, MRB_SYM(__outer__), NULL);
+    iv_put(mrb, c->iv, MRB_SYM(__classname__), path);
     mrb_field_write_barrier_value(mrb, (struct RBasic*)c, path);
     path = mrb_str_dup(mrb, path);
   }
   return path;
 }
 
+size_t
+mrb_obj_iv_tbl_memsize(mrb_value obj)
+{
+  iv_tbl *t = mrb_obj_ptr(obj)->iv;
+  if (t == NULL) return 0;
+  return sizeof(iv_tbl) + t->alloc*(sizeof(mrb_value)+sizeof(mrb_sym));
+}
+
 #define identchar(c) (ISALNUM(c) || (c) == '_' || !ISASCII(c))
 
 mrb_bool

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

@@ -4,11 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <stddef.h>
-#include <stdarg.h>
-#ifndef MRB_WITHOUT_FLOAT
-#include <math.h>
-#endif
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/class.h>
@@ -23,8 +18,10 @@
 #include <mruby/opcode.h>
 #include "value_array.h"
 #include <mruby/throw.h>
+#include <mruby/dump.h>
+#include <mruby/presym.h>
 
-#ifdef MRB_DISABLE_STDIO
+#ifdef MRB_NO_STDIO
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -37,27 +34,14 @@
 #define STACK_INIT_SIZE 128
 #define CALLINFO_INIT_SIZE 32
 
-#ifndef ENSURE_STACK_INIT_SIZE
-#define ENSURE_STACK_INIT_SIZE 16
-#endif
-
-#ifndef RESCUE_STACK_INIT_SIZE
-#define RESCUE_STACK_INIT_SIZE 16
-#endif
-
 /* Define amount of linear stack growth. */
 #ifndef MRB_STACK_GROWTH
 #define MRB_STACK_GROWTH 128
 #endif
 
-/* Maximum mrb_funcall() depth. Should be set lower on memory constrained systems. */
-#ifndef MRB_FUNCALL_DEPTH_MAX
-#define MRB_FUNCALL_DEPTH_MAX 512
-#endif
-
-/* Maximum depth of ecall() recursion. */
-#ifndef MRB_ECALL_DEPTH_MAX
-#define MRB_ECALL_DEPTH_MAX 512
+/* Maximum recursive depth. Should be set lower on memory constrained systems. */
+#ifndef MRB_CALL_LEVEL_MAX
+#define MRB_CALL_LEVEL_MAX 512
 #endif
 
 /* Maximum stack depth. Should be set lower on memory constrained systems.
@@ -80,6 +64,7 @@
   mrb_gc *gc = &mrb->gc;
   int capa = gc->arena_capa;
 
+  mrb->gc.arena_idx = idx;
   if (idx < capa / 4) {
     capa >>= 2;
     if (capa < MRB_GC_ARENA_SIZE) {
@@ -92,36 +77,27 @@
   }
 }
 #else
-#define mrb_gc_arena_shrink(mrb,idx)
+#define mrb_gc_arena_shrink(mrb,idx) mrb_gc_arena_restore(mrb,idx)
 #endif
 
-#define CALL_MAXARGS 127
+#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)
 {
-#ifndef MRB_NAN_BOXING
-  const mrb_value mrb_value_zero = { { 0 } };
-
-  while (count-- > 0) {
-    *from++ = mrb_value_zero;
-  }
-#else
   while (count-- > 0) {
     SET_NIL_VALUE(*from);
     from++;
   }
-#endif
 }
 
 static inline void
 stack_copy(mrb_value *dst, const mrb_value *src, size_t size)
 {
-  while (size-- > 0) {
-    *dst++ = *src++;
-  }
+  memcpy(dst, src, sizeof(mrb_value)*size);
 }
 
 static void
@@ -132,14 +108,13 @@
   /* mrb_assert(mrb->stack == NULL); */
   c->stbase = (mrb_value *)mrb_calloc(mrb, STACK_INIT_SIZE, sizeof(mrb_value));
   c->stend = c->stbase + STACK_INIT_SIZE;
-  c->stack = c->stbase;
 
   /* mrb_assert(ci == NULL); */
   c->cibase = (mrb_callinfo *)mrb_calloc(mrb, CALLINFO_INIT_SIZE, sizeof(mrb_callinfo));
   c->ciend = c->cibase + CALLINFO_INIT_SIZE;
   c->ci = c->cibase;
-  c->ci->target_class = mrb->object_class;
-  c->ci->stackent = c->stack;
+  c->ci->u.target_class = mrb->object_class;
+  c->ci->stack = c->stbase;
 }
 
 static inline void
@@ -149,7 +124,7 @@
 
   if (newbase == oldbase) return;
   while (ci <= mrb->c->ci) {
-    struct REnv *e = ci->env;
+    struct REnv *e = mrb_vm_ci_env(ci);
     mrb_value *st;
 
     if (e && MRB_ENV_ONSTACK_P(e) &&
@@ -159,7 +134,7 @@
       e->stack = newbase + off;
     }
 
-    if (ci->proc && MRB_PROC_ENV_P(ci->proc) && ci->env != MRB_PROC_ENV(ci->proc)) {
+    if (ci->proc && MRB_PROC_ENV_P(ci->proc) && e != MRB_PROC_ENV(ci->proc)) {
       e = MRB_PROC_ENV(ci->proc);
 
       if (e && MRB_ENV_ONSTACK_P(e) &&
@@ -170,7 +145,7 @@
       }
     }
 
-    ci->stackent = newbase + (ci->stackent - oldbase);
+    ci->stack = newbase + (ci->stack - oldbase);
     ci++;
   }
 }
@@ -184,7 +159,7 @@
   mrb_value *newstack;
   size_t oldsize = mrb->c->stend - mrb->c->stbase;
   size_t size = oldsize;
-  size_t off = mrb->c->stack - mrb->c->stbase;
+  size_t off = mrb->c->ci->stack ? mrb->c->stend - mrb->c->ci->stack : 0;
 
   if (off > size) size = off;
 #ifdef MRB_STACK_EXTEND_DOUBLING
@@ -202,14 +177,13 @@
     size += room;
 #endif
 
-  newstack = (mrb_value *)mrb_realloc(mrb, mrb->c->stbase, sizeof(mrb_value) * size);
+  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));
   }
   stack_clear(&(newstackoldsize), size - oldsize);
   envadjust(mrb, oldbase, newstack, oldsize);
   mrb->c->stbase = newstack;
-  mrb->c->stack = mrb->c->stbase + off;
   mrb->c->stend = mrb->c->stbase + size;
 
   /* Raise an exception if the new stack size will be too large,
@@ -222,15 +196,15 @@
 MRB_API void
 mrb_stack_extend(mrb_state *mrb, mrb_int room)
 {
-  if (mrb->c->stack + room >= mrb->c->stend) {
+  if (!mrb->c->ci->stack || mrb->c->ci->stack + room >= mrb->c->stend) {
     stack_extend_alloc(mrb, room);
   }
 }
 
 static inline struct REnv*
-uvenv(mrb_state *mrb, int up)
+uvenv(mrb_state *mrb, mrb_int up)
 {
-  struct RProc *proc = mrb->c->ci->proc;
+  const struct RProc *proc = mrb->c->ci->proc;
   struct REnv *e;
 
   while (up--) {
@@ -245,7 +219,7 @@
 
     while (cb <= ci) {
       if (ci->proc == proc) {
-        return ci->env;
+        return mrb_vm_ci_env(ci);
       }
       ci--;
     }
@@ -253,8 +227,8 @@
   return NULL;
 }
 
-static inline struct RProc*
-top_proc(mrb_state *mrb, struct RProc *proc)
+static inline const struct RProc*
+top_proc(mrb_state *mrb, const struct RProc *proc)
 {
   while (proc->upper) {
     if (MRB_PROC_SCOPE_P(proc) || MRB_PROC_STRICT_P(proc))
@@ -264,30 +238,36 @@
   return proc;
 }
 
-#define CI_ACC_SKIP    -1
-#define CI_ACC_DIRECT  -2
-#define CI_ACC_RESUMED -3
+#define CINFO_NONE    0
+#define CINFO_SKIP    1
+#define CINFO_DIRECT  2
+#define CINFO_RESUMED 3
 
 static inline mrb_callinfo*
-cipush(mrb_state *mrb)
+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)
 {
   struct mrb_context *c = mrb->c;
-  static const mrb_callinfo ci_zero = { 0 };
   mrb_callinfo *ci = c->ci;
 
-  int ridx = ci->ridx;
-
   if (ci + 1 == c->ciend) {
     ptrdiff_t size = ci - c->cibase;
 
+    if (size > MRB_CALL_LEVEL_MAX) {
+      mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
+    }
     c->cibase = (mrb_callinfo *)mrb_realloc(mrb, c->cibase, sizeof(mrb_callinfo)*size*2);
     c->ci = c->cibase + size;
     c->ciend = c->cibase + size * 2;
   }
   ci = ++c->ci;
-  *ci = ci_zero;
-  ci->epos = mrb->c->eidx;
-  ci->ridx = ridx;
+  ci->mid = mid;
+  mrb_vm_ci_proc_set(ci, proc);
+  ci->stack = ci-1.stack + push_stacks;
+  ci->n = argc & 0xf;
+  ci->nk = (argc>>4) & 0xf;
+  ci->cci = cci;
+  ci->u.target_class = target_class;
 
   return ci;
 }
@@ -302,7 +282,7 @@
 
     if (!MRB_ENV_ONSTACK_P(e)) return;
     if (e->cxt != mrb->c) return;
-    if (e == mrb->c->cibase->env) return; /* for mirb */
+    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);
@@ -313,74 +293,63 @@
   }
 }
 
-static inline void
+static inline mrb_callinfo*
 cipop(mrb_state *mrb)
 {
   struct mrb_context *c = mrb->c;
-  struct REnv *env = c->ci->env;
+  struct REnv *env = mrb_vm_ci_env(c->ci);
 
   c->ci--;
   if (env) mrb_env_unshare(mrb, env);
+  return c->ci;
 }
 
-void mrb_exc_set(mrb_state *mrb, mrb_value exc);
-static mrb_value mrb_run(mrb_state *mrb, struct RProc* proc, mrb_value self);
-
-static void
-ecall(mrb_state *mrb)
+MRB_API mrb_value
+mrb_protect_error(mrb_state *mrb, mrb_protect_error_func *body, void *userdata, mrb_bool *error)
 {
-  struct RProc *p;
-  struct mrb_context *c = mrb->c;
-  mrb_callinfo *ci = c->ci;
-  struct RObject *exc;
-  struct REnv *env;
-  ptrdiff_t cioff;
+  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
+  struct mrb_jmpbuf c_jmp;
+  mrb_value result = mrb_nil_value();
   int ai = mrb_gc_arena_save(mrb);
-  uint16_t i;
-  int nregs;
+  const struct mrb_context *c = mrb->c;
+  ptrdiff_t ci_index = c->ci - c->cibase;
 
-  if (c->eidx == 0) return;
-  i = --c->eidx;
+  if (error) { *error = FALSE; }
 
-  /* restrict total call depth of ecall() */
-  if (++mrb->ecall_nest > MRB_ECALL_DEPTH_MAX) {
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
+  MRB_TRY(&c_jmp) {
+    mrb->jmp = &c_jmp;
+    result = body(mrb, userdata);
+    mrb->jmp = prev_jmp;
   }
-  p = c->ensurei;
-  if (!p) return;
-  mrb_assert(!MRB_PROC_CFUNC_P(p));
-  c->ensurei = NULL;
-  nregs = p->upper->body.irep->nregs;
-  if (ci->proc && !MRB_PROC_CFUNC_P(ci->proc) &&
-      ci->proc->body.irep->nregs > nregs) {
-    nregs = ci->proc->body.irep->nregs;
-  }
-  cioff = ci - c->cibase;
-  ci = cipush(mrb);
-  ci->stackent = mrb->c->stack;
-  ci->mid = ci-1.mid;
-  ci->acc = CI_ACC_SKIP;
-  ci->argc = 0;
-  ci->proc = p;
-  ci->target_class = MRB_PROC_TARGET_CLASS(p);
-  env = MRB_PROC_ENV(p);
-  mrb_assert(env);
-  c->stack += nregs;
-  exc = mrb->exc; mrb->exc = 0;
-  if (exc) {
-    mrb_gc_protect(mrb, mrb_obj_value(exc));
-  }
-  if (mrb->c->fib) {
-    mrb_gc_protect(mrb, mrb_obj_value(mrb->c->fib));
-  }
-  mrb_run(mrb, p, env->stack0);
-  mrb->c = c;
-  c->ci = c->cibase + cioff;
-  if (!mrb->exc) mrb->exc = exc;
+  MRB_CATCH(&c_jmp) {
+    mrb->jmp = prev_jmp;
+    result = mrb_obj_value(mrb->exc);
+    mrb->exc = NULL;
+    if (error) { *error = TRUE; }
+    if (mrb->c == c) {
+      while (c->ci - c->cibase > ci_index) {
+        cipop(mrb);
+      }
+    }
+    else {
+      // It was probably switched by mrb_fiber_resume().
+      // Simply destroy all successive CINFO_DIRECTs once the fiber has been switched.
+      c = mrb->c;
+      while (c->ci > c->cibase && c->ci->cci == CINFO_DIRECT) {
+        cipop(mrb);
+      }
+    }
+  }
+  MRB_END_EXC(&c_jmp);
+
   mrb_gc_arena_restore(mrb, ai);
-  mrb->ecall_nest--;
+  mrb_gc_protect(mrb, result);
+  return result;
 }
 
+void mrb_exc_set(mrb_state *mrb, mrb_value exc);
+static mrb_value mrb_run(mrb_state *mrb, const struct RProc* proc, mrb_value self);
+
 #ifndef MRB_FUNCALL_ARGC_MAX
 #define MRB_FUNCALL_ARGC_MAX 16
 #endif
@@ -405,28 +374,106 @@
   return mrb_funcall_argv(mrb, self, mid, argc, argv);
 }
 
-static int
-ci_nregs(mrb_callinfo *ci)
+MRB_API mrb_value
+mrb_funcall_id(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, ...)
 {
-  struct RProc *p;
-  int n = 0;
+  mrb_value argvMRB_FUNCALL_ARGC_MAX;
+  va_list ap;
+  mrb_int i;
+
+  if (argc > MRB_FUNCALL_ARGC_MAX) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "Too long arguments. (limit=" MRB_STRINGIZE(MRB_FUNCALL_ARGC_MAX) ")");
+  }
 
-  if (!ci) return 3;
+  va_start(ap, argc);
+  for (i = 0; i < argc; i++) {
+    argvi = va_arg(ap, mrb_value);
+  }
+  va_end(ap);
+  return mrb_funcall_argv(mrb, self, mid, argc, argv);
+}
+
+static mrb_int
+mrb_ci_kidx(const mrb_callinfo *ci)
+{
+  return (ci->n == CALL_MAXARGS) ? 2 : ci->n + 1;
+}
+
+static mrb_int
+mrb_bidx(uint16_t c)
+{
+  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;
+  return n + 1;                 /* self + args + kargs */
+}
+
+mrb_int
+mrb_ci_bidx(mrb_callinfo *ci)
+{
+  return mrb_bidx(ci->n|(ci->nk<<4));
+}
+
+mrb_int
+mrb_ci_nregs(mrb_callinfo *ci)
+{
+  const struct RProc *p;
+
+  if (!ci) return 4;
+  uint8_t nregs = mrb_ci_bidx(ci) + 1; /* self + args + kargs + blk */
   p = ci->proc;
-  if (!p) {
-    if (ci->argc < 0) return 3;
-    return ci->argc+2;
+  if (p && !MRB_PROC_CFUNC_P(p) && p->body.irep && p->body.irep->nregs > nregs) {
+    return p->body.irep->nregs;
   }
-  if (!MRB_PROC_CFUNC_P(p) && p->body.irep) {
-    n = p->body.irep->nregs;
+  return nregs;
+}
+
+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)
+{
+  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 args;
+  mrb_method_t m;
+
+  /* pack positional arguments */
+  if (n == 15) args = argv0;
+  else args = mrb_ary_new_from_values(mrb, n, argv);
+
+  if (mrb_func_basic_p(mrb, recv, missing, mrb_obj_missing)) {
+  method_missing:
+    if (super) mrb_no_method_error(mrb, mid, args, "no superclass method '%n'", mid);
+    else mrb_method_missing(mrb, mid, recv, args);
+    /* not reached */
+  }
+  if (mid != missing) {
+    *clsp = mrb_class(mrb, recv);
   }
-  if (ci->argc < 0) {
-    if (n < 3) n = 3; /* self + args + blk */
+  m = mrb_method_search_vm(mrb, clsp, missing);
+  if (MRB_METHOD_UNDEF_P(m)) goto method_missing; /* just in case */
+  mrb_stack_extend(mrb, a+4);
+
+  argv = &ci->stacka+1;       /* maybe reallocated */
+  argv0 = args;
+  if (nk == 0) {
+    argv1 = blk;
   }
-  if (ci->argc > n) {
-    n = ci->argc + 2; /* self + blk */
+  else {
+    mrb_assert(nk == 15);
+    argv1 = argvn;
+    argv2 = blk;
   }
-  return n;
+  *c = 15 | (nk<<4);
+  mrb_ary_unshift(mrb, args, mrb_symbol_value(mid));
+  return m;
 }
 
 MRB_API mrb_value
@@ -447,7 +494,6 @@
     }
     MRB_CATCH(&c_jmp) { /* error */
       while (nth_ci < (mrb->c->ci - mrb->c->cibase)) {
-        mrb->c->stack = mrb->c->ci->stackent;
         cipop(mrb);
       }
       mrb->jmp = 0;
@@ -459,55 +505,40 @@
   else {
     mrb_method_t m;
     struct RClass *c;
-    mrb_callinfo *ci;
-    int n = ci_nregs(mrb->c->ci);
+    mrb_callinfo *ci = mrb->c->ci;
+    mrb_int n = mrb_ci_nregs(ci);
     ptrdiff_t voff = -1;
 
-    if (!mrb->c->stack) {
+    if (!mrb->c->stbase) {
       stack_init(mrb);
     }
+    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);
-    if (MRB_METHOD_UNDEF_P(m)) {
-      mrb_sym missing = mrb_intern_lit(mrb, "method_missing");
-      mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
-      m = mrb_method_search_vm(mrb, &c, missing);
-      if (MRB_METHOD_UNDEF_P(m)) {
-        mrb_method_missing(mrb, mid, self, args);
-      }
-      mrb_ary_unshift(mrb, args, mrb_symbol_value(mid));
-      mrb_stack_extend(mrb, n+2);
-      mrb->c->stackn+1 = args;
-      argc = -1;
-    }
-    if (mrb->c->ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) {
-      mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
+    mrb_stack_extend(mrb, n + argc + 3);
+    if (argc >= 15) {
+      ci->stackn+1 = mrb_ary_new_from_values(mrb, argc, argv);
+      argc = 15;
     }
-    ci = cipush(mrb);
-    ci->mid = mid;
-    ci->stackent = mrb->c->stack;
-    ci->argc = (int)argc;
-    ci->target_class = c;
-    mrb->c->stack = mrb->c->stack + n;
-    if (argc < 0) argc = 1;
-    if (mrb->c->stbase <= argv && argv < mrb->c->stend) {
-      voff = argv - mrb->c->stbase;
-    }
-    if (argc >= CALL_MAXARGS) {
-      mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
-
-      mrb->c->stack1 = args;
-      ci->argc = -1;
-      argc = 1;
+    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);
     }
-    mrb_stack_extend(mrb, argc + 2);
+    ci = cipush(mrb, n, 0, c, NULL, mid, argc);
     if (MRB_METHOD_PROC_P(m)) {
       struct RProc *p = MRB_METHOD_PROC(m);
 
-      ci->proc = p;
+      mrb_vm_ci_proc_set(ci, p);
       if (!MRB_PROC_CFUNC_P(p)) {
         mrb_stack_extend(mrb, p->body.irep->nregs + argc);
       }
@@ -515,20 +546,23 @@
     if (voff >= 0) {
       argv = mrb->c->stbase + voff;
     }
-    mrb->c->stack0 = self;
-    if (ci->argc > 0) {
-      stack_copy(mrb->c->stack+1, argv, argc);
+    ci->stack0 = self;
+    if (argc < 15) {
+      if (argc > 0)
+        stack_copy(ci->stack+1, argv, argc);
+      ci->stackargc+1 = blk;
+    }
+    else {
+      ci->stack2 = blk;
     }
-    mrb->c->stackargc+1 = blk;
 
     if (MRB_METHOD_CFUNC_P(m)) {
-      ci->acc = CI_ACC_DIRECT;
+      ci->cci = CINFO_DIRECT;
       val = MRB_METHOD_CFUNC(m)(mrb, self);
-      mrb->c->stack = mrb->c->ci->stackent;
       cipop(mrb);
     }
     else {
-      ci->acc = CI_ACC_SKIP;
+      ci->cci = CINFO_SKIP;
       val = mrb_run(mrb, MRB_METHOD_PROC(m), self);
     }
   }
@@ -543,37 +577,78 @@
   return mrb_funcall_with_block(mrb, self, mid, argc, argv, mrb_nil_value());
 }
 
-mrb_value
-mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p)
+static void
+check_method_noarg(mrb_state *mrb, const mrb_callinfo *ci)
+{
+  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))) {
+      argc++;
+    }
+  }
+  if (argc > 0) {
+    mrb_argnum_error(mrb, argc, 0, 0);
+  }
+}
+
+static mrb_value
+exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p)
 {
   mrb_callinfo *ci = mrb->c->ci;
   int keep, nregs;
 
-  mrb->c->stack0 = self;
-  ci->proc = p;
+  ci->stack0 = self;
+  mrb_vm_ci_proc_set(ci, p);
   if (MRB_PROC_CFUNC_P(p)) {
+    if (MRB_PROC_NOARG_P(p)) {
+      check_method_noarg(mrb, ci);
+    }
     return MRB_PROC_CFUNC(p)(mrb, self);
   }
   nregs = p->body.irep->nregs;
-  if (ci->argc < 0) keep = 3;
-  else keep = ci->argc + 2;
+  keep = mrb_ci_bidx(ci)+1;
   if (nregs < keep) {
     mrb_stack_extend(mrb, keep);
   }
   else {
     mrb_stack_extend(mrb, nregs);
-    stack_clear(mrb->c->stack+keep, nregs-keep);
+    stack_clear(ci->stack+keep, nregs-keep);
   }
 
-  ci = cipush(mrb);
-  ci->target_class = 0;
-  ci->pc = p->body.irep->iseq;
-  ci->stackent = mrb->c->stack;
-  ci->acc = 0;
+  cipush(mrb, 0, 0, NULL, NULL, 0, 0);
 
   return self;
 }
 
+mrb_value
+mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p)
+{
+  mrb_callinfo *ci = mrb->c->ci;
+  if (ci->cci == CINFO_NONE) {
+    return exec_irep(mrb, self, p);
+  }
+  else {
+    mrb_value ret;
+    if (MRB_PROC_CFUNC_P(p)) {
+      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));
+      ret = MRB_PROC_CFUNC(p)(mrb, self);
+      cipop(mrb);
+    }
+    else {
+      int keep = mrb_ci_bidx(ci) + 1; /* receiver + block */
+      ret = mrb_top_run(mrb, p, self, keep);
+    }
+    if (mrb->exc && mrb->jmp) {
+      mrb_exc_raise(mrb, mrb_obj_value(mrb->exc));
+    }
+    return ret;
+  }
+}
+
 /* 15.3.1.3.4  */
 /* 15.3.1.3.44 */
 /*
@@ -597,19 +672,34 @@
 mrb_f_send(mrb_state *mrb, mrb_value self)
 {
   mrb_sym name;
-  mrb_value block, *argv, *regs;
-  mrb_int argc, i, len;
+  mrb_value block, *regs;
   mrb_method_t m;
   struct RClass *c;
-  mrb_callinfo *ci;
+  mrb_callinfo *ci = mrb->c->ci;
+  int n = ci->n;
 
-  mrb_get_args(mrb, "n*&", &name, &argv, &argc, &block);
-  ci = mrb->c->ci;
-  if (ci->acc < 0) {
-  funcall:
+  if (ci->cci > CINFO_NONE) {
+  funcall:;
+    const mrb_value *argv;
+    mrb_int argc;
+    mrb_get_args(mrb, "n*&", &name, &argv, &argc, &block);
     return mrb_funcall_with_block(mrb, self, name, argc, argv, block);
   }
 
+  regs = mrb->c->ci->stack+1;
+
+  if (n == 0) {
+  argnum_error:
+    mrb_argnum_error(mrb, 0, 1, -1);
+  }
+  else if (n == 15) {
+    if (RARRAY_LEN(regs0) == 0) goto argnum_error;
+    name = mrb_obj_to_sym(mrb, RARRAY_PTR(regs0)0);
+  }
+  else {
+    name = mrb_obj_to_sym(mrb, regs0);
+  }
+
   c = mrb_class(mrb, self);
   m = mrb_method_search_vm(mrb, &c, name);
   if (MRB_METHOD_UNDEF_P(m)) {            /* call method_mising */
@@ -617,26 +707,33 @@
   }
 
   ci->mid = name;
-  ci->target_class = c;
-  regs = mrb->c->stack+1;
+  ci->u.target_class = c;
   /* remove first symbol from arguments */
-  if (ci->argc >= 0) {
-    for (i=0,len=ci->argc; i<len; i++) {
+  if (n == 15) {     /* variable length arguments */
+    regs0 = mrb_ary_subseq(mrb, regs0, 1, RARRAY_LEN(regs0) - 1);
+  }
+  else { /* n > 0 */
+    for (int i=0; i<n; i++) {
       regsi = regsi+1;
     }
-    ci->argc--;
-  }
-  else {                     /* variable length arguments */
-    regs0 = mrb_ary_subseq(mrb, regs0, 1, RARRAY_LEN(regs0) - 1);
+    regsn = regsn+1;        /* copy kdict or block */
+    if (ci->nk > 0) {
+      regsn+1 = regsn+2;    /* copy block */
+    }
+    ci->n--;
   }
 
   if (MRB_METHOD_CFUNC_P(m)) {
+    if (MRB_METHOD_NOARG_P(m)) {
+      check_method_noarg(mrb, ci);
+    }
+
     if (MRB_METHOD_PROC_P(m)) {
-      ci->proc = MRB_METHOD_PROC(m);
+      mrb_vm_ci_proc_set(ci, MRB_METHOD_PROC(m));
     }
     return MRB_METHOD_CFUNC(m)(mrb, self);
   }
-  return mrb_exec_irep(mrb, self, MRB_METHOD_PROC(m));
+  return exec_irep(mrb, self, MRB_METHOD_PROC(m));
 }
 
 static mrb_value
@@ -650,32 +747,29 @@
     mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
   }
   ci = mrb->c->ci;
-  if (ci->acc == CI_ACC_DIRECT) {
+  if (ci->cci == CINFO_DIRECT) {
     return mrb_yield_with_class(mrb, blk, 1, &self, self, c);
   }
-  ci->target_class = c;
+  ci->u.target_class = c;
   p = mrb_proc_ptr(blk);
-  ci->proc = p;
-  ci->argc = 1;
+  mrb_vm_ci_proc_set(ci, p);
+  ci->n = 1;
+  ci->nk = 0;
   ci->mid = ci-1.mid;
   if (MRB_PROC_CFUNC_P(p)) {
-    mrb_stack_extend(mrb, 3);
-    mrb->c->stack0 = self;
-    mrb->c->stack1 = self;
-    mrb->c->stack2 = mrb_nil_value();
+    mrb_stack_extend(mrb, 4);
+    mrb->c->ci->stack0 = self;
+    mrb->c->ci->stack1 = self;
+    mrb->c->ci->stack2 = mrb_nil_value();
     return MRB_PROC_CFUNC(p)(mrb, self);
   }
   nregs = p->body.irep->nregs;
-  if (nregs < 3) nregs = 3;
+  if (nregs < 4) nregs = 4;
   mrb_stack_extend(mrb, nregs);
-  mrb->c->stack0 = self;
-  mrb->c->stack1 = self;
-  stack_clear(mrb->c->stack+2, nregs-2);
-  ci = cipush(mrb);
-  ci->target_class = 0;
-  ci->pc = p->body.irep->iseq;
-  ci->stackent = mrb->c->stack;
-  ci->acc = 0;
+  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);
 
   return self;
 }
@@ -740,46 +834,38 @@
   mrb_sym mid = mrb->c->ci->mid;
   mrb_callinfo *ci;
   mrb_value val;
-  int n;
+  mrb_int n;
 
   if (mrb_nil_p(b)) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
   }
   ci = mrb->c->ci;
-  n = ci_nregs(ci);
-  if (ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) {
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
-  }
+  n = mrb_ci_nregs(ci);
   p = mrb_proc_ptr(b);
-  ci = cipush(mrb);
-  ci->mid = mid;
-  ci->proc = p;
-  ci->target_class = c;
-  ci->acc = CI_ACC_SKIP;
-  ci->stackent = mrb->c->stack;
-  mrb->c->stack += n;
+  ci = cipush(mrb, n, CINFO_SKIP, c, p, mid, 0 /* dummy */);
+  ci->nk = 0;
   if (argc >= CALL_MAXARGS) {
-    ci->argc = -1;
+    ci->n = 15;
     n = 3;
   }
   else {
-    ci->argc = (int)argc;
+    ci->n = argc;
     n = argc + 2;
   }
   mrb_stack_extend(mrb, n);
-  mrb->c->stack0 = self;
-  if (ci->argc < 0) {
-    mrb->c->stack1 = mrb_ary_new_from_values(mrb, argc, argv);
+  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->stack+1, argv, argc);
+    stack_copy(mrb->c->ci->stack+1, argv, argc);
   }
-  mrb->c->stackargc+1 = mrb_nil_value();
+  mrb->c->ci->stackargc+1 = mrb_nil_value(); /* clear blk */
 
   if (MRB_PROC_CFUNC_P(p)) {
+    ci->cci = CINFO_DIRECT;
     val = MRB_PROC_CFUNC(p)(mrb, self);
-    mrb->c->stack = mrb->c->ci->stackent;
     cipop(mrb);
   }
   else {
@@ -820,25 +906,66 @@
   p = mrb_proc_ptr(b);
   ci = mrb->c->ci;
 
-  mrb_stack_extend(mrb, 3);
-  mrb->c->stack1 = mrb_ary_new_from_values(mrb, argc, argv);
-  mrb->c->stack2 = mrb_nil_value();
-  ci->argc = -1;
-  return mrb_exec_irep(mrb, self, p);
+  mrb_stack_extend(mrb, 4);
+  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();
+  ci->n = 15;
+  ci->nk = 0;
+  return exec_irep(mrb, self, p);
 }
 
 static struct RBreak*
-break_new(mrb_state *mrb, struct RProc *p, mrb_value val)
+break_new(mrb_state *mrb, uint32_t tag, const struct RProc *p, mrb_value val)
 {
   struct RBreak *brk;
 
-  brk = (struct RBreak*)mrb_obj_alloc(mrb, MRB_TT_BREAK, NULL);
+  brk = MRB_OBJ_ALLOC(mrb, MRB_TT_BREAK, NULL);
   mrb_break_proc_set(brk, p);
   mrb_break_value_set(brk, val);
+  mrb_break_tag_set(brk, tag);
 
   return brk;
 }
 
+#define MRB_CATCH_FILTER_RESCUE (UINT32_C(1) << MRB_CATCH_RESCUE)
+#define MRB_CATCH_FILTER_ENSURE (UINT32_C(1) << MRB_CATCH_ENSURE)
+#define MRB_CATCH_FILTER_ALL    (MRB_CATCH_FILTER_RESCUE | MRB_CATCH_FILTER_ENSURE)
+
+static const struct mrb_irep_catch_handler *
+catch_handler_find(mrb_state *mrb, mrb_callinfo *ci, const mrb_code *pc, uint32_t filter)
+{
+  const mrb_irep *irep;
+  ptrdiff_t xpc;
+  size_t cnt;
+  const struct mrb_irep_catch_handler *e;
+
+/* The comparison operators use `>` and `<=` because pc already points to the next instruction */
+#define catch_cover_p(pc, beg, end) ((pc) > (ptrdiff_t)(beg) && (pc) <= (ptrdiff_t)(end))
+
+  if (ci->proc == NULL || MRB_PROC_CFUNC_P(ci->proc)) return NULL;
+  irep = ci->proc->body.irep;
+  if (irep->clen < 1) return NULL;
+  xpc = pc - irep->iseq;
+  /* If it retry at the top level, pc will be 0, so check with -1 as the start position */
+  mrb_assert(catch_cover_p(xpc, -1, irep->ilen));
+  if (!catch_cover_p(xpc, -1, irep->ilen)) return NULL;
+
+  /* Currently uses a simple linear search to avoid processing complexity. */
+  cnt = irep->clen;
+  e = mrb_irep_catch_handler_table(irep) + cnt - 1;
+  for (; cnt > 0; cnt --, e --) {
+    if (((UINT32_C(1) << e->type) & filter) &&
+        catch_cover_p(xpc, mrb_irep_catch_handler_unpack(e->begin), mrb_irep_catch_handler_unpack(e->end))) {
+      return e;
+    }
+  }
+
+#undef catch_cover_p
+
+  return NULL;
+}
+
 typedef enum {
   LOCALJUMP_ERROR_RETURN = 0,
   LOCALJUMP_ERROR_BREAK = 1,
@@ -866,28 +993,87 @@
 {
   mrb_value exc;
   mrb_value str;
-  mrb_int argc = mrb->c->ci->argc;
+  mrb_int argc = mrb->c->ci->n;
 
-  if (argc < 0) {
-    mrb_value args = mrb->c->stack1;
+  if (argc == 15) {
+    mrb_value args = mrb->c->ci->stack1;
     if (mrb_array_p(args)) {
       argc = RARRAY_LEN(args);
     }
   }
-  if (mrb->c->ci->mid) {
-    str = mrb_format(mrb, "'%n': wrong number of arguments (%i for %i)",
-                     mrb->c->ci->mid, argc, num);
-  }
-  else {
-    str = mrb_format(mrb, "wrong number of arguments (%i for %i)", argc, num);
+  if (argc == 0 && mrb->c->ci->nk != 0 && !mrb_hash_empty_p(mrb, mrb->c->ci->stack1)) {
+    argc++;
   }
+  str = mrb_format(mrb, "wrong number of arguments (given %i, expected %i)", argc, num);
   exc = mrb_exc_new_str(mrb, E_ARGUMENT_ERROR, str);
   mrb_exc_set(mrb, exc);
 }
 
-#define ERR_PC_SET(mrb) mrb->c->ci->err = pc0;
-#define ERR_PC_CLR(mrb) mrb->c->ci->err = 0;
-#ifdef MRB_ENABLE_DEBUG_HOOK
+static mrb_bool
+break_tag_p(struct RBreak *brk, uint32_t tag)
+{
+  return (brk != NULL && brk->tt == MRB_TT_BREAK) ? TRUE : FALSE;
+}
+
+static void
+prepare_tagged_break(mrb_state *mrb, uint32_t tag, const struct RProc *proc, mrb_value val)
+{
+  if (break_tag_p((struct RBreak*)mrb->exc, tag)) {
+    mrb_break_tag_set((struct RBreak*)mrb->exc, tag);
+  }
+  else {
+    mrb->exc = (struct RObject*)break_new(mrb, tag, proc, val);
+  }
+}
+
+#define THROW_TAGGED_BREAK(mrb, tag, proc, val) \
+  do { \
+    prepare_tagged_break(mrb, tag, proc, val); \
+    goto L_CATCH_TAGGED_BREAK; \
+  } while (0)
+
+#define UNWIND_ENSURE(mrb, ci, pc, tag, proc, val) \
+  do { \
+    ch = catch_handler_find(mrb, ci, pc, MRB_CATCH_FILTER_ENSURE); \
+    if (ch) { \
+      THROW_TAGGED_BREAK(mrb, tag, proc, val); \
+    } \
+  } while (0)
+
+/*
+ *  CHECKPOINT_RESTORE(tag) {
+ *    This part is executed when jumping by the same "tag" of RBreak (it is not executed the first time).
+ *    Write the code required (initialization of variables, etc.) for the subsequent processing.
+ *  }
+ *  CHECKPOINT_MAIN(tag) {
+ *    This part is always executed.
+ *  }
+ *  CHECKPOINT_END(tag);
+ *
+ *  ...
+ *
+ *  // Jump to CHECKPOINT_RESTORE with the same "tag".
+ *  goto CHECKPOINT_LABEL_MAKE(tag);
+ */
+
+#define CHECKPOINT_LABEL_MAKE(tag) L_CHECKPOINT_ ## tag
+
+#define CHECKPOINT_RESTORE(tag) \
+  do { \
+    if (FALSE) { \
+      CHECKPOINT_LABEL_MAKE(tag): \
+      do {
+
+#define CHECKPOINT_MAIN(tag) \
+      } while (0); \
+    } \
+    do {
+
+#define CHECKPOINT_END(tag) \
+    } while (0); \
+  } while (0)
+
+#ifdef MRB_USE_DEBUG_HOOK
 #define CODE_FETCH_HOOK(mrb, irep, pc, regs) if ((mrb)->code_fetch_hook) (mrb)->code_fetch_hook((mrb), (irep), (pc), (regs));
 #else
 #define CODE_FETCH_HOOK(mrb, irep, pc, regs)
@@ -899,24 +1085,24 @@
 #define BYTECODE_DECODER(x) (x)
 #endif
 
-#ifndef MRB_DISABLE_DIRECT_THREADING
+#ifndef MRB_NO_DIRECT_THREADING
 #if defined __GNUC__ || defined __clang__ || defined __INTEL_COMPILER
 #define DIRECT_THREADED
 #endif
-#endif /* ifndef MRB_DISABLE_DIRECT_THREADING */
+#endif /* ifndef MRB_NO_DIRECT_THREADING */
 
 #ifndef DIRECT_THREADED
 
 #define INIT_DISPATCH for (;;) { insn = BYTECODE_DECODER(*pc); CODE_FETCH_HOOK(mrb, irep, pc, regs); switch (insn) {
-#define CASE(insn,ops) case insn: pc0=pc++; FETCH_ ## ops ();; L_ ## insn ## _BODY:
-#define NEXT break
+#define CASE(insn,ops) case insn: pc++; FETCH_ ## ops (); mrb->c->ci->pc = pc; L_ ## insn ## _BODY:
+#define NEXT goto L_END_DISPATCH
 #define JUMP NEXT
-#define END_DISPATCH }}
+#define END_DISPATCH L_END_DISPATCH:;}}
 
 #else
 
 #define INIT_DISPATCH JUMP; return mrb_nil_value();
-#define CASE(insn,ops) L_ ## insn: pc0=pc++; FETCH_ ## ops (); L_ ## insn ## _BODY:
+#define CASE(insn,ops) L_ ## insn: pc++; FETCH_ ## ops (); mrb->c->ci->pc = pc; L_ ## insn ## _BODY:
 #define NEXT insn=BYTECODE_DECODER(*pc); CODE_FETCH_HOOK(mrb, irep, pc, regs); goto *optableinsn
 #define JUMP NEXT
 
@@ -925,22 +1111,22 @@
 #endif
 
 MRB_API mrb_value
-mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep)
+mrb_vm_run(mrb_state *mrb, const struct RProc *proc, mrb_value self, mrb_int stack_keep)
 {
-  mrb_irep *irep = proc->body.irep;
+  const mrb_irep *irep = proc->body.irep;
   mrb_value result;
   struct mrb_context *c = mrb->c;
   ptrdiff_t cioff = c->ci - c->cibase;
-  unsigned int nregs = irep->nregs;
+  mrb_int nregs = irep->nregs;
 
-  if (!c->stack) {
+  if (!c->stbase) {
     stack_init(mrb);
   }
   if (stack_keep > nregs)
     nregs = stack_keep;
   mrb_stack_extend(mrb, nregs);
-  stack_clear(c->stack + stack_keep, nregs - stack_keep);
-  c->stack0 = self;
+  stack_clear(c->ci->stack + stack_keep, nregs - stack_keep);
+  c->ci->stack0 = self;
   result = mrb_vm_exec(mrb, proc, irep->iseq);
   if (mrb->c != c) {
     if (mrb->c->fib) {
@@ -954,38 +1140,50 @@
   return result;
 }
 
-static mrb_bool
+static struct RClass*
 check_target_class(mrb_state *mrb)
 {
-  if (!mrb->c->ci->target_class) {
-    mrb_value exc = mrb_exc_new_str_lit(mrb, E_TYPE_ERROR, "no target class or module");
+  struct RClass *target = mrb_vm_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);
-    return FALSE;
   }
-  return TRUE;
+  return target;
 }
 
-void mrb_hash_check_kdict(mrb_state *mrb, mrb_value self);
+static mrb_value
+hash_new_from_values(mrb_state *mrb, mrb_int argc, mrb_value *regs)
+{
+  mrb_value hash = mrb_hash_new_capa(mrb, argc);
+  while (argc--) {
+    mrb_hash_set(mrb, hash, regs0, regs1);
+    regs += 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);
 
 MRB_API mrb_value
-mrb_vm_exec(mrb_state *mrb, struct RProc *proc, const mrb_code *pc)
+mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *pc)
 {
   /* mrb_assert(MRB_PROC_CFUNC_P(proc)) */
-  const mrb_code *pc0 = pc;
-  mrb_irep *irep = proc->body.irep;
-  mrb_value *pool = irep->pool;
-  mrb_sym *syms = irep->syms;
+  const mrb_irep *irep = proc->body.irep;
+  const mrb_pool_value *pool = irep->pool;
+  const mrb_sym *syms = irep->syms;
   mrb_code insn;
   int ai = mrb_gc_arena_save(mrb);
   struct mrb_jmpbuf *prev_jmp = mrb->jmp;
   struct mrb_jmpbuf c_jmp;
   uint32_t a;
   uint16_t b;
-  uint8_t c;
+  uint16_t c;
   mrb_sym mid;
+  const struct mrb_irep_catch_handler *ch;
 
 #ifdef DIRECT_THREADED
-  static void *optable = {
+  static const void * const optable = {
 #define OPCODE(x,_) &&L_OP_ ## x,
 #include "mruby/ops.h"
 #undef OPCODE
@@ -1005,9 +1203,9 @@
     goto L_RAISE;
   }
   mrb->jmp = &c_jmp;
-  mrb->c->ci->proc = proc;
+  mrb_vm_ci_proc_set(mrb->c->ci, proc);
 
-#define regs (mrb->c->stack)
+#define regs (mrb->c->ci->stack)
   INIT_DISPATCH {
     CASE(OP_NOP, Z) {
       /* do nothing */
@@ -1020,27 +1218,45 @@
     }
 
     CASE(OP_LOADL, BB) {
-#ifdef MRB_WORD_BOXING
-      mrb_value val = poolb;
-#ifndef MRB_WITHOUT_FLOAT
-      if (mrb_float_p(val)) {
-        val = mrb_float_value(mrb, mrb_float(val));
-      }
-#endif
-      regsa = val;
+      switch (poolb.tt) {   /* number */
+      case IREP_TT_INT32:
+        regsa = mrb_int_value(mrb, (mrb_int)poolb.u.i32);
+        break;
+      case IREP_TT_INT64:
+#if defined(MRB_INT64)
+        regsa = mrb_int_value(mrb, (mrb_int)poolb.u.i64);
+        break;
 #else
-      regsa = poolb;
+#if defined(MRB_64BIT)
+        if (INT32_MIN <= poolb.u.i64 && poolb.u.i64 <= INT32_MAX) {
+          regsa = mrb_int_value(mrb, (mrb_int)poolb.u.i64);
+          break;
+        }
 #endif
+        goto L_INT_OVERFLOW;
+#endif
+      case IREP_TT_BIGINT:
+        goto L_INT_OVERFLOW;
+#ifndef MRB_NO_FLOAT
+      case IREP_TT_FLOAT:
+        regsa = mrb_float_value(mrb, poolb.u.f);
+        break;
+#endif
+      default:
+        /* should not happen (tt:string) */
+        regsa = mrb_nil_value();
+        break;
+      }
       NEXT;
     }
 
     CASE(OP_LOADI, BB) {
-      SET_INT_VALUE(regsa, b);
+      SET_FIXNUM_VALUE(regsa, b);
       NEXT;
     }
 
     CASE(OP_LOADINEG, BB) {
-      SET_INT_VALUE(regsa, -b);
+      SET_FIXNUM_VALUE(regsa, -b);
       NEXT;
     }
 
@@ -1054,12 +1270,17 @@
     CASE(OP_LOADI_6,B) goto L_LOADI;
     CASE(OP_LOADI_7, B) {
     L_LOADI:
-      SET_INT_VALUE(regsa, (mrb_int)insn - (mrb_int)OP_LOADI_0);
+      SET_FIXNUM_VALUE(regsa, (mrb_int)insn - (mrb_int)OP_LOADI_0);
       NEXT;
     }
 
     CASE(OP_LOADI16, BS) {
-      SET_INT_VALUE(regsa, (mrb_int)(int16_t)b);
+      SET_FIXNUM_VALUE(regsa, (mrb_int)(int16_t)b);
+      NEXT;
+    }
+
+    CASE(OP_LOADI32, BSS) {
+      SET_INT_VALUE(mrb, regsa, (int32_t)(((uint32_t)b<<16)+c));
       NEXT;
     }
 
@@ -1122,9 +1343,7 @@
 
     CASE(OP_GETCV, BB) {
       mrb_value val;
-      ERR_PC_SET(mrb);
       val = mrb_vm_cv_get(mrb, symsb);
-      ERR_PC_CLR(mrb);
       regsa = val;
       NEXT;
     }
@@ -1134,14 +1353,47 @@
       NEXT;
     }
 
-    CASE(OP_GETCONST, BB) {
-      mrb_value val;
-      mrb_sym sym = symsb;
+    CASE(OP_GETIDX, B) {
+      mrb_value va = regsa, vb = regsa+1;
+      switch (mrb_type(va)) {
+      case MRB_TT_ARRAY:
+        if (!mrb_integer_p(vb)) goto getidx_fallback;
+        regsa = mrb_ary_entry(va, mrb_integer(vb));
+        break;
+      case MRB_TT_HASH:
+        va = mrb_hash_get(mrb, va, vb);
+        regsa = va;
+        break;
+      case MRB_TT_STRING:
+        switch (mrb_type(vb)) {
+        case MRB_TT_INTEGER:
+        case MRB_TT_STRING:
+        case MRB_TT_RANGE:
+          va = mrb_str_aref(mrb, va, vb, mrb_undef_value());
+          regsa = va;
+          break;
+        default:
+          goto getidx_fallback;
+        }
+        break;
+      default:
+      getidx_fallback:
+        mid = MRB_OPSYM(aref);
+        goto L_SEND_SYM;
+      }
+      NEXT;
+    }
 
-      ERR_PC_SET(mrb);
-      val = mrb_vm_const_get(mrb, sym);
-      ERR_PC_CLR(mrb);
-      regsa = val;
+    CASE(OP_SETIDX, B) {
+      c = 2;
+      mid = MRB_OPSYM(aset);
+      SET_NIL_VALUE(regsa+3);
+      goto L_SENDB_SYM;
+    }
+
+    CASE(OP_GETCONST, BB) {
+      mrb_value v = mrb_vm_const_get(mrb, symsb);
+      regsa = v;
       NEXT;
     }
 
@@ -1151,12 +1403,8 @@
     }
 
     CASE(OP_GETMCNST, BB) {
-      mrb_value val;
-
-      ERR_PC_SET(mrb);
-      val = mrb_const_get(mrb, regsa, symsb);
-      ERR_PC_CLR(mrb);
-      regsa = val;
+      mrb_value v = mrb_const_get(mrb, regsa, symsb);
+      regsa = v;
       NEXT;
     }
 
@@ -1193,57 +1441,75 @@
     }
 
     CASE(OP_JMP, S) {
-      pc = irep->iseq+a;
+      pc += (int16_t)a;
       JUMP;
     }
     CASE(OP_JMPIF, BS) {
       if (mrb_test(regsa)) {
-        pc = irep->iseq+b;
+        pc += (int16_t)b;
         JUMP;
       }
       NEXT;
     }
     CASE(OP_JMPNOT, BS) {
       if (!mrb_test(regsa)) {
-        pc = irep->iseq+b;
+        pc += (int16_t)b;
         JUMP;
       }
       NEXT;
     }
     CASE(OP_JMPNIL, BS) {
       if (mrb_nil_p(regsa)) {
-        pc = irep->iseq+b;
+        pc += (int16_t)b;
         JUMP;
       }
       NEXT;
     }
 
-    CASE(OP_ONERR, S) {
-      /* check rescue stack */
-      if (mrb->c->ci->ridx == UINT16_MAX-1) {
-        mrb_value exc = mrb_exc_new_str_lit(mrb, E_RUNTIME_ERROR, "too many nested rescues");
-        mrb_exc_set(mrb, exc);
-        goto L_RAISE;
+    CASE(OP_JMPUW, S) {
+      a = (uint32_t)((pc - irep->iseq) + (int16_t)a);
+      CHECKPOINT_RESTORE(RBREAK_TAG_JUMP) {
+        struct RBreak *brk = (struct RBreak*)mrb->exc;
+        mrb_value target = mrb_break_value_get(brk);
+        mrb_assert(mrb_integer_p(target));
+        a = (uint32_t)mrb_integer(target);
+        mrb_assert(a >= 0 && a < irep->ilen);
       }
-      /* expand rescue stack */
-      if (mrb->c->rsize <= mrb->c->ci->ridx) {
-        if (mrb->c->rsize == 0) mrb->c->rsize = RESCUE_STACK_INIT_SIZE;
-        else {
-          mrb->c->rsize *= 2;
-          if (mrb->c->rsize <= mrb->c->ci->ridx) {
-            mrb->c->rsize = UINT16_MAX;
+      CHECKPOINT_MAIN(RBREAK_TAG_JUMP) {
+        ch = catch_handler_find(mrb, mrb->c->ci, pc, MRB_CATCH_FILTER_ENSURE);
+        if (ch) {
+          /* avoiding a jump from a catch handler into the same handler */
+          if (a < mrb_irep_catch_handler_unpack(ch->begin) || a >= mrb_irep_catch_handler_unpack(ch->end)) {
+            THROW_TAGGED_BREAK(mrb, RBREAK_TAG_JUMP, proc, mrb_fixnum_value(a));
           }
         }
-        mrb->c->rescue = (uint16_t*)mrb_realloc(mrb, mrb->c->rescue, sizeof(uint16_t)*mrb->c->rsize);
       }
-      /* push rescue stack */
-      mrb->c->rescuemrb->c->ci->ridx++ = a;
-      NEXT;
+      CHECKPOINT_END(RBREAK_TAG_JUMP);
+
+      mrb->exc = NULL; /* clear break object */
+      pc = irep->iseq + a;
+      JUMP;
     }
 
     CASE(OP_EXCEPT, B) {
-      mrb_value exc = mrb_obj_value(mrb->exc);
-      mrb->exc = 0;
+      mrb_value exc;
+
+      if (mrb->exc == NULL) {
+        exc = mrb_nil_value();
+      }
+      else {
+        switch (mrb->exc->tt) {
+        case MRB_TT_BREAK:
+        case MRB_TT_EXCEPTION:
+          exc = mrb_obj_value(mrb->exc);
+          break;
+        default:
+          mrb_assert(!"bad mrb_type");
+          exc = mrb_nil_value();
+          break;
+        }
+        mrb->exc = NULL;
+      }
       regsa = exc;
       NEXT;
     }
@@ -1260,7 +1526,7 @@
         {
           mrb_value exc;
 
-          exc = mrb_exc_new_str_lit(mrb, E_TYPE_ERROR,
+          exc = mrb_exc_new_lit(mrb, E_TYPE_ERROR,
                                     "class or module required for rescue clause");
           mrb_exc_set(mrb, exc);
           goto L_RAISE;
@@ -1271,192 +1537,113 @@
       NEXT;
     }
 
-    CASE(OP_POPERR, B) {
-      mrb->c->ci->ridx -= a;
-      NEXT;
-    }
-
-    CASE(OP_RAISE, B) {
-      mrb_exc_set(mrb, regsa);
-      goto L_RAISE;
-    }
-
-    CASE(OP_EPUSH, B) {
-      struct RProc *p;
-
-      p = mrb_closure_new(mrb, irep->repsa);
-      /* check ensure stack */
-      if (mrb->c->eidx == UINT16_MAX-1) {
-        mrb_value exc = mrb_exc_new_str_lit(mrb, E_RUNTIME_ERROR, "too many nested ensures");
-        mrb_exc_set(mrb, exc);
-        goto L_RAISE;
+    CASE(OP_RAISEIF, B) {
+      mrb_value exc = regsa;
+      if (mrb_break_p(exc)) {
+        mrb->exc = mrb_obj_ptr(exc);
+        goto L_BREAK;
       }
-      /* expand ensure stack */
-      if (mrb->c->esize <= mrb->c->eidx+1) {
-        if (mrb->c->esize == 0) mrb->c->esize = ENSURE_STACK_INIT_SIZE;
-        else {
-          mrb->c->esize *= 2;
-          if (mrb->c->esize <= mrb->c->eidx) {
-            mrb->c->esize = UINT16_MAX;
-          }
-        }
-        mrb->c->ensure = (struct RProc**)mrb_realloc(mrb, mrb->c->ensure, sizeof(struct RProc*)*mrb->c->esize);
+      mrb_exc_set(mrb, exc);
+      if (mrb->exc) {
+        goto L_RAISE;
       }
-      /* push ensure stack */
-      mrb->c->ensuremrb->c->eidx++ = p;
-      mrb->c->ensuremrb->c->eidx = NULL;
-      mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
 
-    CASE(OP_EPOP, B) {
-      mrb_callinfo *ci = mrb->c->ci;
-      unsigned int n, epos = ci->epos;
-      mrb_value self = regs0;
-      struct RClass *target_class = ci->target_class;
-
-      if (mrb->c->eidx <= epos) {
-        NEXT;
-      }
-
-      if (a > (int)mrb->c->eidx - epos)
-        a = mrb->c->eidx - epos;
-      for (n=0; n<a; n++) {
-        int nregs = irep->nregs;
-
-        proc = mrb->c->ensureepos+n;
-        mrb->c->ensureepos+n = NULL;
-        if (proc == NULL) continue;
-        irep = proc->body.irep;
-        ci = cipush(mrb);
-        ci->mid = ci-1.mid;
-        ci->argc = 0;
-        ci->proc = proc;
-        ci->stackent = mrb->c->stack;
-        ci->target_class = target_class;
-        ci->pc = pc;
-        ci->acc = nregs;
-        mrb->c->stack += ci->acc;
-        mrb_stack_extend(mrb, irep->nregs);
-        regs0 = self;
-        pc = irep->iseq;
-      }
-      pool = irep->pool;
-      syms = irep->syms;
-      mrb->c->eidx = epos;
-      JUMP;
+    CASE(OP_SSEND, BBB) {
+      regsa = regs0;
+      insn = OP_SEND;
     }
+    goto L_SENDB;
 
-    CASE(OP_SENDV, BB) {
-      c = CALL_MAXARGS;
-      goto L_SEND;
-    };
-
-    CASE(OP_SENDVB, BB) {
-      c = CALL_MAXARGS;
-      goto L_SENDB;
-    };
+    CASE(OP_SSENDB, BBB) {
+      regsa = regs0;
+    }
+    goto L_SENDB;
 
     CASE(OP_SEND, BBB)
-    L_SEND:
-    {
-      /* push nil after arguments */
-      int bidx = (c == CALL_MAXARGS) ? a+2 : a+c+1;
-      SET_NIL_VALUE(regsbidx);
-      goto L_SENDB;
-    };
+    goto L_SENDB;
+
     L_SEND_SYM:
-    {
-      /* push nil after arguments */
-      int bidx = (c == CALL_MAXARGS) ? a+2 : a+c+1;
-      SET_NIL_VALUE(regsbidx);
-      goto L_SENDB_SYM;
-    };
+    c = 1;
+    /* push nil after arguments */
+    SET_NIL_VALUE(regsa+2);
+    goto L_SENDB_SYM;
 
     CASE(OP_SENDB, BBB)
     L_SENDB:
     mid = symsb;
     L_SENDB_SYM:
     {
-      int argc = (c == CALL_MAXARGS) ? -1 : c;
-      int bidx = (argc < 0) ? a+2 : a+c+1;
+      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_callinfo *ci = mrb->c->ci;
-      mrb_value recv, blk;
+      mrb_value recv;
 
-      mrb_assert(bidx < irep->nregs);
+      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);
+        regskidx = kdict;
+        nk = 15;
+        c = n | (nk<<4);
+      }
 
-      recv = regsa;
-      blk = regsbidx;
-      if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
-        blk = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
-        /* The stack might have been reallocated during mrb_convert_type(),
-           see #3622 */
-        regsbidx = blk;
+      mrb_assert(bidx < irep->nregs+a);
+      mrb_value blk;
+      mrb_int new_bidx = a+mrb_bidx(c);
+      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 */
+        }
+        regsnew_bidx = blk;
       }
+
+      recv = regsa;
       cls = mrb_class(mrb, recv);
       m = mrb_method_search_vm(mrb, &cls, mid);
       if (MRB_METHOD_UNDEF_P(m)) {
-        mrb_sym missing = mrb_intern_lit(mrb, "method_missing");
-        m = mrb_method_search_vm(mrb, &cls, missing);
-        if (MRB_METHOD_UNDEF_P(m) || (missing == mrb->c->ci->mid && mrb_obj_eq(mrb, regs0, recv))) {
-          mrb_value args = (argc < 0) ? regsa+1 : mrb_ary_new_from_values(mrb, c, regs+a+1);
-          ERR_PC_SET(mrb);
-          mrb_method_missing(mrb, mid, recv, args);
-        }
-        if (argc >= 0) {
-          if (a+2 >= irep->nregs) {
-            mrb_stack_extend(mrb, a+3);
-          }
-          regsa+1 = mrb_ary_new_from_values(mrb, c, regs+a+1);
-          regsa+2 = blk;
-          argc = -1;
-        }
-        mrb_ary_unshift(mrb, regsa+1, mrb_symbol_value(mid));
-        mid = missing;
+        m = prepare_missing(mrb, recv, mid, &cls, a, &c, blk, 0);
+        mid = MRB_SYM(method_missing);
       }
 
       /* push callinfo */
-      ci = cipush(mrb);
-      ci->mid = mid;
-      ci->stackent = mrb->c->stack;
-      ci->target_class = cls;
-      ci->argc = argc;
-
-      ci->pc = pc;
-      ci->acc = a;
-
-      /* prepare stack */
-      mrb->c->stack += a;
+      ci = cipush(mrb, a, 0, cls, NULL, mid, c);
 
       if (MRB_METHOD_CFUNC_P(m)) {
         if (MRB_METHOD_PROC_P(m)) {
           struct RProc *p = MRB_METHOD_PROC(m);
 
-          ci->proc = p;
+          mrb_vm_ci_proc_set(ci, p);
           recv = p->body.func(mrb, recv);
         }
-        else if (MRB_METHOD_NOARG_P(m) &&
-                 (argc > 0 || (argc == -1 && RARRAY_LEN(regs1) != 0))) {
-          argnum_error(mrb, 0);
-          goto L_RAISE;
-        }
         else {
+          if (MRB_METHOD_NOARG_P(m)) {
+            check_method_noarg(mrb, ci);
+          }
           recv = MRB_METHOD_FUNC(m)(mrb, recv);
         }
-        mrb_gc_arena_restore(mrb, ai);
         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) == ci-1.env) {
+          if (p && !MRB_PROC_STRICT_P(p) && MRB_PROC_ENV(p) == mrb_vm_ci_env(&ci-1)) {
             p->flags |= MRB_PROC_ORPHAN;
           }
         }
-        if (!ci->target_class) { /* return from context modifying method (resume/yield) */
-          if (ci->acc == CI_ACC_RESUMED) {
+        if (!ci->u.target_class) { /* return from context modifying method (resume/yield) */
+          if (ci->cci == CINFO_RESUMED) {
             mrb->jmp = prev_jmp;
             return recv;
           }
@@ -1468,34 +1655,31 @@
             syms = irep->syms;
           }
         }
-        mrb->c->stack0 = recv;
+        ci->stack0 = recv;
         /* pop stackpos */
-        mrb->c->stack = ci->stackent;
+        ci = cipop(mrb);
         pc = ci->pc;
-        cipop(mrb);
-        JUMP;
       }
       else {
         /* setup environment for calling method */
-        proc = ci->proc = MRB_METHOD_PROC(m);
+        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, (argc < 0 && irep->nregs < 3) ? 3 : irep->nregs);
+        mrb_stack_extend(mrb, (irep->nregs < 4) ? 4 : irep->nregs);
         pc = irep->iseq;
-        JUMP;
       }
     }
+    JUMP;
 
     CASE(OP_CALL, Z) {
-      mrb_callinfo *ci;
-      mrb_value recv = mrb->c->stack0;
+      mrb_callinfo *ci = mrb->c->ci;
+      mrb_value recv = ci->stack0;
       struct RProc *m = mrb_proc_ptr(recv);
 
       /* replace callinfo */
-      ci = mrb->c->ci;
-      ci->target_class = MRB_PROC_TARGET_CLASS(m);
-      ci->proc = m;
+      ci->u.target_class = MRB_PROC_TARGET_CLASS(m);
+      mrb_vm_ci_proc_set(ci, m);
       if (MRB_PROC_ENV_P(m)) {
         ci->mid = MRB_PROC_ENV(m)->mid;
       }
@@ -1503,57 +1687,46 @@
       /* prepare stack */
       if (MRB_PROC_CFUNC_P(m)) {
         recv = MRB_PROC_CFUNC(m)(mrb, recv);
-        mrb_gc_arena_restore(mrb, ai);
         mrb_gc_arena_shrink(mrb, ai);
         if (mrb->exc) goto L_RAISE;
         /* pop stackpos */
-        ci = mrb->c->ci;
-        mrb->c->stack = ci->stackent;
-        regsci->acc = recv;
+        ci = cipop(mrb);
         pc = ci->pc;
-        cipop(mrb);
+        ci1.stack0 = recv;
         irep = mrb->c->ci->proc->body.irep;
-        pool = irep->pool;
-        syms = irep->syms;
-        JUMP;
       }
       else {
         /* setup environment for calling method */
         proc = m;
         irep = m->body.irep;
         if (!irep) {
-          mrb->c->stack0 = mrb_nil_value();
+          mrb->c->ci->stack0 = mrb_nil_value();
           a = 0;
           c = OP_R_NORMAL;
           goto L_OP_RETURN_BODY;
         }
-        pool = irep->pool;
-        syms = irep->syms;
-        mrb_stack_extend(mrb, irep->nregs);
-        if (ci->argc < 0) {
-          if (irep->nregs > 3) {
-            stack_clear(regs+3, irep->nregs-3);
-          }
-        }
-        else if (ci->argc+2 < irep->nregs) {
-          stack_clear(regs+ci->argc+2, irep->nregs-ci->argc-2);
+        mrb_int nargs = mrb_ci_bidx(ci)+1;
+        if (nargs < irep->nregs) {
+          mrb_stack_extend(mrb, irep->nregs);
+          stack_clear(regs+nargs, irep->nregs-nargs);
         }
         if (MRB_PROC_ENV_P(m)) {
           regs0 = MRB_PROC_ENV(m)->stack0;
         }
         pc = irep->iseq;
-        JUMP;
       }
+      pool = irep->pool;
+      syms = irep->syms;
+      JUMP;
     }
 
     CASE(OP_SUPER, BB) {
-      int argc = (b == CALL_MAXARGS) ? -1 : b;
-      int bidx = (argc < 0) ? a+2 : a+b+1;
       mrb_method_t m;
       struct RClass *cls;
       mrb_callinfo *ci = mrb->c->ci;
+      mrb_int bidx = mrb_bidx(b)+a;
       mrb_value recv, blk;
-      struct RProc *p = ci->proc;
+      const struct RProc *p = ci->proc;
       mrb_sym mid = ci->mid;
       struct RClass* target_class = MRB_PROC_TARGET_CLASS(p);
 
@@ -1562,84 +1735,71 @@
       }
       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_str_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
+        mrb_value exc = mrb_exc_new_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
         mrb_exc_set(mrb, exc);
         goto L_RAISE;
       }
-      if (target_class->tt == MRB_TT_MODULE) {
-        target_class = ci->target_class;
-        if (target_class->tt != MRB_TT_ICLASS) {
-          mrb_value exc = mrb_exc_new_str_lit(mrb, E_RUNTIME_ERROR, "superclass info lost mruby limitations");
-          mrb_exc_set(mrb, exc);
-          goto L_RAISE;
+      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;
         }
       }
       recv = regs0;
       if (!mrb_obj_is_kind_of(mrb, recv, target_class)) {
-        mrb_value exc = mrb_exc_new_str_lit(mrb, E_TYPE_ERROR,
+      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;
       }
-      blk = regsbidx;
       if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
-        blk = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
+        blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
         /* The stack or ci stack might have been reallocated during
-           mrb_convert_type(), see #3622 and #3784 */
+           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)) {
-        mrb_sym missing = mrb_intern_lit(mrb, "method_missing");
-
-        if (mid != missing) {
-          cls = mrb_class(mrb, recv);
-        }
-        m = mrb_method_search_vm(mrb, &cls, missing);
-        if (MRB_METHOD_UNDEF_P(m)) {
-          mrb_value args = (argc < 0) ? regsa+1 : mrb_ary_new_from_values(mrb, b, regs+a+1);
-          ERR_PC_SET(mrb);
-          mrb_method_missing(mrb, mid, recv, args);
-        }
-        mid = missing;
-        if (argc >= 0) {
-          if (a+2 >= irep->nregs) {
-            mrb_stack_extend(mrb, a+3);
-          }
-          regsa+1 = mrb_ary_new_from_values(mrb, b, regs+a+1);
-          regsa+2 = blk;
-          argc = -1;
-        }
-        mrb_ary_unshift(mrb, regsa+1, mrb_symbol_value(ci->mid));
+        m = prepare_missing(mrb, recv, mid, &cls, a, &b, blk, 1);
+        mid = MRB_SYM(method_missing);
       }
 
       /* push callinfo */
-      ci = cipush(mrb);
-      ci->mid = mid;
-      ci->stackent = mrb->c->stack;
-      ci->target_class = cls;
-      ci->pc = pc;
-      ci->argc = argc;
+      ci = cipush(mrb, a, 0, cls, NULL, mid, b);
 
       /* prepare stack */
-      mrb->c->stack += a;
-      mrb->c->stack0 = recv;
+      ci->stack0 = recv;
 
       if (MRB_METHOD_CFUNC_P(m)) {
         mrb_value v;
 
         if (MRB_METHOD_PROC_P(m)) {
-          ci->proc = MRB_METHOD_PROC(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;
-        if (!ci->target_class) { /* return from context modifying method (resume/yield) */
-          if (ci->acc == CI_ACC_RESUMED) {
+        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;
           }
@@ -1651,41 +1811,35 @@
             syms = irep->syms;
           }
         }
-        mrb->c->stack0 = v;
-        /* pop stackpos */
-        mrb->c->stack = ci->stackent;
+        mrb->c->ci->stack0 = v;
+        ci = cipop(mrb);
         pc = ci->pc;
-        cipop(mrb);
-        JUMP;
       }
       else {
-        /* fill callinfo */
-        ci->acc = a;
-
         /* setup environment for calling method */
-        proc = ci->proc = MRB_METHOD_PROC(m);
+        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, (argc < 0 && irep->nregs < 3) ? 3 : irep->nregs);
+        mrb_stack_extend(mrb, (irep->nregs < 4) ? 4 : irep->nregs);
         pc = irep->iseq;
-        JUMP;
       }
+      JUMP;
     }
 
     CASE(OP_ARGARY, BS) {
-      int m1 = (b>>11)&0x3f;
-      int r  = (b>>10)&0x1;
-      int m2 = (b>>5)&0x1f;
-      int kd = (b>>4)&0x1;
-      int lv = (b>>0)&0xf;
+      mrb_int m1 = (b>>11)&0x3f;
+      mrb_int r  = (b>>10)&0x1;
+      mrb_int m2 = (b>>5)&0x1f;
+      mrb_int kd = (b>>4)&0x1;
+      mrb_int lv = (b>>0)&0xf;
       mrb_value *stack;
 
-      if (mrb->c->ci->mid == 0 || mrb->c->ci->target_class == NULL) {
+      if (mrb->c->ci->mid == 0 || mrb_vm_ci_target_class(mrb->c->ci) == NULL) {
         mrb_value exc;
 
       L_NOSUPER:
-        exc = mrb_exc_new_str_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
+        exc = mrb_exc_new_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
         mrb_exc_set(mrb, exc);
         goto L_RAISE;
       }
@@ -1693,25 +1847,25 @@
       else {
         struct REnv *e = uvenv(mrb, lv-1);
         if (!e) goto L_NOSUPER;
-        if (MRB_ENV_LEN(e) <= m1+r+m2+kd+1)
+        if (MRB_ENV_LEN(e) <= m1+r+m2+1)
           goto L_NOSUPER;
         stack = e->stack + 1;
       }
       if (r == 0) {
-        regsa = mrb_ary_new_from_values(mrb, m1+m2+kd, stack);
+        regsa = mrb_ary_new_from_values(mrb, m1+m2, stack);
       }
       else {
         mrb_value *pp = NULL;
         struct RArray *rest;
-        int len = 0;
+        mrb_int len = 0;
 
         if (mrb_array_p(stackm1)) {
           struct RArray *ary = mrb_ary_ptr(stackm1);
 
           pp = ARY_PTR(ary);
-          len = (int)ARY_LEN(ary);
+          len = ARY_LEN(ary);
         }
-        regsa = mrb_ary_new_capa(mrb, m1+len+m2+kd);
+        regsa = mrb_ary_new_capa(mrb, m1+len+m2);
         rest = mrb_ary_ptr(regsa);
         if (m1 > 0) {
           stack_copy(ARY_PTR(rest), stack, m1);
@@ -1722,36 +1876,70 @@
         if (m2 > 0) {
           stack_copy(ARY_PTR(rest)+m1+len, stack+m1+1, m2);
         }
-        if (kd) {
-          stack_copy(ARY_PTR(rest)+m1+len+m2, stack+m1+m2+1, kd);
-        }
-        ARY_SET_LEN(rest, m1+len+m2+kd);
+        ARY_SET_LEN(rest, m1+len+m2);
+      }
+      if (kd) {
+        regsa+1 = stackm1+r+m2;
+        regsa+2 = stackm1+r+m2+1;
+      }
+      else {
+        regsa+1 = stackm1+r+m2;
       }
-      regsa+1 = stackm1+r+m2;
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
 
     CASE(OP_ENTER, W) {
-      int m1 = MRB_ASPEC_REQ(a);
-      int o  = MRB_ASPEC_OPT(a);
-      int r  = MRB_ASPEC_REST(a);
-      int m2 = MRB_ASPEC_POST(a);
-      int kd = (MRB_ASPEC_KEY(a) > 0 || MRB_ASPEC_KDICT(a))? 1 : 0;
+      mrb_int m1 = MRB_ASPEC_REQ(a);
+      mrb_int o  = MRB_ASPEC_OPT(a);
+      mrb_int r  = MRB_ASPEC_REST(a);
+      mrb_int m2 = MRB_ASPEC_POST(a);
+      mrb_int kd = (MRB_ASPEC_KEY(a) > 0 || MRB_ASPEC_KDICT(a))? 1 : 0;
       /* unused
       int b  = MRB_ASPEC_BLOCK(a);
       */
-      int argc = mrb->c->ci->argc;
+      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;
-      int const len = m1 + o + r + m2;
-      int const blk_pos = len + kd + 1;
-      mrb_value *blk = &argvargc < 0 ? 1 : argc;
-      mrb_value kdict;
-      int kargs = kd;
+      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);
+        }
+        ci->nk = 0;
+      }
+      if (kd && MRB_ASPEC_KEY(a) > 0 && mrb_hash_p(kdict)) {
+        kdict = mrb_hash_dup(mrb, kdict);
+      }
 
       /* arguments is passed with Array */
-      if (argc < 0) {
+      if (argc == 15) {
         struct RArray *ary = mrb_ary_ptr(regs1);
         argv = ARY_PTR(ary);
         argc = (int)ARY_LEN(ary);
@@ -1759,8 +1947,8 @@
       }
 
       /* strict argument check */
-      if (mrb->c->ci->proc && MRB_PROC_STRICT_P(mrb->c->ci->proc)) {
-        if (argc < m1 + m2 || (r == 0 && argc > len + kd)) {
+      if (ci->proc && MRB_PROC_STRICT_P(ci->proc)) {
+        if (argc < m1 + m2 || (r == 0 && argc > len)) {
           argnum_error(mrb, m1+m2);
           goto L_RAISE;
         }
@@ -1772,43 +1960,16 @@
         argv = RARRAY_PTR(argv0);
       }
 
-      if (kd) {
-        /* check last arguments is hash if method takes keyword arguments */
-        if (argc == m1+m2) {
-          kdict = mrb_hash_new(mrb);
-          kargs = 0;
-        }
-        else {
-          if (argv && argc > 0 && mrb_hash_p(argvargc-1)) {
-            kdict = argvargc-1;
-            mrb_hash_check_kdict(mrb, kdict);
-          }
-          else if (r || argc <= m1+m2+o
-                   || !(mrb->c->ci->proc && MRB_PROC_STRICT_P(mrb->c->ci->proc))) {
-            kdict = mrb_hash_new(mrb);
-            kargs = 0;
-          }
-          else {
-            argnum_error(mrb, m1+m2);
-            goto L_RAISE;
-          }
-          if (MRB_ASPEC_KEY(a) > 0) {
-            kdict = mrb_hash_dup(mrb, kdict);
-          }
-        }
-      }
-
-      /* no rest arguments */
-      if (argc-kargs < len) {
-        int mlen = m2;
+      /* rest arguments */
+      mrb_value rest = mrb_nil_value();
+      if (argc < len) {
+        mrb_int mlen = m2;
         if (argc < m1+m2) {
           mlen = m1 < argc ? argc - m1 : 0;
         }
-        regsblk_pos = *blk; /* move block */
-        if (kd) regslen + 1 = kdict;
 
         /* copy mandatory and optional arguments */
-        if (argv0 != argv) {
+        if (argv0 != argv && argv) {
           value_move(&regs1, argv, argc-mlen); /* m1 + o */
         }
         if (argc < m1) {
@@ -1821,42 +1982,41 @@
         if (mlen < m2) {
           stack_clear(&regslen-m2+mlen+1, m2-mlen);
         }
-        /* initalize rest arguments with empty Array */
+        /* initialize rest arguments with empty Array */
         if (r) {
-          regsm1+o+1 = mrb_ary_new_capa(mrb, 0);
+          rest = mrb_ary_new_capa(mrb, 0);
+          regsm1+o+1 = rest;
         }
-        /* skip initailizer of passed arguments */
-        if (o > 0 && argc-kargs > m1+m2)
-          pc += (argc - kargs - m1 - m2)*3;
+        /* skip initializer of passed arguments */
+        if (o > 0 && argc > m1+m2)
+          pc += (argc - m1 - m2)*3;
       }
       else {
-        int rnum = 0;
+        mrb_int rnum = 0;
         if (argv0 != argv) {
-          regsblk_pos = *blk; /* move block */
-          if (kd) regslen + 1 = kdict;
           value_move(&regs1, argv, m1+o);
         }
         if (r) {
-          mrb_value ary;
-
-          rnum = argc-m1-o-m2-kargs;
-          ary = mrb_ary_new_from_values(mrb, rnum, argv+m1+o);
-          regsm1+o+1 = ary;
-        }
-        if (m2) {
-          if (argc-m2 > m1) {
-            value_move(&regsm1+o+r+1, &argvm1+o+rnum, m2);
-          }
+          rnum = argc-m1-o-m2;
+          rest = mrb_ary_new_from_values(mrb, rnum, argv+m1+o);
+          regsm1+o+1 = rest;
         }
-        if (argv0 == argv) {
-          regsblk_pos = *blk; /* move block */
-          if (kd) regslen + 1 = kdict;
+        if (m2 > 0 && argc-m2 > m1) {
+          value_move(&regsm1+o+r+1, &argvm1+o+rnum, m2);
         }
         pc += o*3;
       }
 
+      /* need to be update blk first to protect blk from GC */
+      regsblk_pos = blk;              /* move block */
+      if (kd) {
+        if (mrb_nil_p(kdict))
+          kdict = mrb_hash_new_capa(mrb, 0);
+        regskw_pos = kdict;           /* set kwhash */
+      }
+
       /* format arguments for generated code */
-      mrb->c->ci->argc = len + kd;
+      mrb->c->ci->n = len;
 
       /* clear local (but non-argument) variables */
       if (irep->nlocals-blk_pos-1 > 0) {
@@ -1867,24 +2027,27 @@
 
     CASE(OP_KARG, BB) {
       mrb_value k = mrb_symbol_value(symsb);
-      mrb_value kdict = regsmrb->c->ci->argc;
+      mrb_int kidx = mrb_ci_kidx(mrb->c->ci);
+      mrb_value kdict, v;
 
-      if (!mrb_hash_p(kdict) || !mrb_hash_key_p(mrb, kdict, k)) {
+      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;
       }
-      regsa = mrb_hash_get(mrb, kdict, k);
+      v = mrb_hash_get(mrb, kdict, k);
+      regsa = v;
       mrb_hash_delete_key(mrb, kdict, k);
       NEXT;
     }
 
     CASE(OP_KEY_P, BB) {
       mrb_value k = mrb_symbol_value(symsb);
-      mrb_value kdict = regsmrb->c->ci->argc;
+      mrb_int kidx = mrb_ci_kidx(mrb->c->ci);
+      mrb_value kdict;
       mrb_bool key_p = FALSE;
 
-      if (mrb_hash_p(kdict)) {
+      if (kidx >= 0 && mrb_hash_p(kdict=regskidx)) {
         key_p = mrb_hash_key_p(mrb, kdict, k);
       }
       regsa = mrb_bool_value(key_p);
@@ -1892,9 +2055,10 @@
     }
 
     CASE(OP_KEYEND, Z) {
-      mrb_value kdict = regsmrb->c->ci->argc;
+      mrb_int kidx = mrb_ci_kidx(mrb->c->ci);
+      mrb_value kdict;
 
-      if (mrb_hash_p(kdict) && !mrb_hash_empty_p(mrb, kdict)) {
+      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);
@@ -1916,64 +2080,48 @@
     c = OP_R_NORMAL;
     L_RETURN:
     {
-       mrb_callinfo *ci;
-
-#define ecall_adjust() do {\
-  ptrdiff_t cioff = ci - mrb->c->cibase;\
-  ecall(mrb);\
-  ci = mrb->c->cibase + cioff;\
-} while (0)
+      mrb_callinfo *ci;
 
       ci = mrb->c->ci;
       if (ci->mid) {
-        mrb_value blk;
+        mrb_value blk = regsmrb_ci_bidx(ci);
 
-        if (ci->argc < 0) {
-          blk = regs2;
-        }
-        else {
-          blk = regsci->argc+1;
-        }
         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) == ci-1.env) {
+              ci > mrb->c->cibase && MRB_PROC_ENV(p) == mrb_vm_ci_env(&ci-1)) {
             p->flags |= MRB_PROC_ORPHAN;
           }
         }
       }
 
       if (mrb->exc) {
-        mrb_callinfo *ci0;
-
       L_RAISE:
-        ci0 = ci = mrb->c->ci;
+        ci = mrb->c->ci;
         if (ci == mrb->c->cibase) {
-          if (ci->ridx == 0) goto L_FTOP;
-          goto L_RESCUE;
+          ch = catch_handler_find(mrb, ci, pc, MRB_CATCH_FILTER_ALL);
+          if (ch == NULL) goto L_FTOP;
+          goto L_CATCH;
         }
-        while (ci0.ridx == ci-1.ridx) {
-          cipop(mrb);
-          mrb->c->stack = ci->stackent;
-          if (ci->acc == CI_ACC_SKIP && prev_jmp) {
+        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);
           }
-          ci = mrb->c->ci;
+          pc = ci0.pc;
           if (ci == mrb->c->cibase) {
-            if (ci->ridx == 0) {
+            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->stack = mrb->c->stbase;
+                mrb->c->ci->stack = mrb->c->stbase;
                 goto L_STOP;
               }
               else {
                 struct mrb_context *c = mrb->c;
 
-                while (c->eidx > ci->epos) {
-                  ecall_adjust();
-                }
                 c->status = MRB_FIBER_TERMINATED;
                 mrb->c = c->prev;
                 c->prev = NULL;
@@ -1982,29 +2130,23 @@
             }
             break;
           }
-          /* call ensure only when we skip this callinfo */
-          if (ci0.ridx == ci-1.ridx) {
-            while (mrb->c->eidx > ci->epos) {
-              ecall_adjust();
-            }
-          }
         }
-      L_RESCUE:
-        if (ci->ridx == 0) goto L_STOP;
+      L_CATCH:
+        if (ch == NULL) goto L_STOP;
+        if (FALSE) {
+        L_CATCH_TAGGED_BREAK: /* from THROW_TAGGED_BREAK() or UNWIND_ENSURE() */
+          ci = mrb->c->ci;
+        }
         proc = ci->proc;
         irep = proc->body.irep;
         pool = irep->pool;
         syms = irep->syms;
-        if (ci < ci0) {
-          mrb->c->stack = ci1.stackent;
-        }
         mrb_stack_extend(mrb, irep->nregs);
-        pc = irep->iseq+mrb->c->rescue--ci->ridx;
+        pc = irep->iseq + mrb_irep_catch_handler_unpack(ch->target);
       }
       else {
-        int acc;
+        mrb_int acc;
         mrb_value v;
-        struct RProc *dst;
 
         ci = mrb->c->ci;
         v = regsa;
@@ -2012,8 +2154,10 @@
         switch (c) {
         case OP_R_RETURN:
           /* Fall through to OP_R_NORMAL otherwise */
-          if (ci->acc >=0 && MRB_PROC_ENV_P(proc) && !MRB_PROC_STRICT_P(proc)) {
-            mrb_callinfo *cibase = mrb->c->cibase;
+          if (ci->cci == CINFO_NONE && MRB_PROC_ENV_P(proc) && !MRB_PROC_STRICT_P(proc)) {
+            const struct RProc *dst;
+            mrb_callinfo *cibase;
+            cibase = mrb->c->cibase;
             dst = top_proc(mrb, proc);
 
             if (MRB_PROC_ENV_P(dst)) {
@@ -2024,44 +2168,79 @@
                 goto L_RAISE;
               }
             }
+            /* check jump destination */
             while (cibase <= ci && ci->proc != dst) {
-              if (ci->acc < 0) {
+              if (ci->cci > CINFO_NONE) { /* jump cross C boundary */
                 localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
                 goto L_RAISE;
               }
               ci--;
             }
-            if (ci <= cibase) {
+            if (ci <= cibase) { /* no jump destination */
               localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
               goto L_RAISE;
             }
+            ci = mrb->c->ci;
+            while (cibase <= ci && ci->proc != dst) {
+              CHECKPOINT_RESTORE(RBREAK_TAG_RETURN_BLOCK) {
+                cibase = mrb->c->cibase;
+                dst = top_proc(mrb, proc);
+              }
+              CHECKPOINT_MAIN(RBREAK_TAG_RETURN_BLOCK) {
+                UNWIND_ENSURE(mrb, ci, pc, RBREAK_TAG_RETURN_BLOCK, proc, v);
+              }
+              CHECKPOINT_END(RBREAK_TAG_RETURN_BLOCK);
+              ci = cipop(mrb);
+              pc = ci->pc;
+            }
+            proc = ci->proc;
+            mrb->exc = NULL; /* clear break object */
             break;
           }
           /* fallthrough */
         case OP_R_NORMAL:
         NORMAL_RETURN:
           if (ci == mrb->c->cibase) {
-            struct mrb_context *c = mrb->c;
+            struct mrb_context *c;
+            c = mrb->c;
 
             if (!c->prev) { /* toplevel return */
               regsirep->nlocals = v;
-              goto L_STOP;
+              goto CHECKPOINT_LABEL_MAKE(RBREAK_TAG_STOP);
             }
-            if (c->prev->ci == c->prev->cibase) {
-              mrb_value exc = mrb_exc_new_str_lit(mrb, E_FIBER_ERROR, "double resume");
+            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;
             }
-            while (c->eidx > 0) {
-              ecall(mrb);
+            CHECKPOINT_RESTORE(RBREAK_TAG_RETURN_TOPLEVEL) {
+              c = mrb->c;
+            }
+            CHECKPOINT_MAIN(RBREAK_TAG_RETURN_TOPLEVEL) {
+              UNWIND_ENSURE(mrb, ci, pc, RBREAK_TAG_RETURN_TOPLEVEL, proc, v);
             }
+            CHECKPOINT_END(RBREAK_TAG_RETURN_TOPLEVEL);
             /* automatic yield at the end */
             c->status = MRB_FIBER_TERMINATED;
             mrb->c = c->prev;
-            c->prev = NULL;
             mrb->c->status = MRB_FIBER_RUNNING;
+            c->prev = NULL;
+            if (c->vmexec) {
+              mrb_gc_arena_restore(mrb, ai);
+              c->vmexec = FALSE;
+              mrb->jmp = prev_jmp;
+              return v;
+            }
             ci = mrb->c->ci;
           }
+          CHECKPOINT_RESTORE(RBREAK_TAG_RETURN) {
+            /* do nothing */
+          }
+          CHECKPOINT_MAIN(RBREAK_TAG_RETURN) {
+            UNWIND_ENSURE(mrb, ci, pc, RBREAK_TAG_RETURN, proc, v);
+          }
+          CHECKPOINT_END(RBREAK_TAG_RETURN);
+          mrb->exc = NULL; /* clear break object */
           break;
         case OP_R_BREAK:
           if (MRB_PROC_STRICT_P(proc)) goto NORMAL_RETURN;
@@ -2069,7 +2248,7 @@
             mrb_value exc;
 
           L_BREAK_ERROR:
-            exc = mrb_exc_new_str_lit(mrb, E_LOCALJUMP_ERROR,
+            exc = mrb_exc_new_lit(mrb, E_LOCALJUMP_ERROR,
                                       "break from proc-closure");
             mrb_exc_set(mrb, exc);
             goto L_RAISE;
@@ -2084,9 +2263,13 @@
               goto L_BREAK_ERROR;
             }
           }
-          while (mrb->c->eidx > mrb->c->ci->epos) {
-            ecall_adjust();
+          CHECKPOINT_RESTORE(RBREAK_TAG_BREAK) {
+            /* do nothing */
+          }
+          CHECKPOINT_MAIN(RBREAK_TAG_BREAK) {
+            UNWIND_ENSURE(mrb, ci, pc, RBREAK_TAG_BREAK, proc, v);
           }
+          CHECKPOINT_END(RBREAK_TAG_BREAK);
           /* break from fiber block */
           if (ci == mrb->c->cibase && ci->pc) {
             struct mrb_context *c = mrb->c;
@@ -2095,69 +2278,85 @@
             c->prev = NULL;
             ci = mrb->c->ci;
           }
-          if (ci->acc < 0) {
+          if (ci->cci > CINFO_NONE) {
+            ci = cipop(mrb);
             mrb_gc_arena_restore(mrb, ai);
             mrb->c->vmexec = FALSE;
-            mrb->exc = (struct RObject*)break_new(mrb, proc, v);
+            mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, proc, v);
             mrb->jmp = prev_jmp;
             MRB_THROW(prev_jmp);
           }
           if (FALSE) {
+            struct RBreak *brk;
+
           L_BREAK:
-            v = mrb_break_value_get((struct RBreak*)mrb->exc);
-            proc = mrb_break_proc_get((struct RBreak*)mrb->exc);
-            mrb->exc = NULL;
+            brk = (struct RBreak*)mrb->exc;
+            proc = mrb_break_proc_get(brk);
+            v = mrb_break_value_get(brk);
             ci = mrb->c->ci;
+
+            switch (mrb_break_tag_get(brk)) {
+#define DISPATCH_CHECKPOINTS(n, i) case n: goto CHECKPOINT_LABEL_MAKE(n);
+              RBREAK_TAG_FOREACH(DISPATCH_CHECKPOINTS)
+#undef DISPATCH_CHECKPOINTS
+              default:
+                mrb_assert(!"wrong break tag");
+            }
           }
-          mrb->c->stack = ci->stackent;
-          proc = proc->upper;
-          while (mrb->c->cibase < ci &&  ci-1.proc != proc) {
-            if (ci-1.acc == CI_ACC_SKIP) {
-              while (ci < mrb->c->ci) {
-                cipop(mrb);
-              }
+          while (mrb->c->cibase < ci && ci-1.proc != proc->upper) {
+            if (ci-1.cci == CINFO_SKIP) {
               goto L_BREAK_ERROR;
             }
-            ci--;
+            CHECKPOINT_RESTORE(RBREAK_TAG_BREAK_UPPER) {
+              /* do nothing */
+            }
+            CHECKPOINT_MAIN(RBREAK_TAG_BREAK_UPPER) {
+              UNWIND_ENSURE(mrb, ci, pc, RBREAK_TAG_BREAK_UPPER, proc, v);
+            }
+            CHECKPOINT_END(RBREAK_TAG_BREAK_UPPER);
+            ci = cipop(mrb);
+            pc = ci->pc;
+          }
+          CHECKPOINT_RESTORE(RBREAK_TAG_BREAK_INTARGET) {
+            /* do nothing */
           }
+          CHECKPOINT_MAIN(RBREAK_TAG_BREAK_INTARGET) {
+            UNWIND_ENSURE(mrb, ci, pc, RBREAK_TAG_BREAK_INTARGET, proc, v);
+          }
+          CHECKPOINT_END(RBREAK_TAG_BREAK_INTARGET);
           if (ci == mrb->c->cibase) {
             goto L_BREAK_ERROR;
           }
+          mrb->exc = NULL; /* clear break object */
           break;
         default:
           /* cannot happen */
           break;
         }
-        while (ci < mrb->c->ci) {
-          cipop(mrb);
-        }
-        ci0.ridx = ci-1.ridx;
-        while (mrb->c->eidx > ci->epos) {
-          ecall_adjust();
-        }
-        if (mrb->c->vmexec && !ci->target_class) {
+        mrb_assert(ci == mrb->c->ci);
+        mrb_assert(mrb->exc == NULL);
+
+        if (mrb->c->vmexec && !mrb_vm_ci_target_class(ci)) {
           mrb_gc_arena_restore(mrb, ai);
           mrb->c->vmexec = FALSE;
           mrb->jmp = prev_jmp;
           return v;
         }
-        acc = ci->acc;
-        mrb->c->stack = ci->stackent;
-        cipop(mrb);
-        if (acc == CI_ACC_SKIP || acc == CI_ACC_DIRECT) {
+        acc = ci->cci;
+        ci = cipop(mrb);
+        if (acc == CINFO_SKIP || acc == CINFO_DIRECT) {
           mrb_gc_arena_restore(mrb, ai);
           mrb->jmp = prev_jmp;
           return v;
         }
         pc = ci->pc;
-        ci = mrb->c->ci;
         DEBUG(fprintf(stderr, "from :%s\n", mrb_sym_name(mrb, ci->mid)));
-        proc = mrb->c->ci->proc;
+        proc = ci->proc;
         irep = proc->body.irep;
         pool = irep->pool;
         syms = irep->syms;
 
-        regsacc = v;
+        ci1.stack0 = v;
         mrb_gc_arena_restore(mrb, ai);
       }
       JUMP;
@@ -2181,7 +2380,7 @@
         }
         stack = e->stack + 1;
       }
-      if (mrb_nil_p(stackm1+r+m2)) {
+      if (mrb_nil_p(stackm1+r+m2+kd)) {
         localjump_error(mrb, LOCALJUMP_ERROR_YIELD);
         goto L_RAISE;
       }
@@ -2189,34 +2388,39 @@
       NEXT;
     }
 
+  L_INT_OVERFLOW:
+    {
+      mrb_value exc = mrb_exc_new_lit(mrb, E_RANGE_ERROR, "integer overflow");
+      mrb_exc_set(mrb, exc);
+    }
+    goto L_RAISE;
+
 #define TYPES2(a,b) ((((uint16_t)(a))<<8)|(((uint16_t)(b))&0xff))
 #define OP_MATH(op_name)                                                    \
   /* need to check if op is overridden */                                   \
   switch (TYPES2(mrb_type(regsa),mrb_type(regsa+1))) {                  \
-    OP_MATH_CASE_FIXNUM(op_name);                                           \
-    OP_MATH_CASE_FLOAT(op_name, fixnum, float);                             \
-    OP_MATH_CASE_FLOAT(op_name, float,  fixnum);                            \
+    OP_MATH_CASE_INTEGER(op_name);                                          \
+    OP_MATH_CASE_FLOAT(op_name, integer, float);                            \
+    OP_MATH_CASE_FLOAT(op_name, float,  integer);                           \
     OP_MATH_CASE_FLOAT(op_name, float,  float);                             \
     OP_MATH_CASE_STRING_##op_name();                                        \
     default:                                                                \
-      c = 1;                                                                \
-      mid = mrb_intern_lit(mrb, MRB_STRINGIZE(OP_MATH_OP_##op_name));       \
+      mid = MRB_OPSYM(op_name);                                             \
       goto L_SEND_SYM;                                                      \
   }                                                                         \
   NEXT;
-#define OP_MATH_CASE_FIXNUM(op_name)                                        \
-  case TYPES2(MRB_TT_FIXNUM, MRB_TT_FIXNUM):                                \
+#define OP_MATH_CASE_INTEGER(op_name)                                       \
+  case TYPES2(MRB_TT_INTEGER, MRB_TT_INTEGER):                              \
     {                                                                       \
-      mrb_int x = mrb_fixnum(regsa), y = mrb_fixnum(regsa+1), z;        \
+      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(op_name, x, y, z);                             \
+        OP_MATH_OVERFLOW_INT();                                             \
       else                                                                  \
-        SET_INT_VALUE(regsa, z);                                          \
+        SET_INT_VALUE(mrb,regsa, z);                                      \
     }                                                                       \
     break
-#ifdef MRB_WITHOUT_FLOAT
+#ifdef MRB_NO_FLOAT
 #define OP_MATH_CASE_FLOAT(op_name, t1, t2) (void)0
-#define OP_MATH_OVERFLOW_INT(op_name, x, y, z) SET_INT_VALUE(regsa, z)
 #else
 #define OP_MATH_CASE_FLOAT(op_name, t1, t2)                                     \
   case TYPES2(OP_MATH_TT_##t1, OP_MATH_TT_##t2):                                \
@@ -2225,9 +2429,8 @@
       SET_FLOAT_VALUE(mrb, regsa, z);                                         \
     }                                                                           \
     break
-#define OP_MATH_OVERFLOW_INT(op_name, x, y, z) \
-  SET_FLOAT_VALUE(mrb, regsa, (mrb_float)x OP_MATH_OP_##op_name (mrb_float)y)
 #endif
+#define OP_MATH_OVERFLOW_INT() goto L_INT_OVERFLOW
 #define OP_MATH_CASE_STRING_add()                                           \
   case TYPES2(MRB_TT_STRING, MRB_TT_STRING):                                \
     regsa = mrb_str_plus(mrb, regsa, regsa+1);                        \
@@ -2238,8 +2441,8 @@
 #define OP_MATH_OP_add +
 #define OP_MATH_OP_sub -
 #define OP_MATH_OP_mul *
-#define OP_MATH_TT_fixnum MRB_TT_FIXNUM
-#define OP_MATH_TT_float  MRB_TT_FLOAT
+#define OP_MATH_TT_integer MRB_TT_INTEGER
+#define OP_MATH_TT_float   MRB_TT_FLOAT
 
     CASE(OP_ADD, B) {
       OP_MATH(add);
@@ -2254,31 +2457,28 @@
     }
 
     CASE(OP_DIV, B) {
-#ifndef MRB_WITHOUT_FLOAT
-      double x, y, f;
+#ifndef MRB_NO_FLOAT
+      mrb_float x, y, f;
 #endif
 
       /* need to check if op is overridden */
       switch (TYPES2(mrb_type(regsa),mrb_type(regsa+1))) {
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
-#ifdef MRB_WITHOUT_FLOAT
+      case TYPES2(MRB_TT_INTEGER,MRB_TT_INTEGER):
         {
-          mrb_int x = mrb_fixnum(regsa);
-          mrb_int y = mrb_fixnum(regsa+1);
-          SET_INT_VALUE(regsa, y ? x / y : 0);
+          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);
         }
-        break;
-#else
-        x = (mrb_float)mrb_fixnum(regsa);
-        y = (mrb_float)mrb_fixnum(regsa+1);
-        break;
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):
-        x = (mrb_float)mrb_fixnum(regsa);
+        NEXT;
+#ifndef MRB_NO_FLOAT
+      case TYPES2(MRB_TT_INTEGER,MRB_TT_FLOAT):
+        x = (mrb_float)mrb_integer(regsa);
         y = mrb_float(regsa+1);
         break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):
+      case TYPES2(MRB_TT_FLOAT,MRB_TT_INTEGER):
         x = mrb_float(regsa);
-        y = (mrb_float)mrb_fixnum(regsa+1);
+        y = (mrb_float)mrb_integer(regsa+1);
         break;
       case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):
         x = mrb_float(regsa);
@@ -2286,20 +2486,12 @@
         break;
 #endif
       default:
-        c = 1;
-        mid = mrb_intern_lit(mrb, "/");
+        mid = MRB_OPSYM(div);
         goto L_SEND_SYM;
       }
 
-#ifndef MRB_WITHOUT_FLOAT
-      if (y == 0) {
-        if (x > 0) f = INFINITY;
-        else if (x < 0) f = -INFINITY;
-        else /* if (x == 0) */ f = NAN;
-      }
-      else {
-        f = x / y;
-      }
+#ifndef MRB_NO_FLOAT
+      f = mrb_div_float(x, y);
       SET_FLOAT_VALUE(mrb, regsa, f);
 #endif
       NEXT;
@@ -2308,26 +2500,25 @@
 #define OP_MATHI(op_name)                                                   \
   /* need to check if op is overridden */                                   \
   switch (mrb_type(regsa)) {                                              \
-    OP_MATHI_CASE_FIXNUM(op_name);                                          \
+    OP_MATHI_CASE_INTEGER(op_name);                                         \
     OP_MATHI_CASE_FLOAT(op_name);                                           \
     default:                                                                \
-      SET_INT_VALUE(regsa+1, b);                                          \
-      c = 1;                                                                \
-      mid = mrb_intern_lit(mrb, MRB_STRINGIZE(OP_MATH_OP_##op_name));       \
+      SET_INT_VALUE(mrb,regsa+1, b);                                      \
+      mid = MRB_OPSYM(op_name);                                             \
       goto L_SEND_SYM;                                                      \
   }                                                                         \
   NEXT;
-#define OP_MATHI_CASE_FIXNUM(op_name)                                       \
-  case MRB_TT_FIXNUM:                                                       \
+#define OP_MATHI_CASE_INTEGER(op_name)                                      \
+  case MRB_TT_INTEGER:                                                      \
     {                                                                       \
-      mrb_int x = mrb_fixnum(regsa), y = (mrb_int)b, z;                   \
+      mrb_int x = mrb_integer(regsa), y = (mrb_int)b, z;                  \
       if (mrb_int_##op_name##_overflow(x, y, &z))                           \
-        OP_MATH_OVERFLOW_INT(op_name, x, y, z);                             \
+        OP_MATH_OVERFLOW_INT();                                             \
       else                                                                  \
-        SET_INT_VALUE(regsa, z);                                          \
+        SET_INT_VALUE(mrb,regsa, z);                                      \
     }                                                                       \
     break
-#ifdef MRB_WITHOUT_FLOAT
+#ifdef MRB_NO_FLOAT
 #define OP_MATHI_CASE_FLOAT(op_name) (void)0
 #else
 #define OP_MATHI_CASE_FLOAT(op_name)                                        \
@@ -2349,17 +2540,16 @@
 
 #define OP_CMP_BODY(op,v1,v2) (v1(regsa) op v2(regsa+1))
 
-#ifdef MRB_WITHOUT_FLOAT
-#define OP_CMP(op) do {\
+#ifdef MRB_NO_FLOAT
+#define OP_CMP(op,sym) do {\
   int result;\
   /* need to check if - is overridden */\
   switch (TYPES2(mrb_type(regsa),mrb_type(regsa+1))) {\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):\
+  case TYPES2(MRB_TT_INTEGER,MRB_TT_INTEGER):\
     result = OP_CMP_BODY(op,mrb_fixnum,mrb_fixnum);\
     break;\
   default:\
-    c = 1;\
-    mid = mrb_intern_lit(mrb, # op);\
+    mid = MRB_OPSYM(sym);\
     goto L_SEND_SYM;\
   }\
   if (result) {\
@@ -2370,25 +2560,24 @@
   }\
 } while(0)
 #else
-#define OP_CMP(op) do {\
+#define OP_CMP(op, sym) do {\
   int result;\
   /* need to check if - is overridden */\
   switch (TYPES2(mrb_type(regsa),mrb_type(regsa+1))) {\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):\
+  case TYPES2(MRB_TT_INTEGER,MRB_TT_INTEGER):\
     result = OP_CMP_BODY(op,mrb_fixnum,mrb_fixnum);\
     break;\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):\
+  case TYPES2(MRB_TT_INTEGER,MRB_TT_FLOAT):\
     result = OP_CMP_BODY(op,mrb_fixnum,mrb_float);\
     break;\
-  case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):\
+  case TYPES2(MRB_TT_FLOAT,MRB_TT_INTEGER):\
     result = OP_CMP_BODY(op,mrb_float,mrb_fixnum);\
     break;\
   case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):\
     result = OP_CMP_BODY(op,mrb_float,mrb_float);\
     break;\
   default:\
-    c = 1;\
-    mid = mrb_intern_lit(mrb, # op);\
+    mid = MRB_OPSYM(sym);\
     goto L_SEND_SYM;\
   }\
   if (result) {\
@@ -2405,40 +2594,38 @@
         SET_TRUE_VALUE(regsa);
       }
       else {
-        OP_CMP(==);
+        OP_CMP(==,eq);
       }
       NEXT;
     }
 
     CASE(OP_LT, B) {
-      OP_CMP(<);
+      OP_CMP(<,lt);
       NEXT;
     }
 
     CASE(OP_LE, B) {
-      OP_CMP(<=);
+      OP_CMP(<=,le);
       NEXT;
     }
 
     CASE(OP_GT, B) {
-      OP_CMP(>);
+      OP_CMP(>,gt);
       NEXT;
     }
 
     CASE(OP_GE, B) {
-      OP_CMP(>=);
+      OP_CMP(>=,ge);
       NEXT;
     }
 
     CASE(OP_ARRAY, BB) {
-      mrb_value v = mrb_ary_new_from_values(mrb, b, &regsa);
-      regsa = v;
+      regsa = mrb_ary_new_from_values(mrb, b, &regsa);
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
     CASE(OP_ARRAY2, BBB) {
-      mrb_value v = mrb_ary_new_from_values(mrb, c, &regsb);
-      regsa = v;
+      regsa = mrb_ary_new_from_values(mrb, c, &regsb);
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
@@ -2449,14 +2636,18 @@
         regsa = splat;
       }
       else {
+        mrb_assert(mrb_type(regsa) == MRB_TT_ARRAY);
         mrb_ary_concat(mrb, regsa, splat);
       }
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
 
-    CASE(OP_ARYPUSH, B) {
-      mrb_ary_push(mrb, regsa, regsa+1);
+    CASE(OP_ARYPUSH, BB) {
+      mrb_assert(mrb_type(regsa) == MRB_TT_ARRAY);
+      for (mrb_int i=0; i<b; i++) {
+        mrb_ary_push(mrb, regsa, regsa+i+1);
+      }
       NEXT;
     }
 
@@ -2491,6 +2682,7 @@
     }
 
     CASE(OP_ASET, BBB) {
+      mrb_assert(mrb_type(regsb) == MRB_TT_ARRAY);
       mrb_ary_set(mrb, regsb, c, regsa);
       NEXT;
     }
@@ -2533,14 +2725,36 @@
       mrb_sym sym = mrb_intern_str(mrb, regsa);
 
       regsa = mrb_symbol_value(sym);
-      mrb_gc_arena_restore(mrb, ai);
+      NEXT;
+    }
+
+    CASE(OP_SYMBOL, BB) {
+      size_t len;
+      mrb_sym sym;
+
+      mrb_assert((poolb.tt&IREP_TT_NFLAG)==0);
+      len = poolb.tt >> 2;
+      if (poolb.tt & IREP_TT_SFLAG) {
+        sym = mrb_intern_static(mrb, poolb.u.str, len);
+      }
+      else {
+        sym  = mrb_intern(mrb, poolb.u.str, len);
+      }
+      regsa = mrb_symbol_value(sym);
       NEXT;
     }
 
     CASE(OP_STRING, BB) {
-      mrb_value str = mrb_str_dup(mrb, poolb);
+      size_t len;
 
-      regsa = str;
+      mrb_assert((poolb.tt&IREP_TT_NFLAG)==0);
+      len = poolb.tt >> 2;
+      if (poolb.tt & IREP_TT_SFLAG) {
+        regsa = mrb_str_new_static(mrb, poolb.u.str, len);
+      }
+      else {
+        regsa = mrb_str_new(mrb, poolb.u.str, len);
+      }
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
@@ -2568,7 +2782,8 @@
       int i;
       int lim = a+b*2+1;
 
-      hash = mrb_ensure_hash_type(mrb, regsa);
+      hash = regsa;
+      mrb_ensure_hash_type(mrb, hash);
       for (i=a+1; i<lim; i+=2) {
         mrb_hash_set(mrb, hash, regsi, regsi+1);
       }
@@ -2576,8 +2791,9 @@
       NEXT;
     }
     CASE(OP_HASHCAT, B) {
-      mrb_value hash = mrb_ensure_hash_type(mrb, regsa);
+      mrb_value hash = regsa;
 
+      mrb_ensure_hash_type(mrb, hash);
       mrb_hash_merge(mrb, hash, regsa+1);
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
@@ -2588,7 +2804,7 @@
     L_MAKE_LAMBDA:
     {
       struct RProc *p;
-      mrb_irep *nirep = irep->repsb;
+      const mrb_irep *nirep = irep->repsb;
 
       if (c & OP_L_CAPTURE) {
         p = mrb_closure_new(mrb, nirep);
@@ -2612,15 +2828,15 @@
     }
 
     CASE(OP_RANGE_INC, B) {
-      mrb_value val = mrb_range_new(mrb, regsa, regsa+1, FALSE);
-      regsa = val;
+      mrb_value v = mrb_range_new(mrb, regsa, regsa+1, FALSE);
+      regsa = v;
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
 
     CASE(OP_RANGE_EXC, B) {
-      mrb_value val = mrb_range_new(mrb, regsa, regsa+1, TRUE);
-      regsa = val;
+      mrb_value v = mrb_range_new(mrb, regsa, regsa+1, TRUE);
+      regsa = v;
       mrb_gc_arena_restore(mrb, ai);
       NEXT;
     }
@@ -2639,6 +2855,7 @@
       super = regsa+1;
       if (mrb_nil_p(base)) {
         baseclass = MRB_PROC_TARGET_CLASS(mrb->c->ci->proc);
+        if (!baseclass) baseclass = mrb->object_class;
         base = mrb_obj_value(baseclass);
       }
       c = mrb_vm_define_class(mrb, base, super, id);
@@ -2655,6 +2872,7 @@
       base = regsa;
       if (mrb_nil_p(base)) {
         baseclass = MRB_PROC_TARGET_CLASS(mrb->c->ci->proc);
+        if (!baseclass) baseclass = mrb->object_class;
         base = mrb_obj_value(baseclass);
       }
       cls = mrb_vm_define_module(mrb, base, id);
@@ -2663,11 +2881,11 @@
       NEXT;
     }
 
-    CASE(OP_EXEC, BB) {
-      mrb_callinfo *ci;
+    CASE(OP_EXEC, BB)
+    {
       mrb_value recv = regsa;
       struct RProc *p;
-      mrb_irep *nirep = irep->repsb;
+      const mrb_irep *nirep = irep->repsb;
 
       /* prepare closure */
       p = mrb_proc_new(mrb, nirep);
@@ -2677,19 +2895,7 @@
       p->flags |= MRB_PROC_SCOPE;
 
       /* prepare call stack */
-      ci = cipush(mrb);
-      ci->pc = pc;
-      ci->acc = a;
-      ci->mid = 0;
-      ci->stackent = mrb->c->stack;
-      ci->argc = 0;
-      ci->target_class = mrb_class_ptr(recv);
-
-      /* prepare stack */
-      mrb->c->stack += a;
-
-      /* setup block to call */
-      ci->proc = p;
+      cipush(mrb, a, 0, mrb_class_ptr(recv), p, 0, 0);
 
       irep = p->body.irep;
       pool = irep->pool;
@@ -2704,10 +2910,13 @@
       struct RClass *target = mrb_class_ptr(regsa);
       struct RProc *p = mrb_proc_ptr(regsa+1);
       mrb_method_t m;
+      mrb_sym mid = symsb;
 
       MRB_METHOD_FROM_PROC(m, p);
-      mrb_define_method_raw(mrb, target, symsb, m);
+      mrb_define_method_raw(mrb, target, mid, m);
+      mrb_method_added(mrb, target, mid);
       mrb_gc_arena_restore(mrb, ai);
+      regsa = mrb_symbol_value(mid);
       NEXT;
     }
 
@@ -2718,34 +2927,34 @@
     }
 
     CASE(OP_TCLASS, B) {
-      if (!check_target_class(mrb)) goto L_RAISE;
-      regsa = mrb_obj_value(mrb->c->ci->target_class);
+      struct RClass *target = check_target_class(mrb);
+      if (!target) goto L_RAISE;
+      regsa = mrb_obj_value(target);
       NEXT;
     }
 
     CASE(OP_ALIAS, BB) {
-      struct RClass *target;
+      struct RClass *target = check_target_class(mrb);
 
-      if (!check_target_class(mrb)) goto L_RAISE;
-      target = mrb->c->ci->target_class;
+      if (!target) goto L_RAISE;
       mrb_alias_method(mrb, target, symsa, symsb);
+      mrb_method_added(mrb, target, symsa);
       NEXT;
     }
     CASE(OP_UNDEF, B) {
-      struct RClass *target;
+      struct RClass *target = check_target_class(mrb);
 
-      if (!check_target_class(mrb)) goto L_RAISE;
-      target = mrb->c->ci->target_class;
+      if (!target) goto L_RAISE;
       mrb_undef_method_id(mrb, target, symsa);
       NEXT;
     }
 
     CASE(OP_DEBUG, Z) {
       FETCH_BBB();
-#ifdef MRB_ENABLE_DEBUG_HOOK
+#ifdef MRB_USE_DEBUG_HOOK
       mrb->debug_op_hook(mrb, irep, pc, regs);
 #else
-#ifndef MRB_DISABLE_STDIO
+#ifndef MRB_NO_STDIO
       printf("OP_DEBUG %d %d %d\n", a, b, c);
 #else
       abort();
@@ -2755,11 +2964,11 @@
     }
 
     CASE(OP_ERR, B) {
-      mrb_value msg = mrb_str_dup(mrb, poola);
+      size_t len = poola.tt >> 2;
       mrb_value exc;
 
-      exc = mrb_exc_new_str(mrb, E_LOCALJUMP_ERROR, msg);
-      ERR_PC_SET(mrb);
+      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;
     }
@@ -2767,7 +2976,7 @@
     CASE(OP_EXT1, Z) {
       insn = READ_B();
       switch (insn) {
-#define OPCODE(insn,ops) case OP_ ## insn: FETCH_ ## ops ## _1(); goto L_OP_ ## insn ## _BODY;
+#define OPCODE(insn,ops) case OP_ ## insn: FETCH_ ## ops ## _1(); mrb->c->ci->pc = pc; goto L_OP_ ## insn ## _BODY;
 #include "mruby/ops.h"
 #undef OPCODE
       }
@@ -2777,7 +2986,7 @@
     CASE(OP_EXT2, Z) {
       insn = READ_B();
       switch (insn) {
-#define OPCODE(insn,ops) case OP_ ## insn: FETCH_ ## ops ## _2(); goto L_OP_ ## insn ## _BODY;
+#define OPCODE(insn,ops) case OP_ ## insn: FETCH_ ## ops ## _2(); mrb->c->ci->pc = pc; goto L_OP_ ## insn ## _BODY;
 #include "mruby/ops.h"
 #undef OPCODE
       }
@@ -2787,7 +2996,7 @@
     CASE(OP_EXT3, Z) {
       uint8_t insn = READ_B();
       switch (insn) {
-#define OPCODE(insn,ops) case OP_ ## insn: FETCH_ ## ops ## _3(); goto L_OP_ ## insn ## _BODY;
+#define OPCODE(insn,ops) case OP_ ## insn: FETCH_ ## ops ## _3(); mrb->c->ci->pc = pc; goto L_OP_ ## insn ## _BODY;
 #include "mruby/ops.h"
 #undef OPCODE
       }
@@ -2797,14 +3006,17 @@
 
     CASE(OP_STOP, Z) {
       /*        stop VM */
-    L_STOP:
-      while (mrb->c->eidx > 0) {
-        ecall(mrb);
+      CHECKPOINT_RESTORE(RBREAK_TAG_STOP) {
+        /* do nothing */
+      }
+      CHECKPOINT_MAIN(RBREAK_TAG_STOP) {
+        UNWIND_ENSURE(mrb, mrb->c->ci, pc, RBREAK_TAG_STOP, proc, mrb_nil_value());
       }
-      mrb->c->cibase->ridx = 0;
-      ERR_PC_CLR(mrb);
+      CHECKPOINT_END(RBREAK_TAG_STOP);
+    L_STOP:
       mrb->jmp = prev_jmp;
       if (mrb->exc) {
+        mrb_assert(mrb->exc->tt == MRB_TT_EXCEPTION);
         return mrb_obj_value(mrb->exc);
       }
       return regsirep->nlocals;
@@ -2814,52 +3026,47 @@
 #undef regs
   }
   MRB_CATCH(&c_jmp) {
+    mrb_callinfo *ci = mrb->c->ci;
+    while (ci > mrb->c->cibase && ci->cci == CINFO_DIRECT) {
+      ci = cipop(mrb);
+    }
     exc_catched = TRUE;
+    pc = ci->pc;
     goto RETRY_TRY_BLOCK;
   }
   MRB_END_EXC(&c_jmp);
 }
 
 static mrb_value
-mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
+mrb_run(mrb_state *mrb, const struct RProc *proc, mrb_value self)
 {
-  if (mrb->c->ci->argc < 0) {
-    return mrb_vm_run(mrb, proc, self, 3); /* receiver, args and block) */
-  }
-  else {
-    return mrb_vm_run(mrb, proc, self, mrb->c->ci->argc + 2); /* argc + 2 (receiver and block) */
-  }
+  return mrb_vm_run(mrb, proc, self, mrb_ci_bidx(mrb->c->ci) + 1);
 }
 
 MRB_API mrb_value
-mrb_top_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep)
+mrb_top_run(mrb_state *mrb, const struct RProc *proc, mrb_value self, mrb_int stack_keep)
 {
-  mrb_callinfo *ci;
   mrb_value v;
 
   if (!mrb->c->cibase) {
     return mrb_vm_run(mrb, proc, self, stack_keep);
   }
   if (mrb->c->ci == mrb->c->cibase) {
-    mrb->c->ci->env = NULL;
+    mrb_vm_ci_env_set(mrb->c->ci, NULL);
     return mrb_vm_run(mrb, proc, self, stack_keep);
   }
-  ci = cipush(mrb);
-  ci->stackent = mrb->c->stack;
-  ci->mid = 0;
-  ci->acc = CI_ACC_SKIP;
-  ci->target_class = mrb->object_class;
+  cipush(mrb, 0, CINFO_SKIP, mrb->object_class, NULL, 0, 0);
   v = mrb_vm_run(mrb, proc, self, stack_keep);
 
   return v;
 }
 
-#if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
-# if !defined(MRB_ENABLE_CXX_ABI)
+#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_ENABLE_CXX_ABI)
+# if !defined(MRB_USE_CXX_ABI)
 extern "C" {
 # endif
 #endif

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

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/bin.rake Added

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/core.rake Added

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

@@ -1,48 +1,63 @@
 desc 'generate document'
-task :doc => :api_doc, :capi_doc do
-
-end
-
-desc 'generate yard docs'
-task :api_doc do
-  begin
-    sh "mrbdoc"
-  rescue
-    puts "ERROR: To generate yard documentation, you should install yard-mruby gem."
-    puts "  $ gem install yard-mruby yard-coderay"
+task :doc => %wdoc:api doc:capi
+
+namespace :doc do
+  desc 'generate yard docs'
+  task :api do
+    begin
+      sh "mrbdoc"
+    rescue
+      puts "ERROR: To generate yard documentation, you should install yard-mruby gem."
+      puts "  $ gem install yard-mruby yard-coderay"
+    end
   end
-end
 
-desc 'generate doxygen docs'
-task :capi_doc do
-  begin
-    sh "doxygen Doxyfile"
-  rescue
-    puts "ERROR: To generate C API documents, you need Doxygen."
-    puts "  $ sudo apt-get install doxygen"
+  desc 'generate doxygen docs'
+  task :capi do
+    begin
+      sh "doxygen Doxyfile"
+    rescue
+      puts "ERROR: To generate C API documents, you need Doxygen."
+      puts "On Debian-based systems:"
+      puts "  $ sudo apt-get install doxygen"
+      puts "On RHEL-based systems:"
+      puts "  $ sudo dnf install doxygen"
+    end
   end
-end
 
-desc 'clean all built docs'
-task :clean_api_doc do
-  rm_rf 'doc/api'
-end
+  desc 'clean all built docs'
+  task :clean => %wclean:api clean:capi
 
-desc 'clean all built docs'
-task :clean_capi_doc do
-  rm_rf 'doc/capi'
-end
+  namespace :clean do
+    desc 'clean yard docs'
+    task :api do
+      rm_rf 'doc/api'
+    end
 
-desc 'clean all built docs'
-task :clean_doc => :clean_api_doc, :clean_capi_doc do
-end
+    desc 'clean doxygen docs'
+    task :capi do
+      rm_rf 'doc/capi'
+    end
+  end
 
-desc 'clean all built docs'
-task :view_api => :api_doc do
-  sh 'xdg-open doc/api/index.html'
-end
+  namespace :view do
+    desc 'open yard docs'
+    task :api do
+      sh 'xdg-open doc/api/index.html'
+    end
 
-desc 'clean all built docs'
-task :view_capi => :capi_doc do
-  sh 'xdg-open doc/capi/html/index.html'
+    desc 'open doxygen docs'
+    task :capi do
+      sh 'xdg-open doc/capi/html/index.html'
+    end
+  end
 end
+
+# deprecated
+task "api_doc" => "doc:api"
+task "capi_doc" => "doc:capi"
+task "clean_doc" => "doc:clean"
+task "clean_api_doc" => "doc:clean:api"
+task "clean_capi_doc" => "doc:clean:capi"
+task "view_api" => "doc:view:api"
+task "view_capi" => "doc:view:capi"

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

@@ -1,4 +1,12 @@
 MRuby.each_target do
+  file libmruby_core_static => libmruby_core_objs.flatten do |t|
+    archiver.run t.name, t.prerequisites
+  end
+
+  products << libmruby_core_static
+
+  next unless libmruby_enabled?
+
   file libmruby_static => libmruby_objs.flatten do |t|
     archiver.run t.name, t.prerequisites
   end
@@ -6,20 +14,26 @@
   file "#{build_dir}/lib/libmruby.flags.mak" => __FILE__, libmruby_static do |t|
     mkdir_p File.dirname t.name
     open(t.name, 'w') do |f|
-      f.puts "MRUBY_CFLAGS = #{cc.all_flags}"
+      gemincs = gems.map { |g| g.export_include_paths.map { |n| g.filename(n) } }.flatten.uniq
+      f.puts "MRUBY_CFLAGS = #{cc.all_flags(, gemincs)}"
+
+      f.puts "MRUBY_CC = #{cc.command}"
+      f.puts "MRUBY_LD = #{linker.command}"
 
-      gem_flags = gems.map { |g| g.linker.flags }
-      gem_library_paths = gems.map { |g| g.linker.library_paths }
+      libgems = gems.reject{|g| g.bin?}
+      gem_flags = libgems.map {|g| g.linker.flags }
+      gem_library_paths = libgems.map {|g| g.linker.library_paths }
       f.puts "MRUBY_LDFLAGS = #{linker.all_flags(gem_library_paths, gem_flags)} #{linker.option_library_path % "#{build_dir}/lib"}"
 
-      gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries }
+      gem_flags_before_libraries = libgems.map {|g| g.linker.flags_before_libraries }
       f.puts "MRUBY_LDFLAGS_BEFORE_LIBS = #{linker.flags_before_libraries, gem_flags_before_libraries.flatten.join(' ')}"
 
-      gem_libraries = gems.map { |g| g.linker.libraries }
+      gem_libraries = libgems.map {|g| g.linker.libraries }
       f.puts "MRUBY_LIBS = #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries)}"
 
       f.puts "MRUBY_LIBMRUBY_PATH = #{libmruby_static}"
     end
   end
-  task :all => "#{build_dir}/lib/libmruby.flags.mak"
+
+  products << libmruby_static
 end

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

@@ -1,4 +1,6 @@
 MRuby.each_target do
+  active_gems_txt = "#{build_dir}/mrbgems/active_gems.txt"
+
   if enable_gems?
     # set up all gems
     gems.each(&:setup)
@@ -7,7 +9,7 @@
     # loader all gems
     self.libmruby_objs << objfile("#{build_dir}/mrbgems/gem_init")
     file objfile("#{build_dir}/mrbgems/gem_init") => "#{build_dir}/mrbgems/gem_init.c", "#{build_dir}/LEGAL"
-    file "#{build_dir}/mrbgems/gem_init.c" => MRUBY_CONFIG, __FILE__, *Dir.glob("#{build_dir}/mrbgems/mruby-*/*.c") do |t|
+    file "#{build_dir}/mrbgems/gem_init.c" => active_gems_txt, MRUBY_CONFIG, __FILE__ do |t|
       mkdir_p "#{build_dir}/mrbgems"
       open(t.name, 'w') do |f|
         gem_func_gems = gems.select { |g| g.generate_functions }
@@ -35,7 +37,7 @@
         f.puts %Q
         f.write gem_func_decls
         unless gem_final_calls.empty?
-        f.puts %Q
+          f.puts %Q
           f.puts %Qstatic void
           f.puts %Qmrb_final_mrbgems(mrb_state *mrb) {
           f.write gem_final_calls
@@ -51,11 +53,21 @@
     end
   end
 
+  file active_gems_txt => :generate_active_gems_txt
+  task :generate_active_gems_txt do |t|
+    def t.timestamp; Time.at(0) end
+    active_gems = gems.sort_by(&:name).inject(""){|s, g| s << "#{g.name}\n"}
+    if !File.exist?(active_gems_txt) || File.read(active_gems_txt) != active_gems
+      mkdir_p File.dirname(active_gems_txt)
+      File.write(active_gems_txt, active_gems)
+    end
+  end
+
   # legal documents
   file "#{build_dir}/LEGAL" => MRUBY_CONFIG, __FILE__ do |t|
     mkdir_p File.dirname t.name
     open(t.name, 'w+') do |f|
-     f.puts <<LEGAL
+      f.puts <<LEGAL
 Copyright (c) #{Time.now.year} mruby developers
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -82,7 +94,7 @@
 
 Additional Licenses
 
-Due to the reason that you choosed additional mruby packages (GEMS),
+Due to the reason that you chose additional mruby packages (GEMS),
 please check the following additional licenses too:
 GEMS_LEGAL

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/mrblib.rake Added

@@ -0,0 +1,40 @@
+MRuby.each_target do
+  next unless libmruby_enabled?
+
+  src = "#{build_dir}/mrblib/mrblib.c"
+  rbfiles = Dir"#{MRUBY_ROOT}/mrblib/*.rb".sort!
+
+  self.libmruby_objs << objfile(src.ext)
+
+  file src => mrbcfile, __FILE__, *rbfiles do |t|
+    if presym_enabled?
+      cdump = true
+      suffix = "proc"
+    else
+      cdump = false
+      suffix = "irep"
+    end
+    mkdir_p File.dirname(t.name)
+    File.open(t.name, 'w') do |f|
+      _pp "GEN", "mrblib/*.rb", "#{t.name.relative_path}"
+      f.puts %Q/*
+      f.puts %Q * This file is loading the mrblib
+      f.puts %Q *
+      f.puts %Q * IMPORTANT:
+      f.puts %Q *   This file was generated!
+      f.puts %Q *   All manual changes will get lost.
+      f.puts %Q */
+      unless presym_enabled?
+        f.puts %Q#include <mruby.h>
+        f.puts %Q#include <mruby/irep.h>
+      end
+      mrbc.run f, rbfiles, "mrblib_#{suffix}", cdump: cdump, static: true
+      f.puts %Qvoid
+      f.puts %Qmrb_init_mrblib(mrb_state *mrb)
+      f.puts %Q{
+      f.puts %Q  mrblib_#{suffix}_init_syms(mrb); if cdump
+      f.puts %Q  mrb_load_#{suffix}(mrb, mrblib_#{suffix});
+      f.puts %Q}
+    end
+  end
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/presym.rake Added

@@ -0,0 +1,48 @@
+all_prerequisites = ->(task_name, prereqs) do
+  Rake::Tasktask_name.prerequisites.each do |prereq_name|
+    next if prereqsprereq_name
+    prereqsprereq_name = true
+    all_prerequisites.(Rake::Taskprereq_name.name, prereqs)
+  end
+end
+
+MRuby.each_target do |build|
+  gensym_task = task(:gensym)
+  next unless build.presym_enabled?
+
+  presym = build.presym
+
+  include_dir = "#{build.build_dir}/include"
+  build.compilers.each{|c| c.include_paths << include_dir}
+  build.gems.each{|gem| gem.compilers.each{|c| c.include_paths << include_dir}}
+
+  prereqs = {}
+  ppps = 
+  build_dir = "#{build.build_dir}/"
+  mrbc_build_dir = "#{build.mrbc_build.build_dir}/" if build.mrbc_build
+  build.products.each{|product| all_prerequisites.(product, prereqs)}
+  prereqs.each_key do |prereq|
+    next unless File.extname(prereq) == build.exts.object
+    next unless prereq.start_with?(build_dir)
+    next if mrbc_build_dir && prereq.start_with?(mrbc_build_dir)
+    ppp = prereq.ext(build.exts.presym_preprocessed)
+    if Rake.application.lookup(ppp) ||
+       Rake.application.enhance_with_matching_rule(ppp)
+      ppps << ppp
+    end
+  end
+
+  file presym.list_path => ppps do
+    presyms = presym.scan(ppps)
+    current_presyms = presym.read_list if File.exist?(presym.list_path)
+    update = presyms != current_presyms
+    presym.write_list(presyms) if update
+    mkdir_p presym.header_dir
+    %wid table.each do |type|
+      next if !update && File.exist?(presym.send("#{type}_header_path"))
+      presym.send("write_#{type}_header", presyms)
+    end
+  end
+
+  gensym_task.enhance(presym.list_path)
+end

_service:tar_scm:nghttp2-1.52.0.tar.xz/third-party/mruby/tasks/test.rake Added

@@ -0,0 +1,69 @@
+desc "build and run all mruby tests"
+task :test => "test:build" do
+  Rake::Task"test:run".invoke
+end
+
+namespace :test do |test_ns|
+  desc "build and run library tests"
+  task :lib => "build:lib" do
+    test_ns"run:lib".invoke
+  end
+
+  desc "build and run command binaries tests"
+  task :bin => "rake:all" do
+    test_ns"run:bin".invoke
+  end
+
+  desc "build all mruby tests"
+  task :build => "build:lib"
+
+  namespace :build do |test_build_ns|
+    desc "build library tests"
+    task :lib => "rake:all" do
+      MRuby.each_target{|build| build.gem(core: 'mruby-test')}
+      test = test_build_ns"lib_without_loading_gem"
+      test.invoke if test
+    end
+  end
+
+  desc "run all mruby tests"
+  task :run
+
+  namespace :run do
+    desc "run library tests"
+    task :lib
+
+    desc "run command binaries tests"
+    task :bin
+  end
+end
+
+MRuby.each_target do |build|
+  if build.test_enabled?
+    t = task "test:build:lib_without_loading_gem:#{build.name}" do
+      gem = build.gems"mruby-test"
+      gem.setup
+      gem.setup_compilers
+      Rake::Taskbuild.define_installer_if_needed("mrbtest").invoke
+    end
+    task "test:build:lib_without_loading_gem" => t
+
+    t = task "test:run:lib:#{build.name}" do
+      build.run_test
+    end
+    task "test:run" => t
+    task "test:run:lib" => t
+  end
+  if build.bintest_enabled?
+    t = task "test:run:bin:#{build.name}" do
+      build.run_bintest
+    end
+    task "test:run" => t
+    task "test:run:bin" => t
+  end
+end
+
+task :clean do
+  host = MRuby.targets"host"
+  rm_f host.exefile("#{host.class.install_dir}/mrbtest") if host && host.test_enabled?
+end

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

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

@@ -2,11 +2,12 @@
   default_command = params:default_command || 'gcc'
   compiler_flags = %w(-g -O3 -Wall -Wundef)
   c_mandatory_flags = %w(-std=gnu99)
-  cxx_invalid_flags = %w(-Wdeclaration-after-statement -Werror-implicit-function-declaration)
+  cxx_invalid_flags = %w(-Werror-implicit-function-declaration)
+  compile_opt = '%{flags} -o "%{outfile}" "%{infile}"'
 
   conf.cc, conf.objc, conf.asm, conf.cxx.each do |compiler|
     if compiler == conf.cxx
-      compiler.command = ENV'CXX' || default_command.sub(/cc|$/, '++')
+      compiler.command = ENV'CXX' || conf.cc.command.sub(/g\Kcc|$/, '++')
       compiler.flags = ENV'CXXFLAGS' || ENV'CFLAGS' || compiler_flags
     else
       compiler.command = ENV'CC' || default_command
@@ -14,7 +15,8 @@
     end
     compiler.option_include_path = %q-I"%s"
     compiler.option_define = '-D%s'
-    compiler.compile_options = %q%{flags} -MMD -o "%{outfile}" -c "%{infile}"
+    compiler.compile_options = "-MMD -c #{compile_opt}"
+    compiler.preprocess_options = "-E -P #{compile_opt}"
     compiler.cxx_compile_flag = '-x c++ -std=gnu++03'
     compiler.cxx_exception_flag = '-fexceptions'
     compiler.cxx_invalid_flags = c_mandatory_flags + cxx_invalid_flags
@@ -35,8 +37,7 @@
     def cc.header_search_paths
       if @header_search_command != command
         result = `echo | #{build.filename command} -x#{@header_search_language} -Wp,-v - -fsyntax-only 2>&1`
-        result = `echo | #{command} -x#{@header_search_language} -Wp,-v - -fsyntax-only 2>&1` if $?.exitstatus != 0
-        return include_paths if  $?.exitstatus != 0
+        return include_paths if $?.exitstatus != 0
 
         @frameworks = 
         @header_search_paths = result.lines.map { |v|

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

@@ -1,24 +1,20 @@
 # usage of environmental variables to set the
 # cross compiling toolchain proper
 MRuby::Toolchain.new(:openwrt) do |conf|
-  conf.cc, conf.objc, conf.asm.each do |cc|
-    cc.command = ENV'TARGET_CC'
-    cc.flags = ENV'TARGET_CFLAGS'
-    cc.include_paths = "#{MRUBY_ROOT}/include"
+  conf.cc, conf.cxx, conf.objc, conf.asm.each do |cc|
+    if cc == conf.cxx
+      cc.command = ENV'TARGET_CXX'
+      cc.flags = ENV'TARGET_CXXFLAGS'
+    else
+      cc.command = ENV'TARGET_CC'
+      cc.flags = ENV'TARGET_CFLAGS'
+    end
     cc.option_include_path = %q-I"%s"
     cc.option_define = '-D%s'
-    cc.compile_options = %q%{flags} -MMD -o "%{outfile}" -c "%{infile}"
+    cc.compile_options = '%{flags} -MMD -o "%{outfile}" -c "%{infile}"'
+    cc.preprocess_options = '%{flags} -o "%{outfile}" -E -P "%{infile}"'
   end
 
-  conf.cxx.each do |cxx|
-    cxx.command = ENV'TARGET_CXX'
-    cxx.flags = ENV'TARGET_CXXFLAGS'
-    cxx.include_paths = "#{MRUBY_ROOT}/include"
-    cxx.option_include_path = %q-I"%s"
-    cxx.option_define = '-D%s'
-    cxx.compile_options = %q%{flags} -MMD -o "%{outfile}" -c "%{infile}"
-   end
-
   conf.linker do |linker|
     linker.command = ENV'TARGET_CC'
     linker.flags = ENV'TARGET_LDFLAGS'

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

@@ -1,25 +1,21 @@
 MRuby::Toolchain.new(:visualcpp) do |conf, _params|
-  conf.cc do |cc|
-    cc.command = ENV'CC' || 'cl.exe'
-    # C4013: implicit function declaration
-    cc.flags = ENV'CFLAGS' || %w(/c /nologo /W3 /we4013 /Zi /MD /O2 /D_CRT_SECURE_NO_WARNINGS)
-    cc.defines = %w(MRB_STACK_EXTEND_DOUBLING)
-    cc.option_include_path = %q/I"%s"
-    cc.option_define = '/D%s'
-    cc.compile_options = %Q%{flags} /Fo"%{outfile}" "%{infile}"
-    cc.cxx_compile_flag = '/TP'
-    cc.cxx_exception_flag = '/EHs'
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = ENV'CXX' || 'cl.exe'
-    cxx.flags = ENV'CXXFLAGS' || ENV'CFLAGS' || %w(/c /nologo /W3 /Zi /MD /O2 /EHs /D_CRT_SECURE_NO_WARNINGS)
-    cxx.defines = %w(MRB_STACK_EXTEND_DOUBLING)
-    cxx.option_include_path = %q/I"%s"
-    cxx.option_define = '/D%s'
-    cxx.compile_options = %Q%{flags} /Fo"%{outfile}" "%{infile}"
-    cxx.cxx_compile_flag = '/TP'
-    cxx.cxx_exception_flag = '/EHs'
+  compiler_flags = %w(/nologo /W3 /MD /O2 /D_CRT_SECURE_NO_WARNINGS)
+  conf.cc, conf.cxx.each do |compiler|
+    if compiler == conf.cc
+      compiler.command = ENV'CC' || 'cl.exe'
+      # C4013: implicit function declaration
+      compiler.flags = *(ENV'CFLAGS' || compiler_flags + %w(/we4013))
+    else
+      compiler.command = ENV'CXX' || 'cl.exe'
+      compiler.flags = *(ENV'CXXFLAGS' || ENV'CFLAGS' || compiler_flags + %w(/EHs))
+    end
+    compiler.defines = %w(MRB_STACK_EXTEND_DOUBLING)
+    compiler.option_include_path = %q/I"%s"
+    compiler.option_define = '/D%s'
+    compiler.compile_options = %Q/Zi /c /Fo"%{outfile}" %{flags} "%{infile}"
+    compiler.preprocess_options = %Q/EP %{flags} "%{infile}" > "%{outfile}"
+    compiler.cxx_compile_flag = '/TP'
+    compiler.cxx_exception_flag = '/EHs'
   end
 
   conf.linker do |linker|

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

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

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

@@ -1,6 +1,13 @@
 ##
 # ArgumentError ISO Test
 
+def assert_argnum_error(given, expected, &block)
+  assert("wrong number of arguments") do
+    message = "wrong number of arguments (given #{given}, expected #{expected})"
+    assert_raise_with_message(ArgumentError, message, &block)
+  end
+end
+
 assert('ArgumentError', '15.2.24') do
   e2 = nil
   a = 
@@ -14,3 +21,17 @@
   assert_equal(Class, ArgumentError.class)
   assert_equal(ArgumentError, e2.class)
 end
+
+assert("'wrong number of arguments' from mrb_get_args") do
+  assert_argnum_error(0, "1+"){__send__}
+  assert_argnum_error(0, 1..2){Object.const_defined?}
+  assert_argnum_error(3, 1..2){Object.const_defined?(:A, true, 2)}
+  assert_argnum_error(2, 0..1){{}.default(1, 2)}
+  assert_argnum_error(1, 2){Object.const_set(:B)}
+  assert_argnum_error(3, 2){Object.const_set(:C, 1, 2)}
+end
+
+assert('Call to MRB_ARGS_NONE method') do
+  assert_raise(ArgumentError) { nil.__id__ 1 }
+  assert_raise(ArgumentError) { nil.__id__ opts: 1 }
+end

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

@@ -5,7 +5,7 @@
   assert_equal(Class, Array.class)
 end
 
-assert('Array inclueded modules', '15.2.12.3') do
+assert('Array included modules', '15.2.12.3') do
   assert_true(Array.include?(Enumerable))
 end
 
@@ -57,6 +57,8 @@
   a =  "a", "b", "c", "d", "e" 
   assert_equal("b", "c", a1,2)
   assert_equal("b", "c", "d", a1..-2)
+  assert_equal("b", "c", "d", "e", a1..)
+  assert_equal("a", "b", "c", a..2)
   skip unless Object.const_defined?(:Float)
   assert_equal("b", a1.1)
 end
@@ -92,6 +94,10 @@
   a2...4 = 6
   assert_equal(1,2,6,5, a)
 
+  a = 1,2,3,4,5
+  a2... = 6
+  assert_equal(1,2,6, a)
+
   # passing self (#3274)
   a = 1,2,3
   a1,0 = a
@@ -289,6 +295,24 @@
   assert_equal(1, b)
 
   assert_raise(FrozenError) { .freeze.shift }
+
+  # Array#shift with argument
+  assert_equal(, .shift(1))
+
+  a = 1,2,3
+  b = a.shift(1)
+  assert_equal(2,3, a)
+  assert_equal(1, b)
+
+  a = 1,2,3,4
+  b = a.shift(3)
+  assert_equal(4, a)
+  assert_equal(1,2,3, b)
+
+  a = 1,2,3
+  b = a.shift(4)
+  assert_equal(, a)
+  assert_equal(1,2,3, b)
 end
 
 assert('Array#size', '15.2.12.5.28') do
@@ -372,8 +396,7 @@
 assert('Array#hash', '15.2.12.5.35') do
   a =  1, 2, 3 
 
-  #assert_true(a.hash.is_a? Integer)
-  assert_true(a.hash.is_a? Integral)  # mruby special
+  assert_true(a.hash.is_a? Integer)
   assert_equal(1,2.hash, 1,2.hash)
 end

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

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

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

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

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

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

@@ -35,11 +35,66 @@
 end
 
 assert('Float#/', '15.2.9.3.4') do
-  a = 3.123456789 / 3.123456789
-  b = 3.123456789 / 1
-
-  assert_float(1.0        , a)
-  assert_float(3.123456789, b)
+  assert_float(1.0, 3.123456789 / 3.123456789)
+  assert_float(3.123456789, 3.123456789 / 1)
+  assert_float(2.875, -5.75 / -2.0)
+  assert_float(-2.875, 5.75 / -2)
+  assert_float(-2.875, -5.75 / 2.0)
+  assert_float(Float::NAN, 0.0 / 0.0)
+  assert_float(Float::NAN, -0.0 / -0.0)
+  assert_float(Float::NAN, -0.0 / 0.0)
+  assert_float(Float::NAN, Float::NAN / Float::NAN)
+  assert_float(Float::NAN, Float::NAN / 0.0)
+  assert_float(Float::NAN, Float::NAN / -0.0)
+  assert_float(Float::NAN, Float::NAN / 2.0)
+  assert_float(Float::NAN, Float::NAN / -2.0)
+  assert_float(Float::NAN, 0.0 / Float::NAN)
+  assert_float(Float::NAN, -0.0 / Float::NAN)
+  assert_float(Float::NAN, 2.0 / Float::NAN)
+  assert_float(Float::NAN, -2.0 / Float::NAN)
+  assert_float(Float::NAN, Float::INFINITY / Float::INFINITY)
+  assert_float(Float::NAN, -Float::INFINITY / Float::INFINITY)
+  assert_float(Float::NAN, Float::INFINITY / -Float::INFINITY)
+  assert_float(Float::NAN, -Float::INFINITY / -Float::INFINITY)
+  assert_float(Float::INFINITY, 1.0 / 0.0)
+  assert_float(Float::INFINITY, -1.0 / -0.0)
+  assert_float(-Float::INFINITY, 1.0 / -0.0)
+  assert_float(-Float::INFINITY, -1.0 / 0.0)
+  assert_float(0.0, 1.0 / Float::INFINITY)
+  assert_float(0.0, -1.0 / -Float::INFINITY)
+  assert_float(-0.0, -1.0 / Float::INFINITY)
+  assert_float(-0.0, 1.0 / -Float::INFINITY)
+end
+assert('Float#quo') do
+  assert_float(1.0, 3.123456789.quo(3.123456789))
+  assert_float(3.123456789, 3.123456789.quo(1))
+  assert_float(2.875, -5.75.quo(-2.0))
+  assert_float(-2.875, 5.75.quo(-2))
+  assert_float(-2.875, -5.75.quo(2.0))
+  assert_float(Float::NAN, 0.0.quo(0.0))
+  assert_float(Float::NAN, -0.0.quo(-0.0))
+  assert_float(Float::NAN, -0.0.quo(0.0))
+  assert_float(Float::NAN, Float::NAN.quo(Float::NAN))
+  assert_float(Float::NAN, Float::NAN.quo(0.0))
+  assert_float(Float::NAN, Float::NAN.quo(-0.0))
+  assert_float(Float::NAN, Float::NAN.quo(2.0))
+  assert_float(Float::NAN, Float::NAN.quo(-2.0))
+  assert_float(Float::NAN, 0.0.quo(Float::NAN))
+  assert_float(Float::NAN, -0.0.quo(Float::NAN))
+  assert_float(Float::NAN, 2.0.quo(Float::NAN))
+  assert_float(Float::NAN, -2.0.quo(Float::NAN))
+  assert_float(Float::NAN, Float::INFINITY.quo(Float::INFINITY))
+  assert_float(Float::NAN, -Float::INFINITY.quo(Float::INFINITY))
+  assert_float(Float::NAN, Float::INFINITY.quo(-Float::INFINITY))
+  assert_float(Float::NAN, -Float::INFINITY.quo(-Float::INFINITY))
+  assert_float(Float::INFINITY, 1.0.quo(0.0))
+  assert_float(Float::INFINITY, -1.0.quo(-0.0))
+  assert_float(-Float::INFINITY, 1.0.quo(-0.0))
+  assert_float(-Float::INFINITY, -1.0.quo(0.0))
+  assert_float(0.0, 1.0.quo(Float::INFINITY))
+  assert_float(0.0, -1.0.quo(-Float::INFINITY))
+  assert_float(-0.0, -1.0.quo(Float::INFINITY))
+  assert_float(-0.0, 1.0.quo(-Float::INFINITY))
 end
 
 assert('Float#%', '15.2.9.3.5') do
@@ -207,25 +262,23 @@
 end
 
 assert('Float#to_s') do
-  uses_float = 4e38.infinite?  # enable MRB_USE_FLOAT?
+  uses_float = 4e38.infinite?  # enable MRB_USE_FLOAT32?
 
   assert_equal("Infinity", Float::INFINITY.to_s)
   assert_equal("-Infinity", (-Float::INFINITY).to_s)
   assert_equal("NaN", Float::NAN.to_s)
-  assert_equal("0", 0.0.to_s)
-  assert_equal("-0", -0.0.to_s)
+  assert_equal("0.0", 0.0.to_s)
+  assert_equal("-0.0", -0.0.to_s)
   assert_equal("-3.25", -3.25.to_s)
-  assert_equal("50", 50.0.to_s)
+  assert_equal("50.0", 50.0.to_s)
   assert_equal("0.0125", 0.0125.to_s)
   assert_equal("-0.0125", -0.0125.to_s)
   assert_equal("1.0e-10", 0.0000000001.to_s)
   assert_equal("-1.0e-10", -0.0000000001.to_s)
   assert_equal("1.0e+20", 1e20.to_s)
   assert_equal("-1.0e+20", -1e20.to_s)
-  assert_equal("1.0e+16", 10000000000000000.0.to_s)
-  assert_equal("-1.0e+16", -10000000000000000.0.to_s)
-  assert_equal("100000", 100000.0.to_s)
-  assert_equal("-100000", -100000.0.to_s)
+  assert_equal("100000.0", 100000.0.to_s)
+  assert_equal("-100000.0", -100000.0.to_s)
   if uses_float
     assert_equal("1.0e+08", 100000000.0.to_s)
     assert_equal("-1.0e+08", -100000000.0.to_s)
@@ -234,15 +287,32 @@
   else
     assert_equal("1.0e+15", 1000000000000000.0.to_s)
     assert_equal("-1.0e+15", -1000000000000000.0.to_s)
-    assert_equal("100000000000000", 100000000000000.0.to_s)
-    assert_equal("-100000000000000", -100000000000000.0.to_s)
+    assert_equal("100000000000000.0", 100000000000000.0.to_s)
+    assert_equal("-100000000000000.0", -100000000000000.0.to_s)
   end
 end
 
+assert('Float#inspect') do
+  assert_equal("-3.25", -3.25.inspect)
+  assert_equal("50.0", 50.0.inspect)
+end
+
 assert('Float#eql?') do
   assert_operator(5.0, :eql?, 5.0)
   assert_not_operator(5.0, :eql?, 5)
   assert_not_operator(5.0, :eql?, "5.0")
 end
 
+assert('Float#abs') do
+  f = 1.0
+  assert_equal(1.0, f.abs)
+  f = -1.0
+  assert_equal(1.0, f.abs)
+  f = 0.0
+  assert_equal(0.0, f.abs)
+  # abs(negative zero) should be positive zero
+  f = -0.0
+  assert_equal(0.0, f.abs)
+end
+
 end # const_defined?(:Float)

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

@@ -1,378 +1,1014 @@
 ##
 # Hash ISO Test
 
-assert('Hash', '15.2.13') do
-  assert_equal Class, Hash.class
-end
+class HashKey
+  attr_accessor :value, :error, :callback
 
-assert('Hash#==', '15.2.13.4.1') do
-  assert_true({ 'abc' => 'abc' } == { 'abc' => 'abc' })
-  assert_false({ 'abc' => 'abc' } ==  { 'cba' => 'cba' })
-  assert_false({ :a => 1 } == true)
-  skip unless Object.const_defined?(:Float)
-  assert_true({ :equal => 1 } == { :equal => 1.0 })
-end
+  self.class.alias_method :, :new
 
-assert('Hash#', '15.2.13.4.2') do
-  a = { 'abc' => 'abc' }
+  def initialize(value, error: nil, callback: nil)
+    @value = value
+    @error = error
+    @callback = callback
+  end
 
-  assert_equal 'abc', a'abc'
+  def ==(other)
+    @callback.(:==, self, other) if @callback
+    return raise_error(:==) if @error == true || @error == :==
+    other.kind_of?(self.class) && @value == other.value
+  end
 
-  # Hash# should call #default (#3272)
-  hash = {}
-  def hash.default(k); selfk = 1; end
-  hash:foo += 1
+  def eql?(other)
+    @callback.(:eql?, self, other) if @callback
+    return raise_error(:eql?) if @error == true || @error == :eql?
+    other.kind_of?(self.class) && @value.eql?(other.value)
+  end
 
-  assert_equal 2, hash:foo
-end
+  def hash
+    @callback.(:hash, self) if @callback
+    return raise_error(:hash) if @error == true || @error == :hash
+    @value % 3
+  end
 
-assert('Hash#=', '15.2.13.4.3') do
-  a = Hash.new
-  a'abc' = 'abc'
+  def to_s
+    "#{self.class}#{@value}"
+  end
+  alias inspect to_s
 
-  assert_equal 'abc', a'abc'
+  def raise_error(name)
+    raise "##{self}: #{name} error"
+  end
 end
 
-assert('Hash#clear', '15.2.13.4.4') do
-  a = { 'abc' => 'abc' }
-  a.clear
-
-  assert_equal({ }, a)
+class HashEntries < Array
+  self.class.alias_method :, :new
+
+  def initialize(entries) self.replace(entries) end
+  def key(index, k=get=true) get ? selfindex0 : (selfindex0 = k) end
+  def value(index, v=get=true) get ? selfindex1 : (selfindex1 = v) end
+  def keys; map{|k, v| k} end
+  def values; map{|k, v| v} end
+  def each_key(&block) each{|k, v| block.(k)} end
+  def each_value(&block) each{|k, v| block.(v)} end
+  def dup2; self.class*map{|k, v| k.dup, v.dup} end
+  def to_s; "#{self.class}#{super}" end
+  alias inspect to_s
+
+  def hash_for(hash={}, &block)
+    each{|k, v| hashk = v}
+    block.(hash) if block
+    hash
+  end
 end
 
-assert('Hash#dup') do
-  a = { 'a' => 1 }
-  b = a.dup
-  a'a' = 2
-  assert_equal({'a' => 1}, b)
-
-  c = Hash.new { |h, k| hk = k.upcase }
-  d = c.dup
-  assert_equal("FOO", d"foo")
+def ar_entries
+  HashEntries
+    1, "one",
+    HashKey2, :two,
+    nil, :two,
+    :one, 1,
+    "&", "&amp;",
+    HashKey6, :six,
+    HashKey5, :five,  # same hash code as HashKey2
+  
+end
+
+def ht_entries
+  ar_entries.dup.push(
+    "id", 32,
+    :date, "2020-05-02",
+    200, "OK",
+    "modifiers", "left_shift", "control",
+    :banana, :yellow,
+    "JSON", "JavaScript Object Notation",
+    :size, :large,
+    "key_code", "h",
+    "h", 0x04,
+    3, 2, 1, "three, two, one",
+    :auto, true,
+    HashKey12, "December",
+    :path, "/path/to/file",
+    :name, "Ruby",
+  )
+end
+
+def merge_entries!(entries1, entries2)
+  entries2.each do |k2, v2|
+    entry1 = entries1.find{|k1, _| k1.eql?(k2)}
+    entry1 ? (entry11 = v2) : (entries1 << k2, v2)
+  end
+  entries1
+end
+
+def product(*arrays, &block)
+  sizes = Array.new(arrays.size+1, 1)
+  (arrays.size-1).downto(0){|i| sizesi = arraysi.size * sizesi+1}
+  size = sizes0
+  results = Array.new(size){}
+  arrays.each_with_index do |array, arrays_i|
+    results_i = -1
+    (size / sizesarrays_i).times do
+      array.each do |v|
+        sizesarrays_i+1.times{resultsresults_i+=1 << v}
+      end
+    end
+  end
+  results.each{block.(_1)}
 end
 
-assert('Hash#default', '15.2.13.4.5') do
-  a = Hash.new
-  b = Hash.new('abc')
-  c = Hash.new {|s,k| sk = k}
-
-  assert_nil a.default
-  assert_equal 'abc', b.default
-  assert_nil c.default
-  assert_equal 'abc', c.default('abc')
+def assert_iterator(exp, obj, meth)
+  params = 
+  obj.__send__(meth) {|param| params << param}
+  assert_equal(exp, params)
 end
 
-assert('Hash#default=', '15.2.13.4.6') do
-  a = { 'abc' => 'abc' }
-  a.default = 'cba'
-
-  assert_equal 'abc', a'abc'
-  assert_equal 'cba', a'notexist'
+def assert_nothing_crashed(&block)
+  block.call rescue nil
+  pass
 end
 
-assert('Hash#default_proc', '15.2.13.4.7') do
-  a = Hash.new
-  b = Hash.new {|s,k| sk = k + k}
-  c = b2
-  d = b'cat'
-
-  assert_nil a.default_proc
-  assert_equal Proc, b.default_proc.class
-  assert_equal 4, c
-  assert_equal 'catcat', d
+assert('Hash', '15.2.13') do
+  assert_equal(Class, Hash.class)
+end
+
+:==, '15.2.13.4.1', :eql?, ''.each do |meth, iso|
+  assert("Hash##{meth}", iso) do
+    cls = Class.new(Hash){attr_accessor :foo}
+    ar_entries, ht_entries.each do |entries|
+      h1 = entries.hash_for
+      h2 = entries.dup.reverse!.hash_for
+      assert_operator(h1, meth, h2)
+      assert_operator(h1, meth, h1)
+      assert_not_operator(h1, meth, true)
+      assert_operator({}, meth, Hash.new)
+
+      h1 = entries.hash_for(cls.new(1)) {|h| h.foo = 1}
+      h2 = entries.hash_for(cls.new(2)) {|h| h.foo = 2}
+      assert_operator(h1, meth, h2)
+
+      h1 = entries.hash_for
+      h2 = entries.hash_for(cls.new)
+      assert_operator(h1, meth, h2)
+
+      h1 = (entries.dup << :_k, 1).hash_for
+      h2 = (entries.dup << :_k, 2).hash_for
+      assert_not_operator(h1, meth, h2)
+
+      h1 = (entries.dup << :_k1, 0).hash_for
+      h2 = (entries.dup << :_k2, 0).hash_for
+      assert_not_operator(h1, meth, h2)
+
+      h1 = entries.hash_for
+      h2 = (entries.dup << :_k, 2).hash_for
+      assert_not_operator(h1, meth, h2)
+
+      k1, v1 = HashKey-1, HashKey-2
+      k2, v2 = HashKey-1, HashKey-2
+      h1 = (entries.dup << k1, v1).hash_for
+      h2 = (entries.dup << k2, v2).hash_for
+      product(h1, h2, k1, k2, %ieql? hash) do |h, k, m|
+        k1, k2.each{_1.callback = nil}
+        k.callback = ->(name, *){h.clear if name == m}
+        assert_nothing_crashed{h1.__send__(meth, h2)}
+      end
+      product(h1, h2, v1, v2) do |h, v|
+        v1, v2.each{_1.callback = nil}
+        v.callback = ->(name, *){h.clear if name == meth}
+        assert_nothing_crashed{h1.__send__(meth, h2)}
+      end
+
+      if Object.const_defined?(:Float)
+        h1 = (entries.dup << -1, true).hash_for
+        h2 = (entries.dup << -1.0, true).hash_for
+        assert_not_operator(h1, meth, h2)
+        h1 = (entries.dup << -1.0, true).hash_for
+        h2 = (entries.dup << -1, true).hash_for
+        assert_not_operator(h1, meth, h2)
+
+        h1 = (entries.dup << :_k, 1).hash_for
+        h2 = (entries.dup << :_k, 1.0).hash_for
+        if meth == :==
+          assert_operator(h1, meth, h2)
+        else
+          assert_not_operator(h1, meth, h2)
+        end
+      end
+    end
+  end
 end
 
-assert('Hash#delete', '15.2.13.4.8') do
-  a = { 'abc' => 'ABC' }
-  b = { 'abc' => 'ABC' }
-  b_tmp_1 = false
-  b_tmp_2 = false
-
-  assert_equal 'ABC', a.delete('abc')
-  b.delete('abc') do |k|
-    b_tmp_1 = true
-  end
-  b.delete('abc') do |k|
-    b_tmp_2 = true
+assert('Hash#', '15.2.13.4.2') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for
+    assert_equal(entries.size, h.size)
+    entries.each{|k, v| assert_equal(v, hk)}
+    assert_equal(nil, h"_not_found_")
+    assert_equal(nil, h:_not_dound_)
+    assert_equal(nil, h-2)
+
+    k = HashKey-4
+    hHashKey-1 = -1
+    hk = -4
+    h.delete(k)
+    assert_equal(nil, hk)
+
+    if Object.const_defined?(:Float)
+      h-2 = 22
+      assert_equal(nil, h-2.0)
+      h-3.0 = 33
+      assert_equal(nil, h-3)
+      assert_equal(33, h-3.0)
+    end
+
+    k = HashKey-2
+    k.callback = ->(name, *){h.clear if name == :eql?}
+    assert_nothing_crashed{hk}
+    k.callback = ->(name, *){h.clear if name == :hash}
+    assert_nothing_crashed{hk}
   end
 
-  assert_nil a.delete('cba')
-  assert_false a.has_key?('abc')
-  assert_false b_tmp_1
-  assert_true b_tmp_2
+  # Hash# should call #default (#3272)
+  h = {}
+  def h.default(k); selfk = 1; end
+  h:foo += 1
+  assert_equal(2, h:foo)
+end
+
+%w= 3, %wstore 26.each do |meth, no|
+  assert("Hash##{meth}", "15.2.13.4.#{no}") do
+    {}, ht_entries.hash_for.each do |h|
+      # duplicated key
+      k = :_dup_key
+      h.__send__(meth, k, 1)
+      size = h.size
+      h.__send__(meth, k, 2)
+      assert_equal(size, h.size)
+      assert_equal(2, hk)
+
+      # freeze string key
+      k = "_mutable"
+      h.__send__(meth, k, 1)
+      h_k = h.keys-1
+      assert_not_same(k, h_k)
+      assert_predicate(h_k, :frozen?)
+      assert_not_predicate(k, :frozen?)
+
+      # frozen string key
+      k = "_immutable".freeze
+      h.__send__(meth, k, 2)
+      h_k = h.keys-1
+      assert_same(k, h_k)
+      assert_predicate(h_k, :frozen?)
+
+      # numeric key
+      if Object.const_defined?(:Float)
+        h.__send__(meth, 3, :fixnum)
+        h.__send__(meth, 3.0, :float)
+        assert_equal(:fixnum, h3)
+        assert_equal(:float, h3.0)
+        h.__send__(meth, 4.0, :float)
+        h.__send__(meth, 4, :fixnum)
+        assert_equal(:fixnum, h4)
+        assert_equal(:float, h4.0)
+      end
+
+      # other key
+      k = :_array
+      h.__send__(meth, k, :_array)
+      h_k = h.keys-1
+      assert_same(k, h_k)
+      assert_not_predicate(h_k, :frozen?)
+      assert_not_predicate(k, :frozen?)
+
+      # deleted key
+      k1, k2, k3 = HashKey-1, HashKey-4, HashKey-7  # same hash code
+      h.__send__(meth, k1, 1)
+      h.__send__(meth, k2, -4)
+      h.__send__(meth, k3, 73)
+      size = h.size
+      h.delete(k1)
+      h.delete(k2)
+      h.__send__(meth, k2, 40)
+      assert_equal(nil, hk1)
+      assert_equal(40, hk2)
+      assert_equal(73, hk3)
+      assert_equal(size - 1, h.size)
+
+      # frozen
+      h.freeze
+      assert_raise(FrozenError){h.__send__(meth, -100, 1)}
+    end
+
+    ar_entries.hash_for, ht_entries.hash_for.each do |h|
+      k = HashKey-2
+      k.callback = ->(name, *){h.clear if name == :eql?}
+      assert_nothing_crashed{h.__send__(meth, k, 2)}
+      k.callback = ->(name, *){h.clear if name == :hash}
+      assert_nothing_crashed{h.__send__(meth, k, 2)}
+    end
+  end
 end
 
-assert('Hash#each', '15.2.13.4.9') do
-  a = { 'abc_key' => 'abc_value' }
-  key = nil
-  value = nil
-
-  a.each  do |k,v|
-    key = k
-    value = v
+assert('Hash#clear', '15.2.13.4.4') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for
+    assert_same(h, h.clear)
+    assert_equal(0, h.size)
+    assert_nil(hentries.key(3))
+
+    h.freeze
+    assert_raise(FrozenError){h.clear}
   end
 
-  assert_equal 'abc_key', key
-  assert_equal 'abc_value', value
+  h = {}.freeze
+  assert_raise(FrozenError){h.clear}
 end
 
-assert('Hash#each_key', '15.2.13.4.10') do
-  a = { 'abc_key' => 'abc_value' }
-  key = nil
-
-  a.each_key  do |k|
-    key = k
+assert('Hash#dup') do
+  cls = Class.new(Hash){attr_accessor :foo}
+  ar_entries, ht_entries.each do |entries|
+    h1 = entries.hash_for(cls.new(61)){|h| h.foo = 23}.freeze
+    h2 = h1.dup
+    assert_not_predicate(h2, :frozen?)
+    assert_equal(h1.class, h2.class)
+    assert_equal(entries, h2.to_a)
+    assert_equal(23, h2.foo)
+    assert_equal(61, h2"_not_found_")
+    h2-10 = 10
+    assert_equal(10, h2-10)
+    assert_not_operator(h1, :key?, -10)
+
+    h = entries.hash_for
+    k = HashKey-1
+    hk = 1
+    k.callback = ->(*){h.clear}
+    assert_nothing_crashed{h.dup}
   end
-
-  assert_equal 'abc_key', key
 end
 
-assert('Hash#each_value', '15.2.13.4.11') do
-  a = { 'abc_key' => 'abc_value' }
-  value = nil
-
-  a.each_value  do |v|
-    value = v
+assert('Hash#default', '15.2.13.4.5') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for(Hash.new)
+    assert_equal(nil, h.default)
+    assert_equal(nil, h.default(-2))
+
+    h = entries.hash_for(Hash.new(-88))
+    assert_equal(-88, h.default)
+    assert_equal(-88, h.default(-2))
+    assert_not_operator(h, :key?, -2)
+    assert_raise(ArgumentError){h.default(-2,-2)}
+
+    proc = ->(h, k){hk = k * 3}
+    h = entries.hash_for(Hash.new(proc))
+    assert_equal(proc, h.default(-2))
+
+    h = entries.hash_for(Hash.new(&proc))
+    assert_equal(nil, h.default)
+    assert_not_operator(h, :key?, -2)
+    assert_equal(-6, h.default(-2))
+    assert_equal(-6, h-2)
+    h-2 = -5
+    assert_equal(-6, h.default(-2))
+    assert_equal(-6, h-2)
   end
-
-  assert_equal 'abc_value', value
 end
 
-assert('Hash#empty?', '15.2.13.4.12') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_false a.empty?
-  assert_true b.empty?
-end
+assert('Hash#default=', '15.2.13.4.6') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for(Hash.new)
+    h.default = 3
+    assert_equal(3, h-2)
+    assert_equal(entries.value(0), hentries.key(0))
 
-assert('Hash#has_key?', '15.2.13.4.13') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
+    h.default = 4
+    assert_equal(4, h-2)
 
-  assert_true a.has_key?('abc_key')
-  assert_false b.has_key?('cba')
-end
+    h.default = nil
+    assert_equal(nil, h-2)
 
-assert('Hash#has_value?', '15.2.13.4.14') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
+    h.default = 5
+    assert_same(h-2, h-3)
 
-  assert_true a.has_value?('abc_value')
-  assert_false b.has_value?('cba')
+    h.freeze
+    assert_raise(FrozenError){h.default = 3}
+  end
 end
 
-assert('Hash#include?', '15.2.13.4.15') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.include?('abc_key')
-  assert_false b.include?('cba')
+assert('Hash#default_proc', '15.2.13.4.7') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for({})
+    assert_nil(h.default_proc)
+
+    h = entries.hash_for(Hash.new(34))
+    assert_nil(h.default_proc)
+
+    h = entries.hash_for(Hash.new{|h, k| hk = k * 3})
+    proc = h.default_proc
+    assert_equal(Proc, proc.class)
+    assert_equal(6, proc.(h, 2))
+    assert_equal(2, 6, h.to_a-1)
+  end
 end
 
-assert('Hash#initialize', '15.2.13.4.16') do
-  # Testing initialize by new.
-  h = Hash.new
-  h2 = Hash.new(:not_found)
-
-  assert_true h.is_a? Hash
-  assert_equal({ }, h)
-  assert_nil h"hello"
-  assert_equal :not_found, h2"hello"
-end
+assert('Hash#delete', '15.2.13.4.8') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for
+    pairs = entries.dup
+    0, 2, -1.each do |i|
+      k, v = pairs.delete_at(i)
+      assert_equal(v, h.delete(k))
+      assert_equal(nil, hk)
+      assert_equal(false, h.key?(k))
+    end
+    entries.key(0), "_not_found_".each {|k|assert_equal(nil, h.delete(k))}
+    assert_equal(pairs.size, h.size)
+    assert_equal(pairs, h.to_a)
+    pairs.each {|k, v| assert_equal(v, hk)}
+
+    h = entries.hash_for
+    pairs = entries.dup
+    pairs.delete_at(1), "_not_found_", "_default".each do |k, v|
+      assert_equal(v, h.delete(k){"_default"})
+      assert_equal(nil, hk)
+      assert_equal(false, h.key?(k))
+    end
+    assert_equal(pairs.size, h.size)
+    assert_equal(pairs, h.to_a)
+    pairs.each {|k, v| assert_equal(v, hk)}
+
+    if Object.const_defined?(:Float)
+      h = entries.dup.push(-5, 1, -5.0, 2, -6.0, 3, -6, 4).hash_for
+      assert_equal(1, h.delete(-5))
+      assert_equal(3, h.delete(-6.0))
+    end
+
+    # nil value with block
+    h = entries.hash_for
+    k = "_nil"
+    hk = nil
+    assert_equal(nil, h.delete(k){"blk"})
+    assert_equal(false, h.key?(k))
+
+    k = HashKey-31, callback: ->(*){h.clear}
+    assert_nothing_crashed{h.delete(k)}
+  end
 
-assert('Hash#initialize_copy', '15.2.13.4.17') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new.initialize_copy(a)
+  assert_raise(ArgumentError){{}.delete}
+  assert_raise(ArgumentError){{}.delete(1,2)}
 
-  assert_equal({ 'abc_key' => 'abc_value' }, b)
+  h = {}.freeze
+  assert_raise(FrozenError){h.delete(1)}
+end
+
+%weach 9, %weach_key 10, %weach_value 11.each do |meth, no|
+  assert("Hash##{meth}", "15.2.13.4.#{no}") do
+    ar_entries, ht_entries.each do |entries|
+      exp = 
+      entries.__send__(meth){|param| exp << param}
+      assert_iterator(exp, entries.hash_for, meth)
+
+      h = entries.hash_for
+      entries.shift
+      h.shift
+      entry = entries.delete_at(1)
+      h.delete(entry0)
+      h.delete(entries.delete_at(-4)0)
+      entries << entry
+      h.store(*entry)
+      exp = 
+      entries.__send__(meth){|param| exp << param}
+      assert_iterator(exp, h, meth)
+    end
+
+    assert_iterator(, {}, meth)
+  end
 end
 
-assert('Hash#key?', '15.2.13.4.18') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
+assert('Hash#empty?', '15.2.13.4.12') do
+  ar_entries, ht_entries.each do |entries|
+    assert_not_predicate entries.hash_for, :empty?
 
-  assert_true a.key?('abc_key')
-  assert_false b.key?('cba')
-end
+    h = entries.hash_for
+    h.shift
+    h.delete(entries.key(-1))
+    assert_not_predicate h, :empty?
 
-assert('Hash#keys', '15.2.13.4.19') do
-  a = { 'abc_key' => 'abc_value' }
+    h = entries.hash_for
+    entries.size.times{h.shift}
+    assert_predicate(h, :empty?)
 
-  assert_equal 'abc_key', a.keys
-end
-
-assert('Hash#length', '15.2.13.4.20') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
+    h = entries.hash_for
+    entries.each {|k, v| h.delete(k)}
+    assert_predicate(h, :empty?)
+  end
 
-  assert_equal 1, a.length
-  assert_equal 0, b.length
+  assert_predicate(Hash.new, :empty?)
+  assert_predicate(Hash.new(1), :empty?)
+  assert_predicate(Hash.new{|h, k| hk = 2}, :empty?)
 end
 
-assert('Hash#member?', '15.2.13.4.21') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.member?('abc_key')
-  assert_false b.member?('cba')
-end
+%whas_key? 13, %winclude? 15, %wkey? 18, %wmember? 21.each do |meth,no|
+  assert("Hash##{meth}", "15.2.13.4.#{no}") do
+    ar_entries, ht_entries.each do |entries|
+      pairs = entries.dup.push(HashKey-3, 3, nil, "NIL")
+      h = pairs.hash_for
+      pairs.each{|k, v| assert_operator(h, meth, k)}
+      assert_not_operator(h, meth, HashKey-6)
+      assert_not_operator(h, meth, 3)
 
-assert('Hash#merge', '15.2.13.4.22') do
-  a = { 'abc_key' => 'abc_value', 'cba_key' => 'cba_value' }
-  b = { 'cba_key' => 'XXX',  'xyz_key' => 'xyz_value' }
+      if Object.const_defined?(:Float)
+        hh = entries.push(-7, :i, -8.0, :f).hash_for
+        assert_not_operator(hh, meth, -7.0)
+        assert_not_operator(hh, meth, -8)
+        assert_operator(hh, meth, -8.0)
+      end
 
-  result_1 = a.merge b
-  result_2 = a.merge(b) do |key, original, new|
-    original
-  end
+      h.shift
+      assert_not_operator(h, meth, pairs.key(0))
 
-  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'XXX',
-                'xyz_key' => 'xyz_value' }, result_1)
-  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'cba_value',
-                'xyz_key' => 'xyz_value' }, result_2)
+      h.delete(pairs.key(3))
+      assert_not_operator(h, meth, pairs.key(3))
 
-  assert_raise(TypeError) do
-    { 'abc_key' => 'abc_value' }.merge "a"
+      k = HashKey-31, callback: ->(*){h.clear}
+      assert_nothing_crashed{h.__send__(meth, k)}
+    end
   end
-end
 
-assert('Hash#replace', '15.2.13.4.23') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new.replace(a)
+  h = Hash.new{|h, k| h1 = 1}
+  assert_not_operator(h, meth, 1)
+end
 
-  assert_equal({ 'abc_key' => 'abc_value' }, b)
+%whas_value? 14, %wvalue? 24.each do |meth, no|
+  assert("Hash##{meth}", "15.2.13.4.#{no}") do
+    ar_entries, ht_entries.each do |entries|
+      entries.push(HashKey-5, -8, "NIL", nil)
+      h = entries.hash_for
+      entries.each{|k, v| assert_operator(h, meth, v)}
+      assert_operator(h, meth, -8.0) if Object.const_defined?(:Float)
+      assert_not_operator(h, meth, "-8")
 
-  a = Hash.new(42)
-  b = {}
-  b.replace(a)
-  assert_equal(42, b1)
+      h.shift
+      assert_not_operator(h, meth, entries.value(0))
 
-  a = Hash.new{|h,x| x}
-  b.replace(a)
-  assert_equal(127, b127)
+      h.delete(entries.key(3))
+      assert_not_operator(h, meth, entries.value(3))
 
-   assert_raise(TypeError) do
-    { 'abc_key' => 'abc_value' }.replace "a"
+      v = HashKey-31, callback: ->(*){h.clear}
+      assert_nothing_crashed{h.__send__(meth, v)}
+    end
   end
-end
-
-assert('Hash#shift', '15.2.13.4.24') do
-  a = { 'abc_key' => 'abc_value', 'cba_key' => 'cba_value' }
-  b = a.shift
-
-  assert_equal Array, b.class
-  assert_equal 2, b.size
-  assert_equal 1, a.size
 
-  b = a.shift
-
-  assert_equal Array, b.class
-  assert_equal 2, b.size
-  assert_equal 0, a.size
+  h = Hash.new{|h, k| h1 = 1}
+  assert_not_operator(h, meth, 1)
 end
 
-assert('Hash#size', '15.2.13.4.25') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_equal 1, a.size
-  assert_equal 0, b.size
+assert('Hash#initialize', '15.2.13.4.16') do
+  h = Hash.new
+  assert_equal(Hash, h.class)
+  assert_not_operator(h, :key?, 1)
+  assert_equal(nil, h1)
+
+  h = Hash.new(8)
+  assert_not_operator(h, :key?, 1)
+  assert_equal(8, h1)
+  assert_same(h1, h2)
+
+  k = "key"
+  h = Hash.new{|hash, key| hash, key}
+  assert_not_operator(h, :key?, k)
+  assert_equal(h, k, hk)
+  assert_same(h, hk0)
+  assert_same(k, hk1)
+
+  assert_raise(ArgumentError){Hash.new(1,2)}
+  assert_raise(ArgumentError){Hash.new(1){}}
+end
+
+%wkeys 19, %wvalues 28.each do |meth, no|
+  assert("Hash##{meth}", "15.2.13.4.#{no}") do
+    ar_entries, ht_entries.each do |entries|
+      h = entries.hash_for
+      assert_equal(entries.__send__(meth), h.__send__(meth))
+
+      h.shift
+      entries.shift
+      h.delete(entries.delete_at(3)0)
+      assert_equal(entries.__send__(meth), h.__send__(meth))
+    end
+
+    assert_equal(, {}.__send__(meth))
+  end
 end
 
-assert('Hash#store', '15.2.13.4.26') do
-  a = Hash.new
-  a.store('abc', 'abc')
+%wlength 20, %wsize 25.each do |meth, no|
+  assert("Hash##{meth}", "15.2.13.4.#{no}") do
+    ar_entries, ht_entries.each do |entries|
+      h = entries.hash_for
+      assert_equal(entries.size, h.__send__(meth))
+
+      h.shift
+      entries.shift
+      h.delete(entries.delete_at(3)0)
+      assert_equal(entries.size, h.__send__(meth))
+    end
 
-  assert_equal 'abc', a'abc'
+    assert_equal(0, Hash.new.__send__(meth))
+  end
 end
 
-assert('Hash#value?', '15.2.13.4.27') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
+assert('Hash#merge', '15.2.13.4.22') do
+  cls = Class.new(Hash){attr_accessor :foo}
+  ar_pairs = HashEntries
+    "id", 32,
+    nil, :two,
+    "&", "&amp;",
+    :same_key, :AR,
+    HashKey2, 20,
+  
+  ht_pairs = HashEntries
+    *(1..20).map{_1, _1.to_s},
+    :same_key, :HT,
+    :age, 32,
+    HashKey5, 500,
+  
+
+  ar_pairs, ht_pairs, ht_pairs, ar_pairs.each do |entries1, entries2|
+    h1 = entries1.hash_for(cls.new(:dv1)){|h| h.foo = :iv1}.freeze
+    h2 = entries2.hash_for(Hash.new(:dv2)).freeze
+    h3 = h1.merge(h2)
+    assert_equal(entries1, h1.to_a)
+    assert_equal(merge_entries!(entries1.dup2, entries2), h3.to_a)
+    assert_equal(cls, h3.class)
+    assert_equal(:dv1, h3.default)
+    assert_equal(:iv1, h3.foo)
+
+    h3 = {}.merge(entries2.hash_for(cls.new))
+    assert_equal(merge_entries!(, entries2), h3.to_a)
+    assert_equal(Hash, h3.class)
+
+    h3 = entries1.hash_for.merge({})
+    assert_equal(merge_entries!(entries1.dup2, ), h3.to_a)
+
+    h1 = entries1.hash_for
+    h2 = entries2.hash_for
+    h3 = h1.merge(h2){|k, v1, v2| k, v1, v2}
+    exp = merge_entries!(entries1.dup2, entries2)
+    exp.find{|k, _| k == :same_key}1 = 
+      :same_key,
+      entries1.find{|k, _| k == :same_key}1,
+      entries2.find{|k, _| k == :same_key}1,
+    
+    assert_equal(exp, h3.to_a)
+
+    assert_raise(TypeError){entries1.hash_for.merge("str")}
+
+    k2 = HashKey-2
+    entries2 << k2, 234
+    h1, h2 = entries1.hash_for, entries2.hash_for
+    k2.callback = ->(name, *){h1.clear if name == :eql?}
+    assert_nothing_crashed{h1.merge(h2)}
+    h1, h2 = entries1.hash_for, entries2.hash_for
+    k2.callback = ->(name, *){h2.clear if name == :eql?}
+    assert_nothing_crashed{h1.merge(h2)}
+    h1, h2 = entries1.hash_for, entries2.hash_for
+    k2.callback = ->(name, *){h1.clear if name == :hash}
+    assert_nothing_crashed{h1.merge(h2)}
+    h1, h2 = entries1.hash_for, entries2.hash_for
+    k2.callback = ->(name, *){h2.clear if name == :hash}
+    assert_nothing_crashed{h1.merge(h2)}
+  end
+end
 
-  assert_true a.value?('abc_value')
-  assert_false b.value?('cba')
+assert("Hash#replace", "15.2.13.4.23") do
+  cls = Class.new(Hash){attr_accessor :foo}
+  e = ar_entries, ht_entries
+  e, e.reverse.each do |entries1, entries2|
+    h1 = entries1.hash_for
+    assert_same(h1, h1.replace(h1))
+    assert_equal(entries1, h1.to_a)
+
+    h1 = {}
+    assert_same(h1, h1.replace(entries2.hash_for))
+    assert_equal(entries2, h1.to_a)
+
+    h1 = entries1.hash_for
+    assert_same(h1, h1.replace({}))
+    assert_predicate(h1, :empty?)
+
+    pairs2 = entries2.dup
+    h2 = pairs2.hash_for
+    pairs2.shift
+    h2.shift
+    h2.delete(pairs2.delete_at(2)0)
+    h2.delete(pairs2.delete_at(4)0)
+    h1 = entries1.hash_for
+    assert_same(h1, h1.replace(h2))
+    assert_equal(pairs2, h1.to_a)
+
+    h1 = entries1.hash_for(Hash.new(10))
+    h2 = entries2.hash_for(Hash.new(20))
+    assert_same(h1, h1.replace(h2))
+    assert_equal(entries2, h1.to_a)
+    assert_equal(20, h1.default)
+
+    h1 = entries1.hash_for(Hash.new{_2})
+    h2 = entries2.hash_for(Hash.new{_2.to_s})
+    assert_same(h1, h1.replace(h2))
+    assert_equal(entries2, h1.to_a)
+    assert_equal("-11", h1-11)
+
+    h1 = entries1.hash_for(Hash.new(10))
+    h2 = entries2.hash_for(Hash.new{_2.to_s})
+    assert_same(h1, h1.replace(h2))
+    assert_equal(entries2, h1.to_a)
+    assert_equal("-11", h1-11)
+
+    h1 = entries1.hash_for(Hash.new{_2})
+    h2 = entries2.hash_for(Hash.new(20))
+    assert_same(h1, h1.replace(h2))
+    assert_equal(entries2, h1.to_a)
+    assert_equal(20, h1-1)
+
+    h1 = entries1.hash_for(cls.new(10)){|h| h.foo = 41}
+    h2 = entries2.hash_for(cls.new(20)){|h| h.foo = 42}.freeze
+    assert_same(h1, h1.replace(h2))
+    assert_equal(entries2, h1.to_a)
+    assert_equal(20, h1.default)
+    assert_equal(41, h1.foo)
+
+    h1 = entries1.hash_for
+    h2 = entries2.hash_for(cls.new)
+    assert_same(h1, h1.replace(h2))
+    assert_equal(entries2, h1.to_a)
+
+    assert_raise(TypeError){entries1.hash_for.replace()}
+
+    k2 = HashKey-2
+    pairs2 = entries2.dup
+    pairs2 << k2, 23
+    h1 = entries1.hash_for
+    h2 = pairs2.hash_for
+    k2.callback = ->(*){h1.clear; h2.clear}
+    assert_nothing_crashed{h1.replace(h2)}
+
+    assert_raise(FrozenError){h1.freeze.replace(h1)}
+    assert_raise(FrozenError){{}.freeze.replace({})}
+  end
 end
 
-assert('Hash#values', '15.2.13.4.28') do
-  a = { 'abc_key' => 'abc_value' }
+assert('Hash#shift', '15.2.13.4.24') do
+  ar_entries, ht_entries.each do |entries|
+    pairs = entries.dup
+    h = pairs.hash_for
+    h.delete(pairs.delete_at(0)0)
+    h.delete(pairs.delete_at(3)0)
+    until pairs.empty?
+      exp = pairs.shift
+      act = h.shift
+      assert_equal(Array, act.class)
+      assert_equal(exp, act)
+      assert_equal(exp.size, act.size)
+      assert_not_operator(h, :key?, exp0)
+    end
+
+    assert_equal(nil, h.shift)
+    assert_equal(0, h.size)
+
+    h.default = -456
+    assert_equal(nil, h.shift)
+    assert_equal(0, h.size)
+
+    h.freeze
+    assert_raise(FrozenError){h.shift}
+  end
 
-  assert_equal 'abc_value', a.values
+  h = Hash.new{|h, k| h, k}
+  assert_equal(0, h.size)
+  assert_equal(nil, h.shift)
 end
 
 # Not ISO specified
 
-assert('Hash#eql?') do
-  a = { 'a' => 1, 'b' => 2, 'c' => 3 }
-  b = { 'a' => 1, 'b' => 2, 'c' => 3 }
-  c = { 'a' => 1.0, 'b' => 2, 'c' => 3 }
-  assert_true(a.eql?(b))
-  assert_false(a.eql?(c))
-  assert_false(a.eql?(true))
+%ireject select.each do |meth|
+  assert("Hash##{meth}") do
+    cls = Class.new(Hash){attr_accessor :foo}
+    ar_entries, ht_entries.each do |entries|
+      params = nil
+      filter = ->((k, v)) do
+        params << k, v
+        String === k
+      end
+
+      h = entries.hash_for(cls.new(1))
+      params = 
+      ret = h.__send__(meth, &filter)
+      assert_equal(entries, params)
+      assert_equal(entries, h.to_a)
+      assert_equal(1, h.default)
+      assert_equal(entries.__send__(meth, &filter), ret.to_a)
+      assert_equal(Hash, ret.class)
+      assert_equal(nil, ret.default)
+
+      params = 
+      assert_predicate({}.__send__(meth, &filter), :empty?)
+      assert_predicate(params, :empty?)
+    end
+  end
 end
 
-assert('Hash#reject') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.reject do |k,v|
-    v % 2 == 0
+%ireject! select!.each do |meth|
+  assert("Hash##{meth}") do
+    ar_entries, ht_entries.each do |entries|
+      params = nil
+      filter = ->((k, v)) do
+        params << k, v
+        String === k
+      end
+
+      pairs = entries.dup << "_str", 5
+      h = pairs.hash_for(Hash.new(1))
+      params = 
+      ret = h.__send__(meth, &filter)
+      assert_same(h, ret)
+      assert_equal(pairs, params)
+      assert_equal(pairs.__send__(meth.to_s0..-2, &filter), h.to_a)
+      assert_equal(1, h.default)
+
+      h = pairs.hash_for
+      ret = h.__send__(meth){meth == :select!}
+      assert_nil(ret)
+      assert_equal(pairs, h.to_a)
+
+      assert_raise(FrozenError){h.freeze.__send__(meth, &filter)}
+    end
+
+    h = {}
+    assert_nil(h.__send__(meth){})
+    assert_predicate(h, :empty?)
   end
-  assert_equal({:one => 1, :three => 3}, ret)
-  assert_equal({:one => 1, :two => 2, :three => 3, :four => 4}, h)
 end
 
-assert('Hash#reject!') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.reject! do |k,v|
-    v % 2 == 0
+%iinspect to_s.each do |meth|
+  assert("Hash##{meth}") do
+    assert_equal('{}', Hash.new.__send__(meth))
+
+    h1 = {:s => 0, :a => 1,2, 37 => :b, :d => "del", "c" => nil}
+    h1.shift
+    h1.delete(:d)
+    s1 = ':a=>1, 2, 37=>:b, "c"=>nil'
+    h2 = Hash.new(100)
+
+    (1..14).each{h2_1 = _1 * 2}
+    h2 = {**h2, **h1}
+    s2 = "1=>2, 2=>4, 3=>6, 4=>8, 5=>10, 6=>12, 7=>14, 8=>16, " \
+         "9=>18, 10=>20, 11=>22, 12=>24, 13=>26, 14=>28, #{s1}"
+
+    h1, s1, h2, s2.each do |h, s|
+      assert_equal("{#{s}}", h.__send__(meth))
+
+      hh = {}
+      hh:recur = hh
+      h.each{|k, v| hhk = v}
+      assert_equal("{:recur=>{...}, #{s}}", hh.__send__(meth))
+
+      hh = h.dup
+      hhhh = :recur
+      assert_equal("{#{s}, {...}=>:recur}", hh.__send__(meth))
+    end
+
+    ar_entries, ht_entries.each do |entries|
+      cls = Class.new do
+        attr_accessor :h
+        def inspect; @h.replace(@h.dup); to_s; end
+      end
+      v = cls.new
+      h = entries.hash_for({_k: v})
+      v.h = h
+      assert_nothing_raised{h.__send__(meth)}
+    end
   end
-  assert_equal({:one => 1, :three => 3}, ret)
-  assert_equal({:one => 1, :three => 3}, h)
 end
 
-assert('Hash#select') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.select do |k,v|
-    v % 2 == 0
+assert('Hash#rehash') do
+  cls = Class.new(Hash){attr_accessor :foo}
+  ar_entries, ht_entries.each do |entries|
+    k1, k2, k3 = HashKey-1, HashKey-2, HashKey-3
+    pairs = entries.dup.push(
+      -4, -40,
+      HashKey-11, -5,
+      :_del, "_del",
+      k1, :_k1,
+      "_a", "_b",
+      k2, :_k2,
+      "_c", "_d",
+      HashKey-22, -21,
+      k3, :_k3,
+    )
+    h = pairs.hash_for(cls.new(:defvar)){|h| h.foo = "f"}
+    k1.value, k2.value, k3.value = -11, -11, -22
+    pairs1 = pairs.dup
+    pairs1.delete(:_del, h.delete(:_del))
+    exp_pairs1 = pairs1.hash_for.to_a
+    h.freeze
+    assert_same(h, h.rehash)
+    assert_equal(exp_pairs1, h.to_a)
+    assert_equal(exp_pairs1.size, h.size)
+    assert_equal(:defvar, h.default)
+    assert_equal("f", h.foo)
+    exp_pairs1.each {|k, v| assert_equal(v, hk)}
+
+    # If an error occurs during rehash, at least the entry list is not broken.
+    k1.value, k2.value, k3.value = -1, -2, -3
+    h = pairs.hash_for
+    k1.value = -11
+    pairs2 = pairs.dup
+    pairs2.delete(:_del, h.delete(:_del))
+    exp_pairs2 = pairs2.hash_for.to_a
+    k2.error = :eql?
+    assert_raise{h.rehash}
+    act_pairs2 = h.to_a
+    unless pairs2 == act_pairs2 && pairs2.size == h.size
+      assert_equal(exp_pairs2, act_pairs2)
+      assert_equal(exp_pairs2.size, h.size)
+    end
+
+    k1.value = -1
+    k2.error = false
+    h = pairs.hash_for
+    k1.callback = ->(name, *){h.clear if name == :eql?}
+    assert_nothing_crashed{h.rehash}
+    k1.callback = ->(name, *){h.clear if name == :hash}
+    assert_nothing_crashed{h.rehash}
   end
-  assert_equal({:two => 2, :four => 4}, ret)
-  assert_equal({:one => 1, :two => 2, :three => 3, :four => 4}, h)
-end
 
-assert('Hash#select!') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.select! do |k,v|
-    v % 2 == 0
+  h = {}
+  assert_same(h, h.rehash)
+  assert_predicate(h, :empty?)
+
+  h = {}
+  (1..17).each{h_1 = _1 * 2}
+  (2..16).each{h.delete(_1)}
+  assert_same(h, h.rehash)
+  assert_equal(1, 2, 17, 34, h.to_a)
+  assert_equal(2, h.size)
+  1, 17.each{assert_equal(_1 * 2, h_1)}
+end
+
+assert('#eql? receiver should be specified key') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for
+    k0 = HashKey-99
+    hk0 = 1
+
+    k1 = HashKey-3, error: :eql?
+    assert_raise{hk1}
+    k0.error = :eql?
+    k1.error = false
+    assert_nothing_raised{hk1}
+
+    k0.error = false
+    k1.error = :eql?
+    assert_raise{hk1 = 1}
+    k0.error = :eql?
+    k1.error = false
+    assert_nothing_raised{hk1 = 1}
+
+    k0.error = false
+    k2 = HashKey-6, error: :eql?
+    assert_raise{h.delete(k2)}
+    k0.error = :eql?
+    k2.error = false
+    assert_nothing_raised{h.delete(k2)}
+
+    k0.error = false
+    k3 = HashKey-9, error: :eql?
+    %ihas_key? include? key? member?.each do |m|
+      assert_raise{h.__send__(m, k3)}
+    end
+    k0.error = :eql?
+    k3.error = false
+    %ihas_key? include? key? member?.each do |m|
+      assert_nothing_raised{h.__send__(m, k3)}
+    end
   end
-  assert_equal({:two => 2, :four => 4}, ret)
-  assert_equal({:two => 2, :four => 4}, h)
 end
 
-# Not ISO specified
-
-assert('Hash#inspect') do
-  h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
-  h"recur" = h
-  ret = h.to_s
+assert('#== receiver should be specified value') do
+  ar_entries, ht_entries.each do |entries|
+    h = entries.hash_for
+    v0 = HashKey-99
+    h-99 = v0
 
-  assert_include ret, '"c"=>300'
-  assert_include ret, '"a"=>100'
-  assert_include ret, '"d"=>400'
-  assert_include ret, '"recur"=>{...}'
-end
-
-assert('Hash#rehash') do
-  h = {:a => "b"}
-  # hash key modified
-  h.keys00 = :b
-  # h:b => nil
-  h.rehash
-  assert_equal("b", h:b)
+    v1 = HashKey-3, error: :==
+    %ihas_value? value?.each{|m| assert_raise{h.__send__(m, v1)}}
+    v0.error = :==
+    v1.error = false
+    %ihas_value? value?.each{|m| assert_nothing_raised{h.__send__(m, v1)}}
+  end
 end
 
-assert('Hash#freeze') do
-  h = {}.freeze
-  assert_raise(FrozenError) do
-    h:a = 'b'
-  end
+assert('test value ommision') do
+  x = 1
+  y = 2
+  assert_equal({x:1, y:2}, {x:, y:})
 end

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

@@ -14,16 +14,6 @@
 
   assert_raise(TypeError){ 0+nil }
   assert_raise(TypeError){ 1+nil }
-
-  c = Mrbtest::FIXNUM_MAX + 1
-  d = Mrbtest::FIXNUM_MAX.__send__(:+, 1)
-
-  skip unless Object.const_defined?(:Float)
-  e = Mrbtest::FIXNUM_MAX + 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
 end
 
 assert('Integer#-', '15.2.8.3.2') do
@@ -32,69 +22,57 @@
 
   assert_equal 1, a
   assert_equal 1.0, b if Object.const_defined?(:Float)
-
-  c = Mrbtest::FIXNUM_MIN - 1
-  d = Mrbtest::FIXNUM_MIN.__send__(:-, 1)
-
-  skip unless Object.const_defined?(:Float)
-  e = Mrbtest::FIXNUM_MIN - 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
 end
 
 assert('Integer#*', '15.2.8.3.3') do
   a = 1*1
-  b = 1*1.0 if Object.const_defined?(:Float)
-
   assert_equal 1, a
-  assert_equal 1.0, b if Object.const_defined?(:Float)
-
+  if Object.const_defined?(:Float)
+    b = 1*1.0
+    assert_equal 1.0, b
+  end
   assert_raise(TypeError){ 0*nil }
   assert_raise(TypeError){ 1*nil }
-
-  c = Mrbtest::FIXNUM_MAX * 2
-  d = Mrbtest::FIXNUM_MAX.__send__(:*, 2)
-
-  skip unless Object.const_defined?(:Float)
-  e = Mrbtest::FIXNUM_MAX * 2.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
 end
 
 assert('Integer#/', '15.2.8.3.4') do
   a = 2/1
-  b = 2/1.0
-
   assert_equal 2, a
+  a = 5/2
+  assert_equal 2, a
+  skip unless Object.const_defined?(:Float)
+  b = 2/1.0
   assert_equal 2.0, b
 end
 
+assert('Integer#quo') do
+  a = 6.quo(5)
+  assert_equal 1.2, a
+end if Object.const_defined?(:Float)
+
 assert('Integer#%', '15.2.8.3.5') do
   a = 1%1
-  b = 1%1.0
-  c = 2%4
-  d = 2%5
-  e = 2%-5
-  f = -2%5
-  g = -2%-5
-  h =  2%-2
-  i = -2%2
-  j = -2%-2
+  b = 2%4
+  c = 2%5
+  d = 2%-5
+  e = -2%5
+  f = -2%-5
+  g =  2%-2
+  h = -2%2
+  i = -2%-2
 
   assert_equal 0, a
-  assert_equal 0.0, b
+  assert_equal 2, b
   assert_equal 2, c
-  assert_equal 2, d
-  assert_equal(-3, e)
-  assert_equal 3, f
-  assert_equal(-2, g)
+  assert_equal(-3, d)
+  assert_equal 3, e
+  assert_equal(-2, f)
+  assert_equal 0, g
   assert_equal 0, h
   assert_equal 0, i
-  assert_equal 0, j
+  skip unless Object.const_defined?(:Float)
+  j = 1%1.0
+  assert_equal 0.0, j
 end
 
 assert('Integer#<=>', '15.2.9.3.6') do
@@ -155,10 +133,6 @@
   assert_equal 23, 46 << -1
 
   skip unless Object.const_defined?(:Float)
-
-  # Overflow to Fixnum
-  assert_float 9223372036854775808.0, 1 << 63
-  assert_float(-13835058055282163712.0, -3 << 62)
 end
 
 assert('Integer#>>', '15.2.8.3.13') do

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

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

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

@@ -90,7 +90,7 @@
   a = <<AAA
 aaa
 AAA
-   b = <<b_b
+  b = <<b_b
 bbb
 b_b
     c = <<CCC1, <<"CCC2", <<'CCC3'
@@ -162,6 +162,47 @@
 QQ2
       "o")
 
+  r = <<~RRR
+    rrr
+      rrr
+  RRR
+  s = <<~"SSS"
+    sss
+      sss
+  SSS
+  t = <<~'TTT'
+    ttt
+      ttt
+  TTT
+  u = <<~UUU1   , <<~"UUU2"   , <<~'UUU3' 
+    u#{1}u
+  UUU1
+    u#{2}u
+  UUU2
+    u#{3}u
+  UUU3
+  v1 = <<~VVV
+
+    vvv
+    #{"vvv"}
+  VVV
+  v2 = <<~VVV
+\tvvv
+  vvv
+  VVV
+  v3 = <<~VVV
+    v v v
+      vvv
+  VVV
+  v4 = <<~VVV
+    vvv \
+    vvv
+  VVV
+  v5 = <<~VVV
+      vvv \
+    vvv
+  VVV
+
   w = %W( 1 #{<<WWW} 3
 www
 WWW
@@ -197,10 +238,18 @@
   assert_equal 1, "nn1\n", 3, 4, n
   assert_equal "a $ q\n $ c $ d", q1
   assert_equal "l $ mqq\nn $ o", q2
+  assert_equal "rrr\n  rrr\n", r
+  assert_equal "sss\n  sss\n", s
+  assert_equal "ttt\n  ttt\n", t
+  assert_equal "u1u\n", "u2u\n", "u\#{3}u\n", u
+  assert_equal "\nvvv\nvvv\n", v1
+  assert_equal "\tvvv\n  vvv\n", v2
+  assert_equal "v v v\n  vvv\n", v3
+  assert_equal "vvv vvv\n", v4
+  assert_equal "  vvv vvv\n", v5
   assert_equal "1", "www\n", "3", "4", "5", w
   assert_equal 1, "foo 222 333\n 444\n5\n bar\n6\n", 9, x
   assert_equal "", z
-
 end

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

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

@@ -391,15 +391,15 @@
     class Parent
       def hello
       end
-     end
+    end
 
-     class Child < Parent
+    class Child < Parent
       def hello
       end
-     end
+    end
 
-     class GrandChild < Child
-     end
+    class GrandChild < Child
+    end
   end
   Test4UndefMethod::Child.class_eval{ undef_method :hello }
 
@@ -593,7 +593,7 @@
   #        to_f / other
   #      end
   #    end
-  #    Fixnum.send(:prepend, M)
+  #    Integer.send(:prepend, M)
   #    assert_equal(0.5, 1 / 2, "#{bug7983}")
   #  }
   #  assert_equal(0, 1 / 2)
@@ -674,7 +674,7 @@
     c1 = labeled_class("C1")
     c2 = labeled_class("C2", c1) {prepend m}
     c1.class_eval {prepend m}
-    assert_equal(m, c2, m, c1, c2.ancestors0, 4, "should accesisble prepended module in superclass")
+    assert_equal(m, c2, m, c1, c2.ancestors0, 4, "should accessible prepended module in superclass")
   end
 
   # requires #assert_separately
@@ -736,9 +736,9 @@
 
   class C1
     include M1
-     def initialize()
-       super()
-     end
+      def initialize()
+        super()
+      end
   end
 
   class C2

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

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

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

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

@@ -8,19 +8,39 @@
 assert('Range#==', '15.2.14.4.1') do
   assert_true (1..10) == (1..10)
   assert_false (1..10) == (1..100)
+  assert_false (1..10) == (1..)
+  assert_false (1..10) == (..10)
+
+  assert_true (1..) == (1..nil)
+  assert_true (1..) == (1..)
+  assert_false (1..) == (1...)
+
+  assert_true (..1) == (nil..1)
+  assert_true (..1) == (..1)
+  assert_false (..1) == (...1)
+
   skip unless Object.const_defined?(:Float)
   assert_true (1..10) == Range.new(1.0, 10.0)
+
 end
 
 assert('Range#===', '15.2.14.4.2') do
   a = (1..10)
+  b = (1..)
+  c = (..10)
 
   assert_true a === 5
   assert_false a === 20
+  assert_true b === 20
+  assert_false b === 0
+  assert_false c === 20
+  assert_true c === 0
 end
 
 assert('Range#begin', '15.2.14.4.3') do
   assert_equal 1, (1..10).begin
+  assert_equal 1, (1..).begin
+  assert_nil (..1).begin
 end
 
 assert('Range#each', '15.2.14.4.4') do
@@ -28,27 +48,45 @@
   b = 0
   a.each {|i| b += i}
   assert_equal 6, b
+  c = 
+  (1..).each { |i| c << i; break if c.size == 10 }
+  assert_equal 1, 2, 3, 4, 5, 6, 7, 8 ,9, 10, c
 end
 
 assert('Range#end', '15.2.14.4.5') do
   assert_equal 10, (1..10).end
+  assert_nil (1..).end
+  assert_equal 10, (..10).end
 end
 
 assert('Range#exclude_end?', '15.2.14.4.6') do
   assert_true (1...10).exclude_end?
   assert_false (1..10).exclude_end?
+  assert_true (1...).exclude_end?
+  assert_false (1..).exclude_end?
+  assert_true (...1).exclude_end?
+  assert_false (..1).exclude_end?
 end
 
 assert('Range#first', '15.2.14.4.7') do
   assert_equal 1, (1..10).first
+  assert_equal 1, (1..).first
 end
 
 assert('Range#include?', '15.2.14.4.8') do
   assert_true (1..10).include?(10)
   assert_false (1..10).include?(11)
+  assert_true (1..).include?(10)
+  assert_false (1..).include?(0)
+  assert_true (..10).include?(10)
+  assert_true (..10).include?(0)
 
   assert_true (1...10).include?(9)
   assert_false (1...10).include?(10)
+  assert_true (1...).include?(10)
+  assert_false (1...).include?(0)
+  assert_false (...10).include?(10)
+  assert_true (...10).include?(0)
 end
 
 assert('Range#initialize', '15.2.14.4.9') do
@@ -61,17 +99,29 @@
   assert_false b.exclude_end?
 
   assert_raise(NameError) { (0..1).__send__(:initialize, 1, 3) }
+
+  c = Range.new(1, nil, true)
+  d = Range.new(1, nil, false)
+
+  assert_equal (1...nil), c
+  assert_true c.exclude_end?
+  assert_equal (1..nil), d
+  assert_false d.exclude_end?
 end
 
 assert('Range#last', '15.2.14.4.10') do
   assert_equal 10, (1..10).last
+  assert_nil (1..).last
 end
 
 assert('Range#member?', '15.2.14.4.11') do
   a = (1..10)
+  b = (1..)
 
   assert_true a.member?(5)
   assert_false a.member?(20)
+  assert_true b.member?(20)
+  assert_false b.member?(0)
 end
 
 assert('Range#to_s', '15.2.14.4.12') do
@@ -79,6 +129,10 @@
   assert_equal "0...1", (0...1).to_s
   assert_equal "a..b", ("a".."b").to_s
   assert_equal "a...b", ("a"..."b").to_s
+  assert_equal "0..", (0..).to_s
+  assert_equal "0...", (0...).to_s
+  assert_equal "a..", ("a"..).to_s
+  assert_equal "a...", ("a"...).to_s
 end
 
 assert('Range#inspect', '15.2.14.4.13') do
@@ -86,19 +140,36 @@
   assert_equal "0...1", (0...1).inspect
   assert_equal "\"a\"..\"b\"", ("a".."b").inspect
   assert_equal "\"a\"...\"b\"", ("a"..."b").inspect
+  assert_equal "0..", (0..).inspect
+  assert_equal "0...", (0...).inspect
+  assert_equal "\"a\"..", ("a"..).inspect
+  assert_equal "\"a\"...", ("a"...).inspect
 end
 
 assert('Range#eql?', '15.2.14.4.14') do
   assert_true (1..10).eql? (1..10)
   assert_false (1..10).eql? (1..100)
-  assert_false (1..10).eql? (Range.new(1.0, 10.0))
   assert_false (1..10).eql? "1..10"
+  assert_true (1..).eql? (1..)
+  assert_false (1..).eql? (2..)
+  assert_false (1..).eql? "1.."
+  skip unless Object.const_defined?(:Float)
+  assert_false (1..10).eql? (Range.new(1.0, 10.0))
+  assert_false (1..).eql? (Range.new(1.0, nil))
 end
 
 assert('Range#initialize_copy', '15.2.14.4.15') do
   assert_raise(NameError) { (0..1).__send__(:initialize_copy, 1..3) }
 end
 
+assert('Range#hash', '15.3.1.3.15') do
+  assert_kind_of(Integer, (1..10).hash)
+  assert_equal (1..10).hash, (1..10).hash
+  assert_not_equal (1..10).hash, (1...10).hash
+  assert_equal (1..).hash, (1..).hash
+  assert_not_equal (1..).hash, (1...).hash
+end
+
 assert('Range#dup') do
   r = (1..3).dup
   assert_equal 1, r.begin
@@ -109,4 +180,15 @@
   assert_equal "a", r.begin
   assert_equal "z", r.end
   assert_true r.exclude_end?
+
+  r = (1..).dup
+  assert_equal 1, r.begin
+  assert_nil r.end
+  assert_false r.exclude_end?
+end
+
+assert('Range#to_a') do
+  assert_equal(1, 2, 3, 4, 5, (1..5).to_a)
+  assert_equal(1, 2, 3, 4, (1...5).to_a)
+  assert_raise(RangeError) { (1..).to_a }
 end

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

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

@@ -23,22 +23,21 @@
   :Exception, :Object, '15.2.22.2',
   :StandardError, :Exception, '15.2.23.2',
   :ArgumentError, :StandardError, '15.2.24.2',
-  # :LocalJumpError, :StandardError, '15.2.25.2',
-  :LocalJumpError, :ScriptError, '15.2.25.2', # mruby specific
-  :RangeError, :StandardError, '12.2.26.2',
-  :RegexpError, :StandardError, '12.2.27.2',
-  :RuntimeError, :StandardError, '12.2.28.2',
-  :TypeError, :StandardError, '12.2.29.2',
-#  :ZeroDivisionError, :StandardError, '12.2.30.2',  # No ZeroDivisionError in mruby
+  :LocalJumpError, :StandardError, '15.2.25.2',
+  :RangeError, :StandardError, '15.2.26.2',
+  :RegexpError, :StandardError, '15.2.27.2',
+  :RuntimeError, :StandardError, '15.2.28.2',
+  :TypeError, :StandardError, '15.2.29.2',
+  :ZeroDivisionError, :StandardError, '15.2.30.2',
   :NameError, :StandardError, '15.2.31.2',
   :NoMethodError, :NameError, '15.2.32.2',
   :IndexError, :StandardError, '15.2.33.2',
-#  :IOError, :StandardError, '12.2.34.2',
-#  :EOFError, :IOError, '12.2.35.2',
+#  :IOError, :StandardError, '15.2.34.2',
+#  :EOFError, :IOError, '15.2.35.2',
 #  :SystemCallError, :StandardError, '15.2.36.2',
-  :ScriptError, :Exception, '12.2.37.2',
-  :SyntaxError, :ScriptError, '12.2.38.2',
-#  :LoadError, :ScriptError, '12.2.39,2',
+  :ScriptError, :Exception, '15.2.37.2',
+  :SyntaxError, :ScriptError, '15.2.38.2',
+#  :LoadError, :ScriptError, '15.2.39,2',
 .each do |cls, super_cls, iso|
   assert "Direct superclass of #{cls}", iso do
     skip "#{cls} isn't defined" unless Object.const_defined? cls

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

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

@@ -35,9 +35,10 @@
 end
 
 assert('yield', '11.3.5') do
-  assert_raise LocalJumpError do
-    yield
-  end
+# it's syntax error now
+#  assert_raise LocalJumpError do
+#    yield
+#  end
   assert_raise LocalJumpError do
     o = Object.new
     def o.foo
@@ -47,7 +48,32 @@
   end
 end
 
-assert('redo in a for loop (#3275)') do
+assert('break', '11.5.2.4.3') do
+  n = 0
+  a = 
+  while true
+    n += 1
+    a.push(n)
+    if n > 3
+      break
+    end
+  end
+
+  assert_equal 1,2,3,4, a
+
+  n = 0
+  a = 
+  6.times do
+    n += 1
+    a.push(n)
+    if n > 3
+      break
+    end
+  end
+  assert_equal 1,2,3,4, a
+end
+
+assert('redo', '11.5.2.4.5') do
   sum = 0
   for i in 1..10
     sum += i
@@ -58,6 +84,17 @@
   end
 
   assert_equal 220, sum
+
+  n = 0
+  a = 
+  3.times do
+    n += 1
+    if n == 2
+      redo
+    end
+    a.push(n)
+  end
+  assert_equal 1,3,4, a
 end
 
 assert('Abbreviated variable assignment', '11.4.2.3.2') do
@@ -187,6 +224,18 @@
   assert_equal 1, Syntax4AbbrVarAsgnAsReturns::A.new.b
 end
 
+assert('Abbreviated variable assignment of object attribute') do
+  module Syntax4AbbrVarAsgnObjectAttr
+    class A
+      attr_accessor :c
+      def b
+        self.c ||= 1
+      end
+    end
+  end
+  assert_equal 1, Syntax4AbbrVarAsgnObjectAttr::A.new.b
+end
+
 assert('Splat and multiple assignment') do
   *a = *1,2,3
   b, *c = *7,8,9
@@ -345,6 +394,11 @@
   assert_equal 2, (a = *o)
 end
 
+assert('one-line pattern match') do
+  1 => a
+  assert_equal(1, a)
+end
+
 assert('splat object in case statement') do
   o = Object.new
   def o.to_a
@@ -498,8 +552,7 @@
   assert_raise(ArgumentError) { m }
   assert_raise(ArgumentError) { m 'a'  => 1, a: 1 }
   h = { a: 1 }
-  assert_equal 1, m(h)
-  assert_equal({ a: 1 }, h)
+  assert_equal 1, m(**h)
 
   def m(a: 1) a end
   assert_equal 1, m
@@ -514,23 +567,23 @@
   def m(a, **) a end
   assert_equal 1, m(1)
   assert_equal 1, m(1, a: 2, b: 3)
-  assert_equal({ 'a' => 1, b: 2 }, m('a' => 1, b: 2))
+  assert_raise(ArgumentError) { m('a' => 1, b: 2) }
 
   def m(a, **k) a, k end
   assert_equal 1, {}, m(1)
   assert_equal 1, {a: 2, b: 3}, m(1, a: 2, b: 3)
-  assert_equal {'a' => 1, b: 2}, {}, m('a' => 1, b: 2)
+  assert_raise(ArgumentError) { m('a' => 1, b: 2) }
 
   def m(a=1, **) a end
   assert_equal 1, m
   assert_equal 2, m(2, a: 1, b: 0)
-  assert_raise(ArgumentError) { m('a' => 1, a: 2) }
 
   def m(a=1, **k) a, k end
   assert_equal 1, {}, m
   assert_equal 1, {a: 1}, m(a: 1)
   assert_equal 2, {a: 1, b: 2}, m(2, a: 1, b: 2)
-  assert_equal {a: 1}, {b: 2}, m({a: 1}, {b: 2})
+  assert_equal {a: 1}, {b: 2}, m({a: 1}, b: 2)
+  assert_raise(ArgumentError) { m({a: 1}, {b: 2}) }
 
   def m(*, a:) a end
   assert_equal 1, m(a: 1)
@@ -555,34 +608,27 @@
   def m(*a, **) a end
   assert_equal , m()
   assert_equal 1, 2, 3, m(1, 2, 3, a: 4, b: 5)
-  assert_raise(ArgumentError) { m("a" => 1, a: 1) }
   assert_equal 1, m(1, **{a: 2})
 
   def m(*, **k) k end
   assert_equal({}, m())
   assert_equal({a: 4, b: 5}, m(1, 2, 3, a: 4, b: 5))
-  assert_raise(ArgumentError) { m("a" => 1, a: 1) }
 
   def m(a = nil, b = nil, **k) a, k end
   assert_equal nil, {}, m()
   assert_equal(nil, {a: 1}, m(a: 1))
-  assert_raise(ArgumentError) { m("a" => 1, a: 1) }
   assert_equal({"a" => 1}, {a: 1}, m({ "a" => 1 }, a: 1))
   assert_equal({a: 1}, {}, m({a: 1}, {}))
-  assert_equal(nil, {}, m({}))
+  assert_equal({}, {}, m({}))
 
   def m(*a, **k) a, k end
   assert_equal(, {}, m())
   assert_equal(1, {}, m(1))
   assert_equal(, {a: 1, b: 2}, m(a: 1, b: 2))
   assert_equal(1, 2, 3, {a: 2}, m(1, 2, 3, a: 2))
-  assert_raise(ArgumentError) { m("a" => 1, a: 1) }
-  assert_raise(ArgumentError) { m("a" => 1) }
   assert_equal(, {a: 1}, m(a: 1))
-  assert_raise(ArgumentError) { m("a" => 1, a: 1) }
   assert_equal({"a" => 1}, {a: 1}, m({ "a" => 1 }, a: 1))
-  assert_equal({a: 1}, {}, m({a: 1}, {}))
-  assert_raise(ArgumentError) { m({a: 1}, {"a" => 1}) }
+  assert_equal({a: 1}, {}, {}, m({a: 1}, {}))
 
   def m(a:, b:) a, b end
   assert_equal(1, 2, m(a: 1, b: 2))
@@ -591,23 +637,21 @@
   def m(a:, b: 1) a, b end
   assert_equal(1, 1, m(a: 1))
   assert_equal(1, 2, m(a: 1, b: 2))
+  assert_raise(ArgumentError) { m(b: 1) }
   assert_raise(ArgumentError) { m("a" => 1, a: 1, b: 2) }
 
   def m(a:, **) a end
   assert_equal(1, m(a: 1))
   assert_equal(1, m(a: 1, b: 2))
-  assert_raise(ArgumentError) { m("a" => 1, a: 1, b: 2) }
 
   def m(a:, **k) a, k end
   assert_equal(1, {}, m(a: 1))
   assert_equal(1, {b: 2, c: 3}, m(a: 1, b: 2, c: 3))
-  assert_raise(ArgumentError) { m("a" => 1, a: 1, b: 2) }
 
-=begin
   def m(a:, &b) a, b end
   assert_equal(1, nil, m(a: 1))
-  assert_equal(1, l, m(a: 1, &(l = ->{})))
-=end
+  result = m(a: 1, &(l = ->{}))
+  assert_equal(1, l, result)
 
   def m(a: 1, b:) a, b end
   assert_equal(1, 0, m(b: 0))
@@ -645,21 +689,12 @@
   assert_equal({ a: 1, b: 2}, nil, m(a: 1, b: 2))
   assert_equal :blk, m{ :blk }1.call
 
-  def m(hsh = {}) hsh end
-  assert_equal({ a: 1, b: 2 }, m(a: 1, b: 2))
-  assert_equal({ a: 1, 'b' => 2 }, m(a: 1, 'b' => 2))
-
-  def m(hsh) hsh end
-  assert_equal({ a: 1, b: 2 }, m(a: 1, b: 2))
-  assert_equal({ a: 1, 'b' => 2 }, m(a: 1, 'b' => 2))
-
 =begin
   def m(a, b=1, *c, (*d, (e)), f: 2, g:, h:, **k, &l)
     a, b, c, d, e, f, g, h, k, l
   end
   result = m(9, 8, 7, 6, f: 5, g: 4, h: 3, &(l = ->{}))
   assert_equal(9, 8, 7, , 6, 5, 4, 3, {}, l, result)
-
   def m a, b=1, *c, d, e:, f: 2, g:, **k, &l
     a, b, c, d, e, f, g, k, l
   end
@@ -681,3 +716,57 @@
   _0 = :l
   assert_equal(:l, ->{_0}.call)
 end
+
+assert('argument forwarding') do
+  c = Class.new {
+    def a0(*a,&b)
+      assert_equal(1,2,3, a)
+      assert_not_nil(b)
+    end
+    def a(...)
+      a0(...)
+    end
+    def b(a,...)
+      assert_equal(a,1)
+      a0(1,...)
+    end
+    def c ...
+      a(...)
+    end
+    def d a,...
+      assert_equal(a,1)
+      b(1,...)
+    end
+  }
+  o = c.new
+  o.a(1,2,3){}
+  o.b(1,2,3){}
+  o.c(1,2,3){}
+  o.d(1,2,3){}
+end
+
+assert('endless def') do
+  c = Class.new {
+    def m1 = 42
+    def m2() = 42
+    def m3(x) = x+1
+    def self.s1 = 42
+    def self.s2() = 42
+    def self.s3(x) = x + 1
+    def cm1 = m3 42
+    def cm2() = m3 42
+    def cm3(x) = m3 x+1
+    def self.cs1 = s3 42
+    def self.cs2() = s3 42
+    def self.cs3(x) = s3 x + 1
+  }
+  o = c.new
+  assert_equal(42, o.m1)
+  assert_equal(43, o.m3(o.m2))
+  assert_equal(42, c.s1)
+  assert_equal(43, c.s3(c.s2))
+  assert_equal(43, o.cm1)
+  assert_equal(45, o.cm3(o.cm2))
+  assert_equal(43, c.cs1)
+  assert_equal(45, c.cs3(c.cs2))
+end

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

@@ -1,15 +1,15 @@
 # Test of the \u notation
 
 assert('bare \u notation test') do
-  # Mininum and maximum one byte characters
+  # Minimum and maximum one byte characters
   assert_equal("\x00", "\u0000")
   assert_equal("\x7F", "\u007F")
 
-  # Mininum and maximum two byte characters
+  # Minimum and maximum two byte characters
   assert_equal("\xC2\x80", "\u0080")
   assert_equal("\xDF\xBF", "\u07FF")
 
-  # Mininum and maximum three byte characters
+  # Minimum and maximum three byte characters
   assert_equal("\xE0\xA0\x80", "\u0800")
   assert_equal("\xEF\xBF\xBF", "\uFFFF")
 
@@ -17,19 +17,19 @@
 end
 
 assert('braced \u notation test') do
-  # Mininum and maximum one byte characters
+  # Minimum and maximum one byte characters
   assert_equal("\x00", "\u{0000}")
   assert_equal("\x7F", "\u{007F}")
 
-  # Mininum and maximum two byte characters
+  # Minimum and maximum two byte characters
   assert_equal("\xC2\x80", "\u{0080}")
   assert_equal("\xDF\xBF", "\u{07FF}")
 
-  # Mininum and maximum three byte characters
+  # Minimum and maximum three byte characters
   assert_equal("\xE0\xA0\x80", "\u{0800}")
   assert_equal("\xEF\xBF\xBF", "\u{FFFF}")
 
-  # Mininum and maximum four byte characters
+  # Minimum and maximum four byte characters
   assert_equal("\xF0\x90\x80\x80", "\u{10000}")
   assert_equal("\xF4\x8F\xBF\xBF", "\u{10FFFF}")
 end

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

@@ -17,7 +17,7 @@
   assert_equal '`t`: NilClass', vf.v('`t`: %t', nil)
   assert_equal '`t`: FalseClass', vf.v('`t`: %t', false)
   assert_equal '`t`: TrueClass', vf.v('`t`: %t', true)
-  assert_equal '`t`: Fixnum', vf.v('`t`: %t', 0)
+  assert_equal '`t`: Integer', vf.v('`t`: %t', 0)
   assert_equal '`t`: Hash', vf.v('`t`: %t', {k: "value"})
   assert_match '#<Class:#<Class:#<Hash:0x*>>>', vf.v('%t', sclass({}))
   assert_equal 'string and length', vf.l('string %l length', 'andante', 3)
@@ -29,13 +29,13 @@
   assert_equal '`T`: NilClass', vf.v('`T`: %T', nil)
   assert_equal '`T`: FalseClass', vf.v('`T`: %T', false)
   assert_equal '`T`: TrueClass', vf.v('`T`: %T', true)
-  assert_equal '`T`: Fixnum', vf.v('`T`: %T', 0)
+  assert_equal '`T`: Integer', vf.v('`T`: %T', 0)
   assert_equal '`T`: Hash', vf.v('`T`: %T', {k: "value"})
   assert_match 'Class', vf.v('%T', sclass({}))
   assert_equal '`Y`: nil', vf.v('`Y`: %Y', nil)
   assert_equal '`Y`: false', vf.v('`Y`: %Y', false)
   assert_equal '`Y`: true', vf.v('`Y`: %Y', true)
-  assert_equal '`Y`: Fixnum', vf.v('`Y`: %Y', 0)
+  assert_equal '`Y`: Integer', vf.v('`Y`: %Y', 0)
   assert_equal '`Y`: Hash', vf.v('`Y`: %Y', {k: "value"})
   assert_equal 'Class', vf.v('%Y', sclass({}))
   assert_match '#<Class:#<String:0x*>>', vf.v('%v', sclass(""))

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

@@ -32,33 +32,90 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
-#include <openssl/rand.h>
-#include <openssl/ssl.h>
-#include <openssl/rsa.h>
-#include <openssl/bn.h>
-#ifdef __linux__
+#if defined(__linux__)
+#include <sys/syscall.h>
 #include <sys/prctl.h>
+#elif defined(__APPLE__)
+#include <sys/ptrace.h>
+#elif defined(__FreeBSD__)
+#include <sys/procctl.h>
+#elif defined(__sun)
+#include <priv.h>
 #endif
-#include "neverbleed.h"
 
-#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
-#define OPENSSL_1_1_API 1
-#else
-#define OPENSSL_1_1_API 0
+#include <openssl/opensslconf.h>
+#include <openssl/opensslv.h>
+
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+/* RSA_METHOD is opaque, so RSA_meth* are used. */
+#define NEVERBLEED_OPAQUE_RSA_METHOD
 #endif
 
-enum neverbleed_type { NEVERBLEED_TYPE_ERROR, NEVERBLEED_TYPE_RSA, NEVERBLEED_TYPE_ECDSA };
+#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
 
-struct expbuf_t {
-    char *buf;
-    char *start;
-    char *end;
-    size_t capacity;
-};
+#include <openssl/bn.h>
+#ifdef NEVERBLEED_ECDSA
+#include <openssl/ec.h>
+#endif
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/ssl.h>
+
+#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)
+{
+    if (n) {
+        *n = rsa->n;
+    }
+
+    if (e) {
+        *e = rsa->e;
+    }
+
+    if (d) {
+        *d = rsa->d;
+    }
+}
+
+static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+{
+    if (n == NULL || e == NULL) {
+        return 0;
+    }
+
+    BN_free(rsa->n);
+    BN_free(rsa->e);
+    BN_free(rsa->d);
+    rsa->n = n;
+    rsa->e = e;
+    rsa->d = d;
+
+    return 1;
+}
+
+static void RSA_set_flags(RSA *r, int flags)
+{
+    r->flags |= flags;
+}
+
+#define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY)
+
+#endif
+
+#include "neverbleed.h"
+
+enum neverbleed_type { NEVERBLEED_TYPE_ERROR, NEVERBLEED_TYPE_RSA, NEVERBLEED_TYPE_ECDSA };
 
 struct st_neverbleed_rsa_exdata_t {
     neverbleed_t *nb;
@@ -147,12 +204,7 @@
     return 0;
 }
 
-static size_t expbuf_size(struct expbuf_t *buf)
-{
-    return buf->end - buf->start;
-}
-
-static void expbuf_dispose(struct expbuf_t *buf)
+static void iobuf_dispose(neverbleed_iobuf_t *buf)
 {
     if (buf->capacity != 0)
         OPENSSL_cleanse(buf->buf, buf->capacity);
@@ -160,59 +212,59 @@
     memset(buf, 0, sizeof(*buf));
 }
 
-static void expbuf_reserve(struct expbuf_t *buf, size_t extra)
+static void iobuf_reserve(neverbleed_iobuf_t *buf, size_t extra)
 {
     char *n;
 
-    if (extra <= buf->buf + buf->capacity - buf->end)
+    if (extra <= buf->buf - buf->end + buf->capacity)
         return;
 
     if (buf->capacity == 0)
         buf->capacity = 4096;
-    while (buf->buf + buf->capacity - buf->end < extra)
+    while (buf->buf - buf->end + buf->capacity < extra)
         buf->capacity *= 2;
     if ((n = realloc(buf->buf, buf->capacity)) == NULL)
         dief("realloc failed");
-    buf->start += n - buf->buf;
-    buf->end += n - buf->buf;
+    buf->start = n + (buf->start - buf->buf);
+    buf->end = n + (buf->end - buf->buf);
     buf->buf = n;
 }
 
-static void expbuf_push_num(struct expbuf_t *buf, size_t v)
+static void iobuf_push_num(neverbleed_iobuf_t *buf, size_t v)
 {
-    expbuf_reserve(buf, sizeof(v));
+    iobuf_reserve(buf, sizeof(v));
     memcpy(buf->end, &v, sizeof(v));
     buf->end += sizeof(v);
 }
 
-static void expbuf_push_str(struct expbuf_t *buf, const char *s)
+static void iobuf_push_str(neverbleed_iobuf_t *buf, const char *s)
 {
     size_t l = strlen(s) + 1;
-    expbuf_reserve(buf, l);
+    iobuf_reserve(buf, l);
     memcpy(buf->end, s, l);
     buf->end += l;
 }
 
-static void expbuf_push_bytes(struct expbuf_t *buf, const void *p, size_t l)
+static void iobuf_push_bytes(neverbleed_iobuf_t *buf, const void *p, size_t l)
 {
-    expbuf_push_num(buf, l);
-    expbuf_reserve(buf, l);
+    iobuf_push_num(buf, l);
+    iobuf_reserve(buf, l);
     memcpy(buf->end, p, l);
     buf->end += l;
 }
 
-static int expbuf_shift_num(struct expbuf_t *buf, size_t *v)
+static int iobuf_shift_num(neverbleed_iobuf_t *buf, size_t *v)
 {
-    if (expbuf_size(buf) < sizeof(*v))
+    if (neverbleed_iobuf_size(buf) < sizeof(*v))
         return -1;
     memcpy(v, buf->start, sizeof(*v));
     buf->start += sizeof(*v);
     return 0;
 }
 
-static char *expbuf_shift_str(struct expbuf_t *buf)
+static char *iobuf_shift_str(neverbleed_iobuf_t *buf)
 {
-    char *nul = memchr(buf->start, '\0', expbuf_size(buf)), *ret;
+    char *nul = memchr(buf->start, '\0', neverbleed_iobuf_size(buf)), *ret;
     if (nul == NULL)
         return NULL;
     ret = buf->start;
@@ -220,22 +272,22 @@
     return ret;
 }
 
-static void *expbuf_shift_bytes(struct expbuf_t *buf, size_t *l)
+static void *iobuf_shift_bytes(neverbleed_iobuf_t *buf, size_t *l)
 {
     void *ret;
-    if (expbuf_shift_num(buf, l) != 0)
+    if (iobuf_shift_num(buf, l) != 0)
         return NULL;
-    if (expbuf_size(buf) < *l)
+    if (neverbleed_iobuf_size(buf) < *l)
         return NULL;
     ret = buf->start;
     buf->start += *l;
     return ret;
 }
 
-static int expbuf_write(struct expbuf_t *buf, int fd)
+static int iobuf_write(neverbleed_iobuf_t *buf, int fd)
 {
     struct iovec vecs2 = {{NULL}};
-    size_t bufsz = expbuf_size(buf);
+    size_t bufsz = neverbleed_iobuf_size(buf);
     int vecindex;
     ssize_t r;
 
@@ -263,19 +315,54 @@
     return 0;
 }
 
-static int expbuf_read(struct expbuf_t *buf, int fd)
+static int iobuf_read(neverbleed_iobuf_t *buf, int fd)
 {
     size_t sz;
-
     if (read_nbytes(fd, &sz, sizeof(sz)) != 0)
         return -1;
-    expbuf_reserve(buf, sz);
+    iobuf_reserve(buf, sz);
     if (read_nbytes(fd, buf->end, sz) != 0)
         return -1;
     buf->end += sz;
     return 0;
 }
 
+static void iobuf_transaction_write(neverbleed_iobuf_t *buf, struct st_neverbleed_thread_data_t *thdata)
+{
+    if (iobuf_write(buf, thdata->fd) == -1) {
+        if (errno != 0) {
+            dief("write error (%d) %s", errno, strerror(errno));
+        } else {
+            dief("connection closed by daemon");
+        }
+    }
+}
+
+static void iobuf_transaction_read(neverbleed_iobuf_t *buf, struct st_neverbleed_thread_data_t *thdata)
+{
+    iobuf_dispose(buf);
+    if (iobuf_read(buf, thdata->fd) == -1) {
+        if (errno != 0) {
+            dief("read error (%d) %s", errno, strerror(errno));
+        } else {
+            dief("connection closed by daemon");
+        }
+    }
+}
+
+/**
+ * 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);
+    } else {
+        iobuf_transaction_write(buf, thdata);
+        iobuf_transaction_read(buf, thdata);
+    }
+}
+
 #if !defined(NAME_MAX) || defined(__linux__)
 /* readdir(3) is known to be thread-safe on Linux and should be thread-safe on a platform that does not have a predefined value for
    NAME_MAX */
@@ -312,15 +399,17 @@
     rmdir(path);
 }
 
-void dispose_thread_data(void *_thdata)
+static void dispose_thread_data(void *_thdata)
 {
     struct st_neverbleed_thread_data_t *thdata = _thdata;
+
     assert(thdata->fd >= 0);
     close(thdata->fd);
     thdata->fd = -1;
+    free(thdata);
 }
 
-struct st_neverbleed_thread_data_t *get_thread_data(neverbleed_t *nb)
+static struct st_neverbleed_thread_data_t *get_thread_data(neverbleed_t *nb)
 {
     struct st_neverbleed_thread_data_t *thdata;
     pid_t self_pid = getpid();
@@ -357,6 +446,24 @@
     return thdata;
 }
 
+int neverbleed_get_fd(neverbleed_t *nb)
+{
+    struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
+    return thdata->fd;
+}
+
+void neverbleed_transaction_read(neverbleed_t *nb, neverbleed_iobuf_t *buf)
+{
+    struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
+    iobuf_transaction_read(buf, thdata);
+}
+
+void neverbleed_transaction_write(neverbleed_t *nb, neverbleed_iobuf_t *buf)
+{
+    struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
+    iobuf_transaction_write(buf, thdata);
+}
+
 static void get_privsep_data(const RSA *rsa, struct st_neverbleed_rsa_exdata_t **exdata,
                              struct st_neverbleed_thread_data_t **thdata)
 {
@@ -366,159 +473,106 @@
     *thdata = get_thread_data((*exdata)->nb);
 }
 
-static const size_t default_reserved_size = 8192;
-
-struct key_slots {
-    size_t size;
-    size_t reserved_size;
-    /* bit array slots:
-     *   1-bit slot available
-     *   0-bit slot unavailable
-     */
-    uint8_t *bita_avail;
-};
-
 static struct {
     struct {
         pthread_mutex_t lock;
-        RSA **keys;
-        struct key_slots rsa_slots;
-        EC_KEY **ecdsa_keys;
-        struct key_slots ecdsa_slots;
+        /**
+         * if the slot is use contains a non-NULL key; if not in use, contains the index of the next empty slot or SIZE_MAX if there
+         * are no more empty slots
+         */
+        union {
+            EVP_PKEY *pkey;
+            size_t next_empty;
+        } *slots;
+        size_t num_slots;
+        size_t first_empty;
     } keys;
     neverbleed_t *nb;
-} daemon_vars = {{PTHREAD_MUTEX_INITIALIZER}};
+} daemon_vars = {{.lock = PTHREAD_MUTEX_INITIALIZER, .first_empty = SIZE_MAX}};
 
 static RSA *daemon_get_rsa(size_t key_index)
 {
-    RSA *rsa;
+    RSA *rsa = NULL;
 
     pthread_mutex_lock(&daemon_vars.keys.lock);
-    rsa = daemon_vars.keys.keyskey_index;
-    if (rsa)
-        RSA_up_ref(rsa);
+    if (key_index < daemon_vars.keys.num_slots)
+        rsa = EVP_PKEY_get1_RSA(daemon_vars.keys.slotskey_index.pkey);
     pthread_mutex_unlock(&daemon_vars.keys.lock);
 
     return rsa;
 }
 
-/*
- *  Returns an available slot in bit array B
- *  or if not found, returns SIZE_MAX
- */
-static size_t bita_ffirst(const uint8_t *b, const size_t tot, size_t bits)
+size_t allocate_slot(void)
 {
-    if (bits >= tot)
-        return SIZE_MAX;
-
-    uint64_t w = *((uint64_t *) b);
-    /* __builtin_ffsll returns one plus the index of the least significant 1-bit, or zero if not found */
-    uint32_t r = __builtin_ffsll(w);
-    if (r)
-        return bits + r - 1; /* adjust result */
-
-    return bita_ffirst(&b8, tot, bits + 64);
-}
-
-/*
- * bit operation helpers for the bit-array in key_slots
- */
-#define BITMASK(b) (1 << ((b) % CHAR_BIT))
-#define BITBYTE(b) ((b) / CHAR_BIT)
-#define BITSET(a, b) ((a)BITBYTE(b) |= BITMASK(b))
-#define BITUNSET(a, b) ((a)BITBYTE(b) &= ~BITMASK(b))
-#define BITBYTES(nb) ((nb + CHAR_BIT - 1) / CHAR_BIT)
-#define BITCHECK(a, b) ((a)BITBYTE(b) & BITMASK(b))
-
-static void adjust_slots_reserved_size(int type, struct key_slots *slots)
-{
-#define ROUND2WORD(n) (n + 64 - 1 - (n + 64 - 1) % 64)
-    if (!slots->reserved_size || (slots->size >= slots->reserved_size)) {
-        size_t size = slots->reserved_size ? ROUND2WORD((size_t)(slots->reserved_size * 0.50) + slots->reserved_size)
-                : default_reserved_size;
-#undef ROUND2WORD
-
-        switch (type) {
-        case NEVERBLEED_TYPE_RSA:
-            if ((daemon_vars.keys.keys = realloc(daemon_vars.keys.keys, sizeof(*daemon_vars.keys.keys) * size)) == NULL)
-                dief("no memory");
-            break;
-        case NEVERBLEED_TYPE_ECDSA:
-            if ((daemon_vars.keys.ecdsa_keys = realloc(daemon_vars.keys.ecdsa_keys, sizeof(*daemon_vars.keys.ecdsa_keys) * size)) == NULL)
-                dief("no memory");
-            break;
-        default:
-            dief("invalid type adjusting reserved");
-        }
-
-        uint8_t *b;
-        if ((b = realloc(slots->bita_avail, BITBYTES(size))) == NULL)
+    /* expand if all slots are in use */
+    if (daemon_vars.keys.first_empty == SIZE_MAX) {
+        size_t new_capacity = (daemon_vars.keys.num_slots < 4 ? 4 : daemon_vars.keys.num_slots) * 2;
+        if ((daemon_vars.keys.slots = realloc(daemon_vars.keys.slots, sizeof(daemon_vars.keys.slots0) * new_capacity)) == NULL)
             dief("no memory");
+        daemon_vars.keys.first_empty = daemon_vars.keys.num_slots;
+        for (size_t i = daemon_vars.keys.num_slots; i < new_capacity - 1; ++i)
+            daemon_vars.keys.slotsi.next_empty = i + 1;
+        daemon_vars.keys.slotsnew_capacity - 1.next_empty = SIZE_MAX;
+        daemon_vars.keys.num_slots = new_capacity;
+    }
 
-        /* set all bits to 1 making all slots available */
-        memset(&bBITBYTES(slots->reserved_size), 0xff, BITBYTES(size - slots->reserved_size));
+    /* detach the first empty slot from the empty list */
+    size_t slot_index = daemon_vars.keys.first_empty;
+    daemon_vars.keys.first_empty = daemon_vars.keys.slotsslot_index.next_empty;
 
-        slots->bita_avail = b;
-        slots->reserved_size = size;
-    }
+    /* set bogus value in the allocated slot to help figure out what happened upon crash */
+    daemon_vars.keys.slotsslot_index.next_empty = SIZE_MAX - 1;
+
+    return slot_index;
 }
 
-static size_t daemon_set_rsa(RSA *rsa)
+static size_t daemon_set_pkey(EVP_PKEY *pkey)
 {
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-
-    adjust_slots_reserved_size(NEVERBLEED_TYPE_RSA, &daemon_vars.keys.rsa_slots);
+    assert(pkey != NULL);
 
-    size_t index = bita_ffirst(daemon_vars.keys.rsa_slots.bita_avail, daemon_vars.keys.rsa_slots.reserved_size, 0);
-
-    if (index == SIZE_MAX)
-        dief("no available slot for key");
+    pthread_mutex_lock(&daemon_vars.keys.lock);
 
-    /* set slot as unavailable */
-    BITUNSET(daemon_vars.keys.rsa_slots.bita_avail, index);
+    size_t index = allocate_slot();
+    daemon_vars.keys.slotsindex.pkey = pkey;
+    EVP_PKEY_up_ref(pkey);
 
-    daemon_vars.keys.rsa_slots.size++;
-    daemon_vars.keys.keysindex = rsa;
-    RSA_up_ref(rsa);
     pthread_mutex_unlock(&daemon_vars.keys.lock);
 
     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;
     struct st_neverbleed_thread_data_t *thdata;
-    struct expbuf_t buf = {NULL};
+    neverbleed_iobuf_t buf = {NULL};
     size_t ret;
     unsigned char *to;
     size_t tolen;
 
     get_privsep_data(rsa, &exdata, &thdata);
 
-    expbuf_push_str(&buf, cmd);
-    expbuf_push_bytes(&buf, from, flen);
-    expbuf_push_num(&buf, exdata->key_index);
-    expbuf_push_num(&buf, padding);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0 || (to = expbuf_shift_bytes(&buf, &tolen)) == NULL) {
+    iobuf_push_str(&buf, cmd);
+    iobuf_push_bytes(&buf, from, flen);
+    iobuf_push_num(&buf, exdata->key_index);
+    iobuf_push_num(&buf, padding);
+
+    iobuf_transaction(&buf, thdata);
+
+    if (iobuf_shift_num(&buf, &ret) != 0 || (to = iobuf_shift_bytes(&buf, &tolen)) == NULL) {
         errno = 0;
         dief("failed to parse response");
     }
     memcpy(_to, to, tolen);
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
 
     return (int)ret;
 }
 
 static int priv_encdec_stub(const char *name,
                             int (*func)(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding),
-                            struct expbuf_t *buf)
+                            neverbleed_iobuf_t *buf)
 {
     unsigned char *from, to4096;
     size_t flen;
@@ -526,8 +580,8 @@
     RSA *rsa;
     int ret;
 
-    if ((from = expbuf_shift_bytes(buf, &flen)) == NULL || expbuf_shift_num(buf, &key_index) != 0 ||
-        expbuf_shift_num(buf, &padding) != 0) {
+    if ((from = iobuf_shift_bytes(buf, &flen)) == NULL || iobuf_shift_num(buf, &key_index) != 0 ||
+        iobuf_shift_num(buf, &padding) != 0) {
         errno = 0;
         warnf("%s: failed to parse request", name);
         return -1;
@@ -538,11 +592,11 @@
         return -1;
     }
     ret = func((int)flen, from, to, rsa, (int)padding);
-    expbuf_dispose(buf);
+    iobuf_dispose(buf);
     RSA_free(rsa);
 
-    expbuf_push_num(buf, ret);
-    expbuf_push_bytes(buf, to, ret > 0 ? ret : 0);
+    iobuf_push_num(buf, ret);
+    iobuf_push_bytes(buf, to, ret > 0 ? ret : 0);
 
     return 0;
 }
@@ -552,7 +606,7 @@
     return priv_encdec_proxy("priv_enc", flen, from, to, rsa, padding);
 }
 
-static int priv_enc_stub(struct expbuf_t *buf)
+static int priv_enc_stub(neverbleed_iobuf_t *buf)
 {
     return priv_encdec_stub(__FUNCTION__, RSA_private_encrypt, buf);
 }
@@ -562,7 +616,7 @@
     return priv_encdec_proxy("priv_dec", flen, from, to, rsa, padding);
 }
 
-static int priv_dec_stub(struct expbuf_t *buf)
+static int priv_dec_stub(neverbleed_iobuf_t *buf)
 {
     return priv_encdec_stub(__FUNCTION__, RSA_private_decrypt, buf);
 }
@@ -572,34 +626,30 @@
 {
     struct st_neverbleed_rsa_exdata_t *exdata;
     struct st_neverbleed_thread_data_t *thdata;
-    struct expbuf_t buf = {NULL};
+    neverbleed_iobuf_t buf = {NULL};
     size_t ret, siglen;
     unsigned char *sigret;
 
     get_privsep_data(rsa, &exdata, &thdata);
 
-    expbuf_push_str(&buf, "sign");
-    expbuf_push_num(&buf, type);
-    expbuf_push_bytes(&buf, m, m_len);
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0 || (sigret = expbuf_shift_bytes(&buf, &siglen)) == NULL) {
+    iobuf_push_str(&buf, "sign");
+    iobuf_push_num(&buf, type);
+    iobuf_push_bytes(&buf, m, m_len);
+    iobuf_push_num(&buf, exdata->key_index);
+    iobuf_transaction(&buf, thdata);
+
+    if (iobuf_shift_num(&buf, &ret) != 0 || (sigret = iobuf_shift_bytes(&buf, &siglen)) == NULL) {
         errno = 0;
         dief("failed to parse response");
     }
     memcpy(_sigret, sigret, siglen);
     *_siglen = (unsigned)siglen;
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
 
     return (int)ret;
 }
 
-static int sign_stub(struct expbuf_t *buf)
+static int sign_stub(neverbleed_iobuf_t *buf)
 {
     unsigned char *m, sigret4096;
     size_t type, m_len, key_index;
@@ -607,8 +657,8 @@
     unsigned siglen = 0;
     int ret;
 
-    if (expbuf_shift_num(buf, &type) != 0 || (m = expbuf_shift_bytes(buf, &m_len)) == NULL ||
-        expbuf_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;
@@ -619,54 +669,15 @@
         return -1;
     }
     ret = RSA_sign((int)type, m, (unsigned)m_len, sigret, &siglen, rsa);
-    expbuf_dispose(buf);
+    iobuf_dispose(buf);
     RSA_free(rsa);
 
-    expbuf_push_num(buf, ret);
-    expbuf_push_bytes(buf, sigret, ret == 1 ? siglen : 0);
+    iobuf_push_num(buf, ret);
+    iobuf_push_bytes(buf, sigret, ret == 1 ? siglen : 0);
 
     return 0;
 }
 
-#if !OPENSSL_1_1_API && (!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)
-{
-    if (n) {
-        *n = rsa->n;
-    }
-
-    if (e) {
-        *e = rsa->e;
-    }
-
-    if (d) {
-        *d = rsa->d;
-    }
-}
-
-static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-{
-    if (n == NULL || e == NULL) {
-        return 0;
-    }
-
-    BN_free(rsa->n);
-    BN_free(rsa->e);
-    BN_free(rsa->d);
-    rsa->n = n;
-    rsa->e = e;
-    rsa->d = d;
-
-    return 1;
-}
-
-static void RSA_set_flags(RSA *r, int flags)
-{
-    r->flags |= flags;
-}
-#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;
@@ -701,44 +712,21 @@
     return pkey;
 }
 
-#if OPENSSL_1_1_API
+#ifdef NEVERBLEED_ECDSA
 
 static EC_KEY *daemon_get_ecdsa(size_t key_index)
 {
-    EC_KEY *ec_key;
+    EC_KEY *ec_key = NULL;
 
     pthread_mutex_lock(&daemon_vars.keys.lock);
-    ec_key = daemon_vars.keys.ecdsa_keyskey_index;
-    if (ec_key)
-        EC_KEY_up_ref(ec_key);
+    if (key_index < daemon_vars.keys.num_slots)
+        ec_key = EVP_PKEY_get1_EC_KEY(daemon_vars.keys.slotskey_index.pkey);
     pthread_mutex_unlock(&daemon_vars.keys.lock);
 
     return ec_key;
 }
 
-static size_t daemon_set_ecdsa(EC_KEY *ec_key)
-{
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-
-    adjust_slots_reserved_size(NEVERBLEED_TYPE_ECDSA, &daemon_vars.keys.ecdsa_slots);
-
-    size_t index = bita_ffirst(daemon_vars.keys.ecdsa_slots.bita_avail, daemon_vars.keys.ecdsa_slots.reserved_size, 0);
-
-    if (index == SIZE_MAX)
-        dief("no available slot for key");
-
-    /* set slot as unavailable */
-    BITUNSET(daemon_vars.keys.ecdsa_slots.bita_avail, index);
-
-    daemon_vars.keys.ecdsa_slots.size++;
-    daemon_vars.keys.ecdsa_keysindex = ec_key;
-    EC_KEY_up_ref(ec_key);
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
-
-    return index;
-}
-
-static int ecdsa_sign_stub(struct expbuf_t *buf)
+static int ecdsa_sign_stub(neverbleed_iobuf_t *buf)
 {
     unsigned char *m, sigret4096;
     size_t type, m_len, key_index;
@@ -746,8 +734,8 @@
     unsigned siglen = 0;
     int ret;
 
-    if (expbuf_shift_num(buf, &type) != 0 || (m = expbuf_shift_bytes(buf, &m_len)) == NULL ||
-        expbuf_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;
@@ -759,12 +747,12 @@
     }
 
     ret = ECDSA_sign((int)type, m, (unsigned)m_len, sigret, &siglen, ec_key);
-    expbuf_dispose(buf);
+    iobuf_dispose(buf);
 
     EC_KEY_free(ec_key);
 
-    expbuf_push_num(buf, ret);
-    expbuf_push_bytes(buf, sigret, ret == 1 ? siglen : 0);
+    iobuf_push_num(buf, ret);
+    iobuf_push_bytes(buf, sigret, ret == 1 ? siglen : 0);
 
     return 0;
 }
@@ -783,7 +771,7 @@
 {
     struct st_neverbleed_rsa_exdata_t *exdata;
     struct st_neverbleed_thread_data_t *thdata;
-    struct expbuf_t buf = {};
+    neverbleed_iobuf_t buf = {NULL};
     size_t ret, siglen;
     unsigned char *sigret;
 
@@ -797,23 +785,19 @@
         dief("unexpected non-NULL kinv and rp");
     }
 
-    expbuf_push_str(&buf, "ecdsa_sign");
-    expbuf_push_num(&buf, type);
-    expbuf_push_bytes(&buf, m, m_len);
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
+    iobuf_push_str(&buf, "ecdsa_sign");
+    iobuf_push_num(&buf, type);
+    iobuf_push_bytes(&buf, m, m_len);
+    iobuf_push_num(&buf, exdata->key_index);
+    iobuf_transaction(&buf, thdata);
 
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0 || (sigret = expbuf_shift_bytes(&buf, &siglen)) == NULL) {
+    if (iobuf_shift_num(&buf, &ret) != 0 || (sigret = iobuf_shift_bytes(&buf, &siglen)) == NULL) {
         errno = 0;
         dief("failed to parse response");
     }
     memcpy(_sigret, sigret, siglen);
     *_siglen = (unsigned)siglen;
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
 
     return (int)ret;
 }
@@ -877,81 +861,165 @@
     if (exdata == NULL)
         return;
 
-    struct expbuf_t buf = {NULL};
+    neverbleed_iobuf_t buf = {NULL};
     size_t ret;
 
-    expbuf_push_str(&buf, "del_ecdsa_key");
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
+    iobuf_push_str(&buf, "del_pkey");
+    iobuf_push_num(&buf, exdata->key_index);
+    iobuf_transaction(&buf, thdata);
 
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0) {
+    if (iobuf_shift_num(&buf, &ret) != 0) {
         errno = 0;
         dief("failed to parse response");
     }
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
 }
 
-static int del_ecdsa_key_stub(struct expbuf_t *buf)
+#endif
+
+static EVP_PKEY *daemon_get_pkey(size_t key_index)
 {
-    size_t key_index;
-    int ret = 0;
+    EVP_PKEY *pkey = NULL;
+
+    pthread_mutex_lock(&daemon_vars.keys.lock);
+    if (key_index < daemon_vars.keys.num_slots) {
+        pkey = daemon_vars.keys.slotskey_index.pkey;
+        EVP_PKEY_up_ref(pkey);
+    }
+    pthread_mutex_unlock(&daemon_vars.keys.lock);
 
-    if (expbuf_shift_num(buf, &key_index) != 0) {
+    return pkey;
+}
+
+static int digestsign_stub(neverbleed_iobuf_t *buf)
+{
+    size_t key_index, md_nid, signlen;
+    void *signdata;
+    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) {
         errno = 0;
         warnf("%s: failed to parse request", __FUNCTION__);
         return -1;
     }
-
-    if (!daemon_vars.keys.ecdsa_keys || key_index >= daemon_vars.keys.ecdsa_slots.reserved_size) {
+    if ((pkey = daemon_get_pkey(key_index)) == NULL) {
         errno = 0;
-        warnf("%s: invalid key index %zu", __FUNCTION__, key_index);
-        goto respond;
+        warnf("%s: invalid key index:%zu", __FUNCTION__, key_index);
+        return -1;
     }
+    if (md_nid != SIZE_MAX) {
+        if ((md = EVP_get_digestbynid((int)md_nid)) == NULL) {
+            errno = 0;
+            warnf("%s: invalid EVP_MD nid", __FUNCTION__);
+            return -1;
+        }
+    } else {
+        md = NULL;
+    }
+
+    /* generate signature */
+    EVP_MD_CTX *mdctx = NULL;
+    EVP_PKEY_CTX *pkey_ctx = NULL;
+    unsigned char digestbuf4096;
+    size_t digestlen;
+
+    if ((mdctx = EVP_MD_CTX_create()) == NULL)
+        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_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING) != 1 ||
+            EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, -1) != 1)
+            goto Softfail;
+        if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkey_ctx, md) != 1)
+            goto Softfail;
+    }
+    /* ED25519 keys can never be loaded, so use the Update -> Final call chain without worrying about backward compatibility */
+    if (EVP_DigestSignUpdate(mdctx, signdata, signlen) != 1)
+        goto Softfail;
+    if (EVP_DigestSignFinal(mdctx, NULL, &digestlen) != 1)
+        goto Softfail;
+    if (sizeof(digestbuf) < digestlen) {
+        warnf("%s: digest unexpectedly long as %zu bytes", __FUNCTION__, digestlen);
+        goto Softfail;
+    }
+    if (EVP_DigestSignFinal(mdctx, digestbuf, &digestlen) != 1)
+        goto Softfail;
+
+Respond: /* build response */
+    iobuf_dispose(buf);
+    iobuf_push_bytes(buf, digestbuf, digestlen);
+    if (mdctx != NULL)
+        EVP_MD_CTX_destroy(mdctx);
+    if (pkey != NULL)
+        EVP_PKEY_free(pkey);
+    return 0;
 
-    if (BITCHECK(daemon_vars.keys.ecdsa_slots.bita_avail, key_index)) {
-        warnf("%s: index not in use %zu", __FUNCTION__, key_index);
-        goto respond;
-    }
+Softfail:
+    digestlen = 0;
+    goto Respond;
+}
 
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-    /* set slot as available */
-    BITSET(daemon_vars.keys.ecdsa_slots.bita_avail, key_index);
-    daemon_vars.keys.ecdsa_slots.size--;
-    EC_KEY_free(daemon_vars.keys.ecdsa_keyskey_index);
-    daemon_vars.keys.ecdsa_keyskey_index = NULL;
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
+void neverbleed_start_digestsign(neverbleed_iobuf_t *buf, EVP_PKEY *pkey, const EVP_MD *md, const void *input, size_t len)
+{
+    struct st_neverbleed_rsa_exdata_t *exdata;
+    struct st_neverbleed_thread_data_t *thdata;
 
-    ret = 1;
+    /* obtain reference */
+    switch (EVP_PKEY_base_id(pkey)) {
+    case EVP_PKEY_RSA: {
+        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);
+    } break;
+#ifdef NEVERBLEED_ECDSA
+    case EVP_PKEY_EC:
+        ecdsa_get_privsep_data(EVP_PKEY_get0_EC_KEY(pkey), &exdata, &thdata);
+        break;
+#endif
+    default:
+        dief("unexpected private key");
+        break;
+    }
 
-respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, ret);
-    return 0;
+    *buf = (neverbleed_iobuf_t){NULL};
+    iobuf_push_str(buf, "digestsign");
+    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);
 }
 
-#endif
+void neverbleed_finish_digestsign(neverbleed_iobuf_t *buf, void **digest, size_t *digest_len)
+{
+    const void *src;
+
+    if ((src = iobuf_shift_bytes(buf, digest_len)) == NULL) {
+        errno = 0;
+        dief("failed to parse response");
+    }
+    if ((*digest = malloc(*digest_len)) == NULL)
+        dief("no memory");
+    memcpy(*digest, src, *digest_len);
+
+    iobuf_dispose(buf);
+}
 
 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);
-    struct expbuf_t buf = {NULL};
+    neverbleed_iobuf_t buf = {NULL};
     int ret = 1;
     size_t index, type;
     EVP_PKEY *pkey;
 
-    expbuf_push_str(&buf, "load_key");
-    expbuf_push_str(&buf, fn);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
+    iobuf_push_str(&buf, "load_key");
+    iobuf_push_str(&buf, fn);
+    iobuf_transaction(&buf, thdata);
 
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &type) != 0 || expbuf_shift_num(&buf, &index) != 0) {
+    if (iobuf_shift_num(&buf, &type) != 0 || iobuf_shift_num(&buf, &index) != 0) {
         errno = 0;
         dief("failed to parse response");
     }
@@ -960,30 +1028,30 @@
     case NEVERBLEED_TYPE_RSA: {
         char *estr, *nstr;
 
-        if ((estr = expbuf_shift_str(&buf)) == NULL || (nstr = expbuf_shift_str(&buf)) == NULL) {
+        if ((estr = iobuf_shift_str(&buf)) == NULL || (nstr = iobuf_shift_str(&buf)) == NULL) {
             errno = 0;
             dief("failed to parse response");
         }
         pkey = create_pkey(nb, index, estr, nstr);
         break;
     }
-#if OPENSSL_1_1_API
+#ifdef NEVERBLEED_ECDSA
     case NEVERBLEED_TYPE_ECDSA: {
         char *ec_pubkeystr;
         size_t curve_name;
 
-        if (expbuf_shift_num(&buf, &curve_name) != 0 || (ec_pubkeystr = expbuf_shift_str(&buf)) == NULL) {
+        if (iobuf_shift_num(&buf, &curve_name) != 0 || (ec_pubkeystr = iobuf_shift_str(&buf)) == NULL) {
             errno = 0;
             dief("failed to parse response");
         }
-        pkey = ecdsa_create_pkey(nb, index, curve_name, ec_pubkeystr);
+        pkey = ecdsa_create_pkey(nb, index, (int)curve_name, ec_pubkeystr);
         break;
     }
 #endif
     default: {
         char *errstr;
 
-        if ((errstr = expbuf_shift_str(&buf)) == NULL) {
+        if ((errstr = iobuf_shift_str(&buf)) == NULL) {
             errno = 0;
             dief("failed to parse response");
         }
@@ -993,7 +1061,7 @@
     }
     }
 
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
 
     /* success */
     if (SSL_CTX_use_PrivateKey(ctx, pkey) != 1) {
@@ -1005,7 +1073,7 @@
     return ret;
 }
 
-static int load_key_stub(struct expbuf_t *buf)
+static int load_key_stub(neverbleed_iobuf_t *buf)
 {
     char *fn;
     FILE *fp = NULL;
@@ -1014,11 +1082,13 @@
     char *estr = NULL, *nstr = NULL, errbufNEVERBLEED_ERRBUF_SIZE = "";
     size_t type = NEVERBLEED_TYPE_ERROR;
     EVP_PKEY *pkey = NULL;
+#ifdef NEVERBLEED_ECDSA
     const EC_GROUP *ec_group;
     BIGNUM *ec_pubkeybn = NULL;
     char *ec_pubkeystr = NULL;
+#endif
 
-    if ((fn = expbuf_shift_str(buf)) == NULL) {
+    if ((fn = iobuf_shift_str(buf)) == NULL) {
         warnf("%s: failed to parse request", __FUNCTION__);
         return -1;
     }
@@ -1039,20 +1109,18 @@
 
         rsa = EVP_PKEY_get1_RSA(pkey);
         type = NEVERBLEED_TYPE_RSA;
-        key_index = daemon_set_rsa(rsa);
         RSA_get0_key(rsa, &n, &e, NULL);
         estr = BN_bn2hex(e);
         nstr = BN_bn2hex(n);
         break;
     }
     case EVP_PKEY_EC: {
-#if OPENSSL_1_1_API
+#ifdef NEVERBLEED_ECDSA
         const EC_POINT *ec_pubkey;
         EC_KEY *ec_key;
 
-        ec_key = EVP_PKEY_get0_EC_KEY(pkey);
+        ec_key = (EC_KEY *)EVP_PKEY_get0_EC_KEY(pkey);
         type = NEVERBLEED_TYPE_ECDSA;
-        key_index = daemon_set_ecdsa(ec_key);
         ec_group = EC_KEY_get0_group(ec_key);
         ec_pubkey = EC_KEY_get0_public_key(ec_key);
         ec_pubkeybn = BN_new();
@@ -1064,7 +1132,7 @@
         ec_pubkeystr = BN_bn2hex(ec_pubkeybn);
         break;
 #else
-        snprintf(errbuf, sizeof(errbuf), "ECDSA support requires OpenSSL >= 1.1.0");
+        snprintf(errbuf, sizeof(errbuf), "ECDSA support requires OpenSSL >= 1.1.0 or LibreSSL >= 2.9.1");
         goto Respond;
 #endif
     }
@@ -1073,21 +1141,26 @@
         goto Respond;
     }
 
+    /* store the key */
+    key_index = daemon_set_pkey(pkey);
+
 Respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, type);
-    expbuf_push_num(buf, key_index);
+    iobuf_dispose(buf);
+    iobuf_push_num(buf, type);
+    iobuf_push_num(buf, key_index);
     switch (type) {
     case NEVERBLEED_TYPE_RSA:
-        expbuf_push_str(buf, estr != NULL ? estr : "");
-        expbuf_push_str(buf, nstr != NULL ? nstr : "");
+        iobuf_push_str(buf, estr != NULL ? estr : "");
+        iobuf_push_str(buf, nstr != NULL ? nstr : "");
         break;
+#ifdef NEVERBLEED_ECDSA
     case NEVERBLEED_TYPE_ECDSA:
-        expbuf_push_num(buf, EC_GROUP_get_curve_name(ec_group));
-        expbuf_push_str(buf, ec_pubkeystr);
+        iobuf_push_num(buf, EC_GROUP_get_curve_name(ec_group));
+        iobuf_push_str(buf, ec_pubkeystr);
         break;
+#endif
     default:
-        expbuf_push_str(buf, errbuf);
+        iobuf_push_str(buf, errbuf);
     }
     if (rsa != NULL)
         RSA_free(rsa);
@@ -1097,10 +1170,12 @@
         OPENSSL_free(estr);
     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);
+#endif
     if (fp != NULL)
         fclose(fp);
 
@@ -1110,28 +1185,24 @@
 int neverbleed_setuidgid(neverbleed_t *nb, const char *user, int change_socket_ownership)
 {
     struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
-    struct expbuf_t buf = {NULL};
+    neverbleed_iobuf_t buf = {NULL};
     size_t ret;
 
-    expbuf_push_str(&buf, "setuidgid");
-    expbuf_push_str(&buf, user);
-    expbuf_push_num(&buf, change_socket_ownership);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
+    iobuf_push_str(&buf, "setuidgid");
+    iobuf_push_str(&buf, user);
+    iobuf_push_num(&buf, change_socket_ownership);
+    iobuf_transaction(&buf, thdata);
 
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0) {
+    if (iobuf_shift_num(&buf, &ret) != 0) {
         errno = 0;
         dief("failed to parse response");
     }
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
 
     return (int)ret;
 }
 
-static int setuidgid_stub(struct expbuf_t *buf)
+static int setuidgid_stub(neverbleed_iobuf_t *buf)
 {
     const char *user;
     size_t change_socket_ownership;
@@ -1139,7 +1210,7 @@
     char pwstrbuf65536; /* should be large enough */
     int ret = -1;
 
-    if ((user = expbuf_shift_str(buf)) == NULL || expbuf_shift_num(buf, &change_socket_ownership) != 0) {
+    if ((user = iobuf_shift_str(buf)) == NULL || iobuf_shift_num(buf, &change_socket_ownership) != 0) {
         errno = 0;
         warnf("%s: failed to parse request", __FUNCTION__);
         return -1;
@@ -1181,10 +1252,65 @@
     ret = 0;
 
 Respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, ret);
+    iobuf_dispose(buf);
+    iobuf_push_num(buf, ret);
+    return 0;
+}
+
+#if NEVERBLEED_HAS_PTHREAD_SETAFFINITY_NP
+int neverbleed_setaffinity(neverbleed_t *nb, NEVERBLEED_CPU_SET_T *cpuset)
+{
+    struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
+    neverbleed_iobuf_t buf = {NULL};
+    size_t ret;
+
+    iobuf_push_str(&buf, "setaffinity");
+    iobuf_push_bytes(&buf, cpuset, sizeof(*cpuset));
+    iobuf_transaction(&buf, thdata);
+
+    if (iobuf_shift_num(&buf, &ret) != 0) {
+        errno = 0;
+        dief("failed to parse response");
+    }
+    iobuf_dispose(&buf);
+
+    return (int)ret;
+}
+
+static int setaffinity_stub(neverbleed_iobuf_t *buf)
+{
+    char *cpuset_bytes;
+    size_t cpuset_len;
+    NEVERBLEED_CPU_SET_T cpuset;
+    int ret = 1;
+
+    if ((cpuset_bytes = iobuf_shift_bytes(buf, &cpuset_len)) == NULL) {
+        errno = 0;
+        warnf("%s: failed to parse request", __FUNCTION__);
+        return -1;
+    }
+
+    assert(cpuset_len == sizeof(NEVERBLEED_CPU_SET_T));
+    memcpy(&cpuset, cpuset_bytes, cpuset_len);
+
+#ifdef __NetBSD__
+    ret = pthread_setaffinity_np(pthread_self(), cpuset_size(cpuset), cpuset);
+#else
+    ret = pthread_setaffinity_np(pthread_self(), sizeof(NEVERBLEED_CPU_SET_T), &cpuset);
+#endif
+    if (ret != 0) {
+        ret = 1;
+        goto Respond;
+    }
+
+    ret = 0;
+
+Respond:
+    iobuf_dispose(buf);
+    iobuf_push_num(buf, ret);
     return 0;
 }
+#endif
 
 __attribute__((noreturn)) static void *daemon_close_notify_thread(void *_close_notify_fd)
 {
@@ -1220,69 +1346,83 @@
     if (exdata == NULL)
         return 1;
 
-    struct expbuf_t buf = {NULL};
+    neverbleed_iobuf_t buf = {NULL};
     size_t ret;
 
-    expbuf_push_str(&buf, "del_rsa_key");
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
+    iobuf_push_str(&buf, "del_pkey");
+    iobuf_push_num(&buf, exdata->key_index);
+    iobuf_transaction(&buf, thdata);
 
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0) {
+    if (iobuf_shift_num(&buf, &ret) != 0) {
         errno = 0;
         dief("failed to parse response");
     }
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
 
     return (int)ret;
 }
 
-static int del_rsa_key_stub(struct expbuf_t *buf)
+static int del_pkey_stub(neverbleed_iobuf_t *buf)
 {
     size_t key_index;
 
     int ret = 0;
 
-    if (expbuf_shift_num(buf, &key_index) != 0) {
+    if (iobuf_shift_num(buf, &key_index) != 0) {
         errno = 0;
         warnf("%s: failed to parse request", __FUNCTION__);
         return -1;
     }
 
-    if (!daemon_vars.keys.keys || key_index >= daemon_vars.keys.rsa_slots.reserved_size) {
-        errno = 0;
+    pthread_mutex_lock(&daemon_vars.keys.lock);
+    /* set slot as available */
+    if (key_index < daemon_vars.keys.num_slots) {
+        EVP_PKEY_free(daemon_vars.keys.slotskey_index.pkey);
+        daemon_vars.keys.slotskey_index.next_empty = daemon_vars.keys.first_empty;
+        daemon_vars.keys.first_empty = key_index;
+    } else {
         warnf("%s: invalid key index %zu", __FUNCTION__, key_index);
         goto respond;
     }
-
-    if (BITCHECK(daemon_vars.keys.rsa_slots.bita_avail, key_index)) {
-        warnf("%s: index not in use %zu", __FUNCTION__, key_index);
-        goto respond;
-    }
-
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-    /* set slot as available */
-    BITSET(daemon_vars.keys.rsa_slots.bita_avail, key_index);
-    daemon_vars.keys.rsa_slots.size--;
-    RSA_free(daemon_vars.keys.keyskey_index);
-    daemon_vars.keys.keyskey_index = NULL;
     pthread_mutex_unlock(&daemon_vars.keys.lock);
 
     ret = 1;
 
 respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, ret);
+    iobuf_dispose(buf);
+    iobuf_push_num(buf, ret);
     return 0;
 }
 
+/**
+ * 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.
+ */
+static void yield_on_data(int fd)
+{
+    fd_set rfds;
+    int ret;
+    FD_ZERO(&rfds);
+    FD_SET(fd, &rfds);
+
+    while ((ret = select(fd + 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");
+    }
+}
+
 static void *daemon_conn_thread(void *_sock_fd)
 {
     int sock_fd = (int)((char *)_sock_fd - (char *)NULL);
-    struct expbuf_t buf = {NULL};
+    neverbleed_iobuf_t buf = {NULL};
     unsigned char auth_tokenNEVERBLEED_AUTH_TOKEN_SIZE;
 
     /* authenticate */
@@ -1297,12 +1437,13 @@
 
     while (1) {
         char *cmd;
-        if (expbuf_read(&buf, sock_fd) != 0) {
+        yield_on_data(sock_fd);
+        if (iobuf_read(&buf, sock_fd) != 0) {
             if (errno != 0)
                 warnf("read error");
             break;
         }
-        if ((cmd = expbuf_shift_str(&buf)) == NULL) {
+        if ((cmd = iobuf_shift_str(&buf)) == NULL) {
             errno = 0;
             warnf("failed to parse request");
             break;
@@ -1316,56 +1457,94 @@
         } else if (strcmp(cmd, "sign") == 0) {
             if (sign_stub(&buf) != 0)
                 break;
-#if OPENSSL_1_1_API
+#ifdef NEVERBLEED_ECDSA
         } else if (strcmp(cmd, "ecdsa_sign") == 0) {
             if (ecdsa_sign_stub(&buf) != 0)
                 break;
-        } else if (strcmp(cmd, "del_ecdsa_key") == 0) {
-            if (del_ecdsa_key_stub(&buf) != 0)
-                break;
 #endif
+        } else if (strcmp(cmd, "digestsign") == 0) {
+            if (digestsign_stub(&buf) != 0)
+                break;
         } else if (strcmp(cmd, "load_key") == 0) {
             if (load_key_stub(&buf) != 0)
                 break;
-        } else if (strcmp(cmd, "del_rsa_key") == 0) {
-            if (del_rsa_key_stub(&buf) != 0)
+        } else if (strcmp(cmd, "del_pkey") == 0) {
+            if (del_pkey_stub(&buf) != 0)
                 break;
         } else if (strcmp(cmd, "setuidgid") == 0) {
             if (setuidgid_stub(&buf) != 0)
                 break;
+#if NEVERBLEED_HAS_PTHREAD_SETAFFINITY_NP
+        } else if (strcmp(cmd, "setaffinity") == 0) {
+            if (setaffinity_stub(&buf) != 0)
+                break;
+#endif
         } else {
             warnf("unknown command:%s", cmd);
             break;
         }
-        if (expbuf_write(&buf, sock_fd) != 0) {
+        if (iobuf_write(&buf, sock_fd) != 0) {
             warnf(errno != 0 ? "write error" : "connection closed by client");
             break;
         }
-        expbuf_dispose(&buf);
+        iobuf_dispose(&buf);
     }
 
 Exit:
-    expbuf_dispose(&buf);
+    iobuf_dispose(&buf);
     close(sock_fd);
 
     return NULL;
 }
 
-__attribute__((noreturn)) static void daemon_main(int listen_fd, int close_notify_fd, const char *tempdir)
+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+#define closefrom my_closefrom
+static void my_closefrom(int lowfd)
 {
-    pthread_t tid;
-    pthread_attr_t thattr;
-    int sock_fd;
+    /* On linux, try close_range (2), then fall back to the slow loop if it fails. */
+#if defined(__linux__) && defined(__NR_close_range)
+    if (syscall(__NR_close_range, lowfd, ~0, 0) == 0)
+        return;
+#endif
+
+    for (int fd = (int)sysconf(_SC_OPEN_MAX) - 1; fd >= lowfd; --fd)
+        (void)close(fd);
+}
+#endif
 
-    { /* close all descriptors (except STDIN, STDOUT, STRERR, listen_fd, close_notify_fd) */
-        int fd = (int)sysconf(_SC_OPEN_MAX) - 1;
-        for (; fd > 2; --fd) {
-            if (fd == listen_fd || fd == close_notify_fd)
+static void cleanup_fds(int listen_fd, int close_notify_fd)
+{
+    int maxfd, k;
+
+    maxfd = 0;
+    if (listen_fd > maxfd) {
+        maxfd = listen_fd;
+    }
+    if (close_notify_fd > maxfd) {
+        maxfd = close_notify_fd;
+    }
+    for (k = 0; k < maxfd; k++) {
+        if (k == listen_fd || k == close_notify_fd)
                 continue;
-            close(fd);
+        switch (k) {
+        case STDOUT_FILENO:
+        case STDERR_FILENO:
+        case STDIN_FILENO:
+            break;
+        default:
+            (void)close(k);
         }
     }
+    closefrom(maxfd + 1);
+}
+
+__attribute__((noreturn)) static void daemon_main(int listen_fd, int close_notify_fd, const char *tempdir)
+{
+    pthread_t tid;
+    pthread_attr_t thattr;
+    int sock_fd;
 
+    cleanup_fds(listen_fd, close_notify_fd);
     pthread_attr_init(&thattr);
     pthread_attr_setdetachstate(&thattr, 1);
 
@@ -1380,7 +1559,7 @@
     }
 }
 
-#if !OPENSSL_1_1_API
+#ifndef NEVERBLEED_OPAQUE_RSA_METHOD
 
 static RSA_METHOD static_rsa_method = {
     "privsep RSA method", /* name */
@@ -1405,11 +1584,16 @@
 {
     int pipe_fds2 = {-1, -1}, listen_fd = -1;
     char *tempdir = NULL;
-#if OPENSSL_1_1_API
-    const RSA_METHOD *default_method = RSA_PKCS1_OpenSSL();
-    EC_KEY_METHOD *ecdsa_method;
+    const RSA_METHOD *rsa_default_method;
+    RSA_METHOD *rsa_method;
+#ifdef NEVERBLEED_ECDSA
     const EC_KEY_METHOD *ecdsa_default_method;
-    RSA_METHOD *rsa_method = RSA_meth_dup(RSA_PKCS1_OpenSSL());
+    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);
 
@@ -1418,24 +1602,25 @@
     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
 
-    /* setup EC_KEY_METHOD for ECDSA */
+#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);
-#else
-    const RSA_METHOD *default_method = RSA_PKCS1_SSLeay();
-    RSA_METHOD *rsa_method = &static_rsa_method;
-
-    rsa_finish = default_method->finish;
-
-    rsa_method->rsa_pub_enc = default_method->rsa_pub_enc;
-    rsa_method->rsa_pub_dec = default_method->rsa_pub_dec;
-    rsa_method->rsa_verify = default_method->rsa_verify;
-    rsa_method->bn_mod_exp = default_method->bn_mod_exp;
 #endif
 
     /* setup the daemon */
@@ -1475,9 +1660,18 @@
         goto Fail;
     case 0:
         close(pipe_fds1);
-#ifdef __linux__
+#if defined(__linux__)
         prctl(PR_SET_DUMPABLE, 0, 0, 0, 0);
+#elif defined(__FreeBSD__)
+        int dumpable = PROC_TRACE_CTL_DISABLE;
+        procctl(P_PID, 0, PROC_TRACE_CTL, &dumpable);
+#elif defined(__sun)
+        setpflags(__PROC_PROTECT, 1);
+#elif defined(__APPLE__)
+        ptrace(PT_DENY_ATTACH, 0, 0, 0);
 #endif
+        if (neverbleed_post_fork_cb != NULL)
+            neverbleed_post_fork_cb();
         daemon_vars.nb = nb;
         daemon_main(listen_fd, pipe_fds0, tempdir);
         break;
@@ -1492,7 +1686,7 @@
     /* 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 OPENSSL_1_1_API
+#ifdef NEVERBLEED_ECDSA
         || !ENGINE_set_EC(nb->engine, ecdsa_method)
 #endif
             ) {
@@ -1523,3 +1717,6 @@
     }
     return -1;
 }
+
+void (*neverbleed_post_fork_cb)(void) = NULL;
+void (*neverbleed_transaction_cb)(neverbleed_iobuf_t *) = NULL;

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

@@ -29,6 +29,14 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#define NEVERBLEED_HAS_PTHREAD_SETAFFINITY_NP 1
+#if defined(__linux__)
+#define NEVERBLEED_CPU_SET_T cpu_set_t
+#else
+#define NEVERBLEED_CPU_SET_T cpuset_t
+#endif
+#endif
 
 #define NEVERBLEED_ERRBUF_SIZE (256)
 #define NEVERBLEED_AUTH_TOKEN_SIZE 32
@@ -41,6 +49,13 @@
     unsigned char auth_tokenNEVERBLEED_AUTH_TOKEN_SIZE;
 } neverbleed_t;
 
+typedef struct st_neverbleed_iobuf_t {
+    char *buf;
+    char *start;
+    char *end;
+    size_t capacity;
+} neverbleed_iobuf_t;
+
 /**
  * initializes the privilege separation engine (returns 0 if successful)
  */
@@ -54,6 +69,47 @@
  */
 int neverbleed_setuidgid(neverbleed_t *nb, const char *user, int change_socket_ownership);
 
+/**
+ * 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);
+/**
+ * parses a digestsign response
+ */
+void neverbleed_finish_digestsign(neverbleed_iobuf_t *buf, void **digest, size_t *digest_len);
+
+#if NEVERBLEED_HAS_PTHREAD_SETAFFINITY_NP
+/**
+ * set the cpu affinity for the neverbleed thread (returns 0 if successful)
+ */
+int neverbleed_setaffinity(neverbleed_t *nb, NEVERBLEED_CPU_SET_T *cpuset);
+#endif
+
+/**
+ * an optional callback that can be registered by the application for doing stuff immediately after the neverbleed process is being
+ * spawned
+ */
+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.
+ */
+extern void (*neverbleed_transaction_cb)(neverbleed_iobuf_t *);
+
+typedef void (*neverbleed_cb)(int);
+
+int neverbleed_get_fd(neverbleed_t *nb);
+static size_t neverbleed_iobuf_size(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);
+
+/* inline function definitions */
+
+inline size_t neverbleed_iobuf_size(neverbleed_iobuf_t *buf)
+{
+    return buf->end - buf->start;
+}
+
 #ifdef __cplusplus
 }
 #endif