From 6ec0c7c6c4bb341926c45db99e7287cce91a8da2 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 12 Aug 2012 15:56:21 +0000
Subject: Stricter symbol construction and conversion.

git-svn-id: http://svn.drobilla.net/lad/trunk/raul@4670 a436a847-0d15-0410-975c-d299462d15a1
---
 src/Symbol.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Symbol.cpp b/src/Symbol.cpp
index fdaf711..4fe049e 100644
--- a/src/Symbol.cpp
+++ b/src/Symbol.cpp
@@ -53,19 +53,14 @@ Symbol::is_valid(const std::basic_string<char>& symbol)
  * This will make a best effort at turning @a str into a complete, valid
  * Symbol, and will always return one.
  */
-string
+Raul::Symbol
 Symbol::symbolify(const std::basic_string<char>& str)
 {
 	string symbol = str;
 
 	Path::replace_invalid_chars(symbol, 0, true);
 
-	if (symbol.length() == 0)
-		return "_";
-
-	assert(is_valid(symbol));
-
-	return symbol;
+	return Raul::Symbol(symbol.empty() ? "_" : symbol);
 }
 
 } // namespace Raul
-- 
cgit v1.2.1