Commit 4bece54f authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

re-initialize some variables for each file

merge 3570e978058816745101a69b552ad9d07e349542 and
00f2031c60bc472544b509586ee31c643ab2e81d from qt.
parent 8bdfdba0
......@@ -224,15 +224,15 @@ public:
ProFileEvaluator::Private::Private(ProFileEvaluator *q_)
: q(q_)
{
// Global parser state
m_prevLineNo = 0;
m_prevProFile = 0;
// Configuration, more or less
m_verbose = true;
m_block = 0;
m_commentItem = 0;
m_syntaxError = 0;
m_lineNo = 0;
m_contNextLine = false;
m_cumulative = true;
// Evaluator state
m_updateCondition = false;
m_condition = ConditionFalse;
m_invertNext = false;
......@@ -248,8 +248,13 @@ bool ProFileEvaluator::Private::read(ProFile *pro)
return false;
}
// Parser state
m_block = 0;
m_commentItem = 0;
m_contNextLine = false;
m_syntaxError = false;
m_lineNo = 1;
m_blockstack.clear();
m_blockstack.push(pro);
QTextStream ts(&file);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment