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 |
|
Max Brunsfeld
|
e6f3239bef
|
Move stream operator definitions to spec helpers
This is one less thing for users to worry about when compiling and linking
the library itself
|
2015-09-10 10:12:11 -07:00 |
|
Max Brunsfeld
|
bd77ab1ac9
|
Move public rule functions out of rule namespace
This way, there's only one public namespace: tree_sitter
|
2015-09-03 17:49:20 -07:00 |
|
Max Brunsfeld
|
c18351772a
|
Auto-format: no single-line functions
|
2015-07-31 16:32:24 -07:00 |
|
Max Brunsfeld
|
f9b057f3a9
|
clang-format everything
|
2015-07-27 18:29:48 -07:00 |
|
Max Brunsfeld
|
aabcb10cfb
|
Respect expected_conflicts field when building parse table
|
2015-06-28 16:22:31 -05:00 |
|
Max Brunsfeld
|
80ec303b10
|
Replace prec rule w/ left_assoc and right_assoc
Consider shift/reduce conflicts to be compilation errors unless
they are resolved by a specified associativity.
|
2015-03-16 23:12:34 -07:00 |
|
Max Brunsfeld
|
3458fa6e50
|
Fix non-deterministic order in conflict description
|
2015-03-07 11:02:21 -08:00 |
|
Max Brunsfeld
|
2d436cf141
|
Identify fragile reductions at compile time
|
2015-02-21 15:11:03 -08:00 |
|
Max Brunsfeld
|
2e7ffb4d14
|
Tweak auto-format settings
Prefer lines that exceed 80 characters by a small margin to
line breaks in argument lists
|
2014-09-09 13:15:40 -07:00 |
|
Max Brunsfeld
|
98cc2f2264
|
Auto-format all source code with clang-format
|
2014-07-21 13:20:00 -07:00 |
|
Max Brunsfeld
|
f4287c07d0
|
Fix ParseStateId / size_t confusion in parse table
|
2014-07-07 13:21:30 -07:00 |
|
Max Brunsfeld
|
67590eddc7
|
Fix stream operator for new parse action types
|
2014-07-03 08:15:36 -07:00 |
|
Max Brunsfeld
|
83a1b9439e
|
Fix handling of ubiquitous tokens used in grammar rules
|
2014-07-01 20:47:35 -07:00 |
|
Max Brunsfeld
|
9686c57e90
|
Allow ubiquitous tokens to also be used in grammar rules
|
2014-06-26 08:52:42 -07:00 |
|
Max Brunsfeld
|
b010e1667e
|
Fix parse action equality method
|
2014-05-06 12:51:38 -07:00 |
|
Max Brunsfeld
|
25eda9d889
|
ISymbol -> Symbol
Interned symbols are now the main type of symbol in use
|
2014-04-28 20:43:27 -07:00 |
|
Max Brunsfeld
|
68d44fd565
|
Intern symbols during grammar preparation
|
2014-04-22 23:38:26 -07:00 |
|
Max Brunsfeld
|
a437d39773
|
Add rule precedence construct
Still need to add some way of expressing left and right
associativity
|
2014-04-15 08:40:46 -07:00 |
|
Max Brunsfeld
|
6a0a28f4b3
|
WIP - try to fix travis build
|
2014-04-08 21:41:38 -07:00 |
|
Max Brunsfeld
|
3982b73ed6
|
Start work on recording parse action conflicts
|
2014-04-08 08:19:55 -07:00 |
|
Max Brunsfeld
|
129d2b9314
|
Remove extra EOF actions in lexer
|
2014-04-04 08:44:35 -07:00 |
|
Max Brunsfeld
|
3f770ff3c3
|
Remove unused consumed_symbols vector from parse items
|
2014-03-26 21:04:11 -07:00 |
|
Max Brunsfeld
|
aac0786449
|
Resolve token conflicts by tokens' order in grammar
|
2014-03-24 19:18:06 -07:00 |
|
Max Brunsfeld
|
3aaa08b948
|
Fix some egregiously long lines
|
2014-03-09 23:58:25 -07:00 |
|
Max Brunsfeld
|
a4120f36d4
|
Remove all uses of 'using namespace'
|
2014-03-09 22:45:33 -07:00 |
|
Max Brunsfeld
|
de5deeeb69
|
Remove spurious semicolons
|
2014-03-09 22:24:52 -07:00 |
|
Max Brunsfeld
|
a411e43484
|
Rename source files: .cpp -> .cc
|
2014-03-09 22:13:08 -07:00 |
|