Changes in src/MakeLibCfa.cc [845cedc:2794fff]

File:

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

src/MakeLibCfa.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// MakeLibCfa.cc --
+// MakeLibCfa.cc -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 10:33:33 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Apr 22 13:54:15 2016
-// Update Count     : 40
-//
+// Last Modified On : Fri Jul 03 18:11:37 2015
+// Update Count     : 18
+// 
 
 #include "MakeLibCfa.h"
@@ -22 +22 @@
 #include "SynTree/Initializer.h"
 #include "CodeGen/OperatorTable.h"
-#include "Common/UniqueName.h"
+#include "UniqueName.h"
 
 namespace LibCfa {
@@ -29 +29 @@
                 void visit( FunctionDecl* funcDecl );
                 void visit( ObjectDecl* objDecl );
-
+  
                 std::list< Declaration* > &get_newDecls() { return newDecls; }
           private:
@@ -43 +43 @@
         void MakeLibCfa::visit( FunctionDecl* origFuncDecl ) {
                 if ( origFuncDecl->get_linkage() != LinkageSpec::Intrinsic ) return;
-                if ( origFuncDecl->get_statements() ) return;
-
+  
                 FunctionDecl *funcDecl = origFuncDecl->clone();
                 CodeGen::OperatorInfo opInfo;
@@ -55 +54 @@
                 assert( param != funcDecl->get_functionType()->get_parameters().end() );
 
-                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 );
+                if ( (*param)->get_name() == "" ) {
+                        (*param)->set_name( paramNamer.newName() );
+                        (*param)->set_linkage( LinkageSpec::C );
+                } // if
 
                 switch ( opInfo.type ) {
@@ -72 +65 @@
                   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:
-                                funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( std::list< Label >(), newExpr ) );
+                        {
+                                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 );
                                 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:
@@ -101 +84 @@
                         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 );
         }
 
         void MakeLibCfa::visit( ObjectDecl* origObjDecl ) {
                 if ( origObjDecl->get_linkage() != LinkageSpec::Intrinsic ) return;
-
+  
                 ObjectDecl *objDecl = origObjDecl->clone();
                 assert( ! objDecl->get_init() );
                 std::list< Expression* > noDesignators;
-                objDecl->set_init( new SingleInit( new NameExpr( objDecl->get_name() ), noDesignators, false ) ); // cannot be constructed
+                objDecl->set_init( new SingleInit( new NameExpr( objDecl->get_name() ), noDesignators ) );
                 newDecls.push_back( objDecl );
         }
 } // namespace LibCfa
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //