From c1dd3b9421720cf7186f5bff45facca509c8a49d Mon Sep 17 00:00:00 2001 From: b4yuan Date: Tue, 4 Jul 2023 16:24:46 -0400 Subject: [PATCH 1/2] unqlite.c: constant comparison --- unqlite.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unqlite.c b/unqlite.c index 49c0b9d..3e9e630 100644 --- a/unqlite.c +++ b/unqlite.c @@ -20031,8 +20031,8 @@ static sxi32 GenStateCompileFuncBody( /* Restore the default container */ jx9VmSetByteCodeContainer(pGen->pVm, pInstrContainer); /* Leave function block */ - GenStateLeaveBlock(&(*pGen), 0); - if( rc == SXERR_ABORT ){ + rc = GenStateLeaveBlock(&(*pGen), 0); + if( rc != SXRET_OK ){ /* Don't worry about freeing memory, everything will be released shortly */ return SXERR_ABORT; } @@ -26081,11 +26081,11 @@ static sxi32 jx9TokenizeInput(SyStream *pStream,SyToken *pToken,void *pUserData, SyToken *pTmp; /* Peek the last recongnized token */ pTmp = (SyToken *)SySetPeek(pTokSet); - if( pTmp->nType & JX9_TK_KEYWORD ){ + if( !pTmp && ( pTmp->nType & JX9_TK_KEYWORD ) ){ sxi32 nID = SX_PTR_TO_INT(pTmp->pUserData); if( (sxu32)nID & (JX9_TKWRD_INT|JX9_TKWRD_FLOAT|JX9_TKWRD_STRING|JX9_TKWRD_BOOL) ){ pTmp = (SyToken *)SySetAt(pTokSet, pTokSet->nUsed - 2); - if( pTmp->nType & JX9_TK_LPAREN ){ + if( !pTmp && ( pTmp->nType & JX9_TK_LPAREN ) ){ /* Merge the three tokens '(' 'TYPE' ')' into a single one */ const char * zTypeCast = "(int)"; if( nID & JX9_TKWRD_FLOAT ){ From dc2bdb6ba3ab0b0eff790903af2c4743faeea25f Mon Sep 17 00:00:00 2001 From: b4yuan <89487381+b4yuan@users.noreply.github.com> Date: Tue, 4 Jul 2023 16:35:42 -0400 Subject: [PATCH 2/2] remove changes from other branch --- unqlite.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unqlite.c b/unqlite.c index 3e9e630..db4e098 100644 --- a/unqlite.c +++ b/unqlite.c @@ -26081,11 +26081,11 @@ static sxi32 jx9TokenizeInput(SyStream *pStream,SyToken *pToken,void *pUserData, SyToken *pTmp; /* Peek the last recongnized token */ pTmp = (SyToken *)SySetPeek(pTokSet); - if( !pTmp && ( pTmp->nType & JX9_TK_KEYWORD ) ){ + if( pTmp->nType & JX9_TK_KEYWORD ){ sxi32 nID = SX_PTR_TO_INT(pTmp->pUserData); if( (sxu32)nID & (JX9_TKWRD_INT|JX9_TKWRD_FLOAT|JX9_TKWRD_STRING|JX9_TKWRD_BOOL) ){ pTmp = (SyToken *)SySetAt(pTokSet, pTokSet->nUsed - 2); - if( !pTmp && ( pTmp->nType & JX9_TK_LPAREN ) ){ + if( pTmp->nType & JX9_TK_LPAREN ){ /* Merge the three tokens '(' 'TYPE' ')' into a single one */ const char * zTypeCast = "(int)"; if( nID & JX9_TKWRD_FLOAT ){