Changeset b3b2077 for src/SynTree

Timestamp:

Nov 9, 2016, 2:05:09 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:

23bb1b9

Parents:

8780e30

Message:

refactor some code that generates dereference and assignment calls

Location:

src/SynTree

Files:

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

src/SynTree/Expression.cc

@@ -380 +380 @@
 }
 
+UntypedExpr * UntypedExpr::createDeref( Expression * expr ) {
+        UntypedExpr * ret = new UntypedExpr( new NameExpr("*?"), std::list< Expression * >{ expr } );
+        if ( Type * type = expr->get_result() ) {
+                Type * base = InitTweak::getPointerBase( type );
+                if ( ! base ) {
+                        std::cerr << type << std::endl;
+                }
+                assertf( base, "expected pointer type in dereference\n" );
+                ret->set_result( maybeClone( base ) );
+        }
+        return ret;
+}
+
+UntypedExpr * UntypedExpr::createAssign( Expression * arg1, Expression * arg2 ) {
+        assert( arg1 && arg2 );
+        UntypedExpr * ret = new UntypedExpr( new NameExpr( "?=?" ), std::list< Expression * >{ arg1, arg2 } );
+        if ( arg1->get_result() && arg2->get_result() ) {
+                // if both expressions are typed, assumes that this assignment is a C bitwise assignment,
+                // so the result is the type of the RHS
+                ret->set_result( arg2->get_result()->clone() );
+        }
+        return ret;
+}
+
+
 void UntypedExpr::print( std::ostream &os, int indent ) const {
         os << "Applying untyped: " << std::endl;
@@ -446 +471 @@
 
 void ConditionalExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Conditional expression on: " << std::endl;
+        os << "Conditional expression on: " << std::endl;
+        os << std::string( indent+2, ' ' );
         arg1->print( os, indent+2 );
         os << std::string( indent, ' ' ) << "First alternative:" << std::endl;
+        os << std::string( indent+2, ' ' );
         arg2->print( os, indent+2 );
         os << std::string( indent, ' ' ) << "Second alternative:" << std::endl;
+        os << std::string( indent+2, ' ' );
         arg3->print( os, indent+2 );
         os << std::endl;

src/SynTree/Expression.h

@@ -111 +111 @@
         std::list<Expression*>& get_args() { return args; }
 
+        static UntypedExpr * createDeref( Expression * arg );
+        static UntypedExpr * createAssign( Expression * arg1, Expression * arg2 );
+
         virtual UntypedExpr *clone() const { return new UntypedExpr( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }