Skip to content

fix: Dafny standard libraries .doo building fixes #788

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

Open
wants to merge 6 commits into
base: main-1.x
Choose a base branch
from
Open

fix: Dafny standard libraries .doo building fixes #788

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f70cf2
Makefile fix
robin-aws Feb 19, 2025
3ec02ab
More makefile fixes, fresher dafny branch commit
robin-aws Feb 19, 2025
2ae8391
Fix protocol of dafny submodule
robin-aws Feb 19, 2025
a199acc
Merge branch 'main-1.x' into robin-aws/dafny-stdlibs-doo-makefile-fix
robin-aws Feb 27, 2025
900998a
Address TODO in streams.py
robin-aws Feb 27, 2025
b0672d3
Merge branch 'robin-aws/dafny-stdlibs-doo-makefile-fix' of github.com…
robin-aws Feb 27, 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
4 changes: 2 additions & 2 deletions SmithyDafnyMakefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ transpile_implementation:
$(DAFNY_OTHER_FILES) \
$(TRANSPILE_MODULE_NAME) \
$(if $(strip $(STD_LIBRARY)) , --library:$(PROJECT_ROOT)/$(STD_LIBRARY)/src/Index.dfy, ) \
$(if $(USE_DAFNY_STANDARD_LIBRARIES) , --library:$(PROJECT_ROOT)/$(STD_LIBRARY)/bin/DafnyStandardLibraries-smithy-dafny-subset.doo, ) \
$(if $(USE_DAFNY_STANDARD_LIBRARIES) , $(if $(strip $(STD_LIBRARY)) , --library:$(PROJECT_ROOT)/$(STD_LIBRARY)/bin/DafnyStandardLibraries-smithy-dafny-subset.doo, ), ) \
$(TRANSLATION_RECORD) \
$(TRANSPILE_DEPENDENCIES)

Expand Down Expand Up @@ -248,7 +248,7 @@ transpile_test:
$(DAFNY_OPTIONS) \
$(DAFNY_OTHER_FILES) \
$(if $(strip $(STD_LIBRARY)) , --library:$(PROJECT_ROOT)/$(STD_LIBRARY)/src/Index.dfy, ) \
$(if $(USE_DAFNY_STANDARD_LIBRARIES) , --library:$(PROJECT_ROOT)/$(STD_LIBRARY)/bin/DafnyStandardLibraries-smithy-dafny-subset.doo, ) \
$(if $(USE_DAFNY_STANDARD_LIBRARIES) , $(if $(strip $(STD_LIBRARY)) , --library:$(PROJECT_ROOT)/$(STD_LIBRARY)/bin/DafnyStandardLibraries-smithy-dafny-subset.doo, ), ) \
$(TRANSLATION_RECORD) \
$(SOURCE_TRANSLATION_RECORD) \
$(TRANSPILE_MODULE_NAME) \
Expand Down
2 changes: 1 addition & 1 deletion TestModels/dafny-dependencies/StandardLibrary/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ transpile_implementation:
--unicode-char:false \
--function-syntax:3 \
--output $(OUT) \
$(if $(USE_DAFNY_STANDARD_LIBRARIES), bin/DafnyStandardLibraries-smithy-dafny-subset.doo, ) \
$(if $(USE_DAFNY_STANDARD_LIBRARIES), ./bin/DafnyStandardLibraries-smithy-dafny-subset.doo, ) \
$(DAFNY_OPTIONS) \
$(DAFNY_OTHER_FILES) \
$(TRANSPILE_MODULE_NAME)
Expand Down
2 changes: 1 addition & 1 deletion TestModels/dafny-dependencies/dafny
Open in desktop
Submodule dafny updated 4 files
+3 −0 Source/DafnyStandardLibraries/examples/Actions/ActionsExamples.dfy
+31 −0 Source/DafnyStandardLibraries/examples/TerminationExamples.dfy
+1 −1 Source/DafnyStandardLibraries/src/Std/Frames.dfy
+0 −25 Source/DafnyStandardLibraries/src/Std/Termination.dfy
Loading