2001-03-10 Manuel Guesdon <mguesdon@orange-concept.com>

* GSXML.m/.h: added errer, warning and fatal error methods with
		line and col parameters in GSSAXHandler.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9317 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon 2001-03-10 08:40:23 +00:00
parent b94afc7ba5
commit 698493ef14
3 changed files with 56 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2001-03-10 Manuel Guesdon <mguesdon@orange-concept.com>
* GSXML.m/.h: added errer, warning and fatal error methods with
line and col parameters in GSSAXHandler.
2001-03-08 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/gnustep/base/NSCalendarDate.h:

View file

@ -295,6 +295,15 @@ typedef xmlNsType GSXMLNamespaceType;
- (void) warning: (NSString*)e;
- (void) error: (NSString*)e;
- (void) fatalError: (NSString*)e;
- (void) warning: (NSString*)e
colNumber: (int)colNumber
lineNumber: (int)lineNumber;
- (void) error: (NSString*)e
colNumber: (int)colNumber
lineNumber: (int)lineNumber;
- (void) fatalError: (NSString*)e
colNumber: (int)colNumber
lineNumber: (int)lineNumber;
@end

View file

@ -1654,13 +1654,19 @@ warningFunction(void *ctx, const char *msg, ...)
{
char allMsg[2048];
va_list args;
int lineNumber=-1;
int colNumber=-1;
va_start(args, msg);
vsprintf(allMsg, msg, args);
va_end(args);
NSCAssert(ctx,@"No Context");
[HANDLER warning: UTF8Str(allMsg)];
lineNumber=getLineNumber(ctx);
colNumber=getColumnNumber(ctx);
[HANDLER warning: UTF8Str(allMsg)
colNumber:colNumber
lineNumber:lineNumber];
}
static void
@ -1668,12 +1674,18 @@ errorFunction(void *ctx, const char *msg, ...)
{
char allMsg[2048];
va_list args;
int lineNumber=-1;
int colNumber=-1;
va_start(args, msg);
vsprintf(allMsg, msg, args);
va_end(args);
NSCAssert(ctx,@"No Context");
[HANDLER error: UTF8Str(allMsg)];
lineNumber=getLineNumber(ctx);
colNumber=getColumnNumber(ctx);
[HANDLER error: UTF8Str(allMsg)
colNumber:colNumber
lineNumber:lineNumber];
}
static void
@ -1681,12 +1693,18 @@ fatalErrorFunction(void *ctx, const char *msg, ...)
{
char allMsg[2048];
va_list args;
int lineNumber=-1;
int colNumber=-1;
va_start(args, msg);
vsprintf(allMsg, msg, args);
va_end(args);
NSCAssert(ctx, @"No Context");
[HANDLER fatalError: UTF8Str(allMsg)];
lineNumber=getLineNumber(ctx);
colNumber=getColumnNumber(ctx);
[HANDLER fatalError: UTF8Str(allMsg)
colNumber:colNumber
lineNumber:lineNumber];
}
#undef HANDLER
@ -1841,6 +1859,27 @@ fatalErrorFunction(void *ctx, const char *msg, ...)
{
}
- (void) warning: (NSString*)e
colNumber: (int)colNumber
lineNumber: (int)lineNumber
{
[self warning:e];
}
- (void) error: (NSString*)e
colNumber: (int)colNumber
lineNumber: (int)lineNumber
{
[self error:e];
}
- (void) fatalError: (NSString*)e
colNumber: (int)colNumber
lineNumber: (int)lineNumber
{
[self fatalError:e];
}
- (int) hasInternalSubset
{
return 0;