diff --git a/src/libs/cplusplus/BackwardsScanner.cpp b/src/libs/cplusplus/BackwardsScanner.cpp index 07c4688757a103f05087997d84b9e032ae479029..b0b71ffecdf98e7234c93be90e2e245bd387ac9e 100644 --- a/src/libs/cplusplus/BackwardsScanner.cpp +++ b/src/libs/cplusplus/BackwardsScanner.cpp @@ -45,6 +45,8 @@ BackwardsScanner::BackwardsScanner(const QTextCursor &cursor, const QString &suf _text += suffix; _tokens.append(_tokenize(_text, previousBlockState(_block))); + + _startToken = _tokens.size(); } int BackwardsScanner::state() const @@ -53,8 +55,11 @@ int BackwardsScanner::state() const const QList<SimpleToken> &BackwardsScanner::tokens() const { return _tokens; } -const SimpleToken &BackwardsScanner::operator[](int i) const -{ return const_cast<BackwardsScanner *>(this)->fetchToken(i); } +const SimpleToken &BackwardsScanner::LA(int index) const +{ return const_cast<BackwardsScanner *>(this)->fetchToken(_startToken - index); } + +const SimpleToken &BackwardsScanner::operator[](int index) const +{ return const_cast<BackwardsScanner *>(this)->fetchToken(index); } const SimpleToken &BackwardsScanner::fetchToken(int i) { @@ -89,7 +94,7 @@ const SimpleToken &BackwardsScanner::fetchToken(int i) } int BackwardsScanner::startToken() const -{ return _tokens.size(); } +{ return _startToken; } int BackwardsScanner::startPosition() const { return _block.position(); } diff --git a/src/libs/cplusplus/BackwardsScanner.h b/src/libs/cplusplus/BackwardsScanner.h index 7b8e3b6e717f4667956008857f3c9f841c29e228..68d1f047878ff5440b0421d964e45665f613555b 100644 --- a/src/libs/cplusplus/BackwardsScanner.h +++ b/src/libs/cplusplus/BackwardsScanner.h @@ -54,7 +54,11 @@ public: QString text(int begin, int end) const; QStringRef textRef(int begin, int end) const; - const SimpleToken &operator[](int i) const; + // 1-based + const SimpleToken &LA(int index) const; + + // n-la token is [startToken - n] + const SimpleToken &operator[](int index) const; // ### deprecate int startOfMatchingBrace(int index) const; int previousBlockState(const QTextBlock &block) const; @@ -71,6 +75,7 @@ private: QString _text; SimpleLexer _tokenize; int _maxBlockCount; + int _startToken; }; } // end of namespace CPlusPlus