Skip to content

Commit

Permalink
Merge branch 'issue_1301' into 'master'
Browse files Browse the repository at this point in the history
Unparsing: add GenericPackageInstantion and GenericSubInstantiation configs

Closes #1301

See merge request eng/libadalang/libadalang!1570
  • Loading branch information
joaopsazevedo committed Mar 7, 2024
2 parents cf71a9d + a74ea0e commit 027d9b8
Show file tree
Hide file tree
Showing 38 changed files with 2,380 additions and 95 deletions.
257 changes: 227 additions & 30 deletions extensions/default_unparsing_config.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"id": 14,
"id": 22,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "innerRoot"
},
"alignContents": {
"id": 13,
"id": 21,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -16,13 +16,13 @@
"n": 2
},
"alignContents": {
"id": 12,
"id": 20,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 11,
"id": 19,
"kind": "list",
"list": [
{
Expand All @@ -46,15 +46,13 @@
"text": "("
},
{
"id": 9,
"id": 17,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "innerRoot"
},
"alignContents": {
"id": 8,
"command": "group",
"id": 0,
"groupContents": {
"id": 16,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -63,47 +61,113 @@
"n": 2
},
"alignContents": {
"id": 7,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 6,
"kind": "list",
"list": [
{
"id": 3,
"kind": "text",
"text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar"
"id": 15,
"kind": "list",
"list": [
{
"id": 14,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "innerRoot"
},
{
"id": 4,
"alignContents": {
"id": 13,
"kind": "command",
"command": {
"command": "line",
"literal": false,
"soft": false,
"hard": false
"command": "align",
"alignData": {
"kind": "width",
"n": 2
},
"alignContents": {
"id": 12,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 11,
"kind": "list",
"list": [
{
"id": 3,
"kind": "text",
"text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar"
},
{
"id": 4,
"kind": "command",
"command": {
"command": "line",
"literal": false,
"soft": false,
"hard": false
}
},
{
"id": 5,
"kind": "text",
"text": "("
},
{
"id": 9,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 8,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "width",
"n": 2
},
"alignContents": {
"id": 7,
"kind": "list",
"list": [
{
"id": 6,
"kind": "text",
"text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz"
}
]
}
}
},
"break": false,
"expandedStates": null
}
},
{
"id": 10,
"kind": "text",
"text": ")"
}
]
},
"break": false,
"expandedStates": null
}
}
}
},
{
"id": 5,
"kind": "text",
"text": "(Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz)"
}
]
},
"break": false,
"expandedStates": null
}
}
}
]
}
}
}
},
"break": false,
"expandedStates": null
}
},
{
"id": 10,
"id": 18,
"kind": "text",
"text": ")"
}
Expand Down
47 changes: 42 additions & 5 deletions testsuite/tests/unparsing/call_expr/long_name/doc-baseline.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"id": 6,
"id": 11,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "innerRoot"
},
"alignContents": {
"id": 5,
"id": 10,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -16,13 +16,13 @@
"n": 2
},
"alignContents": {
"id": 4,
"id": 9,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 3,
"id": 8,
"kind": "list",
"list": [
{
Expand All @@ -43,7 +43,44 @@
{
"id": 2,
"kind": "text",
"text": "(Bar)"
"text": "("
},
{
"id": 6,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 5,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "width",
"n": 2
},
"alignContents": {
"id": 4,
"kind": "list",
"list": [
{
"id": 3,
"kind": "text",
"text": "Bar"
}
]
}
}
},
"break": false,
"expandedStates": null
}
},
{
"id": 7,
"kind": "text",
"text": ")"
}
]
},
Expand Down
47 changes: 42 additions & 5 deletions testsuite/tests/unparsing/call_expr/long_suffix/doc-baseline.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"id": 6,
"id": 11,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "innerRoot"
},
"alignContents": {
"id": 5,
"id": 10,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -16,13 +16,13 @@
"n": 2
},
"alignContents": {
"id": 4,
"id": 9,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 3,
"id": 8,
"kind": "list",
"list": [
{
Expand All @@ -43,7 +43,44 @@
{
"id": 2,
"kind": "text",
"text": "(Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar)"
"text": "("
},
{
"id": 6,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 5,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "width",
"n": 2
},
"alignContents": {
"id": 4,
"kind": "list",
"list": [
{
"id": 3,
"kind": "text",
"text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar"
}
]
}
}
},
"break": false,
"expandedStates": null
}
},
{
"id": 7,
"kind": "text",
"text": ")"
}
]
},
Expand Down
Loading

0 comments on commit 027d9b8

Please sign in to comment.