Add new helpers

Author: mrRosset

HeaderManager.cpp

@@ -1,14 +1,17 @@
 #include "HeaderManager.h"
+#include "Utils.h"
 
 #include "clang/Tooling/Tooling.h"
 
+#include <iostream>
 #include <fstream>
 
 HeaderManager::HeaderManager(): headers() {
 
 }
 
-void HeaderManager::LoadConfig(const std::string& path){
+void HeaderManager::LoadConfig(std::string path){
+    trim(path);
     std::ifstream input(path);
 
     for(std::string line; getline( input, line );){
@@ -22,7 +25,8 @@ void HeaderManager::LoadConfig(const std::string& path){
 
 }
 
-bool HeaderManager::IsStandard(const std::string& path){
+bool HeaderManager::IsStandard(std::string path){
+    trim(path);
     return !!headers.count(path);
 }
 

HeaderManager.h

@@ -9,8 +9,8 @@ class HeaderManager {
 
 public:
     HeaderManager();
-    void LoadConfig(const std::string& path);
-    bool IsStandard(const std::string& path);
+    void LoadConfig(std::string path);
+    bool IsStandard(std::string path);
     std::string* GetImport(const std::string& include);
 
 };

Main.cpp

@@ -4,6 +4,8 @@
 #define CATCH_CONFIG_RUNNER
 #include "catch/catch.hpp"
 
+#include <sys/types.h>
+
 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");

TreeConsumer.h

@@ -24,9 +24,9 @@ class TreeConsumer : public clang::ASTConsumer {
         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();
-            locations.insert(basename(fpath) + "\n");
 
             if(!headerMan.IsStandard(basename(fpath)) && fpath != ""){
+                locations.insert(basename(fpath) + "\n");
                 visitor->TraverseDecl(D);
             }
 

TreeVisitor.cpp

@@ -37,7 +37,7 @@ bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {
     }
 
     //Note the C Iso require at least one argument in a variadic function, so the comma is fine
-    std::string variad = func->isVariadic() ? ", varArgs: native.CVararg*" : "";
+    std::string variad = func->isVariadic() ? ", varArgs: native.CVararg" : "";
 
     declarations += "\tdef " + funcName + "(" + params + variad + "): " + retType + " = native.extern\n";
     return true;
@@ -89,17 +89,30 @@ bool TreeVisitor::VisitRecordDecl(clang::RecordDecl *record){
     if(record->isUnion() && !record->isAnonymousStructOrUnion() && name != ""){
 
         //Replace "union x" with union_x in scala
-        typeTranslator.AddTranslation("union " + name, "union" + name);
+        typeTranslator.AddTranslation("union " + name, "union_" + name);
 
         uint64_t maxSize = 0;
+        std::string helpersFunc = "";
 
         for(const clang::FieldDecl* field : record->fields()){
             maxSize = std::max(maxSize, astContext->getTypeSize(field->getType()));
+            std::string fname = handleReservedWords(field->getNameAsString());
+            std::string ftype = typeTranslator.Translate(field->getType(), &name);
+
+            if(fname != ""){
+                helpersFunc += "\t\tdef " + fname + ": native.Ptr[" + ftype + "] = p.cast[native.Ptr[" + ftype + "]]\n";
+                helpersFunc += "\t\tdef " + fname + "_=(value: " + ftype + "): Unit = !(p.cast[native.Ptr[" + ftype + "]]) = value\n";
+            }
         }
 
-        declarations += "\ttype union_" + name + " = native.CArray[Byte, " + intToScalaNat(maxSize) + "]\n";
+        auto usize = intToScalaNat(maxSize);
+        declarations += "\ttype union_" + name + " = native.CArray[Byte, " + usize + "]\n";
 
-        return true;
+        helpers += "\timplicit class union_" + name +"_pos(val p: native.Ptr[native.CArray[Byte, " + usize + "]]) extends AnyVal {\n";
+        helpers += helpersFunc;
+        helpers += "\t}\n\n";
+
+        return true;        
 
     } else if (record->isStruct() && record->isThisDeclarationADefinition() && !record->isAnonymousStructOrUnion() && name != ""){
 
@@ -119,7 +132,7 @@ bool TreeVisitor::VisitRecordDecl(clang::RecordDecl *record){
             fields += ftype + ", ";
             if(name != ""){
                 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";
+                helpersFunc += "\t\tdef " + fname + "_=(value: " + ftype + "):Unit = !p._" + std::to_string(fieldCnt + 1) + " = value\n";
             }
             fieldCnt++;
         }

TypeTranslator.cpp

@@ -49,7 +49,12 @@ std::string TypeTranslator::TranslateFunctionPointer(const clang::QualType& qtpe
             counter++;
         }
 
-        std::string variad = fc->isVariadic() ? "varArgs: native.CVararg*, " : "";
+        std::string variad = "";
+
+        if(fc->isVariadic()){
+            counter ++;
+            variad =  "native.CVararg, ";
+        }
 
         return std::string("native.CFunctionPtr") + std::to_string(counter) + "[" + params + variad + ret + "]";
 

Utils.h

@@ -5,6 +5,9 @@
 
 #include <string>
 #include <cinttypes>
+#include <algorithm>
+#include <cctype>
+#include <locale>
 
 inline std::string basename(const std::string& pathname) {
     return {std::find_if(pathname.rbegin(), pathname.rend(),
@@ -74,4 +77,25 @@ inline std::string handleReservedWords(std::string name){
     }
 }
 
+// trim from start (in place)
+static inline void ltrim(std::string &s) {
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int ch) {
+        return !std::isspace(ch);
+    }));
+}
+
+// trim from end (in place)
+static inline void rtrim(std::string &s) {
+    s.erase(std::find_if(s.rbegin(), s.rend(), [](int ch) {
+        return !std::isspace(ch);
+    }).base(), s.end());
+}
+
+// trim from both ends (in place)
+static inline void trim(std::string &s) {
+    ltrim(s);
+    rtrim(s);
+}
+
+
 #endif // UTILS_H

stdHeaders.txt

@@ -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=