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

Add regex postfix flags to javascript grammar

Browse source 
- Refactor statement terminators in javascript grammar
- Reorganize javascript language tests
This commit is contained in:
Max Brunsfeld 2014-06-11 16:43:03 -07:00
parent 082560dd6e
commit bb4d83ce47
9 changed files with 32747 additions and 32747 deletions
Download patch file Download diff file Expand all files Collapse all files

32
examples/grammars/javascript.cc
View file

@ -5,6 +5,12 @@ namespace tree_sitter_examples {
using tree_sitter::Grammar;
using namespace tree_sitter::rules;
static rule_ptr terminated(rule_ptr rule) {
return seq({ rule, prec(-1, token(choice({
str("\n"),
str(";") }))) });
}
extern const Grammar javascript = Grammar({
{ "program", repeat(sym("statement")) },
@ -66,26 +72,19 @@ namespace tree_sitter_examples {
keyword("default") }),
str(":"),
repeat(sym("statement")) }) },
{ "break_statement", seq({
keyword("break"),
sym("_terminator") }) },
{ "var_declaration", seq({
{ "break_statement", terminated(keyword("break")) },
{ "var_declaration", terminated(seq({
keyword("var"),
comma_sep(err(choice({
sym("assignment"),
sym("identifier") }))),
sym("_terminator") }) },
{ "expression_statement", seq({
err(sym("expression")),
sym("_terminator") }) },
{ "return_statement", seq({
sym("identifier") }))) })) },
{ "expression_statement", terminated(err(sym("expression"))) },
{ "return_statement", terminated(seq({
keyword("return"),
optional(sym("expression")),
sym("_terminator") }) },
{ "delete_statement", seq({
optional(sym("expression")) })) },
{ "delete_statement", terminated(seq({
keyword("delete"),
sym("property_access"),
sym("_terminator") }) },
sym("property_access") })) },
// Expressions
{ "expression", choice({
@ -183,8 +182,7 @@ namespace tree_sitter_examples {
str(":"),
sym("expression") })))) },
{ "array", in_brackets(comma_sep(err(sym("expression")))) },
{ "_terminator", pattern("[;\n]") },
{ "regex", token(delimited("/")) },
{ "regex", token(seq({ delimited("/"), optional(str("g")) })) },
{ "string", token(choice({
delimited("\""),
delimited("'") })) },