atria-soft/exml
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] eror with the clang compilation

Browse Source
This commit is contained in:
Edouard DUPIN 2013-07-02 21:50:06 +02:00
parent 12f6785e62
commit 0e6c60afb7
16 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exml/Attribute.cpp
View File

@ -20,7 +20,7 @@ exml::Attribute::Attribute(const etk::UString& _name, const etk::UString& _value
} }
bool exml::Attribute::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) bool exml::Attribute::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc)
{ {
EXML_VERBOSE("start parse : 'attribute'"); EXML_VERBOSE("start parse : 'attribute'");
m_pos = _filePos; m_pos = _filePos;
@ -108,7 +108,7 @@ bool exml::Attribute::Parse(const etk::UString& _data, int32_t& _pos, bool _case
return true; return true;
} }
bool exml::Attribute::Generate(etk::UString& _data, int32_t _indent) const bool exml::Attribute::IGenerate(etk::UString& _data, int32_t _indent) const
{ {
_data += " "; _data += " ";
_data += m_name; _data += m_name;

4
exml/Attribute.h
View File

@ -46,8 +46,8 @@ namespace exml
virtual const etk::UString& GetName(void) const { return m_name; }; virtual const etk::UString& GetName(void) const { return m_name; };
public: // herited function: public: // herited function:
virtual nodeType_te GetType(void) const { return exml::typeAttribute; }; virtual nodeType_te GetType(void) const { return exml::typeAttribute; };
virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
virtual bool Generate(etk::UString& _data, int32_t _indent) const; virtual bool IGenerate(etk::UString& _data, int32_t _indent) const;
virtual exml::Attribute* ToAttribute(void) { return this; }; virtual exml::Attribute* ToAttribute(void) { return this; };
virtual const exml::Attribute* ToAttribute(void) const { return this; }; virtual const exml::Attribute* ToAttribute(void) const { return this; };
virtual void Clear(void); virtual void Clear(void);

4
exml/AttributeList.cpp
View File

@ -101,11 +101,11 @@ void exml::AttributeList::SetAttribute(const etk::UString& _name, const etk::USt
m_listAttribute.PushBack(attr); m_listAttribute.PushBack(attr);
} }
bool exml::AttributeList::Generate(etk::UString& _data, int32_t _indent) const bool exml::AttributeList::IGenerate(etk::UString& _data, int32_t _indent) const
{ {
for (int32_t iii=0; iii<m_listAttribute.Size(); iii++) { for (int32_t iii=0; iii<m_listAttribute.Size(); iii++) {
if (NULL!=m_listAttribute[iii]) { if (NULL!=m_listAttribute[iii]) {
m_listAttribute[iii]->Generate(_data, _indent); m_listAttribute[iii]->IGenerate(_data, _indent);
} }
} }
return true; return true;

2
exml/AttributeList.h
View File

@ -70,7 +70,7 @@ namespace exml
*/ */
void SetAttribute(const etk::UString& _name, const etk::UString& _value); void SetAttribute(const etk::UString& _name, const etk::UString& _value);
public: // herited function: public: // herited function:
bool Generate(etk::UString& _data, int32_t _indent) const; bool IGenerate(etk::UString& _data, int32_t _indent) const;
virtual void Clear(void); virtual void Clear(void);
}; };
}; };

4
exml/Comment.cpp
View File

