Ast tree matcher

CMakeLists.txt

@@ -215,7 +215,6 @@ add_custom_command(
 )
 
 file(GLOB rule_subdirs CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/rules/*)
-set(cpp_rules_ir_outputs)
 set(rust_rules_ir_outputs)
 foreach(_rule_dir IN LISTS rule_subdirs)
   file(GLOB _cpp_srcs ${_rule_dir}/src.c ${_rule_dir}/src.cpp)
@@ -224,25 +223,6 @@ foreach(_rule_dir IN LISTS rule_subdirs)
   endif()
   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_file)
-  if(EXISTS ${_rule_dir}/cxxflags)
-    set(_cxxflags_file ${_rule_dir}/cxxflags)
-    file(STRINGS ${_cxxflags_file} _flags)
-    foreach(_flag IN LISTS _flags)
-      list(APPEND _cxxflags --cxxflags=${_flag})
-    endforeach()
-  endif()
-  add_custom_command(
-    OUTPUT ${_cpp_out}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${_out_dir}
-    COMMAND $<TARGET_FILE:cpp-rule-preprocessor> --dir ${_rule_dir} --out ${_cpp_out} ${_cxxflags}
-    DEPENDS ${_cpp_srcs} ${_cxxflags_file} ${PROJECT_SOURCE_DIR}/cpp2rust/cpp_rule_preprocessor.cpp ${RUSTLS_HEADER} ${BROTLI_HEADERS}
-    VERBATIM
-  )
-  list(APPEND cpp_rules_ir_outputs ${_cpp_out})
-
   set(_rust_srcs)
   set(_rust_out)
   if(EXISTS ${_rule_dir}/tgt_unsafe.rs)
@@ -271,8 +251,6 @@ foreach(_rule_dir IN LISTS rule_subdirs)
   list(APPEND rust_rules_ir_outputs ${_rust_out})
 endforeach()
 
-add_custom_target("preprocess-cpp-rules" ALL DEPENDS ${cpp_rules_ir_outputs})
-
 add_custom_target("preprocess-rust-rules" ALL
                   DEPENDS ${rust_rules_ir_outputs})
 

cpp2rust/CMakeLists.txt

@@ -1,7 +1,6 @@
 file(GLOB_RECURSE CORE_SOURCES "*.cpp")
 list(REMOVE_ITEM CORE_SOURCES
     "${CMAKE_CURRENT_SOURCE_DIR}/cpp2rust.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/cpp_rule_preprocessor.cpp"
 )
 
 add_library(cpp2rust_core STATIC ${CORE_SOURCES})
@@ -17,6 +16,7 @@ target_compile_definitions(cpp2rust_core PUBLIC "-DCLANG_C_COMPILER=\"${CMAKE_C_
 target_compile_definitions(cpp2rust_core PUBLIC "-DCLANG_CXX_COMPILER=\"${CMAKE_CXX_COMPILER}\"")
 target_compile_definitions(cpp2rust_core PUBLIC "-DCLANG_RESOURCE_DIR=\"${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}\"")
 target_compile_definitions(cpp2rust_core PUBLIC "-DCOMPAT_INCLUDE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/compat\"")
+target_compile_definitions(cpp2rust_core PUBLIC "-DRULES_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}/rules\"")
 target_compile_definitions(cpp2rust_core PUBLIC "-DRUST_STABLE_VERSION=\"${RUST_STABLE_VERSION}\"")
 
 if (APPLE)
@@ -33,6 +33,3 @@ target_link_libraries(cpp2rust_core PUBLIC ${llvm_libs})
 
 add_clang_executable(cpp2rust PARTIAL_SOURCES_INTENDED cpp2rust.cpp)
 target_link_libraries(cpp2rust PRIVATE cpp2rust_core)
-
-add_clang_executable(cpp-rule-preprocessor PARTIAL_SOURCES_INTENDED cpp_rule_preprocessor.cpp)
-target_link_libraries(cpp-rule-preprocessor PRIVATE cpp2rust_core)

cpp2rust/ast_consumer.cpp

@@ -4,10 +4,14 @@
 #include "ast_consumer.h"
 
 #include "converter/converter.h"
+#include "converter/rules/matcher.h"
+#include "converter/rules/registry.h"
+#include "converter/rules/rule_decls.h"
 
 namespace cpp2rust {
 void ASTConsumer::HandleTranslationUnit(clang::ASTContext &ctx) {
   auto converter = CreateConverter(rs_code_, ctx, model_, rules_dir_);
+  RuleDecls::Collect(CI_.getSema());
   converter->SetSema(CI_.getSema());
   if (first_) {
     converter->EmitFilePreamble();