Changeset d908563 for src/AST/TypeSubstitution.hpp

Timestamp:

May 27, 2019, 11:08:54 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

f88a252

Parents:

933f32f (diff), 21a44ca (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 cleanup-dtors

File:

• src/AST/TypeSubstitution.hpp (modified) (4 diffs)

src/AST/TypeSubstitution.hpp

@@ -25 +25 @@
 #include "Fwd.hpp"        // for UniqueId
 #include "ParseNode.hpp"
-#include "Type.hpp"       // for ptr<Type>
+#include "Type.hpp"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Visitor.hpp"
 #include "Decl.hpp"
 #include "Expr.hpp"
+#include "Node.hpp"
 
 namespace ast {
@@ -43 +44 @@
         TypeSubstitution &operator=( const TypeSubstitution &other );
 
-        template< typename SynTreeClass > int apply( SynTreeClass *&input ) const;
-        template< typename SynTreeClass > int applyFree( SynTreeClass *&input ) const;
+        template< typename SynTreeClass > int apply( const SynTreeClass *& input ) const;
+        template< typename SynTreeClass > int applyFree( const SynTreeClass *& input ) const;
+
+        template< typename node_t, enum Node::ref_type ref_t >
+        int apply( ptr_base< node_t, ref_t > & input ) const {
+                const node_t * p = input.get();
+                int ret = apply(p);
+                input = p;
+                return ret;
+        }
+
+        template< typename node_t, enum Node::ref_type ref_t >
+        int applyFree( ptr_base< node_t, ref_t > & input ) const {
+                const node_t * p = input.get();
+                int ret = applyFree(p);
+                input = p;
+                return ret;
+        }
 
         void add( std::string formalType, const Type *actualType );
@@ -162 +179 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::apply( SynTreeClass *&input ) const {
+int TypeSubstitution::apply( const SynTreeClass *& input ) const {
         assert( input );
         Pass<Substituter> sub( *this, false );
-        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
-        assert( input );
+        input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
 ///     std::cerr << "substitution result is: ";
 ///     newType->print( std::cerr );
@@ -174 +190 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::applyFree( SynTreeClass *&input ) const {
+int TypeSubstitution::applyFree( const SynTreeClass *& input ) const {
         assert( input );
         Pass<Substituter> sub( *this, true );
-        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
-        assert( input );
+        input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
 ///     std::cerr << "substitution result is: ";
 ///     newType->print( std::cerr );