remove xml.h/cpp's dependancy on exception.h/cpp - in preparation to
move xml.h/cpp and ssprintf.h/ccp out of rbuild directory since buildno
uses them too
Modified: trunk/reactos/tools/rbuild/XML.cpp
Modified: trunk/reactos/tools/rbuild/XML.h
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
Modified: trunk/reactos/tools/rbuild/bootstrap.cpp
Modified: trunk/reactos/tools/rbuild/compilerflag.cpp
Modified: trunk/reactos/tools/rbuild/exception.cpp
Modified: trunk/reactos/tools/rbuild/exception.h
Modified: trunk/reactos/tools/rbuild/include.cpp
Modified: trunk/reactos/tools/rbuild/linkerflag.cpp
Modified: trunk/reactos/tools/rbuild/linkerscript.cpp
Modified: trunk/reactos/tools/rbuild/module.cpp
Modified: trunk/reactos/tools/rbuild/project.cpp
Modified: trunk/reactos/tools/rbuild/rbuild.cpp
Modified: trunk/reactos/tools/rbuild/rbuild.dsp
Modified: trunk/reactos/tools/rbuild/stubbedcomponent.cpp
Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp
_____
Modified: trunk/reactos/tools/rbuild/XML.cpp
--- trunk/reactos/tools/rbuild/XML.cpp 2005-11-27 06:20:33 UTC (rev
19673)
+++ trunk/reactos/tools/rbuild/XML.cpp 2005-11-27 06:34:50 UTC (rev
19674)
@@ -15,11 +15,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "pch.h"
-#ifndef MAX_PATH
-#define MAX_PATH _MAX_PATH
-#endif
+#ifdef _MSC_VER
+#pragma warning ( disable : 4786 )
+#endif//_MSC_VER
#ifdef WIN32
# include <direct.h>
@@ -31,9 +30,12 @@
#include <assert.h>
#include "XML.h"
-#include "exception.h"
#include "ssprintf.h"
+#ifndef MAX_PATH
+#define MAX_PATH _MAX_PATH
+#endif
+
using std::string;
using std::vector;
@@ -46,6 +48,29 @@
string working_directory;
+XMLException::XMLException (
+ const std::string& location,
+ const char* format, ... )
+{
+ va_list args;
+ va_start ( args, format );
+ SetExceptionV ( location, format, args );
+ va_end ( args );
+}
+
+void XMLException::SetExceptionV ( const std::string& location, const
char* format, va_list args )
+{
+ _e = location + ": " + ssvprintf(format,args);
+}
+
+void XMLException::SetException ( const std::string& location, const
char* format, ... )
+{
+ va_list args;
+ va_start ( args, format );
+ SetExceptionV ( location, format, args );
+ va_end ( args );
+}
+
XMLIncludes::~XMLIncludes()
{
for ( size_t i = 0; i < this->size(); i++ )
@@ -56,7 +81,7 @@
InitWorkingDirectory()
{
// store the current directory for path calculations
- working_directory.resize ( _MAX_PATH );
+ working_directory.resize ( MAX_PATH );
working_directory[0] = 0;
getcwd ( &working_directory[0], working_directory.size() );
working_directory.resize ( strlen ( working_directory.c_str() )
);
@@ -70,18 +95,17 @@
filelen ( FILE* f )
{
#ifdef WIN32
- return _filelengthi64 ( _fileno(f) );
+ return _filelengthi64 ( _fileno(f) );
#else
# ifdef __FreeBSD__
- struct stat file_stat;
- if ( fstat(fileno(f), &file_stat) != 0 )
+ struct stat file_stat;
+ if ( fstat(fileno(f), &file_stat) != 0 )
# else
- struct stat64 file_stat;
- if ( fstat64(fileno(f), &file_stat) != 0 )
+ struct stat64 file_stat;
+ if ( fstat64(fileno(f), &file_stat) != 0 )
# endif // __FreeBSD__
- return 0;
- return file_stat.st_size;
-
+ return 0;
+ return file_stat.st_size;
#endif // WIN32
}
@@ -227,9 +251,10 @@
}
void
-Path::Split ( vector<string>& out,
- const string& path,
- bool include_last )
+Path::Split (
+ vector<string>& out,
+ const string& path,
+ bool include_last )
{
string s ( path );
const char* prev = strtok ( &s[0], "/\\" );
@@ -263,7 +288,7 @@
}
bool
-XMLFile::open(const string& filename_)
+XMLFile::open ( const string& filename_ )
{
close();
FILE* f = fopen ( filename_.c_str(), "rb" );
@@ -297,7 +322,7 @@
}
bool
-XMLFile::more_tokens()
+XMLFile::more_tokens ()
{
return _p != _end;
}
@@ -305,7 +330,7 @@
// get_token() is used to return a token, and move the pointer
// past the token
bool
-XMLFile::get_token(string& token)
+XMLFile::get_token ( string& token )
{
const char* tokend;
if ( !strncmp ( _p, "<!--", 4 ) )
@@ -372,8 +397,9 @@
{
}
-XMLAttribute::XMLAttribute(const string& name_,
- const string& value_)
+XMLAttribute::XMLAttribute(
+ const string& name_,
+ const string& value_ )
: name(name_), value(value_)
{
}
@@ -391,8 +417,9 @@
return *this;
}
-XMLElement::XMLElement ( XMLFile* xmlFile,
- const string& location )
+XMLElement::XMLElement (
+ XMLFile* xmlFile,
+ const string& location )
: xmlFile ( xmlFile ),
location ( location ),
parentElement ( NULL )
@@ -422,8 +449,9 @@
// Return Value: returns true if you need to look for a </tag> for
// the one it just parsed...
bool
-XMLElement::Parse(const string& token,
- bool& end_tag)
+XMLElement::Parse (
+ const string& token,
+ bool& end_tag )
{
const char* p = token.c_str();
assert ( *p == '<' );
@@ -493,8 +521,9 @@
}
else if ( name[0] != '!' )
{
- throw XMLSyntaxErrorException ( location,
- "attributes must
have values" );
+ throw XMLSyntaxErrorException (
+ location,
+ "attributes must have values" );
}
attributes.push_back ( new XMLAttribute ( attribute,
value ) );
}
@@ -502,8 +531,9 @@
}
XMLAttribute*
-XMLElement::GetAttribute ( const string& attribute,
- bool required )
+XMLElement::GetAttribute (
+ const string& attribute,
+ bool required )
{
// this would be faster with a tree-based container, but our
attribute
// lists are likely to stay so short as to not be an issue.
@@ -514,16 +544,18 @@
}
if ( required )
{
- throw RequiredAttributeNotFoundException ( location,
- attribute,
- name );
+ throw XMLRequiredAttributeNotFoundException (
+ location,
+ attribute,
+ name );
}
return NULL;
}
const XMLAttribute*
-XMLElement::GetAttribute ( const string& attribute,
- bool required ) const
+XMLElement::GetAttribute (
+ const string& attribute,
+ bool required ) const
{
// this would be faster with a tree-based container, but our
attribute
// lists are likely to stay so short as to not be an issue.
@@ -534,13 +566,57 @@
}
if ( required )
{
- throw RequiredAttributeNotFoundException ( location,
- attribute,
- name );
+ throw XMLRequiredAttributeNotFoundException (
+ location,
+ attribute,
+ name );
}
return NULL;
}
+int
+XMLElement::FindElement ( const std::string& type, int prev ) const
+{
+ int done = subElements.size();
+ while ( ++prev < done )
+ {
+ XMLElement* e = subElements[prev];
+ if ( e->name == type )
+ return prev;
+ }
+ return -1;
+}
+
+int
+XMLElement::GetElements (
+ const std::string& type,
+ std::vector<XMLElement*>& v )
+{
+ int find = FindElement ( type );
+ v.resize ( 0 );
+ while ( find != -1 )
+ {
+ v.push_back ( subElements[find] );
+ find = FindElement ( type, find );
+ }
+ return v.size();
+}
+
+int
+XMLElement::GetElements (
+ const std::string& type,
+ std::vector<const XMLElement*>& v ) const
+{
+ int find = FindElement ( type );
+ v.resize ( 0 );
+ while ( find != -1 )
+ {
+ v.push_back ( subElements[find] );
+ find = FindElement ( type, find );
+ }
+ return v.size();
+}
+
// XMLParse()
// This function reads a "token" from the file loaded in XMLFile
// if it finds a tag that is non-singular, it parses sub-elements
and/or
@@ -549,30 +625,38 @@
// it's parsed data. Keep calling this function until it returns NULL
// (no more data)
XMLElement*
-XMLParse ( XMLFile& f,
- XMLIncludes* includes,
- const Path& path,
- bool* pend_tag = NULL )
+XMLParse (
+ XMLFile& f,
+ XMLIncludes* includes,
+ const Path& path,
+ bool* pend_tag = NULL )
{
string token, location;
if ( !f.get_token(token,location) )
return NULL;
bool end_tag, is_include = false;
- while ( token[0] != '<'
- || !strncmp ( token.c_str (), "<!--", 4 )
- || !strncmp ( token.c_str (), "<?", 2 ) )
+ while
+ (
+ token[0] != '<'
+ || !strncmp ( token.c_str (), "<!--", 4 )
+ || !strncmp ( token.c_str (), "<?", 2 )
+ )
{
if ( token[0] != '<' )
- throw XMLSyntaxErrorException ( location,
- "expecting xml
tag, not '%s'",
- token.c_str ()
);
- if ( !f.get_token(token,location) )
+ {
+ throw XMLSyntaxErrorException (
+ location,
+ "expecting xml tag, not '%s'",
+ token.c_str () );
+ }
+ if ( !f.get_token ( token, location ) )
return NULL;
}
- XMLElement* e = new XMLElement ( &f,
- location );
+ XMLElement* e = new XMLElement (
+ &f,
+ location );
bool bNeedEnd = e->Parse ( token, end_tag );
if ( e->name == "xi:include" && includes )
@@ -581,8 +665,10 @@
att = e->GetAttribute ( "href", true );
assert ( att );
string includeFile ( path.Fixup ( att->value, true ) );
- string topIncludeFile (
Path::RelativeFromWorkingDirectory ( includeFile ) );
- includes->push_back ( new XMLInclude ( e, path,
topIncludeFile ) );
+ string topIncludeFile (
+ Path::RelativeFromWorkingDirectory ( includeFile
) );
+ includes->push_back (
+ new XMLInclude ( e, path, topIncludeFile ) );
is_include = true;
}
@@ -593,9 +679,10 @@
else if ( end_tag )
{
delete e;
- throw XMLSyntaxErrorException ( location,
- "end tag '%s'
not expected",
- token.c_str() );
+ throw XMLSyntaxErrorException (
+ location,
+ "end tag '%s' not expected",
+ token.c_str() );
return NULL;
}
return e;
@@ -607,26 +694,29 @@
{
if ( !f.get_token ( token, location ) ||
token.size () == 0 )
{
- throw InvalidBuildFileException (
+ throw XMLInvalidBuildFileException (
location,
"internal tool error -
get_token() failed when more_tokens() returned true" );
break;
}
if ( e->subElements.size() &&
!bThisMixingErrorReported )
{
- throw XMLSyntaxErrorException (
location,
- "mixing
of inner text with sub elements" );
+ throw XMLSyntaxErrorException (
+ location,
+ "mixing of inner text with sub
elements" );
bThisMixingErrorReported = true;
}
if ( strchr ( token.c_str (), '>' ) )
{
- throw XMLSyntaxErrorException (
location,
- "invalid
symbol '>'" );
+ throw XMLSyntaxErrorException (
+ location,
+ "invalid symbol '>'" );
}
if ( e->value.size() > 0 )
{
- throw XMLSyntaxErrorException (
location,
-
"multiple instances of inner text" );
+ throw XMLSyntaxErrorException (
+ location,
+ "multiple instances of inner
text" );
e->value += " " + token;
}
else
@@ -634,13 +724,14 @@
}
else
{
- XMLElement* e2 = XMLParse ( f, is_include ? NULL
: includes, path, &end_tag );
+ XMLElement* e2 = XMLParse (
+ f, is_include ? NULL : includes, path,
&end_tag );
if ( !e2 )
{
string e_location = e->location;
string e_name = e->name;
delete e;
- throw InvalidBuildFileException (
+ throw XMLInvalidBuildFileException (
e_location,
"end of file found looking for
end tag: </%s>",
e_name.c_str() );
@@ -669,8 +760,9 @@
{
string e_location = e->location;
delete e;
- throw XMLSyntaxErrorException (
e_location,
- "mixing
of inner text with sub elements" );
+ throw XMLSyntaxErrorException (
+ e_location,
+ "mixing of inner text with sub
elements" );
bThisMixingErrorReported = true;
}
e->AddSubElement ( e2 );
@@ -680,7 +772,11 @@
}
void
-XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes,
const Path& path )
+XMLReadFile (
+ XMLFile& f,
+ XMLElement& head,
+ XMLIncludes& includes,
+ const Path& path )
{
for ( ;; )
{
@@ -692,8 +788,9 @@
}
XMLElement*
-XMLLoadInclude ( XMLInclude& include,
- XMLIncludes& includes )
+XMLLoadInclude (
+ XMLInclude& include,
+ XMLIncludes& includes )
{
XMLAttribute* att;
att = include.e->GetAttribute("href", true);
@@ -720,13 +817,17 @@
{
att = e3->GetAttribute (
"href", true );
assert ( att );
- string includeFile (
include.path.Fixup ( att->value, true ) );
- string topIncludeFile (
Path::RelativeFromWorkingDirectory ( includeFile ) );
- XMLInclude*
fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile );
- return XMLLoadInclude (
*fallbackInclude, includes );
+ string includeFile (
+
include.path.Fixup ( att->value, true ) );
+ string topIncludeFile (
+
Path::RelativeFromWorkingDirectory ( includeFile ) );
+ XMLInclude*
fallbackInclude =
+ new XMLInclude (
e3, include.path, topIncludeFile );
+ return XMLLoadInclude (
+
*fallbackInclude, includes );
}
}
- throw InvalidBuildFileException (
+ throw XMLInvalidBuildFileException (
e2->location,
"<xi:fallback> must have a
<xi:include> sub-element" );
return NULL;
@@ -737,8 +838,9 @@
else
{
include.fileExists = true;
- XMLElement* new_e = new XMLElement ( fInc,
- include.e->location
);
+ XMLElement* new_e = new XMLElement (
+ fInc,
+ include.e->location );
new_e->name = "xi:included";
Path path2 ( include.path, att->value );
XMLReadFile ( *fInc, *new_e, includes, path2 );
@@ -754,10 +856,12 @@
XMLFile* f = new XMLFile();
if ( !f->open ( filename ) )
- throw FileNotFoundException ( filename );
+ {
+ throw XMLFileNotFoundException ( "(virtual)", filename
);
+ return NULL;
+ }
- XMLElement* head = new XMLElement ( f,
- "(virtual)" );
+ XMLElement* head = new XMLElement ( f, "(virtual)" );
XMLReadFile ( *f, *head, includes, path );
@@ -767,17 +871,17 @@
XMLElement* e2 = XMLLoadInclude ( *includes[i], includes
);
if ( !e2 )
{
- throw FileNotFoundException (
- ssprintf ( "%s (referenced from %s)",
- e->GetAttribute ( "top_href",
true )->value.c_str (),
- f->Location ().c_str () ) );
+ throw XMLFileNotFoundException (
+ f->Location(),
+ e->GetAttribute ( "top_href", true
)->value );
}
XMLElement* parent = e->parentElement;
XMLElement** parent_container = NULL;
if ( !parent )
{
+ string location = e->location;
delete e;
- throw Exception ( "internal tool error:
xi:include doesn't have a parent" );
+ throw XMLException ( location, "internal tool
error: xi:include doesn't have a parent" );
return NULL;
}
for ( size_t j = 0; j < parent->subElements.size (); j++
)
@@ -790,8 +894,9 @@
}
if ( !parent_container )
{
+ string location = e->location;
delete e;
- throw Exception ( "internal tool error: couldn't
find xi:include in parent's sub-elements" );
+ throw XMLException ( location, "internal tool
error: couldn't find xi:include in parent's sub-elements" );
return NULL;
}
// replace inclusion tree with the imported tree
_____
Modified: trunk/reactos/tools/rbuild/XML.h
--- trunk/reactos/tools/rbuild/XML.h 2005-11-27 06:20:33 UTC (rev
19673)
+++ trunk/reactos/tools/rbuild/XML.h 2005-11-27 06:34:50 UTC (rev
19674)
@@ -18,7 +18,9 @@
#ifndef XML_H
#define XML_H
-#include "pch.h"
+#include <string>
+#include <vector>
+#include <stdarg.h>
class XMLElement;
@@ -34,6 +36,75 @@
#endif
filelen ( FILE* f );
+class XMLException
+{
+public:
+ XMLException ( const std::string& location, const char* format,
... );
+ const std::string& operator *() { return _e; }
+
+protected:
+ XMLException() {}
+ void SetExceptionV ( const std::string& location, const char*
format, va_list args );
+ void SetException ( const std::string& location, const char*
format, ... );
+
+private:
+ std::string _e;
+};
+
+class XMLSyntaxErrorException : public XMLException
+{
+public:
+ XMLSyntaxErrorException (
+ const std::string& location,
+ const char* format, ... )
+ {
+ va_list args;
+ va_start ( args, format );
+ SetExceptionV ( location, format, args );
+ va_end ( args );
+ }
+};
+
+class XMLRequiredAttributeNotFoundException : public XMLException
+{
+public:
+ XMLRequiredAttributeNotFoundException (
+ const std::string& location,
+ const std::string& attributeName,
+ const std::string& elementName )
+ {
+ SetException ( location, "Required attribute '%s' not
found in element '%s'",
+ attributeName.c_str(),
+ elementName.c_str() );
+ }
+};
+
+class XMLInvalidBuildFileException : public XMLException
+{
+public:
+ XMLInvalidBuildFileException (
+ const std::string& location,
+ const char* format,
+ ... )
+ {
+ va_list args;
+ va_start ( args, format );
+ SetExceptionV ( location, format, args );
+ va_end ( args );
+ }
+};
+
+class XMLFileNotFoundException : public XMLException
+{
+public:
+ XMLFileNotFoundException (
+ const std::string& location,
+ const std::string& filename )
+ {
+ SetException ( location, "Can't open file '%s'",
filename.c_str() );
+ }
+};
+
class Path
{
std::vector<std::string> path;
@@ -46,9 +117,10 @@
static std::string RelativeFromWorkingDirectory ( const
std::string& path );
static std::string RelativeFromDirectory ( const std::string&
path, const std::string& base_directory);
- static void Split ( std::vector<std::string>& out,
- const std::string& path,
- bool include_last );
+ static void Split (
+ std::vector<std::string>& out,
+ const std::string& path,
+ bool include_last );
};
class XMLInclude
@@ -59,8 +131,13 @@
std::string topIncludeFilename;
bool fileExists;
- XMLInclude ( XMLElement* e_, const Path& path_, const
std::string topIncludeFilename_ )
- : e ( e_ ), path ( path_ ), topIncludeFilename (
topIncludeFilename_ )
+ XMLInclude (
+ XMLElement* e_,
+ const Path& path_,
+ const std::string topIncludeFilename_ )
+ : e ( e_ ),
+ path ( path_ ),
+ topIncludeFilename ( topIncludeFilename_ )
{
}
};
@@ -117,21 +194,43 @@
std::vector<XMLElement*> subElements;
std::string value;
- XMLElement ( XMLFile* xmlFile,
- const std::string& location );
+ XMLElement (
+ XMLFile* xmlFile,
+ const std::string& location );
+
~XMLElement();
- bool Parse(const std::string& token,
- bool& end_tag);
+
+ bool Parse (
+ const std::string& token,
+ bool& end_tag);
+
void AddSubElement ( XMLElement* e );
- XMLAttribute* GetAttribute ( const std::string& attribute,
- bool required);
- const XMLAttribute* GetAttribute ( const std::string& attribute,
- bool required) const;
+
+ XMLAttribute* GetAttribute (
+ const std::string& attribute,
+ bool required);
+
+ const XMLAttribute* GetAttribute (
+ const std::string& attribute,
+ bool required ) const;
+
+ int FindElement (
+ const std::string& type,
+ int prev = -1 ) const;
+
+ int GetElements (
+ const std::string& type,
+ std::vector<XMLElement*>& v );
+
+ int GetElements (
+ const std::string& type,
+ std::vector<const XMLElement*>& v ) const;
};
XMLElement*
-XMLLoadFile ( const std::string& filename,
- const Path& path,
- XMLIncludes& includes );
+XMLLoadFile (
+ const std::string& filename,
+ const Path& path,
+ XMLIncludes& includes );
#endif // XML_H
_____
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
2005-11-27 06:20:33 UTC (rev 19673)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
2005-11-27 06:34:50 UTC (rev 19674)
@@ -1944,8 +1944,9 @@
if ( invoke.invokeModule->type != BuildTool )
{
- throw InvalidBuildFileException (
module.node.location,
- "Only modules
of type buildtool can be invoked." );
+ throw XMLInvalidBuildFileException (
+ module.node.location,
+ "Only modules of type buildtool can be
invoked." );
}
string invokeTarget = module.GetInvocationTarget ( i );
_____
Modified: trunk/reactos/tools/rbuild/bootstrap.cpp
--- trunk/reactos/tools/rbuild/bootstrap.cpp 2005-11-27 06:20:33 UTC
(rev 19673)
+++ trunk/reactos/tools/rbuild/bootstrap.cpp 2005-11-27 06:34:50 UTC
(rev 19674)
@@ -72,7 +72,7 @@
{
if ( !IsSupportedModuleType ( module->type ) )
{
- throw InvalidBuildFileException (
+ throw XMLInvalidBuildFileException (
node.location,
"<bootstrap> is not applicable for this module
type." );
}
_____
Modified: trunk/reactos/tools/rbuild/compilerflag.cpp
--- trunk/reactos/tools/rbuild/compilerflag.cpp 2005-11-27 06:20:33 UTC
(rev 19673)
+++ trunk/reactos/tools/rbuild/compilerflag.cpp 2005-11-27 06:34:50 UTC
(rev 19674)
@@ -51,7 +51,7 @@
{
if (node.value.size () == 0)
{
- throw InvalidBuildFileException (
+ throw XMLInvalidBuildFileException (
node.location,
"<compilerflag> is empty." );
}
_____
Modified: trunk/reactos/tools/rbuild/exception.cpp
--- trunk/reactos/tools/rbuild/exception.cpp 2005-11-27 06:20:33 UTC
(rev 19673)
+++ trunk/reactos/tools/rbuild/exception.cpp 2005-11-27 06:34:50 UTC
(rev 19674)
@@ -26,58 +26,60 @@
Exception::Exception ( const string& message )
{
- Message = message;
+ _e = message;
}
-Exception::Exception ( const char* format,
- ...)
+Exception::Exception ( const char* format, ...)
{
va_list args;
- va_start ( args,
- format);
- Message = ssvprintf ( format,
- args);
+ va_start ( args, format);
+ _e = ssvprintf ( format, args);
va_end ( args );
}
-void Exception::SetMessage ( const char* message,
- va_list args)
+void Exception::SetMessage ( const char* format, ...)
{
- Message = ssvprintf ( message,
- args);
+ va_list args;
+ va_start ( args, format);
+ _e = ssvprintf ( format, args);
+ va_end ( args );
}
+void Exception::SetMessageV ( const char* message, va_list args )
+{
+ _e = ssvprintf ( message, args);
+}
+
OutOfMemoryException::OutOfMemoryException ()
: Exception ( "Out of memory" )
{
}
-InvalidOperationException::InvalidOperationException ( const char*
filename,
- const int
linenumber )
+InvalidOperationException::InvalidOperationException (
+ const char* filename,
+ const int linenumber )
+ : Exception ( "%s:%d", filename, linenumber )
{
- Message = ssprintf ( "%s:%d",
- filename,
- linenumber );
}
-InvalidOperationException::InvalidOperationException ( const char*
filename,
- const int
linenumber,
- const char*
message,
- ... )
+InvalidOperationException::InvalidOperationException (
+ const char* filename,
+ const int linenumber,
+ const char* message,
+ ... )
{
string errorMessage;
va_list args;
- va_start ( args,
- message );
- errorMessage = ssvprintf ( message,
- args );
+ va_start ( args, message );
+ errorMessage = ssvprintf ( message, args );
va_end ( args );
- Message = ssprintf ( "%s:%d %s",
- filename,
- linenumber,
- errorMessage.c_str () );
+ SetMessage (
+ "%s:%d %s",
+ filename,
+ linenumber,
+ errorMessage.c_str () );
}
@@ -97,49 +99,15 @@
}
-InvalidBuildFileException::InvalidBuildFileException ( const string&
location,
- const char*
message,
- ...)
-{
- va_list args;
- va_start ( args,
- message );
- SetLocationMessage ( location, message, args );
- va_end ( args );
-}
-
-InvalidBuildFileException::InvalidBuildFileException ()
-{
-}
-
-void
-InvalidBuildFileException::SetLocationMessage ( const std::string&
location,
- const char* message,
- va_list args )
-{
- Message = location + ": " + ssvprintf ( message, args );
-}
-
-XMLSyntaxErrorException::XMLSyntaxErrorException ( const string&
location,
- const char*
message,
- ... )
-{
- va_list args;
- va_start ( args,
- message );
- SetLocationMessage ( location, message, args );
- va_end ( args );
-}
-
-
RequiredAttributeNotFoundException::RequiredAttributeNotFoundException
(
const string& location,
const string& attributeName,
const string& elementName )
- : InvalidBuildFileException ( location,
- "Required attribute '%s' not found
on '%s'.",
- attributeName.c_str (),
- elementName.c_str ())
+ : XMLInvalidBuildFileException (
+ location,
+ "Required attribute '%s' not found on '%s'.",
+ attributeName.c_str (),
+ elementName.c_str ())
{
}
@@ -147,10 +115,11 @@
const string& location,
const string& name,
const string& value )
- : InvalidBuildFileException ( location,
- "Attribute '%s' has an invalid
value '%s'.",
- name.c_str (),
- value.c_str () )
+ : XMLInvalidBuildFileException (
+ location,
+ "Attribute '%s' has an invalid value '%s'.",
+ name.c_str (),
+ value.c_str () )
{
}
@@ -171,9 +140,10 @@
UnknownModuleTypeException::UnknownModuleTypeException ( const string&
location,
int moduletype
)
- : InvalidBuildFileException ( location,
- "module type requested: %i",
- moduletype )
+ : XMLInvalidBuildFileException (
+ location,
+ "module type requested: %i",
+ moduletype )
{
}
_____
Modified: trunk/reactos/tools/rbuild/exception.h
--- trunk/reactos/tools/rbuild/exception.h 2005-11-27 06:20:33 UTC
(rev 19673)
+++ trunk/reactos/tools/rbuild/exception.h 2005-11-27 06:34:50 UTC
(rev 19674)
@@ -19,6 +19,7 @@
#define __EXCEPTION_H
#include "pch.h"
+#include "XML.h"
class Exception
{
@@ -26,11 +27,15 @@
Exception ( const std::string& message );
Exception ( const char* format,
...);
- std::string Message;
+ const std::string& operator *() { return _e; }
+
protected:
Exception ();
- void SetMessage ( const char* message,
- va_list args );
+ void SetMessage ( const char* message, ... );
+ void SetMessageV ( const char* message, va_list args );
+
+private:
+ std::string _e;
};
@@ -68,39 +73,17 @@
std::string Filename;
};
-class InvalidBuildFileException : public Exception
-{
-public:
- InvalidBuildFileException ( const std::string& location,
- const char* message,
- ...);
- void SetLocationMessage ( const std::string& location,
- const char* message,
- va_list args );
-protected:
- InvalidBuildFileException ();
-};
-
-class XMLSyntaxErrorException : public InvalidBuildFileException
+class RequiredAttributeNotFoundException : public
XMLInvalidBuildFileException
{
public:
- XMLSyntaxErrorException ( const std::string& location,
- const char* message,
- ... );
-};
-
-
-class RequiredAttributeNotFoundException : public
InvalidBuildFileException
-{
-public:
RequiredAttributeNotFoundException ( const std::string&
location,
const std::string&
attributeName,
const std::string&
elementName );
[truncated at 1000 lines; 679 more skipped]
