Changeset b66d14a for src/SymTab

Timestamp:

Jan 11, 2021, 10:10:33 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

20207c0

Parents:

2501ae5

Message:

add new type kinds DStype and ALtype

Location:

src/SymTab

Files:

• Demangle.cc (modified) (2 diffs)
• Mangler.cc (modified) (4 diffs)
• ManglerCommon.cc (modified) (2 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 : Tue Feb 11 15:09:18 2020
-// Update Count     : 10
+// Last Modified On : Mon Jan 11 21:28:27 2021
+// Update Count     : 11
 //
 
@@ -367 +367 @@
                                 // type variable types
                                 for (size_t k = 0; k < TypeDecl::NUMBER_OF_KINDS; ++k) {
-                                        static const std::string typeVariableNames[] = { "DT", "OT", "FT", "TT", };
+                                        static const std::string typeVariableNames[] = { "DT", "DST", "OT", "FT", "TT", "ALT", };
                                         static_assert(
                                                 sizeof(typeVariableNames)/sizeof(typeVariableNames[0]) == TypeDecl::NUMBER_OF_KINDS,

src/SymTab/Mangler.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Nov 18 12:01:38 2020
-// Update Count     : 64
+// Last Modified On : Mon Jan 11 21:56:06 2021
+// Update Count     : 74
 //
 #include "Mangler.h"
@@ -313 +313 @@
                                 // and the case has not yet come up in practice. Alternatively, if not then this code can be removed
                                 // aside from the assert false.
-                                assertf(false, "Mangler_old should not visit typedecl: %s", toCString(decl));
+                                assertf( false, "Mangler_old should not visit typedecl: %s", toCString(decl));
                                 assertf( decl->kind < TypeDecl::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
                                 mangleName += Encoding::typeVariables[ decl->kind ] + std::to_string( decl->name.length() ) + decl->name;
@@ -343 +343 @@
                                                         break;
                                                   default:
-                                                        assert( false );
+                                                        assertf( false, "unimplemented kind for type variable %s", SymTab::Mangler::Encoding::typeVariables[i->kind].c_str() );
                                                 } // switch
                                                 varNums[ i->name ] = std::make_pair( nextVarNum, (int)i->kind );
@@ -673 +673 @@
                                         for ( auto & decl : ptype->forall ) {
                                                 switch ( decl->kind ) {
-                                                case ast::TypeDecl::Kind::Dtype:
+                                                  case ast::TypeDecl::Kind::Dtype:
                                                         dcount++;
                                                         break;
-                                                case ast::TypeDecl::Kind::Ftype:
+                                                  case ast::TypeDecl::Kind::Ftype:
                                                         fcount++;
                                                         break;
-                                                case ast::TypeDecl::Kind::Ttype:
+                                                  case ast::TypeDecl::Kind::Ttype:
                                                         vcount++;
                                                         break;
-                                                default:
-                                                        assert( false );
+                                                  default:
+                                                        assertf( false, "unimplemented kind for type variable %s", SymTab::Mangler::Encoding::typeVariables[decl->kind].c_str() );
                                                 } // switch
                                                 varNums[ decl->name ] = std::make_pair( nextVarNum, (int)decl->kind );

src/SymTab/ManglerCommon.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:44:03 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 14:54:38 2019
-// Update Count     : 28
+// Last Modified On : Mon Jan 11 21:23:10 2021
+// Update Count     : 29
 //
 
@@ -104 +104 @@
                         const std::string typeVariables[] = {
                                 "BD", // dtype
+                                "BDS", // dtype + sized
                                 "BO", // otype
                                 "BF", // ftype
                                 "BT", // ttype
+                                "BAL", // array length type
                         };
                         static_assert(
-                                sizeof(typeVariables)/sizeof(typeVariables[0]) == TypeDecl::NUMBER_OF_KINDS,
+                                sizeof(typeVariables) / sizeof(typeVariables[0]) == TypeDecl::NUMBER_OF_KINDS,
                                 "Each type variable kind should have a corresponding mangler prefix"
                         );