Skip to content

Commit 3b9ceda

Browse files
seidewitzseidewitz
committed
ST6RI-894 Updated KerML Xpect scoping tests for new redef scoping rules.
1 parent dc186f1 commit 3b9ceda

16 files changed

Lines changed: 250 additions & 256 deletions

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance3_Rdef.kerml.xt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,40 @@ package test{
2727
feature C subsets B{
2828
//XPECT linkedName at b --> test.B.b
2929
//* XPECT scope at b ---
30-
A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
31-
A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
32-
B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c2,
33-
C.c2.aa, C.c2.aa.self, C.c2.aa.that, C.c2.aa.that.self, C.c2.self, C.c2.that,
34-
C.c2.that.self, C.self, C.that, C.that.self, D, D.d, D.d.self, D.d.that, D.d.that.self, D.self,
35-
D.that, D.that.self, b, b.aa, b.aa.self, b.aa.that, b.aa.that.self, b.self, b.that,
36-
b.that.self, self, test.A, test.A.a, test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that,
37-
test.A.a.aa.that.self, test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.self, test.A.that,
38-
test.A.that.self, test.B, test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that,
39-
test.B.b.aa.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that,
40-
test.B.that.self, test.C, test.C.c2, test.C.c2.aa, test.C.c2.aa.self, test.C.c2.aa.that,
41-
test.C.c2.aa.that.self, test.C.c2.self, test.C.c2.that, test.C.c2.that.self, test.C.self, test.C.that,
42-
test.C.that.self, test.D, test.D.d, test.D.d.self, test.D.d.that, test.D.d.that.self,
43-
test.D.self, test.D.that, test.D.that.self, that, that.self
30+
A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
31+
A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
32+
B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.b, C.b.aa,
33+
C.b.aa.self, C.b.aa.that, C.b.aa.that.self, C.b.self, C.b.that, C.b.that.self, C.self,
34+
C.that, C.that.self, D, D.d, D.d.self, D.d.that, D.d.that.self, D.self, D.that,
35+
D.that.self, b, b.aa, b.aa.self, b.aa.that, b.aa.that.self, b.self, b.that, b.that.self,
36+
self, test.A, test.A.a, test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that,
37+
test.A.a.aa.that.self, test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.self, test.A.that,
38+
test.A.that.self, test.B, test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that,
39+
test.B.b.aa.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that,
40+
test.B.that.self, test.C, test.C.b, test.C.b.aa, test.C.b.aa.self, test.C.b.aa.that,
41+
test.C.b.aa.that.self, test.C.b.self, test.C.b.that, test.C.b.that.self, test.C.self, test.C.that,
42+
test.C.that.self, test.D, test.D.d, test.D.d.self, test.D.d.that, test.D.d.that.self,
43+
test.D.self, test.D.that, test.D.that.self, that, that.self
4444
--- */
4545
feature c2 redefines b {}
4646
}
4747
feature D subsets C.c2{
4848
//XPECT linkedName at aa --> test.A.a.aa
4949
//* XPECT scope at aa ---
50-
A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
51-
A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
52-
B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c2,
53-
C.c2.aa, C.c2.aa.self, C.c2.aa.that, C.c2.aa.that.self, C.c2.self, C.c2.that,
54-
C.c2.that.self, C.self, C.that, C.that.self, D, D.d, D.d.self, D.d.that, D.d.that.self, D.self,
55-
D.that, D.that.self, aa, aa.self, aa.that, aa.that.self, self, test.A, test.A.a,
56-
test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that, test.A.a.aa.that.self, test.A.a.self,
57-
test.A.a.that, test.A.a.that.self, test.A.self, test.A.that, test.A.that.self, test.B,
58-
test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that, test.B.b.aa.that.self,
59-
test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that, test.B.that.self,
60-
test.C, test.C.c2, test.C.c2.aa, test.C.c2.aa.self, test.C.c2.aa.that,
61-
test.C.c2.aa.that.self, test.C.c2.self, test.C.c2.that, test.C.c2.that.self, test.C.self, test.C.that,
62-
test.C.that.self, test.D, test.D.d, test.D.d.self, test.D.d.that, test.D.d.that.self,
63-
test.D.self, test.D.that, test.D.that.self, that, that.self
50+
A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
51+
A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
52+
B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c2,
53+
C.c2.aa, C.c2.aa.self, C.c2.aa.that, C.c2.aa.that.self, C.c2.self, C.c2.that,
54+
C.c2.that.self, C.self, C.that, C.that.self, D, D.aa, D.aa.self, D.aa.that, D.aa.that.self,
55+
D.self, D.that, D.that.self, aa, aa.self, aa.that, aa.that.self, self, test.A,
56+
test.A.a, test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that, test.A.a.aa.that.self,
57+
test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.self, test.A.that, test.A.that.self,
58+
test.B, test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that,
59+
test.B.b.aa.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that,
60+
test.B.that.self, test.C, test.C.c2, test.C.c2.aa, test.C.c2.aa.self, test.C.c2.aa.that,
61+
test.C.c2.aa.that.self, test.C.c2.self, test.C.c2.that, test.C.c2.that.self, test.C.self, test.C.that,
62+
test.C.that.self, test.D, test.D.aa, test.D.aa.self, test.D.aa.that, test.D.aa.that.self,
63+
test.D.self, test.D.that, test.D.that.self, that, that.self
6464
--- */
6565
feature d redefines aa {}
6666
}

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance_Rdef.kerml.xt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ package test{
4747
--- */
4848
feature C subsets B{
4949
//* XPECT scope at b ---
50-
A, A.a, A.a.self, A.a.that, A.a.that.self, A.self, A.that, A.that.self, B, B.b,
51-
B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c, C.c.self,
52-
C.c.that, C.c.that.self, C.self, C.that, C.that.self, D, D.self, D.that, D.that.self, b,
53-
b.self, b.that, b.that.self, self, test.A, test.A.a, test.A.a.self, test.A.a.that,
54-
test.A.a.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.self,
55-
test.B.b.that, test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.C,
56-
test.C.c, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self, test.C.that,
57-
test.C.that.self, test.D, test.D.self, test.D.that, test.D.that.self, that, that.self
50+
A, A.a, A.a.self, A.a.that, A.a.that.self, A.self, A.that, A.that.self, B, B.b,
51+
B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.b, C.b.self,
52+
C.b.that, C.b.that.self, C.self, C.that, C.that.self, D, D.self, D.that, D.that.self, b,
53+
b.self, b.that, b.that.self, self, test.A, test.A.a, test.A.a.self, test.A.a.that,
54+
test.A.a.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.self,
55+
test.B.b.that, test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.C,
56+
test.C.b, test.C.b.self, test.C.b.that, test.C.b.that.self, test.C.self, test.C.that,
57+
test.C.that.self, test.D, test.D.self, test.D.that, test.D.that.self, that, that.self
5858
--- */
5959
feature c redefines b {}
6060
}

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberForPrivate_Rdef.kerml.xt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ package test {
2020
private alias k for something;
2121
feature hello {
2222
//* XPECT scope at k ---
23-
hello, hello.self, hello.test, hello.test.self, hello.test.that,
24-
hello.test.that.self, hello.that, hello.that.self, k, k.self, k.that, k.that.self, self, something,
25-
something.self, something.that, something.that.self, test.hello, test.hello.self,
26-
test.hello.test, test.hello.test.self, test.hello.test.that, test.hello.test.that.self,
27-
test.hello.that, test.hello.that.self, that, that.self
23+
hello, hello.self, hello.that, hello.that.self, k, k.self, k.that, k.that.self,
24+
self, something, something.self, something.that, something.that.self, test.hello,
25+
test.hello.self, test.hello.that, test.hello.that.self, that, that.self
2826
--- */
2927
//XPECT linkedName at k --> test.something
3028
feature test redefines k{}

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberFromInheritance2_Rdef.kerml.xt‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,20 @@ package test{
3838
//XPECT linkedName at AA --> test.A
3939
feature B subsets AA{
4040
//* XPECT scope at aa ---
41-
A, A.a, A.a.self, A.a.that, A.a.that.self, A.aa, A.aa.self, A.aa.that,
42-
A.aa.that.self, A.self, A.that, A.that.self, AA, AA.a, AA.a.self, AA.a.that, AA.a.that.self,
43-
AA.aa, AA.aa.self, AA.aa.that, AA.aa.that.self, AA.self, AA.that, AA.that.self, B,
44-
B.b, B.b.self, B.b.that, B.b.that.self, B.b_alias, B.b_alias.self, B.b_alias.that,
45-
B.b_alias.that.self, B.self, B.that, B.that.self, a, a.self, a.that, a.that.self, aa, aa.self,
46-
aa.that, aa.that.self, self, test.A, test.A.a, test.A.a.self, test.A.a.that,
47-
test.A.a.that.self, test.A.aa, test.A.aa.self, test.A.aa.that, test.A.aa.that.self, test.A.self,
48-
test.A.that, test.A.that.self, test.AA, test.AA.a, test.AA.a.self, test.AA.a.that,
49-
test.AA.a.that.self, test.AA.aa, test.AA.aa.self, test.AA.aa.that, test.AA.aa.that.self,
50-
test.AA.self, test.AA.that, test.AA.that.self, test.B, test.B.b, test.B.b.self,
51-
test.B.b.that, test.B.b.that.self, test.B.b_alias, test.B.b_alias.self, test.B.b_alias.that,
52-
test.B.b_alias.that.self, test.B.self, test.B.that, test.B.that.self, that, that.self
41+
A, A.a, A.a.self, A.a.that, A.a.that.self, A.aa, A.aa.self, A.aa.that,
42+
A.aa.that.self, A.self, A.that, A.that.self, AA, AA.a, AA.a.self, AA.a.that, AA.a.that.self,
43+
AA.aa, AA.aa.self, AA.aa.that, AA.aa.that.self, AA.self, AA.that, AA.that.self, B,
44+
B.a, B.a.self, B.a.that, B.a.that.self, B.aa, B.aa.self, B.aa.that, B.aa.that.self,
45+
B.b_alias, B.b_alias.self, B.b_alias.that, B.b_alias.that.self, B.self, B.that,
46+
B.that.self, a, a.self, a.that, a.that.self, aa, aa.self, aa.that, aa.that.self, self,
47+
test.A, test.A.a, test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.aa,
48+
test.A.aa.self, test.A.aa.that, test.A.aa.that.self, test.A.self, test.A.that,
49+
test.A.that.self, test.AA, test.AA.a, test.AA.a.self, test.AA.a.that, test.AA.a.that.self,
50+
test.AA.aa, test.AA.aa.self, test.AA.aa.that, test.AA.aa.that.self, test.AA.self,
51+
test.AA.that, test.AA.that.self, test.B, test.B.a, test.B.a.self, test.B.a.that,
52+
test.B.a.that.self, test.B.aa, test.B.aa.self, test.B.aa.that, test.B.aa.that.self, test.B.b_alias,
53+
test.B.b_alias.self, test.B.b_alias.that, test.B.b_alias.that.self, test.B.self, test.B.that,
54+
test.B.that.self, that, that.self
5355
--- */
5456
//XPECT linkedName at aa --> test.A.a
5557
feature b redefines aa;

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassMoreTimes_Rdef.kerml.xt‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,38 @@ package test{
6060
feature EE subsets D {
6161
//XPECT linkedName at D::f --> OuterPackage3.D.f
6262
//* XPECT scope at D::f ---
63-
D, D.c, D.c.self, D.c.that, D.c.that.self, D.f, D.f.a1, D.f.a1.self,
64-
D.f.a1.that, D.f.a1.that.self, D.f.self, D.f.that, D.f.that.self, D.self, D.that,
65-
D.that.self, EE, EE.c, EE.c.self, EE.c.that, EE.c.that.self, EE.self, EE.that, EE.that.self,
66-
EE.try, EE.try.a1, EE.try.a1.self, EE.try.a1.that, EE.try.a1.that.self, EE.try.self,
67-
EE.try.that, EE.try.that.self, OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self,
68-
OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that,
69-
OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1,
70-
OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self,
71-
OuterPackage.B.b.that, OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that,
72-
OuterPackage.B.that.self, OuterPackage2.B, OuterPackage2.B.b, OuterPackage2.B.b.a1,
73-
OuterPackage2.B.b.a1.self, OuterPackage2.B.b.a1.that, OuterPackage2.B.b.a1.that.self,
74-
OuterPackage2.B.b.self, OuterPackage2.B.b.that, OuterPackage2.B.b.that.self, OuterPackage2.B.self,
75-
OuterPackage2.B.that, OuterPackage2.B.that.self, OuterPackage2.C, OuterPackage2.C.b,
76-
OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self, OuterPackage2.C.b.a1.that,
77-
OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that, OuterPackage2.C.b.that.self,
78-
OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that, OuterPackage2.C.c.that.self,
79-
OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, OuterPackage3.C,
80-
OuterPackage3.C.b, OuterPackage3.C.b.a1, OuterPackage3.C.b.a1.self, OuterPackage3.C.b.a1.that,
81-
OuterPackage3.C.b.a1.that.self, OuterPackage3.C.b.self, OuterPackage3.C.b.that, OuterPackage3.C.b.that.self,
82-
OuterPackage3.C.c, OuterPackage3.C.c.self, OuterPackage3.C.c.that, OuterPackage3.C.c.that.self,
83-
OuterPackage3.C.self, OuterPackage3.C.that, OuterPackage3.C.that.self, OuterPackage3.D,
84-
OuterPackage3.D.c, OuterPackage3.D.c.self, OuterPackage3.D.c.that, OuterPackage3.D.c.that.self,
85-
OuterPackage3.D.f, OuterPackage3.D.f.a1, OuterPackage3.D.f.a1.self, OuterPackage3.D.f.a1.that,
86-
OuterPackage3.D.f.a1.that.self, OuterPackage3.D.f.self, OuterPackage3.D.f.that, OuterPackage3.D.f.that.self,
87-
OuterPackage3.D.self, OuterPackage3.D.that, OuterPackage3.D.that.self, c, c.self, c.that,
88-
c.that.self, f, f.a1, f.a1.self, f.a1.that, f.a1.that.self, f.self, f.that, f.that.self,
89-
self, test.D, test.D.c, test.D.c.self, test.D.c.that, test.D.c.that.self, test.D.f,
90-
test.D.f.a1, test.D.f.a1.self, test.D.f.a1.that, test.D.f.a1.that.self, test.D.f.self,
91-
test.D.f.that, test.D.f.that.self, test.D.self, test.D.that, test.D.that.self, test.EE,
92-
test.EE.c, test.EE.c.self, test.EE.c.that, test.EE.c.that.self, test.EE.self,
93-
test.EE.that, test.EE.that.self, test.EE.try, test.EE.try.a1, test.EE.try.a1.self,
94-
test.EE.try.a1.that, test.EE.try.a1.that.self, test.EE.try.self, test.EE.try.that,
95-
test.EE.try.that.self, that, that.self
63+
D, D.c, D.c.self, D.c.that, D.c.that.self, D.f, D.f.a1, D.f.a1.self,
64+
D.f.a1.that, D.f.a1.that.self, D.f.self, D.f.that, D.f.that.self, D.self, D.that,
65+
D.that.self, EE, EE.c, EE.c.self, EE.c.that, EE.c.that.self, EE.f, EE.f.a1, EE.f.a1.self,
66+
EE.f.a1.that, EE.f.a1.that.self, EE.f.self, EE.f.that, EE.f.that.self, EE.self, EE.that,
67+
EE.that.self, OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self,
68+
OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that,
69+
OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1,
70+
OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self,
71+
OuterPackage.B.b.that, OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that,
72+
OuterPackage.B.that.self, OuterPackage2.B, OuterPackage2.B.b, OuterPackage2.B.b.a1,
73+
OuterPackage2.B.b.a1.self, OuterPackage2.B.b.a1.that, OuterPackage2.B.b.a1.that.self,
74+
OuterPackage2.B.b.self, OuterPackage2.B.b.that, OuterPackage2.B.b.that.self, OuterPackage2.B.self,
75+
OuterPackage2.B.that, OuterPackage2.B.that.self, OuterPackage2.C, OuterPackage2.C.b,
76+
OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self, OuterPackage2.C.b.a1.that,
77+
OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that, OuterPackage2.C.b.that.self,
78+
OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that, OuterPackage2.C.c.that.self,
79+
OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, OuterPackage3.C,
80+
OuterPackage3.C.b, OuterPackage3.C.b.a1, OuterPackage3.C.b.a1.self, OuterPackage3.C.b.a1.that,
81+
OuterPackage3.C.b.a1.that.self, OuterPackage3.C.b.self, OuterPackage3.C.b.that, OuterPackage3.C.b.that.self,
82+
OuterPackage3.C.c, OuterPackage3.C.c.self, OuterPackage3.C.c.that, OuterPackage3.C.c.that.self,
83+
OuterPackage3.C.self, OuterPackage3.C.that, OuterPackage3.C.that.self, OuterPackage3.D,
84+
OuterPackage3.D.c, OuterPackage3.D.c.self, OuterPackage3.D.c.that, OuterPackage3.D.c.that.self,
85+
OuterPackage3.D.f, OuterPackage3.D.f.a1, OuterPackage3.D.f.a1.self, OuterPackage3.D.f.a1.that,
86+
OuterPackage3.D.f.a1.that.self, OuterPackage3.D.f.self, OuterPackage3.D.f.that, OuterPackage3.D.f.that.self,
87+
OuterPackage3.D.self, OuterPackage3.D.that, OuterPackage3.D.that.self, c, c.self, c.that,
88+
c.that.self, f, f.a1, f.a1.self, f.a1.that, f.a1.that.self, f.self, f.that, f.that.self,
89+
self, test.D, test.D.c, test.D.c.self, test.D.c.that, test.D.c.that.self, test.D.f,
90+
test.D.f.a1, test.D.f.a1.self, test.D.f.a1.that, test.D.f.a1.that.self, test.D.f.self,
91+
test.D.f.that, test.D.f.that.self, test.D.self, test.D.that, test.D.that.self, test.EE,
92+
test.EE.c, test.EE.c.self, test.EE.c.that, test.EE.c.that.self, test.EE.f, test.EE.f.a1,
93+
test.EE.f.a1.self, test.EE.f.a1.that, test.EE.f.a1.that.self, test.EE.f.self, test.EE.f.that,
94+
test.EE.f.that.self, test.EE.self, test.EE.that, test.EE.that.self, that, that.self
9695
--- */
9796
feature try redefines D::f;
9897
}

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassWithAlias_Rdef.kerml.xt‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,16 @@ package test{
2323
//XPECT linkedName at aliass --> OuterPackage.A
2424
feature C {
2525
//* XPECT scope at aliass---
26-
C, C.c, C.c.a1, C.c.a1.self, C.c.a1.that, C.c.a1.that.self, C.c.self, C.c.that,
27-
C.c.that.self, C.self, C.that, C.that.self, OuterPackage.A, OuterPackage.A.a1,
28-
OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self,
29-
OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b,
30-
OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
31-
OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
32-
OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, aliass, aliass.a1,
33-
aliass.a1.self, aliass.a1.that, aliass.a1.that.self, aliass.self, aliass.that,
34-
aliass.that.self, self, test.C, test.C.c, test.C.c.a1, test.C.c.a1.self, test.C.c.a1.that,
35-
test.C.c.a1.that.self, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self, test.C.that,
36-
test.C.that.self, test.aliass, test.aliass.a1, test.aliass.a1.self, test.aliass.a1.that,
37-
test.aliass.a1.that.self, test.aliass.self, test.aliass.that, test.aliass.that.self, that, that.self
26+
C, C.self, C.that, C.that.self, OuterPackage.A, OuterPackage.A.a1,
27+
OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self,
28+
OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b,
29+
OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
30+
OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
31+
OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, aliass, aliass.a1,
32+
aliass.a1.self, aliass.a1.that, aliass.a1.that.self, aliass.self, aliass.that,
33+
aliass.that.self, self, test.C, test.C.self, test.C.that, test.C.that.self, test.aliass,
34+
test.aliass.a1, test.aliass.a1.self, test.aliass.a1.that, test.aliass.a1.that.self,
35+
test.aliass.self, test.aliass.that, test.aliass.that.self, that, that.self
3836
--- */
3937
feature c redefines aliass;
4038
}

0 commit comments

Comments
 (0)