[[ Bug 15302 ]] occured to occurred

bwmilby · bwmilby · commit 883ea8243093 · 2017-07-23T10:31:44.000-05:00
Correct the spelling error of "occured" to "occurred".  Most of the corrections were in comments.  A few were in strings.  6 changes were to actual code, but were self contained within each function (engine\src\mac-menu.mm and engine\src\opensslsocket.cpp).
diff --git a/engine/include/customprinter.h b/engine/include/customprinter.h
@@ -337,15 +337,15 @@ class MCCustomPrintingDevice
 
 	// Return the error string describing the reason for 'false' being returned
 	// from one of the action methods. 'nil' should be returned if no error
-	// has occured.
+	// has occurred.
 	virtual const char *GetError(void) = 0;
 
 	// Start a new document with the given details as present in the
 	// passed structure.
 	virtual bool BeginDocument(const MCCustomPrinterDocument& document) = 0;
 
 	// Cancel the current document - this should have the same effect as if
-	// an error occured, but obviously no error should be set.
+	// an error occurred, but obviously no error should be set.
 	virtual void AbortDocument(void) = 0;
 
 	// Mark the end of a document.
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -454,7 +454,7 @@ void MCButton::open()
     MCControl::open();
 
 	// MW-2011-02-08: [[ Bug 9382 ]] Make sure we reset icons when opening and the state
-	//   has changed (i.e. background transition has occured).
+	//   has changed (i.e. background transition has occurred).
 	uint32_t t_old_state;
 	t_old_state = state;
 	switch(gethilite(0))
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -232,7 +232,7 @@ class MCCustomMetaContext: public MCMetaContext
 	// can be used.
 	MCPrinterRectangle m_page_rect;
 
-	// If this is true, an error has occured during execute
+	// If this is true, an error has occurred during execute
 	bool m_execute_error;
 
 	// The untransformed rect and scale of current composite region
