Skip to content

Commit f60a01e

Browse files
authored
Merge pull request #3185 from masatake/ada-minor-fix
Ada: skip whitespace characters between an identifier and ':'
2 parents d38b6c0 + 09a8382 commit f60a01e

File tree

10 files changed

+2198
-2122
lines changed

10 files changed

+2198
-2122
lines changed

Tmain/list-roles.d/stdout-expected.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#
44
#
55
#LANGUAGE KIND(L/N) NAME ENABLED DESCRIPTION
6+
Ada p/package subunit on package name referenced in separate()
67
Asm s/section placement on placement where the assembled code goes
78
AutoIt S/script local on local include
89
AutoIt S/script system on system include
@@ -96,6 +97,7 @@ Vera h/header system on system header
9697
# all.*
9798
#
9899
#LANGUAGE KIND(L/N) NAME ENABLED DESCRIPTION
100+
Ada p/package subunit on package name referenced in separate()
99101
Asm s/section placement on placement where the assembled code goes
100102
AutoIt S/script local on local include
101103
AutoIt S/script system on system include

Units/parser-ada.r/ada-entry.d/expected.tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Input_0 input_0.gpr /^project Input_0 is$/;" P
33
Input_1 input_1.adb /^package body Input_1 is$/;" p
44
Ma_Tasche input_1.adb /^ task body Ma_Tasche is$/;" k package:Input_1 file:
55
Var_Continuer input_1.adb /^ Var_Continuer : Boolean := False;$/;" v task:Ma_Tasche file:
6+
Boucle_Principale input_1.adb /^ Boucle_Principale :$/;" i task:Ma_Tasche file:
7+
Accepter input_1.adb /^ accept Accepter$/;" e identifier:Boucle_Principale file:
68
Mon_Autre_Tasche input_1.adb /^ task body Mon_Autre_Tasche is$/;" k package:Input_1 file:
79
Une_Autre_Tasche_1 input_1.adb /^ Une_Autre_Tasche_1 : Tasche_Type_1_T;$/;" v package:Input_1 file:
810
Tasche_Type_1_T input_1.adb /^ task body Tasche_Type_1_T is$/;" k package:Input_1 file:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--sort=no
2+
--extras=+r
3+
--fields=+r
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Buffer input.adb /^separate (Buffer);$/;" p roles:subunit
2+
Test input.adb /^package body Test is$/;" p package:Buffer roles:def
3+
Parent input-1.adb /^package body Parent is$/;" p roles:def
4+
Variable input-1.adb /^ Variable : String := "Hello, there.";$/;" v package:Parent file: roles:def
5+
Parent input-1.adb /^separate(Parent)$/;" p roles:subunit
6+
Inner input-1.adb /^procedure Inner is$/;" r package:Parent roles:def
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- Taken from https://www.adaic.org/resources/add_content/standards/05rm/html/RM-10-1-3.html
2+
package body Parent is
3+
Variable : String := "Hello, there.";
4+
procedure Inner is separate;
5+
end Parent;
6+
7+
with Ada.Text_IO;
8+
separate(Parent)
9+
procedure Inner is
10+
begin
11+
Ada.Text_IO.Put_Line(Variable);
12+
end Inner;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
-- Taken from #2943 submitted by @koenmeersman
2+
with Ada.Text_IO;
3+
4+
separate (Buffer);
5+
6+
package body Test is
7+
procedure Inner is separate;
8+
begin
9+
null;
10+
end Test;
11+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--sort=no
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Go input.adb /^procedure Go is$/;" r
2+
Loop_Label input.adb /^ Loop_Label :$/;" i subprogram:Go file:
3+
Not_Tagged input.adb /^ procedure Not_Tagged is$/;" r anon:declare file:
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
-- Taken from #2933 submitted by @koenmeersman
2+
procedure Go is
3+
begin
4+
Loop_Label :
5+
while True loop
6+
declare
7+
procedure Not_Tagged is
8+
begin
9+
null;
10+
end Step_T;
11+
begin
12+
null;
13+
end;
14+
end loop Loop_Label;
15+
end Go;

0 commit comments

Comments
 (0)