Factor out runtime from Tools (#66)

This makes it easier to instantiate `Tools` with an alternative
definition.

---------

Co-authored-by: devops <[email protected]>

Author: tothtamas28

package/version

@@ -1 +1 @@
-0.1.52
+0.1.53

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kriscv"
-version = "0.1.52"
+version = "0.1.53"
 description = "K tooling for the RISC-V architecture"
 authors = [
     "Runtime Verification, Inc. <[email protected]>",

src/kriscv/build.py

@@ -17,4 +17,4 @@
 
 
 def semantics(*, temp_dir: Path | None = None) -> Tools:
-    return Tools(definition_dir=kdist.get('riscv-semantics.llvm'), runtime=runtime, temp_dir=temp_dir)
+    return Tools(definition_dir=kdist.get('riscv-semantics.llvm'), temp_dir=temp_dir)

src/kriscv/tools.py

@@ -17,17 +17,14 @@
 if TYPE_CHECKING:
 
     from pyk.kast.inner import KInner
-    from pyk.kllvm.runtime import Runtime
     from pyk.ktool.kprint import KPrint
 
 
 class Tools:
     __krun: KRun
-    __runtime: Runtime
 
-    def __init__(self, definition_dir: Path, runtime: Runtime, *, temp_dir: Path | None = None) -> None:
+    def __init__(self, definition_dir: Path, *, temp_dir: Path | None = None) -> None:
         self.__krun = KRun(definition_dir, use_directory=temp_dir)
-        self.__runtime = runtime
 
     @property
     def krun(self) -> KRun:
@@ -37,10 +34,6 @@ def krun(self) -> KRun:
     def kprint(self) -> KPrint:
         return self.__krun
 
-    @property
-    def runtime(self) -> Runtime:
-        return self.__runtime
-
     def init_config(self, config_vars: dict[str, KInner]) -> KInner:
         conf = self.krun.definition.init_config(sort=GENERATED_TOP_CELL)
         return Subst(config_vars)(conf)

src/tests/unit/test_unit.py

@@ -11,7 +11,7 @@
 from pyk.kore.match import kore_int
 from pyk.prelude.kint import INT, intToken
 
-from kriscv import term_builder
+from kriscv import build, term_builder
 from kriscv.term_builder import register
 from kriscv.term_manip import kore_sparse_bytes, normalize_memory
 
@@ -30,7 +30,7 @@ def _eval_call(tools: Tools, call: KInner, sort: KSort) -> KInner:
 
 def _eval_call_to_kore(tools: Tools, call: KInner, sort: KSort) -> Pattern:
     llvm_input = pattern_to_llvm(tools.krun.kast_to_kore(call, sort))
-    llvm_res = tools.runtime.evaluate(llvm_input)
+    llvm_res = build.runtime.evaluate(llvm_input)
     return llvm_to_pattern(llvm_res)