organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-07 06:04:59 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Add XML_DefaultCurrent

Browse source
This commit is contained in:
James Clark 1998-06-21 06:53:13 +00:00
parent 78d38a3fd0
commit 5700ecb60f
3 changed files with 111 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
expat/xmlparse/xmlparse.c
View file

@ -233,6 +233,7 @@ typedef struct {
Processor *processor;
enum XML_Error errorCode;
const char *eventPtr;
const char *eventEndPtr;
const char *positionPtr;
int tagLevel;
ENTITY *declEntity;
@ -277,6 +278,7 @@ typedef struct {
#define processor (((Parser *)parser)->processor)
#define errorCode (((Parser *)parser)->errorCode)
#define eventPtr (((Parser *)parser)->eventPtr)
#define eventEndPtr (((Parser *)parser)->eventEndPtr)
#define positionPtr (((Parser *)parser)->positionPtr)
#define position (((Parser *)parser)->position)
#define tagLevel (((Parser *)parser)->tagLevel)
@ -337,6 +339,7 @@ XML_Parser XML_ParserCreate(const XML_Char *encodingName)
memset(&position, 0, sizeof(POSITION));
errorCode = XML_ERROR_NONE;
eventPtr = 0;
eventEndPtr = 0;
positionPtr = 0;
tagLevel = 0;
tagStack = 0;
@ -520,7 +523,10 @@ int XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
if (!isFinal)
return 1;
errorCode = processor(parser, bufferPtr, parseEndPtr = bufferEnd, 0);
return errorCode == XML_ERROR_NONE;
if (errorCode == XML_ERROR_NONE)
return 1;
eventEndPtr = eventPtr;
return 0;
}
else if (bufferPtr == bufferEnd) {
const char *end;
@ -531,11 +537,14 @@ int XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
errorCode = processor(parser, s, parseEndPtr = s + len, 0);
if (errorCode == XML_ERROR_NONE)
return 1;
eventEndPtr = eventPtr;
return 0;
}
errorCode = processor(parser, s, parseEndPtr = s + len, &end);
if (errorCode != XML_ERROR_NONE)
if (errorCode != XML_ERROR_NONE) {
eventEndPtr = eventPtr;
return 0;
}
XmlUpdatePosition(encoding, positionPtr, end, &position);
nLeftOver = s + len - end;
if (nLeftOver) {
@ -544,6 +553,7 @@ int XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
buffer = realloc(buffer, len * 2);
if (!buffer) {
errorCode = XML_ERROR_NO_MEMORY;
eventPtr = eventEndPtr = 0;
return 0;
}
bufferLim = buffer + len * 2;
@ -573,8 +583,10 @@ int XML_ParseBuffer(XML_Parser parser, int len, int isFinal)
XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
return 1;
}
else
else {
eventEndPtr = eventPtr;
return 0;
}
}
void *XML_GetBuffer(XML_Parser parser, int len)
@ -642,6 +654,12 @@ int XML_GetCurrentColumnNumber(XML_Parser parser)
return position.columnNumber;
}
void XML_DefaultCurrent(XML_Parser parser)
{
if (defaultHandler)
reportDefault(parser, encoding, eventPtr, eventEndPtr);
}
const XML_LChar *XML_ErrorString(int code)
{
static const XML_LChar *message[] = {
@ -782,17 +800,26 @@ doContent(XML_Parser parser,
{
const ENCODING *internalEnc = XmlGetInternalEncoding();
const char *dummy;
const char **eventPP = enc == encoding ? &eventPtr : &dummy;
*eventPP = s;
const char **eventPP;
const char **eventEndPP;
if (enc == encoding) {
eventPP = &eventPtr;
*eventPP = s;
eventEndPP = &eventEndPtr;
}
else
eventPP = eventEndPP = &dummy;
for (;;) {
const char *next;
int tok = XmlContentTok(enc, s, end, &next);
*eventEndPP = next;
switch (tok) {
case XML_TOK_TRAILING_CR:
if (nextPtr) {
*nextPtr = s;
return XML_ERROR_NONE;
}
*eventEndPP = end;
if (characterDataHandler) {
XML_Char c = XML_T('\n');
characterDataHandler(handlerArg, &c, 1);
@ -869,6 +896,9 @@ doContent(XML_Parser parser,
reportDefault(parser, enc, s, next);
break;
}
/* Protect against the possibility that somebody sets
the defaultHandler from inside another handler. */
*eventEndPP = *eventPP;
entity->open = 1;
result = doContent(parser,
tagLevel,
@ -996,8 +1026,11 @@ doContent(XML_Parser parser,
return result;
startElementHandler(handlerArg, name, (const XML_Char **)atts);
}
if (endElementHandler)
if (endElementHandler) {
if (startElementHandler)
*eventEndPP = *eventPP;
endElementHandler(handlerArg, name);
}
poolClear(&tempPool);
}
else if (defaultHandler)
@ -1067,7 +1100,9 @@ doContent(XML_Parser parser,
case XML_TOK_CDATA_SECT_OPEN:
{
enum XML_Error result;
if (defaultHandler && !characterDataHandler)
if (characterDataHandler)
characterDataHandler(handlerArg, dataBuf, 0);
else if (defaultHandler)
reportDefault(parser, enc, s, next);
result = doCdataSection(parser, enc, &next, end, nextPtr);
if (!next) {
@ -1109,6 +1144,7 @@ doContent(XML_Parser parser,
for (;;) {
ICHAR *dataPtr = (ICHAR *)dataBuf;
XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd);
*eventEndPP = s;
characterDataHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf);
if (s == next)
break;
@ -1257,17 +1293,27 @@ enum XML_Error doCdataSection(XML_Parser parser,
const char *end,
const char **nextPtr)
{
const char *dummy;
const char **eventPP = enc == encoding ? &eventPtr : &dummy;
const char *s = *startPtr;
*eventPP = s;
const char *dummy;
const char **eventPP;
const char **eventEndPP;
if (enc == encoding) {
eventPP = &eventPtr;
*eventPP = s;
eventEndPP = &eventEndPtr;
}
else
eventPP = eventEndPP = &dummy;
*startPtr = 0;
for (;;) {
const char *next;
int tok = XmlCdataSectionTok(enc, s, end, &next);
*eventEndPP = next;
switch (tok) {
case XML_TOK_CDATA_SECT_CLOSE:
if (defaultHandler && !characterDataHandler)
if (characterDataHandler)
characterDataHandler(handlerArg, dataBuf, 0);
else if (defaultHandler)
reportDefault(parser, enc, s, next);
*startPtr = next;
return XML_ERROR_NONE;
@ -1285,6 +1331,7 @@ enum XML_Error doCdataSection(XML_Parser parser,
for (;;) {
ICHAR *dataPtr = (ICHAR *)dataBuf;
XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd);
*eventEndPP = next;
characterDataHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf);
if (s == next)
break;
@ -1586,7 +1633,7 @@ prologProcessor(XML_Parser parser,
return XML_ERROR_NO_MEMORY;
poolFinish(&dtd.pool);
if (unparsedEntityDeclHandler) {
eventPtr = s;
eventPtr = eventEndPtr = s;
unparsedEntityDeclHandler(handlerArg,
declEntity->name,
declEntity->base,
@ -1660,7 +1707,7 @@ prologProcessor(XML_Parser parser,
next - encoding->minBytesPerChar);
if (!systemId)
return XML_ERROR_NO_MEMORY;
eventPtr = s;
eventPtr = eventEndPtr = s;
notationDeclHandler(handlerArg,
declNotationName,
dtd.base,
@ -1671,7 +1718,7 @@ prologProcessor(XML_Parser parser,
break;
case XML_ROLE_NOTATION_NO_SYSTEM_ID:
if (declNotationPublicId && notationDeclHandler) {
eventPtr = s;
eventPtr = eventEndPtr = s;
notationDeclHandler(handlerArg,
declNotationName,
dtd.base,
@ -1722,6 +1769,7 @@ prologProcessor(XML_Parser parser,
switch (tok) {
case XML_TOK_PI:
eventPtr = s;
eventEndPtr = next;
if (!reportProcessingInstruction(parser, encoding, s, next))
return XML_ERROR_NO_MEMORY;
break;
@ -1736,6 +1784,7 @@ prologProcessor(XML_Parser parser,
break;
default:
eventPtr = s;
eventEndPtr = next;
reportDefault(parser, encoding, s, next);
}
}
@ -1755,10 +1804,13 @@ enum XML_Error epilogProcessor(XML_Parser parser,
for (;;) {
const char *next;
int tok = XmlPrologTok(encoding, s, end, &next);
eventEndPtr = next;
switch (tok) {
case XML_TOK_TRAILING_CR:
if (defaultHandler)
if (defaultHandler) {
eventEndPtr = end;
reportDefault(parser, encoding, s, end);
}
/* fall through */
case XML_TOK_NONE:
if (nextPtr)
@ -2071,11 +2123,17 @@ reportDefault(XML_Parser parser, const ENCODING *enc, const char *s, const char
for (;;) {
ICHAR *dataPtr = (ICHAR *)dataBuf;
XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd);
defaultHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf);
if (s == end)
if (s == end) {
defaultHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf);
break;
if (enc == encoding)
}
if (enc == encoding) {
eventEndPtr = s;
defaultHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf);
eventPtr = s;
}
else
defaultHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf);
}
}
else

8
expat/xmlparse/xmlparse.h
View file

@ -259,6 +259,14 @@ XML_SetUnknownEncodingHandler(XML_Parser parser,
XML_UnknownEncodingHandler handler,
void *encodingHandlerData);
/* This can be called within a handler for a start element, end element,
processing instruction or character data. It causes the corresponding
markup to be passed to the default handler.
Within the expansion of an internal entity, nothing will be passed
to the default handler, although this usually will not happen since
setting a default handler inhibits expansion of internal entities. */
void XMLPARSEAPI XML_DefaultCurrent(XML_Parser parser);
/* This value is passed as the userData argument to callbacks. */
void XMLPARSEAPI
XML_SetUserData(XML_Parser parser, void *userData);

29
expat/xmlwf/xmlwf.c
View file

@ -175,10 +175,31 @@ static void processingInstruction(void *userData, const XML_Char *target, const
puttc(T('>'), fp);
}
static void markup(void *userData, const XML_Char *s, int len)
static void defaultCharacterData(XML_Parser parser, const XML_Char *s, int len)
{
XML_DefaultCurrent(parser);
}
static void defaultStartElement(XML_Parser parser, const XML_Char *name, const XML_Char **atts)
{
XML_DefaultCurrent(parser);
}
static void defaultEndElement(XML_Parser parser, const XML_Char *name)
{
XML_DefaultCurrent(parser);
}
static void defaultProcessingInstruction(XML_Parser parser, const XML_Char *target, const XML_Char *data)
{
XML_DefaultCurrent(parser);
}
static void markup(XML_Parser parser, const XML_Char *s, int len)
{
FILE *fp = XML_GetUserData(parser);
for (; len > 0; --len, ++s)
puttc(*s, (FILE *)userData);
puttc(*s, fp);
}
static
@ -585,7 +606,11 @@ int tmain(int argc, XML_Char **argv)
XML_SetNotationDeclHandler(parser, metaNotationDecl);
break;
case 'c':
XML_UseParserAsHandlerArg(parser);
XML_SetDefaultHandler(parser, markup);
XML_SetElementHandler(parser, defaultStartElement, defaultEndElement);
XML_SetCharacterDataHandler(parser, defaultCharacterData);
XML_SetProcessingInstructionHandler(parser, defaultProcessingInstruction);
break;
default:
XML_SetElementHandler(parser, startElement, endElement);