Changeset 6b419ce

Timestamp:

Nov 6, 2023, 5:52:12 PM (9 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

c46c999

Parents:

fe293bf (diff), c649d2c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• src/SymTab/Demangle.cc (modified) (3 diffs)
• src/SymTab/Demangle.h (modified) (2 diffs)
• src/SymTab/demangler.cc (modified) (1 diff)
• tests/in-demangle.txt (added)

src/SymTab/Demangle.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Jul 19 12:52:41 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 11 21:28:27 2021
-// Update Count     : 11
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Nov  6 15:59:00 2023
+// Update Count     : 12
 //
 
@@ -18 +18 @@
 
 #include "CodeGen/GenType.h"
+#include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"
 #include "Common/utility.h"                                                             // isPrefix
@@ -605 +606 @@
                                 Type * type = nullptr;
                                 if (! view.parse(name, type)) return mangleName;
+                                auto info = CodeGen::operatorLookupByOutput(name);
+                                if (info) name = info->inputName;
                                 std::unique_ptr<Type> manager(type);
                                 return genDemangleType(type, name);

src/SymTab/Demangle.h

@@ -10 +10 @@
 // Created On       : Fri May 13 10:11:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 13 10:30:00 2022
-// Update Count     : 0
+// Last Modified On : Mon Nov  6 15:48:00 2023
+// Update Count     : 1
 //
 
@@ -17 +17 @@
 
 extern "C" {
+        /// Main interface to the demangler as a utility.
+        /// Caller must free the returned string.
         char * cforall_demangle(const char *, int);
 }

src/SymTab/demangler.cc

@@ -2 +2 @@
 #include <iostream>
 #include <fstream>
-using namespace std;
 
-void f(const std::string & mangleName) {
+void demangleAndPrint(const std::string & mangleName) {
         char * demangleName = cforall_demangle(mangleName.c_str(), 0);
-        cout << mangleName << " => " << std::flush << demangleName << endl;
+        std::cout << mangleName << " => " << demangleName << std::endl;
         free(demangleName);
 }
 
-int main() {
-        ifstream in("in-demangle.txt");
+int main(int argc, char * argv[]) {
+        char const * fileName = (1 < argc) ? argv[1] : "in-demangle.txt";
+        std::ifstream in(fileName);
+
         std::string line;
-        while (getline(in, line)) {
-                if (line.empty()) { cout << "=================================" << endl; continue; }
-                else if (line[0] == '#') continue;
-                f(line);
+        while (std::getline(in, line)) {
+                if (line.empty()) {
+                        std::cout << "=================================" << std::endl;
+                } else if (line[0] == '#') {
+                        continue;
+                } else {
+                        demangleAndPrint(line);
+                }
         }
 }