Renamed TS_.. functions to GS_.. to match TypeStack renaming to GenericStack. Continued string parser function implementation

Author: HeCoding180

inc/cJSON_GenericStack.h

@@ -24,7 +24,7 @@
  * @return  false if GenericStack is not empty
  * 
  */
-#define TS_IS_EMPTY(TS) ((TS).isEmpty)
+#define GS_IS_EMPTY(TS) ((TS).isEmpty)
 /**
  * @brief   Macro used to check if a cJSON_GenericStack_t pointer's stack is empty.
  * 
@@ -34,7 +34,7 @@
  * @return  false if GenericStack is not empty
  * 
  */
-#define TS_PTR_IS_EMPTY(TS) ((TS)->isEmpty)
+#define GS_PTR_IS_EMPTY(TS) ((TS)->isEmpty)
 
 /**
  * @brief   Macro used to check if a cJSON_GenericStack_t stack is full.
@@ -45,7 +45,7 @@
  * @return  false if GenericStack is not full
  * 
  */
-#define TS_IS_FULL(TS) ((TS).index == ((TS).stackSize - 1))
+#define GS_IS_FULL(TS) ((TS).index == ((TS).stackSize - 1))
 /**
  * @brief   Macro used to check if a cJSON_GenericStack_t pointer's stack is full.
  * 
@@ -55,22 +55,22 @@
  * @return  false if GenericStack is not full
  * 
  */
-#define TS_PTR_IS_FULL(TS) ((TS)->index == ((TS)->stackSize - 1))
+#define GS_PTR_IS_FULL(TS) ((TS)->index == ((TS)->stackSize - 1))
 
 /**
  * @brief   Unsafe macro used to get the top item from a cJSON_GenericStack_t stack.
  * 
  * @param   TS cJSON_GenericStack_t struct.
  * 
  */
-#define TS_TOP(TS) ((TS).stack[(TS).index])
+#define GS_TOP(TS) ((TS).stack[(TS).index])
 /**
  * @brief   Unsafe macro used to get the top item from a cJSON_GenericStack_t pointer's stack.
  * 
  * @param   TS cJSON_GenericStack_t struct pointer.
  * 
  */
-#define TS_PTR_TOP(TS) ((TS)->stack[(TS)->index])
+#define GS_PTR_TOP(TS) ((TS)->stack[(TS)->index])
 
 #pragma endregion
 
@@ -91,22 +91,22 @@ typedef enum cJSON_GenericStack_Result
      * @brief   Default result.
      * 
      */
-    TS_Ok,
+    GS_Ok,
     /**
-     * @brief   Returned on TS_Push operation of a full stack.
+     * @brief   Returned on GS_Push operation of a full stack.
      * 
      */
-    TS_StackOverflow_Error,
+    GS_StackOverflow_Error,
     /**
-     * @brief   Returned on TS_Pop operation of an empty stack.
+     * @brief   Returned on GS_Pop operation of an empty stack.
      * 
      */
-    TS_StackUnderflow_Error,
+    GS_StackUnderflow_Error,
     /**
-     * @brief   Returned on TS_Top of an empty stack.
+     * @brief   Returned on GS_Top of an empty stack.
      * 
      */
-    TS_StackIsEmpty
+    GS_StackIsEmpty
 } cJSON_GenericStack_Result_t;
 
 #pragma endregion
@@ -157,52 +157,52 @@ typedef struct cJSON_GenericStack
  * @param   stackSize Size of the stack in number of items.
  * @return  cJSON_GenericStack_t Struct with allocated stack memory.
  */
-cJSON_GenericStack_t TS_Create(cJSON_depth_t stackSize);
+cJSON_GenericStack_t GS_Create(cJSON_depth_t stackSize);
 /**
  * @brief   Resets and frees stack memory of a cJSON_GenericStack_t struct. Needs to be used on discarding of the struct to avoid memory leaks.
  * 
  * @param   TSptr Pointer to a cJSON_GenericStack_t struct.
  */
