ceedling 0.20.3 → 0.21.0

data/vendor/c_exception/vendor/unity/test/tests/testparameterized.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include "unity.h"
 
-int putcharSpy(int c) {return putchar(c);} // include passthrough for linking tests
+void putcharSpy(int c) { (void)putchar(c);} // include passthrough for linking tests
 
 #define TEST_CASE(...)
 

data/vendor/c_exception/vendor/unity/test/tests/testunity.c

@@ -44,8 +44,8 @@ static const _UD d_zero = 0.0;
       UNITY_OUTPUT_CHAR('\n');                                                 \
     }
 
-int SetToOneToFailInTearDown;
-int SetToOneMeanWeAlreadyCheckedThisGuy;
+static int SetToOneToFailInTearDown;
+static int SetToOneMeanWeAlreadyCheckedThisGuy;
 
 void setUp(void)
 {
@@ -1370,7 +1370,7 @@ void testNotEqualString4(void)
 void testNotEqualStringLen4(void)
 {
     EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("bar\r", "bar\n", 4);
+    TEST_ASSERT_EQUAL_STRING_LEN("\r\x16", "bar\n", 4);
     VERIFY_FAILS_END
 }
 
@@ -1390,6 +1390,13 @@ void testNotEqualString_ExpectedStringIsNull(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualStringLen_ExpectedStringIsNull(void)
+{
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_STRING_LEN(NULL, "bar", 1);
+    VERIFY_FAILS_END
+}
+
 void testNotEqualString_ActualStringIsNull(void)
 {
     EXPECT_ABORT_BEGIN
@@ -1397,6 +1404,13 @@ void testNotEqualString_ActualStringIsNull(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualStringLen_ActualStringIsNull(void)
+{
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_STRING_LEN("foo", NULL, 1);
+    VERIFY_FAILS_END
+}
+
 void testEqualStringArrays(void)
 {
     const char *testStrings[] = { "foo", "boo", "woo", "moo" };
@@ -1476,6 +1490,16 @@ void testEqualStringArrayIfBothNulls(void)
     TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
 }
 
+void testNotEqualStringArrayLengthZero(void)
+{
+    const char *testStrings[] = {NULL};
+    const char **expStrings = NULL;
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 0);
+    VERIFY_FAILS_END
+}
+
 void testEqualMemory(void)
 {
     const char *testString = "whatever";
@@ -1516,6 +1540,13 @@ void testNotEqualMemory4(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualMemoryLengthZero(void)
+{
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_MEMORY(NULL, NULL, 0);
+    VERIFY_FAILS_END
+}
+
 void testEqualIntArrays(void)
 {
     int p0[] = {1, 8, 987, -2};
@@ -1528,6 +1559,7 @@ void testEqualIntArrays(void)
     TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
     TEST_ASSERT_EQUAL_INT_ARRAY(p0, p2, 3);
     TEST_ASSERT_EQUAL_INT_ARRAY(p0, p3, 1);
+    TEST_ASSERT_EQUAL_INT_ARRAY(NULL, NULL, 1);
 }
 
 void testNotEqualIntArraysNullExpected(void)
@@ -1580,6 +1612,16 @@ void testNotEqualIntArrays3(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualIntArraysLengthZero(void)
+{
+    _UU32 p0[1] = {1};
+    _UU32 p1[1] = {1};
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 0);
+    VERIFY_FAILS_END
+}
+
 void testEqualPtrArrays(void)
 {
     char A = 1;
@@ -2205,7 +2247,7 @@ char* getBufferPutcharSpy(void)
 #endif
 }
 
-int putcharSpy(int c)
+void putcharSpy(int c)
 {
 #ifdef USING_OUTPUT_SPY
     if (putcharSpyEnabled)
@@ -2215,7 +2257,19 @@ int putcharSpy(int c)
     } else
         c = putchar(c);
 #endif
-    return c;
+}
+
+void testFailureCountIncrementsAndIsReturnedAtEnd(void)
+{
+    Unity.CurrentTestFailed = 1;
+    startPutcharSpy(); // Suppress output
+    UnityConcludeTest();
+    TEST_ASSERT_EQUAL(1, Unity.TestFailures);
+
+    int failures = UnityEnd();
+    Unity.TestFailures--;
+    endPutcharSpy();
+    TEST_ASSERT_EQUAL(1, failures);
 }
 
 #define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) {             \
@@ -2978,6 +3032,18 @@ void testFloatIsNotDeterminate2(void)
 #endif
 }
 
+void testFloatTraitFailsOnInvalidTrait(void)
+{
+#ifdef UNITY_EXCLUDE_FLOAT
+    TEST_IGNORE();
+#else
+    EXPECT_ABORT_BEGIN
+    UnityAssertFloatSpecial(1.0f, NULL, __LINE__, UNITY_FLOAT_INVALID_TRAIT);
+    VERIFY_FAILS_END
+#endif
+}
+
+
 void testEqualFloatArrays(void)
 {
 #ifdef UNITY_EXCLUDE_FLOAT
@@ -2993,6 +3059,7 @@ void testEqualFloatArrays(void)
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p2, 3);
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p3, 1);
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(NULL, NULL, 1);
 #endif
 }
 
@@ -3136,6 +3203,20 @@ void testNotEqualFloatArraysInf(void)
 #endif
 }
 
