database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Fix a bug in the #line generator of lemon. Ticket #3214. (CVS 5404)

Browse Source 
FossilOrigin-Name: dc697c26668929c4eed5ab8cde6975125a7e66c7
This commit is contained in:
drh
2008-07-14 12:21:08 +00:00
parent 71f486254b
commit b5bd49e9cb
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tool/lemon.c
View File

@ -2321,6 +2321,7 @@ to follow the previous rule.");
if( x[0]=='{' || x[0]=='\"' || isalnum(x[0]) ){
char *zOld, *zNew, *zBuf, *z;
int nOld, n, nLine, nNew, nBack;
int addLineMacro;
char zLine[50];
zNew = x;
if( zNew[0]=='"' || zNew[0]=='{' ) zNew++;
@ -2332,8 +2333,9 @@ to follow the previous rule.");
}
nOld = strlen(zOld);
n = nOld + nNew + 20;
if( psp->insertLineMacro && psp->decllinenoslot
&& psp->decllinenoslot[0] ){
addLineMacro = psp->insertLineMacro &&
(psp->decllinenoslot==0 || psp->decllinenoslot[0]!=0);
if( addLineMacro ){
for(z=psp->filename, nBack=0; *z; z++){
if( *z=='\\' ) nBack++;
}
@ -2343,8 +2345,7 @@ to follow the previous rule.");
}
*psp->declargslot = zBuf = realloc(*psp->declargslot, n);
zBuf += nOld;
if( psp->insertLineMacro && psp->decllinenoslot
&& psp->decllinenoslot[0] ){
if( addLineMacro ){
if( nOld && zBuf[-1]!='\n' ){
*(zBuf++) = '\n';
}