Skip to content

Commit 9bfd421

Browse files
committed
Testcases of objects (constants and variables) renamings.
1 parent 6fe31de commit 9bfd421

File tree

5 files changed

+220
-19
lines changed

5 files changed

+220
-19
lines changed

testsuite/als_helper/locations.json

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@
9191
// declaration: `Named_Number`
9292
{"file": "objects.adb", "line": 7, "column": 30},
9393
// reference: `Named_Number`
94-
{"file": "objects_package.adb", "line": 8, "column": 30},
94+
{"file": "objects_package.adb", "line": 10, "column": 38},
9595
// reference: `Named_Number`
9696

9797
{"file": "objects.ads", "line": 7, "column": 4},
9898
// declaration `Public_Constant`
9999
{"file": "objects.adb", "line": 14, "column": 30},
100100
// reference `Public_Constant`
101-
{"file": "objects_package.adb", "line": 15, "column": 30},
101+
{"file": "objects_package.adb", "line": 17, "column": 38},
102102
// reference `Public_Constant`
103103

104104
{"file": "objects.ads", "line": 10, "column": 4},
@@ -107,23 +107,51 @@
107107
// declaration `Private_Constant`
108108
{"file": "objects.adb", "line": 21, "column": 30},
109109
// reference `Private_Constant`
110-
{"file": "objects_package.adb", "line": 22, "column": 30},
110+
{"file": "objects_package.adb", "line": 24, "column": 38},
111111
// reference `Private_Constant`
112112

