Renamed cJSON_DataType_t Null to NullType. Removed cJSON_UnknownValueType_Error and replaced it with cJSON_InvalidCharacterSequence_Error. Changed dict/list append functions' return type from cJSON_Result_t to void. Changed generic object malloc function to not allocate memory for string type generic objects. Added parser flags. Added parser's number parser. Worked on string parser function implementation. TODO: Bool behavior, dict/list start behavior in string parser.

Author: HeCoding180

inc/cJSON.h

@@ -55,7 +55,7 @@ cJSON_Result_t cJSON_delGenObj(cJSON_Generic_t GObj);
  * 
  * @param   GOptr cJSON_Generic pointer, where the parsed structure will be saved in.
  * @param   str String containing the JSON data.
- * @return  cJSON_Result_t Returns cJSON_Ok by default. Can return the following errors: cJSON_Structure_Error, cJSON_DepthOutOfRange_Error.
+ * @return  cJSON_Result_t Returns cJSON_Ok by default. Can return one of the following errors: cJSON_DepthOutOfRange_Error, cJSON_Structure_Error, cJSON_InvalidCharacterSequence_Error.
  */
 cJSON_Result_t cJSON_parseStr(cJSON_Generic_t *GObjPtr, char *str);
 

inc/cJSON_Parser_Util.h

@@ -15,8 +15,28 @@
 #include "../inc/cJSON_Types.h"
 #include "../inc/cJSON_Util.h"
 
+//   ---   Defines   ---
+
+// - Flag Defines -
+#pragma region Flag Defines
+
+#define CJP_DICT_END_POSSIBLE       0x01    // "}" possible
+#define CJP_LIST_END_POSSIBLE       0x02    // "]" possible
+#define CJP_ITEM_SEPT_POSSIBLE      0x04    // "," possible
+#define CJP_DICT_KEY_POSSIBLE       0x08    // Dictionary key (string) possible
+#define CJP_DICT_SEPT_POSSIBLE      0x10    // ":" possible
+#define CJP_DICT_VALUE_POSSIBLE     0x20    // Value possible (top of object stack is a dictionary)
+#define CJP_LIST_VALUE_POSSIBLE     0x40    // Value possible (top of object stack is a list)
+
+#pragma endregion
+
+
+
 //   ---   Macros   ---
 
+// - Character Case Macros -
+#pragma region Character Case Macros
+
 /**
  * @brief   Macro used to change an alphabetical character to lower case
  * 
@@ -28,6 +48,8 @@
  */
 #define UPPER_CASE_CHAR(c) ((((c) > 0x40) && ((c) < 0x5B)) ? ((c) & 0xDF) : (c))
 
+#pragma endregion
+
 
 
 //   ---   Typedefs   ---
@@ -63,7 +85,7 @@ typedef struct cJSON_StringBuilder_DoubleBuffer
  * @param   outputStrPtr Pointer to a string pointer variable where the extracted and formatted string should be stored.
  * @return  char* Returns 
  */
-static cJSON_Result_t cJSON_Parser_StringBuilder(char **refStrPtr, char **outputStrPtr);
+cJSON_Result_t cJSON_Parser_StringBuilder(char **refStrPtr, char **outputStrPtr);
 
 /**
  * @brief   Function used to add a character to a double buffer.
@@ -75,4 +97,17 @@ static void SB_DB_AddChar(cJSON_SB_DB_t *SbDb, const char c);
 
 #pragma endregion
 
+// - Number Parser Function Prototypes -
+#pragma region Number Parser Function Prototypes
+
+/**
+ * @brief   Function used to extract a number from the current location of the refStrPtr
+ * 
+ * @param   refStrPtr Pointer to the start location of the number that is to be extracted inside of the original string that is to be parsed. Pointer pointer is also used to skip that segment of the string by incrementing the original string pointer.
+ * @return  cJSON_Generic_t Generic object containing the parsed integer or float.
+ */
+cJSON_Generic_t cJSON_Parser_NumParser(char **refStrPtr);
+
+#pragma endregion
+
 #endif

inc/cJSON_Types.h

@@ -132,7 +132,7 @@ typedef bool cJSON_Bool_t;
  */
 typedef enum cJSON_DataType
 {
-    Null = 0,
+    NullType = 0,
     Dictionary,
     List,
     String,
@@ -145,10 +145,10 @@ typedef enum cJSON_Result
 {
     cJSON_Ok,
     cJSON_Datatype_Error,
-    cJSON_Structure_Error,
     cJSON_DepthOutOfRange_Error,
+    cJSON_InvalidCharacterSequence_Error,
     cJSON_NotAllocated_Error,
-    cJSON_UnknownValueType_Error,
+    cJSON_Structure_Error,
     cJSON_Unknown_Error
 } cJSON_Result_t;
 

inc/cJSON_Util.h

@@ -75,15 +75,15 @@ cJSON_Generic_t mallocGenObj(cJSON_ContainerType_t containerType);
  * @param   valObj Value cJSON generic object.
  * @return  cJSON_Result_t 
  */
-cJSON_Result_t cJSON_appendToDict(cJSON_Dict_t *dictPtr, const cJSON_Key_t key, cJSON_Generic_t valObj);
+void cJSON_appendToDict(cJSON_Dict_t *dictPtr, const cJSON_Key_t key, cJSON_Generic_t valObj);
 /**
  * @brief   Function to append a generic object to a list.
  * 
  * @param   listPtr Pointer to the list the generic object should be added to.
  * @param   obj 
  * @return  cJSON_Result_t 
  */
-cJSON_Result_t cJSON_appendToList(cJSON_List_t *listPtr, cJSON_Generic_t obj);
+void cJSON_appendToList(cJSON_List_t *listPtr, cJSON_Generic_t obj);
 
 #pragma endregion