Skip to content

Commit a1b25da

Browse files
TurboGitTurboGit
committed
Use Ada 2022 array aggregate syntax.
1 parent 86afce8 commit a1b25da

11 files changed

+155
-171
lines changed

‎src/templates_parser-data.adb‎

Lines changed: 1 addition & 3 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,8 +27,6 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
31-
3230
with Ada.Text_IO;
3331

3432
separate (Templates_Parser)

‎src/templates_parser-expr.adb‎

Lines changed: 4 additions & 6 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,8 +27,6 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
31-
3230
with Ada.Text_IO;
3331

3432
separate (Templates_Parser)
@@ -312,7 +310,7 @@ package body Expr is
312310
end F_Xor;
313311

314312
Op_Table : constant array (Expr.Ops) of Ops_Fct :=
315-
(Expr.O_And => F_And'Access,
313+
[Expr.O_And => F_And'Access,
316314
Expr.O_Or => F_Or'Access,
317315
Expr.O_Xor => F_Xor'Access,
318316
Expr.O_Sup => F_Sup'Access,
@@ -322,10 +320,10 @@ package body Expr is
322320
Expr.O_Equal => F_Equ'Access,
323321
Expr.O_Diff => F_Diff'Access,
324322
Expr.O_In => F_In'Access,
325-
Expr.O_Cat => F_Cat'Access);
323+
Expr.O_Cat => F_Cat'Access];
326324

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

330328
begin
331329
case E.Kind is

‎src/templates_parser-filter.adb‎

Lines changed: 112 additions & 114 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,8 +27,6 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
31-
3230
pragma Wide_Character_Encoding (Brackets);
3331

3432
with Ada.Characters.Latin_1;
@@ -108,166 +106,166 @@ package body Filter is
108106

109107
-- Filters Table
110108

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

115-
Plus =>
116-
(Plus_Token'Access, Plus'Access),
113+
Plus =>
114+
(Plus_Token'Access, Plus'Access),
117115

118-
Minus =>
119-
(Minus_Token'Access, Minus'Access),
116+
Minus =>
117+
(Minus_Token'Access, Minus'Access),
120118

121-
Divide =>
122-
(Divide_Token'Access, Divide'Access),
119+
Divide =>
120+
(Divide_Token'Access, Divide'Access),
123121

124-
Absolute =>
125-
(Abs_Token'Access, Absolute'Access),
122+
Absolute =>
123+
(Abs_Token'Access, Absolute'Access),
126124

127-
Add =>
128-
(Add_Token'Access, Plus'Access),
125+
Add =>
126+
(Add_Token'Access, Plus'Access),
129127

130-
Add_Param =>
131-
(Add_Param_Token'Access, Add_Param'Access),
128+
Add_Param =>
129+
(Add_Param_Token'Access, Add_Param'Access),
132130

133-
Alternate =>
134-
(Alternate_Token'Access, Alternate'Access),
131+
Alternate =>
132+
(Alternate_Token'Access, Alternate'Access),
135133

136-
BR_2_EOL =>
137-
(BR_2_EOL_Token'Access, BR_2_EOL'Access),
134+
BR_2_EOL =>
135+
(BR_2_EOL_Token'Access, BR_2_EOL'Access),
138136

139-
BR_2_LF =>
140-
(BR_2_LF_Token'Access, BR_2_LF'Access),
137+
BR_2_LF =>
138+
(BR_2_LF_Token'Access, BR_2_LF'Access),
141139

142-
Capitalize =>
143-
(Capitalize_Token'Access, Capitalize'Access),
140+
Capitalize =>
141+
(Capitalize_Token'Access, Capitalize'Access),
144142

145-
Clean_Text =>
146-
(Clean_Text_Token'Access, Clean_Text'Access),
143+
Clean_Text =>
144+
(Clean_Text_Token'Access, Clean_Text'Access),
147145

148-
Coma_2_Point =>
149-
(Coma_2_Point_Token'Access, Coma_2_Point'Access),
146+
Coma_2_Point =>
147+
(Coma_2_Point_Token'Access, Coma_2_Point'Access),
150148

151-
Contract =>
152-
(Contract_Token'Access, Contract'Access),
149+
Contract =>
150+
(Contract_Token'Access, Contract'Access),
153151

154-
Default =>
155-
(Default_Token'Access, Default'Access),
152+
Default =>
153+
(Default_Token'Access, Default'Access),
156154

157-
Del_Param =>
158-
(Del_Param_Token'Access, Del_Param'Access),
155+
Del_Param =>
156+
(Del_Param_Token'Access, Del_Param'Access),
159157

160-
Div =>
161-
(Div_Token'Access, Divide'Access),
158+
Div =>
159+
(Div_Token'Access, Divide'Access),
162160

163-
Exist =>
164-
(Exist_Token'Access, Exist'Access),
161+
Exist =>
162+
(Exist_Token'Access, Exist'Access),
165163

166-
File_Exists =>
167-
(File_Exists_Token'Access, File_Exists'Access),
164+
File_Exists =>
165+
(File_Exists_Token'Access, File_Exists'Access),
168166

169-
Format_Date =>
170-
(Format_Date_Token'Access, Format_Date'Access),
167+
Format_Date =>
168+
(Format_Date_Token'Access, Format_Date'Access),
171169

172-
Format_Number =>
173-
(Format_Number_Token'Access, Format_Number'Access),
170+
Format_Number =>
171+
(Format_Number_Token'Access, Format_Number'Access),
174172

175-
Is_Empty =>
176-
(Is_Empty_Token'Access, Is_Empty'Access),
173+
Is_Empty =>
174+
(Is_Empty_Token'Access, Is_Empty'Access),
177175

178-
LF_2_BR =>
179-
(LF_2_BR_Token'Access, LF_2_BR'Access),
176+
LF_2_BR =>
177+
(LF_2_BR_Token'Access, LF_2_BR'Access),
180178

181-
Lower =>
182-
(Lower_Token'Access, Lower'Access),
179+
Lower =>
180+
(Lower_Token'Access, Lower'Access),
183181

184-
Match =>
185-
(Match_Token'Access, Match'Access),
182+
Match =>
183+
(Match_Token'Access, Match'Access),
186184

187-
Max =>
188-
(Max_Token'Access, Max'Access),
185+
Max =>
186+
(Max_Token'Access, Max'Access),
189187

190-
Min =>
191-
(Min_Token'Access, Min'Access),
188+
Min =>
189+
(Min_Token'Access, Min'Access),
192190

193-
Modulo =>
194-
(Modulo_Token'Access, Modulo'Access),
191+
Modulo =>
192+
(Modulo_Token'Access, Modulo'Access),
195193

196-
Mult =>
197-
(Mult_Token'Access, Multiply'Access),
194+
Mult =>
195+
(Mult_Token'Access, Multiply'Access),
198196

199-
Neg =>
200-
(Neg_Token'Access, Neg'Access),
197+
Neg =>
198+
(Neg_Token'Access, Neg'Access),
201199

202-
No_Digit =>
203-
(No_Digit_Token'Access, No_Digit'Access),
200+
No_Digit =>
201+
(No_Digit_Token'Access, No_Digit'Access),
204202

205-
No_Dynamic =>
206-
(No_Dynamic_Token'Access, No_Dynamic'Access),
203+
No_Dynamic =>
204+
(No_Dynamic_Token'Access, No_Dynamic'Access),
207205

208-
No_Letter =>
209-
(No_Letter_Token'Access, No_Letter'Access),
206+
No_Letter =>
207+
(No_Letter_Token'Access, No_Letter'Access),
210208

211-
No_Space =>
212-
(No_Space_Token'Access, No_Space'Access),
209+
No_Space =>
210+
(No_Space_Token'Access, No_Space'Access),
213211

214-
Oui_Non =>
215-
(Oui_Non_Token'Access, Oui_Non'Access),
212+
Oui_Non =>
213+
(Oui_Non_Token'Access, Oui_Non'Access),
216214

217-
Point_2_Coma =>
218-
(Point_2_Coma_Token'Access, Point_2_Coma'Access),
215+
Point_2_Coma =>
216+
(Point_2_Coma_Token'Access, Point_2_Coma'Access),
219217

220-
Repeat =>
221-
(Repeat_Token'Access, Repeat'Access),
218+
Repeat =>
219+
(Repeat_Token'Access, Repeat'Access),
222220

223-
Replace =>
224-
(Replace_Token'Access, Replace'Access),
221+
Replace =>
222+
(Replace_Token'Access, Replace'Access),
225223

226-
Replace_All =>
227-
(Replace_All_Token'Access, Replace_All'Access),
224+
Replace_All =>
225+
(Replace_All_Token'Access, Replace_All'Access),
228226

229-
Replace_Param =>
230-
(Replace_Param_Token'Access, Replace_Param'Access),
227+
Replace_Param =>
228+
(Replace_Param_Token'Access, Replace_Param'Access),
231229

232-
Invert =>
233-
(Reverse_Token'Access, Reverse_Data'Access),
230+
Invert =>
231+
(Reverse_Token'Access, Reverse_Data'Access),
234232

235-
Size =>
236-
(Size_Token'Access, Size'Access),
233+
Size =>
234+
(Size_Token'Access, Size'Access),
237235

238-
Slice =>
239-
(Slice_Token'Access, Slice'Access),
236+
Slice =>
237+
(Slice_Token'Access, Slice'Access),
240238

241-
Strip =>
242-
(Strip_Token'Access, Strip'Access),
239+
Strip =>
240+
(Strip_Token'Access, Strip'Access),
243241

244-
Sub =>
245-
(Sub_Token'Access, Minus'Access),
242+
Sub =>
243+
(Sub_Token'Access, Minus'Access),
246244

247-
Trim =>
248-
(Trim_Token'Access, Trim'Access),
245+
Trim =>
246+
(Trim_Token'Access, Trim'Access),
249247

250-
Upper =>
251-
(Upper_Token'Access, Upper'Access),
248+
Upper =>
249+
(Upper_Token'Access, Upper'Access),
252250

253-
User_Defined =>
254-
(User_Defined_Token'Access, User_Defined'Access),
251+
User_Defined =>
252+
(User_Defined_Token'Access, User_Defined'Access),
255253

256-
Web_Encode =>
257-
(Web_Encode_Token'Access, Web_Encode'Access),
254+
Web_Encode =>
255+
(Web_Encode_Token'Access, Web_Encode'Access),
258256

259-
Web_Escape =>
260-
(Web_Escape_Token'Access, Web_Escape'Access),
257+
Web_Escape =>
258+
(Web_Escape_Token'Access, Web_Escape'Access),
261259

262-
Web_NBSP =>
263-
(Web_NBSP_Token'Access, Web_NBSP'Access),
260+
Web_NBSP =>
261+
(Web_NBSP_Token'Access, Web_NBSP'Access),
264262

265-
Wrap =>
266-
(Wrap_Token'Access, Wrap'Access),
263+
Wrap =>
264+
(Wrap_Token'Access, Wrap'Access),
267265

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

272270
function Replace_One_Or_All
273271
(S : String;
@@ -450,7 +448,7 @@ package body Filter is
450448
begin
451449
Check_Null_Parameter (P);
452450

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

456454
----------------
@@ -507,10 +505,10 @@ package body Filter is
507505
package L1 renames Ada.Characters.Latin_1;
508506

509507
Non_ASCII : constant String :=
510-
(L1.Space, L1.LC_E_Acute, L1.LC_E_Grave,
508+
[L1.Space, L1.LC_E_Acute, L1.LC_E_Grave,
511509
L1.LC_E_Circumflex, L1.LC_I_Circumflex,
512510
L1.LC_I_Diaeresis, L1.LC_A_Grave,
513-
L1.LC_O_Circumflex, L1.LC_C_Cedilla);
511+
L1.LC_O_Circumflex, L1.LC_C_Cedilla];
514512

515513
Clean_Set : constant Strings.Maps.Character_Set :=
516514
Strings.Maps.Constants.Letter_Set

‎src/templates_parser-input.ads‎

Lines changed: 1 addition & 3 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,8 +27,6 @@
2727
-- covered by the GNU Public License. --
2828
------------------------------------------------------------------------------
2929

30-
pragma Ada_2012;
31-
3230
with Ada.IO_Exceptions;
3331

3432
package Templates_Parser.Input is

0 commit comments

Comments
 (0)