Propagate function names to V (#24)

Author: 0xGeorgii

.vscode/settings.json

@@ -7,6 +7,7 @@
         "./wat-codegen/Cargo.toml",
         "./tests/Cargo.toml",
         "./playground-server/Cargo.toml",
-        "./wat-fmt/Cargo.toml"
+        "./wat-fmt/Cargo.toml",
+        "./wasm-fmt/Cargo.toml"
     ]
 }

Cargo.toml

@@ -11,6 +11,7 @@ members = [
     "tests",
     "playground-server",
     "wat-fmt",
+    "wasm-fmt",
 ]
 
 [workspace.package]
@@ -31,6 +32,7 @@ inference-playground-server = { path = "./playground-server", version = "0.0.1"
 inf-wast = "0.0.5"
 inf-wasmparser = "0.0.5"
 wat-fmt = { path = "./wat-fmt", version = "0.0.1" }
-tree-sitter = "0.24.7"
+wasm-fmt = { path = "./wasm-fmt", version = "0.0.1" }
+tree-sitter = "0.25.1"
 tree-sitter-inference = "0.0.28"
 anyhow = "1.0.44"

playground-server/Cargo.toml

@@ -12,4 +12,5 @@ actix-cors = "0.7.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 inference.workspace = true
-wat-fmt.workspace = true
+wat-fmt.workspace = true
+wasm-fmt.workspace = true

playground-server/src/main.rs

@@ -3,7 +3,8 @@ use actix_web::{post, web, App, HttpResponse, HttpServer, Responder};
 use inference::{compile_to_wat, wasm_to_v, wat_to_wasm};
 use serde::{Deserialize, Serialize};
 
-use wat_fmt::format;
+use wasm_fmt::format as wasm_format;
+use wat_fmt::format as wat_format;
 
 #[derive(Deserialize)]
 struct CompileRequest {
@@ -14,6 +15,7 @@ struct CompileRequest {
 struct Response {
     wat: String,
     wasm: Vec<u8>,
+    wasm_str: String,
     v: String,
     errors: Vec<String>,
 }
@@ -30,6 +32,7 @@ fn parse_inf_file(input: &str) -> Response {
             return Response {
                 wat: String::new(),
                 wasm: vec![],
+                wasm_str: String::new(),
                 v: String::new(),
                 errors,
             };
@@ -45,17 +48,20 @@ fn parse_inf_file(input: &str) -> Response {
             .map(|v_str| v = v_str)
             .unwrap_or_else(|e| errors.push(e.to_string()));
 
-        let wat = format(&wat);
+        let wat = wat_format(&wat);
+        let wasm_str = wasm_format(&wasm);
         Response {
             wat,
             wasm,
+            wasm_str,
             v,
             errors,
         }
     } else {
         Response {
             wat: String::new(),
             wasm: vec![],
+            wasm_str: String::new(),
             v,
             errors,
         }
@@ -89,6 +95,8 @@ async fn main() -> std::io::Result<()> {
 
 #[cfg(test)]
 mod test {
+    use std::any;
+
     use super::*;
 
     #[test]

wasm-fmt/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "wasm-fmt"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]