Top level functions (#147) (#149)

* Refactor methods * Run global functions * Tests for top level fn without args * External blocks Co-authored-by: Virgil <[email protected]>
Pi-Squared-Inc · Oct 7, 2024 · 3ea07e4 · 3ea07e4
1 parent b0d2398
commit 3ea07e4
Show file tree

Hide file tree

Showing 31 changed files with 351 additions and 131 deletions.
diff --git a/mx-rust-semantics/main/calls/implementation.md b/mx-rust-semantics/main/calls/implementation.md
@@ -66,22 +66,21 @@ module MX-RUST-CALLS-IMPLEMENTATION
             ...
         </k>
         <mx-rust-endpoint-to-function>
-            FunctionName |-> Endpoint:Identifier ...
+            FunctionName:String:KItem |-> Endpoint:PathInExpression ...
         </mx-rust-endpoint-to-function>
         <mx-rust-contract-trait> TraitName:TypePath </mx-rust-contract-trait>
         <mx-call-args> Args:MxValueList </mx-call-args>
-        <trait-path> TraitName </trait-path>
         <method-name> Endpoint </method-name>
         <method-params> _:SelfSort : _ , Nfp:NormalizedFunctionParameterList </method-params>
 
     rule (ptrValue(...) #as SelfValue:Expression) , Params:CallParamsList
-        ~> MxRust#partialMethodCall(Method:Identifier)
-        => methodCall(... self: SelfValue, method: Method, params: Params)
+        ~> MxRust#partialMethodCall(Method:PathInExpression)
+        => functionCall(... function: Method, params: (SelfValue , Params))
 
     syntax MxRustInstruction ::= "MxRust#newContractObject" "(" TypePath ")"
     rule MxRust#newContractObject(P:TypePath) => Rust#newStruct(P, .Map)
 
-    syntax MxRustInstruction ::= "MxRust#partialMethodCall" "(" Identifier ")"
+    syntax MxRustInstruction ::= "MxRust#partialMethodCall" "(" PathInExpression ")"
 
     syntax MxRustInstruction ::= mxArgsToRustArgs
                                     ( MxValueList

diff --git a/mx-rust-semantics/main/modules/address.md b/mx-rust-semantics/main/modules/address.md
@@ -10,9 +10,9 @@ module MX-RUST-MODULES-ADDRESS
                         | "mx_address_value"  [token]
 
     rule
-        normalizedMethodCall
+        normalizedFunctionCall
             ( ManagedAddress
-            , #token("zero", "Identifier"):Identifier
+                :: #token("zero", "Identifier"):Identifier
             , ( .PtrList)
             )
         => mxRustEmptyValue(rustType(ManagedAddress))

diff --git a/mx-rust-semantics/main/modules/biguint.md b/mx-rust-semantics/main/modules/biguint.md
@@ -13,9 +13,9 @@ module MX-RUST-MODULES-BIGUINT
 
     rule
         <k>
-            normalizedMethodCall
+            normalizedFunctionCall
                 ( #token("BigUint", "Identifier"):Identifier
-                , #token("from", "Identifier"):Identifier
+                    :: #token("from", "Identifier"):Identifier
                 ,   ( ptr(ValueId:Int)
                     , .PtrList
                     )
@@ -26,9 +26,9 @@ module MX-RUST-MODULES-BIGUINT
         </k>
         <values> ValueId |-> V:Value ... </values>
 
-    rule normalizedMethodCall
+    rule normalizedFunctionCall
             ( #token("BigUint", "Identifier"):Identifier
-            , #token("zero", "Identifier"):Identifier
+                :: #token("zero", "Identifier"):Identifier
             , .PtrList
             )
         => mxRustBigIntNew(0)

diff --git a/mx-rust-semantics/main/modules/blockchain.md b/mx-rust-semantics/main/modules/blockchain.md
@@ -18,9 +18,9 @@ module MX-RUST-MODULES-BLOCKCHAIN
             )
 
     rule
-        normalizedMethodCall
+        normalizedFunctionCall
             ( MxRust#Blockchain
-            , #token("new", "Identifier"):Identifier
+                :: #token("new", "Identifier"):Identifier
             , .PtrList
             )
         =>  mxRustNewStruct

diff --git a/mx-rust-semantics/main/modules/call-value.md b/mx-rust-semantics/main/modules/call-value.md
@@ -18,9 +18,9 @@ module MX-RUST-MODULES-CALL-VALUE
             )
 
     rule
-        normalizedMethodCall
+        normalizedFunctionCall
             ( MxRust#CallValue
-            , #token("new", "Identifier"):Identifier
+                :: #token("new", "Identifier"):Identifier
             , .PtrList
             )
         =>  mxRustNewStruct

diff --git a/mx-rust-semantics/main/modules/hooks.md b/mx-rust-semantics/main/modules/hooks.md
@@ -10,9 +10,9 @@ module MX-RUST-MODULES-HOOKS
 
     rule
         <k>
-            normalizedMethodCall
+            normalizedFunctionCall
                 ( #token("MxRust#Hooks", "Identifier"):Identifier
-                , #token("MxRust#loadMxReturnValue", "Identifier"):Identifier
+                    :: #token("MxRust#loadMxReturnValue", "Identifier"):Identifier
                 ,   ( ptr(ReturnTypeId:Int)
                     , .PtrList
                     )

diff --git a/mx-rust-semantics/main/modules/managed-vec.md b/mx-rust-semantics/main/modules/managed-vec.md
@@ -9,9 +9,9 @@ module MX-RUST-MODULES-MANAGED-VEC
     imports private RUST-SHARED-SYNTAX
 
     rule
-        normalizedMethodCall
+        normalizedFunctionCall
             ( #token("ManagedVec", "Identifier"):Identifier
-            , #token("new", "Identifier"):Identifier
+                :: #token("new", "Identifier"):Identifier
             , .PtrList
             )
         => mxRustEmptyValue(rustType(#token("ManagedVec", "Identifier")))

diff --git a/mx-rust-semantics/main/modules/proxy.md b/mx-rust-semantics/main/modules/proxy.md
@@ -42,9 +42,9 @@ module MX-RUST-MODULES-PROXY
 
     rule
         <k>
-            normalizedMethodCall
+            normalizedFunctionCall
                 ( #token("MxRust#Proxy", "Identifier"):Identifier
-                , #token("new", "Identifier"):Identifier
+                    :: #token("new", "Identifier"):Identifier
                 , ptr(P1), ptr(P2), .PtrList
                 )
             =>  mxRustNewStruct
@@ -70,7 +70,7 @@ module MX-RUST-MODULES-PROXY
             normalizedMethodCall
                 ( #token("MxRust#Proxy", "Identifier"):Identifier
                     => ProxyType
-                , MethodName:Identifier
+                , _MethodName:Identifier
                 , (ptr(SelfId:Int) , _Params:PtrList)
                 )
             ...
@@ -85,7 +85,6 @@ module MX-RUST-MODULES-PROXY
             ...
         </values>
         <trait-path> ProxyType </trait-path>
-        <method-name> MethodName </method-name>
 
     syntax RustMxInstruction ::= rustMxManagedExecuteOnDestContext
                                     ( destination: RustToMxOrInstruction  // RustToMx
@@ -184,9 +183,9 @@ module MX-RUST-MODULES-PROXY
 
     rule
         <k>
-            normalizedMethodCall
+            normalizedFunctionCall
                 ( #token("MxRust#Proxy", "Identifier"):Identifier
-                , #token("MxRust#execute_on_dest_context", "Identifier"):Identifier
+                    :: #token("MxRust#execute_on_dest_context", "Identifier"):Identifier
                 , (ptr(SelfId:Int) , .PtrList)
                 )
             => rustMxManagedExecuteOnDestContext

diff --git a/mx-rust-semantics/main/modules/send.md b/mx-rust-semantics/main/modules/send.md
@@ -18,9 +18,9 @@ module MX-RUST-MODULES-SEND
             )
 
     rule
-        normalizedMethodCall
+        normalizedFunctionCall
             ( MxRust#Send
-            , #token("new", "Identifier"):Identifier
+                :: #token("new", "Identifier"):Identifier
             , .PtrList
             )
         =>  mxRustNewStruct

diff --git a/mx-rust-semantics/main/modules/storage.md b/mx-rust-semantics/main/modules/storage.md
@@ -9,17 +9,17 @@ module MX-RUST-MODULES-STORAGE
     imports private RUST-SHARED-SYNTAX
 
     rule
-        normalizedMethodCall
-            ( #token("SingleValueMapper", "Identifier"):Identifier #as Type:Identifier
-            , #token("new", "Identifier"):Identifier
+        normalizedFunctionCall
+            ( #token("SingleValueMapper", "Identifier"):Identifier
+              :: #token("new", "Identifier"):Identifier
             ,   ( ptr(KeyId:Int)
                 , ptr(ResultTypeId:Int)
                 , .PtrList
                 )
             )
         => mxRustNewValue
             ( struct
-                ( Type
+                ( #token("SingleValueMapper", "Identifier"):Identifier
                 , #token("storage_key", "Identifier"):Identifier |-> KeyId
                     #token("result_type", "Identifier"):Identifier |-> ResultTypeId
                 )

diff --git a/mx-rust-semantics/main/preprocessing/configuration.md b/mx-rust-semantics/main/preprocessing/configuration.md
@@ -36,7 +36,7 @@ module MX-RUST-PREPROCESSED-ENDPOINTS-CONFIGURATION
     imports MAP
 
     configuration
-        <mx-rust-endpoint-to-function> .Map </mx-rust-endpoint-to-function>  // String to Identifier
+        <mx-rust-endpoint-to-function> .Map </mx-rust-endpoint-to-function>  // String to PathInExpression
 endmodule
 
 ```
diff --git a/mx-rust-semantics/main/preprocessing/contract.md b/mx-rust-semantics/main/preprocessing/contract.md
@@ -1,9 +1,10 @@
 ```k
 
 module MX-RUST-PREPROCESSING-CONTRACT
-    imports COMMON-K-CELL
-    imports MX-RUST-REPRESENTATION
-    imports RUST-PREPROCESSING-CONFIGURATION
+    imports private COMMON-K-CELL
+    imports private MX-RUST-REPRESENTATION
+    imports private RUST-CONVERSIONS-SYNTAX
+    imports private RUST-PREPROCESSING-CONFIGURATION
 
     syntax MxRustInstruction  ::= rustMxAddContractSend(TypePath)
                                 | rustMxAddContractCallValue(TypePath)
@@ -13,6 +14,10 @@ module MX-RUST-PREPROCESSING-CONTRACT
                                     , method: Identifier
                                     , struct: Identifier
                                     )
+                                | rustMxAddContractGenericMethod
+                                    ( method: PathInExpression
+                                    , struct: Identifier
+                                    )
 
     rule rustMxAddContractMethods(Trait:TypePath)
         => rustMxAddContractSend(Trait:TypePath)
@@ -40,33 +45,39 @@ module MX-RUST-PREPROCESSING-CONTRACT
             , struct: #token("MxRust#Blockchain", "Identifier")
             )
 
+    rule rustMxAddContractGenericMethod
+            (... trait: Trait:TypePath
+            , method: Method:Identifier
+            , struct: Identifier
+            )
+        => rustMxAddContractGenericMethod
+            (... method: typePathToPathInExpression(append(Trait, Method))
+            , struct: Identifier
+            )
+
     rule
         <k>
             rustMxAddContractGenericMethod
-                (... trait: Trait:TypePath
-                , method: Method:Identifier
+                (... method: Method:PathInExpression
                 )
             => error
-                ( "send already exists for trait"
-                , ListItem(Trait)
+                ( "method already exists for trait"
+                , ListItem(Method)
                 )
             ...
         </k>
-        <trait-path> Trait </trait-path>
         <method-name> Method </method-name>
         [priority(50)]
 
     rule
         <k>
             rustMxAddContractGenericMethod
-                (... trait: Trait:TypePath
-                , method: Method:Identifier
+                (... method: Method:PathInExpression
                 , struct: Struct:Identifier
                 )
             => .K
             ...
         </k>
-        <trait-path> Trait </trait-path>
         ( .Bag
             =>  <method>
                     <method-name> Method </method-name>