Converted all regex from cache variables to global properties

Author: MrPointer

cmake/Platform/Project/ProjectSetup.cmake

@@ -11,13 +11,4 @@ function(arduino_cmake_project _project_name)
 
     setup_project_core_lib(${_project_name})
 
-    set(ARDUINO_CMAKE_FUNCTION_DEFINITION_REGEX_PATTERN
-            "^([A-Za-z0-9_][ \t\r\n]*)+\\(.*\\)$" PARENT_SCOPE)
-    set(ARDUINO_CMAKE_FUNCTION_DECLARATION_REGEX_PATTERN
-            "^([A-Za-z0-9_])+.+([A-Za-z0-9_])+[ \t\r\n]*\\((.*)\\);$" PARENT_SCOPE)
-    set(ARDUINO_CMAKE_FUNCTION_NAME_REGEX_PATTERN "(([A-Za-z0-9_])+)[ \t\r\n]*\\(.*\\)" PARENT_SCOPE)
-    set(ARDUINO_CMAKE_FUNCTION_ARGS_REGEX_PATTERN "\\((.*)\\)" PARENT_SCOPE)
-    set(ARDUINO_CMAKE_FUNCTION_SINGLE_ARG_REGEX_PATTERN "([A-Za-z0-9_]+)[^,]*" PARENT_SCOPE)
-    set(ARDUINO_CMAKE_FUNCTION_ARG_TYPE_REGEX_PATTERN "[A-Za-z0-9_]+.*[ \t\r\n]+" PARENT_SCOPE)
-
 endfunction()

cmake/Platform/Sketches/FunctionPrototypeGenerator.cmake

@@ -16,12 +16,16 @@ endfunction()
 
 macro(_setup_regex_patterns)
 
-    string(CONCAT function_prototype_pattern
-            "${ARDUINO_CMAKE_FUNCTION_DECLARATION_REGEX_PATTERN}"
-            "|${ARDUINO_CMAKE_FUNCTION_DEFINITION_REGEX_PATTERN}")
+    get_property(function_declaration_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_DECLARATION_REGEX_PATTERN)
+    get_property(function_definition_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_DEFINITION_REGEX_PATTERN)
+    get_property(preprocessor_regex GLOBAL PROPERTY ARDUINO_CMAKE_PREPROCESSOR_REGEX_PATTERN)
+
+    string(CONCAT function_prototype_regex
+            "${function_declaration_regex}"
+            "|${function_definition_regex}")
     string(CONCAT code_pattern
-            "${ARDUINO_CMAKE_PREPROCESSOR_REGEX_PATTERN}"
-            "|${function_prototype_pattern}")
+            "${preprocessor_regex}"
+            "|${function_prototype_regex}")
 
     set(comment_line_pattern "\\/\\/")
     set(comment_block_start_pattern "\\/\\*")
@@ -31,7 +35,9 @@ endmacro()
 
 macro(_insert_platform_header _current_line _line_index)
 
-    if ("${_current_line}" MATCHES "${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN}")
+    get_property(header_include_regex GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN)
+
+    if ("${_current_line}" MATCHES "${header_include_regex}")
         set(include_line "${ARDUINO_CMAKE_PLATFORM_HEADER_INCLUDE_LINE}\n")
     else ()
         set(include_line "${ARDUINO_CMAKE_PLATFORM_HEADER_INCLUDE_LINE}\n\n")
@@ -73,7 +79,9 @@ endmacro()
 
 macro(_handle_prototype_generation)
 
-    if (NOT "${line}" MATCHES "${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN}")
+    get_property(header_include_regex GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN)
+
+    if (NOT "${line}" MATCHES "${header_include_regex}")
         if (NOT "${line}" STREQUAL "") # Not a newline
 
             if (NOT header_inclusion_block)

cmake/Platform/Sketches/SketchSourceConverter.cmake

@@ -10,6 +10,8 @@
 #=============================================================================#
 function(match_function_declaration _definition_signature _included_headers _return_var)
 
+    get_property(function_declaration_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_DECLARATION_REGEX_PATTERN)
+
     # Get function name and list of argument-types
     strip_function_signature("${_definition_signature}" original_stripped_function)
     list(GET original_stripped_function 0 original_function_name)
@@ -22,7 +24,7 @@ function(match_function_declaration _definition_signature _included_headers _ret
         foreach (line ${header_lines})
 
             # Search for function declarations
-            if ("${line}" MATCHES "${ARDUINO_CMAKE_FUNCTION_DECLARATION_REGEX_PATTERN}")
+            if ("${line}" MATCHES "${function_declaration_regex}")
 
                 # Get function name and list of argument-types
                 strip_function_signature("${line}" iterated_stripped_function)

cmake/Platform/Sources/FunctionDeclarationMatcher.cmake

@@ -6,13 +6,17 @@
 #=============================================================================#
 function(_get_function_arguments_types _signature _return_var)
 
-    string(REGEX MATCH ${ARDUINO_CMAKE_FUNCTION_ARGS_REGEX_PATTERN} function_args_string "${_signature}")
-    string(REGEX MATCHALL ${ARDUINO_CMAKE_FUNCTION_SINGLE_ARG_REGEX_PATTERN}
+    get_property(function_args_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_ARGS_REGEX_PATTERN)
+    get_property(function_single_arg_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_SINGLE_ARG_REGEX_PATTERN)
+    get_property(function_arg_type_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_ARG_TYPE_REGEX_PATTERN)
+
+    string(REGEX MATCH ${function_args_regex} function_args_string "${_signature}")
+    string(REGEX MATCHALL ${function_single_arg_regex}
             function_arg_list "${function_args_string}")
     # Iterate through all arguments to extract only their type
     foreach (arg ${function_arg_list})
 
-        string(REGEX MATCH ${ARDUINO_CMAKE_FUNCTION_ARG_TYPE_REGEX_PATTERN} arg_type "${arg}")
+        string(REGEX MATCH ${function_arg_type_regex} arg_type "${arg}")
         string(STRIP "${arg_type}" arg_type) # Strip remaining whitespaces
 
         if (NOT "${arg_type}" STREQUAL "void") # Do NOT append 'void' arguments - they're meaningless
@@ -33,8 +37,10 @@ endfunction()
 #=============================================================================#
 function(strip_function_signature _signature _return_var)
 
+    get_property(function_name_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_NAME_REGEX_PATTERN)
+
     # Strip function's name
-    string(REGEX MATCH ${ARDUINO_CMAKE_FUNCTION_NAME_REGEX_PATTERN} function_name_match "${_signature}")
+    string(REGEX MATCH ${function_name_regex} function_name_match "${_signature}")
     set(function_name ${CMAKE_MATCH_1})
     list(APPEND stripped_signature ${function_name})
 

cmake/Platform/Sources/FunctionSignatureStripper.cmake

@@ -1,9 +1,11 @@
 function(get_source_function_definitions _source_file _return_var)
 
+    get_property(function_definition_regex GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_DEFINITION_REGEX_PATTERN)
+
     file(STRINGS "${_source_file}" source_lines)
 
     foreach (line ${source_lines})
-        if ("${line}" MATCHES "${ARDUINO_CMAKE_FUNCTION_DEFINITION_REGEX_PATTERN}")
+        if ("${line}" MATCHES "${function_definition_regex}")
             list(APPEND definitions "${line}")
         endif ()
     endforeach ()

cmake/Platform/Sources/SourceFunctionsRetriever.cmake

@@ -10,14 +10,17 @@ function(_get_source_included_headers _source_file _return_var)
 
     cmake_parse_arguments(parsed_args "WE" "" "" ${ARGN})
 
+    get_property(header_include_regex GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN)
+    get_property(header_name_regex GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN)
+
     file(STRINGS "${_source_file}" source_lines) # Loc = Lines of code
 
-    list(FILTER source_lines INCLUDE REGEX ${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN})
+    list(FILTER source_lines INCLUDE REGEX ${header_include_regex})
 
     # Extract header names from inclusion
     foreach (loc ${source_lines})
 
-        string(REGEX MATCH ${ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN} match ${loc})
+        string(REGEX MATCH ${header_name_regex} match ${loc})
 
         if (parsed_args_WE)
             get_name_without_file_extension("${CMAKE_MATCH_1}" header_name)

cmake/Platform/Sources/SourceHeadersRetriever.cmake

@@ -78,8 +78,9 @@ function(get_source_file_includes _source_file _return_var)
     endif ()
 
     file(STRINGS "${_source_file}" source_lines)
-    
-    list(FILTER source_lines INCLUDE REGEX "${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN}")
+
+    get_property(header_include_regex GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN)
+    list(FILTER source_lines INCLUDE REGEX "${header_include_regex}")
 
     set(${_return_var} ${source_lines} PARENT_SCOPE)
 
@@ -94,8 +95,10 @@ endfunction()
 #=============================================================================#
 function(get_headers_parent_directories _sources _return_var)
 
+    get_property(header_file_extension_regex GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN)
+
     # Extract header files
-    list(FILTER _sources INCLUDE REGEX "${ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN}")
+    list(FILTER _sources INCLUDE REGEX "${header_file_extension_regex}")
 
     foreach (header_source ${_sources})
         get_filename_component(header_parent_dir ${header_source} DIRECTORY)

cmake/Platform/Sources/SourcesManager.cmake

@@ -3,46 +3,25 @@
 #=============================================================================#
 function(set_internal_search_patterns)
 
-    set(ARDUINO_CMAKE_SEMICOLON_REPLACEMENT "!@&#%" CACHE STRING
-            "String replacement for the semicolon char, required when treating lists as code")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_SEMICOLON_REPLACEMENT "!@&#%")
 
-    set(ARDUINO_CMAKE_PREPROCESSOR_REGEX_PATTERN "^#([A-Za-z0-9_])+" CACHE STRING
-            "Regex pattern matching preprocessor directives in source files")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_PREPROCESSOR_REGEX_PATTERN "^#([A-Za-z0-9_])+")
+    set(header_include_regex "^#include.*[<\"]")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN "${header_include_regex}")
 
