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

Refactor string and regex specification in javascript grammar

Browse source
This commit is contained in:
Max Brunsfeld 2014-05-01 12:48:01 -07:00
parent a2c125998e
commit 60e2728acc
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
examples/grammars/javascript.cc
View file

@ -5,6 +5,14 @@ namespace tree_sitter_examples {
using tree_sitter::Grammar;
using namespace tree_sitter::rules;
static rule_ptr delimited(std::string delimiter) {
return seq({
str(delimiter),
pattern("([^" + delimiter + "]|\\\\" + delimiter + ")+"),
str(delimiter)
});
}
extern const Grammar javascript({
{ "program", repeat(sym("statement")) },
@ -158,19 +166,10 @@ namespace tree_sitter_examples {
{ "comment", pattern("//[^\n]*") },
{ "_terminator", pattern("[;\n]") },
{ "regex", token(seq({
str("/"),
pattern("([^/]|\\\\/)+"),
str("/") })) },
{ "regex", token(delimited("/")) },
{ "string", token(choice({
seq({
str("\""),
pattern("([^\"]|\\\\\")+"),
str("\"") }),
seq({
str("'"),
pattern("([^\']|\\\\\')+"),
str("'") }) })) },
delimited("\""),
delimited("'") })) },
{ "identifier", pattern("[\\a_$][\\w_$]*") },
{ "number", pattern("\\d+(\\.\\d+)?") },
});