herb 0.7.4-aarch64-linux-gnu → 0.8.0-aarch64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdac1e74fbf67c9fd2fbdfdeb2d379ae1093f0e1858860b66629a1f44ccefe57
-  data.tar.gz: 6f514eee95be38a3e360a63c8ea199986ebc289f92a9817aa982129501aaa349
+  metadata.gz: 0b363f5d92afe92881c17ec763dc7bfc28ee6a8aac39e79ca7d101c3d1000f1c
+  data.tar.gz: ef2ec88c8c8adb3f28849ce10b59fdb4b312e2c413227a293696033a179620f5
 SHA512:
-  metadata.gz: ca0fcdbeb1e4d903f935cf496a748612e9a6253c4381d77d716152d3fecf7778efb77b7e0a873e932dcbbf379fb7cc5bb3e11109d219ac06da67cda2265c19c1
-  data.tar.gz: '097141c4f92f95478b55ca5b928b84b88073d50c9a601d25d903062d92fe7f84601ea0d72ff2c2ec02134a267d9c37a51710b305d08223040f75e9c4486215a4'
+  metadata.gz: 11ea667b4b365ba99fdcabf1250e82132bb7dcebe5c4daa5a68ad4b6cb129dc79fa4ee0c3f69b6312acaaa08b5d589b0d37542d1cfa10ae8bec48a5c5cc5e8d4
+  data.tar.gz: ffdf788c56319b72f96a096f85d64c0599bb3b97cca978daae00c9c4a8954044a46b237cdce1658ace4ca8b6c346daa4d52e224da0bcf8a265871ac241a1298e

data/Makefile

@@ -61,22 +61,22 @@ shared_flags = $(production_flags) $(shared_library_flags) $(prism_flags)
 ifeq ($(os),Linux)
   test_cflags = $(test_flags) -I/usr/include/check
   test_ldflags = -L/usr/lib/x86_64-linux-gnu -lcheck -lm -lsubunit $(prism_ldflags)
-  cc = clang-19
-  clang_format = clang-format-19
-  clang_tidy = clang-tidy-19
+  cc = clang-21
+  clang_format = clang-format-21
+  clang_tidy = clang-tidy-21
 endif
 
 ifeq ($(os),Darwin)
   brew_prefix := $(shell brew --prefix check)
   test_cflags = $(test_flags) -I$(brew_prefix)/include
   test_ldflags = -L$(brew_prefix)/lib -lcheck -lm $(prism_ldflags)
-  llvm_path = $(shell brew --prefix llvm@19)
+  llvm_path = $(shell brew --prefix llvm@21)
   cc = $(llvm_path)/bin/clang
   clang_format = $(llvm_path)/bin/clang-format
   clang_tidy = $(llvm_path)/bin/clang-tidy
 endif
 
-all: templates prism $(exec) $(lib_name) $(static_lib_name) test wasm
+all: templates prism $(exec) $(lib_name) $(static_lib_name) test wasm clangd_config
 
 $(exec): $(objects)
 	$(cc) $(objects) $(flags) $(ldflags) $(prism_ldflags) -o $(exec)
@@ -122,5 +122,8 @@ lint:
 tidy:
 	$(clang_tidy) $(project_files) -- $(flags)
 
+clangd_config:
+	@echo "$(flags) $(test_cflags)" | tr ' ' '\n' | sort -u > compile_flags.txt
+
 wasm:
 	cd wasm && make

data/config.yml

@@ -30,12 +30,12 @@ errors:
 
     - name: UnexpectedTokenError
       message:
-        template: "Found `%s` when expecting `%s` at (%zu:%zu)."
+        template: "Found `%s` when expecting `%s` at (%u:%u)."
         arguments:
           - token_type_to_string(found->type)
           - token_type_to_string(expected_type)
-          - found->location->start->line
-          - found->location->start->column
+          - found->location.start.line
+          - found->location.start.column
 
       fields:
         - name: expected_type
