Changeset 4e8949f

Timestamp:

Sep 19, 2017, 1:18:57 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:

d48e529

Parents:

80ac42d

Message:

Handle ConstructorExpr? in CodeGenerator?

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• CodeTools/TrackLoc.cc (modified) (1 diff)
• SymTab/Autogen.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -474 +474 @@
                                         } else {
                                                 // no constructors with 0 or more than 2 parameters
-                                                assert( false );
+                                                assertf( ! genC, "UntypedExpr constructor/destructor with 0 or more than 2 parameters." );
+                                                output << "(";
+                                                (*arg++)->accept( *visitor );
+                                                output << opInfo.symbol << "{ ";
+                                                genCommaList( arg, untypedExpr->get_args().end() );
+                                                output << "}) /* " << opInfo.inputName << " */";
                                         } // if
                                         break;
@@ -785 +790 @@
                 --indent;
                 output << indent << "})";
+        }
+
+        void CodeGenerator::postvisit( ConstructorExpr * expr ) {
+                assertf( ! genC, "Unique expressions should not reach code generation." );
+                expr->callExpr->accept( *visitor );
         }
 

src/CodeGen/CodeGenerator.h

@@ -89 +89 @@
                 void postvisit( AsmExpr * );
                 void postvisit( StmtExpr * );
+                void postvisit( ConstructorExpr * );
 
                 //*** Statements

src/CodeTools/TrackLoc.cc

@@ -64 +64 @@
                                 }
                                 else {
-                                        std::cerr << "Top level node has no CodeLocation " << name << std::endl;
-                                        exit(EXIT_FAILURE);
+                                        assertf( false, "Top level node has no CodeLocation %s", name.c_str() );
                                 }
                         }

src/SymTab/Autogen.cc

@@ -223 +223 @@
                         FunctionType * ftype = data.genType( refType );
 
-                        if(concurrent_type && CodeGen::isDestructor( data.fname )) {
+                        if ( concurrent_type && CodeGen::isDestructor( data.fname ) ) {
                                 ftype->parameters.front()->get_type()->set_mutex( true );
                         }