mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Some formatting changes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@11371 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald
parent
299c88a96b
commit
920c3bef8e
9 changed files with 260 additions and 119 deletions
|
|
@ -6,6 +6,10 @@
|
|||
* Source/NSConcreteNumber.m: ditto
|
||||
* Source/GSFormat.m: Fix bug in formatting short integers - was trying
|
||||
to treat them as full sized.
|
||||
* headers/Foundation/NSString.h: Fix error in initWithFormat:locale:,...
|
||||
* Source/NSString.m: ditto ... was missing varargs
|
||||
* Documentation/gsdoc/NSNumber.gsdoc: document changes.
|
||||
* Documentation/gsdoc/NSString.gsdoc: document changes.
|
||||
|
||||
2001-11-09 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
|
|
|
|||
|
|
@ -120,12 +120,46 @@
|
|||
<method type="NSString*">
|
||||
<sel>description</sel>
|
||||
<desc>
|
||||
Invokes descriptionWithLocale: using nil locale.
|
||||
</desc>
|
||||
</method>
|
||||
<method type="NSString*">
|
||||
<sel>descriptionWithLocale:</sel>
|
||||
<arg type="NSDictionary*">aLocale</arg>
|
||||
<desc>
|
||||
<p>
|
||||
Produces a string representation of the number. For a boolean
|
||||
this will be either 'true' or 'false'. For other numbers the
|
||||
format is produced using the initWithFormat:locale:... method
|
||||
of NSString, and the format depends on the type of number as
|
||||
follows -
|
||||
</p>
|
||||
<deflist>
|
||||
<term>char</term>
|
||||
<desc>%i</desc>
|
||||
<term> short</term>
|
||||
<desc>%hi</desc>
|
||||
<term> int</term>
|
||||
<desc>%i</desc>
|
||||
<term> long</term>
|
||||
<desc>%li</desc>
|
||||
<term> long long</term>
|
||||
<desc>%li</desc>
|
||||
<term> unsigned char</term>
|
||||
<desc>%u</desc>
|
||||
<term> unsigned short</term>
|
||||
<desc>%hu</desc>
|
||||
<term> unsigned int</term>
|
||||
<desc>%u</desc>
|
||||
<term> unsigned long</term>
|
||||
<desc>%lu</desc>
|
||||
<term> unsigned long long</term>
|
||||
<desc>%lu</desc>
|
||||
<term> float</term>
|
||||
<desc>%0.7g</desc>
|
||||
<term> double</term>
|
||||
<desc>%0.16g</desc>
|
||||
</deflist>
|
||||
</desc>
|
||||
</method>
|
||||
<method type="double">
|
||||
|
|
@ -245,6 +279,7 @@
|
|||
<method type="NSString*">
|
||||
<sel>stringValue</sel>
|
||||
<desc>
|
||||
Expivalent to descriptionWithLocale: using a nil locale.
|
||||
</desc>
|
||||
</method>
|
||||
<method type="unsigned char">
|
||||
|
|
|
|||
|
|
@ -163,11 +163,48 @@
|
|||
<h3><a name ="method-17">description</a></h3>
|
||||
- (NSString*) <b>description</b>;<br>
|
||||
|
||||
Invokes descriptionWithLocale: using nil locale.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-18">descriptionWithLocale:</a></h3>
|
||||
- (NSString*) <b>descriptionWithLocale:</b> (NSDictionary*)aLocale;<br>
|
||||
|
||||
<p>
|
||||
|
||||
Produces a string representation of the number. For a boolean
|
||||
this will be either 'true' or 'false'. For other numbers the
|
||||
format is produced using the initWithFormat:locale:... method
|
||||
of NSString, and the format depends on the type of number as
|
||||
follows -
|
||||
</p>
|
||||
|
||||
<dl>
|
||||
<dt>char
|
||||
<dd>%i
|
||||
<dt> short
|
||||
<dd>%hi
|
||||
<dt> int
|
||||
<dd>%i
|
||||
<dt> long
|
||||
<dd>%li
|
||||
<dt> long long
|
||||
<dd>%li
|
||||
<dt> unsigned char
|
||||
<dd>%u
|
||||
<dt> unsigned short
|
||||
<dd>%hu
|
||||
<dt> unsigned int
|
||||
<dd>%u
|
||||
<dt> unsigned long
|
||||
<dd>%lu
|
||||
<dt> unsigned long long
|
||||
<dd>%lu
|
||||
<dt> float
|
||||
<dd>%0.7g
|
||||
<dt> double
|
||||
<dd>%0.16g
|
||||
</dl>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-19">doubleValue</a></h3>
|
||||
|
|
@ -273,6 +310,7 @@
|
|||
<h3><a name ="method-39">stringValue</a></h3>
|
||||
- (NSString*) <b>stringValue</b>;<br>
|
||||
|
||||
Expivalent to descriptionWithLocale: using a nil locale.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-40">unsignedCharValue</a></h3>
|
||||
|
|
|
|||
|
|
@ -449,8 +449,10 @@
|
|||
|
||||
<method type="id">
|
||||
<sel>initWithFormat:</sel>
|
||||
<arg type="NSString*">format,</arg>
|
||||
<arg type="NSString*">format</arg>
|
||||
<vararg/>
|
||||
<desc>
|
||||
Invokes initWithFormat:locale:arguments with a nil locale.
|
||||
</desc>
|
||||
</method>
|
||||
|
||||
|
|
@ -460,13 +462,29 @@
|
|||
<sel>arguments:</sel>
|
||||
<arg type="va_list">argList</arg>
|
||||
<desc>
|
||||
Invokes initWithFormat:locale:arguments with a nil locale.
|
||||
</desc>
|
||||
</method>
|
||||
|
||||
<method type="id">
|
||||
<sel>initWithFormat:</sel>
|
||||
<arg type="NSString*">format</arg>
|
||||
<sel>locale:</sel>
|
||||
<arg type="NSDictionary*">dictionary</arg>
|
||||
<vararg/>
|
||||
<desc>
|
||||
Initialises the string using the specified format and local
|
||||
to format the following arguments.
|
||||
</desc>
|
||||
</method>
|
||||
|
||||
<method type="id">
|
||||
<sel>initWithFormat:</sel>
|
||||
<arg type="NSString*">format</arg>
|
||||
<sel>arguments:</sel>
|
||||
<arg type="va_list">argList</arg>
|
||||
<desc>
|
||||
Invokes initWithFormat:locale:,... with a nil locale.
|
||||
</desc>
|
||||
</method>
|
||||
|
||||
|
|
@ -478,6 +496,8 @@
|
|||
<sel>arguments:</sel>
|
||||
<arg type="va_list">argList</arg>
|
||||
<desc>
|
||||
Initialises the string using the specified format and local
|
||||
to format the following arguments.
|
||||
</desc>
|
||||
</method>
|
||||
|
||||
|
|
|
|||
|
|
@ -62,13 +62,13 @@
|
|||
<li ><a href ="NSString.html#method-0">+availableStringEncodings</a>
|
||||
<li ><a href ="NSString.html#method-1">+defaultCStringEncoding</a>
|
||||
<li ><a href ="NSString.html#method-37">+getLineStart:end:contentsEnd:</a>
|
||||
<li ><a href ="NSString.html#method-59">+lineRangeForRange:</a>
|
||||
<li ><a href ="NSString.html#method-60">+lineRangeForRange:</a>
|
||||
<li ><a href ="NSString.html#method-2">+localizedNameOfStringEncoding:</a>
|
||||
<li ><a href ="NSString.html#method-3">+localizedStringWithFormat:</a>
|
||||
<li ><a href ="NSString.html#method-4">+pathWithComponents:</a>
|
||||
<li ><a href ="NSString.html#method-5">+string</a>
|
||||
<li ><a href ="NSString.html#method-9">+stringWithCString:</a>
|
||||
<li ><a href ="NSString.html#method-8">+stringWithCString:</a>
|
||||
<li ><a href ="NSString.html#method-9">+stringWithCString:</a>
|
||||
<li ><a href ="NSString.html#method-6">+stringWithCharacters:length:</a>
|
||||
<li ><a href ="NSString.html#method-7">+stringWithContentsOfFile:</a>
|
||||
<li ><a href ="NSString.html#method-10">+stringWithFormat:</a>
|
||||
|
|
@ -95,59 +95,60 @@
|
|||
<li ><a href ="NSString.html#method-33">-getCString:</a>
|
||||
<li ><a href ="NSString.html#method-34">-getCString:maxLength:</a>
|
||||
<li ><a href ="NSString.html#method-35">-getCString:maxLength:range:remainingRange:</a>
|
||||
<li ><a href ="NSString.html#method-32">-getCharacters:</a>
|
||||
<li ><a href ="NSString.html#method-31">-getCharacters:</a>
|
||||
<li ><a href ="NSString.html#method-32">-getCharacters:</a>
|
||||
<li ><a href ="NSString.html#method-36">-getFileSystemRepresentation:maxLength:</a>
|
||||
<li ><a href ="NSString.html#method-39">-hasPrefix:</a>
|
||||
<li ><a href ="NSString.html#method-40">-hasSuffix:</a>
|
||||
<li ><a href ="NSString.html#method-38">-hash</a>
|
||||
<li ><a href ="NSString.html#method-41">-init</a>
|
||||
<li ><a href ="NSString.html#method-46">-initWithCString:</a>
|
||||
<li ><a href ="NSString.html#method-45">-initWithCString:</a>
|
||||
<li ><a href ="NSString.html#method-46">-initWithCString:</a>
|
||||
<li ><a href ="NSString.html#method-47">-initWithCStringNoCopy:length:freeWhenDone:</a>
|
||||
<li ><a href ="NSString.html#method-42">-initWithCharacters:</a>
|
||||
<li ><a href ="NSString.html#method-43">-initWithCharactersNoCopy:length:freeWhenDone:</a>
|
||||
<li ><a href ="NSString.html#method-44">-initWithContentsOfFile:</a>
|
||||
<li ><a href ="NSString.html#method-48">-initWithData:encoding:</a>
|
||||
<li ><a href ="NSString.html#method-49">-initWithFormat:</a>
|
||||
<li ><a href ="NSString.html#method-51">-initWithFormat:</a>
|
||||
<li ><a href ="NSString.html#method-52">-initWithFormat:arguments:</a>
|
||||
<li ><a href ="NSString.html#method-50">-initWithFormat:arguments:</a>
|
||||
<li ><a href ="NSString.html#method-52">-initWithFormat:locale:arguments:</a>
|
||||
<li ><a href ="NSString.html#method-53">-initWithString:</a>
|
||||
<li ><a href ="NSString.html#method-54">-intValue</a>
|
||||
<li ><a href ="NSString.html#method-55">-isAbsolutePath</a>
|
||||
<li ><a href ="NSString.html#method-56">-isEqualToString:</a>
|
||||
<li ><a href ="NSString.html#method-57">-lastPathComponent</a>
|
||||
<li ><a href ="NSString.html#method-58">-length</a>
|
||||
<li ><a href ="NSString.html#method-60">-lossyCString</a>
|
||||
<li ><a href ="NSString.html#method-61">-lowercaseString</a>
|
||||
<li ><a href ="NSString.html#method-62">-pathComponents</a>
|
||||
<li ><a href ="NSString.html#method-63">-pathExtension</a>
|
||||
<li ><a href ="NSString.html#method-64">-propertyList</a>
|
||||
<li ><a href ="NSString.html#method-65">-propertyListFromStringsFileFormat</a>
|
||||
<li ><a href ="NSString.html#method-66">-rangeOfCharacterFromSet:</a>
|
||||
<li ><a href ="NSString.html#method-67">-rangeOfCharacterFromSet:options:</a>
|
||||
<li ><a href ="NSString.html#method-68">-rangeOfCharacterFromSet:options:range:</a>
|
||||
<li ><a href ="NSString.html#method-69">-rangeOfComposedCharacterSequenceAtIndex:</a>
|
||||
<li ><a href ="NSString.html#method-70">-rangeOfString:</a>
|
||||
<li ><a href ="NSString.html#method-71">-rangeOfString:options:</a>
|
||||
<li ><a href ="NSString.html#method-72">-rangeOfString:options:range:</a>
|
||||
<li ><a href ="NSString.html#method-73">-smallestEncoding</a>
|
||||
<li ><a href ="NSString.html#method-74">-stringByAbbreviatingWithTildeInPath</a>
|
||||
<li ><a href ="NSString.html#method-75">-stringByAppendingFormat:</a>
|
||||
<li ><a href ="NSString.html#method-76">-stringByAppendingPathComponent:</a>
|
||||
<li ><a href ="NSString.html#method-77">-stringByAppendingPathExtension:</a>
|
||||
<li ><a href ="NSString.html#method-78">-stringByAppendingString:</a>
|
||||
<li ><a href ="NSString.html#method-79">-stringByDeletingLastPathComponent</a>
|
||||
<li ><a href ="NSString.html#method-80">-stringByDeletingPathExtension</a>
|
||||
<li ><a href ="NSString.html#method-81">-stringByExpandingTildeInPath</a>
|
||||
<li ><a href ="NSString.html#method-82">-stringByReplacingString:withString:</a>
|
||||
<li ><a href ="NSString.html#method-83">-stringsByAppendingPaths:</a>
|
||||
<li ><a href ="NSString.html#method-84">-substringFromIndex:</a>
|
||||
<li ><a href ="NSString.html#method-85">-substringToIndex:</a>
|
||||
<li ><a href ="NSString.html#method-86">-substringWithRange:</a>
|
||||
<li ><a href ="NSString.html#method-87">-uppercaseString</a>
|
||||
<li ><a href ="NSString.html#method-88">-writeToFile:atomically:</a>
|
||||
<li ><a href ="NSString.html#method-51">-initWithFormat:locale:</a>
|
||||
<li ><a href ="NSString.html#method-53">-initWithFormat:locale:arguments:</a>
|
||||
<li ><a href ="NSString.html#method-54">-initWithString:</a>
|
||||
<li ><a href ="NSString.html#method-55">-intValue</a>
|
||||
<li ><a href ="NSString.html#method-56">-isAbsolutePath</a>
|
||||
<li ><a href ="NSString.html#method-57">-isEqualToString:</a>
|
||||
<li ><a href ="NSString.html#method-58">-lastPathComponent</a>
|
||||
<li ><a href ="NSString.html#method-59">-length</a>
|
||||
<li ><a href ="NSString.html#method-61">-lossyCString</a>
|
||||
<li ><a href ="NSString.html#method-62">-lowercaseString</a>
|
||||
<li ><a href ="NSString.html#method-63">-pathComponents</a>
|
||||
<li ><a href ="NSString.html#method-64">-pathExtension</a>
|
||||
<li ><a href ="NSString.html#method-65">-propertyList</a>
|
||||
<li ><a href ="NSString.html#method-66">-propertyListFromStringsFileFormat</a>
|
||||
<li ><a href ="NSString.html#method-67">-rangeOfCharacterFromSet:</a>
|
||||
<li ><a href ="NSString.html#method-68">-rangeOfCharacterFromSet:options:</a>
|
||||
<li ><a href ="NSString.html#method-69">-rangeOfCharacterFromSet:options:range:</a>
|
||||
<li ><a href ="NSString.html#method-70">-rangeOfComposedCharacterSequenceAtIndex:</a>
|
||||
<li ><a href ="NSString.html#method-71">-rangeOfString:</a>
|
||||
<li ><a href ="NSString.html#method-72">-rangeOfString:options:</a>
|
||||
<li ><a href ="NSString.html#method-73">-rangeOfString:options:range:</a>
|
||||
<li ><a href ="NSString.html#method-74">-smallestEncoding</a>
|
||||
<li ><a href ="NSString.html#method-75">-stringByAbbreviatingWithTildeInPath</a>
|
||||
<li ><a href ="NSString.html#method-76">-stringByAppendingFormat:</a>
|
||||
<li ><a href ="NSString.html#method-77">-stringByAppendingPathComponent:</a>
|
||||
<li ><a href ="NSString.html#method-78">-stringByAppendingPathExtension:</a>
|
||||
<li ><a href ="NSString.html#method-79">-stringByAppendingString:</a>
|
||||
<li ><a href ="NSString.html#method-80">-stringByDeletingLastPathComponent</a>
|
||||
<li ><a href ="NSString.html#method-81">-stringByDeletingPathExtension</a>
|
||||
<li ><a href ="NSString.html#method-82">-stringByExpandingTildeInPath</a>
|
||||
<li ><a href ="NSString.html#method-83">-stringByReplacingString:withString:</a>
|
||||
<li ><a href ="NSString.html#method-84">-stringsByAppendingPaths:</a>
|
||||
<li ><a href ="NSString.html#method-85">-substringFromIndex:</a>
|
||||
<li ><a href ="NSString.html#method-86">-substringToIndex:</a>
|
||||
<li ><a href ="NSString.html#method-87">-substringWithRange:</a>
|
||||
<li ><a href ="NSString.html#method-88">-uppercaseString</a>
|
||||
<li ><a href ="NSString.html#method-89">-writeToFile:atomically:</a>
|
||||
</ul>
|
||||
<hr><h2>Class Methods </h2>
|
||||
<h3><a name ="method-0">availableStringEncodings</a></h3>
|
||||
|
|
@ -257,7 +258,7 @@
|
|||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-59">lineRangeForRange:</a></h3>
|
||||
<h3><a name ="method-60">lineRangeForRange:</a></h3>
|
||||
+ (NSRange) <b>lineRangeForRange:</b> (NSRange)aRange;<br>
|
||||
|
||||
|
||||
|
|
@ -452,122 +453,134 @@
|
|||
|
||||
<hr>
|
||||
<h3><a name ="method-49">initWithFormat:</a></h3>
|
||||
- (id) <b>initWithFormat:</b> (NSString*)format,;<br>
|
||||
- (id) <b>initWithFormat:</b> (NSString*)format, ...;<br>
|
||||
|
||||
Invokes initWithFormat:locale:arguments with a nil locale.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-50">initWithFormat:arguments:</a></h3>
|
||||
- (id) <b>initWithFormat:</b> (NSString*)format <b>arguments:</b> (va_list)argList;<br>
|
||||
|
||||
Invokes initWithFormat:locale:arguments with a nil locale.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-51">initWithFormat:</a></h3>
|
||||
- (id) <b>initWithFormat:</b> (NSString*)format;<br>
|
||||
<h3><a name ="method-51">initWithFormat:locale:</a></h3>
|
||||
- (id) <b>initWithFormat:</b> (NSString*)format <b>locale:</b> (NSDictionary*)dictionary, ...;<br>
|
||||
|
||||
Initialises the string using the specified format and local
|
||||
to format the following arguments.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-52">initWithFormat:locale:arguments:</a></h3>
|
||||
<h3><a name ="method-52">initWithFormat:arguments:</a></h3>
|
||||
- (id) <b>initWithFormat:</b> (NSString*)format <b>arguments:</b> (va_list)argList;<br>
|
||||
|
||||
Invokes initWithFormat:locale:,... with a nil locale.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-53">initWithFormat:locale:arguments:</a></h3>
|
||||
- (id) <b>initWithFormat:</b> (NSString*)format <b>locale:</b> (NSDictionary*)dictionary <b>arguments:</b> (va_list)argList;<br>
|
||||
|
||||
Initialises the string using the specified format and local
|
||||
to format the following arguments.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-53">initWithString:</a></h3>
|
||||
<h3><a name ="method-54">initWithString:</a></h3>
|
||||
- (id) <b>initWithString:</b> (NSString*)aString;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-54">intValue</a></h3>
|
||||
<h3><a name ="method-55">intValue</a></h3>
|
||||
- (int) <b>intValue</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-55">isAbsolutePath</a></h3>
|
||||
<h3><a name ="method-56">isAbsolutePath</a></h3>
|
||||
- (BOOL) <b>isAbsolutePath</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-56">isEqualToString:</a></h3>
|
||||
<h3><a name ="method-57">isEqualToString:</a></h3>
|
||||
- (BOOL) <b>isEqualToString:</b> (NSString*)aString;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-57">lastPathComponent</a></h3>
|
||||
<h3><a name ="method-58">lastPathComponent</a></h3>
|
||||
- (NSString*) <b>lastPathComponent</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-58">length</a></h3>
|
||||
<h3><a name ="method-59">length</a></h3>
|
||||
- (unsigned int) <b>length</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-60">lossyCString</a></h3>
|
||||
<h3><a name ="method-61">lossyCString</a></h3>
|
||||
- (const char*) <b>lossyCString</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-61">lowercaseString</a></h3>
|
||||
<h3><a name ="method-62">lowercaseString</a></h3>
|
||||
- (NSString*) <b>lowercaseString</b>;<br>
|
||||
|
||||
Returns a copy of the receiver with all characters converted
|
||||
to lowercase.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-62">pathComponents</a></h3>
|
||||
<h3><a name ="method-63">pathComponents</a></h3>
|
||||
- (NSArray*) <b>pathComponents</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-63">pathExtension</a></h3>
|
||||
<h3><a name ="method-64">pathExtension</a></h3>
|
||||
- (NSString*) <b>pathExtension</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-64">propertyList</a></h3>
|
||||
<h3><a name ="method-65">propertyList</a></h3>
|
||||
- (id) <b>propertyList</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-65">propertyListFromStringsFileFormat</a></h3>
|
||||
<h3><a name ="method-66">propertyListFromStringsFileFormat</a></h3>
|
||||
- (NSDictionary*) <b>propertyListFromStringsFileFormat</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-66">rangeOfCharacterFromSet:</a></h3>
|
||||
<h3><a name ="method-67">rangeOfCharacterFromSet:</a></h3>
|
||||
- (NSRange) <b>rangeOfCharacterFromSet:</b> (NSCharacterSet*)aSet;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-67">rangeOfCharacterFromSet:options:</a></h3>
|
||||
<h3><a name ="method-68">rangeOfCharacterFromSet:options:</a></h3>
|
||||
- (NSRange) <b>rangeOfCharacterFromSet:</b> (NSCharacterSet*)aSet <b>options:</b> (unsigned int)mask;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-68">rangeOfCharacterFromSet:options:range:</a></h3>
|
||||
<h3><a name ="method-69">rangeOfCharacterFromSet:options:range:</a></h3>
|
||||
- (NSRange) <b>rangeOfCharacterFromSet:</b> (NSCharacterSet*)aSet <b>options:</b> (unsigned int)mask <b>range:</b> (NSRange)aRange;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-69">rangeOfComposedCharacterSequenceAtIndex:</a></h3>
|
||||
<h3><a name ="method-70">rangeOfComposedCharacterSequenceAtIndex:</a></h3>
|
||||
- (NSRange) <b>rangeOfComposedCharacterSequenceAtIndex:</b> (unsigned int)anIndex;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-70">rangeOfString:</a></h3>
|
||||
<h3><a name ="method-71">rangeOfString:</a></h3>
|
||||
- (NSRange) <b>rangeOfString:</b> (NSString*)aString;<br>
|
||||
|
||||
Invokes <em>rangeOfString:options:</em> with the options mask
|
||||
set to zero.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-71">rangeOfString:options:</a></h3>
|
||||
<h3><a name ="method-72">rangeOfString:options:</a></h3>
|
||||
- (NSRange) <b>rangeOfString:</b> (NSString*)aString <b>options:</b> (unsigned int)mask;<br>
|
||||
|
||||
Invokes <em>rangeOfString:options:range</em> with the range set
|
||||
set to the range of the whole of the reciever.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-72">rangeOfString:options:range:</a></h3>
|
||||
<h3><a name ="method-73">rangeOfString:options:range:</a></h3>
|
||||
- (NSRange) <b>rangeOfString:</b> (NSString*)subString <b>options:</b> (unsigned int)mask <b>range:</b> (NSRange)aRange;<br>
|
||||
|
||||
Returns the range giving the location and length of the first
|
||||
|
|
@ -592,52 +605,52 @@
|
|||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-73">smallestEncoding</a></h3>
|
||||
<h3><a name ="method-74">smallestEncoding</a></h3>
|
||||
- (NSStringEncoding) <b>smallestEncoding</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-74">stringByAbbreviatingWithTildeInPath</a></h3>
|
||||
<h3><a name ="method-75">stringByAbbreviatingWithTildeInPath</a></h3>
|
||||
- (NSString*) <b>stringByAbbreviatingWithTildeInPath</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-75">stringByAppendingFormat:</a></h3>
|
||||
<h3><a name ="method-76">stringByAppendingFormat:</a></h3>
|
||||
- (NSString*) <b>stringByAppendingFormat:</b> (NSString*)format,;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-76">stringByAppendingPathComponent:</a></h3>
|
||||
<h3><a name ="method-77">stringByAppendingPathComponent:</a></h3>
|
||||
- (NSString*) <b>stringByAppendingPathComponent:</b> (NSString*)aString;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-77">stringByAppendingPathExtension:</a></h3>
|
||||
<h3><a name ="method-78">stringByAppendingPathExtension:</a></h3>
|
||||
- (NSString*) <b>stringByAppendingPathExtension:</b> (NSString*)string;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-78">stringByAppendingString:</a></h3>
|
||||
<h3><a name ="method-79">stringByAppendingString:</a></h3>
|
||||
- (NSString*) <b>stringByAppendingString:</b> (NSString*)aString;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-79">stringByDeletingLastPathComponent</a></h3>
|
||||
<h3><a name ="method-80">stringByDeletingLastPathComponent</a></h3>
|
||||
- (NSString*) <b>stringByDeletingLastPathComponent</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-80">stringByDeletingPathExtension</a></h3>
|
||||
<h3><a name ="method-81">stringByDeletingPathExtension</a></h3>
|
||||
- (NSString*) <b>stringByDeletingPathExtension</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-81">stringByExpandingTildeInPath</a></h3>
|
||||
<h3><a name ="method-82">stringByExpandingTildeInPath</a></h3>
|
||||
- (NSString*) <b>stringByExpandingTildeInPath</b>;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-82">stringByReplacingString:withString:</a></h3>
|
||||
<h3><a name ="method-83">stringByReplacingString:withString:</a></h3>
|
||||
- (NSString*) <b>stringByReplacingString:</b> (NSString*)aString <b>withString:</b> (NSString*)replacement;<br>
|
||||
Standards: GNUstep NotMacOS-X NotOpenStep<br>
|
||||
|
||||
|
|
@ -648,34 +661,34 @@ Standards: GNUstep NotMacOS-X NotOpenStep<br>
|
|||
not considered to exist within the receiver.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-83">stringsByAppendingPaths:</a></h3>
|
||||
<h3><a name ="method-84">stringsByAppendingPaths:</a></h3>
|
||||
- (NSArray*) <b>stringsByAppendingPaths:</b> (NSArray*)paths;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-84">substringFromIndex:</a></h3>
|
||||
<h3><a name ="method-85">substringFromIndex:</a></h3>
|
||||
- (NSString*) <b>substringFromIndex:</b> (unsigned int)anIndex;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-85">substringToIndex:</a></h3>
|
||||
<h3><a name ="method-86">substringToIndex:</a></h3>
|
||||
- (NSString*) <b>substringToIndex:</b> (unsigned int)anIndex;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-86">substringWithRange:</a></h3>
|
||||
<h3><a name ="method-87">substringWithRange:</a></h3>
|
||||
- (NSString*) <b>substringWithRange:</b> (NSRange)aRange;<br>
|
||||
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-87">uppercaseString</a></h3>
|
||||
<h3><a name ="method-88">uppercaseString</a></h3>
|
||||
- (NSString*) <b>uppercaseString</b>;<br>
|
||||
|
||||
Returns a copy of the receiver with all characters converted
|
||||
to uppercase.
|
||||
|
||||
<hr>
|
||||
<h3><a name ="method-88">writeToFile:atomically:</a></h3>
|
||||
<h3><a name ="method-89">writeToFile:atomically:</a></h3>
|
||||
- (BOOL) <b>writeToFile:</b> (NSString*)path <b>atomically:</b> (BOOL)flag;<br>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ enum {
|
|||
length: (unsigned int)length;
|
||||
- (id) initWithCString: (const char*)byteString;
|
||||
- (id) initWithString: (NSString*)string;
|
||||
- (id) initWithFormat: (NSString*)format,...;
|
||||
- (id) initWithFormat: (NSString*)format, ...;
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
arguments: (va_list)argList;
|
||||
- (id) initWithData: (NSData*)data
|
||||
|
|
@ -252,7 +252,7 @@ enum {
|
|||
+ (id) stringWithContentsOfURL: (NSURL*)anURL;
|
||||
+ (id) stringWithUTF8String: (const char*)bytes;
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
locale: (NSDictionary*)dictionary;
|
||||
locale: (NSDictionary*)dictionary, ...;
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
locale: (NSDictionary*)dictionary
|
||||
arguments: (va_list)argList;
|
||||
|
|
|
|||
|
|
@ -377,30 +377,35 @@
|
|||
{
|
||||
#if TYPE_ORDER == 0
|
||||
return (data) ? @"true" : @"false";
|
||||
#elif TYPE_ORDER == 1
|
||||
return [NSString stringWithFormat: @"%i", (int)data];
|
||||
#else
|
||||
NSString *result = [NSString alloc];
|
||||
|
||||
#if TYPE_ORDER == 1
|
||||
result = [result initWithFormat: @"%i" locale: locale, (int)data];
|
||||
#elif TYPE_ORDER == 2
|
||||
return [NSString stringWithFormat: @"%u", (unsigned int)data];
|
||||
result = [result initWithFormat: @"%u" locale: locale, (unsigned int)data];
|
||||
#elif TYPE_ORDER == 3
|
||||
return [NSString stringWithFormat: @"%hi", (short int)data];
|
||||
result = [result initWithFormat: @"%hi" locale: locale, data];
|
||||
#elif TYPE_ORDER == 4
|
||||
return [NSString stringWithFormat: @"%hu", (unsigned short int)data];
|
||||
result = [result initWithFormat: @"%hu" locale: locale, data];
|
||||
#elif TYPE_ORDER == 5
|
||||
return [NSString stringWithFormat: @"%i", data];
|
||||
result = [result initWithFormat: @"%i" locale: locale, data];
|
||||
#elif TYPE_ORDER == 6
|
||||
return [NSString stringWithFormat: @"%u", data];
|
||||
result = [result initWithFormat: @"%u" locale: locale, data];
|
||||
#elif TYPE_ORDER == 7
|
||||
return [NSString stringWithFormat: @"%li", data];
|
||||
result = [result initWithFormat: @"%li" locale: locale, data];
|
||||
#elif TYPE_ORDER == 8
|
||||
return [NSString stringWithFormat: @"%lu", data];
|
||||
result = [result initWithFormat: @"%lu" locale: locale, data];
|
||||
#elif TYPE_ORDER == 9
|
||||
return [NSString stringWithFormat: @"%lli", data];
|
||||
result = [result initWithFormat: @"%lli" locale: locale, data];
|
||||
#elif TYPE_ORDER == 10
|
||||
return [NSString stringWithFormat: @"%llu", data];
|
||||
result = [result initWithFormat: @"%llu" locale: locale, data];
|
||||
#elif TYPE_ORDER == 11
|
||||
return [NSString stringWithFormat: @"%0.7g", (double)data];
|
||||
result = [result initWithFormat: @"%0.7g" locale: locale, (double)data];
|
||||
#elif TYPE_ORDER == 12
|
||||
return [NSString stringWithFormat: @"%0.16g", data];
|
||||
result = [result initWithFormat: @"%0.16g" locale: locale, data];
|
||||
#endif
|
||||
return AUTORELEASE(result);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -666,11 +666,12 @@ static Class doubleNumberClass;
|
|||
|
||||
- (NSString*) descriptionWithLocale: (NSDictionary*)locale
|
||||
{
|
||||
NSString *result = nil;
|
||||
|
||||
if (GSObjCClass(self) == abstractClass)
|
||||
{
|
||||
[NSException raise: NSInternalInconsistencyException
|
||||
format: @"descriptionWithLocale: for abstract NSNumber"];
|
||||
return nil;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -680,48 +681,74 @@ static Class doubleNumberClass;
|
|||
{
|
||||
case 0:
|
||||
return [self boolValue] ? @"true" : @"false";
|
||||
break;
|
||||
|
||||
case 1:
|
||||
return [NSString stringWithFormat: @"%i",
|
||||
result = [[NSString alloc] initWithFormat: @"%i" locale: locale,
|
||||
(int)[self charValue]];
|
||||
break;
|
||||
|
||||
case 2:
|
||||
return [NSString stringWithFormat: @"%u",
|
||||
result = [[NSString alloc] initWithFormat: @"%u" locale: locale,
|
||||
(unsigned int)[self unsignedCharValue]];
|
||||
break;
|
||||
|
||||
case 3:
|
||||
return [NSString stringWithFormat: @"%hi",
|
||||
(short int)[self shortValue]];
|
||||
result = [[NSString alloc] initWithFormat: @"%hi" locale: locale,
|
||||
[self shortValue]];
|
||||
break;
|
||||
|
||||
case 4:
|
||||
return [NSString stringWithFormat: @"%hu",
|
||||
(unsigned short int)[self unsignedShortValue]];
|
||||
result = [[NSString alloc] initWithFormat: @"%hu" locale: locale,
|
||||
[self unsignedShortValue]];
|
||||
break;
|
||||
|
||||
case 5:
|
||||
return [NSString stringWithFormat: @"%i",
|
||||
result = [[NSString alloc] initWithFormat: @"%i" locale: locale,
|
||||
[self intValue]];
|
||||
break;
|
||||
|
||||
case 6:
|
||||
return [NSString stringWithFormat: @"%u",
|
||||
result = [[NSString alloc] initWithFormat: @"%u" locale: locale,
|
||||
[self unsignedIntValue]];
|
||||
break;
|
||||
|
||||
case 7:
|
||||
return [NSString stringWithFormat: @"%li",
|
||||
result = [[NSString alloc] initWithFormat: @"%li" locale: locale,
|
||||
[self longValue]];
|
||||
break;
|
||||
|
||||
case 8:
|
||||
return [NSString stringWithFormat: @"%lu",
|
||||
result = [[NSString alloc] initWithFormat: @"%lu" locale: locale,
|
||||
[self unsignedLongValue]];
|
||||
break;
|
||||
|
||||
case 9:
|
||||
return [NSString stringWithFormat: @"%lli",
|
||||
result = [[NSString alloc] initWithFormat: @"%lli" locale: locale,
|
||||
[self longLongValue]];
|
||||
break;
|
||||
|
||||
case 10:
|
||||
return [NSString stringWithFormat: @"%llu",
|
||||
result = [[NSString alloc] initWithFormat: @"%llu" locale: locale,
|
||||
[self unsignedLongLongValue]];
|
||||
break;
|
||||
|
||||
case 11:
|
||||
return [NSString stringWithFormat: @"%0.7g",
|
||||
result = [[NSString alloc] initWithFormat: @"%0.7g" locale: locale,
|
||||
(double)[self floatValue]];
|
||||
break;
|
||||
|
||||
case 12:
|
||||
return [NSString stringWithFormat: @"%0.16g",
|
||||
result = [[NSString alloc] initWithFormat: @"%0.16g" locale: locale,
|
||||
[self doubleValue]];
|
||||
break;
|
||||
|
||||
default:
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"unknown number type value for description"];
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
return AUTORELEASE(result);
|
||||
}
|
||||
|
||||
/* All the rest of these methods must be implemented by a subclass */
|
||||
|
|
|
|||
|
|
@ -723,14 +723,13 @@ handle_printf_atsign (FILE *stream,
|
|||
}
|
||||
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
locale: (NSDictionary*)locale
|
||||
locale: (NSDictionary*)locale, ...
|
||||
{
|
||||
va_list ap;
|
||||
/*
|
||||
* Dummy variable 'ap' is unused, but needs to be present because on
|
||||
* some machines we can't just pass a null as a va_list
|
||||
*/
|
||||
va_list ap;
|
||||
va_start(ap, locale);
|
||||
return [self initWithFormat: format locale: locale arguments: ap];
|
||||
va_end(ap);
|
||||
return self;
|
||||
}
|
||||
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
|
|
|
|||
Loading…
Reference in a new issue