Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update smir_pretty submodule to latest master #434

Merged
merged 5 commits into from
Jan 23, 2025
Merged

update smir_pretty submodule to latest master #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3706f98
update smir_pretty submodule to latest master
jberthold Jan 16, 2025
930822d
Set Version: 0.3.61
Jan 16, 2025
4daf2a3
fix Makefile script for parse tests
jberthold Jan 16, 2025
731a636
Upgrade smir_pretty submodule to include the to_string workaround
jberthold Jan 22, 2025
37f846e
fix up smir-parse-tests script in Makefile for CI usage
jberthold Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@ smir-parse-tests: build smir-pretty
dir=$$(dirname $${source}); \
target=$${dir}/$$(basename $${source%.rs}).smir.json; \
${SMIR} -Z no-codegen --out-dir $${dir} $$source \
&& (echo -n "smir-ed "; \
${POETRY_RUN} convert-from-definition $${target} Pgm > /dev/null \
&& (echo "and parsed!"; rm $${target}) || report "$$source" "PARSE ERROR!") \
|| report "$$source" "SMIR ERROR!" ; \
done; \
&& echo -n "smir-ed " \
|| report "$$source" "SMIR ERROR!"; \
if [ -s $${target} ]; then \
${POETRY_RUN} convert-from-definition $$(realpath $${target}) Pgm > /dev/null \
&& (echo "and parsed!"; rm $${target}) \
|| report "$$source" "PARSE ERROR!"; \
fi; \
done; \
[ -z "$$errors" ] || (echo "FAILING TESTS:"; printf ". %s\n" $${errors}; exit 1); \
2 changes: 1 addition & 1 deletion deps/smir_pretty
Open in desktop
Submodule smir_pretty updated 84 files
+60 −0 .github/workflows/test.yml
+2 −2 Cargo.lock
+48 −5 Makefile
+0 −3 panic_example.rs
+1 −0 panic_example.rs
+0 −1 panic_example.smir.json
+1 −0 panic_example.smir.json
+1 −1 run.sh
+3 −9 src/driver.rs
+0 −23 src/kani_lib/LICENSE-MIT
+0 −593 src/kani_lib/kani_collector.rs
+0 −7 src/kani_lib/mod.rs
+0 −1 src/lib.rs
+0 −1 src/main.rs
+239 −56 src/printer.rs
+5 −0 tests/integration/failing/array.rs
+2,262 −0 tests/integration/failing/array.smir.json.expected
+9 −0 tests/integration/failing/box.rs
+14,446 −0 tests/integration/failing/box.smir.json.expected
+19 −0 tests/integration/failing/defined-trait.rs
+0 −0 tests/integration/failing/defined-trait.smir.json.expected
+19 −0 tests/integration/failing/derive-copy-struct.rs
+2,454 −0 tests/integration/failing/derive-copy-struct.smir.json.expected
+14 −0 tests/integration/failing/generic.rs
+3,499 −0 tests/integration/failing/generic.smir.json.expected
+3 −0 tests/integration/failing/panic_example.rs
+1,452 −0 tests/integration/failing/panic_example.smir.json.expected
+4 −0 tests/integration/failing/std-string-empty.rs
+5,984 −0 tests/integration/failing/std-string-empty.smir.json.expected
+4 −0 tests/integration/failing/std-to-string.rs
+0 −0 tests/integration/failing/std-to-string.smir.json.expected
+5 −0 tests/integration/failing/str-empty.rs
+2,402 −0 tests/integration/failing/str-empty.smir.json.expected
+5 −0 tests/integration/failing/str-trivial.rs
+2,409 −0 tests/integration/failing/str-trivial.smir.json.expected
+23 −0 tests/integration/normalise-filter.jq
+6 −0 tests/integration/programs/assert_eq.rs
+2,045 −0 tests/integration/programs/assert_eq.smir.json.expected
+74 −0 tests/integration/programs/binop.rs
+9,651 −0 tests/integration/programs/binop.smir.json.expected
+5 −0 tests/integration/programs/char-trivial.rs
+1,575 −0 tests/integration/programs/char-trivial.smir.json.expected
+5 −0 tests/integration/programs/closure-args.rs
+1,868 −0 tests/integration/programs/closure-args.smir.json.expected
+5 −0 tests/integration/programs/closure-no-args.rs
+1,688 −0 tests/integration/programs/closure-no-args.smir.json.expected
+12 −0 tests/integration/programs/const-arithm-simple.rs
+1,831 −0 tests/integration/programs/const-arithm-simple.smir.json.expected
+3 −0 tests/integration/programs/div.rs
+1,942 −0 tests/integration/programs/div.smir.json.expected
+7 −0 tests/integration/programs/double-ref-deref.rs
+1,693 −0 tests/integration/programs/double-ref-deref.smir.json.expected
+10 −0 tests/integration/programs/enum.rs
+1,397 −0 tests/integration/programs/enum.smir.json.expected
+13 −0 tests/integration/programs/fibonacci.rs
+2,249 −0 tests/integration/programs/fibonacci.smir.json.expected
+11 −0 tests/integration/programs/float.rs
+2,145 −0 tests/integration/programs/float.smir.json.expected
+3 −0 tests/integration/programs/modulo.rs
+1,940 −0 tests/integration/programs/modulo.smir.json.expected
+21 −0 tests/integration/programs/mutual_recursion.rs
+2,202 −0 tests/integration/programs/mutual_recursion.smir.json.expected
+6 −0 tests/integration/programs/option-construction.rs
+1,733 −0 tests/integration/programs/option-construction.smir.json.expected
+5 −0 tests/integration/programs/primitive-type-bounds.rs
+1,805 −0 tests/integration/programs/primitive-type-bounds.smir.json.expected
+12 −0 tests/integration/programs/recursion-simple-match.rs
+2,009 −0 tests/integration/programs/recursion-simple-match.smir.json.expected
+13 −0 tests/integration/programs/recursion-simple.rs
+2,009 −0 tests/integration/programs/recursion-simple.smir.json.expected
+7 −0 tests/integration/programs/ref-deref.rs
+1,639 −0 tests/integration/programs/ref-deref.smir.json.expected
+7 −0 tests/integration/programs/shl_min.rs
+3,419 −0 tests/integration/programs/shl_min.smir.json.expected
+7 −0 tests/integration/programs/slice.rs
+4,509 −0 tests/integration/programs/slice.smir.json.expected
+7 −0 tests/integration/programs/strange-ref-deref.rs
+1,696 −0 tests/integration/programs/strange-ref-deref.smir.json.expected
+10 −0 tests/integration/programs/struct.rs
+1,841 −0 tests/integration/programs/struct.smir.json.expected
+23 −0 tests/integration/programs/sum-to-n.rs
+2,438 −0 tests/integration/programs/sum-to-n.smir.json.expected
+5 −0 tests/integration/programs/tuple-eq.rs
+2,514 −0 tests/integration/programs/tuple-eq.smir.json.expected
+5 −0 tests/integration/programs/tuples-simple.rs
+1,687 −0 tests/integration/programs/tuples-simple.smir.json.expected
2 changes: 1 addition & 1 deletion kmir/pyproject.toml
View file
Open in desktop
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 = "kmir"
version = "0.3.60"
version = "0.3.61"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion kmir/src/kmir/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from typing import Final

VERSION: Final = '0.3.60'
VERSION: Final = '0.3.61'
2 changes: 1 addition & 1 deletion package/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.60
0.3.61
Loading