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

Remove subclasses of Symbol for terminals and non-terminals

Browse source
This commit is contained in:
Max Brunsfeld 2014-01-04 15:01:06 -08:00
parent ed80d9cf52
commit 29c81167c0
23 changed files with 88 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/compiler/grammar/prepare_grammar_spec.cpp
View file

@ -21,11 +21,11 @@ describe("preparing a grammar", []() {
AssertThat(result.first, Equals(Grammar({
{ "rule1", seq({
token("1"),
sym("1"),
seq({
sym("rule2"),
sym("rule3") }),
token("1") }) }
sym("1") }) }
})));
AssertThat(result.second, Equals(Grammar("", {

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

@ -14,19 +14,19 @@ describe("building parse and lex tables", []() {
{ "expression", choice({
seq({
sym("term"),
token("plus-token"),
sym("plus-token"),
sym("term") }),
sym("term") }) },
{ "term", choice({
sym("variable"),
sym("number"),
seq({
token("left-paren-token"),
sym("left-paren-token"),
sym("expression"),
token("right-paren-token")
sym("right-paren-token")
}) }) },
{ "variable", token("variable-token") },
{ "number", token("number-token") }
{ "variable", sym("variable-token") },
{ "number", sym("number-token") }
});
Grammar lex_grammar({
@ -64,8 +64,8 @@ describe("building parse and lex tables", []() {
AssertThat(lex_state(0).actions, Equals(unordered_map<CharMatch, lex_actions>({
{ CharMatchSpecific('('), lex_actions({ LexAction::Advance(1) }) },
{ CharMatchClass(CharClassWord), lex_actions({ LexAction::Advance(2) }) },
{ CharMatchClass(CharClassDigit), lex_actions({ LexAction::Advance(3) }) },
{ CharMatchClass(CharClassDigit), lex_actions({ LexAction::Advance(2) }) },
{ CharMatchClass(CharClassWord), lex_actions({ LexAction::Advance(3) }) },
})));
});

10
spec/fixtures/parsers/arithmetic.c vendored
View file

@ -20,19 +20,19 @@ static void ts_lex(TSParser *parser) {
START_LEXER();
switch (LEX_STATE()) {
case 0:
if (isalnum(LOOKAHEAD_CHAR()))
ADVANCE(2);
if (isdigit(LOOKAHEAD_CHAR()))
ADVANCE(3);
if (LOOKAHEAD_CHAR() == '(')
ADVANCE(2);
if (isalnum(LOOKAHEAD_CHAR()))
ADVANCE(1);
LEX_ERROR();
case 1:
ACCEPT_TOKEN(ts_symbol_2);
case 2:
if (isalnum(LOOKAHEAD_CHAR()))
ADVANCE(2);
ADVANCE(1);
ACCEPT_TOKEN(ts_symbol_1);
case 2:
ACCEPT_TOKEN(ts_symbol_2);
case 3:
if (isdigit(LOOKAHEAD_CHAR()))
ADVANCE(3);