Test multiple starting rules

.github/workflows/run-tests.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - name: Install dependencies (Linux)
       if: runner.os == 'Linux'
-      run: sudo apt-get update && sudo apt-get install -y gcc gdc ldc valgrind
+      run: sudo apt-get update && sudo apt-get install -y gcc gdc ldc
 
     - name: Install dependencies (macOS)
       if: runner.os == 'macOS'

CHANGELOG.md

@@ -1,120 +1,3 @@
-## v4.8.1
-
-### Fixes
-
-- Fix tree node struct type forward-declarations for C/C++
-
-## v4.8.0
-
-### New Features
-
-- Add `p_parse_inner_XXX()` APIs that accept a caller-provided set of follow
-  tokens. These behave the same as `p_parse_XXX()` by parsing starting at the
-  given start rule, but instead of expecting the rest of the input to match
-  the start rule they allow specifying a set of tokens that may follow the
-  start rule.
-- Add `p_set_position()` API to set the current text position stored in the
-  context. Useful for setting the initial text position to something other
-  than `(1, 1)` for a nested parse operation.
-- Add `p_input_index()` API to get the current input text byte offset.
-- Add `p_set_input_index()` API to set the current input text byte offset.
-  Useful together with `p_set_position()` to rewind the input part-way through
-  a parse in order to re-read an earlier section of the input.
-
-## v4.7.0
-
-### New Features
-
-- Support parser rule user code blocks in tree generation mode.
-
-### Fixes
-
-- propane.vim: do not highlight rule components as propane keywords
-
-## v4.6.0
-
-### New Features
-
-- Add lexer user code API to access matched input text positions
-- Track rule component text positions and add parser user code API to access
-
-### Fixes
-
-- Fixed a few user guide and source comments related to text input positions
-
-## v4.5.0
-
-### New Features
-
-- Add `noline` grammar statement to skip emitting `#line` directives
-- Attempt to autodetect target language (D/C++) in extra/vim/syntax/propane.vim
-
-### Fixes
-
-- Fix #line reset directives
-- Update keyword list in extra/vim/syntax/propane.vim
-- Fix propane.vim keyword detection
-
-## v4.4.0
-
-### New Features
-
-- Add p_value_get() / p_value_get_XXX() accessors
-
-## v4.3.0
-
-### New Features
-
-- Use #line for user code blocks to report input grammar position for errors.
-
-## v4.2.0
-
-### New Features
-
-- Add support for a custom lex function.
-
-## v4.1.0
-
-### New Features
-
-- Add `p_context_delete()` and `p_tree_delete()` for D targets.
-
-## v4.0.0
-
-### New Features
-
-- Add `context_user_fields` statement to allow custom context user fields.
-- Add `token_user_fields` statement to allow custom token user fields.
-- Add `on_token_node` statement to allow custom code when constructing token nodes.
-- Add `free_token_node` statement to allow custom code when freeing token nodes.
-- Add `p_context_delete()`.
-- Allow `drop` patterns to execute lexer user code blocks.
-
-### Breaking Changes
-
-- Replace `p_context_init()` with `p_context_new()` and `p_context_delete()`.
-- Renamed `p_free_tree()` to `p_tree_delete()`.
-- The `free_token_node` statement now takes a user code block instead of a
-  function name parameter.
-
-## v3.0.0
-
-### New Features
-
-- Add support for multiple starting rules (#38)
-- Add `p_free_tree()` functions to reclaim generated tree memory
-- Add `free_token_node` grammar statement to reclaim user-allocated memory stored in a Token tree node `pvalue` field
-- Add valgrind memory leak tests to unit tests
-- Fix build issues for C++ to officially support C++ target output
-
-### Improvements
-
-- Document `p_lex()` and `p_token_info_t` in user guide (#37)
-
-### Breaking Changes
-
-- Rename AST generation mode to tree generation mode (see [UPGRADING.md](UPGRADING.md))
-
 ## v2.3.0
 
 ### New Features

Gemfile.lock

@@ -5,12 +5,12 @@ GEM
     date (3.5.1)
     diff-lcs (1.6.2)
     docile (1.4.1)
-    erb (6.0.4)
-    psych (5.4.0)
+    erb (6.0.1)
+    psych (5.3.1)
       date
       stringio
-    rake (13.4.2)
-    rdoc (7.2.0)
+    rake (13.3.1)
+    rdoc (7.1.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -24,10 +24,10 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.8)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.7)
+    rspec-support (3.13.6)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -51,4 +51,4 @@ DEPENDENCIES
   syntax
 
 BUNDLED WITH
-  4.0.14
+   2.3.7

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2010-2026 Josh Holtrop
+Copyright (c) 2010-2024 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

README.md

@@ -7,9 +7,7 @@ Propane is a LALR Parser Generator (LPG) which:
   * supports UTF-8 lexer inputs
   * generates a table-driven shift/reduce parser to parse input in linear time
   * targets C, C++, or D language outputs
-  * optionally supports automatic full parse tree generation
-  * supports starting parsing from multiple start rules
-  * tracks input text start and end positions for all matched tokens/rules
+  * optionally supports automatic full AST generation
   * is MIT-licensed
   * is distributable as a standalone Ruby script
 

UPGRADING.md

@@ -1,21 +0,0 @@
-## v4.0.0
-
-### API Changes
-
-- Replace any calls to `p_context_init()` with `p_context_new()`.
-- Replace any references to the address of a statically allocated context
-  structure with the pointer returned from `p_context_init()` (e.g. `&context`
-  -> `context`).
-- Add a call to `p_context_delete()` (for C or C++) after lexing/parsing to
-  reclaim context memory.
-- Rename `p_free_tree()` calls to `p_tree_delete()`.
-- Change `free_token_node` statement calls from taking a function name argument
-  to taking a user code block.
-
-## v3.0.0
-
-### Grammar Changes
-
-- Rename `ast;` statement to `tree;`.
-- Rename `ast_prefix;` statement to `tree_prefix;`.
-- Rename `ast_suffix;` statement to `tree_suffix;`.

assets/parser.c.erb

@@ -43,52 +43,30 @@ const char * <%= @grammar.prefix %>token_names[] = {
  *************************************************************************/
 
 /**
- * Allocate and initialize lexer/parser context structure.
- *
- * Deinitialize and deallocate with <%= @grammar.prefix %>context_delete().
+ * Initialize lexer/parser context structure.
  *
+ * @param[out] context
+ *   Lexer/parser context structure.
  * @param input
  *   Text input.
  * @param input_length
  *   Text input length.
- *
- * @return Context structure for lexer/parser.
  */
-<%= @grammar.prefix %>context_t * <%= @grammar.prefix %>context_new(uint8_t const * input, size_t input_length)
+void <%= @grammar.prefix %>context_init(<%= @grammar.prefix %>context_t * context, uint8_t const * input, size_t input_length)
 {
-<% if @cpp %>
-    <%= @grammar.prefix %>context_t * context = new <%= @grammar.prefix %>context_t();
-<% else %>
-    <%= @grammar.prefix %>context_t * context = (<%= @grammar.prefix %>context_t *)calloc(1, sizeof(<%= @grammar.prefix %>context_t));
-<% end %>
+    /* New default-initialized context structure. */
+    <%= @grammar.prefix %>context_t newcontext;
+    memset(&newcontext, 0, sizeof(newcontext));
 
     /* Lexer initialization. */
-    context->input = input;
-    context->input_length = input_length;
-    context->text_position.row = 1u;
-    context->text_position.col = 1u;
-    context->mode = <%= @lexer.mode_id("default") %>;
+    newcontext.input = input;
+    newcontext.input_length = input_length;
+    newcontext.text_position.row = 1u;
+    newcontext.text_position.col = 1u;
+    newcontext.mode = <%= @lexer.mode_id("default") %>;
 
-    return context;
-}
-
-/**
- * Deinitialize and deallocate lexer/parser context structure.
- *
- * For C++, destructors will be called for any context user fields. However, if
- * pointers are used to store allocated resources, the user should free them
- * before calling this function.
- *
- * @param context
- *   Lexer/parser context structure allocated with <%= @grammar.prefix %>context_new().
- */
-void <%= @grammar.prefix %>context_delete(<%= @grammar.prefix %>context_t * context)
-{
-<% if @cpp %>
-    delete context;
-<% else %>
-    free(context);
-<% end %>
+    /* Copy to the user's context structure. */
+    *context = newcontext;
 }
 
 /**************************************************************************
@@ -486,22 +464,6 @@ static size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%= @
     case P_SUCCESS:
         {
         <%= @grammar.prefix %>token_t token_to_accept = match_info.accepting_state->token;
-        /* Calculate the token length and start/end positions before invoking
-         * the lexer user code so that the user code can access them. The
-         * context input text position tracking is not updated until after the
-         * user code has run so that it is left unchanged if the user code
-         * requests to terminate the lexer. */
-        token_info.length = match_info.length;
-        if (match_info.end_delta_position.row != 0u)
-        {
-            token_info.end_position.row = token_info.position.row + match_info.end_delta_position.row;
-            token_info.end_position.col = match_info.end_delta_position.col;
-        }
-        else
-        {
-            token_info.end_position.row = token_info.position.row;
-            token_info.end_position.col = token_info.position.col + match_info.end_delta_position.col;
-        }
         if (match_info.accepting_state->code_id != INVALID_USER_CODE_ID)
         {
             uint8_t const * match = &context->input[context->input_index];
@@ -540,6 +502,17 @@ static size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%= @
             return P_DROP;
         }
         token_info.token = token_to_accept;
+        token_info.length = match_info.length;
+        if (match_info.end_delta_position.row != 0u)
+        {
+            token_info.end_position.row = token_info.position.row + match_info.end_delta_position.row;
+            token_info.end_position.col = match_info.end_delta_position.col;
+        }
+        else
+        {
+            token_info.end_position.row = token_info.position.row;
+            token_info.end_position.col = token_info.position.col + match_info.end_delta_position.col;
+        }
         *out_token_info = token_info;
         }
         return P_SUCCESS;
@@ -665,7 +638,7 @@ typedef struct
      * reduce action.
      */
     parser_state_id_t n_states;
-<% if @grammar.tree %>
+<% if @grammar.ast %>
 
     /**
      * Map of rule components to rule set child fields.
@@ -673,7 +646,7 @@ typedef struct
     uint16_t const * rule_set_node_field_index_map;
 
     /**
-     * Number of rule set tree node fields.
+     * Number of rule set AST node fields.
      */
     uint16_t rule_set_node_field_array_size;
 
@@ -712,28 +685,24 @@ typedef struct
     /** Parser state ID. */
     size_t state_id;
 
-<% if @grammar.tree %>
-    /** tree node. */
-    void * tree_node;
-<% else %>
-    <%= @grammar.prefix %>position_t position;
-    <%= @grammar.prefix %>position_t end_position;
     /** Parser value from this state. */
     <%= @grammar.prefix %>value_t pvalue;
+
+<% if @grammar.ast %>
+    /** AST node. */
+    void * ast_node;
 <% end %>
 } state_value_t;
 
-<% if @grammar.tree %>
-/** Common tree node structure. */
-typedef struct TreeNode_s
+/** Common AST node structure. */
+typedef struct ASTNode_s
 {
     <%= @grammar.prefix %>position_t position;
     <%= @grammar.prefix %>position_t end_position;
     uint16_t n_fields;
     uint8_t is_token;
-    struct TreeNode_s * fields[];
-} TreeNode;
-<% end %>
+    struct ASTNode_s * fields[];
+} ASTNode;
 
 /** Parser shift table. */
 static const shift_t parser_shift_table[] = {
@@ -742,7 +711,7 @@ static const shift_t parser_shift_table[] = {
 <%   end %>
 };
 
-<% if @grammar.tree %>
+<% 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(", ") %>};
@@ -757,14 +726,14 @@ static const reduce_t parser_reduce_table[] = {
         <%= reduce[:token_id] %>u, /* Token: <%= reduce[:token] ? reduce[:token].name : "(any)" %> */
         <%= reduce[:rule_id] %>u, /* Rule ID */
         <%= reduce[:rule_set_id] %>u, /* Rule set ID (<%= reduce[:rule].rule_set.name %>) */
-<%     if @grammar.tree %>
+<%     if @grammar.ast %>
         <%= reduce[:n_states] %>u, /* Number of states */
 <%       if reduce[:rule].flat_rule_set_node_field_index_map? %>
         NULL, /* No rule set node field index map (flat map) */
 <%       else %>
         &r_<%= reduce[:rule].name.gsub("$", "_") %><%= reduce[:rule].id %>_node_field_index_map[0], /* Rule set node field index map */
 <%       end %>
-        <%= reduce[:rule].rule_set.tree_fields.size %>, /* Number of tree fields */
+        <%= reduce[:rule].rule_set.ast_fields.size %>, /* Number of AST fields */
         <%= reduce[:propagate_optional_target] %>}, /* Propagate optional target? */
 <%     else %>
         <%= reduce[:n_states] %>u},
@@ -872,60 +841,7 @@ static void state_values_stack_free(state_values_stack_t * stack)
      free(stack->entries);
 }
 
