Skip to content

Commit ca740b3

Browse files
treefrogframeworktreefrogframework
committed
updated testcase.
1 parent 1e4d816 commit ca740b3

File tree

4 files changed

+36
-35
lines changed

4 files changed

+36
-35
lines changed

‎src/thtmlparser.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,11 @@ THtmlElement &THtmlParser::insertNewElement(int parent, int index)
431431
} else {
432432
elements.resize(elements.size() + 1);
433433
last().parent = parent;
434-
if (index >= 0 && index < elements[parent].children.count()) {
435-
elements[parent].children.insert(index, lastIndex());
434+
auto &ele = elements[parent];
435+
if (index >= 0 && index < ele.children.count()) {
436+
ele.children.insert(index, lastIndex());
436437
} else {
437-
elements[parent].children.append(lastIndex());
438+
ele.children.append(lastIndex());
438439
}
439440
}
440441
return last();

‎src/thtmlparser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,3 @@ class T_CORE_EXPORT THtmlParser {
8686
QString txt;
8787
int pos;
8888
};
89-

‎tools/tmake/otamaconverter.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,16 @@ QString OtamaConverter::convertToErb(const QString &html, const QString &otm, in
241241
QStringList vals = otmParser.getWrapSrcCode(label, OtmParser::TagReplacement);
242242
if (!vals.isEmpty()) {
243243
// Adds block codes
244-
int idx = htmlParser.at(e.parent).children.indexOf(i);
245-
THtmlElement &he1 = htmlParser.insertNewElement(e.parent, idx);
244+
const int eparent = e.parent;
245+
int idx = htmlParser.at(eparent).children.indexOf(i);
246+
THtmlElement &he1 = htmlParser.insertNewElement(eparent, idx); // after this, e becomes undefined
246247
he1.text = LEFT_DELIM;
247248
he1.text += vals[0].trimmed();
248249
he1.text += (scriptArea ? RIGHT_DELIM_NO_TRIM : RIGHT_DELIM);
249250

250251
QString s = vals.value(1).trimmed();
251252
if (!s.isEmpty()) {
252-
THtmlElement &he2 = htmlParser.insertNewElement(e.parent, idx + 2);
253+
THtmlElement &he2 = htmlParser.insertNewElement(eparent, idx + 2);
253254
he2.text = LEFT_DELIM;
254255
he2.text += s;
255256
he2.text += (scriptArea ? RIGHT_DELIM_NO_TRIM : RIGHT_DELIM);

‎tools/tmake/test/tmaketest.cpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -82,37 +82,37 @@ void TestTfpconverter::otamaconvert_data()
8282
QTest::addColumn<QString>("olgFileName");
8383
QTest::addColumn<QString>("resultFileName");
8484

85-
// QTest::newRow("1") << "index1.html" << "logic1.olg" << "res1.html";
86-
// QTest::newRow("1-2") << "index1-2.html" << "logic1.olg" << "res1-2.html";
87-
// QTest::newRow("2") << "index2.html" << "logic1.olg" << "res2.html";
88-
// QTest::newRow("3") << "index3.html" << "logic1.olg" << "res3.html";
89-
// QTest::newRow("4") << "index4.html" << "logic1.olg" << "res4.html";
90-
// QTest::newRow("5") << "index5.html" << "logic1.olg" << "res5.html";
91-
// QTest::newRow("6") << "index6.html" << "logic1.olg" << "res6.html";
92-
// QTest::newRow("7") << "index7.html" << "logic1.olg" << "res7.html";
93-
// QTest::newRow("8") << "index8.html" << "logic1.olg" << "res8.html";
94-
// QTest::newRow("9") << "index9.html" << "logic1.olg" << "res9.html";
95-
// QTest::newRow("10") << "index10.html" << "logic1.olg" << "res10.html";
96-
// QTest::newRow("11") << "index11.html" << "logic1.olg" << "res11.html";
97-
// QTest::newRow("12") << "index12.html" << "logic1.olg" << "res12.html";
98-
// QTest::newRow("13") << "index13.html" << "logic1.olg" << "res13.html";
99-
// QTest::newRow("14") << "index14.html" << "logic1.olg" << "res14.html";
100-
// QTest::newRow("14-2") << "index14-2.html" << "logic1.olg" << "res14-2.html";
101-
// QTest::newRow("14-3") << "index14-3.html" << "logic1.olg" << "res14-3.html";
102-
// QTest::newRow("14-4") << "index14-4.html" << "logic1.olg" << "res14-4.html";
103-
// QTest::newRow("15") << "index15.html" << "logic1.olg" << "res15.html";
104-
// QTest::newRow("16") << "index16.html" << "logic1.olg" << "res16.html";
105-
// QTest::newRow("17") << "index17.html" << "logic1.olg" << "res17.html";
106-
// QTest::newRow("18") << "index18.html" << "logic1.olg" << "res18.html";
107-
// QTest::newRow("19") << "index19.html" << "logic1.olg" << "res19.html";
108-
// QTest::newRow("20") << "index20.html" << "logic1.olg" << "res20.html";
85+
QTest::newRow("1") << "index1.html" << "logic1.olg" << "res1.html";
86+
QTest::newRow("1-2") << "index1-2.html" << "logic1.olg" << "res1-2.html";
87+
QTest::newRow("2") << "index2.html" << "logic1.olg" << "res2.html";
88+
QTest::newRow("3") << "index3.html" << "logic1.olg" << "res3.html";
89+
QTest::newRow("4") << "index4.html" << "logic1.olg" << "res4.html";
90+
QTest::newRow("5") << "index5.html" << "logic1.olg" << "res5.html";
91+
QTest::newRow("6") << "index6.html" << "logic1.olg" << "res6.html";
92+
QTest::newRow("7") << "index7.html" << "logic1.olg" << "res7.html";
93+
QTest::newRow("8") << "index8.html" << "logic1.olg" << "res8.html";
94+
QTest::newRow("9") << "index9.html" << "logic1.olg" << "res9.html";
95+
QTest::newRow("10") << "index10.html" << "logic1.olg" << "res10.html";
96+
QTest::newRow("11") << "index11.html" << "logic1.olg" << "res11.html";
97+
QTest::newRow("12") << "index12.html" << "logic1.olg" << "res12.html";
98+
QTest::newRow("13") << "index13.html" << "logic1.olg" << "res13.html";
99+
QTest::newRow("14") << "index14.html" << "logic1.olg" << "res14.html";
100+
QTest::newRow("14-2") << "index14-2.html" << "logic1.olg" << "res14-2.html";
101+
QTest::newRow("14-3") << "index14-3.html" << "logic1.olg" << "res14-3.html";
102+
QTest::newRow("14-4") << "index14-4.html" << "logic1.olg" << "res14-4.html";
103+
QTest::newRow("15") << "index15.html" << "logic1.olg" << "res15.html";
104+
QTest::newRow("16") << "index16.html" << "logic1.olg" << "res16.html";
105+
QTest::newRow("17") << "index17.html" << "logic1.olg" << "res17.html";
106+
QTest::newRow("18") << "index18.html" << "logic1.olg" << "res18.html";
107+
QTest::newRow("19") << "index19.html" << "logic1.olg" << "res19.html";
108+
QTest::newRow("20") << "index20.html" << "logic1.olg" << "res20.html";
109109

110110
QTest::newRow("c1") << "indexc1.html" << "logic1.olg" << "resc1.html";
111-
// QTest::newRow("c2") << "indexc2.html" << "logic1.olg" << "resc2.html";
112-
// QTest::newRow("c3") << "indexc3.html" << "logic1.olg" << "resc3.html";
113-
// QTest::newRow("c4") << "indexc4.html" << "logic1.olg" << "resc4.html";
111+
QTest::newRow("c2") << "indexc2.html" << "logic1.olg" << "resc2.html";
112+
QTest::newRow("c3") << "indexc3.html" << "logic1.olg" << "resc3.html";
113+
QTest::newRow("c4") << "indexc4.html" << "logic1.olg" << "resc4.html";
114114

115-
// QTest::newRow("dm") << "dummy.html" << "logic1.olg" << "resdm.html";
115+
QTest::newRow("dm") << "dummy.html" << "logic1.olg" << "resdm.html";
116116
}
117117

118118

0 commit comments

Comments
 (0)