From 9c727abb8424686b038299fc245d93689152d41b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 11 May 2022 09:26:11 +0200 Subject: [PATCH] COMP: increment lemon sources, fix stray comment char (wmkdepend) COMP: compile utilites before solvers - there are no inter-dependencies, so favour getting utilities working first --- applications/Allwmake | 4 ++-- wmake/etc/lempar.c | 4 ++-- wmake/etc/lempar.c.patch | 8 ++++---- wmake/src/lemon.c | 9 ++++----- wmake/src/lemon.c.patch | 16 ++++++++-------- wmake/src/wmkdepend.cc | 2 +- wmake/src/wmkdepend.rl | 2 +- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/applications/Allwmake b/applications/Allwmake index ae643c9f80..008ef550d4 100755 --- a/applications/Allwmake +++ b/applications/Allwmake @@ -21,10 +21,10 @@ echo ======================================== #------------------------------------------------------------------------------ -wmake -all $targetType solvers wmake -all $targetType utilities +wmake -all $targetType solvers -# Optional +# Extra tools (optional) ## wmake -all $targetType tools #------------------------------------------------------------------------------ diff --git a/wmake/etc/lempar.c b/wmake/etc/lempar.c index 7561d3783d..d5875e3e83 100644 --- a/wmake/etc/lempar.c +++ b/wmake/etc/lempar.c @@ -228,9 +228,9 @@ struct yyParser { }; typedef struct yyParser yyParser; +#include #ifndef NDEBUG #include -#include static FILE *yyTraceFILE = 0; static char *yyTracePrompt = 0; #endif /* NDEBUG */ @@ -895,8 +895,8 @@ void Parse( yyact = yy_find_shift_action((YYCODETYPE)yymajor,yyact); if( yyact >= YY_MIN_REDUCE ){ unsigned int yyruleno = yyact - YY_MIN_REDUCE; /* Reduce by this rule */ - assert( yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ); #ifndef NDEBUG + assert( yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ); if( yyTraceFILE ){ int yysize = yyRuleInfoNRhs[yyruleno]; if( yysize ){ diff --git a/wmake/etc/lempar.c.patch b/wmake/etc/lempar.c.patch index f7368ba7e6..ec7e1d5009 100644 --- a/wmake/etc/lempar.c.patch +++ b/wmake/etc/lempar.c.patch @@ -1,5 +1,5 @@ ---- lempar.c.orig 2020-11-05 19:44:09.412097759 +0100 -+++ lempar.c 2020-11-06 09:03:57.932738075 +0100 +--- lempar.c.orig 2022-05-11 05:42:38.000000000 +0200 ++++ lempar.c 2022-05-11 09:13:31.688352277 +0200 @@ -89,6 +89,11 @@ /************* End control #defines *******************************************/ #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0]))) @@ -68,7 +68,7 @@ int ParseCoverage(FILE *out){ int stateno, iLookAhead, i; int nMissed = 0; -@@ -889,6 +901,7 @@ +@@ -840,6 +852,7 @@ ** Outputs: ** None. */ @@ -76,7 +76,7 @@ void Parse( void *yyp, /* The parser */ int yymajor, /* The major token code number */ -@@ -1063,6 +1076,7 @@ +@@ -1057,6 +1070,7 @@ ** Return the fallback token corresponding to canonical token iToken, or ** 0 if iToken has no fallback. */ diff --git a/wmake/src/lemon.c b/wmake/src/lemon.c index 52fb402aea..a99cf6be01 100644 --- a/wmake/src/lemon.c +++ b/wmake/src/lemon.c @@ -1,9 +1,9 @@ /* OPENFOAM note * * https://sqlite.org/src/raw/ - * https://www.sqlite.org/src/artifact/25888183 - * Artifact 258881835bd5bccd0c74fb110fe54244ff18e8e7ef3d949cbdab7187f02132bb: - * File tool/lemon.c part of check-in [f2f279b2]] at 2021-10-04 + * https://www.sqlite.org/src/artifact/ea5c8589 + * Artifact ea5c8589c7749e9bd32ba10432aeeed3c16e215de72a12ada2bc707884837149: + * File tool/lemon.c part of check-in [201569e0] at 2022-04-07 */ /* ** This file contains all sources (including headers) to the LEMON @@ -3048,6 +3048,7 @@ void Parse(struct lemon *gp) } if( c=='/' && cp[1]=='*' ){ /* Skip C style comments */ cp+=2; + if( (*cp)=='/' ) cp++; while( (c= *cp)!=0 && (c!='/' || cp[-1]!='*') ){ if( c=='\n' ) lineno++; cp++; @@ -4323,7 +4324,6 @@ void ReportTable( int sqlFlag /* Generate the *.sql file too */ ){ FILE *out, *in, *sql; - char line[LINESIZE]; int lineno; struct state *stp; struct action *ap; @@ -4801,7 +4801,6 @@ void ReportTable( /* Generate a table containing the symbolic name of every symbol */ for(i=0; insymbol; i++){ - lemon_sprintf(line,"\"%s\",",lemp->symbols[i]->name); fprintf(out," /* %4d */ \"%s\",\n",i, lemp->symbols[i]->name); lineno++; } tplt_xfer(lemp->name,in,out,&lineno); diff --git a/wmake/src/lemon.c.patch b/wmake/src/lemon.c.patch index 0224efc9bf..c2ef304847 100644 --- a/wmake/src/lemon.c.patch +++ b/wmake/src/lemon.c.patch @@ -1,5 +1,5 @@ ---- lemon.c.orig 2020-11-05 19:43:43.780141575 +0100 -+++ lemon.c 2020-11-05 19:59:41.022505205 +0100 +--- lemon.c.orig 2022-05-11 05:42:38.000000000 +0200 ++++ lemon.c 2022-05-11 09:13:17.556350944 +0200 @@ -426,6 +426,7 @@ int printPreprocessed; /* Show preprocessor output on stdout */ int has_fallback; /* True if any %fallback is seen in the grammar */ @@ -8,7 +8,7 @@ char *argv0; /* Name of the program */ }; -@@ -1555,6 +1560,24 @@ +@@ -1553,6 +1554,24 @@ lemon_strcpy(outputDir, z); } @@ -33,7 +33,7 @@ static char *user_templatename = NULL; static void handle_T_option(char *z){ user_templatename = (char *) malloc( lemonStrlen(z)+1 ); -@@ -1643,6 +1666,7 @@ +@@ -1641,6 +1660,7 @@ {OPT_FLAG, "c", (char*)&compress, "Don't compress the action table."}, {OPT_FSTR, "d", (char*)&handle_d_option, "Output directory. Default '.'"}, {OPT_FSTR, "D", (char*)handle_D_option, "Define an %ifdef macro."}, @@ -41,7 +41,7 @@ {OPT_FLAG, "E", (char*)&printPP, "Print input file after preprocessing."}, {OPT_FSTR, "f", 0, "Ignored. (Placeholder for -f compiler options.)"}, {OPT_FLAG, "g", (char*)&rpflag, "Print grammar without actions."}, -@@ -2266,6 +2290,7 @@ +@@ -2268,6 +2288,7 @@ psp->preccounter = 0; psp->firstrule = psp->lastrule = 0; psp->gp->nrule = 0; @@ -49,7 +49,7 @@ /* fall through */ case WAITING_FOR_DECL_OR_RULE: if( x[0]=='%' ){ -@@ -2551,6 +2576,11 @@ +@@ -2553,6 +2574,11 @@ psp->state = WAITING_FOR_WILDCARD_ID; }else if( strcmp(x,"token_class")==0 ){ psp->state = WAITING_FOR_CLASS_ID; @@ -61,7 +61,7 @@ }else{ ErrorMsg(psp->filename,psp->tokenlineno, "Unknown declaration keyword: \"%%%s\".",x); -@@ -4311,7 +4341,7 @@ +@@ -4315,7 +4341,7 @@ in = tplt_open(lemp); if( in==0 ) return; @@ -70,7 +70,7 @@ if( out==0 ){ fclose(in); return; -@@ -4435,6 +4465,9 @@ +@@ -4439,6 +4465,9 @@ tplt_xfer(lemp->name,in,out,&lineno); /* Generate the defines */ diff --git a/wmake/src/wmkdepend.cc b/wmake/src/wmkdepend.cc index 60a27dd19b..f8bf930a53 100644 --- a/wmake/src/wmkdepend.cc +++ b/wmake/src/wmkdepend.cc @@ -971,7 +971,7 @@ int main(int argc, char* argv[]) } else if (!strncmp(argv[i], "-o", 2)) { - // Option: -oFile */ + // Option: -oFile if (optLen > 2) { outputFile.assign(argv[i] + 2); diff --git a/wmake/src/wmkdepend.rl b/wmake/src/wmkdepend.rl index b58f76ea9e..04d7ece23d 100644 --- a/wmake/src/wmkdepend.rl +++ b/wmake/src/wmkdepend.rl @@ -553,7 +553,7 @@ int main(int argc, char* argv[]) } else if (!strncmp(argv[i], "-o", 2)) { - // Option: -oFile */ + // Option: -oFile if (optLen > 2) { outputFile.assign(argv[i] + 2);