Changeset 60aaa51d for src/AST/GenericSubstitution.cpp

Timestamp:

Jun 7, 2019, 4:14:48 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

05d55ff

Parents:

5684736

git-author:

Aaron Moss <a3moss@…> (06/07/19 16:14:40)

git-committer:

Aaron Moss <a3moss@…> (06/07/19 16:14:48)

Message:

More resolver porting; mostly CurrentObject?

File:

• src/AST/GenericSubstitution.cpp (modified) (2 diffs)

src/AST/GenericSubstitution.cpp

@@ -31 +31 @@
                 TypeSubstitution sub;
 
-                void previsit( const Type * ty ) {
-                        assertf( false, "Attempted generic substitution for non-aggregate type: %s",
-                                toString( ty ).c_str() );
+                void previsit( const Type * ) {
+                        // allow empty substitution for non-generic type
+                        visit_children = false;
                 }
 
@@ -40 +40 @@
                 }
 
-                void previsit( const ReferenceToType * ty ) {
+        private:
+                // make substitution for generic type
+                void makeSub( const ReferenceToType * ty ) {
                         visit_children = false;
-                        // build substitution from base parameters
                         const AggregateDecl * aggr = ty->aggr();
                         sub = TypeSubstitution{ aggr->params.begin(), aggr->params.end(), ty->params.begin() };
+                }
+
+        public:
+                void previsit( const StructInstType * ty ) {
+                        makeSub( ty );
+                }
+
+                void previsit( const UnionInstType * ty ) {
+                        makeSub( ty );
                 }
         };
 }
 
-TypeSubstitution genericSubsitution( const Type * ty ) {
+TypeSubstitution genericSubstitution( const Type * ty ) {
         Pass<GenericSubstitutionBuilder> builder;
         maybe_accept( ty, builder );