--- ais/ai-00285.txt 2004/12/09 19:55:25 1.22 +++ ais/ai-00285.txt 2005/01/07 03:07:35 1.23 @@ -26,18 +26,13 @@ !standard 2.3(02) !standard 2.3(03) !standard 2.3(05) +!standard 2.3(06) !standard 2.6(06) -!standard 3.5(28) -!standard 3.5(29) -!standard 3.5(34) +!standard 3.5(27) +!standard 3.5(30-34) !standard 3.5(37) -!standard 3.5(40) -!standard 3.5(41) -!standard 3.5(42) -!standard 3.5(43) -!standard 3.5(44) -!standard 3.5(45) -!standard 3.5(51) +!standard 3.5(39) +!standard 3.5(43-51) !standard 3.5(55) !standard 3.5(56) !standard 3.5(59) @@ -505,7 +500,7 @@ Replace the AARM Note: -This table serves to show the correspondence between ISO 10646 +This table serves to show the correspondence between ISO/IEC 10646:2003 names and the graphic symbols (glyphs) used in this International Standard. These are the characters that play a special role in the syntax of Ada. @@ -557,7 +552,11 @@ in the note in section 1 of ISO/IEC 10646:2003, is applied to obtain the uppercase version of each character. +Add a note after 2.3(6): +Identifiers differing only in the use of corresponding upper and lower case +letters are considered the same. + Add after 2.6(6): No modification is performed on the sequence of characters in a string_literal. @@ -639,7 +638,9 @@ function S'Wide_Value(Arg : Wide_String) return S'Base This function returns a value given an image of the value as a Wide_String, -ignoring any leading or trailing spaces. For the evaluation of a call on +ignoring any leading or trailing spaces. + +For the evaluation of a call on S'Wide_Value for an enumeration subtype S, if the sequence of characters of the parameter (ignoring leading and trailing spaces) has the syntax of an enumeration literal and if it corresponds to a literal of the type of S (or @@ -665,7 +666,7 @@ In 3.5(59) change: ... as [does]{do} S'Wide_Value (S'Wide_Image (V)) {and S'Wide_Wide_Value -(S'Wide_Wide_Image (V))} ... +(S'Wide_Wide_Image (V))} {None of these expressions}[Neither expression] ever... In the middle of 3.5.2(2), change: @@ -1389,7 +1390,7 @@ The characters whose code position is 16#FFFE# or 16#FFFF# are not allowed anywhere in the text of a program. The characters in categories @fa<other_control>, @fa<other_private_use>, and @fa<other_surrogate> are only -allowed in comments. +allowed in @fa<comment>s. !corrigendum 2.1(2) @@ -1662,6 +1663,17 @@ section 1 of ISO/IEC 10646:2003, is applied to obtain the uppercase version of each character.> +!corrigendum 2.3(06) + +@dinsa +In a nonstandard mode, +an implementation may support other upper/lower case equivalence +rules for @fa<identifier>s, to accommodate local conventions. +@dinst +@xindent<@s9<NOTES@hr +3 @fa<Identifier>s differing only in the use of corresponding upper and +lower case letters are considered the same.>> + !corrigendum 2.6(06) @dinsa @@ -1672,45 +1684,110 @@ @fa<string_literal>. -!corrigendum 3.5(28) +!corrigendum 3.5(27) -@drepl -@xhang<@xterm<S'Wide_Image> -S'Wide_Image denotes a function with the following specification:> -@dby +@dinsa +@xindent<For an enumeration type, the function returns the value whose position +number is one less than that of the value of Arg; Constraint_Error is raised if +there is no such value of the type. For an integer type, the function returns +the result of subtracting one from the value of Arg. For a fixed point type, +the function returns the result of subtracting small from the value of Arg. For +a floating point type, the function returns the machine number (as defined in +3.5.7) immediately below the value of Arg; Constraint_Error is raised if there +is no such machine number.> +@dinss @xhang<@xterm<S'Wide_Wide_Image> S'Wide_Wide_Image denotes a function with the following specification:> -!corrigendum 3.5(29) - -@drepl -@xcode< @b<function> S'Wide_Image(@i<Arg> : S'Base) - @b<return> Wide_String> -@dby @xcode< @b<function> S'Wide_Wide_Image(@i<Arg> : S'Base) @b<return> Wide_Wide_String> -!corrigendum 3.5(34) +@xindent<The function returns an @i<image> of the value of @i<Arg>, that is, a +sequence of characters representing the value in display form. The lower bound +of the result is one.> + +@xindent<The image of an integer value is the corresponding decimal literal, +without underlines, leading zeros, exponent, or trailing spaces, but with a +single leading character that is either a minus sign or a space.> + +@xindent<The image of an enumeration value is either the corresponding +identifier in upper case or the corresponding character literal (including the +two apostrophes); neither leading nor trailing spaces are included. For a +@i<nongraphic character> (a value of a character type that has no enumeration +literal associated with it), the result is a corresponding language-defined or +implementation-defined name in upper case (for example, the image of the +nongraphic character identified as @i<nul> is "NUL" -- the quotes are not part +of the image).> -@dinsa +@xindent<The image of a floating point value is a decimal real literal best +approximating the value (rounded away from zero if halfway between) with a +single leading character that is either a minus sign or a space, a single digit +(that is nonzero unless the value is zero), a decimal point, S'Digits-1 (see +3.5.8) digits after the decimal point (but one if S'Digits is one), an upper +case E, the sign of the exponent (either + or -), and two or more digits (with +leading zeros if necessary) representing the exponent. If S'Signed_Zeros is +True, then the leading character is a minus sign for a negatively signed zero.> + @xindent<The image of a fixed point value is a decimal real literal best approximating the value (rounded away from zero if halfway between) with a single leading character that is either a minus sign or a space, one or more digits before the decimal point (with no redundant leading zeros), a decimal point, and S'Aft (see 3.5.10) digits after the decimal point.> -@dinss -@xhang<@xterm<S'Wide_Image> -S'Wide_Image denotes a function with the following specification:> -@xcode< @b<function> S'Wide_Image(@i<Arg> : S'Base) - @b<return> Wide_String> +!corrigendum 3.5(30) -@xindent<The function returns an image of the value of @i<Arg> as a Wide_String. The lower -bound of the result is one. The image has the same sequence of character as -defined for S'Wide_Wide_Image if all the graphic characters are defined in +@drepl +@xindent<The function returns an @i<image> of the value of @i<Arg>, that is, a +sequence of characters representing the value in display form. The lower bound +of the result is one.> +@dby +@xindent<The function returns an image of the value of @i<Arg> as a Wide_String, +that is, a sequence of characters representing the value in display form. The +lower bound of the result is one. The image has the same sequence of character +as defined for S'Wide_Wide_Image if all the graphic characters are defined in Wide_Character; otherwise the sequence of characters is implementation defined -(but no shorter than that of S'Wide_Wide_Image for the same value of @i<Arg>).> +(but no shorter than that of S'Wide_Wide_Image for the same value of Arg).> + +!corrigendum 3.5(31) + +@ddel +@xindent<The image of an integer value is the corresponding decimal literal, +without underlines, leading zeros, exponent, or trailing spaces, but with a +single leading character that is either a minus sign or a space.> + +!corrigendum 3.5(32) + +@ddel +@xindent<The image of an enumeration value is either the corresponding +identifier in upper case or the corresponding character literal (including the +two apostrophes); neither leading nor trailing spaces are included. For a +@i<nongraphic character> (a value of a character type that has no enumeration +literal associated with it), the result is a corresponding language-defined or +implementation-defined name in upper case (for example, the image of the +nongraphic character identified as @i<nul> is "NUL" -- the quotes are not part +of the image).> + +!corrigendum 3.5(33) +@ddel +@xindent<The image of a floating point value is a decimal real literal best +approximating the value (rounded away from zero if halfway between) with a +single leading character that is either a minus sign or a space, a single digit +(that is nonzero unless the value is zero), a decimal point, S'Digits-1 (see +3.5.8) digits after the decimal point (but one if S'Digits is one), an upper +case E, the sign of the exponent (either + or -), and two or more digits (with +leading zeros if necessary) representing the exponent. If S'Signed_Zeros is +True, then the leading character is a minus sign for a negatively signed zero.> + +!corrigendum 3.5(34) + +@ddel +@xindent<The image of a fixed point value is a decimal real literal best +approximating the value (rounded away from zero if halfway between) with a +single leading character that is either a minus sign or a space, one or more +digits before the decimal point (with no redundant leading zeros), a decimal +point, and S'Aft (see 3.5.10) digits after the decimal point.> + !corrigendum 3.5(37) @drepl @@ -1731,33 +1808,53 @@ S'Wide_Wide_Image over all the values of S. It denotes zero for a subtype that has a null range. Its type is @i<universal_integer>.> -!corrigendum 3.5(40) +!corrigendum 3.5(39) -@drepl -@xhang<@xterm<S'Wide_Value> -S'Wide_Value denotes a function with the following specification:> -@dby +@dinsa +@xhang<@xterm<S'Width> +S'Width denotes the maximum length of a String returned by S'Image over all +values of the subtype S. It denotes zero for a subtype that has a null range. +Its type is @i<universal_integer>.> +@dinss @xhang<@xterm<S'Wide_Wide_Value> S'Wide_Wide_Value denotes a function with the following specification:> -!corrigendum 3.5(41) - -@drepl -@xcode< @b<function> S'Wide_Value(@i<Arg> : Wide_String) - @b<return> S'Base> -@dby @xcode< @b<function> S'Wide_Wide_Value(@i<Arg> : Wide_Wide_String) @b<return> S'Base> -!corrigendum 3.5(42) - -@drepl -@xindent<This function returns a value given an image of the value as a -Wide_String, ignoring any leading or trailing spaces.> -@dby @xindent<This function returns a value given an image of the value as a Wide_Wide_String, ignoring any leading or trailing spaces.> +@xindent<For the evaluation of a call on S'Wide_Wide_Value for an enumeration subtype S, +if the sequence of characters of the parameter (ignoring leading and trailing +spaces) has the syntax of an enumeration literal and if it corresponds to a +literal of the type of S (or corresponds to the result of S'Wide_Wide_Image +for a nongraphic character of the type), the result is the corresponding +enumeration value; otherwise Constraint_Error is raised.> + +@xindent<For the evaluation of a call on S'Wide_Wide_Value for an integer subtype S, if +the sequence of characters of the parameter (ignoring leading and trailing +spaces) has the syntax of an integer literal, with an optional leading sign +character (plus or minus for a signed type; only plus for a modular type), and +the corresponding numeric value belongs to the base range of the type of S, +then that value is the result; otherwise Constraint_Error is raised.> + +@xindent<For the evaluation of a call on S'Wide_Wide_Value for a real subtype +S, if the sequence of characters of the parameter (ignoring leading and +trailing spaces) has the syntax of one of the following:> + +@xinbull<@fa<numeric_literal>> +@xinbull<@fa<numeral>.[@fa<exponent>]> +@xinbull<.numeral[exponent]> +@xinbull<@fa<base>#@fa<based_numeral>.#[@fa<exponent>]> +@xinbull<@fa<base>#.@fa<based_numeral>#[@fa<exponent>]> + +@xindent<with an optional leading sign character (plus or minus), and if the +corresponding numeric value belongs to the base range of the type of S, then +that value is the result; otherwise Constraint_Error is raised. The sign of a +zero value is preserved (positive if none has been specified) if S'Signed_Zeros +is True.> + !corrigendum 3.5(43) @drepl @@ -1768,67 +1865,67 @@ for a nongraphic character of the type), the result is the corresponding enumeration value; otherwise Constraint_Error is raised.> @dby -@xindent<For the evaluation of a call on S'Wide_Wide_Value for an enumeration subtype S, +@xindent<For the evaluation of a call on S'Wide_Value for an enumeration subtype S, if the sequence of characters of the parameter (ignoring leading and trailing spaces) has the syntax of an enumeration literal and if it corresponds to a -literal of the type of S (or corresponds to the result of S'Wide_Wide_Image +literal of the type of S (or corresponds to the result of S'Wide_Image for a nongraphic character of the type), the result is the corresponding -enumeration value; otherwise Constraint_Error is raised.> +enumeration value; otherwise Constraint_Error is raised. For a numeric subtype +S, the evaluation of a call on S'Wide_Value with @i<Arg> of type Wide_String is +equivalent to a call on S'Wide_Wide_Value for a corresponding @i<Arg> of type +Wide_Wide_String. > !corrigendum 3.5(44) -@drepl +@ddel @xindent<For the evaluation of a call on S'Wide_Value (or S'Value) for an integer subtype S, if the sequence of characters of the parameter (ignoring leading and trailing spaces) has the syntax of an integer literal, with an optional leading sign character (plus or minus for a signed type; only plus for a modular type), and the corresponding numeric value belongs to the base range of the type of S, then that value is the result; otherwise Constraint_Error is raised.> -@dby -@xindent<For the evaluation of a call on S'Wide_Wide_Value for an integer subtype S, if -the sequence of characters of the parameter (ignoring leading and trailing -spaces) has the syntax of an integer literal, with an optional leading sign -character (plus or minus for a signed type; only plus for a modular type), and -the corresponding numeric value belongs to the base range of the type of S, -then that value is the result; otherwise Constraint_Error is raised.> !corrigendum 3.5(45) -@drepl +@ddel @xindent<For the evaluation of a call on S'Wide_Value (or S'Value) for a real subtype S, if the sequence of characters of the parameter (ignoring leading and -trailing spaces) has the syntax of one of the following:> -@dby -@xindent<For the evaluation of a call on S'Wide_Wide_Value for a real subtype -S, if the sequence of characters of the parameter (ignoring leading and trailing spaces) has the syntax of one of the following:> +!corrigendum 3.5(46) + +@ddel +@xinbull<@fa<numeric_literal>> + +!corrigendum 3.5(47) + +@ddel +@xinbull<@fa<numeral>.[@fa<exponent>]> + +!corrigendum 3.5(48) + +@ddel +@xinbull<.numeral[exponent]> + +!corrigendum 3.5(49) + +@ddel +@xinbull<@fa<base>#@fa<based_numeral>.#[@fa<exponent>]> + +!corrigendum 3.5(50) + +@ddel +@xinbull<@fa<base>#.@fa<based_numeral>#[@fa<exponent>]> + !corrigendum 3.5(51) -@dinsa +@ddel @xindent<with an optional leading sign character (plus or minus), and if the corresponding numeric value belongs to the base range of the type of S, then that value is the result; otherwise Constraint_Error is raised. The sign of a zero value is preserved (positive if none has been specified) if S'Signed_Zeros is True.> -@dinss -@xhang<@xterm<S'Wide_Value> -S'Wide_Value denotes a function with the following specification:> - -@xcode< @b<function> S'Wide_Value(@i<Arg> : Wide_String) - @b<return> S'Base> -@xindent<This function returns a value given an image of the value as a -Wide_String, ignoring any leading or trailing spaces. For the evaluation of a -call on S'Wide_Value for an enumeration subtype S, if the sequence of -characters of the parameter (ignoring leading and trailing spaces) has the -syntax of an enumeration literal and if it corresponds to a literal of the type -of S (or corresponds to the result of S'Wide_Image for a value of the type), -the result is the corresponding enumeration value; otherwise Constraint_Error -is raised. For a numeric subtype S, the evaluation of a call on S'Wide_Value -with @i<Arg> of type Wide_String is equivalent to a call on S'Wide_Wide_Value for a -corresponding @i<Arg> of type Wide_Wide_String.> - !corrigendum 3.5(55) @drepl @@ -1873,7 +1970,7 @@ @xindent<@s9<21 For any value V (including any nongraphic character) of an enumeration subtype S, S'Value(S'Image(V)) equals V, as do S'Wide_Value(S'Wide_Image(V)) and S'Wide_Wide_Value(S'Wide_Wide_Image(V)). -Neither expression ever raises Constraint_Error.>> +None of these expressions ever raise Constraint_Error.>> !corrigendum 3.5.2(2) @@ -1998,7 +2095,7 @@ @xcode< -- @ft<@i<The predefined operators for the type Character are the same as for>> -- @ft<@i<any enumeration type.>> - -- @ft<@i<The declaration of type Wide_Character is based on the standard ISO 10646 BMP character set.>> + -- @ft<@i<The declaration of type Wide_Character is based on the standard ISO/IEC 10646:2003 BMP character set.>> -- @ft<@i<The first 256 positions have the same contents as type Character. See 3.5.2.>> @b<type> Wide_Character @b<is> (@i<nul>, @i<soh> ... @i<FFFE>, @i<FFFF>);

Questions? Ask the ACAA Technical Agent