Skip to content

Commit 3be1112

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents 7cc4003 + 5ac1976 commit 3be1112

File tree

8 files changed

+346
-40
lines changed

8 files changed

+346
-40
lines changed

‎testsuite/als_helper/exceptions_package.adb‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
with Exceptions; use Exceptions;
1+
with Exceptions;
2+
with Exceptions_Renamings;
23

34
package body Exceptions_Package is
45

56
procedure Dummy is
67
begin
78
begin
8-
raise Test_Exception;
9+
raise Exceptions.Test_Exception;
910

1011
exception
11-
when Test_Exception =>
12+
when Exceptions.Test_Exception =>
13+
null;
14+
end;
15+
16+
begin
17+
raise Exceptions_Renamings.Renamed_Test_Exception;
18+
19+
exception
20+
when Exceptions_Renamings.Renamed_Test_Exception =>
1221
null;
1322
end;
1423
end Dummy;

‎testsuite/als_helper/exceptions_renamings.adb‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
package body Exceptions_Renamings is
3+
4+
procedure Dummy is
5+
begin
6+
begin
7+
raise Renamed_Test_Exception;
8+
9+
exception
10+
when Renamed_Test_Exception =>
11+
null;
12+
end;
13+
end Dummy;
14+
15+
end Exceptions_Renamings;

‎testsuite/als_helper/exceptions_renamings.ads‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
with Exceptions;
3+
4+
package Exceptions_Renamings is
5+
6+
Renamed_Test_Exception : exception;
7+
-- Description of the renamed exception
8+
9+
private
10+
11+
procedure Dummy;
12+
13+
end Exceptions_Renamings;

‎testsuite/als_helper/locations.json‎

Lines changed: 61 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,44 @@
8787
{"file": "discriminant_record_types_package.adb", "line": 36, "column": 26},
8888
// reference: `Known_Discriminant_Private_Null_Record`
8989

90+
// Exceptions (declarations and renamings)
91+
92+
{"file": "exceptions.ads", "line": 4, "column": 4},
93+
// declaration of the exception
94+
{"file": "exceptions.adb", "line": 7, "column": 16},
95+
// reference of the exception
96+
{"file": "exceptions.adb", "line": 10, "column": 15},
97+
// reference of the exception
98+
{"file": "exceptions_package.adb", "line": 9, "column": 27},
99+
// reference of the exception
100+
{"file": "exceptions_package.adb", "line": 12, "column": 26},
101+
// reference of the exception
102+
103+
{"file": "exceptions_renamings.ads", "line": 6, "column": 4},
104+
// renaming of the exception
105+
{"file": "exceptions_renamings.adb", "line": 7, "column": 16},
106+
// reference of the renamed exception
107+
{"file": "exceptions_renamings.adb", "line": 10, "column": 15},
108+
// reference of the renamed exception
109+
{"file": "exceptions_package.adb", "line": 17, "column": 37},
110+
// reference of the renamed exception
111+
{"file": "exceptions_package.adb", "line": 20, "column": 36},
112+
// reference of the renamed exception
113+
114+
// Objects
115+
90116
{"file": "objects.ads", "line": 4, "column": 4},
91117
// declaration: `Named_Number`
92118
{"file": "objects.adb", "line": 7, "column": 30},
93119
// reference: `Named_Number`
94-
{"file": "objects_package.adb", "line": 8, "column": 30},
120+
{"file": "objects_package.adb", "line": 10, "column": 38},
95121
// reference: `Named_Number`
96122

97123
{"file": "objects.ads", "line": 7, "column": 4},
98124
// declaration `Public_Constant`
99125
{"file": "objects.adb", "line": 14, "column": 30},
100126
// reference `Public_Constant`
101-
{"file": "objects_package.adb", "line": 15, "column": 30},
127+
{"file": "objects_package.adb", "line": 17, "column": 38},
102128
// reference `Public_Constant`
103129

104130
{"file": "objects.ads", "line": 10, "column": 4},
@@ -107,29 +133,50 @@
107133
// declaration `Private_Constant`
108134
{"file": "objects.adb", "line": 21, "column": 30},
109135
// reference `Private_Constant`
110-
{"file": "objects_package.adb", "line": 22, "column": 30},
136+
{"file": "objects_package.adb", "line": 24, "column": 38},
111137
// reference `Private_Constant`
112138

113139
{"file": "objects.ads", "line": 13, "column": 4},
114-
// declaration of the object
140+
// declaration of the object `Private_Constant`
115141
{"file": "objects.adb", "line": 28, "column": 30},
116-
// reference of the object
117-
{"file": "objects_package.adb", "line": 29, "column": 30},
118-
// reference of the object
142+
// reference of the object `Private_Constant`
143+
{"file": "objects_package.adb", "line": 31, "column": 38},
144+
// reference of the object `Private_Constant`
119145

120146
{"file": "objects.ads", "line": 16, "column": 4},
121147
// declaration of the object with default value
122148
{"file": "objects.adb", "line": 35, "column": 30},
123149
// reference of the object with default value
124-
{"file": "objects_package.adb", "line": 36, "column": 30},
150+
{"file": "objects_package.adb", "line": 38, "column": 38},
125151
// reference of the object with default value
126152

