goto-diff --unified: output diff of individual instructions

Author: tautschnig

src/goto-diff/Makefile

@@ -1,5 +1,6 @@
 SRC = goto_diff_main.cpp goto_diff_parse_options.cpp \
-      goto_diff_languages.cpp goto_diff_base.cpp syntactic_diff.cpp
+      goto_diff_languages.cpp goto_diff_base.cpp syntactic_diff.cpp \
+      unified_diff.cpp
 
 OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../linking/linking$(LIBEXT) \

src/goto-diff/goto_diff_parse_options.cpp

@@ -44,6 +44,7 @@ Author: Peter Schrammel
 #include "goto_diff_parse_options.h"
 #include "goto_diff.h"
 #include "syntactic_diff.h"
+#include "unified_diff.h"
 
 /*******************************************************************\
 
@@ -333,6 +334,16 @@ int goto_diff_parse_optionst::doit()
     return 0;
   }
 
+  if(cmdline.isset("unified") ||
+     cmdline.isset('u'))
+  {
+    unified_difft u(goto_model1, goto_model2);
+    u();
+    u.output(std::cout);
+
+    return 0;
+  }
+
   std::unique_ptr<goto_difft> goto_diff;
   goto_diff = std::unique_ptr<goto_difft>(
     new syntactic_difft(goto_model1, goto_model2,get_message_handler()));
@@ -517,6 +528,7 @@ void goto_diff_parse_optionst::help()
     "Diff options:\n"
     " --show-functions             show functions (default)\n"
     " --syntactic                  do syntactic diff (default)\n"
+    " -u | --unified               output unified diff\n"
     "\n"
     "Other options:\n"
     " --version                    show version and exit\n"

src/goto-diff/goto_diff_parse_options.h

@@ -22,7 +22,8 @@ class optionst;
 #define GOTO_DIFF_OPTIONS \
   "(json-ui)" \
   "(show-goto-functions)" \
-  "(verbosity):(version)"
+  "(verbosity):(version)" \
+  "u(unified)"
 
 class goto_diff_parse_optionst:
   public parse_options_baset,