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.

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

Add top-level commands to Dafny and redesign the CLI UI V2 #2603

Merged
merged 112 commits into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
9bf813a
Commands draft
keyboardDrummer Jul 3, 2022
0343e55
Commands draft
keyboardDrummer Jul 3, 2022
7d1b226
Merge branch 'cliCommands' of github.com:keyboardDrummer/dafny into c…
keyboardDrummer Jul 19, 2022
16dca60
Merge branch 'master' into cliCommands
keyboardDrummer Aug 2, 2022
04d5850
Merge branch 'cliCommands' of github.com:keyboardDrummer/dafny into c…
keyboardDrummer Aug 2, 2022
bce9221
Fixes and added some testcases
keyboardDrummer Aug 2, 2022
d15f5d3
Add new options framework
keyboardDrummer Aug 8, 2022
5f05b01
Mixed parsing of new and old options
keyboardDrummer Aug 8, 2022
d7ed974
Arrays seems to pass now using updated CLI UI
keyboardDrummer Aug 12, 2022
2f977fa
Support %args in LitTests
keyboardDrummer Aug 12, 2022
691162a
Fix Expect.dfy
keyboardDrummer Aug 12, 2022
2feb533
Enable using Boogie options
keyboardDrummer Aug 12, 2022
ad89001
Ran formatter
keyboardDrummer Aug 12, 2022
3827907
Test fixes
keyboardDrummer Aug 12, 2022
d7f45ef
Remove duplicate ShowSnippets code except the help
keyboardDrummer Aug 12, 2022
5db01dc
Enable substitutions to create multiple arguments
keyboardDrummer Aug 12, 2022
9c68228
Fix TargetOption
keyboardDrummer Aug 12, 2022
26d9dab
Reduce duplication for compileTarget
keyboardDrummer Aug 12, 2022
e7258c3
Copy documentation
keyboardDrummer Aug 12, 2022
a2965e4
Merge remote-tracking branch 'origin/master' into cliCommands
keyboardDrummer Aug 15, 2022
1309a28
Merge branch 'master' into cliCommands
keyboardDrummer Aug 15, 2022
7073a47
Fix compilation error:
keyboardDrummer Aug 15, 2022
20fa509
Merge branch 'cliCommands' of github.com:keyboardDrummer/dafny into c…
keyboardDrummer Aug 15, 2022
b148def
Fix bugs and add a test for short name usage
keyboardDrummer Aug 15, 2022
b9ed313
Add another usage of dafny build, and fix bugs
keyboardDrummer Aug 15, 2022
a9e60bd
Fix test
keyboardDrummer Aug 15, 2022
72e4b89
Worked on help
keyboardDrummer Aug 15, 2022
aef1a70
Old help looks good now
keyboardDrummer Aug 15, 2022
187cc37
Improve new style help
keyboardDrummer Aug 15, 2022
76ccfe2
Support dafny --help and dafny --version
keyboardDrummer Aug 15, 2022
22b30d5
Use a stack instead of IEnumerable
keyboardDrummer Aug 15, 2022
5d20703
Ran formatter
keyboardDrummer Aug 15, 2022
84837f2
Update Options.txt
keyboardDrummer Aug 15, 2022
03f5891
Order change
keyboardDrummer Aug 15, 2022
af9c772
Bugfix
keyboardDrummer Aug 15, 2022
0d98c8e
Fix bug and cleanup
keyboardDrummer Aug 15, 2022
5e5f30b
Undo unintended .md changes
keyboardDrummer Aug 16, 2022
a97a929
Change dafny_0 into dafny where || true was added
keyboardDrummer Aug 16, 2022
9df231c
Rename DafnyOptions.Compile to EmitExecutable
keyboardDrummer Aug 16, 2022
b34cfa5
Prep for using System.CommandLine
keyboardDrummer Aug 17, 2022
b1ea1a3
Now using System.CommandLine
keyboardDrummer Aug 17, 2022
6f9694f
AssumptionVariables1 passes
keyboardDrummer Aug 17, 2022
bc02ba0
Fixed some bugs
keyboardDrummer Aug 17, 2022
e4080d9
Fix bug
keyboardDrummer Aug 17, 2022
f460ce6
Ran formatter
keyboardDrummer Aug 17, 2022
c09be17
Merge branch 'master' into systemCommandline
keyboardDrummer Aug 17, 2022
63f4a86
Revert spillTargetCode change
keyboardDrummer Aug 17, 2022
6bfb12c
Fix bugs
keyboardDrummer Aug 17, 2022
7f415d9
Improve new help
keyboardDrummer Aug 17, 2022
4282665
Ran formatter
keyboardDrummer Aug 17, 2022
7d6e6db
Remove comment
keyboardDrummer Aug 17, 2022
b0b8f55
Fix bug
keyboardDrummer Aug 17, 2022
4d54e4e
Help updates
keyboardDrummer Aug 17, 2022
a070524
Update Options.txt
keyboardDrummer Aug 17, 2022
8d684d8
Bugfix
keyboardDrummer Aug 17, 2022
2dcefac
Fix bugs
keyboardDrummer Aug 17, 2022
61529f5
Refactoring
keyboardDrummer Aug 17, 2022
957a304
Help update
keyboardDrummer Aug 18, 2022
62d3e5e
Fix bugs
keyboardDrummer Aug 18, 2022
d72fb0d
Fix bug
keyboardDrummer Aug 18, 2022
807fd04
Merge branch 'master' into systemCommandline
keyboardDrummer Aug 18, 2022
253609e
Merge branch 'master' into systemCommandline
keyboardDrummer Aug 18, 2022
509858b
Rename build command to integrate
keyboardDrummer Aug 18, 2022
9071361
Merge branch 'systemCommandline' of github.com:keyboardDrummer/dafny …
keyboardDrummer Aug 18, 2022
815d1fa
Merge branch 'master' into systemCommandline
keyboardDrummer Aug 18, 2022
1bff784
Ran formatter and fix Options.txt
keyboardDrummer Aug 18, 2022
f29d330
Merge branch 'systemCommandline' of github.com:keyboardDrummer/dafny …
keyboardDrummer Aug 18, 2022
13346bd
Update tests
keyboardDrummer Aug 18, 2022
d8842ef
Add build command
keyboardDrummer Aug 31, 2022
f292544
Add --dev feature, and rprint option:
keyboardDrummer Aug 31, 2022
44c9108
Resolve CompileVerbose todo
keyboardDrummer Aug 31, 2022
c619af3
Fix comp error
keyboardDrummer Aug 31, 2022
95ba9e2
Merge branch 'master' into systemCommandline
keyboardDrummer Aug 31, 2022
70d4399
Add bprint option
keyboardDrummer Aug 31, 2022
ac93de6
Introduce include-runtime option
keyboardDrummer Aug 31, 2022
94b3c98
Rename
keyboardDrummer Sep 16, 2022
a18769e
Update Test/lit.site.cfg
keyboardDrummer Sep 21, 2022
b08d5bf
Review changes
keyboardDrummer Sep 21, 2022
9b57190
Update Options.txt
keyboardDrummer Sep 21, 2022
4f9831c
Merge branch 'systemCommandline' of github.com:keyboardDrummer/dafny …
keyboardDrummer Sep 21, 2022
767a7f9
Merge remote-tracking branch 'origin/master' into systemCommandline
keyboardDrummer Sep 21, 2022
7cb1cf0
Doc improvements
keyboardDrummer Sep 21, 2022
024237f
Update Options.txt
keyboardDrummer Sep 21, 2022
50e2960
Update options.txt
keyboardDrummer Sep 22, 2022
daf7745
Add missing dev options
keyboardDrummer Sep 22, 2022
929f1c5
Merge remote-tracking branch 'origin/master' into systemCommandline
keyboardDrummer Sep 22, 2022
67e5966
Update Options.txt
keyboardDrummer Sep 22, 2022
0ef9db6
Update Options.txt
keyboardDrummer Sep 22, 2022
c950408
Update docs
keyboardDrummer Sep 22, 2022
cf1d948
Update Options.txt
keyboardDrummer Sep 22, 2022
9dd53a5
Doc fixes
keyboardDrummer Sep 22, 2022
a07c813
update docs
keyboardDrummer Sep 22, 2022
63b398d
Update docs
keyboardDrummer Sep 22, 2022
66c9c54
Code review, fix lit.site.cfg, improvement the --boogie option to han…
keyboardDrummer Sep 23, 2022
82a918f
Code review
keyboardDrummer Sep 23, 2022
47b4895
Merge branch 'master' into systemCommandline
keyboardDrummer Sep 23, 2022
fdfc01e
Fix tests
keyboardDrummer Sep 23, 2022
90f35dc
Merge branch 'systemCommandline' of github.com:keyboardDrummer/dafny …
keyboardDrummer Sep 23, 2022
344b41d
Run formatter and fix tests
keyboardDrummer Sep 23, 2022
cc1158d
Let CompileWithArguments pass
keyboardDrummer Sep 23, 2022
7740713
Merge remote-tracking branch 'origin/master' into systemCommandline
keyboardDrummer Sep 28, 2022
3860bba
Merge branch 'master' into systemCommandline
keyboardDrummer Sep 28, 2022
67e5498
Merge branch 'master' into systemCommandline
keyboardDrummer Sep 29, 2022
913e3a1
Rename and ran formatter
keyboardDrummer Sep 29, 2022
2e2b85a
Merge branch 'systemCommandline' of github.com:keyboardDrummer/dafny …
keyboardDrummer Sep 29, 2022
59a85e9
Merge branch 'master' into systemCommandline
keyboardDrummer Sep 29, 2022
e59a3b8
Update Source/DafnyCore/Options/IOptionSpec.cs
keyboardDrummer Sep 30, 2022
5ec8345
Refactoring
keyboardDrummer Sep 30, 2022
579c808
Let old and new help refer to each other
keyboardDrummer Sep 30, 2022
da064bf
Merge branch 'master' into systemCommandline
keyboardDrummer Sep 30, 2022
423db6c
Merge branch 'systemCommandline' of github.com:keyboardDrummer/dafny …
keyboardDrummer Sep 30, 2022
0720494
Merge branch 'master' into systemCommandline
robin-aws Sep 30, 2022
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
2 changes: 1 addition & 1 deletion Source/DafnyCore/DafnyConsolePrinter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public override void ReportBplError(Boogie.IToken tok, string message, bool erro
realigned_tok.val = tok.val;
realigned_tok.filename = tok.filename;
base.ReportBplError(realigned_tok, message, error, tw, category);
if (DafnyOptions.O.ShowSnippets) {
if (ShowSnippetsOption.Instance.Get(DafnyOptions.O)) {
WriteSourceCodeSnippet(tok, tw);
}

Expand Down
5 changes: 4 additions & 1 deletion Source/DafnyCore/DafnyCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@
<DefineConstants>TRACE</DefineConstants>
<TargetFramework>net6.0</TargetFramework>
<PackageLicenseExpression>MIT</PackageLicenseExpression>

<NoWarn>$(NoWarn);NU5104</NoWarn> <!-- Required because System.CommandLine is in beta. -->
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
<PackageReference Include="Boogie.ExecutionEngine" Version="2.15.7" />
Expand Down
Loading