+void testNotEqualFloatArraysLengthZero(void)
+{
+#ifdef UNITY_EXCLUDE_FLOAT
+    TEST_IGNORE();
+#else
+    float p0[1] = {0.0f};
+    float p1[1] = {0.0f};
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 0);
+    VERIFY_FAILS_END
+#endif
+}
+
 // ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES DOUBLE SUPPORT ==================
 
 void testDoublesWithinDelta(void)
@@ -3483,6 +3564,17 @@ void testDoubleIsNotDeterminate2(void)
 #endif
 }
 
+void testDoubleTraitFailsOnInvalidTrait(void)
+{
+#ifdef UNITY_EXCLUDE_DOUBLE
+    TEST_IGNORE();
+#else
+    EXPECT_ABORT_BEGIN
+    UnityAssertDoubleSpecial(1.0, NULL, __LINE__, UNITY_FLOAT_INVALID_TRAIT);
+    VERIFY_FAILS_END
+#endif
+}
+
 void testEqualDoubleArrays(void)
 {
 #ifdef UNITY_EXCLUDE_DOUBLE
@@ -3498,6 +3590,7 @@ void testEqualDoubleArrays(void)
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p2, 3);
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p3, 1);
+    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(NULL, NULL, 1);
 #endif
 }
 
@@ -3641,6 +3734,22 @@ void testNotEqualDoubleArraysInf(void)
 #endif
 }
 
+void testNotEqualDoubleArraysLengthZero(void)
+{
+#ifdef UNITY_EXCLUDE_DOUBLE
+    TEST_IGNORE();
+#else
+    double p0[1] = {0.0};
+    double p1[1] = {0.0};
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 0);
+    VERIFY_FAILS_END
+#endif
+}
+
+// ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES DETAIL SUPPORT ==================
+
 void testThatDetailsCanBeHandleOneDetail(void)
 {
 #ifdef UNITY_EXCLUDE_DETAILS
@@ -3654,6 +3763,19 @@ void testThatDetailsCanBeHandleOneDetail(void)
 #endif
 }
 
+void testThatDetailsCanHandleTestFail(void)
+{
+#ifdef UNITY_EXCLUDE_DETAILS
+    TEST_IGNORE();
+#else
+    UNITY_SET_DETAILS("Detail1","Detail2");
+
+    EXPECT_ABORT_BEGIN
+    TEST_FAIL_MESSAGE("Should Fail And Say Detail1 and Detail2");
+    VERIFY_FAILS_END
+#endif
+}
+
 void testThatDetailsCanBeHandleTwoDetails(void)
 {
 #ifdef UNITY_EXCLUDE_DETAILS

data/vendor/cmock/docs/CMock_Summary.md

@@ -293,7 +293,7 @@ Defined in the yaml file, they look more like this:
 
 * `:plugins`:
   An array of which plugins to enable. 'expect' is always active. Also
-  available currently are `:ignore,` `:ignore_args,` `:array,`
+  available currently are `:ignore,` `:ignore_arg,` `:array,`
   `:cexception,` `:callback,` and `:return_thru_ptr`
 
 * `:strippables`:

data/vendor/cmock/lib/cmock_generator.rb

@@ -28,7 +28,12 @@ class CMockGenerator
     here = File.dirname __FILE__
     unity_path_in_ceedling = "#{here}/../../unity" # path to Unity from within Ceedling
     unity_path_in_cmock = "#{here}/../vendor/unity" # path to Unity from within CMock
-    if File.exist? unity_path_in_ceedling
+    # path to Unity as specified by env var
+    unity_path_in_env = ENV.has_key?("UNITY_DIR") ? File.expand_path(ENV.fetch("UNITY_DIR")) : nil
+
+    if unity_path_in_env and File.exist? unity_path_in_env
+      require "#{unity_path_in_env}/auto/type_sanitizer"
+    elsif File.exist? unity_path_in_ceedling
       require "#{unity_path_in_ceedling}/auto/type_sanitizer"
     elsif File.exist? unity_path_in_cmock
       require "#{unity_path_in_cmock}/auto/type_sanitizer"
@@ -95,7 +100,7 @@ class CMockGenerator
     file << plugin_includes if (!plugin_includes.empty?)
     file << "\n"
     file << "/* Ignore the following warnings, since we are copying code */\n"
-    file << "#if defined(__GNUC__) && !defined(__ICC)\n"
+    file << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n"
     file << "#if !defined(__clang__)\n"
     file << "#pragma GCC diagnostic ignored \"-Wpragmas\"\n"
     file << "#endif\n"

data/vendor/cmock/lib/cmock_header_parser.rb

@@ -141,10 +141,8 @@ class CMockHeaderParser
       arg_array = arg.split
       arg_elements = arg_array - @c_attributes              # split up words and remove known attributes
       args << { :type   => (arg_type = arg_elements[0..-2].join(' ')),
-                :name   => arg_elements[-1],
-                :ptr?   => divine_ptr(arg_type),
-                :const? => divine_const(arg)
-              }
+                :name   => arg_elements[-1]
+              }.merge(divine_ptr_and_const(arg))
     end
     return args
   end
