diff options
| author | drh <drh@noemail.net> | 2013-11-21 14:44:38 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-11-21 14:44:38 +0000 |
| commit | 10f468f37a17a99a98748e49b26bc825b0938851 (patch) | |
| tree | 795d7d876193bf490c4f8fe572135dd4901d9661 /src | |
| parent | b1fba2868b7e1c1932fe7985658ca409e8bbd6da (diff) | |
| download | sqlite-10f468f37a17a99a98748e49b26bc825b0938851.tar.gz sqlite-10f468f37a17a99a98748e49b26bc825b0938851.zip | |
Remove the obsolete TK_CONST_FUNC token type.
FossilOrigin-Name: 9b4217f055e9bced186b4c56a5753bd6da7115b5
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 4 | ||||
| -rw-r--r-- | src/parse.y | 7 | ||||
| -rw-r--r-- | src/resolve.c | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/expr.c b/src/expr.c index f0a419040..62055d246 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2626,7 +2626,6 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ } break; } - case TK_CONST_FUNC: case TK_FUNCTION: { ExprList *pFarg; /* List of function arguments */ int nFarg; /* Number of function arguments */ @@ -2639,8 +2638,6 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ CollSeq *pColl = 0; /* A collating sequence */ assert( !ExprHasProperty(pExpr, EP_xIsSelect) ); - testcase( op==TK_CONST_FUNC ); - testcase( op==TK_FUNCTION ); if( ExprHasProperty(pExpr, EP_TokenOnly) ){ pFarg = 0; }else{ @@ -3206,7 +3203,6 @@ void sqlite3ExplainExpr(Vdbe *pOut, Expr *pExpr){ } case TK_AGG_FUNCTION: - case TK_CONST_FUNC: case TK_FUNCTION: { ExprList *pFarg; /* List of function arguments */ if( ExprHasProperty(pExpr, EP_TokenOnly) ){ diff --git a/src/parse.y b/src/parse.y index 07e607dcf..ba9feb10f 100644 --- a/src/parse.y +++ b/src/parse.y @@ -854,12 +854,7 @@ expr(A) ::= ID(X) LP STAR RP(E). { spanSet(&A,&X,&E); } term(A) ::= CTIME_KW(OP). { - /* The CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP values are - ** treated as functions that return constants */ - A.pExpr = sqlite3ExprFunction(pParse, 0,&OP); - if( A.pExpr ){ - A.pExpr->op = TK_CONST_FUNC; - } + A.pExpr = sqlite3ExprFunction(pParse, 0, &OP); spanSet(&A, &OP, &OP); } diff --git a/src/resolve.c b/src/resolve.c index 999c628c0..2c0907cc4 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -667,7 +667,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ /* Resolve function names */ - case TK_CONST_FUNC: case TK_FUNCTION: { ExprList *pList = pExpr->x.pList; /* The argument list */ int n = pList ? pList->nExpr : 0; /* Number of arguments */ @@ -680,7 +679,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ FuncDef *pDef; /* Information about the function */ u8 enc = ENC(pParse->db); /* The database encoding */ - testcase( pExpr->op==TK_CONST_FUNC ); assert( !ExprHasProperty(pExpr, EP_xIsSelect) ); notValidPartIdxWhere(pParse, pNC, "functions"); zId = pExpr->u.zToken; |