Skip to content

Commit 6790661

Browse files
marcorothmarcoroth
committed
C: Reorganize src/ directory
1 parent 2ec3a5d commit 6790661

File tree

143 files changed

+518
-525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+518
-525
lines changed

‎.gitignore‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ sig/serialized_ast_errors.rbs
119119
sig/serialized_ast_nodes.rbs
120120
src/analyze/missing_end.c
121121
src/analyze/transform.c
122-
src/ast_nodes.c
123-
src/ast_pretty_print.c
122+
src/ast/ast_nodes.c
123+
src/ast/ast_pretty_print.c
124124
src/errors.c
125-
src/include/ast_nodes.h
126-
src/include/ast_pretty_print.h
125+
src/include/ast/ast_nodes.h
126+
src/include/ast/ast_pretty_print.h
127127
src/include/errors.h
128-
src/include/util/hb_foreach.h
129-
src/parser_match_tags.c
128+
src/include/lib/hb_foreach.h
129+
src/parser/match_tags.c
130130
src/visitor.c
131131
wasm/error_helpers.cpp
132132
wasm/error_helpers.h

‎ext/herb/extconf.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@
4646
$VPATH << "$(srcdir)/../../src"
4747
$VPATH << "$(srcdir)/../../src/analyze"
4848
$VPATH << "$(srcdir)/../../src/analyze/action_view"
49+
$VPATH << "$(srcdir)/../../src/ast"
50+
$VPATH << "$(srcdir)/../../src/lexer"
51+
$VPATH << "$(srcdir)/../../src/location"
4952
$VPATH << "$(srcdir)/../../src/parser"
53+
$VPATH << "$(srcdir)/../../src/prism"
54+
$VPATH << "$(srcdir)/../../src/lib"
5055
$VPATH << "$(srcdir)/../../src/util"
5156
$VPATH << prism_src_path
5257
$VPATH << "#{prism_src_path}/util"

‎ext/herb/extension.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <ruby.h>
22

3-
#include "../../src/include/util/hb_allocator.h"
4-
#include "../../src/include/util/hb_arena_debug.h"
3+
#include "../../src/include/lib/hb_allocator.h"
4+
#include "../../src/include/lib/hb_arena_debug.h"
55

66
#include "error_helpers.h"
77
#include "extension.h"

‎ext/herb/extension_helpers.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
#include "nodes.h"
66

77
#include "../../src/include/herb.h"
8-
#include "../../src/include/location.h"
9-
#include "../../src/include/position.h"
10-
#include "../../src/include/token.h"
11-
#include "../../src/include/util/hb_allocator.h"
12-
#include "../../src/include/util/hb_string.h"
8+
#include "../../src/include/location/location.h"
9+
#include "../../src/include/location/position.h"
10+
#include "../../src/include/lexer/token.h"
11+
#include "../../src/include/lib/hb_allocator.h"
12+
#include "../../src/include/lib/hb_string.h"
1313