-<% unless @grammar.tree %>
-/**
- * Get the rule position (start or end) for the currently matched rule.
- */
-static <%= @grammar.prefix %>position_t get_rule_position(state_values_stack_t * statevalues, size_t i, size_t n_states, bool get_end)
-{
-    if (n_states > 0u)
-    {
-        if (i == 0u)
-        {
-            if (get_end)
-            {
-                int stack_index = -1;
-                for (size_t j = 0u; j < n_states; j++)
-                {
-                    state_value_t * sv = state_values_stack_index(statevalues, stack_index - (int)j);
-                    if (<%= @grammar.prefix %>position_valid(sv->end_position))
-                    {
-                        return sv->end_position;
-                    }
-                }
-            }
-            else
-            {
-                int stack_index = -(int)n_states;
-                for (size_t j = 0u; j < n_states; j++)
-                {
-                    state_value_t * sv = state_values_stack_index(statevalues, stack_index + (int)j);
-                    if (<%= @grammar.prefix %>position_valid(sv->position))
-                    {
-                        return sv->position;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (get_end)
-            {
-                return state_values_stack_index(statevalues, -1 - (int)n_states + (int)i)->end_position;
-            }
-            else
-            {
-                return state_values_stack_index(statevalues, -1 - (int)n_states + (int)i)->position;
-            }
-        }
-    }
-    <%= @grammar.prefix %>position_t empty_pos;
-    memset(&empty_pos, 0, sizeof(empty_pos));
-    return empty_pos;
-}
-<% end %>
-
-<% if !@grammar.tree || @grammar.parser_user_code_used? %>
+<% unless @grammar.ast %>
 /**
  * Execute user code associated with a parser rule.
  *
@@ -936,7 +852,7 @@ static <%= @grammar.prefix %>position_t get_rule_position(state_values_stack_t *
  * @retval P_USER_TERMINATED
  *   User requested to terminate parsing.
  */
-static size_t parser_user_code(<%= @grammar.tree ? "void" : "#{@grammar.prefix}value_t" %> * _pvalue, uint32_t rule, state_values_stack_t * statevalues, uint32_t n_states, <%= @grammar.prefix %>context_t * context)
+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)
 {
     switch (rule)
     {
@@ -1008,17 +924,8 @@ static size_t check_reduce(size_t state_id, <%= @grammar.prefix %>token_t token)
  *
  * @param context
  *   Lexer/parser context structure.
- * @param start_state_id
+ * @start_state_id
  *   ID of the state in which to start.
- * @param start_rule_set_id
- *   Rule set ID for the requested start rule. Only used when
- *   @p follow_tokens is non-NULL, to gate follow-token shift success.
- * @param follow_tokens
- *   Optional array of caller-provided follow tokens (tokens expected to
- *   appear immediately after the start rule in some outer context). Used to
- *   drive the "parse inner" retry logic. May be NULL for a standard parse.
- * @param n_follow_tokens
- *   Number of entries in @p follow_tokens.
  *
  * @retval P_SUCCESS
  *   The parser successfully matched the input text. The parse result value
@@ -1031,20 +938,15 @@ static size_t check_reduce(size_t state_id, <%= @grammar.prefix %>token_t token)
  * @reval P_UNEXPECTED_INPUT
  *   Input text does not match any lexer pattern.
  */
-static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start_state_id,
-    size_t start_rule_set_id,
-    <%= @grammar.prefix %>token_t const * follow_tokens, size_t n_follow_tokens)
+static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start_state_id)
 {
     <%= @grammar.prefix %>token_info_t token_info;
     <%= @grammar.prefix %>token_t token = INVALID_TOKEN_ID;
     state_values_stack_t statevalues;
     size_t reduced_rule_set = INVALID_ID;
-    size_t last_shifted_rule_set_id = INVALID_ID;
-<% if @grammar.tree %>
+<% if @grammar.ast %>
     void * reduced_parser_node;
 <% else %>
-    <%= @grammar.prefix %>position_t reduced_position;
-    <%= @grammar.prefix %>position_t reduced_end_position;
     <%= @grammar.prefix %>value_t reduced_parser_value;
 <% end %>
     state_values_stack_init(&statevalues);
@@ -1055,7 +957,7 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
     {
         if (token == INVALID_TOKEN_ID)
         {
-            size_t lexer_result = <%= lex_fn %>(context, &token_info);
+            size_t lexer_result = <%= @grammar.prefix %>lex(context, &token_info);
             if (lexer_result != P_SUCCESS)
             {
                 result = lexer_result;
@@ -1063,18 +965,6 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
             }
             token = token_info.token;
         }
-        /* For a "parse inner" operation, determine once per iteration whether
-         * the current token is a member of the caller-provided follow token
-         * set. Used by both the shift-side and reduce-side retries below. */
-        bool token_is_follow = false;
-        for (size_t i = 0u; i < n_follow_tokens; i++)
-        {
-            if (token == follow_tokens[i])
-            {
-                token_is_follow = true;
-                break;
-            }
-        }
         size_t shift_state = INVALID_ID;
         if (reduced_rule_set != INVALID_ID)
         {
@@ -1086,86 +976,44 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
             if ((shift_state != INVALID_ID) && (token == TOKEN___EOF))
             {
                 /* Successful parse. */
-<% if @grammar.tree %>
-                context->parse_result = state_values_stack_index(&statevalues, -1)->tree_node;
+<% if @grammar.ast %>
+                context->parse_result = state_values_stack_index(&statevalues, -1)->ast_node;
 <% else %>
                 context->parse_result = state_values_stack_index(&statevalues, -1)->pvalue;
 <% end %>
                 result = P_SUCCESS;
                 break;
             }
-            if ((shift_state == INVALID_ID) && token_is_follow)
-            {
-                /* For a "parse inner" operation, if the incoming token is one
-                 * of the caller's follow tokens, retry the shift as
-                 * TOKEN___EOF. Only consider the parse complete if the reduced
-                 * start rule is the only thing on the parse stack (i.e. the
-                 * initial state plus a single shifted start rule set entry). */
-                size_t retry_shift_state = check_shift(state_values_stack_index(&statevalues, -1)->state_id, TOKEN___EOF);
-                if ((retry_shift_state != INVALID_ID) &&
-                    (statevalues.length == 2u) &&
-                    (last_shifted_rule_set_id == start_rule_set_id))
-                {
-                    /* Successful parse via follow token. Rewind the input
-                     * position so that the follow token is not consumed from
-                     * the input stream and remains available for a subsequent
-                     * call to <%= @grammar.prefix %>lex() or a
-                     * <%= @grammar.prefix %>parse*() function. */
-                    context->input_index -= token_info.length;
-                    context->text_position = token_info.position;
-<% if @grammar.tree %>
-                    context->parse_result = state_values_stack_index(&statevalues, -1)->tree_node;
-<% else %>
-                    context->parse_result = state_values_stack_index(&statevalues, -1)->pvalue;
-<% end %>
-                    result = P_SUCCESS;
-                    break;
-                }
-            }
         }
         if (shift_state != INVALID_ID)
         {
-            /* We have something to shift. Track the last shifted rule set ID
-             * (INVALID_ID if we just shifted a token) so the follow-token
-             * shift retry can gate success on the reduced start rule being the
-             * only thing on top of the initial state. */
-            last_shifted_rule_set_id = reduced_rule_set;
+            /* We have something to shift. */
             state_values_stack_push(&statevalues);
-            state_value_t * new_state_info = state_values_stack_index(&statevalues, -1);
-            new_state_info->state_id = shift_state;
+            state_values_stack_index(&statevalues, -1)->state_id = shift_state;
             if (reduced_rule_set == INVALID_ID)
             {
                 /* We shifted a token, mark it consumed. */
-<% if @grammar.tree %>
-<%   if @cpp %>
-                <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %> * token_tree_node = new <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %>();
+<% if @grammar.ast %>
+                <%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %> * token_ast_node = (<%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %> *)malloc(sizeof(<%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %>));
+                token_ast_node->position = token_info.position;
+                token_ast_node->end_position = token_info.end_position;
+                token_ast_node->n_fields = 0u;
+                token_ast_node->is_token = 1u;
+                token_ast_node->token = token;
+                token_ast_node->pvalue = token_info.pvalue;
+                state_values_stack_index(&statevalues, -1)->ast_node = token_ast_node;
 <% else %>
-                <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %> * token_tree_node = (<%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %> *)malloc(sizeof(<%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %>));
-<%   end %>
-                token_tree_node->position = token_info.position;
-                token_tree_node->end_position = token_info.end_position;
-                token_tree_node->n_fields = 0u;
-                token_tree_node->is_token = 1u;
-                token_tree_node->token = token;
-                token_tree_node->pvalue = token_info.pvalue;
-<%= expand_code(@grammar.on_token_node, false, nil, nil) %>
-                new_state_info->tree_node = token_tree_node;
-<% else %>
-                new_state_info->position = token_info.position;
-                new_state_info->end_position = token_info.end_position;
-                new_state_info->pvalue = token_info.pvalue;
+                state_values_stack_index(&statevalues, -1)->pvalue = token_info.pvalue;
 <% end %>
                 token = INVALID_TOKEN_ID;
             }
             else
             {
                 /* We shifted a RuleSet. */
-<% if @grammar.tree %>
-                new_state_info->tree_node = reduced_parser_node;
+<% if @grammar.ast %>
+                state_values_stack_index(&statevalues, -1)->ast_node = reduced_parser_node;
 <% else %>
-                new_state_info->pvalue = reduced_parser_value;
-                new_state_info->position = reduced_position;
-                new_state_info->end_position = reduced_end_position;
+                state_values_stack_index(&statevalues, -1)->pvalue = reduced_parser_value;
                 <%= @grammar.prefix %>value_t new_parse_result;
                 memset(&new_parse_result, 0, sizeof(new_parse_result));
                 reduced_parser_value = new_parse_result;
@@ -1176,28 +1024,19 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
         }
 
         size_t reduce_index = check_reduce(state_values_stack_index(&statevalues, -1)->state_id, token);
-        if ((reduce_index == INVALID_ID) && token_is_follow)
-        {
-            /* For a "parse inner" operation, if the incoming token is one of
-             * the caller's follow tokens, retry the reduce lookup as
-             * TOKEN___EOF. Whatever reduce_index results (if any) is used
-             * regardless of which rule set it reduces to; this allows chains
-             * of reductions leading up to the start rule. */
-            reduce_index = check_reduce(state_values_stack_index(&statevalues, -1)->state_id, TOKEN___EOF);
-        }
         if (reduce_index != INVALID_ID)
         {
             /* We have something to reduce. */
-<% if @grammar.tree %>
+<% if @grammar.ast %>
             if (parser_reduce_table[reduce_index].propagate_optional_target)
             {
-                reduced_parser_node = state_values_stack_index(&statevalues, -1)->tree_node;
+                reduced_parser_node = state_values_stack_index(&statevalues, -1)->ast_node;
             }
             else if (parser_reduce_table[reduce_index].n_states > 0)
             {
                 size_t n_fields = parser_reduce_table[reduce_index].rule_set_node_field_array_size;
-                size_t bytes = sizeof(TreeNode) + n_fields * sizeof(void *);
-                TreeNode * node = (TreeNode *)malloc(bytes);
+                size_t bytes = sizeof(ASTNode) + n_fields * sizeof(void *);
+                ASTNode * node = (ASTNode *)malloc(bytes);
                 memset(node, 0, bytes);
                 node->position = INVALID_POSITION;
                 node->end_position = INVALID_POSITION;
@@ -1206,20 +1045,20 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
                 {
                     for (size_t i = 0; i < parser_reduce_table[reduce_index].n_states; i++)
                     {
-                        node->fields[i] = (TreeNode *)state_values_stack_index(&statevalues, -(int)parser_reduce_table[reduce_index].n_states + (int)i)->tree_node;
+                        node->fields[i] = (ASTNode *)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]] = (TreeNode *)state_values_stack_index(&statevalues, -(int)parser_reduce_table[reduce_index].n_states + (int)i)->tree_node;
+                        node->fields[parser_reduce_table[reduce_index].rule_set_node_field_index_map[i]] = (ASTNode *)state_values_stack_index(&statevalues, -(int)parser_reduce_table[reduce_index].n_states + (int)i)->ast_node;
                     }
                 }
                 bool position_found = false;
                 for (size_t i = 0; i < n_fields; i++)
                 {
-                    TreeNode * child = node->fields[i];
+                    ASTNode * child = node->fields[i];
                     if ((child != NULL) && <%= @grammar.prefix %>position_valid(child->position))
                     {
                         if (!position_found)
@@ -1236,13 +1075,6 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
             {
                 reduced_parser_node = NULL;
             }
-<%   if @grammar.parser_user_code_used? %>
-            if (parser_user_code(reduced_parser_node, parser_reduce_table[reduce_index].rule, &statevalues, parser_reduce_table[reduce_index].n_states, context) == P_USER_TERMINATED)
-            {
-                state_values_stack_free(&statevalues);
-                return P_USER_TERMINATED;
-            }
-<%   end %>
 <% else %>
             <%= @grammar.prefix %>value_t reduced_parser_value2;
             memset(&reduced_parser_value2, 0, sizeof(reduced_parser_value2));
@@ -1252,16 +1084,6 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
                 return P_USER_TERMINATED;
             }
             reduced_parser_value = reduced_parser_value2;
-            if (parser_reduce_table[reduce_index].n_states > 0u)
-            {
-                reduced_position = get_rule_position(&statevalues, 0u, parser_reduce_table[reduce_index].n_states, false);
-                reduced_end_position = get_rule_position(&statevalues, 0u, parser_reduce_table[reduce_index].n_states, true);
-            }
-            else
-            {
-                memset(&reduced_position, 0, sizeof(reduced_position));
-                memset(&reduced_end_position, 0, sizeof(reduced_end_position));
-            }
 <% end %>
             reduced_rule_set = parser_reduce_table[reduce_index].rule_set;
             state_values_stack_pop(&statevalues, parser_reduce_table[reduce_index].n_states);
@@ -1284,20 +1106,14 @@ static size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start
 
 size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context)
 {
-    return parse_from(context, 0u, <%= @parser.rule_sets[@grammar.start_rules[0]].id %>u, NULL, 0u);
+    return parse_from(context, 0u);
 }
 
 <% @grammar.start_rules.each_with_index do |start_rule, i| %>
 
 size_t <%= @grammar.prefix %>parse_<%= start_rule %>(<%= @grammar.prefix %>context_t * context)
 {
-    return parse_from(context, <%= i %>u, <%= @parser.rule_sets[start_rule].id %>u, NULL, 0u);
-}
-
-size_t <%= @grammar.prefix %>parse_inner_<%= start_rule %>(<%= @grammar.prefix %>context_t * context,
-    <%= @grammar.prefix %>token_t const * follow_tokens, size_t n_follow_tokens)
-{
-    return parse_from(context, <%= i %>u, <%= @parser.rule_sets[start_rule].id %>u, follow_tokens, n_follow_tokens);
+    return parse_from(context, <%= i %>u);
 }
 <% end %>
 
@@ -1309,15 +1125,15 @@ size_t <%= @grammar.prefix %>parse_inner_<%= start_rule %>(<%= @grammar.prefix %
  *
  * @return Parse result value.
  */
-<% if @grammar.tree %>
-<%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
+<% if @grammar.ast %>
+<%= @grammar.ast_prefix %><%= @grammar.start_rules[0] %><%= @grammar.ast_suffix %> * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
 {
-    return (<%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> *) context->parse_result;
+    return (<%= @grammar.ast_prefix %><%= @grammar.start_rules[0] %><%= @grammar.ast_suffix %> *) context->parse_result;
 }
 <%   @grammar.start_rules.each_with_index do |start_rule, i| %>
-<%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> * <%= @grammar.prefix %>result_<%= start_rule %>(<%= @grammar.prefix %>context_t * context)
+<%= @grammar.ast_prefix %><%= start_rule %><%= @grammar.ast_suffix %> * <%= @grammar.prefix %>result_<%= start_rule %>(<%= @grammar.prefix %>context_t * context)
 {
-    return (<%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> *) context->parse_result;
+    return (<%= @grammar.ast_prefix %><%= start_rule %><%= @grammar.ast_suffix %> *) context->parse_result;
 }
 <%   end %>
 <% else %>
@@ -1346,58 +1162,6 @@ size_t <%= @grammar.prefix %>parse_inner_<%= start_rule %>(<%= @grammar.prefix %
     return context->text_position;
 }
 
-/**
- * Set the current text input position.
- *
- * This can be used to set the initial text position to something other than
- * (1, 1) for a nested parse operation so that error positions reported by
- * subsequent lexer/parser calls are relative to a larger enclosing document.
- *
- * @param context
- *   Lexer/parser context structure.
- * @param position
- *   Text position to set.
- */
-void <%= @grammar.prefix %>set_position(<%= @grammar.prefix %>context_t * context, <%= @grammar.prefix %>position_t position)
-{
-    context->text_position = position;
-}
-
-/**
- * Get the current input text byte offset.
- *
- * @param context
- *   Lexer/parser context structure.
- *
- * @return Current input text byte offset (measured from the start of the
- *   input text passed to <%= @grammar.prefix %>context_new()).
- */
-size_t <%= @grammar.prefix %>input_index(<%= @grammar.prefix %>context_t * context)
-{
-    return context->input_index;
-}
-
-/**
- * Set the current input text byte offset.
- *
- * This moves the lexer's read cursor to the given byte offset (measured from
- * the start of the input text passed to <%= @grammar.prefix %>context_new()).
- * It can be used together with <%= @grammar.prefix %>set_position() to rewind
- * the input part-way through a parse in order to re-read an earlier section of
- * the input. The byte offset is not validated; the caller is responsible for
- * providing an offset within the bounds of the input text. A value previously
- * returned by <%= @grammar.prefix %>input_index() is a suitable argument.
- *
- * @param context
- *   Lexer/parser context structure.
- * @param input_index
- *   Input text byte offset to set.
- */
-void <%= @grammar.prefix %>set_input_index(<%= @grammar.prefix %>context_t * context, size_t input_index)
-{
-    context->input_index = input_index;
-}
-
 /**
  * Get the user terminate code.
  *
@@ -1420,19 +1184,16 @@ size_t <%= @grammar.prefix %>user_terminate_code(<%= @grammar.prefix %>context_t
 {
     return context->token;
 }
-<% if @grammar.tree %>
+<% if @grammar.ast %>
 
-static void tree_delete(TreeNode * node)
+static void free_ast_node(ASTNode * node)
 {
     if (node->is_token)
     {
-        <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %> * token_tree_node = (<%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %> *)node;
-<%= expand_code(@grammar.free_token_node, false, nil, nil) %>
-<%   if @cpp %>
-        delete token_tree_node;
-<%   else %>
-        free(token_tree_node);
+<%   if @grammar.free_token_node %>
+        <%= @grammar.free_token_node %>((<%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %> *) node);
 <%   end %>
+        /* TODO: free value_t */
     }
     else if (node->n_fields > 0u)
     {
@@ -1440,28 +1201,28 @@ static void tree_delete(TreeNode * node)
         {
             if (node->fields[i] != NULL)
             {
-                tree_delete(node->fields[i]);
+                free_ast_node(node->fields[i]);
+            }
         }
     }
     free(node);
 }
-}
 
 /**
- * Free all tree node memory.
+ * Free all AST node memory.
  */
-void <%= @grammar.prefix %>tree_delete(<%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> * tree)
+void <%= @grammar.prefix %>free_ast(<%= @grammar.ast_prefix %><%= @grammar.start_rules[0] %><%= @grammar.ast_suffix %> * ast)
 {
-    tree_delete((TreeNode *)tree);
+    free_ast_node((ASTNode *)ast);
 }
 <%   @grammar.start_rules.each_with_index do |start_rule, i| %>
 
 /**
- * Free all tree node memory.
+ * Free all AST node memory.
  */
-void <%= @grammar.prefix %>tree_delete_<%= start_rule %>(<%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> * tree)
+void <%= @grammar.prefix %>free_ast_<%= start_rule %>(<%= @grammar.ast_prefix %><%= start_rule %><%= @grammar.ast_suffix %> * ast)
 {
-    tree_delete((TreeNode *)tree);
+    free_ast_node((ASTNode *)ast);
 }
 <%   end %>
 <% end %>

assets/parser.d.erb

@@ -9,7 +9,7 @@ module <%= @grammar.modulename %>;
 <% end %>
 
 import core.memory;
-import core.stdc.stdlib : malloc, free;
+import core.stdc.stdlib : malloc;
 
 /**************************************************************************
  * User code blocks
@@ -59,10 +59,10 @@ public alias <%= @grammar.prefix %>code_point_t = uint;
  */
 public struct <%= @grammar.prefix %>position_t
 {
-    /** Input text row (1-based). */
+    /** Input text row (0-based). */
     uint row;
 
-    /** Input text column (1-based). */
+    /** Input text column (0-based). */
     uint col;
 
     /** Invalid position value. */
@@ -75,7 +75,7 @@ public struct <%= @grammar.prefix %>position_t
     }
 }
 
-<% if @grammar.tree %>
+<% if @grammar.ast %>
 /** Parser values type. */
 public alias <%= @grammar.prefix %>value_t = <%= @grammar.ptype %>;
 <% else %>
@@ -86,58 +86,35 @@ public union <%= @grammar.prefix %>value_t
     <%= typestring %> v_<%= name %>;
 <%   end %>
 }
-
-/** Parser value constructor(s). */
-<%   @grammar.ptypes.each do |name, typestring| %>
-public <%= @grammar.prefix %>value_t <%= @grammar.prefix %>value<%= name == "default" ? "" : "_#{name}" %>(T)(T v)
-{
-    return <%= @grammar.prefix %>value_t(v_<%= name %>: v);
-}
 <% end %>
 
-/** Parser value accessor(s). */
-<%   @grammar.ptypes.each do |name, typestring| %>
-public <%= typestring %> <%= @grammar.prefix %>value_get<%= name == "default" ? "" : "_#{name}" %>(<%= @grammar.prefix %>value_t * pvalue)
-{
-    return pvalue.v_<%= name %>;
-}
-<%   end %>
-<% end %>
-
-<% if @grammar.tree %>
-/** Common tree node structure. */
-private struct TreeNode
+<% if @grammar.ast %>
+/** Common AST node structure. */
+private struct ASTNode
 {
     <%= @grammar.prefix %>position_t position;
     <%= @grammar.prefix %>position_t end_position;
-    ushort n_fields;
-    bool is_token;
     void *[0] fields;
 }
 
-/** Tree node types. @{ */
-public struct <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %>
+/** AST node types. @{ */
+public struct <%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %>
 {
-    /* TreeNode fields must be present in the same order here. */
+    /* ASTNode fields must be present in the same order here. */
     <%= @grammar.prefix %>position_t position;
     <%= @grammar.prefix %>position_t end_position;
-    ushort n_fields;
-    bool is_token;
     <%= @grammar.prefix %>token_t token;
     <%= @grammar.prefix %>value_t pvalue;
-<%= @grammar.token_user_fields %>
 }
 
 <%   @parser.rule_sets.each do |name, rule_set| %>
 <%     next if name.start_with?("$") %>
 <%     next if rule_set.optional? %>
-public struct <%= @grammar.tree_prefix %><%= name %><%= @grammar.tree_suffix %>
+public struct <%= @grammar.ast_prefix %><%= name %><%= @grammar.ast_suffix %>
 {
     <%= @grammar.prefix %>position_t position;
     <%= @grammar.prefix %>position_t end_position;
-    ushort n_fields;
-    bool is_token;
-<%     rule_set.tree_fields.each do |fields| %>
+<%     rule_set.ast_fields.each do |fields| %>
     union
     {
 <%       fields.each do |field_name, type| %>
@@ -195,7 +172,7 @@ public struct <%= @grammar.prefix %>context_t
     /* Parser context data. */
 
     /** Parse result value. */
-<% if @grammar.tree %>
+<% if @grammar.ast %>
     void * parse_result;
 <% else %>
     <%= @grammar.prefix %>value_t parse_result;
@@ -206,8 +183,6 @@ public struct <%= @grammar.prefix %>context_t
 
     /** User terminate code. */
     size_t user_terminate_code;
-
-<%= @grammar.context_user_fields %>
 }
 
 /**************************************************************************
@@ -247,39 +222,26 @@ private enum size_t INVALID_ID = cast(size_t)-1;
  *************************************************************************/
 
 /**
- * Allocate and initialize lexer/parser context structure.
- *
- * Deinitialize and deallocate with <%= @grammar.prefix %>context_delete().
+ * Initialize lexer/parser context structure.
  *
+ * @param[out] context
+ *   Lexer/parser context structure.
  * @param input
  *   Text input.
- * @param input_length
- *   Text input length.
- *
- * @return Context structure for lexer/parser.
  */
-<%= @grammar.prefix %>context_t * <%= @grammar.prefix %>context_new(string input)
+public void <%= @grammar.prefix %>context_init(<%= @grammar.prefix %>context_t * context, string input)
 {
     /* New default-initialized context structure. */
-    <%= @grammar.prefix %>context_t * context = new <%= @grammar.prefix %>context_t;
+    <%= @grammar.prefix %>context_t newcontext;
 
     /* Lexer initialization. */
-    context.input = input;
-    context.text_position.row = 1u;
-    context.text_position.col = 1u;
-    context.mode = <%= @lexer.mode_id("default") %>;
+    newcontext.input = input;
+    newcontext.text_position.row = 1u;
+    newcontext.text_position.col = 1u;
+    newcontext.mode = <%= @lexer.mode_id("default") %>;
 
-    return context;
-}
-
-/**
- * Deinitialize and deallocate lexer/parser context structure.
- *
- * @param context
- *   Lexer/parser context structure allocated with <%= @grammar.prefix %>context_new().
- */
-void <%= @grammar.prefix %>context_delete(<%= @grammar.prefix %>context_t * context)
-{
+    /* Copy to the user's context structure. */
+    *context = newcontext;
 }
 
 /**************************************************************************
@@ -665,22 +627,6 @@ private size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%=
     {
     case P_SUCCESS:
         <%= @grammar.prefix %>token_t token_to_accept = match_info.accepting_state.token;
-        /* Calculate the token length and start/end positions before invoking
-         * the lexer user code so that the user code can access them. The
-         * context input text position tracking is not updated until after the
-         * user code has run so that it is left unchanged if the user code
-         * requests to terminate the lexer. */
-        token_info.length = match_info.length;
-        if (match_info.end_delta_position.row != 0u)
-        {
-            token_info.end_position.row = token_info.position.row + match_info.end_delta_position.row;
-            token_info.end_position.col = match_info.end_delta_position.col;
-        }
-        else
-        {
-            token_info.end_position.row = token_info.position.row;
-            token_info.end_position.col = token_info.position.col + match_info.end_delta_position.col;
-        }
         if (match_info.accepting_state.code_id != INVALID_USER_CODE_ID)
         {
             string match = context.input[context.input_index..(context.input_index + match_info.length)];
@@ -719,6 +665,17 @@ private size_t attempt_lex_token(<%= @grammar.prefix %>context_t * context, <%=
             return P_DROP;
         }
         token_info.token = token_to_accept;
+        token_info.length = match_info.length;
+        if (match_info.end_delta_position.row != 0u)
+        {
+            token_info.end_position.row = token_info.position.row + match_info.end_delta_position.row;
+            token_info.end_position.col = match_info.end_delta_position.col;
+        }
+        else
+        {
+            token_info.end_position.row = token_info.position.row;
+            token_info.end_position.col = token_info.position.col + match_info.end_delta_position.col;
+        }
         *out_token_info = token_info;
         return P_SUCCESS;
 
@@ -840,7 +797,7 @@ private struct reduce_t
      * reduce action.
      */
     parser_state_id_t n_states;
-<% if @grammar.tree %>
+<% if @grammar.ast %>
 
     /**
      * Map of rule components to rule set child fields.
@@ -848,7 +805,7 @@ private struct reduce_t
     immutable(ushort) * rule_set_node_field_index_map;
 
     /**
-     * Number of rule set tree node fields.
+     * Number of rule set AST node fields.
      */
     ushort rule_set_node_field_array_size;
 
@@ -887,14 +844,12 @@ private struct state_value_t
     /** Parser state ID. */
     size_t state_id;
 
-<% if @grammar.tree %>
-    /** Tree node. */
-    void * tree_node;
-<% else %>
-    <%= @grammar.prefix %>position_t position;
-    <%= @grammar.prefix %>position_t end_position;
     /** Parser value from this state. */
     <%= @grammar.prefix %>value_t pvalue;
+
+<% if @grammar.ast %>
+    /** AST node. */
+    void * ast_node;
 <% end %>
 
     this(size_t state_id)
@@ -910,7 +865,7 @@ private immutable shift_t[] parser_shift_table = [
 <%   end %>
 ];
 
-<% if @grammar.tree %>
+<% 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(", ") %>];
@@ -925,14 +880,14 @@ private immutable reduce_t[] parser_reduce_table = [
         <%= reduce[:token_id] %>u, /* Token: <%= reduce[:token] ? reduce[:token].name : "(any)" %> */
         <%= reduce[:rule_id] %>u, /* Rule ID */
         <%= reduce[:rule_set_id] %>u, /* Rule set ID (<%= reduce[:rule].rule_set.name %>) */
-<%     if @grammar.tree %>
+<%     if @grammar.ast %>
         <%= reduce[:n_states] %>u, /* Number of states */
 <%       if reduce[:rule].flat_rule_set_node_field_index_map? %>
         null, /* No rule set node field index map (flat map) */
 <%       else %>
         &r_<%= reduce[:rule].name.gsub("$", "_") %><%= reduce[:rule].id %>_node_field_index_map[0], /* Rule set node field index map */
 <%       end %>
-        <%= reduce[:rule].rule_set.tree_fields.size %>, /* Number of tree fields */
+        <%= reduce[:rule].rule_set.ast_fields.size %>, /* Number of AST fields */
         <%= reduce[:propagate_optional_target] %>), /* Propagate optional target? */
 <%     else %>
         <%= reduce[:n_states] %>u), /* Number of states */
@@ -947,56 +902,7 @@ private immutable parser_state_t[] parser_state_table = [
 <%   end %>
 ];
 
-<% unless @grammar.tree %>
-/**
- * Get the rule position (start or end) for the currently matched rule.
- */
-private <%= @grammar.prefix %>position_t get_rule_position(state_value_t[] statevalues, size_t i, size_t n_states, bool get_end)
-{
-    if (n_states > 0u)
-    {
-        if (i == 0u)
-        {
-            if (get_end)
-            {
-                for (size_t j = 0u; j < n_states; j++)
-                {
-                    state_value_t * sv = &statevalues[$-1-j];
-                    if (sv.end_position.valid)
-                    {
-                        return sv.end_position;
-                    }
-                }
-            }
-            else
-            {
-                for (size_t j = 0u; j < n_states; j++)
-                {
-                    state_value_t * sv = &statevalues[$-n_states+j];
-                    if (sv.position.valid)
-                    {
-                        return sv.position;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (get_end)
-            {
-                return statevalues[$-1-n_states+i].end_position;
-            }
-            else
-            {
-                return statevalues[$-1-n_states+i].position;
-            }
-        }
-    }
-    return <%= @grammar.prefix %>position_t.INVALID;
-}
-<% end %>
-
-<% if !@grammar.tree || @grammar.parser_user_code_used? %>
+<% unless @grammar.ast %>
 /**
  * Execute user code associated with a parser rule.
  *
@@ -1007,7 +913,7 @@ private <%= @grammar.prefix %>position_t get_rule_position(state_value_t[] state
  * @retval P_USER_TERMINATED
  *   User requested to terminate parsing.
  */
-private size_t parser_user_code(<%= @grammar.tree ? "void" : "#{@grammar.prefix}value_t" %> * _pvalue, uint rule, state_value_t[] statevalues, uint n_states, <%= @grammar.prefix %>context_t * context)
+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)
 {
     switch (rule)
     {
@@ -1079,16 +985,8 @@ private size_t check_reduce(size_t state_id, <%= @grammar.prefix %>token_t token
  *
  * @param context
  *   Lexer/parser context structure.
- * @param start_state_id
+ * @start_state_id
  *   ID of the state in which to start.
- * @param start_rule_set_id
- *   Rule set ID for the requested start rule. Only used when
- *   @p follow_tokens is non-empty, to gate follow-token shift success.
- * @param follow_tokens
- *   Optional slice of caller-provided follow tokens (tokens expected to
- *   appear immediately after the start rule in some outer context). Used to
- *   drive the "parse inner" retry logic. May be null/empty for a standard
- *   parse.
  *
  * @retval P_SUCCESS
  *   The parser successfully matched the input text. The parse result value
@@ -1101,46 +999,29 @@ private size_t check_reduce(size_t state_id, <%= @grammar.prefix %>token_t token
  * @reval P_UNEXPECTED_INPUT
  *   Input text does not match any lexer pattern.
  */
-private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start_state_id,
-    size_t start_rule_set_id,
-    const(<%= @grammar.prefix %>token_t)[] follow_tokens)
+private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t start_state_id)
 {
     <%= @grammar.prefix %>token_info_t token_info;
     <%= @grammar.prefix %>token_t token = INVALID_TOKEN_ID;
     state_value_t[] statevalues = new state_value_t[](1);
     statevalues[0].state_id = start_state_id;
     size_t reduced_rule_set = INVALID_ID;
-    size_t last_shifted_rule_set_id = INVALID_ID;
-<% if @grammar.tree %>
+<% if @grammar.ast %>
     void * reduced_parser_node;
 <% else %>
-    <%= @grammar.prefix %>position_t reduced_position;
-    <%= @grammar.prefix %>position_t reduced_end_position;
     <%= @grammar.prefix %>value_t reduced_parser_value;
 <% end %>
     for (;;)
     {
         if (token == INVALID_TOKEN_ID)
         {
-            size_t lexer_result = <%= lex_fn %>(context, &token_info);
+            size_t lexer_result = <%= @grammar.prefix %>lex(context, &token_info);
             if (lexer_result != P_SUCCESS)
             {
                 return lexer_result;
             }
             token = token_info.token;
         }
-        /* For a "parse inner" operation, determine once per iteration whether
-         * the current token is a member of the caller-provided follow token
-         * set. Used by both the shift-side and reduce-side retries below. */
-        bool token_is_follow = false;
-        foreach (eof_token; follow_tokens)
-        {
-            if (token == eof_token)
-            {
-                token_is_follow = true;
-                break;
-            }
-        }
         size_t shift_state = INVALID_ID;
         if (reduced_rule_set != INVALID_ID)
         {
@@ -1152,59 +1033,25 @@ private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t star
             if ((shift_state != INVALID_ID) && (token == TOKEN___EOF))
             {
                 /* Successful parse. */
-<% if @grammar.tree %>
-                context.parse_result = statevalues[$-1].tree_node;
+<% if @grammar.ast %>
+                context.parse_result = statevalues[$-1].ast_node;
 <% else %>
                 context.parse_result = statevalues[$-1].pvalue;
 <% end %>
                 return P_SUCCESS;
             }
-            if ((shift_state == INVALID_ID) && token_is_follow)
-            {
-                /* For a "parse inner" operation, if the incoming token is one
-                 * of the caller's follow tokens, retry the shift as
-                 * TOKEN___EOF. Only consider the parse complete if the reduced
-                 * start rule is the only thing on the parse stack (i.e. the
-                 * initial state plus a single shifted start rule set entry). */
-                size_t retry_shift_state = check_shift(statevalues[$-1].state_id, TOKEN___EOF);
-                if ((retry_shift_state != INVALID_ID) &&
-                    (statevalues.length == 2u) &&
-                    (last_shifted_rule_set_id == start_rule_set_id))
-                {
-                    /* Successful parse via follow token. Rewind the input
-                     * position so that the follow token is not consumed from
-                     * the input stream and remains available for a subsequent
-                     * call to <%= @grammar.prefix %>lex() or a
-                     * <%= @grammar.prefix %>parse*() function. */
-                    context.input_index -= token_info.length;
-                    context.text_position = token_info.position;
-<% if @grammar.tree %>
-                    context.parse_result = statevalues[$-1].tree_node;
-<% else %>
-                    context.parse_result = statevalues[$-1].pvalue;
-<% end %>
-                    return P_SUCCESS;
-                }
-            }
         }
         if (shift_state != INVALID_ID)
         {
-            /* We have something to shift. Track the last shifted rule set ID
-             * (INVALID_ID if we just shifted a token) so the follow-token
-             * shift retry can gate success on the reduced start rule being the
-             * only thing on top of the initial state. */
-            last_shifted_rule_set_id = reduced_rule_set;
+            /* We have something to shift. */
             statevalues ~= state_value_t(shift_state);
             if (reduced_rule_set == INVALID_ID)
             {
                 /* We shifted a token, mark it consumed. */
-<% if @grammar.tree %>
-                <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %> * token_tree_node = new <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %>(token_info.position, token_info.end_position, 0u, true, token, token_info.pvalue);
-<%= expand_code(@grammar.on_token_node, false, nil, nil) %>
-                statevalues[$-1].tree_node = token_tree_node;
+<% if @grammar.ast %>
+                <%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %> * token_ast_node = new <%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %>(token_info.position, token_info.end_position, token, token_info.pvalue);
+                statevalues[$-1].ast_node = token_ast_node;
 <% else %>
-                statevalues[$-1].position = token_info.position;
-                statevalues[$-1].end_position = token_info.end_position;
                 statevalues[$-1].pvalue = token_info.pvalue;
 <% end %>
                 token = INVALID_TOKEN_ID;
@@ -1212,12 +1059,10 @@ private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t star
             else
             {
                 /* We shifted a RuleSet. */
-<% if @grammar.tree %>
-                statevalues[$-1].tree_node = reduced_parser_node;
+<% if @grammar.ast %>
+                statevalues[$-1].ast_node = reduced_parser_node;
 <% else %>
                 statevalues[$-1].pvalue = reduced_parser_value;
-                statevalues[$-1].position = reduced_position;
-                statevalues[$-1].end_position = reduced_end_position;
                 <%= @grammar.prefix %>value_t new_parse_result;
                 reduced_parser_value = new_parse_result;
 <% end %>
@@ -1227,33 +1072,22 @@ private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t star
         }
 
         size_t reduce_index = check_reduce(statevalues[$-1].state_id, token);
-        if ((reduce_index == INVALID_ID) && token_is_follow)
-        {
-            /* For a "parse inner" operation, if the incoming token is one of
-             * the caller's follow tokens, retry the reduce lookup as
-             * TOKEN___EOF. Whatever reduce_index results (if any) is used
-             * regardless of which rule set it reduces to; this allows chains
-             * of reductions leading up to the start rule. */
-            reduce_index = check_reduce(statevalues[$-1].state_id, TOKEN___EOF);
-        }
         if (reduce_index != INVALID_ID)
         {
             /* We have something to reduce. */
-<% if @grammar.tree %>
+<% if @grammar.ast %>
             if (parser_reduce_table[reduce_index].propagate_optional_target)
             {
-                reduced_parser_node = statevalues[$ - 1].tree_node;
+                reduced_parser_node = statevalues[$ - 1].ast_node;
             }
             else if (parser_reduce_table[reduce_index].n_states > 0)
             {
                 size_t n_fields = parser_reduce_table[reduce_index].rule_set_node_field_array_size;
-                size_t node_size = TreeNode.sizeof + n_fields * (void *).sizeof;
-                TreeNode * node = cast(TreeNode *)malloc(node_size);
+                size_t node_size = ASTNode.sizeof + n_fields * (void *).sizeof;
+                ASTNode * node = cast(ASTNode *)malloc(node_size);
                 GC.addRange(node, node_size);
                 node.position = <%= @grammar.prefix %>position_t.INVALID;
                 node.end_position = <%= @grammar.prefix %>position_t.INVALID;
-                node.n_fields = cast(ushort)n_fields;
-                node.is_token = false;
                 foreach (i; 0..n_fields)
                 {
                     node.fields[i] = null;
@@ -1262,20 +1096,20 @@ private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t star
                 {
                     foreach (i; 0..parser_reduce_table[reduce_index].n_states)
                     {
-                        node.fields[i] = statevalues[$ - parser_reduce_table[reduce_index].n_states + i].tree_node;
+                        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].tree_node;
+                        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;
                     }
                 }
                 bool position_found = false;
                 foreach (i; 0..n_fields)
                 {
-                    TreeNode * child = cast(TreeNode *)node.fields[i];
+                    ASTNode * child = cast(ASTNode *)node.fields[i];
                     if (child && child.position.valid)
                     {
                         if (!position_found)
@@ -1292,12 +1126,6 @@ private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t star
             {
                 reduced_parser_node = null;
             }
-<%   if @grammar.parser_user_code_used? %>
-            if (parser_user_code(reduced_parser_node, parser_reduce_table[reduce_index].rule, statevalues, parser_reduce_table[reduce_index].n_states, context) == P_USER_TERMINATED)
-            {
-                return P_USER_TERMINATED;
-            }
-<%   end %>
 <% 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)
@@ -1305,16 +1133,6 @@ private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t star
                 return P_USER_TERMINATED;
             }
             reduced_parser_value = reduced_parser_value2;
-            if (parser_reduce_table[reduce_index].n_states > 0u)
-            {
-                reduced_position = get_rule_position(statevalues, 0u, parser_reduce_table[reduce_index].n_states, false);
-                reduced_end_position = get_rule_position(statevalues, 0u, parser_reduce_table[reduce_index].n_states, true);
-            }
-            else
-            {
-                reduced_position = <%= @grammar.prefix %>position_t.INVALID;
-                reduced_end_position = <%= @grammar.prefix %>position_t.INVALID;
-            }
 <% end %>
             reduced_rule_set = parser_reduce_table[reduce_index].rule_set;
             statevalues.length -= parser_reduce_table[reduce_index].n_states;
@@ -1334,20 +1152,14 @@ private size_t parse_from(<%= @grammar.prefix %>context_t * context, size_t star
 
 public size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context)
 {
-    return parse_from(context, 0u, <%= @parser.rule_sets[@grammar.start_rules[0]].id %>u, null);
+    return parse_from(context, 0u);
 }
 
 <% @grammar.start_rules.each_with_index do |start_rule, i| %>
 
 public size_t <%= @grammar.prefix %>parse_<%= start_rule %>(<%= @grammar.prefix %>context_t * context)
 {
-    return parse_from(context, <%= i %>u, <%= @parser.rule_sets[start_rule].id %>u, null);
-}
-
-public size_t <%= @grammar.prefix %>parse_inner_<%= start_rule %>(<%= @grammar.prefix %>context_t * context,
-    const(<%= @grammar.prefix %>token_t)[] follow_tokens)
-{
-    return parse_from(context, <%= i %>u, <%= @parser.rule_sets[start_rule].id %>u, follow_tokens);
+    return parse_from(context, <%= i %>u);
 }
 <% end %>
 
@@ -1359,15 +1171,15 @@ public size_t <%= @grammar.prefix %>parse_inner_<%= start_rule %>(<%= @grammar.p
  *
  * @return Parse result value.
  */
-<% if @grammar.tree %>
-public <%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
+<% if @grammar.ast %>
+public <%= @grammar.ast_prefix %><%= @grammar.start_rules[0] %><%= @grammar.ast_suffix %> * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context)
 {
-    return cast(<%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> *)context.parse_result;
+    return cast(<%= @grammar.ast_prefix %><%= @grammar.start_rules[0] %><%= @grammar.ast_suffix %> *)context.parse_result;
 }
 <%   @grammar.start_rules.each_with_index do |start_rule, i| %>
-public <%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> * <%= @grammar.prefix %>result_<%= start_rule %>(<%= @grammar.prefix %>context_t * context)
+public <%= @grammar.ast_prefix %><%= start_rule %><%= @grammar.ast_suffix %> * <%= @grammar.prefix %>result_<%= start_rule %>(<%= @grammar.prefix %>context_t * context)
 {
-    return cast(<%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> *)context.parse_result;
+    return cast(<%= @grammar.ast_prefix %><%= start_rule %><%= @grammar.ast_suffix %> *)context.parse_result;
 }
 <%   end %>
 <% else %>
@@ -1383,35 +1195,6 @@ public <%= start_rule_type(i)[1] %> <%= @grammar.prefix %>result_<%= start_rule
 <%   end %>
 <% end %>
 
-<% if @grammar.tree %>
-private void tree_delete(TreeNode * node)
-{
-    if (!node.is_token)
-    {
-        for (size_t i = 0u; i < node.n_fields; i++)
-        {
-            if (node.fields[i])
-            {
-                tree_delete(cast(TreeNode *)node.fields[i]);
-            }
-        }
-        GC.removeRange(node);
-        free(node);
-    }
-}
-
-void <%= @grammar.prefix %>tree_delete(<%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> * tree)
-{
-    tree_delete(cast(TreeNode *)tree);
-}
-<%   @grammar.start_rules.each_with_index do |start_rule, i| %>
-void <%= @grammar.prefix %>tree_delete_<%= start_rule %>(<%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> * tree)
-{
-    tree_delete(cast(TreeNode *)tree);
-}
-<%   end %>
-<% end %>
-
 /**
  * Get the current text input position.
  *
@@ -1425,58 +1208,6 @@ public <%= @grammar.prefix %>position_t <%= @grammar.prefix %>position(<%= @gram
     return context.text_position;
 }
 
-/**
- * Set the current text input position.
- *
- * This can be used to set the initial text position to something other than
- * (1, 1) for a nested parse operation so that error positions reported by
- * subsequent lexer/parser calls are relative to a larger enclosing document.
- *
- * @param context
- *   Lexer/parser context structure.
- * @param position
- *   Text position to set.
- */
-public void <%= @grammar.prefix %>set_position(<%= @grammar.prefix %>context_t * context, <%= @grammar.prefix %>position_t position)
-{
-    context.text_position = position;
-}
-
-/**
- * Get the current input text byte offset.
- *
- * @param context
- *   Lexer/parser context structure.
- *
- * @return Current input text byte offset (measured from the start of the
- *   input text passed to <%= @grammar.prefix %>context_new()).
- */
-public size_t <%= @grammar.prefix %>input_index(<%= @grammar.prefix %>context_t * context)
-{
-    return context.input_index;
-}
-
-/**
- * Set the current input text byte offset.
- *
- * This moves the lexer's read cursor to the given byte offset (measured from
- * the start of the input text passed to <%= @grammar.prefix %>context_new()).
- * It can be used together with <%= @grammar.prefix %>set_position() to rewind
- * the input part-way through a parse in order to re-read an earlier section of
- * the input. The byte offset is not validated; the caller is responsible for
- * providing an offset within the bounds of the input text. A value previously
- * returned by <%= @grammar.prefix %>input_index() is a suitable argument.
- *
- * @param context
- *   Lexer/parser context structure.
- * @param input_index
- *   Input text byte offset to set.
- */
-public void <%= @grammar.prefix %>set_input_index(<%= @grammar.prefix %>context_t * context, size_t input_index)
-{
-    context.input_index = input_index;
-}
-
 /**
  * Get the user terminate code.
  *

assets/parser.h.erb

@@ -45,10 +45,10 @@ typedef uint32_t <%= @grammar.prefix %>code_point_t;
  */
 typedef struct
 {
-    /** Input text row (1-based). */
+    /** Input text row (0-based). */
     uint32_t row;
 
-    /** Input text column (1-based). */
+    /** Input text column (0-based). */
     uint32_t col;
 } <%= @grammar.prefix %>position_t;
 
@@ -58,7 +58,7 @@ typedef struct
 /** User header code blocks. */
 <%= @grammar.code_blocks.fetch("header", "") %>
 
-<% if @grammar.tree %>
+<% if @grammar.ast %>
 /** Parser values type. */
 typedef <%= @grammar.ptype %> <%= @grammar.prefix %>value_t;
 <% else %>
@@ -69,55 +69,38 @@ typedef union
     <%= typestring %> v_<%= name %>;
 <%   end %>
 } <%= @grammar.prefix %>value_t;
-
-/** Parser value constructor(s). */
-<%   @grammar.ptypes.each do |name, typestring| %>
-static inline <%= @grammar.prefix %>value_t <%= @grammar.prefix %>value<%= name == "default" ? "" : "_#{name}" %>(<%= typestring %> v)
-{
-    return (<%= @grammar.prefix %>value_t){.v_<%= name %> = v};
-}
 <% end %>
 
-/** Parser value accessor(s). */
-<%   @grammar.ptypes.each do |name, typestring| %>
-static inline <%= typestring %> <%= @grammar.prefix %>value_get<%= name == "default" ? "" : "_#{name}" %>(<%= @grammar.prefix %>value_t const * pvalue)
+<% if @grammar.ast %>
+/** AST node types. @{ */
+typedef struct <%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %>
 {
-    return pvalue->v_<%= name %>;
-}
-<%   end %>
-<% end %>
-
-<% if @grammar.tree %>
-/** Tree node types. @{ */
-typedef struct <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %>
-{
-    <% # TreeNode fields must be present in the same order here. # %>
+    <% # ASTNode fields must be present in the same order here. # %>
     <%= @grammar.prefix %>position_t position;
     <%= @grammar.prefix %>position_t end_position;
     uint16_t n_fields;
     uint8_t is_token;
-<%= @grammar.token_user_fields %>
     <%= @grammar.prefix %>token_t token;
     <%= @grammar.prefix %>value_t pvalue;
-} <%= @grammar.tree_prefix %>Token<%= @grammar.tree_suffix %>;
+} <%= @grammar.ast_prefix %>Token<%= @grammar.ast_suffix %>;
 
 <%   @parser.rule_sets.each do |name, rule_set| %>
 <%     next if name.start_with?("$") %>
 <%     next if rule_set.optional? %>
-struct <%= @grammar.tree_prefix %><%= name %><%= @grammar.tree_suffix %>;
+struct <%= name %>;
 <%   end %>
 
 <%   @parser.rule_sets.each do |name, rule_set| %>
 <%     next if name.start_with?("$") %>
 <%     next if rule_set.optional? %>
-typedef struct <%= @grammar.tree_prefix %><%= name %><%= @grammar.tree_suffix %>
+typedef struct <%= @grammar.ast_prefix %><%= name %><%= @grammar.ast_suffix %>
 {
-    <% # TreeNode fields must be present in the same order here. # %>
+    <% # ASTNode fields must be present in the same order here. # %>
     <%= @grammar.prefix %>position_t position;
     <%= @grammar.prefix %>position_t end_position;
     uint16_t n_fields;
     uint8_t is_token;
-<%     rule_set.tree_fields.each do |fields| %>
+<%     rule_set.ast_fields.each do |fields| %>
     union
     {
 <%       fields.each do |field_name, type| %>
@@ -125,7 +108,7 @@ typedef struct <%= @grammar.tree_prefix %><%= name %><%= @grammar.tree_suffix %>
 <%       end %>
     };
 <%     end %>
-} <%= @grammar.tree_prefix %><%= name %><%= @grammar.tree_suffix %>;
+} <%= @grammar.ast_prefix %><%= name %><%= @grammar.ast_suffix %>;
 
 <%   end %>
 /** @} */
@@ -178,7 +161,7 @@ typedef struct
     /* Parser context data. */
 
     /** Parse result value. */
-<% if @grammar.tree %>
+<% if @grammar.ast %>
     void * parse_result;
 <% else %>
     <%= @grammar.prefix %>value_t parse_result;
@@ -189,8 +172,6 @@ typedef struct
 
     /** User terminate code. */
     size_t user_terminate_code;
-
-<%= @grammar.context_user_fields %>
 } <%= @grammar.prefix %>context_t;
 
 /**************************************************************************
@@ -200,9 +181,7 @@ typedef struct
 /** Token names. */
 extern const char * <%= @grammar.prefix %>token_names[];
 
-<%= @grammar.prefix %>context_t * <%= @grammar.prefix %>context_new(uint8_t const * input, size_t input_length);
-
-void <%= @grammar.prefix %>context_delete(<%= @grammar.prefix %>context_t * context);
+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,
         <%= @grammar.prefix %>code_point_t * out_code_point, uint8_t * out_code_point_length);
@@ -212,14 +191,12 @@ size_t <%= @grammar.prefix %>lex(<%= @grammar.prefix %>context_t * context, <%=
 size_t <%= @grammar.prefix %>parse(<%= @grammar.prefix %>context_t * context);
 <%   @grammar.start_rules.each_with_index do |start_rule, i| %>
 size_t <%= @grammar.prefix %>parse_<%= start_rule %>(<%= @grammar.prefix %>context_t * context);
-size_t <%= @grammar.prefix %>parse_inner_<%= start_rule %>(<%= @grammar.prefix %>context_t * context,
-        <%= @grammar.prefix %>token_t const * follow_tokens, size_t n_follow_tokens);
 <%   end %>
 
-<% if @grammar.tree %>
-<%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context);
+<% if @grammar.ast %>
+<%= @grammar.ast_prefix %><%= @grammar.start_rules[0] %><%= @grammar.ast_suffix %> * <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context);
 <%   @grammar.start_rules.each_with_index do |start_rule, i| %>
-<%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> * <%= @grammar.prefix %>result_<%= start_rule %>(<%= @grammar.prefix %>context_t * context);
+<%= @grammar.ast_prefix %><%= start_rule %><%= @grammar.ast_suffix %> * <%= @grammar.prefix %>result_<%= start_rule %>(<%= @grammar.prefix %>context_t * context);
 <%   end %>
 <% else %>
 <%= start_rule_type[1] %> <%= @grammar.prefix %>result(<%= @grammar.prefix %>context_t * context);
@@ -228,21 +205,15 @@ size_t <%= @grammar.prefix %>parse_inner_<%= start_rule %>(<%= @grammar.prefix %
 <%   end %>
 <% end %>
 
-<% if @grammar.tree %>
-void <%= @grammar.prefix %>tree_delete(<%= @grammar.tree_prefix %><%= @grammar.start_rules[0] %><%= @grammar.tree_suffix %> * tree);
+<% if @grammar.ast %>
+void <%= @grammar.prefix %>free_ast(<%= @grammar.ast_prefix %><%= @grammar.start_rules[0] %><%= @grammar.ast_suffix %> * ast);
 <%   @grammar.start_rules.each_with_index do |start_rule, i| %>
-void <%= @grammar.prefix %>tree_delete_<%= start_rule %>(<%= @grammar.tree_prefix %><%= start_rule %><%= @grammar.tree_suffix %> * tree);
+void <%= @grammar.prefix %>free_ast_<%= start_rule %>(<%= @grammar.ast_prefix %><%= start_rule %><%= @grammar.ast_suffix %> * ast);
 <%   end %>
 <% end %>
 
 <%= @grammar.prefix %>position_t <%= @grammar.prefix %>position(<%= @grammar.prefix %>context_t * context);
 
-void <%= @grammar.prefix %>set_position(<%= @grammar.prefix %>context_t * context, <%= @grammar.prefix %>position_t position);
-
-size_t <%= @grammar.prefix %>input_index(<%= @grammar.prefix %>context_t * context);
-
-void <%= @grammar.prefix %>set_input_index(<%= @grammar.prefix %>context_t * context, size_t input_index);
-
 size_t <%= @grammar.prefix %>user_terminate_code(<%= @grammar.prefix %>context_t * context);
 
 <%= @grammar.prefix %>token_t <%= @grammar.prefix %>token(<%= @grammar.prefix %>context_t * context);

extra/vim/syntax/propane.vim

@@ -8,11 +8,7 @@ if exists("b:current_syntax")
 endif
 
 if !exists("b:propane_subtype")
-  if search('\<import\s\+\%(std\|core\)\.', 'nw') > 0
   let b:propane_subtype = "d"
-  else
-    let b:propane_subtype = "cpp"
-  endif
 endif
 
 exe "syn include @propaneTarget syntax/".b:propane_subtype.".vim"
@@ -20,32 +16,18 @@ exe "syn include @propaneTarget syntax/".b:propane_subtype.".vim"
 syn region propaneTarget matchgroup=propaneDelimiter start="<<" end=">>$" contains=@propaneTarget keepend
 
 syn match propaneComment "#.*"
+syn match propaneOperator "->"
 syn match propaneFieldAlias ":[a-zA-Z0-9_]\+" contains=propaneFieldOperator
 syn match propaneFieldOperator ":" contained
 syn match propaneOperator "?"
-" The right-hand side of a rule (after '->' up to '<<' or ';') lists symbol
-" names that may coincide with propane keywords (e.g. 'start', 'token',
-" 'tree'). Wrap it in a region that excludes keyword matches so those names
-" are not highlighted as keywords. The '<<' is left unconsumed so the
-" propaneTarget region can still match it.
-syn region propaneRuleRhs matchgroup=propaneOperator start="->" end="\ze<<" end=";" contains=propaneFieldAlias,propaneRuleOperator,propaneComment keepend
-syn match propaneRuleOperator "?" contained
-" Keywords that introduce a user-defined name. The name is consumed by
-" propaneName via nextgroup so a name matching a keyword (e.g. 'token start')
-" is not highlighted as a keyword. These must be a match (not syn keyword)
-" because a syn keyword always wins over a contained nextgroup match.
-syn match propaneNameDecl "\<\%(tokenid\|token\|lex_fn\|module\|start\|tree_prefix\|tree_suffix\)\>" nextgroup=propaneName skipwhite
-syn match propaneName "\<\h\w*\>" contained
-syn match propaneKeyword "\<\%(context_user_fields\|drop\|free_token_node\|noline\|on_token_node\|prefix\|ptype\|token_user_fields\|tree\)\>"
+syn keyword propaneKeyword ast ast_prefix ast_suffix drop module prefix ptype start token tokenid
 
 syn region propaneRegex start="/" end="/" skip="\v\\\\|\\/"
 
 hi def link propaneComment Comment
 hi def link propaneKeyword Keyword
-hi def link propaneNameDecl Keyword
 hi def link propaneRegex String
 hi def link propaneOperator Operator
-hi def link propaneRuleOperator Operator
 hi def link propaneFieldOperator Operator
 hi def link propaneDelimiter Delimiter
 hi def link propaneFieldAlias Identifier

lib/propane.rb

@@ -33,7 +33,7 @@ class Propane
 
     def run(input_file, output_file, log_file, options)
       begin
-        grammar = Grammar.new(File.read(input_file), input_file)
+        grammar = Grammar.new(File.read(input_file))
         generator = Generator.new(grammar, output_file, log_file, options)
         generator.generate
       rescue Error => e

lib/propane/generator.rb

@@ -13,13 +13,8 @@ class Propane
       @language =
         if output_file.end_with?(".d")
           "d"
-        elsif output_file.end_with?(".c")
-          "c"
-        elsif output_file =~ %r{\.(cc|cpp|cxx)$}
-          @cpp = true
-          "c"
         else
-          raise Error.new("Could not determine target language from output file name (#{output_file})")
+          "c"
         end
       @options = options
       process_grammar!
@@ -38,13 +33,7 @@ class Propane
           output_file = @output_file
         end
         erb = ERB.new(template, trim_mode: "<>")
-        result = erb.result(binding.clone).lines.each_with_index.map do |line, i|
-          if line == "#linereset\n"
-            %[#line #{i + 2} "#{output_file}"\n]
-          else
-            line
-          end
-        end.join
+        result = erb.result(binding.clone)
         File.open(output_file, "wb") do |fh|
           fh.write(result)
         end
@@ -185,8 +174,7 @@ class Propane
                 end
               end
               @grammar.rules << Rule.new(component, [], nil, ptypename, rule.line_number)
-              optcode = @grammar.tree ? nil : "$$ = $1;\n"
-              @grammar.rules << Rule.new(component, [c], optcode, ptypename, rule.line_number)
+              @grammar.rules << Rule.new(component, [c], "$$ = $1;\n", ptypename, rule.line_number)
               optional_rules_added << component
             end
           end
@@ -277,34 +265,8 @@ class Propane
           "context.user_terminate_code = (#{user_terminate_code}); return #{retval};"
         end
       end
-      code = code.gsub(/\$\{context\.(\w+)\}/) do |match|
-        fieldname = $1
-        case @language
-        when "c"
-          "context->#{fieldname}"
-        when "d"
-          "context.#{fieldname}"
-        end
-      end
-      code = code.gsub(/\$\{token\.(\w+)\}/) do |match|
-        fieldname = $1
-        case @language
-        when "c"
-          "token_tree_node->#{fieldname}"
-        when "d"
-          "token_tree_node.#{fieldname}"
-        end
-      end
       if parser
         code = code.gsub(/\$\$/) do |match|
-          if @grammar.tree
-            case @language
-            when "c"
-              "((#{@grammar.tree_prefix}#{rule.name}#{@grammar.tree_suffix} *)_pvalue)"
-            when "d"
-              "(cast(#{@grammar.tree_prefix}#{rule.name}#{@grammar.tree_suffix} *)_pvalue)"
-            end
-          else
           case @language
           when "c"
             "_pvalue->v_#{rule.ptypename}"
@@ -312,33 +274,31 @@ class Propane
             "_pvalue.v_#{rule.ptypename}"
           end
         end
-        end
         code = code.gsub(/\$(\d+)/) do |match|
-          parser_component_reference(rule, $1.to_i)
-        end
-        code = code.gsub(/\$\{(\$|\d+)\.position\}/) do |match|
           index = $1.to_i
-          "get_rule_position(statevalues, #{index}, n_states, false)"
+          case @language
+          when "c"
+            "state_values_stack_index(statevalues, -1 - (int)n_states + #{index})->pvalue.v_#{rule.components[index - 1].ptypename}"
+          when "d"
+            "statevalues[$-1-n_states+#{index}].pvalue.v_#{rule.components[index - 1].ptypename}"
           end
-        code = code.gsub(/\$\{(\$|\d+)\.end_position\}/) do |match|
-          index = $1.to_i
-          "get_rule_position(statevalues, #{index}, n_states, true)"
         end
         code = code.gsub(/\$\{(\w+)\}/) do |match|
           aliasname = $1
           if index = rule.aliases[aliasname]
-            # Field aliases are just a named reference to a positional rule
-            # component, so reuse the same expansion as `$1', `$2', etc. Note
-            # that rule.aliases stores a 0-based component index, so add 1 to
-            # convert it to the 1-based index used for positional references.
-            parser_component_reference(rule, index + 1)
+            case @language
+            when "c"
+              "state_values_stack_index(statevalues, -(int)n_states + #{index})->pvalue.v_#{rule.components[index].ptypename}"
+            when "d"
+              "statevalues[$-n_states+#{index}].pvalue.v_#{rule.components[index].ptypename}"
+            end
           else
             raise Error.new("Field alias '#{aliasname}' not found")
           end
         end
       else
         code = code.gsub(/\$\$/) do |match|
-          if @grammar.tree
+          if @grammar.ast
             case @language
             when "c"
               "out_token_info->pvalue"
@@ -354,22 +314,6 @@ class Propane
             end
           end
         end
-        code = code.gsub(/\$\{position\}/) do |match|
-          case @language
-          when "c"
-            "out_token_info->position"
-          when "d"
-            "out_token_info.position"
-          end
-        end
-        code = code.gsub(/\$\{end_position\}/) do |match|
-          case @language
-          when "c"
-            "out_token_info->end_position"
-          when "d"
-            "out_token_info.end_position"
-          end
-        end
         code = code.gsub(/\$mode\(([a-zA-Z_][a-zA-Z_0-9]*)\)/) do |match|
           mode_name = $1
           mode_id = @lexer.mode_id(mode_name)
@@ -387,53 +331,6 @@ class Propane
       code
     end
 
-    # Expand a positional reference to a parser rule component.
-    #
-    # This is used to expand `$1', `$2', etc. as well as field aliases (which
-    # are just named references to a positional rule component).
-    #
-    # @param rule [Rule]
-    #   The Rule containing the user code.
-    # @param index [Integer]
-    #   1-based index of the rule component to reference.
-    #
-    # @return [String]
-    #   Expanded rule component reference.
-    def parser_component_reference(rule, index)
-      component = rule.components[index - 1]
-      if @grammar.tree
-        # In tree mode a component reference yields a pointer to that
-        # component's tree node. An optional component propagates its target
-        # node (or null), so use the optional target's node type.
-        if component.is_a?(RuleSet) && component.optional?
-          component = component.option_target
-        end
-        node_name = component.is_a?(Token) ? "Token" : component.name
-        typename = "#{@grammar.tree_prefix}#{node_name}#{@grammar.tree_suffix}"
-        case @language
-        when "c"
-          "((#{typename} *)state_values_stack_index(statevalues, -1 - (int)n_states + #{index})->tree_node)"
-        when "d"
-          "(cast(#{typename} *)statevalues[$-1-n_states+#{index}].tree_node)"
-        end
-      else
-        case @language
-        when "c"
-          "state_values_stack_index(statevalues, -1 - (int)n_states + #{index})->pvalue.v_#{component.ptypename}"
-        when "d"
-          "statevalues[$-1-n_states+#{index}].pvalue.v_#{component.ptypename}"
-        end
-      end
-    end
-
-    # Get the lex function to use.
-    #
-    # @return [String]
-    #   Lex function to use.
-    def lex_fn
-      @grammar.lex_fn || "#{@grammar.prefix}lex"
-    end
-
     # Get the parser value type for the start rule.
     #
     # @return [Array<String>]

lib/propane/grammar.rb

@@ -5,11 +5,9 @@ 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 :context_user_fields
-    attr_reader :lex_fn
-    attr_reader :tree
-    attr_reader :tree_prefix
-    attr_reader :tree_suffix
+    attr_reader :ast
+    attr_reader :ast_prefix
+    attr_reader :ast_suffix
     attr_reader :free_token_node
     attr_reader :modulename
     attr_reader :patterns
@@ -19,11 +17,8 @@ class Propane
     attr_reader :code_blocks
     attr_reader :ptypes
     attr_reader :prefix
-    attr_reader :on_token_node
-    attr_reader :token_user_fields
 
-    def initialize(input, filename)
-      @filename = filename
+    def initialize(input)
       @patterns = []
       @start_rules = []
       @tokens = []
@@ -35,13 +30,10 @@ class Propane
       @input = input.gsub("\r\n", "\n")
       @ptypes = {"default" => "void *"}
       @prefix = "p_"
-      @tree = false
-      @tree_prefix = ""
-      @tree_suffix = ""
-      @free_token_node = ""
-      @context_user_fields = nil
-      @on_token_node = ""
-      @token_user_fields = nil
+      @ast = false
+      @ast_prefix = ""
+      @ast_suffix = ""
+      @free_token_node = nil
       parse_grammar!
       @start_rules << "Start" if @start_rules.empty?
     end
@@ -58,10 +50,6 @@ class Propane
       @tokens.size + 1
     end
 
-    def parser_user_code_used?
-      @rules.any? {|r| r.code}
-    end
-
     private
 
     def parse_grammar!
@@ -74,15 +62,11 @@ class Propane
       if parse_white_space!
       elsif parse_comment_line!
       elsif @modeline.nil? && parse_mode_label!
-      elsif parse_context_user_fields_statement!
-      elsif parse_lex_fn!
-      elsif parse_tree_statement!
-      elsif parse_tree_prefix_statement!
-      elsif parse_tree_suffix_statement!
+      elsif parse_ast_statement!
+      elsif parse_ast_prefix_statement!
+      elsif parse_ast_suffix_statement!
       elsif parse_free_token_node_statement!
       elsif parse_module_statement!
-      elsif parse_on_token_node_statement!
-      elsif parse_token_user_fields_statement!
       elsif parse_ptype_statement!
       elsif parse_pattern_statement!
       elsif parse_start_statement!
@@ -92,7 +76,6 @@ class Propane
       elsif parse_rule_statement!
       elsif parse_code_block_statement!
       elsif parse_prefix_statement!
-      elsif parse_noline_statement!
       else
         if @input.size > 25
           @input = @input.slice(0..20) + "..."
@@ -115,37 +98,27 @@ class Propane
       consume!(/#.*\n/)
     end
 
-    def parse_context_user_fields_statement!
-      if md = consume!(/context_user_fields\b\s*/)
-        unless code = parse_code_block!
-          raise Error.new("Line #{@line_number}: expected code block")
-        end
-        @context_user_fields ||= ""
-        @context_user_fields += code
+    def parse_ast_statement!
+      if consume!(/ast\s*;/)
+        @ast = true
       end
     end
 
-    def parse_lex_fn!
-      if md = consume!(/lex_fn\b\s*(\w+)\s*;/)
-        @lex_fn = md[1]
+    def parse_ast_prefix_statement!
+      if md = consume!(/ast_prefix\s+(\w+)\s*;/)
+        @ast_prefix = md[1]
       end
     end
 
-    def parse_tree_statement!
-      if consume!(/tree\s*;/)
-        @tree = true
+    def parse_ast_suffix_statement!
+      if md = consume!(/ast_suffix\s+(\w+)\s*;/)
+        @ast_suffix = md[1]
       end
     end
 
-    def parse_tree_prefix_statement!
-      if md = consume!(/tree_prefix\s+(\w+)\s*;/)
-        @tree_prefix = md[1]
-      end
-    end
-
-    def parse_tree_suffix_statement!
-      if md = consume!(/tree_suffix\s+(\w+)\s*;/)
-        @tree_suffix = md[1]
+    def parse_free_token_node_statement!
+      if md = consume!(/free_token_node\s+(\w+)\s*;/)
+        @free_token_node = md[1]
       end
     end
 
@@ -159,40 +132,12 @@ class Propane
       end
     end
 
-    def parse_on_token_node_statement!
-      if md = consume!(/on_token_node\b\s*/)
-        unless code = parse_code_block!
-          raise Error.new("Line #{@line_number}: expected code block")
-        end
-        @on_token_node += code
-      end
-    end
-
-    def parse_token_user_fields_statement!
-      if md = consume!(/token_user_fields\b\s*/)
-        unless code = parse_code_block!
-          raise Error.new("Line #{@line_number}: expected code block")
-        end
-        @token_user_fields ||= ""
-        @token_user_fields += code
-      end
-    end
-
-    def parse_free_token_node_statement!
-      if md = consume!(/free_token_node\b\s*/)
-        unless code = parse_code_block!
-          raise Error.new("Line #{@line_number}: expected code block")
-        end
-        @free_token_node += code
-      end
-    end
-
     def parse_ptype_statement!
       if consume!(/ptype\s+/)
         name = "default"
         if md = consume!(/(#{IDENTIFIER_REGEX})\s*=\s*/)
-          if @tree
-            raise Error.new("Multiple ptypes are unsupported in tree mode")
+          if @ast
+            raise Error.new("Multiple ptypes are unsupported in AST mode")
           end
           name = md[1]
         end
@@ -206,8 +151,8 @@ class Propane
         md = consume!(/(#{IDENTIFIER_REGEX})\s*/, "expected token name")
         name = md[1]
         if md = consume!(/\((#{IDENTIFIER_REGEX})\)\s*/)
-          if @tree
-            raise Error.new("Multiple ptypes are unsupported in tree mode")
+          if @ast
+            raise Error.new("Multiple ptypes are unsupported in AST mode")
           end
           ptypename = md[1]
         end
@@ -230,8 +175,8 @@ class Propane
         md = consume!(/(#{IDENTIFIER_REGEX})\s*/, "expected token name")
         name = md[1]
         if md = consume!(/\((#{IDENTIFIER_REGEX})\)\s*/)
-          if @tree
-            raise Error.new("Multiple ptypes are unsupported in tree mode")
+          if @ast
+            raise Error.new("Multiple ptypes are unsupported in AST mode")
           end
           ptypename = md[1]
         end
@@ -250,10 +195,8 @@ class Propane
           raise Error.new("Line #{@line_number}: expected pattern to follow `drop'")
         end
         consume!(/\s+/)
-        unless code = parse_code_block!
-          consume!(/;/, "expected `;' or code block")
-        end
-        @patterns << Pattern.new(pattern: pattern, line_number: @line_number, code: code, modes: get_modes_from_modeline)
+        consume!(/;/, "expected `;'")
+        @patterns << Pattern.new(pattern: pattern, line_number: @line_number, modes: get_modes_from_modeline)
         @modeline = nil
         true
       end
@@ -262,14 +205,18 @@ class Propane
     def parse_rule_statement!
       if md = consume!(/(#{IDENTIFIER_REGEX})\s*(?:\((#{IDENTIFIER_REGEX})\))?\s*->\s*/)
         rule_name, ptypename = *md[1, 2]
-        if @tree && ptypename
-          raise Error.new("Multiple ptypes are unsupported in tree mode")
+        if @ast && ptypename
+          raise Error.new("Multiple ptypes are unsupported in AST mode")
         end
         md = consume!(/((?:#{IDENTIFIER_REGEX}\??(?::#{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
+        end
         @rules << Rule.new(rule_name, components, code, ptypename, @line_number)
         @modeline = nil
         true
@@ -280,8 +227,8 @@ class Propane
       if pattern = parse_pattern!
         consume!(/\s+/)
         if md = consume!(/\((#{IDENTIFIER_REGEX})\)\s*/)
-          if @tree
-            raise Error.new("Multiple ptypes are unsupported in tree mode")
+          if @ast
+            raise Error.new("Multiple ptypes are unsupported in AST mode")
           end
           ptypename = md[1]
         end
@@ -306,14 +253,8 @@ class Propane
     def parse_code_block_statement!
       if md = consume!(/<<([a-z]*)(.*?)>>\n/m)
         name, code = md[1..2]
-        code = code.chomp
-        unless @noline
-          if code.start_with?("\n")
-            code = %[#line #{@line_number + 1} "#{@filename}"#{code}\n#linereset\n]
-          else
-            code = %[#line #{@line_number} "#{@filename}"\n#{code}\n#linereset\n]
-          end
-        end
+        code.sub!(/\A\n/, "")
+        code += "\n" unless code.end_with?("\n")
         if @code_blocks[name]
           @code_blocks[name] += code
         else
@@ -331,13 +272,6 @@ class Propane
       end
     end
 
-    def parse_noline_statement!
-      if md = consume!(/noline\s*;/)
-        @noline = true
-        true
-      end
-    end
-
     def parse_pattern!
       if md = consume!(%r{/})
         pattern = ""
@@ -351,8 +285,6 @@ class Propane
             end
           elsif md = consume!(%r{(.)})
             pattern += md[1]
-          elsif @input == "" || @input.start_with?("\n")
-            raise Error.new("Line #{@line_number}: Unterminated pattern; expected `/`")
           end
         end
         pattern
@@ -361,14 +293,9 @@ class Propane
 
     def parse_code_block!
       if md = consume!(/<<(.*?)>>\n/m)
-        code = md[1].chomp
-        unless @noline
-          if code.start_with?("\n")
-            code = %[#line #{@line_number + 1} "#{@filename}"#{code}\n#linereset\n]
-          else
-            code = %[#line #{@line_number} "#{@filename}"\n#{code}\n#linereset\n]
-          end
-        end
+        code = md[1]
+        code.sub!(/\A\n/, "")
+        code += "\n" unless code.end_with?("\n")
         code
       end
     end

lib/propane/rule.rb

@@ -36,7 +36,7 @@ class Propane
 
     # @return [Array<Integer>]
     #   Map this rule's components to their positions in the parent RuleSet's
-    #   node field pointer array. This is used for tree construction.
+    #   node field pointer array. This is used for AST construction.
     attr_accessor :rule_set_node_field_index_map
 
     # Construct a Rule.

lib/propane/rule_set.rb

@@ -4,8 +4,8 @@ class Propane
   class RuleSet
 
     # @return [Array<Hash>]
-    #   tree fields.
-    attr_reader :tree_fields
+    #   AST fields.
+    attr_reader :ast_fields
 
     # @return [Integer]
     #   ID of the RuleSet.
@@ -100,28 +100,28 @@ class Propane
 
     # Finalize a RuleSet after adding all Rules to it.
     def finalize(grammar)
-      if grammar.tree
-        build_tree_fields(grammar)
+      if grammar.ast
+        build_ast_fields(grammar)
       end
     end
 
     private
 
-    # Build the set of tree fields for this RuleSet.
+    # 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 tree node. The entry is a Hash. It could have one or
+    # 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 [void]
-    def build_tree_fields(grammar)
-      field_tree_node_indexes = {}
+    def build_ast_fields(grammar)
+      field_ast_node_indexes = {}
       field_indexes_across_all_rules = {}
-      # Stores the index into @tree_fields by field alias name.
+      # Stores the index into @ast_fields by field alias name.
       field_aliases = {}
-      @tree_fields = []
+      @ast_fields = []
       @rules.each do |rule|
         rule.components.each_with_index do |component, i|
           if component.is_a?(RuleSet) && component.optional?
@@ -132,25 +132,25 @@ class Propane
           else
             node_name = component.name
           end
-          struct_name = "#{grammar.tree_prefix}#{node_name}#{grammar.tree_suffix}"
+          struct_name = "#{grammar.ast_prefix}#{node_name}#{grammar.ast_suffix}"
           field_name = "p#{node_name}#{i + 1}"
-          unless field_tree_node_indexes[field_name]
-            field_tree_node_indexes[field_name] = @tree_fields.size
-            @tree_fields << {field_name => struct_name}
+          unless field_ast_node_indexes[field_name]
+            field_ast_node_indexes[field_name] = @ast_fields.size
+            @ast_fields << {field_name => struct_name}
           end
           rule.aliases.each do |alias_name, index|
             if index == i
-              alias_tree_fields_index = field_tree_node_indexes[field_name]
-              if field_aliases[alias_name] && field_aliases[alias_name] != alias_tree_fields_index
-                raise Error.new("Error: conflicting tree node field positions for alias `#{alias_name}` in rule #{rule.name} defined on line #{rule.line_number}")
+              alias_ast_fields_index = field_ast_node_indexes[field_name]
+              if field_aliases[alias_name] && field_aliases[alias_name] != alias_ast_fields_index
+                raise Error.new("Error: conflicting AST node field positions for alias `#{alias_name}` in rule #{rule.name} defined on line #{rule.line_number}")
               end
-              field_aliases[alias_name] = alias_tree_fields_index
-              @tree_fields[alias_tree_fields_index][alias_name] = @tree_fields[alias_tree_fields_index].first[1]
+              field_aliases[alias_name] = alias_ast_fields_index
+              @ast_fields[alias_ast_fields_index][alias_name] = @ast_fields[alias_ast_fields_index].first[1]
             end
           end
           field_indexes_across_all_rules[node_name] ||= Set.new
-          field_indexes_across_all_rules[node_name] << field_tree_node_indexes[field_name]
-          rule.rule_set_node_field_index_map[i] = field_tree_node_indexes[field_name]
+          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|
@@ -158,8 +158,8 @@ class Propane
           # 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.
-          @tree_fields[indexes_across_all_rules.first]["p#{node_name}"] =
-            "#{grammar.tree_prefix}#{node_name}#{grammar.tree_suffix}"
+          @ast_fields[indexes_across_all_rules.first]["p#{node_name}"] =
+            "#{grammar.ast_prefix}#{node_name}#{grammar.ast_suffix}"
         end
       end
     end

lib/propane/version.rb

@@ -1,3 +1,3 @@
 class Propane
-  VERSION = "4.8.1"
+  VERSION = "2.3.0"
 end

spec/ast_node_memory_remains.c.propane

@@ -1,5 +1,5 @@
-tree;
-tree_prefix P;
+ast;
+ast_prefix P;
 
 <<header
 #include <stdio.h>

spec/ast_node_memory_remains.d.propane

@@ -1,5 +1,5 @@
-tree;
-tree_prefix P;
+ast;
+ast_prefix P;
 
 <<
 import std.bigint;

spec/macros.c.propane

@@ -1,25 +0,0 @@
-<<
-#include <stdlib.h>
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info);
-void record(int v);
->>
-
-ptype int;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token lbrace /\{/;
-token rbrace /\}/;
-token plus /\+/;
-token macro;
-token macroname /@[a-zA-Z_]\w*/;
-token num /\d+/ << char b[100]; memcpy(b, match, match_length); b[match_length] = '\0'; $$ = atoi(b); >>
-
-Start -> Statements;
-Statements -> ;
-Statements -> Statement Statements;
-Statement -> Add;
-Statement -> MacroStart;
-Add -> num plus num << $$ = $1 + $3; record($$); >>
-MacroStart -> macro macroname lbrace;

spec/macros.d.propane

@@ -1,31 +0,0 @@
-<<
-import test_macros;
->>
-
-ptype int;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token lbrace /\{/;
-token rbrace /\}/;
-token plus /\+/;
-token macro;
-token macroname /@[a-zA-Z_]\w*/;
-token num /\d+/ <<
-    int n = 0;
-    foreach (c; match)
-    {
-        n *= 10;
-        n += (c - '0');
-    }
-    $$ = n;
->>
-
-Start -> Statements;
-Statements -> ;
-Statements -> Statement Statements;
-Statement -> Add;
-Statement -> MacroStart;
-Add -> num plus num << $$ = $1 + $3; record($$); >>
-MacroStart -> macro macroname lbrace;

spec/parse_inner_nested.c.propane

@@ -1,19 +0,0 @@
-<<
-#include <stdlib.h>
-#include <string.h>
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info);
->>
-
-ptype int;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token lparen /\(/;
-token rparen /\)/;
-token plus /\+/;
-token num /\d+/ << char b[32]; memcpy(b, match, match_length); b[match_length] = '\0'; $$ = atoi(b); >>
-
-Start -> Expr << $$ = $1; >>
-Expr -> num << $$ = $1; >>
-Expr -> Expr plus num << $$ = $1 + $3; >>

spec/parse_inner_nested.d.propane

@@ -1,17 +0,0 @@
-<<
-import test_parse_inner_nested;
->>
-
-ptype int;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token lparen /\(/;
-token rparen /\)/;
-token plus /\+/;
-token num /\d+/ << int n = 0; foreach (ch; match) { n *= 10; n += (ch - '0'); } $$ = n; >>
-
-Start -> Expr << $$ = $1; >>
-Expr -> num << $$ = $1; >>
-Expr -> Expr plus num << $$ = $1 + $3; >>

spec/parse_inner_nested_tree.c.propane

@@ -1,17 +0,0 @@
-<<
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info);
->>
-
-tree;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token lparen /\(/;
-token rparen /\)/;
-token plus /\+/;
-token num /\d+/;
-
-Start -> Expr;
-Expr -> num;
-Expr -> Expr plus num;

spec/parse_inner_nested_tree.d.propane

@@ -1,17 +0,0 @@
-<<
-import test_parse_inner_nested_tree;
->>
-
-tree;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token lparen /\(/;
-token rparen /\)/;
-token plus /\+/;
-token num /\d+/;
-
-Start -> Expr;
-Expr -> num;
-Expr -> Expr plus num;

spec/propane/grammar_spec.rb

@@ -28,7 +28,7 @@ B -> <<
   b = 0;
 >>
 EOF
-      grammar = Grammar.new(input, "test.propane")
+      grammar = Grammar.new(input)
       expect(grammar.modulename).to eq "a.b"
       expect(grammar.ptype).to eq "XYZ  *"
       expect(grammar.ptypes).to eq("default" => "XYZ  *")
@@ -62,7 +62,7 @@ EOF
       expect(o).to_not be_nil
       expect(o.pattern).to eq "token_with_code"
       expect(o.line_number).to eq 11
-      expect(o.code).to eq %[#line 12 "test.propane"\nCode for the token\n#linereset\n]
+      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
@@ -83,7 +83,7 @@ EOF
       expect(o.name).to eq "A"
       expect(o.components).to eq %w[B]
       expect(o.line_number).to eq 19
-      expect(o.code).to eq %[#line 20 "test.propane"\n  a = 42;\n#linereset\n]
+      expect(o.code).to eq "  a = 42;\n"
 
       o = grammar.rules[1]
       expect(o.name).to eq "B"
@@ -95,7 +95,7 @@ EOF
       expect(o.name).to eq "B"
       expect(o.components).to eq []
       expect(o.line_number).to eq 23
-      expect(o.code).to eq %[#line 24 "test.propane"\n  b = 0;\n#linereset\n]
+      expect(o.code).to eq "  b = 0;\n"
     end
 
     it "parses code segments with semicolons" do
@@ -113,7 +113,7 @@ tokenid token_with_no_pattern;
 
 prefix myparser_;
 EOF
-      grammar = Grammar.new(input, "test.propane")
+      grammar = Grammar.new(input)
       expect(grammar.prefix).to eq "myparser_"
 
       o = grammar.tokens.find {|token| token.name == "code1"}
@@ -122,7 +122,7 @@ EOF
 
       o = grammar.patterns.find {|pattern| pattern.token == o}
       expect(o).to_not be_nil
-      expect(o.code).to eq %[#line 2 "test.propane"\n  a = b;\n  return c;\n#linereset\n]
+      expect(o.code).to eq "  a = b;\n  return c;\n"
 
       o = grammar.tokens.find {|token| token.name == "code2"}
       expect(o).to_not be_nil
@@ -130,42 +130,7 @@ EOF
 
       o = grammar.patterns.find {|pattern| pattern.token == o}
       expect(o).to_not be_nil
-      expect(o.code).to eq %[#line 7 "test.propane"\n  writeln("Hello there");\n#linereset\n]
-    end
-
-    it "does not emit #line directives with noline statement" do
-      input = <<EOF
-noline;
-
-token code1 <<
-  a = b;
-  return c;
->>
-
-token code2 <<
-  writeln("Hello there");
->>
-
-tokenid token_with_no_pattern;
-
-prefix myparser_;
-EOF
-      grammar = Grammar.new(input, "test.propane")
-      expect(grammar.prefix).to eq "myparser_"
-
-      o = grammar.tokens.find {|token| token.name == "code1"}
-      expect(o).to_not be_nil
-
-      o = grammar.patterns.find {|pattern| pattern.token == o}
-      expect(o).to_not be_nil
-      expect(o.code).to eq %[\n  a = b;\n  return c;]
-
-      o = grammar.tokens.find {|token| token.name == "code2"}
-      expect(o).to_not be_nil
-
-      o = grammar.patterns.find {|pattern| pattern.token == o}
-      expect(o).to_not be_nil
-      expect(o.code).to eq %[\n  writeln("Hello there");]
+      expect(o.code).to eq %[  writeln("Hello there");\n]
     end
 
     it "supports mode labels" do
@@ -179,7 +144,7 @@ m2: /bar/ <<
 drop /q/;
 m3: drop /r/;
 EOF
-      grammar = Grammar.new(input, "test.propane")
+      grammar = Grammar.new(input)
 
       o = grammar.tokens.find {|token| token.name == "a"}
       expect(o).to_not be_nil
@@ -232,7 +197,7 @@ tokenid int(integer);
 Start (node) -> R;
 R -> abc int;
 EOF
-      grammar = Grammar.new(input, "test.propane")
+      grammar = Grammar.new(input)
 
       o = grammar.tokens.find {|token| token.name == "abc"}
       expect(o).to_not be_nil

spec/propane/lexer/dfa_spec.rb

@@ -51,7 +51,7 @@ class TestLexer
 end
 
 def run(grammar, input)
-  grammar = Propane::Grammar.new(grammar, "test.propane")
+  grammar = Propane::Grammar.new(grammar)
   token_dfa = Propane::Lexer::DFA.new(grammar.patterns)
   test_lexer = TestLexer.new(token_dfa)
   test_lexer.lex(input)

spec/rewind.c.propane

@@ -1,23 +0,0 @@
-<<
-#include <stdlib.h>
-#include <string.h>
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info);
-void record(int value);
->>
-
-ptype int;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token repeat /repeat/;
-token lbrace /\{/;
-token rbrace /\}/;
-token plus /\+/;
-token num /\d+/ << char b[32]; memcpy(b, match, match_length); b[match_length] = '\0'; $$ = atoi(b); >>
-
-Start -> Statements;
-Statements -> ;
-Statements -> Statement Statements;
-Statement -> Add;
-Add -> num plus num << record($1 + $3); >>

spec/rewind.d.propane

@@ -1,20 +0,0 @@
-<<
-import test_rewind;
->>
-
-ptype int;
-
-lex_fn mylexfn;
-
-drop /\s+/;
-token repeat /repeat/;
-token lbrace /\{/;
-token rbrace /\}/;
-token plus /\+/;
-token num /\d+/ << int n = 0; foreach (ch; match) { n *= 10; n += (ch - '0'); } $$ = n; >>
-
-Start -> Statements;
-Statements -> ;
-Statements -> Statement Statements;
-Statement -> Add;
-Add -> num plus num << record($1 + $3); >>

spec/test_ast.c

@@ -6,10 +6,10 @@
 int main()
 {
     char const * input = "a, ((b)), b";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    Start * start = p_result(context);
+    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;
@@ -33,22 +33,20 @@ int main()
     assert_eq(22, itemsmore->pItem->pToken1->pvalue);
     assert(itemsmore->pItemsMore == NULL);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    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);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "2 1";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    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);
@@ -57,8 +55,7 @@ int main()
     assert(start->pItems->pItem->pDual->pTwo2 == NULL);
     assert(start->pItems->pItem->pDual->pOne1 == NULL);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     return 0;
 }

spec/test_ast.d

@@ -10,9 +10,10 @@ int main()
 unittest
 {
     string input = "a, ((b)), b";
-    p_context_t * context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    Start * start = p_result(context);
+    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;
@@ -36,20 +37,16 @@ unittest
     assert_eq(22, itemsmore.pItem.pToken1.pvalue);
     assert(itemsmore.pItemsMore is null);
 
-    p_tree_delete(start);
-
     input = "";
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert_eq(P_SUCCESS, p_parse(&context));
+    start = p_result(&context);
     assert(start.pItems is null);
 
-    p_tree_delete(start);
-
     input = "2 1";
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    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);
@@ -57,6 +54,4 @@ unittest
     assert(start.pItems.pItem.pDual.pOne2 !is null);
     assert(start.pItems.pItem.pDual.pTwo2 is null);
     assert(start.pItems.pItem.pDual.pOne1 is null);
-
-    p_tree_delete(start);
 }

spec/test_ast_field_aliases.c

@@ -6,17 +6,16 @@
 int main()
 {
     char const * input = "\na\nb\nc";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
 
     assert_eq(TOKEN_a, start->first->pToken->token);
     assert_eq(TOKEN_b, start->second->pToken->token);
     assert_eq(TOKEN_c, start->third->pToken->token);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     return 0;
 }

spec/test_ast_field_aliases.d

@@ -10,13 +10,12 @@ int main()
 unittest
 {
     string input = "\na\nb\nc";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
 
     assert_eq(TOKEN_a, start.first.pToken.token);
     assert_eq(TOKEN_b, start.second.pToken.token);
     assert_eq(TOKEN_c, start.third.pToken.token);
-
-    p_tree_delete(start);
 }

spec/test_ast_invalid_positions.c

@@ -6,10 +6,10 @@
 int main()
 {
     char const * input = "\na\n  bb ccc";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
 
     assert_eq(2, start->pT1->pToken->position.row);
     assert_eq(1, start->pT1->pToken->position.col);
@@ -30,13 +30,12 @@ int main()
     assert_eq(3, start->end_position.row);
     assert_eq(8, start->end_position.col);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "a\nbb";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(1, start->pT1->pToken->position.row);
     assert_eq(1, start->pT1->pToken->position.col);
@@ -57,13 +56,12 @@ int main()
     assert_eq(2, start->end_position.row);
     assert_eq(2, start->end_position.col);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "a\nc\nc";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(1, start->pT1->pToken->position.row);
     assert_eq(1, start->pT1->pToken->position.col);
@@ -84,13 +82,12 @@ int main()
     assert_eq(3, start->end_position.row);
     assert_eq(1, start->end_position.col);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "a";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(1, start->pT1->pToken->position.row);
     assert_eq(1, start->pT1->pToken->position.col);
@@ -107,8 +104,7 @@ int main()
     assert_eq(1, start->end_position.row);
     assert_eq(1, start->end_position.col);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     return 0;
 }

spec/test_ast_invalid_positions.d

@@ -10,9 +10,10 @@ int main()
 unittest
 {
     string input = "\na\n  bb ccc";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
 
     assert_eq(2, start.pT1.pToken.position.row);
     assert_eq(1, start.pT1.pToken.position.col);
@@ -33,12 +34,10 @@ unittest
     assert_eq(3, start.end_position.row);
     assert_eq(8, start.end_position.col);
 
-    p_tree_delete(start);
-
     input = "a\nbb";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(1, start.pT1.pToken.position.row);
     assert_eq(1, start.pT1.pToken.position.col);
@@ -59,12 +58,10 @@ unittest
     assert_eq(2, start.end_position.row);
     assert_eq(2, start.end_position.col);
 
-    p_tree_delete(start);
-
     input = "a\nc\nc";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(1, start.pT1.pToken.position.row);
     assert_eq(1, start.pT1.pToken.position.col);
@@ -85,12 +82,10 @@ unittest
     assert_eq(3, start.end_position.row);
     assert_eq(1, start.end_position.col);
 
-    p_tree_delete(start);
-
     input = "a";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(1, start.pT1.pToken.position.row);
     assert_eq(1, start.pT1.pToken.position.col);
@@ -106,6 +101,4 @@ unittest
     assert_eq(1, start.position.col);
     assert_eq(1, start.end_position.row);
     assert_eq(1, start.end_position.col);
-
-    p_tree_delete(start);
 }

spec/test_ast_node_memory_remains.c

@@ -369,11 +369,11 @@ int main(int argc, char * argv[])
         {"size_t_to_ulong", TOKEN_ulong},
         {"main", TOKEN_int},
     };
-    p_context_t * context;
-    context = p_context_new((const uint8_t *)input, strlen(input));
-    size_t result = p_parse(context);
+    p_context_t context;
+    p_context_init(&context, (const uint8_t *)input, strlen(input));
+    size_t result = p_parse(&context);
     assert_eq(P_SUCCESS, result);
-    PModule * pmod = p_result(context);
+    PModule * pmod = p_result(&context);
     PModuleItems * pmis = pmod->pModuleItems;
     PFunctionDefinition ** pfds;
     size_t n_pfds = 0u;
@@ -412,8 +412,7 @@ int main(int argc, char * argv[])
     }
 
     free(pfds);
-    p_tree_delete(pmod);
-    p_context_delete(context);
+    p_free_ast(pmod);
 
     return 0;
 }

spec/test_ast_node_memory_remains.d

@@ -374,11 +374,11 @@ def main() -> int
         Expected("size_t_to_ulong", TOKEN_ulong),
         Expected("main", TOKEN_int),
     ];
-    p_context_t * context;
-    context = p_context_new(input);
-    size_t result = p_parse(context);
+    p_context_t context;
+    p_context_init(&context, input);
+    size_t result = p_parse(&context);
     assert_eq(P_SUCCESS, result);
-    PModule * pmod = p_result(context);
+    PModule * pmod = p_result(&context);
     PModuleItems * pmis = pmod.pModuleItems;
     PFunctionDefinition *[] pfds;
     while (pmis !is null)
@@ -405,5 +405,4 @@ def main() -> int
             stderr.writeln("Index ", i, ": expected ", expected[i].name, "/", expected[i].token, ", got ", pfds[i].name.pvalue.s, "/", pfds[i].returntype.pType.pTypeBase.pToken1.token);
         }
     }
-    p_tree_delete(pmod);
 }

spec/test_ast_ps.c

@@ -6,10 +6,10 @@
 int main()
 {
     char const * input = "a, ((b)), b";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    PStartS * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert_eq(P_SUCCESS, p_parse(&context));
+    PStartS * start = p_result(&context);
     assert(start->pItems1 != NULL);
     assert(start->pItems != NULL);
     PItemsS * items = start->pItems;
@@ -33,22 +33,20 @@ int main()
     assert_eq(22, itemsmore->pItem->pToken1->pvalue);
     assert(itemsmore->pItemsMore == NULL);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    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);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "2 1";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    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);
@@ -57,8 +55,7 @@ int main()
     assert(start->pItems->pItem->pDual->pTwo2 == NULL);
     assert(start->pItems->pItem->pDual->pOne1 == NULL);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     return 0;
 }

spec/test_ast_ps.d

@@ -10,9 +10,10 @@ int main()
 unittest
 {
     string input = "a, ((b)), b";
-    p_context_t * context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    PStartS * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert_eq(P_SUCCESS, p_parse(&context));
+    PStartS * start = p_result(&context);
     assert(start.pItems1 !is null);
     assert(start.pItems !is null);
     PItemsS * items = start.pItems;
@@ -36,20 +37,16 @@ unittest
     assert_eq(22, itemsmore.pItem.pToken1.pvalue);
     assert(itemsmore.pItemsMore is null);
 
-    p_tree_delete(start);
-
     input = "";
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert_eq(P_SUCCESS, p_parse(&context));
+    start = p_result(&context);
     assert(start.pItems is null);
 
-    p_tree_delete(start);
-
     input = "2 1";
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    start = p_result(context);
+    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);
@@ -57,6 +54,4 @@ unittest
     assert(start.pItems.pItem.pDual.pOne2 !is null);
     assert(start.pItems.pItem.pDual.pTwo2 is null);
     assert(start.pItems.pItem.pDual.pOne1 is null);
-
-    p_tree_delete(start);
 }

spec/test_ast_token_positions.c

@@ -6,10 +6,10 @@
 int main()
 {
     char const * input = "abbccc";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
 
     assert_eq(1, start->pT1->pToken->position.row);
     assert_eq(1, start->pT1->pToken->position.col);
@@ -43,13 +43,12 @@ int main()
     assert_eq(1, start->end_position.row);
     assert_eq(6, start->end_position.col);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "\n\n  bb\nc\ncc\n\n     a";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(3, start->pT1->pToken->position.row);
     assert_eq(3, start->pT1->pToken->position.col);
@@ -83,8 +82,7 @@ int main()
     assert_eq(7, start->end_position.row);
     assert_eq(6, start->end_position.col);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     return 0;
 }

spec/test_ast_token_positions.d

@@ -10,9 +10,10 @@ int main()
 unittest
 {
     string input = "abbccc";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
 
     assert_eq(1, start.pT1.pToken.position.row);
     assert_eq(1, start.pT1.pToken.position.col);
@@ -46,12 +47,10 @@ unittest
     assert_eq(1, start.end_position.row);
     assert_eq(6, start.end_position.col);
 
-    p_tree_delete(start);
-
     input = "\n\n  bb\nc\ncc\n\n     a";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
 
     assert_eq(3, start.pT1.pToken.position.row);
     assert_eq(3, start.pT1.pToken.position.col);
@@ -84,6 +83,4 @@ unittest
     assert_eq(3, start.position.col);
     assert_eq(7, start.end_position.row);
     assert_eq(6, start.end_position.col);
-
-    p_tree_delete(start);
 }

spec/test_basic_math_grammar.c

@@ -5,29 +5,25 @@
 int main()
 {
     char const * input = "1 + 2 * 3 + 4";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(11, p_result(context));
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(11, p_result(&context));
 
     input = "1 * 2 ** 4 * 3";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(48, p_result(context));
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(48, p_result(&context));
 
     input = "(1 + 2) * 3 + 4";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(13, p_result(context));
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(13, p_result(&context));
 
     input = "(2 * 2) ** 3 + 4 + 5";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(73, p_result(context));
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(73, p_result(&context));
 
     return 0;
 }

spec/test_basic_math_grammar.d

@@ -10,23 +10,23 @@ int main()
 unittest
 {
     string input = "1 + 2 * 3 + 4";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(11, p_result(context));
+    p_context_t context;
+    p_context_init(&context, input);
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(11, p_result(&context));
 
     input = "1 * 2 ** 4 * 3";
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(48, p_result(context));
+    p_context_init(&context, input);
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(48, p_result(&context));
 
     input = "(1 + 2) * 3 + 4";
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(13, p_result(context));
+    p_context_init(&context, input);
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(13, p_result(&context));
 
     input = "(2 * 2) ** 3 + 4 + 5";
-    context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    assert_eq(73, p_result(context));
+    p_context_init(&context, input);
+    assert_eq(P_SUCCESS, p_parse(&context));
+    assert_eq(73, p_result(&context));
 }

spec/test_custom_lex_fn.c

@@ -1,15 +0,0 @@
-#include "testparser.h"
-#include "testutils.h"
-#include <string.h>
-
-int main()
-{
-    char const * input = "cbacba";
-    p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    size_t result = p_result(context);
-    assert_eq(0x932187932187, result);
-    p_context_delete(context);
-
-    return 0;
-}

spec/test_custom_lex_fn.d

@@ -1,18 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input = "cbacba";
-    p_context_t * context = p_context_new(input);
-    assert_eq(P_SUCCESS, p_parse(context));
-    size_t result = p_result(context);
-    assert_eq(0x932187932187, result);
-    p_context_delete(context);
-}

spec/test_drop_code_block.c

@@ -1,15 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-int main()
-{
-    char const * input = "    # comment 1\n#    comment 2\na\n";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
-
-    return 0;
-}

spec/test_drop_code_block.d

@@ -1,16 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input = "    # comment 1\n#    comment 2\na\n";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-}

spec/test_error_positions.c

@@ -5,43 +5,38 @@
 int main()
 {
     char const * input = "a 42";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "a\n123\na  a";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_UNEXPECTED_TOKEN);
-    assert(p_position(context).row == 3);
-    assert(p_position(context).col == 4);
-    assert(p_token(context) == TOKEN_a);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
+    assert(p_position(&context).row == 3);
+    assert(p_position(&context).col == 4);
+    assert(p_token(&context) == TOKEN_a);
 
     input = "12";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_UNEXPECTED_TOKEN);
-    assert(p_position(context).row == 1);
-    assert(p_position(context).col == 1);
-    assert(p_token(context) == TOKEN_num);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
+    assert(p_position(&context).row == 1);
+    assert(p_position(&context).col == 1);
+    assert(p_token(&context) == TOKEN_num);
 
     input = "a 12\n\nab";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_UNEXPECTED_INPUT);
-    assert(p_position(context).row == 3);
-    assert(p_position(context).col == 2);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_UNEXPECTED_INPUT);
+    assert(p_position(&context).row == 3);
+    assert(p_position(&context).col == 2);
 
     input = "a 12\n\na\n\n77\na   \xAA";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_DECODE_ERROR);
-    assert(p_position(context).row == 6);
-    assert(p_position(context).col == 5);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_DECODE_ERROR);
+    assert(p_position(&context).row == 6);
+    assert(p_position(&context).col == 5);
 
     assert(strcmp(p_token_names[TOKEN_a], "a") == 0);
     assert(strcmp(p_token_names[TOKEN_num], "num") == 0);
-    p_context_delete(context);
 
     return 0;
 }

spec/test_error_positions.d

@@ -9,31 +9,31 @@ int main()
 unittest
 {
     string input = "a 42";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "a\n123\na  a";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_UNEXPECTED_TOKEN);
-    assert(p_position(context) == p_position_t(3, 4));
-    assert(p_token(context) == TOKEN_a);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
+    assert(p_position(&context) == p_position_t(3, 4));
+    assert(p_token(&context) == TOKEN_a);
 
     input = "12";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_UNEXPECTED_TOKEN);
-    assert(p_position(context) == p_position_t(1, 1));
-    assert(p_token(context) == TOKEN_num);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
+    assert(p_position(&context) == p_position_t(1, 1));
+    assert(p_token(&context) == TOKEN_num);
 
     input = "a 12\n\nab";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_UNEXPECTED_INPUT);
-    assert(p_position(context) == p_position_t(3, 2));
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_UNEXPECTED_INPUT);
+    assert(p_position(&context) == p_position_t(3, 2));
 
     input = "a 12\n\na\n\n77\na   \xAA";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_DECODE_ERROR);
-    assert(p_position(context) == p_position_t(6, 5));
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_DECODE_ERROR);
+    assert(p_position(&context) == p_position_t(6, 5));
 
     assert(p_token_names[TOKEN_a] == "a");
     assert(p_token_names[TOKEN_num] == "num");

spec/test_field_aliases.c

@@ -6,9 +6,8 @@
 int main()
 {
     char const * input = "foo1\nbar2";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
     return 0;
 }

spec/test_field_aliases.d

@@ -9,7 +9,7 @@ int main()
 unittest
 {
     string input = "foo1\nbar2";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 }

spec/test_free_ast_token_node_memory.c

@@ -6,15 +6,14 @@
 int main()
 {
     char const * input = "ab";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-    Start * start = p_result(context);
+    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->a != NULL);
     assert(*start->a->pvalue == 1);
     assert(start->b != NULL);
     assert(*start->b->pvalue == 2);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 }

spec/test_input_index.c

@@ -1,60 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-int main()
-{
-    /* Grammar (simple):
-     *   drop /\\s+/;
-     *   token a; token b;
-     *   Start -> a b;
-     *
-     * Verifies that p_input_index() reports the parser/lexer's current byte
-     * offset into the input text. */
-
-    /* Fresh context: input_index starts at 0. */
-    {
-        char const * input = "ab";
-        p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-        assert_eq(0u, p_input_index(context));
-        p_context_delete(context);
-    }
-
-    /* After each successful lex the byte offset advances past the token. */
-    {
-        char const * input = "a b";
-        p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_info_t token_info;
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert_eq((size_t)TOKEN_a, (size_t)token_info.token);
-        assert_eq(1u, p_input_index(context));
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert_eq((size_t)TOKEN_b, (size_t)token_info.token);
-        /* The dropped space between `a` and `b` advances input_index too. */
-        assert_eq(3u, p_input_index(context));
-        p_context_delete(context);
-    }
-
-    /* After a full successful parse, input_index has reached the end. */
-    {
-        char const * input = "ab";
-        p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-        assert(p_parse_Start(context) == P_SUCCESS);
-        assert_eq(2u, p_input_index(context));
-        p_context_delete(context);
-    }
-
-    /* When parse_inner completes via a follow token, the follow token is not
-     * consumed, so input_index points at the start of the follow token. */
-    {
-        char const * input = "abb";
-        p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_b };
-        assert(p_parse_inner_Start(context, follow_tokens, 1u) == P_SUCCESS);
-        assert_eq(2u, p_input_index(context));
-        p_context_delete(context);
-    }
-
-    return 0;
-}

spec/test_input_index.d

@@ -1,51 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    /* See test_input_index.c for details on the grammar and cases. */
-
-    /* Fresh context: input_index starts at 0. */
-    {
-        string input = "ab";
-        p_context_t * context = p_context_new(input);
-        assert(p_input_index(context) == 0);
-    }
-
-    /* After each successful lex the byte offset advances past the token. */
-    {
-        string input = "a b";
-        p_context_t * context = p_context_new(input);
-        p_token_info_t token_info;
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert(token_info.token == TOKEN_a);
-        assert(p_input_index(context) == 1);
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert(token_info.token == TOKEN_b);
-        assert(p_input_index(context) == 3);
-    }
-
-    /* After a full successful parse, input_index has reached the end. */
-    {
-        string input = "ab";
-        p_context_t * context = p_context_new(input);
-        assert(p_parse_Start(context) == P_SUCCESS);
-        assert(p_input_index(context) == 2);
-    }
-
-    /* When parse_inner completes via a follow token, the follow token is not
-     * consumed, so input_index points at the start of the follow token. */
-    {
-        string input = "abb";
-        p_context_t * context = p_context_new(input);
-        p_token_t[] follow_tokens = [TOKEN_b];
-        assert(p_parse_inner_Start(context, follow_tokens) == P_SUCCESS);
-        assert(p_input_index(context) == 2);
-    }
-}

spec/test_lexer.c

@@ -38,75 +38,73 @@ int main()
 
     p_token_info_t token_info;
     char const * input = "5 + 4 * \n677 + 567";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 1u);
     assert(token_info.position.col == 1u);
     assert(token_info.end_position.row == 1u);
     assert(token_info.end_position.col == 1u);
     assert(token_info.length == 1u);
     assert(token_info.token == TOKEN_int);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 1u);
     assert(token_info.position.col == 3u);
     assert(token_info.end_position.row == 1u);
     assert(token_info.end_position.col == 3u);
     assert(token_info.length == 1u);
     assert(token_info.token == TOKEN_plus);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 1u);
     assert(token_info.position.col == 5u);
     assert(token_info.end_position.row == 1u);
     assert(token_info.end_position.col == 5u);
     assert(token_info.length == 1u);
     assert(token_info.token == TOKEN_int);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 1u);
     assert(token_info.position.col == 7u);
     assert(token_info.end_position.row == 1u);
     assert(token_info.end_position.col == 7u);
     assert(token_info.length == 1u);
     assert(token_info.token == TOKEN_times);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 2u);
     assert(token_info.position.col == 1u);
     assert(token_info.end_position.row == 2u);
     assert(token_info.end_position.col == 3u);
     assert(token_info.length == 3u);
     assert(token_info.token == TOKEN_int);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 2u);
     assert(token_info.position.col == 5u);
     assert(token_info.end_position.row == 2u);
     assert(token_info.end_position.col == 5u);
     assert(token_info.length == 1u);
     assert(token_info.token == TOKEN_plus);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 2u);
     assert(token_info.position.col == 7u);
     assert(token_info.end_position.row == 2u);
     assert(token_info.end_position.col == 9u);
     assert(token_info.length == 3u);
     assert(token_info.token == TOKEN_int);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 2u);
     assert(token_info.position.col == 10u);
     assert(token_info.end_position.row == 2u);
     assert(token_info.end_position.col == 10u);
     assert(token_info.length == 0u);
     assert(token_info.token == TOKEN___EOF);
