MCVariable functions updated to use an MCExecContext

livecodesebastien · livecodesebastien · commit fb067ad69de4 · 2013-10-14T15:44:05.000+01:00
MCB_setmsg updated subsequently
diff --git a/engine/src/cmds.cpp b/engine/src/cmds.cpp
@@ -2438,9 +2438,8 @@ void MCSort::additem(MCExecContext &ctxt, MCSortnode *items, uint4 &nitems, Sort
 	MCAutoValueRef t_value;
 	if (by != NULL)
 	{
-		MCerrorlock++;
-		ctxt.GetEP().setvalueref(p_value);
-		MCeach->set(ctxt.GetEP());
+        MCerrorlock++;
+        MCeach -> setvalueref(p_value);
 		if (by->eval(ctxt.GetEP()) == ES_NORMAL)
 			t_value = ctxt.GetEP().getvalueref();
 		else
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -76,7 +76,7 @@ static int2 depth;
 
 #include "srvdebug.h"
 
-void MCB_setmsg(MCStringRef p_msg)
+void MCB_setmsg(MCExecContext& ctxt, MCStringRef p_msg)
 {
     
 }
@@ -122,11 +122,10 @@ void MCB_setvar(MCExecContext &ctxt, MCValueRef p_value, MCNameRef name)
 
 #else
 
-void MCB_setmsg(MCStringRef p_msg)
+void MCB_setmsg(MCExecContext& ctxt, MCStringRef p_msg)
 {
-    MCExecPoint ep(nil, nil, nil);
-    ep . setvalueref(p_msg);
-    MCB_setmsg(ep);
+    ctxt . GetEP() . setvalueref(p_msg);
+    MCB_setmsg(ctxt . GetEP());
 }
 
 void MCB_setmsg(MCExecPoint &ep)
diff --git a/engine/src/debug.h b/engine/src/debug.h
@@ -62,7 +62,7 @@ extern uint2 MCnexecutioncontexts;
 extern uint2 MCdebugcontext;
 extern Boolean MCmessagemessages;
 
-extern void MCB_setmsg(MCStringRef p_string);
+extern void MCB_setmsg(MCExecContext& ctxt, MCStringRef p_msg);
 extern void MCB_setmsg(MCExecPoint &ep);
 extern void MCB_message(MCExecPoint &ep, MCNameRef message, MCParameter *p);
 extern void MCB_prepmessage(MCExecPoint &ep, MCNameRef message, uint2 line, uint2 pos, uint2 id, MCStringRef p_info = kMCEmptyString);
diff --git a/engine/src/lnxdc.cpp b/engine/src/lnxdc.cpp
@@ -434,7 +434,7 @@ uint4 MCScreenDC::getdisplays(MCDisplay const *& p_displays, bool p_effective)
 bool MCScreenDC::listprinters(MCStringRef& r_printers)
 {
 	MCdefaultstackptr->domess(MCSTR(LIST_PRINTER_SCRIPT));
-	MCresult->eval(false, (MCValueRef&)r_printers);
+    MCresult->copyasvalueref((MCValueRef&)r_printers);
 	return true;
 }
 
diff --git a/engine/src/variable.cpp b/engine/src/variable.cpp
@@ -235,60 +235,54 @@ MCValueRef MCVariable::getvalueref(MCNameRef *p_path, uindex_t p_length, bool p_
 	return kMCEmptyString;
 }
 
-bool MCVariable::copyasvalueref(MCValueRef &r_value)
+bool MCVariable::copyasvalueref(MCValueRef& r_value)
 {
-    return MCValueCopy(getvalueref(nil, 0, false), r_value);
+    return copyasvalueref(nil, 0, false, r_value);
 }
 
-bool MCVariable::copyasvalueref(MCNameRef *p_path, uindex_t p_length, bool p_case_sensitive, MCValueRef &r_value)
+bool MCVariable::copyasvalueref(MCNameRef *p_path, uindex_t p_length, bool p_case_sensitive, MCValueRef& r_value)
 {
-    return MCValueCopy(getvalueref(p_path, p_length, p_case_sensitive));
+    return MCValueCopy(getvalueref(p_path, p_length, p_case_sensitive), r_value);
 }
 
 Exec_stat MCVariable::eval(MCExecPoint& ep)
 {
-	return eval(ep, nil, 0);
+    return eval(ep, nil, 0);
 }
 
-void MCVariable::eval(bool p_case_sensitive, MCValueRef &r_value)
+Exec_stat MCVariable::eval(MCExecPoint& ep, MCNameRef *p_path, uindex_t p_length)
 {
-	eval(nil, 0, p_case_sensitive, r_value);
-}
+    MCExecContext ctxt(ep);
 
-void MCVariable::eval(MCNameRef *p_path, uindex_t p_length, bool p_case_sensitive, MCValueRef &r_value)
-{
-	r_value = getvalueref(p_path, p_length, p_case_sensitive);
+    MCAutoValueRef t_value;
+    if (eval(ctxt, p_path, p_length, &t_value) &&
+            ep . setvalueref(*t_value))
+        return ES_NORMAL;
+
+    return ES_ERROR;
 }
 
-Exec_stat MCVariable::eval(MCExecPoint& ep, MCNameRef *p_path, uindex_t p_length)
+bool MCVariable::eval(MCExecContext& ctxt, MCNameRef *p_path, uindex_t p_length, MCValueRef& r_value)
 {
-	MCValueRef t_value;
-	t_value = getvalueref(p_path, p_length, ep . getcasesensitive() == True);
-
-	if (ep . setvalueref(t_value))
-		return ES_NORMAL;
-
-	return ES_ERROR;
+    return copyasvalueref(p_path, p_length, ctxt . GetCaseSensitive(), r_value);
 }
 
 Exec_stat MCVariable::set(MCExecPoint& ep)
 {
-	return set(ep, nil, 0);
+    return set(ep, nil, 0);
 }
 
 Exec_stat MCVariable::set(MCExecPoint& ep, MCNameRef *p_path, uindex_t p_length)
 {
-	MCAutoValueRef t_value;
-	if (!ep . copyasvalueref(&t_value))
-		return ES_ERROR;
+    MCAutoValueRef t_value;
+    if (!ep . copyasvalueref(&t_value))
+        return ES_ERROR;
 
-	if (setvalueref(p_path, p_length, ep . getcasesensitive() == True, *t_value))
-	{
-		synchronize(ep, True);
-		return ES_NORMAL;
-	}
+    MCExecContext ctxt(ep);
+    if (set(ctxt, *t_value, p_path, p_length))
+        return ES_NORMAL;
 
-	return ES_ERROR;
+    return ES_ERROR;
 }
 
 bool MCVariable::set(MCExecContext& ctxt, MCValueRef p_value)
@@ -303,7 +297,7 @@ bool MCVariable::set(MCExecContext& ctxt, MCValueRef p_value, MCNameRef *p_path,
     
     if (setvalueref(p_path, p_length, ctxt . GetCaseSensitive(), *t_value))
     {
-        synchronize(ctxt, p_value, true);
+        synchronize(ctxt, true);
         return true;
     }
     
@@ -312,45 +306,20 @@ bool MCVariable::set(MCExecContext& ctxt, MCValueRef p_value, MCNameRef *p_path,
 
 Exec_stat MCVariable::append(MCExecPoint& ep)
 {
-	return append(ep, nil, 0);
+    return append(ep, nil, 0);
 }
 
 Exec_stat MCVariable::append(MCExecPoint& ep, MCNameRef *p_path, uindex_t p_length)
 {
-	MCAutoStringRef t_value;
-	if (!ep . copyasstringref(&t_value))
-		return ES_ERROR;
-
-	if (p_length == 0)
-	{
-		if (!converttomutablestring(ep))
-			return ES_ERROR;
-
-		if (!MCStringAppend((MCStringRef)value, *t_value))
-			return ES_ERROR;
-
-		synchronize(ep, True);
+    MCAutoValueRef t_value;
+    if (!ep . copyasvalueref(&t_value))
+        return ES_ERROR;
 
-		return ES_NORMAL;
-	}
+    MCExecContext ctxt(ep);
+    if (append(ctxt, *t_value, p_path, p_length))
+        return ES_NORMAL;
 
-	MCValueRef t_current_value;
-	t_current_value = getvalueref(p_path, p_length, ep . getcasesensitive() == True);
-	
-	MCStringRef t_current_value_as_string;
-	t_current_value_as_string = nil;
-	if (ep . convertvaluereftostring(t_current_value, t_current_value_as_string) &&
-		MCStringMutableCopyAndRelease(t_current_value_as_string, t_current_value_as_string) &&
-		MCStringAppend(t_current_value_as_string, *t_value) &&
-		setvalueref(p_path, p_length, ep . getcasesensitive() == True, t_current_value_as_string))
-	{
-		MCValueRelease(t_current_value_as_string);
-		synchronize(ep, True);
-		return ES_NORMAL;
-	}
-
-	MCValueRelease(t_current_value_as_string);
-	return ES_ERROR;
+    return ES_ERROR;
 }
 
 bool MCVariable::append(MCExecContext& ctxt, MCValueRef p_value)
@@ -372,11 +341,11 @@ bool MCVariable::append(MCExecContext& ctxt, MCValueRef p_value, MCNameRef *p_pa
 		if (!MCStringAppend((MCStringRef)value, *t_value))
 			return false;
         
-		synchronize(ctxt, p_value, true);
+        synchronize(ctxt, true);
         
 		return true;
 	}
-    
+
 	MCValueRef t_current_value;
 	t_current_value = getvalueref(p_path, p_length, ctxt . GetCaseSensitive());
 	
@@ -388,7 +357,7 @@ bool MCVariable::append(MCExecContext& ctxt, MCValueRef p_value, MCNameRef *p_pa
 		setvalueref(p_path, p_length, ctxt . GetCaseSensitive(), t_current_value_as_string))
 	{
 		MCValueRelease(t_current_value_as_string);
-		synchronize(ctxt, p_value, true);
+        synchronize(ctxt, true);
 		return true;
 	}
     
@@ -398,36 +367,16 @@ bool MCVariable::append(MCExecContext& ctxt, MCValueRef p_value, MCNameRef *p_pa
 
 Exec_stat MCVariable::remove(MCExecPoint& ep)
 {
-	return remove(ep, nil, 0);
+    return remove(ep, nil, 0);
 }
 
 Exec_stat MCVariable::remove(MCExecPoint& ep, MCNameRef *p_path, uindex_t p_length)
 {
-	if (p_length == 0)
-	{
-		clear();
-		
-		if (is_env)
-		{
-			if (!isdigit(MCNameGetCharAtIndex(name, 1)) && MCNameGetCharAtIndex(name, 1) != '#')
-			{
-				MCAutoStringRef t_env;
-				/* UNCHECKED */ MCStringCopySubstring(MCNameGetString(name), MCRangeMake(1, MCStringGetLength(MCNameGetString(name))), &t_env);
-				MCS_unsetenv(*t_env);
-			}
-		}
-	}
-
-	if (MCValueGetTypeCode(value) != kMCValueTypeCodeArray)
-		return ES_NORMAL;
-
-	if (!converttomutablearray())
-		return ES_ERROR;
-
-	MCArrayRemoveValueOnPath((MCArrayRef)value, ep . getcasesensitive() == True, p_path, p_length);
-
-	return ES_NORMAL;
+    MCExecContext ctxt(ep);
+    if (remove(ctxt, p_path, p_length))
+        return ES_NORMAL;
 
+    return ES_ERROR;
 }
 
 bool MCVariable::remove(MCExecContext& ctxt)
@@ -627,6 +576,7 @@ bool MCVariable::ensureglobal(MCNameRef p_name, MCVariable*& r_var)
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#if 0
 void MCVariable::synchronize(MCExecPoint& ep, Boolean notify)
 {
 	if (is_env)
@@ -682,15 +632,16 @@ void MCVariable::synchronize(MCExecPoint& ep, Boolean notify)
 		}
 	}
 }
+#endif
 
-void MCVariable::synchronize(MCExecContext& ctxt, MCValueRef p_value, bool p_notify)
+void MCVariable::synchronize(MCExecContext& ctxt, bool p_notify)
 {
 	if (is_env)
 	{
 		if (!isdigit(MCNameGetCharAtIndex(name, 1)) && MCNameGetCharAtIndex(name, 1) != '#')
 		{
 			MCAutoStringRef t_string;
-			if (ctxt . ConvertToString(p_value, &t_string))
+            if (ctxt . ConvertToString(value, &t_string))
             {
                 MCAutoStringRef t_env;
 				/* UNCHECKED */ MCStringCopySubstring(MCNameGetString(name), MCRangeMake(1, MCStringGetLength(MCNameGetString(name))), &t_env);
@@ -699,13 +650,10 @@ void MCVariable::synchronize(MCExecContext& ctxt, MCValueRef p_value, bool p_not
 		}
 	}
 	else if (is_msg)
-	{
-        MCAutoValueRef t_value;
-        eval(ctxt . GetCaseSensitive(), &t_value);
-        
+    {
         MCAutoStringRef t_msg;
-        if (ctxt . ConvertToString(*t_value, &t_msg))
-            MCB_setmsg(*t_msg);
+        if (ctxt . ConvertToString(value, &t_msg))
+            MCB_setmsg(ctxt, *t_msg);
 	}
     
 	if (p_notify && MCnwatchedvars)
@@ -723,24 +671,22 @@ void MCVariable::synchronize(MCExecContext& ctxt, MCValueRef p_value, bool p_not
 					MCwatchedvars[i] . handlername == NULL &&
 					!is_global)
 					continue;
-                
-				// Otherwise, trigger the setvar message.
-                MCAutoValueRef t_value;
-                eval(ctxt . GetCaseSensitive(), &t_value);
-                
+
 				if (*MCwatchedvars[i].expression)
 				{
 					MCAutoStringRef t_expression;
                     MCStringCreateWithCString(MCwatchedvars[i].expression, &t_expression);
-					MCAutoValueRef t_bool_value;
+                    MCAutoValueRef t_value;
+                    MCAutoBooleanRef t_bool_value;
                     
-                    ctxt . GetHandler() -> eval(ctxt, *t_expression, &t_bool_value);
-                    
-					if (!ctxt . HasError() && (MCBooleanRef)*t_bool_value == kMCTrue)
-                        MCB_setvar(ctxt, *t_value, name);
+                    ctxt . GetHandler() -> eval(ctxt, *t_expression, &t_value);
+                    if (!ctxt . HasError() &&
+                            ctxt . ConvertToBoolean(*t_value, &t_bool_value))
+                    if (!ctxt . HasError() && *t_bool_value == kMCTrue)
+                        MCB_setvar(ctxt, value, name);
 				}
 				else
-                    MCB_setvar(ctxt, *t_value, name);
+                    MCB_setvar(ctxt, value, name);
                 
 				break;
 			}
@@ -803,9 +749,9 @@ Exec_stat MCContainer::remove(MCExecPoint& ep)
 	return m_variable -> remove(ep, m_path, m_length);
 }
 
-void MCContainer::eval(bool p_case_sensitive, MCValueRef& r_value)
+bool MCContainer::eval(MCExecContext& ctxt, MCValueRef& r_value)
 {
-    m_variable -> eval(m_path, m_length, p_case_sensitive, r_value);
+    return m_variable -> eval(ctxt, m_path, m_length, r_value);
 }
 
 bool MCContainer::set(MCExecContext& ctxt, MCValueRef p_value)
@@ -958,16 +904,15 @@ bool MCVarref::eval(MCExecContext& ctxt, MCValueRef& r_value)
 		
 		t_resolved_ref = fetchvar(ctxt);
         
-		t_resolved_ref -> eval(ctxt . GetCaseSensitive(), r_value);
-        
-        return true;
+        return t_resolved_ref -> copyasvalueref(r_value);
 	}
     
 	MCAutoPointer<MCContainer> t_container;
 	if (!resolve(ctxt, &t_container))
 		return false;
     
-	t_container -> eval(ctxt . GetCaseSensitive(), r_value);
+    if (!t_container -> eval(ctxt, r_value))
+        return false;
     
     return true;
 }
@@ -1168,7 +1113,7 @@ Exec_stat MCVarref::dofree(MCExecPoint &ep)
 		
 		t_var = fetchvar(ep);
 			
-		return t_var -> remove(ep, nil, 0);
+        return t_var -> remove(ep);
 	}
 	
 	MCAutoPointer<MCContainer> t_container;
diff --git a/engine/src/variable.h b/engine/src/variable.h

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ static int2 depth;`
`76`	`76`
`77`	`77`	`#include "srvdebug.h"`
`78`	`78`
`79`		`-void MCB_setmsg(MCStringRef p_msg)`
	`79`	`+void MCB_setmsg(MCExecContext& ctxt, MCStringRef p_msg)`
`80`	`80`	`{`
`81`	`81`
`82`	`82`	`}`
`@@ -122,11 +122,10 @@ void MCB_setvar(MCExecContext &ctxt, MCValueRef p_value, MCNameRef name)`
`122`	`122`
`123`	`123`	`#else`
`124`	`124`
`125`		`-void MCB_setmsg(MCStringRef p_msg)`
	`125`	`+void MCB_setmsg(MCExecContext& ctxt, MCStringRef p_msg)`
`126`	`126`	`{`
`127`		`- MCExecPoint ep(nil, nil, nil);`
`128`		`- ep . setvalueref(p_msg);`
`129`		`- MCB_setmsg(ep);`
	`127`	`+ ctxt . GetEP() . setvalueref(p_msg);`
	`128`	`+ MCB_setmsg(ctxt . GetEP());`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`void MCB_setmsg(MCExecPoint &ep)`
Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ uint4 MCScreenDC::getdisplays(MCDisplay const *& p_displays, bool p_effective)`
`434`	`434`	`bool MCScreenDC::listprinters(MCStringRef& r_printers)`
`435`	`435`	`{`
`436`	`436`	`MCdefaultstackptr->domess(MCSTR(LIST_PRINTER_SCRIPT));`
`437`		`- MCresult->eval(false, (MCValueRef&)r_printers);`
	`437`	`+ MCresult->copyasvalueref((MCValueRef&)r_printers);`
`438`	`438`	`return true;`
`439`	`439`	`}`
`440`	`440`