LIR skeleton, renaming some types to prevent conflict.

2013-12-29 14:28:46 -08:00
parent 7d83ba0021
commit 3d01efffac
66 changed files with 817 additions and 762 deletions
--- a/src/alloy/backend/ivm/ivm_assembler.cc
+++ b/src/alloy/backend/ivm/ivm_assembler.cc
@@ -13,7 +13,7 @@
 #include <alloy/backend/tracing.h>
 #include <alloy/backend/ivm/ivm_intcode.h>
 #include <alloy/backend/ivm/ivm_function.h>
-#include <alloy/hir/function_builder.h>
+#include <alloy/hir/hir_builder.h>
 #include <alloy/hir/label.h>
 #include <alloy/runtime/runtime.h>

@@ -54,7 +54,7 @@ void IVMAssembler::Reset() {
 }

 int IVMAssembler::Assemble(
-    FunctionInfo* symbol_info, FunctionBuilder* builder,
+    FunctionInfo* symbol_info, HIRBuilder* builder,
    DebugInfo* debug_info, Function** out_function) {
  IVMFunction* fn = new IVMFunction(symbol_info);
  fn->set_debug_info(debug_info);