Skip to content

C: Reorganize src/ directory #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoroth merged 1 commit into from
Mar 21, 2026
Merged

C: Reorganize src/ directory #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .clang-format-ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ ext/herb/error_helpers.c
ext/herb/nodes.c
src/analyze/missing_end.c
src/analyze/transform.c
src/ast_nodes.c
src/ast_pretty_print.c
src/ast/ast_nodes.c
src/ast/ast_pretty_print.c
src/errors.c
src/include/ast_nodes.h
src/include/ast_pretty_print.h
src/include/ast/ast_nodes.h
src/include/ast/ast_pretty_print.h
src/include/errors.h
src/include/util/hb_foreach.h
src/parser_match_tags.c
src/include/lib/hb_foreach.h
src/parser/match_tags.c
src/visitor.c
12 changes: 6 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ sig/serialized_ast_errors.rbs
sig/serialized_ast_nodes.rbs
src/analyze/missing_end.c
src/analyze/transform.c
src/ast_nodes.c
src/ast_pretty_print.c
src/ast/ast_nodes.c
src/ast/ast_pretty_print.c
src/errors.c
src/include/ast_nodes.h
src/include/ast_pretty_print.h
src/include/ast/ast_nodes.h
src/include/ast/ast_pretty_print.h
src/include/errors.h
src/include/util/hb_foreach.h
src/parser_match_tags.c
src/include/lib/hb_foreach.h
src/parser/match_tags.c
src/visitor.c
wasm/error_helpers.cpp
wasm/error_helpers.h
Expand Down
5 changes: 5 additions & 0 deletions ext/herb/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@
$VPATH << "$(srcdir)/../../src"
$VPATH << "$(srcdir)/../../src/analyze"
$VPATH << "$(srcdir)/../../src/analyze/action_view"
$VPATH << "$(srcdir)/../../src/ast"
$VPATH << "$(srcdir)/../../src/lexer"
$VPATH << "$(srcdir)/../../src/location"
$VPATH << "$(srcdir)/../../src/parser"
$VPATH << "$(srcdir)/../../src/prism"
$VPATH << "$(srcdir)/../../src/lib"
$VPATH << "$(srcdir)/../../src/util"
$VPATH << prism_src_path
$VPATH << "#{prism_src_path}/util"
Expand Down
4 changes: 2 additions & 2 deletions ext/herb/extension.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <ruby.h>

#include "../../src/include/util/hb_allocator.h"
#include "../../src/include/util/hb_arena_debug.h"
#include "../../src/include/lib/hb_allocator.h"
#include "../../src/include/lib/hb_arena_debug.h"

#include "error_helpers.h"
#include "extension.h"
Expand Down
10 changes: 5 additions & 5 deletions ext/herb/extension_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include "nodes.h"

#include "../../src/include/herb.h"
#include "../../src/include/location.h"
#include "../../src/include/position.h"
#include "../../src/include/token.h"
#include "../../src/include/util/hb_allocator.h"
#include "../../src/include/util/hb_string.h"
#include "../../src/include/lexer/token.h"
#include "../../src/include/lib/hb_allocator.h"
#include "../../src/include/lib/hb_string.h"
#include "../../src/include/location/location.h"
#include "../../src/include/location/position.h"

