moved bitvec directory to const-evaluator. moved constantbv directory extlib-constbv

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

diff --git a/Makefile b/Makefile
index 7917065cf4b6252cc3299ec5b165568285ebb7f0..d4fa64a04dbfc4106ad881e1ac8d29a8476535a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,13 +24,13 @@ all:
 #      $(MAKE) -C $(SRC)/sat simp
 #      $(MAKE) -C $(SRC)/sat unsound
        $(MAKE) -C $(SRC)/simplifier
-       $(MAKE) -C $(SRC)/bitvec
+       $(MAKE) -C $(SRC)/const-evaluator
        $(MAKE) -C $(SRC)/c_interface
-       $(MAKE) -C $(SRC)/constantbv
+       $(MAKE) -C $(SRC)/extlib-constbv
        $(MAKE) -C $(SRC)/parser
        $(MAKE) -C $(SRC)/main
        $(AR) rc libstp.a  $(SRC)/AST/*.o  $(SRC)/AST/printer/*.o $(SRC)/abstraction-refinement/*.o $(SRC)/to-sat/*.o \
-                          $(SRC)/sat/*.or $(SRC)/simplifier/*.o  $(SRC)/bitvec/*.o $(SRC)/constantbv/*.o $(SRC)/c_interface/*.o \
+                          $(SRC)/sat/*.or $(SRC)/simplifier/*.o  $(SRC)/const-evaluator/*.o $(SRC)/extlib-constbv/*.o $(SRC)/c_interface/*.o \
                           $(SRC)/parser/let-funcs.o $(SRC)/parser/parseCVC.o $(SRC)/parser/lexCVC.o $(SRC)/main/*.o
        $(RANLIB) libstp.a
        @mkdir -p lib
@@ -62,9 +62,9 @@ clean:
        $(MAKE) clean -C $(SRC)/to-sat
        $(MAKE) clean -C $(SRC)/sat
        $(MAKE) clean -C $(SRC)/simplifier
-       $(MAKE) clean -C $(SRC)/bitvec
+       $(MAKE) clean -C $(SRC)/const-evaluator
        $(MAKE) clean -C $(SRC)/c_interface
-       $(MAKE) clean -C $(SRC)/constantbv
+       $(MAKE) clean -C $(SRC)/extlib-constbv
        $(MAKE) clean -C $(SRC)/parser
        $(MAKE) clean -C $(SRC)/main
 

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 7917065cf4b6252cc3299ec5b165568285ebb7f0..d4fa64a04dbfc4106ad881e1ac8d29a8476535a4 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -24,13 +24,13 @@ all:
 #      $(MAKE) -C $(SRC)/sat simp
 #      $(MAKE) -C $(SRC)/sat unsound
        $(MAKE) -C $(SRC)/simplifier
-       $(MAKE) -C $(SRC)/bitvec
+       $(MAKE) -C $(SRC)/const-evaluator
        $(MAKE) -C $(SRC)/c_interface
-       $(MAKE) -C $(SRC)/constantbv
+       $(MAKE) -C $(SRC)/extlib-constbv
        $(MAKE) -C $(SRC)/parser
        $(MAKE) -C $(SRC)/main
        $(AR) rc libstp.a  $(SRC)/AST/*.o  $(SRC)/AST/printer/*.o $(SRC)/abstraction-refinement/*.o $(SRC)/to-sat/*.o \
-                          $(SRC)/sat/*.or $(SRC)/simplifier/*.o  $(SRC)/bitvec/*.o $(SRC)/constantbv/*.o $(SRC)/c_interface/*.o \
+                          $(SRC)/sat/*.or $(SRC)/simplifier/*.o  $(SRC)/const-evaluator/*.o $(SRC)/extlib-constbv/*.o $(SRC)/c_interface/*.o \
                           $(SRC)/parser/let-funcs.o $(SRC)/parser/parseCVC.o $(SRC)/parser/lexCVC.o $(SRC)/main/*.o
        $(RANLIB) libstp.a
        @mkdir -p lib
@@ -62,9 +62,9 @@ clean:
        $(MAKE) clean -C $(SRC)/to-sat
        $(MAKE) clean -C $(SRC)/sat
        $(MAKE) clean -C $(SRC)/simplifier
-       $(MAKE) clean -C $(SRC)/bitvec
+       $(MAKE) clean -C $(SRC)/const-evaluator
        $(MAKE) clean -C $(SRC)/c_interface
-       $(MAKE) clean -C $(SRC)/constantbv
+       $(MAKE) clean -C $(SRC)/extlib-constbv
        $(MAKE) clean -C $(SRC)/parser
        $(MAKE) clean -C $(SRC)/main
 

diff --git a/src/AST/AST.h b/src/AST/AST.h
index 09721e048edd2a709463b131f5cb5f78d6f40572..7bbc83cce5b41bb68e2fd59aaebe6b4a3a5ee2c0 100644 (file)
--- a/src/AST/AST.h
+++ b/src/AST/AST.h
@@ -35,7 +35,7 @@
 #include "ASTKind.h"
 #include <stdint.h>
 #include <stdlib.h>
-#include "../constantbv/constantbv.h"
+#include "../extlib-constbv/constantbv.h"
 
 /*****************************************************************************
  * LIST OF CLASSES DECLARED IN THIS FILE:

diff --git a/src/bitvec/Makefile b/src/const-evaluator/Makefile
similarity index 100%
rename from src/bitvec/Makefile
rename to src/const-evaluator/Makefile

diff --git a/src/bitvec/consteval.cpp b/src/const-evaluator/consteval.cpp
similarity index 100%
rename from src/bitvec/consteval.cpp
rename to src/const-evaluator/consteval.cpp

diff --git a/src/constantbv/Makefile b/src/extlib-constbv/Makefile
similarity index 100%
rename from src/constantbv/Makefile
rename to src/extlib-constbv/Makefile

diff --git a/src/constantbv/constantbv.cpp b/src/extlib-constbv/constantbv.cpp
similarity index 100%
rename from src/constantbv/constantbv.cpp
rename to src/extlib-constbv/constantbv.cpp

diff --git a/src/constantbv/constantbv.h b/src/extlib-constbv/constantbv.h
similarity index 100%
rename from src/constantbv/constantbv.h
rename to src/extlib-constbv/constantbv.h

diff --git a/src/main/Makefile b/src/main/Makefile
index 401acc40ef8d4e6c4f23dab45ff770323f4c4d4d..b31e4904b749e7ec75c5a8d122472cabcf8f302b 100644 (file)
--- a/src/main/Makefile
+++ b/src/main/Makefile
@@ -8,8 +8,8 @@ LIBS =  -L../to-sat -ltosat \
        -L../abstraction-refinement -labstractionrefinement \
        -L../sat -lminisat  \
        -L../simplifier -lsimplifier \
-        -L../bitvec -lconsteval \
-       -L../constantbv -lconstantbv \
+        -L../const-evaluator -lconsteval \
+       -L../extlib-constbv -lconstantbv \
        -L../parser -lparser
 
 # This rebuilds each time, because the target "parser" is not created