Changes in src/GenPoly/Lvalue.cc [acd7c5dd:8ca3a72]

File:

• src/GenPoly/Lvalue.cc (modified) (4 diffs)

src/GenPoly/Lvalue.cc

@@ -27 +27 @@
 #include "SynTree/Mutator.h"
 #include "SymTab/Indexer.h"
-
 #include "ResolvExpr/Resolver.h"
-#include "ResolvExpr/TypeEnvironment.h"
 #include "ResolvExpr/typeops.h"
-#include "ResolvExpr/Unify.h"
 
 #include "Common/UniqueName.h"
@@ -63 +60 @@
                         typedef Mutator Parent;
 
-                        virtual Expression * mutate( MemberExpr * memExpr );
                         virtual Expression * mutate( AddressExpr * addressExpr );
-
-                        template<typename Func>
-                        Expression * applyTransformation( Expression * expr, Expression * arg, Func mkExpr );
                 };
         } // namespace
@@ -78 +71 @@
                 acceptAll( translationUnit, p2 );
                 mutateAll( translationUnit, genLval );
-        }
-
-        Expression * generalizedLvalue( Expression * expr ) {
-                GeneralizedLvalue genLval;
-                return expr->acceptMutator( genLval );
         }
 
@@ -175 +163 @@
                 }
 
-                template<typename Func>
-                Expression * GeneralizedLvalue::applyTransformation( Expression * expr, Expression * arg, Func mkExpr ) {
-                        if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( arg ) ) {
+                Expression * GeneralizedLvalue::mutate( AddressExpr * addrExpr ) {
+                        addrExpr = safe_dynamic_cast< AddressExpr * >( Parent::mutate( addrExpr ) );
+                        if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( addrExpr->get_arg() ) ) {
                                 Expression * arg1 = commaExpr->get_arg1()->clone();
                                 Expression * arg2 = commaExpr->get_arg2()->clone();
-                                Expression * ret = new CommaExpr( arg1, mkExpr( arg2 ) );
-                                ret->set_env( expr->get_env() );
-                                expr->set_env( nullptr );
-                                delete expr;
-                                return ret->acceptMutator( *this );
-                        } else if ( ConditionalExpr * condExpr = dynamic_cast< ConditionalExpr * >( arg ) ) {
+                                delete addrExpr;
+                                return new CommaExpr( arg1, new AddressExpr( arg2 ) );
+                        } else if ( ConditionalExpr * condExpr = dynamic_cast< ConditionalExpr * >( addrExpr->get_arg() ) ) {
                                 Expression * arg1 = condExpr->get_arg1()->clone();
                                 Expression * arg2 = condExpr->get_arg2()->clone();
                                 Expression * arg3 = condExpr->get_arg3()->clone();
-                                ConditionalExpr * ret = new ConditionalExpr( arg1, mkExpr( arg2 ), mkExpr( arg3 ) );
-                                ret->set_env( expr->get_env() );
-                                expr->set_env( nullptr );
-                                delete expr;
-
-                                // conditional expr type may not be either of the argument types, need to unify
-                                using namespace ResolvExpr;
-                                Type* commonType = nullptr;
-                                TypeEnvironment newEnv;
-                                AssertionSet needAssertions, haveAssertions;
-                                OpenVarSet openVars;
-                                unify( ret->get_arg2()->get_result(), ret->get_arg3()->get_result(), newEnv, needAssertions, haveAssertions, openVars, SymTab::Indexer(), commonType );
-                                ret->set_result( commonType ? commonType : ret->get_arg2()->get_result()->clone() );
-                                return ret->acceptMutator( *this );
+                                delete addrExpr;
+                                return new ConditionalExpr( arg1, new AddressExpr( arg2 ), new AddressExpr( arg3 ) );
                         }
-                        return expr;
-                }
-
-                Expression * GeneralizedLvalue::mutate( MemberExpr * memExpr ) {
-                        Parent::mutate( memExpr );
-                        return applyTransformation( memExpr, memExpr->get_aggregate(), [=]( Expression * aggr ) { return new MemberExpr( memExpr->get_member(), aggr ); } );
-                }
-
-                Expression * GeneralizedLvalue::mutate( AddressExpr * addrExpr ) {
-                        addrExpr = safe_dynamic_cast< AddressExpr * >( Parent::mutate( addrExpr ) );
-                        return applyTransformation( addrExpr, addrExpr->get_arg(), []( Expression * arg ) { return new AddressExpr( arg ); } );
+                        return addrExpr;
                 }
         } // namespace