Move procedure createTypeDependencyGraph out of TypeEnvironmentAnalysis

souffle-lang · May 8, 2020 · 8f0ebf6 · 8f0ebf6
1 parent 2bf055a
commit 8f0ebf6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/src/AstTypeEnvironmentAnalysis.cpp b/src/AstTypeEnvironmentAnalysis.cpp
@@ -30,6 +30,28 @@
 
 namespace souffle {
 
+namespace {
+
+Graph<AstQualifiedName> createTypeDependencyGraph(const std::vector<AstType*>& programTypes) {
+    Graph<AstQualifiedName> typeDependencyGraph;
+    for (const auto* astType : programTypes) {
+        if (auto type = dynamic_cast<const AstSubsetType*>(astType)) {
+            typeDependencyGraph.insert(type->getQualifiedName(), type->getBaseType());
+        } else if (dynamic_cast<const AstRecordType*>(astType) != nullptr) {
+            // do nothing
+        } else if (auto type = dynamic_cast<const AstUnionType*>(astType)) {
+            for (const auto& subtype : type->getTypes()) {
+                typeDependencyGraph.insert(type->getQualifiedName(), subtype);
+            }
+        } else {
+            fatal("unsupported type construct: %s", typeid(astType).name());
+        }
+    }
+    return typeDependencyGraph;
+}
+
+}  // namespace
+
 void TypeEnvironmentAnalysis::run(const AstTranslationUnit& translationUnit) {
     const AstProgram& program = *translationUnit.getProgram();
 
@@ -105,25 +127,6 @@ void TypeEnvironmentAnalysis::linkTypes(const std::vector<AstType*>& programType
     }
 }
 
-Graph<AstQualifiedName> TypeEnvironmentAnalysis::createTypeDependencyGraph(
-        const std::vector<AstType*>& programTypes) {
-    Graph<AstQualifiedName> typeDependencyGraph;
-    for (const auto* astType : programTypes) {
-        if (auto type = dynamic_cast<const AstSubsetType*>(astType)) {
-            typeDependencyGraph.insert(type->getQualifiedName(), type->getBaseType());
-        } else if (dynamic_cast<const AstRecordType*>(astType) != nullptr) {
-            // do nothing
-        } else if (auto type = dynamic_cast<const AstUnionType*>(astType)) {
-            for (const auto& subtype : type->getTypes()) {
-                typeDependencyGraph.insert(type->getQualifiedName(), subtype);
-            }
-        } else {
-            fatal("unsupported type construct: %s", typeid(astType).name());
-        }
-    }
-    return typeDependencyGraph;
-}
-
 void TypeEnvironmentAnalysis::analyseCyclicTypes(
         const Graph<AstQualifiedName>& dependencyGraph, const std::vector<AstType*>& programTypes) {
     for (const auto& astType : programTypes) {

diff --git a/src/AstTypeEnvironmentAnalysis.h b/src/AstTypeEnvironmentAnalysis.h
@@ -70,11 +70,6 @@ class TypeEnvironmentAnalysis : public AstAnalysis {
      */
     void linkTypes(const std::vector<AstType*>& program);
 
-    /**
-     * Create a type dependency graph.
-     */
-    Graph<AstQualifiedName> createTypeDependencyGraph(const std::vector<AstType*>& programTypes);
-
     /**
      * Check intersections of unions with primitive types.
      */