Merge pull request #437 from alufers/master

fix: Don't smush macros which have an escaped empty line at the end

Author: mvandervoord

lib/cmock_header_parser.rb

@@ -137,7 +137,7 @@ def transform_inline_functions(source)
     # If the user uses a macro to declare an inline function,
     # smushing the macros makes it easier to recognize them as a macro and if required,
     # remove them later on in this function
-    source.gsub!(/\s*\\\s*/m, ' ')
+    source.gsub!(/\s*\\(\n|\s*)/m, ' ')
 
     # Just looking for static|inline in the gsub is a bit too aggressive (functions that are named like this, ...), so we try to be a bit smarter
     # Instead, look for an inline pattern (f.e. "static inline") and parse it.

test/unit/cmock_header_parser_test.rb

@@ -2867,5 +2867,19 @@ class Classy {
     assert_equal(expected, @parser.transform_inline_functions(source))
   end
 
+  it "Transform macros with escapes of empty lines" do
+    source =
+      "#define some_msg_t_FIELDLIST(X, a) \\\n" +
+      "\n" +
+      "#define some_msg_t_CALLBACK NULL\n"
+
+    expected =
+      "#define some_msg_t_FIELDLIST(X, a) \n" +
+      "#define some_msg_t_CALLBACK NULL\n"
+
+    @parser.treat_inlines = :include
+    assert_equal(expected, @parser.transform_inline_functions(source))
+  end
+
 
 end