wasmprinter: print the end offset (#1425)

* wasmprinter: print the end offset

With `--print-offsets`, print the offset at the end of the module or
component. For example, with an empty module, print this:

```
(module)
(;@8     ;)
```

This change also ensures that top-level modules and components are printed
with a newline at the end, which makes using them on the command line
tidier.

* Update test outputs.

crates/wasm-compose/src/graph.rs

@@ -1329,7 +1329,11 @@ mod test {
         })?;
 
         let wat = wasmprinter::print_bytes(encoded)?;
-        assert_eq!(r#"(component)"#, wat);
+        assert_eq!(
+            r#"(component)
+"#,
+            wat
+        );
 
         Ok(())
     }
@@ -1356,7 +1360,8 @@ mod test {
   )
   (import "b" (component (;0;) (type 0)))
   (instance (;0;) (instantiate 0))
-)"#,
+)
+"#,
             wat
         );
 
@@ -1382,7 +1387,8 @@ mod test {
             r#"(component
   (component (;0;))
   (instance (;0;) (instantiate 0))
-)"#,
+)
+"#,
             wat
         );
 
@@ -1552,7 +1558,8 @@ mod test {
       (with "i5" (type 4))
     )
   )
-)"#,
+)
+"#,
             wat
         );
 

crates/wasm-compose/tests/compose.rs

@@ -74,6 +74,7 @@ fn component_composing() -> Result<()> {
                             }
                         }
                     }
+                    err.push_str("\n");
                     (err.replace('\\', "/"), &error_path)
                 }
             }
@@ -112,16 +113,15 @@ fn component_composing() -> Result<()> {
         };
 
         if std::env::var_os("BLESS").is_some() {
-            fs::write(baseline_path, output + "\n")?;
+            fs::write(baseline_path, output)?;
         } else {
             assert_eq!(
                 fs::read_to_string(baseline_path)
                     .with_context(|| format!(
                         "failed to read component baseline `{}`",
                         baseline_path.display()
                     ))?
-                    .replace("\r\n", "\n")
-                    .trim(),
+                    .replace("\r\n", "\n"),
                 output,
                 "failed baseline comparison for test case `{}` ({})",
                 test_case,

crates/wasmprinter/src/lib.rs

@@ -547,7 +547,7 @@ impl Printer {
                     self.print_component_exports(states.last_mut().unwrap(), s)?;
                 }
 
-                Payload::End(_) => {
+                Payload::End(offset) => {
                     self.end_group(); // close the `module` or `component` group
 
                     let state = states.pop().unwrap();
@@ -562,6 +562,10 @@ impl Printer {
                         }
                         parser = parsers.pop().unwrap();
                     } else {
+                        self.newline(offset);
+                        if self.print_offsets {
+                            self.result.push('\n');
+                        }
                         break;
                     }
                 }

crates/wasmprinter/tests/all.rs

@@ -259,7 +259,8 @@ fn offsets_and_lines_smoke_test() {
         (Some(0x20), "    local.get 0\n"),
         (None,       "  )\n"),
         (Some(0x17), "  (export \"f\" (func 0))\n"),
-        (None,       ")"),
+        (None,       ")\n"),
+        (Some(0x23), ""),
     ];
 
     assert_eq!(actual, expected);

crates/wit-component/tests/components/adapt-empty-interface/component.wat

@@ -57,4 +57,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-export-default/component.wat

@@ -29,4 +29,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-export-namespaced/component.wat

@@ -39,4 +39,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-export-reallocs/component.wat

@@ -128,4 +128,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-export-save-args/component.wat

@@ -83,4 +83,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-export-with-post-return/component.wat

@@ -99,4 +99,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-import-only-used-in-adapter/component.wat

@@ -112,4 +112,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-inject-stack-with-adapt-realloc/component.wat

@@ -171,4 +171,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-inject-stack-with-realloc-no-state/component.wat

@@ -213,4 +213,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-inject-stack-with-realloc/component.wat

@@ -196,4 +196,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-inject-stack-with-reallocing-adapter/component.wat

@@ -184,4 +184,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-inject-stack/component.wat

@@ -159,4 +159,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-list-return/component.wat

@@ -101,4 +101,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-memory-simple/component.wat

@@ -89,4 +89,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-multiple/component.wat

@@ -104,4 +104,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-preview1/component.wat

@@ -116,4 +116,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/adapt-unused/component.wat

@@ -9,4 +9,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/bare-funcs/component.wat

@@ -90,4 +90,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/empty/component.wat

@@ -9,4 +9,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/ensure-default-type-exports/component.wat

@@ -47,4 +47,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/export-interface-using-import/component.wat

@@ -33,4 +33,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/export-name-shuffling/component.wat

@@ -39,4 +39,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/export-resource/component.wat

@@ -99,4 +99,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/export-type-name-conflict/component.wat

@@ -43,4 +43,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/export-with-type-alias/component.wat

@@ -37,4 +37,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/exports/component.wat

@@ -136,4 +136,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-and-export-resource/component.wat

@@ -50,4 +50,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-conflict/component.wat

@@ -115,4 +115,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-empty-interface/component.wat

@@ -9,4 +9,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-export-same-iface-name/component.wat

@@ -56,4 +56,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-export/component.wat

@@ -121,4 +121,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-in-adapter-and-main-module/component.wat

@@ -217,4 +217,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-partial-export-full/component.wat

@@ -28,4 +28,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-resource-in-interface/component.wat

@@ -38,4 +38,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/import-resource-simple/component.wat

@@ -30,4 +30,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/imports/component.wat

@@ -146,4 +146,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/lift-options/component.wat

@@ -283,4 +283,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/link-bare-funcs/component.wat

@@ -241,4 +241,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/link-circular/component.wat

@@ -166,4 +166,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/link-dl-openable/component.wat

@@ -123,4 +123,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/link-duplicate-symbols/component.wat

@@ -167,4 +167,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)

crates/wit-component/tests/components/link-got-func/component.wat

@@ -160,4 +160,4 @@
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )
-)
+)