-    set(ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN "^#include.*[<\"]" CACHE STRING
-            "Regex pattern matching header inclusion in a source file")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN "${header_include_regex}(.+)[>\"]$")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN ".+\\.h.*$")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_NAME_WE_REGEX_PATTERN "([^\\/]+)\\.")
 
-    set(ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN
-            "${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN}(.+)[>\"]$" CACHE STRING
-            "Regex pattern matching a header's name when wrapped in inclusion line")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_DEFINITION_REGEX_PATTERN
+            "^([A-Za-z0-9_][ \t\r\n]*)+\\(.*\\)$")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_DECLARATION_REGEX_PATTERN
+            "^([A-Za-z0-9_])+.+([A-Za-z0-9_])+[ \t\r\n]*\\((.*)\\);$")
 
-    set(ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN ".+\\.h.*$" CACHE STRING
-            "Regex pattern matching all header file extensions")
-
-    set(ARDUINO_CMAKE_NAME_WE_REGEX_PATTERN "([^\\/]+)\\." CACHE STRING
-            "Regex pattern matching name without file extension")
-
-    #[[set(ARDUINO_CMAKE_FUNCTION_DECLARATION_REGEX_PATTERN "^([A-Za-z0-9_])+.+([A-Za-z0-9_])+[ \t\r\\n]*\((.*)\);$"
-            CACHE STRING "Regex pattern matching a function signature definition in a source file")
-
-    set(ARDUINO_CMAKE_FUNCTION_DEFINITION_REGEX_PATTERN "^([A-Za-z0-9_])+[ \t\r\n]*\(([A-Za-z0-9_])*\)$"
-            CACHE STRING "Regex pattern matching a function signature definition in a source file")
-
-    set(ARDUINO_CMAKE_FUNCTION_NAME_REGEX_PATTERN "(([A-Za-z0-9_])+)[ \t\r\\n]*\(.*\)"
-            CACHE STRING
-            "Regex pattern matching a function's name (and everything following it), can be retrieved by the 1st group")
-
-    set(ARDUINO_CMAKE_FUNCTION_ARGS_REGEX_PATTERN "\((.*)\)"
-            CACHE STRING
-            "Regex pattern matching a function's argument list, i.e. What's inside the parentheses")
-
-    set(ARDUINO_CMAKE_FUNCTION_SINGLE_ARG_REGEX_PATTERN "([A-Za-z0-9_]+)[^,]*"
-            CACHE STRING
-            "Regex pattern matching a function's argument, requiring maximum matches to get all arguments")
-
-    set(ARDUINO_CMAKE_FUNCTION_ARG_TYPE_REGEX_PATTERN "[A-Za-z0-9_]+.*[ \t\r\\n]+"
-            CACHE STRING
-            "Regex pattern matching a function argument type, ommiting it's name")]]
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_NAME_REGEX_PATTERN "(([A-Za-z0-9_])+)[ \t\r\n]*\\(.*\\)")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_ARGS_REGEX_PATTERN "\\((.*)\\)")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_SINGLE_ARG_REGEX_PATTERN "([A-Za-z0-9_]+)[^,]*")
+    set_property(GLOBAL PROPERTY ARDUINO_CMAKE_FUNCTION_ARG_TYPE_REGEX_PATTERN "[A-Za-z0-9_]+.*[ \t\r\n]+")
 
 endfunction()
 

cmake/Platform/System/DefaultsManager.cmake

@@ -79,7 +79,9 @@ endfunction()
 #=============================================================================#
 function(get_name_without_file_extension _input_string _return_var)
 
-    string(REGEX MATCH "${ARDUINO_CMAKE_NAME_WE_REGEX_PATTERN}" match "${_input_string}")
+    get_property(name_we_regex GLOBAL PROPERTY ARDUINO_CMAKE_NAME_WE_REGEX_PATTERN)
+
+    string(REGEX MATCH "${name_we_regex}" match "${_input_string}")
 
     set(${_return_var} ${CMAKE_MATCH_1} PARENT_SCOPE)
 
@@ -122,10 +124,12 @@ function(escape_semicolon_in_string _string _return_var)
 
     cmake_parse_arguments(parsed_args "REVERSE" "" "" ${ARGN})
 
+    get_property(semicolon_replacement GLOBAL PROPERTY ARDUINO_CMAKE_SEMICOLON_REPLACEMENT)
+
     if (parsed_args_REVERSE)
-        string(REGEX REPLACE "^(.+)${ARDUINO_CMAKE_SEMICOLON_REPLACEMENT}(.*)$" "\\1;\\2" escaped_line "${_string}")
+        string(REGEX REPLACE "^(.+)${semicolon_replacement}(.*)$" "\\1;\\2" escaped_line "${_string}")
     else ()
-        string(REGEX REPLACE "^(.+);(.*)$" "\\1${ARDUINO_CMAKE_SEMICOLON_REPLACEMENT}\\2" escaped_line "${_string}")
+        string(REGEX REPLACE "^(.+);(.*)$" "\\1${semicolon_replacement}\\2" escaped_line "${_string}")
     endif ()
 
     set(${_return_var} ${escaped_line} PARENT_SCOPE)