@@ -156,11 +154,34 @@ class CMockHeaderParser
   end
 
   def divine_const(arg)
-    return false if /const[ *]/.match(arg).nil?                           # check for const
-    return false if /\*/.match(arg) and /const[^*]*\*/.match(arg).nil?    # check const comes before * indicating const data
+    return false if !(/(?:^|\s|\*)const(?:\*|\s|$)/ =~ arg)   # check for const as part of a larger word
+    return true  if (/const(?:\w|\s)*\*/ =~ arg)              # check const comes before * indicating const data
+    return false if (/\*\s*const/ =~ arg)                     # check const comes after * indicating const ptr
     return true
   end
 
+  def divine_ptr_and_const(arg)
+    divination = { :ptr? => false, :const? => false, :const_ptr? => false }
+
+    #first check if there is a pointer present and that it's not part of a C string or function definition
+    #divination[:ptr?] = (arg.split[0..-2].join.include?('*') && !arg.gsub(/(const|char|\*|\s)+/,'').empty?)
+    divination[:ptr?] = (arg.include?('*') && !arg.gsub(/(const|char|\*|\s)+/,'').empty?)
+
+    #if there isn't a const that isn't part of a larger word, we're done
+    return divination if !(/(?:^|\s|\*)const(?:\*|\s|$)/ =~ arg)
+    divination[:const?] = true
+
+    # check const comes after * indicating const ptr
+    if (/\*\s*const/ =~ arg)
+      divination[:const_ptr?] = true
+
+      #check const comes before * indicating also const data
+      divination[:const?] = (/const(?:\w|\s)*\*/ =~ arg) ? true : false
+    end
+
+    return divination
+  end
+
   def clean_args(arg_list)
     if ((@local_as_void.include?(arg_list.strip)) or (arg_list.empty?))
       return 'void'
@@ -220,6 +241,7 @@ class CMockHeaderParser
     #build attribute and return type strings
     decl[:modifier] = []
     rettype = []
+    full_retval = descriptors[0..-2].join(' ')
     descriptors[0..-2].each do |word|
       if @c_attributes.include?(word)
         decl[:modifier] << word
@@ -234,11 +256,9 @@ class CMockHeaderParser
     rettype = 'void' if (@local_as_void.include?(rettype.strip))
     decl[:return] = { :type   => rettype,
                       :name   => 'cmock_to_return',
-                      :ptr?   => divine_ptr(rettype),
-                      :const? => decl[:modifier].split(/\s/).include?('const'),
                       :str    => "#{rettype} cmock_to_return",
                       :void?  => (rettype == 'void')
-                    }
+                    }.merge(divine_ptr_and_const(full_retval))
 
     #remove default argument statements from mock definitions
     args.gsub!(/=\s*[a-zA-Z0-9_\.]+\s*/, ' ')

data/vendor/cmock/scripts/create_mock.rb

@@ -4,5 +4,5 @@ raise "Header file to mock must be specified!" unless ARGV.length >= 1
 
 mock_out = ENV.fetch('MOCK_OUT', './build/test/mocks')
 mock_prefix = ENV.fetch('MOCK_PREFIX', 'mock_')
-cmock = CMock.new(plugins: [:ignore, :return_thru_ptr], mock_prefix: 'mock_', mock_path: mock_out)
+cmock = CMock.new({:plugins => [:ignore, :return_thru_ptr], :mock_prefix => mock_prefix, :mock_path => mock_out})
 cmock.setup_mocks(ARGV[0])

data/vendor/cmock/test/system/test_compilation/const.h

@@ -20,3 +20,18 @@ void const_variants2(
 	struct _DUMMY_T const * const param1,
 	const unsigned long int const * const param2,
 	const struct _DUMMY_T const * param3 );
+
+const int * const_retval1(void);        /* nicety version for pointer to constant int */
+int const * const_retval2(void);        /* formal version for pointer to constant int */
+//int * const const_retval3(void);        /* formal version for constant pointer to int */
+//int const * const const_retval4(void);  /* formal version for constant pointer to constant int */
+
+const int* const_retval5(void);         /* sticky-left nicety version for pointer to constant int */
+int const* const_retval6(void);         /* sticky-left formal version for pointer to constant int */
+//int* const const_retval7(void);         /* sticky-left formal version for constant pointer to int */
+//int const* const const_retval8(void);   /* sticky-left formal version for constant pointer to constant int */
+
+const int *const_retval9(void);         /* sticky-right nicety version for pointer to constant int */
+int const *const_retvalA(void);         /* sticky-right formal version for pointer to constant int */
+//int *const const_retvalB(void);         /* sticky-right formal version for constant pointer to int */
+//int const *const const_retvalC(void);   /* sticky-right formal version for constant pointer to constant int */

data/vendor/cmock/test/unit/cmock_generator_main_test.rb

@@ -94,7 +94,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
       "#include \"PluginRequiredHeader.h\"\n",
       "\n",
       "/* Ignore the following warnings, since we are copying code */\n",
-      "#if defined(__GNUC__) && !defined(__ICC)\n",
+      "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
       "#if !defined(__clang__)\n",
       "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
       "#endif\n",
