Skip to content

Commit b6f03f9

Browse files
TurboGitTurboGit
committed
Use Ada 2022 array aggregate syntax.
1 parent 5031898 commit b6f03f9

11 files changed

+166
-165
lines changed

‎src/templates_parser-data.adb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
-- Templates Parser --
33
-- --
4-
-- Copyright (C) 1999-2019, AdaCore --
4+
-- Copyright (C) 1999-2024, AdaCore --
55
-- --
66
-- This library is free software; you can redistribute it and/or modify --
77
-- it under terms of the GNU General Public License as published by the --
@@ -27,7 +27,7 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
30+
pragma Ada_2022;
3131

3232
with Ada.Text_IO;
3333

‎src/templates_parser-expr.adb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
-- Templates Parser --
33
-- --
4-
-- Copyright (C) 1999-2019, AdaCore --
4+
-- Copyright (C) 1999-2024, AdaCore --
55
-- --
66
-- This library is free software; you can redistribute it and/or modify --
77
-- it under terms of the GNU General Public License as published by the --
@@ -27,7 +27,7 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
30+
pragma Ada_2022;
3131

3232
with Ada.Text_IO;
3333

@@ -312,7 +312,7 @@ package body Expr is
312312
end F_Xor;
313313

314314
Op_Table : constant array (Expr.Ops) of Ops_Fct :=
315-
(Expr.O_And => F_And'Access,
315+
[Expr.O_And => F_And'Access,
316316
Expr.O_Or => F_Or'Access,
317317
Expr.O_Xor => F_Xor'Access,
318318
Expr.O_Sup => F_Sup'Access,
@@ -322,10 +322,10 @@ package body Expr is
322322
Expr.O_Equal => F_Equ'Access,
323323
Expr.O_Diff => F_Diff'Access,
324324
Expr.O_In => F_In'Access,
325-
Expr.O_Cat => F_Cat'Access);
325+
Expr.O_Cat => F_Cat'Access];
326326

327327
U_Op_Table : constant array (Expr.U_Ops) of U_Ops_Fct :=
328-
(Expr.O_Not => F_Not'Access);
328+
[Expr.O_Not => F_Not'Access];
329329

330330
begin
331331
case E.Kind is

‎src/templates_parser-filter.adb‎

Lines changed: 113 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
-- Templates Parser --
33
-- --
4-
-- Copyright (C) 2003-2022, AdaCore --
4+
-- Copyright (C) 2003-2024, AdaCore --
55
-- --
66
-- This library is free software; you can redistribute it and/or modify --
77
-- it under terms of the GNU General Public License as published by the --
@@ -27,7 +27,7 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
30+
pragma Ada_2022;
3131

3232
pragma Wide_Character_Encoding (Brackets);
3333

@@ -108,166 +108,166 @@ package body Filter is
108108

109109
-- Filters Table
110110

111-
Table : constant array (Mode) of Filter_Record
112-
:= (Multiply =>
113-
(Multiply_Token'Access, Multiply'Access),
111+
Table : constant array (Mode) of Filter_Record :=
112+
[Multiply =>
113+
(Multiply_Token'Access, Multiply'Access),
114114

115-
Plus =>
116-
(Plus_Token'Access, Plus'Access),
115+
Plus =>
116+
(Plus_Token'Access, Plus'Access),
117117

118-
Minus =>
119-
(Minus_Token'Access, Minus'Access),
118+
Minus =>
119+
(Minus_Token'Access, Minus'Access),
120120

121-
Divide =>
122-
(Divide_Token'Access, Divide'Access),
121+
Divide =>
122+
(Divide_Token'Access, Divide'Access),
123123

124-
Absolute =>
125-
(Abs_Token'Access, Absolute'Access),
124+
Absolute =>
125+
(Abs_Token'Access, Absolute'Access),
126126

127-
Add =>
128-
(Add_Token'Access, Plus'Access),
127+
Add =>
128+
(Add_Token'Access, Plus'Access),
129129

130-
Add_Param =>
131-
(Add_Param_Token'Access, Add_Param'Access),
130+
Add_Param =>
131+
(Add_Param_Token'Access, Add_Param'Access),
132132

133-
Alternate =>
134-
(Alternate_Token'Access, Alternate'Access),
133+
Alternate =>
134+
(Alternate_Token'Access, Alternate'Access),
135135

136-
BR_2_EOL =>
137-
(BR_2_EOL_Token'Access, BR_2_EOL'Access),
136+
BR_2_EOL =>
137+
(BR_2_EOL_Token'Access, BR_2_EOL'Access),
138138

139-
BR_2_LF =>
140-
(BR_2_LF_Token'Access, BR_2_LF'Access),
139+
BR_2_LF =>
140+
(BR_2_LF_Token'Access, BR_2_LF'Access),
141141

142-
Capitalize =>
143-
(Capitalize_Token'Access, Capitalize'Access),
142+
Capitalize =>
143+
(Capitalize_Token'Access, Capitalize'Access),
144144

145-
Clean_Text =>
146-
(Clean_Text_Token'Access, Clean_Text'Access),
145+
Clean_Text =>
146+
(Clean_Text_Token'Access, Clean_Text'Access),
147147

148-
Coma_2_Point =>
149-
(Coma_2_Point_Token'Access, Coma_2_Point'Access),
148+
Coma_2_Point =>
149+
(Coma_2_Point_Token'Access, Coma_2_Point'Access),
150150

151-
Contract =>
152-
(Contract_Token'Access, Contract'Access),
151+
Contract =>
152+
(Contract_Token'Access, Contract'Access),
153153

154-
Default =>
155-
(Default_Token'Access, Default'Access),
154+
Default =>
155+
(Default_Token'Access, Default'Access),
156156

157-
Del_Param =>
158-
(Del_Param_Token'Access, Del_Param'Access),
157+
Del_Param =>
158+
(Del_Param_Token'Access, Del_Param'Access),
159159

160-
Div =>
161-
(Div_Token'Access, Divide'Access),
160+
Div =>
161+
(Div_Token'Access, Divide'Access),
162162

163-
Exist =>
164-
(Exist_Token'Access, Exist'Access),
163+
Exist =>
164+
(Exist_Token'Access, Exist'Access),
165165

166-
File_Exists =>
167-
(File_Exists_Token'Access, File_Exists'Access),
166+
File_Exists =>
167+
(File_Exists_Token'Access, File_Exists'Access),
168168

169-
Format_Date =>
170-
(Format_Date_Token'Access, Format_Date'Access),
169+
Format_Date =>
170+
(Format_Date_Token'Access, Format_Date'Access),
171171

172-
Format_Number =>
173-
(Format_Number_Token'Access, Format_Number'Access),
172+
Format_Number =>
173+
(Format_Number_Token'Access, Format_Number'Access),
174174

175-
Is_Empty =>
176-
(Is_Empty_Token'Access, Is_Empty'Access),
175+
Is_Empty =>
176+
(Is_Empty_Token'Access, Is_Empty'Access),
177177

178-
LF_2_BR =>
179-
(LF_2_BR_Token'Access, LF_2_BR'Access),
178+
LF_2_BR =>
179+
(LF_2_BR_Token'Access, LF_2_BR'Access),
180180

181-
Lower =>
182-
(Lower_Token'Access, Lower'Access),
181+
Lower =>
182+
(Lower_Token'Access, Lower'Access),
183183

184-
Match =>
185-
(Match_Token'Access, Match'Access),
184+
Match =>
185+
(Match_Token'Access, Match'Access),
186186

187-
Max =>
188-
(Max_Token'Access, Max'Access),
187+
Max =>
188+
(Max_Token'Access, Max'Access),
189189

190-
Min =>
191-
(Min_Token'Access, Min'Access),
190+
Min =>
191+
(Min_Token'Access, Min'Access),
192192

193-
Modulo =>
194-
(Modulo_Token'Access, Modulo'Access),
193+
Modulo =>
194+
(Modulo_Token'Access, Modulo'Access),
195195

196-
Mult =>
197-
(Mult_Token'Access, Multiply'Access),
196+
Mult =>
197+
(Mult_Token'Access, Multiply'Access),
198198

199-
Neg =>
200-
(Neg_Token'Access, Neg'Access),
199+
Neg =>
200+
(Neg_Token'Access, Neg'Access),
201201

202-
No_Digit =>
203-
(No_Digit_Token'Access, No_Digit'Access),
202+
No_Digit =>
203+
(No_Digit_Token'Access, No_Digit'Access),
204204

205-
No_Dynamic =>
206-
(No_Dynamic_Token'Access, No_Dynamic'Access),
205+
No_Dynamic =>
206+
(No_Dynamic_Token'Access, No_Dynamic'Access),
207207

208-
No_Letter =>
209-
(No_Letter_Token'Access, No_Letter'Access),
208+
No_Letter =>
209+
(No_Letter_Token'Access, No_Letter'Access),
210210

211-
No_Space =>
212-
(No_Space_Token'Access, No_Space'Access),
211+
No_Space =>
212+
(No_Space_Token'Access, No_Space'Access),
213213

214-
Oui_Non =>
215-
(Oui_Non_Token'Access, Oui_Non'Access),
214+
Oui_Non =>
215+
(Oui_Non_Token'Access, Oui_Non'Access),
216216

217-
Point_2_Coma =>
218-
(Point_2_Coma_Token'Access, Point_2_Coma'Access),
217+
Point_2_Coma =>
218+
(Point_2_Coma_Token'Access, Point_2_Coma'Access),
219219

220-
Repeat =>
221-
(Repeat_Token'Access, Repeat'Access),
220+
Repeat =>
221+
(Repeat_Token'Access, Repeat'Access),
222222

223-
Replace =>
224-
(Replace_Token'Access, Replace'Access),
223+
Replace =>
224+
(Replace_Token'Access, Replace'Access),
225225

226-
Replace_All =>
227-
(Replace_All_Token'Access, Replace_All'Access),
226+
Replace_All =>
227+
(Replace_All_Token'Access, Replace_All'Access),
228228

229-
Replace_Param =>
230-
(Replace_Param_Token'Access, Replace_Param'Access),
229+
Replace_Param =>
230+
(Replace_Param_Token'Access, Replace_Param'Access),
231231

232-
Invert =>
233-
(Reverse_Token'Access, Reverse_Data'Access),
232+
Invert =>
233+
(Reverse_Token'Access, Reverse_Data'Access),
234234

235-
Size =>
236-
(Size_Token'Access, Size'Access),
235+
Size =>
236+
(Size_Token'Access, Size'Access),
237237

238-
Slice =>
239-
(Slice_Token'Access, Slice'Access),
238+
Slice =>
239+
(Slice_Token'Access, Slice'Access),
240240

241-
Strip =>
242-
(Strip_Token'Access, Strip'Access),
241+
Strip =>
242+
(Strip_Token'Access, Strip'Access),
243243

244-
Sub =>
245-
(Sub_Token'Access, Minus'Access),
244+
Sub =>
245+
(Sub_Token'Access, Minus'Access),
246246

247-
Trim =>
248-
(Trim_Token'Access, Trim'Access),
247+
Trim =>
248+
(Trim_Token'Access, Trim'Access),
249249

250-
Upper =>
251-
(Upper_Token'Access, Upper'Access),
250+
Upper =>
251+
(Upper_Token'Access, Upper'Access),
252252

253-
User_Defined =>
254-
(User_Defined_Token'Access, User_Defined'Access),
253+
User_Defined =>
254+
(User_Defined_Token'Access, User_Defined'Access),
255255

256-
Web_Encode =>
257-
(Web_Encode_Token'Access, Web_Encode'Access),
256+
Web_Encode =>
257+
(Web_Encode_Token'Access, Web_Encode'Access),
258258

259-
Web_Escape =>
260-
(Web_Escape_Token'Access, Web_Escape'Access),
259+
Web_Escape =>
260+
(Web_Escape_Token'Access, Web_Escape'Access),
261261

262-
Web_NBSP =>
263-
(Web_NBSP_Token'Access, Web_NBSP'Access),
262+
Web_NBSP =>
263+
(Web_NBSP_Token'Access, Web_NBSP'Access),
264264

265-
Wrap =>
266-
(Wrap_Token'Access, Wrap'Access),
265+
Wrap =>
266+
(Wrap_Token'Access, Wrap'Access),
267267

268-
Yes_No =>
269-
(Yes_No_Token'Access, Yes_No'Access)
270-
);
268+
Yes_No =>
269+
(Yes_No_Token'Access, Yes_No'Access)
270+
];
271271

272272
function Replace_One_Or_All
273273
(S : String;
@@ -450,7 +450,7 @@ package body Filter is
450450
begin
451451
Check_Null_Parameter (P);
452452

453-
return BR_2_EOL (S, String'(1 => ASCII.LF));
453+
return BR_2_EOL (S, String'[ASCII.LF]);
454454
end BR_2_LF;
455455

456456
----------------
@@ -507,10 +507,10 @@ package body Filter is
507507
package L1 renames Ada.Characters.Latin_1;
508508

509509
Non_ASCII : constant String :=
510-
(L1.Space, L1.LC_E_Acute, L1.LC_E_Grave,
510+
[L1.Space, L1.LC_E_Acute, L1.LC_E_Grave,
511511
L1.LC_E_Circumflex, L1.LC_I_Circumflex,
512512
L1.LC_I_Diaeresis, L1.LC_A_Grave,
513-
L1.LC_O_Circumflex, L1.LC_C_Cedilla);
513+
L1.LC_O_Circumflex, L1.LC_C_Cedilla];
514514

515515
Clean_Set : constant Strings.Maps.Character_Set :=
516516
Strings.Maps.Constants.Letter_Set

‎src/templates_parser-input.ads‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
-- Templates Parser --
33
-- --
4-
-- Copyright (C) 2002-2013, AdaCore --
4+
-- Copyright (C) 2002-2024, AdaCore --
55
-- --
66
-- This library is free software; you can redistribute it and/or modify --
77
-- it under terms of the GNU General Public License as published by the --
@@ -27,7 +27,7 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
30+
pragma Ada_2022;
3131

3232
with Ada.IO_Exceptions;
3333

0 commit comments

Comments
 (0)