Merge pull request #3028 from peterschrammel/move-goto-program-template

 Move contents of goto_program_template.cpp to goto_program.cpp

Author: tautschnig

src/goto-programs/Makefile

@@ -19,7 +19,6 @@ SRC = adjust_float_expressions.cpp \
       goto_inline_class.cpp \
       goto_inline.cpp \
       goto_program.cpp \
-      goto_program_template.cpp \
       goto_trace.cpp \
       graphml_witness.cpp \
       initialize_goto_model.cpp \

src/goto-programs/goto_program.cpp

@@ -698,3 +698,66 @@ bool goto_programt::equals(const goto_programt &other) const
 
   return true;
 }
+
+/// Outputs a string representation of a `goto_program_instruction_typet`
+std::ostream &operator<<(std::ostream &out, goto_program_instruction_typet t)
+{
+  switch(t)
+  {
+  case NO_INSTRUCTION_TYPE:
+    out << "NO_INSTRUCTION_TYPE";
+    break;
+  case GOTO:
+    out << "GOTO";
+    break;
+  case ASSUME:
+    out << "ASSUME";
+    break;
+  case ASSERT:
+    out << "ASSERT";
+    break;
+  case OTHER:
+    out << "OTHER";
+    break;
+  case DECL:
+    out << "DECL";
+    break;
+  case DEAD:
+    out << "DEAD";
+    break;
+  case SKIP:
+    out << "SKIP";
+    break;
+  case START_THREAD:
+    out << "START_THREAD";
+    break;
+  case END_THREAD:
+    out << "END_THREAD";
+    break;
+  case LOCATION:
+    out << "LOCATION";
+    break;
+  case END_FUNCTION:
+    out << "END_FUNCTION";
+    break;
+  case ATOMIC_BEGIN:
+    out << "ATOMIC_BEGIN";
+    break;
+  case ATOMIC_END:
+    out << "ATOMIC_END";
+    break;
+  case RETURN:
+    out << "RETURN";
+    break;
+  case ASSIGN:
+    out << "ASSIGN";
+    break;
+  case FUNCTION_CALL:
+    out << "FUNCTION_CALL";
+    break;
+  default:
+    out << "?";
+  }
+
+  return out;
+}