[STYLE] remove (void) in () to be c++ coherent
This commit is contained in:
parent
92ea8abb9e
commit
970c050bc2
@ -121,7 +121,7 @@ bool exml::Attribute::iGenerate(std::string& _data, int32_t _indent) const {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exml::Attribute::clear(void) {
|
void exml::Attribute::clear() {
|
||||||
m_name = "";
|
m_name = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
Attribute(void) { };
|
Attribute() { };
|
||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
* @param[in] _name Name of the attribute.
|
* @param[in] _name Name of the attribute.
|
||||||
@ -28,7 +28,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~Attribute(void) { };
|
virtual ~Attribute() { };
|
||||||
protected:
|
protected:
|
||||||
std::string m_name;
|
std::string m_name;
|
||||||
public:
|
public:
|
||||||
@ -43,22 +43,22 @@ namespace exml {
|
|||||||
* @brief get the current name of the Attribute
|
* @brief get the current name of the Attribute
|
||||||
* @return String of the attribute
|
* @return String of the attribute
|
||||||
*/
|
*/
|
||||||
virtual const std::string& getName(void) const {
|
virtual const std::string& getName() const {
|
||||||
return m_name;
|
return m_name;
|
||||||
};
|
};
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
virtual enum nodeType getType(void) const {
|
virtual enum nodeType getType() const {
|
||||||
return exml::typeAttribute;
|
return exml::typeAttribute;
|
||||||
};
|
};
|
||||||
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
||||||
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
||||||
virtual exml::Attribute* toAttribute(void) {
|
virtual exml::Attribute* toAttribute() {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual const exml::Attribute* toAttribute(void) const {
|
virtual const exml::Attribute* toAttribute() const {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual void clear(void);
|
virtual void clear();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "AttributeList"
|
#define __class__ "AttributeList"
|
||||||
|
|
||||||
exml::AttributeList::~AttributeList(void) {
|
exml::AttributeList::~AttributeList() {
|
||||||
for (size_t iii=0; iii<m_listAttribute.size(); iii++) {
|
for (size_t iii=0; iii<m_listAttribute.size(); iii++) {
|
||||||
if (NULL!=m_listAttribute[iii]) {
|
if (NULL!=m_listAttribute[iii]) {
|
||||||
delete(m_listAttribute[iii]);
|
delete(m_listAttribute[iii]);
|
||||||
@ -104,7 +104,7 @@ bool exml::AttributeList::iGenerate(std::string& _data, int32_t _indent) const {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exml::AttributeList::clear(void) {
|
void exml::AttributeList::clear() {
|
||||||
exml::Node::clear();
|
exml::Node::clear();
|
||||||
for (size_t iii=0; iii<m_listAttribute.size(); iii++) {
|
for (size_t iii=0; iii<m_listAttribute.size(); iii++) {
|
||||||
if (NULL!=m_listAttribute[iii]) {
|
if (NULL!=m_listAttribute[iii]) {
|
||||||
|
@ -19,7 +19,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
AttributeList(void) { };
|
AttributeList() { };
|
||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
* @param[in] _value Node value;
|
* @param[in] _value Node value;
|
||||||
@ -31,7 +31,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~AttributeList(void);
|
virtual ~AttributeList();
|
||||||
protected:
|
protected:
|
||||||
std::vector<exml::Attribute*> m_listAttribute; //!< list of all attribute
|
std::vector<exml::Attribute*> m_listAttribute; //!< list of all attribute
|
||||||
public:
|
public:
|
||||||
@ -39,7 +39,7 @@ namespace exml {
|
|||||||
* @brief get the number of attribute in the Node
|
* @brief get the number of attribute in the Node
|
||||||
* @return Nulber of attribute >=0
|
* @return Nulber of attribute >=0
|
||||||
*/
|
*/
|
||||||
size_t sizeAttribute(void) const {
|
size_t sizeAttribute() const {
|
||||||
return m_listAttribute.size();
|
return m_listAttribute.size();
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
@ -74,7 +74,7 @@ namespace exml {
|
|||||||
void setAttribute(const std::string& _name, const std::string& _value);
|
void setAttribute(const std::string& _name, const std::string& _value);
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
bool iGenerate(std::string& _data, int32_t _indent) const;
|
bool iGenerate(std::string& _data, int32_t _indent) const;
|
||||||
virtual void clear(void);
|
virtual void clear();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
Comment(void) { };
|
Comment() { };
|
||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
* @param[in] _value comment value
|
* @param[in] _value comment value
|
||||||
@ -30,17 +30,17 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~Comment(void) { };
|
virtual ~Comment() { };
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
virtual enum nodeType getType(void) const {
|
virtual enum nodeType getType() const {
|
||||||
return typeAttribute;
|
return typeAttribute;
|
||||||
};
|
};
|
||||||
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
||||||
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
||||||
virtual exml::Comment* toComment(void) {
|
virtual exml::Comment* toComment() {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual const exml::Comment* toComment(void) const {
|
virtual const exml::Comment* toComment() const {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -17,7 +17,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
Declaration(void) { };
|
Declaration() { };
|
||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
* @param[in] _name name of the declaration (xml, xml:xxxx ...)
|
* @param[in] _name name of the declaration (xml, xml:xxxx ...)
|
||||||
@ -29,17 +29,17 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~Declaration(void) { };
|
virtual ~Declaration() { };
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
virtual enum nodeType getType(void) const {
|
virtual enum nodeType getType() const {
|
||||||
return typeAttribute;
|
return typeAttribute;
|
||||||
};
|
};
|
||||||
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
||||||
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
||||||
virtual exml::Declaration* toDeclaration(void) {
|
virtual exml::Declaration* toDeclaration() {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual const exml::Declaration* toDeclaration(void) const {
|
virtual const exml::Declaration* toDeclaration() const {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -55,7 +55,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~DeclarationXML(void) { };
|
virtual ~DeclarationXML() { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "Document"
|
#define __class__ "Document"
|
||||||
|
|
||||||
exml::Document::Document(void) :
|
exml::Document::Document() :
|
||||||
m_caseSensitive(false),
|
m_caseSensitive(false),
|
||||||
m_writeErrorWhenDetexted(true),
|
m_writeErrorWhenDetexted(true),
|
||||||
m_comment(""),
|
m_comment(""),
|
||||||
@ -107,7 +107,7 @@ bool exml::Document::store(const std::string& _file) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exml::Document::display(void) {
|
void exml::Document::display() {
|
||||||
std::string tmpp;
|
std::string tmpp;
|
||||||
iGenerate(tmpp, 0);
|
iGenerate(tmpp, 0);
|
||||||
EXML_INFO("Generated XML : \n" << tmpp);
|
EXML_INFO("Generated XML : \n" << tmpp);
|
||||||
@ -130,7 +130,7 @@ std::string createPosPointer(const std::string& _line, int32_t _pos) {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exml::Document::displayError(void) {
|
void exml::Document::displayError() {
|
||||||
if (m_comment.size() == 0) {
|
if (m_comment.size() == 0) {
|
||||||
EXML_ERROR("No error detected ???");
|
EXML_ERROR("No error detected ???");
|
||||||
return;
|
return;
|
||||||
|
@ -18,11 +18,11 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
Document(void);
|
Document();
|
||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~Document(void) { };
|
virtual ~Document() { };
|
||||||
private:
|
private:
|
||||||
bool m_caseSensitive; // check the case sensitive of the nodes and attribute
|
bool m_caseSensitive; // check the case sensitive of the nodes and attribute
|
||||||
public:
|
public:
|
||||||
@ -37,7 +37,7 @@ namespace exml {
|
|||||||
* @brief get the status of case sensitive mode.
|
* @brief get the status of case sensitive mode.
|
||||||
* @return true if case sensitive is active
|
* @return true if case sensitive is active
|
||||||
*/
|
*/
|
||||||
virtual bool getCaseSensitive(void) const {
|
virtual bool getCaseSensitive() const {
|
||||||
return m_caseSensitive;
|
return m_caseSensitive;
|
||||||
};
|
};
|
||||||
public:
|
public:
|
||||||
@ -72,31 +72,31 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Display the Document on console
|
* @brief Display the Document on console
|
||||||
*/
|
*/
|
||||||
void display(void);
|
void display();
|
||||||
private:
|
private:
|
||||||
bool m_writeErrorWhenDetexted;
|
bool m_writeErrorWhenDetexted;
|
||||||
std::string m_comment;
|
std::string m_comment;
|
||||||
std::string m_Line;
|
std::string m_Line;
|
||||||
exml::filePos m_filePos;
|
exml::filePos m_filePos;
|
||||||
public:
|
public:
|
||||||
void displayErrorWhenDetected(void) {
|
void displayErrorWhenDetected() {
|
||||||
m_writeErrorWhenDetexted = true;
|
m_writeErrorWhenDetexted = true;
|
||||||
};
|
};
|
||||||
void notDisplayErrorWhenDetected(void) {
|
void notDisplayErrorWhenDetected() {
|
||||||
m_writeErrorWhenDetexted = false;
|
m_writeErrorWhenDetexted = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
void createError(const std::string& _data, int32_t _pos, const exml::filePos& _filePos, const std::string& _comment);
|
void createError(const std::string& _data, int32_t _pos, const exml::filePos& _filePos, const std::string& _comment);
|
||||||
void displayError(void);
|
void displayError();
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
virtual enum nodeType getType(void) const {
|
virtual enum nodeType getType() const {
|
||||||
return typeDocument;
|
return typeDocument;
|
||||||
};
|
};
|
||||||
bool iGenerate(std::string& _data, int32_t _indent) const;
|
bool iGenerate(std::string& _data, int32_t _indent) const;
|
||||||
virtual exml::Document* toDocument(void) {
|
virtual exml::Document* toDocument() {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual const exml::Document* toDocument(void) const {
|
virtual const exml::Document* toDocument() const {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -28,7 +28,7 @@ static bool isWhiteChar(char32_t _val) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
exml::Element::~Element(void) {
|
exml::Element::~Element() {
|
||||||
for (size_t iii=0; iii<m_listSub.size(); iii++) {
|
for (size_t iii=0; iii<m_listSub.size(); iii++) {
|
||||||
if (NULL!=m_listSub[iii]) {
|
if (NULL!=m_listSub[iii]) {
|
||||||
delete(m_listSub[iii]);
|
delete(m_listSub[iii]);
|
||||||
@ -136,7 +136,7 @@ void exml::Element::append(exml::Node* _node) {
|
|||||||
m_listSub.push_back(_node);
|
m_listSub.push_back(_node);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string exml::Element::getText(void) {
|
std::string exml::Element::getText() {
|
||||||
// TODO : add more capabilities ...
|
// TODO : add more capabilities ...
|
||||||
std::string res;
|
std::string res;
|
||||||
for (size_t iii=0; iii<m_listSub.size(); iii++) {
|
for (size_t iii=0; iii<m_listSub.size(); iii++) {
|
||||||
@ -493,7 +493,7 @@ bool exml::Element::iParse(const std::string& _data, int32_t& _pos, bool _caseSe
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exml::Element::clear(void) {
|
void exml::Element::clear() {
|
||||||
exml::AttributeList::clear();
|
exml::AttributeList::clear();
|
||||||
for (size_t iii=0; iii<m_listSub.size(); iii++) {
|
for (size_t iii=0; iii<m_listSub.size(); iii++) {
|
||||||
if (NULL!=m_listSub[iii]) {
|
if (NULL!=m_listSub[iii]) {
|
||||||
|
@ -19,7 +19,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
Element(void) { };
|
Element() { };
|
||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
* @param[in] _value Element name;
|
* @param[in] _value Element name;
|
||||||
@ -31,7 +31,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~Element(void);
|
virtual ~Element();
|
||||||
protected:
|
protected:
|
||||||
std::vector<exml::Node*> m_listSub;
|
std::vector<exml::Node*> m_listSub;
|
||||||
public:
|
public:
|
||||||
@ -39,7 +39,7 @@ namespace exml {
|
|||||||
* @brief get the number of sub element in the node (can be exml::Comment ; exml::Element ; exml::Text :exml::Declaration).
|
* @brief get the number of sub element in the node (can be exml::Comment ; exml::Element ; exml::Text :exml::Declaration).
|
||||||
* @return a number >=0.
|
* @return a number >=0.
|
||||||
*/
|
*/
|
||||||
size_t size(void) const {
|
size_t size() const {
|
||||||
return m_listSub.size();
|
return m_listSub.size();
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
@ -79,22 +79,22 @@ namespace exml {
|
|||||||
* @brief get the internal data of the element (if the element has some sub node thay are converted in xml string == > like this it is not needed to use <![CDATA[...]]>
|
* @brief get the internal data of the element (if the element has some sub node thay are converted in xml string == > like this it is not needed to use <![CDATA[...]]>
|
||||||
* @return the curent data string.
|
* @return the curent data string.
|
||||||
*/
|
*/
|
||||||
std::string getText(void);
|
std::string getText();
|
||||||
protected:
|
protected:
|
||||||
bool subParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc, bool _mainNode=false);
|
bool subParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc, bool _mainNode=false);
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
virtual enum nodeType getType(void) const {
|
virtual enum nodeType getType() const {
|
||||||
return typeElement;
|
return typeElement;
|
||||||
};
|
};
|
||||||
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
||||||
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
||||||
virtual exml::Element* toElement(void) {
|
virtual exml::Element* toElement() {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual const exml::Element* toElement(void) const {
|
virtual const exml::Element* toElement() const {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual void clear(void);
|
virtual void clear();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -116,7 +116,7 @@ int32_t exml::Node::countWhiteChar(const std::string& _data, int32_t _pos, exml:
|
|||||||
return white;
|
return white;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exml::Node::clear(void) {
|
void exml::Node::clear() {
|
||||||
m_value = "";
|
m_value = "";
|
||||||
m_pos.clear();
|
m_pos.clear();
|
||||||
}
|
}
|
||||||
|
64
exml/Node.h
64
exml/Node.h
@ -49,7 +49,7 @@ namespace exml {
|
|||||||
int32_t m_col;
|
int32_t m_col;
|
||||||
int32_t m_line;
|
int32_t m_line;
|
||||||
public:
|
public:
|
||||||
filePos(void) :
|
filePos() :
|
||||||
m_col(0),
|
m_col(0),
|
||||||
m_line(0) {
|
m_line(0) {
|
||||||
|
|
||||||
@ -59,12 +59,12 @@ namespace exml {
|
|||||||
m_line(_line) {
|
m_line(_line) {
|
||||||
|
|
||||||
};
|
};
|
||||||
~filePos(void) { };
|
~filePos() { };
|
||||||
filePos& operator ++(void) {
|
filePos& operator ++() {
|
||||||
m_col++;
|
m_col++;
|
||||||
return *this;
|
return *this;
|
||||||
};
|
};
|
||||||
filePos& operator --(void) {
|
filePos& operator --() {
|
||||||
m_col--;
|
m_col--;
|
||||||
if(m_col<0) {
|
if(m_col<0) {
|
||||||
m_col=0;
|
m_col=0;
|
||||||
@ -89,7 +89,7 @@ namespace exml {
|
|||||||
m_line = _obj.m_line;
|
m_line = _obj.m_line;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
void newLine(void) {
|
void newLine() {
|
||||||
m_col=0;
|
m_col=0;
|
||||||
m_line++;
|
m_line++;
|
||||||
};
|
};
|
||||||
@ -105,14 +105,14 @@ namespace exml {
|
|||||||
m_col = _col;
|
m_col = _col;
|
||||||
m_line = _line;
|
m_line = _line;
|
||||||
}
|
}
|
||||||
void clear(void) {
|
void clear() {
|
||||||
m_col = 0;
|
m_col = 0;
|
||||||
m_line = 0;
|
m_line = 0;
|
||||||
}
|
}
|
||||||
int32_t getCol(void) const {
|
int32_t getCol() const {
|
||||||
return m_col;
|
return m_col;
|
||||||
};
|
};
|
||||||
int32_t getLine(void) const {
|
int32_t getLine() const {
|
||||||
return m_line;
|
return m_line;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -123,7 +123,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief basic element of a xml structure
|
* @brief basic element of a xml structure
|
||||||
*/
|
*/
|
||||||
Node(void) :
|
Node() :
|
||||||
m_pos(0,0) {
|
m_pos(0,0) {
|
||||||
|
|
||||||
};
|
};
|
||||||
@ -135,7 +135,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief destructor
|
* @brief destructor
|
||||||
*/
|
*/
|
||||||
virtual ~Node(void) { };
|
virtual ~Node() { };
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief parse the Current node [pure VIRUAL]
|
* @brief parse the Current node [pure VIRUAL]
|
||||||
@ -161,7 +161,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief get the current position where the element is in the file
|
* @brief get the current position where the element is in the file
|
||||||
*/
|
*/
|
||||||
const exml::filePos& getPos(void) {
|
const exml::filePos& getPos() {
|
||||||
return m_pos;
|
return m_pos;
|
||||||
};
|
};
|
||||||
protected:
|
protected:
|
||||||
@ -178,7 +178,7 @@ namespace exml {
|
|||||||
* @brief get the current element Value.
|
* @brief get the current element Value.
|
||||||
* @return the reference of the string value.
|
* @return the reference of the string value.
|
||||||
*/
|
*/
|
||||||
virtual const std::string& getValue(void) const {
|
virtual const std::string& getValue() const {
|
||||||
return m_value;
|
return m_value;
|
||||||
};
|
};
|
||||||
public:
|
public:
|
||||||
@ -186,7 +186,7 @@ namespace exml {
|
|||||||
* @brief get the node type.
|
* @brief get the node type.
|
||||||
* @return the type of the Node.
|
* @return the type of the Node.
|
||||||
*/
|
*/
|
||||||
virtual enum nodeType getType(void) const {
|
virtual enum nodeType getType() const {
|
||||||
return typeNode;
|
return typeNode;
|
||||||
};
|
};
|
||||||
protected:
|
protected:
|
||||||
@ -221,60 +221,60 @@ namespace exml {
|
|||||||
* @brief Cast the element in a Document if it is possible.
|
* @brief Cast the element in a Document if it is possible.
|
||||||
* @return pointer on the class or NULL.
|
* @return pointer on the class or NULL.
|
||||||
*/
|
*/
|
||||||
virtual exml::Document* toDocument(void) {
|
virtual exml::Document* toDocument() {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
virtual const exml::Document* toDocument(void) const {
|
virtual const exml::Document* toDocument() const {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief Cast the element in a Attribute if it is possible.
|
* @brief Cast the element in a Attribute if it is possible.
|
||||||
* @return pointer on the class or NULL.
|
* @return pointer on the class or NULL.
|
||||||
*/
|
*/
|
||||||
virtual exml::Attribute* toAttribute(void) {
|
virtual exml::Attribute* toAttribute() {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
virtual const exml::Attribute* toAttribute(void) const {
|
virtual const exml::Attribute* toAttribute() const {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief Cast the element in a Comment if it is possible.
|
* @brief Cast the element in a Comment if it is possible.
|
||||||
* @return pointer on the class or NULL.
|
* @return pointer on the class or NULL.
|
||||||
*/
|
*/
|
||||||
virtual exml::Comment* toComment(void) {
|
virtual exml::Comment* toComment() {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
virtual const exml::Comment* toComment(void) const {
|
virtual const exml::Comment* toComment() const {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief Cast the element in a Declaration if it is possible.
|
* @brief Cast the element in a Declaration if it is possible.
|
||||||
* @return pointer on the class or NULL.
|
* @return pointer on the class or NULL.
|
||||||
*/
|
*/
|
||||||
virtual exml::Declaration* toDeclaration(void) {
|
virtual exml::Declaration* toDeclaration() {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
virtual const exml::Declaration* toDeclaration(void) const {
|
virtual const exml::Declaration* toDeclaration() const {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief Cast the element in a Element if it is possible.
|
* @brief Cast the element in a Element if it is possible.
|
||||||
* @return pointer on the class or NULL.
|
* @return pointer on the class or NULL.
|
||||||
*/
|
*/
|
||||||
virtual exml::Element* toElement(void) {
|
virtual exml::Element* toElement() {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
virtual const exml::Element* toElement(void) const {
|
virtual const exml::Element* toElement() const {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief Cast the element in a Text if it is possible.
|
* @brief Cast the element in a Text if it is possible.
|
||||||
* @return pointer on the class or NULL.
|
* @return pointer on the class or NULL.
|
||||||
*/
|
*/
|
||||||
virtual exml::Text* toText(void) {
|
virtual exml::Text* toText() {
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
virtual const exml::Text* toText(void) const{
|
virtual const exml::Text* toText() const{
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -282,49 +282,49 @@ namespace exml {
|
|||||||
* @brief check if the node is a exml::Document
|
* @brief check if the node is a exml::Document
|
||||||
* @return true if the node is a exml::Document
|
* @return true if the node is a exml::Document
|
||||||
*/
|
*/
|
||||||
bool isDocument(void) const {
|
bool isDocument() const {
|
||||||
return getType() == exml::typeDocument;
|
return getType() == exml::typeDocument;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief check if the node is a exml::Attribute
|
* @brief check if the node is a exml::Attribute
|
||||||
* @return true if the node is a exml::Attribute
|
* @return true if the node is a exml::Attribute
|
||||||
*/
|
*/
|
||||||
bool isAttribute(void) const {
|
bool isAttribute() const {
|
||||||
return getType() == exml::typeAttribute;
|
return getType() == exml::typeAttribute;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief check if the node is a exml::Comment
|
* @brief check if the node is a exml::Comment
|
||||||
* @return true if the node is a exml::Comment
|
* @return true if the node is a exml::Comment
|
||||||
*/
|
*/
|
||||||
bool isComment(void) const {
|
bool isComment() const {
|
||||||
return getType() == exml::typeComment;
|
return getType() == exml::typeComment;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief check if the node is a exml::Declaration
|
* @brief check if the node is a exml::Declaration
|
||||||
* @return true if the node is a exml::Declaration
|
* @return true if the node is a exml::Declaration
|
||||||
*/
|
*/
|
||||||
bool isDeclaration(void) const {
|
bool isDeclaration() const {
|
||||||
return getType() == exml::typeDeclaration;
|
return getType() == exml::typeDeclaration;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief check if the node is a exml::Element
|
* @brief check if the node is a exml::Element
|
||||||
* @return true if the node is a exml::Element
|
* @return true if the node is a exml::Element
|
||||||
*/
|
*/
|
||||||
bool isElement(void) const {
|
bool isElement() const {
|
||||||
return getType() == exml::typeElement;
|
return getType() == exml::typeElement;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief check if the node is a exml::Text
|
* @brief check if the node is a exml::Text
|
||||||
* @return true if the node is a exml::Text
|
* @return true if the node is a exml::Text
|
||||||
*/
|
*/
|
||||||
bool isText(void) const {
|
bool isText() const {
|
||||||
return getType() == exml::typeText;
|
return getType() == exml::typeText;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief clear the Node
|
* @brief clear the Node
|
||||||
*/
|
*/
|
||||||
virtual void clear(void);
|
virtual void clear();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ bool exml::Text::iGenerate(std::string& _data, int32_t _indent) const {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t exml::Text::countLines(void) const {
|
int32_t exml::Text::countLines() const {
|
||||||
int32_t count = 1;
|
int32_t count = 1;
|
||||||
for (size_t iii=0; iii<m_value.size(); iii++) {
|
for (size_t iii=0; iii<m_value.size(); iii++) {
|
||||||
if(m_value[iii] == '\n') {
|
if(m_value[iii] == '\n') {
|
||||||
|
16
exml/Text.h
16
exml/Text.h
@ -18,7 +18,7 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
Text(void) { };
|
Text() { };
|
||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
* @param[in] _data String data of the current Text
|
* @param[in] _data String data of the current Text
|
||||||
@ -27,22 +27,22 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~Text(void) { };
|
virtual ~Text() { };
|
||||||
/**
|
/**
|
||||||
* @brief count the number of line in the current text
|
* @brief count the number of line in the current text
|
||||||
* @return The number of lines
|
* @return The number of lines
|
||||||
*/
|
*/
|
||||||
int32_t countLines(void) const;
|
int32_t countLines() const;
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
virtual enum nodeType getType(void) const {
|
virtual enum nodeType getType() const {
|
||||||
return typeText;
|
return typeText;
|
||||||
};
|
};
|
||||||
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
||||||
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
virtual bool iGenerate(std::string& _data, int32_t _indent) const;
|
||||||
virtual exml::Text* toText(void) {
|
virtual exml::Text* toText() {
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
virtual const exml::Text* toText(void) const{
|
virtual const exml::Text* toText() const{
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -51,11 +51,11 @@ namespace exml {
|
|||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
*/
|
*/
|
||||||
TextCDATA(void) { };
|
TextCDATA() { };
|
||||||
/**
|
/**
|
||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~TextCDATA(void) { };
|
virtual ~TextCDATA() { };
|
||||||
public: // herited function:
|
public: // herited function:
|
||||||
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc);
|
||||||
};
|
};
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <exml/debug.h>
|
#include <exml/debug.h>
|
||||||
|
|
||||||
int32_t exml::getLogId(void) {
|
int32_t exml::getLogId() {
|
||||||
static int32_t g_val = etk::log::registerInstance("exml");
|
static int32_t g_val = etk::log::registerInstance("exml");
|
||||||
return g_val;
|
return g_val;
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <etk/log.h>
|
#include <etk/log.h>
|
||||||
|
|
||||||
namespace exml {
|
namespace exml {
|
||||||
int32_t getLogId(void);
|
int32_t getLogId();
|
||||||
};
|
};
|
||||||
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
||||||
#define EXML_BASE(info,data) \
|
#define EXML_BASE(info,data) \
|
||||||
|
@ -19,7 +19,7 @@ class testCheck {
|
|||||||
std::string m_ref;
|
std::string m_ref;
|
||||||
std::string m_input;
|
std::string m_input;
|
||||||
int32_t m_errorPos; // -1 : no error , 1 : parsing error, 2 generation error, 3 comparaison error ????
|
int32_t m_errorPos; // -1 : no error , 1 : parsing error, 2 generation error, 3 comparaison error ????
|
||||||
testCheck(void) {};
|
testCheck() {};
|
||||||
void set(const std::string& _ref, int32_t _pos, const std::string& _input) {
|
void set(const std::string& _ref, int32_t _pos, const std::string& _input) {
|
||||||
m_ref = _ref;
|
m_ref = _ref;
|
||||||
m_input = _input;
|
m_input = _input;
|
||||||
@ -29,7 +29,7 @@ class testCheck {
|
|||||||
|
|
||||||
std::vector<testCheck> l_list;
|
std::vector<testCheck> l_list;
|
||||||
|
|
||||||
void init(void) {
|
void init() {
|
||||||
std::string reference;
|
std::string reference;
|
||||||
std::string input;
|
std::string input;
|
||||||
testCheck check;
|
testCheck check;
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include <exml/Document.h>
|
#include <exml/Document.h>
|
||||||
|
|
||||||
namespace exml {
|
namespace exml {
|
||||||
bool test(void);
|
bool test();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user