Remove end-of-line whitespace from lemon.c.
FossilOrigin-Name: d78355c85f49e139f1ac1a660563865350f0e442652b7bc50b684398f81cc602
This commit is contained in:
parent
14d8855b8f
commit
06f60d8e87
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C Fix\ssome\sleft-over\sK&R-C\sconstructs\sin\slemon.c.\s\sNo\schanges\sto\sthe\score.
|
||||
D 2017-04-14T19:44:15.729
|
||||
C Remove\send-of-line\swhitespace\sfrom\slemon.c.
|
||||
D 2017-04-14T19:46:12.138
|
||||
F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
|
||||
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
|
||||
F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
|
||||
@ -1498,7 +1498,7 @@ F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
|
||||
F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
|
||||
F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
|
||||
F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
|
||||
F tool/lemon.c c02a8dffa053950c460cc27e524e24a06cbd1c06125ae9d619be0811528cb9bb
|
||||
F tool/lemon.c 6b0cdffb377e79c6295c40300677688f3d35c21c0154da635642ef82dc3a5836
|
||||
F tool/lempar.c db1bdb4821f2d8fbd76e577cf3ab18642c8d08d1
|
||||
F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
|
||||
F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
|
||||
@ -1572,7 +1572,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P f489b5bb6b35665befdd411c2c55df5258e83cba265d8c4427ba22529cf882a4
|
||||
R 09cedb0a1e3f12dd43403c176a722752
|
||||
P a53799059d4ece246610b6c877ab7088ded3548cbca7149a03deea8ac0e27e68
|
||||
R e8b4051079bcc56bd29a4fddab0de3fd
|
||||
U drh
|
||||
Z 8d14d0c30102a27bc4df09a1b38d16b8
|
||||
Z a46eec356673a6ddd2be83fdca8b716d
|
||||
|
@ -1 +1 @@
|
||||
a53799059d4ece246610b6c877ab7088ded3548cbca7149a03deea8ac0e27e68
|
||||
d78355c85f49e139f1ac1a660563865350f0e442652b7bc50b684398f81cc602
|
48
tool/lemon.c
48
tool/lemon.c
@ -561,8 +561,8 @@ void Action_add(
|
||||
** default action for the state_number is returned.
|
||||
**
|
||||
** All actions associated with a single state_number are first entered
|
||||
** into aLookahead[] using multiple calls to acttab_action(). Then the
|
||||
** actions for that single state_number are placed into the aAction[]
|
||||
** into aLookahead[] using multiple calls to acttab_action(). Then the
|
||||
** actions for that single state_number are placed into the aAction[]
|
||||
** array with a single call to acttab_insert(). The acttab_insert() call
|
||||
** also resets the aLookahead[] array in preparation for the next
|
||||
** state number.
|
||||
@ -612,7 +612,7 @@ acttab *acttab_alloc(void){
|
||||
return p;
|
||||
}
|
||||
|
||||
/* Add a new action to the current transaction set.
|
||||
/* Add a new action to the current transaction set.
|
||||
**
|
||||
** This routine is called once for each lookahead for a particular
|
||||
** state.
|
||||
@ -674,7 +674,7 @@ int acttab_insert(acttab *p){
|
||||
}
|
||||
}
|
||||
|
||||
/* Scan the existing action table looking for an offset that is a
|
||||
/* Scan the existing action table looking for an offset that is a
|
||||
** duplicate of the current transaction set. Fall out of the loop
|
||||
** if and when the duplicate is found.
|
||||
**
|
||||
@ -752,7 +752,7 @@ int acttab_insert(acttab *p){
|
||||
*/
|
||||
|
||||
/* Find a precedence symbol of every rule in the grammar.
|
||||
**
|
||||
**
|
||||
** Those rules which have a precedence symbol coded in the input
|
||||
** grammar using the "[symbol]" construct will already have the
|
||||
** rp->precsym field filled. Other rules take as their precedence
|
||||
@ -1072,7 +1072,7 @@ void FindFollowSets(struct lemon *lemp)
|
||||
cfp->status = INCOMPLETE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
do{
|
||||
progress = 0;
|
||||
for(i=0; i<lemp->nstate; i++){
|
||||
@ -1103,7 +1103,7 @@ void FindActions(struct lemon *lemp)
|
||||
struct symbol *sp;
|
||||
struct rule *rp;
|
||||
|
||||
/* Add all of the reduce actions
|
||||
/* Add all of the reduce actions
|
||||
** A reduce action is added for each element of the followset of
|
||||
** a configuration which has its dot at the extreme right.
|
||||
*/
|
||||
@ -1220,7 +1220,7 @@ static int resolve_conflict(
|
||||
apx->type = RD_RESOLVED;
|
||||
}
|
||||
}else{
|
||||
assert(
|
||||
assert(
|
||||
apx->type==SH_RESOLVED ||
|
||||
apx->type==RD_RESOLVED ||
|
||||
apx->type==SSCONFLICT ||
|
||||
@ -1606,7 +1606,7 @@ int main(int argc, char **argv)
|
||||
OptInit(argv,options,stderr);
|
||||
if( version ){
|
||||
printf("Lemon version 1.0\n");
|
||||
exit(0);
|
||||
exit(0);
|
||||
}
|
||||
if( OptNArgs()!=1 ){
|
||||
fprintf(stderr,"Exactly one filename argument is required.\n");
|
||||
@ -2307,7 +2307,7 @@ to follow the previous rule.");
|
||||
case IN_RHS:
|
||||
if( x[0]=='.' ){
|
||||
struct rule *rp;
|
||||
rp = (struct rule *)calloc( sizeof(struct rule) +
|
||||
rp = (struct rule *)calloc( sizeof(struct rule) +
|
||||
sizeof(struct symbol*)*psp->nrhs + sizeof(char*)*psp->nrhs, 1);
|
||||
if( rp==0 ){
|
||||
ErrorMsg(psp->filename,psp->tokenlineno,
|
||||
@ -2997,7 +2997,7 @@ PRIVATE FILE *file_open(
|
||||
return fp;
|
||||
}
|
||||
|
||||
/* Duplicate the input file without comments and without actions
|
||||
/* Duplicate the input file without comments and without actions
|
||||
** on rules */
|
||||
void Reprint(struct lemon *lemp)
|
||||
{
|
||||
@ -3148,7 +3148,7 @@ int PrintAction(
|
||||
indent,ap->sp->name,ap->x.rp->iRule);
|
||||
break;
|
||||
case SSCONFLICT:
|
||||
fprintf(fp,"%*s shift %-7d ** Parsing conflict **",
|
||||
fprintf(fp,"%*s shift %-7d ** Parsing conflict **",
|
||||
indent,ap->sp->name,ap->x.stp->statenum);
|
||||
break;
|
||||
case SH_RESOLVED:
|
||||
@ -3421,7 +3421,7 @@ PRIVATE void tplt_print(FILE *out, struct lemon *lemp, char *str, int *lineno)
|
||||
(*lineno)++;
|
||||
}
|
||||
if (!lemp->nolinenosflag) {
|
||||
(*lineno)++; tplt_linedir(out,*lineno,lemp->outname);
|
||||
(*lineno)++; tplt_linedir(out,*lineno,lemp->outname);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -3466,8 +3466,8 @@ void emit_destructor_code(
|
||||
fputc(*cp,out);
|
||||
}
|
||||
fprintf(out,"\n"); (*lineno)++;
|
||||
if (!lemp->nolinenosflag) {
|
||||
(*lineno)++; tplt_linedir(out,*lineno,lemp->outname);
|
||||
if (!lemp->nolinenosflag) {
|
||||
(*lineno)++; tplt_linedir(out,*lineno,lemp->outname);
|
||||
}
|
||||
fprintf(out,"}\n"); (*lineno)++;
|
||||
return;
|
||||
@ -3590,7 +3590,7 @@ PRIVATE int translate_code(struct lemon *lemp, struct rule *rp){
|
||||
/* There is no LHS value symbol. */
|
||||
lhsdirect = 1;
|
||||
}else if( strcmp(rp->lhsalias,rp->rhsalias[0])==0 ){
|
||||
/* The LHS symbol and the left-most RHS symbol are the same, so
|
||||
/* The LHS symbol and the left-most RHS symbol are the same, so
|
||||
** direct writing is allowed */
|
||||
lhsdirect = 1;
|
||||
lhsused = 1;
|
||||
@ -3601,7 +3601,7 @@ PRIVATE int translate_code(struct lemon *lemp, struct rule *rp){
|
||||
"different datatypes.",
|
||||
rp->lhs->name, rp->lhsalias, rp->rhs[0]->name, rp->rhsalias[0]);
|
||||
lemp->errorcnt++;
|
||||
}
|
||||
}
|
||||
}else{
|
||||
lemon_sprintf(zOvwrt, "/*%s-overwrites-%s*/",
|
||||
rp->lhsalias, rp->rhsalias[0]);
|
||||
@ -3740,7 +3740,7 @@ PRIVATE int translate_code(struct lemon *lemp, struct rule *rp){
|
||||
return rc;
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
** Generate code which executes when the rule "rp" is reduced. Write
|
||||
** the code to "out". Make sure lineno stays up-to-date.
|
||||
*/
|
||||
@ -4237,7 +4237,7 @@ void ReportTable(
|
||||
fprintf(out, "#define YY_SHIFT_COUNT (%d)\n", n-1); lineno++;
|
||||
fprintf(out, "#define YY_SHIFT_MIN (%d)\n", mnTknOfst); lineno++;
|
||||
fprintf(out, "#define YY_SHIFT_MAX (%d)\n", mxTknOfst); lineno++;
|
||||
fprintf(out, "static const %s yy_shift_ofst[] = {\n",
|
||||
fprintf(out, "static const %s yy_shift_ofst[] = {\n",
|
||||
minimum_size_type(mnTknOfst, lemp->nterminal+lemp->nactiontab, &sz));
|
||||
lineno++;
|
||||
lemp->tablesize += n*sz;
|
||||
@ -4264,7 +4264,7 @@ void ReportTable(
|
||||
fprintf(out, "#define YY_REDUCE_COUNT (%d)\n", n-1); lineno++;
|
||||
fprintf(out, "#define YY_REDUCE_MIN (%d)\n", mnNtOfst); lineno++;
|
||||
fprintf(out, "#define YY_REDUCE_MAX (%d)\n", mxNtOfst); lineno++;
|
||||
fprintf(out, "static const %s yy_reduce_ofst[] = {\n",
|
||||
fprintf(out, "static const %s yy_reduce_ofst[] = {\n",
|
||||
minimum_size_type(mnNtOfst-1, mxNtOfst, &sz)); lineno++;
|
||||
lemp->tablesize += n*sz;
|
||||
for(i=j=0; i<n; i++){
|
||||
@ -4343,7 +4343,7 @@ void ReportTable(
|
||||
tplt_xfer(lemp->name,in,out,&lineno);
|
||||
|
||||
/* Generate code which executes every time a symbol is popped from
|
||||
** the stack while processing errors or while destroying the parser.
|
||||
** the stack while processing errors or while destroying the parser.
|
||||
** (In other words, generate the %destructor actions)
|
||||
*/
|
||||
if( lemp->tokendest ){
|
||||
@ -4409,7 +4409,7 @@ void ReportTable(
|
||||
tplt_print(out,lemp,lemp->overflow,&lineno);
|
||||
tplt_xfer(lemp->name,in,out,&lineno);
|
||||
|
||||
/* Generate the table of rule information
|
||||
/* Generate the table of rule information
|
||||
**
|
||||
** Note: This code depends on the fact that rules are number
|
||||
** sequentually beginning with 0.
|
||||
@ -4520,7 +4520,7 @@ void ReportHeader(struct lemon *lemp)
|
||||
for(i=1; i<lemp->nterminal; i++){
|
||||
fprintf(out,"#define %s%-30s %3d\n",prefix,lemp->symbols[i]->name,i);
|
||||
}
|
||||
fclose(out);
|
||||
fclose(out);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -4567,7 +4567,7 @@ void CompressTables(struct lemon *lemp)
|
||||
rbest = rp;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Do not make a default if the number of rules to default
|
||||
** is not at least 1 or if the wildcard token is a possible
|
||||
** lookahead.
|
||||
|
Loading…
Reference in New Issue
Block a user