core/redAcore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Important Update:

Browse Source 
- DataTreeCore:
  - Add Parent & Prev Child links to DataMembers
  - Update CreateMember() to set Parent/Sibling reference
      & increase Parent->Len
  - Remove AddMember()
  - Update DestroyMember() to decrease Parent->Len
- JSONparseCore:
  - Update ParseArray() for above changes made to DataTreeCore
This commit is contained in:
Charl Wentzel
2017-08-11 15:42:59 +02:00
parent 73743060a0
commit 2b7c49d5bb
3 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
DataTreeCore.cpp
View File

@@ -17,7 +17,7 @@
CDataTree::CDataTree()
{
// Create Root member of tree
RootMember = CreateMember( NULL );
RootMember = CreateMember( NULL, NULL, NULL );
RootMember->Type = jtObject;
}
//---------------------------------------------------------------------------
@@ -30,7 +30,7 @@ CDataTree::~CDataTree()
}
//---------------------------------------------------------------------------
TDataMember * CDataTree::CreateMember( const char * Name, const int Len )
TDataMember * CDataTree::CreateMember( TDataMember * Parent, TDataMember * PrevChild, const char * Name, const int Len )
{
TDataMember * Member;
@@ -45,43 +45,38 @@ TDataMember * CDataTree::CreateMember( const char * Name, const int Len )
memcpy( Member->Name, Name, Member->NameLen );
Member->Name[ Member->NameLen ] = 0;
}
// Update Parent
if (Parent) {
Member->Parent = Parent;
Parent->Len++;
}
// Set Sibling links
Member->Prev = PrevChild;
Member->Next = NULL;
return Member;
}
//---------------------------------------------------------------------------
bool CDataTree::AddMember( TDataMember * Parent, TDataMember * Member )
{
TDataMember ** Child;
// Validate
if (!Parent || !Member) {
return false;
}
// Get end of list
Child = &(Parent->FirstChild);
while (*Child) {
Child = &((*Child)->Next);
}
// Add member
*Child = Member;
Parent->Len++;
return true;
}
//---------------------------------------------------------------------------
bool CDataTree::DestroyMember( TDataMember ** Member )
{
TDataMember * NextMember;
// Valdate
// Validate
if (!Member || !*Member)
return false;
// Get next param in list
NextMember = (*Member)->Next;
// Update Parent
if ((*Member)->Parent)
(*Member)->Parent->Len--;
// Destroy
if ((*Member)->Name)
free( (*Member)->Name );
@@ -102,7 +97,7 @@ bool CDataTree::DestroyMember( TDataMember ** Member )
bool CDataTree::DestroyValue( TDataMember * Member )
{
// Valdate
// Validate
if (!Member)
return false;
@@ -111,10 +106,12 @@ bool CDataTree::DestroyValue( TDataMember * Member )
free( Member->Value );
Member->Value = NULL;
}
// Destroy Children
while (Member->FirstChild) {
DestroyMember( &(Member->FirstChild) );
}
Member->Len = 0;
return true;
}
//---------------------------------------------------------------------------
@@ -122,7 +119,8 @@ bool CDataTree::DestroyValue( TDataMember * Member )
TDataMember ** CDataTree::GetMemberPtr( TDataMember * BaseMember, const char * Path, bool Create, TDataMember ** Parent )
{
TDataMember * Member;
TDataMember ** Child = NULL;
TDataMember ** Child;
TDataMember * PrevChild;
char * Pos;
char * EndPos;
char * Key;
@@ -182,9 +180,12 @@ TDataMember ** CDataTree::GetMemberPtr( TDataMember * BaseMember, const char *
Index = -1;
// find end of list
PrevChild = NULL;
Child = &(Member->FirstChild);
while (*Child)
while (*Child) {
PrevChild = *Child;
Child = &((*Child)->Next);
}
}
else {
// Get requested index
@@ -193,9 +194,11 @@ TDataMember ** CDataTree::GetMemberPtr( TDataMember * BaseMember, const char *
break;
// Find element at requested index
PrevChild = NULL;
Child = &(Member->FirstChild);
Count = 0;
while (*Child && (Count < Index)) {
PrevChild = *Child;
Child = &((*Child)->Next);
Count++;
}
@@ -204,8 +207,7 @@ TDataMember ** CDataTree::GetMemberPtr( TDataMember * BaseMember, const char *
// Create element if needed
if (!*Child && Create) {
if ((Index == -1) || (Index = Count + 1)) {
*Child = CreateMember( NULL );
Member->Len++;
*Child = CreateMember( Member, PrevChild, NULL );
}
}
}
@@ -238,13 +240,14 @@ TDataMember ** CDataTree::GetMemberPtr( TDataMember * BaseMember, const char *
}
// Find next parent
PrevChild = NULL;
Child = &(Member->FirstChild);
while (*Child && (((*Child)->NameLen != KeyLen) || strncasecmp( (*Child)->Name, Key, KeyLen ))) {
PrevChild = *Child;
Child = &((*Child)->Next);
}
if (!*Child && Create) {
*Child = CreateMember( Key, KeyLen );
Member->Len++;
*Child = CreateMember( Member, PrevChild, Key, KeyLen );
}
}
@@ -324,7 +327,6 @@ bool CDataTree::Delete( TDataMember * BaseMember, const char * Path )
else if ((Member = GetMemberPtr( BaseMember, Path, false, &Parent ))) {
// If valid path, destroy member
DestroyMember( Member );
Parent->Len--;
return true;
}
else {