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

Remove tab characters from source code files. Replace them with spaces.

Browse Source 
FossilOrigin-Name: 7edd10a960d5ff121e470b0549b0aa9fb7760022
This commit is contained in:
drh
2012-08-20 15:53:54 +00:00
parent 36ce6d2341
commit f2f105d40e
7 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifest
View File

@@ -1,5 +1,5 @@
C Add\sa\scommand-line\sprogram\sto\stool/\sthat\swill\scheck\ssource\scode\sfiles\sfor\nthe\spresence\sof\stabs,\scarriage-returns,\swhitespace\sat\sthe\sends\sof\slines,\nand\sblank\slines\sat\sthe\sends\sof\sfiles. C Remove\stab\scharacters\sfrom\ssource\scode\sfiles.\s\sReplace\sthem\swith\sspaces.
D 2012-08-20T15:46:08.616 D 2012-08-20T15:53:54.334
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -123,10 +123,10 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c 82b6fcbec3101ff951f47797f407d5eb5d06fa44 F src/btree.c 32dc63ef18c6a8d448c37c030ced70cf23ccad75
F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142 F src/build.c 196734374128023e414a818f2051d836badb3526
F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
F src/ctime.c 500d019da966631ad957c37705642be87524463b F src/ctime.c 500d019da966631ad957c37705642be87524463b
@@ -148,7 +148,7 @@ F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09 F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09
F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@ -162,7 +162,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757 F src/os_unix.c b5149a3343a6acd6c9df4e3acf5085a6501c1f68
F src/os_win.c b8fc659987a678c7924796585f5ae293ba5c896d F src/os_win.c b8fc659987a678c7924796585f5ae293ba5c896d
F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78 F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
@@ -977,7 +977,7 @@ F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
F tool/lemon.c 8b7afc12a6671e3a932a5209a9e64abbfbd0f025 F tool/lemon.c 680980c7935bfa1edec20c804c9e5ba4b1dd96f5
F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79 F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@ -1011,7 +1011,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P b1b01c4cd9798d69951665ed7d6d9f79f6b463a1 P 656a9c8b47d262e0982ad3a35db490e2ff4d856e
R db3c2f86cbdcb0a11fb0992163e936bd R 0e0adc036d304d5c4dd5e1ab38071ea8
U drh U drh
Z c6dac7cfeec82346ac2dc26da1ee134c Z 448a9623866dd8e560b884c67dc8bc9d

2
manifest.uuid
View File

@@ -1 +1 @@
656a9c8b47d262e0982ad3a35db490e2ff4d856e 7edd10a960d5ff121e470b0549b0aa9fb7760022

4
src/btree.c
View File

