From 3f199ff2b13508fe4fdcdd885a618a3d462373fd Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Wed, 6 Mar 2024 08:43:13 -0700 Subject: [PATCH] Update dependency: deps/pyk_release (#588) * deps/pyk_release: Set Version v0.1.663 * pykwasm/: sync poetry files v0.1.663 * deps/k_release: sync release file version 6.3.17 * Set Version: 0.1.12 * deps/pyk_release: Set Version v0.1.664 * pykwasm/: sync poetry files v0.1.664 * deps/k_release: sync release file version 6.3.18 * deps/pyk_release: Set Version v0.1.665 * pykwasm/: sync poetry files v0.1.665 * deps/pyk_release: Set Version v0.1.666 * pykwasm/: sync poetry files v0.1.666 * deps/pyk_release: Set Version v0.1.667 * pykwasm/: sync poetry files v0.1.667 * deps/pyk_release: Set Version v0.1.668 * pykwasm/: sync poetry files v0.1.668 * deps/pyk_release: Set Version v0.1.669 * pykwasm/: sync poetry files v0.1.669 * deps/k_release: sync release file version 6.3.20 * deps/pyk_release: Set Version v0.1.670 * pykwasm/: sync poetry files v0.1.670 * deps/k_release: sync release file version 6.3.21 * deps/pyk_release: Set Version v0.1.671 * pykwasm/: sync poetry files v0.1.671 * deps/pyk_release: Set Version v0.1.672 * pykwasm/: sync poetry files v0.1.672 * deps/pyk_release: Set Version v0.1.673 * pykwasm/: sync poetry files v0.1.673 * deps/pyk_release: Set Version v0.1.674 * pykwasm/: sync poetry files v0.1.674 * deps/k_release: sync release file version 6.3.23 * deps/pyk_release: Set Version v0.1.675 * pykwasm/: sync poetry files v0.1.675 * deps/k_release: sync release file version 6.3.24 * deps/pyk_release: Set Version v0.1.676 * pykwasm/: sync poetry files v0.1.676 * deps/k_release: sync release file version 6.3.25 * deps/pyk_release: Set Version v0.1.677 * pykwasm/: sync poetry files v0.1.677 * deps/pyk_release: Set Version v0.1.678 * pykwasm/: sync poetry files v0.1.678 * deps/pyk_release: Set Version v0.1.679 * pykwasm/: sync poetry files v0.1.679 * deps/pyk_release: Set Version v0.1.680 * pykwasm/: sync poetry files v0.1.680 * deps/pyk_release: Set Version v0.1.681 * pykwasm/: sync poetry files v0.1.681 * deps/pyk_release: Set Version v0.1.682 * pykwasm/: sync poetry files v0.1.682 * deps/pyk_release: Set Version v0.1.683 * pykwasm/: sync poetry files v0.1.683 * deps/pyk_release: Set Version v0.1.684 * pykwasm/: sync poetry files v0.1.684 * Fix list klabels --------- Co-authored-by: devops Co-authored-by: Virgil --- data.md | 8 ++++---- deps/k_release | 2 +- deps/pyk_release | 2 +- package/version | 2 +- pykwasm/poetry.lock | 16 ++++++++-------- pykwasm/pyproject.toml | 4 ++-- wasm-text.md | 2 +- wasm.md | 10 +++++----- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data.md b/data.md index c17605255..3803fae38 100644 --- a/data.md +++ b/data.md @@ -53,7 +53,7 @@ The exception is for characters that are explicitly escaped which can represent syntax String ::= #parseWasmString ( WasmStringToken ) [function, total, hook(STRING.token2string)] // ---------------------------------------------------------------------------------------------------------- - syntax DataString ::= List{WasmString, ""} [klabel(listWasmString)] + syntax DataString ::= List{WasmString, ""} [symbol(listWasmString), terminator-symbol(".List{\"listWasmString\"}")] // ------------------------------------------------------------------- ``` @@ -74,7 +74,7 @@ Element Segment is a list of indices. It is used when initializing a WebAssembly table, or used as the parameter of the `br_table` function. ```k - syntax ElemSegment ::= List{Index, ""} [klabel(listIndex)] + syntax ElemSegment ::= List{Index, ""} [symbol(listIndex), terminator-symbol(".List{\"listIndex\"}")] // ---------------------------------------------------------- ``` @@ -104,7 +104,7 @@ WebAssembly has three kinds of [Value types](https://webassembly.github.io/spec/ There are two basic type-constructors: sequencing (`[_]`) and function spaces (`_->_`). ```k - syntax ValTypes ::= List{ValType, ""} [klabel(listValTypes), symbol] + syntax ValTypes ::= List{ValType, ""} [symbol(listValTypes), terminator-symbol(".List{\"listValTypes\"}")] // -------------------------------------------------------------------- ``` @@ -296,7 +296,7 @@ For `Int`, however, a the context is irrelevant and the index always just resolv ### ElemSegment ```k - syntax Ints ::= List{Int, ""} [klabel(listInt), symbol] + syntax Ints ::= List{Int, ""} [symbol(listInt), terminator-symbol(".List{\"listInt\"}")] // ------------------------------------------------------- syntax Int ::= #lenElemSegment (ElemSegment) [function, total] diff --git a/deps/k_release b/deps/k_release index b98d1d3fa..c73b21b80 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.5 +6.3.25 diff --git a/deps/pyk_release b/deps/pyk_release index 105f5e4d4..0a4c8002d 100644 --- a/deps/pyk_release +++ b/deps/pyk_release @@ -1 +1 @@ -v0.1.662 +v0.1.684 diff --git a/package/version b/package/version index 20f49513e..0e24a92ff 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.11 +0.1.12 diff --git a/pykwasm/poetry.lock b/pykwasm/poetry.lock index 531817330..681605851 100644 --- a/pykwasm/poetry.lock +++ b/pykwasm/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "attrs" @@ -871,7 +871,7 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyk" -version = "0.1.662" +version = "0.1.684" description = "" optional = false python-versions = "^3.10" @@ -892,8 +892,8 @@ xdg-base-dirs = "^6.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/pyk.git" -reference = "v0.1.662" -resolved_reference = "975f9d0e8d5ebe28fbda58b56325ef5aee9a075b" +reference = "v0.1.684" +resolved_reference = "b1d0820a110a3f1f33cb8bf0bef1ebd5da5aaf00" [[package]] name = "pyperclip" @@ -995,13 +995,13 @@ testing = ["filelock"] [[package]] name = "rich" -version = "13.7.0" +version = "13.7.1" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.7.0" files = [ - {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"}, - {file = "rich-13.7.0.tar.gz", hash = "sha256:5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa"}, + {file = "rich-13.7.1-py3-none-any.whl", hash = "sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222"}, + {file = "rich-13.7.1.tar.gz", hash = "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"}, ] [package.dependencies] @@ -1134,4 +1134,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "0d21b1f0d12091070072ad5e447253a932a8cb463a466aebabec7ef5fa2d3637" +content-hash = "aa432b2c9d3bf88ce050043a3f18b60a13fa1535f77b03b344a8fc1fc373fa55" diff --git a/pykwasm/pyproject.toml b/pykwasm/pyproject.toml index 1355caf07..c96c2fa67 100644 --- a/pykwasm/pyproject.toml +++ b/pykwasm/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pykwasm" -version = "0.1.11" +version = "0.1.12" description = "" authors = [ "Runtime Verification, Inc. ", @@ -14,7 +14,7 @@ authors = [ python = "^3.10" cytoolz = "^0.12.1" numpy = "^1.24.2" -pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.662" } +pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.684" } py-wasm = {url = "https://github.com/runtimeverification/py-wasm/archive/refs/tags/0.2.0.tar.gz"} [tool.poetry.group.dev.dependencies] diff --git a/wasm-text.md b/wasm-text.md index 4bc30dec2..385a5f440 100644 --- a/wasm-text.md +++ b/wasm-text.md @@ -232,7 +232,7 @@ The following is the text format representation of an import specification. syntax LocalDecl ::= "(" LocalDecl ")" [bracket] | "local" ValTypes | "local" Identifier ValType - syntax LocalDecls ::= List{LocalDecl , ""} [klabel(listLocalDecl)] + syntax LocalDecls ::= List{LocalDecl , ""} [symbol(listLocalDecl), terminator-symbol(".List{\"listLocalDecl\"}")] // ------------------------------------------------------------------------- ``` diff --git a/wasm.md b/wasm.md index 0353bc738..bf809e128 100644 --- a/wasm.md +++ b/wasm.md @@ -59,10 +59,10 @@ The sorts `EmptyStmt` and `EmptyStmts` are administrative so that the empty list syntax Stmt ::= Instr | Defn // ----------------------------- - syntax EmptyStmts ::= List{EmptyStmt , ""} [klabel(listStmt), symbol] - syntax Instrs ::= List{Instr , ""} [klabel(listStmt)] - syntax Defns ::= List{Defn , ""} [klabel(listStmt)] - syntax Stmts ::= List{Stmt , ""} [klabel(listStmt)] + syntax EmptyStmts ::= List{EmptyStmt , ""} [overload(listStmt), terminator-symbol(".List{\"listStmt\"}")] + syntax Instrs ::= List{Instr , ""} [overload(listStmt)] + syntax Defns ::= List{Defn , ""} [overload(listStmt)] + syntax Stmts ::= List{Stmt , ""} [overload(listStmt)] // ------------------------------------------------------------- syntax Instrs ::= EmptyStmts @@ -104,7 +104,7 @@ The sorts `EmptyStmt` and `EmptyStmts` are administrative so that the empty list syntax TypeDecl ::= "(" TypeDecl ")" [bracket] | TypeKeyWord ValTypes | "param" Identifier ValType - syntax TypeDecls ::= List{TypeDecl , ""} [klabel(listTypeDecl)] + syntax TypeDecls ::= List{TypeDecl , ""} [symbol(listTypeDecl), terminator-symbol(".List{\"listTypeDecl\"}")] // ----------------------------------------------------------------- syntax StoreOp ::= "store" [klabel(storeOpStore), symbol]