v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenDDLParser: latest greatest, 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/511/head
Kim Kulling 2015-03-23 18:46:41 +01:00
parent 8f577e2e77
commit 5b2ab2f76a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/openddlparser/code/OpenDDLParser.cpp
View File

@ -352,7 +352,8 @@ char *OpenDDLParser::parseStructureBody( char *in, char *end, bool &error ) {
DataArrayList *dtArrayList( ddl_nullptr ); DataArrayList *dtArrayList( ddl_nullptr );
Value *values( ddl_nullptr ); Value *values( ddl_nullptr );
if( 1 == arrayLen ) { if( 1 == arrayLen ) {
in = parseDataList( in, end, &values, &refs ); size_t numRefs( 0 ), numValues( 0 );
in = parseDataList( in, end, &values, numValues, &refs, numRefs );
setNodeValues( top(), values ); setNodeValues( top(), values );
setNodeReferences( top(), refs ); setNodeReferences( top(), refs );
} else if( arrayLen > 1 ) { } else if( arrayLen > 1 ) {
@ -797,8 +798,9 @@ char *OpenDDLParser::parseProperty( char *in, char *end, Property **prop ) {
return in; return in;
} }
char *OpenDDLParser::parseDataList( char *in, char *end, Value **data, Reference **refs ) { char *OpenDDLParser::parseDataList( char *in, char *end, Value **data, size_t &numValues, Reference **refs, size_t &numRefs ) {
*data = ddl_nullptr; *data = ddl_nullptr;
numValues = numRefs = 0;
if( ddl_nullptr == in || in == end ) { if( ddl_nullptr == in || in == end ) {
return in; return in;
} }
@ -824,6 +826,7 @@ char *OpenDDLParser::parseDataList( char *in, char *end, Value **data, Reference
if( !names.empty() ) { if( !names.empty() ) {
Reference *ref = new Reference( names.size(), &names[ 0 ] ); Reference *ref = new Reference( names.size(), &names[ 0 ] );
*refs = ref; *refs = ref;
numRefs = names.size();
} }
} }
@ -835,6 +838,7 @@ char *OpenDDLParser::parseDataList( char *in, char *end, Value **data, Reference
prev->setNext( current ); prev->setNext( current );
prev = current; prev = current;
} }
numValues++;
} }
in = getNextSeparator( in, end ); in = getNextSeparator( in, end );
@ -861,11 +865,13 @@ char *OpenDDLParser::parseDataArrayList( char *in, char *end, DataArrayList **da
Reference *refs( ddl_nullptr ); Reference *refs( ddl_nullptr );
DataArrayList *prev( ddl_nullptr ), *currentDataList( ddl_nullptr ); DataArrayList *prev( ddl_nullptr ), *currentDataList( ddl_nullptr );
do { do {
in = parseDataList( in, end, &current, &refs ); size_t numRefs( 0 ), numValues( 0 );
in = parseDataList( in, end, &current, numValues, &refs, numRefs );
if( ddl_nullptr != current ) { if( ddl_nullptr != current ) {
if( ddl_nullptr == prev ) { if( ddl_nullptr == prev ) {
*dataList = new DataArrayList; *dataList = new DataArrayList;
(*dataList)->m_dataList = current; ( *dataList )->m_dataList = current;
( *dataList )->m_numItems = numValues;
prev = *dataList; prev = *dataList;
} else { } else {
currentDataList = new DataArrayList; currentDataList = new DataArrayList;

2
contrib/openddlparser/include/openddlparser/OpenDDLParser.h
View File

@ -96,7 +96,7 @@ public: // static parser helpers
static char *parseStringLiteral( char *in, char *end, Value **stringData ); static char *parseStringLiteral( char *in, char *end, Value **stringData );
static char *parseHexaLiteral( char *in, char *end, Value **data ); static char *parseHexaLiteral( char *in, char *end, Value **data );
static char *parseProperty( char *in, char *end, Property **prop ); static char *parseProperty( char *in, char *end, Property **prop );
static char *parseDataList( char *in, char *end, Value **data, Reference **refs ); static char *parseDataList( char *in, char *end, Value **data, size_t &numValues, Reference **refs, size_t &numRefs );
static char *parseDataArrayList( char *in, char *end, DataArrayList **dataList ); static char *parseDataArrayList( char *in, char *end, DataArrayList **dataList );
static const char *getVersion(); static const char *getVersion();