From bc2ffc59be751940178fa75683c00c84575de9e6 Mon Sep 17 00:00:00 2001
From: Neil Brown <neil@twistedsquare.com>
Date: Wed, 16 Jan 2008 11:52:32 +0000
Subject: [PATCH] Corrected the bounds checking so that (size - 1) is used as
 the maximum index (not size, as before)

---
 transformations/ArrayUsageCheck.hs     |  2 +-
 transformations/ArrayUsageCheckTest.hs | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/transformations/ArrayUsageCheck.hs b/transformations/ArrayUsageCheck.hs
index 6d7bd1d..ab3b628 100644
--- a/transformations/ArrayUsageCheck.hs
+++ b/transformations/ArrayUsageCheck.hs
@@ -192,7 +192,7 @@ makeEquations es high = makeEquations' >>* (\(s,v,lh) -> [(s,squareEquations eqI
                                           [(h,_,_)] -> return h
                                           _ -> throwError "Multiple possible upper bounds not supported"
                               return (eqs,high'')
-                        return (s,v,(amap (const 0) h, h))
+                        return (s,v,(amap (const 0) h, addConstant (-1) h))
                               
     -- Note that in all these functions, the divisor should always be positive!
   
diff --git a/transformations/ArrayUsageCheckTest.hs b/transformations/ArrayUsageCheckTest.hs
index 77b28e7..3ec0334 100644
--- a/transformations/ArrayUsageCheckTest.hs
+++ b/transformations/ArrayUsageCheckTest.hs
@@ -243,26 +243,26 @@ testMakeEquations :: Test
 testMakeEquations = TestList
   [
     test (0,[(Map.empty,[con 0 === con 1],leq [con 0,con 1,con 7] &&& leq [con 0,con 2,con 7])],
-      [intLiteral 1, intLiteral 2],intLiteral 7)
+      [intLiteral 1, intLiteral 2],intLiteral 8)
      
    ,test (1,[(i_mapping,[i === con 3],leq [con 0,con 3,con 7] &&& leq [con 0,i,con 7])],
-      [exprVariable "i",intLiteral 3],intLiteral 7)
+      [exprVariable "i",intLiteral 3],intLiteral 8)
    
    ,test (2,[(ij_mapping,[i === j],leq [con 0,i,con 7] &&& leq [con 0,j,con 7])],
-      [exprVariable "i",exprVariable "j"],intLiteral 7)
+      [exprVariable "i",exprVariable "j"],intLiteral 8)
 
    ,test (3,[(ij_mapping,[i ++ con 3 === j],leq [con 0,i ++ con 3,con 7] &&& leq [con 0,j,con 7])],
-      [buildExpr $ Dy (Var "i") A.Add (Lit $ intLiteral 3),exprVariable "j"],intLiteral 7)
+      [buildExpr $ Dy (Var "i") A.Add (Lit $ intLiteral 3),exprVariable "j"],intLiteral 8)
      
    ,test (4,[(ij_mapping,[2 ** i === j],leq [con 0,2 ** i,con 7] &&& leq [con 0,j,con 7])],
-      [buildExpr $ Dy (Var "i") A.Mul (Lit $ intLiteral 2),exprVariable "j"],intLiteral 7)
+      [buildExpr $ Dy (Var "i") A.Mul (Lit $ intLiteral 2),exprVariable "j"],intLiteral 8)
    
    -- Testing (i REM 3) vs (4)
    ,test (10,[
         (i_mod_mapping 3,[con 0 === con 4, i === con 0], leq [con 0,con 0,con 7] &&& leq [con 0,con 4,con 7])
        ,(i_mod_mapping 3,[i ++ 3 ** j === con 4], leq [con 0,con 4,con 7] &&& leq [con 0,i ++ 3 ** j,con 7] &&& [i >== con 1] &&& [j <== con 0] &&& leq [con 0, i ++ 3 ** j, con 2])
        ,(i_mod_mapping 3,[i ++ 3 ** j === con 4], leq [con 0,con 4,con 7] &&& leq [con 0,i ++ 3 ** j,con 7] &&& [i <== con (-1)] &&& [j >== con 0] &&& leq [con (-2), i ++ 3 ** j, con 0])
-      ],[buildExpr $ Dy (Var "i") A.Rem (Lit $ intLiteral 3),intLiteral 4],intLiteral 7)
+      ],[buildExpr $ Dy (Var "i") A.Rem (Lit $ intLiteral 3),intLiteral 4],intLiteral 8)
       
    -- Testing ((3*i - 2*j REM 11) - 5) vs (i + j)
    -- Expressed as ((2 * (i - j)) + i) REM 11 - 5, and i + j
@@ -283,7 +283,7 @@ testMakeEquations = TestList
                A.Rem (Lit $ intLiteral 11)
               )
            A.Subtr (Lit $ intLiteral 5)
-        ,buildExpr $ Dy (Var "i") A.Add (Var "j")],intLiteral 7)
+        ,buildExpr $ Dy (Var "i") A.Add (Var "j")],intLiteral 8)
    
    -- Testing i REM 2 vs (i + 1) REM 4
    ,test (12,combine (i_ip1_mod_mapping 2 4)
@@ -298,7 +298,7 @@ testMakeEquations = TestList
       ,[([i ++ 2**j === i ++ con 1 ++ 4**k],[]),rr_i_neg,rr_ip1_neg]
      ], [buildExpr $ Dy (Var "i") A.Rem (Lit $ intLiteral 2)
         ,buildExpr $ Dy (Dy (Var "i") A.Add (Lit $ intLiteral 1)) A.Rem (Lit $ intLiteral 4)
-        ], intLiteral 7)
+        ], intLiteral 8)
       
    -- TODO test REM + REM vs REM -- 27 combinations!
    
@@ -327,7 +327,7 @@ testMakeEquations = TestList
      -- i negative, j negative, i REM j = i + k:
     ,(i_mod_j_mapping, [i ++ k === con 3], [i <== con (-1), k >== (-1)**j] &&& 
         leq [j ++ con 1, i ++ k, con 0] &&& leq [con 0, i ++ k, con 7] &&& leq [con 0, con 3, con 7])
-   ], [buildExpr $ Dy (Var "i") A.Rem (Var "j"), intLiteral 3], intLiteral 7)
+   ], [buildExpr $ Dy (Var "i") A.Rem (Var "j"), intLiteral 3], intLiteral 8)
 
   ]
   where