Changeset 514a791 for src

Timestamp:

May 21, 2019, 4:33:30 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

a1b154d, b869ec5

Parents:

a83044fb

Message:

Fix compile errors on previous push

Location:

src/AST

Files:

• Convert.cpp (modified) (4 diffs)
• Type.cpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -50 +50 @@
                 ConverterNewToOld & visitor;
 
-                template<typename U>
-                T * accept1( const ast::ptr<U> & ptr ) {
+                template<typename U, enum ast::Node::ref_type R>
+                T * accept1( const ast::ptr_base<U, R> & ptr ) {
                         if ( ! ptr ) return nullptr;
                         ptr->accept( visitor );
@@ -95 +95 @@
 
         template<typename NewT, typename OldT>
-        NewT * cached( OldT * old ) {
-                auto it = cache.find( old );
-                // doesn't update cache, that should be handled by the accept function
-                ast::Node * nw = it == cache.end() ? getAccept1< NewT >( old ) : it->second;
-                return strict_dynamic_cast< NewT * >( nw );
+        NewT * cached( const OldT & old ) {
+                auto it = cache.find( old.get() );
+                if ( it == cache.end() ) {
+                        // doesn't update cache, that should be handled by the accept function
+                        return get< NewT >().accept1( old );
+                } else {
+                        return strict_dynamic_cast< NewT * >( it->second );
+                }
         }
 
@@ -797 +800 @@
                 ty->parameters = get<DeclarationWithType>().acceptL( node->params );
                 ty->forall = get<TypeDecl>().acceptL( node->forall );
-                node = ty;
+                this->node = ty;
                 return nullptr;
         }
@@ -1679 +1682 @@
 
         virtual void visit( TypeInstType * old ) override final {
-                auto ty = new ast::TypeInstType{
-                        cached< ast::TypeDecl >( old->baseStruct ),
-                        cv( old ),
-                        GET_ACCEPT_V( attributes, Attribute )
-                };
+                ast::TypeInstType * ty;
+                if ( old->baseType ) {
+                        ty = new ast::TypeInstType{
+                                old->name,
+                                cached< ast::TypeDecl >( old->baseType ),
+                                cv( old ),
+                                GET_ACCEPT_V( attributes, Attribute )
+                        };
+                } else {
+                        ty = new ast::TypeInstType{
+                                old->name,
+                                old->isFtype ? ast::TypeVar::Ftype : ast::TypeVar::Dtype,
+                                cv( old ),
+                                GET_ACCEPT_V( attributes, Attribute )
+                        };
+                }
                 postvisit( old, ty );
                 this->node = ty;

src/AST/Type.cpp

@@ -141 +141 @@
 bool EnumInstType::isComplete() const { return base ? base->body : false; }
 
+// --- TraitInstType
+
+TraitInstType::TraitInstType( const TraitDecl * b, CV::Qualifiers q,
+        std::vector<ptr<Attribute>>&& as )
+: ReferenceToType( b->name, q, std::move(as) ), base( b ) {}
+
 // --- TypeInstType