diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-08-02 02:56:07 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-08-02 02:56:07 (GMT) |
commit | 666a475ea8c32eb5c49a53b29defc2c66c9cc5e3 (patch) | |
tree | dfb4fe2d4308f02bf3b8d45331b5d93c1cabae01 /src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp | |
parent | d39d01497640c3a0818d25036894495f8b597bdb (diff) | |
parent | e93d11c733bb44208089a7488c6e7a176468d407 (diff) | |
download | Qt-666a475ea8c32eb5c49a53b29defc2c66c9cc5e3.zip Qt-666a475ea8c32eb5c49a53b29defc2c66c9cc5e3.tar.gz Qt-666a475ea8c32eb5c49a53b29defc2c66c9cc5e3.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp index c2cb1c2..647b20a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp @@ -1554,7 +1554,7 @@ public: } case PatternTerm::TypeParentheticalAssertion: { - unsigned alternativeFrameLocation = term.inputPosition + RegexStackSpaceForBackTrackInfoParentheticalAssertion; + unsigned alternativeFrameLocation = term.frameLocation + RegexStackSpaceForBackTrackInfoParentheticalAssertion; atomParentheticalAssertionBegin(term.parentheses.subpatternId, term.invertOrCapture, term.frameLocation, alternativeFrameLocation); emitDisjunction(term.parentheses.disjunction, currentCountAlreadyChecked, 0); |