@@ -1461,7 +1461,7 @@ static int btreeInitPage(MemPage *pPage){
size = get2byte(&data[pc+2]); size = get2byte(&data[pc+2]);
if( (next>0 && next<=pc+size+3) || pc+size>usableSize ){ if( (next>0 && next<=pc+size+3) || pc+size>usableSize ){
/* Free blocks must be in ascending order. And the last byte of /* Free blocks must be in ascending order. And the last byte of
** the free-block must lie on the database page. */ ** the free-block must lie on the database page. */
return SQLITE_CORRUPT_BKPT; return SQLITE_CORRUPT_BKPT;
} }
nFree = nFree + size; nFree = nFree + size;
@@ -2635,7 +2635,7 @@ int sqlite3BtreeBeginTrans(Btree *p, int wrflag){
pBt->nTransaction++; pBt->nTransaction++;
#ifndef SQLITE_OMIT_SHARED_CACHE #ifndef SQLITE_OMIT_SHARED_CACHE
if( p->sharable ){ if( p->sharable ){
assert( p->lock.pBtree==p && p->lock.iTable==1 ); assert( p->lock.pBtree==p && p->lock.iTable==1 );
p->lock.eLock = READ_LOCK; p->lock.eLock = READ_LOCK;
p->lock.pNext = pBt->pLock; p->lock.pNext = pBt->pLock;
pBt->pLock = &p->lock; pBt->pLock = &p->lock;

2
src/build.c
View File

@@ -534,7 +534,7 @@ void sqlite3DeleteTable(sqlite3 *db, Table *pTable){
if( !db || db->pnBytesFreed==0 ){ if( !db || db->pnBytesFreed==0 ){
char *zName = pIndex->zName; char *zName = pIndex->zName;
TESTONLY ( Index *pOld = ) sqlite3HashInsert( TESTONLY ( Index *pOld = ) sqlite3HashInsert(
&pIndex->pSchema->idxHash, zName, sqlite3Strlen30(zName), 0 &pIndex->pSchema->idxHash, zName, sqlite3Strlen30(zName), 0
); );
assert( db==0 || sqlite3SchemaMutexHeld(db, 0, pIndex->pSchema) ); assert( db==0 || sqlite3SchemaMutexHeld(db, 0, pIndex->pSchema) );
assert( pOld==pIndex || pOld==0 ); assert( pOld==pIndex || pOld==0 );

4
src/mem1.c
View File

@@ -231,14 +231,14 @@ static int sqlite3MemInit(void *NotUsed){
}else{ }else{
/* only 1 core, use our own zone to contention over global locks, /* only 1 core, use our own zone to contention over global locks,
** e.g. we have our own dedicated locks */ ** e.g. we have our own dedicated locks */
bool success; bool success;
malloc_zone_t* newzone = malloc_create_zone(4096, 0); malloc_zone_t* newzone = malloc_create_zone(4096, 0);
malloc_set_zone_name(newzone, "Sqlite_Heap"); malloc_set_zone_name(newzone, "Sqlite_Heap");
do{ do{
success = OSAtomicCompareAndSwapPtrBarrier(NULL, newzone, success = OSAtomicCompareAndSwapPtrBarrier(NULL, newzone,
(void * volatile *)&_sqliteZone_); (void * volatile *)&_sqliteZone_);
}while(!_sqliteZone_); }while(!_sqliteZone_);
if( !success ){ if( !success ){
/* somebody registered a zone first */ /* somebody registered a zone first */
malloc_destroy_zone(newzone); malloc_destroy_zone(newzone);
} }

20
src/os_unix.c
View File

@@ -715,9 +715,9 @@ static int sqliteErrorFromPosixError(int posixError, int sqliteIOErr) {
case EACCES: case EACCES:
/* EACCES is like EAGAIN during locking operations, but not any other time*/ /* EACCES is like EAGAIN during locking operations, but not any other time*/
if( (sqliteIOErr == SQLITE_IOERR_LOCK) || if( (sqliteIOErr == SQLITE_IOERR_LOCK) ||
(sqliteIOErr == SQLITE_IOERR_UNLOCK) || (sqliteIOErr == SQLITE_IOERR_UNLOCK) ||
(sqliteIOErr == SQLITE_IOERR_RDLOCK) || (sqliteIOErr == SQLITE_IOERR_RDLOCK) ||
(sqliteIOErr == SQLITE_IOERR_CHECKRESERVEDLOCK) ){ (sqliteIOErr == SQLITE_IOERR_CHECKRESERVEDLOCK) ){
return SQLITE_BUSY; return SQLITE_BUSY;
} }
/* else fall through */ /* else fall through */
@@ -1764,7 +1764,7 @@ static int posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){
pInode->eFileLock = NO_LOCK; pInode->eFileLock = NO_LOCK;
}else{ }else{
rc = SQLITE_IOERR_UNLOCK; rc = SQLITE_IOERR_UNLOCK;
pFile->lastErrno = errno; pFile->lastErrno = errno;
pInode->eFileLock = NO_LOCK; pInode->eFileLock = NO_LOCK;
pFile->eFileLock = NO_LOCK; pFile->eFileLock = NO_LOCK;
} }
@@ -1780,7 +1780,7 @@ static int posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){
closePendingFds(pFile); closePendingFds(pFile);
} }
} }
end_unlock: end_unlock:
unixLeaveMutex(); unixLeaveMutex();
if( rc==SQLITE_OK ) pFile->eFileLock = eFileLock; if( rc==SQLITE_OK ) pFile->eFileLock = eFileLock;
@@ -2047,7 +2047,7 @@ static int dotlockUnlock(sqlite3_file *id, int eFileLock) {
assert( pFile ); assert( pFile );
OSTRACE(("UNLOCK %d %d was %d pid=%d (dotlock)\n", pFile->h, eFileLock, OSTRACE(("UNLOCK %d %d was %d pid=%d (dotlock)\n", pFile->h, eFileLock,
pFile->eFileLock, getpid())); pFile->eFileLock, getpid()));
assert( eFileLock<=SHARED_LOCK ); assert( eFileLock<=SHARED_LOCK );
/* no-op if possible */ /* no-op if possible */
@@ -2434,7 +2434,7 @@ static int semUnlock(sqlite3_file *id, int eFileLock) {
assert( pFile ); assert( pFile );
assert( pSem ); assert( pSem );
OSTRACE(("UNLOCK %d %d was %d pid=%d (sem)\n", pFile->h, eFileLock, OSTRACE(("UNLOCK %d %d was %d pid=%d (sem)\n", pFile->h, eFileLock,
pFile->eFileLock, getpid())); pFile->eFileLock, getpid()));
assert( eFileLock<=SHARED_LOCK ); assert( eFileLock<=SHARED_LOCK );
/* no-op if possible */ /* no-op if possible */
@@ -3024,7 +3024,7 @@ static int seekAndRead(unixFile *id, sqlite3_int64 offset, void *pBuf, int cnt){
if( newOffset == -1 ){ if( newOffset == -1 ){
((unixFile*)id)->lastErrno = errno; ((unixFile*)id)->lastErrno = errno;
}else{ }else{
((unixFile*)id)->lastErrno = 0; ((unixFile*)id)->lastErrno = 0;
} }
return -1; return -1;
} }
@@ -3112,7 +3112,7 @@ static int seekAndWrite(unixFile *id, i64 offset, const void *pBuf, int cnt){
if( newOffset == -1 ){ if( newOffset == -1 ){
((unixFile*)id)->lastErrno = errno; ((unixFile*)id)->lastErrno = errno;
}else{ }else{
((unixFile*)id)->lastErrno = 0; ((unixFile*)id)->lastErrno = 0;
} }
return -1; return -1;
} }
@@ -5626,7 +5626,7 @@ static int unixGetLastError(sqlite3_vfs *NotUsed, int NotUsed2, char *NotUsed3){
** address in the shared range is taken for a SHARED lock, the entire ** address in the shared range is taken for a SHARED lock, the entire
** shared range is taken for an EXCLUSIVE lock): ** shared range is taken for an EXCLUSIVE lock):
** **
** PENDING_BYTE 0x40000000 ** PENDING_BYTE 0x40000000
** RESERVED_BYTE 0x40000001 ** RESERVED_BYTE 0x40000001
** SHARED_RANGE 0x40000002 -> 0x40000200 ** SHARED_RANGE 0x40000002 -> 0x40000200
** **

78
tool/lemon.c
View File

@@ -15,7 +15,7 @@
#ifndef __WIN32__ #ifndef __WIN32__
# if defined(_WIN32) || defined(WIN32) # if defined(_WIN32) || defined(WIN32)
# define __WIN32__ # define __WIN32__
# endif # endif
#endif #endif
@@ -653,7 +653,7 @@ void FindRulePrecedences(struct lemon *xp)
} }
}else if( sp->prec>=0 ){ }else if( sp->prec>=0 ){
rp->precsym = rp->rhs[i]; rp->precsym = rp->rhs[i];
} }
} }
} }
} }
@@ -711,12 +711,12 @@ void FindFirstSets(struct lemon *lemp)
progress += SetAdd(s1->firstset,s2->subsym[j]->index); progress += SetAdd(s1->firstset,s2->subsym[j]->index);
} }
break; break;
}else if( s1==s2 ){ }else if( s1==s2 ){
if( s1->lambda==LEMON_FALSE ) break; if( s1->lambda==LEMON_FALSE ) break;
}else{ }else{
progress += SetUnion(s1->firstset,s2->firstset); progress += SetUnion(s1->firstset,s2->firstset);
if( s2->lambda==LEMON_FALSE ) break; if( s2->lambda==LEMON_FALSE ) break;
} }
} }
} }
}while( progress ); }while( progress );
@@ -959,8 +959,8 @@ void FindFollowSets(struct lemon *lemp)
if( change ){ if( change ){
plp->cfp->status = INCOMPLETE; plp->cfp->status = INCOMPLETE;
progress = 1; progress = 1;
} }
} }
cfp->status = COMPLETE; cfp->status = COMPLETE;
} }
} }
@@ -993,7 +993,7 @@ void FindActions(struct lemon *lemp)
** rule "cfp->rp" if the lookahead symbol is "lemp->symbols[j]" */ ** rule "cfp->rp" if the lookahead symbol is "lemp->symbols[j]" */
Action_add(&stp->ap,REDUCE,lemp->symbols[j],(char *)cfp->rp); Action_add(&stp->ap,REDUCE,lemp->symbols[j],(char *)cfp->rp);
} }
} }
} }
} }
} }
@@ -1262,11 +1262,11 @@ void Configlist_closure(struct lemon *lemp)
SetAdd(newcfp->fws, xsp->subsym[k]->index); SetAdd(newcfp->fws, xsp->subsym[k]->index);
} }
break; break;
}else{ }else{
SetUnion(newcfp->fws,xsp->firstset); SetUnion(newcfp->fws,xsp->firstset);
if( xsp->lambda==LEMON_FALSE ) break; if( xsp->lambda==LEMON_FALSE ) break;
} }
} }
if( i==rp->nrhs ) Plink_add(&cfp->fplp,newcfp); if( i==rp->nrhs ) Plink_add(&cfp->fplp,newcfp);
} }
} }
@@ -1996,7 +1996,7 @@ static void parseonetoken(struct pstate *psp)
"There is no prior rule upon which to attach the code \ "There is no prior rule upon which to attach the code \
fragment which begins on this line."); fragment which begins on this line.");
psp->errorcnt++; psp->errorcnt++;
}else if( psp->prevrule->code!=0 ){ }else if( psp->prevrule->code!=0 ){
ErrorMsg(psp->filename,psp->tokenlineno, ErrorMsg(psp->filename,psp->tokenlineno,
"Code fragment beginning on this line is not the first \ "Code fragment beginning on this line is not the first \
to follow the previous rule."); to follow the previous rule.");
@@ -2004,7 +2004,7 @@ to follow the previous rule.");
}else{ }else{
psp->prevrule->line = psp->tokenlineno; psp->prevrule->line = psp->tokenlineno;
psp->prevrule->code = &x[1]; psp->prevrule->code = &x[1];
} }
}else if( x[0]=='[' ){ }else if( x[0]=='[' ){
psp->state = PRECEDENCE_MARK_1; psp->state = PRECEDENCE_MARK_1;
}else{ }else{
@@ -2097,7 +2097,7 @@ to follow the previous rule.");
"Can't allocate enough memory for this rule."); "Can't allocate enough memory for this rule.");
psp->errorcnt++; psp->errorcnt++;
psp->prevrule = 0; psp->prevrule = 0;
}else{ }else{
int i; int i;
rp->ruleline = psp->tokenlineno; rp->ruleline = psp->tokenlineno;
rp->rhs = (struct symbol**)&rp[1]; rp->rhs = (struct symbol**)&rp[1];
@@ -2105,7 +2105,7 @@ to follow the previous rule.");
for(i=0; i<psp->nrhs; i++){ for(i=0; i<psp->nrhs; i++){
rp->rhs[i] = psp->rhs[i]; rp->rhs[i] = psp->rhs[i];
rp->rhsalias[i] = psp->alias[i]; rp->rhsalias[i] = psp->alias[i];
} }
rp->lhs = psp->lhs; rp->lhs = psp->lhs;
rp->lhsalias = psp->lhsalias; rp->lhsalias = psp->lhsalias;
rp->nrhs = psp->nrhs; rp->nrhs = psp->nrhs;
@@ -2117,12 +2117,12 @@ to follow the previous rule.");
rp->next = 0; rp->next = 0;
if( psp->firstrule==0 ){ if( psp->firstrule==0 ){
psp->firstrule = psp->lastrule = rp; psp->firstrule = psp->lastrule = rp;
}else{ }else{
psp->lastrule->next = rp; psp->lastrule->next = rp;
psp->lastrule = rp; psp->lastrule = rp;
} }
psp->prevrule = rp; psp->prevrule = rp;
} }
psp->state = WAITING_FOR_DECL_OR_RULE; psp->state = WAITING_FOR_DECL_OR_RULE;
}else if( isalpha(x[0]) ){ }else if( isalpha(x[0]) ){
if( psp->nrhs>=MAXRHS ){ if( psp->nrhs>=MAXRHS ){
@@ -2131,11 +2131,11 @@ to follow the previous rule.");
x); x);
psp->errorcnt++; psp->errorcnt++;
psp->state = RESYNC_AFTER_RULE_ERROR; psp->state = RESYNC_AFTER_RULE_ERROR;
}else{ }else{
psp->rhs[psp->nrhs] = Symbol_new(x); psp->rhs[psp->nrhs] = Symbol_new(x);
psp->alias[psp->nrhs] = 0; psp->alias[psp->nrhs] = 0;
psp->nrhs++; psp->nrhs++;
} }
}else if( (x[0]=='|' || x[0]=='/') && psp->nrhs>0 ){ }else if( (x[0]=='|' || x[0]=='/') && psp->nrhs>0 ){
struct symbol *msp = psp->rhs[psp->nrhs-1]; struct symbol *msp = psp->rhs[psp->nrhs-1];
if( msp->type!=MULTITERMINAL ){ if( msp->type!=MULTITERMINAL ){
@@ -2199,24 +2199,24 @@ to follow the previous rule.");
if( strcmp(x,"name")==0 ){ if( strcmp(x,"name")==0 ){
psp->declargslot = &(psp->gp->name); psp->declargslot = &(psp->gp->name);
psp->insertLineMacro = 0; psp->insertLineMacro = 0;
}else if( strcmp(x,"include")==0 ){ }else if( strcmp(x,"include")==0 ){
psp->declargslot = &(psp->gp->include); psp->declargslot = &(psp->gp->include);
}else if( strcmp(x,"code")==0 ){ }else if( strcmp(x,"code")==0 ){
psp->declargslot = &(psp->gp->extracode); psp->declargslot = &(psp->gp->extracode);
}else if( strcmp(x,"token_destructor")==0 ){ }else if( strcmp(x,"token_destructor")==0 ){
psp->declargslot = &psp->gp->tokendest; psp->declargslot = &psp->gp->tokendest;
}else if( strcmp(x,"default_destructor")==0 ){ }else if( strcmp(x,"default_destructor")==0 ){
psp->declargslot = &psp->gp->vardest; psp->declargslot = &psp->gp->vardest;
}else if( strcmp(x,"token_prefix")==0 ){ }else if( strcmp(x,"token_prefix")==0 ){
psp->declargslot = &psp->gp->tokenprefix; psp->declargslot = &psp->gp->tokenprefix;
psp->insertLineMacro = 0; psp->insertLineMacro = 0;
}else if( strcmp(x,"syntax_error")==0 ){ }else if( strcmp(x,"syntax_error")==0 ){
psp->declargslot = &(psp->gp->error); psp->declargslot = &(psp->gp->error);
}else if( strcmp(x,"parse_accept")==0 ){ }else if( strcmp(x,"parse_accept")==0 ){
psp->declargslot = &(psp->gp->accept); psp->declargslot = &(psp->gp->accept);
}else if( strcmp(x,"parse_failure")==0 ){ }else if( strcmp(x,"parse_failure")==0 ){
psp->declargslot = &(psp->gp->failure); psp->declargslot = &(psp->gp->failure);
}else if( strcmp(x,"stack_overflow")==0 ){ }else if( strcmp(x,"stack_overflow")==0 ){
psp->declargslot = &(psp->gp->overflow); psp->declargslot = &(psp->gp->overflow);
}else if( strcmp(x,"extra_argument")==0 ){ }else if( strcmp(x,"extra_argument")==0 ){
psp->declargslot = &(psp->gp->arg); psp->declargslot = &(psp->gp->arg);
@@ -2245,9 +2245,9 @@ to follow the previous rule.");
psp->preccounter++; psp->preccounter++;
psp->declassoc = NONE; psp->declassoc = NONE;
psp->state = WAITING_FOR_PRECEDENCE_SYMBOL; psp->state = WAITING_FOR_PRECEDENCE_SYMBOL;
}else if( strcmp(x,"destructor")==0 ){ }else if( strcmp(x,"destructor")==0 ){
psp->state = WAITING_FOR_DESTRUCTOR_SYMBOL; psp->state = WAITING_FOR_DESTRUCTOR_SYMBOL;
}else if( strcmp(x,"type")==0 ){ }else if( strcmp(x,"type")==0 ){
psp->state = WAITING_FOR_DATATYPE_SYMBOL; psp->state = WAITING_FOR_DATATYPE_SYMBOL;
}else if( strcmp(x,"fallback")==0 ){ }else if( strcmp(x,"fallback")==0 ){
psp->fallback = 0; psp->fallback = 0;
@@ -2259,7 +2259,7 @@ to follow the previous rule.");
"Unknown declaration keyword: \"%%%s\".",x); "Unknown declaration keyword: \"%%%s\".",x);
psp->errorcnt++; psp->errorcnt++;
psp->state = RESYNC_AFTER_DECL_ERROR; psp->state = RESYNC_AFTER_DECL_ERROR;
} }
}else{ }else{
ErrorMsg(psp->filename,psp->tokenlineno, ErrorMsg(psp->filename,psp->tokenlineno,
"Illegal declaration keyword: \"%s\".",x); "Illegal declaration keyword: \"%s\".",x);
@@ -2314,10 +2314,10 @@ to follow the previous rule.");
ErrorMsg(psp->filename,psp->tokenlineno, ErrorMsg(psp->filename,psp->tokenlineno,
"Symbol \"%s\" has already be given a precedence.",x); "Symbol \"%s\" has already be given a precedence.",x);
psp->errorcnt++; psp->errorcnt++;
}else{ }else{
sp->prec = psp->preccounter; sp->prec = psp->preccounter;
sp->assoc = psp->declassoc; sp->assoc = psp->declassoc;
} }
}else{ }else{
ErrorMsg(psp->filename,psp->tokenlineno, ErrorMsg(psp->filename,psp->tokenlineno,
"Can't assign a precedence to \"%s\".",x); "Can't assign a precedence to \"%s\".",x);
@@ -2587,12 +2587,12 @@ void Parse(struct lemon *gp)
if( c=='\n' ) lineno++; if( c=='\n' ) lineno++;
prevc = c; prevc = c;
cp++; cp++;
} }
}else if( c=='/' && cp[1]=='/' ){ /* Skip C++ style comments too */ }else if( c=='/' && cp[1]=='/' ){ /* Skip C++ style comments too */
cp = &cp[2]; cp = &cp[2];
while( (c= *cp)!=0 && c!='\n' ) cp++; while( (c= *cp)!=0 && c!='\n' ) cp++;
if( c ) lineno++; if( c ) lineno++;
}else if( c=='\'' || c=='\"' ){ /* String a character literals */ }else if( c=='\'' || c=='\"' ){ /* String a character literals */
int startchar, prevc; int startchar, prevc;
startchar = c; startchar = c;
prevc = 0; prevc = 0;
@@ -2600,8 +2600,8 @@ void Parse(struct lemon *gp)
if( c=='\n' ) lineno++; if( c=='\n' ) lineno++;
if( prevc=='\\' ) prevc = 0; if( prevc=='\\' ) prevc = 0;
else prevc = c; else prevc = c;
} }
} }
} }
if( c==0 ){ if( c==0 ){
ErrorMsg(ps.filename,ps.tokenlineno, ErrorMsg(ps.filename,ps.tokenlineno,