Merge pull request #1299 from forejtv/json-source-location

Add source location to JSON output

Author: Daniel Kroening

src/memory-models/Makefile

@@ -9,6 +9,7 @@ SRC = mm2cpp.cpp \
 OBJ += ../big-int/big-int$(LIBEXT) \
       ../ansi-c/ansi-c$(LIBEXT) \
       ../linking/linking$(LIBEXT) \
+      ../langapi/langapi$(LIBEXT) \
       ../util/util$(LIBEXT)
 
 INCLUDES= -I ..

src/util/ui_message.cpp

@@ -14,6 +14,7 @@ Author: Daniel Kroening, [email protected]
 #include "xml.h"
 #include "json.h"
 #include "xml_expr.h"
+#include "json_expr.h"
 #include "cout_message.h"
 #include "cmdline.h"
 
@@ -219,11 +220,9 @@ void ui_message_handlert::json_ui_msg(
 
   json_objectt result;
 
-  #if 0
   if(location.is_not_nil() &&
      !location.get_file().empty())
-    result.new_element(xml(location));
-  #endif
+    result["sourceLocation"] = json(location);
 
   result["messageType"] = json_stringt(type);
   result["messageText"] = json_stringt(msg1);