traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle built-in symbols correctly in conflict manager

Browse source
This commit is contained in:
Max Brunsfeld 2014-07-13 17:59:23 -07:00
parent 44c4bf5f5e
commit b217cd38fb
3 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spec/compiler/build_tables/conflict_manager_spec.cc
View file

@ -1,4 +1,5 @@
#include "compiler/compiler_spec_helper.h"
#include "compiler/rules/built_in_symbols.h"
#include "compiler/build_tables/parse_conflict_manager.h"
#include "compiler/build_tables/lex_conflict_manager.h"
#include "compiler/prepared_grammar.h"
@ -148,6 +149,20 @@ describe("resolving parse conflicts", []() {
AssertThat(manager->resolve_parse_action(sym1, shift, reduce), IsFalse());
AssertThat(manager->resolve_parse_action(sym1, reduce, shift), IsTrue());
});
describe("when the symbols is a built-in symbol", [&]() {
it("records a conflict", [&]() {
manager->resolve_parse_action(rules::ERROR(), reduce, shift);
AssertThat(manager->conflicts()[0], Equals(
Conflict("rule1: shift (precedence 0) / reduce ERROR (precedence 0)")
));
manager->resolve_parse_action(rules::END_OF_INPUT(), reduce, shift);
AssertThat(manager->conflicts()[1], Equals(
Conflict("rule1: shift (precedence 0) / reduce EOF (precedence 0)")
));
});
});
});
describe("when the shift has conflicting precedences compared to the reduce", [&]() {