Changeset a137d5a

Timestamp:

Oct 31, 2023, 2:53:39 PM (14 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

6e7ed0aa

Parents:

58c64323

Message:

Took out some old code from the new section of the Mangler.

File:

• src/SymTab/Mangler.cc (modified) (10 diffs)

src/SymTab/Mangler.cc

@@ -22 +22 @@
 #include <string>                        // for string, char_traits, operator<<
 
+#include "AST/Pass.hpp"
 #include "CodeGen/OperatorTable.h"       // for OperatorInfo, operatorLookup
 #include "Common/PassVisitor.h"
@@ -31 +32 @@
 #include "SynTree/Expression.h"          // for TypeExpr, Expression, operator<<
 #include "SynTree/Type.h"                // for Type, ReferenceToType, Type::Fora...
-
-#include "AST/Pass.hpp"
 
 namespace SymTab {
@@ -476 +475 @@
                                 mangleName += std::to_string( decl->name.size() ) + decl->name;
                         } // if
-                        maybeAccept( decl->get_type(), *visitor );
+                        decl->get_type()->accept( *visitor );
                         if ( mangleOverridable && decl->linkage.is_overrideable ) {
                                 // want to be able to override autogenerated and intrinsic routines,
@@ -522 +521 @@
                         printQualifiers( arrayType );
                         mangleName += Encoding::array + "0";
-                        maybeAccept( arrayType->base.get(), *visitor );
+                        arrayType->base->accept( *visitor );
                 }
 
@@ -532 +531 @@
                         inFunctionType = true;
                         printQualifiers( refType );
-                        maybeAccept( refType->base.get(), *visitor );
+                        refType->base->accept( *visitor );
                 }
 
@@ -561 +560 @@
                                         auto paramType = dynamic_cast< const ast::TypeExpr * >( param );
                                         assertf(paramType, "Aggregate parameters should be type expressions: %s", toCString(param));
-                                        maybeAccept( paramType->type.get(), *visitor );
+                                        paramType->type->accept( *visitor );
                                 }
                                 mangleName += "_";
@@ -590 +589 @@
                                 // are equivalent and should mangle the same way. This is accomplished by numbering the type variables when they
                                 // are first found and prefixing with the appropriate encoding for the type class.
-                                assertf( varNum->second.second < TypeDecl::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", varNum->second.second );
+                                assertf( varNum->second.second < ast::TypeDecl::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", varNum->second.second );
                                 mangleName += Encoding::typeVariables[varNum->second.second] + std::to_string( varNum->second.first );
                         } // if
@@ -622 +621 @@
                 void Mangler_new::postvisit( const ast::QualifiedType * qualType ) {
                         bool inqual = inQualifiedType;
-                        if (! inqual ) {
+                        if ( !inqual ) {
                                 // N marks the start of a qualified type
                                 inQualifiedType = true;
                                 mangleName += Encoding::qualifiedTypeStart;
                         }
-                        maybeAccept( qualType->parent.get(), *visitor );
-                        maybeAccept( qualType->child.get(), *visitor );
-                        if ( ! inqual ) {
+                        qualType->parent->accept( *visitor );
+                        qualType->child->accept( *visitor );
+                        if ( !inqual ) {
                                 // E marks the end of a qualified type
                                 inQualifiedType = false;
@@ -691 +690 @@
                                 // these qualifiers do not distinguish the outermost type of a function parameter
                                 if ( type->is_const() ) {
-                                        mangleName += Encoding::qualifiers.at(Type::Const);
+                                        mangleName += Encoding::qualifiers.at( ast::CV::Const );
                                 } // if
                                 if ( type->is_volatile() ) {
-                                        mangleName += Encoding::qualifiers.at(Type::Volatile);
+                                        mangleName += Encoding::qualifiers.at( ast::CV::Volatile );
                                 } // if
                                 // Removed due to restrict not affecting function compatibility in GCC
@@ -701 +700 @@
                                 // } // if
                                 if ( type->is_atomic() ) {
-                                        mangleName += Encoding::qualifiers.at(Type::Atomic);
+                                        mangleName += Encoding::qualifiers.at( ast::CV::Atomic );
                                 } // if
                         }
                         if ( type->is_mutex() ) {
-                                mangleName += Encoding::qualifiers.at(Type::Mutex);
+                                mangleName += Encoding::qualifiers.at( ast::CV::Mutex );
                         } // if
                         if ( inFunctionType ) {