research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a capability to expose the comment field.

Browse source 
nChildren now takes an argument (has a default) to ignore comments.
This commit is contained in:
Harry Moffat 2010-09-21 16:03:45 +00:00
parent 3446c33520
commit fd62251e6f
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Cantera/src/base/xml.cpp
View file

@ -835,15 +835,29 @@ namespace Cantera {
const std::vector<XML_Node*>& XML_Node::children() const {
return m_children;
}
// return the number of children
//=====================================================================================================================
// Return the number of children
/*
*
* @param discardComments Bool indicating whether we should ignore comments in the count. defaults to false
*/
int XML_Node::nChildren() const {
int XML_Node::nChildren(const bool discardComments) const {
if (discardComments) {
int count = 0;
for (int i = 0; i < m_nchildren; i++) {
XML_Node *xc = m_children[i];
if (!(xc->isComment())) {
count++;
}
}
return count;
}
return m_nchildren;
}
//=====================================================================================================================
bool XML_Node::isComment() const {
return m_iscomment;
}
//=====================================================================================================================
// Require that the current xml node have an attribute named
// by the first argument, a, and that this attribute have the
// the string value listed in the second argument, v.

10
Cantera/src/base/xml.h
View file

@ -472,12 +472,16 @@ namespace Cantera {
*/
const std::vector<XML_Node*>& children() const;
//! return the number of children
//! Return the number of children
/*!
*
* @param discardComments If true comments are discarded when adding up the number of children.
* Defaults to false.
*/
int nChildren() const;
int nChildren(bool discardComments = false) const;
//! Boolean function indicating whether a comment
bool isComment() const;
//! Require that the current xml node have an attribute named
//! by the first argument, a, and that this attribute have the
//! the string value listed in the second argument, v.