Changeset 141b786 for src/SynTree

Timestamp:

Nov 9, 2016, 2:21:05 PM (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:

b726084

Parents:

23bb1b9

Message:

rework UniqueExpr?, handle UniqueExpr? in FixInit?, fix translation for UniqueExprs?, refactor explode functions and fix AddressExpr? distribution over exploded tuple exprs

Location:

src/SynTree

Files:

• Expression.cc (modified) (1 diff)
• Expression.h (modified) (2 diffs)

src/SynTree/Expression.cc ¶

@@ -609 +609 @@
 
 long long UniqueExpr::count = 0;
-UniqueExpr::UniqueExpr( Expression *expr, long long idVal ) : expr( new Expression* ), object( new ObjectDecl* ), id( idVal ) {
+UniqueExpr::UniqueExpr( Expression *expr, long long idVal ) : expr( expr ), object( nullptr ), var( nullptr ), id( idVal ) {
+        assert( expr );
         assert( count != -1 );
         if ( id == -1 ) id = count++;
-        set_expr( expr );
-        assert( expr );
         if ( expr->get_result() ) {
                 set_result( expr->get_result()->clone() );
         }
-        set_object( nullptr );
-}
-UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( other.expr ), object( other.object ), id( other.id ) {
+}
+UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( maybeClone( other.expr ) ), object( maybeClone( other.object ) ), var( maybeClone( other.var ) ), id( other.id ) {
 }
 UniqueExpr::~UniqueExpr() {
-        if ( expr.unique() ) {
-                delete *expr;
-        }
-        if ( object.unique() ) {
-                delete *object;
-        }
+        delete expr;
+        delete object;
+        delete var;
 }
 void UniqueExpr::print( std::ostream &os, int indent ) const {

src/SynTree/Expression.h ¶

@@ -742 +742 @@
         ~UniqueExpr();
 
-        Expression * get_expr() const { return *expr; }
-        UniqueExpr * set_expr( Expression * newValue ) { *expr = newValue; return this; }
-
-        ObjectDecl * get_object() const { return *object; }
-        UniqueExpr * set_object( ObjectDecl * newValue ) { *object = newValue; return this; }
+        Expression * get_expr() const { return expr; }
+        UniqueExpr * set_expr( Expression * newValue ) { expr = newValue; return this; }
+
+        ObjectDecl * get_object() const { return object; }
+        UniqueExpr * set_object( ObjectDecl * newValue ) { object = newValue; return this; }
+
+        VariableExpr * get_var() const { return var; }
+        UniqueExpr * set_var( VariableExpr * newValue ) { var = newValue; return this; }
 
         int get_id() const { return id; }
@@ -755 +758 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
 private:
-        std::shared_ptr< Expression * > expr;
-        std::shared_ptr< ObjectDecl * > object;
+        Expression * expr;
+        ObjectDecl * object;
+        VariableExpr * var;
         int id;
         static long long count;