Changeset 38587bc

Timestamp:

Aug 19, 2018, 11:15:47 AM (7 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:

0e73845

Parents:

2f9768f

Message:

Parse union, enum, zero_t, and one_t in demangler

File:

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

src/SymTab/Demangle.cc ¶

@@ -352 +352 @@
                                 Type * parseArray(Type::Qualifiers tq);
                                 Type * parseStruct(Type::Qualifiers tq);
+                                Type * parseUnion(Type::Qualifiers tq);
+                                Type * parseEnum(Type::Qualifiers tq);
 
                                 Type * parseType();
@@ -372 +374 @@
                                 parsers.emplace_back(Encoding::tuple, [this](Type::Qualifiers tq) { return parseTuple(tq); });
                                 parsers.emplace_back(Encoding::struct_t, [this](Type::Qualifiers tq) { return parseStruct(tq); });
+                                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::zero, [this](Type::Qualifiers tq) { return new ZeroType(tq); });
+                                parsers.emplace_back(Encoding::one, [this](Type::Qualifiers tq) { return new OneType(tq); });
                         }
 
@@ -493 +499 @@
                         }
 
+                        Type * StringView::parseUnion(Type::Qualifiers tq) {
+                                PRINT( std::cerr << "union..." << std::endl; )
+                                std::string name;
+                                if (! extractName(name)) return nullptr;
+                                return new UnionInstType(tq, name);
+                        }
+
+                        Type * StringView::parseEnum(Type::Qualifiers tq) {
+                                PRINT( std::cerr << "enum..." << std::endl; )
+                                std::string name;
+                                if (! extractName(name)) return nullptr;
+                                return new EnumInstType(tq, name);
+                        }
+
                         Type * StringView::parseType() {
                                 if (done()) return nullptr;