Release 3.0.

The build was broken by https://github.com/skvadrik/re2c/pull/376, which
added define of _POSIX_SOURCE to unbreak the build on Cygwin. The build
on FreeBSD is fixed by additionally defining _POSIX_C_SOURCE, which is
required by fdopen.

.github/workflows/benchmarks.yml

@@ -32,16 +32,27 @@ jobs:
           # no Windows, as Kleenex generates non-portable C code
 
     steps:
-      - name: Checkout
+      - name: Checkout Code
         uses: actions/checkout@v2
 
-      - name: Setup
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+
+      - name: Setup Common Prerequisites
         run: |
           case ${{ runner.os }} in
             Linux*)
               echo "CC=gcc" >> $GITHUB_ENV
               echo "CXX=g++" >> $GITHUB_ENV
-              sudo apt-get install libre2-dev libbenchmark-dev
+              sudo apt install libre2-dev libbenchmark-dev
               ;;
             macOS*)
               sudo xcode-select -switch /Applications/Xcode.app
@@ -52,6 +63,7 @@ jobs:
               brew install re2 google-benchmark
               ;;
           esac
+          pip install psutil
 
       - name: Configure
         run: |
@@ -59,6 +71,7 @@ jobs:
             -G "Unix Makefiles" \
             -DRE2C_BUILD_LIBS=ON \
             -DRE2C_BUILD_RE2GO=OFF \
+            -DRE2C_BUILD_RE2RUST=OFF \
             -DRE2C_BUILD_BENCHMARKS=ON \
             -DCMAKE_CXX_FLAGS="-O3"
 
@@ -76,6 +89,10 @@ jobs:
         working-directory: .build/benchmarks/submatch_dfa_jit
         run: ./bench_submatch_dfa_jit
 
+      - name: Run submatch Java benchmark (ReTdfa)
+        working-directory: .build/benchmarks/submatch_java
+        run: ./run.py
+
       - name: Run submatch NFA benchmark
         working-directory: .build/benchmarks/submatch_nfa
         run: ./bench_submatch_nfa

.github/workflows/ci.yml

@@ -14,95 +14,48 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
+      # When set to true, GitHub cancels
+      # all in-progress jobs if any matrix job fails.
+      fail-fast: false
+
       matrix:
 
         include:
           # Linux
           - name: linux-gcc-ubsan-ootree
             os: ubuntu-latest
-            generator: Unix Makefiles
-            build-type: Ubsan
-            build-dir: .build
-            cxx-flags: -O2
-            skeleton: ${{ false }}
 
           - name: linux-gcc-asan-ootree
             os: ubuntu-latest
-            generator: Unix Makefiles
-            build-type: Asan
-            build-dir: .build
-            cxx-flags: -O2
-            skeleton: ${{ false }}
 
           - name: linux-gcc-debug-ootree-skeleton
             os: ubuntu-latest
-            generator: Unix Makefiles
-            build-type: Debug
-            build-dir: .build
-            cxx-flags: -O2
-            skeleton: ${{ true }}
 
           - name: linux-gcc-debug-intree-m32-skeleton
             os: ubuntu-latest
-            generator: Unix Makefiles
-            build-type: Debug
-            build-dir: .
-            cxx-flags: -O2 -m32
-            ld-flags: -m32
-            skeleton: ${{ true }}
 
           - name: linux-gcc-release-ootree-skeleton
             os: ubuntu-latest
-            generator: Unix Makefiles
-            build-type: Release
-            build-dir: .build
-            skeleton: ${{ true }}
 
           # macOS
           - name: macos-clang-debug-ootree-skeleton
             os: macos-latest
-            generator: Unix Makefiles
-            build-type: Debug
-            build-dir: .build
-            cxx-flags: -O2
-            skeleton: ${{ true }}
 
           - name: macos-clang-debug-intree-skeleton
             os: macos-latest
-            generator: Unix Makefiles
-            build-type: Debug
-            build-dir: .
-            cxx-flags: -O2
-            skeleton: ${{ true }}
 
           - name: macos-clang-release-ootree-skeleton
             os: macos-latest
-            generator: Unix Makefiles
-            build-type: Release
-            build-dir: .build
-            skeleton: ${{ true }}
 
           # Windows
           - name: windows-msvc-debug-ootree
             os: windows-latest
-            generator: Visual Studio 16 2019
-            build-type: Debug
-            build-dir: .build
-            skeleton: ${{ false }}
 
           - name: windows-msvc-debug-intree
             os: windows-latest
-            generator: Visual Studio 16 2019
-            build-type: Debug
-            build-dir: .
-            skeleton: ${{ false }}
 
           - name: windows-msvc-release-ootree
             os: windows-latest
-            generator: Visual Studio 16 2019
-            build-type: Release
-            build-dir: .build
-            skeleton: ${{ false }}
 
     steps:
       - name: Checkout Code
@@ -123,16 +76,10 @@ jobs:
           case ${{ runner.os }} in
             Linux*)
               sudo apt install gcc-multilib g++-multilib  # for -m32
-              echo "CC=gcc" >> $GITHUB_ENV
-              echo "CXX=g++" >> $GITHUB_ENV
               ;;
             macOS*)
               sudo xcode-select -switch /Applications/Xcode.app
-
-              echo "CC=$(xcrun -f clang)" >> $GITHUB_ENV
-              echo "CXX=$(xcrun -f clang++)" >> $GITHUB_ENV
               echo "SDKROOT=$(xcodebuild -version -sdk macosx Path)" >> $GITHUB_ENV
-
               echo "$(xcodebuild -version -sdk macosx Path)" >> $GITHUB_PATH
               ;;
             Windows*)
@@ -146,119 +93,67 @@ jobs:
           python-version: 3.x
           architecture: x64
 
-      - name: Get PIP Cache Key
-        id: pip-cache
-        run: |
-          python -c "from pip._internal.locations import USER_CACHE_DIR; \
-                     print('::set-output name=dir::' + USER_CACHE_DIR)"
-
       - name: Install Python Dependencies
         # Disabled until this https://github.com/skvadrik/re2c/issues/327
         # will be implemented
         if: startsWith(runner.os, 'Windows') == false
         run: |
           python -m pip install --upgrade pip
-          pip install docutils pygments
+          python -m pip install docutils pygments
 
-      - name: Prepare Configure Command
-        id: configure-command
-        run: |
-          # Common CMake arguments
-          args=( -S . -B ${{ matrix.build-dir }} )
-
-          # Generator's specific stuff.
-          args+=( -G "${{ matrix.generator }}" )
-          case "${{ matrix.generator }}" in
-            'Visual Studio'*)
-              args+=( -A x64 )
-              ;;
-            *)
-              # CMAKE_BUILD_TYPE is not used by multi-config build
-              # types (e.g Visual Studio) at the configure time
-              # thus we add it only for single-config build types
-              args+=( -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} )
-              ;;
-          esac
-
-          # CFLAGS, CXXFLAGS, LDFLAGS
-          args+=( -DCMAKE_C_FLAGS="${{ matrix.cxx-flags }}" )
-          args+=( -DCMAKE_CXX_FLAGS="${{ matrix.cxx-flags }}" )
-          args+=( -DCMAKE_EXE_LINKER_FLAGS="${{ matrix.ld-flags }}" )
-          args+=( -DCMAKE_SHARED_LINKER_FLAGS="${{ matrix.ld-flags }}" )
-
-          # Quote each argument to prevent word split.
-          echo "::set-output name=cmake::$(printf " '%s'" "${args[@]}")"
+      - name: Check Available Configure Presets
+        run: cmake --list-presets
 
       - name: Fast Configure
-        run: |
-          # Read prepared command into an array
-          args=( ${{ steps.configure-command.outputs.cmake }} )
-
-          # Amend Build Options
-          args+=( -DCMAKE_INSTALL_PREFIX="$(pwd)/install" )
-
-          # Disable some defaults for now to speed up the build as
-          # they are not necessary in a minimal installation
-          args+=( -DRE2C_BUILD_RE2GO=OFF )
-
-          # Print the resulting command line for debugging purposes
-          printf "cmake" && printf " '%s'" "${args[@]}" && printf "\n"
-
-          # Run CMake, pass quoted arguments to prevent word split.
-          printf " '%s'" "${args[@]}" | xargs cmake
+        run: cmake --preset=${{ matrix.name }}-fast
 
       - name: Fast Build
-        run: cmake --build ${{ matrix.build-dir }} --config ${{ matrix.build-type }}
+        run: cmake --build --preset=${{ matrix.name }}-fast
 
       - name: Install
-        run: |
-          cmake --build ${{ matrix.build-dir }} --config ${{ matrix.build-type }} --target install
-          echo -e "Install tree:\n$(find install | sed 's/^/-- /')"
+        run: cmake --build --preset=${{ matrix.name }}-fast --target install
 
       - name: Minimal Install Test
         working-directory: ./install/bin
         run: ./re2c --version
 
       - name: Full Configure
+        run: cmake --preset=${{ matrix.name }}-full
+
+      - name: Get build dir
+        id: build-info
         run: |
-          # Read prepared command into an array
-          args=( ${{ steps.configure-command.outputs.cmake }} )
-
-          # Amend Build Options
-          args+=( -DCMAKE_INSTALL_PREFIX="$(pwd)/install-2" -DRE2C_BUILD_RE2GO=ON -DRE2C_BUILD_LIBS=ON )
-          args+=( -DRE2C_REBUILD_LEXERS=ON -DRE2C_FOR_BUILD="$(pwd)/install/bin/re2c" )
-
-          # Windows does not have a native 'man' and 'sed' commands.
-          # Disabled until this https://github.com/skvadrik/re2c/issues/327
-          # will be implemented
-          case ${{ runner.os }} in
-            Windows*)
-              args+=( -DRE2C_REBUILD_DOCS=OFF )
-              ;;
-            *)
-              args+=( -DRE2C_REBUILD_DOCS=ON )
-              ;;
-          esac
-
-          # Print the resulting command line for debugging purposes
-          printf "cmake" && printf " '%s'" "${args[@]}" && printf "\n"
-
-          # Run CMake, pass quoted arguments to prevent word split.
-          printf " '%s'" "${args[@]}" | xargs cmake
+          if echo "${{ matrix.name }}" | grep -q "ootree"; then
+            BUILD_DIR="$(pwd)/.build/${{ matrix.name }}-full"
+          else
+            BUILD_DIR="$(pwd)"
+          fi
+          echo "::set-output name=BUILD_DIR::$BUILD_DIR"
 
       - name: Full Build
         run: |
           find src -name '*.re' | xargs touch
-          cmake --build ${{ matrix.build-dir }} --config ${{ matrix.build-type }} --verbose
+          cmake --build --preset=${{ matrix.name }}-full
 
-      - name: Test
-        if: startsWith(runner.os, 'Windows') == false
-        working-directory: ${{ matrix.build-dir }}
-        run: |
-          # main test suite
-          cmake --build . --target check
+      - name: Run Main Test Suite
+        run: cmake --build --preset=${{ matrix.name }}-full --target tests
 
-          # skeleton tests (if enabled)
-          if [[ "x${{ matrix.skeleton }}" == "xtrue" ]] ; then
-            ./run_tests.sh --skeleton
-          fi
+      - name: Run Skeleton Tests
+        if: "contains(matrix.name, 'skeleton')"
+        # Remove the following line after fix Windows tests
+        working-directory: ${{ steps.build-info.outputs.BUILD_DIR }}
+        run: python run_tests.py --skeleton
+
+      - name: Archive test artifacts
+        # Run this step only if tests failed (otherwise there is nothing to upload).
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          # To ensure that jobs don't overwrite existing artifacts,
+          # use a different name per job.
+          name: test-${{ matrix.name }}
+          # Tests run in a temporary directory that has a name test_<timestamp>.
+          path: ${{ steps.build-info.outputs.BUILD_DIR }}/test_[0-9]*
+          # Artifacts are retained for 90 days by default.
+          # In fact, we don't need such long period.
+          retention-days: 30

.gitignore

@@ -12,6 +12,9 @@
 /test_*
 /.build*
 
+# Ignore user defined CMake presets
+CMakeUserPresets.json
+
 # The files autogenerated by automake.
 Makefile.in
 aclocal.m4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "benchmarks/submatch_java/REgen"]
+	path = benchmarks/submatch_java/REgen
+	url = https://github.com/skvadrik/REgen.git

.travis.yml

@@ -1,5 +1,8 @@
 language: cpp
 
+# use Ubuntu 20.04 (Focal Fossa) that defaults to Python 3
+dist: focal
+
 # speed up incremental builds
 cache: ccache
 
@@ -75,7 +78,7 @@ script:
   - make -j$(nproc)
   - |
     if [ x${SKELETON} = "xyes" ]; then
-        ./run_tests.sh --skeleton
+        ./run_tests.py --skeleton
     else
         make -j$(nproc) check VERBOSE=1
     fi

BUILD.md

@@ -0,0 +1,199 @@
+How to build
+============
+
+
+Dependencies
+------------
+
+To build re2c from a release tarball one needs only a C++ compiler and
+optionally Python 3 to run the tests.
+
+To develop re2c one also needs CMake or Autotools (both build systems are
+maintained). Other dependencies include Bison (to rebuild parsers), rst2man (to
+rebuild documentation) and Sphinx (to rebuild the website). Benchmarks also use
+google-benchmark, re2 and Java. A few helper scripts are written in Haskell, but
+they are not essential for re2c development.
+
+re2c is a self-hosting lexer generator, meaning that parts of its source code
+are written in re2c (namely, all the source files that have a *.re* extension).
+By default re2c builds from pre-generated bootstrap files. To build from source
+*.re* files, it is necessary to reconfigure the build and provide a path to an
+existing re2c binary that will be used for bootstrap (see the details below).
+
+
+Build (Autotools)
+-----------------
+
+If you are building from a release tarball, the configure script is already
+there. Otherwise it is necessary to generate it:
+  ```
+  $ autoreconf -i -W all
+  ```
+An in-tree build (objects are generated side by side with sources):
+  ```
+  $ ./configure && make && make install
+  ```
+An out-of-tree build (objects are generated in a separate directory):
+  ```
+  $ mkdir .build && cd .build && ../configure && make && make install
+  ```
+
+The configure script has many options (to see them all, run
+`configure --help`). The options specific to re2c are the following:
+
+  * `--enable-debug`
+    Enable debug checks in the re2c source code. Also enables debug options.
+
+  * `--enable-golang`
+    Build re2go (identical to `re2c --lang go`). This is on by default.
+
+  * `--enable-rust`
+    Build re2rust (identical to `re2c --lang rust`). This is on by default.
+
+  * `--enable-lexers`
+    Enable regeneration of *.re* files (as opposed to using bootstrap files).
+    This requires setting `RE2C_FOR_BUILD` to an existing re2c executable
+    path.
+
+  * `--enable-docs`
+    Enable regeneration of documentation (requires rst2man).
+
+  * `--enable-benchmarks`
+    Build benchmarks (requires google benchmarks library).
+
+  * `--enable-benchmarks-regenerate`
+    Regenerate C code for Ragel and Kleenex benchmarks (this will download and
+    build Ragel and Kleenex). re2c benchmarks are always regenerated.
+
+  * `--enable-libs`
+    Build the experimental libre2c library that provides POSIX
+    `regcomp`/`regexec`/`regfree` interface to re2c.
+
+
+Cross-compile re2c for Windows (for some Mingw versions you might have to use
+`-std=gnu++11` compiler option):
+  ```
+  $ ./configure --host i686-w64-ming32 \
+      LDFLAGS="-static -static-libstdc++ -static-libgcc"
+  ```
+
+There is a bunch of build scripts for specialized builds with Asan, Ubsan,
+GLIBCXX_DEBUG, etc. in the ``build`` subdirectory.
+
+
+Build (CMake)
+-------------
+
+CMake supports different build modes, which can be further customized with
+individual options. By default re2c builds with `-O2 -g` and does not set any
+particular mode to allow the user complete freedom in overriding the build
+options. To enable a build mode at configure phase, use
+`-DCMAKE_BUILD_TYPE=<mode>` option (this works with single-config generators,
+such as Makefiles or Ninja). At build phase use `--config <mode>` option.
+The following modes are supported:
+
+  * `Release`
+    This is an optimized `-O3 -DNDEBUG` build without debug symbols, asserts
+    and debug checks.
+
+  * `Debug`
+    This is a non-optimized `-g -DRE2C_DEBUG` build with debug symbols, asserts,
+    and debug checks.
+
+  * `RelWithDebInfo`
+    This is an optimized `-O2 -g -DNDEBUG` build with debug symbols, but
+    without asserts and debug checks.
+
+  * `MinSizeRel`
+    This is an optimized for size `-Os -DNDEBUG` build without debug symbols,
+    asserts and debug checks.
+
+  * `Asan`
+    This is a non-optimized `-g -fsanitize=address` build that instruments the
+    code with Address Sanitizer to check for memory errors.
+
+  * `Ubsan`
+    This is a non-optimized `-g -fsanitize=undefined` build that instruments
+    the code with Undefined Behavior Sanitizer to check for undefined behavior
+    errors.
+
+A simple build (objects are generated in a separate build directory):
+  ```
+  $ mkdir .build && cd .build && cmake .. && cmake --build .
+  ```
+
+CMake supports a lot of configuration options. Here is the list of options
+specific to re2c:
+
+  * `-DRE2C_BUILD_RE2GO=yes`
+    Build re2go executable (an alias to `re2c --lang go`). Enabled by default.
+
+  * `-DRE2C_BUILD_RE2RUST=yes`
+    Build re2rust executable (an alias to `re2c --lang rust`). Enabled by
+    default.
+
+  * `-DRE2C_REBUILD_LEXERS=yes`
+    Enable regeneration of *.re* files (as opposed to using bootstrap files).
+    This requires setting `-DRE2C_FOR_BUILD` to an existing re2c executable
+    path.
+
+  * `-DRE2C_REBUILD_DOCS=yes`
+    Enable regeneration of documentation (requires rst2man).
+
+  * `-DRE2C_BUILD_BENCHMARKS=yes`
+    Build benchmarks (requires google benchmarks library).
+
+  * `-DRE2C_REGEN_BENCHMARKS=yes`
+    Regenerate C code for Ragel and Kleenex benchmarks (this will download and
+    build Ragel and Kleenex). re2c benchmarks are always regenerated.
+
+  * `-DRE2C_BUILD_LIBS=yes`
+    Build the experimental libre2c library that provides POSIX
+    `regcomp`/`regexec`/`regfree` interface to re2c.
+
+
+Cross-compile re2c for Windows using Mingw:
+  ```
+  $ cmake . -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-cross-mingw32-linux.cmake \
+      -DCMAKE_EXE_LINKER_FLAGS="-static -static-libstdc++ -static-libgcc" \
+      -DBUILD_SHARED_LIBS=no
+  ```
+
+There is a bunch of build scripts for specialized builds with Asan, Ubsan,
+GLIBCXX_DEBUG, etc. in the ``build`` subdirectory.
+
+
+Test
+----
+
+re2c has a main test suite and a number of unit tests. Run them all:
+  ```
+  $ make check
+  ```
+Run only the main test suite and watch the progress dumped on stdout:
+  ```
+  $ python3 run_tests.py -j<N>
+  ```
+Run the main test suite with `--skeleton` re2c option:
+  ```
+  $ python3 run_tests.py --skeleton
+  ```
+Run the test suite under Valgrind (takes some time and memory):
+  ```
+  $ python3 run_tests.py --valgrind
+  ```
+Test Mingw builds with Wine:
+  ```
+  $ make wtests
+  ```
+Check the distribution (works with Autotools):
+  ```
+  $ make distcheck
+  ```
+
+re2c provides a helper script `build/__alltest.sh` that builds and tests various
+re2c build flavours with Asan, Ubsan, GLIBCXX_DEBUG, etc. There is a couple of
+fuzz-testing Haskell scripts in the *fuzz* subdirectory; they are based on the
+QuickCheck library and can be easily modified to fuzz-test various aspects of
+re2c by comparing current re2c version against older versions or against other
+regular expression libraries.

CHANGELOG

@@ -1,10 +1,167 @@
 Changelog
 =========
 
+
+----
+3.0x
+----
+
+3.0 (2022-01-27)
+~~~~~~~~~~~~~~~~
+
+- Added code generation backend for Rust:
+
+  + Enabled with ``--lang rust`` option.
+  + A new ``re2rust`` binary (built by default, or configured with
+    ``--enable-rust`` Autoconf option and ``RE2C_BUILD_RE2RUST`` CMake option).
+
+- Added options:
+
+  + ``--loop-switch``
+  + ``--no-unsafe``
+
+- Added configurations;
+
+  + ``re2c:label:yyloop``
+  + ``re2c:unsafe``
+
+- Renamed options to use common naming scheme. The old names are supported as
+  aliases, so the change does not break existing code. Documentation has been
+  updated to use new names.
+
+  + ``--api`` is a new alias for ``--input``
+  + ``--ebcdic`` is a new alias for ``--ecb``
+  + ``--ucs2`` is a new alias for ``--wide-chars``
+  + ``--utf32`` is a new alias for ``--unicode``
+  + ``--utf16`` is a new alias for ``--utf-16``
+  + ``--utf8`` is a new alias for ``--utf-8``
+  + ``--header`` is a new alias for ``--type-header``
+
+- Renamed configurations to use common naming scheme and support proper scoping
+  under subcategories such as ``:define``, ``:label``, ``:variable``, etc. The
+  old names are supported as aliases, so the change does not break existing
+  code. Documentation has been updated to use new names.
+
+  + ``re2c:api`` is a new alias for ``re2c:flags:input``
+  + ``re2c:bit-vectors`` is a new alias for ``re2c:flags:bit-vectors``
+  + ``re2c:case-insensitive`` is a new alias for ``re2c:flags:case-insensitive``
+  + ``re2c:case-inverted`` is a new alias for ``re2c:flags:case-inverted``
+  + ``re2c:case-ranges`` is a new alias for ``re2c:flags:case-ranges``
+  + ``re2c:cond:prefix`` is a new alias for ``re2c:condprefix``
+  + ``re2c:cond:enumprefix`` is a new alias for ``re2c:condenumprefix``
+  + ``re2c:computed-gotos`` is a new alias for ``re2c:flags:computed-gotos``
+  + ``re2c:computed-gotos:threshold`` is a new alias for ``re2c:cgoto:threshold``
+  + ``re2c:debug-output`` is a new alias for ``re2c:flags:debug-output``
+  + ``re2c:encoding:ebcdic`` is a new alias for ``re2c:flags:ecb``
+  + ``re2c:encoding:utf32`` is a new alias for ``re2c:flags:unicode``
+  + ``re2c:encoding:ucs2`` is a new alias for ``re2c:flags:wide-chars``
+  + ``re2c:encoding:utf16`` is a new alias for ``re2c:flags:utf-16``
+  + ``re2c:encoding:utf8`` is a new alias for ``re2c:flags:utf-8``
+  + ``re2c:encoding-policy`` is a new alias for ``re2c:flags:encoding-policy``
+  + ``re2c:empty-class`` is a new alias for ``re2c:flags:empty-class``
+  + ``re2c:header`` is a new alias for ``re2c:flags:type-header``
+  + ``re2c:label:prefix`` is a new alias for ``re2c:labelprefix``
+  + ``re2c:label:yyfill`` is a new alias for ``re2c:label:yyFillLabel``
+  + ``re2c:label:start`` is a new alias for ``re2c:startlabel``
+  + ``re2c:nested-ifs`` is a new alias for ``re2c:flags:nested-ifs``
+  + ``re2c:posix-captures`` is a new alias for ``re2c:flags:posix-captures``
+  + ``re2c:tags`` is a new alias for ``re2c:flags:tags``
+  + ``re2c:variable:yych:conversion`` is a new alias for ``re2c:yych:conversion``
+  + ``re2c:variable:yych:emit`` is a new alias for ``re2c:yych:emit``
+  + ``re2c:variable:yybm:hex`` is a new alias for ``re2c:yybm:hex``
+  + ``re2c:unsafe`` is a new alias for ``re2c:flags:unsafe``
+
+- Added directive alias ``conditions:re2c`` for ``types:re2c``.
+
+- Multiple small changes in code generation, including some formatting changes
+  that result in large diffs in the generated code:
+
+  + Do not allocate indices for unused state labels (this results in a change in
+    state enumeration), commits
+    `919570c4 <https://github.com/skvadrik/re2c/commit/919570c4>`_ and
+    `82b704f6 <https://github.com/skvadrik/re2c/commit/82b704f6>`_.
+  + Do not generate redundant ``YYPEEK`` statements, commit
+    `cca31d22 <https://github.com/skvadrik/re2c/commit/cca31d22>`_.
+  + Do not generate ``YYDEBUG`` statements for unused states labels, commit
+    `a46f01e6 <https://github.com/skvadrik/re2c/commit/a46f01e6>`_.
+  + C backend: change formatting of switch statements, commit
+    `ed88e12e <https://github.com/skvadrik/re2c/commit/ed88e12e>`_.
+  + Go backend: render continuous character ranges in compact form, commit
+    `09161b14 <https://github.com/skvadrik/re2c/commit/09161b14>`_.
+  + Mark start and end of included .re files with line directives, commit
+    `48e83fca <https://github.com/skvadrik/re2c/commit/48e83fca>`_.
+
+- A fix to limit maximum allowed NFA and DFA size (to avoid out of memory
+  crashes and stack overflows), commit
+  `a3473fd7 <https://github.com/skvadrik/re2c/commit/a3473fd7>`_.
+
+- A fix to correctly compute fixed tags in trailing context, commit
+  `68e1ab71 <https://github.com/skvadrik/re2c/commit/68e1ab71>`_.
+
+- A fix to generate non-overlapping names for s-tag and m-tag variables, commit
+  `7c6b5c95 <https://github.com/skvadrik/re2c/commit/7c6b5c95>`_.
+
+- Infrastructural: added support for CMake presets.
+
+- Updated documentation.
+
+- Backwards-incompatible changes that are unlikely to affect any users:
+
+  + Restrict lexical contexts where ``%{`` is recognized as a block start,
+    commit `dba7d055 <https://github.com/skvadrik/re2c/commit/dba7d055>`_.
+  + Emit an error when repetition lower bound exceeds upper bound, commit
+    `039c1894 <https://github.com/skvadrik/re2c/commit/039c1894>`_.
+
+
+----
+2.2x
+----
+
+2.2 (2021-08-01)
+~~~~~~~~~~~~~~~~
+
+- Added named blocks and block lists in directives.
+
+- Added local blocks ``/*!local:re2c ... */``.
+
+- Added in-block ``!include`` directive.
+
+- Added in-block ``!use`` directive.
+
+- Allowed reusable blocks without ``-r --reusable`` option.
+
+- Allowed customizing the generated code with configurations for directives
+  ``max:re2c``, ``maxnmatch:re2c``, ``stags:re2c``, ``mtags:re2c`` and
+  ``types:re2c`` (see directive descriptions for details).
+
+- Forbid arbitrary text at the end of ``max:re2c`` directive. This may break
+  backwards compatibility, although it is unlikely that this was used by anyone.
+  The change was necessary in order to allow customization of the generated code
+  with configurations.
+
+- Deprecated configurations ``flags:i``, ``flags:no-debug-info`` in favour of
+  the global options ``-i``, ``--no-debug-info``.
+
+- Reimplemented re2c test runner in Python (thanks to
+  `Serghei Iakovlev <https://github.com/sergeyklay>`_). Improved integration
+  with GitHub Actions.
+
+- Changes in the experimental libre2c library: added new algorithms that
+  construct t-string or extract submatch on all repetitions; added TDFA
+  benchmark written in Java by Angelo Borsotti.
+
+- Updated documentation.
+
 ----
 2.1x
 ----
 
+2.1.1 (2021-03-27)
+~~~~~~~~~~~~~~~~~~
+
+- Added missing CMakeLists.txt to release tarballs
+  (`#346 <https://github.com/skvadrik/re2c/issues/346>`_).
+
 2.1 (2021-03-26)
 ~~~~~~~~~~~~~~~~
 

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.12)
-project(re2c VERSION 2.1 HOMEPAGE_URL "https://re2c.org/")
+project(re2c VERSION 3.0 HOMEPAGE_URL "https://re2c.org/")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -42,12 +42,14 @@ endif()
 option(RE2C_BUILD_LIBS "Build libraries" OFF)
 
 option(RE2C_BUILD_RE2GO "Build re2go executable (an alias for `re2c --lang go`)" ON)
