summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorGravatar wuestholz <unknown>2013-06-19 16:51:41 -0700
committerGravatar wuestholz <unknown>2013-06-19 16:51:41 -0700
commitf41945b8fa8148f03c198fc898995d86e4b6ebfb (patch)
tree9b111a02022d969e35d476cb40783da0de765977 /Source
parent44e391001eda86f42f5b0c6382a386e5dcf3c770 (diff)
Did some refactoring of the error reporting functionality.
Diffstat (limited to 'Source')
-rw-r--r--Source/DafnyDriver/DafnyDriver.cs6
-rw-r--r--Source/DafnyExtension/DafnyDriver.cs4
-rw-r--r--Source/DafnyExtension/ProgressMargin.cs1
3 files changed, 6 insertions, 5 deletions
diff --git a/Source/DafnyDriver/DafnyDriver.cs b/Source/DafnyDriver/DafnyDriver.cs
index dfcbe3bc..22153b3b 100644
--- a/Source/DafnyDriver/DafnyDriver.cs
+++ b/Source/DafnyDriver/DafnyDriver.cs
@@ -202,14 +202,14 @@ namespace Microsoft.Dafny
class DafnyConsolePrinter : ConsolePrinter
{
- public override void ReportBplError(IToken tok, string message, bool error, bool showBplLocation, string category = null)
+ public override void ReportBplError(IToken tok, string message, bool error, string category = null)
{
- base.ReportBplError(tok, message, error, showBplLocation, category);
+ base.ReportBplError(tok, message, error, category);
if (tok is Dafny.NestedToken)
{
var nt = (Dafny.NestedToken)tok;
- ReportBplError(nt.Inner, "Related location", false, showBplLocation);
+ ReportBplError(nt.Inner, "Related location", false);
}
}
}
diff --git a/Source/DafnyExtension/DafnyDriver.cs b/Source/DafnyExtension/DafnyDriver.cs
index 296f1a2f..0811236d 100644
--- a/Source/DafnyExtension/DafnyDriver.cs
+++ b/Source/DafnyExtension/DafnyDriver.cs
@@ -62,7 +62,7 @@ namespace DafnyLanguage
{
}
- public void ReportBplError(IToken tok, string message, bool error, bool showBplLocation, string category = null)
+ public void ReportBplError(IToken tok, string message, bool error, string category = null)
{
}
@@ -70,7 +70,7 @@ namespace DafnyLanguage
{
}
- public void WriteErrorInformation(ErrorInformation errorInfo, bool showBplLocation)
+ public void WriteErrorInformation(ErrorInformation errorInfo)
{
}
}
diff --git a/Source/DafnyExtension/ProgressMargin.cs b/Source/DafnyExtension/ProgressMargin.cs
index 81ae9935..12099293 100644
--- a/Source/DafnyExtension/ProgressMargin.cs
+++ b/Source/DafnyExtension/ProgressMargin.cs
@@ -302,6 +302,7 @@ namespace DafnyLanguage
{
bool success = DafnyDriver.Verify(program, GetHashCode().ToString(), requestId, errorInfo =>
{
+ errorInfo.BoogieErrorCode = null;
if (errorInfo.RequestId != null && RequestIdToSnapshot.ContainsKey(errorInfo.RequestId))
{
var s = RequestIdToSnapshot[errorInfo.RequestId];