[[ ComposedWidgets ]] Make sure GetPropertyOfWidget throws an error if the property is not present.

runrevmark · runrevmark · commit f6115064f4ef · 2015-07-01T11:04:58.000+01:00
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -294,6 +294,16 @@ bool MCScriptThrowCannotCallContextHandlerError(MCScriptModuleRef p_module, MCSc
     return MCErrorCreateAndThrow(kMCScriptCannotCallContextHandlerErrorTypeInfo, "module", p_module -> name, "handler", MCScriptGetNameOfDefinitionInModule(p_module, p_handler), nil);
 }
 
+bool MCScriptThrowHandlerNotFoundError(MCScriptModuleRef p_module, MCNameRef p_handler)
+{
+    return MCErrorCreateAndThrow(kMCScriptHandlerNotFoundErrorTypeInfo, "module", p_module -> name, "handler", p_handler, nil);
+}
+
+bool MCScriptThrowPropertyNotFoundError(MCScriptModuleRef p_module, MCNameRef p_property)
+{
+    return MCErrorCreateAndThrow(kMCScriptPropertyNotFoundErrorTypeInfo, "module", p_module -> name, "property", p_property, nil);
+}
+
 ///////////
 
 MCScriptVariableDefinition *MCScriptDefinitionAsVariable(MCScriptDefinition *self)
@@ -333,7 +343,7 @@ bool MCScriptGetPropertyOfInstance(MCScriptInstanceRef self, MCNameRef p_propert
     // Lookup the definition (throws if not found).
     MCScriptPropertyDefinition *t_definition;
     if (!MCScriptLookupPropertyDefinitionInModule(self -> module, p_property, t_definition))
-        return false;
+        return MCScriptThrowPropertyNotFoundError(self -> module, p_property);
     
     MCScriptDefinition *t_getter;
     t_getter = t_definition -> getter != 0 ? self -> module -> definitions[t_definition -> getter - 1] : nil;
@@ -386,10 +396,10 @@ bool MCScriptSetPropertyOfInstance(MCScriptInstanceRef self, MCNameRef p_propert
 {
     __MCScriptValidateObjectAndKind__(self, kMCScriptObjectKindInstance);
     
-    // Lookup the definition (throws if not found).
+    // Lookup the definition.
     MCScriptPropertyDefinition *t_definition;
     if (!MCScriptLookupPropertyDefinitionInModule(self -> module, p_property, t_definition))
-        return false;
+        return MCScriptThrowPropertyNotFoundError(self -> module, p_property);
     
     MCScriptDefinition *t_setter;
     t_setter = t_definition -> setter != 0 ? self -> module -> definitions[t_definition -> setter - 1] : nil;
@@ -517,7 +527,7 @@ bool MCScriptCallHandlerOfInstance(MCScriptInstanceRef self, MCNameRef p_handler
     // Lookup the definition (throws if not found).
     MCScriptHandlerDefinition *t_definition;
     if (!MCScriptLookupHandlerDefinitionInModule(self -> module, p_handler, t_definition))
-        return MCErrorThrowGeneric(MCSTR("handler not found"));
+        return MCScriptThrowHandlerNotFoundError(self -> module, p_handler);
     
     return MCScriptCallHandlerOfInstanceDirect(self, t_definition, p_arguments, p_argument_count, r_value);
 }
diff --git a/libscript/src/script-object.cpp b/libscript/src/script-object.cpp
@@ -37,6 +37,8 @@ MCTypeInfoRef kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo;
 MCTypeInfoRef kMCScriptInvalidPropertyValueErrorTypeInfo;
 MCTypeInfoRef kMCScriptNotAHandlerValueErrorTypeInfo;
 MCTypeInfoRef kMCScriptCannotCallContextHandlerErrorTypeInfo;
+MCTypeInfoRef kMCScriptHandlerNotFoundErrorTypeInfo;
+MCTypeInfoRef kMCScriptPropertyNotFoundErrorTypeInfo;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -269,6 +271,10 @@ bool MCScriptInitialize(void)
 			return false;
 		if (!MCNamedErrorTypeInfoCreate(MCNAME("livecode.lang.CannotCallContextHandlerError"), MCNAME("runtime"), MCSTR("Cannot call context handler"), kMCScriptCannotCallContextHandlerErrorTypeInfo))
 			return false;
+		if (!MCNamedErrorTypeInfoCreate(MCNAME("livecode.lang.HandlerNotFoundError"), MCNAME("runtime"), MCSTR("No handler %{handler} in module %{module}"), kMCScriptHandlerNotFoundErrorTypeInfo))
+			return false;
+		if (!MCNamedErrorTypeInfoCreate(MCNAME("livecode.lang.PropertyNotFoundError"), MCNAME("runtime"), MCSTR("No property %{property} in module %{module}"), kMCScriptHandlerNotFoundErrorTypeInfo))
+			return false;
     }
 
     return true;
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -42,6 +42,8 @@ extern MCTypeInfoRef kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptInvalidPropertyValueErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptNotAHandlerValueErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptCannotCallContextHandlerErrorTypeInfo;
+extern MCTypeInfoRef kMCScriptPropertyNotFoundErrorTypeInfo;
+extern MCTypeInfoRef kMCScriptHandlerNotFoundErrorTypeInfo;
 
 ////////////////////////////////////////////////////////////////////////////////
 
