This is an experimental change to investigate the feasibility of allow

DEFAULT tokens within VALUES clauses attached to INSERT statements. There
is a lot of extra code space consumed for such an obscure feature.

FossilOrigin-Name: 2ff4129ea05c1cc5a0c58540c7de9cdd5831a808514d11ac5ba2d4a44ca20354

diff --git a/manifest b/manifest
index 27e4110605c3aaac97aa03534cb90c55668d6cdf..ddc4ff9321524e3603e0b7074205f9c80299eaec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\sthe\stest/speedtest.tcl\sscript\sso\sthat\sit\suses\san\son-disk\sdatabase\nrather\sthan\san\sin-memory\sdatabase.
-D 2025-02-06T17:29:14.625
+C This\sis\san\sexperimental\schange\sto\sinvestigate\sthe\sfeasibility\sof\sallow\nDEFAULT\stokens\swithin\sVALUES\sclauses\sattached\sto\sINSERT\sstatements.\sThere\nis\sa\slot\sof\sextra\scode\sspace\sconsumed\sfor\ssuch\san\sobscure\sfeature.
+D 2025-02-06T21:14:27.053
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -769,7 +769,7 @@ F src/os_win.c 49c7725b500f5867e8360e75eeb30f9d70b62fa1f05c8a101da627210578df32
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 3a1c4e7f69af482e33c8cba8a75afe0dda0ea6391240adac22b040ce1bdeef44
 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
-F src/parse.y 5dce477d23c6cd41da97ff9bc4ef93fba0e0a0aaa72a15ddb8a3f71618d76cac
+F src/parse.y 537ea5f4881e924db32e786fbfe2cc5d20990731d34c2101b0abd6a1315d7970
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -2136,8 +2136,8 @@ F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c f62a0c701b2c7ff2f3e21d206f093c123f222dbf07136a10ffd1ca15a5c706c5
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-F tool/lemon.c 2418ee31f65764d150f7dd87ef00b4408f1b01a55db0b30bed673a3e336ae718
-F tool/lempar.c e6b649778e5c027c8365ff01d7ef39297cd7285fa1f881cce31792689541e79f
+F tool/lemon.c 8a87e0ac84a9bfe48c5f13fec2282f5ffe4b2cb259f3fa6be4890e1188a32493
+F tool/lempar.c bf92d06432a217adb9cc143392b0eaac4e4083321cee1dcd14ece83eb14a7acf
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669
@@ -2209,8 +2209,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ed82272904deb37640286448e03153316f828c629547a615a504af1d7ec5a278
-R 3389deb8f0facbb95e58d6e9fc976f10
+P e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c
+R d804befe9bc6b41a89ecf51824c5dd3c
+T *branch * default-in-values
+T *sym-default-in-values *
+T -sym-trunk *
 U drh
-Z 9628165988950eefdec8a4b63484fc0a
+Z 6c6a00c698a47380c071bb1637488a2a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a345c887753497b7a6520f0ef2429a029230bf3d..8c7cc3302b449571d77c591cea04030e882f6415 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c
+2ff4129ea05c1cc5a0c58540c7de9cdd5831a808514d11ac5ba2d4a44ca20354

diff --git a/src/parse.y b/src/parse.y
index e9e2c62e616a8ec5bf42f47a684ec2f2051e28b7..1ebd3f465b85047cc2d06e12e4b6e6c41e174e43 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -1521,6 +1521,72 @@ nexprlist(A) ::= nexprlist(A) COMMA expr(Y).
 nexprlist(A) ::= expr(Y).
     {A = sqlite3ExprListAppend(pParse,0,Y); /*A-overwrites-Y*/}
 
