Skip to content

Commit

Permalink
A number of small formatting changes, mostly only for the FDIS.
Browse files Browse the repository at this point in the history
  • Loading branch information
rbrukardt authored and reznikmm committed Sep 24, 2022
1 parent 0e95e91 commit 4d93b18
Show file tree
Hide file tree
Showing 13 changed files with 239 additions and 83 deletions.
11 changes: 9 additions & 2 deletions source/02.mss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@Part(02, Root="ada.mss")

@Comment{$Date: 2022/09/17 06:51:37 $}
@Comment{$Date: 2022/09/23 04:34:03 $}
@LabeledSection{Lexical Elements}

@Comment{$Source: e:\\cvsroot/ARM/Source/02.mss,v $}
@Comment{$Revision: 1.102 $}
@Comment{$Revision: 1.103 $}

@begin{Intro}
@ChgRef{Version=[3],Kind=[Revised],ARef=[AI05-0299-1]}
Expand Down Expand Up @@ -1640,8 +1640,15 @@ implementation can support additional (implementation-defined) pragmas.]}
@end{MetaRules}
@begin{Syntax}
@begin{NotISO}
@Syn{lhs=<pragma>,rhs="
@key{pragma} @Syn2{identifier} [(@Syn2{pragma_argument_association} {, @Syn2{pragma_argument_association}})];"}
@end{NotISO}
@begin{ISOOnly}
@Syn{lhs=<pragma>,rhs="
@key{pragma} @Syn2{identifier}
[(@Syn2{pragma_argument_association} {, @Syn2{pragma_argument_association}})];"}
@end{ISOOnly}
@ChgRef{Version=[3],Kind=[Revised],ARef=[AI05-0290-1]}
@Syn{lhs=<pragma_argument_association>,rhs="
Expand Down
65 changes: 44 additions & 21 deletions source/03a.mss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@Part(03, Root="ada.mss")

@Comment{$Date: 2022/09/17 06:51:37 $}
@Comment{$Date: 2022/09/23 04:34:03 $}
@LabeledSection{Declarations and Types}

@Comment{$Source: e:\\cvsroot/ARM/Source/03a.mss,v $}
@Comment{$Revision: 1.157 $}
@Comment{$Revision: 1.158 $}

@begin{Intro}
@ChgRef{Version=[3],Kind=[Revised],ARef=[AI05-0299-1]}
Expand Down Expand Up @@ -2225,12 +2225,12 @@ to describe some common exceptional conditions as follows:}]}
Predicate_Failure => @key[raise] Status_Error @key[with] "File not open";
@key[subtype] Input_File_Type @key[is] Open_File_Type
@key[with] Dynamic_Predicate => Mode (Input_File_Type) = In_File,
Predicate_Failure => @key[raise] Mode_Error @key[with] "Cannot read file: "
& Name (Input_File_Type);
Predicate_Failure => @key[raise] Mode_Error
@key[with] "Cannot read file: " & Name (Input_File_Type);
@key[subtype] Output_File_Type @key[is] Open_File_Type
@key[with] Dynamic_Predicate => Mode (Output_File_Type) /= In_File,
Predicate_Failure => @key[raise] Mode_Error @key[with] "Cannot write file: "
& Name (Output_File_Type);]}@Comment{Does not fit with '&' on previous line}
Predicate_Failure => @key[raise] Mode_Error
@key[with] "Cannot write file: " & Name (Output_File_Type);]}
@ChgRef{Version=[4],Kind=[AddedNormal]}
@ChgAdded{Version=[4],Text=[ ...]}
Expand Down Expand Up @@ -2924,6 +2924,7 @@ of the (anonymous) type of the object.
@end{Intro}

