Move pointer_offset_sum

Move it from pointer_analysis to util. It is not currently used in the
cbmc codebase. The only changes were to the names of the guards in the
header file and the includes.

Author: Owen

src/pointer-analysis/Makefile

@@ -1,6 +1,5 @@
 SRC = add_failed_symbols.cpp \
       goto_program_dereference.cpp \
-      pointer_offset_sum.cpp \
       rewrite_index.cpp \
       show_value_sets.cpp \
       value_set.cpp \

src/util/Makefile

@@ -53,6 +53,7 @@ SRC = allocate_objects.cpp \
       parse_options.cpp \
       parser.cpp \
       pointer_offset_size.cpp \
+      pointer_offset_sum.cpp \
       pointer_predicates.cpp \
       rational.cpp \
       rational_tools.cpp \

src/pointer-analysis/pointer_offset_sum.cpp renamed to src/util/pointer_offset_sum.cpp

@@ -11,13 +11,13 @@ Author: Daniel Kroening, [email protected]
 
 #include "pointer_offset_sum.h"
 
-#include <util/std_expr.h>
+#include "std_expr.h"
 
 exprt pointer_offset_sum(const exprt &a, const exprt &b)
 {
-  if(a.id()==ID_unknown)
+  if(a.id() == ID_unknown)
     return a;
-  else if(b.id()==ID_unknown)
+  else if(b.id() == ID_unknown)
     return b;
   else if(a.is_zero())
     return b;

src/pointer-analysis/pointer_offset_sum.h renamed to src/util/pointer_offset_sum.h

@@ -9,11 +9,11 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Pointer Dereferencing
 
-#ifndef CPROVER_POINTER_ANALYSIS_POINTER_OFFSET_SUM_H
-#define CPROVER_POINTER_ANALYSIS_POINTER_OFFSET_SUM_H
+#ifndef CPROVER_UTIL_POINTER_OFFSET_SUM_H
+#define CPROVER_UTIL_POINTER_OFFSET_SUM_H
 
-#include <util/expr.h>
+#include "expr.h"
 
 exprt pointer_offset_sum(const exprt &a, const exprt &b);
 
-#endif // CPROVER_POINTER_ANALYSIS_POINTER_OFFSET_SUM_H
+#endif // CPROVER_UTIL_POINTER_OFFSET_SUM_H