Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ext/herb/error_helpers.c
ext/herb/nodes.c
src/analyze_missing_end.c
src/analyze_transform.c
src/analyze/missing_end.c
src/analyze/transform.c
src/ast_nodes.c
src/ast_pretty_print.c
src/errors.c
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ rust/src/union_types.rs
rust/src/visitor.rs
sig/serialized_ast_errors.rbs
sig/serialized_ast_nodes.rbs
src/analyze_missing_end.c
src/analyze_transform.c
src/analyze/missing_end.c
src/analyze/transform.c
src/ast_nodes.c
src/ast_pretty_print.c
src/errors.c
Expand Down
1 change: 1 addition & 0 deletions ext/herb/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
prism_include_path = "#{prism_path}/include"

$VPATH << "$(srcdir)/../../src"
$VPATH << "$(srcdir)/../../src/analyze"
$VPATH << "$(srcdir)/../../src/util"
$VPATH << prism_src_path
$VPATH << "#{prism_src_path}/util"
Expand Down
18 changes: 11 additions & 7 deletions javascript/packages/node/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@
"./extension/nodes.cpp",

# Herb main source files
"./extension/libherb/analyze_conditional_elements.c",
"./extension/libherb/analyze_conditional_open_tags.c",
"./extension/libherb/analyze_helpers.c",
"./extension/libherb/analyze_missing_end.c",
"./extension/libherb/analyze_transform.c",
"./extension/libherb/analyze.c",
"./extension/libherb/analyzed_ruby.c",
"./extension/libherb/analyze/analyze.c",
"./extension/libherb/analyze/analyzed_ruby.c",
"./extension/libherb/analyze/builders.c",
"./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/invalid_structures.c",
"./extension/libherb/analyze/missing_end.c",
"./extension/libherb/analyze/parse_errors.c",
"./extension/libherb/analyze/transform.c",
"./extension/libherb/ast_node.c",
"./extension/libherb/ast_nodes.c",
"./extension/libherb/ast_pretty_print.c",
Expand Down
2 changes: 1 addition & 1 deletion rust/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ fn main() {
};

let mut builder = bindgen::Builder::default()
.header(include_dir.join("analyze.h").to_str().unwrap())
.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("errors.h").to_str().unwrap())
Expand Down
Loading
Loading