Merge pull request souffle-lang#1635 from mmcgr/redundancy

Remove TypeAttribute.cpp
joshuakarp · Sep 14, 2020 · 33eea51 · 33eea51
2 parents 3396f3c + 6c14534
commit 33eea51
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 56 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -19,7 +19,6 @@ souffle_sources = \
         GraphUtils.h                                       \
         LogStatement.h                                     \
         RelationTag.h                                      \
-        TypeAttribute.cpp                                  \
         ast/Aggregator.h                                   \
         ast/AlgebraicDataType.h                            \
         ast/Argument.h                                     \

diff --git a/src/TypeAttribute.cpp b/src/TypeAttribute.cpp
diff --git a/src/include/souffle/TypeAttribute.h b/src/include/souffle/TypeAttribute.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include "souffle/utility/MiscUtil.h"
 #include <iostream>
 
 namespace souffle {
@@ -34,12 +35,17 @@ enum class TypeAttribute {
 };
 
 // Printing of the TypeAttribute Enum.
-// To be utilised in synthesizer.
-std::ostream& operator<<(std::ostream& os, TypeAttribute T);
-
-/**
- * Check if type is numeric.
- */
-bool isNumericType(TypeAttribute ramType);
+inline std::ostream& operator<<(std::ostream& os, TypeAttribute T) {
+    switch (T) {
+        case TypeAttribute::Symbol: return os << "TypeAttribute::Symbol";
+        case TypeAttribute::Signed: return os << "TypeAttribute::Signed";
+        case TypeAttribute::Float: return os << "TypeAttribute::Float";
+        case TypeAttribute::Unsigned: return os << "TypeAttribute::Unsigned";
+        case TypeAttribute::Record: return os << "TypeAttribute::Record";
+        case TypeAttribute::ADT: return os << "TypeAttribute::ADT";
+    }
+
+    fatal("unhandled `TypeAttribute`");
+}
 
 }  // end of namespace souffle