Deal with more complex array length expressions. (thanks @jlindgren90 !)

lib/cmock_header_parser.rb

@@ -16,7 +16,7 @@ class CMockHeaderParser
     @c_calling_conventions = cfg.c_calling_conventions.uniq
     @treat_as_array = cfg.treat_as_array
     @treat_as_void = (['void'] + cfg.treat_as_void).uniq
-    @function_declaration_parse_base_match = '([\w\s\*\(\),\[\]]+??)\(([\w\s\*\(\),\.\[\]+-]*)\)'
+    @function_declaration_parse_base_match = '([\w\s\*\(\),\[\]]+??)\(([\w\s\*\(\),\.\[\]+\-\/]*)\)'
     @declaration_parse_matcher = /#{@function_declaration_parse_base_match}$/m
     @standards = (['int','short','char','long','unsigned','signed'] + cfg.treat_as.keys).uniq
     @array_size_name = cfg.array_size_name
@@ -392,7 +392,7 @@ class CMockHeaderParser
     else
       c = 0
       # magically turn brackets into asterisks, also match for parentheses that come from macros
-      arg_list.gsub!(/(\w+)(?:\s*\[[\s\w\(\)+-]*\])+/, '*\1')
+      arg_list.gsub!(/(\w+)(?:\s*\[[^\[\]]*\])+/, '*\1')
       # remove space to place asterisks with type (where they belong)
       arg_list.gsub!(/\s+\*/, '*')
       # pull asterisks away from arg to place asterisks with type (where they belong)

test/unit/cmock_header_parser_test.rb

@@ -1291,7 +1291,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
 
   it "handle arrays and treat them as pointers or strings" do
     source = 'void KeyOperated(CUSTOM_TYPE thing1[], int thing2 [ ], ' \
-             'char thing3 [][2 ][ 3], int* thing4[4], u8 thing5[((u8)5)])'
+             'char thing3 [][2 ][ 3], int* thing4[4], u8 thing5[((u8)((5 + 5*2)/3))])'
     expected_args = [
       { type: 'CUSTOM_TYPE*', name: 'thing1', ptr?: true,  const?: false, const_ptr?: false },
       { type: 'int*',         name: 'thing2', ptr?: true,  const?: false, const_ptr?: false },