Changeset efa8b6a

Timestamp:

Aug 21, 2018, 8:53:11 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

cdbab55

Parents:

72b3605

Message:

Demangle type instances that are not in the forall list, fix edge handling for extracting number/name

File:

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

src/SymTab/Demangle.cc

@@ -354 +354 @@
                                 Type * parseUnion(Type::Qualifiers tq);
                                 Type * parseEnum(Type::Qualifiers tq);
+                                Type * parseType(Type::Qualifiers tq);
 
                                 Type * parseType();
@@ -390 +391 @@
                                 parsers.emplace_back(Encoding::union_t, [this](Type::Qualifiers tq) { return parseUnion(tq); });
                                 parsers.emplace_back(Encoding::enum_t, [this](Type::Qualifiers tq) { return parseEnum(tq); });
+                                parsers.emplace_back(Encoding::type, [this](Type::Qualifiers tq) { return parseType(tq); });
                                 parsers.emplace_back(Encoding::zero, [this](Type::Qualifiers tq) { return new ZeroType(tq); });
                                 parsers.emplace_back(Encoding::one, [this](Type::Qualifiers tq) { return new OneType(tq); });
@@ -396 +398 @@
                         bool StringView::extractNumber(size_t & out) {
                                 std::stringstream numss;
+                                if (idx >= str.size()) return false;
                                 while (isdigit(str[idx])) {
                                         numss << str[idx];
                                         ++idx;
-                                        if (idx >= str.size()) return false;
+                                        if (idx == str.size()) break;
                                 }
                                 if (! (numss >> out)) return false;
+                                PRINT( std::cerr << "extractNumber success: " << out << std::endl; )
                                 return true;
                         }
@@ -408 +412 @@
                                 size_t len;
                                 if (! extractNumber(len)) return false;
-                                if (idx+len >= str.size()) return false;
+                                if (idx+len > str.size()) return false;
                                 out = str.substr(idx, len);
                                 idx += len;
+                                PRINT( std::cerr << "extractName success: " << out << std::endl; )
                                 return true;
                         }
@@ -525 +530 @@
                                 if (! extractName(name)) return nullptr;
                                 return new EnumInstType(tq, name);
+                        }
+
+                        Type * StringView::parseType(Type::Qualifiers tq) {
+                                PRINT( std::cerr << "type..." << std::endl; )
+                                std::string name;
+                                if (! extractName(name)) return nullptr;
+                                PRINT( std::cerr << "typename..." << name << std::endl; )
+                                return new TypeInstType(tq, name, false);
                         }