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

Axiom warning refactoring #3662

Merged

Conversation

keyboardDrummer
Copy link
Member

@keyboardDrummer keyboardDrummer commented Mar 2, 2023

Refactoring part of #3553

No code has been changed, only moved.

By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.

@keyboardDrummer keyboardDrummer enabled auto-merge (squash) March 2, 2023 10:37
// LHS failed to resolve. Abort trying to resolve assign or return stmt
return;
} else {
throw new InvalidOperationException("Internal error: unexpected option in ResolveAssignOrReturnStmt");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update error message: ResolveAssignOrReturnStmt doesn't exist anymore, I think.

stefan-aws
stefan-aws previously approved these changes Mar 2, 2023
Copy link
Collaborator

@stefan-aws stefan-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A (potentially incomplete) summary of the changes:

  • Moves Method from MemberDecl.cs to Method.cs
  • Moves ConcreteUpdateStatement from Statement.cs to ConcreteUpdateStatement.cs
  • Moves UpdateStmt from Statement.cs to UpdateStmt.cs
  • Moves ResolveUpdateStmt from NameResolutionAndTypeInference.cs to Resolve in UpdateStmt.cs
  • Moves IteratorDecl from TopLevelDeclarations.cs to IteratorDecl in IteratorDecl.cs
  • In Resolver.cs refactors code as call to new functions FillInPostConditionsAndBodiesOfPrefixLemmas in Resolver.cs and Resolve in IteratorDecl.cs
  • Moves CreateIteratorMethodSpecs from Resolver.cs to IteratorDecl.cs
  • Sort of moves ResolveNestedMatchStmt from Resolver.cs to NestedMatchStmt.cs
  • Move ResolveAssignOrReturnStmt from Resolver.cs to Resolve in AssignOrReturnStmt.cs
  • Moves ResolveMethod from NameResolutionAndTypeInference.cs to Resolve in Method.cs
  • Moves ResolveFunction from NameResolutionAndTypeInference.cs to Resolve in Function.cs
  • Moves ResolveAssignSuchThatStmt in NameResolutionAndTypeInference.cs to Resolve in AssignSuchThatStmt.cs
  • Moves ConcreteUpdateStatement in Statement.cs toConcreteUpdateStatement.cs
  • Moves UpdateStmt in Statement.cs to UpdateStmt.cs
  • Moves Resolver from Resolver.cs to Resolve in IteratorDecl.cs

@keyboardDrummer keyboardDrummer merged commit 11a4da0 into dafny-lang:master Mar 2, 2023
@keyboardDrummer keyboardDrummer deleted the axiomWarningRefactoring branch March 2, 2023 16:32
atomb pushed a commit to atomb/dafny that referenced this pull request Mar 2, 2023
Refactoring part of dafny-lang#3553

No code has been changed, only moved.

<small>By submitting this pull request, I confirm that my contribution
is made under the terms of the [MIT
license](https://github.com/dafny-lang/dafny/blob/master/LICENSE.txt).</small>
robin-aws added a commit that referenced this pull request Mar 8, 2023
Updating `master` to pick up all `main-4.0`-specific changes (mostly
switching default option values)

The only two merge conflicts were:

1. `SinglePassCompiler.cs` - non-conflict between #3546 and #3647
touching adjacent lines.
2. `lit.sit.cfg` - slight conflict between #3662 improving the search
for Z3 and 4.0 making it only search for 4.12.1.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants