Remove some dead code. Improve some error checks and comments.

FossilOrigin-Name: 6712fbe46a97867cea309f78a274edbb6bd166a505b41e18a580306da0e063db

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index eddcfddd1e7f81ccc0a9e139a52ef60ba8557a19..582b0c0a30efd33f417cf015b63f3e3ad57cd1f9 100644 (file)
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -632,10 +632,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     capi.sqlite3_js_rc_str = (rc)=>__rcMap[rc];
     /* Bind all registered C-side structs... */
     const notThese = Object.assign(Object.create(null),{
-      // For each struct to NOT register, map its name to false:
+      // For each struct to NOT register, map its name to true:
       WasmTestStruct: true,
-      /* We remove the kvvfs VFS from Worker threads below. */
+      /* We unregister the kvvfs VFS from Worker threads below. */
       sqlite3_kvvfs_methods: !util.isUIThread(),
+      /* sqlite3_index_info and friends require int64: */
       sqlite3_index_info: !wasm.bigIntEnabled,
       sqlite3_index_constraint: !wasm.bigIntEnabled,
       sqlite3_index_orderby: !wasm.bigIntEnabled,

diff --git a/ext/wasm/jaccwabyt/jaccwabyt.js b/ext/wasm/jaccwabyt/jaccwabyt.js
index 81b4c1bd4f90f82277b859451f551497f7f69e8d..7c8d42b331c75f735e3bce2d1da6e1d052fcbc7e 100644 (file)
--- a/ext/wasm/jaccwabyt/jaccwabyt.js
+++ b/ext/wasm/jaccwabyt/jaccwabyt.js
@@ -130,34 +130,9 @@ self.Jaccwabyt = function StructBinderFactory(config){
     }
     toss("Unhandled signature IR:",s);
   };
-  /** Returns the sizeof value for the given SIG. Throws for an
-      unknown SIG. */
-  const sigSizeof = function(s){
-    switch(sigLetter(s)){
-        case 'c': case 'C': return 1;
-        case 'i': return 4;
-        case 'p': case 'P': case 's': return ptrSizeof;
-        case 'j': return 8;
-        case 'f': return 4 /* C-side floats, not JS-side */;
-        case 'd': return 8;
-    }
-    toss("Unhandled signature sizeof:",s);
-  };
+
   const affirmBigIntArray = BigInt64Array
         ? ()=>true : ()=>toss('BigInt64Array is not available.');
-  /** Returns the (signed) TypedArray associated with the type
-      described by the given SIG. Throws for an unknown SIG. */
-  /**********
-  const sigTypedArray = function(s){
-    switch(sigIR(s)) {
-        case 'i32': return Int32Array;
-        case 'i64': return affirmBigIntArray() && BigInt64Array;
-        case 'float': return Float32Array;
-        case 'double': return Float64Array;
-    }
-    toss("Unhandled signature TypedArray:",s);
-  };
-  **************/
   /** Returns the name of a DataView getter method corresponding
       to the given SIG. */
   const sigDVGetter = function(s){
@@ -217,6 +192,8 @@ self.Jaccwabyt = function StructBinderFactory(config){
     toss("Unhandled DataView set wrapper for signature:",s);
   };
 
+  /** Returns the given struct and member name in a form suitable for
+      debugging and error output. */
   const sPropName = (s,k)=>s+'::'+k;
 
   const __propThrowOnSet = function(structName,propName){
@@ -673,13 +650,20 @@ self.Jaccwabyt = function StructBinderFactory(config){
       // Sanity checks of sizeof/offset info...
       const m = structInfo.members[k];
       if(!m.sizeof) toss(structName,"member",k,"is missing sizeof.");
-      else if(m.sizeof>1){ // offsets of size-1 members may be odd values.
+      else if(m.sizeof===1){
+        (m.signature === 'c' || m.signature === 'C') ||
+          toss("Unexpected sizeof==1 member",
+               sPropName(structInfo.name,k),
+               "with signature",m.signature);
+      }else{
+        // sizes and offsets of size-1 members may be odd values, but
+        // others may not.
         if(0!==(m.sizeof%4)){
-          console.warn("Invalid struct description =",m,"from",structInfo.members);
+          console.warn("Invalid struct member description =",m,"from",structInfo);
           toss(structName,"member",k,"sizeof is not aligned. sizeof="+m.sizeof);
         }
         if(0!==(m.offset%4)){
-          console.warn("Invalid struct description =",m,"from",structInfo.members);
+          console.warn("Invalid struct member description =",m,"from",structInfo);
           toss(structName,"member",k,"offset is not aligned. offset="+m.offset);
         }
       }

diff --git a/manifest b/manifest
index 7d4a4ffa9e9a57b267acb4f08926037a16398b1e..ceb804eae8b39946ea6dc886909ea6d79e77c224 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sinfrastructure\sfor\sadding\svirtual\stable/table-valued\sfunction\ssupport\sto\sWASM.
-D 2022-12-05T05:30:03.152
+C Remove\ssome\sdead\scode.\sImprove\ssome\serror\schecks\sand\scomments.
+D 2022-12-05T05:45:00.486
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -503,7 +503,7 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
 F ext/wasm/api/pre-js.c-pp.js b88499dc303c21fc3f55f2c364a0f814f587b60a95784303881169f9e91c1d5f
 F ext/wasm/api/sqlite3-api-cleanup.js 680d5ccfff54459db136a49b2199d9f879c8405d9c99af1dda0cc5e7c29056f4
-F ext/wasm/api/sqlite3-api-glue.js 6028d0c3e6f475a513040a45612238b749ec6c155181d5bd029d66577ab4d0d6
+F ext/wasm/api/sqlite3-api-glue.js 40504fa3d382b9181e20e299ac5318ef55345090b8f5098601d7f759d57d6418
 F ext/wasm/api/sqlite3-api-oo1.js 91a7d7b9203fb0f031e6ba380a644a7f871e1798b388de399c01ed4087bac9e0
 F ext/wasm/api/sqlite3-api-prologue.js 697a5989ad52a9ba7bc60b5436589bd05885ee2201d84c38c5e9af3876af3ba4
 F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f
@@ -539,7 +539,7 @@ F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html c806b6005145b71d64240606e9c6e0bf56878ee8829c66fe7486cebf34b0e6b1
 F ext/wasm/index.html f151b7c7b5cfdc066567d556acd168e769efd4e982286dc5f849a5ee69ecd0ff
-F ext/wasm/jaccwabyt/jaccwabyt.js 7c41784c442aa67f0e86e7c14aa51b3a28e3b21eb579c71c16af3c988fbf966f
+F ext/wasm/jaccwabyt/jaccwabyt.js 292d37ad3b5fcef420db7b449813c38f1656f490f43e214ea4895793158e7fce
 F ext/wasm/jaccwabyt/jaccwabyt.md 50df3ccb7a773634000496a2ccb805dd25cf8cd963696a7deec3209a68c6093b
 F ext/wasm/module-symbols.html 980680c8acfa3c8ae6a5aa223512d1b8e78040ced20f8ba2c382129bc73ec028
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
@@ -2065,11 +2065,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 1b779afa3ed2f35a110e460fc6ed13cba744db85b9924149ab028b100d1e1e12
-R b429259a443dd7b0ac8ceede26128588
-T *branch * wasm-vtab
-T *sym-wasm-vtab *
-T -sym-trunk * Cancelled\sby\sbranch.
+P c202d7a0398b9aabc2babba5c4c91a313f32bbf37549d419775642bb4aa3936a
+R acfab192817c95e0e585836998ec2507
 U stephan
-Z bd980b10d448d088ee0cbb8238fc2a43
+Z 572c98dbcc011253d2f467baefba9d4d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f70604b10c6ce6e9eef63ad699738318bd346b66..cddf20fae51cc65cc0a22df03f39ff76489ee337 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c202d7a0398b9aabc2babba5c4c91a313f32bbf37549d419775642bb4aa3936a
\ No newline at end of file
+6712fbe46a97867cea309f78a274edbb6bd166a505b41e18a580306da0e063db
\ No newline at end of file