Fix. I didn't update al l the function calls I should have in r832

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

diff --git a/src/c_interface/c_interface.cpp b/src/c_interface/c_interface.cpp
index 28ee9216c1290ae25a6c6cb39d24b1b7319a9f0e..7e71f46238e409185b3f83f5e672ebefb4c67279 100644 (file)
--- a/src/c_interface/c_interface.cpp
+++ b/src/c_interface/c_interface.cpp
@@ -672,11 +672,11 @@ Expr vc_varExpr(VC vc, const char * name, Type type) {
   switch(a->GetKind()) {
   case BEEV::BITVECTOR:
     o.SetIndexWidth(0);
-    o.SetValueWidth(GetUnsignedConst((*a)[0]));
+    o.SetValueWidth((*a)[0].GetUnsignedConst());
     break;
   case BEEV::ARRAY:
-    o.SetIndexWidth(GetUnsignedConst((*a)[0]));
-    o.SetValueWidth(GetUnsignedConst((*a)[1]));
+    o.SetIndexWidth((*a)[0].GetUnsignedConst());
+    o.SetValueWidth((*a)[1].GetUnsignedConst());
     break;
   case BEEV::BOOLEAN:
     o.SetIndexWidth(0);
@@ -1586,7 +1586,7 @@ int getBVInt(Expr e) {
                        "extract int value from a NON-constant BITVECTOR: ",
                        *a);
     }
-  return (int)GetUnsignedConst(*a);
+  return (int)a->GetUnsignedConst();
 }
 
 //! Return an unsigned int from a constant bitvector expression
@@ -1600,7 +1600,7 @@ unsigned int getBVUnsigned(Expr e) {
                        "value from a NON-constant BITVECTOR: ",
                        *a);
     }
-  return (unsigned int)GetUnsignedConst(*a);
+  return (unsigned int)a->GetUnsignedConst();
 }
 
 //! Return an unsigned long long int from a constant bitvector expression
@@ -1966,15 +1966,15 @@ int getExprID (Expr ex) {
 
 
 #if 0
-/#ifndef YY_TYPEDEF_YY_BUFFER_STATE\r
-struct yy_buffer_state;\r
-#define YY_TYPEDEF_YY_BUFFER_STATE\r
-typedef struct yy_buffer_state *YY_BUFFER_STATE;\r
+/#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+struct yy_buffer_state;
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 
-extern YY_BUFFER_STATE cvc_scan_string (const char *yy_str  );\r
+extern YY_BUFFER_STATE cvc_scan_string (const char *yy_str  );
 extern void cvc_delete_buffer (YY_BUFFER_STATE  b );
-extern YY_BUFFER_STATE smt_scan_string (const char *yy_str  );\r
+extern YY_BUFFER_STATE smt_scan_string (const char *yy_str  );
 extern void smt_delete_buffer (YY_BUFFER_STATE  b );
 extern void cvc_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
 extern void smt_switch_to_buffer (YY_BUFFER_STATE new_buffer  );