shadowfacts
/
tree-sitter-elixir
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add field names to quoted delimiters

This commit is contained in:
Jonatan Kłosko 2021-09-29 11:54:52 +02:00
parent e35f31122f
commit 3cf73a2529
4 changed files with 310471 additions and 269573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grammar.js
View File

@ -877,7 +877,7 @@ function defineQuoted(start, end, name) {
return { return {
[`_quoted_i_${name}`]: ($) => [`_quoted_i_${name}`]: ($) =>
seq( seq(
start, field("quoted_start", start),
repeat( repeat(
choice( choice(
alias($[`_quoted_content_i_${name}`], $.quoted_content), alias($[`_quoted_content_i_${name}`], $.quoted_content),
@ -885,12 +885,12 @@ function defineQuoted(start, end, name) {
$.escape_sequence $.escape_sequence
) )
), ),
end field("quoted_end", end)
), ),
[`_quoted_${name}`]: ($) => [`_quoted_${name}`]: ($) =>
seq( seq(
start, field("quoted_start", start),
repeat( repeat(
choice( choice(
alias($[`_quoted_content_${name}`], $.quoted_content), alias($[`_quoted_content_${name}`], $.quoted_content),
@ -898,7 +898,7 @@ function defineQuoted(start, end, name) {
$.escape_sequence $.escape_sequence
) )
), ),
end field("quoted_end", end)
), ),
}; };
} }

320
src/grammar.json
View File

@ -1073,8 +1073,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "\"" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "\""
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1102,8 +1106,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "\"" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "\""
}
} }
] ]
}, },
@ -1111,8 +1119,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "\"" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "\""
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1136,8 +1148,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "\"" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "\""
}
} }
] ]
}, },
@ -1145,8 +1161,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "'" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "'"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1174,8 +1194,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "'" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "'"
}
} }
] ]
}, },
@ -1183,8 +1207,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "'" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "'"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1208,8 +1236,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "'" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "'"
}
} }
] ]
}, },
@ -1217,8 +1249,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "'''" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "'''"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1246,8 +1282,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "'''" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "'''"
}
} }
] ]
}, },
@ -1255,8 +1295,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "'''" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "'''"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1280,8 +1324,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "'''" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "'''"
}
} }
] ]
}, },
@ -1289,8 +1337,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "\"\"\"" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "\"\"\""
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1318,8 +1370,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "\"\"\"" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "\"\"\""
}
} }
] ]
}, },
@ -1327,8 +1383,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "\"\"\"" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "\"\"\""
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1352,8 +1412,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "\"\"\"" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "\"\"\""
}
} }
] ]
}, },
@ -1361,8 +1425,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "(" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "("
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1390,8 +1458,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": ")" "name": "quoted_end",
"content": {
"type": "STRING",
"value": ")"
}
} }
] ]
}, },
@ -1399,8 +1471,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "(" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "("
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1424,8 +1500,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": ")" "name": "quoted_end",
"content": {
"type": "STRING",
"value": ")"
}
} }
] ]
}, },
@ -1433,8 +1513,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "{" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "{"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1462,8 +1546,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "}" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "}"
}
} }
] ]
}, },
@ -1471,8 +1559,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "{" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "{"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1496,8 +1588,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "}" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "}"
}
} }
] ]
}, },
@ -1505,8 +1601,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "[" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "["
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1534,8 +1634,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "]" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "]"
}
} }
] ]
}, },
@ -1543,8 +1647,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "[" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "["
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1568,8 +1676,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "]" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "]"
}
} }
] ]
}, },
@ -1577,8 +1689,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "<" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "<"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1606,8 +1722,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": ">" "name": "quoted_end",
"content": {
"type": "STRING",
"value": ">"
}
} }
] ]
}, },
@ -1615,8 +1735,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "<" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "<"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1640,8 +1764,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": ">" "name": "quoted_end",
"content": {
"type": "STRING",
"value": ">"
}
} }
] ]
}, },
@ -1649,8 +1777,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "|" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "|"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1678,8 +1810,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "|" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "|"
}
} }
] ]
}, },
@ -1687,8 +1823,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "|" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "|"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1712,8 +1852,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "|" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "|"
}
} }
] ]
}, },
@ -1721,8 +1865,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "/" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "/"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1750,8 +1898,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "/" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "/"
}
} }
] ]
}, },
@ -1759,8 +1911,12 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": "/" "name": "quoted_start",
"content": {
"type": "STRING",
"value": "/"
}
}, },
{ {
"type": "REPEAT", "type": "REPEAT",
@ -1784,8 +1940,12 @@
} }
}, },
{ {
"type": "STRING", "type": "FIELD",
"value": "/" "name": "quoted_end",
"content": {
"type": "STRING",
"value": "/"
}
} }
] ]
}, },

