Skip to content

Commit fa1f4aa

Browse files
author
Max Brunsfeld
authored
Merge pull request tree-sitter#204 from tree-sitter/property-sheets
Add a system for assigning properties to syntax nodes
2 parents 2575223 + 2b6857b commit fa1f4aa

File tree

22 files changed

+923
-102
lines changed

22 files changed

+923
-102
lines changed

externals/bandit

include/tree_sitter/compiler.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ typedef struct {
2929
} TSCompileResult;
3030

3131
TSCompileResult ts_compile_grammar(const char *input, FILE *log_file);
32+
TSCompileResult ts_compile_property_sheet(const char *input, FILE *log_file);
3233

3334
#ifdef __cplusplus
3435
}

project.gyp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
'src/compiler/build_tables/parse_item.cc',
1919
'src/compiler/build_tables/parse_item_set_builder.cc',
2020
'src/compiler/build_tables/parse_table_builder.cc',
21+
'src/compiler/build_tables/property_table_builder.cc',
2122
'src/compiler/build_tables/rule_can_be_blank.cc',
2223
'src/compiler/compile.cc',
2324
'src/compiler/generate_code/c_code.cc',
25+
'src/compiler/generate_code/property_table_json.cc',
2426
'src/compiler/lex_table.cc',
2527
'src/compiler/log.cc',
26-
'src/compiler/parse_grammar.cc',
28+
'src/compiler/parse_json.cc',
2729
'src/compiler/parse_table.cc',
2830
'src/compiler/precedence_range.cc',
2931
'src/compiler/prepare_grammar/expand_repeats.cc',
@@ -122,6 +124,7 @@
122124
'cflags': [ '-g' ],
123125
'ldflags': [ '-g' ],
124126
'xcode_settings': {
127+
'ARCHS': ['x86_64'],
125128
'OTHER_LDFLAGS': ['-g'],
126129
'GCC_OPTIMIZATION_LEVEL': '0',
127130
},
@@ -131,6 +134,7 @@
131134
'cflags': [ '-g' ],
132135
'ldflags': [ '-g' ],
133136
'xcode_settings': {
137+
'ARCHS': ['x86_64'],
134138
'OTHER_LDFLAGS': ['-g'],
135139
'GCC_OPTIMIZATION_LEVEL': '0',
136140
'OTHER_CPLUSPLUSFLAGS': ['-fsanitize=address'],
@@ -143,6 +147,9 @@
143147
'Release': {
144148
'cflags': [ '-O2', '-fno-strict-aliasing' ],
145149
'cflags!': [ '-O3', '-fstrict-aliasing' ],
150+
'xcode_settings': {
151+
'ARCHS': ['x86_64'],
152+
},
146153
},
147154
},
148155

0 commit comments

Comments
 (0)