@@ -144,7 +144,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
       "#include \"PluginRequiredHeader.h\"\n",
       "\n",
       "/* Ignore the following warnings, since we are copying code */\n",
-      "#if defined(__GNUC__) && !defined(__ICC)\n",
+      "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
       "#if !defined(__clang__)\n",
       "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
       "#endif\n",
@@ -178,7 +178,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
       "#include \"#{orig_filename}\"\n",
       "\n",
       "/* Ignore the following warnings, since we are copying code */\n",
-      "#if defined(__GNUC__) && !defined(__ICC)\n",
+      "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
       "#if !defined(__clang__)\n",
       "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
       "#endif\n",
@@ -213,7 +213,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
       "#include \"PluginRequiredHeader.h\"\n",
       "\n",
       "/* Ignore the following warnings, since we are copying code */\n",
-      "#if defined(__GNUC__) && !defined(__ICC)\n",
+      "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
       "#if !defined(__clang__)\n",
       "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
       "#endif\n",

data/vendor/cmock/test/unit/cmock_header_parser_test.rb

@@ -478,12 +478,13 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[{:type=>"int", :name=>"a", :ptr? => false, :const? => false}],
+                 :args=>[{:type=>"int", :name=>"a", :ptr? => false, :const? => false, :const_ptr? => false}],
                  :args_string=>"int a",
                  :args_call=>"a"}
     assert_equal(expected, @parser.parse_declaration(source))
@@ -497,6 +498,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "int cmock_to_return",
                             :void?  => false
                           },
@@ -516,12 +518,13 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "char cmock_to_return",
                             :void?  => false
                           },
                  :modifier=>"",
                  :contains_ptr? => true,
-                 :args=>[{:type=>"MY_FUNKY_VOID*", :name=>"bluh", :ptr? => true, :const? => false}],
+                 :args=>[{:type=>"MY_FUNKY_VOID*", :name=>"bluh", :ptr? => true, :const? => false, :const_ptr? => false}],
                  :args_string=>"MY_FUNKY_VOID* bluh",
                  :args_call=>"bluh" }
     assert_equal(expected, @parser.parse_declaration(source))
@@ -614,13 +617,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "int cmock_to_return",
                             :void?  => false
                           },
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"int", :name=>"a", :ptr? => false, :const? => false},
-                          {:type=>"unsigned int", :name=>"b", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"int", :name=>"a", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"unsigned int", :name=>"b", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"int a, unsigned int b",
                  :args_call=>"a, b" }
@@ -635,15 +639,16 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"FunkyChicken",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"uint", :name=>"la", :ptr? => false, :const? => false},
-                          {:type=>"int",  :name=>"de", :ptr? => false, :const? => false},
-                          {:type=>"bool", :name=>"da", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"uint", :name=>"la", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"int",  :name=>"de", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"bool", :name=>"da", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"uint la, int     de, bool da",
                  :args_call=>"la, de, da" }
@@ -658,6 +663,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
@@ -678,14 +684,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => true,
+                            :const_ptr? => false,
                             :str    => "int cmock_to_return",
                             :void?  => false
                           },
                  :name=>"TheMatrix",
                  :modifier=>"const",
                  :contains_ptr? => true,
-                 :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false},
-                          {:type=>"unsigned int*", :name=>"Neo",     :ptr? => true,  :const? => false}
+                 :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"unsigned int*", :name=>"Neo",     :ptr? => true,  :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"int Trinity, unsigned int* Neo",
                  :args_call=>"Trinity, Neo" }
@@ -700,6 +707,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => true,
+                            :const_ptr? => false,
                             :str    => "int cmock_to_return",
                             :void?  => false
                           },
@@ -707,8 +715,8 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                  :modifier=>"const",
                  :c_calling_convention=>"__stdcall",
                  :contains_ptr? => true,
-                 :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false},
-                          {:type=>"unsigned int*", :name=>"Neo",     :ptr? => true,  :const? => false}
+                 :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"unsigned int*", :name=>"Neo",     :ptr? => true,  :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"int Trinity, unsigned int* Neo",
                  :args_call=>"Trinity, Neo" }
@@ -725,14 +733,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => true,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
                   :name=>"TheMatrix",
                   :modifier=>"const",
                   :contains_ptr? => true,
-                  :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false},
-                           {:type=>"unsigned int*", :name=>"Neo",     :ptr? => true,  :const? => false}
+                  :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false, :const_ptr? => false},
+                           {:type=>"unsigned int*", :name=>"Neo",     :ptr? => true,  :const? => false, :const_ptr? => false}
                          ],
                   :args_string=>"int Trinity, unsigned int* Neo",
                  :args_call=>"Trinity, Neo" },
@@ -741,14 +750,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
                   :name=>"Morpheus",
                   :modifier=>"",
                   :contains_ptr? => true,
