diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-25 12:28:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-25 13:50:26 +0200 |
| commit | 960d4ebf76d3e7c757d2625a1e52a22556da9d40 (patch) | |
| tree | bdf4a9368addb03388969d626df92934583d4952 /include/connectivity | |
| parent | aa0a20bdccda8576163d763a81a0d7135114c17d (diff) | |
convert SQLNodeType to scoped enum
Change-Id: I622e55622d38e6017993c8bc52625c85d0f74d74
Diffstat (limited to 'include/connectivity')
| -rw-r--r-- | include/connectivity/sqlnode.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index b50e5f4c807d..cb750e53d2a3 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -64,11 +64,11 @@ namespace connectivity typedef ::std::vector< OSQLParseNode* > OSQLParseNodes; - enum SQLNodeType {SQL_NODE_RULE, SQL_NODE_LISTRULE, SQL_NODE_COMMALISTRULE, - SQL_NODE_KEYWORD, SQL_NODE_COMPARISON, SQL_NODE_NAME, - SQL_NODE_STRING, SQL_NODE_INTNUM, SQL_NODE_APPROXNUM, - SQL_NODE_EQUAL,SQL_NODE_LESS,SQL_NODE_GREAT,SQL_NODE_LESSEQ,SQL_NODE_GREATEQ,SQL_NODE_NOTEQUAL, - SQL_NODE_PUNCTUATION, SQL_NODE_AMMSC, SQL_NODE_ACCESS_DATE,SQL_NODE_DATE,SQL_NODE_CONCAT}; + enum class SQLNodeType { Rule, ListRule, CommaListRule, + Keyword, Comparison, Name, + String, IntNum, ApproxNum, + Equal, Less, Great, LessEq, GreatEq, NotEqual, + Punctuation, AMMSC, AccessDate, Date, Concat}; typedef ::std::set< OUString > QueryNameSet; @@ -360,8 +360,8 @@ namespace connectivity // IsRule tests whether a node is a rule (NonTerminal) // ATTENTION: rules can be leaves, for example empty lists bool isRule() const - { return (m_eNodeType == SQL_NODE_RULE) || (m_eNodeType == SQL_NODE_LISTRULE) - || (m_eNodeType == SQL_NODE_COMMALISTRULE);} + { return (m_eNodeType == SQLNodeType::Rule) || (m_eNodeType == SQLNodeType::ListRule) + || (m_eNodeType == SQLNodeType::CommaListRule);} // IsToken tests whether a Node is a Token (Terminal but not a rule) bool isToken() const {return !isRule();} @@ -458,7 +458,7 @@ namespace connectivity #define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token) #define SQL_ISTOKENOR2(pParseNode, tok0, tok1) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 )) #define SQL_ISTOKENOR3(pParseNode, tok0, tok1, tok2) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok2 )) - #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && (pParseNode)->getTokenValue() == (aString)) + #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQLNodeType::Punctuation && (pParseNode)->getTokenValue() == (aString)) } #endif // INCLUDED_CONNECTIVITY_SQLNODE_HXX |