|
|
@ -902,7 +902,7 @@ static ExprValue* parseVar(const char*& s)
|
|
|
|
while (isspace(*p))
|
|
|
|
while (isspace(*p))
|
|
|
|
p++;
|
|
|
|
p++;
|
|
|
|
if (*p != '=') {
|
|
|
|
if (*p != '=') {
|
|
|
|
TRACE(TQString().sprintf("parse error: = not found after %s", name));
|
|
|
|
TRACE(TQString("parse error: = not found after %1").arg(name));
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// skip the '=' and more whitespace
|
|
|
|
// skip the '=' and more whitespace
|
|
|
@ -941,7 +941,7 @@ static void skipNested(const char*& s, char opening, char closing)
|
|
|
|
p++;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (nest != 0) {
|
|
|
|
if (nest != 0) {
|
|
|
|
TRACE(TQString().sprintf("parse error: mismatching %c%c at %-20.20s", opening, closing, s));
|
|
|
|
TRACE(TQString("parse error: mismatching %1%2 at %3").arg(opening).arg(closing).arg(s));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s = p;
|
|
|
|
s = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -984,7 +984,7 @@ static void skipNestedAngles(const char*& s)
|
|
|
|
p++;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (nest != 0) {
|
|
|
|
if (nest != 0) {
|
|
|
|
TRACE(TQString().sprintf("parse error: mismatching <> at %-20.20s", s));
|
|
|
|
TRACE(TQString("parse error: mismatching <> at %1").arg(s));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s = p;
|
|
|
|
s = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1100,7 +1100,7 @@ static void skipNestedWithString(const char*& s, char opening, char closing)
|
|
|
|
p++;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (nest > 0) {
|
|
|
|
if (nest > 0) {
|
|
|
|
TRACE(TQString().sprintf("parse error: mismatching %c%c at %-20.20s", opening, closing, s));
|
|
|
|
TRACE(TQString("parse error: mismatching %1%2 at %3").arg(opening).arg(closing).arg(s));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s = p;
|
|
|
|
s = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1132,7 +1132,7 @@ static bool parseName(const char*& s, TQString& name, VarTree::NameKind& kind)
|
|
|
|
// name, which might be "static"; allow dot for "_vtbl."
|
|
|
|
// name, which might be "static"; allow dot for "_vtbl."
|
|
|
|
skipName(p);
|
|
|
|
skipName(p);
|
|
|
|
if (p == s) {
|
|
|
|
if (p == s) {
|
|
|
|
TRACE(TQString().sprintf("parse error: not a name %-20.20s", s));
|
|
|
|
TRACE(TQString("parse error: not a name %1").arg(s));
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int len = p - s;
|
|
|
|
int len = p - s;
|
|
|
@ -1145,7 +1145,7 @@ static bool parseName(const char*& s, TQString& name, VarTree::NameKind& kind)
|
|
|
|
s = p;
|
|
|
|
s = p;
|
|
|
|
skipName(p);
|
|
|
|
skipName(p);
|
|
|
|
if (p == s) {
|
|
|
|
if (p == s) {
|
|
|
|
TRACE(TQString().sprintf("parse error: not a name after static %-20.20s", s));
|
|
|
|
TRACE(TQString("parse error: not a name after static %1").arg(s));
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
len = p - s;
|
|
|
|
len = p - s;
|
|
|
@ -1477,7 +1477,7 @@ static bool parseValueSeq(const char*& s, ExprValue* variable)
|
|
|
|
delete var;
|
|
|
|
delete var;
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
TRACE(TQString().sprintf("found <repeats %d times> in array", l));
|
|
|
|
TRACE(TQString("found <repeats %1 times> in array").arg(l));
|
|
|
|
// replace name and advance index
|
|
|
|
// replace name and advance index
|
|
|
|
name.sprintf("[%d .. %d]", index, index+l-1);
|
|
|
|
name.sprintf("[%d .. %d]", index, index+l-1);
|
|
|
|
var->m_name = name;
|
|
|
|
var->m_name = name;
|
|
|
|