-    p_context_delete(context);
 
-    context = p_context_new((uint8_t const *)"", 0u);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    p_context_init(&context, (uint8_t const *)"", 0u);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info.position.row == 1u);
     assert(token_info.position.col == 1u);
     assert(token_info.end_position.row == 1u);
     assert(token_info.end_position.col == 1u);
     assert(token_info.length == 0u);
     assert(token_info.token == TOKEN___EOF);
-    p_context_delete(context);
 
     return 0;
 }

spec/test_lexer.d

@@ -44,26 +44,26 @@ unittest
 {
     p_token_info_t token_info;
     string input = "5 + 4 * \n677 + 567";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(1, 1), p_position_t(1, 1), 1, TOKEN_int));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(1, 3), p_position_t(1, 3), 1, TOKEN_plus));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(1, 5), p_position_t(1, 5), 1, TOKEN_int));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(1, 7), p_position_t(1, 7), 1, TOKEN_times));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(2, 1), p_position_t(2, 3), 3, TOKEN_int));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(2, 5), p_position_t(2, 5), 1, TOKEN_plus));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(2, 7), p_position_t(2, 9), 3, TOKEN_int));
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(2, 10), p_position_t(2, 10), 0, TOKEN___EOF));
 
-    context = p_context_new("");
-    assert(p_lex(context, &token_info) == P_SUCCESS);
+    p_context_init(&context, "");
+    assert(p_lex(&context, &token_info) == P_SUCCESS);
     assert(token_info == p_token_info_t(p_position_t(1, 1), p_position_t(1, 1), 0, TOKEN___EOF));
 }

