Merge

7 files changed, 8 insertions, 2 deletions

diff --git a/Source/Core/Absy.cs b/Source/Core/Absy.cs
index 5f7328d1..fc28100e 100644
--- a/Source/Core/Absy.cs
+++ b/Source/Core/Absy.cs
@@ -95,6 +95,7 @@ namespace Microsoft.Boogie {
   using Microsoft.Boogie.AbstractInterpretation;

   using AI = Microsoft.AbstractInterpretationFramework;

   using Graphing;

+  using Set = GSet<object>;

 

   [ContractClass(typeof(AbsyContracts))]

   public abstract class Absy {

diff --git a/Source/Core/AbsyCmd.cs b/Source/Core/AbsyCmd.cs
index 06eb3ae5..e96c3fd1 100644
--- a/Source/Core/AbsyCmd.cs
+++ b/Source/Core/AbsyCmd.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Boogie {
   using Microsoft.Boogie.AbstractInterpretation;

   using AI = Microsoft.AbstractInterpretationFramework;

   using System.Diagnostics.Contracts;

+  using Set = GSet<object>;

 

 

   //---------------------------------------------------------------------

diff --git a/Source/Core/AbsyExpr.cs b/Source/Core/AbsyExpr.cs
index fe5f0621..02a2f762 100644
--- a/Source/Core/AbsyExpr.cs
+++ b/Source/Core/AbsyExpr.cs
@@ -18,6 +18,8 @@ namespace Microsoft.Boogie {
   using System.Diagnostics.Contracts;

   using Microsoft.Basetypes;

 

+  using Set = GSet<object>; // not that the set used is not a set of Variable only, as it also contains TypeVariables

+

 

   //---------------------------------------------------------------------

   // Expressions

diff --git a/Source/Core/AbsyQuant.cs b/Source/Core/AbsyQuant.cs
index cae8bd92..3f798fd2 100644
--- a/Source/Core/AbsyQuant.cs
+++ b/Source/Core/AbsyQuant.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Boogie {
   using System.Diagnostics.Contracts;

   using Microsoft.Basetypes;

 

+  using Set = GSet<object>;

 

   //---------------------------------------------------------------------

   // Quantifiers and general binders

diff --git a/Source/Core/BoogiePL.atg b/Source/Core/BoogiePL.atg
index c7950c9a..33172e7f 100644
--- a/Source/Core/BoogiePL.atg
+++ b/Source/Core/BoogiePL.atg
@@ -97,7 +97,7 @@ private class BvBounds : Expr {
     Contract.Requires(stream != null);

     {Contract.Assert(false);throw new cce.UnreachableException();}

   }

-  public override void ComputeFreeVariables(Set/*!*/ freeVars) {Contract.Requires(freeVars != null); {Contract.Assert(false);throw new cce.UnreachableException();} }

+  public override void ComputeFreeVariables(GSet<object>/*!*/ freeVars) {Contract.Requires(freeVars != null); {Contract.Assert(false);throw new cce.UnreachableException();} }

   public override AI.IExpr/*!*/ IExpr { get { Contract.Ensures(Contract.Result<AI.IExpr>()!=null); {Contract.Assert(false);throw new cce.UnreachableException();} } }

 }

 

diff --git a/Source/Core/LambdaHelper.cs b/Source/Core/LambdaHelper.cs
index 04bf0222..b3b02724 100644
--- a/Source/Core/LambdaHelper.cs
+++ b/Source/Core/LambdaHelper.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Boogie {
   using System.Collections.Generic;

   using System.Diagnostics;

   using System.Diagnostics.Contracts;

+  using Set = GSet<object>;

 

   public static class LambdaHelper {

     public static Absy Desugar(Absy node, out List<Expr/*!*/>/*!*/ axioms, out List<Function/*!*/>/*!*/ functions) {

diff --git a/Source/Core/Parser.cs b/Source/Core/Parser.cs
index 5bfbbfc2..3602339e 100644
--- a/Source/Core/Parser.cs
+++ b/Source/Core/Parser.cs
@@ -116,7 +116,7 @@ private class BvBounds : Expr {
     Contract.Requires(stream != null);

     {Contract.Assert(false);throw new cce.UnreachableException();}

   }

-  public override void ComputeFreeVariables(Set/*!*/ freeVars) {Contract.Requires(freeVars != null); {Contract.Assert(false);throw new cce.UnreachableException();} }

+  public override void ComputeFreeVariables(GSet<object>/*!*/ freeVars) {Contract.Requires(freeVars != null); {Contract.Assert(false);throw new cce.UnreachableException();} }

   public override AI.IExpr/*!*/ IExpr { get { Contract.Ensures(Contract.Result<AI.IExpr>()!=null); {Contract.Assert(false);throw new cce.UnreachableException();} } }

 }