Changes in src/SymTab/Demangle.cc [07de76b:8abca06]

File:

• src/SymTab/Demangle.cc (modified) (4 diffs)

src/SymTab/Demangle.cc

@@ -10 +10 @@
 // Created On       : Thu Jul 19 12:52:41 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 14:54:15 2019
-// Update Count     : 4
+// Last Modified On : Tue Feb 11 15:09:18 2020
+// Update Count     : 10
 //
 
@@ -19 +19 @@
 #include "CodeGen/GenType.h"
 #include "Common/PassVisitor.h"
+#include "Common/utility.h"                                                             // isPrefix
 #include "Mangler.h"
 #include "SynTree/Type.h"
@@ -416 +417 @@
 
                         bool StringView::isPrefix(const std::string & pref) {
-                                if ( pref.size() > str.size()-idx ) return false;
-                                auto its = std::mismatch( pref.begin(), pref.end(), std::next(str.begin(), idx) );
-                                if (its.first == pref.end()) {
+                                // if ( pref.size() > str.size()-idx ) return false;
+                                // auto its = std::mismatch( pref.begin(), pref.end(), std::next(str.begin(), idx) );
+                                // if (its.first == pref.end()) {
+                                //      idx += pref.size();
+                                //      return true;
+                                // }
+
+                                // This update is untested because there are no tests for this code.
+                                if ( ::isPrefix( str, pref, idx ) ) {
                                         idx += pref.size();
                                         return true;
@@ -429 +436 @@
                                 PRINT( std::cerr << "====== " << str.size() << " " << str << std::endl; )
                                 if (str.size() < 2+Encoding::manglePrefix.size()) return false; // +2 for at least _1 suffix
-                                if (! isPrefix(Encoding::manglePrefix) || ! isdigit(str.back())) return false;
+                                if ( ! isPrefix(Encoding::manglePrefix) || ! isdigit(str.back() ) ) return false;
 
                                 // get name