+option(RE2C_BUILD_RE2RUST "Build re2rust executable (an alias for `re2c --lang rust`)" ON)
 
 option(RE2C_BUILD_BENCHMARKS "Build benchmarks" OFF)
 option(RE2C_REGEN_BENCHMARKS "Regenerate C code for benchmarks" OFF)
 
 # checks for programs
 find_package(BISON)
+find_package(Python3 COMPONENTS Interpreter)
 
 # checks for C++ compiler flags
 set(CMAKE_CXX_STANDARD 98)
@@ -95,11 +97,14 @@ set(re2c_docs
 )
 
 set(top_srcdir "${CMAKE_CURRENT_SOURCE_DIR}")
+set(top_builddir "${CMAKE_CURRENT_BINARY_DIR}")
+set(PYTHON "${Python3_EXECUTABLE}")
+
 configure_file(doc/manpage.rst.in doc/manpage.rst @ONLY)
 configure_file(doc/help.rst.in doc/help.rst @ONLY)
 
-configure_file(run_tests.sh.in run_tests.sh @ONLY)
-set(RE2C_RUN_TESTS "${CMAKE_CURRENT_BINARY_DIR}/run_tests.sh")
+configure_file(run_tests.py.in run_tests.py @ONLY)
+set(RE2C_RUN_TESTS "${CMAKE_CURRENT_BINARY_DIR}/run_tests.py")
 if(CMAKE_HOST_UNIX)
     execute_process(COMMAND chmod +x "${RE2C_RUN_TESTS}")
 endif()
