Changes in src/CodeGen/FixMain.cc [a16764a6:bf2438c]

File:

• src/CodeGen/FixMain.cc (modified) (3 diffs)

src/CodeGen/FixMain.cc

@@ -23 +23 @@
 
 #include "Common/SemanticError.h"  // for SemanticError
-#include "CodeGen/GenType.h"       // for GenType
 #include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
 #include "SynTree/Type.h"          // for FunctionType
@@ -31 +30 @@
         std::unique_ptr<FunctionDecl> FixMain::main_signature = nullptr;
 
-        template<typename container>
-        std::string genTypeAt(const container& p, size_t idx) {
-                return genType((*std::next(p.begin(), idx))->get_type(), "");
-        }
-
         void FixMain::registerMain(FunctionDecl* functionDecl)
         {
                 if(main_signature) {
-                        SemanticError(functionDecl, "Multiple definition of main routine\n");
+                        throw SemanticError("Multiple definition of main routine\n", functionDecl);
                 }
                 main_signature.reset( functionDecl->clone() );
@@ -49 +43 @@
 
                         os << main_signature->get_scopedMangleName() << "(";
-                        const auto& params = main_signature->get_functionType()->get_parameters();
-                        switch(params.size()) {
-                                case 3: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv, (" << genTypeAt(params, 2) << ")envp"; break;
-                                case 2: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv"; break;
+                        switch(main_signature->get_functionType()->get_parameters().size()) {
+                                case 3: os << "argc, argv, envp"; break;
+                                case 2: os << "argc, argv"; break;
                                 case 0: break;
                                 default : assert(false);