Remove HASKELL_STANDALONE and FOUNDRY from KompileTarget (#2121)

* Remove `HASKELL_STANDALONE` and `FOUNDRY` from `KompileTarget` * Set Version: 1.0.318 * Set Version: 1.0.319 --------- Co-authored-by: devops <[email protected]>
runtimeverification · Oct 20, 2023 · 0717dac · 0717dac
1 parent 95f02e0
commit 0717dac
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
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.318"
+version = "1.0.319"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",

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.318'
+VERSION: Final = '1.0.319'
diff --git a/kevm-pyk/src/kevm_pyk/__main__.py b/kevm-pyk/src/kevm_pyk/__main__.py
@@ -607,7 +607,7 @@ def parse(s: str) -> list[T]:
         parents=[kevm_cli_args.logging_args, kevm_cli_args.k_args, kevm_cli_args.kompile_args],
     )
     kevm_kompile_args.add_argument('main_file', type=file_path, help='Path to file with main module.')
-    kevm_kompile_args.add_argument('--target', type=KompileTarget, help='[llvm|haskell|haskell-standalone|foundry]')
+    kevm_kompile_args.add_argument('--target', type=KompileTarget, help='[llvm|haskell|haskell-booster]')
     kevm_kompile_args.add_argument(
         '-o', '--output-definition', type=Path, dest='output_dir', help='Path to write kompiled definition to.'
     )

diff --git a/kevm-pyk/src/kevm_pyk/kdist/plugin.py b/kevm-pyk/src/kevm_pyk/kdist/plugin.py
@@ -90,15 +90,15 @@ def _build_env(self) -> Iterator[Path]:
     ),
     'haskell-standalone': KEVMTarget(
         {
-            'target': KompileTarget.HASKELL_STANDALONE,
+            'target': KompileTarget.HASKELL,
             'main_file': config.EVM_SEMANTICS_DIR / 'driver.md',
             'main_module': 'ETHEREUM-SIMULATION',
             'syntax_module': 'ETHEREUM-SIMULATION',
         },
     ),
     'foundry': KEVMTarget(
         {
-            'target': KompileTarget.FOUNDRY,
+            'target': KompileTarget.HASKELL,
             'main_file': config.EVM_SEMANTICS_DIR / 'foundry.md',
             'main_module': 'FOUNDRY',
             'syntax_module': 'FOUNDRY',

diff --git a/kevm-pyk/src/kevm_pyk/kompile.py b/kevm-pyk/src/kevm_pyk/kompile.py
@@ -29,15 +29,13 @@ class KompileTarget(Enum):
     LLVM = 'llvm'
     HASKELL = 'haskell'
     HASKELL_BOOSTER = 'haskell-booster'
-    HASKELL_STANDALONE = 'haskell-standalone'
-    FOUNDRY = 'foundry'
 
     @property
     def md_selector(self) -> str:
         match self:
             case self.LLVM:
                 return 'k & ! symbolic'
-            case self.HASKELL | self.HASKELL_STANDALONE | self.HASKELL_BOOSTER | self.FOUNDRY:
+            case self.HASKELL | self.HASKELL_BOOSTER:
                 return 'k & ! concrete'
             case _:
                 raise AssertionError()
@@ -96,7 +94,7 @@ def kevm_kompile(
                 )
                 return kompile(output_dir=output_dir, debug=debug, verbose=verbose)
 
-            case KompileTarget.HASKELL | KompileTarget.FOUNDRY | KompileTarget.HASKELL_STANDALONE:
+            case KompileTarget.HASKELL:
                 kompile = HaskellKompile(
                     base_args=base_args,
                     haskell_binary=haskell_binary,

diff --git a/package/version b/package/version
@@ -1 +1 @@
-1.0.318
+1.0.319