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

Compare commits

base: ambroisie:295e3956a394de1700798b86be3cbd4ea985f2dd
Branches Tags
ambroisie:main
ambroisie:playground-wip
ambroisie:v0.7.0
ambroisie:v0.6.0
ambroisie:v0.5.0
ambroisie:v0.4.0
ambroisie:v0.3.0
ambroisie:v0.2.0
ambroisie:v0.1.0
...
compare: ambroisie:e4653b25350ef7f3808401ac1dab00cc3ec4c6cb
Branches Tags
ambroisie:main
ambroisie:playground-wip
ambroisie:v0.7.0
ambroisie:v0.6.0
ambroisie:v0.5.0
ambroisie:v0.4.0
ambroisie:v0.3.0
ambroisie:v0.2.0
ambroisie:v0.1.0

6 commits
295e3956a3 ... e4653b2535

Author SHA1 Message Date
Bruno BELANYI
e4653b2535 WIP
All checks were successful
ci/woodpecker/push/check Pipeline was successful
Details
2024-04-09 13:12:10 +01:00
Bruno BELANYI
4727086526 WIP: Merge 'select_case' and 'default_case' 
Not sure whether I like this change or not... IMO this might be too lax.
 2024-04-09 13:11:53 +01:00
Bruno BELANYI
41d50aca38 Alias 'default_case' to 'select_case' 
There's not much use in the node being a different name.
 2024-04-09 13:09:48 +01:00
Bruno BELANYI
5082de5c7f Add 'default' alias 
This makes it appear in the tree as a named node.
 2024-04-09 13:08:02 +01:00
Bruno BELANYI
e711defc41 Hide 'select_cases' rule 
It doesn't provide any more information to expose it.
 2024-04-09 12:49:36 +01:00
Bruno BELANYI
ba2022d3c8 Add builtins highlighting
All checks were successful
ci/woodpecker/push/check Pipeline was successful
Details
2024-04-09 12:28:28 +01:00
7 changed files with 1009 additions and 1276 deletions
Download patch file Download diff file Expand all files Collapse all files

22
grammar.js
View file