@ -13,7 +13,7 @@
#undef __class__ #undef __class__
#define __class__ "Comment" #define __class__ "Comment"
bool exml::Comment::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) bool exml::Comment::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc)
{ {
EXML_VERBOSE("start parse : 'comment'"); EXML_VERBOSE("start parse : 'comment'");
m_pos = _filePos; m_pos = _filePos;
@ -53,7 +53,7 @@ bool exml::Comment::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSe
return false; return false;
} }
bool exml::Comment::Generate(etk::UString& _data, int32_t _indent) const bool exml::Comment::IGenerate(etk::UString& _data, int32_t _indent) const
{ {
AddIndent(_data, _indent); AddIndent(_data, _indent);
_data += "<!--"; _data += "<!--";

4
exml/Comment.h
View File

@ -32,8 +32,8 @@ namespace exml
virtual ~Comment(void) { }; virtual ~Comment(void) { };
public: // herited function: public: // herited function:
virtual nodeType_te GetType(void) const { return typeAttribute; }; virtual nodeType_te GetType(void) const { return typeAttribute; };
virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
virtual bool Generate(etk::UString& _data, int32_t _indent) const; virtual bool IGenerate(etk::UString& _data, int32_t _indent) const;
virtual exml::Comment* ToComment(void) { return this; }; virtual exml::Comment* ToComment(void) { return this; };
virtual const exml::Comment* ToComment(void) const { return this; }; virtual const exml::Comment* ToComment(void) const { return this; };
}; };

8
exml/Declaration.cpp
View File

@ -39,17 +39,17 @@ exml::DeclarationXML::DeclarationXML(const etk::UString& _version, unicode::char
} }
} }
bool exml::Declaration::Generate(etk::UString& _data, int32_t _indent) const bool exml::Declaration::IGenerate(etk::UString& _data, int32_t _indent) const
{ {
AddIndent(_data, _indent); AddIndent(_data, _indent);
_data += "<?"; _data += "<?";
_data += m_value; _data += m_value;
exml::AttributeList::Generate(_data, _indent); exml::AttributeList::IGenerate(_data, _indent);
_data += "?>\n"; _data += "?>\n";
return true; return true;
} }
bool exml::Declaration::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) bool exml::Declaration::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc)
{ {
EXML_VERBOSE("start parse : 'declaration' : '" << m_value << "'"); EXML_VERBOSE("start parse : 'declaration' : '" << m_value << "'");
m_pos = _filePos; m_pos = _filePos;
@ -82,7 +82,7 @@ bool exml::Declaration::Parse(const etk::UString& _data, int32_t& _pos, bool _ca
return false; return false;
} }
_pos = iii; _pos = iii;
if (false==attribute->Parse(_data, _pos, _caseSensitive, _filePos, _doc)) { if (false==attribute->IParse(_data, _pos, _caseSensitive, _filePos, _doc)) {
delete(attribute); delete(attribute);
return false; return false;
} }

4
exml/Declaration.h
View File

@ -31,8 +31,8 @@ namespace exml
virtual ~Declaration(void) { }; virtual ~Declaration(void) { };
public: // herited function: public: // herited function:
virtual nodeType_te GetType(void) const { return typeAttribute; }; virtual nodeType_te GetType(void) const { return typeAttribute; };
virtual bool Generate(etk::UString& _data, int32_t _indent) const; virtual bool IGenerate(etk::UString& _data, int32_t _indent) const;
virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
virtual exml::Declaration* ToDeclaration(void) { return this; }; virtual exml::Declaration* ToDeclaration(void) { return this; };
virtual const exml::Declaration* ToDeclaration(void) const { return this; }; virtual const exml::Declaration* ToDeclaration(void) const { return this; };
}; };

8
exml/Document.cpp
View File

