[21683] Further tweaks

livecodepanos · livecodepanos · commit a2ad8c9f10ea · 2018-11-15T15:51:04.000+02:00
diff --git a/engine/src/widget.cpp b/engine/src/widget.cpp
@@ -670,26 +670,40 @@ bool MCWidget::setcustomprop(MCExecContext& ctxt, MCNameRef p_set_name, MCNameRe
         CatchError(ctxt);
         
         Exec_errors t_error;
+        bool t_throw = false;
         
         MCResolvedTypeInfo t_resolved_type;
         if (!MCTypeInfoResolve(t_set_type, t_resolved_type))
             return false;
         
         if ( t_resolved_type . named_type == kMCBooleanTypeInfo)
+        {
             t_error = EE_PROPERTY_NAB;
-        
+            t_throw = true;
+        }
         else if (t_resolved_type . named_type == kMCNumberTypeInfo)
+        {
             t_error = EE_PROPERTY_NAN;
+            t_throw = true;
+        }
         else if (t_resolved_type . named_type == kMCStringTypeInfo)
+        {
             t_error = EE_PROPERTY_NAS;
+            t_throw = true;
+        }
         else if (t_resolved_type . named_type == kMCArrayTypeInfo || t_resolved_type . named_type == kMCProperListTypeInfo)
+        {
             t_error = EE_PROPERTY_NOTANARRAY;
+            t_throw = true;
+        }
         else if (t_resolved_type . named_type == kMCDataTypeInfo)
+        {
             t_error = EE_PROPERTY_NOTADATA;
-        else
-            t_error = EE_PROPERTY_CANTSET;
-            
-        ctxt . LegacyThrow(t_error);
+            t_throw = true;
+        }
+        
+        if (t_throw)
+            ctxt . LegacyThrow(t_error);
         return false;
     }
     
diff --git a/libscript/src/script-error.cpp b/libscript/src/script-error.cpp
@@ -398,7 +398,7 @@ MCScriptCreateErrorExpectedError(MCErrorRef& r_error)
 						  nil);
 }
 
-bool MCScriptThrowAttemptToSetReadOnlyPropertyError(MCScriptInstanceRef p_instance, MCNameRef p_property)
+bool MCScriptThrowCannotSetReadOnlyPropertyError(MCScriptInstanceRef p_instance, MCNameRef p_property)
 {
     return MCErrorCreateAndThrow(kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo,
                                  "module",
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -422,7 +422,7 @@ MCScriptSetPropertyInInstance(MCScriptInstanceRef self,
 	
     // If there is no setter for the property then this is an error.
     if (t_setter == nil)
-        return MCScriptThrowAttemptToSetReadOnlyPropertyError(self, p_property);
+        return MCScriptThrowCannotSetReadOnlyPropertyError(self, p_property);
     
 	/* LOAD CHECK */
 	__MCScriptAssert__(t_setter != nil,
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -608,7 +608,7 @@ MCScriptThrowPropertyNotFoundError(MCScriptInstanceRef instance,
 								   MCNameRef property);
 
 bool
-MCScriptThrowAttemptToSetReadOnlyPropertyError(MCScriptInstanceRef instance,
+MCScriptThrowCannotSetReadOnlyPropertyError(MCScriptInstanceRef instance,
                                    MCNameRef property);
 
 bool

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ MCScriptCreateErrorExpectedError(MCErrorRef& r_error)`
`398`	`398`	`nil);`
`399`	`399`	`}`
`400`	`400`
`401`		`-bool MCScriptThrowAttemptToSetReadOnlyPropertyError(MCScriptInstanceRef p_instance, MCNameRef p_property)`
	`401`	`+bool MCScriptThrowCannotSetReadOnlyPropertyError(MCScriptInstanceRef p_instance, MCNameRef p_property)`
`402`	`402`	`{`
`403`	`403`	`return MCErrorCreateAndThrow(kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo,`
`404`	`404`	`"module",`