diff options
Diffstat (limited to 'Source/Scripting/angelscript/add_on/scriptstdstring/scriptstdstring_utils.cpp')
| -rw-r--r-- | Source/Scripting/angelscript/add_on/scriptstdstring/scriptstdstring_utils.cpp | 149 |
1 files changed, 70 insertions, 79 deletions
diff --git a/Source/Scripting/angelscript/add_on/scriptstdstring/scriptstdstring_utils.cpp b/Source/Scripting/angelscript/add_on/scriptstdstring/scriptstdstring_utils.cpp index 54662aa0..4dc7d721 100644 --- a/Source/Scripting/angelscript/add_on/scriptstdstring/scriptstdstring_utils.cpp +++ b/Source/Scripting/angelscript/add_on/scriptstdstring/scriptstdstring_utils.cpp @@ -20,51 +20,46 @@ BEGIN_AS_NAMESPACE // // AngelScript signature: // array<string>@ string::split(const string &in delim) const -static CScriptArray *StringSplit(const string &delim, const string &str) -{ - // Obtain a pointer to the engine - asIScriptContext *ctx = asGetActiveContext(); - asIScriptEngine *engine = ctx->GetEngine(); - - // TODO: This should only be done once - // TODO: This assumes that CScriptArray was already registered - asITypeInfo *arrayType = engine->GetTypeInfoByDecl("array<string>"); - - // Create the array object - CScriptArray *array = CScriptArray::Create(arrayType); - - // Find the existence of the delimiter in the input string - int pos = 0, prev = 0, count = 0; - while( (pos = (int)str.find(delim, prev)) != (int)string::npos ) - { - // Add the part to the array - array->Resize(array->GetSize()+1); - ((string*)array->At(count))->assign(&str[prev], pos-prev); - - // Find the next part - count++; - prev = pos + (int)delim.length(); - } - - // Add the remaining part - array->Resize(array->GetSize()+1); - ((string*)array->At(count))->assign(&str[prev]); - - return array; +static CScriptArray *StringSplit(const string &delim, const string &str) { + // Obtain a pointer to the engine + asIScriptContext *ctx = asGetActiveContext(); + asIScriptEngine *engine = ctx->GetEngine(); + + // TODO: This should only be done once + // TODO: This assumes that CScriptArray was already registered + asITypeInfo *arrayType = engine->GetTypeInfoByDecl("array<string>"); + + // Create the array object + CScriptArray *array = CScriptArray::Create(arrayType); + + // Find the existence of the delimiter in the input string + int pos = 0, prev = 0, count = 0; + while ((pos = (int)str.find(delim, prev)) != (int)string::npos) { + // Add the part to the array + array->Resize(array->GetSize() + 1); + ((string *)array->At(count))->assign(&str[prev], pos - prev); + + // Find the next part + count++; + prev = pos + (int)delim.length(); + } + + // Add the remaining part + array->Resize(array->GetSize() + 1); + ((string *)array->At(count))->assign(&str[prev]); + + return array; } -static void StringSplit_Generic(asIScriptGeneric *gen) -{ - // Get the arguments - string *str = (string*)gen->GetObject(); - string *delim = *(string**)gen->GetAddressOfArg(0); +static void StringSplit_Generic(asIScriptGeneric *gen) { + // Get the arguments + string *str = (string *)gen->GetObject(); + string *delim = *(string **)gen->GetAddressOfArg(0); - // Return the array by handle - *(CScriptArray**)gen->GetAddressOfReturnLocation() = StringSplit(*delim, *str); + // Return the array by handle + *(CScriptArray **)gen->GetAddressOfReturnLocation() = StringSplit(*delim, *str); } - - // This function takes as input an array of string handles as well as a // delimiter and concatenates the array elements into one delimited string. // Example: @@ -78,52 +73,48 @@ static void StringSplit_Generic(asIScriptGeneric *gen) // // AngelScript signature: // string join(const array<string> &in array, const string &in delim) -static string StringJoin(const CScriptArray &array, const string &delim) -{ - // Create the new string - string str = ""; - if( array.GetSize() ) - { - int n; - for( n = 0; n < (int)array.GetSize() - 1; n++ ) - { - str += *(string*)array.At(n); - str += delim; - } - - // Add the last part - str += *(string*)array.At(n); - } - - return str; +static string StringJoin(const CScriptArray &array, const string &delim) { + // Create the new string + string str = ""; + if (array.GetSize()) { + int n; + for (n = 0; n < (int)array.GetSize() - 1; n++) { + str += *(string *)array.At(n); + str += delim; + } + + // Add the last part + str += *(string *)array.At(n); + } + + return str; } -static void StringJoin_Generic(asIScriptGeneric *gen) -{ - // Get the arguments - CScriptArray *array = *(CScriptArray**)gen->GetAddressOfArg(0); - string *delim = *(string**)gen->GetAddressOfArg(1); +static void StringJoin_Generic(asIScriptGeneric *gen) { + // Get the arguments + CScriptArray *array = *(CScriptArray **)gen->GetAddressOfArg(0); + string *delim = *(string **)gen->GetAddressOfArg(1); - // Return the string - new(gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim)); + // Return the string + new (gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim)); } // This is where the utility functions are registered. // The string type must have been registered first. -void RegisterStdStringUtils(asIScriptEngine *engine) -{ - int r; - - if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") ) - { - r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0); - r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0); - } - else - { - r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0); - r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0); - } +void RegisterStdStringUtils(asIScriptEngine *engine) { + int r; + + if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY")) { + r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); + assert(r >= 0); + r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); + assert(r >= 0); + } else { + r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); + assert(r >= 0); + r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); + assert(r >= 0); + } } END_AS_NAMESPACE |