@ -25,11 +25,11 @@ exml::Document::Document(void) :
} }
bool exml::Document::Generate(etk::UString& _data, int32_t _indent) const bool exml::Document::IGenerate(etk::UString& _data, int32_t _indent) const
{ {
for (int32_t iii=0; iii<m_listSub.Size(); iii++) { for (int32_t iii=0; iii<m_listSub.Size(); iii++) {
if (NULL!=m_listSub[iii]) { if (NULL!=m_listSub[iii]) {
m_listSub[iii]->Generate(_data, _indent); m_listSub[iii]->IGenerate(_data, _indent);
} }
} }
return true; return true;
@ -50,7 +50,7 @@ bool exml::Document::Parse(const etk::UString& _data)
bool exml::Document::Generate(etk::UString& _data) bool exml::Document::Generate(etk::UString& _data)
{ {
_data = ""; _data = "";
return Generate(_data,0); return IGenerate(_data,0);
} }
bool exml::Document::Load(const etk::UString& _file) bool exml::Document::Load(const etk::UString& _file)
@ -120,7 +120,7 @@ bool exml::Document::Store(const etk::UString& _file)
void exml::Document::Display(void) void exml::Document::Display(void)
{ {
etk::UString tmpp; etk::UString tmpp;
Generate(tmpp, 0); IGenerate(tmpp, 0);
EXML_INFO("Generated XML : \n" << tmpp); EXML_INFO("Generated XML : \n" << tmpp);
} }

2
exml/Document.h
View File

@ -98,7 +98,7 @@ namespace exml
void DisplayError(void); void DisplayError(void);
public: // herited function: public: // herited function:
virtual nodeType_te GetType(void) const { return typeDocument; }; virtual nodeType_te GetType(void) const { return typeDocument; };
bool Generate(etk::UString& _data, int32_t _indent) const; bool IGenerate(etk::UString& _data, int32_t _indent) const;
virtual exml::Document* ToDocument(void) { return this; }; virtual exml::Document* ToDocument(void) { return this; };
virtual const exml::Document* ToDocument(void) const { return this; }; virtual const exml::Document* ToDocument(void) const { return this; };
}; };

24
exml/Element.cpp
View File

@ -143,19 +143,19 @@ etk::UString exml::Element::GetText(void)
etk::UString res; etk::UString res;
for (int32_t iii=0; iii<m_listSub.Size(); iii++) { for (int32_t iii=0; iii<m_listSub.Size(); iii++) {
if (NULL!=m_listSub[iii]) { if (NULL!=m_listSub[iii]) {
m_listSub[iii]->Generate(res, 0); m_listSub[iii]->IGenerate(res, 0);
} }
} }
return res; return res;
} }
bool exml::Element::Generate(etk::UString& _data, int32_t _indent) const bool exml::Element::IGenerate(etk::UString& _data, int32_t _indent) const
{ {
AddIndent(_data, _indent); AddIndent(_data, _indent);
_data += "<"; _data += "<";
_data += m_value; _data += m_value;
exml::AttributeList::Generate(_data, _indent); exml::AttributeList::IGenerate(_data, _indent);
if (m_listSub.Size()>0) { if (m_listSub.Size()>0) {
if( m_listSub.Size()==1 if( m_listSub.Size()==1
@ -163,13 +163,13 @@ bool exml::Element::Generate(etk::UString& _data, int32_t _indent) const
&& m_listSub[0]->GetType() == exml::typeText && m_listSub[0]->GetType() == exml::typeText
&& static_cast<exml::Text*>(m_listSub[0])->CountLines()==1) { && static_cast<exml::Text*>(m_listSub[0])->CountLines()==1) {
_data += ">"; _data += ">";
m_listSub[0]->Generate(_data,0); m_listSub[0]->IGenerate(_data,0);
} else { } else {
_data += ">\n"; _data += ">\n";
for (int32_t iii=0; iii<m_listSub.Size(); iii++) { for (int32_t iii=0; iii<m_listSub.Size(); iii++) {
if (NULL!=m_listSub[iii]) { if (NULL!=m_listSub[iii]) {
m_listSub[iii]->Generate(_data, _indent+1); m_listSub[iii]->IGenerate(_data, _indent+1);
} }
} }
AddIndent(_data, _indent); AddIndent(_data, _indent);
@ -240,7 +240,7 @@ bool exml::Element::SubParse(const etk::UString& _data, int32_t& _pos, bool _cas
} }
_filePos += tmpPos; _filePos += tmpPos;
_pos = endPosName+1; _pos = endPosName+1;
if (false==declaration->Parse(_data, _pos, _caseSensitive, _filePos, _doc)) { if (false==declaration->IParse(_data, _pos, _caseSensitive, _filePos, _doc)) {
delete(declaration); delete(declaration);
return false; return false;
} }
@ -274,7 +274,7 @@ bool exml::Element::SubParse(const etk::UString& _data, int32_t& _pos, bool _cas
} }
_pos = iii+white+4; _pos = iii+white+4;
_filePos += tmpPos; _filePos += tmpPos;
if (false==comment->Parse(_data, _pos, _caseSensitive, _filePos, _doc)) { if (false==comment->IParse(_data, _pos, _caseSensitive, _filePos, _doc)) {
delete(comment); delete(comment);
return false; return false;
} }
@ -304,7 +304,7 @@ bool exml::Element::SubParse(const etk::UString& _data, int32_t& _pos, bool _cas
} }
_pos = iii+9+white; _pos = iii+9+white;
_filePos += tmpPos; _filePos += tmpPos;
if (false==text->Parse(_data, _pos, _caseSensitive, _filePos, _doc)) { if (false==text->IParse(_data, _pos, _caseSensitive, _filePos, _doc)) {
delete(text); delete(text);
return false; return false;
} }
@ -395,7 +395,7 @@ bool exml::Element::SubParse(const etk::UString& _data, int32_t& _pos, bool _cas
} }
_pos = endPosName+1; _pos = endPosName+1;
_filePos += tmpPos; _filePos += tmpPos;
if (false==element->Parse(_data, _pos, _caseSensitive, _filePos, _doc)) { if (false==element->IParse(_data, _pos, _caseSensitive, _filePos, _doc)) {
delete(element); delete(element);
return false; return false;
} }
@ -427,7 +427,7 @@ bool exml::Element::SubParse(const etk::UString& _data, int32_t& _pos, bool _cas
} }
_pos = iii; _pos = iii;
_filePos += tmpPos; _filePos += tmpPos;
if (false==text->Parse(_data, _pos, _caseSensitive, _filePos, _doc)) { if (false==text->IParse(_data, _pos, _caseSensitive, _filePos, _doc)) {
delete(text); delete(text);
return false; return false;
} }
@ -443,7 +443,7 @@ bool exml::Element::SubParse(const etk::UString& _data, int32_t& _pos, bool _cas
return false; return false;
} }
bool exml::Element::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) bool exml::Element::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc)
{ {
EXML_PARSE_ELEMENT("start parse : 'element' named='" << m_value << "'"); EXML_PARSE_ELEMENT("start parse : 'element' named='" << m_value << "'");
// note : When start parsing the upper element must have set the value of the element and set the position after this one // note : When start parsing the upper element must have set the value of the element and set the position after this one
@ -482,7 +482,7 @@ bool exml::Element::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSe
return false; return false;
} }
_pos = iii; _pos = iii;
if (false==attribute->Parse(_data, _pos, _caseSensitive, _filePos, _doc)) { if (false==attribute->IParse(_data, _pos, _caseSensitive, _filePos, _doc)) {
delete(attribute); delete(attribute);
return false; return false;
} }