+
+%include {
+  /* Forward declaration */
+  static SQLITE_NOINLINE void parserRequireInsertContext(
+    Parse *pParse,                /* The SQLite parsing context */
+    void *pLemon,                 /* The LEMON parser state */
+    Token *pErrToken,             /* Token that might be a syntax error */
+    int nRhs                      /* Number of RHS tokens on the ruls */
+  );
+}
+%code {
+  /* This routine checks to see if the parser stack looks like either of these:
+  **
+  **     insert_cmd INTO xfullname idlist_opt VALUES LP
+  **     insert_cmd INTO xfullname idlist_opt values COMMA LP
+  **
+  ** If the parser stack is different from both of these, then raise a syntax error
+  ** on pErrToken.
+  */
+  static SQLITE_NOINLINE void parserRequireInsertContext(
+    Parse *pParse,                /* The SQLite parsing context */
+    void *pLemon,                 /* The LEMON parser state */
+    Token *pErrToken,             /* Token that might be a syntax error */
+    int nRhs                      /* Number of RHS tokens on the ruls */
+  ){
+    yyParser *yypParser = (yyParser*)pLemon;
+    yyStackEntry *yytos = yypParser->yytos - nRhs;
+    int bFault = 0;
+    if( (yytos - yypParser->yystack) < 6
+     || yytos[0].major!=TK_LP
+    ){
+      bFault = 1;
+    }else
+    if( yytos[-1].major==TK_COMMA
+     && yytos[-2].major==YYNT_values
+     && yytos[-3].major==YYNT_idlist_opt
+    ){
+      /* This is ok */
+    }else
+    if( yytos[-1].major==TK_VALUES
+     && yytos[-2].major==YYNT_idlist_opt
+    ){
+      /* This is ok */
+    }else
+    {
+      bFault = 1;  /* Cannot match */
+    }
+    if( bFault ) parserSyntaxError(pParse, pErrToken);
+  }
+}
+
+// The following reduction rules only succeed if the previous two
+// tokens are "VALUES LP".  If the previous two tokens are anything
+// different, a syntax error is raised.
+//
+nexprlist(A) ::= nexprlist(A) COMMA DEFAULT(D). {
+  Expr *p = sqlite3PExpr(pParse,TK_DEFAULT,0,0);
+  parserRequireInsertContext(pParse, yypParser, &D, 3);
+  A = sqlite3ExprListAppend(pParse,A,p);
+}
+nexprlist(A) ::= DEFAULT(D). {
+  Expr *p = sqlite3PExpr(pParse,TK_DEFAULT,0,0);
+  parserRequireInsertContext(pParse, yypParser, &D, 1);
+  A = sqlite3ExprListAppend(pParse,0,p);
+}
+
 %ifndef SQLITE_OMIT_SUBQUERY
 /* A paren_exprlist is an optional expression list contained inside
 ** of parenthesis */

diff --git a/tool/lemon.c b/tool/lemon.c
index 5747520b6e43ae5ee43077c1ab2542228e58083b..ddb118d7bb3d7053ae391b3781c1cff0ac7f0e89 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -4934,6 +4934,14 @@ void ReportTable(
   }
   tplt_xfer(lemp->name,in,out,&lineno);
 
+  /* Generate internal #defines for every non-terminal symbol.
+  */
+  for(i=0; i<lemp->nsymbol; i++){
+    if( !ISLOWER(lemp->symbols[i]->name[0]) ) continue;
+    fprintf(out,"#define YYNT_%-20s %4d\n",lemp->symbols[i]->name, i);lineno++;
+  }
+  tplt_xfer(lemp->name,in,out,&lineno);
+
   /* Generate a table containing a text string that describes every
   ** rule in the rule set of the grammar.  This information is used
   ** when tracing REDUCE actions.

diff --git a/tool/lempar.c b/tool/lempar.c
index 851a0e2e5433ec560df3256d4cd4ec3087a274b6..31dc66a61fd71166105058288c3091057ae7dc46 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -280,6 +280,9 @@ static const char *const yyTokenName[] = {
 };
 #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
 
+/* Numeric values assigned to non-terminal symbols. */
+%%
+
 #ifndef NDEBUG
 /* For tracing reduce actions, the names of all rules are required.
 */