@ -2,10 +2,6 @@ function commaSeparated(elem) {
return seq(elem, repeat(seq(",", elem)), optional(",")) return seq(elem, repeat(seq(",", elem)), optional(","))
} }
function trailingCommaSeparated(elem) {
return repeat(seq(elem, ","))
}
module.exports = grammar({ module.exports = grammar({
name: "blueprint", name: "blueprint",
@ -123,10 +119,11 @@ module.exports = grammar({
"(", "(",
choice($.select_value, $.soong_config_variable), choice($.select_value, $.soong_config_variable),
",", ",",
$.select_cases, $._select_cases,
")", ")",
), ),
// FIXME: simplify with 'soong_config_variable'?
select_value: ($) => seq( select_value: ($) => seq(
field("type", alias( field("type", alias(
choice("product_variable", "release_variable", "variant"), choice("product_variable", "release_variable", "variant"),
@ -137,6 +134,7 @@ module.exports = grammar({
")", ")",
), ),
// FIXME
soong_config_variable: ($) => seq( soong_config_variable: ($) => seq(
field("type", alias("soong_config_variable", $.selection_type)), field("type", alias("soong_config_variable", $.selection_type)),
"(", "(",
@ -151,26 +149,18 @@ module.exports = grammar({
")", ")",
), ),
select_cases: ($) => seq( _select_cases: ($) => seq(
"{", "{",
optional(trailingCommaSeparated($.select_case)), optional(repeat(seq($.select_case, ","))),
// default *must* be the last one, enforced at parse-time...
optional(seq($.default_case, ",")),
"}", "}",
), ),
select_case: ($) => seq( select_case: ($) => seq(
field("pattern", $._string_literal), field("pattern", choice(alias("default", $.default), $._string_literal)),
":", ":",
field("value", $._case_value) field("value", $._case_value)
), ),
default_case: ($) => seq(
field("pattern", "default"),
":",
field("value", $._case_value),
),
_case_value: ($) => choice( _case_value: ($) => choice(
alias("unset", $.unset), alias("unset", $.unset),
$._expr, $._expr,

8
queries/highlights.scm
View file

@ -49,6 +49,14 @@
field: (identifier) @variable.member)) field: (identifier) @variable.member))
; }}} ; }}}
; Built-ins {{{
[
(unset)
(default)
] @variable.builtin
(selection_type) @function.builtin
; }}}
; Expressions {{{ ; Expressions {{{
(map_expression (map_expression
(property (property

68
src/grammar.json generated
View file

@ -482,7 +482,7 @@
}, },
{ {
"type": "SYMBOL", "type": "SYMBOL",
"name": "select_cases" "name": "_select_cases"
}, },
{ {
"type": "STRING", "type": "STRING",
@ -592,7 +592,7 @@
} }
] ]
}, },
"select_cases": { "_select_cases": {
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
@ -623,27 +623,6 @@
} }
] ]
}, },
{
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "default_case"
},
{
"type": "STRING",
"value": ","
}
]
},
{
"type": "BLANK"
}
]
},
{ {
"type": "STRING", "type": "STRING",
"value": "}" "value": "}"
@ -657,33 +636,22 @@
"type": "FIELD", "type": "FIELD",
"name": "pattern", "name": "pattern",
"content": { "content": {
"type": "SYMBOL", "type": "CHOICE",
"name": "_string_literal" "members": [
} {
}, "type": "ALIAS",
{ "content": {
"type": "STRING", "type": "STRING",
"value": ":" "value": "default"
}, },
{ "named": true,
"type": "FIELD", "value": "default"
"name": "value", },
"content": { {
"type": "SYMBOL", "type": "SYMBOL",
"name": "_case_value" "name": "_string_literal"
} }
} ]
]
},
"default_case": {
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "pattern",
"content": {
"type": "STRING",
"value": "default"
} }
}, },
{ {

89
src/node-types.json generated
View file

@ -177,68 +177,6 @@
"named": true, "named": true,
"fields": {} "fields": {}
}, },
{
"type": "default_case",
"named": true,
"fields": {
"pattern": {
"multiple": false,
"required": true,
"types": [
{
"type": "default",
"named": false
}
]
},
"value": {
"multiple": false,
"required": true,
"types": [
{
"type": "binary_expression",
"named": true
},
{
"type": "boolean_literal",
"named": true
},
{
"type": "identifier",
"named": true
},
{
"type": "integer_literal",
"named": true
},
{
"type": "interpreted_string_literal",
"named": true
},
{
"type": "list_expression",
"named": true
},
{
"type": "map_expression",
"named": true
},
{
"type": "raw_string_literal",
"named": true
},
{
"type": "select_expression",
"named": true
},
{
"type": "unset",
"named": true
}
]
}
}
},
{ {
"type": "integer_literal", "type": "integer_literal",
"named": true, "named": true,
@ -420,6 +358,10 @@
"multiple": false, "multiple": false,
"required": true, "required": true,
"types": [ "types": [
{
"type": "default",
"named": true
},
{ {
"type": "interpreted_string_literal", "type": "interpreted_string_literal",
"named": true "named": true
@ -478,25 +420,6 @@
} }
} }
}, },
{
"type": "select_cases",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "default_case",
"named": true
},
{
"type": "select_case",
"named": true
}
]
}
},
{ {
"type": "select_expression", "type": "select_expression",
"named": true, "named": true,
@ -506,7 +429,7 @@
"required": true, "required": true,
"types": [ "types": [
{ {
"type": "select_cases", "type": "select_case",
"named": true "named": true
}, },
{ {
@ -673,7 +596,7 @@
}, },
{ {
"type": "default", "type": "default",
"named": false "named": true
}, },
{ {
"type": "escape_sequence", "type": "escape_sequence",

1985
src/parser.c generated
View file

File diff suppressed because it is too large Load diff

99
test/corpus/select.txt
View file

@ -17,12 +17,12 @@ foo = select(release_variable("RELEASE_TEST"), {
(select_value (select_value
(selection_type) (selection_type)
(interpreted_string_literal)) (interpreted_string_literal))
(select_cases (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal))
(interpreted_string_literal)) (select_case
(default_case (default)
(unset)))))) (unset)))))
================================================================================ ================================================================================
Select (soong config variable) Select (soong config variable)
@ -44,13 +44,12 @@ foo = select(soong_config_variable("my_namespace", "my_var"), {
(selection_type) (selection_type)
(interpreted_string_literal) (interpreted_string_literal)
(interpreted_string_literal)) (interpreted_string_literal))
(select_cases (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (unset))
(unset)) (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal)))))
(interpreted_string_literal))))))
================================================================================ ================================================================================
Select (no default) Select (no default)
@ -73,19 +72,18 @@ foo = select(variant("arch"), {
(select_value (select_value
(selection_type) (selection_type)
(interpreted_string_literal)) (interpreted_string_literal))
(select_cases (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal))
(interpreted_string_literal)) (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal))
(interpreted_string_literal)) (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal))
(interpreted_string_literal)) (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal)))))
(interpreted_string_literal))))))
================================================================================ ================================================================================
Select (no values) Select (no values)
@ -102,8 +100,7 @@ foo = select(variant("VARIANT"), {})
(select_expression (select_expression
(select_value (select_value
(selection_type) (selection_type)
(interpreted_string_literal)) (interpreted_string_literal)))))
(select_cases))))
================================================================================ ================================================================================
Select (default in wrong order) Select (default in wrong order)
@ -127,22 +124,21 @@ foo = select(variant("VARIANT"), {
(select_value (select_value
(selection_type) (selection_type)
(interpreted_string_literal)) (interpreted_string_literal))
(select_cases (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal))
(interpreted_string_literal)) (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal))
(interpreted_string_literal)) (select_case
(ERROR (default)
(default_case (unset))
(unset))) (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal))
(interpreted_string_literal)) (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (interpreted_string_literal)))))
(interpreted_string_literal))))))
================================================================================ ================================================================================
Select (no condition) Select (no condition)
@ -163,12 +159,12 @@ foo = select(variant(), {
(select_value (select_value
(selection_type) (selection_type)
(MISSING raw_string_literal)) (MISSING raw_string_literal))
(select_cases (select_case
(select_case (interpreted_string_literal)
(interpreted_string_literal) (unset))
(unset)) (select_case
(default_case (default)
(interpreted_string_literal)))))) (interpreted_string_literal)))))
================================================================================ ================================================================================
Select (invalid type) Select (invalid type)
@ -189,7 +185,8 @@ foo = select(some_unknown_type("CONDITION"), {
(identifier) (identifier)
(identifier) (identifier)
(interpreted_string_literal) (interpreted_string_literal)
(interpreted_string_literal)) (interpreted_string_literal)
(default))
(interpreted_string_literal)) (interpreted_string_literal))
(ERROR)) (ERROR))

14
test/highlight/builtins.bp Normal file
View file

@ -0,0 +1,14 @@
foo = select(soong_config_variable("my_namespace", "my_var"), {
// ^ function.builtin
"foo": unset,
// ^ variable.builtin
default: select(variant("VARIANT") {}),
// <- variable.builtin
// ^ function.builtin
})
/* Assigning to builtins is conveniently not allowed at runtime */
unset = 12
// <- variable.builtin
default = 27
// <- variable.builtin