4
exml/Element.h
View File

@ -81,8 +81,8 @@ namespace exml
bool SubParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc, bool _mainNode=false); bool SubParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc, bool _mainNode=false);
public: // herited function: public: // herited function:
virtual nodeType_te GetType(void) const { return typeElement; }; virtual nodeType_te GetType(void) const { return typeElement; };
virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
virtual bool Generate(etk::UString& _data, int32_t _indent) const; virtual bool IGenerate(etk::UString& _data, int32_t _indent) const;
virtual exml::Element* ToElement(void) { return this; }; virtual exml::Element* ToElement(void) { return this; };
virtual const exml::Element* ToElement(void) const { return this; }; virtual const exml::Element* ToElement(void) const { return this; };
virtual void Clear(void); virtual void Clear(void);

6
exml/Node.h
View File

@ -55,7 +55,7 @@ namespace exml
filePos(int32_t _line, int32_t _col) : m_col(_col),m_line(_line) { }; filePos(int32_t _line, int32_t _col) : m_col(_col),m_line(_line) { };
~filePos(void) { }; ~filePos(void) { };
filePos& operator ++(void) { m_col++; return *this; }; filePos& operator ++(void) { m_col++; return *this; };
filePos& operator --(void) { m_col--; if(m_col<0) { m_col=0; return *this; } }; filePos& operator --(void) { m_col--; if(m_col<0) { m_col=0;} return *this; };
const filePos& operator +=(const filePos& _obj) const filePos& operator +=(const filePos& _obj)
{ {
if (_obj.m_line==0) { if (_obj.m_line==0) {
@ -127,14 +127,14 @@ namespace exml
* @param[in,out] file parsing position (line x col x) * @param[in,out] file parsing position (line x col x)
* @return false if an error occured. * @return false if an error occured.
*/ */
virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) = 0; virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) = 0;
/** /**
* @brief Generate a string with the tree of the xml * @brief Generate a string with the tree of the xml
* @param[in,out] _data string where to add the elements * @param[in,out] _data string where to add the elements
* @param[in] current indentation of the file * @param[in] current indentation of the file
* @return false if an error occured. * @return false if an error occured.
*/ */
virtual bool Generate(etk::UString& _data, int32_t _indent) const { return true; }; virtual bool IGenerate(etk::UString& _data, int32_t _indent) const { return true; };
protected: protected:
exml::filePos m_pos; //!< position in the readed file ==> not correct when the file is generated exml::filePos m_pos; //!< position in the readed file ==> not correct when the file is generated
public: public:

6
exml/Text.cpp
View File

@ -13,7 +13,7 @@
#undef __class__ #undef __class__
#define __class__ "Text" #define __class__ "Text"
bool exml::Text::Generate(etk::UString& _data, int32_t _indent) const bool exml::Text::IGenerate(etk::UString& _data, int32_t _indent) const
{ {
_data += m_value; _data += m_value;
return true; return true;
@ -30,7 +30,7 @@ int32_t exml::Text::CountLines(void) const
return count; return count;
} }
bool exml::Text::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) bool exml::Text::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc)
{ {
EXML_VERBOSE("start parse : 'text'"); EXML_VERBOSE("start parse : 'text'");
m_pos = _filePos; m_pos = _filePos;
@ -65,7 +65,7 @@ bool exml::Text::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensi
return false; return false;
} }
bool exml::TextCDATA::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) bool exml::TextCDATA::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc)
{ {
EXML_VERBOSE("start parse : 'text::CDATA'"); EXML_VERBOSE("start parse : 'text::CDATA'");
m_pos = _filePos; m_pos = _filePos;

6
exml/Text.h
View File

@ -37,8 +37,8 @@ namespace exml
int32_t CountLines(void) const; int32_t CountLines(void) const;
public: // herited function: public: // herited function:
virtual nodeType_te GetType(void) const { return typeText; }; virtual nodeType_te GetType(void) const { return typeText; };
virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
virtual bool Generate(etk::UString& _data, int32_t _indent) const; virtual bool IGenerate(etk::UString& _data, int32_t _indent) const;
virtual exml::Text* ToText(void) { return this; }; virtual exml::Text* ToText(void) { return this; };
virtual const exml::Text* ToText(void) const{ return this; }; virtual const exml::Text* ToText(void) const{ return this; };
}; };
@ -54,7 +54,7 @@ namespace exml
*/ */
virtual ~TextCDATA(void) { }; virtual ~TextCDATA(void) { };
public: // herited function: public: // herited function:
virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
}; };
}; };

4
lutin_exmltest.py
View File

@ -5,13 +5,13 @@ import datetime
def Create(target): def Create(target):
# module name is 'edn' and type binary. # module name is 'edn' and type binary.
myModule = lutinModule.module(__file__, 'exmltest', 'PACKAGE') myModule = lutinModule.module(__file__, 'exmltest', 'BINARY')
# add the file to compile: # add the file to compile:
myModule.AddSrcFile([ myModule.AddSrcFile([
'exml/test.cpp']) 'exml/test.cpp'])
myModule.AddModuleDepend('exml') myModule.AddModuleDepend(['exml'])
now = datetime.datetime.now() now = datetime.datetime.now()
versionID=str(now.year-2012)+"."+str(now.month)+"."+str(now.day) versionID=str(now.year-2012)+"."+str(now.month)+"."+str(now.day)