Changeset bf32bb8 for src/SynTree

Timestamp:

Oct 18, 2016, 4:23:04 PM (9 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:

f0121d7

Parents:

848ce71

Message:

implement transformation for MemberTupleExprs?

Location:

src/SynTree

Files:

• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (3 diffs)

src/SynTree/Expression.cc ¶

@@ -580 +580 @@
 
 
-UniqueExpr::UniqueExpr( Expression *expr ) : expr( new Expression* ) {
+long long UniqueExpr::count = 0;
+UniqueExpr::UniqueExpr( Expression *expr, long long idVal ) : expr( new Expression* ), id( idVal ) {
+        assert( count != -1 );
+        if ( id == -1 ) id = count++;
         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 ) {
+        if ( expr->get_result() ) {
+                set_result( expr->get_result()->clone() );
+        }
+}
+UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( other.expr ), id( other.id ) {
 }
 UniqueExpr::~UniqueExpr() {
@@ -594 +598 @@
 }
 void UniqueExpr::print( std::ostream &os, int indent ) const {
-        os << "Unique Expression: " << std::endl << std::string( indent+2, ' ' );
+        os << "Unique Expression with id:" << id << std::endl << std::string( indent+2, ' ' );
         get_expr()->print( os, indent+2 );
 }

src/SynTree/Expression.h ¶

@@ -735 +735 @@
 class UniqueExpr : public Expression {
 public:
-        UniqueExpr( Expression * expr );
+        UniqueExpr( Expression * expr, long long idVal = -1 );
         UniqueExpr( const UniqueExpr & other );
         ~UniqueExpr();
@@ -742 +742 @@
         UniqueExpr * set_expr( Expression * newValue ) { *expr = newValue; return this; }
 
+        int get_id() const { return id; }
+
         virtual UniqueExpr *clone() const { return new UniqueExpr( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -748 +750 @@
 private:
         std::shared_ptr< Expression * > expr;
+        int id;
+        static long long count;
 };