mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 16:50:58 +00:00
Documentation improvements.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15422 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
12caf1c108
commit
6c28122b3b
4 changed files with 81 additions and 4 deletions
|
@ -8,6 +8,9 @@
|
||||||
* Source/NSHashTable.m: Update for macosx compatibility, add some
|
* Source/NSHashTable.m: Update for macosx compatibility, add some
|
||||||
documentation and move stuff from externs.m
|
documentation and move stuff from externs.m
|
||||||
* Source/externs.m: Remove map and hash table stuff
|
* Source/externs.m: Remove map and hash table stuff
|
||||||
|
* Source/NSException.m: Fix documentation cross ref error.
|
||||||
|
* Source/NSAssertion.m: Improve documentation.
|
||||||
|
* Headers/gnustep/base/NSException.h: Include assertion documentation.
|
||||||
* Headers/gnustep/base/NSMapTable.h: Update for macosx compatibility.
|
* Headers/gnustep/base/NSMapTable.h: Update for macosx compatibility.
|
||||||
* Headers/gnustep/base/NSHashTable.h: Ditto
|
* Headers/gnustep/base/NSHashTable.h: Ditto
|
||||||
* Tools/AGSHtml.m: Fix typo ... excess semicolon in constant output.
|
* Tools/AGSHtml.m: Fix typo ... excess semicolon in constant output.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* Interface for NSException for GNUStep
|
/** Interface for NSException for GNUStep
|
||||||
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
||||||
|
|
||||||
Written by: Adam Fedor <fedor@boulder.colorado.edu>
|
Written by: Adam Fedor <fedor@boulder.colorado.edu>
|
||||||
|
@ -19,6 +19,10 @@
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this library; if not, write to the Free
|
License along with this library; if not, write to the Free
|
||||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
|
||||||
|
|
||||||
|
AutogsdocSource: NSAssertionHandler.m
|
||||||
|
AutogsdocSource: NSException.m
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __NSException_h_GNUSTEP_BASE_INCLUDE
|
#ifndef __NSException_h_GNUSTEP_BASE_INCLUDE
|
||||||
|
@ -178,47 +182,98 @@ GS_EXPORT void _NSRemoveHandler( NSHandler *handler );
|
||||||
} while(0)
|
} while(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Asserts to use in Objective-C method bodies*/
|
/** Used in an ObjC method body.<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2,
|
||||||
|
* arg3, arg4, arg5 */
|
||||||
#define NSAssert5(condition, desc, arg1, arg2, arg3, arg4, arg5) \
|
#define NSAssert5(condition, desc, arg1, arg2, arg3, arg4, arg5) \
|
||||||
_NSAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4), (arg5))
|
_NSAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4), (arg5))
|
||||||
|
|
||||||
|
/** Used in an ObjC method body.<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2,
|
||||||
|
* arg3, arg4 */
|
||||||
#define NSAssert4(condition, desc, arg1, arg2, arg3, arg4) \
|
#define NSAssert4(condition, desc, arg1, arg2, arg3, arg4) \
|
||||||
_NSAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4))
|
_NSAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4))
|
||||||
|
|
||||||
|
/** Used in an ObjC method body.<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2,
|
||||||
|
* arg3 */
|
||||||
#define NSAssert3(condition, desc, arg1, arg2, arg3) \
|
#define NSAssert3(condition, desc, arg1, arg2, arg3) \
|
||||||
_NSAssertArgs((condition), (desc), (arg1), (arg2), (arg3))
|
_NSAssertArgs((condition), (desc), (arg1), (arg2), (arg3))
|
||||||
|
|
||||||
|
/** Used in an ObjC method body.<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2 */
|
||||||
#define NSAssert2(condition, desc, arg1, arg2) \
|
#define NSAssert2(condition, desc, arg1, arg2) \
|
||||||
_NSAssertArgs((condition), (desc), (arg1), (arg2))
|
_NSAssertArgs((condition), (desc), (arg1), (arg2))
|
||||||
|
|
||||||
|
/** Used in an ObjC method body.<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1 */
|
||||||
#define NSAssert1(condition, desc, arg1) \
|
#define NSAssert1(condition, desc, arg1) \
|
||||||
_NSAssertArgs((condition), (desc), (arg1))
|
_NSAssertArgs((condition), (desc), (arg1))
|
||||||
|
|
||||||
|
/** Used in an ObjC method body.<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc */
|
||||||
#define NSAssert(condition, desc) \
|
#define NSAssert(condition, desc) \
|
||||||
_NSAssertArgs((condition), (desc))
|
_NSAssertArgs((condition), (desc))
|
||||||
|
|
||||||
|
/** Used in an ObjC method body.<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception saying that an invalid
|
||||||
|
* parameter was supplied to the method. */
|
||||||
#define NSParameterAssert(condition) \
|
#define NSParameterAssert(condition) \
|
||||||
_NSAssertArgs((condition), @"Invalid parameter not satisfying: %s", #condition)
|
_NSAssertArgs((condition), @"Invalid parameter not satisfying: %s", #condition)
|
||||||
|
|
||||||
/* Asserts to use in C function bodies */
|
/** Used in plain C code (not in an ObjC method body).<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2,
|
||||||
|
* arg3, arg4, arg5 */
|
||||||
#define NSCAssert5(condition, desc, arg1, arg2, arg3, arg4, arg5) \
|
#define NSCAssert5(condition, desc, arg1, arg2, arg3, arg4, arg5) \
|
||||||
_NSCAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4), (arg5))
|
_NSCAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4), (arg5))
|
||||||
|
|
||||||
|
/** Used in plain C code (not in an ObjC method body).<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2,
|
||||||
|
* arg3, arg4 */
|
||||||
#define NSCAssert4(condition, desc, arg1, arg2, arg3, arg4) \
|
#define NSCAssert4(condition, desc, arg1, arg2, arg3, arg4) \
|
||||||
_NSCAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4))
|
_NSCAssertArgs((condition), (desc), (arg1), (arg2), (arg3), (arg4))
|
||||||
|
|
||||||
|
/** Used in plain C code (not in an ObjC method body).<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2,
|
||||||
|
* arg3 */
|
||||||
#define NSCAssert3(condition, desc, arg1, arg2, arg3) \
|
#define NSCAssert3(condition, desc, arg1, arg2, arg3) \
|
||||||
_NSCAssertArgs((condition), (desc), (arg1), (arg2), (arg3))
|
_NSCAssertArgs((condition), (desc), (arg1), (arg2), (arg3))
|
||||||
|
|
||||||
|
/** Used in plain C code (not in an ObjC method body).<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1, arg2
|
||||||
|
*/
|
||||||
#define NSCAssert2(condition, desc, arg1, arg2) \
|
#define NSCAssert2(condition, desc, arg1, arg2) \
|
||||||
_NSCAssertArgs((condition), (desc), (arg1), (arg2))
|
_NSCAssertArgs((condition), (desc), (arg1), (arg2))
|
||||||
|
|
||||||
|
/** Used in plain C code (not in an ObjC method body).<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc and arg1
|
||||||
|
*/
|
||||||
#define NSCAssert1(condition, desc, arg1) \
|
#define NSCAssert1(condition, desc, arg1) \
|
||||||
_NSCAssertArgs((condition), (desc), (arg1))
|
_NSCAssertArgs((condition), (desc), (arg1))
|
||||||
|
|
||||||
|
/** Used in plain C code (not in an ObjC method body).<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception using desc
|
||||||
|
*/
|
||||||
#define NSCAssert(condition, desc) \
|
#define NSCAssert(condition, desc) \
|
||||||
_NSCAssertArgs((condition), (desc))
|
_NSCAssertArgs((condition), (desc))
|
||||||
|
|
||||||
|
/** Used in plain C code (not in an ObjC method body).<br />
|
||||||
|
* See [NSAssertionHandler] for details.<br />
|
||||||
|
* When condition is false, raise an exception saying that an invalid
|
||||||
|
* parameter was supplied to the method. */
|
||||||
#define NSCParameterAssert(condition) \
|
#define NSCParameterAssert(condition) \
|
||||||
_NSCAssertArgs((condition), @"Invalid parameter not satisfying: %s", #condition)
|
_NSCAssertArgs((condition), @"Invalid parameter not satisfying: %s", #condition)
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,25 @@
|
||||||
#include <Foundation/NSString.h>
|
#include <Foundation/NSString.h>
|
||||||
#include <Foundation/NSThread.h>
|
#include <Foundation/NSThread.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>NSAssertionHandler objects are used to raise exceptions on behalf of
|
||||||
|
* macros implementing assertions.<br />
|
||||||
|
* Each thread has its own assertion handler instance.<br />
|
||||||
|
* </p>
|
||||||
|
* <p>The macros work together with the assertion handler object to
|
||||||
|
* produce meaningful exception messages containing the name of the
|
||||||
|
* source file, the position within that file, and the name of the
|
||||||
|
* ObjC method or C function in which the assertion failed.
|
||||||
|
* </p>
|
||||||
|
* The assertion macros are:
|
||||||
|
* NSAssert(), NSCAssert(),
|
||||||
|
* NSAssert1(), NSCAssert1(),
|
||||||
|
* NSAssert2(), NSCAssert2(),
|
||||||
|
* NSAssert3(), NSCAssert3(),
|
||||||
|
* NSAssert4(), NSCAssert4(),
|
||||||
|
* NSAssert5(), NSCAssert5(),
|
||||||
|
* NSParameterAssert(), NSCParameterAssert()
|
||||||
|
*/
|
||||||
@implementation NSAssertionHandler
|
@implementation NSAssertionHandler
|
||||||
|
|
||||||
/* Key for thread dictionary. */
|
/* Key for thread dictionary. */
|
||||||
|
|
|
@ -144,7 +144,7 @@ _NSFoundationUncaughtExceptionHandler (NSException *exception)
|
||||||
<p>
|
<p>
|
||||||
The local variable localException is the name of the exception
|
The local variable localException is the name of the exception
|
||||||
object you can use in the NS_HANDLER section.
|
object you can use in the NS_HANDLER section.
|
||||||
The easiest way to cause an exeption is using the +raise:format:
|
The easiest way to cause an exeption is using the +raise:format:,...
|
||||||
method.
|
method.
|
||||||
</p>
|
</p>
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue