herb 0.9.2-arm-linux-gnu → 0.9.4-arm-linux-gnu

data/src/include/analyze/analyzed_ruby.h

@@ -1,8 +1,8 @@
 #ifndef HERB_ANALYZED_RUBY_H
 #define HERB_ANALYZED_RUBY_H
 
-#include "../util/hb_array.h"
-#include "../util/hb_string.h"
+#include "../lib/hb_array.h"
+#include "../lib/hb_string.h"
 
 #include <prism.h>
 

data/src/include/analyze/builders.h

@@ -1,10 +1,10 @@
 #ifndef HERB_ANALYZE_BUILDERS_H
 #define HERB_ANALYZE_BUILDERS_H
 
-#include "../ast_nodes.h"
-#include "../location.h"
-#include "../position.h"
-#include "../util/hb_allocator.h"
+#include "../ast/ast_nodes.h"
+#include "../lib/hb_allocator.h"
+#include "../location/location.h"
+#include "../location/position.h"
 #include "analyze.h"
 
 position_T erb_content_end_position(const AST_ERB_CONTENT_NODE_T* erb_node);

data/src/include/analyze/conditional_elements.h

@@ -1,8 +1,8 @@
 #ifndef HERB_ANALYZE_CONDITIONAL_ELEMENTS_H
 #define HERB_ANALYZE_CONDITIONAL_ELEMENTS_H
 
-#include "../ast_nodes.h"
-#include "../util/hb_allocator.h"
+#include "../ast/ast_nodes.h"
+#include "../lib/hb_allocator.h"
 
 void herb_transform_conditional_elements(AST_DOCUMENT_NODE_T* document, hb_allocator_T* allocator);
 

data/src/include/analyze/conditional_open_tags.h

@@ -1,8 +1,8 @@
 #ifndef HERB_ANALYZE_CONDITIONAL_OPEN_TAGS_H
 #define HERB_ANALYZE_CONDITIONAL_OPEN_TAGS_H
 
-#include "../ast_nodes.h"
-#include "../util/hb_allocator.h"
+#include "../ast/ast_nodes.h"
+#include "../lib/hb_allocator.h"
 
 void herb_transform_conditional_open_tags(AST_DOCUMENT_NODE_T* document, hb_allocator_T* allocator);
 

data/src/include/analyze/control_type.h

@@ -1,7 +1,7 @@
 #ifndef HERB_ANALYZE_CONTROL_TYPE_H
 #define HERB_ANALYZE_CONTROL_TYPE_H
 
-#include "../ast_nodes.h"
+#include "../ast/ast_nodes.h"
 #include "analyze.h"
 
 #include <stdbool.h>

data/src/include/analyze/helpers.h

@@ -4,8 +4,8 @@
 #include <prism.h>
 #include <stdbool.h>
 
-#include "../ast_node.h"
-#include "../util/hb_allocator.h"
+#include "../ast/ast_node.h"
+#include "../lib/hb_allocator.h"
 #include "analyzed_ruby.h"
 
 bool has_if_node(analyzed_ruby_T* analyzed);

data/src/include/analyze/invalid_structures.h

@@ -1,7 +1,7 @@
 #ifndef HERB_ANALYZE_INVALID_STRUCTURES_H
 #define HERB_ANALYZE_INVALID_STRUCTURES_H
 
-#include "../ast_node.h"
+#include "../ast/ast_node.h"
 #include "analyze.h"
 
 #include <stdbool.h>

data/src/include/analyze/prism_annotate.h

@@ -1,8 +1,8 @@
 #ifndef HERB_PRISM_ANNOTATE_H
 #define HERB_PRISM_ANNOTATE_H
 
