Move PBD symbol demangle functions into pbd/demangle.h/cc

Add pbd/demangle.cc source file and move functions from pbd/stacktrace.cc into
it

5 files changed, 85 insertions, 63 deletions

diff --git a/libs/pbd/demangle.cc b/libs/pbd/demangle.cc
new file mode 100644
index 0000000000..3f355806ee
--- /dev/null
+++ b/libs/pbd/demangle.cc
@@ -0,0 +1,67 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "pbd/demangle.h"
+
+#if defined(__GLIBCXX__)
+#include <cxxabi.h>
+#endif
+
+std::string
+PBD::symbol_demangle (const std::string& l)
+{
+#if defined(__GLIBCXX__)
+	int status;
+
+	try {
+
+		char* realname = abi::__cxa_demangle (l.c_str(), 0, 0, &status);
+		std::string d (realname);
+		free (realname);
+		return d;
+	} catch (std::exception) {
+
+	}
+#endif
+
+	return l;
+}
+
+std::string
+PBD::demangle (std::string const & l)
+{
+	std::string::size_type const b = l.find_first_of ("(");
+
+	if (b == std::string::npos) {
+		return symbol_demangle (l);
+	}
+
+	std::string::size_type const p = l.find_last_of ("+");
+	if (p == std::string::npos) {
+		return symbol_demangle (l);
+	}
+
+	if ((p - b) <= 1) {
+		return symbol_demangle (l);
+	}
+
+	std::string const fn = l.substr (b + 1, p - b - 1);
+
+	return symbol_demangle (fn);
+}
diff --git a/libs/pbd/pbd/demangle.h b/libs/pbd/pbd/demangle.h
index a8487f96d0..1ca2925fd0 100644
--- a/libs/pbd/pbd/demangle.h
+++ b/libs/pbd/pbd/demangle.h
@@ -52,6 +52,20 @@ namespace PBD
 
 		return typeid(obj).name();
 	}
+
+	/**
+	 * @param a mangled symbol/name
+	 * @return a demangled symbol/name
+	 */
+	LIBPBD_API std::string symbol_demangle(const std::string&);
+
+	/**
+	 * @param a string containing a mangled symbol/name
+	 * @return a string with the mangled symbol/name replaced with a demangled
+	 * name
+	 */
+	LIBPBD_API std::string demangle(const std::string&);
+
 } // namespace
 
 #endif // __libpbd_demangle_h__
diff --git a/libs/pbd/pbd/stacktrace.h b/libs/pbd/pbd/stacktrace.h
index 17a719e9ae..99fc9d5c57 100644
--- a/libs/pbd/pbd/stacktrace.h
+++ b/libs/pbd/pbd/stacktrace.h
@@ -41,7 +41,6 @@ namespace PBD {
 
 	LIBPBD_API void stacktrace (std::ostream& out, int levels = 0);
 	LIBPBD_API void trace_twb();
-	LIBPBD_API std::string demangle (const std::string&);
 
 template<typename T>
 class /*LIBPBD_API*/ thing_with_backtrace
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index 176c5b8840..8a7cdfafca 100644
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -21,6 +21,7 @@
 
 #include "pbd/stacktrace.h"
 #include "pbd/debug.h"
+#include "pbd/demangle.h"
 #include "pbd/compose.h"
 #include "pbd/pthread_utils.h"
 
@@ -43,48 +44,6 @@ PBD::trace_twb ()
 #ifdef HAVE_EXECINFO
 
 #include <execinfo.h>
-#include <cxxabi.h>
-
-static std::string
-symbol_demangle (const std::string& l)
-{
-	int status;
-
-	try {
-
-		char* realname = abi::__cxa_demangle (l.c_str(), 0, 0, &status);
-		std::string d (realname);
-		free (realname);
-		return d;
-	} catch (std::exception) {
-
-	}
-
-	return l;
-}
-
-std::string
-PBD::demangle (std::string const & l)
-{
-	std::string::size_type const b = l.find_first_of ("(");
-
-	if (b == std::string::npos) {
-		return symbol_demangle (l);
-	}
-
-	std::string::size_type const p = l.find_last_of ("+");
-	if (p == std::string::npos) {
-		return symbol_demangle (l);
-	}
-
-	if ((p - b) <= 1) {
-		return symbol_demangle (l);
-	}
-
-	std::string const fn = l.substr (b + 1, p - b - 1);
-
-	return symbol_demangle (fn);
-}
 
 void
 PBD::stacktrace (std::ostream& out, int levels)
@@ -127,12 +86,6 @@ extern "C" {
 }
 #endif
 
-std::string
-PBD::demangle (std::string const & l) /* JE - !!!! 'PBD' namespace might possibly get removed (except it's still used in 'libs/canvas/item.cc') */
-{
-	return std::string();
-}
-
 void
 PBD::stacktrace( std::ostream& out, int)
 {
@@ -169,30 +122,18 @@ PBD::stacktrace( std::ostream& out, int)
 #endif
 }
 
-void
-c_stacktrace ()
-{
-	PBD::stacktrace (std::cout);
-}
-
 #else
 
-std::string
-PBD::demangle (std::string const & l) /* JE - !!!! 'PBD' namespace might possibly get removed (except it's still used in 'libs/canvas/item.cc') */
-{
-	return std::string();
-}
-
 void
 PBD::stacktrace (std::ostream& out, int /*levels*/)
 {
 	out << "stack tracing is not enabled on this platform" << std::endl;
 }
 
+#endif
+
 void
 c_stacktrace ()
 {
 	PBD::stacktrace (std::cout);
 }
-
-#endif /* HAVE_EXECINFO */
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 654d404634..00cc6634eb 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -41,6 +41,7 @@ libpbd_sources = [
     'crossthread.cc',
     'cpus.cc',
     'debug.cc',
+    'demangle.cc',
     'enumwriter.cc',
     'event_loop.cc',
     'enums.cc',