Update dependency: deps/pyk_release (#2361)

* deps/pyk_release: Set Version v0.1.719 * Set Version: 1.0.501 * kevm-pyk/: sync poetry files pyk version v0.1.719 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.720 * kevm-pyk/: sync poetry files pyk version v0.1.720 * flake.{nix,lock}: update Nix derivations * kevm-pyk: remove --output-definition and --definition * __main__.py: rename output_dir to definition_dir in exec_kompile_spec * deps/pyk_release: Set Version v0.1.722 * kevm-pyk/: sync poetry files pyk version v0.1.722 * deps/k_release: sync release file version 6.3.45 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.723 * Set Version: 1.0.502 * kevm-pyk/: sync poetry files pyk version v0.1.723 * flake.{nix,lock}: update Nix derivations * Set Version: 1.0.503 * utils.py: replace production_for_klabel with symbols * deps/pyk_release: Set Version v0.1.724 * kevm-pyk/: sync poetry files pyk version v0.1.724 * deps/k_release: sync release file version 6.3.47 * flake.{nix,lock}: update Nix derivations * Set Version: 1.0.501 * cli.py: add back --definition * Set Version: 1.0.503 * deps/pyk_release: Set Version v0.1.725 * kevm-pyk/: sync poetry files pyk version v0.1.725 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.726 * kevm-pyk/: sync poetry files pyk version v0.1.726 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.727 * kevm-pyk/: sync poetry files pyk version v0.1.727 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.728 * kevm-pyk/: sync poetry files pyk version v0.1.728 * deps/k_release: sync release file version 6.3.50 * flake.{nix,lock}: update Nix derivations * Set Version: 1.0.504 * kevm-pyk/: sync poetry files pyk version v0.1.728 * deps/pyk_release: Set Version v0.1.729 * kevm-pyk/: sync poetry files pyk version v0.1.729 * deps/k_release: sync release file version 6.3.52 * flake.{nix,lock}: update Nix derivations * cli.py: move --definition in kprove args * Set Version: 1.0.505 * kevm-pyk/: sync poetry files pyk version v0.1.729 * __main__.py: remove --output-definition * deps/pyk_release: Set Version v0.1.730 * kevm-pyk/: sync poetry files pyk version v0.1.730 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.731 * kevm-pyk/: sync poetry files pyk version v0.1.731 * deps/k_release: sync release file version 6.3.58 * flake.{nix,lock}: update Nix derivations * Fix output_dir being changed to definition_dir * Set Version: 1.0.506 --------- Co-authored-by: devops <[email protected]> Co-authored-by: Andrei <[email protected]> Co-authored-by: Petar Maksimović <[email protected]> Co-authored-by: Noah Watson <[email protected]> Co-authored-by: Noah Watson <[email protected]>
runtimeverification · Mar 22, 2024 · 92bdb3d · 92bdb3d
1 parent 3ec7a25
commit 92bdb3d
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 40 deletions.
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-6.3.43
+6.3.58
diff --git a/deps/pyk_release b/deps/pyk_release
@@ -1 +1 @@
-v0.1.718
+v0.1.731
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,11 +2,11 @@
   description = "A flake for the KEVM Semantics";
 
   inputs = {
-    k-framework.url = "github:runtimeverification/k/v6.3.43";
+    k-framework.url = "github:runtimeverification/k/v6.3.58";
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.follows = "k-framework/rv-utils";
-    pyk.url = "github:runtimeverification/pyk/v0.1.718";
+    pyk.url = "github:runtimeverification/pyk/v0.1.731";
     nixpkgs-pyk.follows = "pyk/nixpkgs";
     poetry2nix.follows = "pyk/poetry2nix";
     blockchain-k-plugin = {

diff --git a/kevm-pyk/poetry.lock b/kevm-pyk/poetry.lock
diff --git 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.505"
+version = "1.0.506"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",
@@ -13,7 +13,7 @@ authors = [
 [tool.poetry.dependencies]
 python = "^3.10"
 pathos = "*"
-pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.718" }
+pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.731" }
 tomlkit = "^0.11.6"
 
 [tool.poetry.group.dev.dependencies]

diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py
@@ -6,4 +6,4 @@
     from typing import Final
 
 
-VERSION: Final = '1.0.505'
+VERSION: Final = '1.0.506'
diff --git a/kevm-pyk/src/kevm_pyk/__main__.py b/kevm-pyk/src/kevm_pyk/__main__.py
@@ -149,14 +149,12 @@ def exec_version(options: VersionOptions) -> None:
 class KompileSpecOptions(LoggingOptions, KOptions, KompileOptions):
     main_file: Path
     target: KompileTarget
-    output_dir: Path | None
     debug_build: bool
 
     @staticmethod
     def default() -> dict[str, Any]:
         return {
             'target': KompileTarget.HASKELL,
-            'output_dir': None,
             'debug_build': False,
         }
 
@@ -165,7 +163,7 @@ def exec_kompile_spec(options: KompileSpecOptions) -> None:
     if options.target not in [KompileTarget.HASKELL, KompileTarget.MAUDE]:
         raise ValueError(f'Can only call kevm kompile-spec with --target [haskell,maude], got: {options.target.value}')
 
-    output_dir = options.output_dir or Path()
+    definition_dir = options.definition_dir or Path()
 
     optimization = 0
     if options.o1:
@@ -179,7 +177,7 @@ def exec_kompile_spec(options: KompileSpecOptions) -> None:
 
     kevm_kompile(
         options.target,
-        output_dir=output_dir,
+        output_dir=definition_dir,
         main_file=options.main_file,
         main_module=options.main_module,
         syntax_module=options.syntax_module,
@@ -820,9 +818,7 @@ def parse(s: str) -> list[T]:
     )
     kevm_kompile_spec_args.add_argument('main_file', type=file_path, help='Path to file with main module.')
     kevm_kompile_spec_args.add_argument('--target', type=KompileTarget, help='[haskell|maude]')
-    kevm_kompile_spec_args.add_argument(
-        '-o', '--output-definition', type=Path, dest='output_dir', help='Path to write kompiled definition to.'
-    )
+
     kevm_kompile_spec_args.add_argument(
         '--debug-build', dest='debug_build', default=None, help='Enable debug symbols in LLVM builds.'
     )

diff --git a/kevm-pyk/src/kevm_pyk/cli.py b/kevm-pyk/src/kevm_pyk/cli.py
@@ -215,13 +215,13 @@ def target_args(self) -> ArgumentParser:
     @cached_property
     def k_args(self) -> ArgumentParser:
         args = super().definition_args
-        args.add_argument('--definition', type=dir_path, dest='definition_dir', help='Path to definition to use.')
         args.add_argument('--depth', default=None, type=int, help='Maximum depth to execute to.')
         return args
 
     @cached_property
     def kprove_args(self) -> ArgumentParser:
         args = ArgumentParser(add_help=False)
+        args.add_argument('--definition', type=dir_path, dest='definition_dir', help='Path to definition to use.')
         args.add_argument(
             '--debug-equations',
             type=list_of(str, delim=','),
@@ -253,6 +253,7 @@ def kprove_args(self) -> ArgumentParser:
     @cached_property
     def kprove_legacy_args(self) -> ArgumentParser:
         args = ArgumentParser(add_help=False)
+        args.add_argument('--definition', type=dir_path, dest='definition_dir', help='Path to definition to use.')
         args.add_argument(
             '--bug-report',
             default=False,

diff --git a/kevm-pyk/src/kevm_pyk/utils.py b/kevm-pyk/src/kevm_pyk/utils.py
@@ -231,7 +231,7 @@ def byte_offset_to_lines(lines: Iterable[str], byte_start: int, byte_width: int)
 def KDefinition__expand_macros(defn: KDefinition, term: KInner) -> KInner:  # noqa: N802
     def _expand_macros(_term: KInner) -> KInner:
         if type(_term) is KApply:
-            prod = defn.production_for_klabel(_term.label)
+            prod = defn.symbols[_term.label.name]
             if any(key in prod.att for key in [Atts.MACRO, Atts.ALIAS, Atts.MACRO_REC, Atts.ALIAS_REC]):
                 for r in defn.macro_rules:
                     assert type(r.body) is KRewrite

diff --git a/package/version b/package/version
@@ -1 +1 @@
-1.0.505
+1.0.506
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@
		from typing import Final


		VERSION: Final = '1.0.505'
		VERSION: Final = '1.0.506'