spec/test_lexer_match_text.c

@@ -6,11 +6,10 @@
 int main()
 {
     char const * input = "identifier_123";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
     printf("pass1\n");
-    p_context_delete(context);
 
     return 0;
 }

spec/test_lexer_match_text.d

@@ -9,8 +9,8 @@ int main()
 unittest
 {
     string input = `identifier_123`;
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
     writeln("pass1");
 }

spec/test_lexer_modes.c

@@ -6,17 +6,15 @@
 int main()
 {
     char const * input = "abc \"a string\" def";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
     printf("pass1\n");
-    p_context_delete(context);
 
     input = "abc \"abc def\" def";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
     printf("pass2\n");
-    p_context_delete(context);
 
     return 0;
 }

spec/test_lexer_modes.d

@@ -9,13 +9,13 @@ int main()
 unittest
 {
     string input = `abc "a string" def`;
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
     writeln("pass1");
 
     input = `abc "abc def" def`;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
     writeln("pass2");
 }

spec/test_lexer_multiple_modes.c

@@ -6,17 +6,15 @@
 int main()
 {
     char const * input = "abc.def";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
     printf("pass1\n");
-    p_context_delete(context);
 
     input = "abc .  abc";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
     printf("pass2\n");
-    p_context_delete(context);
 
     return 0;
 }

