Changeset f47d0ad

Timestamp:

Aug 6, 2018, 10:47:55 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

8316a49

Parents:

4084928e

Message:

Change signature of cforall_demangle to be C-compatible

Location:

src/SymTab

Files:

• Demangle.cc (modified) (2 diffs)
• Mangler.h (modified) (1 diff)
• demangler.cc (modified) (1 diff)

src/SymTab/Demangle.cc

@@ -509 +509 @@
                                 return true;
                         }
+
+                        std::string demangle(const std::string & mangleName) {
+                                SymTab::Mangler::StringView view(mangleName);
+                                std::string name;
+                                Type * type = nullptr;
+                                if (! view.parse(name, type)) return mangleName;
+                                return genDemangleType(type, name);
+                        }
                 } // namespace
         } // namespace Mangler
@@ -514 +522 @@
 
 extern "C" {
-        std::string cforall_demangle(const std::string & mangleName) {
-                SymTab::Mangler::StringView view(mangleName);
-                std::string name;
-                Type * type = nullptr;
-                if (! view.parse(name, type)) return mangleName;
-                return genDemangleType(type, name);
-        } // extern "C"
+        char * cforall_demangle(const char * mangleName) {
+                const std::string & demangleName = SymTab::Mangler::demangle(mangleName);
+                return strdup(demangleName.c_str());
+        }
 }
 

src/SymTab/Mangler.h

@@ -69 +69 @@
 
 extern "C" {
-        std::string cforall_demangle(const std::string &);
+        char * cforall_demangle(const char *);
 }
 

src/SymTab/demangler.cc

@@ -5 +5 @@
 
 void f(const std::string & mangleName) {
-  cout << mangleName << " => " << std::flush << cforall_demangle(mangleName) << endl;
+        char * demangleName = cforall_demangle(mangleName.c_str());
+        cout << mangleName << " => " << std::flush << demangleName << endl;
+        free(demangleName);
 }
 
 int main() {
-  ifstream in("in-demangle.txt");
-  std::string line;
-  while (getline(in, line)) {
-    if (line.empty()) { cout << "=================================" << endl; continue; }
-    else if (line[0] == '#') continue;
-    f(line);
-  }
+        ifstream in("in-demangle.txt");
+        std::string line;
+        while (getline(in, line)) {
+                if (line.empty()) { cout << "=================================" << endl; continue; }
+                else if (line[0] == '#') continue;
+                f(line);
+        }
 }