merge conflicts

1 files changed, 4 insertions, 7 deletions

diff --git a/src/codegen.hpp b/src/codegen.hpp
index 7795a3d3d9..403931b834 100644
--- a/src/codegen.hpp
+++ b/src/codegen.hpp
@@ -29,7 +29,7 @@ struct ErrorMsg {
 };
 
 
-CodeGen *create_codegen(AstNode *root, Buf *in_file);
+CodeGen *codegen_create(Buf *root_source_dir);
 
 enum CodeGenBuildType {
     CodeGenBuildTypeDebug,
@@ -38,15 +38,12 @@ enum CodeGenBuildType {
 void codegen_set_build_type(CodeGen *codegen, CodeGenBuildType build_type);
 void codegen_set_is_static(CodeGen *codegen, bool is_static);
 void codegen_set_strip(CodeGen *codegen, bool strip);
+void codegen_set_verbose(CodeGen *codegen, bool verbose);
 void codegen_set_out_type(CodeGen *codegen, OutType out_type);
 void codegen_set_out_name(CodeGen *codegen, Buf *out_name);
 
-void code_gen_optimize(CodeGen *g);
+void codegen_add_code(CodeGen *g, Buf *source_path, Buf *source_code);
 
-void code_gen(CodeGen *g);
-
-void code_gen_link(CodeGen *g, const char *out_file);
-
-ZigList<ErrorMsg> *codegen_error_messages(CodeGen *g);
+void codegen_link(CodeGen *g, const char *out_file);
 
 #endif