use #log to log events rather than a cell (#29)

* use #log to log events rather than a cell * update tests * update tests
Pi-Squared-Inc · Sep 11, 2024 · 672411a · 672411a
1 parent 53aacb1
commit 672411a
Show file tree

Hide file tree

Showing 18 changed files with 15,209 additions and 15,241 deletions.
diff --git a/Makefile b/Makefile
@@ -76,12 +76,12 @@ test-aave:
 test-regression: ${REGRESSION_TESTS}
 
 $(REGRESSION_TESTS): %.out: %.sol %.txn %.ref $(SEMANTICS_FILE_NAME)-kompiled/timestamp
-	ulimit -s 65536 && bin/krun-sol $*.sol $*.txn > $*.out
+	ulimit -s 65536 && bin/krun-sol $*.sol $*.txn > $*.out 2>&1
 	diff -U3 -w $*.ref $*.out
 
 test-examples: ${EXAMPLE_TESTS}
 
 .SECONDEXPANSION:
 $(EXAMPLE_TESTS): %.out: $$(subst $(TRANSACTIONS_DIR), $(EXAMPLES_DIR), $$(@D)).sol %.txn %.ref $(SEMANTICS_FILE_NAME)-kompiled/timestamp
-	ulimit -s 65536 && bin/krun-sol $< $*.txn > $*.out
+	ulimit -s 65536 && bin/krun-sol $< $*.txn > $*.out 2>&1
 	diff -U3 -w $*.ref $*.out
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

diff --git a/test/regression/arithmetic.ref b/test/regression/arithmetic.ref
@@ -109,9 +109,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/arraystestcontract.ref b/test/regression/arraystestcontract.ref
@@ -121,9 +121,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/block.ref b/test/regression/block.ref
@@ -96,9 +96,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/boolean.ref b/test/regression/boolean.ref
@@ -120,9 +120,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/contract.ref b/test/regression/contract.ref
@@ -365,9 +365,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/emit.ref b/test/regression/emit.ref
@@ -1,3 +1,4 @@
+Approval(1, 0, 2)
 <solidity>
   <k>
     .K
@@ -113,9 +114,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      ListItem ( event (... name: Approval , args: v ( 1p160 , address ) , v ( 0p160 , address ) , v ( 2p160 , address ) , .TypedVals ) )
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/eventtestcontract.ref b/test/regression/eventtestcontract.ref
@@ -241,9 +241,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/for.ref b/test/regression/for.ref
@@ -98,9 +98,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/function.ref b/test/regression/function.ref
@@ -2181,9 +2181,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       11p160
     </next-address>

diff --git a/test/regression/if.ref b/test/regression/if.ref
@@ -97,9 +97,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/increment.ref b/test/regression/increment.ref
@@ -95,9 +95,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>

diff --git a/test/regression/mapstestcontract.ref b/test/regression/mapstestcontract.ref
@@ -147,9 +147,6 @@
         </contract-storage>
       </live-contract>
     </live-contracts>
-    <events>
-      .List
-    </events>
     <next-address>
       3p160
     </next-address>