Allow different constructor name (#264)

second-state · Dec 6, 2021 · 20aadda · 20aadda
1 parent 8f5cfb6
commit 20aadda
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cargo-sewup/src/build.rs b/cargo-sewup/src/build.rs
@@ -107,7 +107,7 @@ async fn build_wat(
         format!(
             r#"
   (export "memory" (memory 0))
-  (func (export "main") call $constructor i32.const 0 i32.const {} call {})"#,
+  (func (export "main") call $__constructor i32.const 0 i32.const {} call {})"#,
             bin_size, eth_finish_sig
         )
     } else {
@@ -124,7 +124,7 @@ async fn build_wat(
         format!(
             r#"
   (export "memory" (memory 0))
-  (func (export "main") call $constructor i32.const 0 i32.const {} call $_Eth_Finish)
+  (func (export "main") call $__constructor i32.const 0 i32.const {} call $_Eth_Finish)
         "#,
             bin_size
         )

diff --git a/examples/kv-contract/src/lib.rs b/examples/kv-contract/src/lib.rs
@@ -17,7 +17,7 @@ pub struct Pair(pub u32, pub Vec<u8>);
 pub struct SimpleStructPair(pub String, pub bool, pub String);
 
 #[ewasm_constructor]
-fn constructor() {
+fn setup() {
     use sewup::types::{Raw, Row};
     let mut storage =
         sewup::kv::Store::new().expect("there is no return for constructor currently");

diff --git a/sewup-derive/src/lib.rs b/sewup-derive/src/lib.rs
@@ -321,10 +321,10 @@ pub fn ewasm_fn(attr: TokenStream, item: TokenStream) -> TokenStream {
 #[proc_macro_error]
 #[proc_macro_attribute]
 pub fn ewasm_constructor(_attr: TokenStream, item: TokenStream) -> TokenStream {
-    let input = syn::parse_macro_input!(item as syn::ItemFn);
-    let name = &input.sig.ident;
-    if *name != "constructor" {
-        abort!(input.sig.ident, "please name the function as `constructor`");
+    let mut input = syn::parse_macro_input!(item as syn::ItemFn);
+    let default_name = Ident::new("__constructor", Span::call_site());
+    if input.sig.ident != "__constructor" {
+        input.sig.ident = default_name;
     }
     let result = quote! {
         #[cfg(target_arch = "wasm32")]
@@ -336,7 +336,7 @@ pub fn ewasm_constructor(_attr: TokenStream, item: TokenStream) -> TokenStream {
         #[cfg(feature = "constructor-test")]
         #[no_mangle]
         pub fn main() {
-            #name();
+            __constructor();
         }
     };
     result.into()