-#include "../ast_nodes.h"
-#include "../util/hb_allocator.h"
+#include "../ast/ast_nodes.h"
+#include "../lib/hb_allocator.h"
 
 void herb_annotate_prism_nodes(
   AST_DOCUMENT_NODE_T* document,

data/src/include/analyze/render_nodes.h

@@ -1,7 +1,7 @@
 #ifndef HERB_ANALYZE_RENDER_NODES_H
 #define HERB_ANALYZE_RENDER_NODES_H
 
-#include "../ast_nodes.h"
+#include "../ast/ast_nodes.h"
 #include "analyze.h"
 
 #include <stdbool.h>

data/src/include/analyze/strict_locals.h

@@ -0,0 +1,11 @@
+#ifndef HERB_ANALYZE_STRICT_LOCALS_H
+#define HERB_ANALYZE_STRICT_LOCALS_H
+
+#include "../ast/ast_nodes.h"
+#include "analyze.h"
+
+#include <stdbool.h>
+
+bool transform_strict_locals_nodes(const AST_NODE_T* node, void* data);
+
+#endif

data/src/include/{ast_node.h → ast/ast_node.h}

@@ -1,11 +1,11 @@
 #ifndef HERB_AST_H
 #define HERB_AST_H
 
+#include "../errors.h"
+#include "../lexer/token_struct.h"
+#include "../lib/hb_allocator.h"
+#include "../location/position.h"
 #include "ast_nodes.h"
-#include "errors.h"
-#include "position.h"
-#include "token_struct.h"
-#include "util/hb_allocator.h"
 
 void ast_node_init(
   AST_NODE_T* node,

data/src/include/{ast_nodes.h → ast/ast_nodes.h}

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /home/runner/work/herb/herb/templates/src/include/ast_nodes.h.erb
+// be modified manually. See /home/runner/work/herb/herb/templates/src/include/ast/ast_nodes.h.erb
 
 #ifndef HERB_AST_NODES_H
 #define HERB_AST_NODES_H
@@ -7,18 +7,17 @@
 #include <stdbool.h>
 #include <prism.h>
 
-#include "analyze/analyzed_ruby.h"
-#include "element_source.h"
-#include "herb_prism_node.h"
-#include "prism_context.h"
-#include "prism_serialized.h"
-#include "location.h"
-#include "position.h"
-#include "token_struct.h"
-#include "util/hb_allocator.h"
-#include "util/hb_array.h"
-#include "util/hb_buffer.h"
-#include "util/hb_string.h"
+#include "../analyze/analyzed_ruby.h"
+#include "../prism/herb_prism_node.h"
+#include "../prism/prism_context.h"
+#include "../prism/prism_serialized.h"
+#include "../location/location.h"
+#include "../location/position.h"
+#include "../lexer/token_struct.h"
+#include "../lib/hb_allocator.h"
+#include "../lib/hb_array.h"
+#include "../lib/hb_buffer.h"
+#include "../lib/hb_string.h"
 
 typedef enum {
   AST_DOCUMENT_NODE,
@@ -59,6 +58,8 @@ typedef enum {
   AST_ERB_UNLESS_NODE,
   AST_RUBY_RENDER_LOCAL_NODE,
   AST_ERB_RENDER_NODE,
+  AST_RUBY_STRICT_LOCAL_NODE,
+  AST_ERB_STRICT_LOCALS_NODE,
   AST_ERB_YIELD_NODE,
   AST_ERB_IN_NODE,
 } ast_node_type_T;
@@ -262,6 +263,9 @@ typedef struct AST_ERB_BLOCK_NODE_STRUCT {
   token_T* tag_closing;
   herb_prism_node_T prism_node;
   hb_array_T* body;
+  struct AST_ERB_RESCUE_NODE_STRUCT* rescue_clause;
+  struct AST_ERB_ELSE_NODE_STRUCT* else_clause;
+  struct AST_ERB_ENSURE_NODE_STRUCT* ensure_clause;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_BLOCK_NODE_T;
 
@@ -403,6 +407,24 @@ typedef struct AST_ERB_RENDER_NODE_STRUCT {
   hb_array_T* locals;
 } AST_ERB_RENDER_NODE_T;
 
+typedef struct AST_RUBY_STRICT_LOCAL_NODE_STRUCT {
+  AST_NODE_T base;
+  token_T* name;
+  struct AST_RUBY_LITERAL_NODE_STRUCT* default_value;
+  bool required;
+  bool double_splat;
+} AST_RUBY_STRICT_LOCAL_NODE_T;
+
+typedef struct AST_ERB_STRICT_LOCALS_NODE_STRUCT {
+  AST_NODE_T base;
+  token_T* tag_opening;
+  token_T* content;
+  token_T* tag_closing;
+  analyzed_ruby_T* analyzed_ruby;
+  herb_prism_node_T prism_node;
+  hb_array_T* locals;
+} AST_ERB_STRICT_LOCALS_NODE_T;
+
 typedef struct AST_ERB_YIELD_NODE_STRUCT {
   AST_NODE_T base;
   token_T* tag_opening;
@@ -444,7 +466,7 @@ AST_ERB_CONTENT_NODE_T* ast_erb_content_node_init(token_T* tag_opening, token_T*
 AST_ERB_END_NODE_T* ast_erb_end_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_ELSE_NODE_T* ast_erb_else_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, herb_prism_node_T prism_node, hb_array_T* statements, AST_NODE_T* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
-AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, herb_prism_node_T prism_node, hb_array_T* body, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
+AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, herb_prism_node_T prism_node, hb_array_T* body, struct AST_ERB_RESCUE_NODE_STRUCT* rescue_clause, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_ENSURE_NODE_STRUCT* ensure_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_WHEN_NODE_T* ast_erb_when_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_CASE_NODE_T* ast_erb_case_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* children, herb_prism_node_T prism_node, hb_array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_CASE_MATCH_NODE_T* ast_erb_case_match_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* children, herb_prism_node_T prism_node, hb_array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
@@ -457,6 +479,8 @@ AST_ERB_BEGIN_NODE_T* ast_erb_begin_node_init(token_T* tag_opening, token_T* con
 AST_ERB_UNLESS_NODE_T* ast_erb_unless_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, herb_prism_node_T prism_node, hb_array_T* statements, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_RUBY_RENDER_LOCAL_NODE_T* ast_ruby_render_local_node_init(token_T* name, struct AST_RUBY_LITERAL_NODE_STRUCT* value, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_RENDER_NODE_T* ast_erb_render_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, analyzed_ruby_T* analyzed_ruby, herb_prism_node_T prism_node, token_T* partial, token_T* template_path, token_T* layout, token_T* file, token_T* inline_template, token_T* body, token_T* plain, token_T* html, token_T* renderable, token_T* collection, token_T* object, token_T* as_name, token_T* spacer_template, token_T* formats, token_T* variants, token_T* handlers, token_T* content_type, hb_array_T* locals, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
+AST_RUBY_STRICT_LOCAL_NODE_T* ast_ruby_strict_local_node_init(token_T* name, struct AST_RUBY_LITERAL_NODE_STRUCT* default_value, bool required, bool double_splat, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
+AST_ERB_STRICT_LOCALS_NODE_T* ast_erb_strict_locals_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, analyzed_ruby_T* analyzed_ruby, herb_prism_node_T prism_node, hb_array_T* locals, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_YIELD_NODE_T* ast_erb_yield_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 AST_ERB_IN_NODE_T* ast_erb_in_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors, hb_allocator_T* allocator);
 

data/src/include/{ast_pretty_print.h → ast/ast_pretty_print.h}

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /home/runner/work/herb/herb/templates/src/include/ast_pretty_print.h.erb
+// be modified manually. See /home/runner/work/herb/herb/templates/src/include/ast/ast_pretty_print.h.erb
 
 #ifndef HERB_AST_PRETTY_PRINT_H
 #define HERB_AST_PRETTY_PRINT_H
@@ -8,8 +8,8 @@
   // Pretty print support excluded
 #else
 
-#include "ast_nodes.h"
-#include "util/hb_buffer.h"
+#include "../ast/ast_nodes.h"
+#include "../lib/hb_buffer.h"
 
 void ast_pretty_print_node(
   AST_NODE_T* node,

data/src/include/{pretty_print.h → ast/pretty_print.h}

@@ -5,10 +5,10 @@
 // Pretty print support excluded
 #else
 
-#  include "analyze/analyzed_ruby.h"
-#  include "ast_nodes.h"
-#  include "location.h"
-#  include "util/hb_buffer.h"
+#  include "../analyze/analyzed_ruby.h"
+#  include "../ast/ast_nodes.h"
+#  include "../lib/hb_buffer.h"
+#  include "../location/location.h"
 
 #  include <stdbool.h>
 

data/src/include/errors.h

@@ -5,13 +5,13 @@
 #define HERB_ERRORS_H
 
 #include "errors.h"
-#include "location.h"
-#include "position.h"
-#include "token.h"
-#include "util/hb_allocator.h"
-#include "util/hb_array.h"
-#include "util/hb_buffer.h"
-#include "util/hb_string.h"
+#include "location/location.h"
+#include "location/position.h"
+#include "lexer/token.h"
+#include "lib/hb_allocator.h"
+#include "lib/hb_array.h"
+#include "lib/hb_buffer.h"
+#include "lib/hb_string.h"
 
 typedef enum {
   UNEXPECTED_ERROR,
@@ -44,6 +44,13 @@ typedef enum {
   RENDER_INVALID_AS_OPTION_ERROR,
   RENDER_OBJECT_AND_COLLECTION_ERROR,
   RENDER_LAYOUT_WITHOUT_BLOCK_ERROR,
+  STRICT_LOCALS_POSITIONAL_ARGUMENT_ERROR,
+  STRICT_LOCALS_BLOCK_ARGUMENT_ERROR,
+  STRICT_LOCALS_SPLAT_ARGUMENT_ERROR,
+  STRICT_LOCALS_MISSING_PARENTHESIS_ERROR,
+  STRICT_LOCALS_DUPLICATE_DECLARATION_ERROR,
+  VOID_ELEMENT_CONTENT_ERROR,
+  DOT_NOTATION_CASING_ERROR,
 } error_type_T;
 
 typedef struct ERROR_STRUCT {
@@ -223,6 +230,43 @@ typedef struct {
   hb_string_T layout;
 } RENDER_LAYOUT_WITHOUT_BLOCK_ERROR_T;
 
+typedef struct {
+  ERROR_T base;
+  hb_string_T name;
+} STRICT_LOCALS_POSITIONAL_ARGUMENT_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  hb_string_T name;
+} STRICT_LOCALS_BLOCK_ARGUMENT_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  hb_string_T name;
+} STRICT_LOCALS_SPLAT_ARGUMENT_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  hb_string_T rest;
+} STRICT_LOCALS_MISSING_PARENTHESIS_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  /* no additional fields */
+} STRICT_LOCALS_DUPLICATE_DECLARATION_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  token_T* tag_name;
+  hb_string_T helper_name;
+  hb_string_T content_type;
+} VOID_ELEMENT_CONTENT_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  token_T* segment;
+} DOT_NOTATION_CASING_ERROR_T;
+
 UNEXPECTED_ERROR_T* unexpected_error_init(hb_string_T description, hb_string_T expected, hb_string_T found, position_T start, position_T end, hb_allocator_T* allocator);
 void append_unexpected_error(hb_string_T description, hb_string_T expected, hb_string_T found, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
 UNEXPECTED_TOKEN_ERROR_T* unexpected_token_error_init(token_type_T expected_type, token_T* found, position_T start, position_T end, hb_allocator_T* allocator);
@@ -283,6 +327,20 @@ RENDER_OBJECT_AND_COLLECTION_ERROR_T* render_object_and_collection_error_init(po
 void append_render_object_and_collection_error(position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
 RENDER_LAYOUT_WITHOUT_BLOCK_ERROR_T* render_layout_without_block_error_init(hb_string_T layout, position_T start, position_T end, hb_allocator_T* allocator);
 void append_render_layout_without_block_error(hb_string_T layout, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+STRICT_LOCALS_POSITIONAL_ARGUMENT_ERROR_T* strict_locals_positional_argument_error_init(hb_string_T name, position_T start, position_T end, hb_allocator_T* allocator);
+void append_strict_locals_positional_argument_error(hb_string_T name, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+STRICT_LOCALS_BLOCK_ARGUMENT_ERROR_T* strict_locals_block_argument_error_init(hb_string_T name, position_T start, position_T end, hb_allocator_T* allocator);
+void append_strict_locals_block_argument_error(hb_string_T name, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+STRICT_LOCALS_SPLAT_ARGUMENT_ERROR_T* strict_locals_splat_argument_error_init(hb_string_T name, position_T start, position_T end, hb_allocator_T* allocator);
+void append_strict_locals_splat_argument_error(hb_string_T name, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+STRICT_LOCALS_MISSING_PARENTHESIS_ERROR_T* strict_locals_missing_parenthesis_error_init(hb_string_T rest, position_T start, position_T end, hb_allocator_T* allocator);
+void append_strict_locals_missing_parenthesis_error(hb_string_T rest, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+STRICT_LOCALS_DUPLICATE_DECLARATION_ERROR_T* strict_locals_duplicate_declaration_error_init(position_T start, position_T end, hb_allocator_T* allocator);
+void append_strict_locals_duplicate_declaration_error(position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+VOID_ELEMENT_CONTENT_ERROR_T* void_element_content_error_init(token_T* tag_name, hb_string_T helper_name, hb_string_T content_type, position_T start, position_T end, hb_allocator_T* allocator);
+void append_void_element_content_error(token_T* tag_name, hb_string_T helper_name, hb_string_T content_type, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+DOT_NOTATION_CASING_ERROR_T* dot_notation_casing_error_init(token_T* segment, position_T start, position_T end, hb_allocator_T* allocator);
+void append_dot_notation_casing_error(token_T* segment, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
 
 void error_init(ERROR_T* error, error_type_T type, position_T start, position_T end);
 

data/src/include/extract.h

@@ -1,8 +1,8 @@
 #ifndef HERB_EXTRACT_H
 #define HERB_EXTRACT_H
 
-#include "util/hb_allocator.h"
-#include "util/hb_buffer.h"
+#include "lib/hb_allocator.h"
+#include "lib/hb_buffer.h"
 
 #include <stdbool.h>
 

data/src/include/herb.h

@@ -1,13 +1,13 @@
 #ifndef HERB_H
 #define HERB_H
 
-#include "ast_node.h"
+#include "ast/ast_node.h"
 #include "extract.h"
+#include "lib/hb_allocator.h"
+#include "lib/hb_array.h"
+#include "lib/hb_buffer.h"
 #include "macros.h"
-#include "parser.h"
-#include "util/hb_allocator.h"
-#include "util/hb_array.h"
-#include "util/hb_buffer.h"
+#include "parser/parser.h"
 
 #include <prism.h>
 #include <stdbool.h>

data/src/include/{lex_helpers.h → lexer/lex_helpers.h}

@@ -1,12 +1,12 @@
 #ifndef HERB_LEX_HELPERS_H
 #define HERB_LEX_HELPERS_H
 
-#include "herb.h"
+#include "../herb.h"
+#include "../lib/hb_allocator.h"
+#include "../lib/hb_array.h"
+#include "../lib/hb_buffer.h"
+#include "../lib/hb_string.h"
 #include "token.h"
-#include "util/hb_allocator.h"
-#include "util/hb_array.h"
-#include "util/hb_buffer.h"
-#include "util/hb_string.h"
 
 #include <stdlib.h>
 

data/src/include/{lexer.h → lexer/lexer.h}

@@ -1,8 +1,8 @@
 #ifndef HERB_LEXER_H
 #define HERB_LEXER_H
 
+#include "../lexer/token_struct.h"
 #include "lexer_struct.h"
-#include "token_struct.h"
 
 void lexer_init(lexer_T* lexer, const char* source, hb_allocator_T* allocator);
 token_T* lexer_next_token(lexer_T* lexer);

data/src/include/{lexer_peek_helpers.h → lexer/lexer_peek_helpers.h}

@@ -1,10 +1,10 @@
 #ifndef HERB_LEXER_PEEK_HELPERS_H
 #define HERB_LEXER_PEEK_HELPERS_H
 
+#include "../lib/hb_string.h"
+#include "../macros.h"
 #include "lexer_struct.h"
-#include "macros.h"
 #include "token_struct.h"
-#include "util/hb_string.h"
 
 #include <ctype.h>
 #include <stdbool.h>

data/src/include/{lexer_struct.h → lexer/lexer_struct.h}

@@ -1,8 +1,8 @@
 #ifndef HERB_LEXER_STRUCT_H
 #define HERB_LEXER_STRUCT_H
 
-#include "util/hb_allocator.h"
-#include "util/hb_string.h"
+#include "../lib/hb_allocator.h"
+#include "../lib/hb_string.h"
 
 #include <stdbool.h>
 #include <stdint.h>

data/src/include/{token.h → lexer/token.h}

@@ -1,11 +1,11 @@
 #ifndef HERB_TOKEN_H
 #define HERB_TOKEN_H
 
+#include "../lib/hb_allocator.h"
+#include "../lib/hb_string.h"
+#include "../location/position.h"
 #include "lexer_struct.h"
-#include "position.h"
 #include "token_struct.h"
-#include "util/hb_allocator.h"
-#include "util/hb_string.h"
 
 #include <stdarg.h>
 

data/src/include/{token_matchers.h → lexer/token_matchers.h}

@@ -1,7 +1,7 @@
 #ifndef HERB_TOKEN_MATCHERS_H
 #define HERB_TOKEN_MATCHERS_H
 
-#include "parser.h"
+#include "../parser/parser.h"
 #include "token.h"
 
 #include <stdarg.h>

data/src/include/{token_struct.h → lexer/token_struct.h}

@@ -3,9 +3,9 @@
 
 #include <stdbool.h>
 
-#include "location.h"
-#include "range.h"
-#include "util/hb_string.h"
+#include "../lib/hb_string.h"
+#include "../location/location.h"
+#include "../location/range.h"
 
 typedef enum {
   TOKEN_WHITESPACE, // ' '

data/src/include/{util → lib}/hb_foreach.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /home/runner/work/herb/herb/templates/src/include/util/hb_foreach.h.erb
+// be modified manually. See /home/runner/work/herb/herb/templates/src/include/lib/hb_foreach.h.erb
 
 #ifndef HB_FOREACH_H
 #define HB_FOREACH_H

data/src/include/{util → lib}/hb_string.h

@@ -15,7 +15,7 @@ typedef struct HB_STRING_STRUCT {
   uint32_t length;
 } hb_string_T;
 
-#define HB_STRING_EMPTY ((hb_string_T) { .data = "", .length = 0 })
+#define HB_STRING_EMPTY ((hb_string_T) { .data = (char*) "", .length = 0 })
 #define HB_STRING_NULL ((hb_string_T) { .data = NULL, .length = 0 })
 
 #define HB_STRING_LITERAL(string) { .data = (char*) (string), .length = (uint32_t) (sizeof(string) - 1) }
@@ -29,6 +29,10 @@ typedef struct HB_STRING_STRUCT {
 
 hb_string_T hb_string_from_c_string(const char* null_terminated_c_string);
 
+static inline hb_string_T hb_string_from_data(const char* data, size_t length) {
+  return (hb_string_T) { .data = (char*) data, .length = (uint32_t) length };
+}
+
 static inline bool hb_string_is_null(hb_string_T string) {
   return string.data == NULL;
 }

data/src/include/{location.h → location/location.h}

@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#include "../lib/hb_allocator.h"
 #include "position.h"
-#include "util/hb_allocator.h"
 
 typedef struct LOCATION_STRUCT {
   position_T start;

data/src/include/parser/dot_notation.h

@@ -0,0 +1,12 @@
+#ifndef HERB_PARSER_DOT_NOTATION_H
+#define HERB_PARSER_DOT_NOTATION_H
+
+#include <stdbool.h>
+
+#include "../lib/hb_array.h"
+#include "parser.h"
+
+bool parser_lookahead_is_valid_dot_notation_open_tag(parser_T* parser);
+void parser_consume_dot_notation_segments(parser_T* parser, token_T* tag_name, hb_array_T* errors);
+
+#endif

data/src/include/{parser.h → parser/parser.h}

@@ -1,10 +1,12 @@
 #ifndef HERB_PARSER_H
 #define HERB_PARSER_H
 
-#include "ast_node.h"
-#include "lexer.h"
-#include "util/hb_allocator.h"
-#include "util/hb_array.h"
+#include "../ast/ast_node.h"
+#include "../lexer/lexer.h"
+#include "../lib/hb_allocator.h"
+#include "../lib/hb_array.h"
+
+#include <stdint.h>
 
 typedef enum {
   FOREIGN_CONTENT_UNKNOWN = 0,
@@ -22,9 +24,14 @@ typedef struct PARSER_OPTIONS_STRUCT {
   bool strict;
   bool action_view_helpers;
   bool render_nodes;
+  bool strict_locals;
   bool prism_program;
   bool prism_nodes;
   bool prism_nodes_deep;
+  bool dot_notation_tags;
+  bool html;
+  uint32_t start_line;
+  uint32_t start_column;
 } parser_options_T;
 
 typedef struct MATCH_TAGS_CONTEXT_STRUCT {

data/src/include/{parser_helpers.h → parser/parser_helpers.h}

@@ -1,13 +1,13 @@
 #ifndef HERB_PARSER_HELPERS_H
 #define HERB_PARSER_HELPERS_H
 
-#include "ast_nodes.h"
-#include "errors.h"
+#include "../ast/ast_nodes.h"
+#include "../errors.h"
+#include "../lexer/token.h"
+#include "../lib/hb_array.h"
+#include "../lib/hb_buffer.h"
+#include "../lib/hb_string.h"
 #include "parser.h"
-#include "token.h"
-#include "util/hb_array.h"
-#include "util/hb_buffer.h"
-#include "util/hb_string.h"
 
 void parser_push_open_tag(const parser_T* parser, token_T* tag_name);
 bool parser_check_matching_tag(const parser_T* parser, hb_string_T tag_name);

data/src/include/{prism_context.h → prism/prism_context.h}

@@ -1,8 +1,8 @@
 #ifndef HERB_PRISM_CONTEXT_H
 #define HERB_PRISM_CONTEXT_H
 
-#include "util/hb_allocator.h"
-#include "util/hb_buffer.h"
+#include "../lib/hb_allocator.h"
+#include "../lib/hb_buffer.h"
 #include <prism.h>
 #include <stdbool.h>
 

data/src/include/{prism_helpers.h → prism/prism_helpers.h}

@@ -1,12 +1,12 @@
 #ifndef HERB_PRISM_HELPERS_H
 #define HERB_PRISM_HELPERS_H
 
-#include "analyze/analyzed_ruby.h"
-#include "ast_nodes.h"
-#include "errors.h"
-#include "location.h"
-#include "position.h"
-#include "util/hb_allocator.h"
+#include "../analyze/analyzed_ruby.h"
+#include "../ast/ast_nodes.h"
+#include "../errors.h"
+#include "../lib/hb_allocator.h"
+#include "../location/location.h"
+#include "../location/position.h"
 
 #include <prism.h>
 

data/src/include/{html_util.h → util/html_util.h}

@@ -1,7 +1,7 @@
 #ifndef HERB_HTML_UTIL_H
 #define HERB_HTML_UTIL_H
 
-#include "util/hb_string.h"
+#include "../lib/hb_string.h"
 #include <stdbool.h>
 
 struct hb_allocator;