Changeset d104b02

Timestamp:

Aug 22, 2017, 5:38:49 PM (7 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:

5ccb10d

Parents:

9f10c4b8

git-author:

Rob Schluntz <rschlunt@…> (08/22/17 17:38:35)

git-committer:

Rob Schluntz <rschlunt@…> (08/22/17 17:38:49)

Message:

Add codegen for TupleAssignExpr?, UniqueExpr? and remove lvalue cast special case

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• CodeGenerator.h (modified) (1 diff)
• GenType.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -547 +547 @@
                 if ( castExpr->get_result()->isVoid() ) {
                         output << "(void)" ;
-                } else if ( ! castExpr->get_result()->get_lvalue() ) {
-                        // at least one result type of cast, but not an lvalue
+                } else {
+                        // at least one result type of cast.
+                        // Note: previously, lvalue casts were skipped. Since it's now impossible for the user to write
+                        // an lvalue cast, this has been taken out.
                         output << "(";
                         output << genType( castExpr->get_result(), "", pretty, genC );
                         output << ")";
-                } else {
-                        // otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is
-                        // never an lvalue in C
                 } // if
                 castExpr->get_arg()->accept( *this );
@@ -679 +678 @@
         }
 
+        void CodeGenerator::visit( TupleAssignExpr * tupleExpr ) {
+                assertf( ! genC, "TupleAssignExpr should not reach code generation." );
+                tupleExpr->stmtExpr->accept( *this );
+        }
+
         void CodeGenerator::visit( UntypedTupleExpr * tupleExpr ) {
                 assertf( ! genC, "UntypedTupleExpr should not reach code generation." );
@@ -726 +730 @@
                 output << "(" << genType( compLitExpr->get_result(), "", pretty, genC ) << ")";
                 compLitExpr->get_initializer()->accept( *this );
+        }
+
+        void CodeGenerator::visit( UniqueExpr * unqExpr ) {
+                assertf( ! genC, "Unique expressions should not reach code generation." );
+                output << "unq<" << unqExpr->get_id() << ">{ ";
+                unqExpr->get_expr()->accept( *this );
+                output << " }";
         }
 

src/CodeGen/CodeGenerator.h

@@ -77 +77 @@
                 virtual void visit( CommaExpr *commaExpr );
                 virtual void visit( CompoundLiteralExpr *compLitExpr );
+                virtual void visit( UniqueExpr * );
+                virtual void visit( TupleAssignExpr * tupleExpr );
                 virtual void visit( UntypedTupleExpr *tupleExpr );
                 virtual void visit( TupleExpr *tupleExpr );

src/CodeGen/GenType.cc

@@ -287 +287 @@
                         typeString = "_Atomic " + typeString;
                 } // if
+                if ( type->get_lvalue() && ! genC ) {
+                        // when not generating C code, print lvalue for debugging.
+                        typeString = "lvalue " + typeString;
+                }
         }
 } // namespace CodeGen