@@ -46,11 +46,11 @@ errors:
 
     - name: MissingOpeningTagError
       message:
-        template: "Found closing tag `</%s>` at (%zu:%zu) without a matching opening tag."
+        template: "Found closing tag `</%s>` at (%u:%u) without a matching opening tag in the same scope."
         arguments:
           - closing_tag->value
-          - closing_tag->location->start->line
-          - closing_tag->location->start->column
+          - closing_tag->location.start.line
+          - closing_tag->location.start.column
 
       fields:
         - name: closing_tag
@@ -58,11 +58,11 @@ errors:
 
     - name: MissingClosingTagError
       message:
-        template: "Opening tag `<%s>` at (%zu:%zu) doesn't have a matching closing tag `</%s>`."
+        template: "Opening tag `<%s>` at (%u:%u) doesn't have a matching closing tag `</%s>` in the same scope."
         arguments:
           - opening_tag->value
-          - opening_tag->location->start->line
-          - opening_tag->location->start->column
+          - opening_tag->location.start.line
+          - opening_tag->location.start.column
           - opening_tag->value
 
       fields:
@@ -71,14 +71,14 @@ errors:
 
     - name: TagNamesMismatchError
       message:
-        template: "Opening tag `<%s>` at (%zu:%zu) closed with `</%s>` at (%zu:%zu)."
+        template: "Opening tag `<%s>` at (%u:%u) closed with `</%s>` at (%u:%u)."
         arguments:
           - opening_tag->value
-          - opening_tag->location->start->line
-          - opening_tag->location->start->column
+          - opening_tag->location.start.line
+          - opening_tag->location.start.column
           - closing_tag->value
-          - closing_tag->location->start->line
-          - closing_tag->location->start->column
+          - closing_tag->location.start.line
+          - closing_tag->location.start.column
 
       fields:
         - name: opening_tag
@@ -89,12 +89,12 @@ errors:
 
     - name: QuotesMismatchError
       message:
-        template: "String opened with %s but closed with %s at (%zu:%zu)."
+        template: "String opened with %s but closed with %s at (%u:%u)."
         arguments:
           - opening_quote->value
           - closing_quote->value
-          - closing_quote->location->start->line
-          - closing_quote->location->start->column
+          - closing_quote->location.start.line
+          - closing_quote->location.start.column
 
       fields:
         - name: opening_quote
@@ -124,11 +124,11 @@ errors:
 
     - name: UnclosedElementError
       message:
-        template: "Tag `<%s>` opened at (%zu:%zu) was never closed before the end of document."
+        template: "Tag `<%s>` opened at (%u:%u) was never closed before the end of document."
         arguments:
           - opening_tag->value
-          - opening_tag->location->start->line
-          - opening_tag->location->start->column
+          - opening_tag->location.start.line
+          - opening_tag->location.start.column
 
       fields:
         - name: opening_tag
@@ -151,6 +151,26 @@ errors:
         - name: level
           type: string
 
+    - name: ERBControlFlowScopeError
+      message:
+        template: "%s appears outside its control flow block. Keep ERB control flow statements together within the same HTML scope (tag, attribute, or content)."
+        arguments:
+          - keyword
+
+      fields:
+        - name: keyword
+          type: string
+
+    - name: MissingERBEndTagError
+      message:
+        template: "%s started here but never closed with an end tag. The end tag may be in a different scope."
+        arguments:
+          - keyword
+
+      fields:
+        - name: keyword
+          type: string
+
 warnings:
   fields: []
   types: []

data/ext/herb/error_helpers.c

@@ -265,6 +265,58 @@ static VALUE rb_ruby_parse_error_from_c_struct(RUBY_PARSE_ERROR_T* ruby_parse_er
   return rb_class_new_instance(6, args, RubyParseError);
 };
 
