Skip to content

Commit 3269466

Browse files
[[ ExternalsV6 ]] Added Java conversion, Obj-C type conversion and autoreleasing for NS*, plus fixes
1 parent a2da122 commit 3269466

15 files changed

Lines changed: 712 additions & 271 deletions

File tree

engine/src/externalv0.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ struct get_array_element_t
799799
uindex_t limit;
800800
char **keys;
801801
MCstring *strings;
802-
bool want_utf8;
802+
bool is_text;
803803
};
804804

805805
static bool get_array_element(void *p_context, MCArrayRef p_array, MCNameRef p_key, MCValueRef p_value)
@@ -1269,7 +1269,7 @@ static char *set_variable_utf8(const char *arg1, const char *arg2,
12691269
//////////
12701270

12711271
static char *get_variable_ex_utf8(const char *arg1, const char *arg2,
1272-
const char *arg3, int *retval, Bool p_want_utf8)
1272+
const char *arg3, int *retval, Bool p_is_text)
12731273
{
12741274
MCString *value = (MCString *)arg3;
12751275
Boolean array = False;
@@ -1303,7 +1303,7 @@ static char *get_variable_ex_utf8(const char *arg1, const char *arg2,
13031303

13041304
char *t_result;
13051305
uindex_t t_char_count;
1306-
if (p_want_utf8)
1306+
if (p_is_text)
13071307
/* UNCHECKED */ MCStringConvertToUTF8(*t_string, t_result, t_char_count);
13081308
else
13091309
/* UNCHECKED */ MCStringConvertToNative(*t_string, (char_t*&)t_result, t_char_count);
@@ -1330,7 +1330,7 @@ static char *get_variable_ex_utf8_binary(const char *arg1, const char *arg2,
13301330
//////////
13311331

13321332
static char *set_variable_ex_utf8(const char *arg1, const char *arg2,
1333-
const char *arg3, int *retval, Bool p_want_utf8)
1333+
const char *arg3, int *retval, Bool p_is_text)
13341334
{
13351335
MCString *t_value = (MCString*)arg3;
13361336
MCVariable *var = NULL;
@@ -1344,7 +1344,7 @@ static char *set_variable_ex_utf8(const char *arg1, const char *arg2,
13441344
return NULL;
13451345

13461346
MCAutoStringRef t_string;
1347-
if (p_want_utf8)
1347+
if (p_is_text)
13481348
/* UNCHECKED */ MCStringCreateWithBytes((byte_t*)t_value->getstring(), t_value->getlength(), kMCStringEncodingUTF8, false, &t_string);
13491349
else
13501350
/* UNCHECKED */ MCStringCreateWithOldString(*t_value, &t_string);
@@ -1399,7 +1399,7 @@ static bool get_array_element_utf8(void *p_context, MCArrayRef p_array, MCNameRe
13991399
if (!MCECptr -> ConvertToString(p_value, &t_string))
14001400
t_string = kMCEmptyString;
14011401

1402-
if (ctxt -> want_utf8)
1402+
if (ctxt -> is_text)
14031403
/* UNCHECKED */ MCStringConvertToUTF8(*t_string, t_chars, t_length);
14041404
else
14051405
/* UNCHECKED */ MCStringConvertToNative(*t_string, (char_t*&)t_chars, t_length);
@@ -1418,7 +1418,7 @@ static bool get_array_element_utf8(void *p_context, MCArrayRef p_array, MCNameRe
14181418
}
14191419

14201420
static char *get_array_utf8(const char *arg1, const char *arg2,
1421-
const char *arg3, int *retval, bool p_want_utf8)
1421+
const char *arg3, int *retval, bool p_is_text)
14221422
{
14231423
MCarray *value = (MCarray *)arg3;
14241424
MCVariable *var = NULL;
@@ -1452,7 +1452,7 @@ static char *get_array_utf8(const char *arg1, const char *arg2,
14521452
t_ctxt . limit = value -> nelements;
14531453
t_ctxt . keys = value -> keys;
14541454
t_ctxt . strings = value -> strings;
1455-
t_ctxt . want_utf8 = p_want_utf8;
1455+
t_ctxt . is_text = p_is_text;
14561456
MCArrayApply(t_array, get_array_element_utf8, &t_ctxt);
14571457

14581458
return NULL;
@@ -1509,7 +1509,7 @@ static char *get_array_utf8_binary(const char *arg1, const char *arg2,
15091509
//////////
15101510

15111511
static char *set_array_utf8(const char *arg1, const char *arg2,
1512-
const char *arg3, int *retval, bool p_want_utf8)
1512+
const char *arg3, int *retval, bool p_is_text)
15131513
{
15141514
MCarray *value = (MCarray *)arg3;
15151515
MCVariable *var = NULL;
@@ -1527,7 +1527,7 @@ static char *set_array_utf8(const char *arg1, const char *arg2,
15271527
{
15281528
MCString *s = (MCString *)&value->strings[i];
15291529
MCAutoStringRef t_string;
1530-
if (p_want_utf8)
1530+
if (p_is_text)
15311531
/* UNCHECKED */ MCStringCreateWithBytes((byte_t*)s->getstring(), s->getlength(), kMCStringEncodingUTF8, false, &t_string);
15321532
else
15331533
/* UNCHECKED */ MCStringCreateWithOldString(*s, &t_string);

0 commit comments

Comments
 (0)