diff options
| author |  rustanleino <unknown> | 2011-02-27 00:20:54 +0000 |
|---|---|---|
| committer | rustanleino <unknown> | 2011-02-27 00:20:54 +0000 |
| commit | 7428deb21f108ea296501001bdc8eef92b281a5a (patch) | |
| tree | fdb4e876911c0e60cdca16398377ca5807365d8a /Source | |
| parent | a922ff73e833037aa49e0cdb149be63bba90484d (diff) | |
Dafny: Non-empty Visual-Studio error messages for related split-expr locations.
Dafny: Forbid jumps from ghost code.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Dafny/Resolver.cs | 9 | ||||
| -rw-r--r-- | Source/DafnyDriver/DafnyDriver.cs | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Source/Dafny/Resolver.cs b/Source/Dafny/Resolver.cs index 080930ea..1e27c4db 100644 --- a/Source/Dafny/Resolver.cs +++ b/Source/Dafny/Resolver.cs @@ -1128,9 +1128,14 @@ namespace Microsoft.Dafny { s.TargetStmt = target;
}
}
-
+ if (specContextOnly) {
+ Error(stmt, "break statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
+ }
+
} else if (stmt is ReturnStmt) {
- // nothing to resolve
+ if (specContextOnly) {
+ Error(stmt, "return statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
+ }
} else if (stmt is AssignStmt) {
AssignStmt s = (AssignStmt)stmt;
diff --git a/Source/DafnyDriver/DafnyDriver.cs b/Source/DafnyDriver/DafnyDriver.cs index b3efd7aa..aa0be9dd 100644 --- a/Source/DafnyDriver/DafnyDriver.cs +++ b/Source/DafnyDriver/DafnyDriver.cs @@ -268,7 +268,7 @@ namespace Microsoft.Boogie }
if (tok is Dafny.NestedToken) {
var nt = (Dafny.NestedToken)tok;
- ReportBplError(nt.Inner, "Related location", false);
+ ReportBplError(nt.Inner, "Related location: Related location", false);
}
}
|