diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-24 16:25:57 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-25 13:50:25 +0200 |
commit | 4dd65f861d3179538b58512a10c6c9482d85d0ee (patch) | |
tree | e7513f5661b041c5b3b4b773de6fd5eca4781756 /connectivity | |
parent | convert ErrorCode to scoped enum (diff) | |
download | core-4dd65f861d3179538b58512a10c6c9482d85d0ee.tar.gz core-4dd65f861d3179538b58512a10c6c9482d85d0ee.zip |
convert InternationalKeyCode to scoped enum
Change-Id: I2eba99ebb86003f1f5ddefafb4cd191b29853819
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/parse/sqlbison.y | 98 | ||||
-rw-r--r-- | connectivity/source/parse/sqlflex.l | 146 |
2 files changed, 122 insertions, 122 deletions
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index c9f8bbadc68c..2c34608b142c 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -4333,31 +4333,31 @@ OString OParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const OString aKeyword; switch (_eKey) { - case KEY_LIKE: aKeyword = "LIKE"; break; - case KEY_NOT: aKeyword = "NOT"; break; - case KEY_NULL: aKeyword = "NULL"; break; - case KEY_TRUE: aKeyword = "True"; break; - case KEY_FALSE: aKeyword = "False"; break; - case KEY_IS: aKeyword = "IS"; break; - case KEY_BETWEEN: aKeyword = "BETWEEN"; break; - case KEY_OR: aKeyword = "OR"; break; - case KEY_AND: aKeyword = "AND"; break; - case KEY_AVG: aKeyword = "AVG"; break; - case KEY_COUNT: aKeyword = "COUNT"; break; - case KEY_MAX: aKeyword = "MAX"; break; - case KEY_MIN: aKeyword = "MIN"; break; - case KEY_SUM: aKeyword = "SUM"; break; - case KEY_EVERY: aKeyword = "EVERY"; break; - case KEY_ANY: aKeyword = "ANY"; break; - case KEY_SOME: aKeyword = "SOME"; break; - case KEY_STDDEV_POP: aKeyword = "STDDEV_POP"; break; - case KEY_STDDEV_SAMP: aKeyword = "STDDEV_SAMP"; break; - case KEY_VAR_SAMP: aKeyword = "VAR_SAMP"; break; - case KEY_VAR_POP: aKeyword = "VAR_POP"; break; - case KEY_COLLECT: aKeyword = "COLLECT"; break; - case KEY_FUSION: aKeyword = "FUSION"; break; - case KEY_INTERSECTION:aKeyword = "INTERSECTION"; break; - case KEY_NONE: break; + case InternationalKeyCode::Like: aKeyword = "LIKE"; break; + case InternationalKeyCode::Not: aKeyword = "NOT"; break; + case InternationalKeyCode::Null: aKeyword = "NULL"; break; + case InternationalKeyCode::True: aKeyword = "True"; break; + case InternationalKeyCode::False: aKeyword = "False"; break; + case InternationalKeyCode::Is: aKeyword = "IS"; break; + case InternationalKeyCode::Between: aKeyword = "BETWEEN"; break; + case InternationalKeyCode::Or: aKeyword = "OR"; break; + case InternationalKeyCode::And: aKeyword = "AND"; break; + case InternationalKeyCode::Avg: aKeyword = "AVG"; break; + case InternationalKeyCode::Count: aKeyword = "COUNT"; break; + case InternationalKeyCode::Max: aKeyword = "MAX"; break; + case InternationalKeyCode::Min: aKeyword = "MIN"; break; + case InternationalKeyCode::Sum: aKeyword = "SUM"; break; + case InternationalKeyCode::Every: aKeyword = "EVERY"; break; + case InternationalKeyCode::Any: aKeyword = "ANY"; break; + case InternationalKeyCode::Some: aKeyword = "SOME"; break; + case InternationalKeyCode::StdDevPop: aKeyword = "STDDEV_POP"; break; + case InternationalKeyCode::StdDevSamp: aKeyword = "STDDEV_SAMP"; break; + case InternationalKeyCode::VarSamp: aKeyword = "VAR_SAMP"; break; + case InternationalKeyCode::VarPop: aKeyword = "VAR_POP"; break; + case InternationalKeyCode::Collect: aKeyword = "COLLECT"; break; + case InternationalKeyCode::Fusion: aKeyword = "FUSION"; break; + case InternationalKeyCode::Intersection:aKeyword = "INTERSECTION"; break; + case InternationalKeyCode::None: break; default: OSL_FAIL( "OParseContext::getIntlKeywordAscii: unknown key!" ); break; @@ -4370,12 +4370,12 @@ IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const OString& { static IParseContext::InternationalKeyCode Intl_TokenID[] = { - KEY_LIKE, KEY_NOT, KEY_NULL, KEY_TRUE, - KEY_FALSE, KEY_IS, KEY_BETWEEN, KEY_OR, - KEY_AND, KEY_AVG, KEY_COUNT, KEY_MAX, - KEY_MIN, KEY_SUM, KEY_EVERY,KEY_ANY,KEY_SOME, - KEY_STDDEV_POP,KEY_STDDEV_SAMP,KEY_VAR_SAMP, - KEY_VAR_POP,KEY_COLLECT,KEY_FUSION,KEY_INTERSECTION + InternationalKeyCode::Like, InternationalKeyCode::Not, InternationalKeyCode::Null, InternationalKeyCode::True, + InternationalKeyCode::False, InternationalKeyCode::Is, InternationalKeyCode::Between, InternationalKeyCode::Or, + InternationalKeyCode::And, InternationalKeyCode::Avg, InternationalKeyCode::Count, InternationalKeyCode::Max, + InternationalKeyCode::Min, InternationalKeyCode::Sum, InternationalKeyCode::Every,InternationalKeyCode::Any,InternationalKeyCode::Some, + InternationalKeyCode::StdDevPop,InternationalKeyCode::StdDevSamp,InternationalKeyCode::VarSamp, + InternationalKeyCode::VarPop,InternationalKeyCode::Collect,InternationalKeyCode::Fusion,InternationalKeyCode::Intersection }; sal_uInt32 nCount = SAL_N_ELEMENTS( Intl_TokenID ); @@ -4386,7 +4386,7 @@ IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const OString& return Intl_TokenID[i]; } - return KEY_NONE; + return InternationalKeyCode::None; } @@ -4612,25 +4612,25 @@ OString OSQLParser::TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pCont OString aStr; if (pContext) { - IParseContext::InternationalKeyCode eKeyCode = IParseContext::KEY_NONE; + IParseContext::InternationalKeyCode eKeyCode = IParseContext::InternationalKeyCode::None; switch( nTokenID ) { - case SQL_TOKEN_LIKE: eKeyCode = IParseContext::KEY_LIKE; break; - case SQL_TOKEN_NOT: eKeyCode = IParseContext::KEY_NOT; break; - case SQL_TOKEN_NULL: eKeyCode = IParseContext::KEY_NULL; break; - case SQL_TOKEN_TRUE: eKeyCode = IParseContext::KEY_TRUE; break; - case SQL_TOKEN_FALSE: eKeyCode = IParseContext::KEY_FALSE; break; - case SQL_TOKEN_IS: eKeyCode = IParseContext::KEY_IS; break; - case SQL_TOKEN_BETWEEN: eKeyCode = IParseContext::KEY_BETWEEN; break; - case SQL_TOKEN_OR: eKeyCode = IParseContext::KEY_OR; break; - case SQL_TOKEN_AND: eKeyCode = IParseContext::KEY_AND; break; - case SQL_TOKEN_AVG: eKeyCode = IParseContext::KEY_AVG; break; - case SQL_TOKEN_COUNT: eKeyCode = IParseContext::KEY_COUNT; break; - case SQL_TOKEN_MAX: eKeyCode = IParseContext::KEY_MAX; break; - case SQL_TOKEN_MIN: eKeyCode = IParseContext::KEY_MIN; break; - case SQL_TOKEN_SUM: eKeyCode = IParseContext::KEY_SUM; break; - } - if ( eKeyCode != IParseContext::KEY_NONE ) + case SQL_TOKEN_LIKE: eKeyCode = IParseContext::InternationalKeyCode::Like; break; + case SQL_TOKEN_NOT: eKeyCode = IParseContext::InternationalKeyCode::Not; break; + case SQL_TOKEN_NULL: eKeyCode = IParseContext::InternationalKeyCode::Null; break; + case SQL_TOKEN_TRUE: eKeyCode = IParseContext::InternationalKeyCode::True; break; + case SQL_TOKEN_FALSE: eKeyCode = IParseContext::InternationalKeyCode::False; break; + case SQL_TOKEN_IS: eKeyCode = IParseContext::InternationalKeyCode::Is; break; + case SQL_TOKEN_BETWEEN: eKeyCode = IParseContext::InternationalKeyCode::Between; break; + case SQL_TOKEN_OR: eKeyCode = IParseContext::InternationalKeyCode::Or; break; + case SQL_TOKEN_AND: eKeyCode = IParseContext::InternationalKeyCode::And; break; + case SQL_TOKEN_AVG: eKeyCode = IParseContext::InternationalKeyCode::Avg; break; + case SQL_TOKEN_COUNT: eKeyCode = IParseContext::InternationalKeyCode::Count; break; + case SQL_TOKEN_MAX: eKeyCode = IParseContext::InternationalKeyCode::Max; break; + case SQL_TOKEN_MIN: eKeyCode = IParseContext::InternationalKeyCode::Min; break; + case SQL_TOKEN_SUM: eKeyCode = IParseContext::InternationalKeyCode::Sum; break; + } + if ( eKeyCode != IParseContext::InternationalKeyCode::None ) aStr = pContext->getIntlKeywordAscii(eKeyCode); } diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 94fa789350f2..84aa790032cb 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -550,30 +550,30 @@ sal_Int32 mapEnumToToken(IParseContext::InternationalKeyCode _eKeyCode ) sal_Int32 nTokenID = 0; switch( _eKeyCode ) { - case IParseContext::KEY_LIKE: nTokenID = SQL_TOKEN_LIKE; break; - case IParseContext::KEY_NOT: nTokenID = SQL_TOKEN_NOT; break; - case IParseContext::KEY_NULL: nTokenID = SQL_TOKEN_NULL; break; - case IParseContext::KEY_TRUE: nTokenID = SQL_TOKEN_TRUE; break; - case IParseContext::KEY_FALSE: nTokenID = SQL_TOKEN_FALSE; break; - case IParseContext::KEY_IS: nTokenID = SQL_TOKEN_IS; break; - case IParseContext::KEY_BETWEEN: nTokenID = SQL_TOKEN_BETWEEN; break; - case IParseContext::KEY_OR: nTokenID = SQL_TOKEN_OR; break; - case IParseContext::KEY_AND: nTokenID = SQL_TOKEN_AND; break; - case IParseContext::KEY_AVG: nTokenID = SQL_TOKEN_AVG; break; - case IParseContext::KEY_COUNT: nTokenID = SQL_TOKEN_COUNT; break; - case IParseContext::KEY_MAX: nTokenID = SQL_TOKEN_MAX; break; - case IParseContext::KEY_MIN: nTokenID = SQL_TOKEN_MIN; break; - case IParseContext::KEY_SUM: nTokenID = SQL_TOKEN_SUM; break; - case IParseContext::KEY_EVERY: nTokenID = SQL_TOKEN_EVERY; break; - case IParseContext::KEY_ANY: nTokenID = SQL_TOKEN_ANY; break; - case IParseContext::KEY_SOME: nTokenID = SQL_TOKEN_SOME; break; - case IParseContext::KEY_STDDEV_POP: nTokenID = SQL_TOKEN_STDDEV_POP; break; - case IParseContext::KEY_STDDEV_SAMP: nTokenID = SQL_TOKEN_STDDEV_SAMP; break; - case IParseContext::KEY_VAR_SAMP: nTokenID = SQL_TOKEN_VAR_SAMP; break; - case IParseContext::KEY_VAR_POP: nTokenID = SQL_TOKEN_VAR_POP; break; - case IParseContext::KEY_COLLECT: nTokenID = SQL_TOKEN_COLLECT; break; - case IParseContext::KEY_FUSION: nTokenID = SQL_TOKEN_FUSION; break; - case IParseContext::KEY_INTERSECTION: nTokenID = SQL_TOKEN_INTERSECTION; break; + case IParseContext::InternationalKeyCode::Like: nTokenID = SQL_TOKEN_LIKE; break; + case IParseContext::InternationalKeyCode::Not: nTokenID = SQL_TOKEN_NOT; break; + case IParseContext::InternationalKeyCode::Null: nTokenID = SQL_TOKEN_NULL; break; + case IParseContext::InternationalKeyCode::True: nTokenID = SQL_TOKEN_TRUE; break; + case IParseContext::InternationalKeyCode::False: nTokenID = SQL_TOKEN_FALSE; break; + case IParseContext::InternationalKeyCode::Is: nTokenID = SQL_TOKEN_IS; break; + case IParseContext::InternationalKeyCode::Between: nTokenID = SQL_TOKEN_BETWEEN; break; + case IParseContext::InternationalKeyCode::Or: nTokenID = SQL_TOKEN_OR; break; + case IParseContext::InternationalKeyCode::And: nTokenID = SQL_TOKEN_AND; break; + case IParseContext::InternationalKeyCode::Avg: nTokenID = SQL_TOKEN_AVG; break; + case IParseContext::InternationalKeyCode::Count: nTokenID = SQL_TOKEN_COUNT; break; + case IParseContext::InternationalKeyCode::Max: nTokenID = SQL_TOKEN_MAX; break; + case IParseContext::InternationalKeyCode::Min: nTokenID = SQL_TOKEN_MIN; break; + case IParseContext::InternationalKeyCode::Sum: nTokenID = SQL_TOKEN_SUM; break; + case IParseContext::InternationalKeyCode::Every: nTokenID = SQL_TOKEN_EVERY; break; + case IParseContext::InternationalKeyCode::Any: nTokenID = SQL_TOKEN_ANY; break; + case IParseContext::InternationalKeyCode::Some: nTokenID = SQL_TOKEN_SOME; break; + case IParseContext::InternationalKeyCode::StdDevPop: nTokenID = SQL_TOKEN_STDDEV_POP; break; + case IParseContext::InternationalKeyCode::StdDevSamp: nTokenID = SQL_TOKEN_STDDEV_SAMP; break; + case IParseContext::InternationalKeyCode::VarSamp: nTokenID = SQL_TOKEN_VAR_SAMP; break; + case IParseContext::InternationalKeyCode::VarPop: nTokenID = SQL_TOKEN_VAR_POP; break; + case IParseContext::InternationalKeyCode::Collect: nTokenID = SQL_TOKEN_COLLECT; break; + case IParseContext::InternationalKeyCode::Fusion: nTokenID = SQL_TOKEN_FUSION; break; + case IParseContext::InternationalKeyCode::Intersection: nTokenID = SQL_TOKEN_INTERSECTION; break; default: OSL_FAIL( "mapEnumToToken: unsupported key!" ); } @@ -591,30 +591,30 @@ sal_Int32 gatherName(const sal_Char* text) IParseContext::InternationalKeyCode eKeyCode = xxx_pGLOBAL_SQLSCAN->getInternationalTokenID(text); switch (eKeyCode) { - case IParseContext::KEY_LIKE: - case IParseContext::KEY_NOT: - case IParseContext::KEY_NULL: - case IParseContext::KEY_TRUE: - case IParseContext::KEY_FALSE: - case IParseContext::KEY_IS: - case IParseContext::KEY_BETWEEN: - case IParseContext::KEY_OR: - case IParseContext::KEY_AND: - case IParseContext::KEY_COUNT: - case IParseContext::KEY_AVG: - case IParseContext::KEY_MAX: - case IParseContext::KEY_MIN: - case IParseContext::KEY_SUM: - case IParseContext::KEY_EVERY: - case IParseContext::KEY_ANY: - case IParseContext::KEY_SOME: - case IParseContext::KEY_STDDEV_POP: - case IParseContext::KEY_STDDEV_SAMP: - case IParseContext::KEY_VAR_SAMP: - case IParseContext::KEY_VAR_POP: - case IParseContext::KEY_COLLECT: - case IParseContext::KEY_FUSION: - case IParseContext::KEY_INTERSECTION: + case IParseContext::InternationalKeyCode::Like: + case IParseContext::InternationalKeyCode::Not: + case IParseContext::InternationalKeyCode::Null: + case IParseContext::InternationalKeyCode::True: + case IParseContext::InternationalKeyCode::False: + case IParseContext::InternationalKeyCode::Is: + case IParseContext::InternationalKeyCode::Between: + case IParseContext::InternationalKeyCode::Or: + case IParseContext::InternationalKeyCode::And: + case IParseContext::InternationalKeyCode::Count: + case IParseContext::InternationalKeyCode::Avg: + case IParseContext::InternationalKeyCode::Max: + case IParseContext::InternationalKeyCode::Min: + case IParseContext::InternationalKeyCode::Sum: + case IParseContext::InternationalKeyCode::Every: + case IParseContext::InternationalKeyCode::Any: + case IParseContext::InternationalKeyCode::Some: + case IParseContext::InternationalKeyCode::StdDevPop: + case IParseContext::InternationalKeyCode::StdDevSamp: + case IParseContext::InternationalKeyCode::VarSamp: + case IParseContext::InternationalKeyCode::VarPop: + case IParseContext::InternationalKeyCode::Collect: + case IParseContext::InternationalKeyCode::Fusion: + case IParseContext::InternationalKeyCode::Intersection: nToken = mapEnumToToken(eKeyCode); SQL_NEW_KEYWORD(nToken); break; @@ -635,30 +635,30 @@ sal_Int32 gatherNamePre(const sal_Char* text) IParseContext::InternationalKeyCode eKeyCode = xxx_pGLOBAL_SQLSCAN->getInternationalTokenID(text); switch (eKeyCode) { - case IParseContext::KEY_LIKE: - case IParseContext::KEY_NOT: - case IParseContext::KEY_NULL: - case IParseContext::KEY_TRUE: - case IParseContext::KEY_FALSE: - case IParseContext::KEY_IS: - case IParseContext::KEY_BETWEEN: - case IParseContext::KEY_OR: - case IParseContext::KEY_AND: - case IParseContext::KEY_COUNT: - case IParseContext::KEY_AVG: - case IParseContext::KEY_MAX: - case IParseContext::KEY_MIN: - case IParseContext::KEY_SUM: - case IParseContext::KEY_EVERY: - case IParseContext::KEY_ANY: - case IParseContext::KEY_SOME: - case IParseContext::KEY_STDDEV_POP: - case IParseContext::KEY_STDDEV_SAMP: - case IParseContext::KEY_VAR_SAMP: - case IParseContext::KEY_VAR_POP: - case IParseContext::KEY_COLLECT: - case IParseContext::KEY_FUSION: - case IParseContext::KEY_INTERSECTION: + case IParseContext::InternationalKeyCode::Like: + case IParseContext::InternationalKeyCode::Not: + case IParseContext::InternationalKeyCode::Null: + case IParseContext::InternationalKeyCode::True: + case IParseContext::InternationalKeyCode::False: + case IParseContext::InternationalKeyCode::Is: + case IParseContext::InternationalKeyCode::Between: + case IParseContext::InternationalKeyCode::Or: + case IParseContext::InternationalKeyCode::And: + case IParseContext::InternationalKeyCode::Count: + case IParseContext::InternationalKeyCode::Avg: + case IParseContext::InternationalKeyCode::Max: + case IParseContext::InternationalKeyCode::Min: + case IParseContext::InternationalKeyCode::Sum: + case IParseContext::InternationalKeyCode::Every: + case IParseContext::InternationalKeyCode::Any: + case IParseContext::InternationalKeyCode::Some: + case IParseContext::InternationalKeyCode::StdDevPop: + case IParseContext::InternationalKeyCode::StdDevSamp: + case IParseContext::InternationalKeyCode::VarSamp: + case IParseContext::InternationalKeyCode::VarPop: + case IParseContext::InternationalKeyCode::Collect: + case IParseContext::InternationalKeyCode::Fusion: + case IParseContext::InternationalKeyCode::Intersection: nToken = mapEnumToToken(eKeyCode); SQL_NEW_KEYWORD(nToken); break; @@ -785,7 +785,7 @@ sal_Int32 OSQLScanner::SQLyygetc(void) IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const sal_Char* sToken) const { OSL_ENSURE(m_pContext, "OSQLScanner::getInternationalTokenID: No Context set"); - return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::KEY_NONE; + return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::InternationalKeyCode::None; } sal_Int32 OSQLScanner::GetGERRule() { return PREDICATE_GER; } sal_Int32 OSQLScanner::GetENGRule() { return PREDICATE_ENG; } |