-                  :args=>[ {:type=>"int",           :name=>"cmock_arg1", :ptr? => false, :const? => false},
-                           {:type=>"unsigned int*", :name=>"cmock_arg2", :ptr? => true,  :const? => false}
+                  :args=>[ {:type=>"int",           :name=>"cmock_arg1", :ptr? => false, :const? => false, :const_ptr? => false},
+                           {:type=>"unsigned int*", :name=>"cmock_arg2", :ptr? => true,  :const? => false, :const_ptr? => false}
                          ],
                   :args_string=>"int cmock_arg1, unsigned int* cmock_arg2",
                  :args_call=>"cmock_arg1, cmock_arg2"
@@ -767,13 +777,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => true,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
                   :modifier=>"const",
                   :contains_ptr? => true,
-                  :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false},
-                           {:type=>"unsigned int*", :name=>"Neo", :ptr? => true,      :const? => false}
+                  :args=>[ {:type=>"int",           :name=>"Trinity", :ptr? => false, :const? => false, :const_ptr? => false},
+                           {:type=>"unsigned int*", :name=>"Neo", :ptr? => true,      :const? => false, :const_ptr? => false}
                          ],
                   :args_string=>"int Trinity, unsigned int* Neo",
                   :args_call=>"Trinity, Neo"
@@ -781,6 +792,29 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
     assert_equal(expected, @parser.parse("module", source)[:functions])
   end
 
+  it "should properly handle const applied after asterisk in return type (not legal C, but sometimes used)" do
+
+    source = "int * const PorkRoast(void);\n"
+
+    expected = [{ :var_arg=>nil,
+                  :name=>"PorkRoast",
+                  :return=> { :type   => "int*",
+                              :name   => 'cmock_to_return',
+                              :ptr?   => true,
+                              :const? => false,
+                              :const_ptr? => true,
+                              :str    => "int* cmock_to_return",
+                              :void?  => false
+                            },
+                  :modifier=>"const",
+                  :contains_ptr? => false,
+                  :args=>[],
+                  :args_string=>"void",
+                  :args_call=>""
+                }]
+    assert_equal(expected, @parser.parse("module", source)[:functions])
+  end
+
   it "properly detect typedef'd variants of void and use those" do
 
     source = "typedef (void) FUNKY_VOID_T;\n" +
@@ -794,12 +828,13 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                                 :name   => 'cmock_to_return',
                                 :ptr?   => false,
                                 :const? => false,
+                                :const_ptr? => false,
                                 :str    => "void cmock_to_return",
                                 :void?  => true
                               },
                   :modifier=>"",
                   :contains_ptr? => false,
-                  :args=>[ {:type=>"int", :name=>"SingAlong", :ptr? => false, :const? => false} ],
+                  :args=>[ {:type=>"int", :name=>"SingAlong", :ptr? => false, :const? => false, :const_ptr? => false} ],
                   :args_string=>"int SingAlong",
                   :args_call=>"SingAlong"
                 },
@@ -808,6 +843,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
@@ -832,13 +868,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
                   :name=>"DrHorrible",
                   :modifier=>"",
                   :contains_ptr? => false,
-                  :args=>[ {:type=>"struct SingAlong", :name=>"Blog", :ptr? => false, :const? => false} ],
+                  :args=>[ {:type=>"struct SingAlong", :name=>"Blog", :ptr? => false, :const? => false, :const_ptr? => false} ],
                   :args_string=>"struct SingAlong Blog",
                   :args_call=>"Blog"
                 },
@@ -847,13 +884,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "void cmock_to_return",
                               :void?  => true
                             },
                   :name=>"Penny",
                   :modifier=>"",
                   :contains_ptr? => true,
-                  :args=>[ {:type=>"struct _KeepYourHeadUp_*", :name=>"BillyBuddy", :ptr? => true, :const? => true} ],
+                  :args=>[ {:type=>"struct _KeepYourHeadUp_*", :name=>"BillyBuddy", :ptr? => true, :const? => true, :const_ptr? => true} ],
                   :args_string=>"struct const _KeepYourHeadUp_* const BillyBuddy",
                   :args_call=>"BillyBuddy"
                 },
@@ -862,6 +900,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "struct TheseArentTheHammer cmock_to_return",
                               :void?  => false
                             },
@@ -882,14 +921,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"OrangePeel",
                  :modifier=>"",
                  :contains_ptr? => true,
-                 :args=>[ {:type=>"union STARS_AND_STRIPES*", :name=>"a", :ptr? => true, :const? => false},
-                          {:type=>"union AFL_CIO", :name=>"b", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"union STARS_AND_STRIPES*", :name=>"a", :ptr? => true, :const? => false, :const_ptr? => false},
+                          {:type=>"union AFL_CIO", :name=>"b", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"union STARS_AND_STRIPES* a, union AFL_CIO b",
                  :args_call=>"a, b" }]
@@ -904,17 +944,18 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"ApplePeel",
                  :modifier=>"",
                  :contains_ptr? => true,
-                 :args=>[ {:type=> "unsigned int", :name=>"const_param", :ptr? => false, :const? => true},
-                          {:type=>"int", :name=>"int_param", :ptr? => false, :const? => false},
-                          {:type=>"int", :name=>"integer", :ptr? => false, :const? => false},
-                          {:type=>"char", :name=>"character", :ptr? => false, :const? => false},
-                          {:type=>"int*", :name=>"constant", :ptr? => true, :const? => false}
+                 :args=>[ {:type=> "unsigned int", :name=>"const_param", :ptr? => false, :const? => true, :const_ptr? => false},
+                          {:type=>"int", :name=>"int_param", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"int", :name=>"integer", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"char", :name=>"character", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"int*", :name=>"constant", :ptr? => true, :const? => false, :const_ptr? => true}
                         ],
                  :args_string=>"const unsigned int const_param, int int_param, int integer, char character, int* const constant",
                  :args_call=>"const_param, int_param, integer, character, constant" }]
