diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/hir_typeck/expr_context.cpp | 2 | ||||
| -rw-r--r-- | src/hir_typeck/expr_cs.cpp | 2 | ||||
| -rw-r--r-- | src/hir_typeck/expr_simple.cpp (renamed from src/hir_typeck/expr.cpp) | 2 | ||||
| -rw-r--r-- | src/hir_typeck/expr_simple.hpp (renamed from src/hir_typeck/expr.hpp) | 0 | ||||
| -rw-r--r-- | src/hir_typeck/helpers.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -50,8 +50,8 @@ OBJ += hir/crate_ptr.o hir/type_ptr.o hir/expr_ptr.o OBJ += hir/type.o hir/path.o hir/expr.o hir/pattern.o OBJ += hir/visitor.o OBJ += hir_conv/expand_type.o hir_conv/constant_evaluation.o hir_conv/resolve_ufcs.o hir_conv/bind.o -OBJ += hir_typeck/outer.o hir_typeck/expr.o hir_typeck/expr_context.o hir_typeck/helpers.o -OBJ += hir_typeck/expr_cs.o +OBJ += hir_typeck/outer.o hir_typeck/expr_context.o hir_typeck/helpers.o +OBJ += hir_typeck/expr_simple.o hir_typeck/expr_cs.o PCHS := ast/ast.hpp diff --git a/src/hir_typeck/expr_context.cpp b/src/hir_typeck/expr_context.cpp index 97b65f54..a957a6f5 100644 --- a/src/hir_typeck/expr_context.cpp +++ b/src/hir_typeck/expr_context.cpp @@ -1,6 +1,6 @@ /* */ -#include "expr.hpp" +#include "expr_simple.hpp" #include <hir/hir.hpp> #include <algorithm> // std::find_if #include "helpers.hpp" diff --git a/src/hir_typeck/expr_cs.cpp b/src/hir_typeck/expr_cs.cpp index d96bbf76..5e5ef9f8 100644 --- a/src/hir_typeck/expr_cs.cpp +++ b/src/hir_typeck/expr_cs.cpp @@ -12,7 +12,7 @@ #include <algorithm> // std::find_if #include "helpers.hpp" -#include "expr.hpp" +//#include "expr.hpp" // PLAN: Build up a set of conditions that are easier to solve struct Context diff --git a/src/hir_typeck/expr.cpp b/src/hir_typeck/expr_simple.cpp index b61144ac..7379ed2c 100644 --- a/src/hir_typeck/expr.cpp +++ b/src/hir_typeck/expr_simple.cpp @@ -7,7 +7,7 @@ #include <algorithm> // std::find_if #include "helpers.hpp" -#include "expr.hpp" +#include "expr_simple.hpp" namespace typeck { diff --git a/src/hir_typeck/expr.hpp b/src/hir_typeck/expr_simple.hpp index a8a96fa9..a8a96fa9 100644 --- a/src/hir_typeck/expr.hpp +++ b/src/hir_typeck/expr_simple.hpp diff --git a/src/hir_typeck/helpers.cpp b/src/hir_typeck/helpers.cpp index d07efd93..5095cf7c 100644 --- a/src/hir_typeck/helpers.cpp +++ b/src/hir_typeck/helpers.cpp @@ -1,6 +1,6 @@ #include "helpers.hpp" -#include "expr.hpp" +#include "expr_simple.hpp" bool monomorphise_type_needed(const ::HIR::TypeRef& tpl); |