+static VALUE rb_erb_control_flow_scope_error_from_c_struct(ERB_CONTROL_FLOW_SCOPE_ERROR_T* erb_control_flow_scope_error) {
+  if (erb_control_flow_scope_error == NULL) { return Qnil; }
+
+  ERROR_T* error = &erb_control_flow_scope_error->base;
+
+  VALUE Herb = rb_define_module("Herb");
+  VALUE Errors = rb_define_module_under(Herb, "Errors");
+  VALUE Error = rb_define_class_under(Errors, "Error", rb_cObject);
+  VALUE ERBControlFlowScopeError = rb_define_class_under(Errors, "ERBControlFlowScopeError", Error);
+
+  VALUE type = rb_utf8_str_new_cstr(error_type_to_string(error));
+  VALUE location = rb_location_from_c_struct(error->location);
+  VALUE message = rb_utf8_str_new_cstr(error->message);
+
+  VALUE erb_control_flow_scope_error_keyword = rb_utf8_str_new_cstr(erb_control_flow_scope_error->keyword);
+
+  VALUE args[4] = {
+    type,
+    location,
+    message,
+    erb_control_flow_scope_error_keyword
+  };
+
+  return rb_class_new_instance(4, args, ERBControlFlowScopeError);
+};
+
+static VALUE rb_missingerb_end_tag_error_from_c_struct(MISSINGERB_END_TAG_ERROR_T* missingerb_end_tag_error) {
+  if (missingerb_end_tag_error == NULL) { return Qnil; }
+
+  ERROR_T* error = &missingerb_end_tag_error->base;
+
+  VALUE Herb = rb_define_module("Herb");
+  VALUE Errors = rb_define_module_under(Herb, "Errors");
+  VALUE Error = rb_define_class_under(Errors, "Error", rb_cObject);
+  VALUE MissingERBEndTagError = rb_define_class_under(Errors, "MissingERBEndTagError", Error);
+
+  VALUE type = rb_utf8_str_new_cstr(error_type_to_string(error));
+  VALUE location = rb_location_from_c_struct(error->location);
+  VALUE message = rb_utf8_str_new_cstr(error->message);
+
+  VALUE missingerb_end_tag_error_keyword = rb_utf8_str_new_cstr(missingerb_end_tag_error->keyword);
+
+  VALUE args[4] = {
+    type,
+    location,
+    message,
+    missingerb_end_tag_error_keyword
+  };
+
+  return rb_class_new_instance(4, args, MissingERBEndTagError);
+};
+
 
 VALUE rb_error_from_c_struct(ERROR_T* error) {
   if (!error) { return Qnil; }
@@ -279,17 +331,19 @@ VALUE rb_error_from_c_struct(ERROR_T* error) {
     case VOID_ELEMENT_CLOSING_TAG_ERROR: return rb_void_element_closing_tag_error_from_c_struct((VOID_ELEMENT_CLOSING_TAG_ERROR_T*) error); break;
     case UNCLOSED_ELEMENT_ERROR: return rb_unclosed_element_error_from_c_struct((UNCLOSED_ELEMENT_ERROR_T*) error); break;
     case RUBY_PARSE_ERROR: return rb_ruby_parse_error_from_c_struct((RUBY_PARSE_ERROR_T*) error); break;
+    case ERB_CONTROL_FLOW_SCOPE_ERROR: return rb_erb_control_flow_scope_error_from_c_struct((ERB_CONTROL_FLOW_SCOPE_ERROR_T*) error); break;
+    case MISSINGERB_END_TAG_ERROR: return rb_missingerb_end_tag_error_from_c_struct((MISSINGERB_END_TAG_ERROR_T*) error); break;
   }
 
   return Qnil;
 }
 