-void TS_Delete(cJSON_GenericStack_t *TSptr);
+void GS_Delete(cJSON_GenericStack_t *TSptr);
 
 /**
  * @brief   Used to push a cJSON_ContainerType_t value to the stack.
  * 
  * @param   TSptr Pointer to a cJSON_GenericStack_t struct.
  * @param   type cJSON_ContainerType_t type that is to be pushed to the stack.
- * @return  cJSON_GenericStack_Result_t Returns TS_Ok by default. Returns TS_StackOverflow_Error if stack was already full before the push operation (type not pushed to stack).
+ * @return  cJSON_GenericStack_Result_t Returns GS_Ok by default. Returns GS_StackOverflow_Error if stack was already full before the push operation (type not pushed to stack).
  */
-cJSON_GenericStack_Result_t TS_Push(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t type);
+cJSON_GenericStack_Result_t GS_Push(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t type);
 /**
  * @brief   Used to remove the top item from the stack.
  * 
  * @param   TSptr Pointer to a cJSON_GenericStack_t struct.
- * @return  cJSON_GenericStack_Result_t Returns TS_Ok by default. Returns TS_StackUnderflow_Error if stack was already empty before the pop operation (nothing changed).
+ * @return  cJSON_GenericStack_Result_t Returns GS_Ok by default. Returns GS_StackUnderflow_Error if stack was already empty before the pop operation (nothing changed).
  */
-cJSON_GenericStack_Result_t TS_Pop(cJSON_GenericStack_t *TSptr);
+cJSON_GenericStack_Result_t GS_Pop(cJSON_GenericStack_t *TSptr);
 /**
  * @brief   Used to retreive the top value from the stack.
  * 
  * @param   TSptr Pointer to a cJSON_GenericStack_t struct.
  * @param   type Pointer to a cJSON_ContainerType_t variable, the stack's top type is to be stored in.
- * @return  cJSON_ContainerType_t Returns TS_Ok by default. Returns TS_StackIsEmpty if stack is empty (type pointer's contents are left untouched).
+ * @return  cJSON_ContainerType_t Returns GS_Ok by default. Returns GS_StackIsEmpty if stack is empty (type pointer's contents are left untouched).
  */
-cJSON_GenericStack_Result_t TS_Top(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t *type);
+cJSON_GenericStack_Result_t GS_Top(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t *type);
 /**
  * @brief   Function used to check if stack is empty.
  * 
  * @param   TSptr Pointer to a cJSON_GenericStack_t struct.
  * @return  true if stack is empty.
  * @return  false if stack is not empty.
  */
-bool TS_IsEmpty(cJSON_GenericStack_t *TSptr);
+bool GS_IsEmpty(cJSON_GenericStack_t *TSptr);
 /**
  * @brief   Used to check if stack is full.
  * 
  * @param   TSptr Pointer to a cJSON_GenericStack_t struct.
  * @return  true if stack is full.
  * @return  false if stack is not full.
  */
-bool TS_IsFull(cJSON_GenericStack_t *TSptr);
+bool GS_IsFull(cJSON_GenericStack_t *TSptr);
 
 #pragma endregion

src/cJSON.c

@@ -92,29 +92,44 @@ cJSON_Result_t cJSON_parseStr(cJSON_Generic_t *GObjPtr, const char *str)
     // Check if GObjPtr is allocated. If so delete old data structure
     if (GObjPtr->dataContainer != NULL) cJSON_delGenObj(*GObjPtr);
 
+    // Create object stack
+    cJSON_GenericStack_t ObjectStack = GS_Create(CJSON_MAX_DEPTH);
 
 
-    enum valueEnironmentType
+    /*enum valueEnironmentType
     {
         None,
         StringValue,
         NumericValue
-    } valEnvType;
+    } valEnvType;*/
+
+    bool ObjectIsEmpty = true;
 
     // Loop through string's contents
     while (*str)
     {
-        if (0)
+        if (ObjectIsEmpty)
         {
+            if (*str == '{')        *GObjPtr = mallocGenObj(Dictionary);
+            else if (*str == '[')   *GObjPtr = mallocGenObj(List);
+            else
+            {
+                // Skip invalid characters
+                str++;
+                continue;
+            }
 
+            GS_Push(&ObjectStack, *GObjPtr);
+            ObjectIsEmpty = false;
         }
         else
         {
             switch (*str)
             {
             case ' ':   // Ignore space character
+            case '\t':  // Ignore tab character
             case '\n':  // Ignore newline character
-                continue;
+                break;
             case '{':
                 // Start dictionary
                 break;
@@ -134,12 +149,18 @@ cJSON_Result_t cJSON_parseStr(cJSON_Generic_t *GObjPtr, const char *str)
             case ',':
                 // Next item
                 break;
+            default:
+                // Unexpected character
+                return cJSON_Structure_Error;
             }
         }
 
         // Handle next character
         str++;
     }