spec/test_lexer_multiple_modes.d

@@ -9,13 +9,13 @@ int main()
 unittest
 {
     string input = `abc.def`;
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
     writeln("pass1");
 
     input = `abc .  abc`;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
     writeln("pass2");
 }

spec/test_lexer_positions.c

@@ -1,50 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-
-int main()
-{
-    char const * input = "abc\n  defg hi\n!";
-    p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-    p_token_info_t token_info;
-
-    /* First token "abc" on row 1, cols 1-3. */
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_word);
-    assert(context->last_start.row == 1u);
-    assert(context->last_start.col == 1u);
-    assert(context->last_end.row == 1u);
-    assert(context->last_end.col == 3u);
-    /* The lexer code block observed the same positions reported to the caller. */
-    assert(context->last_start.row == token_info.position.row);
-    assert(context->last_start.col == token_info.position.col);
-    assert(context->last_end.row == token_info.end_position.row);
-    assert(context->last_end.col == token_info.end_position.col);
-
-    /* Second token "defg" on row 2, cols 3-6. */
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_word);
-    assert(context->last_start.row == 2u);
-    assert(context->last_start.col == 3u);
-    assert(context->last_end.row == 2u);
-    assert(context->last_end.col == 6u);
-
-    /* Third token "hi" on row 2, cols 8-9. */
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_word);
-    assert(context->last_start.row == 2u);
-    assert(context->last_start.col == 8u);
-    assert(context->last_end.row == 2u);
-    assert(context->last_end.col == 9u);
-
-    /* The "!" stop token terminates the lexer. The context input text position
-     * must not be updated when the lexer user code requests termination, so it
-     * still points at the "!" token on row 3, col 1. */
-    assert(p_lex(context, &token_info) == P_USER_TERMINATED);
-    assert(p_user_terminate_code(context) == 42u);
-    assert(context->text_position.row == 3u);
-    assert(context->text_position.col == 1u);
-
-    p_context_delete(context);
-    return 0;
-}

