minor tweaks

Author: mvandervoord

lib/cmock_header_parser.rb

@@ -578,7 +578,7 @@ def parse_declaration(parse_project, declaration, namespace = [], classname = ni
     # remove default argument statements from mock definitions
     args.gsub!(/=\s*[a-zA-Z0-9_.]+\s*/, ' ')
 
-    # check for var args
+    # check for var args and place in their own collection for handling separately
     if args =~ /\.\.\./
       decl[:var_arg] = args.match(/[\w\s]*\.\.\./).to_s.strip
       args = if args =~ /,[\w\s]*\.\.\./
@@ -589,6 +589,8 @@ def parse_declaration(parse_project, declaration, namespace = [], classname = ni
     else
       decl[:var_arg] = nil
     end
+
+    # parse out and clean up the remainder of the arguments
     args = clean_args(args, parse_project)
     decl[:args_string] = args
     decl[:args] = parse_args(args)

src/cmock.h

@@ -18,7 +18,7 @@
 
 #define CMOCK_VERSION_MAJOR    2
 #define CMOCK_VERSION_MINOR    6
-#define CMOCK_VERSION_BUILD    0
+#define CMOCK_VERSION_BUILD    1
 #define CMOCK_VERSION          ((CMOCK_VERSION_MAJOR << 16) | (CMOCK_VERSION_MINOR << 8) | CMOCK_VERSION_BUILD)
 
 /* should be big enough to index full range of CMOCK_MEM_MAX */

test/system/test_compilation/parsing.h

@@ -84,6 +84,15 @@ typedef struct
   int (*another_function_pointer_in_a_struct) (void);
 } another_thing_that_should_get_ignored;
 
+typedef enum
+{
+  A_ENUM_VALUE = -18,   /**< Comment */
+  ANOTHER_ENUM_VALUE = -19 /**< Another comment.
+                                This one goes on and on. */
+} SET_OF_ENUM_VALUES_T;
+
+void DoesStuffWithEnum(SET_OF_ENUM_VALUES_T enumVal);
+
 inline int stuff(int num)
 {
     int reg = 0x12;