traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tree-sitter/spec/runtime
History
Max Brunsfeld ebc52f109d Merge branch 'flatten-rules-into-productions' 
This branch had diverged considerably, so merging it required changing a lot
of code.

Conflicts:
	project.gyp
	spec/compiler/build_tables/action_takes_precedence_spec.cc
	spec/compiler/build_tables/build_conflict_spec.cc
	spec/compiler/build_tables/build_parse_table_spec.cc
	spec/compiler/build_tables/first_symbols_spec.cc
	spec/compiler/build_tables/item_set_closure_spec.cc
	spec/compiler/build_tables/item_set_transitions_spec.cc
	spec/compiler/build_tables/rule_can_be_blank_spec.cc
	spec/compiler/helpers/containers.h
	spec/compiler/prepare_grammar/expand_repeats_spec.cc
	spec/compiler/prepare_grammar/extract_tokens_spec.cc
	src/compiler/build_tables/action_takes_precedence.h
	src/compiler/build_tables/build_parse_table.cc
	src/compiler/build_tables/first_symbols.cc
	src/compiler/build_tables/first_symbols.h
	src/compiler/build_tables/item_set_closure.cc
	src/compiler/build_tables/item_set_transitions.cc
	src/compiler/build_tables/parse_item.cc
	src/compiler/build_tables/parse_item.h
	src/compiler/build_tables/rule_can_be_blank.cc
	src/compiler/build_tables/rule_can_be_blank.h
	src/compiler/prepare_grammar/expand_repeats.cc
	src/compiler/prepare_grammar/extract_tokens.cc
	src/compiler/prepare_grammar/extract_tokens.h
	src/compiler/prepare_grammar/prepare_grammar.cc
	src/compiler/rules/built_in_symbols.cc
	src/compiler/rules/built_in_symbols.h
	src/compiler/syntax_grammar.cc
	src/compiler/syntax_grammar.h
2015-10-02 23:46:39 -07:00
..
helpers Add some edit sequences to corpus tests 2015-09-22 21:19:19 -07:00
document_spec.cc Cleanup debug logging in parser 2015-09-22 19:35:13 -07:00
language_specs.cc Merge branch 'flatten-rules-into-productions' 2015-10-02 23:46:39 -07:00
node_spec.cc Add ability to edit multiple times between parses 2015-09-18 23:20:06 -07:00
parser_spec.cc Add undo method to SpyInput 2015-09-19 14:46:14 -07:00
runtime_spec_helper.h Remove unnecessary include from runtime spec-helper 2015-09-09 12:59:27 -07:00
runtime_specs.cc Fix indentation in specs 2014-08-07 08:11:21 -07:00
stack_spec.cc Rename ParseStack -> Stack 2015-09-18 22:02:06 -07:00
tree_spec.cc Add ts_tree_edit function 2015-09-18 22:02:06 -07:00