113113
{"file": "objects.ads", "line": 13, "column": 4},
114-
// declaration of the object
114+
// declaration of the object `Private_Constant`
115115
{"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
116+
// reference of the object `Private_Constant`
117+
{"file": "objects_package.adb", "line": 31, "column": 38},
118+
// reference of the object `Private_Constant`
119119

120120
{"file": "objects.ads", "line": 16, "column": 4},
121121
// declaration of the object with default value
122122
{"file": "objects.adb", "line": 35, "column": 30},
123123
// reference of the object with default value
124-
{"file": "objects_package.adb", "line": 36, "column": 30},
124+
{"file": "objects_package.adb", "line": 38, "column": 38},
125125
// reference of the object with default value
126126

127+
{"file": "objects_renamings.ads", "line": 6, "column": 4},
128+
// declaration of `Renamed_Named_Number`
129+
{"file": "objects_renamings.adb", "line": 7, "column": 25},
130+
// reference of `Renamed_Named_Number`
131+
{"file": "objects_package.adb", "line": 47, "column": 43},
132+
// reference of `Renamed_Named_Number`
133+
134+
{"file": "objects_renamings.ads", "line": 9, "column": 4},
135+
// declaration of `Renamed_Public_Constant`
136+
{"file": "objects_renamings.adb", "line": 14, "column": 25},
137+
// reference of `Renamed_Public_Constant`
138+
{"file": "objects_package.adb", "line": 54, "column": 43},
139+
// reference of `Renamed_Public_Constant`
140+
141+
{"file": "objects_renamings.ads", "line": 12, "column": 4},
142+
// declaration of `Renamed_Private_Constant`
143+
{"file": "objects_renamings.adb", "line": 21, "column": 25},
144+
// reference of `Renamed_Private_Constant`
145+
{"file": "objects_package.adb", "line": 61, "column": 43},
146+
// reference of `Renamed_Private_Constant`
147+
148+
{"file": "objects_renamings.ads", "line": 15, "column": 4},
149+
// declaration of `Renamed_Value`
150+
{"file": "objects_renamings.adb", "line": 28, "column": 25},
151+
// reference of `Renamed_Value`
152+
{"file": "objects_package.adb", "line": 68, "column": 43},
153+
// reference of `Renamed_Value`
154+
127155
{"file": "exceptions.ads", "line": 4, "column": 4},
128156
// declaration of the exception
129157
{"file": "exceptions.adb", "line": 7, "column": 16},

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;
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;
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;

testsuite/als_helper/test.out

Lines changed: 89 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ Named_Number : constant := 2;
517517
Description of the named number
518518
----- DONE -----
519519
Defining name: <DefiningName "Named_Number" objects.ads:4:4-4:16>
520-
Origin: <Id "Named_Number" objects_package.adb:8:30-8:42>
520+
Origin: <Id "Named_Number" objects_package.adb:10:38-10:50>
521521
----- CODE SNIPPET -----
522522
Named_Number : constant := 2;
523523
----- DOCUMENTATION -----
@@ -538,7 +538,7 @@ Public_Constant : constant Integer := 3;
538538
Description of the `Public_Constant`
539539
----- DONE -----
540540
Defining name: <DefiningName "Public_Constant" objects.ads:7:4-7:19>
541-
Origin: <Id "Public_Constant" objects_package.adb:15:30-15:45>
541+
Origin: <Id "Public_Constant" objects_package.adb:17:38-17:53>
542542
----- CODE SNIPPET -----
543543
Public_Constant : constant Integer := 3;
544544
----- DOCUMENTATION -----
@@ -574,7 +574,7 @@ Public description of the `Private_Constant`
574574
Private description of the `Private_Constant`
575575
----- DONE -----
576576
Defining name: <DefiningName "Private_Constant" objects.ads:10:4-10:20>
577-
Origin: <Id "Private_Constant" objects_package.adb:22:30-22:46>
577+
Origin: <Id "Private_Constant" objects_package.adb:24:38-24:54>
578578
----- CODE SNIPPET -----
579579
Private_Constant : constant Integer;
580580
----- DOCUMENTATION -----
@@ -595,7 +595,7 @@ Value : Integer;
595595
Description of the object
596596
----- DONE -----
597597
Defining name: <DefiningName "Value" objects.ads:13:4-13:9>
598-
Origin: <Id "Value" objects_package.adb:29:30-29:35>
598+
Origin: <Id "Value" objects_package.adb:31:38-31:43>
599599
----- CODE SNIPPET -----
600600
Value : Integer;
601601
----- DOCUMENTATION -----
@@ -616,12 +616,96 @@ Value_Default : Integer := 1;
616616
Description of the object with default value
617617
----- DONE -----
618618
Defining name: <DefiningName "Value_Default" objects.ads:16:4-16:17>
619-
Origin: <Id "Value_Default" objects_package.adb:36:30-36:43>
619+
Origin: <Id "Value_Default" objects_package.adb:38:38-38:51>
620620
----- CODE SNIPPET -----
621621
Value_Default : Integer := 1;
622622
----- DOCUMENTATION -----
623623
Description of the object with default value
624624
----- DONE -----
625+
Defining name: <DefiningName "Renamed_Named_Number" objects_renamings.ads:6:4-6:24>
626+
Origin: <Id "Renamed_Named_Number" objects_renamings.ads:6:4-6:24>
627+
----- CODE SNIPPET -----
628+
Renamed_Named_Number : constant := Objects.Named_Number;
629+
----- DOCUMENTATION -----
630+
Description of the renamed named number
631+
----- DONE -----
632+
Defining name: <DefiningName "Renamed_Named_Number" objects_renamings.ads:6:4-6:24>
633+
Origin: <Id "Renamed_Named_Number" objects_renamings.adb:7:25-7:45>
634+
----- CODE SNIPPET -----
635+
Renamed_Named_Number : constant := Objects.Named_Number;
636+
----- DOCUMENTATION -----
637+
Description of the renamed named number
638+
----- DONE -----
639+
Defining name: <DefiningName "Renamed_Named_Number" objects_renamings.ads:6:4-6:24>
640+
Origin: <Id "Renamed_Named_Number" objects_package.adb:47:43-47:63>
641+
----- CODE SNIPPET -----
642+
Renamed_Named_Number : constant := Objects.Named_Number;
643+
----- DOCUMENTATION -----
644+
Description of the renamed named number
645+
----- DONE -----
646+
Defining name: <DefiningName "Renamed_Public_Constant" objects_renamings.ads:9:4-9:27>
647+
Origin: <Id "Renamed_Public_Constant" objects_renamings.ads:9:4-9:27>
648+
----- CODE SNIPPET -----
649+
Renamed_Public_Constant : Integer renames Objects.Public_Constant;
650+
----- DOCUMENTATION -----
651+
Description of the renamed `Public_Constant`
652+
----- DONE -----
653+
Defining name: <DefiningName "Renamed_Public_Constant" objects_renamings.ads:9:4-9:27>
654+
Origin: <Id "Renamed_Public_Constant" objects_renamings.adb:14:25-14:48>
655+
----- CODE SNIPPET -----
656+
Renamed_Public_Constant : Integer renames Objects.Public_Constant;
657+
----- DOCUMENTATION -----
658+
Description of the renamed `Public_Constant`
659+
----- DONE -----
660+
Defining name: <DefiningName "Renamed_Public_Constant" objects_renamings.ads:9:4-9:27>
661+
Origin: <Id "Renamed_Public_Constant" objects_package.adb:54:43-54:66>
662+
----- CODE SNIPPET -----
663+
Renamed_Public_Constant : Integer renames Objects.Public_Constant;
664+
----- DOCUMENTATION -----
665+
Description of the renamed `Public_Constant`
666+
----- DONE -----
667+
Defining name: <DefiningName "Renamed_Private_Constant" objects_renamings.ads:12:4-12:28>
668+
Origin: <Id "Renamed_Private_Constant" objects_renamings.ads:12:4-12:28>
669+
----- CODE SNIPPET -----
670+
Renamed_Private_Constant : Integer renames Objects.Private_Constant;
671+
----- DOCUMENTATION -----
672+
Description of the renamed `Private_Constant`
673+
----- DONE -----
674+
Defining name: <DefiningName "Renamed_Private_Constant" objects_renamings.ads:12:4-12:28>
675+
Origin: <Id "Renamed_Private_Constant" objects_renamings.adb:21:25-21:49>
676+
----- CODE SNIPPET -----
677+
Renamed_Private_Constant : Integer renames Objects.Private_Constant;
678+
----- DOCUMENTATION -----
679+
Description of the renamed `Private_Constant`
680+
----- DONE -----
681+
Defining name: <DefiningName "Renamed_Private_Constant" objects_renamings.ads:12:4-12:28>
682+
Origin: <Id "Renamed_Private_Constant" objects_package.adb:61:43-61:67>
683+
----- CODE SNIPPET -----
684+
Renamed_Private_Constant : Integer renames Objects.Private_Constant;
685+
----- DOCUMENTATION -----
686+
Description of the renamed `Private_Constant`
687+
----- DONE -----
688+
Defining name: <DefiningName "Renamed_Value" objects_renamings.ads:15:4-15:17>
689+
Origin: <Id "Renamed_Value" objects_renamings.ads:15:4-15:17>
690+
----- CODE SNIPPET -----
691+
Renamed_Value : Integer renames Objects.Value;
692+
----- DOCUMENTATION -----
693+
Description of the renamed object
694+
----- DONE -----
695+
Defining name: <DefiningName "Renamed_Value" objects_renamings.ads:15:4-15:17>
696+
Origin: <Id "Renamed_Value" objects_renamings.adb:28:25-28:38>
697+
----- CODE SNIPPET -----
698+
Renamed_Value : Integer renames Objects.Value;
699+
----- DOCUMENTATION -----
700+
Description of the renamed object
701+
----- DONE -----
702+
Defining name: <DefiningName "Renamed_Value" objects_renamings.ads:15:4-15:17>
703+
Origin: <Id "Renamed_Value" objects_package.adb:68:43-68:56>
704+
----- CODE SNIPPET -----
705+
Renamed_Value : Integer renames Objects.Value;
706+
----- DOCUMENTATION -----
707+
Description of the renamed object
708+
----- DONE -----
625709
Defining name: <DefiningName "Test_Exception" exceptions.ads:4:4-4:18>
626710
Origin: <Id "Test_Exception" exceptions.ads:4:4-4:18>
627711
----- CODE SNIPPET -----

0 commit comments

Comments
 (0)