Add a simple cycle detection system

Author: mrRosset

CMakeLists.txt

@@ -12,6 +12,7 @@ add_clang_executable(scalaBindgen
   TypeTranslator.cpp
   HeaderManager.h
   HeaderManager.cpp
+  CycleDetection.h
   Utils.h
   catch/catch.hpp
   SimpleTypeTests.cpp

CycleDetection.h

@@ -0,0 +1,51 @@
+#pragma once
+
+#include "TypeTranslator.h"
+
+#include <string>
+#include <map>
+#include <set>
+
+class CycleDetection {
+private:
+    TypeTranslator& tpeTransl;
+
+    bool contains(std::string& k){
+        return !!dependencies.count(k);
+    }
+
+public:
+    std::map<std::string, std::set<std::string> > dependencies;
+    CycleDetection(TypeTranslator& tpeTransl_) : tpeTransl(tpeTransl_), dependencies{} {}
+
+
+    void AddDependcy(std::string name, const clang::QualType& qtpe){
+
+        //TODO: function pointer
+
+        if(qtpe->isPointerType()){
+            const clang::PointerType* ptr = qtpe.getTypePtr()->getAs<clang::PointerType>();
+            AddDependcy(name, ptr->getPointeeType());
+            return;
+        }
+
+        std::string qtpeString = tpeTransl.Translate(qtpe);
+
+        //Add the dependence of qtpe
+        if(contains(qtpeString)){
+            dependencies[name].insert(dependencies[qtpeString].begin(), dependencies[qtpeString].end());
+        }
+
+        dependencies[name].insert(qtpeString);
+    }
+
+
+    bool isCyclic(std::string& name){
+        if(contains(name)){
+            if(dependencies[name].count(name) != 0){
+                return true;
+            }
+        }
+        return false;
+    }
+};

TreeVisitor.cpp

@@ -128,12 +128,15 @@ bool TreeVisitor::VisitRecordDecl(clang::RecordDecl *record){
         for(const clang::FieldDecl* field : record->fields()){
             std::string fname = handleReservedWords(field->getNameAsString());
             std::string ftype = typeTranslator.Translate(field->getType(), &name);
-
             fields += ftype + ", ";
-            if(name != ""){
+
+            if(fname != ""){
                 helpersFunc += "\t\tdef " + fname + ": " + ftype + " = !p._" + std::to_string(fieldCnt + 1) + "\n";
                 helpersFunc += "\t\tdef " + fname + "_=(value: " + ftype + "):Unit = !p._" + std::to_string(fieldCnt + 1) + " = value\n";
             }
+
+            cycleDetection.AddDependcy(newName, field->getType());
+
             fieldCnt++;
         }
 
@@ -142,6 +145,12 @@ bool TreeVisitor::VisitRecordDecl(clang::RecordDecl *record){
             fields = fields.substr(0, fields.size()-2);
         }
 
+        //llvm::errs() << newName << "\n";
+        //for(auto& s : cycleDetection.dependencies[newName]){
+        //    llvm::errs() << "\t" << s << "\n";
+        //}
+        //llvm::errs() << cycleDetection.isCyclic(newName) << "\n";
+
         if(fieldCnt < SCALA_NATIVE_MAX_STRUCT_FIELDS){
             declarations += "\ttype " + newName + " = " + "native.CStruct" + std::to_string(fieldCnt) + "[" + fields + "]\n";
         } else {

TreeVisitor.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "HeaderManager.h"
+#include "CycleDetection.h"
 #include "TypeTranslator.h"
 
 #include "clang/Driver/Options.h"
@@ -23,9 +24,11 @@ class TreeVisitor : public clang::RecursiveASTVisitor<TreeVisitor> {
 private:
     clang::ASTContext* astContext;
     TypeTranslator typeTranslator;
+    CycleDetection cycleDetection;
+
 
 public:
-    explicit TreeVisitor(clang::CompilerInstance *CI) : astContext(&(CI->getASTContext())), typeTranslator(astContext) {}
+    explicit TreeVisitor(clang::CompilerInstance *CI) : astContext(&(CI->getASTContext())), typeTranslator(astContext), cycleDetection(typeTranslator) {}
 
     virtual bool VisitFunctionDecl(clang::FunctionDecl *func);
     virtual bool VisitTypedefDecl(clang::TypedefDecl *tpdef);