herb 0.9.0-arm-linux-gnu → 0.9.2-arm-linux-gnu

data/src/html_util.c

@@ -27,6 +27,46 @@ static hb_string_T void_tags[] = HB_STRING_LIST(
   "wbr"
 );
 
+// https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#boolean-attributes
+static hb_string_T boolean_attributes[] = HB_STRING_LIST(
+  "allowfullscreen",
+  "async",
+  "autofocus",
+  "autoplay",
+  "checked",
+  "compact",
+  "controls",
+  "declare",
+  "default",
+  "defer",
+  "disabled",
+  "formnovalidate",
+  "hidden",
+  "inert",
+  "ismap",
+  "itemscope",
+  "loop",
+  "multiple",
+  "muted",
+  "nomodule",
+  "nohref",
+  "noresize",
+  "noshade",
+  "novalidate",
+  "nowrap",
+  "open",
+  "playsinline",
+  "readonly",
+  "required",
+  "reversed",
+  "scoped",
+  "seamless",
+  "selected",
+  "sortable",
+  "truespeed",
+  "typemustmatch"
+);
+
 // https://html.spec.whatwg.org/multipage/syntax.html#optional-tags
 static hb_string_T optional_end_tags[] = HB_STRING_LIST(
   "li",
@@ -112,6 +152,16 @@ bool is_void_element(hb_string_T tag_name) {
   return false;
 }
 
+bool is_boolean_attribute(hb_string_T attribute_name) {
+  if (hb_string_is_empty(attribute_name)) { return false; }
+
+  for (size_t i = 0; i < sizeof(boolean_attributes) / sizeof(boolean_attributes[0]); i++) {
+    if (hb_string_equals_case_insensitive(attribute_name, boolean_attributes[i])) { return true; }
+  }
+
+  return false;
+}
+
 bool has_optional_end_tag(hb_string_T tag_name) {
   if (hb_string_is_empty(tag_name)) { return false; }
 

data/src/include/analyze/action_view/tag_helper_handler.h

@@ -38,4 +38,6 @@ void tag_helper_info_free(tag_helper_info_T** info);
 tag_helper_handler_T* get_tag_helper_handlers(void);
 size_t get_tag_helper_handlers_count(void);
 
+char* extract_inline_block_content(pm_call_node_t* call_node, hb_allocator_T* allocator);
+
 #endif

data/src/include/analyze/render_nodes.h

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

data/src/include/ast_nodes.h

@@ -57,6 +57,8 @@ typedef enum {
   AST_ERB_ENSURE_NODE,
   AST_ERB_BEGIN_NODE,
   AST_ERB_UNLESS_NODE,
+  AST_RUBY_RENDER_LOCAL_NODE,
+  AST_ERB_RENDER_NODE,
   AST_ERB_YIELD_NODE,
   AST_ERB_IN_NODE,
 } ast_node_type_T;
@@ -368,6 +370,39 @@ typedef struct AST_ERB_UNLESS_NODE_STRUCT {
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_UNLESS_NODE_T;
 
+typedef struct AST_RUBY_RENDER_LOCAL_NODE_STRUCT {
+  AST_NODE_T base;
+  token_T* name;
+  struct AST_RUBY_LITERAL_NODE_STRUCT* value;
+} AST_RUBY_RENDER_LOCAL_NODE_T;
+
+typedef struct AST_ERB_RENDER_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;
+  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;
+} AST_ERB_RENDER_NODE_T;
+
 typedef struct AST_ERB_YIELD_NODE_STRUCT {
   AST_NODE_T base;
   token_T* tag_opening;
@@ -420,6 +455,8 @@ AST_ERB_RESCUE_NODE_T* ast_erb_rescue_node_init(token_T* tag_opening, token_T* c
 AST_ERB_ENSURE_NODE_T* ast_erb_ensure_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_BEGIN_NODE_T* ast_erb_begin_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, herb_prism_node_T prism_node, hb_array_T* statements, 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_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_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/errors.h

@@ -37,6 +37,13 @@ typedef enum {
   UNCLOSED_ERB_TAG_ERROR,
   STRAY_ERB_CLOSING_TAG_ERROR,
   NESTED_ERB_TAG_ERROR,
+  RENDER_AMBIGUOUS_LOCALS_ERROR,
+  RENDER_MISSING_LOCALS_ERROR,
+  RENDER_NO_ARGUMENTS_ERROR,
+  RENDER_CONFLICTING_PARTIAL_ERROR,
+  RENDER_INVALID_AS_OPTION_ERROR,
+  RENDER_OBJECT_AND_COLLECTION_ERROR,
+  RENDER_LAYOUT_WITHOUT_BLOCK_ERROR,
 } error_type_T;
 
 typedef struct ERROR_STRUCT {
@@ -179,6 +186,43 @@ typedef struct {
   size_t nested_tag_column;
 } NESTED_ERB_TAG_ERROR_T;
 
+typedef struct {
+  ERROR_T base;
+  hb_string_T partial;
+} RENDER_AMBIGUOUS_LOCALS_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  hb_string_T partial;
+  hb_string_T keywords;
+} RENDER_MISSING_LOCALS_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  /* no additional fields */
+} RENDER_NO_ARGUMENTS_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  hb_string_T positional_partial;
+  hb_string_T keyword_partial;
+} RENDER_CONFLICTING_PARTIAL_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  hb_string_T as_value;
+} RENDER_INVALID_AS_OPTION_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  /* no additional fields */
+} RENDER_OBJECT_AND_COLLECTION_ERROR_T;
+
+typedef struct {
+  ERROR_T base;
+  hb_string_T layout;
+} RENDER_LAYOUT_WITHOUT_BLOCK_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);
@@ -225,6 +269,20 @@ STRAY_ERB_CLOSING_TAG_ERROR_T* stray_erb_closing_tag_error_init(position_T start
 void append_stray_erb_closing_tag_error(position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
 NESTED_ERB_TAG_ERROR_T* nested_erb_tag_error_init(token_T* opening_tag, size_t nested_tag_line, size_t nested_tag_column, position_T start, position_T end, hb_allocator_T* allocator);
 void append_nested_erb_tag_error(token_T* opening_tag, size_t nested_tag_line, size_t nested_tag_column, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+RENDER_AMBIGUOUS_LOCALS_ERROR_T* render_ambiguous_locals_error_init(hb_string_T partial, position_T start, position_T end, hb_allocator_T* allocator);
+void append_render_ambiguous_locals_error(hb_string_T partial, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+RENDER_MISSING_LOCALS_ERROR_T* render_missing_locals_error_init(hb_string_T partial, hb_string_T keywords, position_T start, position_T end, hb_allocator_T* allocator);
+void append_render_missing_locals_error(hb_string_T partial, hb_string_T keywords, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+RENDER_NO_ARGUMENTS_ERROR_T* render_no_arguments_error_init(position_T start, position_T end, hb_allocator_T* allocator);
+void append_render_no_arguments_error(position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+RENDER_CONFLICTING_PARTIAL_ERROR_T* render_conflicting_partial_error_init(hb_string_T positional_partial, hb_string_T keyword_partial, position_T start, position_T end, hb_allocator_T* allocator);
+void append_render_conflicting_partial_error(hb_string_T positional_partial, hb_string_T keyword_partial, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+RENDER_INVALID_AS_OPTION_ERROR_T* render_invalid_as_option_error_init(hb_string_T as_value, position_T start, position_T end, hb_allocator_T* allocator);
+void append_render_invalid_as_option_error(hb_string_T as_value, position_T start, position_T end, hb_allocator_T* allocator, hb_array_T* errors);
+RENDER_OBJECT_AND_COLLECTION_ERROR_T* render_object_and_collection_error_init(position_T start, position_T end, hb_allocator_T* allocator);
+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);
 
 void error_init(ERROR_T* error, error_type_T type, position_T start, position_T end);
 

data/src/include/html_util.h

@@ -7,6 +7,7 @@
 struct hb_allocator;
 
 bool is_void_element(hb_string_T tag_name);
+bool is_boolean_attribute(hb_string_T attribute_name);
 bool has_optional_end_tag(hb_string_T tag_name);
 bool should_implicitly_close(hb_string_T open_tag_name, hb_string_T next_tag_name);
 bool parent_closes_element(hb_string_T open_tag_name, hb_string_T parent_close_tag_name);

data/src/include/parser.h

@@ -21,6 +21,7 @@ typedef struct PARSER_OPTIONS_STRUCT {
   bool analyze;
   bool strict;
   bool action_view_helpers;
+  bool render_nodes;
   bool prism_program;
   bool prism_nodes;
   bool prism_nodes_deep;

data/src/include/version.h

@@ -1,6 +1,6 @@
 #ifndef HERB_VERSION_H
 #define HERB_VERSION_H
 
-#define HERB_VERSION "0.9.0"
+#define HERB_VERSION "0.9.2"
 
 #endif

data/src/parser.c

@@ -37,6 +37,7 @@ const parser_options_T HERB_DEFAULT_PARSER_OPTIONS = { .track_whitespace = false
                                                        .analyze = true,
                                                        .strict = true,
                                                        .action_view_helpers = false,
+                                                       .render_nodes = false,
                                                        .prism_nodes_deep = false,
                                                        .prism_nodes = false,
                                                        .prism_program = false };

data/src/parser_match_tags.c

@@ -360,6 +360,26 @@ bool match_tags_visitor(const AST_NODE_T* node, void* data) {
 
 
 
+    case AST_RUBY_RENDER_LOCAL_NODE: {
+      const AST_RUBY_RENDER_LOCAL_NODE_T* ruby_render_local_node = (const AST_RUBY_RENDER_LOCAL_NODE_T*) node;
+
+      if (ruby_render_local_node->value != NULL) {
+        herb_visit_node((AST_NODE_T*) ruby_render_local_node->value, match_tags_visitor, context);
+      }
+    } break;
+
+
+
+    case AST_ERB_RENDER_NODE: {
+      const AST_ERB_RENDER_NODE_T* erb_render_node = (const AST_ERB_RENDER_NODE_T*) node;
+
+      if (erb_render_node->locals != NULL) {
+        match_tags_in_node_array(erb_render_node->locals, context->errors, context->options, context->allocator);
+      }
+    } break;
+
+
+
 
 
     case AST_ERB_IN_NODE: {

data/src/util/hb_arena.c

@@ -70,16 +70,12 @@ static bool hb_arena_append_page(hb_arena_T* allocator, size_t page_size) {
   page->position = 0;
 
   if (allocator->head == NULL) {
+    assert(allocator->tail == NULL);
+
     allocator->head = page;
     allocator->tail = page;
   } else {
-    hb_arena_page_T* last = allocator->head;
-
-    while (last->next != NULL) {
-      last = last->next;
-    }
-
-    last->next = page;
+    allocator->tail->next = page;
     allocator->tail = page;
   }
 

data/src/visitor.c

@@ -421,6 +421,26 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
 
     } break;
 
+    case AST_RUBY_RENDER_LOCAL_NODE: {
+      const AST_RUBY_RENDER_LOCAL_NODE_T* ruby_render_local_node = ((const AST_RUBY_RENDER_LOCAL_NODE_T *) node);
+
+      if (ruby_render_local_node->value != NULL) {
+        herb_visit_node((AST_NODE_T *) ruby_render_local_node->value, visitor, data);
+      }
+
+    } break;
+
+    case AST_ERB_RENDER_NODE: {
+      const AST_ERB_RENDER_NODE_T* erb_render_node = ((const AST_ERB_RENDER_NODE_T *) node);
+
+      if (erb_render_node->locals != NULL) {
+        for (size_t index = 0; index < hb_array_size(erb_render_node->locals); index++) {
+          herb_visit_node(hb_array_get(erb_render_node->locals, index), visitor, data);
+        }
+      }
+
+    } break;
+
     case AST_ERB_IN_NODE: {
       const AST_ERB_IN_NODE_T* erb_in_node = ((const AST_ERB_IN_NODE_T *) node);
 

data/templates/lib/herb/ast/nodes.rb.erb

@@ -22,7 +22,7 @@ module Herb
         super(type, location, errors)
         <%- node.fields.each do |field| -%>
         <%- if field.is_a?(Herb::Template::StringField) -%>
-        @<%= field.name %> = <%= field.name %>.force_encoding("utf-8")
+        @<%= field.name %> = <%= field.name %>&.force_encoding("utf-8")
         <%- else -%>
         @<%= field.name %> = <%= field.name %>
         <%- end -%>
@@ -37,7 +37,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 

data/templates/rust/src/ast/nodes.rs.erb

@@ -171,7 +171,7 @@ unsafe fn convert_node(node_pointer: *const c_void) -> Option<AnyNode> {
 
   match node_type {
     <%- nodes.each do |node| -%>
-    <%= node.type %> => convert_<%= node.human %>(node_pointer).map(AnyNode::<%= node.name %>),
+    <%= node.type %> => convert_<%= node.human %>(node_pointer).map(|n| AnyNode::<%= node.name %>(Box::new(n))),
     <%- end -%>
     _ => {
       eprintln!("Warning: Unknown node type {}", node_type);

data/templates/rust/src/nodes.rs.erb

@@ -210,7 +210,7 @@ pub trait ERBNode {
 #[derive(Debug, Clone)]
 pub enum AnyNode {
   <%- nodes.each do |node| -%>
-  <%= node.name %>(<%= node.name %>),
+  <%= node.name %>(Box<<%= node.name %>>),
   <%- end -%>
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herb
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: arm-linux-gnu
 authors:
 - Marco Roth
@@ -110,11 +110,14 @@ files:
 - sig/herb/visitor.rbs
 - sig/herb/warnings.rbs
 - sig/herb_c_extension.rbs
+- sig/rubyvm.rbs
 - sig/serialized.rbs
 - sig/serialized_ast_errors.rbs
 - sig/serialized_ast_nodes.rbs
 - src/analyze/action_view/attribute_extraction_helpers.c
 - src/analyze/action_view/content_tag.c
+- src/analyze/action_view/javascript_include_tag.c
+- src/analyze/action_view/javascript_tag.c
 - src/analyze/action_view/link_to.c
 - src/analyze/action_view/registry.c
 - src/analyze/action_view/tag.c
@@ -132,6 +135,7 @@ files:
 - src/analyze/missing_end.c
 - src/analyze/parse_errors.c
 - src/analyze/prism_annotate.c
+- src/analyze/render_nodes.c
 - src/analyze/transform.c
 - src/ast_node.c
 - src/ast_nodes.c
@@ -153,6 +157,7 @@ files:
 - src/include/analyze/helpers.h
 - src/include/analyze/invalid_structures.h
 - src/include/analyze/prism_annotate.h
+- src/include/analyze/render_nodes.h
 - src/include/ast_node.h
 - src/include/ast_nodes.h
 - src/include/ast_pretty_print.h