@begin{Syntax}
@begin{NotISO}
@ChgRef{Version=[2],Kind=[Revised],ARef=[AI95-00385-01],ARef=[AI95-00406-01]}
@ChgRef{Version=[3],Kind=[Revised],ARef=[AI05-0183-1]}
@Syn{lhs=<object_declaration>,rhs="
Expand All @@ -2935,6 +2936,21 @@ of the (anonymous) type of the object.
[@Syn2{aspect_specification}]>,Old=[]};
| @Syn2{single_task_declaration}
| @Syn2{single_protected_declaration}"}
@end{NotISO}
@begin{ISOOnly}
@Syn{lhs=<object_declaration>,rhs="
@Syn2{defining_identifier_list} :
[@key{aliased}] [@key{constant}] @Syn2{subtype_indication} [:= @Syn2{expression}]@Chg{Version=[3],New=<
[@Syn2{aspect_specification}]>,Old=[]};@Chg{Version=[2],New=<
| @Syn2{defining_identifier_list} :
[@key{aliased}] [@key{constant}] @Syn2{access_definition} [:= @Syn2{expression}]@Chg{Version=[3],New=<
[@Syn2{aspect_specification}]>,Old=[]};>,Old=<>}
| @Syn2{defining_identifier_list} :
[@key{aliased}] [@key{constant}] @Syn2{array_type_definition} [:= @Syn2{expression}]@Chg{Version=[3],New=<
[@Syn2{aspect_specification}]>,Old=[]};
| @Syn2{single_task_declaration}
| @Syn2{single_protected_declaration}"}
@end{ISOOnly}

@Syn{lhs=<defining_identifier_list>,rhs="
@Syn2{defining_identifier} {, @Syn2{defining_identifier}}"}
Expand Down Expand Up @@ -3695,9 +3711,16 @@ categories of types, but not classes of types.]}
@end{Intro}
@begin{Syntax}
@begin{NotISO}
@ChgRef{Version=[2],Kind=[Revised],ARef=[AI95-00251-01],ARef=[AI95-00419-01]}
@Syn{lhs=<derived_type_definition>,rhs="@Chg{Version=[2],New=<
>,Old=<>}[@key{abstract}] @Chg{Version=[2],New=<[@key{limited}] >,Old=<>}@key{new} @SynI{parent_}@Syn2{subtype_indication} [@Chg{Version=[2],New=<[@key{and} @Syn2{interface_list}] >,Old=<>}@Syn2{record_extension_part}]"}
@end{NotISO}
@begin{ISOOnly}
@Syn{lhs=<derived_type_definition>,rhs="
[@key{abstract}] @key{limited}] @key{new} @SynI{parent_}@Syn2{subtype_indication}
[@Chg{Version=[2],New=<[@key{and} @Syn2{interface_list}] >,Old=<>}@Syn2{record_extension_part}]"}
@end{ISOOnly}
@end{Syntax}
@begin{Legality}
Expand Down Expand Up @@ -5995,8 +6018,8 @@ An @nt<enumeration_type_definition> defines an enumeration type.]
(@Syn2{enumeration_literal_specification} {, @Syn2{enumeration_literal_specification}})"}


