Removing TypeSystem.

common/constants.h

@@ -112,7 +112,6 @@ struct PointerType : Type {
 
  private:
   friend Type;
-  friend struct TypeSystem;
   friend PointerType Ptr(Type t);
 
   explicit PointerType() = default;
@@ -131,7 +130,6 @@ struct BufferPointerType : Type {
 
  private:
   friend Type;
-  friend struct TypeSystem;
   friend BufferPointerType BufPtr(Type t);
 
   explicit BufferPointerType() = default;
@@ -151,7 +149,6 @@ struct SliceType : Type {
 
  private:
   friend Type;
-  friend struct TypeSystem;
   friend SliceType Slice(Type t);
 
   explicit SliceType() = default;
@@ -222,7 +219,6 @@ struct ParametersType : Type {
  private:
   friend Type;
   friend struct FunctionType;
-  friend struct TypeSystem;
   friend ParametersType Parameters(std::span<Parameter const>);
   explicit constexpr ParametersType(uint32_t n)
       : Type(Type::Kind::Parameters, n) {}
@@ -266,7 +262,6 @@ struct FunctionType : Type {
 
  private:
   friend Type;
-  friend struct TypeSystem;
   friend FunctionType Function(ParametersType, std::span<Type const>,
                                Evaluation);
 

ir/deserialize.h

@@ -52,7 +52,6 @@ struct ModuleDeserializer : R {
     type::Type t;
     co_await nth::io::deserialize(d, t);
     std::vector<jasmin::Value> values;
-    t = d.reindexing_(t);
     switch (t.kind()) {
       case type::Type::Kind::Primitive: {
         auto p = t.AsPrimitive();
@@ -197,13 +196,11 @@ struct ModuleDeserializer : R {
     StringLiteral name;
     type::Type t;
     co_await nth::io::deserialize(d, name, t);
-    f = ForeignFunction(name, d.reindexing_(t).AsFunction());
+    f = ForeignFunction(name, t.AsFunction());
     co_return Result::success();
   }
 
   friend Result NthDeserialize(ModuleDeserializer& d, Module& m) {
-    d.reindexing_.clear();
-
     co_await nth::io::deserialize(d, GlobalConstantTable());
     co_await nth::io::deserialize(d, d.context_.foreign);
     co_await nth::io::deserialize(d, m.program());
@@ -217,7 +214,6 @@ struct ModuleDeserializer : R {
     return context_.registry;
   }
  private:
-  type::TypeSystem::ReindexTable reindexing_;
   SharedContext& context_;
 
   Result read_as_string(std::string& content) {

ir/emit.h

@@ -9,6 +9,7 @@
 #include "absl/container/flat_hash_map.h"
 #include "common/identifier.h"
 #include "common/module_id.h"
+#include "common/type.h"
 #include "ir/dependent_modules.h"
 #include "ir/lexical_scope.h"
 #include "ir/local_storage.h"
@@ -20,7 +21,6 @@
 #include "parse/declaration.h"
 #include "parse/node_index.h"
 #include "parse/tree.h"
-#include "type/type.h"
 
 namespace ic {
 

ir/ir.cc

@@ -10,6 +10,7 @@
 #include "common/module_id.h"
 #include "common/resources.h"
 #include "common/string.h"
+#include "common/type.h"
 #include "ir/lexical_scope.h"
 #include "ir/type_stack.h"
 #include "jasmin/core/function.h"
@@ -19,7 +20,6 @@
 #include "parse/node_index.h"
 #include "parse/tree.h"
 #include "type/cast.h"
-#include "type/type.h"
 
 namespace ic {
 namespace {

ir/lexical_scope.h

@@ -9,7 +9,6 @@
 #include "nth/debug/debug.h"
 #include "nth/utility/iterator_range.h"
 #include "parse/node_index.h"
-#include "type/type.h"
 
 namespace ic {
 

ir/local_storage.h

@@ -2,11 +2,11 @@
 #define ICARUS_IR_LOCAL_STORAGE_H
 
 #include "absl/container/flat_hash_map.h"
+#include "common/type.h"
 #include "nth/container/interval.h"
 #include "nth/debug/debug.h"
 #include "parse/node_index.h"
 #include "type/byte_width.h"
-#include "type/type.h"
 
 namespace ic {
 

ir/module.h

@@ -11,7 +11,6 @@
 #include "ir/function.h"
 #include "ir/scope.h"
 #include "jasmin/core/value.h"
-#include "type/type.h"
 
 namespace ic {
 

ir/type_stack.h

@@ -6,7 +6,8 @@
 #include <span>
 #include <vector>
 
-#include "type/type.h"
+#include "common/type.h"
+#include "type/basic.h"
 
 namespace ic {
 

toolchain/builtin/module.cc

@@ -5,7 +5,7 @@
 #include "common/any_value.h"
 #include "common/identifier.h"
 #include "common/pattern.h"
-#include "type/type.h"
+#include "common/type.h"
 
 namespace ic::builtin {
 namespace {

type/BUILD

@@ -173,10 +173,10 @@ cc_library(
 
 cc_library(
     name = "type",
-    hdrs = ["type.h"],
     srcs = ["type.cc"],
     deps = [
-        ":type_system",
+        ":dependent",
+        ":type_contour",
         "//common:constants",
         "@nth_cc//nth/container:flyweight_set",
         "@nth_cc//nth/debug",
@@ -201,28 +201,3 @@ cc_test(
         "@nth_cc//nth/test:main",
     ]
 )
-
-cc_library(
-    name = "type_system",
-    hdrs = ["type_system.h"],
-    srcs = ["type_system.cc"],
-    deps = [
-        ":alignment",
-        ":basic",
-        ":byte_width",
-        ":dependent",
-        ":function",
-        ":opaque",
-        ":parameters",
-        ":pattern",
-        ":pointer",
-        ":primitive",
-        ":refinement",
-        ":type_contour",
-        "//common/language:type_kind",
-        "//common:pattern",
-        "@nth_cc//nth/container:flyweight_set",
-        "@nth_cc//nth/debug",
-        "@nth_cc//nth/utility:no_destructor",
-    ],
-)

type/cast.h

@@ -1,8 +1,8 @@
 #ifndef ICARUS_TYPE_CAST_H
 #define ICARUS_TYPE_CAST_H
 
-#include "type/type.h"
 #include "common/any_value.h"
+#include "common/type.h"
 
 namespace ic::type {
 

type/dependent_test.cc

@@ -1,13 +1,14 @@
 #include "type/dependent.h"
 
 #include "common/any_value.h"
+#include "common/type.h"
 #include "jasmin/instructions/arithmetic.h"
 #include "jasmin/instructions/common.h"
 #include "nth/test/test.h"
+#include "type/basic.h"
 #include "type/function.h"
 #include "type/parameters.h"
 #include "type/primitive.h"
-#include "type/type.h"
 
 namespace ic::type {
 namespace {

type/type.cc

@@ -1,4 +1,4 @@
-#include "type/type.h"
+#include "common/type.h"
 
 #include <cstring>
 #include <utility>
@@ -9,12 +9,12 @@
 #include "common/pattern.h"
 #include "nth/debug/debug.h"
 #include "nth/utility/no_destructor.h"
+#include "type/dependent.h"
+#include "type/type_contour.h"
 
 namespace ic::type {
 namespace {
 
-nth::NoDestructor<TypeSystem> type_system;
-
 uint64_t opaque_count = 0;
 
 }  // namespace