Changeset 3c13c03 for src/SynTree/TupleExpr.cc

Timestamp:

Sep 17, 2016, 8:27:51 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

8c49c0e

Parents:

12bc63a

Message:

expand TupleExpr? and TupleIndexExpr?, add UniqueExpr?

File:

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

src/SynTree/TupleExpr.cc

@@ -18 +18 @@
 #include "Type.h"
 #include "Declaration.h"
+#include "Tuples/Tuples.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 ) );
+                }
+        }
 }
 
@@ -36 +42 @@
 }
 
-TupleIndexExpr::TupleIndexExpr( Expression * tuple, unsigned int index ) {
+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 ) );
+        assert( type->size() > index );
+        set_result( (*std::next( type->get_types().begin(), index ))->clone() );
 }
 
@@ -51 +57 @@
 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;
@@ -70 +77 @@
 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 );
@@ -97 +106 @@
 
 void TupleAssignExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Tuple Assignment Expression, with temporaries:" << std::endl;
+        os << "Tuple Assignment Expression, with temporaries:" << std::endl;
         printAll( tempDecls, os, indent+4 );
         os << std::string( indent+2, ' ' ) << "with assignments: " << std::endl;