my own uncrustify run
This commit is contained in:
Rudolf Polzer
@@ -1,25 +1,25 @@
|
||||
/*
|
||||
Copyright (C) 2001-2006, William Joseph.
|
||||
All Rights Reserved.
|
||||
Copyright (C) 2001-2006, William Joseph.
|
||||
All Rights Reserved.
|
||||
|
||||
This file is part of GtkRadiant.
|
||||
This file is part of GtkRadiant.
|
||||
|
||||
GtkRadiant is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
GtkRadiant is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
GtkRadiant is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
GtkRadiant is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GtkRadiant; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GtkRadiant; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#if !defined(INCLUDED_XML_XMLPARSER_H)
|
||||
#if !defined( INCLUDED_XML_XMLPARSER_H )
|
||||
#define INCLUDED_XML_XMLPARSER_H
|
||||
|
||||
#include <cstdio>
|
||||
@@ -33,41 +33,34 @@ class TextInputStream;
|
||||
class SAXElement : public XMLElement
|
||||
{
|
||||
public:
|
||||
SAXElement(const char* name, const char** atts)
|
||||
: m_name(name), m_atts(atts)
|
||||
{
|
||||
}
|
||||
const char* name() const
|
||||
{
|
||||
return m_name;
|
||||
}
|
||||
const char* attribute(const char* name) const
|
||||
{
|
||||
if(m_atts != 0)
|
||||
{
|
||||
for(const char** att = m_atts; *att != 0; att+=2)
|
||||
{
|
||||
if(strcmp(*att, name) == 0)
|
||||
{
|
||||
return *(++att);
|
||||
}
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
void forEachAttribute(XMLAttrVisitor& visitor) const
|
||||
{
|
||||
if(m_atts != 0)
|
||||
{
|
||||
for(const char** att = m_atts; *att != 0; att+=2)
|
||||
{
|
||||
visitor.visit(*att, *(att+1));
|
||||
}
|
||||
}
|
||||
}
|
||||
SAXElement( const char* name, const char** atts )
|
||||
: m_name( name ), m_atts( atts ){
|
||||
}
|
||||
const char* name() const {
|
||||
return m_name;
|
||||
}
|
||||
const char* attribute( const char* name ) const {
|
||||
if ( m_atts != 0 ) {
|
||||
for ( const char** att = m_atts; *att != 0; att += 2 )
|
||||
{
|
||||
if ( strcmp( *att, name ) == 0 ) {
|
||||
return *( ++att );
|
||||
}
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
void forEachAttribute( XMLAttrVisitor& visitor ) const {
|
||||
if ( m_atts != 0 ) {
|
||||
for ( const char** att = m_atts; *att != 0; att += 2 )
|
||||
{
|
||||
visitor.visit( *att, *( att + 1 ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
private:
|
||||
const char* m_name;
|
||||
const char** m_atts;
|
||||
const char* m_name;
|
||||
const char** m_atts;
|
||||
};
|
||||
|
||||
#include <stdarg.h>
|
||||
@@ -75,166 +68,150 @@ private:
|
||||
class FormattedVA
|
||||
{
|
||||
public:
|
||||
const char* m_format;
|
||||
va_list& m_arguments;
|
||||
FormattedVA(const char* format, va_list& m_arguments)
|
||||
: m_format(format), m_arguments(m_arguments)
|
||||
{
|
||||
}
|
||||
const char* m_format;
|
||||
va_list& m_arguments;
|
||||
FormattedVA( const char* format, va_list& m_arguments )
|
||||
: m_format( format ), m_arguments( m_arguments ){
|
||||
}
|
||||
};
|
||||
|
||||
class Formatted
|
||||
{
|
||||
public:
|
||||
const char* m_format;
|
||||
va_list m_arguments;
|
||||
Formatted(const char* format, ...)
|
||||
: m_format(format)
|
||||
{
|
||||
va_start(m_arguments, format);
|
||||
}
|
||||
~Formatted()
|
||||
{
|
||||
va_end(m_arguments);
|
||||
}
|
||||
const char* m_format;
|
||||
va_list m_arguments;
|
||||
Formatted( const char* format, ... )
|
||||
: m_format( format ){
|
||||
va_start( m_arguments, format );
|
||||
}
|
||||
~Formatted(){
|
||||
va_end( m_arguments );
|
||||
}
|
||||
};
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER < 1400
|
||||
#if _MSC_VER < 1400
|
||||
#define vsnprintf std::vsnprintf
|
||||
#endif
|
||||
#endif
|
||||
|
||||
template<typename TextOutputStreamType>
|
||||
inline TextOutputStreamType& ostream_write(TextOutputStreamType& ostream, const FormattedVA& formatted)
|
||||
{
|
||||
char buffer[1024];
|
||||
ostream.write(buffer, vsnprintf(buffer, 1023, formatted.m_format, formatted.m_arguments));
|
||||
return ostream;
|
||||
inline TextOutputStreamType& ostream_write( TextOutputStreamType& ostream, const FormattedVA& formatted ){
|
||||
char buffer[1024];
|
||||
ostream.write( buffer, vsnprintf( buffer, 1023, formatted.m_format, formatted.m_arguments ) );
|
||||
return ostream;
|
||||
}
|
||||
|
||||
template<typename TextOutputStreamType>
|
||||
inline TextOutputStreamType& ostream_write(TextOutputStreamType& ostream, const Formatted& formatted)
|
||||
{
|
||||
char buffer[1024];
|
||||
ostream.write(buffer, vsnprintf(buffer, 1023, formatted.m_format, formatted.m_arguments));
|
||||
return ostream;
|
||||
inline TextOutputStreamType& ostream_write( TextOutputStreamType& ostream, const Formatted& formatted ){
|
||||
char buffer[1024];
|
||||
ostream.write( buffer, vsnprintf( buffer, 1023, formatted.m_format, formatted.m_arguments ) );
|
||||
return ostream;
|
||||
}
|
||||
|
||||
class XMLSAXImporter
|
||||
{
|
||||
XMLImporter& m_importer;
|
||||
xmlSAXHandler m_sax;
|
||||
XMLImporter& m_importer;
|
||||
xmlSAXHandler m_sax;
|
||||
|
||||
static void startElement(void *user_data, const xmlChar *name, const xmlChar **atts)
|
||||
{
|
||||
SAXElement element(reinterpret_cast<const char*>(name), reinterpret_cast<const char**>(atts));
|
||||
reinterpret_cast<XMLSAXImporter*>(user_data)->m_importer.pushElement(element);
|
||||
}
|
||||
static void endElement(void *user_data, const xmlChar *name)
|
||||
{
|
||||
reinterpret_cast<XMLSAXImporter*>(user_data)->m_importer.popElement(reinterpret_cast<const char*>(name));
|
||||
}
|
||||
static void characters(void *user_data, const xmlChar *ch, int len)
|
||||
{
|
||||
reinterpret_cast<XMLSAXImporter*>(user_data)->m_importer
|
||||
<< StringRange(reinterpret_cast<const char*>(ch), reinterpret_cast<const char*>(ch + len));
|
||||
}
|
||||
static void startElement( void *user_data, const xmlChar *name, const xmlChar **atts ){
|
||||
SAXElement element( reinterpret_cast<const char*>( name ), reinterpret_cast<const char**>( atts ) );
|
||||
reinterpret_cast<XMLSAXImporter*>( user_data )->m_importer.pushElement( element );
|
||||
}
|
||||
static void endElement( void *user_data, const xmlChar *name ){
|
||||
reinterpret_cast<XMLSAXImporter*>( user_data )->m_importer.popElement( reinterpret_cast<const char*>( name ) );
|
||||
}
|
||||
static void characters( void *user_data, const xmlChar *ch, int len ){
|
||||
reinterpret_cast<XMLSAXImporter*>( user_data )->m_importer
|
||||
<< StringRange( reinterpret_cast<const char*>( ch ), reinterpret_cast<const char*>( ch + len ) );
|
||||
}
|
||||
|
||||
static void warning(void *user_data, const char *msg, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, msg);
|
||||
globalErrorStream() << "XML WARNING: " << FormattedVA(msg, args);
|
||||
va_end(args);
|
||||
}
|
||||
static void error(void *user_data, const char *msg, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, msg);
|
||||
globalErrorStream() << "XML ERROR: " << FormattedVA(msg, args);
|
||||
va_end(args);
|
||||
}
|
||||
static void warning( void *user_data, const char *msg, ... ){
|
||||
va_list args;
|
||||
va_start( args, msg );
|
||||
globalErrorStream() << "XML WARNING: " << FormattedVA( msg, args );
|
||||
va_end( args );
|
||||
}
|
||||
static void error( void *user_data, const char *msg, ... ){
|
||||
va_list args;
|
||||
va_start( args, msg );
|
||||
globalErrorStream() << "XML ERROR: " << FormattedVA( msg, args );
|
||||
va_end( args );
|
||||
}
|
||||
|
||||
public:
|
||||
XMLSAXImporter(XMLImporter& importer) : m_importer(importer)
|
||||
{
|
||||
m_sax.internalSubset = 0;
|
||||
m_sax.isStandalone = 0;
|
||||
m_sax.hasInternalSubset = 0;
|
||||
m_sax.hasExternalSubset = 0;
|
||||
m_sax.resolveEntity = 0;
|
||||
m_sax.getEntity = 0;
|
||||
m_sax.entityDecl = 0;
|
||||
m_sax.notationDecl = 0;
|
||||
m_sax.attributeDecl = 0;
|
||||
m_sax.elementDecl = 0;
|
||||
m_sax.unparsedEntityDecl = 0;
|
||||
m_sax.setDocumentLocator = 0;
|
||||
m_sax.startDocument = 0;
|
||||
m_sax.endDocument = 0;
|
||||
m_sax.startElement = startElement;
|
||||
m_sax.endElement = endElement;
|
||||
m_sax.reference = 0;
|
||||
m_sax.characters = characters;
|
||||
m_sax.ignorableWhitespace = 0;
|
||||
m_sax.processingInstruction = 0;
|
||||
m_sax.comment = 0;
|
||||
m_sax.warning = warning;
|
||||
m_sax.error = error;
|
||||
m_sax.fatalError = 0;
|
||||
m_sax.getParameterEntity = 0;
|
||||
m_sax.cdataBlock = 0;
|
||||
m_sax.externalSubset = 0;
|
||||
m_sax.initialized = 1;
|
||||
}
|
||||
XMLSAXImporter( XMLImporter& importer ) : m_importer( importer ){
|
||||
m_sax.internalSubset = 0;
|
||||
m_sax.isStandalone = 0;
|
||||
m_sax.hasInternalSubset = 0;
|
||||
m_sax.hasExternalSubset = 0;
|
||||
m_sax.resolveEntity = 0;
|
||||
m_sax.getEntity = 0;
|
||||
m_sax.entityDecl = 0;
|
||||
m_sax.notationDecl = 0;
|
||||
m_sax.attributeDecl = 0;
|
||||
m_sax.elementDecl = 0;
|
||||
m_sax.unparsedEntityDecl = 0;
|
||||
m_sax.setDocumentLocator = 0;
|
||||
m_sax.startDocument = 0;
|
||||
m_sax.endDocument = 0;
|
||||
m_sax.startElement = startElement;
|
||||
m_sax.endElement = endElement;
|
||||
m_sax.reference = 0;
|
||||
m_sax.characters = characters;
|
||||
m_sax.ignorableWhitespace = 0;
|
||||
m_sax.processingInstruction = 0;
|
||||
m_sax.comment = 0;
|
||||
m_sax.warning = warning;
|
||||
m_sax.error = error;
|
||||
m_sax.fatalError = 0;
|
||||
m_sax.getParameterEntity = 0;
|
||||
m_sax.cdataBlock = 0;
|
||||
m_sax.externalSubset = 0;
|
||||
m_sax.initialized = 1;
|
||||
}
|
||||
|
||||
xmlSAXHandler* callbacks()
|
||||
{
|
||||
return &m_sax;
|
||||
}
|
||||
void* context()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
xmlSAXHandler* callbacks(){
|
||||
return &m_sax;
|
||||
}
|
||||
void* context(){
|
||||
return this;
|
||||
}
|
||||
};
|
||||
|
||||
class XMLStreamParser : public XMLExporter
|
||||
{
|
||||
enum unnamed0 { BUFSIZE = 1024 };
|
||||
enum unnamed0 { BUFSIZE = 1024 };
|
||||
public:
|
||||
XMLStreamParser(TextInputStream& istream)
|
||||
: m_istream(istream)
|
||||
{
|
||||
}
|
||||
virtual void exportXML(XMLImporter& importer)
|
||||
{
|
||||
bool wellFormed = false;
|
||||
XMLStreamParser( TextInputStream& istream )
|
||||
: m_istream( istream ){
|
||||
}
|
||||
virtual void exportXML( XMLImporter& importer ){
|
||||
bool wellFormed = false;
|
||||
|
||||
char chars[BUFSIZE];
|
||||
std::size_t res = m_istream.read(chars, 4);
|
||||
if (res > 0)
|
||||
{
|
||||
XMLSAXImporter sax(importer);
|
||||
char chars[BUFSIZE];
|
||||
std::size_t res = m_istream.read( chars, 4 );
|
||||
if ( res > 0 ) {
|
||||
XMLSAXImporter sax( importer );
|
||||
|
||||
xmlParserCtxtPtr ctxt = xmlCreatePushParserCtxt(sax.callbacks(), sax.context(), chars, static_cast<int>(res), 0);
|
||||
ctxt->replaceEntities = 1;
|
||||
xmlParserCtxtPtr ctxt = xmlCreatePushParserCtxt( sax.callbacks(), sax.context(), chars, static_cast<int>( res ), 0 );
|
||||
ctxt->replaceEntities = 1;
|
||||
|
||||
while ((res = m_istream.read(chars, BUFSIZE)) > 0)
|
||||
{
|
||||
xmlParseChunk(ctxt, chars, static_cast<int>(res), 0);
|
||||
}
|
||||
xmlParseChunk(ctxt, chars, 0, 1);
|
||||
while ( ( res = m_istream.read( chars, BUFSIZE ) ) > 0 )
|
||||
{
|
||||
xmlParseChunk( ctxt, chars, static_cast<int>( res ), 0 );
|
||||
}
|
||||
xmlParseChunk( ctxt, chars, 0, 1 );
|
||||
|
||||
wellFormed = (ctxt->wellFormed == 1);
|
||||
wellFormed = ( ctxt->wellFormed == 1 );
|
||||
|
||||
xmlFreeParserCtxt(ctxt);
|
||||
}
|
||||
xmlFreeParserCtxt( ctxt );
|
||||
}
|
||||
|
||||
//return wellFormed;
|
||||
}
|
||||
//return wellFormed;
|
||||
}
|
||||
private:
|
||||
TextInputStream& m_istream;
|
||||
TextInputStream& m_istream;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user