Changeset 2890212 for src/AST/TypeSubstitution.hpp

Timestamp:

Jul 31, 2019, 3:23:04 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ae265b55, f49b3fc

Parents:

504eb72

Message:

Startup.cfa now compiles with new ast

File:

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

src/AST/TypeSubstitution.hpp

@@ -44 +44 @@
         TypeSubstitution &operator=( const TypeSubstitution &other );
 
-        template< typename SynTreeClass > int apply( const SynTreeClass *& input ) const;
-        template< typename SynTreeClass > int applyFree( const SynTreeClass *& input ) const;
+        template< typename SynTreeClass >
+        struct ApplyResult {
+                const SynTreeClass * node;
+                int count;
+        };
+
+        template< typename SynTreeClass > ApplyResult<SynTreeClass> apply( const SynTreeClass * input ) const;
+        template< typename SynTreeClass > ApplyResult<SynTreeClass> 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;
+                auto ret = apply(p);
+                input = ret.node;
+                return ret.count;
         }
 
@@ -58 +64 @@
         int applyFree( ptr_base< node_t, ref_t > & input ) const {
                 const node_t * p = input.get();
-                int ret = applyFree(p);
-                input = p;
-                return ret;
+                auto ret = applyFree(p);
+                input = ret.node;
+                return ret.count;
         }
 
@@ -175 +181 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::apply( const SynTreeClass *& input ) const {
+TypeSubstitution::ApplyResult<SynTreeClass> TypeSubstitution::apply( const SynTreeClass * input ) const {
         assert( input );
         Pass<Substituter> sub( *this, false );
         input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
-///     std::cerr << "substitution result is: ";
-///     newType->print( std::cerr );
-///     std::cerr << std::endl;
-        return sub.pass.subCount;
+        return { input, sub.pass.subCount };
 }
 
 template< typename SynTreeClass >
-int TypeSubstitution::applyFree( const SynTreeClass *& input ) const {
+TypeSubstitution::ApplyResult<SynTreeClass> TypeSubstitution::applyFree( const SynTreeClass * input ) const {
         assert( input );
         Pass<Substituter> sub( *this, true );
         input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
-///     std::cerr << "substitution result is: ";
-///     newType->print( std::cerr );
-///     std::cerr << std::endl;
-        return sub.pass.subCount;
+        return { input, sub.pass.subCount };
 }