-
Notifications
You must be signed in to change notification settings - Fork 52
Fixing issue #849 #857
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
Merged
+115
−5
Merged
Fixing issue #849 #857
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
eb89961
Fixing issue 849 by letting extension expressions declare whether the…
marcoeilers 742d3e9
Adapting name and signature of new function to similar existing ones
marcoeilers cd88640
Merge branch 'master' into meilers_fix_849
marcoeilers cbd4ef4
Also added ForbiddenInTrigger functionality to extension expressions
marcoeilers b4baa4b
Forbid ADT discriminators in triggers and adapt test
marcoeilers 79a6f69
Gave new utility method a proper signature
marcoeilers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // Any copyright is dedicated to the Public Domain. | ||
| // http://creativecommons.org/publicdomain/zero/1.0/ | ||
|
|
||
|
|
||
| adt Term { | ||
| Const(n: Int) | ||
| } | ||
|
|
||
| domain theory { | ||
| function foo(t: Term): Bool | ||
|
|
||
| axiom ax1 { forall n: Int :: | ||
| {Const(n)} // Type checker error | ||
| {foo(Const(n))} // OK | ||
| foo(Const(n)) | ||
| } | ||
| } | ||
|
|
||
| method testConstr(s: Set[Int], j: Int) { | ||
| assume j in s | ||
| assume forall i: Int :: {Const(i)} i in s ==> i > 0 | ||
| var t: Term := Const(j) | ||
| assert j > 0 | ||
| } | ||
|
|
||
| method testConstrF(s: Set[Int], j: Int) { | ||
| assume j in s | ||
| assume forall i: Int :: {Const(i)} i in s ==> i > 0 | ||
| //:: ExpectedOutput(assert.failed:assertion.false) | ||
| assert j > 0 | ||
| } | ||
|
|
||
| method testDestr(s: Set[Term], c: Term) { | ||
| assume c in s | ||
| assume forall i: Term :: {i.n} i in s ==> foo(i) | ||
| var t: Int := c.n | ||
| assert foo(c) | ||
| } | ||
|
|
||
| method testDestr2(s: Set[Term], c: Term) { | ||
| assume c in s | ||
| assume forall i: Term :: {i.n} i in s ==> foo(i) | ||
| //:: ExpectedOutput(assert.failed:assertion.false) | ||
| assert foo(c) | ||
| } | ||
|
|
||
| method testDiscr(s: Set[Term], c: Term) { | ||
| assume c in s | ||
| // i.isConst must not be picked as a trigger, otherwise the backends may crash | ||
| assume forall i: Term :: i.isConst ==> foo(i) | ||
| var t: Bool := c.isConst | ||
| assert foo(c) | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| // Any copyright is dedicated to the Public Domain. | ||
| // http://creativecommons.org/publicdomain/zero/1.0/ | ||
|
|
||
|
|
||
| adt Term { | ||
| Const(n: Int) | ||
| } | ||
|
|
||
| domain theory { | ||
| function foo(t: Term): Bool | ||
|
|
||
| axiom ax1 { forall n: Int :: | ||
| {Const(n)} // Type checker error | ||
| {foo(Const(n))} // OK | ||
| foo(Const(n)) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| method testDiscr(s: Set[Term], c: Term) { | ||
| assume c in s | ||
| //:: ExpectedOutput(typechecker.error) | ||
| assume forall i: Term :: {i.isConst} i in s ==> foo(i) | ||
| assert foo(c) | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.