Changeset 0026d67

Timestamp:

Oct 27, 2022, 12:29:48 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

22a0e87

Parents:

63d1ebe

Message:

Replaced Mangle::typeMode() with Mangle::mangleType(...), as it is how typeMode() was always used and it is shorter. Various other clean-up in the Mangler files.

Location:

src

Files:

• GenPoly/ScrubTyVars.cc (modified) (3 diffs)
• ResolvExpr/SatisfyAssertions.cpp (modified) (1 diff)
• SymTab/Mangler.cc (modified) (4 diffs)
• SymTab/Mangler.h (modified) (4 diffs)
• Virtual/ExpandCasts.cc (modified) (2 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -20 +20 @@
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ScrubTyVars.h"
-#include "SymTab/Mangler.h"             // for mangle, typeMode
+#include "SymTab/Mangler.h"             // for mangleType
 #include "SynTree/Declaration.h"        // for TypeDecl, TypeDecl::Data, Typ...
 #include "SynTree/Expression.h"         // for Expression (ptr only), NameExpr
@@ -227 +227 @@
         if ( dynType ) {
                 return new ast::NameExpr( expr->location,
-                        sizeofName( Mangle::mangle( dynType, Mangle::typeMode() ) ) );
+                        sizeofName( Mangle::mangleType( dynType ) ) );
         } else {
                 return expr;
@@ -237 +237 @@
         if ( dynType ) {
                 return new ast::NameExpr( expr->location,
-                        alignofName( Mangle::mangle( dynType, Mangle::typeMode() ) ) );
+                        alignofName( Mangle::mangleType( dynType ) ) );
         } else {
                 return expr;

src/ResolvExpr/SatisfyAssertions.cpp

@@ -268 +268 @@
                 ast::ptr< ast::Type > resType = cand.expr->result;
                 cand.env.apply( resType );
-                return Mangle::mangle( resType, Mangle::typeMode() );
+                return Mangle::mangleType( resType );
         }
 

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 11 21:56:06 2021
-// Update Count     : 74
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Oct 21 16:18:00 2022
+// Update Count     : 75
 //
 #include "Mangler.h"
@@ -418 +418 @@
                         void postvisit( const ast::QualifiedType * qualType );
 
-                        std::string get_mangleName() { return mangleName; }
+                        /// The result is the current constructed mangled name.
+                        std::string result() const { return mangleName; }
                   private:
                         std::string mangleName;         ///< Mangled name being constructed
@@ -444 +445 @@
         } // namespace
 
-
         std::string mangle( const ast::Node * decl, Mangle::Mode mode ) {
-                ast::Pass<Mangler_new> mangler( mode );
-                maybeAccept( decl, mangler );
-                return mangler.core.get_mangleName();
+                return ast::Pass<Mangler_new>::read( decl, mode );
         }
 
@@ -689 +687 @@
                                         } // for
                                         for ( auto & assert : ptype->assertions ) {
-                                                ast::Pass<Mangler_new> sub_mangler(
-                                                        mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
-                                                assert->var->accept( sub_mangler );
-                                                assertionNames.push_back( sub_mangler.core.get_mangleName() );
+                                                assertionNames.push_back( ast::Pass<Mangler_new>::read(
+                                                        assert->var.get(),
+                                                        mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums ) );
                                                 acount++;
                                         } // for

src/SymTab/Mangler.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:44:03 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:45:30 2017
-// Update Count     : 15
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Oct 27 11:58:00 2022
+// Update Count     : 16
 //
 
@@ -22 +22 @@
 
 #include "AST/Bitfield.hpp"
-#include "AST/Fwd.hpp"
 #include "SynTree/SynTree.h"  // for Types
 #include "SynTree/Visitor.h"  // for Visitor, maybeAccept
@@ -33 +32 @@
 // * Currently name compression is not implemented.
 
+namespace ast {
+        class Node;
+}
 namespace ResolvExpr {
         class TypeEnvironment;
@@ -101 +103 @@
         using Mode = bitfield<mangle_flags>;
 
-        static inline Mode typeMode() { return NoOverrideable | Type; }
+        /// Mangle declaration name.
+        std::string mangle( const ast::Node * decl, Mode mode = {} );
 
-        /// Mangle declaration name
-        std::string mangle( const ast::Node * decl, Mode mode = {} );
+        /// Most common mangle configuration for types.
+        static inline std::string mangleType( const ast::Node * type ) {
+                return mangle( type, { NoOverrideable | Type } );
+        }
 
         namespace Encoding {

src/Virtual/ExpandCasts.cc

@@ -295 +295 @@
         // returns the previous declaration for error messages.
         ast::ObjectDecl const * insert( ast::ObjectDecl const * typeIdDecl ) {
-                std::string const & mangledName =
-                                Mangle::mangle( typeIdDecl->type, Mangle::typeMode() );
+                std::string mangledName = Mangle::mangleType( typeIdDecl->type );
                 ast::ObjectDecl const *& value = instances[ mangledName ];
                 if ( value ) {
@@ -310 +309 @@
 
         ast::ObjectDecl const * lookup( ast::Type const * typeIdType ) {
-                std::string const & mangledName =
-                                Mangle::mangle( typeIdType, Mangle::typeMode() );
+                std::string mangledName = Mangle::mangleType( typeIdType );
                 auto const it = instances.find( mangledName );
                 return ( instances.end() == it ) ? nullptr : it->second;