@Syn{lhs=<enumeration_literal_specification>,
rhs=" @Syn2{defining_identifier} | @Syn2{defining_character_literal}"}
@Syn{lhs=<enumeration_literal_specification>,rhs="
@Syn2{defining_identifier} | @Syn2{defining_character_literal}"}

@Syn{lhs=<defining_character_literal>,rhs="@Syn2{character_literal}"}
@end{Syntax}
Expand Down Expand Up @@ -6492,11 +6515,11 @@ type with wrap-around semantics.
@end{Intro}
@begin{Syntax}
@Syn{lhs=<integer_type_definition>,
rhs="@Syn2{signed_integer_type_definition} | @Syn2{modular_type_definition}"}
@Syn{lhs=<integer_type_definition>,rhs="
@Syn2{signed_integer_type_definition} | @Syn2{modular_type_definition}"}
@Syn{lhs=<signed_integer_type_definition>,
rhs="@key(range) @SynI{static_}@Syn2{simple_expression} .. @SynI{static_}@Syn2{simple_expression}"}
@Syn{lhs=<signed_integer_type_definition>,rhs="
@key(range) @SynI{static_}@Syn2{simple_expression} .. @SynI{static_}@Syn2{simple_expression}"}
@begin{Discussion}
We don't call this a @nt<range_constraint>,
because it is rather different @em not only is
Expand All @@ -6513,7 +6536,7 @@ rhs="@key(range) @SynI{static_}@Syn2{simple_expression} .. @SynI{static_}@Syn2{s
@end{Discussion}

@Syn{lhs=<modular_type_definition>,
rhs="@key(mod) @SynI{static_}@Syn2{expression}"}
rhs="@key(mod) @SynI{static_}@Syn2{expression}"}
@end{Syntax}

@begin{Resolution}
Expand Down Expand Up @@ -7190,7 +7213,7 @@ point types.
@begin{Syntax}
@Syn{lhs=<real_type_definition>,rhs="
@Syn2{floating_point_definition} | @Syn2{fixed_point_definition}"}
@Syn2{floating_point_definition} | @Syn2{fixed_point_definition}"}
@end{Syntax}
@begin{StaticSem}
Expand Down Expand Up @@ -7337,10 +7360,10 @@ digits.
@begin{Syntax}
@Syn{lhs=<floating_point_definition>,rhs="
@key{digits} @SynI{static_}@Syn2{expression} [@Syn2{real_range_specification}]"}
@key{digits} @SynI{static_}@Syn2{expression} [@Syn2{real_range_specification}]"}
@Syn{lhs=<real_range_specification>,rhs="
@key{range} @SynI{static_}@Syn2{simple_expression} .. @SynI{static_}@Syn2{simple_expression}"}
@key{range} @SynI{static_}@Syn2{simple_expression} .. @SynI{static_}@Syn2{simple_expression}"}
@end{Syntax}
@begin{Resolution}
Expand Down Expand Up @@ -7668,18 +7691,18 @@ absolute value, called the @i(delta) of the fixed point type.
@end{Intro}

@begin{Syntax}
@Syn{lhs=<fixed_point_definition>,rhs="@Syn2{ordinary_fixed_point_definition} | @Syn2{decimal_fixed_point_definition}"}

@Syn{lhs=<fixed_point_definition>,rhs="
@Syn2{ordinary_fixed_point_definition} | @Syn2{decimal_fixed_point_definition}"}

@Syn{lhs=<ordinary_fixed_point_definition>,rhs="
@key{delta} @SynI{static_}@Syn2{expression} @Syn2{real_range_specification}"}
@key{delta} @SynI{static_}@Syn2{expression} @Syn2{real_range_specification}"}

@Syn{lhs=<decimal_fixed_point_definition>,rhs="
@key{delta} @SynI{static_}@Syn2{expression} @key{digits} @SynI{static_}@Syn2{expression} [@Syn2{real_range_specification}]"}
@key{delta} @SynI{static_}@Syn2{expression} @key{digits} @SynI{static_}@Syn2{expression} [@Syn2{real_range_specification}]"}

@ChgRef{Version=[4],Kind=[Revised],ARef=[AI12-0152-1]}
@Syn{lhs=<digits_constraint>,rhs="
@key{digits} @SynI{static_}@Chg{Version=[4],New=[@Syn2{simple_expression}],Old=[@Syn2{expression}]} [@Syn2{range_constraint}]"}
@key{digits} @SynI{static_}@Chg{Version=[4],New=[@Syn2{simple_expression}],Old=[@Syn2{expression}]} [@Syn2{range_constraint}]"}
@end{Syntax}

@begin{Resolution}
Expand Down
32 changes: 29 additions & 3 deletions source/03b.mss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@Part(03, Root="ada.mss")

@Comment{$Date: 2022/09/17 06:51:37 $}
@Comment{$Date: 2022/09/23 04:34:03 $}

@Comment{$Source: e:\\cvsroot/ARM/Source/03b.mss,v $}
@Comment{$Revision: 1.116 $}
@Comment{$Revision: 1.117 $}

@LabeledClause{Array Types}

Expand All @@ -23,13 +23,27 @@ value consisting of the values of the components.
@Syn2{unconstrained_array_definition} | @Syn2{constrained_array_definition}"}


@begin{NotISO}
@Syn{lhs=<unconstrained_array_definition>,rhs="
@key{array}(@Syn2{index_subtype_definition} {, @Syn2{index_subtype_definition}}) @key{of} @Syn2{component_definition}"}
@end{NotISO}
@begin{ISOOnly}
@Syn{lhs=<unconstrained_array_definition>,rhs="
@key{array}(@Syn2{index_subtype_definition} {, @Syn2{index_subtype_definition}})
@key{of} @Syn2{component_definition}"}
@end{ISOOnly}

@Syn{lhs=<index_subtype_definition>,rhs="@Syn2{subtype_mark} @key{range} <>"}

@begin{NotISO}
@Syn{lhs=<constrained_array_definition>,rhs="
@key{array} (@Syn2{discrete_subtype_definition} {, @Syn2{discrete_subtype_definition}}) @key{of} @Syn2{component_definition}"}
@end{NotISO}
@begin{ISOOnly}
@Syn{lhs=<constrained_array_definition>,rhs="
@key{array} (@Syn2{discrete_subtype_definition} {, @Syn2{discrete_subtype_definition}})
@key{of} @Syn2{component_definition}"}
@end{ISOOnly}

@Syn{lhs=<discrete_subtype_definition>,rhs="@SynI{discrete_}@Syn2{subtype_indication} | @Syn2{range}"}

Expand Down Expand Up @@ -895,13 +909,24 @@ are indefinite subtypes.]
@Syn{lhs=<known_discriminant_part>,rhs="
(@Syn2{discriminant_specification} {; @Syn2{discriminant_specification}})"}
@begin{NotISO}
@ChgRef{Version=[2],Kind=[Revised],ARef=[AI95-00231-01]}
@ChgRef{Version=[5],Kind=[Revised],ARef=[AI12-0398-1]}
@Syn{lhs=<discriminant_specification>,rhs="
@Syn2{defining_identifier_list} : @Chg{Version=[2],New=<[@Syn2{null_exclusion}] >,Old=<>}@Syn2{subtype_mark} [:= @Syn2{default_expression}]@Chg{Version=[5],New=<
[@Syn2{aspect_specification}] >,Old=<>}
| @Syn2{defining_identifier_list} : @Syn2{access_definition} [:= @Syn2{default_expression}]@Chg{Version=[5],New=<
[@Syn2{aspect_specification}] >,Old=<>}"}
@end{NotISO}
@begin{ISOOnly}
@Syn{lhs=<discriminant_specification>,rhs="
@Syn2{defining_identifier_list} : @Chg{Version=[2],New=<[@Syn2{null_exclusion}] >,Old=<>}@Syn2{subtype_mark}
[:= @Syn2{default_expression}]@Chg{Version=[5],New=<
[@Syn2{aspect_specification}] >,Old=<>}
| @Syn2{defining_identifier_list} : @Syn2{access_definition}
[:= @Syn2{default_expression}]@Chg{Version=[5],New=<
[@Syn2{aspect_specification}] >,Old=<>}"}
@end{ISOOnly}
@begin{Discussion}
@ChgRef{Version=[5],Kind=[AddedNormal],ARef=[AI12-0398-1]}
Expand Down Expand Up @@ -2482,7 +2507,8 @@ parallel those for case statements.
@Syn{lhs=<discrete_choice_list>,rhs="@Syn2{discrete_choice} {@Chg{Version=[5],New=['|'],Old=[|]} @Syn2{discrete_choice}}"}
@ChgRef{Version=[3],Kind=[Revised],ARef=[AI05-0153-3],ARef=[AI05-0158-1]}
@Syn{lhs=<discrete_choice>,rhs="@Chg{Version=[3],New=[@Syn2{choice_expression}],Old=[@Syn2{expression}]} | @Chg{Version=[3],New=[@SynI{discrete_}@Syn2{subtype_indication} | @Syn2{range}],Old=[@Syn2{discrete_range}]} | @key{others}"}
@Syn{lhs=<discrete_choice>,rhs="
@Chg{Version=[3],New=[@Syn2{choice_expression}],Old=[@Syn2{expression}]} | @Chg{Version=[3],New=[@SynI{discrete_}@Syn2{subtype_indication} | @Syn2{range}],Old=[@Syn2{discrete_range}]} | @key{others}"}
@end{Syntax}
@begin{Resolution}
Expand Down
8 changes: 4 additions & 4 deletions source/03c.mss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@Part(03, Root="ada.mss")

@Comment{$Date: 2022/09/17 06:51:37 $}
@Comment{$Date: 2022/09/23 04:34:03 $}

@Comment{$Source: e:\\cvsroot/ARM/Source/03c.mss,v $}
@Comment{$Revision: 1.160 $}
@Comment{$Revision: 1.161 $}

@LabeledClause{Tagged Types and Type Extensions}

Expand Down Expand Up @@ -3980,8 +3980,8 @@ to a subsequent @nt<full_type_declaration>.

@begin{Syntax}
@ChgRef{Version=[2],Kind=[Revised],ARef=[AI95-00326-01]}
@Syn{lhs=<incomplete_type_declaration>,
rhs="@key{type} @Syn2{defining_identifier} [@Syn2{discriminant_part}]@Chg{Version=[2],New=< [@key{is tagged}]>,Old=<>};"}
@Syn{lhs=<incomplete_type_declaration>,rhs="
@key{type} @Syn2{defining_identifier} [@Syn2{discriminant_part}]@Chg{Version=[2],New=< [@key{is tagged}]>,Old=<>};"}
@end{Syntax}

@begin{StaticSem}
Expand Down
13 changes: 8 additions & 5 deletions source/04a.mss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@Part(04, Root="ada.mss")

@Comment{$Date: 2022/09/17 06:51:37 $}
@Comment{$Date: 2022/09/23 04:34:03 $}
@LabeledSection{Names and Expressions}

@Comment{$Source: e:\\cvsroot/ARM/Source/04a.mss,v $}
@Comment{$Revision: 1.168 $}
@Comment{$Revision: 1.169 $}

@begin{Intro}
@ChgRef{Version=[3],Kind=[Revised],ARef=[AI05-0299-1]}
Expand Down Expand Up @@ -5094,7 +5094,8 @@ rhs="@Chg{Version=[3],New=<@Syn2{membership_choice} {@Chg{Version=[5],New=['|'],
@AddedSyn{Version=[3],lhs=<@Chg{Version=[3],New=<membership_choice>,Old=<>}>,
rhs="@Chg{Version=[3],New=<@Chg{Version=[4],New=<@SynI{choice_}@Syn2{simple_expression}>,Old=<@Syn2{choice_expression}>} | @Syn2{range} | @Syn2{subtype_mark}>,Old=<>}"}
@Syn{lhs=<simple_expression>,rhs="[@Syn2{unary_adding_operator}] @Syn2{term} {@Syn2{binary_adding_operator} @Syn2{term}}"}
@Syn{lhs=<simple_expression>,rhs="
[@Syn2{unary_adding_operator}] @Syn2{term} {@Syn2{binary_adding_operator} @Syn2{term}}"}
@Syn{lhs=<term>,rhs="@Syn2{factor} {@Syn2{multiplying_operator} @Syn2{factor}}"}
Expand Down Expand Up @@ -7725,7 +7726,8 @@ arrays.@defn{quantified expression}@Defn2{Term=[expression],Sec=[quantified]}]}
@begin{Syntax}
@ChgRef{Version=[3],Kind=[AddedNormal],ARef=[AI05-0176-1]}
@AddedSyn{Version=[3],lhs=<@Chg{Version=[3],New=<quantified_expression>,Old=<>}>,
rhs="@Chg{Version=[3],New=[@key[for] @Syn2{quantifier} @Syn2{loop_parameter_specification} => @Syn2{predicate}
rhs="@Chg{Version=[3],New=[
@key[for] @Syn2{quantifier} @Syn2{loop_parameter_specification} => @Syn2{predicate}
| @key[for] @Syn2{quantifier} @Syn2{iterator_specification} => @Syn2{predicate}],Old=<>}"}
@ChgRef{Version=[3],Kind=[AddedNormal]}
Expand Down Expand Up @@ -8055,7 +8057,8 @@ rhs="@Chg{Version=[5],New=<
@ChgRef{Version=[5],Kind=[AddedNormal],ARef=[AI12-0262-1]}
@AddedSyn{Version=[5],lhs=<@Chg{Version=[5],New=<reduction_attribute_designator>,Old=<>}>,
rhs="@Chg{Version=[5],New=<@SynI{reduction_}@Syn2{identifier}(@Syn2{reduction_specification})>,Old=<>}"}
rhs="
@Chg{Version=[5],New=<@SynI{reduction_}@Syn2{identifier}(@Syn2{reduction_specification})>,Old=<>}"}
@ChgRef{Version=[5],Kind=[AddedNormal],ARef=[AI12-0262-1],ARef=[AI12-0348-1]}
@AddedSyn{Version=[5],lhs=<@Chg{Version=[5],New=<reduction_specification>,Old=<>}>,
Expand Down
14 changes: 12 additions & 2 deletions source/05.mss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@Part(05, Root="ada.mss")

@Comment{$Date: 2022/09/17 06:51:37 $}
@Comment{$Date: 2022/09/23 04:34:03 $}
@LabeledSection{Statements}

@Comment{$Source: e:\\cvsroot/ARM/Source/05.mss,v $}
@Comment{$Revision: 1.94 $}
@Comment{$Revision: 1.95 $}

@begin{Intro}
@Redundant[A @nt{statement} defines an action to be performed upon
Expand Down Expand Up @@ -1981,6 +1981,7 @@ an @nt{iterator_specification}.]}
@end{Intro}
@begin{Syntax}
@begin{NotISO}
@ChgRef{Version=[3],Kind=[AddedNormal],ARef=[AI05-0139-2],ARef=[AI05-0292-1]}
@ChgRef{Version=[5],Kind=[Revised],ARef=[AI12-0156-1],ARef=[AI12-0250-1]}
@AddedSyn{Version=[3],lhs=<@Chg{Version=[3],New=<iterator_specification>,Old=<>}>,
Expand All @@ -1989,6 +1990,15 @@ rhs="@Chg{Version=[3],New=<
[@Syn2{iterator_filter}]>,Old=<>}
| @Syn2{defining_identifier} [: @Chg{Version=[5],New=<@Syn2{loop_parameter_subtype_indication}>,Old=<@Syn2{subtype_indication}>}] @key[of] [@key{reverse}] @SynI{iterable_}@Syn2{name}>,Old=<>}@Chg{Version=[5],New=<
[@Syn2{iterator_filter}]>,Old=<>}"}
@end{NotISO}
@begin{ISOOnly}
@AddedSyn{Version=[3],lhs=<@Chg{Version=[3],New=<iterator_specification>,Old=<>}>,
rhs="@Chg{Version=[3],New=<
@Syn2{defining_identifier} @Chg{Version=[5],New=<[: @Syn2{loop_parameter_subtype_indication}] >,Old=<>}@key[in] [@key{reverse}]
@SynI{iterator_}@Syn2{name}@Chg{Version=[5],New=< [@Syn2{iterator_filter}]>,Old=<>}
| @Syn2{defining_identifier} [: @Chg{Version=[5],New=<@Syn2{loop_parameter_subtype_indication}>,Old=<@Syn2{subtype_indication}>}] @key[of]
[@key{reverse}] @SynI{iterable_}@Syn2{name}>,Old=<>}@Chg{Version=[5],New=< [@Syn2{iterator_filter}]>,Old=<>}"}
@end{ISOOnly}
@ChgRef{Version=[5],Kind=[Added],ARef=[AI12-0156-1]}
@AddedSyn{Version=[5],lhs=<@Chg{Version=[5],New=<loop_parameter_subtype_indication>,Old=<>}>,
Expand Down
Loading

0 comments on commit 4d93b18

Please sign in to comment.