Update

Cargo.toml

@@ -10,21 +10,19 @@ version = "0.1.0"
 default = []
 
 [dependencies]
-wami_macro = {path="./lib/wami_macro"}
 leb128 = {path="./lib/leb128"}
+libwat2wasm = { path = "./lib/libwat2wasm" }
+wami_macro = {path="./lib/wami_macro"}
 
 libm = {version="0.2.11"}
 smallvec = {version = "1.13.2", default-features = false}
 
-[dev-dependencies]
-wa_asm = { path = "./lib/wa_asm" }
-
 [workspace]
 members = [
   "example/cli",
   "example/hello",
   "tools/wat2wasm",
   "lib/wami_macro",
   "lib/leb128",
-  "lib/wa_asm",
+  "lib/libwat2wasm",
 ]

README.md

@@ -74,7 +74,7 @@ fn main() {
   )
 )
 "#;
-    let bin = WasmAssembler::to_wasm("hello.wat", src.as_bytes().to_vec()).unwrap();
+    let bin = WebAssembly::wat2wasm("hello.wat", src.as_bytes().to_vec()).unwrap();
     let instance = WebAssembly::instantiate(&bin, &Env {}).unwrap();
     instance.exports().main().unwrap();
 }

example/hello/Cargo.toml

@@ -8,4 +8,3 @@ version = "0.1.0"
 
 [dependencies]
 wami = { path="../../" }
-wa_asm = { path = "../../lib/wa_asm" }

example/hello/src/main.rs

@@ -1,5 +1,4 @@
 // Hello world
-use wa_asm::WasmAssembler;
 use wami::prelude::*;
 
 fn main() {
@@ -18,7 +17,7 @@ fn main() {
   )
 )
 "#;
-    let bin = WasmAssembler::to_wasm("hello.wat", src.as_bytes().to_vec()).unwrap();
+    let bin = WebAssembly::wat2wasm("hello.wat", src.as_bytes().to_vec()).unwrap();
     let instance = WebAssembly::instantiate(&bin, &Env {}).unwrap();
     instance.exports().main().unwrap();
 }

lib/wa_asm/Cargo.toml → lib/libwat2wasm/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "wa_asm"
+name = "libwat2wasm"
 version = "0.1.0"
 edition = "2024"
 

lib/wa_asm/src/lib.rs → lib/libwat2wasm/src/lib.rs

@@ -48,20 +48,7 @@ impl WasmAssembler {
             .map_err(|e| e.to_detail_string(file_name, &src, tokens.line_positions()))
     }
 
-    // pub fn explain_ast(file_name: &str, src: Vec<u8>) -> Result<String, String> {
-    //     Self::_from_src(file_name, src, |tokens| ast::AstModule::parse(tokens))
-    //         .map(|v| format!("{:#?}", v))
-    // }
-
-    // pub fn explain_ir(file_name: &str, src: Vec<u8>) -> Result<String, String> {
-    //     Self::_from_src(file_name, src, |tokens| {
-    //         let ast_module = ast::AstModule::parse(tokens)?;
-    //         ir::Module::from_ast(ast_module)
-    //     })
-    //     .map(|v| format!("{:#?}", v))
-    // }
-
-    pub fn to_wasm(file_name: &str, src: Vec<u8>) -> Result<Vec<u8>, String> {
+    pub fn assemble(file_name: &str, src: Vec<u8>) -> Result<Vec<u8>, String> {
         Self::_from_src(file_name, src, |tokens: &mut TokenStream<Keyword>| {
             let ir_module = ir::Module::from_ast(ast::AstModule::parse(tokens)?)?;
 

src/tests.rs

@@ -7,7 +7,6 @@ use core::f64::consts::PI;
 use leb128::*;
 use std::assert_matches::assert_matches;
 use std::sync::OnceLock;
-use wa_asm::WasmAssembler;
 
 struct Env;
 
@@ -98,7 +97,7 @@ fn shared_instance() -> WasmInstance {
     static BINARY: OnceLock<Vec<u8>> = OnceLock::new();
     let wasm = BINARY.get_or_init(|| {
         let src = include_bytes!("../test/tester.wat").to_vec();
-        WasmAssembler::to_wasm("tester.wat", src).unwrap()
+        WebAssembly::wat2wasm("tester.wat", src).unwrap()
     });
     WebAssembly::instantiate(&wasm, &Env {}).unwrap()
 }

src/wasm.rs

@@ -15,6 +15,7 @@ use core::slice;
 use core::str;
 use global::WasmGlobal;
 use leb128::*;
+use libwat2wasm::WasmAssembler;
 use smallvec::SmallVec;
 
 pub struct WebAssembly;
@@ -40,9 +41,9 @@ impl WebAssembly {
     }
 
     /// Instantiate wasm module
-    pub fn instantiate<Env: WasmEnv>(
+    pub fn instantiate<ENV: WasmEnv>(
         bytes: &[u8],
-        env: &Env,
+        env: &ENV,
     ) -> Result<WasmInstance, Box<dyn Error>> {
         Self::compile(bytes)?.instantiate(env)
     }
@@ -58,6 +59,11 @@ impl WebAssembly {
     pub fn validate(bytes: &[u8]) -> bool {
         Self::compile(bytes).is_ok()
     }
+
+    /// Translates WebAssembly Text format into binary format
+    pub fn wat2wasm(file_name: &str, src: Vec<u8>) -> Result<Vec<u8>, String> {
+        WasmAssembler::assemble(file_name, src)
+    }
 }
 
 pub type WasmResult<T> = Result<T, Box<dyn Error>>;
@@ -226,7 +232,7 @@ impl WasmModule {
         Ok(module)
     }
 
-    pub fn instantiate<Env: WasmEnv>(mut self, env: &Env) -> Result<WasmInstance, Box<dyn Error>> {
+    pub fn instantiate<ENV: WasmEnv>(mut self, env: &ENV) -> Result<WasmInstance, Box<dyn Error>> {
         let mut func_idx = 0;
         for import in &self.imports {
             match &import.desc {

tools/wat2wasm/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-wa_asm = { path = "../../lib/wa_asm" }
+libwat2wasm = { path = "../../lib/libwat2wasm" }

tools/wat2wasm/src/main.rs

@@ -1,12 +1,12 @@
 //! WebAssembly Assembler CLI Frontend
 
+use libwat2wasm::*;
 use std::{
     env::{self, args},
     fs::{File, read_to_string},
     io::{self, Write},
     process,
 };
-use wa_asm::*;
 
 fn usage() -> ! {
     let mut args = env::args_os();
@@ -54,7 +54,7 @@ fn main() {
     };
 
     let src = read_to_string(path_input.as_str()).unwrap();
-    let binary = match WasmAssembler::to_wasm(path_input.as_str(), src.into_bytes()) {
+    let binary = match WasmAssembler::assemble(path_input.as_str(), src.into_bytes()) {
         Ok(v) => v,
         Err(e) => {
             panic!("{}", e);