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

Add ternary expressions to javascript grammar

Browse source
This commit is contained in:
Max Brunsfeld 2014-04-23 22:07:44 -07:00
parent 5313bb5257
commit 7be8d469b8
4 changed files with 6912 additions and 6019 deletions
Download patch file Download diff file Expand all files Collapse all files

29
examples/grammars/javascript.cc
View file

@ -19,12 +19,13 @@ namespace tree_sitter_examples {
static rule_ptr comma_sep(rule_ptr element) {
return choice({
seq({ element, repeat(seq({ str(","), element })) }),
blank(),
});
blank() });
}
extern const Grammar javascript({
{ "program", repeat(sym("statement")) },
// Statements
{ "statement", choice({
sym("statement_block"),
sym("if_statement"),
@ -33,8 +34,6 @@ namespace tree_sitter_examples {
sym("break_statement"),
sym("var_declaration"),
sym("expression_statement") }) },
// Statements
{ "statement_block", in_braces(err(repeat(sym("statement")))) },
{ "for_statement", seq({
sym("_for"),
@ -53,9 +52,9 @@ namespace tree_sitter_examples {
err(sym("expression")),
str(")"),
sym("statement"),
optional(seq({
optional(prec(1, seq({
sym("_else"),
sym("statement") })) }) },
sym("statement") }))) }) },
{ "switch_statement", seq({
sym("_switch"),
str("("),
@ -84,22 +83,28 @@ namespace tree_sitter_examples {
{ "expression_statement", seq({
err(sym("expression")),
sym("_terminator") }) },
// Expressions
{ "expression", choice({
sym("function_expression"),
sym("function_call"),
sym("property_access"),
sym("assignment"),
sym("ternary"),
sym("literal"),
sym("identifier") }) },
// Expressions
{ "assignment", seq({
{ "ternary", seq({
sym("expression"),
str("?"),
sym("expression"),
str(":"),
sym("expression") }) },
{ "assignment", prec(-1, seq({
choice({
sym("identifier"),
sym("property_access"),
}),
sym("property_access") }),
str("="),
sym("expression") })},
sym("expression") })) },
{ "function_expression", seq({
sym("_function"),
optional(sym("identifier")),