Fix contracts so runtime checking can be turned on.

1 files changed, 2 insertions, 16 deletions

diff --git a/Source/AIFramework/CommonFunctionSymbols.cs b/Source/AIFramework/CommonFunctionSymbols.cs
index 7dbfdd03..d8e4497f 100644
--- a/Source/AIFramework/CommonFunctionSymbols.cs
+++ b/Source/AIFramework/CommonFunctionSymbols.cs
@@ -220,15 +220,6 @@ Contract.Ensures(Contract.Result<FunctionType>() != null);
         }

 

         [Once] private static AIType/*!*/ binreltype;

-      [ContractInvariantMethod]

-void ObjectInvariant() 

-{

-    Contract.Invariant(binreltype != null);

-        Contract.Invariant(_eq != null);

-        Contract.Invariant(_neq != null);

-        Contract.Invariant(_subtype != null);

-        Contract.Invariant(_typeof != null);

-}

 

         private static AIType/*!*/ BinrelType {

           get {Contract.Ensures(Contract.Result<AIType>() != null);

@@ -462,7 +453,7 @@ Contract.Requires(f != null);
         private static readonly AIType/*!*/ heaptype = new Heap();

         public static new AIType/*!*/ Type { get {Contract.Ensures(Contract.Result<AIType>() != null); return heaptype; } }

 

-        // the types in the following, select1, select2, are hard-coded;
+        // the types in the following, select1, select2, are hard-coded;

         // these types may not always be appropriate

         private static readonly FunctionSymbol/*!*/ _select1 = new FunctionSymbol("sel1",

             // Heap x FieldName -> Prop

@@ -476,7 +467,7 @@ Contract.Requires(f != null);
         );

         public static FunctionSymbol/*!*/ Select2 { get {Contract.Ensures(Contract.Result<FunctionSymbol>() != null); return _select2; } }

 

-        // the types in the following, store1, store2, are hard-coded;
+        // the types in the following, store1, store2, are hard-coded;

         // these types may not always be appropriate

         private static readonly FunctionSymbol/*!*/ _update1 = new FunctionSymbol("upd1",

             // Heap x FieldName x Value -> Heap

@@ -626,11 +617,6 @@ Contract.Requires(f != null);
     public sealed class Prop : AIType

     {

         private static readonly AIType/*!*/ proptype = new Prop();

-      [ContractInvariantMethod]

-void ObjectInvariant() 

-{

-    Contract.Invariant(proptype != null);

-}

 

         public static AIType/*!*/ Type { get {Contract.Ensures(Contract.Result<AIType>() != null); return proptype; } }