Merge pull request #340 from CezaryGapinski/fix-static-variables-for-enabled-inline-funcs-mocks

Fix static variables detection in headers for enabled inline function mocks

lib/cmock_header_parser.rb

@@ -150,11 +150,18 @@ class CMockHeaderParser
     #  - Copy everything after the inline function implementation and start the parsing of the next inline function
     # There are ofcourse some special cases (inline macro declarations, inline function declarations, ...) which are handled and explained below
     inline_function_regex_formats.each do |format|
+      inspected_source = ''
+      regex_matched = false
       loop do
         inline_function_match = source.match(/#{format}/) # Search for inline function declaration
 
-        break if inline_function_match.nil? # No inline functions so nothing to do
+        if inline_function_match.nil? # No inline functions so nothing to do
+          # Join pre and post match stripped parts for the next inline function detection regex
+          source = inspected_source + source if regex_matched == true
+          break
+        end
 
+        regex_matched = true
         # 1. Determine if we are dealing with a user defined macro to declare inline functions
         # If the end of the pre-match string is a macro-declaration-like string,
         # we are dealing with a user defined macro to declare inline functions
@@ -162,7 +169,8 @@ class CMockHeaderParser
           # Remove the macro from the source
           stripped_pre_match = inline_function_match.pre_match.sub(/(#define\s*)\z/, '')
           stripped_post_match = inline_function_match.post_match.sub(/\A(.*[\n]?)/, '')
-          source = stripped_pre_match + stripped_post_match
+          inspected_source += stripped_pre_match
+          source = stripped_post_match
           next
         end
 
@@ -171,23 +179,32 @@ class CMockHeaderParser
         # we are dealing with a inline function declaration
         if /\A#{@function_declaration_parse_base_match}\s*;/m =~ inline_function_match.post_match
           # Only remove the inline part from the function declaration, leaving the function declaration won't do any harm
-          source = inline_function_match.pre_match + inline_function_match.post_match
+          inspected_source += inline_function_match.pre_match
+          source = inline_function_match.post_match
           next
         end
 
         # 3. If we get here, we found an inline function declaration AND inline function body.
-        #    Remove the function body to transform it into a 'normal' function.
+        # Remove the function body to transform it into a 'normal' function declaration.
-        total_pairs_to_remove = count_number_of_pairs_of_braces_in_function(inline_function_match.post_match)
+        if /\A#{@function_declaration_parse_base_match}\s*\{/m =~ inline_function_match.post_match
+          total_pairs_to_remove = count_number_of_pairs_of_braces_in_function(inline_function_match.post_match)
 
-        break if total_pairs_to_remove == 0 # Bad source?
+          break if total_pairs_to_remove == 0 # Bad source?
 
-        inline_function_stripped = inline_function_match.post_match
+          inline_function_stripped = inline_function_match.post_match
 
-        total_pairs_to_remove.times do
+          total_pairs_to_remove.times do
-          inline_function_stripped.sub!(/\s*#{square_bracket_pair_regex_format}/, ';') # Remove inline implementation (+ some whitespace because it's prettier)
+            inline_function_stripped.sub!(/\s*#{square_bracket_pair_regex_format}/, ';') # Remove inline implementation (+ some whitespace because it's prettier)
+          end
+          inspected_source += inline_function_match.pre_match
+          source = inline_function_stripped
+          next
         end
 
-        source = inline_function_match.pre_match + inline_function_stripped # Make new source with the inline function removed and move on to the next
+        # 4. If we get here, it means the regex match, but it is not related to the function (ex. static variable in header)
+        # Leave this code as it is.
+        inspected_source += inline_function_match.pre_match + inline_function_match[0]
+        source = inline_function_match.post_match
       end
     end
 

test/unit/cmock_header_parser_test.rb

@@ -2204,6 +2204,73 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
     assert_equal(expected, @parser.transform_inline_functions(source))
   end
 
+  it "Transform inline functions leaves static variables" do
+    source =
+      "#ifndef _NOINCLUDES\n" +
+      "#define _NOINCLUDES\n" +
+      "#include \"unity.h\"\n" +
+      "#include \"cmock.h\"\n" +
+      "#include \"YetAnotherHeader.h\"\n" +
+      "\n" +
+      "/* Ignore the following warnings since we are copying code */\n" +
+      "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n" +
+      "#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 6 || (__GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ > 0)))\n" +
+      "#pragma GCC diagnostic push\n" +
+      "#endif\n" +
+      "#if !defined(__clang__)\n" +
+      "#pragma GCC diagnostic ignored \"-Wpragmas\"\n" +
+      "#endif\n" +
+      "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n" +
+      "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n" +
+      "#endif\n" +
+      "\n" +
+      "int my_function(int a);\n" +
+      "static inline int staticinlinefunc(struct my_struct *s)\n" +
+      "{\n" +
+      "    return s->a;\n" +
+      "}\n" +
+      "static const int my_variable = 5;\n" +
+      "struct my_struct {\n" +
+      "int a;\n" +
+      "int b;\n" +
+      "int b;\n" +
+      "char c;\n" +
+      "};\n" +
+      "#endif _NOINCLUDES\n"
+
+    expected =
+    "#ifndef _NOINCLUDES\n" +
+    "#define _NOINCLUDES\n" +
+    "#include \"unity.h\"\n" +
+    "#include \"cmock.h\"\n" +
+    "#include \"YetAnotherHeader.h\"\n" +
+    "\n" +
+    "/* Ignore the following warnings since we are copying code */\n" +
+    "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n" +
+    "#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 6 || (__GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ > 0)))\n" +
+    "#pragma GCC diagnostic push\n" +
+    "#endif\n" +
+    "#if !defined(__clang__)\n" +
+    "#pragma GCC diagnostic ignored \"-Wpragmas\"\n" +
+    "#endif\n" +
+    "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n" +
+    "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n" +
+    "#endif\n" +
+    "\n" +
+    "int my_function(int a);\n" +
+    "int staticinlinefunc(struct my_struct *s);\n" +
+    "static const int my_variable = 5;\n" +
+    "struct my_struct {\n" +
+    "int a;\n" +
+    "int b;\n" +
+    "int b;\n" +
+    "char c;\n" +
+    "};\n" +
+    "#endif _NOINCLUDES\n"
+
+    assert_equal(expected, @parser.transform_inline_functions(source))
+  end
+
   it "Count number of pairs of braces in function succesfully" do
     source =
       "int foo(struct my_struct *s)\n" +