Index: GSArray.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/base/Source/GSArray.m,v
retrieving revision 1.17
diff -r1.17 GSArray.m
29a30,31
> #include <Foundation/NSValue.h>
> #include <Foundation/NSDictionary.h>
134c136
< 			  format: @"Tried to add nil to array"];
---
> 			  format: @"Tried to init array with nil to object"];
271,272c273
<       [NSException raise: NSRangeException
< 		  format: @"Index out of bounds"];
---
>         [self _raiseRangeExceptionWithIndex:index from:_cmd];
351c352
< 			  format: @"Tried to add nil to array"];
---
> 			  format: @"Tried to init array with nil object"];
387c388
< 		      format: @"Unable to grow"];
---
> 		      format: @"Unable to grow array"];
407c408,426
< 
---
> - (void)_raiseRangeExceptionWithIndex:(int)index from:(SEL)sel
> {
>   NSDictionary *info;
>   NSException  *exception;
>   NSString     *reason;
> 
>   info = [NSDictionary dictionaryWithObjectsAndKeys:
>                               [NSNumber numberWithInt:index], @"Index",
>                               [NSNumber numberWithInt:_count], @"Count",
>                               self, @"Array", nil, nil];
>                               
>   reason = [NSString stringWithFormat: @"Index %d is out of range %d (in '%@')",
> 	                  index, _count, NSStringFromSelector(sel)];
> 
>   exception = [NSException exceptionWithName:NSRangeException
> 		                      reason:reason
>                                     userInfo:info];
>   [exception raise];
> }
413,415c432
<       [NSException raise: NSRangeException format:
< 	@"in %@:, index %d is out of range",
< 	NSStringFromSelector(_cmd), i1];
---
>         [self _raiseRangeExceptionWithIndex:i1 from:_cmd];
419,421c436
<       [NSException raise: NSRangeException format:
< 	@"in %@:, index %d is out of range",
< 	NSStringFromSelector(_cmd), i2];
---
>         [self _raiseRangeExceptionWithIndex:i2 from:_cmd];
453c468
< 		  format: @"Unable to make array"];
---
> 		  format: @"Unable to make array while initializing from coder"];
479c494
< 			  format: @"Tried to add nil to array"];
---
> 			  format: @"Tried to init array with nil object"];
493,494c508,518
<       [NSException raise: NSInvalidArgumentException
< 		  format: @"Tried to insert nil to array"];
---
>         NSException  *exception;
>         NSDictionary *info;
> 
>         info = [NSDictionary dictionaryWithObjectsAndKeys:
>                                     [NSNumber numberWithInt:index], @"Index",
>                                     self, @"Array", nil, nil];
> 
>         exception = [NSException exceptionWithName:NSInvalidArgumentException
> 		                            reason:@"Tried to insert nil to array"
>                                           userInfo:info];
>         [exception raise];
498,499c522
<       [NSException raise: NSRangeException format:
< 	      @"in insertObject:atIndex:, index %d is out of range", index];
---
>         [self _raiseRangeExceptionWithIndex:index from:_cmd];
611,613c634
<       [NSException raise: NSRangeException
< 		  format: @"in removeObjectAtIndex:, index %d is out of range",
< 			index];
---
>         [self _raiseRangeExceptionWithIndex:index from:_cmd];
662,664c683
<       [NSException raise: NSRangeException format:
< 	    @"in replaceObjectAtIndex:withObject:, index %d is out of range",
< 	    index];
---
>         [self _raiseRangeExceptionForIndex:index];
957c976
< 	      format: @"attempt to use uninitialised array"];
---
> 	      format: @"Attempt to use uninitialised array"];
1006c1025
< 	      format: @"attempt to use uninitialised array"];
---
> 	      format: @"Attempt to use uninitialised array"];