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

[WIP] better display debug to find bug in regex

Browse Source
This commit is contained in:
Edouard DUPIN 2017-08-13 23:58:13 +02:00
parent f031bb2a86
commit 6ae64a8c18
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
etk/RegExp.hpp
View File

@ -13,9 +13,9 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#define TK_REG_DEBUG TK_HIDDEN //#define TK_REG_DEBUG TK_HIDDEN
//#define TK_REG_DEBUG TK_VERBOSE //#define TK_REG_DEBUG TK_VERBOSE
//#define TK_REG_DEBUG TK_DEBUG #define TK_REG_DEBUG TK_DEBUG
#define TK_REG_DEBUG_3 TK_HIDDEN #define TK_REG_DEBUG_3 TK_HIDDEN
//#define TK_REG_DEBUG_3 TK_VERBOSE //#define TK_REG_DEBUG_3 TK_VERBOSE
@ -234,18 +234,22 @@ class FindProperty {
void setSubIndex(int32_t _newIndex) { void setSubIndex(int32_t _newIndex) {
m_subIndex = _newIndex; m_subIndex = _newIndex;
} }
template<class CLASS_TYPE>
void display(const std::string& _data, int32_t _level = 0) { static void display(const FindProperty& _elem, const CLASS_TYPE& _data, int32_t _level = 0) {
std::string tmp;
for (int32_t iii=_elem.m_positionStart; iii<_elem.m_positionStop; ++iii) {
tmp += _data[iii];
}
TK_INFO("prop : " << levelSpace(_level) << " [" TK_INFO("prop : " << levelSpace(_level) << " ["
<< m_positionStart << "," << _elem.m_positionStart << ","
<< m_positionStop << "]*" << _elem.m_positionStop << "]*"
<< m_multiplicity << " data='" << _elem.m_multiplicity << " data='"
<< std::string(_data, m_positionStart, m_positionStop-m_positionStart) << "'"); << tmp << "'");
for (auto &it : m_subProperty) { for (auto &it : _elem.m_subProperty) {
it.display(_data, _level+1); FindProperty::display<CLASS_TYPE>(it, _data, _level+1);
} }
} }
void display(int32_t _level = 0) { void display(int32_t _level = 0) const {
TK_INFO("prop : " << levelSpace(_level) << " [" TK_INFO("prop : " << levelSpace(_level) << " ["
<< m_positionStart << "," << m_positionStart << ","
<< m_positionStop << "]*" << m_positionStop << "]*"
@ -1161,9 +1165,9 @@ template<class CLASS_TYPE> class NodePThese : public Node<CLASS_TYPE> {
} }
if (_property.getStatus() != parseStatusPartial) { if (_property.getStatus() != parseStatusPartial) {
if (Node<CLASS_TYPE>::m_multipleMin == 0) { if (Node<CLASS_TYPE>::m_multipleMin == 0) {
TK_REG_DEBUG("Parse " << levelSpace(Node<CLASS_TYPE>::m_nodeLevel) << " ==> partial (minSize=0)");
_property.setStatus(parseStatusPartial); _property.setStatus(parseStatusPartial);
_property.setPositionStop(_property.getPositionStart()); _property.setPositionStop(_property.getPositionStart());
TK_REG_DEBUG("Parse " << levelSpace(Node<CLASS_TYPE>::m_nodeLevel) << " ==> partial (minSize=0)");
return; return;
} }
} }
@ -1189,9 +1193,9 @@ template<class CLASS_TYPE> class NodePThese : public Node<CLASS_TYPE> {
prop = _property.m_subProperty[jjj]; prop = _property.m_subProperty[jjj];
tmpCurrentPos = prop.getPositionStop(); tmpCurrentPos = prop.getPositionStop();
_property.m_subProperty.erase(_property.m_subProperty.begin()+jjj, _property.m_subProperty.end()); _property.m_subProperty.erase(_property.m_subProperty.begin()+jjj, _property.m_subProperty.end());
_property.setPositionStop(tmpCurrentPos);
iiiStartPos = prop.getSubIndex(); iiiStartPos = prop.getSubIndex();
TK_REG_DEBUG(" " << levelSpace(Node<CLASS_TYPE>::m_nodeLevel) << " (...) Rewind to " << iiiStartPos << " last elem=" << prop); TK_REG_DEBUG(" " << levelSpace(Node<CLASS_TYPE>::m_nodeLevel) << " (...) Rewind to " << iiiStartPos << " last elem=" << prop);
_property.setPositionStop(tmpCurrentPos);
break; break;
} }
} }
@ -1199,6 +1203,7 @@ template<class CLASS_TYPE> class NodePThese : public Node<CLASS_TYPE> {
if ( _property.getPositionStop() < 0 if ( _property.getPositionStop() < 0
&& Node<CLASS_TYPE>::m_multipleMin == 0 && Node<CLASS_TYPE>::m_multipleMin == 0
&& _property.getMultiplicity() == 0) { && _property.getMultiplicity() == 0) {
TK_REG_DEBUG(" " << levelSpace(Node<CLASS_TYPE>::m_nodeLevel) << " (...) Finish to " << iiiStartPos << " last elem=" << prop);
_property.setPositionStop(_property.getPositionStart()); _property.setPositionStop(_property.getPositionStart());
_property.setStatus(parseStatusPartial); _property.setStatus(parseStatusPartial);
return; return;
@ -1262,8 +1267,13 @@ template<class CLASS_TYPE> class NodePThese : public Node<CLASS_TYPE> {
} }
} }
if (_property.m_subProperty.size() == 0) { if (_property.m_subProperty.size() == 0) {
TK_REG_DEBUG(" " << levelSpace(Node<CLASS_TYPE>::m_nodeLevel) << " (...) sub empty ...");
_property.setPositionStop(_property.getPositionStart()); _property.setPositionStop(_property.getPositionStart());
} else { } else {
TK_REG_DEBUG(" " << levelSpace(Node<CLASS_TYPE>::m_nodeLevel) << " (...) sub finished ...");
for (auto &it: _property.m_subProperty) {
FindProperty::display<CLASS_TYPE>(it, _data, 2);
}
_property.setPositionStop(_property.m_subProperty.back().getPositionStop()); _property.setPositionStop(_property.m_subProperty.back().getPositionStop());
} }
if( _property.getMultiplicity() >= Node<CLASS_TYPE>::m_multipleMin if( _property.getMultiplicity() >= Node<CLASS_TYPE>::m_multipleMin

7
test/testRegExp.cpp
View File

@ -81,6 +81,13 @@ TEST(TestEtkRegExp, complexString ) {
} }
TEST(TestEtkRegExp, endError ) {
std::string expression = "\\@((0(x|X)[0-9a-fA-F]*)|(\\d+\\.?\\d*|\\.\\d+)((e|E)(\\+|\\-)?\\d+)?)(LL|L|l|UL|ul|u|U|F|f)?\\@";
std::string dataToParse = "(9,";
std::pair<int32_t, int32_t> res;
res = testRegExpSingle(expression, dataToParse);
EXPECT_EQ(res, std::make_pair(7,31));
}