cwObject.h/cpp,cwObjectTemplate.h : Initial implementation of newObject(). Added flags to find().
This commit is contained in:
parent
98c9150809
commit
10b2a36970
82
cwObject.cpp
82
cwObject.cpp
@ -89,7 +89,14 @@ namespace cw
|
|||||||
{ return cwLogError(kInvalidArgRC, "There is no conversion from '%s' to '%s'.", _objTypeIdToLabel(tid), o->type->label); }
|
{ return cwLogError(kInvalidArgRC, "There is no conversion from '%s' to '%s'.", _objTypeIdToLabel(tid), o->type->label); }
|
||||||
|
|
||||||
rc_t _objTypeValueFromString( const object_t* o, unsigned tid, void* dst )
|
rc_t _objTypeValueFromString( const object_t* o, unsigned tid, void* dst )
|
||||||
{ return _objTypeValueFromNonValue(o,tid,dst); }
|
{
|
||||||
|
if( tid == kStringTId )
|
||||||
|
{
|
||||||
|
*(char**)dst = o->u.str;
|
||||||
|
return kOkRC;
|
||||||
|
}
|
||||||
|
return _objTypeValueFromNonValue(o,tid,dst);
|
||||||
|
}
|
||||||
|
|
||||||
rc_t _objTypeValueFromVect( const object_t* o, unsigned tid, void* dst )
|
rc_t _objTypeValueFromVect( const object_t* o, unsigned tid, void* dst )
|
||||||
{ return _objTypeValueFromNonValue(o,tid,dst); }
|
{ return _objTypeValueFromNonValue(o,tid,dst); }
|
||||||
@ -349,16 +356,19 @@ namespace cw
|
|||||||
if( newNode == nullptr )
|
if( newNode == nullptr )
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
object_t* child = parent->u.children;
|
if( parent != nullptr )
|
||||||
|
|
||||||
if( parent->u.children == nullptr )
|
|
||||||
parent->u.children = newNode;
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
while( child->sibling != nullptr )
|
object_t* child = parent->u.children;
|
||||||
child = child->sibling;
|
|
||||||
|
|
||||||
child->sibling = newNode;
|
if( parent->u.children == nullptr )
|
||||||
|
parent->u.children = newNode;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
while( child->sibling != nullptr )
|
||||||
|
child = child->sibling;
|
||||||
|
|
||||||
|
child->sibling = newNode;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
newNode->parent = parent;
|
newNode->parent = parent;
|
||||||
@ -450,6 +460,7 @@ cw::rc_t cw::object_t::value( uint64_t& v ) const { return type->value(this,kUIn
|
|||||||
cw::rc_t cw::object_t::value( float& v ) const { return type->value(this,kFloatTId,&v); }
|
cw::rc_t cw::object_t::value( float& v ) const { return type->value(this,kFloatTId,&v); }
|
||||||
cw::rc_t cw::object_t::value( double& v ) const { return type->value(this,kDoubleTId,&v); }
|
cw::rc_t cw::object_t::value( double& v ) const { return type->value(this,kDoubleTId,&v); }
|
||||||
cw::rc_t cw::object_t::value( char*& v ) const { return type->value(this,kStringTId,&v); }
|
cw::rc_t cw::object_t::value( char*& v ) const { return type->value(this,kStringTId,&v); }
|
||||||
|
cw::rc_t cw::object_t::value( const char*& v ) const { return type->value(this,kStringTId,&v); }
|
||||||
|
|
||||||
const char* cw::object_t::pair_label() const
|
const char* cw::object_t::pair_label() const
|
||||||
{
|
{
|
||||||
@ -476,7 +487,7 @@ struct cw::object_str* cw::object_t::pair_value()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const struct cw::object_str* cw::object_t::find( const char* label, bool recurseFl ) const
|
const struct cw::object_str* cw::object_t::find( const char* label, unsigned flags ) const
|
||||||
{
|
{
|
||||||
if( is_container() )
|
if( is_container() )
|
||||||
{
|
{
|
||||||
@ -486,7 +497,7 @@ const struct cw::object_str* cw::object_t::find( const char* label, bool recurse
|
|||||||
return o->pair_value();
|
return o->pair_value();
|
||||||
|
|
||||||
const object_t* ch;
|
const object_t* ch;
|
||||||
if( recurseFl )
|
if( cwIsNotFlag(flags,kNoRecurseFl) )
|
||||||
if((ch = o->find(label)) != nullptr )
|
if((ch = o->find(label)) != nullptr )
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
@ -494,9 +505,9 @@ const struct cw::object_str* cw::object_t::find( const char* label, bool recurse
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct cw::object_str* cw::object_t::find( const char* label, bool recurseFl )
|
struct cw::object_str* cw::object_t::find( const char* label, unsigned flags )
|
||||||
{
|
{
|
||||||
return const_cast<struct object_str*>(((const object_t*)this)->find(label,recurseFl));
|
return const_cast<struct object_str*>(((const object_t*)this)->find(label,flags));
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct cw::object_str* cw::object_t::list_ele( unsigned idx ) const
|
const struct cw::object_str* cw::object_t::list_ele( unsigned idx ) const
|
||||||
@ -530,7 +541,41 @@ void cw::object_t::print(const print_ctx_t* c) const
|
|||||||
type->print(this,ctx);
|
type->print(this,ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::uint8_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<uint8_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::int8_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<int8_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::uint16_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<uint16_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::int16_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<int16_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::uint32_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<uint32_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::int32_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<int32_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::uint64_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<uint64_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( std::int64_t v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<uint64_t>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( bool v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<bool>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( float v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<float>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( double v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<double>( parent, v ); }
|
||||||
|
|
||||||
|
cw::object_t* cw::newObject( const char* v, object_t* parent)
|
||||||
|
{ return _objCreateValueNode<const char*>( parent, v ); }
|
||||||
|
|
||||||
cw::rc_t cw::objectFromString( const char* s, object_t*& objRef )
|
cw::rc_t cw::objectFromString( const char* s, object_t*& objRef )
|
||||||
{
|
{
|
||||||
@ -558,8 +603,6 @@ cw::rc_t cw::objectFromString( const char* s, object_t*& objRef )
|
|||||||
while((lexId = lex::getNextToken(lexH)) != lex::kErrorLexTId && (lexId != lex::kEofLexTId) && (rc == kOkRC))
|
while((lexId = lex::getNextToken(lexH)) != lex::kErrorLexTId && (lexId != lex::kEofLexTId) && (rc == kOkRC))
|
||||||
{
|
{
|
||||||
|
|
||||||
//printf("Lex:%s\n",lexIdToLabel(lexH,lexId));
|
|
||||||
|
|
||||||
switch( lexId )
|
switch( lexId )
|
||||||
{
|
{
|
||||||
case kLCurlyLexTId:
|
case kLCurlyLexTId:
|
||||||
@ -650,6 +693,15 @@ cw::rc_t cw::objectFromString( const char* s, object_t*& objRef )
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if the root has only one child then make the child the root
|
||||||
|
if( root != nullptr && root->child_count() == 1 )
|
||||||
|
{
|
||||||
|
cnp = root->u.children;
|
||||||
|
cnp->unlink();
|
||||||
|
root->free();
|
||||||
|
root = cnp;
|
||||||
|
}
|
||||||
|
|
||||||
objRef = root;
|
objRef = root;
|
||||||
|
|
||||||
errLabel:
|
errLabel:
|
||||||
|
43
cwObject.h
43
cwObject.h
@ -39,7 +39,13 @@ namespace cw
|
|||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
kValueContainerFl = 0x01, // root,pair, or list are the only legal value containers
|
kValueContainerFl = 0x01, // root,pair, or list are the only legal value containers
|
||||||
kContainerFl = 0x02
|
kContainerFl = 0x02,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
kNoRecurseFl = 0x01,
|
||||||
|
kOptionalFl = 0x02
|
||||||
};
|
};
|
||||||
|
|
||||||
struct object_str;
|
struct object_str;
|
||||||
@ -120,6 +126,7 @@ namespace cw
|
|||||||
rc_t value( float& v ) const;
|
rc_t value( float& v ) const;
|
||||||
rc_t value( double& v ) const;
|
rc_t value( double& v ) const;
|
||||||
rc_t value( char*& v ) const;
|
rc_t value( char*& v ) const;
|
||||||
|
rc_t value( const char*& v ) const;
|
||||||
|
|
||||||
const char* pair_label() const;
|
const char* pair_label() const;
|
||||||
|
|
||||||
@ -127,18 +134,28 @@ namespace cw
|
|||||||
struct object_str* pair_value();
|
struct object_str* pair_value();
|
||||||
|
|
||||||
// Search for the pair label 'label'.
|
// Search for the pair label 'label'.
|
||||||
const struct object_str* find( const char* label, bool recurseFl=true ) const;
|
// Return a pointer to the pair value associated with a given pair label.
|
||||||
struct object_str* find( const char* label, bool recurseFl=true );
|
// Set flags to kNoRecurseFl to not recurse into the object in search of the label.
|
||||||
|
const struct object_str* find( const char* label, unsigned flags=0 ) const;
|
||||||
|
struct object_str* find( const char* label, unsigned flags=0 );
|
||||||
|
|
||||||
const struct object_str* list_ele( unsigned idx ) const;
|
const struct object_str* list_ele( unsigned idx ) const;
|
||||||
struct object_str* list_ele( unsigned idx );
|
struct object_str* list_ele( unsigned idx );
|
||||||
|
|
||||||
|
// Set flag 'kNoRecurseFl' to no recurse into the object in search of the value.
|
||||||
|
// Set flag 'kOptional' if the label is optional and may not exist.
|
||||||
template< typename T >
|
template< typename T >
|
||||||
rc_t get( const char* label, T& v ) const
|
rc_t get( const char* label, T& v, unsigned flags=0 ) const
|
||||||
{
|
{
|
||||||
const struct object_str* o;
|
const struct object_str* o;
|
||||||
if((o = find(label)) == NULL )
|
if((o = find(label, flags)) == nullptr )
|
||||||
return cwLogError(kInvalidIdRC,"The pair label '%s' could not be found.",cwStringNullGuard(label));
|
{
|
||||||
|
if( cwIsNotFlag(flags, kOptionalFl) )
|
||||||
|
return cwLogError(kInvalidIdRC,"The pair label '%s' could not be found.",cwStringNullGuard(label));
|
||||||
|
|
||||||
|
return kLabelNotFoundRC;
|
||||||
|
|
||||||
|
}
|
||||||
return o->value(v);
|
return o->value(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,8 +176,18 @@ namespace cw
|
|||||||
|
|
||||||
} object_t;
|
} object_t;
|
||||||
|
|
||||||
|
object_t* newObject( std::uint8_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( std::int8_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( std::int16_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( std::uint16_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( std::int32_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( std::uint32_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( std::int64_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( std::uint64_t v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( bool v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( float v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( double v, object_t* parent=nullptr);
|
||||||
|
object_t* newObject( const char* v, object_t* parent=nullptr);
|
||||||
|
|
||||||
rc_t objectFromString( const char* s, object_t*& objRef );
|
rc_t objectFromString( const char* s, object_t*& objRef );
|
||||||
rc_t objectFromFile( const char* fn, object_t*& objRef );
|
rc_t objectFromFile( const char* fn, object_t*& objRef );
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
|
|
||||||
namespace cw
|
namespace cw
|
||||||
{
|
{
|
||||||
objType_t* _objIdToType( objTypeId_t tid );
|
objType_t* _objIdToType( objTypeId_t tid );
|
||||||
object_t* _objAllocate( objTypeId_t tid=kInvalidTId, object_t* parent=NULL );
|
object_t* _objAllocate( objTypeId_t tid=kInvalidTId, object_t* parent=NULL );
|
||||||
object_t* _objCreateConainerNode( lex::handle_t lexH, object_t* parent, objTypeId_t tid );
|
object_t* _objCreateConainerNode( lex::handle_t lexH, object_t* parent, objTypeId_t tid );
|
||||||
object_t* _objAppendLeftMostNode( object_t* parent, object_t* newNode );
|
object_t* _objAppendLeftMostNode( object_t* parent, object_t* newNode );
|
||||||
|
|
||||||
template< typename T >
|
template< typename T >
|
||||||
object_t* _objSetLeafValue( object_t* obj, T value )
|
object_t* _objSetLeafValue( object_t* obj, T value )
|
||||||
@ -30,7 +30,7 @@ namespace cw
|
|||||||
if( obj != NULL )
|
if( obj != NULL )
|
||||||
{
|
{
|
||||||
obj->u.i32 = value;
|
obj->u.i32 = value;
|
||||||
obj->type = _objIdToType(kInt32TId);
|
obj->type = _objIdToType(kInt32TId);
|
||||||
}
|
}
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -39,7 +39,7 @@ namespace cw
|
|||||||
{
|
{
|
||||||
if( obj != NULL )
|
if( obj != NULL )
|
||||||
{
|
{
|
||||||
obj->u.d = value;
|
obj->u.d = value;
|
||||||
obj->type = _objIdToType(kDoubleTId);
|
obj->type = _objIdToType(kDoubleTId);
|
||||||
}
|
}
|
||||||
return obj;
|
return obj;
|
||||||
@ -49,7 +49,7 @@ namespace cw
|
|||||||
{
|
{
|
||||||
if( obj != NULL )
|
if( obj != NULL )
|
||||||
{
|
{
|
||||||
obj->u.b = value;
|
obj->u.b = value;
|
||||||
obj->type = _objIdToType(kBoolTId);
|
obj->type = _objIdToType(kBoolTId);
|
||||||
}
|
}
|
||||||
return obj;
|
return obj;
|
||||||
@ -60,23 +60,44 @@ namespace cw
|
|||||||
if( obj != NULL )
|
if( obj != NULL )
|
||||||
{
|
{
|
||||||
obj->u.str = value;
|
obj->u.str = value;
|
||||||
obj->type = _objIdToType(kStringTId);
|
obj->type = _objIdToType(kStringTId);
|
||||||
}
|
}
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
template< typename T >
|
template< typename T >
|
||||||
object_t*_objCreateValueNode( object_t* obj, T value, const char* msg, unsigned flags=0 )
|
object_t*_objCreateValueNode( object_t* obj, T value, const char* msg=nullptr, unsigned flags=0 )
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<> object_t* _objCreateValueNode<uint8_t>( object_t* parent, uint8_t value, const char* msg, unsigned flags )
|
||||||
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
template<> object_t* _objCreateValueNode<int8_t>( object_t* parent, int8_t value, const char* msg, unsigned flags )
|
template<> object_t* _objCreateValueNode<int8_t>( object_t* parent, int8_t value, const char* msg, unsigned flags )
|
||||||
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
|
template<> object_t* _objCreateValueNode<uint16_t>( object_t* parent, uint16_t value, const char* msg, unsigned flags )
|
||||||
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
|
template<> object_t* _objCreateValueNode<int16_t>( object_t* parent, int16_t value, const char* msg, unsigned flags )
|
||||||
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
|
template<> object_t* _objCreateValueNode<uint32_t>( object_t* parent, uint32_t value, const char* msg, unsigned flags )
|
||||||
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
template<> object_t* _objCreateValueNode<int32_t>( object_t* parent, int32_t value, const char* msg, unsigned flags )
|
template<> object_t* _objCreateValueNode<int32_t>( object_t* parent, int32_t value, const char* msg, unsigned flags )
|
||||||
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
|
template<> object_t* _objCreateValueNode<uint64_t>( object_t* parent, uint64_t value, const char* msg, unsigned flags )
|
||||||
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
|
template<> object_t* _objCreateValueNode<int64_t>( object_t* parent, int64_t value, const char* msg, unsigned flags )
|
||||||
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
|
template<> object_t* _objCreateValueNode<float>( object_t* parent, float value, const char* msg, unsigned flags )
|
||||||
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
template<> object_t* _objCreateValueNode<double>( object_t* parent, double value, const char* msg, unsigned flags )
|
template<> object_t* _objCreateValueNode<double>( object_t* parent, double value, const char* msg, unsigned flags )
|
||||||
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
{ return _objAppendLeftMostNode( parent, _objSetLeafValue( _objAllocate(), value ) ); }
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user