Skip to content

Commit

Permalink
Merge branch 'issue_1304' into 'master'
Browse files Browse the repository at this point in the history 
Unparsing: add config for ExprFunction

Closes #1304

See merge request eng/libadalang/libadalang!1572
  • Loading branch information
@joaopsazevedo
joaopsazevedo committed Mar 12, 2024
2 parents c28cca8 + 00546ee commit f1455bd
Show file tree
Hide file tree
Showing 58 changed files with 11,464 additions and 8,323 deletions.
237 changes: 137 additions & 100 deletions extensions/default_unparsing_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,33 +57,13 @@
"kind": "group",
"document": [
{
"kind": "group",
"document": [
"line",
{
"kind": "text",
"text": "with"
}
],
"id": "with_keyword"
"kind": "text",
"text": "with"
},
{
"kind": "ifBreak",
"breakContents": {
"kind": "align",
"width": 2,
"contents": {
"kind": "group",
"document": [
"line",
{
"kind": "recurse_field",
"field": "f_aspect_assocs"
}
]
}
},
"flatContents": {
"kind": "align",
"width": 2,
"contents": {
"kind": "group",
"document": [
"line",
Expand All @@ -92,8 +72,7 @@
"field": "f_aspect_assocs"
}
]
},
"groupId": "with_keyword"
}
}
]
}
Expand Down Expand Up @@ -511,12 +490,8 @@
"field": "f_default_expr"
},
{
"kind": "align",
"width": 2,
"contents": {
"kind": "recurse_field",
"field": "f_aspects"
}
"kind": "recurse_field",
"field": "f_aspects"
},
{
"kind": "text",
Expand All @@ -526,6 +501,10 @@
}
},
"fields": {
"f_aspects": [
"hardline",
"recurse"
],
"f_default_expr": [
"whitespace",
"recurse"
Expand Down Expand Up @@ -823,6 +802,63 @@
]
}
},
"ExprFunction": {
"node": {
"kind": "group",
"document": [
{
"kind": "recurse_field",
"field": "f_overriding"
},
{
"kind": "group",
"document": [
{
"kind": "group",
"document": [
{
"kind": "recurse_field",
"field": "f_subp_spec"
},
"line",
{
"kind": "group",
"document": [
{
"kind": "text",
"text": "is"
},
"whitespace",
{
"kind": "indent",
"contents": {
"kind": "recurse_field",
"field": "f_expr"
}
}
]
}
]
},
{
"kind": "recurse_field",
"field": "f_aspects"
},
{
"kind": "text",
"text": ";"
}
]
}
]
},
"fields": {
"f_aspects": [
"hardline",
"recurse"
]
}
},
"ElsifExprPartList": {
"sep": [
"recurse",
Expand Down Expand Up @@ -1547,34 +1583,22 @@
"kind": "group",
"document": [
{
"kind": "group",
"document": {
"kind": "group",
"document": [
{
"kind": "text",
"text": "package"
},
"whitespace",
{
"kind": "text",
"text": "body"
},
"whitespace",
{
"kind": "recurse_field",
"field": "f_package_name"
},
{
"kind": "align",
"width": 2,
"contents": {
"kind": "recurse_field",
"field": "f_aspects"
}
}
]
}
"kind": "text",
"text": "package"
},
"whitespace",
{
"kind": "text",
"text": "body"
},
"whitespace",
{
"kind": "recurse_field",
"field": "f_package_name"
},
{
"kind": "recurse_field",
"field": "f_aspects"
},
"line",
{
Expand Down Expand Up @@ -1612,6 +1636,14 @@
}
],
"fields": {
"f_aspects": {
"kind": "align",
"width": 2,
"contents": [
"hardline",
"recurse"
]
},
"f_stmts": [
{
"kind": "indent",
Expand All @@ -1630,29 +1662,17 @@
"kind": "group",
"document": [
{
"kind": "group",
"document": {
"kind": "group",
"document": [
{
"kind": "text",
"text": "package"
},
"whitespace",
{
"kind": "recurse_field",
"field": "f_package_name"
},
{
"kind": "align",
"width": 2,
"contents": {
"kind": "recurse_field",
"field": "f_aspects"
}
}
]
}
"kind": "text",
"text": "package"
},
"whitespace",
{
"kind": "recurse_field",
"field": "f_package_name"
},
{
"kind": "recurse_field",
"field": "f_aspects"
},
"line",
{
Expand Down Expand Up @@ -1690,6 +1710,16 @@
}
],
"fields": {
"f_aspects": [
{
"kind": "align",
"width": 2,
"contents": [
"hardline",
"recurse"
]
}
],
"f_private_part": [
{
"kind": "indent",
Expand Down Expand Up @@ -2109,12 +2139,8 @@
"field": "f_subp_spec"
},
{
"kind": "align",
"width": 2,
"contents": {
"kind": "recurse_field",
"field": "f_aspects"
}
"kind": "recurse_field",
"field": "f_aspects"
},
"hardlineWithoutBreakParent",
{
Expand Down Expand Up @@ -2155,6 +2181,10 @@
]
},
"fields": {
"f_aspects": [
"hardline",
"recurse"
],
"f_decls": [
{
"kind": "indent",
Expand All @@ -2176,22 +2206,29 @@
"field": "f_overriding"
},
{
"kind": "recurse_field",
"field": "f_subp_spec"
},
{
"kind": "align",
"width": 2,
"contents": {
"kind": "recurse_field",
"field": "f_aspects"
}
"kind": "group",
"document": [
{
"kind": "recurse_field",
"field": "f_subp_spec"
},
{
"kind": "recurse_field",
"field": "f_aspects"
}
]
},
{
"kind": "text",
"text": ";"
}
]
},
"fields": {
"f_aspects": [
"hardline",
"recurse"
]
}
},
"SubpSpec": {
Expand Down
Loading

0 comments on commit f1455bd

Please sign in to comment.