+
+    // Delete object stack
+    GS_Delete(&ObjectStack);
 }
 
 #pragma endregion

src/cJSON_GenericStack.c

@@ -14,7 +14,7 @@
 // - GenericStack Function Implementations -
 #pragma region GenericStack Functions
 
-cJSON_GenericStack_t TS_Create(cJSON_depth_t stackSize)
+cJSON_GenericStack_t GS_Create(cJSON_depth_t stackSize)
 {
     cJSON_GenericStack_t tempTS;
 
@@ -26,7 +26,7 @@ cJSON_GenericStack_t TS_Create(cJSON_depth_t stackSize)
 
     return tempTS;
 }
-void TS_Delete(cJSON_GenericStack_t *TSptr)
+void GS_Delete(cJSON_GenericStack_t *TSptr)
 {
     // Free stack memory
     free(TSptr->stack);
@@ -37,10 +37,10 @@ void TS_Delete(cJSON_GenericStack_t *TSptr)
     TSptr->isEmpty = true;
 }
 
-cJSON_GenericStack_Result_t TS_Push(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t type)
+cJSON_GenericStack_Result_t GS_Push(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t type)
 {
-    if (TS_PTR_IS_FULL(TSptr)) return TS_StackOverflow_Error;
-    else if (TS_PTR_IS_EMPTY(TSptr))
+    if (GS_PTR_IS_FULL(TSptr)) return GS_StackOverflow_Error;
+    else if (GS_PTR_IS_EMPTY(TSptr))
     {
         // Push to empty stack
         TSptr->isEmpty = false;
@@ -52,11 +52,11 @@ cJSON_GenericStack_Result_t TS_Push(cJSON_GenericStack_t *TSptr, cJSON_Container
         TSptr->stack[++TSptr->index] = type;
     }
 
-    return TS_Ok;
+    return GS_Ok;
 }
-cJSON_GenericStack_Result_t TS_Pop(cJSON_GenericStack_t *TSptr)
+cJSON_GenericStack_Result_t GS_Pop(cJSON_GenericStack_t *TSptr)
 {
-    if (TSptr->isEmpty) return TS_StackUnderflow_Error;
+    if (TSptr->isEmpty) return GS_StackUnderflow_Error;
     else if (TSptr->index == 0)
     {
         TSptr->isEmpty = true;
@@ -66,24 +66,24 @@ cJSON_GenericStack_Result_t TS_Pop(cJSON_GenericStack_t *TSptr)
         TSptr->index--;
     }
 
-    return TS_Ok;
+    return GS_Ok;
 }
-cJSON_GenericStack_Result_t TS_Top(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t *type)
+cJSON_GenericStack_Result_t GS_Top(cJSON_GenericStack_t *TSptr, cJSON_ContainerType_t *type)
 {
-    if (TSptr->isEmpty) return TS_StackIsEmpty;
+    if (TSptr->isEmpty) return GS_StackIsEmpty;
     else
     {
-        *type = TS_PTR_TOP(TSptr);
-        return TS_Ok;
+        *type = GS_PTR_TOP(TSptr);
+        return GS_Ok;
     }
 }
-bool TS_IsEmpty(cJSON_GenericStack_t *TSptr)
+bool GS_IsEmpty(cJSON_GenericStack_t *TSptr)
 {
-    return TS_PTR_IS_EMPTY(TSptr);
+    return GS_PTR_IS_EMPTY(TSptr);
 }
-bool TS_IsFull(cJSON_GenericStack_t *TSptr)
+bool GS_IsFull(cJSON_GenericStack_t *TSptr)
 {
-    return TS_PTR_IS_FULL(TSptr);
+    return GS_PTR_IS_FULL(TSptr);
 }
 
 #pragma endregion