update size calculations for assignment statements
this was forgotten when the value lists were extended by a size hint. Change-Id: I6f9b55ed671224a9b8735c8d937f94aac4a73a42 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> (cherry picked from qtcreator/f24c9865306624c2fc150d4bd262a5c4d5a3689a) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
119b53be83
commit
5957a8e01b
@ -275,6 +275,7 @@ enum ProToken {
|
||||
TokRemove, // variable -=
|
||||
TokReplace, // variable ~=
|
||||
// previous literal/expansion is a variable manipulation
|
||||
// - lower bound for expected output length (1)
|
||||
// - value expression + TokValueTerminator
|
||||
TokValueTerminator, // assignment value terminator
|
||||
TokLiteral, // literal string (fully dequoted)
|
||||
|
@ -298,12 +298,12 @@ bool QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
|
||||
// Worst-case size calculations:
|
||||
// - line marker adds 1 (2-nl) to 1st token of each line
|
||||
// - empty assignment "A=":2 =>
|
||||
// TokHashLiteral(1) + hash(2) + len(1) + "A"(1) + TokAssign(1) +
|
||||
// TokValueTerminator(1) == 7 (8)
|
||||
// TokHashLiteral(1) + hash(2) + len(1) + "A"(1) + TokAssign(1) + 0(1) +
|
||||
// TokValueTerminator(1) == 8 (9)
|
||||
// - non-empty assignment "A=B C":5 =>
|
||||
// TokHashLiteral(1) + hash(2) + len(1) + "A"(1) + TokAssign(1) +
|
||||
// TokHashLiteral(1) + hash(2) + len(1) + "A"(1) + TokAssign(1) + 2(1) +
|
||||
// TokLiteral(1) + len(1) + "B"(1) +
|
||||
// TokLiteral(1) + len(1) + "C"(1) + TokValueTerminator(1) == 13 (14)
|
||||
// TokLiteral(1) + len(1) + "C"(1) + TokValueTerminator(1) == 14 (15)
|
||||
// - variable expansion: "$$f":3 =>
|
||||
// TokVariable(1) + hash(2) + len(1) + "f"(1) = 5
|
||||
// - function expansion: "$$f()":5 =>
|
||||
|
Loading…
x
Reference in New Issue
Block a user