@@ -273,7 +273,7 @@ bool MCCustomMetaContext::render(MCCustomPrintingDevice *p_device, const MCPrint
 
 bool MCCustomMetaContext::candomark(MCMark *p_mark)
 {
-	// If an error has occured during this execution, just return true to minimize
+	// If an error has occurred during this execution, just return true to minimize
 	// unnecessary rasterization (this is to make up for a lack of error handling
 	// during the super-classes execution process).
 	if (m_execute_error)
@@ -377,7 +377,7 @@ bool MCCustomMetaContext::candomark(MCMark *p_mark)
 
 void MCCustomMetaContext::domark(MCMark *p_mark)
 {
-	// If an error has occured, we do nothing.
+	// If an error has occurred, we do nothing.
 	if (m_execute_error)
 		return;
 
diff --git a/engine/src/deploy.h b/engine/src/deploy.h
@@ -453,7 +453,7 @@ enum MCDeployError
 	/* An error occurred while creating the startup stack */
 	kMCDeployErrorEmscriptenBadStack,
 	
-	/* An error occured with the pre-deploy step */
+	/* An error occurred with the pre-deploy step */
 	kMCDeployErrorTrialBannerError,
 
 	// SIGN ERRORS
@@ -472,19 +472,19 @@ enum MCDeployError
 	// The password did not match
 	kMCDeployErrorBadPassword,
 
-	// An error occured while building the signature
+	// An error occurred while building the signature
 	kMCDeployErrorBadSignature,
 
-	// An error occured while trying to convert a string
+	// An error occurred while trying to convert a string
 	kMCDeployErrorBadString,
 
-	// An error occured while trying to compute the hash
+	// An error occurred while trying to compute the hash
 	kMCDeployErrorBadHash,
 
-	// An error occured while trying to fetch a timestamp
+	// An error occurred while trying to fetch a timestamp
 	kMCDeployErrorTimestampFailed,
 
-	// An error occured decoding the timestamp response
+	// An error occurred decoding the timestamp response
 	kMCDeployErrorBadTimestamp,
 
 
diff --git a/engine/src/deploy_capsule.cpp b/engine/src/deploy_capsule.cpp
@@ -391,7 +391,7 @@ static bool MCDeployCapsuleFilterFlush(MCDeployCapsuleFilterState& self)
 		self . stream . next_in = self . input;
 	}
 
-	// If a buf error occured, we either need more space, or more input
+	// If a buf error occurred, we either need more space, or more input
 	if (t_result == Z_BUF_ERROR)
 	{
 		// If the input buffer is not maxed out, return as we need more input
diff --git a/engine/src/deploy_linux.cpp b/engine/src/deploy_linux.cpp
@@ -798,7 +798,7 @@ Exec_stat MCDeployToELF(const MCDeployParameters& p_params, bool p_is_android)
 	uint32_t t_end_offset, t_end_size;
 	if (t_success)
 	{
-		// Compute the shift that will have occured to any post-project sections
+		// Compute the shift that will have occurred to any post-project sections
 		int32_t t_project_delta, t_payload_delta;
 		t_project_delta = t_project_size - t_project_section -> sh_size;
 		if (t_payload_section != NULL)
diff --git a/engine/src/dskmac.cpp b/engine/src/dskmac.cpp
@@ -5621,7 +5621,7 @@ bool MCS_mac_elevation_bootstrap_main(int argc, char *argv[])
 	// And finally exec to the new process (this does not return if successful).
 	execvp(t_args[0], t_args);
 	
-	// If we get this far then an error has occured :o(
+	// If we get this far then an error has occurred :o(
 	return false;
 }
 
diff --git a/engine/src/dskw32main.cpp b/engine/src/dskw32main.cpp
@@ -285,7 +285,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 		DisplayStartupErrorAndExit();
 
 	// Now we loop continually until quit. If 'X_main_loop' returns without quitting
-	// it means a stack size change request has occured.
+	// it means a stack size change request has occurred.
 	while(!MCquit)
 	{
 		// Create ourselves a new fiber with appropriate stack size
diff --git a/engine/src/exec-extension.cpp b/engine/src/exec-extension.cpp
@@ -761,7 +761,7 @@ bool MCExtensionConvertFromScriptType(MCExecContext& ctxt, MCTypeInfoRef p_as_ty
 // Ensure that if the input value is a name it comes out as a string.
 // Ensure that if the input value is an array, all elements that are names (recursed)
 // come out as strings.
-// If r_output is nil, then no mutation occured; otherwise it is the mutated value.
+// If r_output is nil, then no mutation occurred; otherwise it is the mutated value.
 static bool __script_ensure_names_are_strings(MCValueRef p_input, MCValueRef& r_output)
 {
     if (MCValueGetTypeCode(p_input) == kMCValueTypeCodeName)
diff --git a/engine/src/executionerrors.h b/engine/src/executionerrors.h
@@ -2639,13 +2639,13 @@ enum Exec_errors
     // AL-2015-07-07: The following error codes are 8.0 specific so should have their numbers
     //  incremented whenever new codes are merged up from below.
     // MW-2014-12-10: [[ Extensions ]] The error codes used to indicate an extension error.
-    // {EE-0863} extension: error occured with domain
+    // {EE-0863} extension: error occurred with domain
     EE_EXTENSION_ERROR_DOMAIN,
-    // {EE-0864} extension: error occured with description
+    // {EE-0864} extension: error occurred with description
     EE_EXTENSION_ERROR_DESCRIPTION,
-    // {EE-0865} extension: error occured with file
+    // {EE-0865} extension: error occurred with file
     EE_EXTENSION_ERROR_FILE,
-    // {EE-0866} extension: error occured with line
+    // {EE-0866} extension: error occurred with line
     EE_EXTENSION_ERROR_LINE,
     
     // {EE-0867} load: error in extension expression
diff --git a/engine/src/field.h b/engine/src/field.h
@@ -137,7 +137,7 @@ enum MCInterfaceFieldCursorMovement
     kMCFieldCursorMovementLogical,
 };
 
-// MW-2012-02-20: [[ FieldExport ]] The event that occured to cause the callback.
+// MW-2012-02-20: [[ FieldExport ]] The event that occurred to cause the callback.
 enum MCFieldExportEventType
 {
 	kMCFieldExportEventBeginParagraph,
diff --git a/engine/src/fieldf.cpp b/engine/src/fieldf.cpp
@@ -1443,7 +1443,7 @@ void MCField::startselection(int2 x, int2 y, Boolean words)
 						selectedmark(False, si, ei, False);
 						if (ti >= si && ti < ei && si != ei)
 						{
-							// Here we mark the fact a mouse-down has occured in
+							// Here we mark the fact a mouse-down has occurred in
 							// the selection. This is used in mdrag to work out
 							// whether to initiate a drag-drop operation.
 							state |= CS_SOURCE_TEXT;
diff --git a/engine/src/ijpg.cpp b/engine/src/ijpg.cpp
@@ -818,7 +818,7 @@ bool MCJPEGImageLoader::LoadFrames(MCBitmapFrame *&r_frames, uint32_t &r_count)
 		MCMemoryDeallocate(t_row_buffer);
 
     // SN-2015-07-07: [[ Bug 15569 ]] Ensure that we do not touch the image if
-    //  an error occured on decompression.
+    //  an error occurred on decompression.
     if (t_success && m_orientation != 0)
 		apply_exif_orientation(m_orientation, t_frame->image);
 
diff --git a/engine/src/lnxelevate.cpp b/engine/src/lnxelevate.cpp
@@ -269,7 +269,7 @@ bool MCSystemOpenElevatedProcess(MCStringRef p_command, int32_t& r_pid, int32_t&
 		// Shouldn't return.
 		execvp(t_argv[0], (char * const *) t_argv);
 
-		// If we get here an error occured. We just exit with '-1' since the parent
+		// If we get here an error occurred. We just exit with '-1' since the parent
 		// will detect termination of the child.
 		_exit(-1);
 	}
diff --git a/engine/src/mac-core.mm b/engine/src/mac-core.mm
@@ -1605,7 +1605,7 @@ void MCMacPlatformHandleMousePress(uint32_t p_button, bool p_new_state)
 		uint32_t t_event_time;
 		t_event_time = MCPlatformGetEventTime();
 		
-		// If the click occured within the double click time and double click
+		// If the click occurred within the double click time and double click
 		// radius *and* if the button is the same as the last clicked button
 		// then increment the click count.
 		if (t_event_time - s_mouse_last_click_time < MCdoubletime &&
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
@@ -215,7 +215,7 @@ - (void)menuItemSelected: (id)sender
         s_menu_item_selected = true;
     }
     
-    // SN-2014-11-06: [[ Bug 13836 ]] s_menu_select_occured was not used.
+    // SN-2014-11-06: [[ Bug 13836 ]] s_menu_select_occurred was not used.
 }
 
 - (BOOL)validateMenuItem: (NSMenuItem *)item
@@ -414,10 +414,10 @@ void MCMacPlatformPopQuittingState()
 // has been selected.
 bool MCMacPlatformIsInQuittingState(void)
 {
-	bool t_occured;
-	t_occured = s_quit_selected;
+	bool t_occurred;
+	t_occurred = s_quit_selected;
 	s_quit_selected = false;
-	return t_occured;
+	return t_occurred;
 }
 
 void MCMacPlatformLockMenuSelect(void)
diff --git a/engine/src/mbliphonebrowser.mm b/engine/src/mbliphonebrowser.mm
@@ -748,7 +748,7 @@ void Destroy(void)
 	
 	void Dispatch(void)
 	{
-		// MW-2011-11-03: [[ LoadRequested ]] If a load occured, then post a load requested
+		// MW-2011-11-03: [[ LoadRequested ]] If a load occurred, then post a load requested
 		//   event.
 		if (m_target -> HandleLoadRequest(m_request, m_type, m_notify))
 			MCEventQueuePostCustom(new MCNativeBrowserLoadRequestEvent(m_target, m_request, m_type, true));
diff --git a/engine/src/opensslsocket.cpp b/engine/src/opensslsocket.cpp
@@ -2248,7 +2248,7 @@ static long post_connection_check(SSL *ssl, char *host)
 	int t_idx = -1;
 
 	if (!(cert = SSL_get_peer_certificate(ssl)) || !host)
-		goto err_occured;
+		goto err_occurred;
 
 	while (NULL != (t_alt_names = (STACK_OF(GENERAL_NAME)*)X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, &t_idx)))
 	{
@@ -2269,13 +2269,13 @@ static long post_connection_check(SSL *ssl, char *host)
 	{
 		data[255] = 0;
 		if (!ssl_match_identity(data, host))
-			goto err_occured;
+			goto err_occurred;
 	}
 
 	X509_free(cert);
 	return SSL_get_verify_result(ssl);
 
-err_occured:
+err_occurred:
 	if (cert)
 		X509_free(cert);
 
diff --git a/engine/src/osxprinter.cpp b/engine/src/osxprinter.cpp
@@ -1033,7 +1033,7 @@ MCPrinterDialogResult MCMacOSXPrinter::DoDialog(bool p_window_modal, Window p_ow
         
         if (t_result == kMCPlatformPrintDialogResultError)
         {
-            PDEBUG(stderr, "DoDialog: Error occured\n");
+            PDEBUG(stderr, "DoDialog: Error occurred\n");
             t_err = PRINTER_DIALOG_RESULT_ERROR;
         }
         else if (t_result == kMCPlatformPrintDialogResultSuccess)
diff --git a/engine/src/osxtheme.mm b/engine/src/osxtheme.mm
@@ -568,7 +568,7 @@ static Widget_Part HitTestScrollControls(const MCWidgetInfo &winfo, int2 mx,int2
 	fillTrackDrawInfo(winfo,ttdi,drect);
 	Boolean inScrollbarArrow = False;
 	ControlPartCode partCode;
-	// scrollbar needs to check first if mouse-down occured in arrows
+	// scrollbar needs to check first if mouse-down occurred in arrows
 	if (ttdi.kind == kThemeScrollBar || ttdi.kind == kThemeSmallScrollBar)
 	{
 		// MW-2008-11-02: [[ Bug ]] If this scrollbar is rendered as a little arrows control, then
diff --git a/engine/src/printer.h b/engine/src/printer.h
@@ -57,7 +57,7 @@ class MCPrinterDevice
 public:
 	virtual ~MCPrinterDevice(void) {};
 
-	// Return a descriptive string of the last printer error that occured. This
+	// Return a descriptive string of the last printer error that occurred. This
 	// call should return NULL if ERROR has not been returned by any method of
 	// the object.
 	//
@@ -68,7 +68,7 @@ class MCPrinterDevice
 
 	// Cancel the current document.
 	//
-	// If an error has occured with printing, ERROR should be returned, else
+	// If an error has occurred with printing, ERROR should be returned, else
 	// CANCEL should be returned.
 	//
 	virtual MCPrinterResult Cancel(void) = 0;
@@ -77,7 +77,7 @@ class MCPrinterDevice
 	//
 	// If this call succeeds, SUCCESS should be returned.
 	// If the job has been cancelled, CANCEL should be returned.
-	// If a printer error has occured, ERROR should be returned.
+	// If a printer error has occurred, ERROR should be returned.
 	//
 	virtual MCPrinterResult Show(void) = 0;
 
@@ -89,7 +89,7 @@ class MCPrinterDevice
 	// If the call succeeds, SUCCESS should be returned and r_context will be
 	// a valid graphics context.
 	// If the job has been cancelld, CANCEL should be returned.
-	// If a printer error has occured, ERROR should be returned.
+	// If a printer error has occurred, ERROR should be returned.
 	//
 	virtual MCPrinterResult Begin(const MCPrinterRectangle& p_src_rect, const MCPrinterRectangle& p_dst_rect, MCContext*& r_context) = 0;
 
@@ -98,7 +98,7 @@ class MCPrinterDevice
 	//
 	// If the call succeeds, SUCCESS should be returned.
 	// If the job has been cancelled, CANCEL should be returned.
-	// If a printer error has occured, ERROR should be returned.
+	// If a printer error has occurred, ERROR should be returned.
 	//
 	virtual MCPrinterResult End(MCContext *p_context) = 0;
 
@@ -108,7 +108,7 @@ class MCPrinterDevice
 	//
 	// If the call succeeds, SUCCESS should be returned.
 	// If the job has been cancelled, CANCEL should be returned.
-	// If a printer error has occured, ERROR should be returned.
+	// If a printer error has occurred, ERROR should be returned.
 	//
 	virtual MCPrinterResult Anchor(const char *name, double x, double y) = 0;
 
@@ -118,7 +118,7 @@ class MCPrinterDevice
 	//
 	// If the call succeeds, SUCCESS should be returned.
 	// If the job has been cancelled, CANCEL should be returned.
-	// If a printer error has occured, ERROR should be returned.
+	// If a printer error has occurred, ERROR should be returned.
 	virtual MCPrinterResult Link(const char *destination, const MCPrinterRectangle& area, MCPrinterLinkType type) = 0;
 
 	// Make a bookmark with the given title, nested at the given depth.
@@ -127,7 +127,7 @@ class MCPrinterDevice
 	//
 	// If the call succeeds, SUCCESS should be returned.
 	// If the job has been cancelled, CANCEL should be returned.
-	// If a printer error has occured, ERROR should be returned.
+	// If a printer error has occurred, ERROR should be returned.
 	//
 	virtual MCPrinterResult Bookmark(const char *title, double x, double y, int depth, bool closed) = 0;
 };
@@ -362,7 +362,7 @@ class MCPrinter
 	//
 	// The return value should reflect the starting state of the device object
 	// note that a valid device object must be returned regardless of whether
-	// a printer error, or cancellation occured.
+	// a printer error, or cancellation occurred.
 	//
 	virtual MCPrinterResult DoBeginPrint(MCStringRef p_document, MCPrinterDevice*& r_device) = 0;
 
diff --git a/engine/src/scrolbar.cpp b/engine/src/scrolbar.cpp
@@ -342,7 +342,7 @@ Boolean MCScrollbar::mdown(uint2 which)
 			{
 				getwidgetthemeinfo(winfo);
 				Widget_Part wpart = MCcurtheme->hittest(winfo,mx,my,rect);
-				// scrollbar needs to check first if mouse-down occured in arrows
+				// scrollbar needs to check first if mouse-down occurred in arrows
 				switch (wpart)
 				{
 				case WTHEME_PART_ARROW_DEC:
diff --git a/engine/src/tilecache.cpp b/engine/src/tilecache.cpp
@@ -129,7 +129,7 @@ struct MCTileCacheFrontier
 
 struct MCTileCache
 {
-	// If false, an error has occured while processing an operation on the
+	// If false, an error has occurred while processing an operation on the
 	// tilecache. It must be flushed before it can be used again.
 	bool valid : 1;
 	
diff --git a/engine/src/tilecachegl.cpp b/engine/src/tilecachegl.cpp
@@ -302,7 +302,7 @@ bool MCTileCacheOpenGLCompositor_EndTiling(void *p_context)
 	// Flush any empty textures.
 	MCTileCacheOpenGLCompositorFlushSuperTiles(self, false);
 	
-	// If an OpenGL error occured, then return false.
+	// If an OpenGL error occurred, then return false.
 	GLenum t_error;
 	t_error = glGetError();
 	if (t_error != GL_NO_ERROR)
diff --git a/engine/src/uidc.h b/engine/src/uidc.h
diff --git a/engine/src/widget.lcb b/engine/src/widget.lcb
diff --git a/ide b/ide
diff --git a/ide-support/revdeploylibraryios.livecodescript b/ide-support/revdeploylibraryios.livecodescript
diff --git a/ide-support/revsaveasandroidstandalone.livecodescript b/ide-support/revsaveasandroidstandalone.livecodescript
diff --git a/lcidlc/include/LiveCode.h b/lcidlc/include/LiveCode.h
diff --git a/libexternalv1/include/external.h b/libexternalv1/include/external.h
diff --git a/thirdparty b/thirdparty

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ static bool MCDeployCapsuleFilterFlush(MCDeployCapsuleFilterState& self)`
`391`	`391`	`self . stream . next_in = self . input;`
`392`	`392`	`}`
`393`	`393`
`394`		`- // If a buf error occured, we either need more space, or more input`
	`394`	`+ // If a buf error occurred, we either need more space, or more input`
`395`	`395`	`if (t_result == Z_BUF_ERROR)`
`396`	`396`	`{`
`397`	`397`	`// If the input buffer is not maxed out, return as we need more input`
Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ Exec_stat MCDeployToELF(const MCDeployParameters& p_params, bool p_is_android)`
`798`	`798`	`uint32_t t_end_offset, t_end_size;`
`799`	`799`	`if (t_success)`
`800`	`800`	`{`
`801`		`- // Compute the shift that will have occured to any post-project sections`
	`801`	`+ // Compute the shift that will have occurred to any post-project sections`
`802`	`802`	`int32_t t_project_delta, t_payload_delta;`
`803`	`803`	`t_project_delta = t_project_size - t_project_section -> sh_size;`
`804`	`804`	`if (t_payload_section != NULL)`
Original file line number	Diff line number	Diff line change
`@@ -5621,7 +5621,7 @@ bool MCS_mac_elevation_bootstrap_main(int argc, char *argv[])`
`5621`	`5621`	`// And finally exec to the new process (this does not return if successful).`
`5622`	`5622`	`execvp(t_args[0], t_args);`
`5623`	`5623`
`5624`		`- // If we get this far then an error has occured :o(`
	`5624`	`+ // If we get this far then an error has occurred :o(`
`5625`	`5625`	`return false;`
`5626`	`5626`	`}`
`5627`	`5627`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi`
`285`	`285`	`DisplayStartupErrorAndExit();`
`286`	`286`
`287`	`287`	`// Now we loop continually until quit. If 'X_main_loop' returns without quitting`
`288`		`- // it means a stack size change request has occured.`
	`288`	`+ // it means a stack size change request has occurred.`
`289`	`289`	`while(!MCquit)`
`290`	`290`	`{`
`291`	`291`	`// Create ourselves a new fiber with appropriate stack size`
Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ bool MCExtensionConvertFromScriptType(MCExecContext& ctxt, MCTypeInfoRef p_as_ty`
`761`	`761`	`// Ensure that if the input value is a name it comes out as a string.`
`762`	`762`	`// Ensure that if the input value is an array, all elements that are names (recursed)`
`763`	`763`	`// come out as strings.`
`764`		`-// If r_output is nil, then no mutation occured; otherwise it is the mutated value.`
	`764`	`+// If r_output is nil, then no mutation occurred; otherwise it is the mutated value.`
`765`	`765`	`static bool __script_ensure_names_are_strings(MCValueRef p_input, MCValueRef& r_output)`
`766`	`766`	`{`
`767`	`767`	`if (MCValueGetTypeCode(p_input) == kMCValueTypeCodeName)`