1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-08 03:22:21 +03:00

Simplifications and optimizations. Also: disable the corrupt.test for now. (CVS 1924)

FossilOrigin-Name: 8fd65e704888a8e2f4a712a94fd0e3f866c10ef3
This commit is contained in:
drh
2004-08-31 13:45:11 +00:00
parent 4e5ffc5f8d
commit 855eb1cf02
11 changed files with 43 additions and 79 deletions

View File

@@ -12,7 +12,7 @@
** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions in SQLite.
**
** $Id: expr.c,v 1.157 2004/08/21 17:54:45 drh Exp $
** $Id: expr.c,v 1.158 2004/08/31 13:45:12 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -1147,8 +1147,9 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
case TK_RSHIFT: op = OP_ShiftRight; break;
case TK_REM: op = OP_Remainder; break;
case TK_FLOAT: op = OP_Real; break;
case TK_STRING: op = OP_String8; break;
case TK_STRING: op = OP_String8; break;
case TK_BLOB: op = OP_HexBlob; break;
case TK_CONCAT: op = OP_Concat; break;
default: op = 0; break;
}
switch( pExpr->op ){
@@ -1209,16 +1210,11 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
case TK_BITOR:
case TK_SLASH:
case TK_LSHIFT:
case TK_RSHIFT: {
sqlite3ExprCode(pParse, pExpr->pLeft);
sqlite3ExprCode(pParse, pExpr->pRight);
sqlite3VdbeAddOp(v, op, 0, 0);
break;
}
case TK_RSHIFT:
case TK_CONCAT: {
sqlite3ExprCode(pParse, pExpr->pLeft);
sqlite3ExprCode(pParse, pExpr->pRight);
sqlite3VdbeAddOp(v, OP_Concat8, 2, 0);
sqlite3VdbeAddOp(v, op, 0, 0);
break;
}
case TK_UMINUS: {