1414
const char* check_string(VALUE value) {
1515
if (NIL_P(value)) { return NULL; }

‎ext/herb/extension_helpers.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include <ruby.h>
55

66
#include "../../src/include/herb.h"
7-
#include "../../src/include/location.h"
8-
#include "../../src/include/position.h"
9-
#include "../../src/include/range.h"
10-
#include "../../src/include/token.h"
7+
#include "../../src/include/location/location.h"
8+
#include "../../src/include/location/position.h"
9+
#include "../../src/include/location/range.h"
10+
#include "../../src/include/lexer/token.h"
1111

1212
const char* check_string(VALUE value);
1313
VALUE rb_string_from_hb_string(hb_string_T string);

‎java/extension_helpers.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
#include "error_helpers.h"
33
#include "nodes.h"
44

5-
#include "../../src/include/ast_nodes.h"
5+
#include "../../src/include/ast/ast_nodes.h"
66
#include "../../src/include/herb.h"
7-
#include "../../src/include/location.h"
8-
#include "../../src/include/position.h"
9-
#include "../../src/include/range.h"
10-
#include "../../src/include/token.h"
11-
#include "../../src/include/util/hb_array.h"
12-
#include "../../src/include/util/hb_string.h"
7+
#include "../../src/include/location/location.h"
8+
#include "../../src/include/location/position.h"
9+
#include "../../src/include/location/range.h"
10+
#include "../../src/include/lexer/token.h"
11+
#include "../../src/include/lib/hb_array.h"
12+
#include "../../src/include/lib/hb_string.h"
1313

1414
#include <stdio.h>
1515
#include <stdlib.h>

‎java/extension_helpers.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
#include <jni.h>
55

6-
#include "../../src/include/ast_nodes.h"
7-
#include "../../src/include/location.h"
8-
#include "../../src/include/position.h"
9-
#include "../../src/include/range.h"
10-
#include "../../src/include/token.h"
11-
#include "../../src/include/util/hb_array.h"
12-
#include "../../src/include/util/hb_string.h"
6+
#include "../../src/include/ast/ast_nodes.h"
7+
#include "../../src/include/location/location.h"
8+
#include "../../src/include/location/position.h"
9+
#include "../../src/include/location/range.h"
10+
#include "../../src/include/lexer/token.h"
11+
#include "../../src/include/lib/hb_array.h"
12+
#include "../../src/include/lib/hb_string.h"
1313

1414
#ifdef __cplusplus
1515
extern "C" {

‎java/herb_jni.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "../../src/include/extract.h"
55
#include "../../src/include/herb.h"
6-
#include "../../src/include/util/hb_allocator.h"
7-
#include "../../src/include/util/hb_buffer.h"
6+
#include "../../src/include/lib/hb_allocator.h"
7+
#include "../../src/include/lib/hb_buffer.h"
88

99
#include <stdlib.h>
1010
#include <string.h>

‎javascript/packages/node/binding.gyp‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"./extension/libherb/analyze/conditional_elements.c",
1717
"./extension/libherb/analyze/conditional_open_tags.c",
1818
"./extension/libherb/analyze/control_type.c",
19-
"./extension/libherb/analyze/helpers.c",
19+
"./extension/libherb/analyze/analyze_helpers.c",
2020
"./extension/libherb/analyze/invalid_structures.c",
2121
"./extension/libherb/analyze/missing_end.c",
2222
"./extension/libherb/analyze/parse_errors.c",
@@ -35,35 +35,37 @@
3535
"./extension/libherb/analyze/action_view/tag_helpers.c",
3636
"./extension/libherb/analyze/action_view/tag.c",
3737
"./extension/libherb/analyze/action_view/turbo_frame_tag.c",
38-
"./extension/libherb/ast_node.c",
39-
"./extension/libherb/ast_nodes.c",
40-
"./extension/libherb/ast_pretty_print.c",
38+
"./extension/libherb/ast/ast_node.c",
39+
"./extension/libherb/ast/ast_nodes.c",
40+
"./extension/libherb/ast/ast_pretty_print.c",
41+
"./extension/libherb/ast/pretty_print.c",
4142
"./extension/libherb/errors.c",
4243
"./extension/libherb/extract.c",
4344
"./extension/libherb/herb.c",
44-
"./extension/libherb/html_util.c",
45-
"./extension/libherb/io.c",
46-
"./extension/libherb/lexer_peek_helpers.c",
4745
"./extension/libherb/lexer.c",
48-
"./extension/libherb/location.c",
46+
"./extension/libherb/lexer/lexer_peek_helpers.c",
47+
"./extension/libherb/lexer/token.c",
48+
"./extension/libherb/lexer/token_matchers.c",
49+
"./extension/libherb/lib/hb_allocator.c",
50+
"./extension/libherb/lib/hb_arena.c",
51+
"./extension/libherb/lib/hb_arena_debug.c",
52+
"./extension/libherb/lib/hb_array.c",
53+
"./extension/libherb/lib/hb_buffer.c",
54+
"./extension/libherb/lib/hb_narray.c",
55+
"./extension/libherb/lib/hb_string.c",
56+
"./extension/libherb/location/location.c",
57+
"./extension/libherb/location/position.c",
58+
"./extension/libherb/location/range.c",
4959
"./extension/libherb/parser/dot_notation.c",
50-
"./extension/libherb/parser_helpers.c",
51-
"./extension/libherb/parser_match_tags.c",
60+
"./extension/libherb/parser/match_tags.c",
61+
"./extension/libherb/parser/parser_helpers.c",
5262
"./extension/libherb/parser.c",
53-
"./extension/libherb/position.c",
54-
"./extension/libherb/pretty_print.c",
55-
"./extension/libherb/prism_helpers.c",
56-
"./extension/libherb/range.c",
57-
"./extension/libherb/token_matchers.c",
58-
"./extension/libherb/token.c",
59-
"./extension/libherb/utf8.c",
60-
"./extension/libherb/util.c",
61-
"./extension/libherb/util/hb_allocator.c",
62-
"./extension/libherb/util/hb_arena.c",
63-
"./extension/libherb/util/hb_array.c",
64-
"./extension/libherb/util/hb_narray.c",
65-
"./extension/libherb/util/hb_buffer.c",
66-
"./extension/libherb/util/hb_string.c",
63+
"./extension/libherb/prism/prism_helpers.c",
64+
"./extension/libherb/prism/ruby_parser.c",
65+
"./extension/libherb/util/html_util.c",
66+
"./extension/libherb/util/io.c",
67+
"./extension/libherb/util/utf8.c",
68+
"./extension/libherb/util/util.c",
6769
"./extension/libherb/visitor.c",
6870

6971
# Prism main source files

‎javascript/packages/node/extension/extension_helpers.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#include <string.h>
55

66
extern "C" {
7-
#include "../extension/libherb/include/ast_nodes.h"
7+
#include "../extension/libherb/include/ast/ast_nodes.h"
88
#include "../extension/libherb/include/herb.h"
9-
#include "../extension/libherb/include/location.h"
10-
#include "../extension/libherb/include/position.h"
11-
#include "../extension/libherb/include/range.h"
12-
#include "../extension/libherb/include/token.h"
13-
#include "../extension/libherb/include/util/hb_array.h"
14-
#include "../extension/libherb/include/util/hb_buffer.h"
15-
#include "../extension/libherb/include/util/hb_string.h"
9+
#include "../extension/libherb/include/location/location.h"
10+
#include "../extension/libherb/include/location/position.h"
11+
#include "../extension/libherb/include/location/range.h"
12+
#include "../extension/libherb/include/lexer/token.h"
13+
#include "../extension/libherb/include/lib/hb_array.h"
14+
#include "../extension/libherb/include/lib/hb_buffer.h"
15+
#include "../extension/libherb/include/lib/hb_string.h"
1616
}
1717

1818
#include "error_helpers.h"

0 commit comments

Comments
 (0)