[[ Script ]] Implement read-only property set error and invalid value for property error.

runrevmark · runrevmark · commit 03303910d854 · 2014-12-17T09:41:53.000Z
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -126,34 +126,16 @@ bool MCHandlerTypeInfoConformsToPropertySetter(MCTypeInfoRef typeinfo)
 
 ///////////
 
-bool MCScriptThrowAttemptToSetReadOnlyPropertyError(MCScriptModuleRef module, MCNameRef property)
+bool MCScriptThrowAttemptToSetReadOnlyPropertyError(MCScriptModuleRef p_module, MCNameRef p_property)
 {
-    return MCErrorThrowGeneric(nil);
+    return MCErrorCreateAndThrow(kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo, "module", p_module -> name, "property", p_property, nil);
 }
 
-bool MCScriptThrowInvalidValueForPropertyError(MCScriptModuleRef module, MCNameRef property, MCTypeInfoRef type, MCValueRef value)
+bool MCScriptThrowInvalidValueForPropertyError(MCScriptModuleRef p_module, MCNameRef p_property, MCTypeInfoRef p_expected_type, MCValueRef p_value)
 {
-    return MCErrorThrowGeneric(nil);
+    return MCErrorCreateAndThrow(kMCScriptInvalidPropertyValueErrorTypeInfo, "module", p_module -> name, "property", p_property, "type", MCNamedTypeInfoGetName(p_expected_type), "value", p_value, nil);
 }
 
-bool MCScriptThrowWrongNumberOfArgumentsForHandlerError(MCScriptModuleRef module, MCNameRef handler, uindex_t expected, uindex_t provided)
-{
-    return MCErrorThrowGeneric(nil);
-}
-
-bool MCScriptThrowNoValueProvidedForInParameterError(MCScriptModuleRef module, MCNameRef handler, MCNameRef parameter)
-{
-    return MCErrorThrowGeneric(nil);
-}
-
-bool MCScriptThrowInvalidValueForParameterError(MCScriptModuleRef module, MCNameRef handler, MCNameRef parameter, MCTypeInfoRef type, MCValueRef value)
-{
-    return MCErrorThrowGeneric(nil);
-}
-
-//////////
-
-
 bool MCScriptThrowInvalidValueForResultError(MCScriptModuleRef p_module, MCScriptDefinition *p_handler, MCTypeInfoRef p_expected_type, MCValueRef p_value)
 {
     return MCErrorCreateAndThrow(kMCScriptInvalidReturnValueErrorTypeInfo, "module", p_module -> name, "handler", MCScriptGetNameOfDefinitionInModule(p_module, p_handler), "type", MCNamedTypeInfoGetName(p_expected_type), "value", p_value, nil);
diff --git a/libscript/src/script-object.cpp b/libscript/src/script-object.cpp
@@ -17,6 +17,8 @@ MCTypeInfoRef kMCScriptForeignHandlerBindingErrorTypeInfo;
 MCTypeInfoRef kMCScriptMultiInvokeBindingErrorTypeInfo;
 MCTypeInfoRef kMCScriptTypeBindingErrorTypeInfo;
 MCTypeInfoRef kMCScriptNoMatchingHandlerErrorTypeInfo;
+MCTypeInfoRef kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo;
+MCTypeInfoRef kMCScriptInvalidPropertyValueErrorTypeInfo;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -246,6 +248,8 @@ bool MCScriptInitialize(void)
         MCScriptCreateNamedErrorType(MCNAME("livecode.lang.PolymorphicHandlerBindingError"), MCSTR("Unable to bind appropriate handler"), kMCScriptMultiInvokeBindingErrorTypeInfo);
         MCScriptCreateNamedErrorType(MCNAME("livecode.lang.TypeBindingError"), MCSTR("Attempt to use unbound named type %{type}"), kMCScriptTypeBindingErrorTypeInfo);
         MCScriptCreateNamedErrorType(MCNAME("livecode.lang.NoMatchingHandlerError"), MCSTR("No matching handler for arguments with types (%{types}) - possible handlers (%{handlers})"), kMCScriptNoMatchingHandlerErrorTypeInfo);
+        MCScriptCreateNamedErrorType(MCNAME("livecode.lang.CannotSetReadOnlyPropertyError"), MCSTR("Cannot set read-only property %{module}.%{property}"), kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo);
+        MCScriptCreateNamedErrorType(MCNAME("livecode.lang.PropertyValueTypeError"), MCSTR("Value is not of correct type for setting property - expected type %{type} for setting property %{module}.%{property}"), kMCScriptInvalidPropertyValueErrorTypeInfo);
     }
 
     return true;
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -22,6 +22,8 @@ extern MCTypeInfoRef kMCScriptForeignHandlerBindingErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptMultiInvokeBindingErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptTypeBindingErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptNoMatchingHandlerErrorTypeInfo;
+extern MCTypeInfoRef kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo;
+extern MCTypeInfoRef kMCScriptInvalidPropertyValueErrorTypeInfo;
 
 ////////////////////////////////////////////////////////////////////////////////
 
