diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-11 19:30:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-13 03:42:44 +0200 |
commit | 8400896cfe3fbef7666329a2920bd0dbdd5890af (patch) | |
tree | 4aeef74d80fcf6d7443c3790dcacf43a016c00e9 /qmake/library/proitems.h | |
parent | ae3f95a951334dee001e37c305e4d7bf91c0d1b3 (diff) |
don't pretend that break()/next()/return() are functions
it's a pretty braindead thing to implement control flow statements as
(built-in) functions.
as a "side effect", this fixes return() value handling for lists.
(cherry picked from qtcreator/f53ed6c4b3feca59a94d4f0de8b1a7411122e30e)
(cherry picked from qtcreator/f529e22ec38fb9a656d74394e484d2453cf42c69)
Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/library/proitems.h')
-rw-r--r-- | qmake/library/proitems.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h index b712ca371b..23dc86d8d3 100644 --- a/qmake/library/proitems.h +++ b/qmake/library/proitems.h @@ -306,6 +306,9 @@ enum ProToken { TokTestCall, // previous literal/expansion is a test function call // - ((nested expansion + TokArgSeparator)* + nested expansion)? // - TokFuncTerminator + TokReturn, // previous literal/expansion is a return value + TokBreak, // break loop + TokNext, // shortcut to next loop iteration TokNot, // '!' operator TokAnd, // ':' operator TokOr, // '|' operator |