Changeset fc12f05 for src/SymTab/demangler.cc

Timestamp:

Nov 13, 2023, 3:43:43 AM (23 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

25f2798

Parents:

0030b508 (diff), 2174191 (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

File:

• src/SymTab/demangler.cc (modified) (1 diff)

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);
+                }
         }
 }