Move C specific rules in src.c (#449)

Part of #447.

Author: lucic71

CMakeLists.txt

@@ -225,7 +225,7 @@ foreach(_rule_dir IN LISTS rule_subdirs)
   get_filename_component(_rule_name ${_rule_dir} NAME)
   set(_out_dir ${RULES_IR_DIR}/${_rule_name})
   set(_cpp_out ${_out_dir}/ir_src.json)
-  set(_cxxflags)
+  set(_cxxflags --cxxflags=-isystem${_rule_dir})
   set(_cxxflags_file)
   if(EXISTS ${_rule_dir}/cxxflags)
     set(_cxxflags_file ${_rule_dir}/cxxflags)

cpp2rust/converter/printer.cpp

@@ -128,6 +128,10 @@ std::string ToString(clang::ASTContext &ctx, clang::QualType qual_type,
             clang::dyn_cast<clang::DecltypeType>(t.getTypePtr())) {
       t = decltype_type->getUnderlyingType();
     }
+    if (const auto *typeof_type =
+            clang::dyn_cast<clang::TypeOfExprType>(t.getTypePtr())) {
+      t = typeof_type->getUnderlyingExpr()->getType();
+    }
     if (const auto *typedef_type = t->getAs<clang::TypedefType>()) {
       if (t.getCanonicalType()->isBuiltinType()) {
         return typedef_type->getDecl()->getNameAsString();

cpp2rust/cpp_rule_preprocessor.cpp

@@ -117,6 +117,14 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
       }
       return;
     }
+    if (auto var = R.Nodes.getNodeAs<clang::VarDecl>("fvar")) {
+      out_.try_emplace(
+          var->getQualifiedNameAsString(),
+          Printer::ToString(*R.Context,
+                            R.Nodes.getNodeAs<clang::FunctionDecl>("fn")));
+      return;
+    }
+
     if (auto var = R.Nodes.getNodeAs<clang::TypedefNameDecl>("tvar")) {
       clang::QualType type = var->getUnderlyingType();
       if (auto *alias = llvm::dyn_cast<clang::TypeAliasDecl>(var)) {
@@ -999,6 +1007,13 @@ class ActionFactory : public clang::tooling::FrontendActionFactory {
             .bind("tvar"),
         &cb_);
 
+    finder_.addMatcher(
+        varDecl(matchesName("(^|::)f[0-9]+$"), isExpansionInMainFile(),
+                hasInitializer(ignoringImplicit(ignoringParenImpCasts(
+                    declRefExpr(to(functionDecl().bind("fn")))))))
+            .bind("fvar"),
+        &cb_);
+
     finder_.addMatcher(functionDecl(isDefinition(),
                                     matchesName("(^|::)f[0-9]+$"),
                                     isExpansionInMainFile())

rules/arpa_inet/src.cpp rules/arpa_inet/src.crules/arpa_inet/src.cpp renamed to rules/arpa_inet/src.c

@@ -1,14 +1,14 @@
 // Copyright (c) 2022-present INESC-ID.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
-#include "brotli/decode.h"
-#include "brotli/encode.h"
-
-using t1 = BrotliDecoderResult;
-using t2 = BrotliEncoderMode;
-using t3 = BrotliDecoderStateStruct *;
-using t4 = const BrotliDecoderStateStruct *;
-using t5 = BrotliDecoderErrorCode;
+#include <brotli/decode.h>
+#include <brotli/encode.h>
+
+typedef BrotliDecoderResult t1;
+typedef BrotliEncoderMode t2;
+typedef struct BrotliDecoderStateStruct *t3;
+typedef const struct BrotliDecoderStateStruct *t4;
+typedef BrotliDecoderErrorCode t5;
 
 BrotliEncoderMode f1() { return BROTLI_MODE_FONT; }
 

rules/brotli/src.cpp rules/brotli/src.crules/brotli/src.cpp renamed to rules/brotli/src.c

@@ -0,0 +1,13 @@
+// Copyright (c) 2022-present INESC-ID.
+// Distributed under the MIT license that can be found in the LICENSE file.
+
+#include <stddef.h>
+#include <sys/types.h>
+
+typedef size_t t2;
+typedef size_t *t3;
+typedef const size_t *t4;
+typedef __typeof__(sizeof(0)) t5;
+typedef ssize_t t6;
+typedef ssize_t *t7;
+typedef const ssize_t *t8;

rules/cstddef/src.c

@@ -2,18 +2,9 @@
 // Distributed under the MIT license that can be found in the LICENSE file.
 
 #include <cstddef>
-#include <sys/types.h>
 
 using t1 = std::byte;
 
-typedef size_t t2;
-typedef size_t *t3;
-typedef const size_t *t4;
-typedef decltype(sizeof(0)) t5;
-typedef ssize_t t6;
-typedef ssize_t *t7;
-typedef const ssize_t *t8;
-
 std::byte f1(const std::byte &a0, unsigned a1) { return operator<<(a0, a1); }
 
 std::byte f2(const std::byte &a0, unsigned a1) { return operator>>(a0, a1); }

rules/cstddef/src.cpp

@@ -3,8 +3,8 @@
 
 #include <dirent.h>
 
-using t1 = DIR *;
-using t2 = struct dirent;
+typedef DIR *t1;
+typedef struct dirent t2;
 
 DIR *f1(const char *name) { return opendir(name); }
 

rules/dirent/src.cpp rules/dirent/src.crules/dirent/src.cpp renamed to rules/dirent/src.c

@@ -1,17 +1,12 @@
 // Copyright (c) 2022-present INESC-ID.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
+#define _GNU_SOURCE
 #include <fcntl.h>
 
-template <typename... Args>
-int f1(int a0, int a1, Args... args) {
-  return fcntl(a0, a1, args...);
-}
+int (*f1)(int, int, ...) = fcntl;
 
-template <typename... Args>
-int f2(const char *a0, int a1, Args... args) {
-  return open(a0, a1, args...);
-}
+int (*f2)(const char *, int, ...) = open;
 
 int f3(void) { return O_CREAT; }
 int f4(void) { return O_TRUNC; }