Skip to content

Commit

Permalink
Move K files into a separate directory (#608)
Browse files Browse the repository at this point in the history
* Move K files into a separate directory

THis provides a namespace when requiring files from a K definition.

* Set Version: 0.1.29

---------

Co-authored-by: devops <[email protected]>
  • Loading branch information
tothtamas28 and devops authored Apr 12, 2024
1 parent 4ae887f commit 0ea9fed
Show file tree
Hide file tree
Showing 18 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ CHECK := git --no-pager diff --no-index --ignore-all-space -R
TEST_CONCRETE_BACKEND := llvm
TEST_SYMBOLIC_BACKEND := haskell

SOURCE_DIR := pykwasm/src/pykwasm/kdist

test: test-execution test-prove

# Generic Test Harnesses
Expand All @@ -56,6 +54,8 @@ tests/%.parse: tests/%
$(TEST) kast --backend $(TEST_CONCRETE_BACKEND) $< kast > $@-out
rm -rf $@-out

SOURCE_DIR := pykwasm/src/pykwasm/kdist/wasm-semantics

tests/%.prove: tests/%
$(TEST) prove --backend $(TEST_SYMBOLIC_BACKEND) $< kwasm-lemmas -I $(SOURCE_DIR)

Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.28
0.1.29
2 changes: 1 addition & 1 deletion pykwasm/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pykwasm"
version = "0.1.28"
version = "0.1.29"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
7 changes: 4 additions & 3 deletions pykwasm/src/pykwasm/kdist/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@


SOURCE_DIR: Final = Path(__file__).parent
K_DIR: Final = SOURCE_DIR / 'wasm-semantics'


class KompileTarget(Target):
Expand All @@ -39,7 +40,7 @@ def context(self) -> dict[str, str]:
'llvm': KompileTarget(
{
'backend': KompileBackend.LLVM,
'main_file': SOURCE_DIR / 'test.md',
'main_file': K_DIR / 'test.md',
'main_module': 'WASM-TEST',
'syntax_module': 'WASM-TEST-SYNTAX',
'md_selector': 'k',
Expand All @@ -51,7 +52,7 @@ def context(self) -> dict[str, str]:
'kwasm-lemmas': KompileTarget(
{
'backend': KompileBackend.HASKELL,
'main_file': SOURCE_DIR / 'kwasm-lemmas.md',
'main_file': K_DIR / 'kwasm-lemmas.md',
'main_module': 'KWASM-LEMMAS',
'syntax_module': 'WASM-TEXT-SYNTAX',
'md_selector': 'k',
Expand All @@ -61,7 +62,7 @@ def context(self) -> dict[str, str]:
'wrc20': KompileTarget(
{
'backend': KompileBackend.HASKELL,
'main_file': SOURCE_DIR / 'wrc20.md',
'main_file': K_DIR / 'wrc20.md',
'main_module': 'WRC20-LEMMAS',
'syntax_module': 'WASM-TEXT-SYNTAX',
'md_selector': 'k',
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 0ea9fed

Please sign in to comment.