Further improvements to the handling of the u32 and u16 typedefs in the

shell.c source file.

FossilOrigin-Name: 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0

diff --git a/manifest b/manifest
index e1da3d05bb9185e81342a95d16427e4c3b05e995..0916bc7d1a459fb71e5bece6c2227f3f09c4d51f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\sability\sof\smkshellc.tcl\sto\sremove\sredundant\stypedefs\sfrom\sthe\ngenerated\sshell.c\scode.\s\sThis\sis\sneeded\sto\sget\sshell.c\sto\sbuild\son\solder\nC\scompilers.
-D 2022-11-07T18:36:02.221
+C Further\simprovements\sto\sthe\shandling\sof\sthe\su32\sand\su16\stypedefs\sin\sthe\nshell.c\ssource\sfile.
+D 2022-11-07T19:40:20.023
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -638,7 +638,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
-F src/shell.c.in 84bb08d8762920285f08f1c0993f1b3992ac43af5d72445cb8a973fc50c71923
+F src/shell.c.in 458cb3de9d548342fc645b699620b1af3de770d2ceec09ac71f86c19bd244064
 F src/sqlite.h.in 46052b3bcab8d34387bbe9ae4f49da9c2e05f19188bbd15a1c05abd895b56b23
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@ -1987,7 +1987,7 @@ F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61
 F tool/mkopcodeh.tcl bcb2bd5affb545fd219ef0304c7978e2a356407ab723f45ec8569235892c1c3f
 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 F tool/mkpragmatab.tcl bd07bd59d45d0f3448e123d6937e9811195f9908a51e09d774609883055bfd3d
-F tool/mkshellc.tcl f2338a4c38e4f4f56e01371f334fbdce2e5a3d1f35fc5b5363d006b972fae749
+F tool/mkshellc.tcl 02d0de8349ef830c0fb20d29680320bde2466e2ec422e5bd94c4317a7a7e8cc9
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
@@ -2055,8 +2055,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ebbb1f88e7b5d6cbe84d400f1a187acedb4c668d0b7e4c63bf1496e57da9b8ad
-R 7804554888bc684c344c3fe1b6c3276b
+P 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e
+R 464a7490d5785cedceee206c55537caa
 U drh
-Z 5e56457afaeb4e9d88ce8f0890f14fb1
+Z 18e20ce83905083b1118871788a6f38f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 942aa9a46aa4624afa455a23da8bfab494551f31..f87dd57dfe18d5ebde69123aa1fd1e6307b00a95 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e
\ No newline at end of file
+55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 635361aa922884ba6a1bb3a312a66f9fd2a892ce..f16478977675db4bf06f27b6923d375d6c9e1315 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -16,6 +16,8 @@
 /* This needs to come before any includes for MSVC compiler */
 #define _CRT_SECURE_NO_WARNINGS
 #endif
+typedef unsigned int u32;
+typedef unsigned short int u16;
 
 /*
 ** Optionally #include a user-defined header, whereby compilation options

diff --git a/tool/mkshellc.tcl b/tool/mkshellc.tcl
index a4c5590eeb2f007c4933940f23998a8134ef8757..35b48007197fc728684cf391207a1fef90e03fc1 100644 (file)
--- a/tool/mkshellc.tcl
+++ b/tool/mkshellc.tcl
@@ -36,7 +36,7 @@ proc omit_redundant_typedefs {line} {
   global typedef_seen
   if {[regexp {^typedef .*\y([a-zA-Z0-9_]+);} $line all typename]} {
     if {[info exists typedef_seen($typename)]} {
-      return "/* $line */"
+      return "/* [string map {/* // */ //} $line] */"
     }
     set typedef_seen($typename) 1
   }