Revert "Add StructuredData plugin type; showcase with new DarwinLog feature"

This reverts commit 1d885845d1451e7b232f53fba2e36be67aadabd8.

llvm-svn: 279200

4 files changed, 2 insertions, 53 deletions

diff --git a/lldb/scripts/interface/SBProcess.i b/lldb/scripts/interface/SBProcess.i
index b5e12a086fe..d9de9d08768 100644
--- a/lldb/scripts/interface/SBProcess.i
+++ b/lldb/scripts/interface/SBProcess.i
@@ -44,8 +44,7 @@ public:
         eBroadcastBitInterrupt      = (1 << 1),
         eBroadcastBitSTDOUT         = (1 << 2),
         eBroadcastBitSTDERR         = (1 << 3),
-        eBroadcastBitProfileData    = (1 << 4),
-        eBroadcastBitStructuredData = (1 << 5)
+        eBroadcastBitProfileData    = (1 << 4)
     };
 
     SBProcess ();
@@ -352,15 +351,9 @@ public:
     static bool
     GetInterruptedFromEvent (const lldb::SBEvent &event);
 
-    static lldb::SBStructuredData
-    GetStructuredDataFromEvent (const lldb::SBEvent &event);
-
     static bool
     EventIsProcessEvent (const lldb::SBEvent &event);
 
-    static bool
-    EventIsStructuredDataEvent (const lldb::SBEvent &event);
-
     lldb::SBBroadcaster
     GetBroadcaster () const;
 
diff --git a/lldb/scripts/interface/SBStructuredData.i b/lldb/scripts/interface/SBStructuredData.i
deleted file mode 100644
index 225b088c433..00000000000
--- a/lldb/scripts/interface/SBStructuredData.i
+++ /dev/null
@@ -1,42 +0,0 @@
-//===-- SWIG Interface for SBStructuredData ---------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-namespace lldb {
-
-    %feature("docstring",
-             "A class representing a StructuredData event.
-
-              This class wraps the event type generated by StructuredData
-              features."
-             ) SBStructuredData;
-    class SBStructuredData
-    {
-    public:
-        
-        SBStructuredData();
-        
-        SBStructuredData(const lldb::SBStructuredData &rhs);
-
-        SBStructuredData(const lldb::EventSP &event_sp);
-
-        ~SBStructuredData();
-                 
-        bool
-        IsValid() const;
-                 
-        void
-        Clear();
-
-        lldb::SBError
-        GetAsJSON(lldb::SBStream &stream) const;
-
-        lldb::SBError
-        GetDescription(lldb::SBStream &stream) const;
-    };
-}
diff --git a/lldb/scripts/interface/SBTarget.i b/lldb/scripts/interface/SBTarget.i
index 12494142866..6198c35fbd7 100644
--- a/lldb/scripts/interface/SBTarget.i
+++ b/lldb/scripts/interface/SBTarget.i
@@ -178,7 +178,7 @@ public:
     ///     Some launch options specified by logical OR'ing 
     ///     lldb::LaunchFlags enumeration values together.
     ///
-    /// @param[in] stop_at_entry
+    /// @param[in] stop_at_endtry
     ///     If false do not stop the inferior at the entry point.
     ///
     /// @param[out]
diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig
index e81fabb19fb..ee34da30fc1 100644
--- a/lldb/scripts/lldb.swig
+++ b/lldb/scripts/lldb.swig
@@ -95,7 +95,6 @@ import six
 #include "lldb/API/SBSourceManager.h"
 #include "lldb/API/SBStream.h"
 #include "lldb/API/SBStringList.h"
-#include "lldb/API/SBStructuredData.h"
 #include "lldb/API/SBSymbol.h"
 #include "lldb/API/SBSymbolContext.h"
 #include "lldb/API/SBSymbolContextList.h"
@@ -178,7 +177,6 @@ import six
 %include "./interface/SBSourceManager.i"
 %include "./interface/SBStream.i"
 %include "./interface/SBStringList.i"
-%include "./interface/SBStructuredData.i"
 %include "./interface/SBSymbol.i"
 %include "./interface/SBSymbolContext.i"
 %include "./interface/SBSymbolContextList.i"