diff options
| author |  Rustan Leino <leino@microsoft.com> | 2011-11-22 20:08:28 -0800 |
|---|---|---|
| committer | Rustan Leino <leino@microsoft.com> | 2011-11-22 20:08:28 -0800 |
| commit | 9a4fb1d4124ea77f7a11e2c1b033f12567a3663b (patch) | |
| tree | f92bb0283af9790523c35e8fa7a797e22590a964 /Util | |
| parent | 166c105b43515bfdbde52514fa9c16ffd61eea25 (diff) | |
| parent | e51210ee428895b58876b11a58ae5c8b9ef2e97f (diff) | |
Merge
Diffstat (limited to 'Util')
| -rw-r--r-- | Util/VS2010/DafnyExtension/DafnyExtension/DafnyDriver.cs | 2 | ||||
| -rw-r--r-- | Util/VS2010/DafnyExtension/DafnyExtension/DafnyExtension.csproj | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/DafnyDriver.cs b/Util/VS2010/DafnyExtension/DafnyExtension/DafnyDriver.cs index 19a5e1df..31cc412e 100644 --- a/Util/VS2010/DafnyExtension/DafnyExtension/DafnyDriver.cs +++ b/Util/VS2010/DafnyExtension/DafnyExtension/DafnyDriver.cs @@ -167,7 +167,7 @@ namespace DafnyLanguage : base(program) {
this.dd = dd;
}
- protected override void Error(IToken tok, string msg, params object[] args) {
+ protected override void Error(Bpl.IToken tok, string msg, params object[] args) {
string s = string.Format(msg, args);
dd.RecordError(tok.line - 1, tok.col - 1, ErrorCategory.ResolveError, s);
ErrorCount++;
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/DafnyExtension.csproj b/Util/VS2010/DafnyExtension/DafnyExtension/DafnyExtension.csproj index 4ae02e17..cf33e5a0 100644 --- a/Util/VS2010/DafnyExtension/DafnyExtension/DafnyExtension.csproj +++ b/Util/VS2010/DafnyExtension/DafnyExtension/DafnyExtension.csproj @@ -57,21 +57,28 @@ <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Binaries\DafnyPipeline.dll</HintPath>
</Reference>
- <Reference Include="FSharp.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Binaries\FSharp.Core.dll</HintPath>
+ <Reference Include="Graph">
+ <HintPath>..\..\..\..\Binaries\Graph.dll</HintPath>
</Reference>
- <Reference Include="FSharp.PowerPack, Version=1.9.9.9, Culture=neutral, PublicKeyToken=a19089b1c74d0809, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Binaries\FSharp.PowerPack.dll</HintPath>
+ <Reference Include="Houdini">
+ <HintPath>..\..\..\..\Binaries\Houdini.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Binaries\Microsoft.Contracts.dll</HintPath>
</Reference>
+ <Reference Include="Model">
+ <HintPath>..\..\..\..\Binaries\Model.dll</HintPath>
+ </Reference>
+ <Reference Include="ParserHelper">
+ <HintPath>..\..\..\..\Binaries\ParserHelper.dll</HintPath>
+ </Reference>
<Reference Include="Provers.Z3">
<HintPath>..\..\..\..\Binaries\Provers.Z3.dll</HintPath>
</Reference>
+ <Reference Include="VCExpr">
+ <HintPath>..\..\..\..\Binaries\VCExpr.dll</HintPath>
+ </Reference>
<Reference Include="VCGeneration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Binaries\VCGeneration.dll</HintPath>
|