cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwObject.h/cpp,cwObjectTemplate.h : All strings are now reallocated on assignment.

Browse Source 
Added newDictObject(),newListObject(),append_child()
This commit is contained in:
kevin 2021-11-01 21:42:33 -04:00
parent 7a01d29210
commit 4262eae18e
3 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cwObject.cpp
View File

@ -40,7 +40,6 @@ namespace cw
{ kFalseLexTId, "false"},
{ kNullLexTId, "null" },
{ lex::kErrorLexTId,""}
};
unsigned _lexSegmentedIdMatcher( const char* cp, unsigned cn )
@ -336,8 +335,8 @@ namespace cw
object_t* _objTypeDuplBool( const struct object_str* src, struct object_str* parent ) { return _objCreateValueNode<bool >(parent,src->u.b ); }
object_t* _objTypeDuplFloat( const struct object_str* src, struct object_str* parent ) { return _objCreateValueNode<float >(parent,src->u.f ); }
object_t* _objTypeDuplDouble( const struct object_str* src, struct object_str* parent ) { return _objCreateValueNode<double >(parent,src->u.d ); }
object_t* _objTypeDuplString( const struct object_str* src, struct object_str* parent ) { return _objCreateValueNode<char* >(parent,mem::duplStr(src->u.str)); }
object_t* _objTypeDuplCString(const struct object_str* src, struct object_str* parent ) { return _objCreateValueNode<const char*>(parent,mem::duplStr(src->u.str));}
object_t* _objTypeDuplString( const struct object_str* src, struct object_str* parent ) { return _objCreateValueNode<char* >(parent,src->u.str); }
object_t* _objTypeDuplCString(const struct object_str* src, struct object_str* parent ) { return _objCreateValueNode<const char*>(parent,src->u.str);}
object_t* _objTypeDuplVect( const struct object_str* src, struct object_str* parent ) { assert(0); return nullptr; }
object_t* _objTypeDuplPair( const struct object_str* src, struct object_str* parent ) { return _objTypeDuplContainer(src,parent); }
object_t* _objTypeDuplList( const struct object_str* src, struct object_str* parent ) { return _objTypeDuplContainer(src,parent); }
@ -362,7 +361,7 @@ namespace cw
{ kFloatTId, "float", 0, _objTypeFree, _objTypeValueFromFloat, _objTypePrintFloat, _objTypeToStringFloat, _objTypeDuplFloat },
{ kDoubleTId, "double", 0, _objTypeFree, _objTypeValueFromDouble, _objTypePrintDouble, _objTypeToStringDouble, _objTypeDuplDouble },
{ kStringTId, "string", 0, _objTypeFreeString, _objTypeValueFromString, _objTypePrintString, _objTypeToStringString, _objTypeDuplString },
{ kCStringTId, "cstring", 0, _objTypeFree, _objTypeValueFromCString, _objTypePrintString, _objTypeToStringString, _objTypeDuplCString },
{ kCStringTId, "cstring", 0, _objTypeFreeString, _objTypeValueFromCString, _objTypePrintString, _objTypeToStringString, _objTypeDuplCString },
{ kVectTId, "vect", 0, _objTypeFree, _objTypeValueFromVect, _objTypePrintVect, _objTypeToStringVect, _objTypeDuplVect },
{ kPairTId, "pair", kContainerFl | kValueContainerFl, _objTypeFree, _objTypeValueFromNonValue, _objTypePrintPair, _objTypeToStringPair, _objTypeDuplPair },
{ kListTId, "list", kContainerFl | kValueContainerFl, _objTypeFree, _objTypeValueFromNonValue, _objTypePrintList, _objTypeToStringList, _objTypeDuplList },
@ -444,6 +443,8 @@ namespace cw
if( parent != nullptr )
{
assert( parent->is_container() );
object_t* child = parent->u.children;
if( parent->u.children == nullptr )
@ -499,7 +500,6 @@ void cw::object_t::unlink()
// if a child has a parent then it must be in that parent's child list
cwAssert(0);
}
void cw::object_t::free()
@ -519,6 +519,15 @@ void cw::object_t::free()
type->free(this);
}
cw::rc_t cw::object_t::append_child( struct object_str* child )
{
if( !is_container() )
return cwLogError(kInvalidDataTypeRC,"The parent of a child object node must be a 'container'.");
_objAppendLeftMostNode( this, child );
return kOkRC;
}
unsigned cw::object_t::child_count() const
{
@ -670,10 +679,10 @@ cw::object_t* cw::newObject( char* v, object_t* parent)
cw::object_t* cw::newObject( const char* v, object_t* parent)
{ return _objCreateValueNode<const char*>( parent, v ); }
cw::object_t* cw::newObjectDict( object_t* parent )
cw::object_t* cw::newDictObject( object_t* parent )
{ return _objAllocate( kDictTId, parent); }
cw::object_t* cw::newObjectList( object_t* parent )
cw::object_t* cw::newListObject( object_t* parent )
{ return _objAllocate( kListTId, parent ); }
cw::object_t* cw::newPairObject( const char* label, std::uint8_t v, object_t* parent)
@ -816,12 +825,15 @@ cw::rc_t cw::objectFromString( const char* s, object_t*& objRef )
if( cnp->is_dict() )
cnp = _objAppendLeftMostNode( cnp, _objAllocate( kPairTId, cnp ));
unsigned n = lex::tokenCharCount(lexH);
char s[ n + 1 ];
memcpy(s,lex::tokenText(lexH),n);
s[n] = 0;
char* v = mem::duplStr(lex::tokenText(lexH),lex::tokenCharCount(lexH));
//char* v = mem::duplStr(lex::tokenText(lexH),lex::tokenCharCount(lexH));
unsigned identFl = lexId == lex::kIdentLexTId ? kIdentFl : 0;
_objCreateValueNode<char*>( cnp, v, "string", identFl );
_objCreateValueNode<char*>( cnp, s, "string", identFl );
}
break;

20
cwObject.h
View File

@ -103,8 +103,15 @@ namespace cw
} u;
// Unlink this node from it's parents and siblings.
void unlink();
// free all resource associated with this object.
void free();
// Append the child node to this objects child list.
rc_t append_child( struct object_str* child );
unsigned child_count() const;
// Value containers are parents of leaf nodes. (A dictionary is not a value container because it's children are pairs with are not leaf nodes.)
@ -149,7 +156,6 @@ namespace cw
const struct object_str* find_child( const char* label ) const { return find(label,kNoRecurseFl); }
struct object_str* find_child( const char* label ) { return find(label,kNoRecurseFl); }
const struct object_str* child_ele( unsigned idx ) const;
struct object_str* child_ele( unsigned idx );
@ -198,11 +204,17 @@ namespace cw
{ return _getv(kOptionalFl,label,valRef,args...); }
template< typename T >
struct object_str* insertPair( const char* label, const T& v )
struct object_str* insert_pair( const char* label, const T& v )
{ return newPairObject(label, v, this); }
// convert this object to a string
unsigned to_string( char* buf, unsigned bufByteN ) const;
// print this object
void print(const print_ctx_t* c=NULL) const;
// duplicate this object
struct object_str* duplicate() const;
} object_t;
@ -220,8 +232,8 @@ namespace cw
object_t* newObject( double v, object_t* parent=nullptr);
object_t* newObject( char* v, object_t* parent=nullptr);
object_t* newObject( const char* v, object_t* parent=nullptr);
object_t* newObjectDict( object_t* parent=nullptr );
object_t* newObjectList( object_t* parent=nullptr );
object_t* newDictObject( object_t* parent=nullptr );
object_t* newListObject( object_t* parent=nullptr );
// Return a pointer to the value node.
object_t* newPairObject( const char* label, std::uint8_t v, object_t* parent=nullptr);

12
cwObjectTemplate.h
View File

@ -123,7 +123,9 @@ namespace cw
{
if( obj != NULL )
{
obj->u.str = value;
//mem::release(obj->u.str);
obj->u.str = value == nullptr ? nullptr : mem::duplStr(value);
//obj->u.str = value;
obj->type = _objIdToType(kStringTId);
}
return obj;
@ -131,12 +133,8 @@ namespace cw
template<> object_t* _objSetLeafValue<const char*>( object_t* obj, const char* value )
{
if( obj != NULL )
{
obj->u.str = (char*)value;
obj->type = _objIdToType(kCStringTId);
}
return obj;
// cast 'const char*' to 'char*'
return _objSetLeafValue<char*>(obj,(char*)value);
}
template< typename T >