Add test support with catch

Author: mrRosset

CMakeLists.txt

@@ -1,5 +1,7 @@
 set(LLVM_LINK_COMPONENTS support)
 
+add_compile_options(-fexceptions)
+
 add_clang_executable(scalaBindgen
   ScalaBindgen.cpp
   ScalaBindgen.h
@@ -8,6 +10,8 @@ add_clang_executable(scalaBindgen
   HeaderManager.h
   HeaderManager.cpp
   Utils.h
+  catch/catch.hpp
+  SimpleTypeTests.cpp
   )
 
 target_link_libraries(scalaBindgen

ScalaBindgen.cpp

@@ -1,7 +1,12 @@
 #include "ScalaBindgen.h"
 
+#define CATCH_CONFIG_RUNNER
+#include "catch/catch.hpp"
+
+
 #define SCALA_NATIVE_MAX_STRUCT_FIELDS 22
 
+
 static llvm::cl::OptionCategory Category("Binding Generator");
 static llvm::cl::extrahelp CommonHelp(clang::tooling::CommonOptionsParser::HelpMessage);
 static llvm::cl::extrahelp MoreHelp("\nProduce Bindings for scala native. Please specify lib name wit parameter name\n");
@@ -128,45 +133,52 @@ bool TreeVisitor::VisitRecordDecl(clang::RecordDecl *record){
     return false;
 }
 
+int main(int argc, char *argv[]) {
 
+    if(argc <= 1 ){
 
-int main(int argc, const char **argv) {
-    clang::tooling::CommonOptionsParser op(argc, argv, Category);
-    clang::tooling::ClangTool Tool(op.getCompilations(), op.getSourcePathList());
+        int result = Catch::Session().run( argc, argv );
+        return result;
 
-    auto lib = LibName.getValue();
-    if(lib == ""){
-    	llvm::errs() << "Error: Please specify the lib name using -name paramter\n";
-    	return -1;
-    }
+    } else{
 
-    auto stdhead = StdHeaders.getValue();
-    if(stdhead != ""){
-        headerMan.LoadConfig(stdhead);
-    }
+        clang::tooling::CommonOptionsParser op(argc, (const char**)argv, Category);
+        clang::tooling::ClangTool Tool(op.getCompilations(), op.getSourcePathList());
+
+        auto lib = LibName.getValue();
+        if(lib == ""){
+            llvm::errs() << "Error: Please specify the lib name using -name paramter\n";
+            return -1;
+        }
 
-    declarations = "";
-    enums = "";
+        auto stdhead = StdHeaders.getValue();
+        if(stdhead != ""){
+            headerMan.LoadConfig(stdhead);
+        }
 
+        declarations = "";
+        enums = "";
 
-    int result = Tool.run(clang::tooling::newFrontendActionFactory<ExampleFrontendAction>().get());
 
-    llvm::outs() << "import scala.scalanative._\n"
-                 << "import scala.scalanative.native.Nat._\n\n";
+        int result = Tool.run(clang::tooling::newFrontendActionFactory<ExampleFrontendAction>().get());
 
-    if(declarations != ""){
-        llvm::outs() << "@native.link(\"" << lib << "\")\n"
-                     << "@native.extern\n"
-                     << "object " << lib << " {\n"
-                     << declarations
-                     << "}\n\n";
-    }
+        llvm::outs() << "import scala.scalanative._\n"
+                     << "import scala.scalanative.native.Nat._\n\n";
 
-    if(enums != ""){
-        llvm::outs() << "object " << lib << "Enums {\n"
-                     << enums
-                     << "}\n";
-    }
+        if(declarations != ""){
+            llvm::outs() << "@native.link(\"" << lib << "\")\n"
+                         << "@native.extern\n"
+                         << "object " << lib << " {\n"
+                         << declarations
+                         << "}\n\n";
+        }
 
-    return result;
+        if(enums != ""){
+            llvm::outs() << "object " << lib << "Enums {\n"
+                         << enums
+                         << "}\n";
+        }
+
+        return result;
+    }
 }

ScalaBindgen.h

@@ -2,7 +2,6 @@
 #include "TypeTranslator.h"
 #include "HeaderManager.h"
 
-
 #include "clang/Driver/Options.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/AST/AST.h"
@@ -16,7 +15,8 @@
 #include "clang/Tooling/Tooling.h"
 #include "llvm/Support/CommandLine.h"
 
-
+extern std::string declarations;
+extern std::string enums;
 
 class TreeVisitor : public clang::RecursiveASTVisitor<TreeVisitor> {
 private:

SimpleTypeTests.cpp

@@ -0,0 +1,56 @@
+#include "ScalaBindgen.h"
+
+
+#include "clang/Tooling/Tooling.h"
+#include "catch/catch.hpp"
+
+#include <iostream>
+
+std::string Translate(std::string code){
+    declarations = "";
+    enums = "";
+    auto* action = new ExampleFrontendAction;
+    clang::tooling::runToolOnCode(action, code);
+    return declarations;
+}
+
+TEST_CASE("native types", "[Type]" ) {
+
+    std::map<std::string, std::string> types = {
+        {"void", "Unit"},
+        //{"bool", "native.CBool"},
+        {"char", "native.CChar"},
+        {"signed char", "native.CSignedChar"},
+        {"unsigned char", "native.CUnsignedChar"},
+        {"short", "native.CShort"},
+        {"unsigned short", "native.CUnsignedShort"},
+        {"int", "native.CInt"},
+        //{"long int", "native.CLongInt"},
+        {"unsigned int", "native.CUnsignedInt"},
+        //{"unsigned long int", "native.CUnsignedLongInt"},
+        {"long", "native.CLong"},
+        {"unsigned long", "native.CUnsignedLong"},
+        {"long long", "native.CLongLong"},
+        {"unsigned long long", "native.CUnsignedLongLong"},
+        //{"size_t", "native.CSize"},
+        //{"ptrdiff_t", "native.CPtrDiff"},
+        {"wchar_t", "native.CWideChar"},
+        {"char16_t", "native.CChar16"},
+        {"char32_t", "native.CChar32"},
+        {"float", "native.CFloat"},
+        {"double", "native.CDouble"},
+        {"void*", "native.Ptr[Byte]"},
+        {"int*", "native.Ptr[native.CInt]"},
+        //{"char*", "native.CString"},
+        //{"int (*a)(int)", "native.CFunctionPtr1[native.CInt, native.CInt]"},
+        //{"struct { int x, y; }*", "native.Ptr[native.CStruct2[native.CInt, native.CInt]]"}
+    };
+
+    for(const auto& kv: types){
+        std::string code = "typedef " + kv.first + " a;\n";
+        std::string answer = "\ttype a = " + kv.second + "\n";
+
+        REQUIRE(answer == Translate(code));
+    }
+
+}

TypeTranslator.cpp

@@ -44,15 +44,15 @@ std::string TypeTranslator::TranslateFunctionPointer(const clang::QualType& qtpe
 
         for(const clang::QualType& param: fc->param_types()){
             params += Translate(param, avoid);
-            params += ",";
+            params += ", ";
             counter++;
         }
 
         if(params != ""){
             //remove last ,
-            params = params.substr(0, params.size()-1);
+            params = params.substr(0, params.size()-2);
 
-            return std::string("native.CFunctionPtr") + std::to_string(counter) + "[" + params + "," + ret + "]";
+            return std::string("native.CFunctionPtr") + std::to_string(counter) + "[" + params + ", " + ret + "]";
         } else{
             return std::string("native.CFunctionPtr") + std::to_string(counter) + "[" + ret + "]";
         }