use #log to log events rather than a cell

Pi-Squared-Inc · Sep 11, 2024 · ac95dc6 · ac95dc6
1 parent eea9f8c
commit ac95dc6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/solidity.md b/src/solidity.md
@@ -76,7 +76,6 @@ module SOLIDITY-CONFIGURATION
             <contract-storage> .Map </contract-storage>
           </live-contract>
         </live-contracts>
-        <events> .List </events>
         <next-address> 2p160 </next-address>
       </exec>
     </solidity>

diff --git a/src/statement.md b/src/statement.md
@@ -5,6 +5,8 @@
 module SOLIDITY-STATEMENT
   imports SOLIDITY-CONFIGURATION
   imports private SOLIDITY-EXPRESSION
+  imports private STRING-BUFFER
+  imports private K-IO
 
   // expression statement
   rule _:TypedVal ; => .K
@@ -52,10 +54,18 @@ module SOLIDITY-STATEMENT
        <store> S => S [ !I <- default(T) ] </store>
 
   // emit statement
-  rule <k> emit X:Id ( ARGS ) ; => .K ...</k>
-       <events>... .List => ListItem(event(X, ARGS)) </events>
+  rule <k> emit X:Id ( ARGS ) ; => #log(Event2String(ARGS, ((.StringBuffer +String Id2String(X)) +String "("))) ...</k>
     requires isKResult(ARGS)
 
+  syntax String ::= Event2String(CallArgumentList, StringBuffer) [function]
+  rule Event2String(.CallArgumentList, SB) => StringBuffer2String(SB +String ")")
+  rule Event2String(v(V:MInt{112}, _), SB) => Event2String(.CallArgumentList, SB +String Int2String(MInt2Unsigned(V)))
+  rule Event2String(v(V:MInt{160}, _), SB) => Event2String(.CallArgumentList, SB +String Int2String(MInt2Unsigned(V)))
+  rule Event2String(v(V:MInt{256}, _), SB) => Event2String(.CallArgumentList, SB +String Int2String(MInt2Unsigned(V)))
+  rule Event2String(v(V:MInt{112}, _), ARGS, SB) => Event2String(ARGS, (SB +String Int2String(MInt2Unsigned(V))) +String ", ") [owise]
+  rule Event2String(v(V:MInt{160}, _), ARGS, SB) => Event2String(ARGS, (SB +String Int2String(MInt2Unsigned(V))) +String ", ") [owise]
+  rule Event2String(v(V:MInt{256}, _), ARGS, SB) => Event2String(ARGS, (SB +String Int2String(MInt2Unsigned(V))) +String ", ") [owise]
+
   // if statement
   rule if ( v(true, bool ) ) S => S
   rule if ( v(false, bool ) ) _ => .K