@@ -141,12 +146,13 @@ set(re2c_sources
     src/codegen/gen_program.cc
     src/codegen/gen_state.cc
     src/codegen/helpers.cc
+    src/codegen/remove_empty.cc
     src/codegen/render.cc
     src/options/opt.cc
+    src/options/symtab.cc
     src/nfa/estimate_size.cc
     src/nfa/re_to_nfa.cc
     src/adfa/adfa.cc
-    src/adfa/prepare.cc
     src/debug/dump_adfa.cc
     src/debug/dump_cfg.cc
     src/debug/dump_dfa.cc
@@ -186,6 +192,7 @@ set(re2c_sources
     src/regexp/default_tags.cc
     src/regexp/fixed_tags.cc
     src/regexp/nullable.cc
+    src/regexp/re.cc
     src/regexp/rule.cc
     src/regexp/split_charset.cc
     src/regexp/tag.cc
@@ -197,11 +204,10 @@ set(re2c_sources
     src/skeleton/skeleton.cc
     src/parse/ast.cc
     src/parse/input.cc
-    src/parse/normalize.cc
+    src/parse/parse.cc
     src/parse/scanner.cc
     src/parse/unescape.cc
-    src/parse/validate.cc
-    src/util/get_dir.cc
+    src/util/file_utils.cc
     src/util/s_to_n32_unsafe.cc
     src/util/temp_file.cc
     src/util/range.cc
@@ -219,6 +225,12 @@ if (RE2C_BUILD_RE2GO)
     target_compile_definitions(re2go PUBLIC "RE2C_LANG=LANG_GO")
 endif()
 
+# re2rust
+if (RE2C_BUILD_RE2RUST)
+    add_executable(re2rust ${re2c_sources})
+    target_compile_definitions(re2rust PUBLIC "RE2C_LANG=LANG_RUST")
+endif()
+
 re2c_bootstrap_lexer("src/parse/lex.re" "src/parse/lex.cc" "src/parse/lex.h")
 re2c_bootstrap_lexer("src/parse/lex_conf.re" "src/parse/lex_conf.cc")
 re2c_bootstrap_lexer("src/options/parse_opts.re" "src/options/parse_opts.cc")
@@ -228,8 +240,8 @@ re2c_bootstrap_parser("src/parse/parser.ypp" "src/parse/parser.cc" "src/parse/pa
 # docs
 set(re2c_docs_sources
     "${re2c_manpage_source}"
-    "doc/manual/api/api.rst_"
     "doc/manual/api/interface.rst_"
+    "doc/manual/conditions/blocks.rst_"
     "doc/manual/conditions/conditions.rst_"
     "doc/manual/configurations/configurations.rst_"
     "doc/manual/directives/directives.rst_"
@@ -254,13 +266,22 @@ set(re2c_docs_sources
     "doc/manual/state/state.rst_"
     "doc/manual/submatch/submatch_example_mtags.rst_"
     "doc/manual/submatch/submatch_example_posix.rst_"
-    "doc/manual/submatch/submatch_example_stags.rst_"
     "doc/manual/submatch/submatch_example_stags_fill.rst_"
+    "doc/manual/submatch/submatch_example_stags.rst_"
     "doc/manual/submatch/submatch.rst_"
+    "doc/manual/synopsis.rst_"
+    "doc/manual/syntax/api1.rst_"
+    "doc/manual/syntax/api2_c.rst_"
+    "doc/manual/syntax/api2_go.rst_"
+    "doc/manual/syntax/api2_rust.rst_"
+    "doc/manual/syntax/api3.rst_"
+    "doc/manual/syntax/intro.rst_"
     "doc/manual/syntax/syntax.rst_"
     "doc/manual/warnings/warnings_general.rst_"
     "doc/manual/warnings/warnings_list.rst_"
     "examples/c/01_basic.re"
+    "examples/c/01_basic.c"
+    "examples/c/conditions/parse_u32_blocks.re"
     "examples/c/conditions/parse_u32_conditions.re"
     "examples/c/encodings/unicode_identifier.re"
     "examples/c/eof/01_sentinel.re"
@@ -270,16 +291,19 @@ set(re2c_docs_sources
     "examples/c/fill/01_fill.re"
     "examples/c/fill/02_fill.re"
     "examples/c/headers/header.re"
-    "examples/c/headers/src/lexer/lexer.h"
+    "examples/c/headers/lexer/state.h"
     "examples/c/includes/include.re"
     "examples/c/includes/definitions.h"
     "examples/c/reuse/reuse.re"
+    "examples/c/reuse/usedir.re"
     "examples/c/state/push.re"
-    "examples/c/submatch/01_stags.re"
     "examples/c/submatch/01_stags_fill.re"
+    "examples/c/submatch/01_stags.re"
     "examples/c/submatch/02_mtags.re"
     "examples/c/submatch/03_posix.re"
     "examples/go/01_basic.re"
+    "examples/go/01_basic.go"
+    "examples/go/conditions/parse_u32_blocks.re"
     "examples/go/conditions/parse_u32_conditions.re"
     "examples/go/encodings/unicode_identifier.re"
     "examples/go/eof/01_sentinel.re"
@@ -289,14 +313,38 @@ set(re2c_docs_sources
     "examples/go/fill/01_fill.re"
     "examples/go/fill/02_fill.re"
     "examples/go/headers/header.re"
-    "examples/go/headers/src/lexer/lexer.go"
+    "examples/go/headers/lexer/state.go"
     "examples/go/includes/include.re"
     "examples/go/includes/definitions.go"
     "examples/go/reuse/reuse.re"
+    "examples/go/reuse/usedir.re"
     "examples/go/state/push.re"
+    "examples/go/submatch/01_stags_fill.re"
     "examples/go/submatch/01_stags.re"
     "examples/go/submatch/02_mtags.re"
     "examples/go/submatch/03_posix.re"
+    "examples/rust/01_basic.re"
+    "examples/rust/01_basic.rs"
+    "examples/rust/conditions/parse_u32_blocks.re"
+    "examples/rust/conditions/parse_u32_conditions.re"
+    "examples/rust/encodings/unicode_identifier.re"
+    "examples/rust/eof/01_sentinel.re"
+    "examples/rust/eof/02_bounds_checking.re"
+    "examples/rust/eof/03_eof_rule.re"
+    "examples/rust/eof/05_generic_api_eof_rule.re"
+    "examples/rust/fill/01_fill.re"
+    "examples/rust/fill/02_fill.re"
+    "examples/rust/headers/header.re"
+    "examples/rust/headers/lexer/state.rs"
+    "examples/rust/includes/include.re"
+    "examples/rust/includes/definitions.rs"
+    "examples/rust/reuse/reuse.re"
+    "examples/rust/reuse/usedir.re"
+    "examples/rust/state/push.re"
+    "examples/rust/submatch/01_stags_fill.re"
+    "examples/rust/submatch/01_stags.re"
+    "examples/rust/submatch/02_mtags.re"
+    "examples/rust/submatch/03_posix.re"
 )
 re2c_gen_manpage("${re2c_manpage_source}" "${re2c_manpage_c}"  "${re2c_manpage_bootstrap_c}"  "c")
 re2c_gen_manpage("${re2c_manpage_source}" "${re2c_manpage_go}" "${re2c_manpage_bootstrap_go}" "go")
@@ -312,6 +360,10 @@ if (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
         install(TARGETS re2go RUNTIME DESTINATION bin)
         install(FILES "${re2c_manpage_go}" DESTINATION "share/man/man1")
     endif()
+    if(RE2C_BUILD_RE2RUST)
+        install(TARGETS re2rust RUNTIME DESTINATION bin)
+        # TODO: add docs for Rust.
+    endif()
     install(FILES include/unicode_categories.re DESTINATION "${RE2C_STDLIB_DIR}")
 
     # rebuild all re2c sources using newly built re2c
@@ -325,19 +377,19 @@ if (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
     add_custom_target(tests
         DEPENDS "${RE2C_RUN_TESTS}"
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-        COMMAND "${RE2C_RUN_TESTS}"
+        COMMAND "${Python3_EXECUTABLE}" "${RE2C_RUN_TESTS}"
     )
     add_dependencies(tests re2c)
     add_custom_target(vtests
         DEPENDS "${RE2C_RUN_TESTS}"
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-        COMMAND "${RE2C_RUN_TESTS}" --valgrind
+        COMMAND "${Python3_EXECUTABLE}" "${RE2C_RUN_TESTS}" --valgrind
     )
     add_dependencies(vtests re2c)
     add_custom_target(wtests
         DEPENDS "${RE2C_RUN_TESTS}"
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-        COMMAND "${RE2C_RUN_TESTS}" --wine -j1
+        COMMAND "${Python3_EXECUTABLE}" "${RE2C_RUN_TESTS}" --wine -j1
     )
     add_dependencies(wtests re2c)
     add_executable(re2c_test_range
@@ -387,6 +439,11 @@ if (RE2C_BUILD_LIBS)
     re2c_bootstrap_lexer("lib/lex.re" "lib/lex.cc")
     re2c_bootstrap_parser("lib/parse.ypp" "lib/parse.cc" "lib/parse.h")
 
+    add_library(test_libre2c_objects_autogen OBJECT
+        "${CMAKE_CURRENT_BINARY_DIR}/lib/test_helper.cc"
+    )
+    re2c_bootstrap_lexer("lib/test_helper.re" "lib/test_helper.cc")
+
     add_library(libre2c_objects OBJECT
         lib/regcomp.cc
         lib/regexec.cc
@@ -403,6 +460,7 @@ if (RE2C_BUILD_LIBS)
         src/parse/ast.cc
         src/parse/unescape.cc
         src/options/opt.cc
+        src/options/symtab.cc
         src/cfg/cfg.cc
         src/cfg/compact.cc
         src/cfg/dce.cc
@@ -444,6 +502,7 @@ if (RE2C_BUILD_LIBS)
         src/regexp/default_tags.cc
         src/regexp/fixed_tags.cc
         src/regexp/nullable.cc
+        src/regexp/re.cc
         src/regexp/rule.cc
         src/regexp/split_charset.cc
         src/regexp/tag.cc
@@ -490,6 +549,7 @@ if (RE2C_BUILD_LIBS)
     # libre2c test
     add_executable(test_libre2c lib/test.cc)
     target_link_libraries(test_libre2c libre2c)
+    target_link_libraries(test_libre2c test_libre2c_objects_autogen)
     add_custom_target(check_libre2c
         COMMAND ./test_libre2c
     )
@@ -497,6 +557,7 @@ if (RE2C_BUILD_LIBS)
     if(RE2C_BUILD_BENCHMARKS)
         add_subdirectory(benchmarks/submatch_nfa)
         add_subdirectory(benchmarks/submatch_dfa_jit)
+        add_subdirectory(benchmarks/submatch_java)
     endif()
 else()
     # empty check target

CMakePresets.json

@@ -0,0 +1,483 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 21,
+    "patch": 1
+  },
+  "configurePresets": [
+    {
+      "name": "default-full-configuration",
+      "hidden": true,
+      "installDir": "${sourceDir}/install-2",
+      "cacheVariables": {
+        "RE2C_BUILD_RE2GO": true,
+        "RE2C_BUILD_RE2RUST": true,
+        "RE2C_BUILD_LIBS": true,
+        "RE2C_REBUILD_LEXERS": true,
+        "RE2C_REBUILD_DOCS": true,
+        "RE2C_FOR_BUILD": "${sourceDir}/install/bin/re2c"
+      }
+    },
+
+    {
+      "name": "linux-config-base",
+      "hidden": true,
+      "generator": "Unix Makefiles",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      },
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "gcc",
+        "CMAKE_CXX_COMPILER": "g++"
+      }
+    },
+    {
+      "name": "linux-gcc-ubsan-ootree-fast",
+      "displayName": "Linux x86_64: GCC / Ubsan / Out of tree (fast)",
+      "inherits": "linux-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Ubsan",
+        "CMAKE_C_FLAGS": "-O2",
+        "CMAKE_CXX_FLAGS": "-O2",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "linux-gcc-ubsan-ootree-full",
+      "displayName": "Linux x86_64: GCC / Ubsan / Out of tree (full)",
+      "inherits": ["default-full-configuration", "linux-gcc-ubsan-ootree-fast"]
+    },
+    {
+      "name": "linux-gcc-asan-ootree-fast",
+      "displayName": "Linux x86_64: GCC / Asan / Out of tree (fast)",
+      "inherits": "linux-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Asan",
+        "CMAKE_C_FLAGS": "-O2",
+        "CMAKE_CXX_FLAGS": "-O2",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "linux-gcc-asan-ootree-full",
+      "displayName": "Linux x86_64: GCC / Asan / Out of tree (full)",
+      "inherits": ["default-full-configuration", "linux-gcc-asan-ootree-fast"]
+    },
+    {
+      "name": "linux-gcc-debug-ootree-skeleton-fast",
+      "displayName": "Linux x86_64: GCC / Debug / Skeleton / Out of tree (fast)",
+      "inherits": "linux-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_C_FLAGS": "-O2",
+        "CMAKE_CXX_FLAGS": "-O2",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "linux-gcc-debug-ootree-skeleton-full",
+      "displayName": "Linux x86_64: GCC / Debug / Skeleton / Out of tree (full)",
+      "inherits": ["default-full-configuration", "linux-gcc-debug-ootree-skeleton-fast"]
+    },
+    {
+      "name": "linux-gcc-debug-intree-m32-skeleton-fast",
+      "displayName": "Linux x86: GCC / Debug / Skeleton / In tree (fast)",
+      "inherits": "linux-config-base",
+      "binaryDir": "${sourceDir}",
+      "installDir": "${sourceDir}/install",
+      "architecture": {
+        "value": "x86",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_C_FLAGS": "-O2 -m32",
+        "CMAKE_CXX_FLAGS": "-O2 -m32",
+        "CMAKE_EXE_LINKER_FLAGS": "-m32",
+        "CMAKE_SHARED_LINKER_FLAGS": "-m32",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "linux-gcc-debug-intree-m32-skeleton-full",
+      "displayName": "Linux x86: GCC / Debug / Skeleton / In tree (full)",
+      "inherits": ["default-full-configuration", "linux-gcc-debug-intree-m32-skeleton-fast"]
+    },
+    {
+      "name": "linux-gcc-release-ootree-skeleton-fast",
+      "displayName": "Linux x86_64: GCC / Release / Skeleton / Out of tree (fast)",
+      "inherits": "linux-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "linux-gcc-release-ootree-skeleton-full",
+      "displayName": "Linux x86_64: GCC / Release / Skeleton / Out of tree (full)",
+      "inherits": ["default-full-configuration", "linux-gcc-release-ootree-skeleton-fast"]
+    },
+
+
+    {
+      "name": "macos-config-base",
+      "hidden": true,
+      "generator": "Unix Makefiles",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      },
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++"
+      }
+    },
+    {
+      "name": "macos-clang-debug-ootree-skeleton-fast",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / Out of tree (fast)",
+      "inherits": "macos-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_C_FLAGS": "-O2",
+        "CMAKE_CXX_FLAGS": "-O2",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "macos-clang-debug-ootree-skeleton-full",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / Out of tree (full)",
+      "inherits": ["default-full-configuration", "macos-clang-debug-ootree-skeleton-fast"]
+    },
+    {
+      "name": "macos-clang-debug-intree-skeleton-fast",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / In tree (fast)",
+      "inherits": "macos-config-base",
+      "binaryDir": "${sourceDir}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_C_FLAGS": "-O2",
+        "CMAKE_CXX_FLAGS": "-O2",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "macos-clang-debug-intree-skeleton-full",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / In tree (full)",
+      "inherits": ["default-full-configuration", "macos-clang-debug-intree-skeleton-fast"]
+    },
+    {
+      "name": "macos-clang-release-ootree-skeleton-fast",
+      "displayName": "macOS x86_64: CLang / Release / Skeleton / Out of tree (fast)",
+      "inherits": "macos-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "macos-clang-release-ootree-skeleton-full",
+      "displayName": "macOS x86_64: CLang / Release / Skeleton / Out of tree (full)",
+      "inherits": ["default-full-configuration", "macos-clang-release-ootree-skeleton-fast"]
+    },
+
+
+    {
+      "name": "windows-config-base",
+      "hidden": true,
+      "generator": "Visual Studio 16 2019",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "cl",
+        "CMAKE_CXX_COMPILER": "cl"
+      }
+    },
+    {
+      "name": "windows-msvc-debug-ootree-fast",
+      "displayName": "Windows x86_64: MSVC / Debug / Out of tree (fast)",
+      "inherits": "windows-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "windows-msvc-debug-ootree-full",
+      "displayName": "Windows x86_64: MSVC / Debug / Out of tree (full)",
+      "inherits": ["default-full-configuration", "windows-msvc-debug-ootree-fast"],
+      "cacheVariables": {
+        "RE2C_REBUILD_DOCS": false
+      }
+    },
+    {
+      "name": "windows-msvc-debug-intree-fast",
+      "displayName": "Windows x86_64: MSVC / Debug / In tree (fast)",
+      "inherits": "windows-config-base",
+      "binaryDir": "${sourceDir}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "windows-msvc-debug-intree-full",
+      "displayName": "Windows x86_64: MSVC / Debug / In tree (full)",
+      "inherits": ["default-full-configuration", "windows-msvc-debug-intree-fast"],
+      "cacheVariables": {
+        "RE2C_REBUILD_DOCS": false
+      }
+    },
+    {
+      "name": "windows-msvc-release-ootree-fast",
+      "displayName": "Windows x86_64: MSVC / Release / Out of tree (fast)",
+      "inherits": "windows-config-base",
+      "binaryDir": "${sourceDir}/.build/${presetName}",
+      "installDir": "${sourceDir}/install",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "RE2C_BUILD_RE2GO": false,
+        "RE2C_BUILD_RE2RUST": false
+      }
+    },
+    {
+      "name": "windows-msvc-release-ootree-full",
+      "displayName": "Windows x86_64: MSVC / Release / Out of tree (full)",
+      "inherits": ["default-full-configuration", "windows-msvc-release-ootree-fast"],
+      "cacheVariables": {
+        "RE2C_REBUILD_DOCS": false
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "linux-build-base",
+      "hidden": true,
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      }
+    },
+    {
+      "name": "linux-gcc-ubsan-ootree-fast",
+      "displayName": "Linux x86_64: GCC / Ubsan / Out of tree (fast)",
+      "configurePreset": "linux-gcc-ubsan-ootree-fast",
+      "inherits": "linux-build-base",
+      "configuration": "Ubsan"
+    },
+    {
+      "name": "linux-gcc-ubsan-ootree-full",
+      "displayName": "Linux x86_64: GCC / Ubsan / Out of tree (full)",
+      "configurePreset": "linux-gcc-ubsan-ootree-full",
+      "inherits": "linux-build-base",
+      "configuration": "Ubsan"
+    },
+    {
+      "name": "linux-gcc-asan-ootree-fast",
+      "displayName": "Linux x86_64: GCC / Asan / Out of tree (fast)",
+      "configurePreset": "linux-gcc-asan-ootree-fast",
+      "inherits": "linux-build-base",
+      "configuration": "Asan"
+    },
+    {
+      "name": "linux-gcc-asan-ootree-full",
+      "displayName": "Linux x86_64: GCC / Asan / Out of tree (full)",
+      "configurePreset": "linux-gcc-asan-ootree-full",
+      "inherits": "linux-build-base",
+      "configuration": "Asan"
+    },
+    {
+      "name": "linux-gcc-debug-ootree-skeleton-fast",
+      "displayName": "Linux x86_64: GCC / Debug / Skeleton / Out of tree (fast)",
+      "configurePreset": "linux-gcc-debug-ootree-skeleton-fast",
+      "inherits": "linux-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "linux-gcc-debug-ootree-skeleton-full",
+      "displayName": "Linux x86_64: GCC / Debug / Skeleton / Out of tree (full)",
+      "configurePreset": "linux-gcc-debug-ootree-skeleton-full",
+      "inherits": "linux-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "linux-gcc-debug-intree-m32-skeleton-fast",
+      "displayName": "Linux x86: GCC / Debug / Skeleton / In tree (fast)",
+      "configurePreset": "linux-gcc-debug-intree-m32-skeleton-fast",
+      "inherits": "linux-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "linux-gcc-debug-intree-m32-skeleton-full",
+      "displayName": "Linux x86: GCC / Debug / Skeleton / In tree (full)",
+      "configurePreset": "linux-gcc-debug-intree-m32-skeleton-full",
+      "inherits": "linux-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "linux-gcc-release-ootree-skeleton-fast",
+      "displayName": "Linux x86_64: GCC / Release / Skeleton / Out of tree (fast)",
+      "configurePreset": "linux-gcc-release-ootree-skeleton-fast",
+      "inherits": "linux-build-base",
+      "configuration": "Release"
+    },
+    {
+      "name": "linux-gcc-release-ootree-skeleton-full",
+      "displayName": "Linux x86_64: GCC / Release / Skeleton / Out of tree (full)",
+      "configurePreset": "linux-gcc-release-ootree-skeleton-full",
+      "inherits": "linux-build-base",
+      "configuration": "Release"
+    },
+
+
+    {
+      "name": "macos-build-base",
+      "hidden": true,
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      }
+    },
+    {
+      "name": "macos-clang-debug-ootree-skeleton-fast",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / Out of tree (fast)",
+      "configurePreset": "macos-clang-debug-ootree-skeleton-fast",
+      "inherits": "macos-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "macos-clang-debug-ootree-skeleton-full",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / Out of tree (full)",
+      "configurePreset": "macos-clang-debug-ootree-skeleton-full",
+      "inherits": "macos-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "macos-clang-debug-intree-skeleton-fast",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / In tree (fast)",
+      "configurePreset": "macos-clang-debug-intree-skeleton-fast",
+      "inherits": "macos-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "macos-clang-debug-intree-skeleton-full",
+      "displayName": "macOS x86_64: Clang / Debug / Skeleton / In tree (full)",
+      "configurePreset": "macos-clang-debug-intree-skeleton-full",
+      "inherits": "macos-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "macos-clang-release-ootree-skeleton-fast",
+      "displayName": "macOS x86_64: CLang / Release / Skeleton / Out of tree (fast)",
+      "configurePreset": "macos-clang-release-ootree-skeleton-fast",
+      "inherits": "macos-build-base",
+      "configuration": "Release"
+    },
+    {
+      "name": "macos-clang-release-ootree-skeleton-full",
+      "displayName": "macOS x86_64: CLang / Release / Skeleton / Out of tree (full)",
+      "configurePreset": "macos-clang-release-ootree-skeleton-full",
+      "inherits": "macos-build-base",
+      "configuration": "Release"
+    },
+
+
+    {
+      "name": "windows-build-base",
+      "hidden": true,
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "windows-msvc-debug-ootree-fast",
+      "displayName": "Windows x86_64: MSVC / Debug / Out of tree (fast)",
+      "configurePreset": "windows-msvc-debug-ootree-fast",
+      "inherits": "windows-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "windows-msvc-debug-ootree-full",
+      "displayName": "Windows x86_64: MSVC / Debug / Out of tree (full)",
+      "configurePreset": "windows-msvc-debug-ootree-full",
+      "inherits": "windows-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "windows-msvc-debug-intree-fast",
+      "displayName": "Windows x86_64: MSVC / Debug / In tree (fast)",
+      "configurePreset": "windows-msvc-debug-intree-fast",
+      "inherits": "windows-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "windows-msvc-debug-intree-full",
+      "displayName": "Windows x86_64: MSVC / Debug / In tree (full)",
+      "configurePreset": "windows-msvc-debug-intree-full",
+      "inherits": "windows-build-base",
+      "configuration": "Debug"
+    },
+    {
+      "name": "windows-msvc-release-ootree-fast",
+      "displayName": "Windows x86_64: MSVC / Release / Out of tree (fast)",
+      "configurePreset": "windows-msvc-release-ootree-fast",
+      "inherits": "windows-build-base",
+      "configuration": "Release"
+    },
+    {
+      "name": "windows-msvc-release-ootree-full",
+      "displayName": "Windows x86_64: MSVC / Release / Out of tree (full)",
+      "configurePreset": "windows-msvc-release-ootree-full",
+      "inherits": "windows-build-base",
+      "configuration": "Release"
+    }
+  ]
+}

Makefile.am

@@ -18,10 +18,11 @@ noinst_PROGRAMS =
 
 # sources
 re2c_HDR = \
+	src/constants.h \
 	src/codegen/code.h \
 	src/codegen/helpers.h \
 	src/options/opt.h \
-	src/adfa/action.h \
+	src/options/symtab.h \
 	src/adfa/adfa.h \
 	src/cfg/cfg.h \
 	src/dfa/closure_leftmost.h \
@@ -47,7 +48,6 @@ re2c_HDR = \
 	src/msg/msg.h \
 	src/msg/ver_to_vernum.h \
 	src/msg/warn.h \
-	src/regexp/empty_class_policy.h \
 	src/regexp/re.h \
 	src/regexp/rule.h \
 	src/regexp/tag.h \
@@ -64,10 +64,10 @@ re2c_HDR = \
 	src/util/allocate.h \
 	src/util/attribute.h \
 	src/util/c99_stdint.h \
+	src/util/file_utils.h \
 	src/util/fixed_allocator.h \
 	src/util/forbid_copy.h \
 	src/util/free_list.h \
-	src/util/get_dir.h \
 	src/util/hash32.h \
 	src/util/local_increment.h \
 	src/util/lookup.h \
@@ -90,12 +90,13 @@ re2c_SRC = \
 	src/codegen/gen_program.cc \
 	src/codegen/gen_state.cc \
 	src/codegen/helpers.cc \
+	src/codegen/remove_empty.cc \
 	src/codegen/render.cc \
 	src/options/opt.cc \
+	src/options/symtab.cc \
 	src/nfa/estimate_size.cc \
 	src/nfa/re_to_nfa.cc \
 	src/adfa/adfa.cc \
-	src/adfa/prepare.cc \
 	src/debug/dump_adfa.cc \
 	src/debug/dump_cfg.cc \
 	src/debug/dump_dfa.cc \
@@ -135,6 +136,7 @@ re2c_SRC = \
 	src/regexp/default_tags.cc \
 	src/regexp/fixed_tags.cc \
 	src/regexp/nullable.cc \
+	src/regexp/re.cc \
 	src/regexp/rule.cc \
 	src/regexp/split_charset.cc \
 	src/regexp/tag.cc \
@@ -146,11 +148,10 @@ re2c_SRC = \
 	src/skeleton/skeleton.cc \
 	src/parse/ast.cc \
 	src/parse/input.cc \
-	src/parse/normalize.cc \
+	src/parse/parse.cc \
 	src/parse/scanner.cc \
 	src/parse/unescape.cc \
-	src/parse/validate.cc \
-	src/util/get_dir.cc \
+	src/util/file_utils.cc \
 	src/util/s_to_n32_unsafe.cc \
 	src/util/temp_file.cc \
 	src/util/range.cc
@@ -188,10 +189,12 @@ re2c_BOOT_PARSER = bootstrap/src/parse/parser.cc
 re2c_BOOT_PARSER_HDR = bootstrap/src/parse/parser.h
 re2c_BOOT_DOC_C = bootstrap/doc/re2c.1
 re2c_BOOT_DOC_GO = bootstrap/doc/re2go.1
+re2c_BOOT_DOC_RUST = bootstrap/doc/re2rust.1
 re2c_BOOT_HELP = bootstrap/src/msg/help.cc
 re2c_BOOT = \
 	$(re2c_BOOT_DOC_C) \
 	$(re2c_BOOT_DOC_GO) \
+	$(re2c_BOOT_DOC_RUST) \
 	$(re2c_BOOT_HELP) \
 	$(re2c_BOOT_PARSER) \
 	$(re2c_BOOT_PARSER_HDR) \
@@ -215,8 +218,8 @@ re2c_CUSTOM = \
 # docs
 re2c_SRC_DOC = doc/manpage.rst
 re2c_SRC_DOC_EXT = \
-	doc/manual/api/api.rst_ \
 	doc/manual/api/interface.rst_ \
+	doc/manual/conditions/blocks.rst_ \
 	doc/manual/conditions/conditions.rst_ \
 	doc/manual/configurations/configurations.rst_ \
 	doc/manual/directives/directives.rst_ \
@@ -241,13 +244,22 @@ re2c_SRC_DOC_EXT = \
 	doc/manual/state/state.rst_ \
 	doc/manual/submatch/submatch_example_mtags.rst_ \
 	doc/manual/submatch/submatch_example_posix.rst_ \
-	doc/manual/submatch/submatch_example_stags.rst_ \
 	doc/manual/submatch/submatch_example_stags_fill.rst_ \
+	doc/manual/submatch/submatch_example_stags.rst_ \
 	doc/manual/submatch/submatch.rst_ \
+	doc/manual/synopsis.rst_ \
+	doc/manual/syntax/api1.rst_ \
+	doc/manual/syntax/api2_c.rst_ \
+	doc/manual/syntax/api2_go.rst_ \
+	doc/manual/syntax/api2_rust.rst_ \
+	doc/manual/syntax/api3.rst_ \
+	doc/manual/syntax/intro.rst_ \
 	doc/manual/syntax/syntax.rst_ \
 	doc/manual/warnings/warnings_general.rst_ \
 	doc/manual/warnings/warnings_list.rst_ \
 	examples/c/01_basic.re \
+	examples/c/01_basic.c \
+	examples/c/conditions/parse_u32_blocks.re \
 	examples/c/conditions/parse_u32_conditions.re \
 	examples/c/encodings/unicode_identifier.re \
 	examples/c/eof/01_sentinel.re \
@@ -257,16 +269,19 @@ re2c_SRC_DOC_EXT = \
 	examples/c/fill/01_fill.re \
 	examples/c/fill/02_fill.re \
 	examples/c/headers/header.re \
-	examples/c/headers/src/lexer/lexer.h \
+	examples/c/headers/lexer/state.h \
 	examples/c/includes/include.re \
 	examples/c/includes/definitions.h \
 	examples/c/reuse/reuse.re \
+	examples/c/reuse/usedir.re \
 	examples/c/state/push.re \
-	examples/c/submatch/01_stags.re \
 	examples/c/submatch/01_stags_fill.re \
+	examples/c/submatch/01_stags.re \
 	examples/c/submatch/02_mtags.re \
 	examples/c/submatch/03_posix.re \
 	examples/go/01_basic.re \
+	examples/go/01_basic.go \
+	examples/go/conditions/parse_u32_blocks.re \
 	examples/go/conditions/parse_u32_conditions.re \
 	examples/go/encodings/unicode_identifier.re \
 	examples/go/eof/01_sentinel.re \
@@ -276,37 +291,72 @@ re2c_SRC_DOC_EXT = \
 	examples/go/fill/01_fill.re \
 	examples/go/fill/02_fill.re \
 	examples/go/headers/header.re \
-	examples/go/headers/src/lexer/lexer.go \
+	examples/go/headers/lexer/state.go \
 	examples/go/includes/include.re \
 	examples/go/includes/definitions.go \
 	examples/go/reuse/reuse.re \
+	examples/go/reuse/usedir.re \
 	examples/go/state/push.re \
+	examples/go/submatch/01_stags_fill.re \
 	examples/go/submatch/01_stags.re \
 	examples/go/submatch/02_mtags.re \
-	examples/go/submatch/03_posix.re
+	examples/go/submatch/03_posix.re \
+	examples/rust/01_basic.re \
+	examples/rust/01_basic.rs \
+	examples/rust/conditions/parse_u32_blocks.re \
+	examples/rust/conditions/parse_u32_conditions.re \
+	examples/rust/encodings/unicode_identifier.re \
+	examples/rust/eof/01_sentinel.re \
+	examples/rust/eof/02_bounds_checking.re \
+	examples/rust/eof/03_eof_rule.re \
+	examples/rust/eof/05_generic_api_eof_rule.re \
+	examples/rust/fill/01_fill.re \
+	examples/rust/fill/02_fill.re \
+	examples/rust/headers/header.re \
+	examples/rust/headers/lexer/state.rs \
+	examples/rust/includes/include.re \
+	examples/rust/includes/definitions.rs \
+	examples/rust/reuse/reuse.re \
+	examples/rust/reuse/usedir.re \
+	examples/rust/state/push.re \
+	examples/rust/submatch/01_stags_fill.re \
+	examples/rust/submatch/01_stags.re \
+	examples/rust/submatch/02_mtags.re \
+	examples/rust/submatch/03_posix.re
 
 DOC_C = doc/re2c.1
 DOCS = $(DOC_C)
+
 if WITH_GOLANG
 DOC_GO = doc/re2go.1
 DOCS += $(DOC_GO)
 endif
+
+if WITH_RUST
+DOC_RUST = doc/re2rust.1
+DOCS += $(DOC_RUST)
+endif
+
 man_MANS = $(DOCS)
 
 # include files (stdlib)
 dist_stdlib_DATA = include/unicode_categories.re
 
+CMAKEFILES := \
+	CMakeLists.txt \
+	cmake
+
 EXTRA_DIST = \
 	$(re2c_BOOT) \
 	$(re2c_CUSTOM) \
 	$(re2c_SRC_DOC_EXT) \
+	$(CMAKEFILES) \
 	CHANGELOG \
 	LICENSE \
 	NO_WARRANTY \
 	README.md \
 	autogen.sh \
 	build \
-	cmake \
 	examples \
 	test
 
@@ -375,8 +425,15 @@ $(DOC_GO): $(re2c_SRC_DOC) $(re2c_SRC_DOC_EXT) $(SPLITMAN)
 		&& $(RST2MAN) --tab-width=4 $(top_builddir)/$(re2c_SRC_DOC).go > $@ \
 		&& cp $@ $(top_srcdir)/$(re2c_BOOT_DOC_GO) \
 		&& rm $(top_builddir)/$(re2c_SRC_DOC).go
+# generate manpage for Rust
+$(DOC_RUST): $(re2c_SRC_DOC) $(re2c_SRC_DOC_EXT) $(SPLITMAN)
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN)$(SPLITMAN) $(top_builddir)/$(re2c_SRC_DOC) $(top_builddir)/$(re2c_SRC_DOC).rust rust \
+		&& $(RST2MAN) --tab-width=4 $(top_builddir)/$(re2c_SRC_DOC).rust > $@ \
+		&& cp $@ $(top_srcdir)/$(re2c_BOOT_DOC_RUST) \
+		&& rm $(top_builddir)/$(re2c_SRC_DOC).rust
 # generate help
-$(re2c_GEN_HELP): $(re2c_CUSTOM_HELP) $(GENHELP)
+$(re2c_GEN_HELP): $(re2c_CUSTOM_HELP) $(re2c_SRC_DOC_EXT) $(GENHELP)
 	$(AM_V_at)$(MKDIR_P) $(@D)
 	$(AM_V_GEN)$(RST2MAN) $(top_builddir)/$(re2c_CUSTOM_HELP) > $@.1 \
 		&& $(GENHELP) $@.1 $@ \
@@ -393,6 +450,10 @@ $(DOC_C): $(re2c_BOOT_DOC_C)
 $(DOC_GO): $(re2c_BOOT_DOC_GO)
 	$(AM_V_at)$(MKDIR_P) $(@D)
 	$(AM_V_GEN)cp $(top_srcdir)/$(re2c_BOOT_DOC_GO) $@
+# copy bootstrap manpage for Rust
+$(DOC_RUST): $(re2c_BOOT_DOC_RUST)
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN)cp $(top_srcdir)/$(re2c_BOOT_DOC_RUST) $@
 # copy bootstrap help
 $(re2c_GEN_HELP): $(re2c_BOOT_HELP)
 	$(AM_V_at)$(MKDIR_P) $(@D)
@@ -402,7 +463,7 @@ endif
 all-local: docs $(re2c_BOOT_PARSER)
 
 # tests
-re2c_TESTSUITE = run_tests.sh
+re2c_TESTSUITE = run_tests.py
 .PHONY: tests
 tests: all $(re2c_TESTSUITE)
 	$(top_builddir)/$(re2c_TESTSUITE)
@@ -462,3 +523,11 @@ re2go_CXXFLAGS = $(AM_CXXFLAGS) -DRE2C_LANG=LANG_GO
 re2go_SOURCES = $(re2c_SOURCES)
 nodist_re2go_SOURCES = $(nodist_re2c_SOURCES)
 endif
+
+# re2rust
+if WITH_RUST
+bin_PROGRAMS += re2rust
+re2rust_CXXFLAGS = $(AM_CXXFLAGS) -DRE2C_LANG=LANG_RUST
+re2rust_SOURCES = $(re2c_SOURCES)
+nodist_re2rust_SOURCES = $(nodist_re2c_SOURCES)
+endif

Makefile.lib.am

@@ -10,9 +10,11 @@ libre2c_la_HDR = \
 	lib/regcomp_dfa_regless.h \
 	lib/regex.h \
 	lib/regex_impl.h \
+	lib/regoff_trie.h \
+	src/constants.h \
 	src/codegen/code.h \
 	src/options/opt.h \
-	src/adfa/action.h \
+	src/options/symtab.h \
 	src/adfa/adfa.h \
 	src/cfg/cfg.h \
 	src/dfa/closure_leftmost.h \
@@ -38,7 +40,6 @@ libre2c_la_HDR = \
 	src/msg/msg.h \
 	src/msg/ver_to_vernum.h \
 	src/msg/warn.h \
-	src/regexp/empty_class_policy.h \
 	src/regexp/re.h \
 	src/regexp/rule.h \
 	src/regexp/tag.h \
@@ -55,9 +56,9 @@ libre2c_la_HDR = \
 	src/util/allocate.h \
 	src/util/attribute.h \
 	src/util/c99_stdint.h \
+	src/util/file_utils.h \
 	src/util/forbid_copy.h \
 	src/util/free_list.h \
-	src/util/get_dir.h \
 	src/util/hash32.h \
 	src/util/local_increment.h \
 	src/util/lookup.h \
@@ -86,6 +87,7 @@ libre2c_la_SRC = \
 	src/parse/ast.cc \
 	src/parse/unescape.cc \
 	src/options/opt.cc \
+	src/options/symtab.cc \
 	src/cfg/cfg.cc \
 	src/cfg/compact.cc \
 	src/cfg/dce.cc \
@@ -127,6 +129,7 @@ libre2c_la_SRC = \
 	src/regexp/default_tags.cc \
 	src/regexp/fixed_tags.cc \
 	src/regexp/nullable.cc \
+	src/regexp/re.cc \
 	src/regexp/rule.cc \
 	src/regexp/split_charset.cc \
 	src/regexp/tag.cc \
@@ -143,11 +146,13 @@ libre2c_la_SOURCES = \
 libre2c_la_CUSTOM = \
 	lib/lex.re \
 	lib/parse.ypp \
+	lib/test_helper.re \
 	src/msg/ver_to_vernum.re
 
 libre2c_la_GEN_SRC = \
 	lib/lex.cc \
 	lib/parse.cc \
+	lib/test_helper.cc \
 	src/msg/ver_to_vernum.cc
 libre2c_la_GEN_HDR = \
 	lib/parse.h
@@ -162,6 +167,7 @@ libre2c_la_BOOTSTRAP = \
 	bootstrap/lib/parse.cc \
 	bootstrap/lib/parse.h \
 	bootstrap/lib/lex.cc \
+	bootstrap/lib/test_helper.cc \
 	bootstrap/src/msg/ver_to_vernum.cc
 
 nodist_libre2c_la_SOURCES = $(libre2c_la_GEN)
@@ -176,7 +182,10 @@ CLEANFILES += $(libre2c_la_GEN)
 lib/lex.cc: lib/parse.cc
 
 # tests
-test_libre2c_SOURCES = lib/test.cc
+test_libre2c_SOURCES = \
+	lib/test.cc \
+	lib/test_helper.h \
+	lib/test_helper.cc
 test_libre2c_LDADD = libre2c.la
 check_PROGRAMS += test_libre2c
 
@@ -186,4 +195,8 @@ SUBDIRS += benchmarks/submatch_nfa
 SUBDIRS += benchmarks/submatch_dfa_jit
 EXTRA_DIST += benchmarks/submatch_nfa
 EXTRA_DIST += benchmarks/submatch_dfa_jit
-endif
+if WITH_JAVA
+SUBDIRS += benchmarks/submatch_java
+EXTRA_DIST += benchmarks/submatch_java
+endif # WITH_JAVA
+endif # WITH_BENCHMARKS

README.md

@@ -1,7 +1,7 @@
 DESCRIPTION
 -----------
 
-re2c is a free and open-source lexer generator for C, C++ and Go.
+re2c is a free and open-source lexer generator for C/C++, Go and Rust.
 
 Its main goal is generating fast lexers: at least as fast as their reasonably
 optimized hand-coded counterparts. Instead of using traditional table-driven
@@ -40,15 +40,14 @@ CONTRIBUTING
 ------------
 
 re2c is an Open Source, community-driven project. See
-[CONTRIBUTING.md](https://github.com/skvadrik/re2c/blob/master/README.md) for
-details about contributions to this repository.
+[CONTRIBUTING.md](https://github.com/skvadrik/re2c/blob/master/CONTRIBUTING.md)
+for details about contributions to this repository.
 
 
 BUILD
 -----
 
-re2c has two build systems: Autotools and CMake. Both are maintained and tested
-on Travis CI. See [the documentation](http://re2c.org/install/install.html) for
+See BUILD.md or the [online docs](https://re2c.org/build/build.html) for
 instructions how to build re2c.
 
 
@@ -64,15 +63,17 @@ Mailing lists:
 - re2c-general@lists.sourceforge.net
 - re2c-devel@lists.sourceforge.net
 
-IRC channel:
+IRC channels:
 
-- freenode/#re2c
+- irc.oftc.net/#re2c
+- irc.libera.chat/#re2c
 
 You are welcome to ask for help or share your thoughts and ideas.
 
 
 AUTHORS
 -------
-Re2c was originally written by Peter Bumbulis <peter@csg.uwaterloo.ca>.
-Since then many people contributed to the project. The current maintainer is
+
+re2c was originally written by Peter Bumbulis <peter@csg.uwaterloo.ca>. Since
+then many volunteers have contributed to the project. The current maintainer is
 Ulya Trofimovich <skvadrik@gmail.com>.

benchmarks/common/common.cc

@@ -46,12 +46,24 @@ void bench_regexec_re2c(benchmark::State& state, const alg_t &alg, const bench_t
         state.SkipWithError("regcomp failed");
     }
 
+    const bool with_hist = alg.flags & REG_SUBHIST;
     const size_t nmatch = re.re_nsub;
-    regmatch_t *pmatch = new regmatch_t[nmatch];
+    regmatch_t *pmatch = with_hist ? NULL : new regmatch_t[nmatch];
 
-    for (auto _ : state) {
-        for (const char **strings = bench.strings; *strings; ++strings) {
-            err |= regexec(&re, *strings, nmatch, pmatch, 0);
+    // Do not move condition inside of the loop to avoid overhead.
+    if (with_hist) {
+        for (auto _ : state) {
+            for (const char **strings = bench.strings; *strings; ++strings) {
+                subhistory_t *h = regparse(&re, *strings, nmatch);
+                err |= h ? 0 : 1;
+                regfreesub(h);
+            }
+        }
+    } else {
+        for (auto _ : state) {
+            for (const char **strings = bench.strings; *strings; ++strings) {
+                err |= regexec(&re, *strings, nmatch, pmatch, 0);
+            }
         }
     }
     if (err) {

benchmarks/json2pgfplot.py

@@ -2,16 +2,40 @@
 
 import argparse
 import json
+import math
+import sys
 from collections import OrderedDict
 
 
-plot_begin = """
+plot_preamble = """
 \\documentclass[tikz]{standalone}
 
 \\usepackage[utf8]{inputenc}
 \\usepackage{amsmath, amssymb, amsfonts}
 \\usepackage{tikz, pgfplots, pgfplotstable}
+"""
 
+# Use Comic Neue font.
+plot_font_comicneue = """
+\\usepackage{comicneue}
+\\usepackage[T1]{fontenc}
+\\renewcommand{\\familydefault}{\\sfdefault}
+"""
+
+# Use Computer Modern Bright font.
+plot_font_cmbright = """
+\\usepackage{cmbright}
+\\usepackage[T1]{fontenc}
+\\renewcommand{\\familydefault}{\\sfdefault}
+"""
+
+# Counterintuitively, 'assume math mode' tricks pgfmathprintnumber into not
+# setting math mode, which is needed because Comic Neue does not support math.
+#
+# Use 'fixed relative' number format with very high precision (the numbers have
+# been previously rounded to a few non-zero digits in the fractional part, so
+# the trailing zeroes will will not be printed).
+plot_begin = """
 \\begin{document}
 
 \\def\\plotwidth{%lfin}
@@ -22,7 +46,6 @@ plot_begin = """
     xbar,
     axis y line*=none,
     axis x line=none,
-    nodes near coords style={/pgf/number format/.cd,1000 sep={\\,}},
     y=0.12in,
     width=(\\plotwidth * 0.75),
     bar width=\\barwidth,
@@ -39,21 +62,24 @@ plot_begin = """
     clip=false,
     visualization depends on={x > \\xmax \\as \\xoverflow},
     visualization depends on={x > \\xmax ? -x + \\xmax : 0 \\as \\xshift},
-    every node near coord/.style={shift={(axis direction cs:\\xshift,0)}},
     nodes near coords={
         \\ifdim \\xoverflow pt=1pt \\!\\Large{...}\\scriptsize\\! \\fi
-        \\pgfmathprintnumber{\\pgfplotspointmeta}
+        \\pgfmathprintnumber[assume math mode=true]{\\pgfplotspointmeta}
+    },
+    nodes near coords style={shift={(axis direction cs:\\xshift,0)}},
+    nodes near coords style={/pgf/number format/.cd,
+        fixed relative,
+        precision = 10,
+        1000 sep = {\\,}
     },
 }}
 """
 
-
 plot_begin_picture = """
 \\begin{tikzpicture}
 \\def\\xmax{%lf}
 """
 
-
 plot_middle = """
 \\def\\xplotshift{%lfin}
 \\def\\yplotshift{%lfin}
@@ -68,12 +94,10 @@ plot_middle = """
 \\end{axis}
 """
 
-
 plot_end_picture = """
 \\end{tikzpicture}
 """
 
-
 plot_end = """
 \\end{document}
 """
@@ -85,6 +109,8 @@ def parse_args():
     parser.add_argument("output", help="output TeX file")
     parser.add_argument("--relative-to",
         help="output CPU time relative to the specified algorithm")
+    parser.add_argument("--font",
+        help="use the specified font (supported fonts: cmbright, comicneue)")
     return parser.parse_args()
 
 
@@ -118,6 +144,20 @@ def index_of_algo(group, stem):
     return 0
 
 
+# Time format: keep integer part precise, round fractional part relative to the
+# exponent (similar to PGFPLOTS's "fixed relative, precision = 2" numer format,
+# but doesn't round integer part). This is to reduce visual noise on the plot.
+#
+# Examples: 1004, 195, 13, 3.8, 0.85, 0.017, 0.0048
+#
+def time_format(time):
+    order = math.floor(math.log(time, 10))
+    if order > 0:
+        return '%.0lf'
+    else:
+        return '%%.%dlf' % (-order + 1)
+
+
 # Split benchmarks into groups by regexp (the first component of the name).
 # If the relative mode is on, normalize CPU time by the time of the first
 # benchmark in each group.
@@ -169,7 +209,7 @@ def group_benchmarks(benchmarks, relative_to):
                 time = time / (cputime0 if relative_to != None else 1)
                 maxtime = max(maxtime, time)
                 avgtime += time
-                table += '{%s} %lf\n' % (algo, time)
+                table += ('{%s} ' + time_format(time) + '\n') % (algo, time)
             timetbl = table
 
         sizetbl = None
@@ -183,7 +223,7 @@ def group_benchmarks(benchmarks, relative_to):
 
         title = gen_title(name)
         nrows = len(group)
-        benchgroups[title] = (timetbl, sizetbl, nrows, captures, regsize)
+        benchgroups[title] = (timetbl, sizetbl, nrows, regsize, captures)
 
         nbench += nrows
         maxrows = max(maxrows, nrows)
@@ -198,7 +238,7 @@ def group_benchmarks(benchmarks, relative_to):
 
 # Generate a Tikz picture with a PGF plot for each benchmark group. Crop
 # very long bars, so that they do not squash other bars to the left.
-def generate_plot(groups):
+def generate_plot(groups, font):
     (benchgroups, maxtime, maxsize, maxrows) = groups
 
     # Plot width is approximately half the usual page width.
@@ -220,7 +260,9 @@ def generate_plot(groups):
         yshift = -plotheight * (i if even else i - 1)
         title = '\\textbf{%s}' % name
         if regsize != None and captures != None:
-            title += ' \\, (%d sym, %d cap)' % (regsize, captures)
+            title += ' \\, (%d symbol%s, %d capture%s)' % (
+                regsize, 's' if regsize > 1 else '',
+                captures, 's' if captures > 1 else '')
 
         # Generate CPU time plots.
         if timetbl != None:
@@ -231,11 +273,22 @@ def generate_plot(groups):
             plot_size += plot_middle % (xshift, yshift, nrows, title, sizetbl)
 
     # Glue plots together in one TeX document
-    plot = plot_begin % (plotwidth, barwidth)
+    plot = plot_preamble
+
+    if font == 'comicneue':
+        plot += plot_font_comicneue
+    elif font == 'cmbright':
+        plot += plot_font_cmbright
+    elif font != None:
+        sys.exit('error: unsupported font: "%s"' % font)
+
+    plot += plot_begin % (plotwidth, barwidth)
+
     if plot_time != '':
         plot += (plot_begin_picture % maxtime) + plot_time + plot_end_picture
     if plot_size != '':
         plot += (plot_begin_picture % maxsize) + plot_size + plot_end_picture
+
     plot += plot_end
 
     return plot
@@ -248,7 +301,7 @@ def main():
         input = json.load(f)
 
     groups = group_benchmarks(input['benchmarks'], args.relative_to)
-    plot = generate_plot(groups)
+    plot = generate_plot(groups, args.font)
 
     with open(args.output, 'w') as f:
         f.write(plot)

benchmarks/submatch_dfa_aot/CMakeLists.txt

@@ -127,7 +127,7 @@ endforeach()
 # re2c
 file(MAKE_DIRECTORY "${GEN_DIR}/re2c/")
 set(RE2C "${CMAKE_BINARY_DIR}/re2c")
-set(RE2C_FLAGS "--reusable" "--tags" "--no-generation-date")
+set(RE2C_FLAGS "--reusable" "--tags" "--no-generation-date" "--no-version")
 set(COMMON_RE2C
     "${SRC_DIR}/re2c/common.re"
     "${SRC_DIR}/re2c/include/fill.re"

benchmarks/submatch_dfa_aot/Makefile.am

@@ -8,7 +8,7 @@ CFLAGS = -O3 -I $(SRC_DIR)
 RAGEL = $(ENG_DIR)/ragel/ragel7
 KLEENEX = $(ENG_DIR)/kleenex/kexc
 RE2C = $(top_builddir)/re2c
-RE2C_FLAGS_COMMON = --reusable --tags --no-generation-date
+RE2C_FLAGS_COMMON = --reusable --tags --no-generation-date --no-version
 RE2C_FLAGS     = $(RE2C_FLAGS_COMMON) -I $(SRC_DIR)/re2c/include
 RE2C_FLAGS_EOF = $(RE2C_FLAGS_COMMON) -I $(SRC_DIR)/re2c/include-eof
 
@@ -181,6 +181,7 @@ $(DAT): $(DAT_DIR)/%/big: $(DAT_DIR)/%/small
 	$(AM_V_GEN)( cd $(@D) && ../../$(srcdir)/data/gen.py )
 
 $(KLEENEX):
+	$(AM_V_at)mkdir -p $(@D) && cp $(srcdir)/engines/kleenex/getkleenex.sh $(@D)
 	$(AM_V_GEN)( cd $(@D) && ./getkleenex.sh )
 
 $(RAGEL):

benchmarks/submatch_dfa_aot/engines/ragel/getragel7.sh

@@ -5,8 +5,8 @@ if [ -e ragel7 ] ; then
     exit 0
 fi
 
-COLM_DIR=colm-0.13.0.7
-RAGEL_DIR=ragel-7.0.0.12
+COLM_DIR=colm-0.14.7
+RAGEL_DIR=ragel-7.0.4
 
 wget http://www.colm.net/files/colm/"$COLM_DIR".tar.gz -O - | tar zx \
     && cd "$COLM_DIR" \
@@ -17,7 +17,10 @@ wget http://www.colm.net/files/colm/"$COLM_DIR".tar.gz -O - | tar zx \
 
 wget http://www.colm.net/files/ragel/"$RAGEL_DIR".tar.gz -O - | tar zx \
     && cd "$RAGEL_DIR" \
-    && ./configure --prefix=$(pwd)/install --with-colm="$(pwd)/../$COLM_DIR/install" \
+    && ./configure \
+        --prefix=$(pwd)/install \
+        --with-colm="$(pwd)/../$COLM_DIR/install" \
+        --disable-manual \
     && make -j$(nproc) \
     && make install \
     && cd ..

benchmarks/submatch_dfa_aot/pregen/ragel/04__apache_log.c

@@ -39,8 +39,6 @@ static void lex(Input *in, Output *out)
 	
 #line 41 "gen/ragel/04__apache_log.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 25:
 			goto st_case_25;
@@ -95,13 +93,12 @@ static void lex(Input *in, Output *out)
 			case 24:
 			goto st_case_24;
 		}
-		goto st_out;
 		_ctr41:
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			g2 = p; }
 		
-#line 105 "gen/ragel/04__apache_log.c"
+#line 102 "gen/ragel/04__apache_log.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
@@ -118,40 +115,37 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 122 "gen/ragel/04__apache_log.c"
+#line 119 "gen/ragel/04__apache_log.c"
 		
 		goto _st25;
 		_st25:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof25;
 		st_case_25:
+		if ( p == pe )
+			goto _out25;
 		if ( ( (*( p))) == 46 ) {
 			goto _ctr44;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr44;
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr44:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			h1 = p; }
 		
-#line 148 "gen/ragel/04__apache_log.c"
+#line 142 "gen/ragel/04__apache_log.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr2;
@@ -166,22 +160,20 @@ static void lex(Input *in, Output *out)
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st1;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr2:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			h2 = p; }
 		
-#line 178 "gen/ragel/04__apache_log.c"
+#line 170 "gen/ragel/04__apache_log.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st2;
@@ -193,22 +185,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr4;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr4:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			i1 = p; }
 		
-#line 205 "gen/ragel/04__apache_log.c"
+#line 195 "gen/ragel/04__apache_log.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr6;
@@ -217,22 +207,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr6;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr6:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			i2 = p; }
 		
-#line 229 "gen/ragel/04__apache_log.c"
+#line 217 "gen/ragel/04__apache_log.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st4;
@@ -244,22 +232,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr8;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr8:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			a1 = p; }
 		
-#line 256 "gen/ragel/04__apache_log.c"
+#line 242 "gen/ragel/04__apache_log.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr10;
@@ -268,22 +254,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr10;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr10:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			a2 = p; }
 		
