Changeset 1f44196 for src/SynTree/TupleExpr.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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' of plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/SynTree/TupleExpr.cc (modified) (3 diffs)

src/SynTree/TupleExpr.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TupleExpr.cc -- 
+// TupleExpr.cc --
 //
 // Author           : Richard C. Bilson
@@ -16 +16 @@
 #include "Expression.h"
 #include "Common/utility.h"
+#include "Type.h"
+#include "Declaration.h"
+#include "Tuples/Tuples.h"
+#include "VarExprReplacer.h"
 
-TupleExpr::TupleExpr( Expression *_aname ) : Expression( _aname ) {
+TupleExpr::TupleExpr( const std::list< Expression * > & exprs, Expression *_aname ) : Expression( _aname ), exprs( exprs ) {
+        if ( ! exprs.empty() ) {
+                if ( std::all_of( exprs.begin(), exprs.end(), [](Expression * expr) { return expr->get_result(); } ) ) {
+                        set_result( Tuples::makeTupleType( exprs ) );
+                }
+        }
 }
 
@@ -29 +38 @@
 
 void TupleExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Tuple:" << std::endl;
+        os << "Tuple:" << std::endl;
         printAll( exprs, os, indent+2 );
         Expression::print( os, indent );
 }
 
-SolvedTupleExpr::SolvedTupleExpr( std::list<Expression *> &_exprs, Expression *_aname ) : Expression( _aname ) {
-        std::copy(_exprs.begin(), _exprs.end(), back_inserter(exprs));
+TupleIndexExpr::TupleIndexExpr( Expression * tuple, unsigned int index ) : tuple( tuple ), index( index )  {
+        TupleType * type = safe_dynamic_cast< TupleType * >( tuple->get_result() );
+        assert( type->size() > index );
+        set_result( (*std::next( type->get_types().begin(), index ))->clone() );
+        get_result()->set_isLvalue( type->get_isLvalue() );
 }
 
-SolvedTupleExpr::SolvedTupleExpr( const SolvedTupleExpr &other ) : Expression( other ) {
-        cloneAll( other.exprs, exprs );
+TupleIndexExpr::TupleIndexExpr( const TupleIndexExpr &other ) : Expression( other ), tuple( other.tuple->clone() ), index( other.index ) {
 }
 
-void SolvedTupleExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Solved Tuple:" << std::endl;
-        printAll( exprs, os, indent+2 );
+TupleIndexExpr::~TupleIndexExpr() {
+        delete tuple;
+}
+
+void TupleIndexExpr::print( std::ostream &os, int indent ) const {
+        os << "Tuple Index Expression, with tuple:" << std::endl;
+        os << std::string( indent+2, ' ' );
+        tuple->print( os, indent+2 );
+        os << std::string( indent+2, ' ' ) << "with index: " << index << std::endl;
         Expression::print( os, indent );
 }
+
+MemberTupleExpr::MemberTupleExpr( Expression * member, Expression * aggregate, Expression * _aname ) : Expression( _aname ) {
+        set_result( maybeClone( member->get_result() ) ); // xxx - ???
+}
+
+MemberTupleExpr::MemberTupleExpr( const MemberTupleExpr &other ) : Expression( other ), member( other.member->clone() ), aggregate( other.aggregate->clone() ) {
+}
+
+MemberTupleExpr::~MemberTupleExpr() {
+        delete member;
+        delete aggregate;
+}
+
+void MemberTupleExpr::print( std::ostream &os, int indent ) const {
+        os << "Member Tuple Expression, with aggregate:" << std::endl;
+        os << std::string( indent+2, ' ' );
+        aggregate->print( os, indent+2 );
+        os << std::string( indent+2, ' ' ) << "with member: " << std::endl;
+        os << std::string( indent+2, ' ' );
+        member->print( os, indent+2 );
+        Expression::print( os, indent );
+}
+
+
+TupleAssignExpr::TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls, Expression * _aname ) : Expression( _aname ), assigns( assigns ), tempDecls( tempDecls ) {
+        set_result( Tuples::makeTupleType( assigns ) );
+}
+
+TupleAssignExpr::TupleAssignExpr( const TupleAssignExpr &other ) : Expression( other ) {
+        cloneAll( other.assigns, assigns );
+        cloneAll( other.tempDecls, tempDecls );
+
+        // clone needs to go into assigns and replace tempDecls
+        VarExprReplacer::DeclMap declMap;
+        std::list< ObjectDecl * >::const_iterator origit = other.tempDecls.begin();
+        for ( ObjectDecl * temp : tempDecls ) {
+                assert( origit != other.tempDecls.end() );
+                ObjectDecl * origTemp = *origit++;
+                assert( origTemp );
+                assert( temp->get_name() == origTemp->get_name() );
+                declMap[ origTemp ] = temp;
+        }
+        if ( ! declMap.empty() ) {
+                VarExprReplacer replacer( declMap );
+                for ( Expression * assn : assigns ) {
+                        assn->accept( replacer );
+                }
+        }
+}
+
+TupleAssignExpr::~TupleAssignExpr() {
+        deleteAll( assigns );
+        // deleteAll( tempDecls );
+}
+
+void TupleAssignExpr::print( std::ostream &os, int indent ) const {
+        os << "Tuple Assignment Expression, with temporaries:" << std::endl;
+        printAll( tempDecls, os, indent+4 );
+        os << std::string( indent+2, ' ' ) << "with assignments: " << std::endl;
+        printAll( assigns, os, indent+4 );
+        Expression::print( os, indent );
+}
+
+
 
 // Local Variables: //