Changeset f1e012b for src/MakeLibCfa.cc

Timestamp:

Jan 19, 2016, 1:28:25 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ca1c11f

Parents:

71f4e4f

Message:

added intrinsic ctor/dtors to prelude, modified MakeLibCfa? to build prelude ctor/dtors, added ctor/dtor to polymorphic object type constraints, rudimentary fallback on initializer nodes if chosen ctor is intrinsic, remove intrinsic destructor statements to reduce output pollution

File:

• src/MakeLibCfa.cc (modified) (5 diffs)

src/MakeLibCfa.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 10:33:33 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jan 07 13:34:39 2016
-// Update Count     : 20
+// Last Modified On : Tue Jan 19 13:20:26 2016
+// Update Count     : 40
 //
 
@@ -54 +54 @@
                 assert( param != funcDecl->get_functionType()->get_parameters().end() );
 
-                if ( (*param)->get_name() == "" ) {
-                        (*param)->set_name( paramNamer.newName() );
-                        (*param)->set_linkage( LinkageSpec::C );
-                } // if
+                for ( ; param != funcDecl->get_functionType()->get_parameters().end(); ++param ) {
+                        if ( (*param)->get_name() == "" ) {
+                                (*param)->set_name( paramNamer.newName() );
+                                (*param)->set_linkage( LinkageSpec::C );
+                        }
+                        newExpr->get_args().push_back( new VariableExpr( *param ) );
+                } // for
+
+                funcDecl->set_statements( new CompoundStmt( std::list< Label >() ) );
+                newDecls.push_back( funcDecl );
 
                 switch ( opInfo.type ) {
@@ -65 +71 @@
                   case CodeGen::OT_POSTFIX:
                   case CodeGen::OT_INFIX:
-                        newExpr->get_args().push_back( new VariableExpr( *param ) );
-                        break;
                   case CodeGen::OT_PREFIXASSIGN:
                   case CodeGen::OT_POSTFIXASSIGN:
                   case CodeGen::OT_INFIXASSIGN:
-                        {
-                                newExpr->get_args().push_back( new VariableExpr( *param ) );
-                                // UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                // deref->get_args().push_back( new VariableExpr( *param ) );
-                                // newExpr->get_args().push_back( deref );
+                                funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( std::list< Label >(), newExpr ) );
                                 break;
-                        }
                   case CodeGen::OT_CTOR:
+                        // ctors don't return a value
+                        if ( funcDecl->get_functionType()->get_parameters().size() == 1 ) {
+                                // intrinsic default constructors should do nothing
+                                // delete newExpr;
+                                break;
+                        } else {
+                                assert( funcDecl->get_functionType()->get_parameters().size() == 2 );
+                                // anything else is a single parameter constructor that is effectively a C-style assignment
+                                // delete newExpr->get_function();
+                                assert(newExpr->get_args().size()==2);
+                                newExpr->set_function( new NameExpr( "?=?" ) );
+                                funcDecl->get_statements()->get_kids().push_back( new ExprStmt( std::list< Label >(), newExpr ) );
+                        }
+                        break;
                   case CodeGen::OT_DTOR:
+                        // intrinsic destructors should do nothing
+                        // delete newExpr;
+                        break;
                   case CodeGen::OT_CONSTANT:
                   case CodeGen::OT_LABELADDRESS:
@@ -84 +100 @@
                         assert( false );
                 } // switch
-
-                for ( param++; param != funcDecl->get_functionType()->get_parameters().end(); ++param ) {
-                        if ( (*param)->get_name() == "" ) {
-                                (*param)->set_name( paramNamer.newName() );
-                                (*param)->set_linkage( LinkageSpec::C );
-                        }
-                        newExpr->get_args().push_back( new VariableExpr( *param ) );
-                } // for
-                funcDecl->set_statements( new CompoundStmt( std::list< Label >() ) );
-                funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( std::list< Label >(), newExpr ) );
-                newDecls.push_back( funcDecl );
         }
 
@@ -107 +112 @@
         }
 } // namespace LibCfa
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //