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

Add parser error messages

Browse source
This commit is contained in:
Max Brunsfeld 2014-01-08 18:35:16 -08:00
parent 614e497ac4
commit 55809f702d
14 changed files with 213 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

38
spec/compiler/lr/table_builder_spec.cpp
View file

@ -5,8 +5,8 @@
using namespace tree_sitter::lr;
using namespace tree_sitter::rules;
typedef std::unordered_set<ParseAction> parse_actions;
typedef std::unordered_set<LexAction> lex_actions;
typedef unordered_set<ParseAction> parse_actions;
typedef unordered_set<LexAction> lex_actions;
START_TEST
@ -15,27 +15,25 @@ describe("building parse and lex tables", []() {
{ "expression", choice({
seq({
sym("term"),
sym("plus-token"),
sym("plus"),
sym("term") }),
sym("term") }) },
{ "term", choice({
sym("variable"),
sym("number"),
seq({
sym("left-paren-token"),
sym("left-paren"),
sym("expression"),
sym("right-paren-token")
}) }) },
{ "variable", sym("variable-token") },
{ "number", sym("number-token") }
sym("right-paren")
}) }) }
});
Grammar lex_grammar({
{ "plus-token", character('+') },
{ "variable-token", pattern("\\w+") },
{ "number-token", pattern("\\d+") },
{ "left-paren-token", character('(') },
{ "right-paren-token", character(')') }
{ "plus", str("+") },
{ "variable", pattern("\\w+") },
{ "number", pattern("\\d+") },
{ "left-paren", str("(") },
{ "right-paren", str(")") }
});
pair<ParseTable, LexTable> tables = build_tables(grammar, lex_grammar);
@ -58,9 +56,9 @@ describe("building parse and lex tables", []() {
{ "number", parse_actions({ ParseAction::Shift(5) }) },
{ "variable", parse_actions({ ParseAction::Shift(5) }) },
{ "left-paren-token", parse_actions({ ParseAction::Shift(6) }) },
{ "variable-token", parse_actions({ ParseAction::Shift(9) }) },
{ "number-token", parse_actions({ ParseAction::Shift(10) }) },
{ "left-paren", parse_actions({ ParseAction::Shift(6) }) },
{ "variable", parse_actions({ ParseAction::Shift(9) }) },
{ "number", parse_actions({ ParseAction::Shift(10) }) },
})));
AssertThat(lex_state(0).actions, Equals(unordered_map<CharMatch, lex_actions>({
@ -68,6 +66,12 @@ describe("building parse and lex tables", []() {
{ CharMatchClass(CharClassDigit), lex_actions({ LexAction::Advance(2) }) },
{ CharMatchClass(CharClassWord), lex_actions({ LexAction::Advance(3) }) },
})));
AssertThat(lex_state(0).expected_inputs(), Equals(unordered_set<CharMatch>({
CharMatchSpecific('('),
CharMatchClass(CharClassDigit),
CharMatchClass(CharClassWord),
})));
});
it("accepts when the start symbol is reduced", [&]() {
@ -78,7 +82,7 @@ describe("building parse and lex tables", []() {
it("has the right next states", [&]() {
AssertThat(parse_state(2).actions, Equals(unordered_map<string, parse_actions>({
{ "plus-token", parse_actions({ ParseAction::Shift(3) }) },
{ "plus", parse_actions({ ParseAction::Shift(3) }) },
})));
});
});