Changeset 70a06f6 for src/GenPoly/GenPoly.h

Timestamp:

Apr 14, 2016, 4:13:10 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

356189a

Parents:

db4ecc5 (diff), 37f0da8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/AddVisit.h
src/SymTab/Validate.cc
src/SynTree/Expression.cc
src/SynTree/Expression.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/iostream.c

File:

• src/GenPoly/GenPoly.h (modified) (3 diffs)

src/GenPoly/GenPoly.h

@@ -17 +17 @@
 #define GENPOLY_H
 
-#include <map>
 #include <string>
 #include <iostream>
 #include <utility>
+
+#include "ErasableScopedMap.h"
+
+#include "SymTab/Mangler.h"
 
 #include "SynTree/Declaration.h"
@@ -27 +30 @@
 
 namespace GenPoly {
-        typedef std::map< std::string, TypeDecl::Kind > TyVarMap;
+        typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
 
         /// A function needs an adapter if it returns a polymorphic value or if any of its
@@ -69 +72 @@
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap );
 
-        /// Gets the name of the sizeof parameter for the type
-        std::string sizeofName( Type *ty );
+        /// Gets the mangled name of this type; alias for SymTab::Mangler::mangleType().
+        inline std::string mangleType( Type *ty ) { return SymTab::Mangler::mangleType( ty ); }
+        
+        /// Gets the name of the sizeof parameter for the type, given its mangled name
+        inline std::string sizeofName( const std::string &name ) { return std::string( "_sizeof_" ) + name; }
 
-        /// Gets the name of the alignof parameter for the type
-        std::string alignofName( Type *ty );
+        /// Gets the name of the alignof parameter for the type, given its mangled name
+        inline std::string alignofName( const std::string &name ) { return std::string( "_alignof_" ) + name; }
 
-        /// Gets the name of the offsetof parameter for the type
-        std::string offsetofName( Type *ty );
+        /// Gets the name of the offsetof parameter for the type, given its mangled name
+        inline std::string offsetofName( const std::string &name ) { return std::string( "_offsetof_" ) + name; }
+
+        /// Gets the name of the layout function for a given aggregate type, given its declaration
+        inline std::string layoutofName( AggregateDecl *decl ) { return std::string( "_layoutof_" ) + decl->get_name(); }
+        
 } // namespace GenPoly