From: smccam <smccam@e59a4935-1847-0410-ae03-e826735625c1>
Date: Fri, 31 Oct 2008 18:38:37 +0000 (+0000)
Subject: Fix a couple of apparent precedence problems in AST (pointed out by
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=926cdf0ad239becf825d59628d4918f75d9f814f;p=francis%2Fstp.git

Fix a couple of apparent precedence problems in AST (pointed out by
GCC warnings). Interestingly, these don't seem to change any regression
results.


git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@34 e59a4935-1847-0410-ae03-e826735625c1
---

diff --git a/AST/AST.cpp b/AST/AST.cpp
index d0cf3c2..bfb350c 100644
--- a/AST/AST.cpp
+++ b/AST/AST.cpp
@@ -797,7 +797,7 @@ namespace BEEV {
     //number of bits in unsigned long. The variable "copied" keeps
     //track of the number of chunks copied so far
 
-    while(copied + sizeof(unsigned long)<<3 < width){
+    while(copied + (sizeof(unsigned long)<<3) < width){
       CONSTANTBV::BitVector_Chunk_Store(bv, sizeof(unsigned long)<<3,copied,c_val);
       bvconst = bvconst >> (sizeof(unsigned long) << 3);
       c_val = (0x00000000ffffffffLL) & bvconst;
diff --git a/AST/ToSAT.cpp b/AST/ToSAT.cpp
index 80bc6dd..9e8623e 100644
--- a/AST/ToSAT.cpp
+++ b/AST/ToSAT.cpp
@@ -924,7 +924,7 @@ namespace BEEV {
 
 	//cout << "debugging: " << ss;
 	size_t pos = ss.find('_',0);
-	if(!(0< pos < ss.size()))
+	if(!((0 < pos) && (pos < ss.size())))
 	  continue;
 
 	//get the associated length