Switch to the new system to handle standard headers

mrRosset · mrRosset · commit 851172ffc133 · 2018-05-17T01:10:08.000+02:00
diff --git a/HeaderManager.cpp b/HeaderManager.cpp
@@ -23,7 +23,7 @@ void HeaderManager::LoadConfig(const std::string& path){
 }
 
 bool HeaderManager::IsStandard(const std::string& path){
-    return false;
+    return !!headers.count(path);
 }
 
 
diff --git a/Main.cpp b/Main.cpp
@@ -9,6 +9,7 @@ static llvm::cl::extrahelp CommonHelp(clang::tooling::CommonOptionsParser::HelpM
 static llvm::cl::extrahelp MoreHelp("\nProduce Bindings for scala native. Please specify lib name wit parameter name\n");
 static llvm::cl::opt<std::string> LibName("name", llvm::cl::cat(Category));
 static llvm::cl::opt<std::string> StdHeaders("stdHeaders", llvm::cl::cat(Category));
+static llvm::cl::opt<bool> PrintHeadersLocation ("location", llvm::cl::cat(Category));
 
 
 int main(int argc, char *argv[]) {
@@ -37,33 +38,43 @@ int main(int argc, char *argv[]) {
         declarations = "";
         enums = "";
         helpers = "";
+        locations.clear();
 
         int result = Tool.run(clang::tooling::newFrontendActionFactory<ScalaFrontendAction>().get());
 
-        llvm::outs() << "import scala.scalanative._\n"
-                     << "import scala.scalanative.native.Nat._\n\n";
-
-        if(declarations != ""){
-            llvm::outs() << "@native.link(\"" << lib << "\")\n"
-                         << "@native.extern\n"
-                         << "object " << lib << " {\n"
-                         << declarations
-                         << "}\n\n"
-                         << "import " + lib + "._\n\n";
-        }
-
-        if(enums != ""){
-            llvm::outs() << "object " << lib << "Enums {\n"
-                         << enums
-                         << "}\n\n";
+        auto printLoc = PrintHeadersLocation.getValue();
+
+        if(printLoc){
+            for(const auto& location: locations){
+                llvm::outs() << location;
+            }
+
+        } else {
+            if(declarations != "" || enums != "")
+            llvm::outs() << "import scala.scalanative._\n"
+                         << "import scala.scalanative.native.Nat._\n\n";
+
+            if(declarations != ""){
+                llvm::outs() << "@native.link(\"" << lib << "\")\n"
+                             << "@native.extern\n"
+                             << "object " << lib << " {\n"
+                             << declarations
+                             << "}\n\n"
+                             << "import " + lib + "._\n\n";
+            }
+
+            if(enums != ""){
+                llvm::outs() << "object " << lib << "Enums {\n"
+                             << enums
+                             << "}\n\n";
+            }
+
+            if(helpers != ""){
+                llvm::outs() << "object " << lib << "Helpers {\n"
+                             << helpers
+                             << "}\n\n";
+            }
         }
-
-        if(helpers != ""){
-            llvm::outs() << "object " << lib << "Helpers {\n"
-                         << helpers
-                         << "}\n\n";
-        }
-
         return result;
     }
 }
diff --git a/SimpleTypeTests.cpp b/SimpleTypeTests.cpp
@@ -9,6 +9,7 @@ std::string Translate(std::string code){
     declarations = "";
     enums = "";
     helpers = "";
+    locations.clear();
     auto* action = new ScalaFrontendAction;
     clang::tooling::runToolOnCode(action, code, "input.h");
     return declarations;
diff --git a/TreeConsumer.h b/TreeConsumer.h
@@ -17,64 +17,22 @@ class TreeConsumer : public clang::ASTConsumer {
 
 public:
 
-    std::vector<std::string> stdheaders{"assert.h","complex.h","ctype.h","errno.h","fenv.h","float.h","inttypes.h","iso646.h","limits.h",
-                                        "locale.h","math.h","setjmp.h","signal.h","stdalign.h","stdarg.h","stdatomic.h","stdbool.h","stddef.h",
-                                        "stdint.h","stdio.h","stdlib.h","stdnoreturn.h","string.h","tgmath.h","threads.h","time.h","uchar.h",
-                                        "wchar.h","wctype.h","aio.h","inet.h","assert.h","complex.h","cpio.h","ctype.h","dirent.h","dlfcn.h",
-                                        "errno.h","fcntl.h","fenv.h","float.h","fmtmsg.h","fnmatch.h","ftw.h","glob.h","grp.h","iconv.h",
-                                        "inttypes.h","iso646.h","langinfo.h","libgen.h","limits.h","locale.h","math.h","monetary.h","mqueue.h",
-                                        "ndbm.h","if.h","netdb.h","in.h","tcp.h","nl_types.h","poll.h","pthread.h","pwd.h",
-                                        "regex.h","sched.h","search.h","semaphore.h","setjmp.h","signal.h","spawn.h","stdarg.h","stdbool.h",
-                                        "stddef.h","stdint.h","stdio.h","stdlib.h","string.h","strings.h","stropts.h","ipc.h","mman.h",
-                                        "msg.h","resource.h","select.h","sem.h","shm.h","socket.h","stat.h",
-                                        "statvfs.h","time.h","times.h","types.h","uio.h","un.h","utsname.h",
-                                        "wait.h","syslog.h","tar.h","termios.h","tgmath.h","time.h","trace.h","ulimit.h","unistd.h",
-                                        "utime.h","utmpx.h","wchar.h","wctype.h","wordexp.h",
-
-                                        "siginfo.h", "sigset.h", "sigaction.h", "sigcontext.h", "sigthread.h", "ucontext.h",
-                                        "pthreadtypes.h", "libio.h", "__stddef_max_align_t.h", "_G_config.h", "sys_errlist.h",
-                                        "sysmacros.h", "xlocale.h", "socket_type.h", "sockaddr.h", "sigstack.h"
-                                       };
-
-    /* with folders
-    std::vector<std::string> stdheaders{"assert.h","complex.h","ctype.h","errno.h","fenv.h","float.h","inttypes.h","iso646.h","limits.h",
-                                        "locale.h","math.h","setjmp.h","signal.h","stdalign.h","stdarg.h","stdatomic.h","stdbool.h","stddef.h",
-                                        "stdint.h","stdio.h","stdlib.h","stdnoreturn.h","string.h","tgmath.h","threads.h","time.h","uchar.h",
-                                        "wchar.h","wctype.h","aio.h","arpa/inet.h","assert.h","complex.h","cpio.h","ctype.h","dirent.h","dlfcn.h",
-                                        "errno.h","fcntl.h","fenv.h","float.h","fmtmsg.h","fnmatch.h","ftw.h","glob.h","grp.h","iconv.h",
-                                        "inttypes.h","iso646.h","langinfo.h","libgen.h","limits.h","locale.h","math.h","monetary.h","mqueue.h",
-                                        "ndbm.h","net/if.h","netdb.h","netinet/in.h","netinet/tcp.h","nl_types.h","poll.h","pthread.h","pwd.h",
-                                        "regex.h","sched.h","search.h","semaphore.h","setjmp.h","signal.h","spawn.h","stdarg.h","stdbool.h",
-                                        "stddef.h","stdint.h","stdio.h","stdlib.h","string.h","strings.h","stropts.h","sys/ipc.h","sys/mman.h",
-                                        "sys/msg.h","sys/resource.h","sys/select.h","sys/sem.h","sys/shm.h","sys/socket.h","sys/stat.h",
-                                        "sys/statvfs.h","sys/time.h","sys/times.h","sys/types.h","sys/uio.h","sys/un.h","sys/utsname.h",
-                                        "sys/wait.h","syslog.h","tar.h","termios.h","tgmath.h","time.h","trace.h","ulimit.h","unistd.h",
-                                        "utime.h","utmpx.h","wchar.h","wctype.h","wordexp.h"};
-     */
-
     explicit TreeConsumer(clang::CompilerInstance *CI) : visitor(new TreeVisitor(CI)), smanager(CI->getASTContext().getSourceManager()) {}
 
-
-
     virtual bool HandleTopLevelDecl(clang::DeclGroupRef DG) {
         // a DeclGroupRef may have multiple Decls, so we iterate through each one
         for (clang::DeclGroupRef::iterator i = DG.begin(), e = DG.end(); i != e; i++) {
             clang::Decl *D = *i;
             std::string fpath = smanager.getFilename(D->getLocation()).str();
-            //llvm::errs() << "DEBUG: " << fpath << "\n";
-            if(std::find(stdheaders.begin(), stdheaders.end(), basename(fpath)) == stdheaders.end() && fpath != ""){
-                visitor->TraverseDecl(D); // recursively visit each AST node in Decl "D"
+            locations.insert(basename(fpath) + "\n");
+
+            if(!headerMan.IsStandard(basename(fpath)) && fpath != ""){
+                visitor->TraverseDecl(D);
             }
+
         }
         return true;
     }
 
-    // this replaces "HandleTopLevelDecl"
-    // override this to call our ExampleVisitor on the entire source file
-    /*virtual void HandleTranslationUnit(clang::ASTContext &Context) {
-        //we can use ASTContext to get the TranslationUnitDecl, which is
-        //a single Decl that collectively represents the entire source file
-        visitor->TraverseDecl(Context.getTranslationUnitDecl());
-    }*/
 
 };
diff --git a/TreeVisitor.cpp b/TreeVisitor.cpp
@@ -8,6 +8,7 @@ HeaderManager headerMan;
 std::string declarations;
 std::string enums;
 std::string helpers;
+std::set<std::string> locations;
 
 bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {
     std::string funcName = func->getNameInfo().getName().getAsString();
diff --git a/TreeVisitor.h b/TreeVisitor.h
@@ -17,6 +17,7 @@ extern HeaderManager headerMan;
 extern std::string declarations;
 extern std::string enums;
 extern std::string helpers;
+extern std::set<std::string> locations;
 
 class TreeVisitor : public clang::RecursiveASTVisitor<TreeVisitor> {
 private:
diff --git a/TypeTranslator.cpp b/TypeTranslator.cpp
@@ -49,14 +49,10 @@ std::string TypeTranslator::TranslateFunctionPointer(const clang::QualType& qtpe
             counter++;
         }
 
-        if(params != ""){
-            //remove last ,
-            params = params.substr(0, params.size()-2);
+        std::string variad = fc->isVariadic() ? "varArgs: native.CVararg*, " : "";
+
+        return std::string("native.CFunctionPtr") + std::to_string(counter) + "[" + params + variad + ret + "]";
 
-            return std::string("native.CFunctionPtr") + std::to_string(counter) + "[" + params + ", " + ret + "]";
-        } else{
-            return std::string("native.CFunctionPtr") + std::to_string(counter) + "[" + ret + "]";
-        }
     } else {
         llvm::errs() << "Unsupported function pointer type: " << qtpe.getAsString() << "\n";
         exit(-1);
diff --git a/stdHeaders.config b/stdHeaders.config
@@ -0,0 +1,132 @@
+
+assert.h=
+complex.h=scala.scalanative.native.complex
+ctype.h=scala.scalanative.native.ctype
+errno.h=scala.scalanative.native.errno
+fenv.h=
+float.h=
+inttypes.h=
+iso646.h=
+limits.h=
+locale.h=
+math.h=scala.scalanative.native.math
+setjmp.h=
+signal.h=scala.scalanative.native.signal
+stdalign.h=
+stdarg.h=
+stdatomic.h=
+stdbool.h=
+stddef.h=
+stdint.h=
+stdio.h=scala.scalanative.native.stdio
+stdlib.h=scala.scalanative.native.stdlib
+stdnoreturn.h=
+string.h=scala.scalanative.native.string
+tgmath.h=
+threads.h=
+time.h=
+uchar.h=
+wchar.h=
+wctype.h=
+
+
+aio.h=
+inet.h=scala.scalanative.posix.arpa.inet
+assert.h=
+complex.h=scala.scalanative.native.complex
+cpio.h=scala.scalanative.posix.cpio
+ctype.h=
+dirent.h=scala.scalanative.posix.dirent
+dlfcn.h=
+errno.h=scala.scalanative.posix.errno
+fcntl.h=scala.scalanative.posix.fcntl
+fenv.h=
+float.h=
+fmtmsg.h=
+fnmatch.h=
+ftw.h=
+glob.h=
+grp.h=scala.scalanative.posix.grp
+iconv.h=
+inttypes.h=scala.scalanative.posix.inttypes
+iso646.h=
+langinfo.h=
+libgen.h=
+limits.h=scala.scalanative.posix.limits
+locale.h=
+math.h=
+monetary.h=
+mqueue.h=
+ndbm.h=
+if.h=
+netdb.h=
+in.h=scala.scalanative.posix.netinet.in
+tcp.h=
+nl_types.h=
+poll.h=
+pthread.h=
+pwd.h=scala.scalanative.posix.pwd
+regex.h=scala.scalanative.posix.regex
+sched.h=
+search.h=
+semaphore.h=
+setjmp.h=
+signal.h=
+spawn.h=
+stdarg.h=
+stdbool.h=
+stddef.h=
+stdint.h=
+stdio.h=
+stdlib.h=scala.scalanative.posix.stdlib
+string.h=
+strings.h=
+stropts.h=
+ipc.h=
+mman.h=
+msg.h=
+resource.h=
+select.h=
+sem.h=
+shm.h=
+socket.h=scala.scalanative.posix.sys.socket
+stat.h=scala.scalanative.posix.sys.stat
+statvfs.h=
+time.h=scala.scalanative.posix.sys.time
+times.h=
+types.h=
+uio.h=scala.scalanative.posix.sys.uio
+un.h=
+utsname.h=
+wait.h=
+syslog.h=scala.scalanative.posix.syslog
+tar.h=
+termios.h=scala.scalanative.posix.termios
+tgmath.h=
+time.h=
+trace.h=
+ulimit.h=
+unistd.h=scala.scalanative.posix.unistd
+utime.h=scala.scalanative.posix.utime
+utmpx.h=
+wchar.h=
+wctype.h=
+wordexp.h=
+
+siginfo.h=
+sigset.h=
+sigaction.h=
+sigcontext.h=
+sigthread.h=
+ucontext.h=
+pthreadtypes.h=
+libio.h=
+__stddef_max_align_t.h=
+_G_config.h=
+sys_errlist.h"=
+sysmacros.h=
+xlocale.h=
+socket_type.h=
+sockaddr.h=
+sigstack.h=
+sys_errlist.h=

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ void HeaderManager::LoadConfig(const std::string& path){`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`bool HeaderManager::IsStandard(const std::string& path){`
`26`		`- return false;`
	`26`	`+ return !!headers.count(path);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`