-#line 280 "gen/ragel/04__apache_log.c"
+#line 264 "gen/ragel/04__apache_log.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st6;
@@ -295,22 +279,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr12;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr12:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			d1 = p; }
 		
-#line 307 "gen/ragel/04__apache_log.c"
+#line 289 "gen/ragel/04__apache_log.c"
 		
 		goto _st7;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st0;
@@ -319,14 +301,12 @@ static void lex(Input *in, Output *out)
 				goto _st0;
 			}
 		}
-		{
-			goto _st8;
-		}
+		goto _st8;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st0;
@@ -335,14 +315,12 @@ static void lex(Input *in, Output *out)
 				goto _st9;
 			}
 		}
-		{
-			goto _st8;
-		}
+		goto _st8;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr16;
@@ -351,22 +329,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr16;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr16:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			d2 = p; }
 		
-#line 363 "gen/ragel/04__apache_log.c"
+#line 339 "gen/ragel/04__apache_log.c"
 		
 		goto _st10;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st10;
@@ -378,22 +354,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr18;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr18:
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			r1 = p; }
 		
-#line 390 "gen/ragel/04__apache_log.c"
+#line 364 "gen/ragel/04__apache_log.c"
 		
 		goto _st11;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st0;
@@ -402,14 +376,12 @@ static void lex(Input *in, Output *out)
 				goto _st0;
 			}
 		}
-		{
-			goto _st12;
-		}
+		goto _st12;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st0;
@@ -418,14 +390,12 @@ static void lex(Input *in, Output *out)
 				goto _st13;
 			}
 		}
-		{
-			goto _st12;
-		}
+		goto _st12;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr22;
@@ -434,22 +404,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr22;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr22:
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			r2 = p; }
 		
-#line 446 "gen/ragel/04__apache_log.c"
+#line 414 "gen/ragel/04__apache_log.c"
 		
 		goto _st14;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st14;
@@ -461,22 +429,20 @@ static void lex(Input *in, Output *out)
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr24;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr24:
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			s1 = p; }
 		
-#line 473 "gen/ragel/04__apache_log.c"
+#line 439 "gen/ragel/04__apache_log.c"
 		
 		goto _st15;
 		_st15:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
 		st_case_15:
+		if ( p == pe )
+			goto _out15;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr26;
@@ -488,22 +454,20 @@ static void lex(Input *in, Output *out)
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st15;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr26:
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			s2 = p; }
 		
-#line 500 "gen/ragel/04__apache_log.c"
+#line 464 "gen/ragel/04__apache_log.c"
 		
 		goto _st16;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st16;
@@ -518,22 +482,20 @@ static void lex(Input *in, Output *out)
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr29;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr28:
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			z1 = p; }
 		
-#line 530 "gen/ragel/04__apache_log.c"
+#line 492 "gen/ragel/04__apache_log.c"
 		
 		goto _st17;
 		_st17:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof17;
 		st_case_17:
+		if ( p == pe )
+			goto _out17;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr31;
@@ -542,22 +504,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr31;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr31:
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			z2 = p; }
 		
-#line 554 "gen/ragel/04__apache_log.c"
+#line 514 "gen/ragel/04__apache_log.c"
 		
 		goto _st18;
 		_st18:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof18;
 		st_case_18:
+		if ( p == pe )
+			goto _out18;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st18;
@@ -569,22 +529,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr33;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr33:
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			u1 = p; }
 		
-#line 581 "gen/ragel/04__apache_log.c"
+#line 539 "gen/ragel/04__apache_log.c"
 		
 		goto _st19;
 		_st19:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof19;
 		st_case_19:
+		if ( p == pe )
+			goto _out19;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st0;
@@ -593,14 +551,12 @@ static void lex(Input *in, Output *out)
 				goto _st20;
 			}
 		}
-		{
-			goto _st19;
-		}
+		goto _st19;
 		_st20:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof20;
 		st_case_20:
+		if ( p == pe )
+			goto _out20;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr36;
@@ -609,22 +565,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr36;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr36:
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			u2 = p; }
 		
-#line 621 "gen/ragel/04__apache_log.c"
+#line 575 "gen/ragel/04__apache_log.c"
 		
 		goto _st21;
 		_st21:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof21;
 		st_case_21:
+		if ( p == pe )
+			goto _out21;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _st21;
@@ -636,22 +590,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr38;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr38:
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			g1 = p; }
 		
-#line 648 "gen/ragel/04__apache_log.c"
+#line 600 "gen/ragel/04__apache_log.c"
 		
 		goto _st22;
 		_st22:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof22;
 		st_case_22:
+		if ( p == pe )
+			goto _out22;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st0;
@@ -660,33 +612,29 @@ static void lex(Input *in, Output *out)
 				goto _st23;
 			}
 		}
-		{
-			goto _st22;
-		}
+		goto _st22;
 		_st23:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof23;
 		st_case_23:
+		if ( p == pe )
+			goto _out23;
 		if ( ( (*( p))) == 10 ) {
 			goto _ctr41;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr29:
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/04__apache_log.rl"
 			z1 = p; }
 		
-#line 683 "gen/ragel/04__apache_log.c"
+#line 631 "gen/ragel/04__apache_log.c"
 		
 		goto _st24;
 		_st24:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof24;
 		st_case_24:
+		if ( p == pe )
+			goto _out24;
 		switch( ( (*( p))) ) {
 			case 9: {
 				goto _ctr31;
@@ -698,39 +646,33 @@ static void lex(Input *in, Output *out)
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st24;
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof25: cs = 25; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof17: cs = 17; goto _test_eof; 
-		_test_eof18: cs = 18; goto _test_eof; 
-		_test_eof19: cs = 19; goto _test_eof; 
-		_test_eof20: cs = 20; goto _test_eof; 
-		_test_eof21: cs = 21; goto _test_eof; 
-		_test_eof22: cs = 22; goto _test_eof; 
-		_test_eof23: cs = 23; goto _test_eof; 
-		_test_eof24: cs = 24; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 25 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out25: cs = 25; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
+		_out16: cs = 16; goto _out; 
+		_out17: cs = 17; goto _out; 
+		_out18: cs = 18; goto _out; 
+		_out19: cs = 19; goto _out; 
+		_out20: cs = 20; goto _out; 
+		_out21: cs = 21; goto _out; 
+		_out22: cs = 22; goto _out; 
+		_out23: cs = 23; goto _out; 
+		_out24: cs = 24; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/05__datetime.c

@@ -39,8 +39,6 @@ static void lex(Input *in, Output *out)
 	
 #line 41 "gen/ragel/05__datetime.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 35:
 			goto st_case_35;
@@ -115,13 +113,12 @@ static void lex(Input *in, Output *out)
 			case 34:
 			goto st_case_34;
 		}
-		goto st_out;
 		_ctr43:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			z2 = p; }
 		
-#line 125 "gen/ragel/05__datetime.c"
+#line 122 "gen/ragel/05__datetime.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
@@ -136,92 +133,81 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 140 "gen/ragel/05__datetime.c"
+#line 137 "gen/ragel/05__datetime.c"
 		
 		goto _st35;
 		_st35:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof35;
 		st_case_35:
+		if ( p == pe )
+			goto _out35;
 		if ( ( (*( p))) == 48 ) {
 			goto _ctr53;
 		}
 		if ( 49 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr54;
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr53:
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			y1 = p; }
 		
-#line 166 "gen/ragel/05__datetime.c"
+#line 160 "gen/ragel/05__datetime.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 45 ) {
 			goto _ctr5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr5:
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			y2 = p; }
 		
-#line 218 "gen/ragel/05__datetime.c"
+#line 204 "gen/ragel/05__datetime.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 48: {
 				goto _ctr7;
@@ -230,52 +216,46 @@ static void lex(Input *in, Output *out)
 				goto _ctr8;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr7:
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			m1 = p; }
 		
-#line 242 "gen/ragel/05__datetime.c"
+#line 226 "gen/ragel/05__datetime.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( 49 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 45 ) {
 			goto _ctr11;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr11:
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			m2 = p; }
 		
-#line 272 "gen/ragel/05__datetime.c"
+#line 252 "gen/ragel/05__datetime.c"
 		
 		goto _st8;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 48: {
 				goto _ctr13;
@@ -287,183 +267,161 @@ static void lex(Input *in, Output *out)
 		if ( 49 <= ( (*( p))) && ( (*( p))) <= 50 ) {
 			goto _ctr14;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr13:
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			d1 = p; }
 		
-#line 299 "gen/ragel/05__datetime.c"
+#line 277 "gen/ragel/05__datetime.c"
 		
 		goto _st9;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( 49 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 84 ) {
 			goto _ctr18;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr18:
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			d2 = p; }
 		
-#line 329 "gen/ragel/05__datetime.c"
+#line 303 "gen/ragel/05__datetime.c"
 		
 		goto _st11;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		if ( ( (*( p))) == 50 ) {
 			goto _ctr21;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 49 ) {
 			goto _ctr20;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr20:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			h1 = p; }
 		
-#line 351 "gen/ragel/05__datetime.c"
+#line 323 "gen/ragel/05__datetime.c"
 		
 		goto _st12;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		if ( ( (*( p))) == 58 ) {
 			goto _ctr24;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr24:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			h2 = p; }
 		
-#line 381 "gen/ragel/05__datetime.c"
+#line 349 "gen/ragel/05__datetime.c"
 		
 		goto _st14;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 53 ) {
 			goto _ctr26;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr26:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			M1 = p; }
 		
-#line 400 "gen/ragel/05__datetime.c"
+#line 366 "gen/ragel/05__datetime.c"
 		
 		goto _st15;
 		_st15:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
 		st_case_15:
+		if ( p == pe )
+			goto _out15;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st16;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		if ( ( (*( p))) == 58 ) {
 			goto _ctr29;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr29:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			M2 = p; }
 		
-#line 430 "gen/ragel/05__datetime.c"
+#line 392 "gen/ragel/05__datetime.c"
 		
 		goto _st17;
 		_st17:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof17;
 		st_case_17:
+		if ( p == pe )
+			goto _out17;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 53 ) {
 			goto _ctr31;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr31:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			s1 = p; }
 		
-#line 449 "gen/ragel/05__datetime.c"
+#line 409 "gen/ragel/05__datetime.c"
 		
 		goto _st18;
 		_st18:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof18;
 		st_case_18:
+		if ( p == pe )
+			goto _out18;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st19;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st19:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof19;
 		st_case_19:
+		if ( p == pe )
+			goto _out19;
 		switch( ( (*( p))) ) {
 			case 43: {
 				goto _ctr34;
@@ -475,288 +433,252 @@ static void lex(Input *in, Output *out)
 				goto _ctr35;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr34:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			s2 = p; }
 		
-#line 487 "gen/ragel/05__datetime.c"
+#line 443 "gen/ragel/05__datetime.c"
 		
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			z1 = p; }
 		
-#line 493 "gen/ragel/05__datetime.c"
+#line 449 "gen/ragel/05__datetime.c"
 		
 		goto _st20;
 		_st20:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof20;
 		st_case_20:
+		if ( p == pe )
+			goto _out20;
 		if ( ( (*( p))) == 50 ) {
 			goto _st26;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 49 ) {
 			goto _st21;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st21:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof21;
 		st_case_21:
+		if ( p == pe )
+			goto _out21;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st22;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st22:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof22;
 		st_case_22:
+		if ( p == pe )
+			goto _out22;
 		if ( ( (*( p))) == 58 ) {
 			goto _st23;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st23:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof23;
 		st_case_23:
+		if ( p == pe )
+			goto _out23;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 53 ) {
 			goto _st24;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st24:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof24;
 		st_case_24:
+		if ( p == pe )
+			goto _out24;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st25;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr35:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			s2 = p; }
 		
-#line 559 "gen/ragel/05__datetime.c"
+#line 505 "gen/ragel/05__datetime.c"
 		
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			z1 = p; }
 		
-#line 565 "gen/ragel/05__datetime.c"
+#line 511 "gen/ragel/05__datetime.c"
 		
 		goto _st25;
 		_st25:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof25;
 		st_case_25:
+		if ( p == pe )
+			goto _out25;
 		if ( ( (*( p))) == 10 ) {
 			goto _ctr43;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st26:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof26;
 		st_case_26:
+		if ( p == pe )
+			goto _out26;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 51 ) {
 			goto _st22;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr21:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			h1 = p; }
 		
-#line 595 "gen/ragel/05__datetime.c"
+#line 537 "gen/ragel/05__datetime.c"
 		
 		goto _st27;
 		_st27:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof27;
 		st_case_27:
+		if ( p == pe )
+			goto _out27;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 51 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr14:
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			d1 = p; }
 		
-#line 614 "gen/ragel/05__datetime.c"
+#line 554 "gen/ragel/05__datetime.c"
 		
 		goto _st28;
 		_st28:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof28;
 		st_case_28:
+		if ( p == pe )
+			goto _out28;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr15:
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			d1 = p; }
 		
-#line 633 "gen/ragel/05__datetime.c"
+#line 571 "gen/ragel/05__datetime.c"
 		
 		goto _st29;
 		_st29:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof29;
 		st_case_29:
+		if ( p == pe )
+			goto _out29;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 49 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr8:
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			m1 = p; }
 		
-#line 652 "gen/ragel/05__datetime.c"
+#line 588 "gen/ragel/05__datetime.c"
 		
 		goto _st30;
 		_st30:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof30;
 		st_case_30:
+		if ( p == pe )
+			goto _out30;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 50 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr54:
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/05__datetime.rl"
 			y1 = p; }
 		
-#line 671 "gen/ragel/05__datetime.c"
+#line 605 "gen/ragel/05__datetime.c"
 		
 		goto _st31;
 		_st31:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof31;
 		st_case_31:
+		if ( p == pe )
+			goto _out31;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st32;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st32:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof32;
 		st_case_32:
+		if ( p == pe )
+			goto _out32;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st33;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st33:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof33;
 		st_case_33:
+		if ( p == pe )
+			goto _out33;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st34;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st34:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof34;
 		st_case_34:
+		if ( p == pe )
+			goto _out34;
 		if ( ( (*( p))) == 45 ) {
 			goto _ctr5;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st34;
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof35: cs = 35; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof17: cs = 17; goto _test_eof; 
-		_test_eof18: cs = 18; goto _test_eof; 
-		_test_eof19: cs = 19; goto _test_eof; 
-		_test_eof20: cs = 20; goto _test_eof; 
-		_test_eof21: cs = 21; goto _test_eof; 
-		_test_eof22: cs = 22; goto _test_eof; 
-		_test_eof23: cs = 23; goto _test_eof; 
-		_test_eof24: cs = 24; goto _test_eof; 
-		_test_eof25: cs = 25; goto _test_eof; 
-		_test_eof26: cs = 26; goto _test_eof; 
-		_test_eof27: cs = 27; goto _test_eof; 
-		_test_eof28: cs = 28; goto _test_eof; 
-		_test_eof29: cs = 29; goto _test_eof; 
-		_test_eof30: cs = 30; goto _test_eof; 
-		_test_eof31: cs = 31; goto _test_eof; 
-		_test_eof32: cs = 32; goto _test_eof; 
-		_test_eof33: cs = 33; goto _test_eof; 
-		_test_eof34: cs = 34; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 35 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out35: cs = 35; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
+		_out16: cs = 16; goto _out; 
+		_out17: cs = 17; goto _out; 
+		_out18: cs = 18; goto _out; 
+		_out19: cs = 19; goto _out; 
+		_out20: cs = 20; goto _out; 
+		_out21: cs = 21; goto _out; 
+		_out22: cs = 22; goto _out; 
+		_out23: cs = 23; goto _out; 
+		_out24: cs = 24; goto _out; 
+		_out25: cs = 25; goto _out; 
+		_out26: cs = 26; goto _out; 
+		_out27: cs = 27; goto _out; 
+		_out28: cs = 28; goto _out; 
+		_out29: cs = 29; goto _out; 
+		_out30: cs = 30; goto _out; 
+		_out31: cs = 31; goto _out; 
+		_out32: cs = 32; goto _out; 
+		_out33: cs = 33; goto _out; 
+		_out34: cs = 34; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/06__email.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/06__email.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 9:
 			goto st_case_9;
@@ -61,7 +59,6 @@ static void lex(Input *in, Output *out)
 			case 8:
 			goto st_case_8;
 		}
-		goto st_out;
 		_ctr10:
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/06__email.rl"
@@ -73,14 +70,14 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 77 "gen/ragel/06__email.c"
+#line 74 "gen/ragel/06__email.c"
 		
 		goto _st9;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st9;
@@ -113,33 +110,29 @@ static void lex(Input *in, Output *out)
 		} else {
 			goto _ctr12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st0:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof0;
 		st_case_0:
+		if ( p == pe )
+			goto _out0;
 		if ( ( (*( p))) == 10 ) {
 			goto _st9;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr12:
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/06__email.rl"
 			p1 = p; }
 		
-#line 136 "gen/ragel/06__email.c"
+#line 129 "gen/ragel/06__email.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st9;
@@ -175,14 +168,12 @@ static void lex(Input *in, Output *out)
 		} else {
 			goto _st1;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st9;
@@ -215,14 +206,12 @@ static void lex(Input *in, Output *out)
 		} else {
 			goto _st1;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 10 ) {
 			goto _st9;
 		}
@@ -233,22 +222,20 @@ static void lex(Input *in, Output *out)
 		} else if ( ( (*( p))) >= 48 ) {
 			goto _ctr5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr5:
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/06__email.rl"
 			p2 = p; }
 		
-#line 245 "gen/ragel/06__email.c"
+#line 232 "gen/ragel/06__email.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st9;
@@ -267,14 +254,12 @@ static void lex(Input *in, Output *out)
 		} else if ( ( (*( p))) >= 48 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st9;
@@ -290,14 +275,12 @@ static void lex(Input *in, Output *out)
 		} else if ( ( (*( p))) >= 48 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 10 ) {
 			goto _st9;
 		}
@@ -308,14 +291,12 @@ static void lex(Input *in, Output *out)
 		} else if ( ( (*( p))) >= 48 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr10;
@@ -334,14 +315,12 @@ static void lex(Input *in, Output *out)
 		} else if ( ( (*( p))) >= 48 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _st9;
@@ -357,24 +336,18 @@ static void lex(Input *in, Output *out)
 		} else if ( ( (*( p))) >= 48 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof0: cs = 0; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 9 )
-			goto _out; _out: {}
+		goto _st0;
+		_out9: cs = 9; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out: {}
 	}
 	
 #line 38 "../../../benchmarks/submatch_dfa_aot/src/ragel/06__email.rl"

benchmarks/submatch_dfa_aot/pregen/ragel/07__ipv4.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/07__ipv4.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 16:
 			goto st_case_16;
@@ -75,7 +73,6 @@ static void lex(Input *in, Output *out)
 			case 15:
 			goto st_case_15;
 		}
