pegasus/src/Pegasus/Common/XmlParser.cpp - diff

Return to XmlParser.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlParser.cpp between version 1.1.1.1 and 1.15

version 1.1.1.1, 2001/01/14 19:53:23

version 1.15, 2002/03/07 00:42:12

Line 1

//BEGIN_LICENSE

//%/////////////////////////////////////////////////////////////////////////////

// Permission is hereby granted, free of charge, to any person obtaining a

// Permission is hereby granted, free of charge, to any person obtaining a copy

// copy of this software and associated documentation files (the "Software"),

// of this software and associated documentation files (the "Software"), to

// to deal in the Software without restriction, including without limitation

// deal in the Software without restriction, including without limitation the

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// and/or sell copies of the Software, and to permit persons to whom the

// sell copies of the Software, and to permit persons to whom the Software is

// Software is furnished to do so, subject to the following conditions:

// furnished to do so, subject to the following conditions:

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// DEALINGS IN THE SOFTWARE.

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//END_LICENSE

//==============================================================================

//BEGIN_HISTORY

// Author:

// Author: Mike Brasher (mbrasher@bmc.com)

// $Log$

// Modified By:

// Revision 1.1.1.1 2001/01/14 19:53:23 mike

// Pegasus import

//%/////////////////////////////////////////////////////////////////////////////

//END_HISTORY

////////////////////////////////////////////////////////////////////////////////

Line 71

Line 68

// TODO:

// ATTN: KS P1 4 Mar 2002. Review the following TODOs to see if there is work.

// Handle <!DOCTYPE...> sections which are complicated (containing

// rules rather than references to files).

Line 83

Line 81

////////////////////////////////////////////////////////////////////////////////

#include <Pegasus/Common/Config.h>

#include <cctype>

#include <cassert>

#include <cstdio>

#include <cstdlib>

#include <cstring>

#include "XmlParser.h"

#include "Logger.h"

PEGASUS_NAMESPACE_BEGIN

#define PEGASUS_ARRAY_T XmlEntry

# include "ArrayImpl.h"

#undef PEGASUS_ARRAY_T

////////////////////////////////////////////////////////////////////////////////

// Static helper functions

Line 103

Line 108

for (; *p; p++)

{

if (*p == '\n')

std::cout << "\\n";

PEGASUS_STD(cout) << "\\n";

else if (*p == '\r')

std::cout << "\\r";

PEGASUS_STD(cout) << "\\r";

else if (*p == '\t')

std::cout << "\\t";

PEGASUS_STD(cout) << "\\t";

else

std::cout << *p;

PEGASUS_STD(cout) << *p;

}

Line 195

Line 200

////////////////////////////////////////////////////////////////////////////////

static char* _xmlMessages[] =

static const char* _xmlMessages[] =

{

"Bad opening element",

"Bad closing element",

Line 225

Line 230

result.append(": on line ");

result.append(buffer);

if (message.getLength())

if (message.size())

{

result.append(": ");

result.append(message);

Line 266

Line 271

XmlSemanticError::XmlSemanticError(

Uint32 lineNumber,

const String& message)

: XmlException(XmlException::VALIDATION_ERROR, lineNumber, message)

: XmlException(XmlException::SEMANTIC_ERROR, lineNumber, message)

{

}

Line 393

Line 398

Boolean XmlParser::_getElementName(char*& p)

{

if (!isalpha(*p) && *p != '_')

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_START_TAG, _line);

}

while (*p &&

(isalnum(*p) || *p == '_' || *p == '-' || *p == ':' || *p == '.'))

Line 424

Line 426

openCloseElement = false;

if (!isalpha(*p) && *p != '_')

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_START_TAG, _line);

}

while (*p &&

(isalnum(*p) || *p == '_' || *p == '-' || *p == ':' || *p == '.'))

Line 461

Line 460

void XmlParser::_getAttributeNameAndEqual(char*& p)

{

if (!isalpha(*p) && *p != '_')

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_ATTRIBUTE_NAME, _line);

}

while (*p &&

(isalnum(*p) || *p == '_' || *p == '-' || *p == ':' || *p == '.'))

Line 475

Line 471

_skipWhitespace(p);

if (*p != '=')

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_ATTRIBUTE_NAME, _line);

}

p++;

Line 492

Line 485

// ATTN-B: handle values contained in semiquotes:

if (*p != '"' && *p != '\'')

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_ATTRIBUTE_VALUE, _line);

}

char startChar = *p++;

Line 503

Line 493

p++;

if (*p != startChar)

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_ATTRIBUTE_VALUE, _line);

}

*p++ = '\0';

}

Line 705

Line 692

entry.text = ++p;

if (!_getElementName(p))

{

std::cout << __LINE__ << std::endl;

throw(XmlException(XmlException::BAD_END_TAG, _line));

}

return;

}

Line 727

Line 711

}

else

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_START_TAG, _line);

}

//--------------------------------------------------------------------------

// Grab all the attributes:

Line 763

Line 744

_getAttributeNameAndEqual(p);

if (*p != '"' && *p != '\'')

{

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_ATTRIBUTE_VALUE, _line);

}

attr.value = p + 1;

_getAttributeValue(p);

Line 777

Line 755

if (!(p[0] == '?' && p[1] == '>') && !isspace(*p))

{

std::cout << __LINE__ << std::endl;

throw XmlException(

XmlException::BAD_ATTRIBUTE_VALUE, _line);

}

Line 786

Line 763

{

// The next thing must be a space or a '>':

std::cout << __LINE__ << std::endl;

throw XmlException(XmlException::BAD_ATTRIBUTE_VALUE, _line);

}

Line 814

Line 790

void XmlEntry::print() const

{

std::cout << "=== " << _typeStrings[type] << " ";

PEGASUS_STD(cout) << "=== " << _typeStrings[type] << " ";

Boolean needQuotes = type == XmlEntry::CDATA || type == XmlEntry::CONTENT;

if (needQuotes)

std::cout << "\"";

PEGASUS_STD(cout) << "\"";

_printValue(text);

if (needQuotes)

std::cout << "\"";

PEGASUS_STD(cout) << "\"";

std::cout << '\n';

PEGASUS_STD(cout) << '\n';

for (Uint32 i = 0; i < attributeCount; i++)

{

std::cout << " " << attributes[i].name << "=\"";

PEGASUS_STD(cout) << " " << attributes[i].name << "=\"";

_printValue(attributes[i].value);

std::cout << "\"" << std::endl;

PEGASUS_STD(cout) << "\"" << PEGASUS_STD(endl);

}

Line 948

Line 924

return true;

}

void XmlAppendCString(Array<Sint8>& out, const char* str)

{

out.append(str, strlen(str));

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.1.1.1
changed lines
	Added in v.1.15

No CVS admin address has been configured