commit 701a0aebe265adae96e0cab54bfba8052ebdfac5
author drh <drh@noemail.net> Sun Feb 22 20:05:00 2004 +0000
committer drh <drh@noemail.net> Sun Feb 22 20:05:00 2004 +0000
tree 3b79a0cc99ef97d68aac6c0f95caff68fbd9abb9
parent d383401c6abf84a53919e091f287fb0b0c874a05

Use sqliteVdbeOp3 instead of sqliteVdbeChangeP3 where applicable. (CVS 1266)

FossilOrigin-Name: 51f1e8f7539596b33bc3365ec8f34041602d049c

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 3daa2b2..7b96ad3 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -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.110 2004/02/22 18:40:57 drh Exp $
+** $Id: expr.c,v 1.111 2004/02/22 20:05:01 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -717,9 +717,10 @@
             case TK_FLOAT:
             case TK_INTEGER:
             case TK_STRING: {
-              int addr = sqliteVdbeAddOp(v, OP_SetInsert, iSet, 0);
+              int addr;
               assert( pE2->token.z );
-              sqliteVdbeChangeP3(v, addr, pE2->token.z, pE2->token.n);
+              addr = sqliteVdbeOp3(v, OP_SetInsert, iSet, 0,
+                                  pE2->token.z, pE2->token.n);
               sqliteVdbeDequoteP3(v, addr);
               break;
             }
@@ -1166,8 +1167,7 @@
       for(i=0; i<nExpr; i++){
         sqliteExprCode(pParse, pList->a[i].pExpr);
       }
-      sqliteVdbeAddOp(v, OP_Function, nExpr, 0);
-      sqliteVdbeChangeP3(v, -1, (char*)pDef, P3_POINTER);
+      sqliteVdbeOp3(v, OP_Function, nExpr, 0, (char*)pDef, P3_POINTER);
       break;
     }
     case TK_SELECT: {
@@ -1257,15 +1257,13 @@
       if( pExpr->iColumn == OE_Rollback ||
 	  pExpr->iColumn == OE_Abort ||
 	  pExpr->iColumn == OE_Fail ){
-	  char * msg = sqliteStrNDup(pExpr->token.z, pExpr->token.n);
-	  sqliteVdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn);
-	  sqliteDequote(msg);
-	  sqliteVdbeChangeP3(v, -1, msg, 0);
-	  sqliteFree(msg);
+	  sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn,
+                           pExpr->token.z, pExpr->token.n);
+	  sqliteVdbeDequoteP3(v, -1);
       } else {
 	  assert( pExpr->iColumn == OE_Ignore );
-	  sqliteVdbeAddOp(v, OP_Goto, 0, pParse->trigStack->ignoreJump);
-	  sqliteVdbeChangeP3(v, -1, "(IGNORE jump)", 0);
+	  sqliteVdbeOp3(v, OP_Goto, 0, pParse->trigStack->ignoreJump,
+                           "(IGNORE jump)", 0);
       }
     }
     break;