commit d81bd4e209374d24ef7534a3e9e6a3fa4540d8c6
author drh <drh@noemail.net> Mon Sep 05 20:06:49 2005 +0000
committer drh <drh@noemail.net> Mon Sep 05 20:06:49 2005 +0000
tree ce97c60431d4ce0f9da3a8ff2817a56070971576
parent c0929987158d14d2ec4e343fe9b7ddbd344607de

Fix bugs introduced by checkin (2656) and do some modest code enhancements. (CVS 2657)

FossilOrigin-Name: 7b56763a8b514834198d2392639d6d726b17d901

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 134de24..7ac7a7a 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.223 2005/09/01 03:07:44 drh Exp $
+** $Id: expr.c,v 1.224 2005/09/05 20:06:49 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2078,7 +2078,6 @@
   NameContext *pNC = (NameContext *)pArg;
   Parse *pParse = pNC->pParse;
   SrcList *pSrcList = pNC->pSrcList;
-  Expr *pAggExpr;
 
   switch( pExpr->op ){
     case TK_COLUMN: {
@@ -2086,9 +2085,10 @@
         if( pExpr->iTable==pSrcList->a[i].iCursor ){
           pAgg = pParse->aAgg;
           for(i=0; i<pParse->nAgg; i++, pAgg++){
+            Expr *pE;
             if( pAgg->isAgg ) continue;
-            if( (pAggExpr = pAgg->pExpr)->iTable==pExpr->iTable
-             && pAggExpr->iColumn==pExpr->iColumn ){
+            pE = pAgg->pExpr;
+            if( pE->iTable==pExpr->iTable && pE->iColumn==pExpr->iColumn ){
               break;
             }
           }