-		goto st_out;
 		_ctr14:
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/07__ipv4.rl"
@@ -90,266 +87,229 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 94 "gen/ragel/07__ipv4.c"
+#line 91 "gen/ragel/07__ipv4.c"
 		
 		goto _st16;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr21;
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr21:
 		{
 #line 11 "../../../benchmarks/submatch_dfa_aot/src/ragel/07__ipv4.rl"
 			p1 = p; }
 		
-#line 117 "gen/ragel/07__ipv4.c"
+#line 111 "gen/ragel/07__ipv4.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 46 ) {
 			goto _st2;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st14;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr4:
 		{
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/07__ipv4.rl"
 			p2 = p; }
 		
-#line 150 "gen/ragel/07__ipv4.c"
+#line 140 "gen/ragel/07__ipv4.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 46 ) {
 			goto _st4;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr8:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/07__ipv4.rl"
 			p3 = p; }
 		
-#line 183 "gen/ragel/07__ipv4.c"
+#line 169 "gen/ragel/07__ipv4.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 46 ) {
 			goto _st6;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _ctr12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr12:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/07__ipv4.rl"
 			p4 = p; }
 		
-#line 216 "gen/ragel/07__ipv4.c"
+#line 198 "gen/ragel/07__ipv4.c"
 		
 		goto _st7;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 10 ) {
 			goto _ctr14;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		if ( ( (*( p))) == 10 ) {
 			goto _ctr14;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st9;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( ( (*( p))) == 10 ) {
 			goto _ctr14;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 46 ) {
 			goto _st6;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st11;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		if ( ( (*( p))) == 46 ) {
 			goto _st6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( ( (*( p))) == 46 ) {
 			goto _st4;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		if ( ( (*( p))) == 46 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		if ( ( (*( p))) == 46 ) {
 			goto _st2;
 		}
 		if ( 48 <= ( (*( p))) && ( (*( p))) <= 57 ) {
 			goto _st15;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st15:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
 		st_case_15:
+		if ( p == pe )
+			goto _out15;
 		if ( ( (*( p))) == 46 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 16 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out16: cs = 16; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/10__alt1_2.c

@@ -40,8 +40,6 @@ static void lex(Input *in, Output *out)
 	
 #line 42 "gen/ragel/10__alt1_2.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 3:
 			goto st_case_3;
@@ -52,13 +50,12 @@ static void lex(Input *in, Output *out)
 			case 2:
 			goto st_case_2;
 		}
-		goto st_out;
 		_ctr2:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 62 "gen/ragel/10__alt1_2.c"
+#line 59 "gen/ragel/10__alt1_2.c"
 		
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
@@ -68,7 +65,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 72 "gen/ragel/10__alt1_2.c"
+#line 69 "gen/ragel/10__alt1_2.c"
 		
 		goto _st3;
 		_ctr4:
@@ -76,7 +73,7 @@ static void lex(Input *in, Output *out)
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 80 "gen/ragel/10__alt1_2.c"
+#line 77 "gen/ragel/10__alt1_2.c"
 		
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
@@ -86,7 +83,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 90 "gen/ragel/10__alt1_2.c"
+#line 87 "gen/ragel/10__alt1_2.c"
 		
 		goto _st3;
 		_ctr6:
@@ -94,25 +91,25 @@ static void lex(Input *in, Output *out)
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			b1 = p; }
 		
-#line 98 "gen/ragel/10__alt1_2.c"
+#line 95 "gen/ragel/10__alt1_2.c"
 		
 		{
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 104 "gen/ragel/10__alt1_2.c"
+#line 101 "gen/ragel/10__alt1_2.c"
 		
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			a1 = p; }
 		
-#line 110 "gen/ragel/10__alt1_2.c"
+#line 107 "gen/ragel/10__alt1_2.c"
 		
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 116 "gen/ragel/10__alt1_2.c"
+#line 113 "gen/ragel/10__alt1_2.c"
 		
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
@@ -122,14 +119,14 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 126 "gen/ragel/10__alt1_2.c"
+#line 123 "gen/ragel/10__alt1_2.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr6;
@@ -141,26 +138,23 @@ static void lex(Input *in, Output *out)
 				goto _ctr8;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr7:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			a1 = p; }
 		
-#line 157 "gen/ragel/10__alt1_2.c"
+#line 151 "gen/ragel/10__alt1_2.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr2;
@@ -169,22 +163,20 @@ static void lex(Input *in, Output *out)
 				goto _st1;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr8:
 		{
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/10__alt1_2.rl"
 			b1 = p; }
 		
-#line 181 "gen/ragel/10__alt1_2.c"
+#line 173 "gen/ragel/10__alt1_2.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr4;
@@ -193,17 +185,11 @@ static void lex(Input *in, Output *out)
 				goto _st2;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 3 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out3: cs = 3; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/11__alt1_4.c

@@ -40,8 +40,6 @@ static void lex(Input *in, Output *out)
 	
 #line 42 "gen/ragel/11__alt1_4.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 5:
 			goto st_case_5;
@@ -56,13 +54,12 @@ static void lex(Input *in, Output *out)
 			case 4:
 			goto st_case_4;
 		}
-		goto st_out;
 		_ctr2:
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 66 "gen/ragel/11__alt1_4.c"
+#line 63 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
@@ -74,7 +71,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 78 "gen/ragel/11__alt1_4.c"
+#line 75 "gen/ragel/11__alt1_4.c"
 		
 		goto _st5;
 		_ctr4:
@@ -82,7 +79,7 @@ static void lex(Input *in, Output *out)
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 86 "gen/ragel/11__alt1_4.c"
+#line 83 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
@@ -94,7 +91,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 98 "gen/ragel/11__alt1_4.c"
+#line 95 "gen/ragel/11__alt1_4.c"
 		
 		goto _st5;
 		_ctr6:
@@ -102,7 +99,7 @@ static void lex(Input *in, Output *out)
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = NULL; }
 		
-#line 106 "gen/ragel/11__alt1_4.c"
+#line 103 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
@@ -114,7 +111,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 118 "gen/ragel/11__alt1_4.c"
+#line 115 "gen/ragel/11__alt1_4.c"
 		
 		goto _st5;
 		_ctr8:
@@ -122,7 +119,7 @@ static void lex(Input *in, Output *out)
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = NULL; }
 		
-#line 126 "gen/ragel/11__alt1_4.c"
+#line 123 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
@@ -134,7 +131,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 138 "gen/ragel/11__alt1_4.c"
+#line 135 "gen/ragel/11__alt1_4.c"
 		
 		goto _st5;
 		_ctr10:
@@ -142,49 +139,49 @@ static void lex(Input *in, Output *out)
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			b1 = p; }
 		
-#line 146 "gen/ragel/11__alt1_4.c"
+#line 143 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 152 "gen/ragel/11__alt1_4.c"
+#line 149 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			c1 = p; }
 		
-#line 158 "gen/ragel/11__alt1_4.c"
+#line 155 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = NULL; }
 		
-#line 164 "gen/ragel/11__alt1_4.c"
+#line 161 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			d1 = p; }
 		
-#line 170 "gen/ragel/11__alt1_4.c"
+#line 167 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = NULL; }
 		
-#line 176 "gen/ragel/11__alt1_4.c"
+#line 173 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			a1 = p; }
 		
-#line 182 "gen/ragel/11__alt1_4.c"
+#line 179 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 188 "gen/ragel/11__alt1_4.c"
+#line 185 "gen/ragel/11__alt1_4.c"
 		
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
@@ -196,14 +193,14 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 200 "gen/ragel/11__alt1_4.c"
+#line 197 "gen/ragel/11__alt1_4.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr10;
@@ -221,26 +218,23 @@ static void lex(Input *in, Output *out)
 				goto _ctr14;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr11:
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			a1 = p; }
 		
-#line 237 "gen/ragel/11__alt1_4.c"
+#line 231 "gen/ragel/11__alt1_4.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr2;
@@ -249,22 +243,20 @@ static void lex(Input *in, Output *out)
 				goto _st1;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr12:
 		{
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			b1 = p; }
 		
-#line 261 "gen/ragel/11__alt1_4.c"
+#line 253 "gen/ragel/11__alt1_4.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr4;
@@ -273,22 +265,20 @@ static void lex(Input *in, Output *out)
 				goto _st2;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr13:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			c1 = p; }
 		
-#line 285 "gen/ragel/11__alt1_4.c"
+#line 275 "gen/ragel/11__alt1_4.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr6;
@@ -297,22 +287,20 @@ static void lex(Input *in, Output *out)
 				goto _st3;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr14:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/11__alt1_4.rl"
 			d1 = p; }
 		
-#line 309 "gen/ragel/11__alt1_4.c"
+#line 297 "gen/ragel/11__alt1_4.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr8;
@@ -321,19 +309,13 @@ static void lex(Input *in, Output *out)
 				goto _st4;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 5 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out5: cs = 5; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/12__alt1_8.c

@@ -40,8 +40,6 @@ static void lex(Input *in, Output *out)
 	
 #line 42 "gen/ragel/12__alt1_8.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 9:
 			goto st_case_9;
@@ -64,13 +62,12 @@ static void lex(Input *in, Output *out)
 			case 8:
 			goto st_case_8;
 		}
-		goto st_out;
 		_ctr2:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 74 "gen/ragel/12__alt1_8.c"
+#line 71 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -86,7 +83,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 90 "gen/ragel/12__alt1_8.c"
+#line 87 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr4:
@@ -94,7 +91,7 @@ static void lex(Input *in, Output *out)
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 98 "gen/ragel/12__alt1_8.c"
+#line 95 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -110,7 +107,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 114 "gen/ragel/12__alt1_8.c"
+#line 111 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr6:
@@ -118,7 +115,7 @@ static void lex(Input *in, Output *out)
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 122 "gen/ragel/12__alt1_8.c"
+#line 119 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -134,7 +131,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 138 "gen/ragel/12__alt1_8.c"
+#line 135 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr8:
@@ -142,7 +139,7 @@ static void lex(Input *in, Output *out)
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 146 "gen/ragel/12__alt1_8.c"
+#line 143 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -158,7 +155,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 162 "gen/ragel/12__alt1_8.c"
+#line 159 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr10:
@@ -166,7 +163,7 @@ static void lex(Input *in, Output *out)
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			e2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 170 "gen/ragel/12__alt1_8.c"
+#line 167 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -182,7 +179,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 186 "gen/ragel/12__alt1_8.c"
+#line 183 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr12:
@@ -190,7 +187,7 @@ static void lex(Input *in, Output *out)
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			f2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 194 "gen/ragel/12__alt1_8.c"
+#line 191 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -206,7 +203,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 210 "gen/ragel/12__alt1_8.c"
+#line 207 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr14:
@@ -214,7 +211,7 @@ static void lex(Input *in, Output *out)
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			g2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = h1 = h2 = NULL; }
 		
-#line 218 "gen/ragel/12__alt1_8.c"
+#line 215 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -230,7 +227,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 234 "gen/ragel/12__alt1_8.c"
+#line 231 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr16:
@@ -238,7 +235,7 @@ static void lex(Input *in, Output *out)
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			h2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = NULL; }
 		
-#line 242 "gen/ragel/12__alt1_8.c"
+#line 239 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -254,7 +251,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 258 "gen/ragel/12__alt1_8.c"
+#line 255 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_ctr18:
@@ -262,97 +259,97 @@ static void lex(Input *in, Output *out)
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			b1 = p; }
 		
-#line 266 "gen/ragel/12__alt1_8.c"
+#line 263 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 272 "gen/ragel/12__alt1_8.c"
+#line 269 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			c1 = p; }
 		
-#line 278 "gen/ragel/12__alt1_8.c"
+#line 275 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 284 "gen/ragel/12__alt1_8.c"
+#line 281 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			d1 = p; }
 		
-#line 290 "gen/ragel/12__alt1_8.c"
+#line 287 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 296 "gen/ragel/12__alt1_8.c"
+#line 293 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			e1 = p; }
 		
-#line 302 "gen/ragel/12__alt1_8.c"
+#line 299 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			e2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 308 "gen/ragel/12__alt1_8.c"
+#line 305 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			f1 = p; }
 		
-#line 314 "gen/ragel/12__alt1_8.c"
+#line 311 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			f2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 320 "gen/ragel/12__alt1_8.c"
+#line 317 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			g1 = p; }
 		
-#line 326 "gen/ragel/12__alt1_8.c"
+#line 323 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			g2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = h1 = h2 = NULL; }
 		
-#line 332 "gen/ragel/12__alt1_8.c"
+#line 329 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			h1 = p; }
 		
-#line 338 "gen/ragel/12__alt1_8.c"
+#line 335 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			h2 = p; a1 = a2 = b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = NULL; }
 		
-#line 344 "gen/ragel/12__alt1_8.c"
+#line 341 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			a1 = p; }
 		
-#line 350 "gen/ragel/12__alt1_8.c"
+#line 347 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = e1 = e2 = f1 = f2 = g1 = g2 = h1 = h2 = NULL; }
 		
-#line 356 "gen/ragel/12__alt1_8.c"
+#line 353 "gen/ragel/12__alt1_8.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
@@ -368,14 +365,14 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 372 "gen/ragel/12__alt1_8.c"
+#line 369 "gen/ragel/12__alt1_8.c"
 		
 		goto _st9;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr18;
@@ -405,26 +402,23 @@ static void lex(Input *in, Output *out)
 				goto _ctr26;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr19:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			a1 = p; }
 		
-#line 421 "gen/ragel/12__alt1_8.c"
+#line 415 "gen/ragel/12__alt1_8.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr2;
@@ -433,22 +427,20 @@ static void lex(Input *in, Output *out)
 				goto _st1;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr20:
 		{
 #line 12 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			b1 = p; }
 		
-#line 445 "gen/ragel/12__alt1_8.c"
+#line 437 "gen/ragel/12__alt1_8.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr4;
@@ -457,22 +449,20 @@ static void lex(Input *in, Output *out)
 				goto _st2;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr21:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			c1 = p; }
 		
-#line 469 "gen/ragel/12__alt1_8.c"
+#line 459 "gen/ragel/12__alt1_8.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr6;
@@ -481,22 +471,20 @@ static void lex(Input *in, Output *out)
 				goto _st3;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr22:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			d1 = p; }
 		
-#line 493 "gen/ragel/12__alt1_8.c"
+#line 481 "gen/ragel/12__alt1_8.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr8;
@@ -505,22 +493,20 @@ static void lex(Input *in, Output *out)
 				goto _st4;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr23:
 		{
 #line 15 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			e1 = p; }
 		
-#line 517 "gen/ragel/12__alt1_8.c"
+#line 503 "gen/ragel/12__alt1_8.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr10;
@@ -529,22 +515,20 @@ static void lex(Input *in, Output *out)
 				goto _st5;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr24:
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			f1 = p; }
 		
-#line 541 "gen/ragel/12__alt1_8.c"
+#line 525 "gen/ragel/12__alt1_8.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr12;
@@ -553,22 +537,20 @@ static void lex(Input *in, Output *out)
 				goto _st6;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr25:
 		{
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			g1 = p; }
 		
-#line 565 "gen/ragel/12__alt1_8.c"
+#line 547 "gen/ragel/12__alt1_8.c"
 		
 		goto _st7;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr14;
@@ -577,22 +559,20 @@ static void lex(Input *in, Output *out)
 				goto _st7;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr26:
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/12__alt1_8.rl"
 			h1 = p; }
 		
-#line 589 "gen/ragel/12__alt1_8.c"
+#line 569 "gen/ragel/12__alt1_8.c"
 		
 		goto _st8;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr16;
@@ -601,23 +581,17 @@ static void lex(Input *in, Output *out)
 				goto _st8;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 9 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out9: cs = 9; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/13__alt2_2.c

@@ -42,8 +42,6 @@ static void lex(Input *in, Output *out)
 	
 #line 44 "gen/ragel/13__alt2_2.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 5:
 			goto st_case_5;
@@ -58,37 +56,36 @@ static void lex(Input *in, Output *out)
 			case 4:
 			goto st_case_4;
 		}
-		goto st_out;
 		_ctr2:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 68 "gen/ragel/13__alt2_2.c"
+#line 65 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b3 = p; }
 		
-#line 74 "gen/ragel/13__alt2_2.c"
+#line 71 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 80 "gen/ragel/13__alt2_2.c"
+#line 77 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a3 = p; }
 		
-#line 86 "gen/ragel/13__alt2_2.c"
+#line 83 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 92 "gen/ragel/13__alt2_2.c"
+#line 89 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
@@ -100,7 +97,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 104 "gen/ragel/13__alt2_2.c"
+#line 101 "gen/ragel/13__alt2_2.c"
 		
 		goto _st5;
 		_ctr5:
@@ -108,7 +105,7 @@ static void lex(Input *in, Output *out)
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 112 "gen/ragel/13__alt2_2.c"
+#line 109 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
@@ -120,7 +117,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 124 "gen/ragel/13__alt2_2.c"
+#line 121 "gen/ragel/13__alt2_2.c"
 		
 		goto _st5;
 		_ctr7:
@@ -128,31 +125,31 @@ static void lex(Input *in, Output *out)
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 132 "gen/ragel/13__alt2_2.c"
+#line 129 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b3 = p; }
 		
-#line 138 "gen/ragel/13__alt2_2.c"
+#line 135 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 144 "gen/ragel/13__alt2_2.c"
+#line 141 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a3 = p; }
 		
-#line 150 "gen/ragel/13__alt2_2.c"
+#line 147 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 156 "gen/ragel/13__alt2_2.c"
+#line 153 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
@@ -164,7 +161,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 168 "gen/ragel/13__alt2_2.c"
+#line 165 "gen/ragel/13__alt2_2.c"
 		
 		goto _st5;
 		_ctr10:
@@ -172,7 +169,7 @@ static void lex(Input *in, Output *out)
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 176 "gen/ragel/13__alt2_2.c"
+#line 173 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
@@ -184,7 +181,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 188 "gen/ragel/13__alt2_2.c"
+#line 185 "gen/ragel/13__alt2_2.c"
 		
 		goto _st5;
 		_ctr12:
@@ -192,49 +189,49 @@ static void lex(Input *in, Output *out)
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b1 = p; }
 		
-#line 196 "gen/ragel/13__alt2_2.c"
+#line 193 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 202 "gen/ragel/13__alt2_2.c"
+#line 199 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a1 = p; }
 		
-#line 208 "gen/ragel/13__alt2_2.c"
+#line 205 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 214 "gen/ragel/13__alt2_2.c"
+#line 211 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b3 = p; }
 		
-#line 220 "gen/ragel/13__alt2_2.c"
+#line 217 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 226 "gen/ragel/13__alt2_2.c"
+#line 223 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a3 = p; }
 		
-#line 232 "gen/ragel/13__alt2_2.c"
+#line 229 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 238 "gen/ragel/13__alt2_2.c"
+#line 235 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
@@ -246,14 +243,14 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 250 "gen/ragel/13__alt2_2.c"
+#line 247 "gen/ragel/13__alt2_2.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr12;
@@ -265,26 +262,23 @@ static void lex(Input *in, Output *out)
 				goto _ctr14;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr13:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a1 = p; }
 		
-#line 281 "gen/ragel/13__alt2_2.c"
+#line 275 "gen/ragel/13__alt2_2.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr2;
@@ -296,28 +290,26 @@ static void lex(Input *in, Output *out)
 				goto _ctr3;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr3:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 308 "gen/ragel/13__alt2_2.c"
+#line 300 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 23 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b3 = p; }
 		
-#line 314 "gen/ragel/13__alt2_2.c"
+#line 306 "gen/ragel/13__alt2_2.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr5;
@@ -326,22 +318,20 @@ static void lex(Input *in, Output *out)
 				goto _st2;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr14:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b1 = p; }
 		
-#line 338 "gen/ragel/13__alt2_2.c"
+#line 328 "gen/ragel/13__alt2_2.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr7;
@@ -353,28 +343,26 @@ static void lex(Input *in, Output *out)
 				goto _st3;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr8:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 365 "gen/ragel/13__alt2_2.c"
+#line 353 "gen/ragel/13__alt2_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/13__alt2_2.rl"
 			a3 = p; }
 		
-#line 371 "gen/ragel/13__alt2_2.c"
+#line 359 "gen/ragel/13__alt2_2.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr10;
@@ -383,19 +371,13 @@ static void lex(Input *in, Output *out)
 				goto _st4;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 5 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out5: cs = 5; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/14__alt2_4.c

@@ -42,8 +42,6 @@ static void lex(Input *in, Output *out)
 	
 #line 44 "gen/ragel/14__alt2_4.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 9:
 			goto st_case_9;
@@ -66,61 +64,60 @@ static void lex(Input *in, Output *out)
 			case 8:
 			goto st_case_8;
 		}
-		goto st_out;
 		_ctr2:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 76 "gen/ragel/14__alt2_4.c"
+#line 73 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 82 "gen/ragel/14__alt2_4.c"
+#line 79 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b4 = p; a3 = a4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 88 "gen/ragel/14__alt2_4.c"
+#line 85 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 94 "gen/ragel/14__alt2_4.c"
+#line 91 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c4 = p; a3 = a4 = b3 = b4 = d3 = d4 = NULL; }
 		
-#line 100 "gen/ragel/14__alt2_4.c"
+#line 97 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 106 "gen/ragel/14__alt2_4.c"
+#line 103 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d4 = p; a3 = a4 = b3 = b4 = c3 = c4 = NULL; }
 		
-#line 112 "gen/ragel/14__alt2_4.c"
+#line 109 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 118 "gen/ragel/14__alt2_4.c"
+#line 115 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a4 = p; b3 = b4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 124 "gen/ragel/14__alt2_4.c"
+#line 121 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -136,7 +133,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 140 "gen/ragel/14__alt2_4.c"
+#line 137 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr7:
@@ -144,7 +141,7 @@ static void lex(Input *in, Output *out)
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b4 = p; a3 = a4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 148 "gen/ragel/14__alt2_4.c"
+#line 145 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -160,7 +157,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 164 "gen/ragel/14__alt2_4.c"
+#line 161 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr9:
@@ -168,7 +165,7 @@ static void lex(Input *in, Output *out)
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c4 = p; a3 = a4 = b3 = b4 = d3 = d4 = NULL; }
 		
-#line 172 "gen/ragel/14__alt2_4.c"
+#line 169 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -184,7 +181,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 188 "gen/ragel/14__alt2_4.c"
+#line 185 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr11:
@@ -192,7 +189,7 @@ static void lex(Input *in, Output *out)
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d4 = p; a3 = a4 = b3 = b4 = c3 = c4 = NULL; }
 		
-#line 196 "gen/ragel/14__alt2_4.c"
+#line 193 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -208,7 +205,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 212 "gen/ragel/14__alt2_4.c"
+#line 209 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr13:
@@ -216,55 +213,55 @@ static void lex(Input *in, Output *out)
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 220 "gen/ragel/14__alt2_4.c"
+#line 217 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 226 "gen/ragel/14__alt2_4.c"
+#line 223 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b4 = p; a3 = a4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 232 "gen/ragel/14__alt2_4.c"
+#line 229 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 238 "gen/ragel/14__alt2_4.c"
+#line 235 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c4 = p; a3 = a4 = b3 = b4 = d3 = d4 = NULL; }
 		
-#line 244 "gen/ragel/14__alt2_4.c"
+#line 241 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 250 "gen/ragel/14__alt2_4.c"
+#line 247 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d4 = p; a3 = a4 = b3 = b4 = c3 = c4 = NULL; }
 		
-#line 256 "gen/ragel/14__alt2_4.c"
+#line 253 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 262 "gen/ragel/14__alt2_4.c"
+#line 259 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a4 = p; b3 = b4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 268 "gen/ragel/14__alt2_4.c"
+#line 265 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -280,7 +277,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 284 "gen/ragel/14__alt2_4.c"
+#line 281 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr18:
@@ -288,7 +285,7 @@ static void lex(Input *in, Output *out)
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a4 = p; b3 = b4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 292 "gen/ragel/14__alt2_4.c"
+#line 289 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -304,7 +301,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 308 "gen/ragel/14__alt2_4.c"
+#line 305 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr20:
@@ -312,55 +309,55 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = NULL; }
 		
-#line 316 "gen/ragel/14__alt2_4.c"
+#line 313 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 322 "gen/ragel/14__alt2_4.c"
+#line 319 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b4 = p; a3 = a4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 328 "gen/ragel/14__alt2_4.c"
+#line 325 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 334 "gen/ragel/14__alt2_4.c"
+#line 331 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c4 = p; a3 = a4 = b3 = b4 = d3 = d4 = NULL; }
 		
-#line 340 "gen/ragel/14__alt2_4.c"
+#line 337 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 346 "gen/ragel/14__alt2_4.c"
+#line 343 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d4 = p; a3 = a4 = b3 = b4 = c3 = c4 = NULL; }
 		
-#line 352 "gen/ragel/14__alt2_4.c"
+#line 349 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 358 "gen/ragel/14__alt2_4.c"
+#line 355 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a4 = p; b3 = b4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 364 "gen/ragel/14__alt2_4.c"
+#line 361 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -376,7 +373,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 380 "gen/ragel/14__alt2_4.c"
+#line 377 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr25:
@@ -384,55 +381,55 @@ static void lex(Input *in, Output *out)
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = NULL; }
 		
-#line 388 "gen/ragel/14__alt2_4.c"
+#line 385 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 394 "gen/ragel/14__alt2_4.c"
+#line 391 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b4 = p; a3 = a4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 400 "gen/ragel/14__alt2_4.c"
+#line 397 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 406 "gen/ragel/14__alt2_4.c"
+#line 403 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c4 = p; a3 = a4 = b3 = b4 = d3 = d4 = NULL; }
 		
-#line 412 "gen/ragel/14__alt2_4.c"
+#line 409 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 418 "gen/ragel/14__alt2_4.c"
+#line 415 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d4 = p; a3 = a4 = b3 = b4 = c3 = c4 = NULL; }
 		
-#line 424 "gen/ragel/14__alt2_4.c"
+#line 421 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 430 "gen/ragel/14__alt2_4.c"
+#line 427 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a4 = p; b3 = b4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 436 "gen/ragel/14__alt2_4.c"
+#line 433 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -448,7 +445,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 452 "gen/ragel/14__alt2_4.c"
+#line 449 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_ctr30:
@@ -456,97 +453,97 @@ static void lex(Input *in, Output *out)
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b1 = p; }
 		