spec/test_lexer_positions.d

@@ -1,42 +0,0 @@
-import testparser;
-import std.stdio;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input = "abc\n  defg hi\n!";
-    p_context_t * context = p_context_new(input);
-    p_token_info_t token_info;
-
-    /* First token "abc" on row 1, cols 1-3. */
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_word);
-    assert(context.last_start == p_position_t(1, 1));
-    assert(context.last_end == p_position_t(1, 3));
-    /* The lexer code block observed the same positions reported to the caller. */
-    assert(context.last_start == token_info.position);
-    assert(context.last_end == token_info.end_position);
-
-    /* Second token "defg" on row 2, cols 3-6. */
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_word);
-    assert(context.last_start == p_position_t(2, 3));
-    assert(context.last_end == p_position_t(2, 6));
-
-    /* Third token "hi" on row 2, cols 8-9. */
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_word);
-    assert(context.last_start == p_position_t(2, 8));
-    assert(context.last_end == p_position_t(2, 9));
-
-    /* The "!" stop token terminates the lexer. The context input text position
-     * must not be updated when the lexer user code requests termination, so it
-     * still points at the "!" token on row 3, col 1. */
-    assert(p_lex(context, &token_info) == P_USER_TERMINATED);
-    assert(p_user_terminate_code(context) == 42u);
-    assert(context.text_position == p_position_t(3, 1));
-}

spec/test_lexer_result_value.c

@@ -5,17 +5,15 @@
 int main()
 {
     char const * input = "x";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    assert(p_result(context) == 1u);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    assert(p_result(&context) == 1u);
 
     input = "fabulous";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    assert(p_result(context) == 8u);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    assert(p_result(&context) == 8u);
 
     return 0;
 }

spec/test_lexer_result_value.d

@@ -9,13 +9,13 @@ int main()
 unittest
 {
     string input = `x`;
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    assert(p_result(context) == 1u);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    assert(p_result(&context) == 1u);
 
     input = `fabulous`;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    assert(p_result(context) == 8u);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    assert(p_result(&context) == 8u);
 }

spec/test_lexer_unknown_character.c

@@ -5,16 +5,14 @@
 int main()
 {
     char const * input = "x";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_UNEXPECTED_INPUT);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_UNEXPECTED_INPUT);
 
     input = "123";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    assert(p_result(context) == 123u);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    assert(p_result(&context) == 123u);
 
     return 0;
 }

spec/test_lexer_unknown_character.d

@@ -9,12 +9,12 @@ int main()
 unittest
 {
     string input = `x`;
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_UNEXPECTED_INPUT);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_UNEXPECTED_INPUT);
 
     input = `123`;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    assert(p_result(context) == 123u);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    assert(p_result(&context) == 123u);
 }

spec/test_macros.c

@@ -1,118 +0,0 @@
-#include "testparser.h"
-#include "testutils.h"
-#include <string.h>
-#include <assert.h>
-#include <stddef.h>
-#include <stdbool.h>
-
-static p_context_t * context;
-size_t n_tokens;
-p_token_info_t token_infos[10];
-
-/* Capture the macro body tokens (everything up to the closing '}') into
- * token_infos[]. Called from mylexfn() right after the definition's '{' has
- * been lexed, so the input cursor is positioned at the first body token. */
-static void capture_macro_body(void)
-{
-    n_tokens = 0u;
-    for (;;)
-    {
-        size_t result = p_lex(context, &token_infos[n_tokens]);
-        assert_eq(result, P_SUCCESS);
-        if (token_infos[n_tokens].token == TOKEN_rbrace)
-        {
-            break;
-        }
-        n_tokens++;
-        assert(n_tokens < sizeof(token_infos) / sizeof(token_infos[0]));
-    }
-}
-
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info)
-{
-    static bool defining;
-    static bool expanding;
-    static size_t expand_i;
-
-    for (;;)
-    {
-        if (expanding)
-        {
-            size_t ei = expand_i++;
-            if (expand_i >= n_tokens)
-            {
-                expanding = false;
-            }
-            *out_token_info = token_infos[ei];
-            return P_SUCCESS;
-        }
-
-        size_t lex_result = p_lex(context, out_token_info);
-        if (lex_result != P_SUCCESS)
-        {
-            return lex_result;
-        }
-
-        switch (out_token_info->token)
-        {
-        case TOKEN_macro:
-            /* Start of a macro definition: "macro macroname { ... }". */
-            defining = true;
-            break;
-        case TOKEN_macroname:
-            if (!defining)
-            {
-                /* Use of a macro: replay its captured body tokens instead of
-                 * returning the macroname to the parser. */
-                expanding = true;
-                expand_i = 0u;
-                continue;
-            }
-            /* Definition name: pass through and keep waiting for '{'. */
-            break;
-        case TOKEN_lbrace:
-            if (defining)
-            {
-                /* Consume and store the macro body now, before the parser gets
-                 * a chance to read its lookahead token (which would otherwise
-                 * swallow the first body token). */
-                capture_macro_body();
-                defining = false;
-            }
-            break;
-        default:
-            defining = false;
-            break;
-        }
-        return lex_result;
-    }
-}
-
-size_t n_nums;
-int nums[10];
-
-void record(int v)
-{
-    nums[n_nums++] = v;
-}
-
-int main()
-{
-    char const * input =
-        "macro @m { 23 + 200 }\n"
-        "66 + 100\n"
-        "@m\n"
-        "33 + 55\n"
-        "@m\n";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
-
-    assert_eq(n_nums, 4);
-    assert_eq(nums[0], 166);
-    assert_eq(nums[1], 223);
-    assert_eq(nums[2], 88);
-    assert_eq(nums[3], 223);
-
-    return 0;
-}

spec/test_macros.d

