Changes in src/AST/Expr.cpp [20a5977:ee574a2]

File:

• src/AST/Expr.cpp (modified) (5 diffs)

src/AST/Expr.cpp

@@ -64 +64 @@
                         // references have been removed, in which case dereference returns an lvalue of the
                         // base type
-                        ret->result.set_and_mutate( base )->set_lvalue( true );
+                        ret->result = base;
+                        add_qualifiers( ret->result, CV::Lvalue );
                 }
         }
@@ -164 +165 @@
         genericSubsitution( aggregate->result ).apply( result );
         // ensure lvalue and appropriate restrictions from aggregate type
-        result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
+        add_qualifiers( result, aggregate->result->qualifiers | CV::Lvalue );
 }
 
@@ -173 +174 @@
         assert( var );
         assert( var->get_type() );
-        result.set_and_mutate( var->get_type() )->set_lvalue( true );
+        result = var->get_type();
+        add_qualifiers( result, CV::Lvalue );
 }
 
@@ -306 +308 @@
 : Expr( loc ), init( i ) {
         assert( t && i );
-        result.set_and_mutate( t )->set_lvalue( true );
+        result = t;
+        add_qualifiers( result, CV::Lvalue );
 }
 
@@ -322 +325 @@
                 "index %d in expr %s", type->size(), index, toString( tuple ).c_str() );
         // like MemberExpr, TupleIndexExpr is always an lvalue
-        result.set_and_mutate( type->types[ index ] )->set_lvalue( true );
+        result = type->types[ index ];
+        add_qualifiers( result, CV::Lvalue );
 }