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

Refactor classes representing individual characters & character classes

Browse source
This commit is contained in:
Max Brunsfeld 2013-12-21 23:53:26 -08:00
parent 8dec6c90f4
commit 9667b3fd6c
17 changed files with 167 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/compiler/lr/item_set_spec.cpp
View file

@ -47,8 +47,8 @@ Describe(item_sets) {
AssertThat(
set.char_transitions(grammar),
Equals(transition_map<rules::Rule, ItemSet>({
{ char_class(CharClassTypeWord), item_set({ Item("variable", choice({ repeat(char_class(CharClassTypeWord)), blank() }), 1) }) },
{ char_class(CharClassTypeDigit), item_set({ Item("number", choice({ repeat(char_class(CharClassTypeDigit)), blank() }), 1) }) },
{ character(CharClassWord), item_set({ Item("variable", choice({ repeat(character(CharClassWord)), blank() }), 1) }) },
{ character(CharClassDigit), item_set({ Item("number", choice({ repeat(character(CharClassDigit)), blank() }), 1) }) },
{ character('('), item_set({ Item("left_paren", blank(), 1) }) }
})));
}

4
spec/compiler/rules/pattern_spec.cpp
View file

@ -21,9 +21,9 @@ Describe(pattern_rules) {
AssertThat(
rule.to_rule_tree()->to_string(),
Equals(seq({
char_class(CharClassTypeWord),
character(CharClassWord),
character('-'),
char_class(CharClassTypeDigit)
character(CharClassDigit)
})->to_string()));
};

2
spec/compiler/rules/rules_spec.cpp
View file

@ -44,7 +44,7 @@ Describe(Rules) {
}
It(handles_character_classes) {
auto rule = rules::char_class(rules::CharClassTypeDigit);
auto rule = rules::character(CharClassDigit);
AssertThat(
rules::transitions(rule),
Equals(transition_map<rules::Rule, rules::Rule>({