@@ -929,17 +970,18 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"LemonPeel",
                  :modifier=>"",
                  :contains_ptr? => true,
-                 :args=>[ {:type=>"integer", :name=>"param", :ptr? => false, :const? => false},
-                          {:type=>"character", :name=>"thing", :ptr? => false, :const? => false},
-                          {:type=>"longint*", :name=>"junk", :ptr? => true, :const? => false},
-                          {:type=>"constant", :name=>"value", :ptr? => false, :const? => false},
-                          {:type=>"int32_t", :name=>"number", :ptr? => false, :const? => true}
+                 :args=>[ {:type=>"integer", :name=>"param", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"character", :name=>"thing", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"longint*", :name=>"junk", :ptr? => true, :const? => false, :const_ptr? => false},
+                          {:type=>"constant", :name=>"value", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"int32_t", :name=>"number", :ptr? => false, :const? => true, :const_ptr? => false}
                         ],
                  :args_string=>"integer param, character thing, longint* junk, constant value, int32_t const number",
                  :args_call=>"param, thing, junk, value, number" }]
@@ -954,16 +996,17 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"CoinOperated",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"signed char", :name=>"abc", :ptr? => false, :const? => false},
-                          {:type=>"unsigned long int", :name=>"xyz_123", :ptr? => false, :const? => true},
-                          {:type=>"unsigned int", :name=>"abc_123", :ptr? => false, :const? => true},
-                          {:type=>"long long", :name=>"arm_of_the_law", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"signed char", :name=>"abc", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"unsigned long int", :name=>"xyz_123", :ptr? => false, :const? => true, :const_ptr? => false},
+                          {:type=>"unsigned int", :name=>"abc_123", :ptr? => false, :const? => true, :const_ptr? => false},
+                          {:type=>"long long", :name=>"arm_of_the_law", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"signed char abc, const unsigned long int xyz_123, unsigned int const abc_123, long long arm_of_the_law",
                  :args_call=>"abc, xyz_123, abc_123, arm_of_the_law" }]
@@ -978,16 +1021,17 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"CardOperated",
                  :modifier=>"",
                  :contains_ptr? => true,
-                 :args=>[ {:type=>"CUSTOM_TYPE", :name=>"abc", :ptr? => false, :const? => false},
-                          {:type=>"CUSTOM_TYPE*", :name=>"xyz_123", :ptr? => true, :const? => false},
-                          {:type=>"CUSTOM_TYPE", :name=>"abcxyz", :ptr? => false, :const? => true},
-                          {:type=>"struct CUSTOM_TYPE const*", :name=>"abc123", :ptr? => true, :const? => true}
+                 :args=>[ {:type=>"CUSTOM_TYPE", :name=>"abc", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"CUSTOM_TYPE*", :name=>"xyz_123", :ptr? => true, :const? => false, :const_ptr? => false},
+                          {:type=>"CUSTOM_TYPE", :name=>"abcxyz", :ptr? => false, :const? => true, :const_ptr? => false},
+                          {:type=>"struct CUSTOM_TYPE const*", :name=>"abc123", :ptr? => true, :const? => true, :const_ptr? => true}
                         ],
                  :args_string=>"CUSTOM_TYPE abc, CUSTOM_TYPE* xyz_123, CUSTOM_TYPE const abcxyz, struct CUSTOM_TYPE const* const abc123",
                  :args_call=>"abc, xyz_123, abcxyz, abc123" }]
@@ -1002,16 +1046,17 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"KeyOperated",
                  :modifier=>"",
                  :contains_ptr? => true,
-                 :args=>[ {:type=>"CUSTOM_TYPE*", :name=>"thing1", :ptr? => true, :const? => false},
-                          {:type=>"int*", :name=>"thing2", :ptr? => true, :const? => false},
-                          {:type=>"char*", :name=>"thing3", :ptr? => false, :const? => false},  #THIS one will likely change in the future when we improve multidimensional array support
-                          {:type=>"int**", :name=>"thing4", :ptr? => true, :const? => false}    #THIS one will likely change in the future when we improve multidimensional array support
+                 :args=>[ {:type=>"CUSTOM_TYPE*", :name=>"thing1", :ptr? => true, :const? => false, :const_ptr? => false},
+                          {:type=>"int*", :name=>"thing2", :ptr? => true, :const? => false, :const_ptr? => false},
+                          {:type=>"char*", :name=>"thing3", :ptr? => true, :const? => false, :const_ptr? => false},  #THIS one will likely change in the future when we improve multidimensional array support
+                          {:type=>"int**", :name=>"thing4", :ptr? => true, :const? => false, :const_ptr? => false}    #THIS one will likely change in the future when we improve multidimensional array support
                         ],
                  :args_string=>"CUSTOM_TYPE* thing1, int* thing2, char* thing3, int** thing4",
                  :args_call=>"thing1, thing2, thing3, thing4" }]
