Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.

Commit 0b2cf31

Browse files
runrevmarkrunrevmark
authored
Merge pull request livecode#7049 from runrevmark/bug-mbl_handler_param_eval
[[ Bug ]] Fix evaluation of mobile handler parameters
2 parents b31d14e + 7c46e71 commit 0b2cf31

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎engine/src/mblhandlers.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ Exec_stat MCHandleStartTrackingSensor(void *p_context, MCParameter *p_parameters
10061006
{
10071007
MCAutoValueRef t_value;
10081008
MCAutoStringRef t_string;
1009-
p_parameters->eval(ctxt, &t_value);
1009+
p_parameters->eval_argument(ctxt, &t_value);
10101010
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
10111011
t_sensor = MCSensorTypeFromString(*t_string);
10121012
p_parameters = p_parameters->getnext();
@@ -1016,7 +1016,7 @@ Exec_stat MCHandleStartTrackingSensor(void *p_context, MCParameter *p_parameters
10161016
{
10171017
MCAutoValueRef t_value;
10181018
MCAutoBooleanRef t_bool;
1019-
p_parameters->eval(ctxt, &t_value);
1019+
p_parameters->eval_argument(ctxt, &t_value);
10201020
// PM-2015-03-11: [[ Bug 14855 ]] Evaluate correctly the second param
10211021
if (ctxt . ConvertToBoolean(*t_value, &t_bool))
10221022
t_loosely = MCValueIsEqualTo(*t_bool, kMCTrue);
@@ -1048,7 +1048,7 @@ Exec_stat MCHandleStopTrackingSensor(void *p_context, MCParameter *p_parameters)
10481048
{
10491049
MCAutoValueRef t_value;
10501050
MCAutoStringRef t_string;
1051-
p_parameters->eval(ctxt, &t_value);
1051+
p_parameters->eval_argument(ctxt, &t_value);
10521052
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
10531053
t_sensor = MCSensorTypeFromString(*t_string);
10541054
p_parameters = p_parameters->getnext();
@@ -1127,7 +1127,7 @@ Exec_stat MCHandleSensorReading(void *p_context, MCParameter *p_parameters)
11271127
{
11281128
MCAutoValueRef t_value;
11291129
MCAutoStringRef t_string;
1130-
p_parameters->eval(ctxt, &t_value);
1130+
p_parameters->eval_argument(ctxt, &t_value);
11311131
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
11321132
t_sensor = MCSensorTypeFromString(*t_string);
11331133
p_parameters = p_parameters->getnext();
@@ -1137,7 +1137,7 @@ Exec_stat MCHandleSensorReading(void *p_context, MCParameter *p_parameters)
11371137
{
11381138
MCAutoValueRef t_value;
11391139
MCAutoBooleanRef t_bool;
1140-
p_parameters->eval(ctxt, &t_value);
1140+
p_parameters->eval_argument(ctxt, &t_value);
11411141
// PM-2015-03-11: [[ Bug 14855 ]] Evaluate correctly the second param
11421142
if(ctxt . ConvertToBoolean(*t_value, &t_bool))
11431143
t_detailed = MCValueIsEqualTo(*t_bool, kMCTrue);
@@ -1269,7 +1269,7 @@ Exec_stat MCHandleSetHeadingCalibrationTimeout(void *p_context, MCParameter *p_p
12691269
{
12701270
MCAutoValueRef t_value;
12711271
MCAutoNumberRef t_number;
1272-
p_parameters->eval(ctxt, &t_value);
1272+
p_parameters->eval_argument(ctxt, &t_value);
12731273
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
12741274
t_timeout = MCNumberFetchAsInteger(*t_number);
12751275
}
@@ -1315,7 +1315,7 @@ Exec_stat MCHandleSensorAvailable(void *p_context, MCParameter *p_parameters)
13151315
{
13161316
MCAutoValueRef t_value;
13171317
MCAutoStringRef t_string;
1318-
p_parameters->eval(ctxt, &t_value);
1318+
p_parameters->eval_argument(ctxt, &t_value);
13191319
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
13201320
t_sensor = MCSensorTypeFromString(*t_string);
13211321
p_parameters = p_parameters->getnext();
@@ -1384,7 +1384,7 @@ Exec_stat MCHandleSetLocationHistoryLimit(void *p_context, MCParameter *p_parame
13841384
return ES_NORMAL;
13851385

13861386
MCAutoValueRef t_value;
1387-
p_parameters->eval(ctxt, &t_value);
1387+
p_parameters->eval_argument(ctxt, &t_value);
13881388

13891389
uinteger_t t_limit = 0;
13901390
/* UNCHECKED */ ctxt . ConvertToUnsignedInteger(*t_value, t_limit);
@@ -1460,7 +1460,7 @@ Exec_stat MCHandleShowContact(void *context, MCParameter *p_parameters) // ABPer
14601460
{
14611461
MCAutoValueRef t_value;
14621462
MCAutoNumberRef t_number;
1463-
p_parameters->eval(ctxt, &t_value);
1463+
p_parameters->eval_argument(ctxt, &t_value);
14641464
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
14651465
t_contact_id = MCNumberFetchAsInteger(*t_number);
14661466
}
@@ -1513,7 +1513,7 @@ Exec_stat MCHandleGetContactData(void *context, MCParameter *p_parameters)
15131513
{
15141514
MCAutoValueRef t_value;
15151515
MCAutoNumberRef t_number;
1516-
p_parameters->eval(ctxt, &t_value);
1516+
p_parameters->eval_argument(ctxt, &t_value);
15171517
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
15181518
t_contact_id = MCNumberFetchAsInteger(*t_number);
15191519
}
@@ -1541,7 +1541,7 @@ Exec_stat MCHandleRemoveContact(void *context, MCParameter *p_parameters)
15411541
{
15421542
MCAutoValueRef t_value;
15431543
MCAutoNumberRef t_number;
1544-
p_parameters->eval(ctxt, &t_value);
1544+
p_parameters->eval_argument(ctxt, &t_value);
15451545
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
15461546
t_contact_id = MCNumberFetchAsInteger(*t_number);
15471547
}
@@ -1580,7 +1580,7 @@ Exec_stat MCHandleFindContact(void *context, MCParameter *p_parameters)
15801580
if (p_parameters)
15811581
{
15821582
MCAutoValueRef t_value;
1583-
p_parameters->eval(ctxt, &t_value);
1583+
p_parameters->eval_argument(ctxt, &t_value);
15841584
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_contact_name);
15851585
}
15861586
ctxt.SetTheResultToEmpty();
@@ -1978,7 +1978,7 @@ Exec_stat MCHandleFindEvent(void *context, MCParameter *p_parameters)
19781978
{
19791979
MCAutoValueRef t_value;
19801980

1981-
if (p_parameters->eval(ctxt, &t_value)
1981+
if (p_parameters->eval_argument(ctxt, &t_value)
19821982
&& !MCValueIsEmpty(*t_value))
19831983
{
19841984
t_success = MCD_convert_to_datetime(ctxt, *t_value, CF_UNDEFINED, CF_UNDEFINED, t_start_date);
@@ -1989,7 +1989,7 @@ Exec_stat MCHandleFindEvent(void *context, MCParameter *p_parameters)
19891989
{
19901990
MCAutoValueRef t_value;
19911991

1992-
if (p_parameters->eval(ctxt, &t_value)
1992+
if (p_parameters->eval_argument(ctxt, &t_value)
19931993
&& !MCValueIsEmpty(*t_value))
19941994
{
19951995
t_success = MCD_convert_to_datetime(ctxt, *t_value, CF_UNDEFINED, CF_UNDEFINED, t_end_date);
@@ -2027,7 +2027,7 @@ Exec_stat MCHandleCreateLocalNotification (void *context, MCParameter *p_paramet
20272027
if (t_success && p_parameters != nil)
20282028
{
20292029
MCAutoValueRef t_value;
2030-
if (p_parameters->eval(ctxt, &t_value)
2030+
if (p_parameters->eval_argument(ctxt, &t_value)
20312031
&& !MCValueIsEmpty(*t_value))
20322032
{
20332033
t_success = MCD_convert_to_datetime(ctxt, *t_value, CF_UNDEFINED, CF_UNDEFINED, t_date);
@@ -3745,23 +3745,23 @@ Exec_stat MCHandlePickDate(void *context, MCParameter *p_parameters)
37453745
if (t_success && p_parameters != nil)
37463746
{
37473747
MCAutoValueRef t_value;
3748-
p_parameters->eval(ctxt, &t_value);
3748+
p_parameters->eval_argument(ctxt, &t_value);
37493749
t_success = ctxt . ConvertToString(*t_value, &t_current);
37503750
p_parameters = p_parameters->getnext();
37513751
}
37523752

37533753
if (t_success && p_parameters != nil)
37543754
{
37553755
MCAutoValueRef t_value;
3756-
p_parameters->eval(ctxt, &t_value);
3756+
p_parameters->eval_argument(ctxt, &t_value);
37573757
t_success = ctxt . ConvertToString(*t_value, &t_start);
37583758
p_parameters = p_parameters->getnext();
37593759
}
37603760

37613761
if (t_success && p_parameters != nil)
37623762
{
37633763
MCAutoValueRef t_value;
3764-
p_parameters->eval(ctxt, &t_value);
3764+
p_parameters->eval_argument(ctxt, &t_value);
37653765
t_success = ctxt . ConvertToString(*t_value, &t_end);
37663766
p_parameters = p_parameters->getnext();
37673767
}
@@ -3833,23 +3833,23 @@ Exec_stat MCHandlePickTime(void *context, MCParameter *p_parameters)
38333833
if (t_success && p_parameters != nil)
38343834
{
38353835
MCAutoValueRef t_value;
3836-
p_parameters->eval(ctxt, &t_value);
3836+
p_parameters->eval_argument(ctxt, &t_value);
38373837
t_success = ctxt . ConvertToString(*t_value, &t_current);
38383838
p_parameters = p_parameters->getnext();
38393839
}
38403840

38413841
if (t_success && p_parameters != nil)
38423842
{
38433843
MCAutoValueRef t_value;
3844-
p_parameters->eval(ctxt, &t_value);
3844+
p_parameters->eval_argument(ctxt, &t_value);
38453845
t_success = ctxt . ConvertToString(*t_value, &t_start);
38463846
p_parameters = p_parameters->getnext();
38473847
}
38483848

38493849
if (t_success && p_parameters != nil)
38503850
{
38513851
MCAutoValueRef t_value;
3852-
p_parameters->eval(ctxt, &t_value);
3852+
p_parameters->eval_argument(ctxt, &t_value);
38533853
t_success = ctxt . ConvertToString(*t_value, &t_end);
38543854
p_parameters = p_parameters->getnext();
38553855
}
@@ -3916,23 +3916,23 @@ Exec_stat MCHandlePickDateAndTime(void *context, MCParameter *p_parameters)
39163916
if (t_success && p_parameters != nil)
39173917
{
39183918
MCAutoValueRef t_value;
3919-
p_parameters->eval(ctxt, &t_value);
3919+
p_parameters->eval_argument(ctxt, &t_value);
39203920
t_success = ctxt . ConvertToString(*t_value, &t_current);
39213921
p_parameters = p_parameters->getnext();
39223922
}
39233923

39243924
if (t_success && p_parameters != nil)
39253925
{
39263926
MCAutoValueRef t_value;
3927-
p_parameters->eval(ctxt, &t_value);
3927+
p_parameters->eval_argument(ctxt, &t_value);
39283928
t_success = ctxt . ConvertToString(*t_value, &t_start);
39293929
p_parameters = p_parameters->getnext();
39303930
}
39313931

39323932
if (t_success && p_parameters != nil)
39333933
{
39343934
MCAutoValueRef t_value;
3935-
p_parameters->eval(ctxt, &t_value);
3935+
p_parameters->eval_argument(ctxt, &t_value);
39363936
t_success = ctxt . ConvertToString(*t_value, &t_end);
39373937
p_parameters = p_parameters->getnext();
39383938
}
@@ -4186,7 +4186,7 @@ Exec_stat MCHandleControlSet(void *context, MCParameter *p_parameters)
41864186

41874187
MCAutoValueRef t_value;
41884188
if (t_success && p_parameters != nil)
4189-
t_success = p_parameters -> eval(ctxt, &t_value);
4189+
t_success = p_parameters -> eval_argument(ctxt, &t_value);
41904190

41914191
if (t_success)
41924192
MCNativeControlExecSet(ctxt, *t_control_name, *t_property, *t_value);
@@ -4239,7 +4239,7 @@ Exec_stat MCHandleControlDo(void *context, MCParameter *p_parameters)
42394239
MCValueRef t_value;
42404240
while (t_success && p_parameters != nil)
42414241
{
4242-
p_parameters -> eval(ctxt, t_value);
4242+
p_parameters -> eval_argument(ctxt, t_value);
42434243
t_success = t_params . Push(t_value);
42444244
p_parameters = p_parameters -> getnext();
42454245
}

0 commit comments

Comments
 (0)