Got rid of the annoying warning in AST.cpp compilation due to more than 64 bit shifti...

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

diff --git a/Makefile b/Makefile
index 8f9931e873629c187b20cc061da2ba204a8b781b..24ddc7c22f2a16cdd9b433bef436f8a1837c31c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ install: all
 
 .PHONY: clean
 clean:
-       rm -rf *~
+       rm -rf *~ scripts/*~
        rm -rf *.a
        rm -rf lib/*.a
        rm -rf test/*~

diff --git a/src/AST/AST.cpp b/src/AST/AST.cpp
index af225398a080ea38b9cd80c2b2305c26b962a106..fa975c9b26adf32992eed15ef3c4cac28668a020 100644 (file)
--- a/src/AST/AST.cpp
+++ b/src/AST/AST.cpp
@@ -407,12 +407,13 @@ ASTNode BeevMgr::CreateBVConst(unsigned int width, unsigned long long int bvcons
        //number of bits in unsigned long. The variable "copied" keeps
        //track of the number of chunks copied so far
 
+       int shift_amount = (sizeof(unsigned long) << 3);
        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);
+               CONSTANTBV::BitVector_Chunk_Store(bv, shift_amount, copied, c_val);
+               bvconst = bvconst >> shift_amount;
                c_val = (~((unsigned long) 0)) & bvconst;
-               copied += sizeof(unsigned long) << 3;
+               copied += shift_amount;
        }
        CONSTANTBV::BitVector_Chunk_Store(bv, width - copied, copied, c_val);
        return CreateBVConst(bv, width);