Changeset 3c13c03 for src/SynTree

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?

Location:

src/SynTree

Files:

• Expression.cc (modified) (4 diffs)
• Expression.h (modified) (2 diffs)
• Mutator.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• TupleExpr.cc (modified) (5 diffs)
• Visitor.cc (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Expression.cc

@@ -522 +522 @@
 
 CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : type( type ), initializer( initializer ) {
+        assert( type && initializer );
         set_result( type->clone() );
 }
 
-CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), type( maybeClone( other.type ) ), initializer( maybeClone( other.initializer ) ) {}
+CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), type( other.type->clone() ), initializer( other.initializer->clone() ) {}
 
 CompoundLiteralExpr::~CompoundLiteralExpr() {
@@ -534 +535 @@
 void CompoundLiteralExpr::print( std::ostream &os, int indent ) const {
         os << "Compound Literal Expression: " << std::endl;
-        if ( type ) type->print( os, indent + 2 );
-        if ( initializer ) initializer->print( os, indent + 2 );
+        os << std::string( indent+2, ' ' );
+        type->print( os, indent + 2 );
+        os << std::string( indent+2, ' ' );
+        initializer->print( os, indent + 2 );
 }
 
@@ -549 +552 @@
 
 RangeExpr::RangeExpr( Expression *low, Expression *high ) : low( low ), high( high ) {}
-RangeExpr::RangeExpr( const RangeExpr &other ) : low( other.low->clone() ), high( other.high->clone() ) {}
+RangeExpr::RangeExpr( const RangeExpr &other ) : Expression( other ), low( other.low->clone() ), high( other.high->clone() ) {}
 void RangeExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Range Expression: ";
+        os << "Range Expression: ";
         low->print( os, indent );
         os << " ... ";
@@ -566 +569 @@
         }
 }
-StmtExpr::StmtExpr( const StmtExpr &other ) : statements( other.statements->clone() ) {}
+StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {}
 StmtExpr::~StmtExpr() {
         delete statements;
 }
 void StmtExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Statement Expression: " << std::endl;
+        os << "Statement Expression: " << std::endl << std::string( indent, ' ' );
         statements->print( os, indent+2 );
+}
+
+
+UniqueExpr::UniqueExpr( Expression *expr ) : expr( new Expression* ) {
+        set_expr( expr );
+        assert( expr );
+        assert( expr->has_result() );
+        set_result( expr->get_result()->clone() );
+}
+UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( other.expr ) {
+}
+UniqueExpr::~UniqueExpr() {
+        if ( expr.unique() ) {
+                delete *expr;
+        }
+}
+void UniqueExpr::print( std::ostream &os, int indent ) const {
+        os << "Unique Expression: " << std::endl << std::string( indent+2, ' ' );
+        get_expr()->print( os, indent+2 );
 }
 

src/SynTree/Expression.h

@@ -639 +639 @@
 class TupleExpr : public Expression {
   public:
-        TupleExpr( Expression *_aname = nullptr );
+        TupleExpr( const std::list< Expression * > & exprs = std::list< Expression * >(), Expression *_aname = nullptr );
         TupleExpr( const TupleExpr &other );
         virtual ~TupleExpr();
@@ -733 +733 @@
 };
 
+class UniqueExpr : public Expression {
+public:
+        UniqueExpr( Expression * expr );
+        UniqueExpr( const UniqueExpr & other );
+        ~UniqueExpr();
+
+        Expression * get_expr() const { return *expr; }
+        UniqueExpr * set_expr( Expression * newValue ) { *expr = newValue; return this; }
+
+        virtual UniqueExpr *clone() const { return new UniqueExpr( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Expression *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+private:
+        std::shared_ptr< Expression * > expr;
+};
+
 std::ostream & operator<<( std::ostream & out, const Expression * expr );
 

src/SynTree/Mutator.cc

@@ -384 +384 @@
 }
 
+Expression *Mutator::mutate( UniqueExpr *uniqueExpr ) {
+        uniqueExpr->set_result( maybeMutate( uniqueExpr->get_result(), *this ) );
+        uniqueExpr->set_expr( maybeMutate( uniqueExpr->get_expr(), *this ) );
+        return uniqueExpr;
+}
+
 Type *Mutator::mutate( VoidType *voidType ) {
         mutateAll( voidType->get_forall(), *this );

src/SynTree/Mutator.h

@@ -83 +83 @@
         virtual Expression* mutate( TupleAssignExpr *assignExpr );
         virtual Expression* mutate( StmtExpr * stmtExpr );
+        virtual Expression* mutate( UniqueExpr * uniqueExpr );
 
         virtual Type* mutate( VoidType *basicType );

src/SynTree/SynTree.h

@@ -88 +88 @@
 class TupleAssignExpr;
 class StmtExpr;
+class UniqueExpr;
 
 class Type;

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;

src/SynTree/Visitor.cc

@@ -326 +326 @@
 }
 
+void Visitor::visit( UniqueExpr *uniqueExpr ) {
+        maybeAccept( uniqueExpr->get_result(), *this );
+        maybeAccept( uniqueExpr->get_expr(), *this );
+}
+
 void Visitor::visit( VoidType *voidType ) {
         acceptAll( voidType->get_forall(), *this );

src/SynTree/Visitor.h

@@ -83 +83 @@
         virtual void visit( TupleAssignExpr *assignExpr );
         virtual void visit( StmtExpr * stmtExpr );
+        virtual void visit( UniqueExpr * uniqueExpr );
 
         virtual void visit( VoidType *basicType );