const char* check_string(VALUE value) {
if (NIL_P(value)) { return NULL; }
Expand Down
8 changes: 4 additions & 4 deletions ext/herb/extension_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#include <ruby.h>

#include "../../src/include/herb.h"
#include "../../src/include/location.h"
#include "../../src/include/position.h"
#include "../../src/include/range.h"
#include "../../src/include/token.h"
#include "../../src/include/lexer/token.h"
#include "../../src/include/location/location.h"
#include "../../src/include/location/position.h"
#include "../../src/include/location/range.h"

const char* check_string(VALUE value);
VALUE rb_string_from_hb_string(hb_string_T string);
Expand Down
14 changes: 7 additions & 7 deletions java/extension_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
#include "error_helpers.h"
#include "nodes.h"

#include "../../src/include/ast_nodes.h"
#include "../../src/include/ast/ast_nodes.h"
#include "../../src/include/herb.h"
#include "../../src/include/location.h"
#include "../../src/include/position.h"
#include "../../src/include/range.h"
#include "../../src/include/token.h"
#include "../../src/include/util/hb_array.h"
#include "../../src/include/util/hb_string.h"
#include "../../src/include/location/location.h"
#include "../../src/include/location/position.h"
#include "../../src/include/location/range.h"
#include "../../src/include/lexer/token.h"
#include "../../src/include/lib/hb_array.h"
#include "../../src/include/lib/hb_string.h"

#include <stdio.h>
#include <stdlib.h>
Expand Down
14 changes: 7 additions & 7 deletions java/extension_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

#include <jni.h>

#include "../../src/include/ast_nodes.h"
#include "../../src/include/location.h"
#include "../../src/include/position.h"
#include "../../src/include/range.h"
#include "../../src/include/token.h"
#include "../../src/include/util/hb_array.h"
#include "../../src/include/util/hb_string.h"
#include "../../src/include/ast/ast_nodes.h"
#include "../../src/include/location/location.h"
#include "../../src/include/location/position.h"
#include "../../src/include/location/range.h"
#include "../../src/include/lexer/token.h"
#include "../../src/include/lib/hb_array.h"
#include "../../src/include/lib/hb_string.h"

#ifdef __cplusplus
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions java/herb_jni.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "../../src/include/extract.h"
#include "../../src/include/herb.h"
#include "../../src/include/util/hb_allocator.h"
#include "../../src/include/util/hb_buffer.h"
#include "../../src/include/lib/hb_allocator.h"
#include "../../src/include/lib/hb_buffer.h"

#include <stdlib.h>
#include <string.h>
Expand Down
50 changes: 26 additions & 24 deletions javascript/packages/node/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"./extension/libherb/analyze/conditional_elements.c",
"./extension/libherb/analyze/conditional_open_tags.c",
"./extension/libherb/analyze/control_type.c",
"./extension/libherb/analyze/helpers.c",
"./extension/libherb/analyze/analyze_helpers.c",
"./extension/libherb/analyze/invalid_structures.c",
"./extension/libherb/analyze/missing_end.c",
"./extension/libherb/analyze/parse_errors.c",
Expand All @@ -35,35 +35,37 @@
"./extension/libherb/analyze/action_view/tag_helpers.c",
"./extension/libherb/analyze/action_view/tag.c",
"./extension/libherb/analyze/action_view/turbo_frame_tag.c",
"./extension/libherb/ast_node.c",
"./extension/libherb/ast_nodes.c",
"./extension/libherb/ast_pretty_print.c",
"./extension/libherb/ast/ast_node.c",
"./extension/libherb/ast/ast_nodes.c",
"./extension/libherb/ast/ast_pretty_print.c",
"./extension/libherb/ast/pretty_print.c",
"./extension/libherb/errors.c",
"./extension/libherb/extract.c",
"./extension/libherb/herb.c",
"./extension/libherb/html_util.c",
"./extension/libherb/io.c",
"./extension/libherb/lexer_peek_helpers.c",
"./extension/libherb/lexer.c",
"./extension/libherb/location.c",
"./extension/libherb/lexer/lexer_peek_helpers.c",
"./extension/libherb/lexer/token.c",
"./extension/libherb/lexer/token_matchers.c",
"./extension/libherb/lib/hb_allocator.c",
"./extension/libherb/lib/hb_arena.c",
"./extension/libherb/lib/hb_arena_debug.c",
"./extension/libherb/lib/hb_array.c",
"./extension/libherb/lib/hb_buffer.c",
"./extension/libherb/lib/hb_narray.c",
"./extension/libherb/lib/hb_string.c",
"./extension/libherb/location/location.c",
"./extension/libherb/location/position.c",
"./extension/libherb/location/range.c",
"./extension/libherb/parser/dot_notation.c",
"./extension/libherb/parser_helpers.c",
"./extension/libherb/parser_match_tags.c",
"./extension/libherb/parser/match_tags.c",
"./extension/libherb/parser/parser_helpers.c",
"./extension/libherb/parser.c",
"./extension/libherb/position.c",
"./extension/libherb/pretty_print.c",
"./extension/libherb/prism_helpers.c",
"./extension/libherb/range.c",
"./extension/libherb/token_matchers.c",
"./extension/libherb/token.c",
"./extension/libherb/utf8.c",
"./extension/libherb/util.c",
"./extension/libherb/util/hb_allocator.c",
"./extension/libherb/util/hb_arena.c",
"./extension/libherb/util/hb_array.c",
"./extension/libherb/util/hb_narray.c",
"./extension/libherb/util/hb_buffer.c",
"./extension/libherb/util/hb_string.c",
"./extension/libherb/prism/prism_helpers.c",
"./extension/libherb/prism/ruby_parser.c",
"./extension/libherb/util/html_util.c",
"./extension/libherb/util/io.c",
"./extension/libherb/util/utf8.c",
"./extension/libherb/util/util.c",
"./extension/libherb/visitor.c",

# Prism main source files
Expand Down
16 changes: 8 additions & 8 deletions javascript/packages/node/extension/extension_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#include <string.h>

extern "C" {
#include "../extension/libherb/include/ast_nodes.h"
#include "../extension/libherb/include/ast/ast_nodes.h"
#include "../extension/libherb/include/herb.h"
#include "../extension/libherb/include/location.h"
#include "../extension/libherb/include/position.h"
#include "../extension/libherb/include/range.h"
#include "../extension/libherb/include/token.h"
#include "../extension/libherb/include/util/hb_array.h"
#include "../extension/libherb/include/util/hb_buffer.h"
#include "../extension/libherb/include/util/hb_string.h"
#include "../extension/libherb/include/location/location.h"
#include "../extension/libherb/include/location/position.h"
#include "../extension/libherb/include/location/range.h"
#include "../extension/libherb/include/lexer/token.h"
#include "../extension/libherb/include/lib/hb_array.h"
#include "../extension/libherb/include/lib/hb_buffer.h"
#include "../extension/libherb/include/lib/hb_string.h"
}

#include "error_helpers.h"
Expand Down
6 changes: 3 additions & 3 deletions javascript/packages/node/extension/extension_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#include <node_api.h>

extern "C" {
#include "../extension/libherb/include/ast_nodes.h"
#include "../extension/libherb/include/ast/ast_nodes.h"
#include "../extension/libherb/include/herb.h"
#include "../extension/libherb/include/util/hb_array.h"
#include "../extension/libherb/include/util/hb_string.h"
#include "../extension/libherb/include/lib/hb_array.h"
#include "../extension/libherb/include/lib/hb_string.h"
}

char* CheckString(napi_env env, napi_value value);
Expand Down
14 changes: 7 additions & 7 deletions javascript/packages/node/extension/herb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
extern "C" {
#include "../extension/libherb/include/ast_nodes.h"
#include "../extension/libherb/include/ast/ast_nodes.h"
#include "../extension/libherb/include/extract.h"
#include "../extension/libherb/include/herb.h"
#include "../extension/libherb/include/location.h"
#include "../extension/libherb/include/range.h"
#include "../extension/libherb/include/token.h"
#include "../extension/libherb/include/util/hb_allocator.h"
#include "../extension/libherb/include/util/hb_array.h"
#include "../extension/libherb/include/util/hb_buffer.h"
#include "../extension/libherb/include/location/location.h"
#include "../extension/libherb/include/location/range.h"
#include "../extension/libherb/include/lexer/token.h"
#include "../extension/libherb/include/lib/hb_allocator.h"
#include "../extension/libherb/include/lib/hb_array.h"
#include "../extension/libherb/include/lib/hb_buffer.h"
}

#include "error_helpers.h"
Expand Down
13 changes: 6 additions & 7 deletions rust/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,14 @@ fn main() {
let mut builder = bindgen::Builder::default()
.header(include_dir.join("analyze/analyze.h").to_str().unwrap())
.header(include_dir.join("herb.h").to_str().unwrap())
.header(include_dir.join("ast_nodes.h").to_str().unwrap())
.header(include_dir.join("ast/ast_nodes.h").to_str().unwrap())
.header(include_dir.join("errors.h").to_str().unwrap())
.header(include_dir.join("element_source.h").to_str().unwrap())
.header(include_dir.join("extract.h").to_str().unwrap())
.header(include_dir.join("token_struct.h").to_str().unwrap())
.header(include_dir.join("util/hb_allocator.h").to_str().unwrap())
.header(include_dir.join("util/hb_string.h").to_str().unwrap())
.header(include_dir.join("util/hb_array.h").to_str().unwrap())
.header(include_dir.join("util/hb_buffer.h").to_str().unwrap())
.header(include_dir.join("lexer/token_struct.h").to_str().unwrap())
.header(include_dir.join("lib/hb_allocator.h").to_str().unwrap())
.header(include_dir.join("lib/hb_string.h").to_str().unwrap())
.header(include_dir.join("lib/hb_array.h").to_str().unwrap())
.header(include_dir.join("lib/hb_buffer.h").to_str().unwrap())
.clang_arg(format!("-I{}", include_dir.display()))
.clang_arg(format!("-I{}", prism_include.display()))
.allowlist_function("herb_.*")
Expand Down
10 changes: 5 additions & 5 deletions src/analyze/action_view/attribute_extraction_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "../../include/analyze/action_view/attribute_extraction_helpers.h"
#include "../../include/analyze/action_view/tag_helper_node_builders.h"
#include "../../include/html_util.h"
#include "../../include/util.h"
#include "../../include/util/hb_allocator.h"
#include "../../include/util/hb_array.h"
#include "../../include/util/hb_string.h"
#include "../../include/lib/hb_allocator.h"
#include "../../include/lib/hb_array.h"
#include "../../include/lib/hb_string.h"
#include "../../include/util/html_util.h"
#include "../../include/util/util.h"

#include <prism.h>
#include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion src/analyze/action_view/registry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "../../include/analyze/action_view/tag_helper_handler.h"
#include "../../include/util/hb_allocator.h"
#include "../../include/lib/hb_allocator.h"

#include <stdbool.h>
#include <stdlib.h>
Expand Down
16 changes: 8 additions & 8 deletions src/analyze/action_view/tag_helper_node_builders.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "../../include/analyze/action_view/tag_helper_node_builders.h"
#include "../../include/ast_nodes.h"
#include "../../include/location.h"
#include "../../include/position.h"
#include "../../include/range.h"
#include "../../include/token_struct.h"
#include "../../include/util/hb_allocator.h"
#include "../../include/util/hb_array.h"
#include "../../include/util/hb_string.h"
#include "../../include/ast/ast_nodes.h"
#include "../../include/lexer/token_struct.h"
#include "../../include/lib/hb_allocator.h"
#include "../../include/lib/hb_array.h"
#include "../../include/lib/hb_string.h"
#include "../../include/location/location.h"
#include "../../include/location/position.h"
#include "../../include/location/range.h"

#include <prism.h>
#include <stdbool.h>
Expand Down
16 changes: 8 additions & 8 deletions src/analyze/action_view/tag_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
#include "../../include/analyze/action_view/tag_helper_handler.h"
#include "../../include/analyze/action_view/tag_helper_node_builders.h"
#include "../../include/analyze/analyze.h"
#include "../../include/ast_nodes.h"
#include "../../include/ast/ast_nodes.h"
#include "../../include/herb.h"
#include "../../include/html_util.h"
#include "../../include/parser_helpers.h"
#include "../../include/position.h"
#include "../../include/util.h"
#include "../../include/util/hb_allocator.h"
#include "../../include/util/hb_array.h"
#include "../../include/util/hb_string.h"
#include "../../include/lib/hb_allocator.h"
#include "../../include/lib/hb_array.h"
#include "../../include/lib/hb_string.h"
#include "../../include/location/position.h"
#include "../../include/parser/parser_helpers.h"
#include "../../include/util/html_util.h"
#include "../../include/util/util.h"
#include "../../include/visitor.h"

#include <prism.h>
Expand Down
18 changes: 9 additions & 9 deletions src/analyze/analyze.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
#include "../include/analyze/invalid_structures.h"
#include "../include/analyze/render_nodes.h"
#include "../include/analyze/strict_locals.h"
#include "../include/ast_node.h"
#include "../include/ast_nodes.h"
#include "../include/ast/ast_node.h"
#include "../include/ast/ast_nodes.h"
#include "../include/errors.h"
#include "../include/location.h"
#include "../include/parser.h"
#include "../include/position.h"
#include "../include/token_struct.h"
#include "../include/util/hb_array.h"
#include "../include/util/hb_string.h"
#include "../include/util/string.h"
#include "../include/lexer/token_struct.h"
#include "../include/lib/hb_array.h"
#include "../include/lib/hb_string.h"
#include "../include/lib/string.h"
#include "../include/location/location.h"
#include "../include/location/position.h"
#include "../include/parser/parser.h"
#include "../include/visitor.h"

#include <prism.h>
Expand Down
Loading
Loading