Skip to content

Commit ca16867

Browse files
daejunparkrv-jenkins
authored andcommitted
edsl: fix #abiEventLog (#575)
* edsl: fix #abiEventLog * data: add rule label for #take
1 parent 099c383 commit ca16867

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

data.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@ A cons-list is used for the EVM wordstack.
413413
```k
414414
syntax WordStack ::= #take ( Int , WordStack ) [function, functional]
415415
// ---------------------------------------------------------------------
416-
rule #take(N, WS) => .WordStack requires notBool N >Int 0
417-
rule #take(N, .WordStack) => 0 : #take(N -Int 1, .WordStack) requires N >Int 0
418-
rule #take(N, (W : WS)) => W : #take(N -Int 1, WS) requires N >Int 0
416+
rule [take.base]: #take(N, WS) => .WordStack requires notBool N >Int 0
417+
rule [take.zero-pad]: #take(N, .WordStack) => 0 : #take(N -Int 1, .WordStack) requires N >Int 0
418+
rule [take.recursive]: #take(N, (W : WS)) => W : #take(N -Int 1, WS) requires N >Int 0
419419
420420
syntax WordStack ::= #drop ( Int , WordStack ) [function, functional]
421421
// ---------------------------------------------------------------------

edsl.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ where `1003892871367861763272476045097431689001461395759728643661426852242313133
258258
syntax SubstateLogEntry ::= #abiEventLog ( Int , String , EventArgs ) [function]
259259
// --------------------------------------------------------------------------------
260260
rule #abiEventLog(ACCT_ID, EVENT_NAME, EVENT_ARGS)
261-
=> { ACCT_ID | #getEventTopics(EVENT_NAME, EVENT_ARGS) | #getEventData(EVENT_ARGS) }
261+
=> { ACCT_ID | #getEventTopics(EVENT_NAME, EVENT_ARGS) | #encodeArgs(#getNonIndexedArgs(EVENT_ARGS)) }
262262
263263
syntax List ::= #getEventTopics ( String , EventArgs ) [function]
264264
// -----------------------------------------------------------------
@@ -278,12 +278,11 @@ where `1003892871367861763272476045097431689001461395759728643661426852242313133
278278
rule #getIndexedArgs(_:TypedArg, ES) => #getIndexedArgs(ES)
279279
rule #getIndexedArgs(.EventArgs) => .List
280280
281-
syntax ByteArray ::= #getEventData ( EventArgs ) [function]
282-
// -----------------------------------------------------------
283-
rule #getEventData(#indexed(_), ES) => #getEventData(ES)
284-
rule #getEventData(E:TypedArg, ES) => #enc(E) ++ #getEventData(ES)
285-
rule #getEventData(.EventArgs) => .WordStack
286-
281+
syntax TypedArgs ::= #getNonIndexedArgs ( EventArgs ) [function]
282+
// ----------------------------------------------------------------
283+
rule #getNonIndexedArgs(#indexed(E), ES) => #getNonIndexedArgs(ES)
284+
rule #getNonIndexedArgs(E:TypedArg, ES) => E, #getNonIndexedArgs(ES)
285+
rule #getNonIndexedArgs(.EventArgs) => .TypedArgs
287286
```
288287

289288
### Hashed Location for Storage

0 commit comments

Comments
 (0)