wip

generates a parser specs passing
2023-08-20 21:22:34 -04:00 · 2023-08-20 21:19:34 -04:00 · 2023-08-20 20:49:24 -04:00 · 2023-08-20 18:43:33 -04:00 · 2023-08-20 17:25:48 -04:00 · 2023-08-20 16:58:02 -04:00
43 changed files with 274 additions and 2514 deletions
@@ -1,31 +1,3 @@
-## v1.3.0
-
-### New Features
-
- Add AST generation (#22)
-
-## v1.2.0
-
-### New Features
-
- Allow one line user code blocks (#21)
- Add backslash escape codes (#19)
- Add API to access unexpected token found (#18)
- Add token_names API (#17)
- Add D example to user guide for p_context_init() (#16)
- Allow user termination from lexer code blocks (#15)
-
-### Fixes
-
- Fix generator hang when state transition cycle is present (#20)
-
-## v1.1.0
-
-### New Features
-
- Add user parser terminations (#13)
- Document generated parser API in user guide (#14)
-
 ## v1.0.0

 - Initial release
@@ -5,4 +5,3 @@ gem "rspec"
 gem "rdoc"
 gem "redcarpet"
 gem "syntax"
-gem "simplecov"
@@ -2,7 +2,6 @@ GEM
  remote: https://rubygems.org/
  specs:
    diff-lcs (1.5.0)
-    docile (1.4.0)
    psych (5.1.0)
      stringio
    rake (13.0.6)
@@ -22,12 +21,6 @@ GEM
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.12.0)
    rspec-support (3.12.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
    stringio (3.0.7)
    syntax (1.2.2)

@@ -39,7 +32,6 @@ DEPENDENCIES
  rdoc
  redcarpet
  rspec
-  simplecov
  syntax

 BUNDLED WITH
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2010-2024 Josh Holtrop
+Copyright (c) 2010-2023 Josh Holtrop

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,99 +1,21 @@
 # The Propane Parser Generator

-Propane is a LALR Parser Generator (LPG) which:
+Propane is an LR Parser Generator (LPG) which:

  * accepts LR(0), SLR, and LALR grammars
  * generates a built-in lexer to tokenize input
  * supports UTF-8 lexer inputs
-  * generates a table-driven shift/reduce parser to parse input in linear time
-  * targets C or D language outputs
-  * optionally supports automatic full AST generation
+  * generates a table-driven parser to parse input in linear time
  * is MIT-licensed
  * is distributable as a standalone Ruby script

 ## Installation

-Propane is designed to be distributed as a stand-alone single file script that
-can be copied into and versioned in a project's source tree.
-The only requirement to run Propane is that the system has a Ruby interpreter
-installed.
-The latest release can be downloaded from [https://github.com/holtrop/propane/releases](https://github.com/holtrop/propane/releases).
-
-Simply copy the `propane` executable script into the desired location within
-the project to be built (typically the root of the repository) and mark it
-executable.
+TODO

 ## Usage

-### Command Line Interface
-
-Propane is typically invoked from the command-line as `./propane`.
-
-    Usage: ./propane [options] <input-file> <output-file>
-    Options:
-      --log LOG   Write log file
-      --version   Show program version and exit
-      -h, --help  Show this usage and exit
-
-The user must specify the path to a Propane input grammar file and a path to an
-output file.
-The generated source code will be written to the output file.
-If a log file path is specified, Propane will write a log file containing
-detailed information about the parser states and transitions.
-
-### Propane Grammar File
-
-A Propane grammar file provides Propane with the patterns, tokens, grammar
-rules, and user code blocks from which to build the generated lexer and parser.
-
-Example grammar file:
-
-```
-<<
-import std.math;
->>
-
-# Parser values are unsigned integers.
-ptype ulong;
-
-# A few basic arithmetic operators.
-token plus /\+/;
-token times /\*/;
-token power /\*\*/;
-token integer /\d+/ <<
-  ulong v;
-  foreach (c; match)
-  {
-    v *= 10;
-    v += (c - '0');
-  }
-  $$ = v;
->>
-token lparen /\(/;
-token rparen /\)/;
-# Drop whitespace.
-drop /\s+/;
-
-Start -> E1 << $$ = $1; >>
-E1 -> E2 << $$ = $1; >>
-E1 -> E1 plus E2 << $$ = $1 + $3; >>
-E2 -> E3 << $$ = $1; >>
-E2 -> E2 times E3 << $$ = $1 * $3; >>
-E3 -> E4 << $$ = $1; >>
-E3 -> E3 power E4 <<
-  $$ = pow($1, $3);
->>
-E4 -> integer << $$ = $1; >>
-E4 -> lparen E1 rparen << $$ = $2; >>
-```
-
-Grammar files can contain comment lines beginning with `#` which are ignored.
-White space in the grammar file is also ignored.
-
-It is convention to use the extension `.propane` for the Propane grammar file,
-however any file name is accepted by Propane.
-
-See [https://holtrop.github.io/propane/index.html](https://holtrop.github.io/propane/index.html) for the full User Guide.
+TODO: Write usage instructions here

 ## Development

@@ -1,8 +1,5 @@
-require "rake/clean"
 require "rspec/core/rake_task"

-CLEAN.include %w[spec/run gen .yardoc yard coverage dist]
-
 task :build_dist do
  sh "ruby rb/build_dist.rb"
 end
@@ -13,20 +10,9 @@ RSpec::Core::RakeTask.new(:spec, :example_pattern) do |task, args|
  end
 end

-# dspec task is useful to test the distributable release script, but is not
-# useful for coverage information.
-desc "Dist Specs"
-task :dspec, [:example_string] => :build_dist do |task, args|
-  ENV["dist_specs"] = "1"
-  Rake::Task["spec"].execute(args)
-  ENV.delete("dist_specs")
-end
-
 task :default => :spec

 desc "Build user guide"
 task :user_guide do
  system("ruby", "-Ilib", "rb/gen_user_guide.rb")
 end
-
-task :all => [:spec, :dspec, :user_guide]
@@ -3,22 +3,13 @@
 #include <stdlib.h>
 #include <string.h>

-/**************************************************************************
- * Public data
- *************************************************************************/
-
-/** Token names. */
-const char * <%= @grammar.prefix %>token_names[] = {
-<% @grammar.tokens.each_with_index do |token, index| %>
-    "<%= token.name %>",
-<% end %>
-};
-
 /**************************************************************************
 * User code blocks
 *************************************************************************/

-<%= @grammar.code_blocks.fetch("", "") %>
+<% @grammar.code_blocks.each do |code| %>
+<%= code %>
+<% end %>

 /**************************************************************************
 * Private types
@@ -32,7 +23,6 @@ const char * <%= @grammar.prefix %>token_names[] = {
 #define P_UNEXPECTED_TOKEN 3u
 #define P_DROP 4u
 #define P_EOF 5u
-#define P_USER_TERMINATED 6u
 <% end %>

 /* An invalid ID value. */
@@ -320,12 +310,9 @@ static lexer_state_id_t check_lexer_transition(uint32_t current_state, uint32_t
 *
 * @param context
 *   Lexer/parser context structure.
- * @param[out] out_match_info
- *   The longest match information is stored here if the return value is
- *   P_SUCCESS or P_DECODE_ERROR.
- * @param[out] out_unexpected_input_length
- *   The unexpected input length is stored here if the return value is
- *   P_UNEXPECTED_INPUT.
+ * @param[out] out_token_info
+ *   The lexed token information is stored here if the return value is
+ *   P_SUCCESS.
 *
 * @reval P_SUCCESS
 *   A token was successfully lexed.
@@ -405,6 +392,7 @@ static size_t find_longest_match(<%= @grammar.prefix %>context_t * context,
                /* Valid EOF return. */
                return P_EOF;
            }
+            break;

        case P_DECODE_ERROR:
            /* If we see a decode error, we may be partially in the middle of
@@ -436,8 +424,6 @@ static size_t find_longest_match(<%= @grammar.prefix %>context_t * context,
 *   Input text does not match any lexer pattern.
 * @retval P_DROP
 *   A drop pattern was matched so the lexer should continue.
- * @retval P_USER_TERMINATED
- *   User code has requested to terminate the lexer.
 */
 static size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%= @grammar.prefix %>token_info_t * out_token_info)
 {
@@ -457,12 +443,6 @@ static size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%= @
            uint8_t const * match = &context->input[context->input_index];
            <%= @grammar.prefix %>token_t user_code_token = lexer_user_code(context,
                match_info.accepting_state->code_id, match, match_info.length, &token_info);
-            /* A TERMINATE_TOKEN_ID return code from lexer_user_code() means
-             * that the user code is requesting to terminate the lexer. */
-            if (user_code_token == TERMINATE_TOKEN_ID)
-            {
-                return P_USER_TERMINATED;
-            }
            /* An invalid token returned from lexer_user_code() means that the
             * user code did not explicitly return a token. So only override
             * the token to return if the user code does explicitly return a
@@ -533,8 +513,6 @@ static size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%= @
 *   The decoder encountered invalid text encoding.
 * @reval P_UNEXPECTED_INPUT
 *   Input text does not match any lexer pattern.
- * @retval P_USER_TERMINATED
- *   User code has requested to terminate the lexer.
 */
 size_t <%= @grammar.prefix %>lex(<%= @grammar.prefix %>context_t * context, <%= @grammar.prefix %>token_info_t * out_token_info)
 {
@@ -611,18 +589,6 @@ typedef struct
     * reduce action.
     */
    parser_state_id_t n_states;
-<% if @grammar.ast %>
-
-    /**
-     * Map of rule components to rule set child fields.
-     */
-    uint16_t const * rule_set_node_field_index_map;
-
-    /**
-     * Number of rule set AST node fields.
-     */
-    uint16_t rule_set_node_field_array_size;
-<% end %>
 } reduce_t;

 /** Parser state entry. */
@@ -653,11 +619,6 @@ typedef struct

    /** Parser value from this state. */
    <%= @grammar.prefix %>value_t pvalue;
-
-<% if @grammar.ast %>
-    /** AST node. */
-    void * ast_node;
-<% end %>
 } state_value_t;

 /** Parser shift table. */
@@ -667,27 +628,10 @@ static const shift_t parser_shift_table[] = {
 <%   end %>
 };

-<% if @grammar.ast %>
-<%   @grammar.rules.each do |rule| %>
-<%     unless rule.flat_rule_set_node_field_index_map? %>
-const uint16_t r_<%= rule.name.gsub("$", "_") %><%= rule.id %>_node_field_index_map[<%= rule.rule_set_node_field_index_map.size %>] = {<%= rule.rule_set_node_field_index_map.map {|v| v.to_s}.join(", ") %>};
-<%     end %>
-<%   end %>
-<% end %>
-
 /** Parser reduce table. */
 static const reduce_t parser_reduce_table[] = {
 <%   @parser.reduce_table.each do |reduce| %>
-    {<%= reduce[:token_id] %>u, <%= reduce[:rule_id] %>u, <%= reduce[:rule_set_id] %>u, <%= reduce[:n_states] %>u
-<%     if @grammar.ast %>
-<%       if reduce[:rule].flat_rule_set_node_field_index_map? %>
-             , NULL
-<%       else %>
-             , &r_<%= reduce[:rule].name.gsub("$", "_") %><%= reduce[:rule].id %>_node_field_index_map[0]
-<%       end %>
-             , <%= reduce[:rule].rule_set.ast_fields.size %>
-<%     end %>
-    },
+    {<%= reduce[:token_id] %>u, <%= reduce[:rule_id] %>u, <%= reduce[:rule_set_id] %>u, <%= reduce[:n_states] %>u},
 <%   end %>
 };

@@ -791,34 +735,31 @@ static void state_values_stack_free(state_values_stack_t * stack)
     free(stack->entries);
 }

-<% unless @grammar.ast %>
 /**
 * Execute user code associated with a parser rule.
 *
 * @param rule The ID of the rule.
 *
- * @retval P_SUCCESS
- *   Continue parsing.
- * @retval P_USER_TERMINATED
- *   User requested to terminate parsing.
+ * @return Parse value.
 */
-static size_t parser_user_code(<%= @grammar.prefix %>value_t * _pvalue, uint32_t rule, state_values_stack_t * statevalues, uint32_t n_states, <%= @grammar.prefix %>context_t * context)
+static <%= @grammar.prefix %>value_t parser_user_code(uint32_t rule, state_values_stack_t * statevalues, uint32_t n_states)
 {
+    <%= @grammar.prefix %>value_t _pvalue = {0};
+
    switch (rule)
    {
-<%   @grammar.rules.each do |rule| %>
-<%     if rule.code %>
+<% @grammar.rules.each do |rule| %>
+<%   if rule.code %>
    case <%= rule.id %>u: {
 <%= expand_code(rule.code, true, rule, nil) %>
    } break;
-<%     end %>
 <%   end %>
+<% end %>
    default: break;
    }

-    return P_SUCCESS;
+    return _pvalue;
 }
-<% end %>

 /**
 * Check if the parser should shift to a new state.
@@ -880,7 +821,7 @@ static size_t check_reduce(size_t state_id, <%= @grammar.prefix %>token_t token)
 *   can be accessed with <%= @grammar.prefix %>result().
 * @retval P_UNEXPECTED_TOKEN
 *   An unexpected token was encountered that does not match any grammar rule.
- *   The function p_token(&context) can be used to get the unexpected token.
+ *   The value context->token holds the unexpected token.
 * @reval P_DECODE_ERROR
 *   The decoder encountered invalid text encoding.
 * @reval P_UNEXPECTED_INPUT
@@ -892,11 +833,7 @@ size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context)
    <%= @grammar.prefix %>token_t token = INVALID_TOKEN_ID;
    state_values_stack_t statevalues;
    size_t reduced_rule_set = INVALID_ID;
-<% if @grammar.ast %>
-    void * reduced_parser_node;
-<% else %>
    <%= @grammar.prefix %>value_t reduced_parser_value;
-<% end %>
    state_values_stack_init(&statevalues);
    state_values_stack_push(&statevalues);
    size_t result;
@@ -923,11 +860,7 @@ size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context)
            if ((shift_state != INVALID_ID) && (token == TOKEN___EOF))
            {
                /* Successful parse. */
-<% if @grammar.ast %>
-                context->parse_result = (Start *)state_values_stack_index(&statevalues, -1)->ast_node;
-<% else %>
                context->parse_result = state_values_stack_index(&statevalues, -1)->pvalue;
-<% end %>
                result = P_SUCCESS;
                break;
            }
@@ -940,26 +873,15 @@ size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context)
            if (reduced_rule_set == INVALID_ID)
            {
                /* We shifted a token, mark it consumed. */
-<% if @grammar.ast %>
-                Token * token_ast_node = malloc(sizeof(Token));
-                token_ast_node->token = token;
-                token_ast_node->pvalue = token_info.pvalue;
-                state_values_stack_index(&statevalues, -1)->ast_node = token_ast_node;
-<% else %>
-                state_values_stack_index(&statevalues, -1)->pvalue = token_info.pvalue;
-<% end %>
                token = INVALID_TOKEN_ID;
+                state_values_stack_index(&statevalues, -1)->pvalue = token_info.pvalue;
            }
            else
            {
                /* We shifted a RuleSet. */
-<% if @grammar.ast %>
-                state_values_stack_index(&statevalues, -1)->ast_node = reduced_parser_node;
-<% else %>
                state_values_stack_index(&statevalues, -1)->pvalue = reduced_parser_value;
                <%= @grammar.prefix %>value_t new_parse_result = {0};
                reduced_parser_value = new_parse_result;
-<% end %>
                reduced_rule_set = INVALID_ID;
            }
            continue;
@@ -969,38 +891,7 @@ size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context)
        if (reduce_index != INVALID_ID)
        {
            /* We have something to reduce. */
-<% if @grammar.ast %>
-            if (parser_reduce_table[reduce_index].n_states > 0)
-            {
-                void ** node_fields = calloc(parser_reduce_table[reduce_index].rule_set_node_field_array_size, sizeof(void *));
-                if (parser_reduce_table[reduce_index].rule_set_node_field_index_map == NULL)
-                {
-                    for (size_t i = 0; i < parser_reduce_table[reduce_index].n_states; i++)
-                    {
-                        node_fields[i] = state_values_stack_index(&statevalues, -(int)parser_reduce_table[reduce_index].n_states + (int)i)->ast_node;
-                    }
-                }
-                else
-                {
-                    for (size_t i = 0; i < parser_reduce_table[reduce_index].n_states; i++)
-                    {
-                        node_fields[parser_reduce_table[reduce_index].rule_set_node_field_index_map[i]] = state_values_stack_index(&statevalues, -(int)parser_reduce_table[reduce_index].n_states + (int)i)->ast_node;
-                    }
-                }
-                reduced_parser_node = node_fields;
-            }
-            else
-            {
-                reduced_parser_node = NULL;
-            }
-<% else %>
-            <%= @grammar.prefix %>value_t reduced_parser_value2 = {0};
-            if (parser_user_code(&reduced_parser_value2, parser_reduce_table[reduce_index].rule, &statevalues, parser_reduce_table[reduce_index].n_states, context) == P_USER_TERMINATED)
-            {
-                return P_USER_TERMINATED;
-            }
-            reduced_parser_value = reduced_parser_value2;
-<% end %>
+            reduced_parser_value = parser_user_code(parser_reduce_table[reduce_index].rule, &statevalues, parser_reduce_table[reduce_index].n_states);
            reduced_rule_set = parser_reduce_table[reduce_index].rule_set;
            state_values_stack_pop(&statevalues, parser_reduce_table[reduce_index].n_states);
            continue;
@@ -1028,17 +919,9 @@ size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context)
 *
 * @return Parse result value.
 */
-<% if @grammar.ast %>
-Start * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
-<% else %>
 <%= start_rule_type[1] %> <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
-<% end %>
 {
-<% if @grammar.ast %>
-    return context->parse_result;
-<% else %>
    return context->parse_result.v_<%= start_rule_type[0] %>;
-<% end %>
 }

 /**
@@ -1053,26 +936,3 @@ Start * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
 {
    return context->text_position;
 }
-
-/**
- * Get the user terminate code.
- *
- * @param context
- *   Lexer/parser context structure.
- *
- * @return User terminate code.
- */
-size_t <%= @grammar.prefix %>user_terminate_code(<%= @grammar.prefix %>context_t * context)
-{
-    return context->user_terminate_code;
-}
-
-/**
- * Get the parse token.
- *
- * @return Parse token.
- */
-<%= @grammar.prefix %>token_t <%= @grammar.prefix %>token(<%= @grammar.prefix %>context_t * context)
-{
-    return context->token;
-}
@@ -12,7 +12,9 @@ module <%= @grammar.modulename %>;
 * User code blocks
 *************************************************************************/

-<%= @grammar.code_blocks.fetch("", "") %>
+<% @grammar.code_blocks.each do |code| %>
+<%= code %>
+<% end %>

 /**************************************************************************
 * Public types
@@ -27,11 +29,10 @@ public enum : size_t
    <%= @grammar.prefix.upcase %>UNEXPECTED_TOKEN,
    <%= @grammar.prefix.upcase %>DROP,
    <%= @grammar.prefix.upcase %>EOF,
-    <%= @grammar.prefix.upcase %>USER_TERMINATED,
 }

 /** Token type. */
-public alias <%= @grammar.prefix %>token_t = <%= get_type_for(@grammar.terminate_token_id) %>;
+public alias <%= @grammar.prefix %>token_t = <%= get_type_for(@grammar.invalid_token_id) %>;

 /** Token IDs. */
 public enum : <%= @grammar.prefix %>token_t
@@ -43,51 +44,19 @@ public enum : <%= @grammar.prefix %>token_t
 <%   end %>
 <% end %>
    INVALID_TOKEN_ID = <%= @grammar.invalid_token_id %>,
-    TERMINATE_TOKEN_ID = <%= @grammar.terminate_token_id %>,
 }

 /** Code point type. */
 public alias <%= @grammar.prefix %>code_point_t = uint;

-<% if @grammar.ast %>
-/** Parser values type. */
-public alias <%= @grammar.prefix %>value_t = <%= @grammar.ptype %>;
-<% else %>
 /** Parser values type(s). */
 public union <%= @grammar.prefix %>value_t
 {
-<%   @grammar.ptypes.each do |name, typestring| %>
+<% @grammar.ptypes.each do |name, typestring| %>
    <%= typestring %> v_<%= name %>;
-<%   end %>
-}
 <% end %>
-
-<% if @grammar.ast %>
-/** AST node types. @{ */
-public struct Token
-{
-    <%= @grammar.prefix %>token_t token;
-    <%= @grammar.prefix %>value_t pvalue;
 }

-<%   @parser.rule_sets.each do |name, rule_set| %>
-<%     next if name.start_with?("$") %>
-public struct <%= name %>
-{
-<%     rule_set.ast_fields.each do |fields| %>
-    union
-    {
-<%       fields.each do |field_name, type| %>
-        <%= type %> * <%= field_name %>;
-<%       end %>
-    }
-<%     end %>
-}
-
-<%   end %>
-/** @} */
-<% end %>
-
 /**
 * A structure to keep track of parser position.
 *
@@ -143,17 +112,10 @@ public struct <%= @grammar.prefix %>context_t
    /* Parser context data. */

    /** Parse result value. */
-<% if @grammar.ast %>
-    Start * parse_result;
-<% else %>
    <%= @grammar.prefix %>value_t parse_result;
-<% end %>

    /** Unexpected token received. */
    <%= @grammar.prefix %>token_t token;
-
-    /** User terminate code. */
-    size_t user_terminate_code;
 }

 /**************************************************************************
@@ -181,7 +143,6 @@ private enum : size_t
    P_UNEXPECTED_TOKEN,
    P_DROP,
    P_EOF,
-    P_USER_TERMINATED,
 }
 <% end %>

@@ -463,12 +424,9 @@ private lexer_state_id_t check_lexer_transition(uint current_state, uint code_po
 *
 * @param context
 *   Lexer/parser context structure.
- * @param[out] out_match_info
- *   The longest match information is stored here if the return value is
- *   P_SUCCESS or P_DECODE_ERROR.
- * @param[out] out_unexpected_input_length
- *   The unexpected input length is stored here if the return value is
- *   P_UNEXPECTED_INPUT.
+ * @param[out] out_token_info
+ *   The lexed token information is stored here if the return value is
+ *   P_SUCCESS.
 *
 * @reval P_SUCCESS
 *   A token was successfully lexed.
@@ -546,6 +504,7 @@ private size_t find_longest_match(<%= @grammar.prefix %>context_t * context,
                /* Valid EOF return. */
                return P_EOF;
            }
+            break;

        case P_DECODE_ERROR:
            /* If we see a decode error, we may be partially in the middle of
@@ -577,8 +536,6 @@ private size_t find_longest_match(<%= @grammar.prefix %>context_t * context,
 *   Input text does not match any lexer pattern.
 * @retval P_DROP
 *   A drop pattern was matched so the lexer should continue.
- * @retval P_USER_TERMINATED
- *   User code has requested to terminate the lexer.
 */
 private size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%= @grammar.prefix %>token_info_t * out_token_info)
 {
@@ -598,12 +555,6 @@ private size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%=
            string match = context.input[context.input_index..(context.input_index + match_info.length)];
            <%= @grammar.prefix %>token_t user_code_token = lexer_user_code(context,
                match_info.accepting_state.code_id, match, &token_info);
-            /* A TERMINATE_TOKEN_ID return code from lexer_user_code() means
-             * that the user code is requesting to terminate the lexer. */
-            if (user_code_token == TERMINATE_TOKEN_ID)
-            {
-                return P_USER_TERMINATED;
-            }
            /* An invalid token returned from lexer_user_code() means that the
             * user code did not explicitly return a token. So only override
             * the token to return if the user code does explicitly return a
@@ -674,8 +625,6 @@ private size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%=
 *   The decoder encountered invalid text encoding.
 * @reval P_UNEXPECTED_INPUT
 *   Input text does not match any lexer pattern.
- * @retval P_USER_TERMINATED
- *   User code has requested to terminate the lexer.
 */
 public size_t <%= @grammar.prefix %>lex(<%= @grammar.prefix %>context_t * context, <%= @grammar.prefix %>token_info_t * out_token_info)
 {
@@ -752,18 +701,6 @@ private struct reduce_t
     * reduce action.
     */
    parser_state_id_t n_states;
-<% if @grammar.ast %>
-
-    /**
-     * Map of rule components to rule set child fields.
-     */
-    immutable(ushort) * rule_set_node_field_index_map;
-
-    /**
-     * Number of rule set AST node fields.
-     */
-    ushort rule_set_node_field_array_size;
-<% end %>
 }

 /** Parser state entry. */
@@ -795,11 +732,6 @@ private struct state_value_t
    /** Parser value from this state. */
    <%= @grammar.prefix %>value_t pvalue;

-<% if @grammar.ast %>
-    /** AST node. */
-    void * ast_node;
-<% end %>
-
    this(size_t state_id)
    {
        this.state_id = state_id;
@@ -813,27 +745,10 @@ private immutable shift_t[] parser_shift_table = [
 <%   end %>
 ];

-<% if @grammar.ast %>
-<%   @grammar.rules.each do |rule| %>
-<%     unless rule.flat_rule_set_node_field_index_map? %>
-immutable ushort[<%= rule.rule_set_node_field_index_map.size %>] r_<%= rule.name.gsub("$", "_") %><%= rule.id %>_node_field_index_map = [<%= rule.rule_set_node_field_index_map.map {|v| v.to_s}.join(", ") %>];
-<%     end %>
-<%   end %>
-<% end %>
-
 /** Parser reduce table. */
 private immutable reduce_t[] parser_reduce_table = [
 <%   @parser.reduce_table.each do |reduce| %>
-    reduce_t(<%= reduce[:token_id] %>u, <%= reduce[:rule_id] %>u, <%= reduce[:rule_set_id] %>u, <%= reduce[:n_states] %>u
-<%     if @grammar.ast %>
-<%       if reduce[:rule].flat_rule_set_node_field_index_map? %>
-             , null
-<%       else %>
-             , &r_<%= reduce[:rule].name.gsub("$", "_") %><%= reduce[:rule].id %>_node_field_index_map[0]
-<%       end %>
-             , <%= reduce[:rule].rule_set.ast_fields.size %>
-<%     end %>
-            ),
+    reduce_t(<%= reduce[:token_id] %>u, <%= reduce[:rule_id] %>u, <%= reduce[:rule_set_id] %>u, <%= reduce[:n_states] %>u),
 <%   end %>
 ];

@@ -844,34 +759,31 @@ private immutable parser_state_t[] parser_state_table = [
 <%   end %>
 ];

-<% unless @grammar.ast %>
 /**
 * Execute user code associated with a parser rule.
 *
 * @param rule The ID of the rule.
 *
- * @retval P_SUCCESS
- *   Continue parsing.
- * @retval P_USER_TERMINATED
- *   User requested to terminate parsing.
+ * @return Parse value.
 */
-private size_t parser_user_code(<%= @grammar.prefix %>value_t * _pvalue, uint rule, state_value_t[] statevalues, uint n_states, <%= @grammar.prefix %>context_t * context)
+private <%= @grammar.prefix %>value_t parser_user_code(uint rule, state_value_t[] statevalues, uint n_states)
 {
+    <%= @grammar.prefix %>value_t _pvalue;
+
    switch (rule)
    {
-<%   @grammar.rules.each do |rule| %>
-<%     if rule.code %>
+<% @grammar.rules.each do |rule| %>
+<%   if rule.code %>
    case <%= rule.id %>u: {
 <%= expand_code(rule.code, true, rule, nil) %>
    } break;
-<%     end %>
 <%   end %>
+<% end %>
    default: break;
    }

-    return P_SUCCESS;
+    return _pvalue;
 }
-<% end %>

 /**
 * Check if the parser should shift to a new state.
@@ -933,7 +845,7 @@ private size_t check_reduce(size_t state_id, <%= @grammar.prefix %>token_t token
 *   can be accessed with <%= @grammar.prefix %>result().
 * @retval P_UNEXPECTED_TOKEN
 *   An unexpected token was encountered that does not match any grammar rule.
- *   The function p_token(&context) can be used to get the unexpected token.
+ *   The value context.token holds the unexpected token.
 * @reval P_DECODE_ERROR
 *   The decoder encountered invalid text encoding.
 * @reval P_UNEXPECTED_INPUT
@@ -945,11 +857,7 @@ public size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * cont
    <%= @grammar.prefix %>token_t token = INVALID_TOKEN_ID;
    state_value_t[] statevalues = new state_value_t[](1);
    size_t reduced_rule_set = INVALID_ID;
-<% if @grammar.ast %>
-    void * reduced_parser_node;
-<% else %>
    <%= @grammar.prefix %>value_t reduced_parser_value;
-<% end %>
    for (;;)
    {
        if (token == INVALID_TOKEN_ID)
@@ -972,11 +880,7 @@ public size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * cont
            if ((shift_state != INVALID_ID) && (token == TOKEN___EOF))
            {
                /* Successful parse. */
-<% if @grammar.ast %>
-                context.parse_result = cast(Start *)statevalues[$-1].ast_node;
-<% else %>
                context.parse_result = statevalues[$-1].pvalue;
-<% end %>
                return P_SUCCESS;
            }
        }
@@ -987,24 +891,15 @@ public size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * cont
            if (reduced_rule_set == INVALID_ID)
            {
                /* We shifted a token, mark it consumed. */
-<% if @grammar.ast %>
-                Token * token_ast_node = new Token(token, token_info.pvalue);
-                statevalues[$-1].ast_node = token_ast_node;
-<% else %>
-                statevalues[$-1].pvalue = token_info.pvalue;
-<% end %>
                token = INVALID_TOKEN_ID;
+                statevalues[$-1].pvalue = token_info.pvalue;
            }
            else
            {
                /* We shifted a RuleSet. */
-<% if @grammar.ast %>
-                statevalues[$-1].ast_node = reduced_parser_node;
-<% else %>
                statevalues[$-1].pvalue = reduced_parser_value;
                <%= @grammar.prefix %>value_t new_parse_result;
                reduced_parser_value = new_parse_result;
-<% end %>
                reduced_rule_set = INVALID_ID;
            }
            continue;
@@ -1014,42 +909,7 @@ public size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * cont
        if (reduce_index != INVALID_ID)
        {
            /* We have something to reduce. */
-<% if @grammar.ast %>
-            if (parser_reduce_table[reduce_index].n_states > 0)
-            {
-                void *[] node_fields = new void *[parser_reduce_table[reduce_index].rule_set_node_field_array_size];
-                foreach (i; 0..parser_reduce_table[reduce_index].rule_set_node_field_array_size)
-                {
-                    node_fields[i] = null;
-                }
-                if (parser_reduce_table[reduce_index].rule_set_node_field_index_map is null)
-                {
-                    foreach (i; 0..parser_reduce_table[reduce_index].n_states)
-                    {
-                        node_fields[i] = statevalues[$ - parser_reduce_table[reduce_index].n_states + i].ast_node;
-                    }
-                }
-                else
-                {
-                    foreach (i; 0..parser_reduce_table[reduce_index].n_states)
-                    {
-                        node_fields[parser_reduce_table[reduce_index].rule_set_node_field_index_map[i]] = statevalues[$ - parser_reduce_table[reduce_index].n_states + i].ast_node;
-                    }
-                }
-                reduced_parser_node = node_fields.ptr;
-            }
-            else
-            {
-                reduced_parser_node = null;
-            }
-<% else %>
-            <%= @grammar.prefix %>value_t reduced_parser_value2;
-            if (parser_user_code(&reduced_parser_value2, parser_reduce_table[reduce_index].rule, statevalues, parser_reduce_table[reduce_index].n_states, context) == P_USER_TERMINATED)
-            {
-                return P_USER_TERMINATED;
-            }
-            reduced_parser_value = reduced_parser_value2;
-<% end %>
+            reduced_parser_value = parser_user_code(parser_reduce_table[reduce_index].rule, statevalues, parser_reduce_table[reduce_index].n_states);
            reduced_rule_set = parser_reduce_table[reduce_index].rule_set;
            statevalues.length -= parser_reduce_table[reduce_index].n_states;
            continue;
@@ -1074,17 +934,9 @@ public size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * cont
 *
 * @return Parse result value.
 */
-<% if @grammar.ast %>
-public Start * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
-<% else %>
 public <%= start_rule_type[1] %> <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
-<% end %>
 {
-<% if @grammar.ast %>
-    return context.parse_result;
-<% else %>
    return context.parse_result.v_<%= start_rule_type[0] %>;
-<% end %>
 }

 /**
@@ -1099,26 +951,3 @@ public <%= @grammar.prefix %>position_t <%= @grammar.prefix %>position(<%= @gram
 {
    return context.text_position;
 }
-
-/**
- * Get the user terminate code.
- *
- * @param context
- *   Lexer/parser context structure.
- *
- * @return User terminate code.
- */
-public size_t <%= @grammar.prefix %>user_terminate_code(<%= @grammar.prefix %>context_t * context)
-{
-    return context.user_terminate_code;
-}
-
-/**
- * Get the parse token.
- *
- * @return Parse token.
- */
-public <%= @grammar.prefix %>token_t <%= @grammar.prefix %>token(<%= @grammar.prefix %>context_t * context)
-{
-    return context.token;
-}
@@ -20,10 +20,9 @@
 #define <%= @grammar.prefix.upcase %>UNEXPECTED_TOKEN 3u
 #define <%= @grammar.prefix.upcase %>DROP 4u
 #define <%= @grammar.prefix.upcase %>EOF 5u
-#define <%= @grammar.prefix.upcase %>USER_TERMINATED 6u

 /** Token type. */
-typedef <%= get_type_for(@grammar.terminate_token_id) %> <%= @grammar.prefix %>token_t;
+typedef <%= get_type_for(@grammar.invalid_token_id) %> <%= @grammar.prefix %>token_t;

 /** Token IDs. */
 <% @grammar.tokens.each_with_index do |token, index| %>
@@ -33,57 +32,17 @@ typedef <%= get_type_for(@grammar.terminate_token_id) %> <%= @grammar.prefix %>t
 <%   end %>
 <% end %>
 #define INVALID_TOKEN_ID <%= @grammar.invalid_token_id %>u
-#define TERMINATE_TOKEN_ID <%= @grammar.terminate_token_id %>u

 /** Code point type. */
 typedef uint32_t <%= @grammar.prefix %>code_point_t;

-/** User header code blocks. */
-<%= @grammar.code_blocks.fetch("header", "") %>
-
-<% if @grammar.ast %>
-/** Parser values type. */
-typedef <%= @grammar.ptype %> <%= @grammar.prefix %>value_t;
-<% else %>
 /** Parser values type(s). */
 typedef union
 {
-<%   @grammar.ptypes.each do |name, typestring| %>
+<% @grammar.ptypes.each do |name, typestring| %>
    <%= typestring %> v_<%= name %>;
-<%   end %>
+<% end %>
 } <%= @grammar.prefix %>value_t;
-<% end %>
-
-<% if @grammar.ast %>
-/** AST node types. @{ */
-typedef struct Token
-{
-    <%= @grammar.prefix %>token_t token;
-    <%= @grammar.prefix %>value_t pvalue;
-} Token;
-
-<%   @parser.rule_sets.each do |name, rule_set| %>
-<%     next if name.start_with?("$") %>
-struct <%= name %>;
-<%   end %>
-
-<%   @parser.rule_sets.each do |name, rule_set| %>
-<%     next if name.start_with?("$") %>
-typedef struct <%= name %>
-{
-<%     rule_set.ast_fields.each do |fields| %>
-    union
-    {
-<%       fields.each do |field_name, type| %>
-        struct <%= type %> * <%= field_name %>;
-<%       end %>
-    };
-<%     end %>
-} <%= name %>;
-
-<%   end %>
-/** @} */
-<% end %>

 /**
 * A structure to keep track of parser position.
@@ -143,26 +102,12 @@ typedef struct
    /* Parser context data. */

    /** Parse result value. */
-<% if @grammar.ast %>
-    Start * parse_result;
-<% else %>
    <%= @grammar.prefix %>value_t parse_result;
-<% end %>

    /** Unexpected token received. */
    <%= @grammar.prefix %>token_t token;
-
-    /** User terminate code. */
-    size_t user_terminate_code;
 } <%= @grammar.prefix %>context_t;

-/**************************************************************************
- * Public data
- *************************************************************************/
-
-/** Token names. */
-extern const char * <%= @grammar.prefix %>token_names[];
-
 void <%= @grammar.prefix %>context_init(<%= @grammar.prefix %>context_t * context, uint8_t const * input, size_t input_length);

 size_t <%= @grammar.prefix %>decode_code_point(uint8_t const * input, size_t input_length,
@@ -172,14 +117,6 @@ size_t <%= @grammar.prefix %>lex(<%= @grammar.prefix %>context_t * context, <%=

 size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context);

-<% if @grammar.ast %>
-Start * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context);
-<% else %>
 <%= start_rule_type[1] %> <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context);
-<% end %>

 <%= @grammar.prefix %>position_t <%= @grammar.prefix %>position(<%= @grammar.prefix %>context_t * context);
-
-size_t <%= @grammar.prefix %>user_terminate_code(<%= @grammar.prefix %>context_t * context);
-
-<%= @grammar.prefix %>token_t <%= @grammar.prefix %>token(<%= @grammar.prefix %>context_t * context);
@@ -7,16 +7,15 @@ ${/remove}

 #> Overview

-Propane is a LALR Parser Generator (LPG) which:
+Propane is an LR Parser Generator (LPG) which:

  * accepts LR(0), SLR, and LALR grammars
  * generates a built-in lexer to tokenize input
  * supports UTF-8 lexer inputs
-  * generates a table-driven shift/reduce parser to parse input in linear time
-  * targets C or D language outputs
-  * optionally supports automatic full AST generation
+  * generates a table-driven parser to parse input in linear time
  * is MIT-licensed
  * is distributable as a standalone Ruby script
+  * supports D language

 #> Installation

@@ -57,10 +56,8 @@ Example grammar file:
 import std.math;
 >>

-# Parser values are unsigned integers.
 ptype ulong;

-# A few basic arithmetic operators.
 token plus /\\+/;
 token times /\\*/;
 token power /\\*\\*/;
@@ -75,809 +72,35 @@ token integer /\\d+/ <<
 >>
 token lparen /\\(/;
 token rparen /\\)/;
-# Drop whitespace.
 drop /\\s+/;

-Start -> E1 << $$ = $1; >>
-E1 -> E2 << $$ = $1; >>
-E1 -> E1 plus E2 << $$ = $1 + $3; >>
-E2 -> E3 << $$ = $1; >>
-E2 -> E2 times E3 << $$ = $1 * $3; >>
-E3 -> E4 << $$ = $1; >>
-E3 -> E3 power E4 << $$ = pow($1, $3); >>
-E4 -> integer << $$ = $1; >>
-E4 -> lparen E1 rparen << $$ = $2; >>
-```
-
-Grammar files can contain comment lines beginning with `#` which are ignored.
-White space in the grammar file is also ignored.
-
-It is convention to use the extension `.propane` for the Propane grammar file,
-however any file name is accepted by Propane.
-
-This user guide follows the convention of beginning a token name with a
-lowercase character and beginning a rule name with an uppercase character.
-
-##> User Code Blocks
-
-User code blocks begin following a "<<" token and end with a ">>" token found
-at the end of a line.
-All text lines in the code block are copied verbatim into the output file.
-
-### Standalone Code Blocks
-
-C example:
-
-```
-<<
-#include &lt;stdio.h>
+Start -> E1 <<
+  $$ = $1;
 >>
-```
-
-D example:
-
-```
-<<
-import std.stdio;
+E1 -> E2 <<
+  $$ = $1;
 >>
-```
-
-Standalone code blocks are emitted early in the output file as top-level code
-outside the context of any function.
-Standalone code blocks are a good place to include/import any other necessary
-supporting code modules.
-They can also define helper functions that can be reused by lexer or parser
-user code blocks.
-They are emitted in the order they are defined in the grammar file.
-
-For a C target, the word "header" may immediately follow the "<<" token to
-cause Propane to emit the code block in the generated header file rather than
-the generated implementation file.
-This allows including another header that may be necessary to define any types
-needed by a `ptype` directive, for example:
-
-```
-<&lt;header
-#include "mytypes.h"
+E1 -> E1 plus E2 <<
+  $$ = $1 + $3;
 >>
-```
-
-### Lexer pattern code blocks
-
-Example:
-
-```
-ptype ulong;
-
-token integer /\\d+/ <<
-  ulong v;
-  foreach (c; match)
-  {
-    v *= 10;
-    v += (c - '0');
-  }
-  $$ = v;
+E2 -> E3 <<
+  $$ = $1;
 >>
-```
-
-Lexer code blocks appear following a `token` or pattern expression.
-User code in a lexer code block will be executed when the lexer matches the
-given pattern.
-Assignment to the `$$` symbol will associate a parser value with the lexed
-token.
-This parser value can then be used later in a parser rule.
-
-### Parser rule code blocks
-
-Example:
-
-```
-E1 -> E1 plus E2 << $$ = $1 + $3; >>
-```
-
-Parser rule code blocks appear following a rule expression.
-User code in a parser rule code block will be executed when the parser reduces
-the given rule.
-Assignment to the `$$` symbol will associate a parser value with the reduced
-rule.
-Parser values for the rules or tokens in the rule pattern can be accessed
-positionally with tokens `$1`, `$2`, `$3`, etc...
-
-Parser rule code blocks are not available in AST generation mode.
-In AST generation mode, a full parse tree is automatically constructed in
-memory for user code to traverse after parsing is complete.
-
-##> AST generation mode - the `ast` statement
-
-To activate AST generation mode, place the `ast` statement in your grammar file:
-
-```
-ast;
-```
-
-It is recommended to place this statement early in the grammar.
-
-In AST generation mode various aspects of propane's behavior are changed:
-
-  * Only one `ptype` is allowed.
-  * Parser user code blocks are not supported.
-  * Structure types are generated to represent the parsed tokens and rules as
-  defined in the grammar.
-  * The parse result from `p_result()` points to a `Start` structure containing
-  the entire parse tree for the input.
-
-Example AST generation grammar:
-
-```
-ast;
-
-ptype int;
-
-token a << $$ = 11; >>
-token b << $$ = 22; >>
-token one /1/;
-token two /2/;
-token comma /,/ <<
-  $$ = 42;
+E2 -> E2 times E3 <<
+  $$ = $1 * $3;
 >>
-token lparen /\\(/;
-token rparen /\\)/;
-drop /\\s+/;
-
-Start -> Items;
-
-Items -> Item ItemsMore;
-Items -> ;
-
-ItemsMore -> comma Item ItemsMore;
-ItemsMore -> ;
-
-Item -> a;
-Item -> b;
-Item -> lparen Item rparen;
-Item -> Dual;
-
-Dual -> One Two;
-Dual -> Two One;
-One -> one;
-Two -> two;
-```
-
-The following unit test describes the fields that will be present for an
-example parse:
-
-```
-string input = "a, ((b)), b";
-p_context_t context;
-p_context_init(&context, input);
-assert_eq(P_SUCCESS, p_parse(&context));
-Start * start = p_result(&context);
-assert(start.pItems1 !is null);
-assert(start.pItems !is null);
-Items * items = start.pItems;
-assert(items.pItem !is null);
-assert(items.pItem.pToken1 !is null);
-assert_eq(TOKEN_a, items.pItem.pToken1.token);
-assert_eq(11, items.pItem.pToken1.pvalue);
-assert(items.pItemsMore !is null);
-ItemsMore * itemsmore = items.pItemsMore;
-assert(itemsmore.pItem !is null);
-assert(itemsmore.pItem.pItem !is null);
-assert(itemsmore.pItem.pItem.pItem !is null);
-assert(itemsmore.pItem.pItem.pItem.pToken1 !is null);
-assert_eq(TOKEN_b, itemsmore.pItem.pItem.pItem.pToken1.token);
-assert_eq(22, itemsmore.pItem.pItem.pItem.pToken1.pvalue);
-assert(itemsmore.pItemsMore !is null);
-itemsmore = itemsmore.pItemsMore;
-assert(itemsmore.pItem !is null);
-assert(itemsmore.pItem.pToken1 !is null);
-assert_eq(TOKEN_b, itemsmore.pItem.pToken1.token);
-assert_eq(22, itemsmore.pItem.pToken1.pvalue);
-assert(itemsmore.pItemsMore is null);
-```
-
-##> Specifying tokens - the `token` statement
-
-The `token` statement allows defining a lexer token and a pattern to match that
-token.
-The name of the token must be specified immediately following the `token`
-keyword.
-A regular expression pattern may optionally follow the token name.
-If a regular expression pattern is not specified, the name of the token is
-taken to be the pattern.
-See also: ${#Regular expression syntax}.
-
-Example:
-
-```
-token for;
-```
-
-In this example, the token name is `for` and the pattern to match it is
-`/for/`.
-
-Example:
-
-```
-token lbrace /\{/;
-```
-
-In this example, the token name is `lbrace` and a single left curly brace will
-match it.
-
-The `token` statement can also include a user code block.
-The user code block will be executed whenever the token is matched by the
-lexer.
-
-Example:
-
-```
-token if << writeln("'if' keyword lexed"); >>
-```
-
-The `token` statement is actually a shortcut statement for a combination of a
-`tokenid` statement and a pattern statement.
-To define a lexer token without an associated pattern to match it, use a
-`tokenid` statement.
-To define a lexer pattern that may or may not result in a matched token, use
-a pattern statement.
-
-##> Defining tokens without a matching pattern - the `tokenid` statement
-
-The `tokenid` statement can be used to define a token without associating it
-with a lexer pattern that matches it.
-
-Example:
-
-```
-tokenid string;
-```
-
-The `tokenid` statement can be useful when defining a token that may optionally
-be returned by user code associated with a pattern.
-
-It is also useful when lexer modes and multiple lexer patterns are required to
-build up a full token.
-A common example is parsing a string.
-See the ${#Lexer modes} chapter for more information.
-
-##> Specifying a lexer pattern - the pattern statement
-
-A pattern statement is used to define a lexer pattern that can execute user
-code but may not result in a matched token.
-
-Example:
-
-```
-/foo+/ << writeln("saw a foo pattern"); >>
-```
-
-This can be especially useful with ${#Lexer modes}.
-
-See also ${#Regular expression syntax}.
-
-##> Ignoring input sections - the `drop` statement
-
-A `drop` statement can be used to specify a lexer pattern that when matched
-should result in the matched input being dropped and lexing continuing after
-the matched input.
-
-A common use for a `drop` statement would be to ignore whitespace sequences in
-the user input.
-
-Example:
-
-```
-drop /\s+/;
-```
-
-See also ${#Regular expression syntax}.
-
-##> Regular expression syntax
-
-A regular expression ("regex") is used to define lexer patterns in `token`,
-pattern, and `drop` statements.
-A regular expression begins and ends with a `/` character.
-
-Example:
-
-```
-/#.*$/
-```
-
-Regular expressions can include many special characters:
-
-  * The `.` character matches any input character other than a newline.
-  * The `*` character matches any number of the previous regex element.
-  * The `+` character matches one or more of the previous regex element.
-  * The `?` character matches 0 or 1 of the previous regex element.
-  * The `[` character begins a character class.
-  * The `(` character begins a matching group.
-  * The `{` character begins a count qualifier.
-  * The `\` character escapes the following character and changes its meaning:
-    * The `\a` sequence matches an ASCII bell character (0x07).
-    * The `\b` sequence matches an ASCII backspace character (0x08).
-    * The `\d` sequence matches any character `0` through `9`.
-    * The `\f` sequence matches an ASCII form feed character (0x0C).
-    * The `\n` sequence matches an ASCII new line character (0x0A).
-    * The `\r` sequence matches an ASCII carriage return character (0x0D).
-    * The `\s` sequence matches a space, horizontal tab `\t`, carriage return
-    `\r`, a form feed `\f`, or a vertical tab `\v` character.
-    * The `\t` sequence matches an ASCII tab character (0x09).
-    * The `\v` sequence matches an ASCII vertical tab character (0x0B).
-    * Any other character matches itself.
-  * The `|` character creates an alternate match.
-
-Any other character just matches itself in the input stream.
-
-A character class consists of a list of character alternates or character
-ranges that can be matched by the character class.
-For example `[a-zA-Z_]` matches any lowercase character between `a` and `z` or
-any uppercase character between `A` and `Z` or the underscore `_` character.
-Character classes can also be negative character classes if the first character
-after the `[` is a `^` character.
-In this case, the set of characters matched by the character class is the
-inverse of what it otherwise would have been.
-For example, `[^0-9]` matches any character other than 0 through 9.
-
-A matching group can be used to override the pattern sequence that multiplicity
-specifiers apply to.
-For example, the pattern `/foo+/` matches "foo" or "foooo", while the pattern
-`/(foo)+/` matches "foo" or "foofoofoo", but not "foooo".
-
-A count qualifier in curly braces can be used to restrict the number of matches
-of the preceding atom to an explicit minimum and maximum range.
-For example, the pattern `\d{3}` matches exactly 3 digits 0-9.
-Both a minimum and maximum multiplicity count can be specified and separated by
-a comma.
-For example, `/a{1,5}/` matches between 1 and 5 `a` characters.
-Either the minimum or maximum count can be omitted to omit the corresponding
-restriction in the number of matches allowed.
-
-An alternate match is created with the `|` character.
-For example, the pattern `/foo|bar/` matches either the sequence "foo" or the
-sequence "bar".
-
-##> Lexer modes
-
-Lexer modes can be used to change the set of patterns that are matched by the
-lexer.
-A common use for lexer modes is to match strings.
-
-Example:
-
-```
-<<
-string mystringvalue;
+E3 -> E4 <<
+  $$ = $1;
 >>
-
-tokenid str;
-
-# String processing
-/"/ <<
-  mystringvalue = "";
-  $mode(string);
+E3 -> E3 power E4 <<
+  $$ = pow($1, $3);
 >>
-string: /[^"]+/ << mystringvalue += match; >>
-string: /"/ <<
-  $mode(default);
-  return $token(str);
+E4 -> integer <<
+  $$ = $1;
+>>
+E4 -> lparen E1 rparen <<
+  $$ = $2;
 >>
-```
-
-A lexer mode is defined by placing the name before a colon (`:`) character that
-precedes a token or pattern statement.
-The token or pattern statement is restricted to only applying if the named mode
-is active.
-
-By default, the active lexer mode is named `default`.
-A `$mode()` call within a lexer code block can be used to change lexer modes.
-
-In the above example, when the lexer in the default mode sees a doublequote
-(`"`) character, the lexer code block will clear the `mystringvalue` variable
-and will set the lexer mode to `string`.
-When the lexer begins looking for patterns to match against the input, it will
-now look only for patterns tagged for the `string` lexer mode.
-Any non-`"` character will be appended to the `mystringvalue` string.
-A `"` character will end the `string` lexer mode and return to the `default`
-lexer mode.
-It also returns the `str` token now that the token is complete.
-
-Note that the token name `str` above could have been `string` instead - the
-namespace for token names is distinct from the namespace for lexer modes.
-
-##> Specifying parser value types - the `ptype` statement
-
-The `ptype` statement is used to define parser value type(s).
-Example:
-
-```
-ptype void *;
-```
-
-This defines the default parser value type to be `void *` (this is, in fact,
-the default parser value type if the grammar file does not specify otherwise).
-
-Each defined lexer token type and parser rule has an associated parser value
-type.
-When the lexer runs, each lexed token has a parser value associated with it.
-When the parser runs, each instance of a reduced rule has a parser value
-associated with it.
-Propane supports using different parser value types for different rules and
-token types.
-The example `ptype` statement above defines the default parser value type.
-A parser value type name can optionally be specified following the `ptype`
-keyword.
-For example:
-
-```
-ptype Value;
-ptype array = Value[];
-ptype dict = Value[string];
-
-Object -> lbrace rbrace << $$ = new Value(); >>
-
-Values (array) -> Value << $$ = [$1]; >>
-Values -> Values comma Value << $$ = $1 ~ [$3]; >>
-
-KeyValue (dict) -> string colon Value << $$ = [$1: $3]; >>
-```
-
-In this example, the default parser value type is `Value`.
-A parser value type named `array` is defined to mean `Value[]`.
-A parser value type named `dict` is defined to mean `Value[string]`.
-Any defined tokens or rules that do not specify a parser value type will have
-the default parser value type associated with them.
-To associate a different parser value type with a token or rule, write the
-parser value type name in parentheses following the name of the token or rule.
-In this example:
-
-  * a reduced `Object`'s parser value has a type of `Value`.
-  * a reduced `Values`'s parser value has a type of `Value[]`.
-  * a reduced `KeyValue`'s parser value has a type of `Value[string]`.
-
-When AST generation mode is active, the `ptype` functionality works differently.
-In this mode, only one `ptype` is used by the parser.
-Lexer user code blocks may assign a parse value to the generated `Token` node
-by assigning to `$$` within a lexer code block.
-The type of the parse value `$$` is given by the global `ptype` type.
-
-##> Specifying a parser rule - the rule statement
-
-Rule statements create parser rules which define the grammar that will be
-parsed by the generated parser.
-
-Multiple rules with the same name can be specified.
-Rules with the same name define a rule set for that name and act as
-alternatives that the parser can accept when attempting to match a reference to
-that rule.
-
-The grammar file must define a rule with the name `Start` which will be used as
-the top-level starting rule that the parser attempts to reduce.
-
-Example:
-
-```
-ptype ulong;
-token word /[a-z]+/ << $$ = match.length; >>
-Start -> word << $$ = $1; >>
-```
-
-In the above example the `Start` rule is defined to match a single `word`
-token.
-
-Example:
-
-```
-Start -> E1 << $$ = $1; >>
-E1 -> E2 << $$ = $1; >>
-E1 -> E1 plus E2 << $$ = $1 + $3; >>
-E2 -> E3 << $$ = $1; >>
-E2 -> E2 times E3 << $$ = $1 * $3; >>
-E3 -> E4 << $$ = $1; >>
-E3 -> E3 power E4 << $$ = pow($1, $3); >>
-E4 -> integer << $$ = $1; >>
-E4 -> lparen E1 rparen << $$ = $2; >>
-```
-
-A parser rule has zero or more terms on the right side of its definition.
-Each of these terms is either a token name or a rule name.
-
-In a parser rule code block, parser values for the right side terms are
-accessible as `$1` for the first term's parser value, `$2` for the second
-term's parser value, etc...
-The `$$` symbol accesses the output parser value for this rule.
-The above examples demonstrate how the parser values for the rule components
-can be used to produce the parser value for the accepted rule.
-
-Parser rule code blocks are not allowed and not used when AST generation mode
-is active.
-
-##> Specifying the parser module name - the `module` statement
-
-The `module` statement can be used to specify the module name for a generated
-D module.
-
-```
-module proj.parser;
-```
-
-If a module statement is not present, then the generated D module will not
-contain a module statement and the default module name will be used.
-
-##> Specifying the generated API prefix - the `prefix` statement
-
-By default the public API (types, constants, and functions) of the generated
-lexer and parser uses a prefix of `p_`.
-
-This prefix can be changed with the `prefix` statement.
-
-Example:
-
-```
-prefix myparser_;
-```
-
-With a parser generated with this `prefix` statement, instead of calling
-`p_context_init()` you would call `myparser_context_init()`.
-
-The `prefix` statement can be optionally used if you would like to change the
-prefix used by your generated lexer and parser to something other than the
-default.
-
-It can also be used when generating multiple lexers/parsers to be used in the
-same program to avoid symbol collisions.
-
-##> User termination of the lexer or parser
-
-Propane supports allowing lexer or parser user code blocks to terminate
-execution of the parser.
-Some example uses of this functionality could be to:
-
-  * Detect integer overflow when lexing an integer literal constant.
-  * Detect and report an error as soon as possible during parsing before continuing to parse any more of the input.
-  * Determine whether parsing should stop and instead be performed using a different parser version.
-
-To terminate parsing from a lexer or parser user code block, use the
-`$terminate(code)` function, passing an integer expression argument.
-For example:
-
-```
-NewExpression -> new Expression << $terminate(42); >>
-```
-
-The value passed to the `$terminate()` function is known as the "user terminate
-code".
-If the parser returns a `P_USER_TERMINATED` result code, then the user
-terminate code can be accessed using the `p_user_terminate_code()` API
-function.
-
-#> Propane generated API
-
-By default, Propane uses a prefix of `p_` when generating a lexer/parser.
-This prefix is used for all publicly declared types and functions.
-The uppercase version of the prefix is used for all constant values.
-
-This section documents the generated API using the default `p_` or `P_` names.
-
-##> Constants
-
-Propane generates the following result code constants:
-
-* `P_SUCCESS`: A successful decode/lex/parse operation has taken place.
-* `P_DECODE_ERROR`: An error occurred when decoding UTF-8 input.
-* `P_UNEXPECTED_INPUT`: Input was received by the lexer that does not match any lexer pattern.
-* `P_UNEXPECTED_TOKEN`: A token was seen in a location that does not match any parser rule.
-* `P_DROP`: The lexer matched a drop pattern.
-* `P_EOF`: The lexer reached the end of the input string.
-* `P_USER_TERMINATED`: A parser user code block has requested to terminate the parser.
-
-Result codes are returned by the functions `p_decode_input()`, `p_lex()`, and `p_parse()`.
-
-##> Types
-
-### `p_context_t`
-
-Propane defines a `p_context_t` structure type.
-The structure is intended to be used opaquely and stores information related to
-the state of the lexer and parser.
-Integrating code must define an instance of the `p_context_t` structure.
-A pointer to this instance is passed to the generated functions.
-
-### `p_position_t`
-
-The `p_position_t` structure contains two fields `row` and `col`.
-These fields contain the 0-based row and column describing a parser position.
-
-### AST Node Types
-
-If AST generation mode is enabled, a structure type for each rule will be
-generated.
-The name of the structure type is given by the name of the rule.
-Additionally a structure type called `Token` is generated to represent an
-AST node which refers to a raw parser token rather than a composite rule.
-
-#### AST Node Fields
-
-A `Token` node has two fields:
-
-  * `token` which specifies which token was parsed (one of `TOKEN_*`)
-  * `pvalue` which specifies the parser value for the token. If a lexer user
-  code block assigned to `$$`, the assigned value will be stored here.
-
-The other generated AST node structures have fields generated based on the
-right hand side components specified for all rules of a given name.
-
-In this example:
-
-```
-Start -> Items;
-
-Items -> Item ItemsMore;
-Items -> ;
-```
-
-The `Start` structure will have a field called `pItems` and another field of
-the same name but with a positional suffix (`pItems1`) which both point to the
-parsed `Items` node.
-Their value will be null if the parsed `Items` rule was empty.
-
-The `Items` structure will have fields:
-
-  * `pItem` and `pItem1` which point to the parsed `Item` structure.
-  * `pItemsMore` and `pItemsMore2` which point to the parsed `ItemsMore` structure.
-
-If a rule can be empty (for example in the second `Items` rule above), then
-an instance of a pointer to that rule's generated AST node will be null if the
-parser matches the empty rule definition.
-
-The non-positional AST node field pointer will not be generated if there are
-multiple positions in which an instance of the node it points to could be
-present.
-For example, in the below rules:
-
-```
-Dual -> One Two;
-Dual -> Two One;
-```
-
-The generated `Dual` structure will contain `pOne1`, `pTwo2`, `pTwo1`, and
-`pOne2` fields.
-However, a `pOne` field and `pTwo` field will not be generated since it would
-be ambiguous which one was matched.
-
-If the first rule is matched, then `pOne1` and `pTwo2` will be non-null while
-`pTwo1` and `pOne2` will be null.
-If the second rule is matched instead, then the opposite would be the case.
-
-##> Functions
-
-### `p_context_init`
-
-The `p_context_init()` function must be called to initialize the context
-structure.
-The input to be used for lexing/parsing is passed in when initializing the
-context structure.
-
-C example:
-
-```
-p_context_t context;
-p_context_init(&context, input, input_length);
-```
-
-D example:
-
-```
-p_context_t context;
-p_context_init(&context, input);
-```
-
-### `p_parse`
-
-The `p_parse()` function is the main entry point to the parser.
-It must be passed a pointer to an initialized context structure.
-
-Example:
-
-```
-p_context_t context;
-p_context_init(&context, input, input_length);
-size_t result = p_parse(&context);
-```
-
-### `p_result`
-
-The `p_result()` function can be used to retrieve the final parse value after
-`p_parse()` returns a `P_SUCCESS` value.
-
-Example:
-
-```
-p_context_t context;
-p_context_init(&context, input, input_length);
-size_t result = p_parse(&context);
-if (p_parse(&context) == P_SUCCESS)
-{
-    result = p_result(&context);
-}
-```
-
-If AST generation mode is active, then the `p_result()` function returns a
-`Start *` pointing to the `Start` AST structure.
-
-### `p_position`
-
-The `p_position()` function can be used to retrieve the parser position where
-an error occurred.
-
-Example:
-
-```
-p_context_t context;
-p_context_init(&context, input, input_length);
-size_t result = p_parse(&context);
-if (p_parse(&context) == P_UNEXPECTED_TOKEN)
-{
-    p_position_t error_position = p_position(&context);
-    fprintf(stderr, "Error: unexpected token at row %u column %u\n",
-        error_position.row + 1, error_position.col + 1);
-}
-```
-
-### `p_user_terminate_code`
-
-The `p_user_terminate_code()` function can be used to retrieve the user
-terminate code after `p_parse()` returns a `P_USER_TERMINATED` value.
-User terminate codes are arbitrary values that can be defined by the user to
-be returned when the user requests to terminate parsing.
-They have no particular meaning to Propane.
-
-Example:
-
-```
-if (p_parse(&context) == P_USER_TERMINATED)
-{
-    size_t user_terminate_code = p_user_terminate_code(&context);
-}
-```
-
-### `p_token`
-
-The `p_token()` function can be used to retrieve the current parse token.
-This is useful after `p_parse()` returns a `P_UNEXPECTED_TOKEN` value.
-terminate code after `p_parse()` returns a `P_USER_TERMINATED` value to
-indicate what token the parser was not expecting.
-
-Example:
-
-```
-if (p_parse(&context) == P_UNEXPECTED_TOKEN)
-{
-    p_token_t unexpected_token = p_token(&context);
-}
-```
-
-##> Data
-
-### `p_token_names`
-
-The `p_token_names` array contains the grammar-specified token names.
-It is indexed by the token ID.
-
-C example:
-
-```
-p_context_t context;
-p_context_init(&context, input, input_length);
-size_t result = p_parse(&context);
-if (p_parse(&context) == P_UNEXPECTED_TOKEN)
-{
-    p_position_t error_position = p_position(&context);
-    fprintf(stderr, "Error: unexpected token `%s' at row %u column %u\n",
-        p_token_names[context.token],
-        error_position.row + 1, error_position.col + 1);
-}
 ```

 #> License
@@ -1,7 +1,6 @@
 require "erb"
 require "set"
 require "stringio"
-require_relative "propane/assets"
 require_relative "propane/cli"
 require_relative "propane/code_point_range"
 require_relative "propane/fa"
@@ -1,10 +0,0 @@
-class Propane
-  module Assets
-    class << self
-      def get(name)
-        path = File.join(File.dirname(File.expand_path(__FILE__)), "../../assets/#{name}")
-        File.binread(path)
-      end
-    end
-  end
-end
@@ -24,7 +24,7 @@ EOF
              log_file = args[i]
            end
          when "--version"
-            puts "propane version #{VERSION}"
+            puts "propane v#{VERSION}"
            return 0
          when "-h", "--help"
            puts USAGE
@@ -10,6 +10,7 @@ class Propane
      else
        @log = StringIO.new
      end
+      @classname = @grammar.classname || File.basename(output_file).sub(%r{[^a-zA-Z0-9].*}, "").capitalize
      @language =
        if output_file =~ /\.([a-z]+)$/
          $1
@@ -25,8 +26,7 @@ class Propane
        extensions += %w[h]
      end
      extensions.each do |extension|
-        template = Assets.get("parser.#{extension}.erb")
-        erb = ERB.new(template, trim_mode: "<>")
+        erb = ERB.new(File.read(File.join(File.dirname(File.expand_path(__FILE__)), "../../assets/parser.#{extension}.erb")), trim_mode: "<>")
        output_file = @output_file.sub(%r{\.[a-z]+$}, ".#{extension}")
        result = erb.result(binding.clone)
        File.open(output_file, "wb") do |fh|
@@ -119,9 +119,6 @@ class Propane
        end
      end
      determine_possibly_empty_rulesets!(rule_sets)
-      rule_sets.each do |name, rule_set|
-        rule_set.finalize
-      end
      # Generate the lexer.
      @lexer = Lexer.new(@grammar)
      # Generate the parser.
@@ -201,24 +198,9 @@ class Propane
      code = code.gsub(/\$token\(([$\w]+)\)/) do |match|
        "TOKEN_#{Token.code_name($1)}"
      end
-      code = code.gsub(/\$terminate\((.*)\);/) do |match|
-        user_terminate_code = $1
-        retval = rule ? "P_USER_TERMINATED" : "TERMINATE_TOKEN_ID"
-        case @language
-        when "c"
-          "context->user_terminate_code = (#{user_terminate_code}); return #{retval};"
-        when "d"
-          "context.user_terminate_code = (#{user_terminate_code}); return #{retval};"
-        end
-      end
      if parser
        code = code.gsub(/\$\$/) do |match|
-          case @language
-          when "c"
-            "_pvalue->v_#{rule.ptypename}"
-          when "d"
-            "_pvalue.v_#{rule.ptypename}"
-          end
+          "_pvalue.v_#{rule.ptypename}"
        end
        code = code.gsub(/\$(\d+)/) do |match|
          index = $1.to_i
@@ -231,20 +213,11 @@ class Propane
        end
      else
        code = code.gsub(/\$\$/) do |match|
-          if @grammar.ast
-            case @language
-            when "c"
-              "out_token_info->pvalue"
-            when "d"
-              "out_token_info.pvalue"
-            end
-          else
-            case @language
-            when "c"
-              "out_token_info->pvalue.v_#{pattern.ptypename}"
-            when "d"
-              "out_token_info.pvalue.v_#{pattern.ptypename}"
-            end
+          case @language
+          when "c"
+            "out_token_info->pvalue.v_#{pattern.ptypename}"
+          when "d"
+            "out_token_info.pvalue.v_#{pattern.ptypename}"
          end
        end
        code = code.gsub(/\$mode\(([a-zA-Z_][a-zA-Z_0-9]*)\)/) do |match|
@@ -5,7 +5,7 @@ class Propane
    # Reserve identifiers beginning with a double-underscore for internal use.
    IDENTIFIER_REGEX = /(?:[a-zA-Z]|_[a-zA-Z0-9])[a-zA-Z_0-9]*/

-    attr_reader :ast
+    attr_reader :classname
    attr_reader :modulename
    attr_reader :patterns
    attr_reader :rules
@@ -18,14 +18,13 @@ class Propane
      @patterns = []
      @tokens = []
      @rules = []
-      @code_blocks = {}
+      @code_blocks = []
      @line_number = 1
      @next_line_number = @line_number
      @mode = nil
      @input = input.gsub("\r\n", "\n")
      @ptypes = {"default" => "void *"}
      @prefix = "p_"
-      @ast = false
      parse_grammar!
    end

@@ -37,10 +36,6 @@ class Propane
      @tokens.size
    end

-    def terminate_token_id
-      @tokens.size + 1
-    end
-
    private

    def parse_grammar!
@@ -53,8 +48,8 @@ class Propane
      if parse_white_space!
      elsif parse_comment_line!
      elsif @mode.nil? && parse_mode_label!
-      elsif parse_ast_statement!
      elsif parse_module_statement!
+      elsif parse_class_statement!
      elsif parse_ptype_statement!
      elsif parse_pattern_statement!
      elsif parse_token_statement!
@@ -85,12 +80,6 @@ class Propane
      consume!(/#.*\n/)
    end

-    def parse_ast_statement!
-      if consume!(/ast\s*;/)
-        @ast = true
-      end
-    end
-
    def parse_module_statement!
      if consume!(/module\s+/)
        md = consume!(/([\w.]+)\s*/, "expected module name")
@@ -101,13 +90,20 @@ class Propane
      end
    end

+    def parse_class_statement!
+      if consume!(/class\s+/)
+        md = consume!(/([\w.]+)\s*/, "expected class name")
+        @classname = md[1]
+        consume!(/;/, "expected `;'")
+        @mode = nil
+        true
+      end
+    end
+
    def parse_ptype_statement!
      if consume!(/ptype\s+/)
        name = "default"
        if md = consume!(/(#{IDENTIFIER_REGEX})\s*=\s*/)
-          if @ast
-            raise Error.new("Multiple ptypes are unsupported in AST mode")
-          end
          name = md[1]
        end
        md = consume!(/([^;]+);/, "expected parser result type expression")
@@ -120,15 +116,12 @@ class Propane
        md = consume!(/(#{IDENTIFIER_REGEX})\s*/, "expected token name")
        name = md[1]
        if md = consume!(/\((#{IDENTIFIER_REGEX})\)\s*/)
-          if @ast
-            raise Error.new("Multiple ptypes are unsupported in AST mode")
-          end
          ptypename = md[1]
        end
        pattern = parse_pattern! || name
        consume!(/\s+/)
        unless code = parse_code_block!
-          consume!(/;/, "expected `;' or code block")
+          consume!(/;/, "expected pattern or `;' or code block")
        end
        token = Token.new(name, ptypename, @line_number)
        @tokens << token
@@ -144,9 +137,6 @@ class Propane
        md = consume!(/(#{IDENTIFIER_REGEX})\s*/, "expected token name")
        name = md[1]
        if md = consume!(/\((#{IDENTIFIER_REGEX})\)\s*/)
-          if @ast
-            raise Error.new("Multiple ptypes are unsupported in AST mode")
-          end
          ptypename = md[1]
        end
        consume!(/;/, "expected `;'");
@@ -174,17 +164,10 @@ class Propane
    def parse_rule_statement!
      if md = consume!(/(#{IDENTIFIER_REGEX})\s*(?:\((#{IDENTIFIER_REGEX})\))?\s*->\s*/)
        rule_name, ptypename = *md[1, 2]
-        if @ast && ptypename
-          raise Error.new("Multiple ptypes are unsupported in AST mode")
-        end
        md = consume!(/((?:#{IDENTIFIER_REGEX}\s*)*)\s*/, "expected rule component list")
        components = md[1].strip.split(/\s+/)
-        if @ast
-          consume!(/;/, "expected `;'")
-        else
-          unless code = parse_code_block!
-            consume!(/;/, "expected `;' or code block")
-          end
+        unless code = parse_code_block!
+          consume!(/;/, "expected pattern or `;' or code block")
        end
        @rules << Rule.new(rule_name, components, code, ptypename, @line_number)
        @mode = nil
@@ -196,9 +179,6 @@ class Propane
      if pattern = parse_pattern!
        consume!(/\s+/)
        if md = consume!(/\((#{IDENTIFIER_REGEX})\)\s*/)
-          if @ast
-            raise Error.new("Multiple ptypes are unsupported in AST mode")
-          end
          ptypename = md[1]
        end
        unless code = parse_code_block!
@@ -211,15 +191,8 @@ class Propane
    end

    def parse_code_block_statement!
-      if md = consume!(/<<([a-z]*)(.*?)>>\n/m)
-        name, code = md[1..2]
-        code.sub!(/\A\n/, "")
-        code += "\n" unless code.end_with?("\n")
-        if @code_blocks[name]
-          @code_blocks[name] += code
-        else
-          @code_blocks[name] = code
-        end
+      if code = parse_code_block!
+        @code_blocks << code
        @mode = nil
        true
      end
@@ -252,11 +225,8 @@ class Propane
    end

    def parse_code_block!
-      if md = consume!(/<<(.*?)>>\n/m)
-        code = md[1]
-        code.sub!(/\A\n/, "")
-        code += "\n" unless code.end_with?("\n")
-        code
+      if md = consume!(/<<\n(.*?)^>>\n/m)
+        md[1]
      end
    end

@@ -63,11 +63,11 @@ class Propane
        reduce_entries =
          case ra = item_set.reduce_actions
          when Rule
-            [{token_id: @grammar.invalid_token_id, rule_id: ra.id, rule: ra,
+            [{token_id: @grammar.invalid_token_id, rule_id: ra.id,
              rule_set_id: ra.rule_set.id, n_states: ra.components.size}]
          when Hash
            ra.map do |token, rule|
-              {token_id: token.id, rule_id: rule.id, rule: rule,
+              {token_id: token.id, rule_id: rule.id,
               rule_set_id: rule.rule_set.id, n_states: rule.components.size}
            end
          else
@@ -134,7 +134,7 @@ class Propane
      # possible following tokens, we will only look in the item sets leading
      # up to this one. This restriction gives us a more precise lookahead set,
      # and allows us to parse LALR grammars.
-      item_sets = Set[item_set] + item_set.leading_item_sets
+      item_sets = item_set.leading_item_sets
      reduce_rules.reduce({}) do |reduce_actions, reduce_rule|
        lookahead_tokens_for_rule = build_lookahead_tokens_to_reduce(reduce_rule, item_sets)
        lookahead_tokens_for_rule.each do |lookahead_token|
@@ -87,24 +87,14 @@ class Propane

      # Set of ItemSets that lead to this ItemSet.
      #
+      # This set includes this ItemSet.
+      #
      # @return [Set<ItemSet>]
      #   Set of all ItemSets that lead up to this ItemSet.
      def leading_item_sets
-        result = Set.new
-        eval_sets = Set[self]
-        evaled = Set.new
-        while eval_sets.size > 0
-          eval_set = eval_sets.first
-          eval_sets.delete(eval_set)
-          evaled << eval_set
-          eval_set.in_sets.each do |in_set|
-            result << in_set
-            unless evaled.include?(in_set)
-              eval_sets << in_set
-            end
-          end
+        @in_sets.reduce(Set[self]) do |result, item_set|
+          result + item_set.leading_item_sets
        end
-        result
      end

      # Represent the ItemSet as a String.
@@ -134,18 +134,8 @@ class Propane
      else
        c = @pattern.slice!(0)
        case c
-        when "a"
-          CharacterRangeUnit.new("\a", "\a")
-        when "b"
-          CharacterRangeUnit.new("\b", "\b")
        when "d"
          CharacterRangeUnit.new("0", "9")
-        when "f"
-          CharacterRangeUnit.new("\f", "\f")
-        when "n"
-          CharacterRangeUnit.new("\n", "\n")
-        when "r"
-          CharacterRangeUnit.new("\r", "\r")
        when "s"
          ccu = CharacterClassUnit.new
          ccu << CharacterRangeUnit.new(" ")
@@ -155,10 +145,6 @@ class Propane
          ccu << CharacterRangeUnit.new("\f")
          ccu << CharacterRangeUnit.new("\v")
          ccu
-        when "t"
-          CharacterRangeUnit.new("\t", "\t")
-        when "v"
-          CharacterRangeUnit.new("\v", "\v")
        else
          CharacterRangeUnit.new(c)
        end
@@ -30,11 +30,6 @@ class Propane
    #   The RuleSet that this Rule is a part of.
    attr_accessor :rule_set

-    # @return [Array<Integer>]
-    #   Map this rule's components to their positions in the parent RuleSet's
-    #   node field pointer array. This is used for AST construction.
-    attr_accessor :rule_set_node_field_index_map
-
    # Construct a Rule.
    #
    # @param name [String]
@@ -50,7 +45,6 @@ class Propane
    def initialize(name, components, code, ptypename, line_number)
      @name = name
      @components = components
-      @rule_set_node_field_index_map = components.map {0}
      @code = code
      @ptypename = ptypename
      @line_number = line_number
@@ -74,17 +68,6 @@ class Propane
      "#{@name} -> #{@components.map(&:name).join(" ")}"
    end

-    # Check whether the rule set node field index map is just a 1:1 mapping.
-    #
-    # @return [Boolean]
-    #   Boolean indicating whether the rule set node field index map is just a
-    #   1:1 mapping.
-    def flat_rule_set_node_field_index_map?
-      @rule_set_node_field_index_map.each_with_index.all? do |v, i|
-        v == i
-      end
-    end
-
  end

 end
@@ -1,6 +1,5 @@
 class Propane

-  # A RuleSet collects all grammar rules of the same name.
  class RuleSet

    # @return [Integer]
@@ -76,56 +75,6 @@ class Propane
      @_start_token_set
    end

-    # Build the set of AST fields for this RuleSet.
-    #
-    # This is an Array of Hashes. Each entry in the Array corresponds to a
-    # field location in the AST node. The entry is a Hash. It could have one or
-    # two keys. It will always have the field name with a positional suffix as
-    # a key. It may also have the field name without the positional suffix if
-    # that field only exists in one position across all Rules in the RuleSet.
-    #
-    # @return [Array<Hash>]
-    #   AST fields.
-    def ast_fields
-      @_ast_fields ||=
-        begin
-          field_ast_node_indexes = {}
-          field_indexes_across_all_rules = {}
-          ast_node_fields = []
-          @rules.each do |rule|
-            rule.components.each_with_index do |component, i|
-              if component.is_a?(Token)
-                node_name = "Token"
-              else
-                node_name = component.name
-              end
-              field_name = "p#{node_name}#{i + 1}"
-              unless field_ast_node_indexes[field_name]
-                field_ast_node_indexes[field_name] = ast_node_fields.size
-                ast_node_fields << {field_name => node_name}
-              end
-              field_indexes_across_all_rules[node_name] ||= Set.new
-              field_indexes_across_all_rules[node_name] << field_ast_node_indexes[field_name]
-              rule.rule_set_node_field_index_map[i] = field_ast_node_indexes[field_name]
-            end
-          end
-          field_indexes_across_all_rules.each do |node_name, indexes_across_all_rules|
-            if indexes_across_all_rules.size == 1
-              # If this field was only seen in one position across all rules,
-              # then add an alias to the positional field name that does not
-              # include the position.
-              ast_node_fields[indexes_across_all_rules.first]["p#{node_name}"] = node_name
-            end
-          end
-          ast_node_fields
-        end
-    end
-
-    # Finalize a RuleSet after adding all Rules to it.
-    def finalize
-      ast_fields
-    end
-
  end

 end
@@ -1,3 +1,3 @@
 class Propane
-  VERSION = "1.3.0"
+  VERSION = "0.1.0"
 end
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec bundle exec ruby -Ilib bin/propane "$@"
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby

-require "erb"
 require "fileutils"
 require "digest/md5"

@@ -14,24 +13,6 @@ START_FILE = "bin/#{PROG_NAME}"
 LIB_DIR = "lib"
 DIST = "dist"

-ASSETS_TEMPLATE = <<EOF
-class Propane
-  module Assets
-    class << self
-      def get(name)
-        case name
-<% Dir.glob("assets/*").each  do |asset_file| %>
-        when <%= File.basename(asset_file).inspect %>
-          <%= File.binread(asset_file).inspect %>
-<% end %>
-        end
-      end
-    end
-  end
-end
-EOF
-
-assets_module = ERB.new(ASSETS_TEMPLATE, trim_mode: "<>").result
 files_processed = {}
 combined_file = []

@@ -44,11 +25,7 @@ combine_files = lambda do |file|
        if File.exist?(path)
          unless files_processed[path]
            files_processed[path] = true
-            if require_name == "propane/assets"
-              combined_file << assets_module
-            else
-              combine_files[path]
-            end
+            combine_files[path]
          end
        else
          raise "require path #{path.inspect} not found"
@@ -1,183 +0,0 @@
-<<header
-#include "json_types.h"
-#include "testutils.h"
->>
-<<
-#include "math.h"
-#include <stdbool.h>
-static str_t string_value;
->>
-
-ptype JSONValue *;
-
-drop /\s+/;
-token lbrace /\{/;
-token rbrace /\}/;
-token lbracket /\[/;
-token rbracket /\]/;
-token comma /,/;
-token colon /:/;
-token number /-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][-+]?[0-9]+)?/ <<
-    double n = 0.0;
-    bool negative = false;
-    size_t i = 0u;
-    if (match[i] == '-')
-    {
-        negative = true;
-        i++;
-    }
-    while ('0' <= match[i] && match[i] <= '9')
-    {
-        n *= 10.0;
-        n += (match[i] - '0');
-        i++;
-    }
-    if (match[i] == '.')
-    {
-        i++;
-        double mult = 0.1;
-        while ('0' <= match[i] && match[i] <= '9')
-        {
-            n += mult * (match[i] - '0');
-            mult /= 10.0;
-            i++;
-        }
-    }
-    if (match[i] == 'e' || match[i] == 'E')
-    {
-        bool exp_negative = false;
-        i++;
-        if (match[i] == '-')
-        {
-            exp_negative = true;
-            i++;
-        }
-        else if (match[i] == '+')
-        {
-            i++;
-        }
-        long exp = 0.0;
-        while ('0' <= match[i] && match[i] <= '9')
-        {
-            exp *= 10;
-            exp += (match[i] - '0');
-            i++;
-        }
-        if (exp_negative)
-        {
-            exp = -exp;
-        }
-        n = pow(n, exp);
-    }
-    if (negative)
-    {
-        n = -n;
-    }
-    $$ = JSONValue_new(JSON_NUMBER);
-    $$->number = n;
->>
-token true <<
-  $$ = JSONValue_new(JSON_TRUE);
->>
-token false <<
-  $$ = JSONValue_new(JSON_FALSE);
->>
-token null <<
-  $$ = JSONValue_new(JSON_NULL);
->>
-/"/ <<
-  $mode(string);
-  str_init(&string_value, "");
->>
-string: token string /"/ <<
-  $$ = JSONValue_new(JSON_STRING);
-  $$->string = string_value;
-  $mode(default);
->>
-string: /\\"/ <<
-  str_append(&string_value, "\"");
->>
-string: /\\\\/ <<
-  str_append(&string_value, "\\");
->>
-string: /\\\// <<
-  str_append(&string_value, "/");
->>
-string: /\\b/ <<
-  str_append(&string_value, "\b");
->>
-string: /\\f/ <<
-  str_append(&string_value, "\f");
->>
-string: /\\n/ <<
-  str_append(&string_value, "\n");
->>
-string: /\\r/ <<
-  str_append(&string_value, "\r");
->>
-string: /\\t/ <<
-  str_append(&string_value, "\t");
->>
-string: /\\u[0-9a-fA-F]{4}/ <<
-  /* Not actually going to encode the code point for this example... */
-  char s[] = {'{', match[2], match[3], match[4], match[5], '}', 0};
-  str_append(&string_value, s);
->>
-string: /[^\\]/ <<
-  char s[] = {match[0], 0};
-  str_append(&string_value, s);
->>
-Start -> Value <<
-  $$ = $1;
->>
-Value -> string <<
-  $$ = $1;
->>
-Value -> number <<
-  $$ = $1;
->>
-Value -> Object <<
-  $$ = $1;
->>
-Value -> Array <<
-  $$ = $1;
->>
-Value -> true <<
-  $$ = $1;
->>
-Value -> false <<
-  $$ = $1;
->>
-Value -> null <<
-  $$ = $1;
->>
-Object -> lbrace rbrace <<
-  $$ = JSONObject_new();
->>
-Object -> lbrace KeyValues rbrace <<
-  $$ = $2;
->>
-KeyValues -> KeyValue <<
-  $$ = $1;
->>
-KeyValues -> KeyValues comma KeyValue <<
-  JSONObject_append($1, $3->object.entries[0].name, $3->object.entries[0].value);
-  $$ = $1;
->>
-KeyValue -> string colon Value <<
-  $$ = JSONObject_new();
-  JSONObject_append($$, str_cstr(&$1->string), $3);
->>
-Array -> lbracket rbracket <<
-  $$ = JSONArray_new();
->>
-Array -> lbracket Values rbracket <<
-  $$ = $2;
->>
-Values -> Value <<
-  $$ = $1;
->>
-Values -> Values comma Value <<
-  JSONArray_append($1, $3);
-  $$ = $1;
->>
@@ -1,64 +0,0 @@
-#include "json_types.h"
-#include <string.h>
-#include <stdlib.h>
-#include "testutils.h"
-
-JSONValue * JSONValue_new(size_t id)
-{
-    JSONValue * jv = calloc(1, sizeof(JSONValue));
-    jv->id = id;
-    return jv;
-}
-
-JSONValue * JSONObject_new(void)
-{
-    JSONValue * jv = JSONValue_new(JSON_OBJECT);
-    jv->object.size = 0u;
-    return jv;
-}
-
-void JSONObject_append(JSONValue * object, char const * name, JSONValue * value)
-{
-    size_t const size = object->object.size;
-    for (size_t i = 0u; i < size; i++)
-    {
-        if (strcmp(name, object->object.entries[i].name) == 0)
-        {
-            object->object.entries[i].value = value;
-            return;
-        }
-    }
-    size_t const new_size = size + 1;
-    void * new_entries = malloc(sizeof(object->object.entries[0]) * new_size);
-    if (size > 0)
-    {
-        memcpy(new_entries, object->object.entries, size * sizeof(object->object.entries[0]));
-        free(object->object.entries);
-    }
-    object->object.entries = new_entries;
-    object->object.entries[size].name = name;
-    object->object.entries[size].value = value;
-    object->object.size = new_size;
-}
-
-JSONValue * JSONArray_new(void)
-{
-    JSONValue * jv = JSONValue_new(JSON_ARRAY);
-    jv->array.size = 0u;
-    return jv;
-}
-
-void JSONArray_append(JSONValue * array, JSONValue * value)
-{
-    size_t const size = array->array.size;
-    size_t const new_size = size + 1;
-    JSONValue ** new_entries = malloc(sizeof(JSONValue *) * new_size);
-    if (array->array.size > 0)
-    {
-        memcpy(new_entries, array->array.entries, sizeof(JSONValue *) * size);
-        free(array->array.entries);
-    }
-    array->array.entries = new_entries;
-    array->array.entries[size] = value;
-    array->array.size = new_size;
-}
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-#include "testutils.h"
-
-#define JSON_OBJECT 0u
-#define JSON_ARRAY 1u
-#define JSON_NUMBER 2u
-#define JSON_STRING 3u
-#define JSON_TRUE 4u
-#define JSON_FALSE 5u
-#define JSON_NULL 6u
-
-typedef struct JSONValue_s
-{
-    size_t id;
-    union
-    {
-        struct
-        {
-            size_t size;
-            struct
-            {
-                char const * name;
-                struct JSONValue_s * value;
-            } * entries;
-        } object;
-        struct
-        {
-            size_t size;
-            struct JSONValue_s ** entries;
-        } array;
-        double number;
-        str_t string;
-    };
-} JSONValue;
-
-JSONValue * JSONValue_new(size_t id);
-
-JSONValue * JSONObject_new(void);
-
-void JSONObject_append(JSONValue * object, char const * name, JSONValue * value);
-
-JSONValue * JSONArray_new(void);
-
-void JSONArray_append(JSONValue * array, JSONValue * value);
@@ -5,6 +5,7 @@ class Propane
 # Comment line

 module a.b;
+class Foobar;
 ptype   XYZ  *  ;

 token while;
@@ -29,6 +30,7 @@ B -> <<
 >>
 EOF
      grammar = Grammar.new(input)
+      expect(grammar.classname).to eq "Foobar"
      expect(grammar.modulename).to eq "a.b"
      expect(grammar.ptype).to eq "XYZ  *"
      expect(grammar.ptypes).to eq("default" => "XYZ  *")
@@ -36,44 +38,44 @@ EOF

      o = grammar.tokens.find {|token| token.name == "while"}
      expect(o).to_not be_nil
-      expect(o.line_number).to eq 6
+      expect(o.line_number).to eq 7

      o = grammar.patterns.find {|pattern| pattern.token == o}
      expect(o).to_not be_nil
      expect(o.pattern).to eq "while"
-      expect(o.line_number).to eq 6
+      expect(o.line_number).to eq 7
      expect(o.code).to be_nil

      o = grammar.tokens.find {|token| token.name == "id"}
      expect(o).to_not be_nil
-      expect(o.line_number).to eq 9
+      expect(o.line_number).to eq 10

      o = grammar.patterns.find {|pattern| pattern.token == o}
      expect(o).to_not be_nil
      expect(o.pattern).to eq "[a-zA-Z_][a-zA-Z_0-9]*"
-      expect(o.line_number).to eq 9
+      expect(o.line_number).to eq 10
      expect(o.code).to be_nil

      o = grammar.tokens.find {|token| token.name == "token_with_code"}
      expect(o).to_not be_nil
-      expect(o.line_number).to eq 11
+      expect(o.line_number).to eq 12

      o = grammar.patterns.find {|pattern| pattern.token == o}
      expect(o).to_not be_nil
      expect(o.pattern).to eq "token_with_code"
-      expect(o.line_number).to eq 11
+      expect(o.line_number).to eq 12
      expect(o.code).to eq "Code for the token\n"

      o = grammar.tokens.find {|token| token.name == "token_with_no_pattern"}
      expect(o).to_not be_nil
-      expect(o.line_number).to eq 15
+      expect(o.line_number).to eq 16

      o = grammar.patterns.find {|pattern| pattern.token == o}
      expect(o).to be_nil

      o = grammar.patterns.find {|pattern| pattern.pattern == "\\s+"}
      expect(o).to_not be_nil
-      expect(o.line_number).to eq 17
+      expect(o.line_number).to eq 18
      expect(o.token).to be_nil
      expect(o.code).to be_nil

@@ -82,19 +84,19 @@ EOF
      o = grammar.rules[0]
      expect(o.name).to eq "A"
      expect(o.components).to eq %w[B]
-      expect(o.line_number).to eq 19
+      expect(o.line_number).to eq 20
      expect(o.code).to eq "  a = 42;\n"

      o = grammar.rules[1]
      expect(o.name).to eq "B"
      expect(o.components).to eq %w[C while id]
-      expect(o.line_number).to eq 22
+      expect(o.line_number).to eq 23
      expect(o.code).to be_nil

      o = grammar.rules[2]
      expect(o.name).to eq "B"
      expect(o.components).to eq []
-      expect(o.line_number).to eq 23
+      expect(o.line_number).to eq 24
      expect(o.code).to eq "  b = 0;\n"
    end

@@ -4,56 +4,14 @@ require "open3"
 Results = Struct.new(:stdout, :stderr, :status)

 describe Propane do
-  before(:all) do
-    @statics = {}
-  end
-
  def write_grammar(grammar, options = {})
    options[:name] ||= ""
    File.write("spec/run/testparser#{options[:name]}.propane", grammar)
  end

-  def run_propane(options = {})
-    @statics[:build_test_id] ||= 0
-    @statics[:build_test_id] += 1
-    if ENV["dist_specs"]
-      command = %W[dist/propane]
-    else
-      command = %W[ruby -I spec/run -r _simplecov_setup -I lib bin/propane]
-      command_prefix =
-        if ENV["partial_specs"]
-          "p"
-        else
-          "b"
-        end
-      command_name = "#{command_prefix}#{@statics[:build_test_id]}"
-      File.open("spec/run/_simplecov_setup.rb", "w") do |fh|
-        fh.puts <<EOF
-require "bundler"
-Bundler.setup
-require "simplecov"
-class MyFormatter
-  def format(*args)
-  end
-end
-SimpleCov.start do
-  command_name(#{command_name.inspect})
-  filters.clear
-  add_filter do |src|
-    !(src.filename[SimpleCov.root])
-  end
-  formatter(MyFormatter)
-end
-# force color off
-ENV["TERM"] = nil
-EOF
-      end
-    end
-    if options[:args]
-      command += options[:args]
-    else
-      command += %W[spec/run/testparser#{options[:name]}.propane spec/run/testparser#{options[:name]}.#{options[:language]} --log spec/run/testparser#{options[:name]}.log]
-    end
+  def build_parser(options = {})
+    options[:name] ||= ""
+    command = %W[./propane.sh spec/run/testparser#{options[:name]}.propane spec/run/testparser#{options[:name]}.#{options[:language]} --log spec/run/testparser#{options[:name]}.log]
    if (options[:capture])
      stdout, stderr, status = Open3.capture3(*command)
      Results.new(stdout, stderr, status)
@@ -78,7 +36,7 @@ EOF
    expect(result).to be_truthy
  end

-  def run_test
+  def run
    stdout, stderr, status = Open3.capture3("spec/run/testparser")
    File.binwrite("spec/run/.stderr", stderr)
    File.binwrite("spec/run/.stdout", stdout)
@@ -116,38 +74,6 @@ EOF
    FileUtils.mkdir_p("spec/run")
  end

-  it "reports its version" do
-    results = run_propane(args: %w[--version], capture: true)
-    expect(results.stdout).to match /propane version \d+\.\d+/
-    expect(results.stderr).to eq ""
-    expect(results.status).to eq 0
-  end
-
-  it "shows help usage" do
-    results = run_propane(args: %w[-h], capture: true)
-    expect(results.stdout).to match /Usage/i
-    expect(results.stderr).to eq ""
-    expect(results.status).to eq 0
-  end
-
-  it "errors with unknown option" do
-    results = run_propane(args: %w[-i], capture: true)
-    expect(results.stderr).to match /Error: unknown option -i/
-    expect(results.status).to_not eq 0
-  end
-
-  it "errors when input and output files are not specified" do
-    results = run_propane(args: [], capture: true)
-    expect(results.stderr).to match /Error: specify input and output files/
-    expect(results.status).to_not eq 0
-  end
-
-  it "errors when input file is not readable" do
-    results = run_propane(args: %w[nope.txt out.d], capture: true)
-    expect(results.stderr).to match /Error: cannot read nope.txt/
-    expect(results.status).to_not eq 0
-  end
-
  %w[d c].each do |language|

    context "#{language.upcase} language" do
@@ -159,12 +85,14 @@ token plus /\\+/;
 token times /\\*/;
 drop /\\s+/;
 Start -> Foo;
-Foo -> int <<>>
-Foo -> plus <<>>
+Foo -> int <<
+>>
+Foo -> plus <<
+>>
 EOF
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_lexer.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.stderr).to eq ""
        expect(results.status).to eq 0
      end
@@ -183,7 +111,9 @@ token int /\\d+/ <<
  }
  $$ = v;
 >>
-Start -> int << $$ = $1; >>
+Start -> int <<
+  $$ = $1;
+>>
 EOF
        when "d"
          write_grammar <<EOF
@@ -197,12 +127,14 @@ token int /\\d+/ <<
  }
  $$ = v;
 >>
-Start -> int << $$ = $1; >>
+Start -> int <<
+  $$ = $1;
+>>
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_lexer_unknown_character.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.stderr).to eq ""
        expect(results.status).to eq 0
      end
@@ -220,7 +152,7 @@ E -> B;
 B -> zero;
 B -> one;
 EOF
-        run_propane(language: language)
+        build_parser(language: language)
      end

      it "generates a parser that does basic math - user guide example" do
@@ -249,15 +181,33 @@ token lparen /\\(/;
 token rparen /\\)/;
 drop /\\s+/;

-Start -> E1 << $$ = $1; >>
-E1 -> E2 << $$ = $1; >>
-E1 -> E1 plus E2 << $$ = $1 + $3; >>
-E2 -> E3 << $$ = $1; >>
-E2 -> E2 times E3 << $$ = $1 * $3; >>
-E3 -> E4 << $$ = $1; >>
-E3 -> E3 power E4 << $$ = (size_t)pow($1, $3); >>
-E4 -> integer << $$ = $1; >>
-E4 -> lparen E1 rparen << $$ = $2; >>
+Start -> E1 <<
+  $$ = $1;
+>>
+E1 -> E2 <<
+  $$ = $1;
+>>
+E1 -> E1 plus E2 <<
+  $$ = $1 + $3;
+>>
+E2 -> E3 <<
+  $$ = $1;
+>>
+E2 -> E2 times E3 <<
+  $$ = $1 * $3;
+>>
+E3 -> E4 <<
+  $$ = $1;
+>>
+E3 -> E3 power E4 <<
+  $$ = (size_t)pow($1, $3);
+>>
+E4 -> integer <<
+  $$ = $1;
+>>
+E4 -> lparen E1 rparen <<
+  $$ = $2;
+>>
 EOF
        when "d"
          write_grammar <<EOF
@@ -283,20 +233,38 @@ token lparen /\\(/;
 token rparen /\\)/;
 drop /\\s+/;

-Start -> E1 << $$ = $1; >>
-E1 -> E2 << $$ = $1; >>
-E1 -> E1 plus E2 << $$ = $1 + $3; >>
-E2 -> E3 << $$ = $1; >>
-E2 -> E2 times E3 << $$ = $1 * $3; >>
-E3 -> E4 << $$ = $1; >>
-E3 -> E3 power E4 << $$ = pow($1, $3); >>
-E4 -> integer << $$ = $1; >>
-E4 -> lparen E1 rparen << $$ = $2; >>
+Start -> E1 <<
+  $$ = $1;
+>>
+E1 -> E2 <<
+  $$ = $1;
+>>
+E1 -> E1 plus E2 <<
+  $$ = $1 + $3;
+>>
+E2 -> E3 <<
+  $$ = $1;
+>>
+E2 -> E2 times E3 <<
+  $$ = $1 * $3;
+>>
+E3 -> E4 <<
+  $$ = $1;
+>>
+E3 -> E3 power E4 <<
+  $$ = pow($1, $3);
+>>
+E4 -> integer <<
+  $$ = $1;
+>>
+E4 -> lparen E1 rparen <<
+  $$ = $2;
+>>
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_basic_math_grammar.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.stderr).to eq ""
        expect(results.status).to eq 0
      end
@@ -308,7 +276,7 @@ Start -> E;
 E -> one E;
 E -> one;
 EOF
-        run_propane(language: language)
+        build_parser(language: language)
      end

      it "distinguishes between multiple identical rules with lookahead symbol" do
@@ -320,9 +288,9 @@ Start -> R2 b;
 R1 -> a b;
 R2 -> a b;
 EOF
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_parser_identical_rules_lookahead.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
      end

@@ -335,9 +303,9 @@ Start -> a R1;
 Start -> b R1;
 R1 -> b;
 EOF
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_parser_rule_from_multiple_states.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
      end

@@ -370,9 +338,9 @@ Abcs -> ;
 Abcs -> abc Abcs;
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_user_code.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
        verify_lines(results.stdout, [
          "abc!",
@@ -402,13 +370,15 @@ EOF
 import std.stdio;
 >>
 token abc;
-/def/ << writeln("def!"); >>
+/def/ <<
+  writeln("def!");
+>>
 Start -> abc;
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_pattern.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
        verify_lines(results.stdout, [
          "def!",
@@ -427,7 +397,9 @@ EOF
 #include <stdio.h>
 >>
 token abc;
-/def/ << printf("def!\\n"); >>
+/def/ <<
+  printf("def!\\n");
+>>
 /ghi/ <<
  printf("ghi!\\n");
  return $token(abc);
@@ -440,7 +412,9 @@ EOF
 import std.stdio;
 >>
 token abc;
-/def/ << writeln("def!"); >>
+/def/ <<
+  writeln("def!");
+>>
 /ghi/ <<
  writeln("ghi!");
  return $token(abc);
@@ -448,9 +422,9 @@ token abc;
 Start -> abc;
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_return_token_from_pattern.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
        verify_lines(results.stdout, [
          "def!",
@@ -506,9 +480,9 @@ string: /"/ <<
 Start -> abc string def;
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_lexer_modes.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
        verify_lines(results.stdout, [
          "begin string mode",
@@ -529,9 +503,15 @@ EOF
 >>
 token a;
 token b;
-Start -> A B << printf("Start!\\n"); >>
-A -> a << printf("A!\\n"); >>
-B -> b << printf("B!\\n"); >>
+Start -> A B <<
+  printf("Start!\\n");
+>>
+A -> a <<
+  printf("A!\\n");
+>>
+B -> b <<
+  printf("B!\\n");
+>>
 EOF
        when "d"
          write_grammar <<EOF
@@ -540,14 +520,20 @@ import std.stdio;
 >>
 token a;
 token b;
-Start -> A B << writeln("Start!"); >>
-A -> a << writeln("A!"); >>
-B -> b << writeln("B!"); >>
+Start -> A B <<
+  writeln("Start!");
+>>
+A -> a <<
+  writeln("A!");
+>>
+B -> b <<
+  writeln("B!");
+>>
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_parser_rule_user_code.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
        verify_lines(results.stdout, [
          "A!",
@@ -560,13 +546,19 @@ EOF
        write_grammar <<EOF
 ptype #{language == "c" ? "uint32_t" : "uint"};
 token a;
-Start -> As << $$ = $1; >>
-As -> << $$ = 0u; >>
-As -> As a << $$ = $1 + 1u; >>
+Start -> As <<
+  $$ = $1;
+>>
+As -> <<
+  $$ = 0u;
+>>
+As -> As a <<
+  $$ = $1 + 1u;
+>>
 EOF
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_parsing_lists.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
        expect(results.stderr).to eq ""
      end
@@ -585,7 +577,7 @@ Start -> b E d;
 E -> e;
 F -> e;
 EOF
-        results = run_propane(capture: true, language: language)
+        results = build_parser(capture: true, language: language)
        expect(results.status).to_not eq 0
        expect(results.stderr).to match %r{reduce/reduce conflict.*\(E\).*\(F\)}
      end
@@ -617,9 +609,9 @@ token id /[a-zA-Z_][a-zA-Z0-9_]*/ <<
 Start -> id;
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_lexer_match_text.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.status).to eq 0
        verify_lines(results.stdout, [
          "Matched token is identifier_123",
@@ -650,9 +642,9 @@ Start -> word <<
 >>
 EOF
        end
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_lexer_result_value.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.stderr).to eq ""
        expect(results.status).to eq 0
      end
@@ -665,16 +657,16 @@ drop /\\s+/;
 Start -> a num Start;
 Start -> a num;
 EOF
-        run_propane(language: language)
+        build_parser(language: language)
        compile("spec/test_error_positions.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.stderr).to eq ""
        expect(results.status).to eq 0
      end

      it "allows creating a JSON parser" do
-        write_grammar(File.read("spec/json_parser.#{language}.propane"))
-        run_propane(language: language)
+        write_grammar(File.read("spec/json_parser.propane"))
+        build_parser(language: language)
        compile(["spec/test_parsing_json.#{language}", "spec/json_types.#{language}"], language: language)
      end

@@ -686,162 +678,16 @@ token num /\\d+/;
 drop /\\s+/;
 Start -> a num;
 EOF
-        run_propane(name: "myp1", language: language)
+        build_parser(name: "myp1", language: language)
        write_grammar(<<EOF, name: "myp2")
 prefix myp2_;
 token b;
 token c;
 Start -> b c b;
 EOF
-        run_propane(name: "myp2", language: language)
+        build_parser(name: "myp2", language: language)
        compile("spec/test_multiple_parsers.#{language}", parsers: %w[myp1 myp2], language: language)
-        results = run_test
-        expect(results.stderr).to eq ""
-        expect(results.status).to eq 0
-      end
-
-      it "allows the user to terminate the lexer" do
-        write_grammar <<EOF
-token a;
-token b <<
-  $terminate(8675309);
->>
-token c;
-Start -> Any;
-Any -> a;
-Any -> b;
-Any -> c;
-EOF
-        run_propane(language: language)
-        compile("spec/test_user_terminate_lexer.#{language}", language: language)
-        results = run_test
-        expect(results.stderr).to eq ""
-        expect(results.status).to eq 0
-      end
-
-      it "allows the user to terminate the parser" do
-        write_grammar <<EOF
-token a;
-token b;
-token c;
-Start -> Any;
-Any -> a Any;
-Any -> b Any << $terminate(4200); >>
-Any -> c Any;
-Any -> ;
-EOF
-        run_propane(language: language)
-        compile("spec/test_user_terminate.#{language}", language: language)
-        results = run_test
-        expect(results.stderr).to eq ""
-        expect(results.status).to eq 0
-      end
-
-      it "matches backslash escape sequences" do
-        case language
-        when "c"
-          write_grammar <<EOF
-<<
-  #include <stdio.h>
->>
-tokenid t;
-/\\a/ << printf("A\\n"); >>
-/\\b/ << printf("B\\n"); >>
-/\\t/ << printf("T\\n"); >>
-/\\n/ << printf("N\\n"); >>
-/\\v/ << printf("V\\n"); >>
-/\\f/ << printf("F\\n"); >>
-/\\r/ << printf("R\\n"); >>
-/t/ << return $token(t); >>
-Start -> t;
-EOF
-        when "d"
-          write_grammar <<EOF
-<<
-  import std.stdio;
->>
-tokenid t;
-/\\a/ << writeln("A"); >>
-/\\b/ << writeln("B"); >>
-/\\t/ << writeln("T"); >>
-/\\n/ << writeln("N"); >>
-/\\v/ << writeln("V"); >>
-/\\f/ << writeln("F"); >>
-/\\r/ << writeln("R"); >>
-/t/ <<
-  return $token(t);
->>
-Start -> t;
-EOF
-        end
-        run_propane(language: language)
-        compile("spec/test_match_backslashes.#{language}", language: language)
-        results = run_test
-        expect(results.stderr).to eq ""
-        expect(results.status).to eq 0
-        verify_lines(results.stdout, [
-          "A",
-          "B",
-          "T",
-          "N",
-          "V",
-          "F",
-          "R",
-        ])
-      end
-
-      it "handles when an item set leads to itself" do
-        write_grammar <<EOF
-token one;
-token two;
-
-Start -> Opt one Start;
-Start -> ;
-
-Opt -> two;
-Opt -> ;
-EOF
-        run_propane(language: language)
-      end
-
-      it "generates an AST" do
-        write_grammar <<EOF
-ast;
-
-ptype int;
-
-token a << $$ = 11; >>
-token b << $$ = 22; >>
-token one /1/;
-token two /2/;
-token comma /,/ <<
-  $$ = 42;
->>
-token lparen /\\(/;
-token rparen /\\)/;
-drop /\\s+/;
-
-Start -> Items;
-
-Items -> Item ItemsMore;
-Items -> ;
-
-ItemsMore -> comma Item ItemsMore;
-ItemsMore -> ;
-
-Item -> a;
-Item -> b;
-Item -> lparen Item rparen;
-Item -> Dual;
-
-Dual -> One Two;
-Dual -> Two One;
-One -> one;
-Two -> two;
-EOF
-        run_propane(language: language)
-        compile("spec/test_ast.#{language}", language: language)
-        results = run_test
+        results = run
        expect(results.stderr).to eq ""
        expect(results.status).to eq 0
      end
@@ -1,27 +1,11 @@
-unless ENV["dist_specs"]
-  require "bundler/setup"
-  require "simplecov"
+require "bundler/setup"
+require "propane"

-  SimpleCov.start do
-    add_filter "/spec/"
-    add_filter "/.bundle/"
-    if ENV["partial_specs"]
-      command_name "RSpec-partial"
-    else
-      command_name "RSpec"
-    end
-    project_name "Propane"
-    merge_timeout 3600
-  end
+RSpec.configure do |config|
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"

-  RSpec.configure do |config|
-    # Enable flags like --only-failures and --next-failure
-    config.example_status_persistence_file_path = ".rspec_status"
-
-    config.expect_with :rspec do |c|
-      c.syntax = :expect
-    end
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
  end
 end
-
-require "propane"
@@ -1,55 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-int main()
-{
-    char const * input = "a, ((b)), b";
-    p_context_t context;
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(&context));
-    Start * start = p_result(&context);
-    assert(start->pItems1 != NULL);
-    assert(start->pItems != NULL);
-    Items * items = start->pItems;
-    assert(items->pItem != NULL);
-    assert(items->pItem->pToken1 != NULL);
-    assert_eq(TOKEN_a, items->pItem->pToken1->token);
-    assert_eq(11, items->pItem->pToken1->pvalue);
-    assert(items->pItemsMore != NULL);
-    ItemsMore * itemsmore = items->pItemsMore;
-    assert(itemsmore->pItem != NULL);
-    assert(itemsmore->pItem->pItem != NULL);
-    assert(itemsmore->pItem->pItem->pItem != NULL);
-    assert(itemsmore->pItem->pItem->pItem->pToken1 != NULL);
-    assert_eq(TOKEN_b, itemsmore->pItem->pItem->pItem->pToken1->token);
-    assert_eq(22, itemsmore->pItem->pItem->pItem->pToken1->pvalue);
-    assert(itemsmore->pItemsMore != NULL);
-    itemsmore = itemsmore->pItemsMore;
-    assert(itemsmore->pItem != NULL);
-    assert(itemsmore->pItem->pToken1 != NULL);
-    assert_eq(TOKEN_b, itemsmore->pItem->pToken1->token);
-    assert_eq(22, itemsmore->pItem->pToken1->pvalue);
-    assert(itemsmore->pItemsMore == NULL);
-
-    input = "";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(&context));
-    start = p_result(&context);
-    assert(start->pItems == NULL);
-
-    input = "2 1";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(&context));
-    start = p_result(&context);
-    assert(start->pItems != NULL);
-    assert(start->pItems->pItem != NULL);
-    assert(start->pItems->pItem->pDual != NULL);
-    assert(start->pItems->pItem->pDual->pTwo1 != NULL);
-    assert(start->pItems->pItem->pDual->pOne2 != NULL);
-    assert(start->pItems->pItem->pDual->pTwo2 == NULL);
-    assert(start->pItems->pItem->pDual->pOne1 == NULL);
-
-    return 0;
-}
@@ -1,57 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input = "a, ((b)), b";
-    p_context_t context;
-    p_context_init(&context, input);
-    assert_eq(P_SUCCESS, p_parse(&context));
-    Start * start = p_result(&context);
-    assert(start.pItems1 !is null);
-    assert(start.pItems !is null);
-    Items * items = start.pItems;
-    assert(items.pItem !is null);
-    assert(items.pItem.pToken1 !is null);
-    assert_eq(TOKEN_a, items.pItem.pToken1.token);
-    assert_eq(11, items.pItem.pToken1.pvalue);
-    assert(items.pItemsMore !is null);
-    ItemsMore * itemsmore = items.pItemsMore;
-    assert(itemsmore.pItem !is null);
-    assert(itemsmore.pItem.pItem !is null);
-    assert(itemsmore.pItem.pItem.pItem !is null);
-    assert(itemsmore.pItem.pItem.pItem.pToken1 !is null);
-    assert_eq(TOKEN_b, itemsmore.pItem.pItem.pItem.pToken1.token);
-    assert_eq(22, itemsmore.pItem.pItem.pItem.pToken1.pvalue);
-    assert(itemsmore.pItemsMore !is null);
-    itemsmore = itemsmore.pItemsMore;
-    assert(itemsmore.pItem !is null);
-    assert(itemsmore.pItem.pToken1 !is null);
-    assert_eq(TOKEN_b, itemsmore.pItem.pToken1.token);
-    assert_eq(22, itemsmore.pItem.pToken1.pvalue);
-    assert(itemsmore.pItemsMore is null);
-
-    input = "";
-    p_context_init(&context, input);
-    assert_eq(P_SUCCESS, p_parse(&context));
-    start = p_result(&context);
-    assert(start.pItems is null);
-
-    input = "2 1";
-    p_context_init(&context, input);
-    assert_eq(P_SUCCESS, p_parse(&context));
-    start = p_result(&context);
-    assert(start.pItems !is null);
-    assert(start.pItems.pItem !is null);
-    assert(start.pItems.pItem.pDual !is null);
-    assert(start.pItems.pItem.pDual.pTwo1 !is null);
-    assert(start.pItems.pItem.pDual.pOne2 !is null);
-    assert(start.pItems.pItem.pDual.pTwo2 is null);
-    assert(start.pItems.pItem.pDual.pOne1 is null);
-}
@@ -14,14 +14,14 @@ int main()
    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
    assert(p_position(&context).row == 2);
    assert(p_position(&context).col == 3);
-    assert(p_token(&context) == TOKEN_a);
+    assert(context.token == TOKEN_a);

    input = "12";
    p_context_init(&context, (uint8_t const *)input, strlen(input));
    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
    assert(p_position(&context).row == 0);
    assert(p_position(&context).col == 0);
-    assert(p_token(&context) == TOKEN_num);
+    assert(context.token == TOKEN_num);

    input = "a 12\n\nab";
    p_context_init(&context, (uint8_t const *)input, strlen(input));
@@ -35,8 +35,5 @@ int main()
    assert(p_position(&context).row == 5);
    assert(p_position(&context).col == 4);

-    assert(strcmp(p_token_names[TOKEN_a], "a") == 0);
-    assert(strcmp(p_token_names[TOKEN_num], "num") == 0);
-
    return 0;
 }
@@ -17,13 +17,13 @@ unittest
    p_context_init(&context, input);
    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
    assert(p_position(&context) == p_position_t(2, 3));
-    assert(p_token(&context) == TOKEN_a);
+    assert(context.token == TOKEN_a);

    input = "12";
    p_context_init(&context, input);
    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
    assert(p_position(&context) == p_position_t(0, 0));
-    assert(p_token(&context) == TOKEN_num);
+    assert(context.token == TOKEN_num);

    input = "a 12\n\nab";
    p_context_init(&context, input);
@@ -34,7 +34,4 @@ unittest
    p_context_init(&context, input);
    assert(p_parse(&context) == P_DECODE_ERROR);
    assert(p_position(&context) == p_position_t(5, 4));
-
-    assert(p_token_names[TOKEN_a] == "a");
-    assert(p_token_names[TOKEN_num] == "num");
 }
@@ -1,13 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-
-int main()
-{
-    char const * input = "\a\b\t\n\v\f\rt";
-    p_context_t context;
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-
-    return 0;
-}
@@ -1,15 +0,0 @@
-import testparser;
-import std.stdio;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input = "\a\b\t\n\v\f\rt";
-    p_context_t context;
-    p_context_init(&context, input);
-    assert(p_parse(&context) == P_SUCCESS);
-}
@@ -1,56 +0,0 @@
-#include "testparser.h"
-#include "json_types.h"
-#include <string.h>
-#include <assert.h>
-
-int main()
-{
-    char const * input = "";
-    p_context_t context;
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-
-    input = "{}";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-    assert(p_result(&context)->id == JSON_OBJECT);
-
-    input = "[]";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-    assert(p_result(&context)->id == JSON_ARRAY);
-
-    input = "-45.6";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-    assert(p_result(&context)->id == JSON_NUMBER);
-    assert(p_result(&context)->number == -45.6);
-
-    input = "2E-2";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-    assert(p_result(&context)->id == JSON_NUMBER);
-    assert(p_result(&context)->number == 0.02);
-
-    input = "{\"hi\":true}";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-    JSONValue * o = p_result(&context);
-    assert(o->id == JSON_OBJECT);
-    assert_eq(1, o->object.size);
-    assert(strcmp(o->object.entries[0].name, "hi") == 0);
-    assert(o->object.entries[0].value->id == JSON_TRUE);
-
-    input = "{\"ff\": false, \"nn\": null}";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-    o = p_result(&context);
-    assert(o->id == JSON_OBJECT);
-    assert_eq(2, o->object.size);
-    assert(strcmp(o->object.entries[0].name, "ff") == 0);
-    assert(o->object.entries[0].value->id == JSON_FALSE);
-    assert(strcmp(o->object.entries[1].name, "nn") == 0);
-    assert(o->object.entries[1].value->id == JSON_NULL);
-
-    return 0;
-}
@@ -1,19 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-int main()
-{
-    char const * input = "aacc";
-    p_context_t context;
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-
-    input = "abc";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_USER_TERMINATED);
-    assert(p_user_terminate_code(&context) == 4200);
-
-    return 0;
-}
@@ -1,20 +0,0 @@
-import testparser;
-import std.stdio;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input = "aacc";
-    p_context_t context;
-    p_context_init(&context, input);
-    assert(p_parse(&context) == P_SUCCESS);
-
-    input = "abc";
-    p_context_init(&context, input);
-    assert(p_parse(&context) == P_USER_TERMINATED);
-    assert(p_user_terminate_code(&context) == 4200);
-}
@@ -1,19 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-int main()
-{
-    char const * input = "a";
-    p_context_t context;
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_SUCCESS);
-
-    input = "b";
-    p_context_init(&context, (uint8_t const *)input, strlen(input));
-    assert(p_parse(&context) == P_USER_TERMINATED);
-    assert(p_user_terminate_code(&context) == 8675309);
-
-    return 0;
-}
@@ -1,20 +0,0 @@
-import testparser;
-import std.stdio;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input = "a";
-    p_context_t context;
-    p_context_init(&context, input);
-    assert(p_parse(&context) == P_SUCCESS);
-
-    input = "b";
-    p_context_init(&context, input);
-    assert(p_parse(&context) == P_USER_TERMINATED);
-    assert(p_user_terminate_code(&context) == 8675309);
-}
@@ -1,9 +1,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include "testutils.h"

 void assert_eq_size_t_i(size_t expected, size_t actual, char const * file, size_t line)
 {
@@ -13,26 +10,3 @@ void assert_eq_size_t_i(size_t expected, size_t actual, char const * file, size_
        assert(false);
    }
 }
-
-void str_init(str_t * str, char const * cs)
-{
-    size_t length = strlen(cs);
-    str->cs = malloc(length + 1u);
-    strcpy(str->cs, cs);
-}
-
-void str_append(str_t * str, char const * cs)
-{
-    size_t length = strlen(str->cs);
-    size_t length2 = strlen(cs);
-    char * new_cs = malloc(length + length2 + 1u);
-    memcpy(new_cs, str->cs, length);
-    strcpy(&new_cs[length], cs);
-    free(str->cs);
-    str->cs = new_cs;
-}
-
-void str_free(str_t * str)
-{
-    free(str->cs);
-}
@@ -5,15 +5,3 @@ void assert_eq_size_t_i(size_t expected, size_t actual, char const * file, size_
 #define assert_eq(expected, actual) \
    assert_eq_size_t_i(expected, actual, __FILE__, __LINE__)

-typedef struct
-{
-    char * cs;
-} str_t;
-
-void str_init(str_t * str, char const * cs);
-void str_append(str_t * str, char const * cs);
-void str_free(str_t * str);
-static inline char * str_cstr(str_t * str)
-{
-    return str->cs;
-}
Author	SHA1	Message	Date
josh	06af7fbe3b	wip	2023-08-20 21:22:34 -04:00
josh	9760da4df4	wip	2023-08-20 21:19:34 -04:00
josh	35acdde09f	generates a parser specs passing	2023-08-20 20:49:24 -04:00
josh	aef5367378	Get test_lexer_unknown_character working for C	2023-08-20 18:43:33 -04:00
josh	36213d9e9c	wip	2023-08-20 17:25:48 -04:00
josh	7b1d903b00	wip	2023-08-20 16:58:02 -04:00
josh	59e8e0a095	wip	2023-08-20 16:56:00 -04:00
josh	dace12310a	wip	2023-08-20 16:53:54 -04:00
josh	c7185edef0	Add spec support for C tests	2023-08-20 16:38:35 -04:00
josh	9d2b3be20b	Determine output language by output file extension	2023-08-20 16:27:58 -04:00
josh	2b515e1a7a	wip	2023-08-20 16:13:18 -04:00
josh	4ffdea07bb	wip	2023-08-08 22:43:46 -04:00
josh	cdb6294f1f	wip	2023-08-06 11:49:26 -04:00
josh	48b4033ef2	wip	2023-08-02 21:36:43 -04:00