Skip to content

Added missing "aempty" in various places #2864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PaulKlint wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −12
Open

Added missing "aempty" in various places #2864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f72f691
Added missing "aempty" in various places
PaulKlint Aug 20, 2026
b2dcaba
Undo change
PaulKlint Aug 20, 2026
0b27996
Fixed error and factored out predicate (ht @toinehartman)
PaulKlint Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/org/rascalmpl/compiler/lang/rascalcore/check/AType.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ bool asubtype(i:\iter-star-seps(AType s, list[AType] seps), AType b){
fail;
}

bool asubtype(\aempty(),aadt(n, [], dataSyntax())) = n == "Tree";
bool asubtype(\opt(AType _),aadt(n, [], dataSyntax())) = n == "Tree";
bool asubtype(\alt(set[AType] _),aadt(n, [], dataSyntax())) = n == "Tree";
bool asubtype(\seq(list[AType] _),aadt(n, [], dataSyntax())) = n == "Tree";
Expand Down Expand Up @@ -697,10 +698,13 @@ AType alub(\iter-seps(AType l,_), \iter-star-seps(AType r,_)) = aadt("Tree", [],
AType alub(\iter-star-seps(AType l, _), \iter-star-seps(AType r, _)) = aadt("Tree", [], dataSyntax()) when l != r;
AType alub(\iter-star-seps(AType l, _), \iter-seps(AType r, _)) = aadt("Tree", [], dataSyntax()) when l != r;

private bool isSyntaxConstructor(AType l)
= l is \achar-class || l is aempty || l is seq || l is opt || l is alt || l is iter || l is \iter-star || l is \iter-seps || l is \iter-star-seps;

AType alub(l:aadt("Tree", _, _), AType r) = l
when r is \achar-class || r is seq || r is opt || r is alt || r is iter || r is \iter-star || r is \iter-seps || r is \iter-star-seps;
when isSyntaxConstructor(r);
AType alub(AType l, r:aadt("Tree", _, _)) = r
when l is \achar-class || l is seq || l is opt || l is alt || l is iter || l is \iter-star || l is \iter-seps || l is \iter-star-seps;
when isSyntaxConstructor(r);

AType alub(\start(AType l) , AType r) = alub(l, r);
AType alub(AType l, \start(AType r)) = alub(l, r);
Expand Down
15 changes: 5 additions & 10 deletions src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst4.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,9 @@ POSSIBILITY OF SUCH DAMAGE.
}
module lang::rascalcore::compile::Examples::Tst4

int outer1(int t, int tabSize=4){
int rec(int t) = t + tabSize when t > 10;
default int rec(int t) = t;
return rec(t);
}
import ParseTree;

syntax A = "a";
test bool optEmpty() = value _ := parse(#(A?), "");

// int outer2(int t, int tabSize=4){
// int rec(int t, int innerKwp = 5) = t + tabSize + innerKwp when t > 10;
// default int rec(int t) = t;
// return rec(t);
// }
test bool empty() = value _ := parse(#(), "");
Loading