diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-20 02:18:24 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-20 02:18:24 +0000 |
| commit | 4501a9bc8494e557bcbe44b38fbd1ec067783a69 (patch) | |
| tree | 4f94f76eb2c53d8224122197636692cfc6e54be6 /tools/lemon | |
| parent | 2552c750e5391ea27cc12a0a4d4cb1a6a73a9888 (diff) | |
lemon is not compiled with HAVE_CONFIG_h so don't test for it nor try to include it.
svn path=/trunk/; revision=45018
Diffstat (limited to 'tools/lemon')
| -rw-r--r-- | tools/lemon/lemon.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index ef480614b2..ee4b47df90 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -28,9 +28,6 @@ ** Updated to sqlite lemon version 1.59 ** $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include <stdio.h> #include <stdarg.h> @@ -1493,7 +1490,7 @@ int main(int argc _U_, char **argv) Symbol_new("$"); lem.errsym = Symbol_new("error"); /* - ** Resetting useCnt in errsym seems to disable some error checking we + ** Resetting useCnt in errsym seems to disable some error checking we ** need to validate the filter syntax. So we remove this resetting for now. ** ** lem.errsym->useCnt = 0; @@ -2148,7 +2145,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, @@ -2963,7 +2960,7 @@ PRIVATE int PrintAction(struct action *ap, FILE *fp, int indent){ indent,ap->sp->name,ap->x.rp->index); break; case SSCONFLICT: - fprintf(fp,"%*s shift %d ** Parsing conflict **", + fprintf(fp,"%*s shift %d ** Parsing conflict **", indent,ap->sp->name,ap->x.stp->statenum); break; case SH_RESOLVED: @@ -3335,7 +3332,7 @@ PRIVATE void translate_code(struct lemon *lemp, struct rule *rp){ rp->code = "\n"; rp->line = rp->ruleline; } - + append_str(0,0,0,0); for(cp=rp->code; *cp; cp++){ if( safe_isalpha(*cp) && (cp==rp->code || (!safe_isalnum(cp[-1]) && cp[-1]!='_')) ){ |