1 files changed, 127 insertions, 3 deletions

diff --git a/Source/VCExpr/SimplifyLikeLineariser.cs b/Source/VCExpr/SimplifyLikeLineariser.cs
index b554c331..1a4374f8 100644
--- a/Source/VCExpr/SimplifyLikeLineariser.cs
+++ b/Source/VCExpr/SimplifyLikeLineariser.cs
@@ -380,9 +380,22 @@ namespace Microsoft.Boogie.VCExprAST {
     internal const string realSubName = "realSub";
     internal const string realMulName = "realMul";
     internal const string realDivName = "realDiv";
+    internal const string floatAddName = "floatAdd";
+    internal const string floatSubName = "floatSub";
+    internal const string floatMulName = "floatMul";
+    internal const string floatDivName = "floatDiv";
+    internal const string floatRemName = "floatRem";
+    internal const string floatMinName = "floatMin";
+    internal const string floatMaxName = "floatMax";
+    internal const string floatLeqName = "floatLeq";
+    internal const string floatLtName = "floatLt";
+    internal const string floatGeqName = "floatGeq";
+    internal const string floatGtName = "floatGt";
+    internal const string floatEqName = "floatEq";
     internal const string realPowName = "realPow";
     internal const string toIntName = "toIntCoercion";
     internal const string toRealName = "toRealCoercion";
+    internal const string toFloatName = "toFloatCoercion";
 
     internal void AssertAsTerm(string x, LineariserOptions options) {
       Contract.Requires(options != null);
@@ -883,7 +896,104 @@ namespace Microsoft.Boogie.VCExprAST {
         return true;
       }
 
-      public bool VisitBvOp(VCExprNAry node, LineariserOptions options) {
+      public bool VisitFloatAddOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatAddName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatSubOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatSubName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatMulOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatMulName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatDivOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatDivName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatRemOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatRemName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatMinOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatMinName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatMaxOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatMaxName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatLeqOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatLeqName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatLtOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatLtName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatGeqOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatGeqName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatGtOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatGtName, node, options);
+        return true;
+      }
+
+      public bool VisitFloatEqOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteTermApplication(floatEqName, node, options);
+        return true;
+      }
+
+      public bool VisitBvOp(VCExprNAry node, LineariserOptions options)
+      {
         //Contract.Requires(options != null);
         //Contract.Requires(node != null);
         WriteTermApplication("$make_bv" + node.Type.BvBits, node, options);
@@ -955,9 +1065,12 @@ namespace Microsoft.Boogie.VCExprAST {
         if (node.Type.IsInt) {
           WriteTermApplication(intSubName, node, options);
         }
-        else {
+        else if (node.Type.IsReal) {
           WriteTermApplication(realSubName, node, options);
         }
+        else {
+          WriteTermApplication(floatSubName, node, options);
+        }
         return true;
       }
 
@@ -967,9 +1080,12 @@ namespace Microsoft.Boogie.VCExprAST {
         if (node.Type.IsInt) {
           WriteTermApplication(intMulName, node, options);
         }
-        else {
+        else if (node.Type.IsReal) {
           WriteTermApplication(realMulName, node, options);
         }
+        else {
+          WriteTermApplication(floatMulName, node, options);
+        }
         return true;
       }
 
@@ -1057,6 +1173,14 @@ namespace Microsoft.Boogie.VCExprAST {
         return true;
       }
 
+      public bool VisitToFloatOp(VCExprNAry node, LineariserOptions options)
+      {
+        //Contract.Requires(options != null);
+        //Contract.Requires(node != null);
+        WriteApplication(toFloatName, node, options);
+        return true;
+      }
+
       public bool VisitBoogieFunctionOp(VCExprNAry node, LineariserOptions options) {
         //Contract.Requires(options != null);
         //Contract.Requires(node != null);