From 13ba35e26f43263af2eb13e36384797d1c16f5cd Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sat, 27 Sep 2014 16:10:30 -0700 Subject: [PATCH] Fix indentation in fixture grammars --- spec/fixtures/grammars/arithmetic.cc | 16 ++-- spec/fixtures/grammars/golang.cc | 74 +++++++++---------- spec/fixtures/grammars/javascript.cc | 106 +++++++++++++-------------- 3 files changed, 97 insertions(+), 99 deletions(-) diff --git a/spec/fixtures/grammars/arithmetic.cc b/spec/fixtures/grammars/arithmetic.cc index 99c7d47b..4508df6e 100644 --- a/spec/fixtures/grammars/arithmetic.cc +++ b/spec/fixtures/grammars/arithmetic.cc @@ -8,14 +8,14 @@ using namespace tree_sitter::rules; extern const Grammar arithmetic = Grammar({ { "expression", choice({ - sym("sum"), - sym("difference"), - sym("product"), - sym("quotient"), - sym("exponent"), - sym("group"), - sym("number"), - sym("variable") }) }, + sym("sum"), + sym("difference"), + sym("product"), + sym("quotient"), + sym("exponent"), + sym("group"), + sym("number"), + sym("variable") }) }, { "sum", infix_op("+", "expression", 1) }, { "difference", infix_op("-", "expression", 1) }, diff --git a/spec/fixtures/grammars/golang.cc b/spec/fixtures/grammars/golang.cc index 4a11fc87..f8bc8f96 100644 --- a/spec/fixtures/grammars/golang.cc +++ b/spec/fixtures/grammars/golang.cc @@ -14,22 +14,22 @@ static rule_ptr terminated(rule_ptr rule) { extern const Grammar golang = Grammar({ { "program", seq({ - sym("package_directive"), - repeat(sym("imports_block")), - repeat(sym("declaration")) }) }, + sym("package_directive"), + repeat(sym("imports_block")), + repeat(sym("declaration")) }) }, { "package_directive", seq({ - keyword("package"), - sym("package_name") }) }, + keyword("package"), + sym("package_name") }) }, { "imports_block", seq({ - keyword("import"), - choice({ - in_parens(err(repeat(sym("package_import")))), - sym("package_import") }) }) }, + keyword("import"), + choice({ + in_parens(err(repeat(sym("package_import")))), + sym("package_import") }) }) }, { "package_import", sym("string") }, { "declaration", choice({ - sym("type_declaration"), - sym("var_declaration"), - sym("func_declaration") }) }, + sym("type_declaration"), + sym("var_declaration"), + sym("func_declaration") }) }, // Declarations { "type_declaration", terminated(seq({ @@ -37,19 +37,19 @@ extern const Grammar golang = Grammar({ sym("type_name"), sym("type_expression") })) }, { "var_declaration", terminated(seq({ - keyword("var"), - sym("var_name"), - choice({ + keyword("var"), + sym("var_name"), + choice({ seq({ - optional(sym("type_expression")), - str("="), - sym("expression") }), + optional(sym("type_expression")), + str("="), + sym("expression") }), sym("type_expression") }) })) }, { "func_declaration", terminated(seq({ - keyword("func"), - sym("var_name"), - sym("_func_signature"), - sym("block_statement") })) }, + keyword("func"), + sym("var_name"), + sym("_func_signature"), + sym("block_statement") })) }, { "block_statement", in_braces(err(repeat(sym("statement")))) }, { "type_expression", choice({ sym("pointer_type"), @@ -73,13 +73,13 @@ extern const Grammar golang = Grammar({ { "struct_type", seq({ keyword("struct"), in_braces(repeat(seq({ - sym("var_name"), - sym("type_expression") }))) }) }, + sym("var_name"), + sym("type_expression") }))) }) }, { "interface_type", seq({ keyword("interface"), in_braces(repeat(seq({ - sym("var_name"), - sym("_func_signature") }))) }) }, + sym("var_name"), + sym("_func_signature") }))) }) }, // Statements { "statement", choice({ @@ -89,8 +89,8 @@ extern const Grammar golang = Grammar({ sym("range_statement"), sym("if_statement") }) }, { "return_statement", terminated(seq({ - keyword("return"), - comma_sep(sym("expression")) })) }, + keyword("return"), + comma_sep(sym("expression")) })) }, { "declaration_statement", choice({ sym("var_declaration"), terminated(seq({ @@ -112,8 +112,8 @@ extern const Grammar golang = Grammar({ optional(seq({ keyword("else"), choice({ - sym("if_statement"), - sym("block_statement") }) })) }) }, + sym("if_statement"), + sym("block_statement") }) })) }) }, { "expression_statement", terminated(sym("expression")) }, // Value expressions @@ -148,14 +148,14 @@ extern const Grammar golang = Grammar({ prefix_op("!", "expression", 4) }) }, { "_func_signature", seq({ in_parens(comma_sep(seq({ - comma_sep1(sym("var_name")), - sym("type_expression") }))), + comma_sep1(sym("var_name")), + sym("type_expression") }))), choice({ - in_parens(choice({ - comma_sep1(seq({ sym("var_name"), sym("type_name") })), - comma_sep1(sym("type_name")) })), - sym("type_name"), - blank() }) }) }, + in_parens(choice({ + comma_sep1(seq({ sym("var_name"), sym("type_name") })), + comma_sep1(sym("type_name")) })), + sym("type_name"), + blank() }) }) }, { "_line_break", str("\n") }, diff --git a/spec/fixtures/grammars/javascript.cc b/spec/fixtures/grammars/javascript.cc index cd25f547..f7f46a58 100644 --- a/spec/fixtures/grammars/javascript.cc +++ b/spec/fixtures/grammars/javascript.cc @@ -17,47 +17,47 @@ extern const Grammar javascript = Grammar({ // Statements { "statement", choice({ - sym("statement_block"), - sym("if_statement"), - sym("try_statement"), - sym("switch_statement"), - sym("while_statement"), - sym("for_statement"), - sym("for_in_statement"), - sym("break_statement"), - sym("var_declaration"), - sym("throw_statement"), - sym("return_statement"), - sym("delete_statement"), - sym("expression_statement") }) }, + sym("statement_block"), + sym("if_statement"), + sym("try_statement"), + sym("switch_statement"), + sym("while_statement"), + sym("for_statement"), + sym("for_in_statement"), + sym("break_statement"), + sym("var_declaration"), + sym("throw_statement"), + sym("return_statement"), + sym("delete_statement"), + sym("expression_statement") }) }, { "statement_block", in_braces(err(repeat(sym("statement")))) }, { "for_statement", seq({ - keyword("for"), - in_parens(err(seq({ + keyword("for"), + in_parens(err(seq({ choice({ - sym("var_declaration"), - sym("expression_statement") }), + sym("var_declaration"), + sym("expression_statement") }), sym("expression_statement"), - sym("expression") }))), - sym("statement") }) }, + sym("expression") }))), + sym("statement") }) }, { "for_in_statement", seq({ keyword("for"), in_parens(err(seq({ - optional(keyword("var")), - sym("identifier"), - keyword("in"), - sym("expression") }))), + optional(keyword("var")), + sym("identifier"), + keyword("in"), + sym("expression") }))), sym("statement") }) }, { "throw_statement", terminated(seq({ - keyword("throw"), - sym("expression") })) }, + keyword("throw"), + sym("expression") })) }, { "if_statement", seq({ keyword("if"), in_parens(err(sym("expression"))), sym("statement"), optional(prec(1, seq({ - keyword("else"), - sym("statement") }))) }) }, + keyword("else"), + sym("statement") }))) }) }, { "while_statement", seq({ keyword("while"), in_parens(err(sym("expression"))), @@ -80,27 +80,27 @@ extern const Grammar javascript = Grammar({ in_braces(repeat(sym("switch_case"))) }) }, { "switch_case", seq({ choice({ - seq({ - keyword("case"), - sym("expression") }), - keyword("default") }), + seq({ + keyword("case"), + sym("expression") }), + keyword("default") }), str(":"), repeat(sym("statement")) }) }, { "break_statement", terminated(keyword("break")) }, { "var_declaration", terminated(seq({ - keyword("var"), - comma_sep(err(seq({ - sym("identifier"), - optional(seq({ - str("="), - sym("expression") })) }))) })) }, + keyword("var"), + comma_sep(err(seq({ + sym("identifier"), + optional(seq({ + str("="), + sym("expression") })) }))) })) }, { "expression_statement", terminated(err(sym("expression"))) }, { "return_statement", terminated(seq({ - keyword("return"), - optional(sym("expression")) })) }, + keyword("return"), + optional(sym("expression")) })) }, { "delete_statement", terminated(seq({ - keyword("delete"), - sym("property_access") })) }, + keyword("delete"), + sym("property_access") })) }, // Expressions { "expression", choice({ @@ -161,16 +161,16 @@ extern const Grammar javascript = Grammar({ str(":"), sym("expression") }) }, { "assignment", prec(-1, seq({ - choice({ + choice({ sym("identifier"), sym("property_access") }), - choice({ + choice({ str("="), str("+="), str("-="), str("*="), str("/=") }), - sym("expression") })) }, + sym("expression") })) }, { "function_expression", seq({ keyword("function"), optional(sym("identifier")), @@ -185,28 +185,26 @@ extern const Grammar javascript = Grammar({ { "property_access", seq({ sym("expression"), prec(10, choice({ - seq({ - str("."), - sym("identifier") }), + seq({ str("."), sym("identifier") }), in_brackets(sym("expression")) })) }) }, { "formal_parameters", in_parens(comma_sep(sym("identifier"))) }, // Literals { "comment", token(choice({ - seq({ + seq({ str("/*"), repeat(pattern("[^*]|(*[^/])")), str("*/") }), - pattern("//[^\n]*") })) }, + pattern("//[^\n]*") })) }, { "object", in_braces(comma_sep(err(seq({ - choice({ sym("string"), sym("identifier") }), - str(":"), - sym("expression") })))) }, + choice({ sym("string"), sym("identifier") }), + str(":"), + sym("expression") })))) }, { "array", in_brackets(comma_sep(err(sym("expression")))) }, { "regex", token(seq({ delimited("/"), optional(str("g")) })) }, { "string", token(choice({ - delimited("\""), - delimited("'") })) }, + delimited("\""), + delimited("'") })) }, { "_line_break", str("\n") }, { "identifier", pattern("[\\a_$][\\w_$]*") }, { "number", pattern("\\d+(\\.\\d+)?") },