@@ -1,116 +0,0 @@
-import testparser;
-import testutils;
-
-size_t n_tokens;
-p_token_info_t[10] token_infos;
-
-// Capture the macro body tokens (everything up to the closing '}') into
-// token_infos[]. Called from mylexfn() right after the definition's '{' has
-// been lexed, so the input cursor is positioned at the first body token.
-void capture_macro_body(p_context_t * context)
-{
-    n_tokens = 0u;
-    for (;;)
-    {
-        size_t result = p_lex(context, &token_infos[n_tokens]);
-        assert(result == P_SUCCESS);
-        if (token_infos[n_tokens].token == TOKEN_rbrace)
-        {
-            break;
-        }
-        n_tokens++;
-        assert(n_tokens < token_infos.length);
-    }
-}
-
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info)
-{
-    static bool defining;
-    static bool expanding;
-    static size_t expand_i;
-
-    for (;;)
-    {
-        if (expanding)
-        {
-            size_t ei = expand_i++;
-            if (expand_i >= n_tokens)
-            {
-                expanding = false;
-            }
-            *out_token_info = token_infos[ei];
-            return P_SUCCESS;
-        }
-
-        size_t lex_result = p_lex(context, out_token_info);
-        if (lex_result != P_SUCCESS)
-        {
-            return lex_result;
-        }
-
-        switch (out_token_info.token)
-        {
-        case TOKEN_macro:
-            // Start of a macro definition: "macro macroname { ... }".
-            defining = true;
-            break;
-        case TOKEN_macroname:
-            if (!defining)
-            {
-                // Use of a macro: replay its captured body tokens instead of
-                // returning the macroname to the parser.
-                expanding = true;
-                expand_i = 0u;
-                continue;
-            }
-            // Definition name: pass through and keep waiting for '{'.
-            break;
-        case TOKEN_lbrace:
-            if (defining)
-            {
-                // Consume and store the macro body now, before the parser gets
-                // a chance to read its lookahead token (which would otherwise
-                // swallow the first body token).
-                capture_macro_body(context);
-                defining = false;
-            }
-            break;
-        default:
-            defining = false;
-            break;
-        }
-        return lex_result;
-    }
-}
-
-size_t n_nums;
-int[10] nums;
-
-void record(int v)
-{
-    nums[n_nums++] = v;
-}
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    string input =
-        "macro @m { 23 + 200 }\n" ~
-        "66 + 100\n" ~
-        "@m\n" ~
-        "33 + 55\n" ~
-        "@m\n";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
-
-    assert(n_nums == 4);
-    assert(nums[0] == 166);
-    assert(nums[1] == 223);
-    assert(nums[2] == 88);
-    assert(nums[3] == 223);
-}

spec/test_match_backslashes.c

@@ -5,10 +5,9 @@
 int main()
 {
     char const * input = "\a\b\t\n\v\f\rt";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     return 0;
 }

spec/test_match_backslashes.d

@@ -9,7 +9,7 @@ int main()
 unittest
 {
     string input = "\a\b\t\n\v\f\rt";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 }

spec/test_multiple_parsers.c

@@ -6,16 +6,14 @@
 int main()
 {
     char const * input1 = "a\n1";
-    myp1_context_t * context1;
-    context1 = myp1_context_new((uint8_t const *)input1, strlen(input1));
-    assert(myp1_parse(context1) == MYP1_SUCCESS);
-    myp1_context_delete(context1);
+    myp1_context_t context1;
+    myp1_context_init(&context1, (uint8_t const *)input1, strlen(input1));
+    assert(myp1_parse(&context1) == MYP1_SUCCESS);
 
     char const * input2 = "bcb";
-    myp2_context_t * context2;
-    context2 = myp2_context_new((uint8_t const *)input2, strlen(input2));
-    assert(myp2_parse(context2) == MYP2_SUCCESS);
-    myp2_context_delete(context2);
+    myp2_context_t context2;
+    myp2_context_init(&context2, (uint8_t const *)input2, strlen(input2));
+    assert(myp2_parse(&context2) == MYP2_SUCCESS);
 
     return 0;
 }

spec/test_multiple_parsers.d

@@ -10,12 +10,12 @@ int main()
 unittest
 {
     string input1 = "a\n1";
-    myp1_context_t * context1;
-    context1 = myp1_context_new(input1);
-    assert(myp1_parse(context1) == MYP1_SUCCESS);
+    myp1_context_t context1;
+    myp1_context_init(&context1, input1);
+    assert(myp1_parse(&context1) == MYP1_SUCCESS);
 
     string input2 = "bcb";
-    myp2_context_t * context2;
-    context2 = myp2_context_new(input2);
-    assert(myp2_parse(context2) == MYP2_SUCCESS);
+    myp2_context_t context2;
+    myp2_context_init(&context2, input2);
+    assert(myp2_parse(&context2) == MYP2_SUCCESS);
 }

spec/test_named_optional_rule_component_ast.c

@@ -6,10 +6,10 @@
 int main()
 {
     char const * input = "b";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
     assert(start->a == NULL);
     assert(start->pToken2 != NULL);
     assert_eq(TOKEN_b, start->pToken2->token);
@@ -17,13 +17,12 @@ int main()
     assert(start->pR == NULL);
     assert(start->r == NULL);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "abcd";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start->a != NULL);
     assert_eq(TOKEN_a, start->pToken1->token);
     assert(start->pToken2 != NULL);
@@ -34,20 +33,18 @@ int main()
     assert(start->pR == start->r);
     assert_eq(TOKEN_c, start->pR->pToken1->token);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "bdc";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start->a == NULL);
     assert(start->pToken2 != NULL);
     assert(start->r != NULL);
     assert_eq(TOKEN_d, start->pR->pToken1->token);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     return 0;
 }

spec/test_named_optional_rule_component_ast.d

@@ -10,9 +10,10 @@ int main()
 unittest
 {
     string input = "b";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
     assert(start.pToken1 is null);
     assert(start.pToken2 !is null);
     assert_eq(TOKEN_b, start.pToken2.token);
@@ -20,12 +21,10 @@ unittest
     assert(start.pR is null);
     assert(start.r is null);
 
-    p_tree_delete(start);
-
     input = "abcd";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start.pToken1 != null);
     assert_eq(TOKEN_a, start.pToken1.token);
     assert(start.pToken2 != null);
@@ -36,16 +35,12 @@ unittest
     assert(start.pR == start.r);
     assert_eq(TOKEN_c, start.pR.pToken1.token);
 
-    p_tree_delete(start);
-
     input = "bdc";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start.pToken1 is null);
     assert(start.pToken2 !is null);
     assert(start.pR !is null);
     assert_eq(TOKEN_d, start.pR.pToken1.token);
-
-    p_tree_delete(start);
 }

spec/test_optional_rule_component.c

@@ -5,20 +5,17 @@
 int main()
 {
     char const * input = "b";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "abcd";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "abdc";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     return 0;
 }

spec/test_optional_rule_component.d

@@ -9,15 +9,15 @@ int main()
 unittest
 {
     string input = "b";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "abcd";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "abdc";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 }

spec/test_optional_rule_component_ast.c

@@ -6,23 +6,22 @@
 int main()
 {
     char const * input = "b";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
     assert(start->pToken1 == NULL);
     assert(start->pToken2 != NULL);
     assert_eq(TOKEN_b, start->pToken2->token);
     assert(start->pR3 == NULL);
     assert(start->pR == NULL);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "abcd";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start->pToken1 != NULL);
     assert_eq(TOKEN_a, start->pToken1->token);
     assert(start->pToken2 != NULL);
@@ -31,20 +30,18 @@ int main()
     assert(start->pR == start->pR3);
     assert_eq(TOKEN_c, start->pR->pToken1->token);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     input = "bdc";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start->pToken1 == NULL);
     assert(start->pToken2 != NULL);
     assert(start->pR != NULL);
     assert_eq(TOKEN_d, start->pR->pToken1->token);
 
-    p_tree_delete(start);
-    p_context_delete(context);
+    p_free_ast(start);
 
     return 0;
 }

spec/test_optional_rule_component_ast.d

@@ -10,21 +10,20 @@ int main()
 unittest
 {
     string input = "b";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    Start * start = p_result(context);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    Start * start = p_result(&context);
     assert(start.pToken1 is null);
     assert(start.pToken2 !is null);
     assert_eq(TOKEN_b, start.pToken2.token);
     assert(start.pR3 is null);
     assert(start.pR is null);
 
-    p_tree_delete(start);
-
     input = "abcd";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start.pToken1 != null);
     assert_eq(TOKEN_a, start.pToken1.token);
     assert(start.pToken2 != null);
@@ -33,16 +32,12 @@ unittest
     assert(start.pR == start.pR3);
     assert_eq(TOKEN_c, start.pR.pToken1.token);
 
-    p_tree_delete(start);
-
     input = "bdc";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    start = p_result(context);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
+    start = p_result(&context);
     assert(start.pToken1 is null);
     assert(start.pToken2 !is null);
     assert(start.pR !is null);
     assert_eq(TOKEN_d, start.pR.pToken1.token);
-
-    p_tree_delete(start);
 }

spec/test_parse_inner.c

@@ -1,73 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-int main()
-{
-    /* Grammar (chain reduce):
-     *   Start -> Y      << $$ = $1; >>
-     *   Y     -> a      << $$ = $1; >>
-     *   token a         << $$ = 1; >>
-     *
-     * The reduce lookahead for both `Y -> a` and `Start -> Y` is only $EOF,
-     * so `p_parse_Start("ab")` fails at token `b`. p_parse_inner_Start with
-     * `b` as a follow token should succeed via the reduce-side retry chain
-     * (Y then Start) followed by the shift-side retry hitting $EOF at the
-     * final state. */
-
-    /* Standard parse succeeds on complete input. */
-    char const * input = "a";
-    p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_Start(context) == P_SUCCESS);
-    assert_eq(1u, (size_t)p_result_Start(context));
-    p_context_delete(context);
-
-    /* Standard parse fails when there's an unexpected trailing token. */
-    input = "ab";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_Start(context) == P_UNEXPECTED_TOKEN);
-    p_context_delete(context);
-
-    /* parse_inner succeeds via a chain of reduce retries (Y, then Start),
-     * followed by the shift-side retry hitting $EOF at the final state. */
-    {
-        input = "ab";
-        context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_b };
-        assert(p_parse_inner_Start(context, follow_tokens, 1u) == P_SUCCESS);
-        assert_eq(1u, (size_t)p_result_Start(context));
-        p_context_delete(context);
-    }
-
-    /* parse_inner with an empty (NULL) follow-token vector behaves like a
-     * standard parse. */
-    input = "ab";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_inner_Start(context, NULL, 0u) == P_UNEXPECTED_TOKEN);
-    p_context_delete(context);
-
-    /* parse_inner behaves like a standard parse when the input matches the
-     * grammar fully. */
-    input = "a";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    {
-        p_token_t follow_tokens[] = { TOKEN_b };
-        assert(p_parse_inner_Start(context, follow_tokens, 1u) == P_SUCCESS);
-        assert_eq(1u, (size_t)p_result_Start(context));
-    }
-    p_context_delete(context);
-
-    /* parse_inner with a non-matching follow token still fails. The grammar
-     * can't consume `b` and it isn't listed as a follow token, so the retries
-     * do not fire. */
-    {
-        input = "ab";
-        context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN___EOF };
-        assert(p_parse_inner_Start(context, follow_tokens, 1u) == P_UNEXPECTED_TOKEN);
-        p_context_delete(context);
-    }
-
-    return 0;
-}

spec/test_parse_inner.d

@@ -1,51 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    /* See test_parse_inner.c for details on the grammar and cases. */
-
-    /* Standard parse succeeds on complete input. */
-    string input = "a";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse_Start(context) == P_SUCCESS);
-    assert(p_result_Start(context) == 1);
-
-    /* Standard parse fails when there's an unexpected trailing token. */
-    input = "ab";
-    context = p_context_new(input);
-    assert(p_parse_Start(context) == P_UNEXPECTED_TOKEN);
-
-    /* parse_inner succeeds via a chain of reduce retries (Y, then Start),
-     * followed by the shift-side retry hitting $EOF at the final state. */
-    input = "ab";
-    context = p_context_new(input);
-    p_token_t[] follow_tokens_b = [TOKEN_b];
-    assert(p_parse_inner_Start(context, follow_tokens_b) == P_SUCCESS);
-    assert(p_result_Start(context) == 1);
-
-    /* parse_inner with a null follow-token slice behaves like a standard
-     * parse. */
-    input = "ab";
-    context = p_context_new(input);
-    assert(p_parse_inner_Start(context, null) == P_UNEXPECTED_TOKEN);
-
-    /* parse_inner behaves like a standard parse when the input matches the
-     * grammar fully. */
-    input = "a";
-    context = p_context_new(input);
-    assert(p_parse_inner_Start(context, follow_tokens_b) == P_SUCCESS);
-    assert(p_result_Start(context) == 1);
-
-    /* parse_inner with a non-matching follow token still fails. */
-    input = "ab";
-    context = p_context_new(input);
-    p_token_t[] follow_tokens_eof = [TOKEN___EOF];
-    assert(p_parse_inner_Start(context, follow_tokens_eof) == P_UNEXPECTED_TOKEN);
-}

spec/test_parse_inner_nested.c

@@ -1,78 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-/* Grammar (integer evaluator; parentheses handled by the lex function):
- *   ptype int;
- *   lex_fn mylexfn;
- *   token lparen /\(/; token rparen /\)/; token plus /\+/;
- *   token num /\d+/          << ... atoi ... >>
- *   Start -> Expr            << $$ = $1; >>
- *   Expr  -> num             << $$ = $1; >>
- *   Expr  -> Expr plus num   << $$ = $1 + $3; >>
- *
- * The tokens lparen and rparen appear in no grammar rule. Instead, when the
- * lex function lexes a '(', it performs a nested parse (p_parse_inner_Start)
- * of the parenthesized sub-expression -- reentrantly, while the outer parse is
- * still suspended in this callback -- reads the computed value with
- * p_result_Start, consumes the ')' that p_parse_inner deliberately left in the
- * input, and hands a single synthesized num token carrying that value back to
- * the outer parse. Nested groups recurse this process to arbitrary depth. */
-
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info)
-{
-    size_t result = p_lex(context, out_token_info);
-    if (result != P_SUCCESS)
-    {
-        return result;
-    }
-    if (out_token_info->token == TOKEN_lparen)
-    {
-        /* Nested parse of the parenthesized sub-expression, stopping at the
-         * closing ')' follow token. This re-enters the parser while the outer
-         * parse is suspended in this lex callback. */
-        p_token_t follow_tokens[] = { TOKEN_rparen };
-        size_t inner_result = p_parse_inner_Start(context, follow_tokens, 1u);
-        if (inner_result != P_SUCCESS)
-        {
-            return inner_result;
-        }
-        int value = p_result_Start(context);
-        /* p_parse_inner rewound the input so that ')' was not consumed; consume
-         * it now. */
-        p_token_info_t rparen_info;
-        size_t rparen_result = p_lex(context, &rparen_info);
-        assert(rparen_result == P_SUCCESS);
-        assert(rparen_info.token == TOKEN_rparen);
-        /* Replace the '(' token with a synthesized num carrying the nested
-         * parse result. */
-        out_token_info->token = TOKEN_num;
-        out_token_info->pvalue = p_value(value);
-    }
-    return P_SUCCESS;
-}
-
-static int eval(char const * input)
-{
-    p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    int value = p_result(context);
-    p_context_delete(context);
-    return value;
-}
-
-int main()
-{
-    /* No parentheses: plain outer parse. */
-    assert_eq(5u, (size_t)eval("2 + 3"));
-    /* A single group evaluated by the nested parse. */
-    assert_eq(3u, (size_t)eval("(1 + 2)"));
-    /* A group in the middle of an outer expression. */
-    assert_eq(14u, (size_t)eval("2 + (3 + 4) + 5"));
-    /* Nested groups: the nested parse re-enters itself. */
-    assert_eq(37u, (size_t)eval("2 + (10 + (20 + 5))"));
-    assert_eq(15u, (size_t)eval("(1 + 2) + (3 + (4 + 5))"));
-
-    return 0;
-}

spec/test_parse_inner_nested.d

@@ -1,64 +0,0 @@
-import testparser;
-import testutils;
-
-/* Grammar: see test_parse_inner_nested.c. */
-
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info)
-{
-    size_t result = p_lex(context, out_token_info);
-    if (result != P_SUCCESS)
-    {
-        return result;
-    }
-    if (out_token_info.token == TOKEN_lparen)
-    {
-        /* Nested parse of the parenthesized sub-expression, stopping at the
-         * closing ')' follow token. This re-enters the parser while the outer
-         * parse is suspended in this lex callback. */
-        p_token_t[] follow_tokens = [TOKEN_rparen];
-        size_t inner_result = p_parse_inner_Start(context, follow_tokens);
-        if (inner_result != P_SUCCESS)
-        {
-            return inner_result;
-        }
-        int value = p_result_Start(context);
-        /* p_parse_inner rewound the input so that ')' was not consumed; consume
-         * it now. */
-        p_token_info_t rparen_info;
-        size_t rparen_result = p_lex(context, &rparen_info);
-        assert(rparen_result == P_SUCCESS);
-        assert(rparen_info.token == TOKEN_rparen);
-        /* Replace the '(' token with a synthesized num carrying the nested
-         * parse result. */
-        out_token_info.token = TOKEN_num;
-        out_token_info.pvalue = p_value(value);
-    }
-    return P_SUCCESS;
-}
-
-int eval(string input)
-{
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-    int value = p_result(context);
-    p_context_delete(context);
-    return value;
-}
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    /* No parentheses: plain outer parse. */
-    assert_eq(5, eval("2 + 3"));
-    /* A single group evaluated by the nested parse. */
-    assert_eq(3, eval("(1 + 2)"));
-    /* A group in the middle of an outer expression. */
-    assert_eq(14, eval("2 + (3 + 4) + 5"));
-    /* Nested groups: the nested parse re-enters itself. */
-    assert_eq(37, eval("2 + (10 + (20 + 5))"));
-    assert_eq(15, eval("(1 + 2) + (3 + (4 + 5))"));
-}

spec/test_parse_inner_nested_tree.c

@@ -1,104 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-/* Grammar (tree generation mode; parentheses handled by the lex function):
- *   tree;
- *   lex_fn mylexfn;
- *   token lparen /\(/; token rparen /\)/; token plus /\+/; token num /\d+/;
- *   Start -> Expr;
- *   Expr  -> num;
- *   Expr  -> Expr plus num;
- *
- * The same lexer-driven nested parse as test_parse_inner_nested, but in tree
- * generation mode. Each "( ... )" group is parsed by a reentrant
- * p_parse_inner_Start() call from the lex function; the resulting subtree is
- * discarded and a single synthesized num token is handed to the outer parse.
- * The synthesized token's position is set to span the whole group ('(' start
- * through ')' end), so this verifies that positions survive the nested-parse
- * boundary and land correctly in the outer tree. */
-
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info)
-{
-    size_t result = p_lex(context, out_token_info);
-    if (result != P_SUCCESS)
-    {
-        return result;
-    }
-    if (out_token_info->token == TOKEN_lparen)
-    {
-        p_position_t start_position = out_token_info->position;
-        /* Reentrant nested parse of the parenthesized sub-expression. */
-        p_token_t follow_tokens[] = { TOKEN_rparen };
-        size_t inner_result = p_parse_inner_Start(context, follow_tokens, 1u);
-        if (inner_result != P_SUCCESS)
-        {
-            return inner_result;
-        }
-        Start * inner = p_result_Start(context);
-        assert_not_null(inner);
-        /* p_parse_inner rewound the input so that ')' was not consumed; consume
-         * it now. */
-        p_token_info_t rparen_info;
-        size_t rparen_result = p_lex(context, &rparen_info);
-        assert(rparen_result == P_SUCCESS);
-        assert(rparen_info.token == TOKEN_rparen);
-        /* The subtree covers the region strictly between the parentheses. */
-        assert_eq((size_t)(start_position.col + 1u), (size_t)inner->position.col);
-        assert_eq((size_t)(rparen_info.position.col - 1u), (size_t)inner->end_position.col);
-        p_tree_delete_Start(inner);
-        /* Synthesize a num token spanning the entire "( ... )" group. */
-        out_token_info->token = TOKEN_num;
-        out_token_info->position = start_position;
-        out_token_info->end_position = rparen_info.end_position;
-    }
-    return P_SUCCESS;
-}
-
-int main()
-{
-    /* "(3 + 4) + (5 + 6)": two parenthesized groups, each collapsed by the
-     * lexer into a single num token spanning its group. */
-    char const * input = "(3 + 4) + (5 + 6)";
-    p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-
-    Start * tree = p_result(context);
-    assert_not_null(tree);
-
-    /* Start -> Expr, where the top Expr is "Expr plus num". */
-    Expr * top = tree->pExpr;
-    assert_not_null(top);
-    assert_not_null(top->pExpr);
-    assert_not_null(top->pToken2);
-    assert_not_null(top->pToken3);
-
-    /* The '+' joining the two groups is at column 9. */
-    assert_eq(1u, (size_t)top->pToken2->position.row);
-    assert_eq(9u, (size_t)top->pToken2->position.col);
-
-    /* Right operand: synthesized num for "(5 + 6)", spanning columns 11..17. */
-    assert_eq(1u, (size_t)top->pToken3->position.row);
-    assert_eq(11u, (size_t)top->pToken3->position.col);
-    assert_eq(1u, (size_t)top->pToken3->end_position.row);
-    assert_eq(17u, (size_t)top->pToken3->end_position.col);
-
-    /* Left operand: Expr -> num, the synthesized num for "(3 + 4)", spanning
-     * columns 1..7. */
-    Expr * left = top->pExpr;
-    assert_not_null(left->pToken1);
-    assert_eq(1u, (size_t)left->pToken1->position.row);
-    assert_eq(1u, (size_t)left->pToken1->position.col);
-    assert_eq(1u, (size_t)left->pToken1->end_position.row);
-    assert_eq(7u, (size_t)left->pToken1->end_position.col);
-
-    /* The whole tree spans columns 1..17. */
-    assert_eq(1u, (size_t)tree->position.col);
-    assert_eq(17u, (size_t)tree->end_position.col);
-
-    p_tree_delete(tree);
-    p_context_delete(context);
-
-    return 0;
-}

spec/test_parse_inner_nested_tree.d