-#line 460 "gen/ragel/14__alt2_4.c"
+#line 457 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 466 "gen/ragel/14__alt2_4.c"
+#line 463 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c1 = p; }
 		
-#line 472 "gen/ragel/14__alt2_4.c"
+#line 469 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = NULL; }
 		
-#line 478 "gen/ragel/14__alt2_4.c"
+#line 475 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d1 = p; }
 		
-#line 484 "gen/ragel/14__alt2_4.c"
+#line 481 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = NULL; }
 		
-#line 490 "gen/ragel/14__alt2_4.c"
+#line 487 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a1 = p; }
 		
-#line 496 "gen/ragel/14__alt2_4.c"
+#line 493 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 502 "gen/ragel/14__alt2_4.c"
+#line 499 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 508 "gen/ragel/14__alt2_4.c"
+#line 505 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b4 = p; a3 = a4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 514 "gen/ragel/14__alt2_4.c"
+#line 511 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 520 "gen/ragel/14__alt2_4.c"
+#line 517 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c4 = p; a3 = a4 = b3 = b4 = d3 = d4 = NULL; }
 		
-#line 526 "gen/ragel/14__alt2_4.c"
+#line 523 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 532 "gen/ragel/14__alt2_4.c"
+#line 529 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d4 = p; a3 = a4 = b3 = b4 = c3 = c4 = NULL; }
 		
-#line 538 "gen/ragel/14__alt2_4.c"
+#line 535 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 544 "gen/ragel/14__alt2_4.c"
+#line 541 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a4 = p; b3 = b4 = c3 = c4 = d3 = d4 = NULL; }
 		
-#line 550 "gen/ragel/14__alt2_4.c"
+#line 547 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 30 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
@@ -562,14 +559,14 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 566 "gen/ragel/14__alt2_4.c"
+#line 563 "gen/ragel/14__alt2_4.c"
 		
 		goto _st9;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr30;
@@ -587,26 +584,23 @@ static void lex(Input *in, Output *out)
 				goto _ctr34;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr31:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a1 = p; }
 		
-#line 603 "gen/ragel/14__alt2_4.c"
+#line 597 "gen/ragel/14__alt2_4.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr2;
@@ -624,21 +618,19 @@ static void lex(Input *in, Output *out)
 				goto _ctr5;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr3:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 636 "gen/ragel/14__alt2_4.c"
+#line 628 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 642 "gen/ragel/14__alt2_4.c"
+#line 634 "gen/ragel/14__alt2_4.c"
 		
 		goto _st2;
 		_ctr22:
@@ -646,13 +638,13 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = NULL; }
 		
-#line 650 "gen/ragel/14__alt2_4.c"
+#line 642 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 656 "gen/ragel/14__alt2_4.c"
+#line 648 "gen/ragel/14__alt2_4.c"
 		
 		goto _st2;
 		_ctr27:
@@ -660,20 +652,20 @@ static void lex(Input *in, Output *out)
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = NULL; }
 		
-#line 664 "gen/ragel/14__alt2_4.c"
+#line 656 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b3 = p; }
 		
-#line 670 "gen/ragel/14__alt2_4.c"
+#line 662 "gen/ragel/14__alt2_4.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr7;
@@ -682,21 +674,19 @@ static void lex(Input *in, Output *out)
 				goto _st2;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr4:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 694 "gen/ragel/14__alt2_4.c"
+#line 684 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 700 "gen/ragel/14__alt2_4.c"
+#line 690 "gen/ragel/14__alt2_4.c"
 		
 		goto _st3;
 		_ctr15:
@@ -704,13 +694,13 @@ static void lex(Input *in, Output *out)
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 708 "gen/ragel/14__alt2_4.c"
+#line 698 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 714 "gen/ragel/14__alt2_4.c"
+#line 704 "gen/ragel/14__alt2_4.c"
 		
 		goto _st3;
 		_ctr28:
@@ -718,20 +708,20 @@ static void lex(Input *in, Output *out)
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = NULL; }
 		
-#line 722 "gen/ragel/14__alt2_4.c"
+#line 712 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 26 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c3 = p; }
 		
-#line 728 "gen/ragel/14__alt2_4.c"
+#line 718 "gen/ragel/14__alt2_4.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr9;
@@ -740,21 +730,19 @@ static void lex(Input *in, Output *out)
 				goto _st3;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr5:
 		{
 #line 22 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a2 = p; b1 = b2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 752 "gen/ragel/14__alt2_4.c"
+#line 740 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 758 "gen/ragel/14__alt2_4.c"
+#line 746 "gen/ragel/14__alt2_4.c"
 		
 		goto _st4;
 		_ctr16:
@@ -762,13 +750,13 @@ static void lex(Input *in, Output *out)
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 766 "gen/ragel/14__alt2_4.c"
+#line 754 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 772 "gen/ragel/14__alt2_4.c"
+#line 760 "gen/ragel/14__alt2_4.c"
 		
 		goto _st4;
 		_ctr23:
@@ -776,20 +764,20 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = NULL; }
 		
-#line 780 "gen/ragel/14__alt2_4.c"
+#line 768 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 27 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d3 = p; }
 		
-#line 786 "gen/ragel/14__alt2_4.c"
+#line 774 "gen/ragel/14__alt2_4.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr11;
@@ -798,22 +786,20 @@ static void lex(Input *in, Output *out)
 				goto _st4;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr32:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b1 = p; }
 		
-#line 810 "gen/ragel/14__alt2_4.c"
+#line 796 "gen/ragel/14__alt2_4.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr13;
@@ -831,21 +817,19 @@ static void lex(Input *in, Output *out)
 				goto _ctr16;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr14:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			b2 = p; a1 = a2 = c1 = c2 = d1 = d2 = NULL; }
 		
-#line 843 "gen/ragel/14__alt2_4.c"
+#line 827 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 849 "gen/ragel/14__alt2_4.c"
+#line 833 "gen/ragel/14__alt2_4.c"
 		
 		goto _st6;
 		_ctr21:
@@ -853,13 +837,13 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c2 = p; a1 = a2 = b1 = b2 = d1 = d2 = NULL; }
 		
-#line 857 "gen/ragel/14__alt2_4.c"
+#line 841 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 863 "gen/ragel/14__alt2_4.c"
+#line 847 "gen/ragel/14__alt2_4.c"
 		
 		goto _st6;
 		_ctr26:
@@ -867,20 +851,20 @@ static void lex(Input *in, Output *out)
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d2 = p; a1 = a2 = b1 = b2 = c1 = c2 = NULL; }
 		
-#line 871 "gen/ragel/14__alt2_4.c"
+#line 855 "gen/ragel/14__alt2_4.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			a3 = p; }
 		
-#line 877 "gen/ragel/14__alt2_4.c"
+#line 861 "gen/ragel/14__alt2_4.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr18;
@@ -889,22 +873,20 @@ static void lex(Input *in, Output *out)
 				goto _st6;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr33:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			c1 = p; }
 		
-#line 901 "gen/ragel/14__alt2_4.c"
+#line 883 "gen/ragel/14__alt2_4.c"
 		
 		goto _st7;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr20;
@@ -922,22 +904,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr23;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr34:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/14__alt2_4.rl"
 			d1 = p; }
 		
-#line 934 "gen/ragel/14__alt2_4.c"
+#line 914 "gen/ragel/14__alt2_4.c"
 		
 		goto _st8;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr25;
@@ -955,23 +935,17 @@ static void lex(Input *in, Output *out)
 				goto _st8;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 9 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out9: cs = 9; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/16__alt4_2.c

@@ -46,8 +46,6 @@ static void lex(Input *in, Output *out)
 	
 #line 48 "gen/ragel/16__alt4_2.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 9:
 			goto st_case_9;
@@ -70,85 +68,84 @@ static void lex(Input *in, Output *out)
 			case 8:
 			goto st_case_8;
 		}
-		goto st_out;
 		_ctr2:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 80 "gen/ragel/16__alt4_2.c"
+#line 77 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b3 = p; }
 		
-#line 86 "gen/ragel/16__alt4_2.c"
+#line 83 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 92 "gen/ragel/16__alt4_2.c"
+#line 89 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a3 = p; }
 		
-#line 98 "gen/ragel/16__alt4_2.c"
+#line 95 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 104 "gen/ragel/16__alt4_2.c"
+#line 101 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b5 = p; }
 		
-#line 110 "gen/ragel/16__alt4_2.c"
+#line 107 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b6 = p; a5 = a6 = NULL; }
 		
-#line 116 "gen/ragel/16__alt4_2.c"
+#line 113 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a5 = p; }
 		
-#line 122 "gen/ragel/16__alt4_2.c"
+#line 119 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a6 = p; b5 = b6 = NULL; }
 		
-#line 128 "gen/ragel/16__alt4_2.c"
+#line 125 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 134 "gen/ragel/16__alt4_2.c"
+#line 131 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 140 "gen/ragel/16__alt4_2.c"
+#line 137 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 146 "gen/ragel/16__alt4_2.c"
+#line 143 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 152 "gen/ragel/16__alt4_2.c"
+#line 149 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -164,7 +161,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 168 "gen/ragel/16__alt4_2.c"
+#line 165 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr5:
@@ -172,55 +169,55 @@ static void lex(Input *in, Output *out)
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 176 "gen/ragel/16__alt4_2.c"
+#line 173 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b5 = p; }
 		
-#line 182 "gen/ragel/16__alt4_2.c"
+#line 179 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b6 = p; a5 = a6 = NULL; }
 		
-#line 188 "gen/ragel/16__alt4_2.c"
+#line 185 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a5 = p; }
 		
-#line 194 "gen/ragel/16__alt4_2.c"
+#line 191 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a6 = p; b5 = b6 = NULL; }
 		
-#line 200 "gen/ragel/16__alt4_2.c"
+#line 197 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 206 "gen/ragel/16__alt4_2.c"
+#line 203 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 212 "gen/ragel/16__alt4_2.c"
+#line 209 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 218 "gen/ragel/16__alt4_2.c"
+#line 215 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 224 "gen/ragel/16__alt4_2.c"
+#line 221 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -236,7 +233,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 240 "gen/ragel/16__alt4_2.c"
+#line 237 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr8:
@@ -244,31 +241,31 @@ static void lex(Input *in, Output *out)
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a6 = p; b5 = b6 = NULL; }
 		
-#line 248 "gen/ragel/16__alt4_2.c"
+#line 245 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 254 "gen/ragel/16__alt4_2.c"
+#line 251 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 260 "gen/ragel/16__alt4_2.c"
+#line 257 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 266 "gen/ragel/16__alt4_2.c"
+#line 263 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 272 "gen/ragel/16__alt4_2.c"
+#line 269 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -284,7 +281,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 288 "gen/ragel/16__alt4_2.c"
+#line 285 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr11:
@@ -292,7 +289,7 @@ static void lex(Input *in, Output *out)
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 296 "gen/ragel/16__alt4_2.c"
+#line 293 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -308,7 +305,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 312 "gen/ragel/16__alt4_2.c"
+#line 309 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr13:
@@ -316,79 +313,79 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 320 "gen/ragel/16__alt4_2.c"
+#line 317 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b3 = p; }
 		
-#line 326 "gen/ragel/16__alt4_2.c"
+#line 323 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 332 "gen/ragel/16__alt4_2.c"
+#line 329 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a3 = p; }
 		
-#line 338 "gen/ragel/16__alt4_2.c"
+#line 335 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 344 "gen/ragel/16__alt4_2.c"
+#line 341 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b5 = p; }
 		
-#line 350 "gen/ragel/16__alt4_2.c"
+#line 347 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b6 = p; a5 = a6 = NULL; }
 		
-#line 356 "gen/ragel/16__alt4_2.c"
+#line 353 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a5 = p; }
 		
-#line 362 "gen/ragel/16__alt4_2.c"
+#line 359 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a6 = p; b5 = b6 = NULL; }
 		
-#line 368 "gen/ragel/16__alt4_2.c"
+#line 365 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 374 "gen/ragel/16__alt4_2.c"
+#line 371 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 380 "gen/ragel/16__alt4_2.c"
+#line 377 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 386 "gen/ragel/16__alt4_2.c"
+#line 383 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 392 "gen/ragel/16__alt4_2.c"
+#line 389 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -404,7 +401,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 408 "gen/ragel/16__alt4_2.c"
+#line 405 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr16:
@@ -412,55 +409,55 @@ static void lex(Input *in, Output *out)
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 416 "gen/ragel/16__alt4_2.c"
+#line 413 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b5 = p; }
 		
-#line 422 "gen/ragel/16__alt4_2.c"
+#line 419 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b6 = p; a5 = a6 = NULL; }
 		
-#line 428 "gen/ragel/16__alt4_2.c"
+#line 425 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a5 = p; }
 		
-#line 434 "gen/ragel/16__alt4_2.c"
+#line 431 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a6 = p; b5 = b6 = NULL; }
 		
-#line 440 "gen/ragel/16__alt4_2.c"
+#line 437 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 446 "gen/ragel/16__alt4_2.c"
+#line 443 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 452 "gen/ragel/16__alt4_2.c"
+#line 449 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 458 "gen/ragel/16__alt4_2.c"
+#line 455 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 464 "gen/ragel/16__alt4_2.c"
+#line 461 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -476,7 +473,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 480 "gen/ragel/16__alt4_2.c"
+#line 477 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr19:
@@ -484,31 +481,31 @@ static void lex(Input *in, Output *out)
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b6 = p; a5 = a6 = NULL; }
 		
-#line 488 "gen/ragel/16__alt4_2.c"
+#line 485 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 494 "gen/ragel/16__alt4_2.c"
+#line 491 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 500 "gen/ragel/16__alt4_2.c"
+#line 497 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 506 "gen/ragel/16__alt4_2.c"
+#line 503 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 512 "gen/ragel/16__alt4_2.c"
+#line 509 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -524,7 +521,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 528 "gen/ragel/16__alt4_2.c"
+#line 525 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr22:
@@ -532,7 +529,7 @@ static void lex(Input *in, Output *out)
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 536 "gen/ragel/16__alt4_2.c"
+#line 533 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -548,7 +545,7 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 552 "gen/ragel/16__alt4_2.c"
+#line 549 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_ctr24:
@@ -556,97 +553,97 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b1 = p; }
 		
-#line 560 "gen/ragel/16__alt4_2.c"
+#line 557 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 566 "gen/ragel/16__alt4_2.c"
+#line 563 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a1 = p; }
 		
-#line 572 "gen/ragel/16__alt4_2.c"
+#line 569 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 578 "gen/ragel/16__alt4_2.c"
+#line 575 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b3 = p; }
 		
-#line 584 "gen/ragel/16__alt4_2.c"
+#line 581 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 590 "gen/ragel/16__alt4_2.c"
+#line 587 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a3 = p; }
 		
-#line 596 "gen/ragel/16__alt4_2.c"
+#line 593 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 602 "gen/ragel/16__alt4_2.c"
+#line 599 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b5 = p; }
 		
-#line 608 "gen/ragel/16__alt4_2.c"
+#line 605 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b6 = p; a5 = a6 = NULL; }
 		
-#line 614 "gen/ragel/16__alt4_2.c"
+#line 611 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a5 = p; }
 		
-#line 620 "gen/ragel/16__alt4_2.c"
+#line 617 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a6 = p; b5 = b6 = NULL; }
 		
-#line 626 "gen/ragel/16__alt4_2.c"
+#line 623 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 632 "gen/ragel/16__alt4_2.c"
+#line 629 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b8 = p; a7 = a8 = NULL; }
 		
-#line 638 "gen/ragel/16__alt4_2.c"
+#line 635 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 644 "gen/ragel/16__alt4_2.c"
+#line 641 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a8 = p; b7 = b8 = NULL; }
 		
-#line 650 "gen/ragel/16__alt4_2.c"
+#line 647 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 35 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
@@ -662,14 +659,14 @@ static void lex(Input *in, Output *out)
 			outc(out, '\n');
 		}
 		
-#line 666 "gen/ragel/16__alt4_2.c"
+#line 663 "gen/ragel/16__alt4_2.c"
 		
 		goto _st9;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr24;
@@ -681,26 +678,23 @@ static void lex(Input *in, Output *out)
 				goto _ctr26;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr25:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a1 = p; }
 		
-#line 697 "gen/ragel/16__alt4_2.c"
+#line 691 "gen/ragel/16__alt4_2.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr2;
@@ -712,28 +706,26 @@ static void lex(Input *in, Output *out)
 				goto _ctr3;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr3:
 		{
 #line 21 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a2 = p; b1 = b2 = NULL; }
 		
-#line 724 "gen/ragel/16__alt4_2.c"
+#line 716 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b3 = p; }
 		
-#line 730 "gen/ragel/16__alt4_2.c"
+#line 722 "gen/ragel/16__alt4_2.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr5;
@@ -745,28 +737,26 @@ static void lex(Input *in, Output *out)
 				goto _st2;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr6:
 		{
 #line 24 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b4 = p; a3 = a4 = NULL; }
 		
-#line 757 "gen/ragel/16__alt4_2.c"
+#line 747 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a5 = p; }
 		
-#line 763 "gen/ragel/16__alt4_2.c"
+#line 753 "gen/ragel/16__alt4_2.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr8;
@@ -778,28 +768,26 @@ static void lex(Input *in, Output *out)
 				goto _ctr9;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr9:
 		{
 #line 29 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a6 = p; b5 = b6 = NULL; }
 		
-#line 790 "gen/ragel/16__alt4_2.c"
+#line 778 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 32 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b7 = p; }
 		
-#line 796 "gen/ragel/16__alt4_2.c"
+#line 784 "gen/ragel/16__alt4_2.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr11;
@@ -808,22 +796,20 @@ static void lex(Input *in, Output *out)
 				goto _st4;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr26:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b1 = p; }
 		
-#line 820 "gen/ragel/16__alt4_2.c"
+#line 806 "gen/ragel/16__alt4_2.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr13;
@@ -835,28 +821,26 @@ static void lex(Input *in, Output *out)
 				goto _st5;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr14:
 		{
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b2 = p; a1 = a2 = NULL; }
 		
-#line 847 "gen/ragel/16__alt4_2.c"
+#line 831 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a3 = p; }
 		
-#line 853 "gen/ragel/16__alt4_2.c"
+#line 837 "gen/ragel/16__alt4_2.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr16;
@@ -868,28 +852,26 @@ static void lex(Input *in, Output *out)
 				goto _ctr17;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr17:
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a4 = p; b3 = b4 = NULL; }
 		
-#line 880 "gen/ragel/16__alt4_2.c"
+#line 862 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b5 = p; }
 		
-#line 886 "gen/ragel/16__alt4_2.c"
+#line 868 "gen/ragel/16__alt4_2.c"
 		
 		goto _st7;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr19;
@@ -901,28 +883,26 @@ static void lex(Input *in, Output *out)
 				goto _st7;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr20:
 		{
 #line 28 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			b6 = p; a5 = a6 = NULL; }
 		
-#line 913 "gen/ragel/16__alt4_2.c"
+#line 893 "gen/ragel/16__alt4_2.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/16__alt4_2.rl"
 			a7 = p; }
 		
-#line 919 "gen/ragel/16__alt4_2.c"
+#line 899 "gen/ragel/16__alt4_2.c"
 		
 		goto _st8;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr22;
@@ -931,23 +911,17 @@ static void lex(Input *in, Output *out)
 				goto _st8;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 9 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out9: cs = 9; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/20__cat2_0.c

@@ -39,8 +39,6 @@ static void lex(Input *in, Output *out)
 	
 #line 41 "gen/ragel/20__cat2_0.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 5:
 			goto st_case_5;
@@ -55,25 +53,24 @@ static void lex(Input *in, Output *out)
 			case 4:
 			goto st_case_4;
 		}
-		goto st_out;
 		_ctr2:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b0 = p; }
 		
-#line 65 "gen/ragel/20__cat2_0.c"
+#line 62 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 71 "gen/ragel/20__cat2_0.c"
+#line 68 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 77 "gen/ragel/20__cat2_0.c"
+#line 74 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 11 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
@@ -82,7 +79,7 @@ static void lex(Input *in, Output *out)
 			outs(out, a1, b1); outc(out, '.'); outs(out, b1, p + 1);
 		}
 		
-#line 86 "gen/ragel/20__cat2_0.c"
+#line 83 "gen/ragel/20__cat2_0.c"
 		
 		goto _st5;
 		_ctr6:
@@ -90,13 +87,13 @@ static void lex(Input *in, Output *out)
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 94 "gen/ragel/20__cat2_0.c"
+#line 91 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 100 "gen/ragel/20__cat2_0.c"
+#line 97 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 11 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
@@ -105,7 +102,7 @@ static void lex(Input *in, Output *out)
 			outs(out, a1, b1); outc(out, '.'); outs(out, b1, p + 1);
 		}
 		
-#line 109 "gen/ragel/20__cat2_0.c"
+#line 106 "gen/ragel/20__cat2_0.c"
 		
 		goto _st5;
 		_ctr10:
@@ -113,7 +110,7 @@ static void lex(Input *in, Output *out)
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 117 "gen/ragel/20__cat2_0.c"
+#line 114 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 11 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
@@ -122,7 +119,7 @@ static void lex(Input *in, Output *out)
 			outs(out, a1, b1); outc(out, '.'); outs(out, b1, p + 1);
 		}
 		
-#line 126 "gen/ragel/20__cat2_0.c"
+#line 123 "gen/ragel/20__cat2_0.c"
 		
 		goto _st5;
 		_ctr13:
@@ -133,7 +130,7 @@ static void lex(Input *in, Output *out)
 			outs(out, a1, b1); outc(out, '.'); outs(out, b1, p + 1);
 		}
 		
-#line 137 "gen/ragel/20__cat2_0.c"
+#line 134 "gen/ragel/20__cat2_0.c"
 		
 		goto _st5;
 		_ctr15:
@@ -141,25 +138,25 @@ static void lex(Input *in, Output *out)
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a0 = p; }
 		
-#line 145 "gen/ragel/20__cat2_0.c"
+#line 142 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b0 = p; }
 		
-#line 151 "gen/ragel/20__cat2_0.c"
+#line 148 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 157 "gen/ragel/20__cat2_0.c"
+#line 154 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 163 "gen/ragel/20__cat2_0.c"
+#line 160 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 11 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
@@ -168,14 +165,14 @@ static void lex(Input *in, Output *out)
 			outs(out, a1, b1); outc(out, '.'); outs(out, b1, p + 1);
 		}
 		
-#line 172 "gen/ragel/20__cat2_0.c"
+#line 169 "gen/ragel/20__cat2_0.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr15;
@@ -187,25 +184,22 @@ static void lex(Input *in, Output *out)
 				goto _ctr17;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr3:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b0 = p; }
 		
-#line 203 "gen/ragel/20__cat2_0.c"
+#line 197 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 209 "gen/ragel/20__cat2_0.c"
+#line 203 "gen/ragel/20__cat2_0.c"
 		
 		goto _st1;
 		_ctr16:
@@ -213,26 +207,26 @@ static void lex(Input *in, Output *out)
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a0 = p; }
 		
-#line 217 "gen/ragel/20__cat2_0.c"
+#line 211 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b0 = p; }
 		
-#line 223 "gen/ragel/20__cat2_0.c"
+#line 217 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 229 "gen/ragel/20__cat2_0.c"
+#line 223 "gen/ragel/20__cat2_0.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr2;
@@ -244,27 +238,25 @@ static void lex(Input *in, Output *out)
 				goto _ctr4;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr4:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b0 = p; }
 		
-#line 256 "gen/ragel/20__cat2_0.c"
+#line 248 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 262 "gen/ragel/20__cat2_0.c"
+#line 254 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 268 "gen/ragel/20__cat2_0.c"
+#line 260 "gen/ragel/20__cat2_0.c"
 		
 		goto _st2;
 		_ctr8:
@@ -272,13 +264,13 @@ static void lex(Input *in, Output *out)
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 276 "gen/ragel/20__cat2_0.c"
+#line 268 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 282 "gen/ragel/20__cat2_0.c"
+#line 274 "gen/ragel/20__cat2_0.c"
 		
 		goto _st2;
 		_ctr17:
@@ -286,32 +278,32 @@ static void lex(Input *in, Output *out)
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a0 = p; }
 		
-#line 290 "gen/ragel/20__cat2_0.c"
+#line 282 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b0 = p; }
 		
-#line 296 "gen/ragel/20__cat2_0.c"
+#line 288 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 302 "gen/ragel/20__cat2_0.c"
+#line 294 "gen/ragel/20__cat2_0.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 308 "gen/ragel/20__cat2_0.c"
+#line 300 "gen/ragel/20__cat2_0.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr6;
@@ -323,22 +315,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr8;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr7:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			a1 = p; }
 		
-#line 335 "gen/ragel/20__cat2_0.c"
+#line 325 "gen/ragel/20__cat2_0.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr10;
@@ -350,22 +340,20 @@ static void lex(Input *in, Output *out)
 				goto _ctr11;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr11:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/20__cat2_0.rl"
 			b1 = p; }
 		
-#line 362 "gen/ragel/20__cat2_0.c"
+#line 350 "gen/ragel/20__cat2_0.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr13;
@@ -374,19 +362,13 @@ static void lex(Input *in, Output *out)
 				goto _st4;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 5 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out5: cs = 5; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/21__cat2_4.c

@@ -39,8 +39,6 @@ static void lex(Input *in, Output *out)
 	
 #line 41 "gen/ragel/21__cat2_4.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 16:
 			goto st_case_16;
@@ -77,7 +75,6 @@ static void lex(Input *in, Output *out)
 			case 15:
 			goto st_case_15;
 		}
-		goto st_out;
 		_ctr17:
 		{
 #line 11 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
@@ -86,100 +83,91 @@ static void lex(Input *in, Output *out)
 			outs(out, a1, b1); outc(out, '.'); outs(out, b1, p + 1);
 		}
 		