127-
{"file": "exceptions.ads", "line": 4, "column": 4},
128-
// declaration of the exception
129-
{"file": "exceptions.adb", "line": 7, "column": 16},
130-
// reference of the exception
131-
{"file": "exceptions_package.adb", "line": 8, "column": 16},
132-
// reference of the exception
153+
{"file": "objects_renamings.ads", "line": 6, "column": 4},
154+
// declaration of `Renamed_Named_Number`
155+
{"file": "objects_renamings.adb", "line": 7, "column": 25},
156+
// reference of `Renamed_Named_Number`
157+
{"file": "objects_package.adb", "line": 47, "column": 43},
158+
// reference of `Renamed_Named_Number`
159+
160+
{"file": "objects_renamings.ads", "line": 9, "column": 4},
161+
// declaration of `Renamed_Public_Constant`
162+
{"file": "objects_renamings.adb", "line": 14, "column": 25},
163+
// reference of `Renamed_Public_Constant`
164+
{"file": "objects_package.adb", "line": 54, "column": 43},
165+
// reference of `Renamed_Public_Constant`
166+
167+
{"file": "objects_renamings.ads", "line": 12, "column": 4},
168+
// declaration of `Renamed_Private_Constant`
169+
{"file": "objects_renamings.adb", "line": 21, "column": 25},
170+
// reference of `Renamed_Private_Constant`
171+
{"file": "objects_package.adb", "line": 61, "column": 43},
172+
// reference of `Renamed_Private_Constant`
173+
174+
{"file": "objects_renamings.ads", "line": 15, "column": 4},
175+
// declaration of `Renamed_Value`
176+
{"file": "objects_renamings.adb", "line": 28, "column": 25},
177+
// reference of `Renamed_Value`
178+
{"file": "objects_package.adb", "line": 68, "column": 43},
179+
// reference of `Renamed_Value`
133180

134181
// LAL 20250922: issue with package name resolution in the body doesn't allow to write test
135182
// {"file": "packages.ads", "line": 5, "column": 9},

‎testsuite/als_helper/objects_package.adb‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,71 @@
1-
with Objects; use Objects;
1+
2+
with Objects;
3+
with Objects_Renamings;
24

35
package body Objects_Package is
46

57
procedure Dummy is
68
begin
79
declare
8-
Object : Integer := Named_Number;
10+
Object : Integer := Objects.Named_Number;
11+
12+
begin
13+
null;
14+
end;
15+
16+
declare
17+
Object : Integer := Objects.Public_Constant;
18+
19+
begin
20+
null;
21+
end;
22+
23+
declare
24+
Object : Integer := Objects.Private_Constant;
925

1026
begin
1127
null;
1228
end;
1329

1430
declare
15-
Object : Integer := Public_Constant;
31+
Object : Integer := Objects.Value;
32+
33+
begin
34+
null;
35+
end;
36+
37+
declare
38+
Object : Integer := Objects.Value_Default;
39+
40+
begin
41+
null;
42+
end;
43+
44+
-- Renamings
45+
46+
declare
47+
V : Integer := Objects_Renamings.Renamed_Named_Number;
1648

1749
begin
1850
null;
1951
end;
2052

2153
declare
22-
Object : Integer := Private_Constant;
54+
V : Integer := Objects_Renamings.Renamed_Public_Constant;
2355

2456
begin
2557
null;
2658
end;
2759

2860
declare
29-
Object : Integer := Value;
61+
V : Integer := Objects_Renamings.Renamed_Private_Constant;
3062

3163
begin
3264
null;
3365
end;
3466

3567
declare
36-
Object : Integer := Value_Default;
68+
V : Integer := Objects_Renamings.Renamed_Value;
3769

3870
begin
3971
null;

‎testsuite/als_helper/objects_renamings.adb‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
2+
package body Objects_Renamings is
3+
4+
procedure Dummy is
5+
begin
6+
declare
7+
V : Integer := Renamed_Named_Number;
8+
9+
begin
10+
null;
11+
end;
12+
13+
declare
14+
V : Integer := Renamed_Public_Constant;
15+
16+
begin
17+
null;
18+
end;
19+
20+
declare
21+
V : Integer := Renamed_Private_Constant;
22+
23+
begin
24+
null;
25+
end;
26+
27+
declare
28+
V : Integer := Renamed_Value;
29+
30+
begin
31+
null;
32+
end;
33+
end Dummy;
34+
35+
end Objects_Renamings;

‎testsuite/als_helper/objects_renamings.ads‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
with Objects;
3+
4+
package Objects_Renamings is
5+
6+
Renamed_Named_Number : constant := Objects.Named_Number;
7+
-- Description of the renamed named number
8+
9+
Renamed_Public_Constant : Integer renames Objects.Public_Constant;
10+
-- Description of the renamed `Public_Constant`
11+
12+
Renamed_Private_Constant : Integer renames Objects.Private_Constant;
13+
-- Description of the renamed `Private_Constant`
14+
15+
Renamed_Value : Integer renames Objects.Value;
16+
-- Description of the renamed object
17+
18+
private
19+
20+
procedure Dummy;
21+
22+
end Objects_Renamings;

0 commit comments

Comments
 (0)