CVS difference for ai12s/ai12-0203-1.txt

--- ai12s/ai12-0203-1.txt	2016/10/07 02:11:18	1.2
+++ ai12s/ai12-0203-1.txt	2016/11/11 03:39:53	1.3
@@ -1,12 +1,14 @@
-!standard 4.1.5(5.1/4)                                    16-10-06  AI12-0203-1/01
+!standard 4.1.5(5.1/4)                                    16-11-10  AI12-0203-1/02
 !standard 4.1.5(7/3)
 !class presentation 16-10-06
+!status Amendment 1-2012 16-11-10
+!status ARG Approved 10-0-0  16-10-08
 !status work item 16-10-06
 !status received 16-09-08
 !priority Low
 !difficulty Easy
 !qualifier Clarification
-!subject Overriding a nonoverriddable aspect
+!subject Overriding a nonoverridable aspect
 !summary
 
 Clarify 4.1.5(7/3).
@@ -22,12 +24,12 @@
    Given a reference type T, the Implicit_Dereference aspect is
    inherited by descendants of type T if not overridden. 
 
-Since the aspect can't be overridden, why the if not overridden above?
+Since the aspect can't be overridden, why the "if not overridden" above?
 
 !recommendation
 
 A nonoverridable aspect can have a confirming aspect value specified,
-and that is the case that have to be covered by the 4.1.5(7/3) sentence.
+and that is the case that has to be covered by the 4.1.5(7/3) sentence.
 A clarification is suggested.
 
 (See Summary.)
@@ -37,10 +39,11 @@
 Modify 4.1.5(7/3):
 
    Given a reference type T, the Implicit_Dereference aspect is inherited
-   by descendants of type T if not overridden{ (which is only permitted if
-   confirming)}. If a descendant type constrains the value of the reference
-   discriminant of T by a new discriminant, that new discriminant is the
-   reference discriminant of the descendant. Redundant[If the descendant type
+   by descendants of type T if not overridden{ Redundant[(which is only
+   permitted if confirming)]}. If a descendant type constrains the value of
+   the reference discriminant of T by a new discriminant, that new
+   discriminant is the reference discriminant of the descendant.
+   Redundant[If the descendant type
    constrains the value of the reference discriminant of T by an expression
    other than the name of a new discriminant, a generalized_reference that
    identifies an object of the descendant type denotes the object or
@@ -49,6 +52,30 @@
 !discussion
 
 (See !recommendation.)
+
+!corrigendum 4.1.5(7/3)
+
+@drepl
+Given a reference type @i<T>, the Implicit_Dereference aspect is inherited by
+descendants of type @i<T> if not overridden. If a descendant type constrains
+the value of the reference discriminant of @i<T> by a new discriminant, that
+new discriminant is the reference discriminant of the descendant. If the
+descendant type constrains the value of the reference discriminant of @i<T> by
+an @fa<expression> other than the @fa<name> of a new discriminant, a
+@fa<generalized_reference> that identifies an object of the descendant type
+denotes the object or subprogram designated by the value of this constraining
+expression.
+@dby
+Given a reference type @i<T>, the Implicit_Dereference aspect is inherited by
+descendants of type @i<T> if not overridden (which is only permitted if
+confirming). If a descendant type constrains
+the value of the reference discriminant of @i<T> by a new discriminant, that
+new discriminant is the reference discriminant of the descendant. If the
+descendant type constrains the value of the reference discriminant of @i<T> by
+an @fa<expression> other than the @fa<name> of a new discriminant, a
+@fa<generalized_reference> that identifies an object of the descendant type
+denotes the object or subprogram designated by the value of this constraining
+expression.
 
 !ASIS