@@ -1026,15 +1071,16 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"Cheese",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"unsigned CUSTOM_TYPE", :name=>"abc", :ptr? => false, :const? => false},
-                          {:type=>"unsigned", :name=>"xyz", :ptr? => false, :const? => false},
-                          {:type=>"CUSTOM_TYPE1 CUSTOM_TYPE2", :name=>"pdq", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"unsigned CUSTOM_TYPE", :name=>"abc", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"unsigned", :name=>"xyz", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"CUSTOM_TYPE1 CUSTOM_TYPE2", :name=>"pdq", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"unsigned CUSTOM_TYPE abc, unsigned xyz, CUSTOM_TYPE1 CUSTOM_TYPE2 pdq",
                  :args_call=>"abc, xyz, pdq" }]
@@ -1049,13 +1095,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"FunkyTurkey",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"cmock_module_func_ptr1 func_ptr",
                  :args_call=>"func_ptr" }]
@@ -1072,13 +1119,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"FunkyTurkey",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"cmock_module_func_ptr1 func_ptr",
                  :args_call=>"func_ptr" }]
@@ -1095,13 +1143,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"FunkyTurkey",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"cmock_module_func_ptr1 func_ptr",
                  :args_call=>"func_ptr" }]
@@ -1118,13 +1167,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"FunkyChicken",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => true}
+                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => true, :const_ptr? => false}
                         ],
                  :args_string=>"cmock_module_func_ptr1 const func_ptr",
                  :args_call=>"func_ptr" }]
@@ -1141,13 +1191,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             # :name   => 'cmock_to_return',
                             # :ptr?   => false,
                             # :const? => false,
+                            # :const_ptr? => false,
                             # :str    => "void cmock_to_return",
                             # :void?  => true
                           # },
                  # :name=>"FunkyParrot",
                  # :modifier=>"",
                  # :contains_ptr? => false,
-                 # :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false}
+                 # :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false, :const_ptr? => false}
                         # ],
                  # :args_string=>"cmock_module_func_ptr1 func_ptr",
                  # :args_call=>"func_ptr" }]
@@ -1164,14 +1215,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"FunkyBudgie",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr1", :ptr? => false, :const? => false},
-                          {:type=>"cmock_module_func_ptr2", :name=>"func_ptr2", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr1", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"cmock_module_func_ptr2", :name=>"func_ptr2", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"cmock_module_func_ptr1 func_ptr1, cmock_module_func_ptr2 func_ptr2",
                  :args_call=>"func_ptr1, func_ptr2" }]
@@ -1188,15 +1240,16 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => true,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "struct mytype* cmock_to_return",
                             :void?  => false
                           },
                  :name=>"FunkyRobin",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"uint16_t", :name=>"num1", :ptr? => false, :const? => false},
-                          {:type=>"uint16_t", :name=>"num2", :ptr? => false, :const? => false},
-                          {:type=>"cmock_module_func_ptr1", :name=>"func_ptr1", :ptr? => false, :const? => false}
+                 :args=>[ {:type=>"uint16_t", :name=>"num1", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"uint16_t", :name=>"num2", :ptr? => false, :const? => false, :const_ptr? => false},
+                          {:type=>"cmock_module_func_ptr1", :name=>"func_ptr1", :ptr? => false, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"uint16_t num1, uint16_t num2, cmock_module_func_ptr1 func_ptr1",
                  :args_call=>"num1, num2, func_ptr1" }]
@@ -1213,13 +1266,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "void cmock_to_return",
                             :void?  => true
                           },
                  :name=>"FunkyFowl",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"cmock_arg1", :ptr? => false, :const? => true}
+                 :args=>[ {:type=>"cmock_module_func_ptr1", :name=>"cmock_arg1", :ptr? => false, :const? => true, :const_ptr? => false}
                         ],
                  :args_string=>"cmock_module_func_ptr1 const cmock_arg1",
                  :args_call=>"cmock_arg1" }]
@@ -1236,13 +1290,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "cmock_module_func_ptr1 cmock_to_return",
                             :void?  => false
                           },
                  :name=>"FunkyPidgeon",
                  :modifier=>"",
                  :contains_ptr? => false,
-                 :args=>[ {:type=>"char", :name=>"op_code", :ptr? => false, :const? => true}
+                 :args=>[ {:type=>"char", :name=>"op_code", :ptr? => false, :const? => true, :const_ptr? => false}
                         ],
                  :args_string=>"const char op_code",
                  :args_call=>"op_code" }]
@@ -1259,6 +1314,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "cmock_module_func_ptr1 cmock_to_return",
                             :void?  => false
                           },
@@ -1281,6 +1337,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "cmock_module_func_ptr1 cmock_to_return",
                             :void?  => false
                           },
@@ -1303,14 +1360,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                             :name   => 'cmock_to_return',
                             :ptr?   => false,
                             :const? => false,
+                            :const_ptr? => false,
                             :str    => "cmock_module_func_ptr1 cmock_to_return",
                             :void?  => false
                           },
                  :name=>"FunkyMacaw",
                  :modifier=>"",
                  :contains_ptr? => true,
