fmt tests; properly define string literals; work on scanner

This commit is contained in:
mhoffm
2021-06-17 19:39:46 +02:00
parent 4801d16825
commit 88401e3bf3
20 changed files with 8036 additions and 5094 deletions

View File

@@ -49,7 +49,43 @@
"required": true,
"types": [
{
"type": "expr_term",
"type": "collection_value",
"named": true
},
{
"type": "expression",
"named": true
},
{
"type": "for_expr",
"named": true
},
{
"type": "function_call",
"named": true
},
{
"type": "get_attr",
"named": true
},
{
"type": "index",
"named": true
},
{
"type": "literal_value",
"named": true
},
{
"type": "splat",
"named": true
},
{
"type": "template_expr",
"named": true
},
{
"type": "variable_expr",
"named": true
}
]
@@ -163,7 +199,7 @@
}
},
{
"type": "expr_term",
"type": "expression",
"named": true,
"fields": {},
"children": {
@@ -175,7 +211,7 @@
"named": true
},
{
"type": "expr_term",
"type": "conditional",
"named": true
},
{
@@ -202,6 +238,10 @@
"type": "literal_value",
"named": true
},
{
"type": "operation",
"named": true
},
{
"type": "splat",
"named": true
@@ -217,29 +257,6 @@
]
}
},
{
"type": "expression",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "conditional",
"named": true
},
{
"type": "expr_term",
"named": true
},
{
"type": "operation",
"named": true
}
]
}
},
{
"type": "for_cond",
"named": true,
@@ -456,6 +473,10 @@
{
"type": "numeric_lit",
"named": true
},
{
"type": "string_lit",
"named": true
}
]
}
@@ -522,12 +543,16 @@
"required": false,
"types": [
{
"type": "escape_sequence",
"type": "template_directive",
"named": true
},
{
"type": "template_interpolation",
"named": true
},
{
"type": "template_literal",
"named": true
}
]
}
@@ -556,16 +581,21 @@
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"multiple": false,
"required": true,
"types": [
{
"type": "escape_sequence",
"type": "template_literal",
"named": true
}
]
}
},
{
"type": "template_directive",
"named": true,
"fields": {}
},
{
"type": "template_expr",
"named": true,
@@ -587,15 +617,24 @@
"fields": {},
"children": {
"multiple": true,
"required": false,
"required": true,
"types": [
{
"type": "escape_sequence",
"type": "expression",
"named": true
},
{
"type": "strip_marker",
"named": true
}
]
}
},
{
"type": "template_literal",
"named": true,
"fields": {}
},
{
"type": "tuple",
"named": true,
@@ -616,11 +655,47 @@
"named": true,
"fields": {},
"children": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
"type": "expr_term",
"type": "collection_value",
"named": true
},
{
"type": "expression",
"named": true
},
{
"type": "for_expr",
"named": true
},
{
"type": "function_call",
"named": true
},
{
"type": "get_attr",
"named": true
},
{
"type": "index",
"named": true
},
{
"type": "literal_value",
"named": true
},
{
"type": "splat",
"named": true
},
{
"type": "template_expr",
"named": true
},
{
"type": "variable_expr",
"named": true
}
]
@@ -649,18 +724,6 @@
"type": "!=",
"named": false
},
{
"type": "\"",
"named": false
},
{
"type": "${",
"named": false
},
{
"type": "${~",
"named": false
},
{
"type": "%",
"named": false
@@ -753,10 +816,6 @@
"type": "ellipsis",
"named": true
},
{
"type": "escape_sequence",
"named": true
},
{
"type": "false",
"named": false
@@ -785,6 +844,10 @@
"type": "numeric_lit",
"named": true
},
{
"type": "strip_marker",
"named": true
},
{
"type": "true",
"named": false
@@ -800,9 +863,5 @@
{
"type": "}",
"named": false
},
{
"type": "~}",
"named": false
}
]