DBIS
/
HyriseSQLParser
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #82 from hyrise/remove_unused_enum_members 

Remove unused enum members
This commit is contained in:
mrks 2018-02-08 17:01:33 +01:00 committed by GitHub
parent 36628dc005 48f32a4b73
commit fbc1839786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1780 additions and 1733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1421
src/parser/bison_parser.cpp
View File

File diff suppressed because it is too large Load Diff

8
src/parser/bison_parser.h
View File

@ -48,7 +48,7 @@
extern int hsql_debug; extern int hsql_debug;
#endif #endif
/* "%code requires" blocks. */ /* "%code requires" blocks. */
#line 35 "bison_parser.y" /* yacc.c:1915 */ #line 35 "bison_parser.y" /* yacc.c:1909 */
// %code requires block // %code requires block
@ -72,7 +72,7 @@ extern int hsql_debug;
} \ } \
} }
#line 76 "bison_parser.h" /* yacc.c:1915 */ #line 76 "bison_parser.h" /* yacc.c:1909 */
/* Token type. */ /* Token type. */
#ifndef HSQL_TOKENTYPE #ifndef HSQL_TOKENTYPE
@ -218,7 +218,7 @@ extern int hsql_debug;
union HSQL_STYPE union HSQL_STYPE
{ {
#line 95 "bison_parser.y" /* yacc.c:1915 */ #line 95 "bison_parser.y" /* yacc.c:1909 */
double fval; double fval;
int64_t ival; int64_t ival;
@ -257,7 +257,7 @@ union HSQL_STYPE
std::vector<hsql::Expr*>* expr_vec; std::vector<hsql::Expr*>* expr_vec;
std::vector<hsql::OrderDescription*>* order_vec; std::vector<hsql::OrderDescription*>* order_vec;
#line 261 "bison_parser.h" /* yacc.c:1915 */ #line 261 "bison_parser.h" /* yacc.c:1909 */
}; };
typedef union HSQL_STYPE HSQL_STYPE; typedef union HSQL_STYPE HSQL_STYPE;

2073
src/parser/flex_lexer.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/parser/flex_lexer.h
View File

@ -344,7 +344,7 @@ extern int hsql_lex \
#undef YY_DECL #undef YY_DECL
#endif #endif
#line 217 "flex_lexer.l" #line 219 "flex_lexer.l"
#line 351 "flex_lexer.h" #line 351 "flex_lexer.h"

4
src/sql/Expr.cpp
View File

@ -70,7 +70,9 @@ namespace hsql {
Expr* Expr::makeCaseList(Expr* caseListElement) { Expr* Expr::makeCaseList(Expr* caseListElement) {
Expr* e = new Expr(kExprOperator); Expr* e = new Expr(kExprOperator);
e->opType = kOpCaseList; // Case list expressions are temporary and will be integrated into the case expressions exprList - thus assign
// operator type kOpNone
e->opType = kOpNone;
e->exprList = new std::vector<Expr*>(); e->exprList = new std::vector<Expr*>();
e->exprList->push_back(caseListElement); e->exprList->push_back(caseListElement);
return e; return e;

5
src/sql/Expr.h
View File

@ -25,9 +25,7 @@ namespace hsql {
kExprSelect, kExprSelect,
kExprHint, kExprHint,
kExprArray, kExprArray,
kExprArrayIndex, kExprArrayIndex
kExprCaseList,
kExprCaseListElement
}; };
// Operator types. These are important for expressions of type kExprOperator. // Operator types. These are important for expressions of type kExprOperator.
@ -39,7 +37,6 @@ namespace hsql {
// n-nary special case // n-nary special case
kOpCase, kOpCase,
kOpCaseList, // Contains n >= 1 kExprCaseListElement in its exprList
kOpCaseListElement, // `WHEN expr THEN expr` kOpCaseListElement, // `WHEN expr THEN expr`
// Binary operators. // Binary operators.