kevm-pyk/{kevm,__main__}: move srcmap as field of KEVM

Author: ehildenb

kevm-pyk/src/kevm_pyk/__main__.py

@@ -423,14 +423,10 @@ def exec_foundry_show(
     use_directory.mkdir(parents=True, exist_ok=True)
     kcfgs_dir = foundry_out / 'kcfgs'
     srcmap_dir = foundry_out / 'srcmaps'
-    foundry = Foundry(definition_dir, profile=profile, use_directory=use_directory)
     kcfg_file = kcfgs_dir / f'{test}.json'
     contract = test.split('.')[0]
     srcmap_file = srcmap_dir / f'{contract}.json'
-    srcmap: Optional[Dict[int, str]] = None
-    if srcmap_file.exists():
-        with open(srcmap_file, 'r') as sm:
-            srcmap = {int(k): v for k, v in json.loads(sm.read()).items()}
+    foundry = Foundry(definition_dir, profile=profile, use_directory=use_directory, srcmap_file=srcmap_file)
 
     def _node_pretty(_ct: CTerm) -> List[str]:
         k_cell = foundry.pretty_print(get_cell(_ct.config, 'K_CELL')).replace('\n', ' ')

kevm-pyk/src/kevm_pyk/kevm.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import sys
 from pathlib import Path
@@ -25,6 +26,9 @@
 
 
 class KEVM(KProve, KRun):
+
+    srcmap: Optional[Dict[int, str]]
+
     def __init__(
         self,
         definition_dir: Path,
@@ -33,6 +37,7 @@ def __init__(
         profile: bool = False,
         kprove_command: str = 'kprove',
         krun_command: str = 'krun',
+        srcmap_file: Optional[Path] = None,
     ) -> None:
         # I'm going for the simplest version here, we can change later if there is an advantage.
         # https://stackoverflow.com/questions/9575409/calling-parent-class-init-with-multiple-inheritance-whats-the-right-way
@@ -47,6 +52,10 @@ def __init__(
         )
         KRun.__init__(self, definition_dir, use_directory=use_directory, profile=profile, command=krun_command)
         KEVM._patch_symbol_table(self.symbol_table)
+        self.srcmap = None
+        if srcmap_file is not None and srcmap_file.exists():
+            with open(srcmap_file, 'r') as sm:
+                self.srcmap = {int(k): v for k, v in json.loads(sm.read()).items()}
 
     @staticmethod
     def kompile(
@@ -440,9 +449,17 @@ def __init__(
         main_file: Optional[Path] = None,
         use_directory: Optional[Path] = None,
         profile: bool = False,
+        srcmap_file: Optional[Path] = None,
     ) -> None:
         # copied from KEVM class and adapted to inherit KPrint instead
-        KEVM.__init__(self, definition_dir, main_file=main_file, use_directory=use_directory, profile=profile)
+        KEVM.__init__(
+            self,
+            definition_dir,
+            main_file=main_file,
+            use_directory=use_directory,
+            profile=profile,
+            srcmap_file=srcmap_file,
+        )
         Foundry._patch_symbol_table(self.symbol_table)
 
     class Sorts: