Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # HG changeset patch
- # User Jerome LAFORGE <jerome.laforge@gmail.com>
- # Date 1332436364 -3600
- # Node ID be3ff3976c76c0649a4a87c380ecf55527cad00c
- # Parent 0b5108e724453610d7692dae038c0ae6db59bf7a
- Use SparseState instead of std::vector.
- Cleaning dead code.
- Feature #3510158.
- diff -r 0b5108e72445 -r be3ff3976c76 lexers/LexSQL.cxx
- --- a/lexers/LexSQL.cxx mer. mars 21 23:39:03 2012 +1100
- +++ b/lexers/LexSQL.cxx jeu. mars 22 18:12:44 2012 +0100
- @@ -30,6 +30,7 @@
- #include "CharacterSet.h"
- #include "LexerModule.h"
- #include "OptionSet.h"
- +#include "SparseState.h"
- #ifdef SCI_NAMESPACE
- using namespace Scintilla;
- @@ -65,10 +66,7 @@
- class SQLStates {
- public :
- void Set(int lineNumber, unsigned short int sqlStatesLine) {
- - if (!sqlStatement.size() == 0 || !sqlStatesLine == 0) {
- - sqlStatement.resize(lineNumber + 1, 0);
- - sqlStatement[lineNumber] = sqlStatesLine;
- - }
- + sqlStatement.Set(lineNumber, sqlStatesLine);
- }
- unsigned short int IgnoreWhen (unsigned short int sqlStatesLine, bool enable) {
- @@ -181,17 +179,13 @@
- }
- unsigned short int ForLine(int lineNumber) {
- - if ((lineNumber > 0) && (sqlStatement.size() > static_cast<size_t>(lineNumber))) {
- - return sqlStatement[lineNumber];
- - } else {
- - return 0;
- - }
- + return sqlStatement.ValueAt(lineNumber);
- }
- SQLStates() {}
- private :
- - std::vector <unsigned short int> sqlStatement;
- + SparseState <unsigned short int> sqlStatement;
- enum {
- MASK_NESTED_CASES = 0x01FF,
- MASK_INTO_SELECT_STATEMENT = 0x0200,
- @@ -610,7 +604,6 @@
- if (!sqlStates.IsCaseMergeWithoutWhenFound(sqlStatesCurrentLine))
- levelNext--;
- sqlStatesCurrentLine = sqlStates.IntoMergeStatement(sqlStatesCurrentLine, false);
- - //sqlStatesCurrentLine = sqlStates.WhenThenFound(sqlStatesCurrentLine, false);
- levelNext--;
- }
- if (sqlStates.IsIntoSelectStatement(sqlStatesCurrentLine))
- @@ -722,7 +715,6 @@
- sqlStatesCurrentLine = sqlStates.EndCaseBlock(sqlStatesCurrentLine);
- if (!sqlStates.IsCaseMergeWithoutWhenFound(sqlStatesCurrentLine))
- levelNext--; //again for the "end case;" and block when
- - //sqlStatesCurrentLine = sqlStates.WhenThenFound(sqlStatesCurrentLine, false);
- }
- } else if (!options.foldOnlyBegin) {
- if (strcmp(s, "case") == 0)
Add Comment
Please, Sign In to add comment