Major Update:

- DataTreeCore:
  - Merge TDataMember and CDataTree into => CDataMember
  - Each node, incl root is now CDataMember object
  - Modified function to not require BaseMember (Object is basemember)
  - Split/duplicat most functions to require, or not require child path
  - Added isNull/Object/Array/Sting() etc methods
  - Many other methods removed or restructured
- Updated DataTree usage in: JSONparseCore,
  ApplicationCore, FunctionCore, SelectableCore, WatchdogCore
This commit is contained in:
Charl Wentzel
2018-11-17 19:10:59 +02:00
parent d36bf3230b
commit f2a1ca950a
10 changed files with 472 additions and 488 deletions

View File

@@ -21,7 +21,7 @@
class CJSONparse
{
private:
CDataTree * DataTree;
CDataMember * DataTree;
// File operation
int InputHandle;
@@ -47,17 +47,17 @@ private:
// Parsing functions
void SkipWhiteSpace();
bool ParseString( char ** Value, int &pLen );
bool ParseObject( TDataMember * Object );
bool ParseArray( TDataMember * Array );
bool ParseString( TDataMember * Member );
bool ParsePrimitive( TDataMember * Member );
bool ParseObject( CDataMember * Object );
bool ParseArray( CDataMember * Array );
bool ParseString( CDataMember * Member );
bool ParsePrimitive( CDataMember * Member );
bool PrintString( char * String, int Len );
bool PrintObject( TDataMember * Object, const int Indent );
bool PrintArray( TDataMember * Object, const int Indent );
bool PrintObject( CDataMember * Object, const int Indent );
bool PrintArray( CDataMember * Object, const int Indent );
public:
CJSONparse( CDataTree * pDataTree );
CJSONparse( CDataMember * pDataTree );
~CJSONparse();
// Buffer operation