219
src/node-types.json
View File

@ -1388,7 +1388,36 @@
{ {
"type": "charlist", "type": "charlist",
"named": true, "named": true,
"fields": {}, "fields": {
"quoted_end": {
"multiple": false,
"required": true,
"types": [
{
"type": "'",
"named": false
},
{
"type": "'''",
"named": false
}
]
},
"quoted_start": {
"multiple": false,
"required": true,
"types": [
{
"type": "'",
"named": false
},
{
"type": "'''",
"named": false
}
]
}
},
"children": { "children": {
"multiple": true, "multiple": true,
"required": false, "required": false,
@ -2333,7 +2362,36 @@
{ {
"type": "quoted_atom", "type": "quoted_atom",
"named": true, "named": true,
"fields": {}, "fields": {
"quoted_end": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "'",
"named": false
}
]
},
"quoted_start": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "'",
"named": false
}
]
}
},
"children": { "children": {
"multiple": true, "multiple": true,
"required": false, "required": false,
@ -2356,7 +2414,36 @@
{ {
"type": "quoted_keyword", "type": "quoted_keyword",
"named": true, "named": true,
"fields": {}, "fields": {
"quoted_end": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "'",
"named": false
}
]
},
"quoted_start": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "'",
"named": false
}
]
}
},
"children": { "children": {
"multiple": true, "multiple": true,
"required": false, "required": false,
@ -2494,7 +2581,100 @@
{ {
"type": "sigil", "type": "sigil",
"named": true, "named": true,
"fields": {}, "fields": {
"quoted_end": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "\"\"\"",
"named": false
},
{
"type": "'",
"named": false
},
{
"type": "'''",
"named": false
},
{
"type": ")",
"named": false
},
{
"type": "/",
"named": false
},
{
"type": ">",
"named": false
},
{
"type": "]",
"named": false
},
{
"type": "|",
"named": false
},
{
"type": "}",
"named": false
}
]
},
"quoted_start": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "\"\"\"",
"named": false
},
{
"type": "'",
"named": false
},
{
"type": "'''",
"named": false
},
{
"type": "(",
"named": false
},
{
"type": "/",
"named": false
},
{
"type": "<",
"named": false
},
{
"type": "[",
"named": false
},
{
"type": "{",
"named": false
},
{
"type": "|",
"named": false
}
]
}
},
"children": { "children": {
"multiple": true, "multiple": true,
"required": true, "required": true,
@ -2681,7 +2861,36 @@
{ {
"type": "string", "type": "string",
"named": true, "named": true,
"fields": {}, "fields": {
"quoted_end": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "\"\"\"",
"named": false
}
]
},
"quoted_start": {
"multiple": false,
"required": true,
"types": [
{
"type": "\"",
"named": false
},
{
"type": "\"\"\"",
"named": false
}
]
}
},
"children": { "children": {
"multiple": true, "multiple": true,
"required": false, "required": false,

579497
src/parser.c
View File

File diff suppressed because it is too large Load Diff