-                 :args=>[ {:type=>"double*", :name=>"foo", :ptr? => true, :const? => false},
-                          {:type=>"THING*", :name=>"bar", :ptr? => true, :const? => false}
+                 :args=>[ {:type=>"double*", :name=>"foo", :ptr? => true, :const? => false, :const_ptr? => false},
+                          {:type=>"THING*", :name=>"bar", :ptr? => true, :const? => false, :const_ptr? => false}
                         ],
                  :args_string=>"double* foo, THING* bar",
                  :args_call=>"foo, bar" }]
@@ -1327,17 +1385,18 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                              :name   => "cmock_to_return",
                              :ptr?   => false,
                              :const? => false,
+                             :const_ptr? => false,
                              :str    => "int cmock_to_return",
                              :void?  => false
                            },
                    :name=>"sqlite3_bind_text",
                    :modifier=>"SQLITE_API",
                    :contains_ptr? => true,
-                   :args=>[ {:type=>"sqlite3_stmt*", :name=>"cmock_arg2", :ptr? => true, :const? => false},
-                            {:type=>"int", :name=>"cmock_arg3", :ptr? => false, :const? => false},
-                            {:type=>"char*", :name=>"cmock_arg4", :ptr? => false, :const? => true},
-                            {:type=>"int", :name=>"n", :ptr? => false, :const? => false},
-                            {:type=>"cmock_module_func_ptr1", :name=>"cmock_arg1", :ptr? => false, :const? => false}
+                   :args=>[ {:type=>"sqlite3_stmt*", :name=>"cmock_arg2", :ptr? => true, :const? => false, :const_ptr? => false},
+                            {:type=>"int", :name=>"cmock_arg3", :ptr? => false, :const? => false, :const_ptr? => false},
+                            {:type=>"char*", :name=>"cmock_arg4", :ptr? => true, :const? => true, :const_ptr? => false},
+                            {:type=>"int", :name=>"n", :ptr? => false, :const? => false, :const_ptr? => false},
+                            {:type=>"cmock_module_func_ptr1", :name=>"cmock_arg1", :ptr? => false, :const? => false, :const_ptr? => false}
                           ],
                    :args_string=>"sqlite3_stmt* cmock_arg2, int cmock_arg3, const char* cmock_arg4, int n, cmock_module_func_ptr1 cmock_arg1",
                    :args_call=>"cmock_arg2, cmock_arg3, cmock_arg4, n, cmock_arg1" }]
@@ -1354,14 +1413,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
                   :name=>"XFiles",
                   :modifier=>"",
                   :contains_ptr? => false,
-                  :args=>[ {:type=>"int", :name=>"Scully", :ptr? => false, :const? => false},
-                           {:type=>"int", :name=>"Mulder", :ptr? => false, :const? => false}
+                  :args=>[ {:type=>"int", :name=>"Scully", :ptr? => false, :const? => false, :const_ptr? => false},
+                           {:type=>"int", :name=>"Mulder", :ptr? => false, :const? => false, :const_ptr? => false}
                          ],
                   :args_string=>"int Scully, int Mulder",
                   :args_call=>"Scully, Mulder"
@@ -1376,13 +1436,14 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => true,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "void* cmock_to_return",
                               :void?  => false
                             },
                   :name=>"MoreSillySongs",
                   :modifier=>"",
                   :contains_ptr? => true,
-                  :args=>[ {:type=>"void*", :name=>"stuff", :ptr? => true, :const? => false}
+                  :args=>[ {:type=>"void*", :name=>"stuff", :ptr? => true, :const? => false, :const_ptr? => false}
                          ],
                   :args_string=>"void* stuff",
                   :args_call=>"stuff"
@@ -1397,14 +1458,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
                   :name=>"LaverneAndShirley",
                   :modifier=>"",
                   :contains_ptr? => false,
-                  :args=>[ {:type=>"int", :name=>"Lenny", :ptr? => false, :const? => false},
-                           {:type=>"int", :name=>"Squiggy", :ptr? => false, :const? => false}
+                  :args=>[ {:type=>"int", :name=>"Lenny", :ptr? => false, :const? => false, :const_ptr? => false},
+                           {:type=>"int", :name=>"Squiggy", :ptr? => false, :const? => false, :const_ptr? => false}
                          ],
                   :args_string=>"int Lenny, int Squiggy",
                   :args_call=>"Lenny, Squiggy"
@@ -1419,14 +1481,15 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
                               :name   => 'cmock_to_return',
                               :ptr?   => false,
                               :const? => false,
+                              :const_ptr? => false,
                               :str    => "int cmock_to_return",
                               :void?  => false
                             },
                   :name=>"TheCosbyShow",
                   :modifier=>"",
                   :contains_ptr? => false,
-                  :args=>[ {:type=>"int", :name=>"Cliff", :ptr? => false, :const? => false},
-                           {:type=>"int", :name=>"Claire", :ptr? => false, :const? => false}
+                  :args=>[ {:type=>"int", :name=>"Cliff", :ptr? => false, :const? => false, :const_ptr? => false},
+                           {:type=>"int", :name=>"Claire", :ptr? => false, :const? => false, :const_ptr? => false}
                          ],
                   :args_string=>"int Cliff, int Claire",
                   :args_call=>"Cliff, Claire"