Move TypeSpec::string and c_str from symtab.cpp to typespec.cpp (#756)

Author: lgritz

src/liboslcomp/symtab.cpp

@@ -41,40 +41,6 @@ OSL_NAMESPACE_ENTER
 namespace pvt {   // OSL::pvt
 
 
-std::string
-TypeSpec::string () const
-{
-    std::string str;
-    if (is_closure() || is_closure_array()) {
-        str += "closure color";
-        if (is_unsized_array())
-            str += "[]";
-        else if (arraylength() > 0)
-            str += Strutil::format ("[%d]", arraylength());
-    }
-    else if (structure() > 0) {
-        str += Strutil::format ("struct %d", structure());
-        if (is_unsized_array())
-            str += "[]";
-        else if (arraylength() > 0)
-            str += Strutil::format ("[%d]", arraylength());
-    } else {
-        str += simpletype().c_str();
-    }
-    return str;
-}
-
-
-
-const char *
-TypeSpec::c_str () const
-{
-    ustring s (this->string());
-    return s.c_str ();
-}
-
-
-
 std::string
 Symbol::mangled () const
 {

src/liboslexec/typespec.cpp

@@ -64,6 +64,40 @@ TypeSpec::TypeSpec (const char *name, int structid, int arraylen)
 
 
 
+std::string
+TypeSpec::string () const
+{
+    std::string str;
+    if (is_closure() || is_closure_array()) {
+        str += "closure color";
+        if (is_unsized_array())
+            str += "[]";
+        else if (arraylength() > 0)
+            str += Strutil::format ("[%d]", arraylength());
+    }
+    else if (structure() > 0) {
+        str += Strutil::format ("struct %d", structure());
+        if (is_unsized_array())
+            str += "[]";
+        else if (arraylength() > 0)
+            str += Strutil::format ("[%d]", arraylength());
+    } else {
+        str += simpletype().c_str();
+    }
+    return str;
+}
+
+
+
+const char *
+TypeSpec::c_str () const
+{
+    ustring s (this->string());
+    return s.c_str ();
+}
+
+
+
 int
 TypeSpec::structure_id (const char *name, bool add)
 {