Changeset 04c77791

Timestamp:

Aug 19, 2018, 12:09:36 PM (6 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:

2987b30

Parents:

0e73845

Message:

Parse forall lists and type variables in demangler

File:

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

src/SymTab/Demangle.cc

@@ -23 +23 @@
 #include "SynTree/Declaration.h"
 
-// #define DEBUG
+#define DEBUG
 #ifdef DEBUG
 #define PRINT(x) x
@@ -365 +365 @@
                                                 PRINT( std::cerr << "basic type: " << k << std::endl; )
                                                 return new BasicType(tq, (BasicType::Kind)k);
+                                        });
+                                }
+                                // type variable types
+                                for (size_t k = 0; k < TypeDecl::NUMBER_OF_KINDS; ++k) {
+                                        parsers.emplace_back(Encoding::typeVariables[k], [k, this](Type::Qualifiers tq) -> TypeInstType * {
+                                                PRINT( std::cerr << "type variable type: " << k << std::endl; )
+                                                std::string name;
+                                                if (! extractName(name)) return nullptr;
+                                                return new TypeInstType(tq, name, (TypeDecl::Kind)k != TypeDecl::Ftype);
                                         });
                                 }
@@ -516 +525 @@
                                 if (done()) return nullptr;
 
+                                std::list<TypeDecl *> forall;
+                                if (isPrefix(Encoding::forall)) {
+                                        PRINT( std::cerr << "polymorphic with..." << std::endl; )
+                                        size_t dcount, fcount, vcount, acount;
+                                        if (! extractNumber(dcount)) return nullptr;
+                                        PRINT( std::cerr << dcount << " dtypes" << std::endl; )
+                                        if (! expect('_')) return nullptr;
+                                        if (! extractNumber(fcount)) return nullptr;
+                                        PRINT( std::cerr << fcount << " ftypes" << std::endl; )
+                                        if (! expect('_')) return nullptr;
+                                        if (! extractNumber(vcount)) return nullptr;
+                                        PRINT( std::cerr << vcount << " ttypes" << std::endl; )
+                                        if (! expect('_')) return nullptr;
+                                        if (! extractNumber(acount)) return nullptr;
+                                        PRINT( std::cerr << acount << " assertions" << std::endl; )
+                                        if (! expect('_')) return nullptr;
+                                        // recursively(?) parse `acount` assertions
+                                        if (! expect('_')) return nullptr;
+                                }
+
                                 // qualifiers
                                 Type::Qualifiers tq;
@@ -531 +560 @@
                                 });
                                 assertf(iter != parsers.end(), "Unhandled type letter: %c at index: %zd", cur(), idx);
-                                return iter->second(tq);
+                                Type * ret = iter->second(tq);
+                                if (! ret) return nullptr;
+                                ret->forall = std::move(forall);
+                                return ret;
                         }