@@ -1,91 +0,0 @@
-import testparser;
-import testutils;
-
-/* Grammar: see test_parse_inner_nested_tree.c. */
-
-size_t mylexfn(p_context_t * context, p_token_info_t * out_token_info)
-{
-    size_t result = p_lex(context, out_token_info);
-    if (result != P_SUCCESS)
-    {
-        return result;
-    }
-    if (out_token_info.token == TOKEN_lparen)
-    {
-        p_position_t start_position = out_token_info.position;
-        /* Reentrant nested parse of the parenthesized sub-expression. */
-        p_token_t[] follow_tokens = [TOKEN_rparen];
-        size_t inner_result = p_parse_inner_Start(context, follow_tokens);
-        if (inner_result != P_SUCCESS)
-        {
-            return inner_result;
-        }
-        Start * inner = p_result_Start(context);
-        assert(inner !is null);
-        /* p_parse_inner rewound the input so that ')' was not consumed; consume
-         * it now. */
-        p_token_info_t rparen_info;
-        size_t rparen_result = p_lex(context, &rparen_info);
-        assert(rparen_result == P_SUCCESS);
-        assert(rparen_info.token == TOKEN_rparen);
-        /* The subtree covers the region strictly between the parentheses. */
-        assert_eq(start_position.col + 1u, inner.position.col);
-        assert_eq(rparen_info.position.col - 1u, inner.end_position.col);
-        p_tree_delete_Start(inner);
-        /* Synthesize a num token spanning the entire "( ... )" group. */
-        out_token_info.token = TOKEN_num;
-        out_token_info.position = start_position;
-        out_token_info.end_position = rparen_info.end_position;
-    }
-    return P_SUCCESS;
-}
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    /* "(3 + 4) + (5 + 6)": two parenthesized groups, each collapsed by the
-     * lexer into a single num token spanning its group. */
-    string input = "(3 + 4) + (5 + 6)";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
-
-    Start * tree = p_result(context);
-    assert(tree !is null);
-
-    /* Start -> Expr, where the top Expr is "Expr plus num". */
-    Expr * top = tree.pExpr;
-    assert(top !is null);
-    assert(top.pExpr !is null);
-    assert(top.pToken2 !is null);
-    assert(top.pToken3 !is null);
-
-    /* The '+' joining the two groups is at column 9. */
-    assert_eq(1u, top.pToken2.position.row);
-    assert_eq(9u, top.pToken2.position.col);
-
-    /* Right operand: synthesized num for "(5 + 6)", spanning columns 11..17. */
-    assert_eq(1u, top.pToken3.position.row);
-    assert_eq(11u, top.pToken3.position.col);
-    assert_eq(1u, top.pToken3.end_position.row);
-    assert_eq(17u, top.pToken3.end_position.col);
-
-    /* Left operand: Expr -> num, the synthesized num for "(3 + 4)", spanning
-     * columns 1..7. */
-    Expr * left = top.pExpr;
-    assert(left.pToken1 !is null);
-    assert_eq(1u, left.pToken1.position.row);
-    assert_eq(1u, left.pToken1.position.col);
-    assert_eq(1u, left.pToken1.end_position.row);
-    assert_eq(7u, left.pToken1.end_position.col);
-
-    /* The whole tree spans columns 1..17. */
-    assert_eq(1u, tree.position.col);
-    assert_eq(17u, tree.end_position.col);
-
-    p_tree_delete(tree);
-    p_context_delete(context);
-}

spec/test_parse_inner_recursive.c

@@ -1,77 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-int main()
-{
-    /* Grammar (recursive):
-     *   Start -> a Start b   << $$ = $2; >>
-     *   Start -> c           << $$ = $1; >>
-     *   token a << $$ = 1; >>
-     *   token b << $$ = 2; >>
-     *   token c << $$ = 3; >>
-     *
-     * Here `Start` can appear in the middle of another `Start` rule, so the
-     * inner-parse follow-token success must be blocked whenever an unfinished
-     * outer `Start -> a Start b` remains on the parse stack (i.e. the parse
-     * stack contains more than just the initial state and the reduced start
-     * rule set). */
-
-    /* Standard parse of `c` succeeds. */
-    char const * input = "c";
-    p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_Start(context) == P_SUCCESS);
-    assert_eq(3u, (size_t)p_result_Start(context));
-    p_context_delete(context);
-
-    /* Standard parse of `acb` succeeds (full outer rule). */
-    input = "acb";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_Start(context) == P_SUCCESS);
-    assert_eq(3u, (size_t)p_result_Start(context));
-    p_context_delete(context);
-
-    /* Standard parse of `ac` fails (`b` missing). */
-    input = "ac";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_Start(context) == P_UNEXPECTED_TOKEN);
-    p_context_delete(context);
-
-    /* parse_inner with `ac` and follow token `b` also fails: even though the
-     * inner `Start -> c` reduces and `Start` is shifted, the outer
-     * `Start -> a Start . b` is still on the stack (stack length > 2), so the
-     * "reduced start rule is the only thing on the parse stack" invariant
-     * blocks the shift-side follow-token success. */
-    {
-        input = "ac";
-        context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_b, TOKEN___EOF };
-        assert(p_parse_inner_Start(context, follow_tokens, 2u) == P_UNEXPECTED_TOKEN);
-        p_context_delete(context);
-    }
-
-    /* parse_inner with `acb` (complete outer rule) succeeds via the standard
-     * path. */
-    {
-        input = "acb";
-        context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_b };
-        assert(p_parse_inner_Start(context, follow_tokens, 1u) == P_SUCCESS);
-        assert_eq(3u, (size_t)p_result_Start(context));
-        p_context_delete(context);
-    }
-
-    /* parse_inner with just `c` succeeds via the standard path even when a
-     * follow-token vector is supplied. */
-    {
-        input = "c";
-        context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_b };
-        assert(p_parse_inner_Start(context, follow_tokens, 1u) == P_SUCCESS);
-        assert_eq(3u, (size_t)p_result_Start(context));
-        p_context_delete(context);
-    }
-
-    return 0;
-}

spec/test_parse_inner_recursive.d

@@ -1,49 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    /* See test_parse_inner_recursive.c for details on the grammar. */
-
-    /* Standard parse of `c` succeeds. */
-    string input = "c";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse_Start(context) == P_SUCCESS);
-    assert(p_result_Start(context) == 3);
-
-    /* Standard parse of `acb` succeeds. */
-    input = "acb";
-    context = p_context_new(input);
-    assert(p_parse_Start(context) == P_SUCCESS);
-    assert(p_result_Start(context) == 3);
-
-    /* Standard parse of `ac` fails. */
-    input = "ac";
-    context = p_context_new(input);
-    assert(p_parse_Start(context) == P_UNEXPECTED_TOKEN);
-
-    /* parse_inner with `ac` fails: outer rule still on the stack. */
-    input = "ac";
-    context = p_context_new(input);
-    p_token_t[] follow_tokens_bothway = [TOKEN_b, TOKEN___EOF];
-    assert(p_parse_inner_Start(context, follow_tokens_bothway) == P_UNEXPECTED_TOKEN);
-
-    /* parse_inner with `acb` succeeds via the standard path. */
-    input = "acb";
-    context = p_context_new(input);
-    p_token_t[] follow_tokens_b = [TOKEN_b];
-    assert(p_parse_inner_Start(context, follow_tokens_b) == P_SUCCESS);
-    assert(p_result_Start(context) == 3);
-
-    /* parse_inner with just `c` succeeds via the standard path. */
-    input = "c";
-    context = p_context_new(input);
-    assert(p_parse_inner_Start(context, follow_tokens_b) == P_SUCCESS);
-    assert(p_result_Start(context) == 3);
-}

spec/test_parse_inner_shared.c

@@ -1,104 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-int main()
-{
-    /* Grammar:
-     *   start Start;
-     *   start R1;
-     *   Start -> R1 a;
-     *   Start -> R2 b;
-     *   R1 -> a b   << $$ = 11; >>
-     *   R2 -> a b   << $$ = 22; >>
-     *   token a; token b;
-     *
-     * The rules `R1 -> a b` and `R2 -> a b` produce identical input. Within
-     * parse_Start, the generated parser differentiates the reduce by
-     * lookahead: `a` selects R1 (because `Start -> R1 a`) and `b` selects R2
-     * (because `Start -> R2 b`). Within parse_R1, the reduce is unconditional
-     * on any lookahead. This test exercises p_parse_inner_R1() to confirm
-     * that reductions to R1 succeed even when the incoming follow token is
-     * not the natural lookahead used by parse_Start's disambiguation. */
-
-    /* Sanity-check that parse_Start resolves R1 vs R2 via lookahead in the
-     * shared "a b" state. */
-    char const * input = "aba";
-    p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_Start(context) == P_SUCCESS);
-    p_context_delete(context);
-
-    input = "abb";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_Start(context) == P_SUCCESS);
-    p_context_delete(context);
-
-    /* Standard parse of R1 succeeds on "ab". */
-    input = "ab";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_R1(context) == P_SUCCESS);
-    assert_eq(11u, (size_t)p_result_R1(context));
-    p_context_delete(context);
-
-    /* Standard parse of R1 fails on "abb" (unexpected trailing token). */
-    input = "abb";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_R1(context) == P_UNEXPECTED_TOKEN);
-    p_context_delete(context);
-
-    /* parse_inner_R1("abb", [b]) succeeds: even though `b` is the lookahead
-     * that parse_Start uses to select R2 over R1 in the ambiguous state, from
-     * R1's start state the reduce to R1 is unconditional, and the follow-
-     * token shift retry at the R1-accepting state completes the parse.
-     *
-     * The follow token that completed the parse must not be consumed from
-     * the input: p_position() should point to the follow token, and a
-     * subsequent p_lex() should return it. */
-    {
-        input = "abb";
-        context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_b };
-        assert(p_parse_inner_R1(context, follow_tokens, 1u) == P_SUCCESS);
-        assert_eq(11u, (size_t)p_result_R1(context));
-        /* Follow token `b` is at column 3 (1-based). */
-        p_position_t pos = p_position(context);
-        assert_eq(1u, (size_t)pos.row);
-        assert_eq(3u, (size_t)pos.col);
-        p_token_info_t token_info;
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert_eq((size_t)TOKEN_b, (size_t)token_info.token);
-        assert_eq(1u, (size_t)token_info.position.row);
-        assert_eq(3u, (size_t)token_info.position.col);
-        p_context_delete(context);
-    }
-
-    /* parse_inner_R1("aba", [a]) also succeeds: `a` is the follow token
-     * parse_Start uses to select R1, and it works here as a follow token
-     * too. */
-    {
-        input = "aba";
-        context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_a };
-        assert(p_parse_inner_R1(context, follow_tokens, 1u) == P_SUCCESS);
-        assert_eq(11u, (size_t)p_result_R1(context));
-        /* Follow token `a` is at column 3 (1-based) and remains in the
-         * input. */
-        p_position_t pos = p_position(context);
-        assert_eq(1u, (size_t)pos.row);
-        assert_eq(3u, (size_t)pos.col);
-        p_token_info_t token_info;
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert_eq((size_t)TOKEN_a, (size_t)token_info.token);
-        p_context_delete(context);
-    }
-
-    /* parse_inner_R1("ab", NULL) behaves like p_parse_R1("ab"). */
-    input = "ab";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse_inner_R1(context, NULL, 0u) == P_SUCCESS);
-    assert_eq(11u, (size_t)p_result_R1(context));
-    p_context_delete(context);
-
-    return 0;
-}

spec/test_parse_inner_shared.d

@@ -1,72 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    /* See test_parse_inner_shared.c for details on the grammar. */
-
-    /* Sanity-check that parse_Start resolves R1 vs R2 via lookahead. */
-    string input = "aba";
-    p_context_t * context = p_context_new(input);
-    assert(p_parse_Start(context) == P_SUCCESS);
-
-    input = "abb";
-    context = p_context_new(input);
-    assert(p_parse_Start(context) == P_SUCCESS);
-
-    /* Standard parse of R1 succeeds on "ab". */
-    input = "ab";
-    context = p_context_new(input);
-    assert(p_parse_R1(context) == P_SUCCESS);
-    assert(p_result_R1(context) == 11);
-
-    /* Standard parse of R1 fails on "abb". */
-    input = "abb";
-    context = p_context_new(input);
-    assert(p_parse_R1(context) == P_UNEXPECTED_TOKEN);
-
-    /* parse_inner_R1("abb", [b]) succeeds: `b` is the lookahead that
-     * parse_Start would use to select R2 over R1, but from R1's own start
-     * state R1 reduces unconditionally, and the follow-token shift retry at
-     * the R1-accepting state completes the parse.
-     *
-     * The follow token that completed the parse must not be consumed: a
-     * subsequent p_lex() should return it. */
-    input = "abb";
-    context = p_context_new(input);
-    p_token_t[] follow_tokens_b = [TOKEN_b];
-    assert(p_parse_inner_R1(context, follow_tokens_b) == P_SUCCESS);
-    assert(p_result_R1(context) == 11);
-    p_position_t pos = p_position(context);
-    assert(pos.row == 1);
-    assert(pos.col == 3);
-    p_token_info_t token_info;
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_b);
-    assert(token_info.position.row == 1);
-    assert(token_info.position.col == 3);
-
-    /* parse_inner_R1("aba", [a]) also succeeds. */
-    input = "aba";
-    context = p_context_new(input);
-    p_token_t[] follow_tokens_a = [TOKEN_a];
-    assert(p_parse_inner_R1(context, follow_tokens_a) == P_SUCCESS);
-    assert(p_result_R1(context) == 11);
-    pos = p_position(context);
-    assert(pos.row == 1);
-    assert(pos.col == 3);
-    assert(p_lex(context, &token_info) == P_SUCCESS);
-    assert(token_info.token == TOKEN_a);
-
-    /* parse_inner_R1("ab", null) behaves like p_parse_R1("ab"). */
-    input = "ab";
-    context = p_context_new(input);
-    assert(p_parse_inner_R1(context, null) == P_SUCCESS);
-    assert(p_result_R1(context) == 11);
-}

spec/test_parse_inner_tree.c

@@ -1,89 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-int main()
-{
-    /* Grammar (tree generation mode, shared reduce state):
-     *   tree;
-     *   token a; token b;
-     *   start Start;
-     *   start R1;
-     *   Start -> R1 a;
-     *   Start -> R2 b;
-     *   R1 -> a b;
-     *   R2 -> a b;
-     *
-     * Exercises p_parse_inner_R1() with a non-EOF follow token in tree
-     * generation mode. Verifies:
-     *   * The reduced tree for R1 is well-formed after a follow-token
-     *     completion.
-     *   * The follow token is not consumed and remains available for a
-     *     subsequent p_lex() call.
-     *   * p_tree_delete_R1() cleans up the returned tree without leaks
-     *     (verified in CI via valgrind). */
-
-    /* Baseline: p_parse_R1 works on "ab" and the returned tree is
-     * well-formed. */
-    {
-        char const * input = "ab";
-        p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-        assert(p_parse_R1(context) == P_SUCCESS);
-        R1 * tree = p_result_R1(context);
-        assert_not_null(tree);
-        assert_not_null(tree->pToken1);
-        assert_eq((size_t)TOKEN_a, (size_t)tree->pToken1->token);
-        assert_not_null(tree->pToken2);
-        assert_eq((size_t)TOKEN_b, (size_t)tree->pToken2->token);
-        p_tree_delete_R1(tree);
-        p_context_delete(context);
-    }
-
-    /* Primary case: p_parse_inner_R1 with a non-EOF follow token completes
-     * the parse, returns a well-formed tree, and leaves the follow token
-     * unconsumed. */
-    {
-        char const * input = "abb";
-        p_context_t * context = p_context_new((uint8_t const *)input, strlen(input));
-        p_token_t follow_tokens[] = { TOKEN_b };
-        assert(p_parse_inner_R1(context, follow_tokens, 1u) == P_SUCCESS);
-
-        /* Tree is well-formed. */
-        R1 * tree = p_result_R1(context);
-        assert_not_null(tree);
-        assert_not_null(tree->pToken1);
-        assert_eq((size_t)TOKEN_a, (size_t)tree->pToken1->token);
-        assert_eq(1u, (size_t)tree->pToken1->position.row);
-        assert_eq(1u, (size_t)tree->pToken1->position.col);
-        assert_not_null(tree->pToken2);
-        assert_eq((size_t)TOKEN_b, (size_t)tree->pToken2->token);
-        assert_eq(1u, (size_t)tree->pToken2->position.row);
-        assert_eq(2u, (size_t)tree->pToken2->position.col);
-
-        /* The R1 tree covers positions 1..2 — the third `b` at column 3 is
-         * the follow token and is not part of the tree. */
-        assert_eq(1u, (size_t)tree->position.row);
-        assert_eq(1u, (size_t)tree->position.col);
-        assert_eq(1u, (size_t)tree->end_position.row);
-        assert_eq(2u, (size_t)tree->end_position.col);
-
-        /* Follow token remains in the input. */
-        p_position_t pos = p_position(context);
-        assert_eq(1u, (size_t)pos.row);
-        assert_eq(3u, (size_t)pos.col);
-        p_token_info_t token_info;
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert_eq((size_t)TOKEN_b, (size_t)token_info.token);
-        assert_eq(1u, (size_t)token_info.position.row);
-        assert_eq(3u, (size_t)token_info.position.col);
-
-        /* p_tree_delete_R1 must free every node reachable from the tree
-         * without leaking anything. valgrind (invoked by the spec runner on
-         * Linux) will detect any missed frees. */
-        p_tree_delete_R1(tree);
-        p_context_delete(context);
-    }
-
-    return 0;
-}

spec/test_parse_inner_tree.d

@@ -1,68 +0,0 @@
-import testparser;
-import std.stdio;
-import testutils;
-
-int main()
-{
-    return 0;
-}
-
-unittest
-{
-    /* See test_parse_inner_tree.c for details on the grammar and cases. */
-
-    /* Baseline: p_parse_R1 works on "ab". */
-    {
-        string input = "ab";
-        p_context_t * context = p_context_new(input);
-        assert(p_parse_R1(context) == P_SUCCESS);
-        R1 * tree = p_result_R1(context);
-        assert(tree !is null);
-        assert(tree.pToken1 !is null);
-        assert(tree.pToken1.token == TOKEN_a);
-        assert(tree.pToken2 !is null);
-        assert(tree.pToken2.token == TOKEN_b);
-        p_tree_delete_R1(tree);
-    }
-
-    /* Primary case: p_parse_inner_R1 with a non-EOF follow token completes
-     * the parse, returns a well-formed tree, and leaves the follow token
-     * unconsumed. */
-    {
-        string input = "abb";
-        p_context_t * context = p_context_new(input);
-        p_token_t[] follow_tokens = [TOKEN_b];
-        assert(p_parse_inner_R1(context, follow_tokens) == P_SUCCESS);
-
-        /* Tree is well-formed. */
-        R1 * tree = p_result_R1(context);
-        assert(tree !is null);
-        assert(tree.pToken1 !is null);
-        assert(tree.pToken1.token == TOKEN_a);
-        assert(tree.pToken1.position.row == 1);
-        assert(tree.pToken1.position.col == 1);
-        assert(tree.pToken2 !is null);
-        assert(tree.pToken2.token == TOKEN_b);
-        assert(tree.pToken2.position.row == 1);
-        assert(tree.pToken2.position.col == 2);
-
-        /* The R1 tree covers positions 1..2. The third `b` at column 3 is
-         * the follow token and is not part of the tree. */
-        assert(tree.position.row == 1);
-        assert(tree.position.col == 1);
-        assert(tree.end_position.row == 1);
-        assert(tree.end_position.col == 2);
-
-        /* Follow token remains in the input. */
-        p_position_t pos = p_position(context);
-        assert(pos.row == 1);
-        assert(pos.col == 3);
-        p_token_info_t token_info;
-        assert(p_lex(context, &token_info) == P_SUCCESS);
-        assert(token_info.token == TOKEN_b);
-        assert(token_info.position.row == 1);
-        assert(token_info.position.col == 3);
-
-        p_tree_delete_R1(tree);
-    }
-}

spec/test_parser_identical_rules_lookahead.c

@@ -5,15 +5,13 @@
 int main()
 {
     char const * input = "aba";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "abb";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     return 0;
 }

spec/test_parser_identical_rules_lookahead.d

@@ -9,11 +9,11 @@ int main()
 unittest
 {
     string input = "aba";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "abb";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 }

spec/test_parser_rule_from_multiple_states.c

@@ -5,23 +5,20 @@
 int main()
 {
     char const * input = "a";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_UNEXPECTED_TOKEN);
-    assert(p_position(context).row == 1);
-    assert(p_position(context).col == 2);
-    assert(context->token == TOKEN___EOF);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
+    assert(p_position(&context).row == 1);
+    assert(p_position(&context).col == 2);
+    assert(context.token == TOKEN___EOF);
 
     input = "a b";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "bb";
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     return 0;
 }

spec/test_parser_rule_from_multiple_states.d

@@ -9,17 +9,17 @@ int main()
 unittest
 {
     string input = "a";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_UNEXPECTED_TOKEN);
-    assert(p_position(context) == p_position_t(1, 2));
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_UNEXPECTED_TOKEN);
+    assert(p_position(&context) == p_position_t(1, 2));
     assert(context.token == TOKEN___EOF);
 
     input = "a b";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 
     input = "bb";
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 }

spec/test_parser_rule_user_code.c

@@ -5,10 +5,9 @@
 int main()
 {
     char const * input = "ab";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert(p_parse(context) == P_SUCCESS);
-    p_context_delete(context);
+    p_context_t context;
+    p_context_init(&context, (uint8_t const *)input, strlen(input));
+    assert(p_parse(&context) == P_SUCCESS);
 
     return 0;
 }

spec/test_parser_rule_user_code.d

@@ -9,7 +9,7 @@ int main()
 unittest
 {
     string input = "ab";
-    p_context_t * context;
-    context = p_context_new(input);
-    assert(p_parse(context) == P_SUCCESS);
+    p_context_t context;
+    p_context_init(&context, input);
+    assert(p_parse(&context) == P_SUCCESS);
 }

spec/test_parser_user_code_tree.c

@@ -1,39 +0,0 @@
-#include "testparser.h"
-#include <assert.h>
-#include <string.h>
-#include "testutils.h"
-
-int main()
-{
-    char const * input = "ab";
-    p_context_t * context;
-    context = p_context_new((uint8_t const *)input, strlen(input));
-    assert_eq(P_SUCCESS, p_parse(context));
-
-    /* The parser user code recorded values accessed via $$, $1, and $2 while
-     * the tree node for the Start rule was being formed. */
-    assert_eq(3, context->start_n_fields);
-    assert_eq(11, context->start_a_value);
-    assert_eq(11, context->a_value);
-    assert_eq(22, context->b_value);
-    assert_eq(TOKEN_b, context->b_token);
-
-    /* The empty-matched rule C has a null $$ tree node, and its field in the
-     * Start node is null as well. */
-    assert_eq(1, context->c_is_null);
-    assert_eq(1, context->c_field_is_null);
-
-    /* Field aliases reference the same component tree nodes as the positional
-     * references. */
-    assert_eq(11, context->alias_a_value);
-    assert_eq(22, context->alias_b_value);
-
-    Start * start = p_result(context);
-    assert(start->pA != NULL);
-    assert(start->pB != NULL);
-    assert(start->pC == NULL);
-    p_tree_delete(start);
-    p_context_delete(context);
-
-    return 0;
-}