-VALUE rb_errors_array_from_c_array(array_T* array) {
+VALUE rb_errors_array_from_c_array(hb_array_T* array) {
   VALUE rb_array = rb_ary_new();
 
   if (array) {
-    for (size_t i = 0; i < array_size(array); i++) {
-      ERROR_T* child_node = (ERROR_T*) array_get(array, i);
+    for (size_t i = 0; i < hb_array_size(array); i++) {
+      ERROR_T* child_node = (ERROR_T*) hb_array_get(array, i);
 
       if (child_node) {
         VALUE rb_child = rb_error_from_c_struct(child_node);

data/ext/herb/error_helpers.h

@@ -10,6 +10,6 @@
 #include <ruby.h>
 
 VALUE rb_error_from_c_struct(ERROR_T* error);
-VALUE rb_errors_array_from_c_array(array_T* array);
+VALUE rb_errors_array_from_c_array(hb_array_T* array);
 
 #endif

data/ext/herb/extconf.rb

@@ -15,6 +15,7 @@ prism_src_path = "#{prism_path}/src"
 prism_include_path = "#{prism_path}/include"
 
 $VPATH << "$(srcdir)/../../src"
+$VPATH << "$(srcdir)/../../src/util"
 $VPATH << prism_src_path
 $VPATH << "#{prism_src_path}/util"
 

data/ext/herb/extension.c

@@ -19,7 +19,7 @@ VALUE cParseResult;
 static VALUE Herb_lex(VALUE self, VALUE source) {
   char* string = (char*) check_string(source);
 
-  array_T* tokens = herb_lex(string);
+  hb_array_T* tokens = herb_lex(string);
 
   VALUE result = create_lex_result(tokens, source);
 
@@ -30,7 +30,7 @@ static VALUE Herb_lex(VALUE self, VALUE source) {
 
 static VALUE Herb_lex_file(VALUE self, VALUE path) {
   char* file_path = (char*) check_string(path);
-  array_T* tokens = herb_lex_file(file_path);
+  hb_array_T* tokens = herb_lex_file(file_path);
 
   VALUE source_value = read_file_to_ruby_string(file_path);
   VALUE result = create_lex_result(tokens, source_value);
@@ -78,6 +78,8 @@ static VALUE Herb_parse_file(VALUE self, VALUE path) {
 
   AST_DOCUMENT_NODE_T* root = herb_parse(string, NULL);
 
+  herb_analyze_parse_tree(root, string);
+
   VALUE result = create_parse_result(root, source_value);
 
   ast_node_free((AST_NODE_T*) root);
@@ -85,45 +87,30 @@ static VALUE Herb_parse_file(VALUE self, VALUE path) {
   return result;
 }
 
-static VALUE Herb_lex_to_json(VALUE self, VALUE source) {
-  char* string = (char*) check_string(source);
-  buffer_T output;
-
-  if (!buffer_init(&output)) { return Qnil; }
-
-  herb_lex_json_to_buffer(string, &output);
-
-  VALUE result = rb_str_new(output.value, output.length);
-
-  buffer_free(&output);
-
-  return result;
-}
-
 static VALUE Herb_extract_ruby(VALUE self, VALUE source) {
   char* string = (char*) check_string(source);
-  buffer_T output;
+  hb_buffer_T output;
 
-  if (!buffer_init(&output)) { return Qnil; }
+  if (!hb_buffer_init(&output, strlen(string))) { return Qnil; }
 
   herb_extract_ruby_to_buffer(string, &output);
 
   VALUE result = rb_utf8_str_new_cstr(output.value);
-  buffer_free(&output);
+  free(output.value);
 
   return result;
 }
 
 static VALUE Herb_extract_html(VALUE self, VALUE source) {
   char* string = (char*) check_string(source);
-  buffer_T output;
+  hb_buffer_T output;
 
-  if (!buffer_init(&output)) { return Qnil; }
+  if (!hb_buffer_init(&output, strlen(string))) { return Qnil; }
 
   herb_extract_html_to_buffer(string, &output);
 
   VALUE result = rb_utf8_str_new_cstr(output.value);
-  buffer_free(&output);
+  free(output.value);
 
   return result;
 }
@@ -151,7 +138,6 @@ void Init_herb(void) {
   rb_define_singleton_method(mHerb, "lex", Herb_lex, 1);
   rb_define_singleton_method(mHerb, "parse_file", Herb_parse_file, 1);
   rb_define_singleton_method(mHerb, "lex_file", Herb_lex_file, 1);
-  rb_define_singleton_method(mHerb, "lex_to_json", Herb_lex_to_json, 1);
   rb_define_singleton_method(mHerb, "extract_ruby", Herb_extract_ruby, 1);
   rb_define_singleton_method(mHerb, "extract_html", Herb_extract_html, 1);
   rb_define_singleton_method(mHerb, "version", Herb_version, 0);

data/ext/herb/extension_helpers.c

@@ -20,32 +20,26 @@ const char* check_string(VALUE value) {
   return RSTRING_PTR(value);
 }
 
-VALUE rb_position_from_c_struct(position_T* position) {
-  if (!position) { return Qnil; }
-
+VALUE rb_position_from_c_struct(position_T position) {
   VALUE args[2];
-  args[0] = SIZET2NUM(position->line);
-  args[1] = SIZET2NUM(position->column);
+  args[0] = UINT2NUM(position.line);
+  args[1] = UINT2NUM(position.column);
 
   return rb_class_new_instance(2, args, cPosition);
 }
 
-VALUE rb_location_from_c_struct(location_T* location) {
-  if (!location) { return Qnil; }
-
+VALUE rb_location_from_c_struct(location_T location) {
   VALUE args[2];
-  args[0] = rb_position_from_c_struct(location->start);
-  args[1] = rb_position_from_c_struct(location->end);
+  args[0] = rb_position_from_c_struct(location.start);
+  args[1] = rb_position_from_c_struct(location.end);
 
   return rb_class_new_instance(2, args, cLocation);
 }
 
-VALUE rb_range_from_c_struct(range_T* range) {
-  if (!range) { return Qnil; }
-
+VALUE rb_range_from_c_struct(range_T range) {
   VALUE args[2];
-  args[0] = SIZET2NUM(range->from);
-  args[1] = SIZET2NUM(range->to);
+  args[0] = UINT2NUM(range.from);
+  args[1] = UINT2NUM(range.to);
 
   return rb_class_new_instance(2, args, cRange);
 }
@@ -64,13 +58,13 @@ VALUE rb_token_from_c_struct(token_T* token) {
   return rb_class_new_instance(4, args, cToken);
 }
 
-VALUE create_lex_result(array_T* tokens, VALUE source) {
+VALUE create_lex_result(hb_array_T* tokens, VALUE source) {
   VALUE value = rb_ary_new();
   VALUE warnings = rb_ary_new();
   VALUE errors = rb_ary_new();
 
-  for (size_t i = 0; i < array_size(tokens); i++) {
-    token_T* token = array_get(tokens, i);
+  for (size_t i = 0; i < hb_array_size(tokens); i++) {
+    token_T* token = hb_array_get(tokens, i);
     if (token != NULL) { rb_ary_push(value, rb_token_from_c_struct(token)); }
   }
 

data/ext/herb/extension_helpers.h

@@ -12,13 +12,13 @@
 const char* check_string(VALUE value);
 VALUE read_file_to_ruby_string(const char* file_path);
 
-VALUE rb_position_from_c_struct(position_T* position);
-VALUE rb_location_from_c_struct(location_T* location);
+VALUE rb_position_from_c_struct(position_T position);
+VALUE rb_location_from_c_struct(location_T location);
 
 VALUE rb_token_from_c_struct(token_T* token);
-VALUE rb_range_from_c_struct(range_T* range);
+VALUE rb_range_from_c_struct(range_T range);
 
-VALUE create_lex_result(array_T* tokens, VALUE source);
+VALUE create_lex_result(hb_array_T* tokens, VALUE source);
 VALUE create_parse_result(AST_DOCUMENT_NODE_T* root, VALUE source);
 
 #endif