From 86adf326ced672bb58a2feb2b7510e8e2fb3f421 Mon Sep 17 00:00:00 2001 From: Jan Tusil Date: Tue, 12 Sep 2023 22:02:31 +0200 Subject: [PATCH] fix inconsistent use of the '_:_WS' klabel (#2057) * fix inconsistent use of the '_:_WS' klabel * Set Version: 1.0.287 * use _:_WS * fix the expected output * Revert "fix the expected output" This reverts commit f093e0d304863314a30a427352d3687837372616. * fix the expected output * fix expected output, more * Revert "fix expected output, more" This reverts commit 364dd8db039ad2f984c61e2af9161ea494901a6c. * Revert "fix the expected output" This reverts commit 3693c58ddd8a4a0eb5951aa40b82a68966aa1b57. * Revert "use _:_WS" This reverts commit b12e829bb715bb2521f1b360223124daea654b21. * use `_:__EVM-TYPES_WordStack_Int_WordStack` * Set Version: 1.0.288 * Apply suggestions from code review * Set Version: 1.0.290 --------- Co-authored-by: devops Co-authored-by: Everett Hildenbrandt --- include/kframework/evm-types.md | 4 ++-- kevm-pyk/pyproject.toml | 2 +- kevm-pyk/src/kevm_pyk/kevm.py | 3 +-- package/debian/changelog | 2 +- package/version | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/kframework/evm-types.md b/include/kframework/evm-types.md index 420602111c..ca068107d7 100644 --- a/include/kframework/evm-types.md +++ b/include/kframework/evm-types.md @@ -228,8 +228,8 @@ A cons-list is used for the EVM wordstack. ```k syntax WordStack ::= ".WordStack" [smtlib(_dotWS)] - | Int ":" WordStack [klabel(_:_WS), smtlib(_WS_)] - // -------------------------------------------------------------------- + | Int ":" WordStack [smtlib(_WS_)] + // ----------------------------------------------------- ``` ```k diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index 5ffe49f2a3..585bb25a9c 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kevm-pyk" -version = "1.0.289" +version = "1.0.290" description = "" authors = [ "Runtime Verification, Inc. ", diff --git a/kevm-pyk/src/kevm_pyk/kevm.py b/kevm-pyk/src/kevm_pyk/kevm.py index 8d0dca91fd..7fb51b534d 100644 --- a/kevm-pyk/src/kevm_pyk/kevm.py +++ b/kevm-pyk/src/kevm_pyk/kevm.py @@ -168,7 +168,6 @@ def _kevm_patch_symbol_table(cls, symbol_table: SymbolTable) -> None: '_|->_', '#And', '_andBool_', - '_:__EVM-TYPES_WordStack_Int_WordStack', '#Implies', '_impliesBool_', '_&Int_', @@ -184,7 +183,7 @@ def _kevm_patch_symbol_table(cls, symbol_table: SymbolTable) -> None: '_Set_', 'typedArgs', '_up/Int__EVM-TYPES_Int_Int_Int', - '_:_WS', + '_:__EVM-TYPES_WordStack_Int_WordStack', ] for symb in paren_symbols: if symb in symbol_table: diff --git a/package/debian/changelog b/package/debian/changelog index b1311419e4..ce342af9c9 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,4 +1,4 @@ -kevm (1.0.289) unstable; urgency=medium +kevm (1.0.290) unstable; urgency=medium * Initial Release. diff --git a/package/version b/package/version index c7119f13e9..140bcfc2c1 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -1.0.289 +1.0.290