CVS difference for ai05s/ai05-0021-1.txt

--- ai05s/ai05-0021-1.txt	2008/11/26 23:58:33	1.6
+++ ai05s/ai05-0021-1.txt	2012/02/19 04:54:03	1.7
@@ -27,7 +27,7 @@
 list, map, or set) that contains the element designated by the cursor are
 tampered with.
 
-(3) Merge raises Program_Error if Source and Target are the same and non-empty.
+(3) Merge raises Program_Error if Source and Target are the same and nonempty.
 
 !question
 
@@ -65,7 +65,7 @@
 
 (3) Modify A.18.2(237/2) as follows:
 {If Source is empty, then Merge does nothing. If Source and Target are
-the same non-empty container object, then Program_Error is propagated.
+the same nonempty container object, then Program_Error is propagated.
 Otherwise, }Merge removes elements from Source and inserts them into Target;
 afterwards, Target contains the union of the elements that were initially
 in Source and Target; Source is left empty. If Target and Source are
@@ -85,7 +85,7 @@
 
 (3) With this change, Merge raises Program_Error in precisely those cases where the
 invariant on the result cannot be preserved. (It's not possible for a single
-object to be empty and non-empty at the same time.) The case in question (merging
+object to be empty and nonempty at the same time.) The case in question (merging
 with yourself) is weird enough that it is not worthwhile to make programmers
 worry about different invariants for (only) that case.
 
@@ -116,7 +116,7 @@
 of "<" is propagated.>
 @dby
 @xindent<If Source is empty, then Merge does nothing. If Source and Target are
-the same non-empty container object, then Program_Error is propagated.
+the same nonempty container object, then Program_Error is propagated.
 Otherwise, Merge removes elements from Source and inserts them into Target;
 afterwards, Target contains the union of the elements that were initially
 in Source and Target; Source is left empty. If Target and Source are
@@ -161,7 +161,7 @@
 of "<" is propagated.>
 @dby
 @xindent<If Source is empty, then Merge does nothing. If Source and Target are
-the same non-empty container object, then Program_Error is propagated.
+the same nonempty container object, then Program_Error is propagated.
 Otherwise, Merge removes elements from Source and inserts them into Target;
 afterwards, Target contains the union of the elements that were initially
 in Source and Target; Source is left empty. If Target and Source are