[[ Script ]] Correct functionality of Query methods in MCScript

runrevmark · runrevmark · commit c4f30abceb4e · 2016-09-15T14:58:17.000+01:00
The definition querying methods should return false if the module is
not usable or the definition could not be found - they should not
throw (as they are used to check whether a module includes a given
named definition!).
diff --git a/libscript/include/libscript/script.h b/libscript/include/libscript/script.h
@@ -186,31 +186,36 @@ bool MCScriptListDependencyNamesOfModule(MCScriptModuleRef module, /* copy */ MC
 // Returns a list of the constants defined by the module.
 bool MCScriptListConstantNamesOfModule(MCScriptModuleRef module, /* copy */ MCProperListRef& r_constant_names);
 
-// Queries the value of the given constant.
+// Queries the value of the given constant. If the constant doesn't exist, or
+// module is not usable, false is returned.
 bool MCScriptQueryConstantOfModule(MCScriptModuleRef module, MCNameRef name, /* get */ MCValueRef& r_constant_value);
 
 // Returns a list of properties implemented by the module.
 bool MCScriptListPropertyNamesOfModule(MCScriptModuleRef module, /* copy */ MCProperListRef& r_property_names);
 
-// Queries the type of the given property. If the setting type is nil, then the property
-// is read-only.
+// Queries the type of the given property. If the setting type is nil, then the
+// property is read-only. If the property doesn't exist, or  module is not
+// usable, false is returned.
 bool MCScriptQueryPropertyOfModule(MCScriptModuleRef module, MCNameRef property, /* get */ MCTypeInfoRef& r_getter, /* get */ MCTypeInfoRef& r_setter);
 
 // Returns a list of the events declared by the module.
 bool MCScriptListEventNamesOfModule(MCScriptModuleRef module, /* copy */ MCProperListRef& r_event_names);
 
-// Query the signature of the given event.
+// Query the signature of the given event. If the event doesn't exist, or
+// module is not usable, false is returned.
 bool MCScriptQueryEventOfModule(MCScriptModuleRef module, MCNameRef event, /* get */ MCTypeInfoRef& r_signature);
 
 // Returns a list of the handlers declared by the module.
 bool MCScriptListHandlerNamesOfModule(MCScriptModuleRef module, /* copy */ MCProperListRef& r_handler_names);
 
-// Query the signature of the given handler.
+// Query the signature of the given handler. If the handler doesn't exist, or
+// module is not usable, false is returned.
 bool MCScriptQueryHandlerSignatureOfModule(MCScriptModuleRef module, MCNameRef handler, /* get */ MCTypeInfoRef& r_signature);
 
 // Copy the names of the parameters in the signature of the given handler.
 // Note: If the module has had debugging info stripped, the list will be all
-// empty names.
+// empty names. If the handler doesn't exist, or module is not usable, false is
+// returned.
 bool MCScriptListHandlerParameterNamesOfModule(MCScriptModuleRef module, MCNameRef handler, /* copy */ MCProperListRef& r_names);
 
 // Emit an interface definition for the module.
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -829,25 +829,6 @@ bool MCScriptEnsureModuleIsUsable(MCScriptModuleRef self)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static bool
-__MCScriptThrowModuleNotUsableError(MCScriptModuleRef self)
-{
-	return MCErrorThrowGenericWithMessage(MCSTR("%{name} not usable"),
-										  "name", self -> name,
-									      nil);
-}
-
-static bool
-__MCScriptThrowDefinitionNotFoundInModuleError(MCScriptModuleRef self,
-											   MCScriptDefinitionKind p_kind,
-											   MCNameRef p_name)
-{
-	return MCErrorThrowGenericWithMessage(MCSTR("%{kind} definition %{name} not found in %{module}"),
-										  "kind", __MCScriptDefinitionKindToString(p_kind),
-										  "name", p_name,
-										  "module", self->name);
-}
-
 static bool
 __MCScriptCopyDefinitionsOfModule(MCScriptModuleRef self,
 								  MCScriptDefinitionKind p_kind,
@@ -915,15 +896,13 @@ bool MCScriptQueryConstantOfModule(MCScriptModuleRef self, MCNameRef p_constant,
 	MCScriptConstantDefinition *t_constant_def = nil;
 	
     if (!self -> is_usable)
-        return __MCScriptThrowModuleNotUsableError(self);
+		return false;
 	
 	if (!MCScriptLookupConstantDefinitionInModule(self,
 												  p_constant,
 												  t_constant_def))
 	{
-        return __MCScriptThrowDefinitionNotFoundInModuleError(self,
-															  kMCScriptDefinitionKindConstant,
-															  p_constant);
+		return false;
 	}
 	
 	r_constant_value = self->values[t_constant_def->value];
@@ -943,10 +922,10 @@ bool MCScriptQueryPropertyOfModule(MCScriptModuleRef self, MCNameRef p_property,
     MCScriptPropertyDefinition *t_def;
     
     if (!self -> is_usable)
-        return __MCScriptThrowModuleNotUsableError(self);
+		return false;
     
     if (!MCScriptLookupPropertyDefinitionInModule(self, p_property, t_def))
-        return __MCScriptThrowDefinitionNotFoundInModuleError(self, kMCScriptDefinitionKindProperty, p_property);
+		return false;
     
     MCScriptDefinition *t_getter;
     t_getter = t_def -> getter != 0 ? self -> definitions[t_def -> getter - 1] : nil;
@@ -989,10 +968,10 @@ bool MCScriptQueryEventOfModule(MCScriptModuleRef self, MCNameRef p_event, /* ge
     MCScriptEventDefinition *t_def;
     
     if (!self -> is_usable)
-        return __MCScriptThrowModuleNotUsableError(self);
+		return false;
     
     if (!MCScriptLookupEventDefinitionInModule(self, p_event, t_def))
-        return __MCScriptThrowDefinitionNotFoundInModuleError(self, kMCScriptDefinitionKindEvent, p_event);
+		return false;
     
     r_signature = self -> types[t_def -> type] -> typeinfo;
     
@@ -1011,10 +990,10 @@ bool MCScriptQueryHandlerSignatureOfModule(MCScriptModuleRef self, MCNameRef p_h
     MCScriptHandlerDefinition *t_def;
     
     if (!self -> is_usable)
-        return __MCScriptThrowModuleNotUsableError(self);
+		return false;
     
     if (!MCScriptLookupHandlerDefinitionInModule(self, p_handler, t_def))
-        return __MCScriptThrowDefinitionNotFoundInModuleError(self, kMCScriptDefinitionKindProperty, p_handler);
+		return false;
     
     r_signature = self -> types[t_def -> type] -> typeinfo;
     
@@ -1027,12 +1006,12 @@ bool MCScriptCopyHandlerParameterNamesOfModule(MCScriptModuleRef self, MCNameRef
     
     if (!self -> is_usable)
 	{
-        return __MCScriptThrowModuleNotUsableError(self);
-    }
+		return false;
+	}
 	
     if (!MCScriptLookupHandlerDefinitionInModule(self, p_handler, t_def))
 	{
-        return __MCScriptThrowDefinitionNotFoundInModuleError(self, kMCScriptDefinitionKindHandler, p_handler);
+		return false;
 	}
 	
 	MCAutoProperListRef t_names;