-#line 90 "gen/ragel/21__cat2_4.c"
+#line 87 "gen/ragel/21__cat2_4.c"
 		
 		goto _st16;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr29;
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr29:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			a0 = p; }
 		
-#line 113 "gen/ragel/21__cat2_4.c"
+#line 107 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 119 "gen/ragel/21__cat2_4.c"
+#line 113 "gen/ragel/21__cat2_4.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr2:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 138 "gen/ragel/21__cat2_4.c"
+#line 130 "gen/ragel/21__cat2_4.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr4:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 157 "gen/ragel/21__cat2_4.c"
+#line 147 "gen/ragel/21__cat2_4.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr6:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 176 "gen/ragel/21__cat2_4.c"
+#line 164 "gen/ragel/21__cat2_4.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr8;
@@ -188,34 +176,32 @@ static void lex(Input *in, Output *out)
 				goto _st15;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr8:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 200 "gen/ragel/21__cat2_4.c"
+#line 186 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			a1 = p; }
 		
-#line 206 "gen/ragel/21__cat2_4.c"
+#line 192 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 212 "gen/ragel/21__cat2_4.c"
+#line 198 "gen/ragel/21__cat2_4.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr11;
@@ -224,34 +210,32 @@ static void lex(Input *in, Output *out)
 				goto _st15;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr11:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 236 "gen/ragel/21__cat2_4.c"
+#line 220 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			a1 = p; }
 		
-#line 242 "gen/ragel/21__cat2_4.c"
+#line 226 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 248 "gen/ragel/21__cat2_4.c"
+#line 232 "gen/ragel/21__cat2_4.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr13;
@@ -260,34 +244,32 @@ static void lex(Input *in, Output *out)
 				goto _st15;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr13:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 272 "gen/ragel/21__cat2_4.c"
+#line 254 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			a1 = p; }
 		
-#line 278 "gen/ragel/21__cat2_4.c"
+#line 260 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 284 "gen/ragel/21__cat2_4.c"
+#line 266 "gen/ragel/21__cat2_4.c"
 		
 		goto _st7;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr15;
@@ -296,34 +278,32 @@ static void lex(Input *in, Output *out)
 				goto _st15;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr15:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b0 = p; }
 		
-#line 308 "gen/ragel/21__cat2_4.c"
+#line 288 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			a1 = p; }
 		
-#line 314 "gen/ragel/21__cat2_4.c"
+#line 294 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 320 "gen/ragel/21__cat2_4.c"
+#line 300 "gen/ragel/21__cat2_4.c"
 		
 		goto _st8;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr17;
@@ -335,14 +315,12 @@ static void lex(Input *in, Output *out)
 				goto _st9;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr17;
@@ -354,85 +332,77 @@ static void lex(Input *in, Output *out)
 				goto _st9;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr19:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			a1 = p; }
 		
-#line 366 "gen/ragel/21__cat2_4.c"
+#line 342 "gen/ragel/21__cat2_4.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 372 "gen/ragel/21__cat2_4.c"
+#line 348 "gen/ragel/21__cat2_4.c"
 		
 		goto _st10;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr21;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr21:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 391 "gen/ragel/21__cat2_4.c"
+#line 365 "gen/ragel/21__cat2_4.c"
 		
 		goto _st11;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr23;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr23:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 410 "gen/ragel/21__cat2_4.c"
+#line 382 "gen/ragel/21__cat2_4.c"
 		
 		goto _st12;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr25;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr25:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/21__cat2_4.rl"
 			b1 = p; }
 		
-#line 429 "gen/ragel/21__cat2_4.c"
+#line 399 "gen/ragel/21__cat2_4.c"
 		
 		goto _st13;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr17;
@@ -444,14 +414,12 @@ static void lex(Input *in, Output *out)
 				goto _st14;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr17;
@@ -460,14 +428,12 @@ static void lex(Input *in, Output *out)
 				goto _st14;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st15:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
 		st_case_15:
+		if ( p == pe )
+			goto _out15;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr19;
@@ -476,30 +442,24 @@ static void lex(Input *in, Output *out)
 				goto _st15;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 16 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out16: cs = 16; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/22__cat2_8.c

@@ -39,8 +39,6 @@ static void lex(Input *in, Output *out)
 	
 #line 41 "gen/ragel/22__cat2_8.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 28:
 			goto st_case_28;
@@ -101,7 +99,6 @@ static void lex(Input *in, Output *out)
 			case 27:
 			goto st_case_27;
 		}
-		goto st_out;
 		_ctr33:
 		{
 #line 11 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
@@ -110,176 +107,159 @@ static void lex(Input *in, Output *out)
 			outs(out, a1, b1); outc(out, '.'); outs(out, b1, p + 1);
 		}
 		
-#line 114 "gen/ragel/22__cat2_8.c"
+#line 111 "gen/ragel/22__cat2_8.c"
 		
 		goto _st28;
 		_st28:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof28;
 		st_case_28:
+		if ( p == pe )
+			goto _out28;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr53;
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr53:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a0 = p; }
 		
-#line 137 "gen/ragel/22__cat2_8.c"
+#line 131 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 143 "gen/ragel/22__cat2_8.c"
+#line 137 "gen/ragel/22__cat2_8.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr2:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 162 "gen/ragel/22__cat2_8.c"
+#line 154 "gen/ragel/22__cat2_8.c"
 		
 		goto _st2;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr4:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 181 "gen/ragel/22__cat2_8.c"
+#line 171 "gen/ragel/22__cat2_8.c"
 		
 		goto _st3;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr6:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 200 "gen/ragel/22__cat2_8.c"
+#line 188 "gen/ragel/22__cat2_8.c"
 		
 		goto _st4;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr8:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 219 "gen/ragel/22__cat2_8.c"
+#line 205 "gen/ragel/22__cat2_8.c"
 		
 		goto _st5;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr10:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 238 "gen/ragel/22__cat2_8.c"
+#line 222 "gen/ragel/22__cat2_8.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr12:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 257 "gen/ragel/22__cat2_8.c"
+#line 239 "gen/ragel/22__cat2_8.c"
 		
 		goto _st7;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr14;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr14:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 276 "gen/ragel/22__cat2_8.c"
+#line 256 "gen/ragel/22__cat2_8.c"
 		
 		goto _st8;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr16;
@@ -288,34 +268,32 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr16:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 300 "gen/ragel/22__cat2_8.c"
+#line 278 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a1 = p; }
 		
-#line 306 "gen/ragel/22__cat2_8.c"
+#line 284 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 312 "gen/ragel/22__cat2_8.c"
+#line 290 "gen/ragel/22__cat2_8.c"
 		
 		goto _st9;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr19;
@@ -324,34 +302,32 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr19:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 336 "gen/ragel/22__cat2_8.c"
+#line 312 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a1 = p; }
 		
-#line 342 "gen/ragel/22__cat2_8.c"
+#line 318 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 348 "gen/ragel/22__cat2_8.c"
+#line 324 "gen/ragel/22__cat2_8.c"
 		
 		goto _st10;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr21;
@@ -360,34 +336,32 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr21:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 372 "gen/ragel/22__cat2_8.c"
+#line 346 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a1 = p; }
 		
-#line 378 "gen/ragel/22__cat2_8.c"
+#line 352 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 384 "gen/ragel/22__cat2_8.c"
+#line 358 "gen/ragel/22__cat2_8.c"
 		
 		goto _st11;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr23;
@@ -396,34 +370,32 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr23:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 408 "gen/ragel/22__cat2_8.c"
+#line 380 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a1 = p; }
 		
-#line 414 "gen/ragel/22__cat2_8.c"
+#line 386 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 420 "gen/ragel/22__cat2_8.c"
+#line 392 "gen/ragel/22__cat2_8.c"
 		
 		goto _st12;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr25;
@@ -432,34 +404,32 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr25:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 444 "gen/ragel/22__cat2_8.c"
+#line 414 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a1 = p; }
 		
-#line 450 "gen/ragel/22__cat2_8.c"
+#line 420 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 456 "gen/ragel/22__cat2_8.c"
+#line 426 "gen/ragel/22__cat2_8.c"
 		
 		goto _st13;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr27;
@@ -468,34 +438,32 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr27:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
-#line 480 "gen/ragel/22__cat2_8.c"
+#line 448 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a1 = p; }
 		
-#line 486 "gen/ragel/22__cat2_8.c"
+#line 454 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 492 "gen/ragel/22__cat2_8.c"
+#line 460 "gen/ragel/22__cat2_8.c"
 		
 		goto _st14;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr29;
@@ -504,14 +472,46 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr29:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b0 = p; }
 		
+#line 482 "gen/ragel/22__cat2_8.c"
+		
+		{
+#line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
+			a1 = p; }
+		
+#line 488 "gen/ragel/22__cat2_8.c"
+		
+		{
+#line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
+			b1 = p; }
+		
+#line 494 "gen/ragel/22__cat2_8.c"
+		
+		goto _st15;
+		_st15:
+		p+= 1;
+		st_case_15:
+		if ( p == pe )
+			goto _out15;
+		switch( ( (*( p))) ) {
+			case 97: {
+				goto _ctr31;
+			}
+			case 98: {
+				goto _st27;
+			}
+		}
+		goto _st0;
+		_ctr31:
+		{
+#line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
+			b0 = p; }
+		
 #line 516 "gen/ragel/22__cat2_8.c"
 		
 		{
@@ -526,48 +526,12 @@ static void lex(Input *in, Output *out)
 		
 #line 528 "gen/ragel/22__cat2_8.c"
 		
-		goto _st15;
-		_st15:
-		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
-		st_case_15:
-		switch( ( (*( p))) ) {
-			case 97: {
-				goto _ctr31;
-			}
-			case 98: {
-				goto _st27;
-			}
-		}
-		{
-			goto _st0;
-		}
-		_ctr31:
-		{
-#line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
-			b0 = p; }
-		
-#line 552 "gen/ragel/22__cat2_8.c"
-		
-		{
-#line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
-			a1 = p; }
-		
-#line 558 "gen/ragel/22__cat2_8.c"
-		
-		{
-#line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
-			b1 = p; }
-		
-#line 564 "gen/ragel/22__cat2_8.c"
-		
 		goto _st16;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr33;
@@ -579,14 +543,12 @@ static void lex(Input *in, Output *out)
 				goto _st17;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st17:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof17;
 		st_case_17:
+		if ( p == pe )
+			goto _out17;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr33;
@@ -598,161 +560,145 @@ static void lex(Input *in, Output *out)
 				goto _st17;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr35:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			a1 = p; }
 		
-#line 610 "gen/ragel/22__cat2_8.c"
+#line 570 "gen/ragel/22__cat2_8.c"
 		
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 616 "gen/ragel/22__cat2_8.c"
+#line 576 "gen/ragel/22__cat2_8.c"
 		
 		goto _st18;
 		_st18:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof18;
 		st_case_18:
+		if ( p == pe )
+			goto _out18;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr37;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr37:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 635 "gen/ragel/22__cat2_8.c"
+#line 593 "gen/ragel/22__cat2_8.c"
 		
 		goto _st19;
 		_st19:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof19;
 		st_case_19:
+		if ( p == pe )
+			goto _out19;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr39;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr39:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 654 "gen/ragel/22__cat2_8.c"
+#line 610 "gen/ragel/22__cat2_8.c"
 		
 		goto _st20;
 		_st20:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof20;
 		st_case_20:
+		if ( p == pe )
+			goto _out20;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr41;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr41:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 673 "gen/ragel/22__cat2_8.c"
+#line 627 "gen/ragel/22__cat2_8.c"
 		
 		goto _st21;
 		_st21:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof21;
 		st_case_21:
+		if ( p == pe )
+			goto _out21;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr43;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr43:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 692 "gen/ragel/22__cat2_8.c"
+#line 644 "gen/ragel/22__cat2_8.c"
 		
 		goto _st22;
 		_st22:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof22;
 		st_case_22:
+		if ( p == pe )
+			goto _out22;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr45;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr45:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 711 "gen/ragel/22__cat2_8.c"
+#line 661 "gen/ragel/22__cat2_8.c"
 		
 		goto _st23;
 		_st23:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof23;
 		st_case_23:
+		if ( p == pe )
+			goto _out23;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr47;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr47:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 730 "gen/ragel/22__cat2_8.c"
+#line 678 "gen/ragel/22__cat2_8.c"
 		
 		goto _st24;
 		_st24:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof24;
 		st_case_24:
+		if ( p == pe )
+			goto _out24;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr49;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr49:
 		{
 #line 10 "../../../benchmarks/submatch_dfa_aot/src/ragel/22__cat2_8.rl"
 			b1 = p; }
 		
-#line 749 "gen/ragel/22__cat2_8.c"
+#line 695 "gen/ragel/22__cat2_8.c"
 		
 		goto _st25;
 		_st25:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof25;
 		st_case_25:
+		if ( p == pe )
+			goto _out25;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr33;
@@ -764,14 +710,12 @@ static void lex(Input *in, Output *out)
 				goto _st26;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st26:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof26;
 		st_case_26:
+		if ( p == pe )
+			goto _out26;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr33;
@@ -780,14 +724,12 @@ static void lex(Input *in, Output *out)
 				goto _st26;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st27:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof27;
 		st_case_27:
+		if ( p == pe )
+			goto _out27;
 		switch( ( (*( p))) ) {
 			case 97: {
 				goto _ctr35;
@@ -796,42 +738,36 @@ static void lex(Input *in, Output *out)
 				goto _st27;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof28: cs = 28; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof17: cs = 17; goto _test_eof; 
-		_test_eof18: cs = 18; goto _test_eof; 
-		_test_eof19: cs = 19; goto _test_eof; 
-		_test_eof20: cs = 20; goto _test_eof; 
-		_test_eof21: cs = 21; goto _test_eof; 
-		_test_eof22: cs = 22; goto _test_eof; 
-		_test_eof23: cs = 23; goto _test_eof; 
-		_test_eof24: cs = 24; goto _test_eof; 
-		_test_eof25: cs = 25; goto _test_eof; 
-		_test_eof26: cs = 26; goto _test_eof; 
-		_test_eof27: cs = 27; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 28 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out28: cs = 28; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
+		_out16: cs = 16; goto _out; 
+		_out17: cs = 17; goto _out; 
+		_out18: cs = 18; goto _out; 
+		_out19: cs = 19; goto _out; 
+		_out20: cs = 20; goto _out; 
+		_out21: cs = 21; goto _out; 
+		_out22: cs = 22; goto _out; 
+		_out23: cs = 23; goto _out; 
+		_out24: cs = 24; goto _out; 
+		_out25: cs = 25; goto _out; 
+		_out26: cs = 26; goto _out; 
+		_out27: cs = 27; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/30__rep_cat_5_3_2.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/30__rep_cat_5_3_2.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 11:
 			goto st_case_11;
@@ -65,7 +63,6 @@ static void lex(Input *in, Output *out)
 			case 10:
 			goto st_case_10;
 		}
-		goto st_out;
 		_ctr13:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/30__rep_cat_5_3_2.rl"
@@ -75,13 +72,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 79 "gen/ragel/30__rep_cat_5_3_2.c"
+#line 76 "gen/ragel/30__rep_cat_5_3_2.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/30__rep_cat_5_3_2.rl"
 			outc(out, '\n'); }
 		
-#line 85 "gen/ragel/30__rep_cat_5_3_2.c"
+#line 82 "gen/ragel/30__rep_cat_5_3_2.c"
 		
 		goto _st11;
 		_ctr16:
@@ -89,14 +86,14 @@ static void lex(Input *in, Output *out)
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/30__rep_cat_5_3_2.rl"
 			outc(out, '\n'); }
 		
-#line 93 "gen/ragel/30__rep_cat_5_3_2.c"
+#line 90 "gen/ragel/30__rep_cat_5_3_2.c"
 		
 		goto _st11;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr16;
@@ -105,13 +102,10 @@ static void lex(Input *in, Output *out)
 				goto _st1;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr14:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/30__rep_cat_5_3_2.rl"
@@ -121,64 +115,54 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 125 "gen/ragel/30__rep_cat_5_3_2.c"
+#line 119 "gen/ragel/30__rep_cat_5_3_2.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr6:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/30__rep_cat_5_3_2.rl"
@@ -188,42 +172,36 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 192 "gen/ragel/30__rep_cat_5_3_2.c"
+#line 176 "gen/ragel/30__rep_cat_5_3_2.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 97 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 97 ) {
 			goto _st8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr10:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/30__rep_cat_5_3_2.rl"
@@ -233,25 +211,23 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 237 "gen/ragel/30__rep_cat_5_3_2.c"
+#line 215 "gen/ragel/30__rep_cat_5_3_2.c"
 		
 		goto _st9;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( ( (*( p))) == 97 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr13;
@@ -260,25 +236,19 @@ static void lex(Input *in, Output *out)
 				goto _ctr14;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 11 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out11: cs = 11; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/31__rep_cat_13_11_7.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/31__rep_cat_13_11_7.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 32:
 			goto st_case_32;
@@ -107,7 +105,6 @@ static void lex(Input *in, Output *out)
 			case 31:
 			goto st_case_31;
 		}
-		goto st_out;
 		_ctr34:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/31__rep_cat_13_11_7.rl"
@@ -117,13 +114,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 121 "gen/ragel/31__rep_cat_13_11_7.c"
+#line 118 "gen/ragel/31__rep_cat_13_11_7.c"
 		
 		{
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/31__rep_cat_13_11_7.rl"
 			outc(out, '\n'); }
 		
-#line 127 "gen/ragel/31__rep_cat_13_11_7.c"
+#line 124 "gen/ragel/31__rep_cat_13_11_7.c"
 		
 		goto _st32;
 		_ctr37:
@@ -131,14 +128,14 @@ static void lex(Input *in, Output *out)
 #line 25 "../../../benchmarks/submatch_dfa_aot/src/ragel/31__rep_cat_13_11_7.rl"
 			outc(out, '\n'); }
 		
-#line 135 "gen/ragel/31__rep_cat_13_11_7.c"
+#line 132 "gen/ragel/31__rep_cat_13_11_7.c"
 		
 		goto _st32;
 		_st32:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof32;
 		st_case_32:
+		if ( p == pe )
+			goto _out32;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr37;
@@ -147,13 +144,10 @@ static void lex(Input *in, Output *out)
 				goto _st1;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr35:
 		{
 #line 19 "../../../benchmarks/submatch_dfa_aot/src/ragel/31__rep_cat_13_11_7.rl"
@@ -163,152 +157,126 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 167 "gen/ragel/31__rep_cat_13_11_7.c"
+#line 161 "gen/ragel/31__rep_cat_13_11_7.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 97 ) {
 			goto _st6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 97 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 97 ) {
 			goto _st8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		if ( ( (*( p))) == 97 ) {
 			goto _st9;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( ( (*( p))) == 97 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 97 ) {
 			goto _st11;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		if ( ( (*( p))) == 97 ) {
 			goto _st12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( ( (*( p))) == 97 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr14;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr14:
 		{
 #line 9 "../../../benchmarks/submatch_dfa_aot/src/ragel/31__rep_cat_13_11_7.rl"
@@ -318,130 +286,108 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 322 "gen/ragel/31__rep_cat_13_11_7.c"
+#line 290 "gen/ragel/31__rep_cat_13_11_7.c"
 		
 		goto _st14;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		if ( ( (*( p))) == 97 ) {
 			goto _st15;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st15:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
 		st_case_15:
+		if ( p == pe )
+			goto _out15;
 		if ( ( (*( p))) == 97 ) {
 			goto _st16;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		if ( ( (*( p))) == 97 ) {
 			goto _st17;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st17:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof17;
 		st_case_17:
+		if ( p == pe )
+			goto _out17;
 		if ( ( (*( p))) == 97 ) {
 			goto _st18;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st18:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof18;
 		st_case_18:
+		if ( p == pe )
+			goto _out18;
 		if ( ( (*( p))) == 97 ) {
 			goto _st19;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st19:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof19;
 		st_case_19:
+		if ( p == pe )
+			goto _out19;
 		if ( ( (*( p))) == 97 ) {
 			goto _st20;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st20:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof20;
 		st_case_20:
+		if ( p == pe )
+			goto _out20;
 		if ( ( (*( p))) == 97 ) {
 			goto _st21;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st21:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof21;
 		st_case_21:
+		if ( p == pe )
+			goto _out21;
 		if ( ( (*( p))) == 97 ) {
 			goto _st22;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st22:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof22;
 		st_case_22:
+		if ( p == pe )
+			goto _out22;
 		if ( ( (*( p))) == 97 ) {
 			goto _st23;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st23:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof23;
 		st_case_23:
+		if ( p == pe )
+			goto _out23;
 		if ( ( (*( p))) == 97 ) {
 			goto _st24;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st24:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof24;
 		st_case_24:
+		if ( p == pe )
+			goto _out24;
 		if ( ( (*( p))) == 97 ) {
 			goto _ctr26;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_ctr26:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/31__rep_cat_13_11_7.rl"
@@ -451,80 +397,68 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 455 "gen/ragel/31__rep_cat_13_11_7.c"
+#line 401 "gen/ragel/31__rep_cat_13_11_7.c"
 		
 		goto _st25;
 		_st25:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof25;
 		st_case_25:
+		if ( p == pe )
+			goto _out25;
 		if ( ( (*( p))) == 97 ) {
 			goto _st26;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st26:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof26;
 		st_case_26:
+		if ( p == pe )
+			goto _out26;
 		if ( ( (*( p))) == 97 ) {
 			goto _st27;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st27:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof27;
 		st_case_27:
+		if ( p == pe )
+			goto _out27;
 		if ( ( (*( p))) == 97 ) {
 			goto _st28;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st28:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof28;
 		st_case_28:
+		if ( p == pe )
+			goto _out28;
 		if ( ( (*( p))) == 97 ) {
 			goto _st29;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st29:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof29;
 		st_case_29:
+		if ( p == pe )
+			goto _out29;
 		if ( ( (*( p))) == 97 ) {
 			goto _st30;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st30:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof30;
 		st_case_30:
+		if ( p == pe )
+			goto _out30;
 		if ( ( (*( p))) == 97 ) {
 			goto _st31;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st31:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof31;
 		st_case_31:
+		if ( p == pe )
+			goto _out31;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr34;
@@ -533,46 +467,40 @@ static void lex(Input *in, Output *out)
 				goto _ctr35;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof32: cs = 32; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof17: cs = 17; goto _test_eof; 
-		_test_eof18: cs = 18; goto _test_eof; 
-		_test_eof19: cs = 19; goto _test_eof; 
-		_test_eof20: cs = 20; goto _test_eof; 
-		_test_eof21: cs = 21; goto _test_eof; 
-		_test_eof22: cs = 22; goto _test_eof; 
-		_test_eof23: cs = 23; goto _test_eof; 
-		_test_eof24: cs = 24; goto _test_eof; 
-		_test_eof25: cs = 25; goto _test_eof; 
-		_test_eof26: cs = 26; goto _test_eof; 
-		_test_eof27: cs = 27; goto _test_eof; 
-		_test_eof28: cs = 28; goto _test_eof; 
-		_test_eof29: cs = 29; goto _test_eof; 
-		_test_eof30: cs = 30; goto _test_eof; 
-		_test_eof31: cs = 31; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 32 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out32: cs = 32; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
+		_out16: cs = 16; goto _out; 
+		_out17: cs = 17; goto _out; 
+		_out18: cs = 18; goto _out; 
+		_out19: cs = 19; goto _out; 
+		_out20: cs = 20; goto _out; 
+		_out21: cs = 21; goto _out; 
+		_out22: cs = 22; goto _out; 
+		_out23: cs = 23; goto _out; 
+		_out24: cs = 24; goto _out; 
+		_out25: cs = 25; goto _out; 
+		_out26: cs = 26; goto _out; 
+		_out27: cs = 27; goto _out; 
+		_out28: cs = 28; goto _out; 
+		_out29: cs = 29; goto _out; 
+		_out30: cs = 30; goto _out; 
+		_out31: cs = 31; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/33__rep_alt_5_3_2.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/33__rep_alt_5_3_2.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 6:
 			goto st_case_6;
@@ -55,7 +53,6 @@ static void lex(Input *in, Output *out)
 			case 5:
 			goto st_case_5;
 		}
-		goto st_out;
 		_ctr3:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/33__rep_alt_5_3_2.rl"
@@ -65,13 +62,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 69 "gen/ragel/33__rep_alt_5_3_2.c"
+#line 66 "gen/ragel/33__rep_alt_5_3_2.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/33__rep_alt_5_3_2.rl"
 			outc(out, '\n'); }
 		
-#line 75 "gen/ragel/33__rep_alt_5_3_2.c"
+#line 72 "gen/ragel/33__rep_alt_5_3_2.c"
 		
 		goto _st6;
 		_ctr9:
@@ -79,20 +76,20 @@ static void lex(Input *in, Output *out)
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/33__rep_alt_5_3_2.rl"
 			s = p; }
 		
-#line 83 "gen/ragel/33__rep_alt_5_3_2.c"
+#line 80 "gen/ragel/33__rep_alt_5_3_2.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/33__rep_alt_5_3_2.rl"
 			outc(out, '\n'); }
 		
-#line 89 "gen/ragel/33__rep_alt_5_3_2.c"
+#line 86 "gen/ragel/33__rep_alt_5_3_2.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr9;
@@ -101,13 +98,10 @@ static void lex(Input *in, Output *out)
 				goto _ctr10;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr7:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/33__rep_alt_5_3_2.rl"
@@ -117,7 +111,7 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 121 "gen/ragel/33__rep_alt_5_3_2.c"
+#line 115 "gen/ragel/33__rep_alt_5_3_2.c"
 		
 		goto _st1;
 		_ctr10:
@@ -125,25 +119,23 @@ static void lex(Input *in, Output *out)
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/33__rep_alt_5_3_2.rl"
 			s = p; }
 		
-#line 129 "gen/ragel/33__rep_alt_5_3_2.c"
+#line 123 "gen/ragel/33__rep_alt_5_3_2.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr3;
@@ -152,14 +144,12 @@ static void lex(Input *in, Output *out)
 				goto _st3;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr3;
@@ -168,25 +158,21 @@ static void lex(Input *in, Output *out)
 				goto _st4;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr3;
@@ -195,20 +181,14 @@ static void lex(Input *in, Output *out)
 				goto _ctr7;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 6 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out6: cs = 6; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/34__rep_alt_13_11_7.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/34__rep_alt_13_11_7.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 14:
 			goto st_case_14;
@@ -71,7 +69,6 @@ static void lex(Input *in, Output *out)
 			case 13:
 			goto st_case_13;
 		}
-		goto st_out;
 		_ctr8:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/34__rep_alt_13_11_7.rl"
@@ -81,13 +78,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 85 "gen/ragel/34__rep_alt_13_11_7.c"
+#line 82 "gen/ragel/34__rep_alt_13_11_7.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/34__rep_alt_13_11_7.rl"
 			outc(out, '\n'); }
 		
-#line 91 "gen/ragel/34__rep_alt_13_11_7.c"
+#line 88 "gen/ragel/34__rep_alt_13_11_7.c"
 		
 		goto _st14;
 		_ctr17:
@@ -95,20 +92,20 @@ static void lex(Input *in, Output *out)
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/34__rep_alt_13_11_7.rl"
 			s = p; }
 		
-#line 99 "gen/ragel/34__rep_alt_13_11_7.c"
+#line 96 "gen/ragel/34__rep_alt_13_11_7.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/34__rep_alt_13_11_7.rl"
 			outc(out, '\n'); }
 		
-#line 105 "gen/ragel/34__rep_alt_13_11_7.c"
+#line 102 "gen/ragel/34__rep_alt_13_11_7.c"
 		
 		goto _st14;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr17;
@@ -117,13 +114,10 @@ static void lex(Input *in, Output *out)
 				goto _ctr18;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr15:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/34__rep_alt_13_11_7.rl"
@@ -133,7 +127,7 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 137 "gen/ragel/34__rep_alt_13_11_7.c"
+#line 131 "gen/ragel/34__rep_alt_13_11_7.c"
 		
 		goto _st1;
 		_ctr18:
@@ -141,80 +135,68 @@ static void lex(Input *in, Output *out)
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/34__rep_alt_13_11_7.rl"
 			s = p; }
 		
-#line 145 "gen/ragel/34__rep_alt_13_11_7.c"
+#line 139 "gen/ragel/34__rep_alt_13_11_7.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 97 ) {
 			goto _st6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 97 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr8;
@@ -223,47 +205,39 @@ static void lex(Input *in, Output *out)
 				goto _st8;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		if ( ( (*( p))) == 97 ) {
 			goto _st9;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( ( (*( p))) == 97 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 97 ) {
 			goto _st11;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr8;
@@ -272,25 +246,21 @@ static void lex(Input *in, Output *out)
 				goto _st12;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( ( (*( p))) == 97 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr8;
@@ -299,28 +269,22 @@ static void lex(Input *in, Output *out)
 				goto _ctr15;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 14 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out14: cs = 14; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/35__rep_alt_23_19_17.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/35__rep_alt_23_19_17.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 24:
 			goto st_case_24;
@@ -91,7 +89,6 @@ static void lex(Input *in, Output *out)
 			case 23:
 			goto st_case_23;
 		}
-		goto st_out;
 		_ctr18:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/35__rep_alt_23_19_17.rl"
@@ -101,13 +98,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 105 "gen/ragel/35__rep_alt_23_19_17.c"
+#line 102 "gen/ragel/35__rep_alt_23_19_17.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/35__rep_alt_23_19_17.rl"
 			outc(out, '\n'); }
 		
-#line 111 "gen/ragel/35__rep_alt_23_19_17.c"
+#line 108 "gen/ragel/35__rep_alt_23_19_17.c"
 		
 		goto _st24;
 		_ctr27:
@@ -115,20 +112,20 @@ static void lex(Input *in, Output *out)
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/35__rep_alt_23_19_17.rl"
 			s = p; }
 		
-#line 119 "gen/ragel/35__rep_alt_23_19_17.c"
+#line 116 "gen/ragel/35__rep_alt_23_19_17.c"
 		
 		{
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/35__rep_alt_23_19_17.rl"
 			outc(out, '\n'); }
 		
-#line 125 "gen/ragel/35__rep_alt_23_19_17.c"
+#line 122 "gen/ragel/35__rep_alt_23_19_17.c"
 		
 		goto _st24;
 		_st24:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof24;
 		st_case_24:
+		if ( p == pe )
+			goto _out24;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr27;
@@ -137,13 +134,10 @@ static void lex(Input *in, Output *out)
 				goto _ctr28;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr25:
 		{
 #line 13 "../../../benchmarks/submatch_dfa_aot/src/ragel/35__rep_alt_23_19_17.rl"
@@ -153,7 +147,7 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 157 "gen/ragel/35__rep_alt_23_19_17.c"
+#line 151 "gen/ragel/35__rep_alt_23_19_17.c"
 		
 		goto _st1;
 		_ctr28:
@@ -161,190 +155,158 @@ static void lex(Input *in, Output *out)
 #line 17 "../../../benchmarks/submatch_dfa_aot/src/ragel/35__rep_alt_23_19_17.rl"
 			s = p; }
 		
-#line 165 "gen/ragel/35__rep_alt_23_19_17.c"
+#line 159 "gen/ragel/35__rep_alt_23_19_17.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 97 ) {
 			goto _st6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 97 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 97 ) {
 			goto _st8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		if ( ( (*( p))) == 97 ) {
 			goto _st9;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( ( (*( p))) == 97 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 97 ) {
 			goto _st11;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		if ( ( (*( p))) == 97 ) {
 			goto _st12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( ( (*( p))) == 97 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		if ( ( (*( p))) == 97 ) {
 			goto _st14;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		if ( ( (*( p))) == 97 ) {
 			goto _st15;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st15:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
 		st_case_15:
+		if ( p == pe )
+			goto _out15;
 		if ( ( (*( p))) == 97 ) {
 			goto _st16;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		if ( ( (*( p))) == 97 ) {
 			goto _st17;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st17:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof17;
 		st_case_17:
+		if ( p == pe )
+			goto _out17;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr18;
@@ -353,25 +315,21 @@ static void lex(Input *in, Output *out)
 				goto _st18;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st18:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof18;
 		st_case_18:
+		if ( p == pe )
+			goto _out18;
 		if ( ( (*( p))) == 97 ) {
 			goto _st19;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st19:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof19;
 		st_case_19:
+		if ( p == pe )
+			goto _out19;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr18;
@@ -380,47 +338,39 @@ static void lex(Input *in, Output *out)
 				goto _st20;
 			}
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st20:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof20;
 		st_case_20:
+		if ( p == pe )
+			goto _out20;
 		if ( ( (*( p))) == 97 ) {
 			goto _st21;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st21:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof21;
 		st_case_21:
+		if ( p == pe )
+			goto _out21;
 		if ( ( (*( p))) == 97 ) {
 			goto _st22;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st22:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof22;
 		st_case_22:
+		if ( p == pe )
+			goto _out22;
 		if ( ( (*( p))) == 97 ) {
 			goto _st23;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st23:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof23;
 		st_case_23:
+		if ( p == pe )
+			goto _out23;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr18;
@@ -429,38 +379,32 @@ static void lex(Input *in, Output *out)
 				goto _ctr25;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof24: cs = 24; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof17: cs = 17; goto _test_eof; 
-		_test_eof18: cs = 18; goto _test_eof; 
-		_test_eof19: cs = 19; goto _test_eof; 
-		_test_eof20: cs = 20; goto _test_eof; 
-		_test_eof21: cs = 21; goto _test_eof; 
-		_test_eof22: cs = 22; goto _test_eof; 
-		_test_eof23: cs = 23; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 24 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out24: cs = 24; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
+		_out16: cs = 16; goto _out; 
+		_out17: cs = 17; goto _out; 
+		_out18: cs = 18; goto _out; 
+		_out19: cs = 19; goto _out; 
+		_out20: cs = 20; goto _out; 
+		_out21: cs = 21; goto _out; 
+		_out22: cs = 22; goto _out; 
+		_out23: cs = 23; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/36__rep_5_rep_3_rep_2.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/36__rep_5_rep_3_rep_2.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 6:
 			goto st_case_6;
@@ -55,7 +53,6 @@ static void lex(Input *in, Output *out)
 			case 5:
 			goto st_case_5;
 		}
-		goto st_out;
 		_ctr6:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/36__rep_5_rep_3_rep_2.rl"
@@ -65,13 +62,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 69 "gen/ragel/36__rep_5_rep_3_rep_2.c"
+#line 66 "gen/ragel/36__rep_5_rep_3_rep_2.c"
 		
 		{
 #line 31 "../../../benchmarks/submatch_dfa_aot/src/ragel/36__rep_5_rep_3_rep_2.rl"
 			outc(out, '\n'); }
 		
-#line 75 "gen/ragel/36__rep_5_rep_3_rep_2.c"
+#line 72 "gen/ragel/36__rep_5_rep_3_rep_2.c"
 		
 		goto _st6;
 		_ctr9:
@@ -79,20 +76,20 @@ static void lex(Input *in, Output *out)
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/36__rep_5_rep_3_rep_2.rl"
 			s = p; }
 		
-#line 83 "gen/ragel/36__rep_5_rep_3_rep_2.c"
+#line 80 "gen/ragel/36__rep_5_rep_3_rep_2.c"
 		
 		{
 #line 31 "../../../benchmarks/submatch_dfa_aot/src/ragel/36__rep_5_rep_3_rep_2.rl"
 			outc(out, '\n'); }
 		
-#line 89 "gen/ragel/36__rep_5_rep_3_rep_2.c"
+#line 86 "gen/ragel/36__rep_5_rep_3_rep_2.c"
 		
 		goto _st6;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr9;
@@ -101,13 +98,10 @@ static void lex(Input *in, Output *out)
 				goto _ctr10;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr7:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/36__rep_5_rep_3_rep_2.rl"
@@ -117,7 +111,7 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 121 "gen/ragel/36__rep_5_rep_3_rep_2.c"
+#line 115 "gen/ragel/36__rep_5_rep_3_rep_2.c"
 		
 		goto _st1;
 		_ctr10:
@@ -125,58 +119,50 @@ static void lex(Input *in, Output *out)
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/36__rep_5_rep_3_rep_2.rl"
 			s = p; }
 		
-#line 129 "gen/ragel/36__rep_5_rep_3_rep_2.c"
+#line 123 "gen/ragel/36__rep_5_rep_3_rep_2.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr6;
@@ -185,20 +171,14 @@ static void lex(Input *in, Output *out)
 				goto _ctr7;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 6 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out6: cs = 6; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/37__rep_13_rep_11_rep_7.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/37__rep_13_rep_11_rep_7.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 14:
 			goto st_case_14;
@@ -71,7 +69,6 @@ static void lex(Input *in, Output *out)
 			case 13:
 			goto st_case_13;
 		}
-		goto st_out;
 		_ctr14:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/37__rep_13_rep_11_rep_7.rl"
@@ -81,13 +78,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 85 "gen/ragel/37__rep_13_rep_11_rep_7.c"
+#line 82 "gen/ragel/37__rep_13_rep_11_rep_7.c"
 		
 		{
 #line 31 "../../../benchmarks/submatch_dfa_aot/src/ragel/37__rep_13_rep_11_rep_7.rl"
 			outc(out, '\n'); }
 		
-#line 91 "gen/ragel/37__rep_13_rep_11_rep_7.c"
+#line 88 "gen/ragel/37__rep_13_rep_11_rep_7.c"
 		
 		goto _st14;
 		_ctr17:
@@ -95,20 +92,20 @@ static void lex(Input *in, Output *out)
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/37__rep_13_rep_11_rep_7.rl"
 			s = p; }
 		
-#line 99 "gen/ragel/37__rep_13_rep_11_rep_7.c"
+#line 96 "gen/ragel/37__rep_13_rep_11_rep_7.c"
 		
 		{
 #line 31 "../../../benchmarks/submatch_dfa_aot/src/ragel/37__rep_13_rep_11_rep_7.rl"
 			outc(out, '\n'); }
 		
-#line 105 "gen/ragel/37__rep_13_rep_11_rep_7.c"
+#line 102 "gen/ragel/37__rep_13_rep_11_rep_7.c"
 		
 		goto _st14;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr17;
@@ -117,13 +114,10 @@ static void lex(Input *in, Output *out)
 				goto _ctr18;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr15:
 		{
 #line 14 "../../../benchmarks/submatch_dfa_aot/src/ragel/37__rep_13_rep_11_rep_7.rl"
@@ -133,7 +127,7 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 137 "gen/ragel/37__rep_13_rep_11_rep_7.c"
+#line 131 "gen/ragel/37__rep_13_rep_11_rep_7.c"
 		
 		goto _st1;
 		_ctr18:
@@ -141,146 +135,122 @@ static void lex(Input *in, Output *out)
 #line 18 "../../../benchmarks/submatch_dfa_aot/src/ragel/37__rep_13_rep_11_rep_7.rl"
 			s = p; }
 		
-#line 145 "gen/ragel/37__rep_13_rep_11_rep_7.c"
+#line 139 "gen/ragel/37__rep_13_rep_11_rep_7.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 97 ) {
 			goto _st6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 97 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 97 ) {
 			goto _st8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		if ( ( (*( p))) == 97 ) {
 			goto _st9;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( ( (*( p))) == 97 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 97 ) {
 			goto _st11;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		if ( ( (*( p))) == 97 ) {
 			goto _st12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( ( (*( p))) == 97 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr14;
@@ -289,28 +259,22 @@ static void lex(Input *in, Output *out)
 				goto _ctr15;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 14 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out14: cs = 14; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/ragel/38__rep_23_rep_19_rep_17.c

@@ -37,8 +37,6 @@ static void lex(Input *in, Output *out)
 	
 #line 39 "gen/ragel/38__rep_23_rep_19_rep_17.c"
 	{
-		if ( p == pe )
-			goto _test_eof;
 		switch ( cs ) {
 			case 24:
 			goto st_case_24;
@@ -91,7 +89,6 @@ static void lex(Input *in, Output *out)
 			case 23:
 			goto st_case_23;
 		}
-		goto st_out;
 		_ctr24:
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/38__rep_23_rep_19_rep_17.rl"
@@ -101,13 +98,13 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 105 "gen/ragel/38__rep_23_rep_19_rep_17.c"
+#line 102 "gen/ragel/38__rep_23_rep_19_rep_17.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/38__rep_23_rep_19_rep_17.rl"
 			outc(out, '\n'); }
 		
-#line 111 "gen/ragel/38__rep_23_rep_19_rep_17.c"
+#line 108 "gen/ragel/38__rep_23_rep_19_rep_17.c"
 		
 		goto _st24;
 		_ctr27:
@@ -115,20 +112,20 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/38__rep_23_rep_19_rep_17.rl"
 			s = p; }
 		
-#line 119 "gen/ragel/38__rep_23_rep_19_rep_17.c"
+#line 116 "gen/ragel/38__rep_23_rep_19_rep_17.c"
 		
 		{
 #line 33 "../../../benchmarks/submatch_dfa_aot/src/ragel/38__rep_23_rep_19_rep_17.rl"
 			outc(out, '\n'); }
 		
-#line 125 "gen/ragel/38__rep_23_rep_19_rep_17.c"
+#line 122 "gen/ragel/38__rep_23_rep_19_rep_17.c"
 		
 		goto _st24;
 		_st24:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof24;
 		st_case_24:
+		if ( p == pe )
+			goto _out24;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr27;
@@ -137,13 +134,10 @@ static void lex(Input *in, Output *out)
 				goto _ctr28;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_case_0:
+		goto _st0;
 		_st0:
-		cs = 0;
-		goto _pop;
+		st_case_0:
+		goto _out0;
 		_ctr25:
 		{
 #line 16 "../../../benchmarks/submatch_dfa_aot/src/ragel/38__rep_23_rep_19_rep_17.rl"
@@ -153,7 +147,7 @@ static void lex(Input *in, Output *out)
 			s = p;
 		}
 		
-#line 157 "gen/ragel/38__rep_23_rep_19_rep_17.c"
+#line 151 "gen/ragel/38__rep_23_rep_19_rep_17.c"
 		
 		goto _st1;
 		_ctr28:
@@ -161,256 +155,212 @@ static void lex(Input *in, Output *out)
 #line 20 "../../../benchmarks/submatch_dfa_aot/src/ragel/38__rep_23_rep_19_rep_17.rl"
 			s = p; }
 		
-#line 165 "gen/ragel/38__rep_23_rep_19_rep_17.c"
+#line 159 "gen/ragel/38__rep_23_rep_19_rep_17.c"
 		
 		goto _st1;
 		_st1:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof1;
 		st_case_1:
+		if ( p == pe )
+			goto _out1;
 		if ( ( (*( p))) == 97 ) {
 			goto _st2;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st2:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof2;
 		st_case_2:
+		if ( p == pe )
+			goto _out2;
 		if ( ( (*( p))) == 97 ) {
 			goto _st3;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st3:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof3;
 		st_case_3:
+		if ( p == pe )
+			goto _out3;
 		if ( ( (*( p))) == 97 ) {
 			goto _st4;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st4:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof4;
 		st_case_4:
+		if ( p == pe )
+			goto _out4;
 		if ( ( (*( p))) == 97 ) {
 			goto _st5;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st5:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof5;
 		st_case_5:
+		if ( p == pe )
+			goto _out5;
 		if ( ( (*( p))) == 97 ) {
 			goto _st6;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st6:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof6;
 		st_case_6:
+		if ( p == pe )
+			goto _out6;
 		if ( ( (*( p))) == 97 ) {
 			goto _st7;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st7:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof7;
 		st_case_7:
+		if ( p == pe )
+			goto _out7;
 		if ( ( (*( p))) == 97 ) {
 			goto _st8;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st8:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof8;
 		st_case_8:
+		if ( p == pe )
+			goto _out8;
 		if ( ( (*( p))) == 97 ) {
 			goto _st9;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st9:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof9;
 		st_case_9:
+		if ( p == pe )
+			goto _out9;
 		if ( ( (*( p))) == 97 ) {
 			goto _st10;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st10:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof10;
 		st_case_10:
+		if ( p == pe )
+			goto _out10;
 		if ( ( (*( p))) == 97 ) {
 			goto _st11;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st11:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof11;
 		st_case_11:
+		if ( p == pe )
+			goto _out11;
 		if ( ( (*( p))) == 97 ) {
 			goto _st12;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st12:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof12;
 		st_case_12:
+		if ( p == pe )
+			goto _out12;
 		if ( ( (*( p))) == 97 ) {
 			goto _st13;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st13:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof13;
 		st_case_13:
+		if ( p == pe )
+			goto _out13;
 		if ( ( (*( p))) == 97 ) {
 			goto _st14;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st14:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof14;
 		st_case_14:
+		if ( p == pe )
+			goto _out14;
 		if ( ( (*( p))) == 97 ) {
 			goto _st15;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st15:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof15;
 		st_case_15:
+		if ( p == pe )
+			goto _out15;
 		if ( ( (*( p))) == 97 ) {
 			goto _st16;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st16:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof16;
 		st_case_16:
+		if ( p == pe )
+			goto _out16;
 		if ( ( (*( p))) == 97 ) {
 			goto _st17;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st17:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof17;
 		st_case_17:
+		if ( p == pe )
+			goto _out17;
 		if ( ( (*( p))) == 97 ) {
 			goto _st18;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st18:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof18;
 		st_case_18:
+		if ( p == pe )
+			goto _out18;
 		if ( ( (*( p))) == 97 ) {
 			goto _st19;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st19:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof19;
 		st_case_19:
+		if ( p == pe )
+			goto _out19;
 		if ( ( (*( p))) == 97 ) {
 			goto _st20;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st20:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof20;
 		st_case_20:
+		if ( p == pe )
+			goto _out20;
 		if ( ( (*( p))) == 97 ) {
 			goto _st21;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st21:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof21;
 		st_case_21:
+		if ( p == pe )
+			goto _out21;
 		if ( ( (*( p))) == 97 ) {
 			goto _st22;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st22:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof22;
 		st_case_22:
+		if ( p == pe )
+			goto _out22;
 		if ( ( (*( p))) == 97 ) {
 			goto _st23;
 		}
-		{
-			goto _st0;
-		}
+		goto _st0;
 		_st23:
 		p+= 1;
-		if ( p == pe )
-			goto _test_eof23;
 		st_case_23:
+		if ( p == pe )
+			goto _out23;
 		switch( ( (*( p))) ) {
 			case 10: {
 				goto _ctr24;
@@ -419,38 +369,32 @@ static void lex(Input *in, Output *out)
 				goto _ctr25;
 			}
 		}
-		{
-			goto _st0;
-		}
-		st_out:
-		_test_eof24: cs = 24; goto _test_eof; 
-		_test_eof1: cs = 1; goto _test_eof; 
-		_test_eof2: cs = 2; goto _test_eof; 
-		_test_eof3: cs = 3; goto _test_eof; 
-		_test_eof4: cs = 4; goto _test_eof; 
-		_test_eof5: cs = 5; goto _test_eof; 
-		_test_eof6: cs = 6; goto _test_eof; 
-		_test_eof7: cs = 7; goto _test_eof; 
-		_test_eof8: cs = 8; goto _test_eof; 
-		_test_eof9: cs = 9; goto _test_eof; 
-		_test_eof10: cs = 10; goto _test_eof; 
-		_test_eof11: cs = 11; goto _test_eof; 
-		_test_eof12: cs = 12; goto _test_eof; 
-		_test_eof13: cs = 13; goto _test_eof; 
-		_test_eof14: cs = 14; goto _test_eof; 
-		_test_eof15: cs = 15; goto _test_eof; 
-		_test_eof16: cs = 16; goto _test_eof; 
-		_test_eof17: cs = 17; goto _test_eof; 
-		_test_eof18: cs = 18; goto _test_eof; 
-		_test_eof19: cs = 19; goto _test_eof; 
-		_test_eof20: cs = 20; goto _test_eof; 
-		_test_eof21: cs = 21; goto _test_eof; 
-		_test_eof22: cs = 22; goto _test_eof; 
-		_test_eof23: cs = 23; goto _test_eof; 
-		
-		_test_eof: {}
-		if ( cs >= 24 )
-			goto _out; _pop: {}
+		goto _st0;
+		_out24: cs = 24; goto _out; 
+		_out0: cs = 0; goto _out; 
+		_out1: cs = 1; goto _out; 
+		_out2: cs = 2; goto _out; 
+		_out3: cs = 3; goto _out; 
+		_out4: cs = 4; goto _out; 
+		_out5: cs = 5; goto _out; 
+		_out6: cs = 6; goto _out; 
+		_out7: cs = 7; goto _out; 
+		_out8: cs = 8; goto _out; 
+		_out9: cs = 9; goto _out; 
+		_out10: cs = 10; goto _out; 
+		_out11: cs = 11; goto _out; 
+		_out12: cs = 12; goto _out; 
+		_out13: cs = 13; goto _out; 
+		_out14: cs = 14; goto _out; 
+		_out15: cs = 15; goto _out; 
+		_out16: cs = 16; goto _out; 
+		_out17: cs = 17; goto _out; 
+		_out18: cs = 18; goto _out; 
+		_out19: cs = 19; goto _out; 
+		_out20: cs = 20; goto _out; 
+		_out21: cs = 21; goto _out; 
+		_out22: cs = 22; goto _out; 
+		_out23: cs = 23; goto _out; 
 		_out: {}
 	}
 	

benchmarks/submatch_dfa_aot/pregen/re2c/00__http_rfc7230-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/00__http_rfc7230.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/00__http_rfc7230-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/00__http_rfc7230.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/00__http_rfc7230-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/00__http_rfc7230.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/00__http_rfc7230-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/00__http_rfc7230.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/00__http_rfc7230-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/00__http_rfc7230.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/00__http_rfc7230-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/00__http_rfc7230.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/01__http_simple-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/01__http_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/01__http_simple-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/01__http_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/01__http_simple-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/01__http_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/01__http_simple-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/01__http_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/01__http_simple-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/01__http_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/01__http_simple-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/01__http_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/02__uri_rfc3986-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/02__uri_rfc3986.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/02__uri_rfc3986-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/02__uri_rfc3986.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/02__uri_rfc3986-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/02__uri_rfc3986.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/02__uri_rfc3986-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/02__uri_rfc3986.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/02__uri_rfc3986-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/02__uri_rfc3986.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/02__uri_rfc3986-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/02__uri_rfc3986.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/03__uri_simple-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/03__uri_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/03__uri_simple-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/03__uri_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/03__uri_simple-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/03__uri_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/03__uri_simple-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/03__uri_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/03__uri_simple-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/03__uri_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/03__uri_simple-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/03__uri_simple.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/04__apache_log-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/04__apache_log.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/04__apache_log-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/04__apache_log.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/04__apache_log-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/04__apache_log.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/04__apache_log-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/04__apache_log.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/04__apache_log-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/04__apache_log.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/04__apache_log-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/04__apache_log.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/05__datetime-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/05__datetime.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/05__datetime-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/05__datetime.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/05__datetime-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/05__datetime.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/05__datetime-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/05__datetime.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/05__datetime-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/05__datetime.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/05__datetime-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/05__datetime.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/06__email-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/06__email.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/06__email-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/06__email.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/06__email-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/06__email.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/06__email-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/06__email.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/06__email-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/06__email.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/06__email-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/06__email.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/07__ipv4-eof-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/07__ipv4.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/07__ipv4-eof-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/07__ipv4.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/07__ipv4-eof-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/07__ipv4.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/07__ipv4-stadfa.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/07__ipv4.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/07__ipv4-tdfa0.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/07__ipv4.re"
 #include <assert.h>
 #include <stdlib.h>

benchmarks/submatch_dfa_aot/pregen/re2c/07__ipv4-tdfa1.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 */
+/* Generated by re2c */
 #line 1 "../../../benchmarks/submatch_dfa_aot/src/re2c/07__ipv4.re"
 #include <assert.h>
 #include <stdlib.h>