Nicer TypeEnv initialization

souffle-lang · Jul 27, 2020 · 89ced82 · 89ced82
1 parent 97abbe0
commit 89ced82
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/ast/TypeSystem.h b/src/ast/TypeSystem.h
@@ -365,11 +365,7 @@ struct TypeSet {
  */
 class TypeEnvironment {
 public:
-    TypeEnvironment()
-            : constantTypes(initializeConstantTypes()),
-              constantNumericTypes(TypeSet(getType("__numberConstant"), getType("__unsignedConstant"),
-                      getType("__floatConstant"))),
-              primitiveTypes(initializePrimitiveTypes()){};
+    TypeEnvironment() = default;
 
     TypeEnvironment(const TypeEnvironment&) = delete;
 
@@ -446,10 +442,11 @@ class TypeEnvironment {
     /** The list of covered types. */
     std::map<AstQualifiedName, std::unique_ptr<Type>> types;
 
-    const TypeSet constantTypes;
-    const TypeSet constantNumericTypes;
+    const TypeSet constantTypes = initializeConstantTypes();
+    const TypeSet constantNumericTypes =
+            TypeSet(getType("__numberConstant"), getType("__unsignedConstant"), getType("__floatConstant"));
 
-    const TypeSet primitiveTypes;
+    const TypeSet primitiveTypes = initializePrimitiveTypes();
 };
 
 // ---------------------------------------------------------------